diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 5cacc1e6..b74733a9 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -9,8 +9,7 @@ on: paths: - "crates/**" - "programs/**" - - "native-host/**" - - "zkvm-host/**" + - "scripts/**" - "proposer/succinct/**" - "Cargo.toml" merge_group: diff --git a/.github/workflows/pr_lint.yml b/.github/workflows/pr_lint.yml index ef3452ad..323c635d 100644 --- a/.github/workflows/pr_lint.yml +++ b/.github/workflows/pr_lint.yml @@ -5,9 +5,6 @@ on: types: - opened - edited - push: - branches: - - main permissions: pull-requests: read diff --git a/Cargo.lock b/Cargo.lock index e6debf0c..7dba5d4a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -64,7 +64,7 @@ dependencies = [ "op-succinct-client-utils", "serde_cbor", "sha2", - "sp1-lib 1.2.0-rc1", + "sp1-lib 1.2.0-rc2", "sp1-zkvm", ] @@ -533,7 +533,7 @@ dependencies = [ "alloy-sol-macro-input", "const-hex", "heck", - "indexmap 2.4.0", + "indexmap 2.5.0", "proc-macro-error", "proc-macro2", "quote", @@ -781,7 +781,7 @@ dependencies = [ "num-bigint 0.4.6", "num-traits", "paste", - "rustc_version 0.4.0", + "rustc_version 0.4.1", "zeroize", ] @@ -924,7 +924,7 @@ checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c" dependencies = [ "futures", "pharos", - "rustc_version 0.4.0", + "rustc_version 0.4.1", ] [[package]] @@ -962,9 +962,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "axum" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1236b4b292f6c4d6dc34604bb5120d85c3fe1d1aa596bd5cc52ca054d13e7b9e" +checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" dependencies = [ "async-trait", "axum-core", @@ -986,7 +986,7 @@ dependencies = [ "serde_json", "serde_path_to_error", "serde_urlencoded", - "sync_wrapper 0.1.2", + "sync_wrapper 1.0.1", "tokio", "tower", "tower-layer", @@ -1382,12 +1382,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "cfg_aliases" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" - [[package]] name = "chrono" version = "0.4.38" @@ -1532,7 +1526,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7bb11bd1378bf3731b182997b40cefe00aba6a6cc74042c8318c1b271d3badf7" dependencies = [ - "nix 0.27.1", + "nix", "thiserror", "tokio", ] @@ -1689,16 +1683,6 @@ dependencies = [ "cipher", ] -[[package]] -name = "ctrlc" -version = "3.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3" -dependencies = [ - "nix 0.29.0", - "windows-sys 0.59.0", -] - [[package]] name = "curve25519-dalek" version = "4.1.3" @@ -1709,7 +1693,7 @@ dependencies = [ "cpufeatures", "curve25519-dalek-derive", "fiat-crypto", - "rustc_version 0.4.0", + "rustc_version 0.4.1", "subtle", "zeroize", ] @@ -1897,7 +1881,7 @@ dependencies = [ "convert_case", "proc-macro2", "quote", - "rustc_version 0.4.0", + "rustc_version 0.4.1", "syn 2.0.76", ] @@ -1986,7 +1970,7 @@ dependencies = [ "hex-literal", "rfc6979", "signature", - "sp1-lib 1.2.0-rc1", + "sp1-lib 1.2.0-rc2", "spki", ] @@ -2727,7 +2711,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.4.0", + "indexmap 2.5.0", "slab", "tokio", "tokio-util", @@ -2746,7 +2730,7 @@ dependencies = [ "futures-core", "futures-sink", "http 1.1.0", - "indexmap 2.4.0", + "indexmap 2.5.0", "slab", "tokio", "tokio-util", @@ -3119,9 +3103,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", "hashbrown 0.14.5", @@ -3316,7 +3300,7 @@ dependencies = [ [[package]] name = "kona-client" version = "0.1.0" -source = "git+https://github.com/ethereum-optimism/kona?branch=main#f4a8e6a35b26667956e9d4c3a1110302b036d9a6" +source = "git+https://github.com/ethereum-optimism/kona?branch=main#2206cde65df13978ff5a238ceb0d4bcbc6aab7ce" dependencies = [ "alloy-consensus", "alloy-eips", @@ -3344,7 +3328,7 @@ dependencies = [ [[package]] name = "kona-common" version = "0.0.2" -source = "git+https://github.com/ethereum-optimism/kona?branch=main#f4a8e6a35b26667956e9d4c3a1110302b036d9a6" +source = "git+https://github.com/ethereum-optimism/kona?branch=main#2206cde65df13978ff5a238ceb0d4bcbc6aab7ce" dependencies = [ "anyhow", "cfg-if", @@ -3354,7 +3338,7 @@ dependencies = [ [[package]] name = "kona-common-proc" version = "0.0.2" -source = "git+https://github.com/ethereum-optimism/kona?branch=main#f4a8e6a35b26667956e9d4c3a1110302b036d9a6" +source = "git+https://github.com/ethereum-optimism/kona?branch=main#2206cde65df13978ff5a238ceb0d4bcbc6aab7ce" dependencies = [ "anyhow", "cfg-if", @@ -3367,7 +3351,7 @@ dependencies = [ [[package]] name = "kona-derive" version = "0.0.2" -source = "git+https://github.com/ethereum-optimism/kona?branch=main#f4a8e6a35b26667956e9d4c3a1110302b036d9a6" +source = "git+https://github.com/ethereum-optimism/kona?branch=main#2206cde65df13978ff5a238ceb0d4bcbc6aab7ce" dependencies = [ "alloc-no-stdlib", "alloy-consensus", @@ -3393,7 +3377,7 @@ dependencies = [ [[package]] name = "kona-executor" version = "0.0.1" -source = "git+https://github.com/ethereum-optimism/kona?branch=main#f4a8e6a35b26667956e9d4c3a1110302b036d9a6" +source = "git+https://github.com/ethereum-optimism/kona?branch=main#2206cde65df13978ff5a238ceb0d4bcbc6aab7ce" dependencies = [ "alloy-consensus", "alloy-eips", @@ -3409,7 +3393,7 @@ dependencies = [ [[package]] name = "kona-host" version = "0.1.0" -source = "git+https://github.com/ethereum-optimism/kona?branch=main#f4a8e6a35b26667956e9d4c3a1110302b036d9a6" +source = "git+https://github.com/ethereum-optimism/kona?branch=main#2206cde65df13978ff5a238ceb0d4bcbc6aab7ce" dependencies = [ "alloy-consensus", "alloy-eips", @@ -3443,7 +3427,7 @@ dependencies = [ [[package]] name = "kona-mpt" version = "0.0.2" -source = "git+https://github.com/ethereum-optimism/kona?branch=main#f4a8e6a35b26667956e9d4c3a1110302b036d9a6" +source = "git+https://github.com/ethereum-optimism/kona?branch=main#2206cde65df13978ff5a238ceb0d4bcbc6aab7ce" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -3457,7 +3441,7 @@ dependencies = [ [[package]] name = "kona-preimage" version = "0.0.2" -source = "git+https://github.com/ethereum-optimism/kona?branch=main#f4a8e6a35b26667956e9d4c3a1110302b036d9a6" +source = "git+https://github.com/ethereum-optimism/kona?branch=main#2206cde65df13978ff5a238ceb0d4bcbc6aab7ce" dependencies = [ "alloy-primitives", "anyhow", @@ -3470,7 +3454,7 @@ dependencies = [ [[package]] name = "kona-primitives" version = "0.0.1" -source = "git+https://github.com/ethereum-optimism/kona?branch=main#f4a8e6a35b26667956e9d4c3a1110302b036d9a6" +source = "git+https://github.com/ethereum-optimism/kona?branch=main#2206cde65df13978ff5a238ceb0d4bcbc6aab7ce" dependencies = [ "alloy-consensus", "alloy-eips", @@ -3502,15 +3486,15 @@ dependencies = [ [[package]] name = "kzg-rs" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea38b4917cfb194709222324913a33a999b25f9da59e2c8da304fc0ef55f996a" +checksum = "0850eb19206463a61bede4f7b7e6b21731807137619044b1f3c287ebcfe2b3b0" dependencies = [ "ff 0.13.0", "hex", - "once_cell", "sha2", "sp1_bls12_381", + "spin 0.9.8", ] [[package]] @@ -3553,7 +3537,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-targets 0.52.6", + "windows-targets 0.48.5", ] [[package]] @@ -3693,17 +3677,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "native-host" -version = "0.1.0" -dependencies = [ - "anyhow", - "clap", - "kona-host", - "log", - "tokio", -] - [[package]] name = "native-tls" version = "0.2.12" @@ -3732,18 +3705,6 @@ dependencies = [ "libc", ] -[[package]] -name = "nix" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "cfg_aliases", - "libc", -] - [[package]] name = "nohash-hasher" version = "0.2.0" @@ -3941,7 +3902,7 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ - "proc-macro-crate 3.2.0", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 2.0.76", @@ -3974,9 +3935,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.3" +version = "0.36.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" dependencies = [ "memchr", ] @@ -4027,7 +3988,7 @@ dependencies = [ "kona-mpt", "kona-preimage", "kona-primitives", - "kzg-rs 0.2.1", + "kzg-rs 0.2.3", "log", "op-alloy-consensus", "revm", @@ -4093,6 +4054,37 @@ dependencies = [ "uuid 1.10.0", ] +[[package]] +name = "op-succinct-prove" +version = "0.1.0" +dependencies = [ + "anyhow", + "cargo_metadata", + "clap", + "csv", + "dotenv", + "kona-host", + "log", + "num-format", + "op-succinct-client-utils", + "op-succinct-host-utils", + "revm", + "sp1-build", + "sp1-sdk", + "tokio", +] + +[[package]] +name = "op-succinct-witnessgen" +version = "0.1.0" +dependencies = [ + "anyhow", + "clap", + "kona-host", + "log", + "tokio", +] + [[package]] name = "open-fastrlp" version = "0.1.4" @@ -4632,7 +4624,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414" dependencies = [ "futures", - "rustc_version 0.4.0", + "rustc_version 0.4.1", ] [[package]] @@ -4844,15 +4836,6 @@ dependencies = [ "syn 2.0.76", ] -[[package]] -name = "prost-types" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" -dependencies = [ - "prost", -] - [[package]] name = "psm" version = "0.1.21" @@ -5459,9 +5442,9 @@ dependencies = [ [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver 1.0.23", ] @@ -5765,7 +5748,7 @@ version = "1.0.127" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" dependencies = [ - "indexmap 2.4.0", + "indexmap 2.5.0", "itoa", "memchr", "ryu", @@ -5824,7 +5807,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.4.0", + "indexmap 2.5.0", "serde", "serde_derive", "serde_json", @@ -6004,9 +5987,9 @@ dependencies = [ [[package]] name = "sp1-build" -version = "1.2.0-rc1" +version = "1.2.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16a18bb0916d1b4ee6f56bad0d79f0f844b2e7eb8dc6f4abce3dc440541ddf99" +checksum = "3534c49b852e04f5145c4b8b480c87806086acb85d2346912d57c7a8fbb0f12c" dependencies = [ "anyhow", "cargo_metadata", @@ -6017,9 +6000,9 @@ dependencies = [ [[package]] name = "sp1-core-executor" -version = "1.2.0-rc1" +version = "1.2.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a627bb8b04c2b537d4eb2a845f01a87357af37b079403d5ded060af445e4ee3" +checksum = "b9d05d3069b0802d5150447ba799be50bf1669c1403bea04bb016d84a355fa15" dependencies = [ "bincode", "bytemuck", @@ -6053,9 +6036,9 @@ dependencies = [ [[package]] name = "sp1-core-machine" -version = "1.2.0-rc1" +version = "1.2.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c8e59ebb97faeae1da856b10108dd3b0d4e37edf83a64c8092c2fb41f2372e4" +checksum = "45e4b2ef0a4e19253c1901cc6b96181d16f2b184e4840bf6df4e9ba79f34decb" dependencies = [ "anyhow", "arrayref", @@ -6117,32 +6100,11 @@ dependencies = [ "web-time", ] -[[package]] -name = "sp1-cuda" -version = "1.2.0-rc1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e817efa8ac773c56a0522115cb0f44704c1ba358f9db504d63770385be52918f" -dependencies = [ - "bincode", - "ctrlc", - "prost", - "prost-types", - "serde", - "serde_json", - "sp1-core-machine", - "sp1-prover", - "sp1-stark", - "tokio", - "tracing", - "tracing-subscriber", - "twirp-rs", -] - [[package]] name = "sp1-curves" -version = "1.2.0-rc1" +version = "1.2.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bcfa6b9b6291ab3b13bcd24ea9414705cdcaea6a25d0cb014e6f6acedd72509" +checksum = "dc7ed96fa4778645261aee8b641d2be5e99ec793afe2d8cb00a41a2db0392b60" dependencies = [ "curve25519-dalek", "dashu", @@ -6161,9 +6123,9 @@ dependencies = [ [[package]] name = "sp1-derive" -version = "1.2.0-rc1" +version = "1.2.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddb6f5a85805239ba886cd36f371712080e668a1281d953b93df0561fc085a0a" +checksum = "1d2af56e4bbbc1950916a0ae75293cdb79b98992b103b0aa1d9fd3a06fdbcdef" dependencies = [ "proc-macro2", "quote", @@ -6185,9 +6147,9 @@ dependencies = [ [[package]] name = "sp1-lib" -version = "1.2.0-rc1" +version = "1.2.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f600a97b145e66f0f5e56595527c359f5cc8cb1f9dc8a6da1ba34bb845c9d1e" +checksum = "b85660c40c7b40a65c706816d9157ef1b084099a80275c9b4d650f53067e667f" dependencies = [ "anyhow", "bincode", @@ -6199,9 +6161,9 @@ dependencies = [ [[package]] name = "sp1-primitives" -version = "1.2.0-rc1" +version = "1.2.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ca81d652375947f93636e0acfa89ffff7ad74531974d9b0c5c77ee6b74d3ec" +checksum = "c7180d57586adfe1d212ffddd044a179415823ccaeaddfeb17788c627135fb2c" dependencies = [ "itertools 0.13.0", "lazy_static", @@ -6213,9 +6175,9 @@ dependencies = [ [[package]] name = "sp1-prover" -version = "1.2.0-rc1" +version = "1.2.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c583b70271b8e9b29a2d8cc81237c9150e5668f3ea30f6e1b3b64f043d190632" +checksum = "e3d88a36d8c81777af8a45ffa4e95bd7cda7426f23b3196c2b1073c82ff8d916" dependencies = [ "anyhow", "bincode", @@ -6253,9 +6215,9 @@ dependencies = [ [[package]] name = "sp1-recursion-circuit" -version = "1.2.0-rc1" +version = "1.2.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d52b699642e3f56099fe7b731cc55f269c44150c95d9ce772b9bbbe14e7320" +checksum = "96b6b4bee94645ef4d22d7bd75728823efcc15f408b190ebedbd45bf0b68ce15" dependencies = [ "bincode", "itertools 0.13.0", @@ -6278,9 +6240,9 @@ dependencies = [ [[package]] name = "sp1-recursion-compiler" -version = "1.2.0-rc1" +version = "1.2.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6996298c6a55ba2742e20937b44c2eca49c698ef23735f24e310da85b264e22a" +checksum = "1909d329420a602889c2ab0ee2ecc3513de5aa23a8d036fc7015f03ea1e3defa" dependencies = [ "backtrace", "itertools 0.13.0", @@ -6308,9 +6270,9 @@ dependencies = [ [[package]] name = "sp1-recursion-core" -version = "1.2.0-rc1" +version = "1.2.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e426a4215dfc57398b4ec0a1de244d84ffa627443da5aa044420beb4a8ebde6c" +checksum = "00e846f994800afd84b7cead471a5b2e804f0e38f965497cdceb93fad8e33608" dependencies = [ "arrayref", "backtrace", @@ -6346,9 +6308,9 @@ dependencies = [ [[package]] name = "sp1-recursion-core-v2" -version = "1.2.0-rc1" +version = "1.2.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3597f842c4b16778fca5b2ab972b308bcce0c6ca50633e88d2804a5a6bb936c" +checksum = "eb7e2d95d154217cd7b73ec9d7b57fea830b9c2c2fc2d6cd576f0ca195814772" dependencies = [ "arrayref", "backtrace", @@ -6387,9 +6349,9 @@ dependencies = [ [[package]] name = "sp1-recursion-derive" -version = "1.2.0-rc1" +version = "1.2.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ad893a3082bc0142fbc4c51965af25e6c6214dcd37bf285cb481c9ceed7bce2" +checksum = "4deb8da6b6c57599071a8d1730e2af5b3922a85a77470513b14ba0f8d9da9960" dependencies = [ "proc-macro2", "quote", @@ -6398,9 +6360,9 @@ dependencies = [ [[package]] name = "sp1-recursion-gnark-ffi" -version = "1.2.0-rc1" +version = "1.2.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3307cb27b8fab5d8b769bfaa4eaaa2c1e62224cbed0eb0426327635ca1db6a81" +checksum = "07a699e5e619a9c50eb98eab1a2dd19c3db46879aa792965f3cc869f46d6b4d8" dependencies = [ "anyhow", "bincode", @@ -6425,9 +6387,9 @@ dependencies = [ [[package]] name = "sp1-recursion-program" -version = "1.2.0-rc1" +version = "1.2.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8675f1f3f0ecd18748215a8c1ea47974523d3289ae1f64117cd259b5d85d7a8" +checksum = "dea81ce0e6be0ceabf421d10239ca6c439a0f3e88ef4d441f07102870075e6c8" dependencies = [ "itertools 0.13.0", "p3-air", @@ -6457,19 +6419,19 @@ dependencies = [ [[package]] name = "sp1-sdk" -version = "1.2.0-rc1" +version = "1.2.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10be778e6b4030feabe5ecda6c8b617cae8d6c4a77db9c2e836f2c1e78f75a1c" +checksum = "57811a47cbd84f6e1ba7a3f8686f557bbc028a3f82b3515bad0e8f3d0870f5cf" dependencies = [ "alloy-sol-types", "anyhow", "async-trait", - "axum", "bincode", "cfg-if", "dirs", "ethers", "futures", + "getrandom", "hashbrown 0.14.5", "hex", "indicatif", @@ -6488,7 +6450,6 @@ dependencies = [ "sha2", "sp1-core-executor", "sp1-core-machine", - "sp1-cuda", "sp1-prover", "sp1-stark", "strum", @@ -6504,11 +6465,12 @@ dependencies = [ [[package]] name = "sp1-stark" -version = "1.2.0-rc1" +version = "1.2.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d15e06e3cb60d88c3c4fc66d17713d69cfd8c1338c67519466322e0d15f10168" +checksum = "07d42c13ddf7d37fa00edd58f772cda13a85d7c6d5a3293d6933c35b3b7d7e9e" dependencies = [ "arrayref", + "getrandom", "hashbrown 0.14.5", "itertools 0.13.0", "p3-air", @@ -6534,9 +6496,9 @@ dependencies = [ [[package]] name = "sp1-zkvm" -version = "1.2.0-rc1" +version = "1.2.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e2045ac8427c677bd1285b1d9eeccc29a54ee952bb38eff83151894376097" +checksum = "3abb3d72cb37e4cb7fc5a687d5ce55edefcec5e5a2378eb04cd682919cb71c7c" dependencies = [ "bincode", "cfg-if", @@ -6549,7 +6511,7 @@ dependencies = [ "rand", "serde", "sha2", - "sp1-lib 1.2.0-rc1", + "sp1-lib 1.2.0-rc2", "sp1-primitives", ] @@ -6564,7 +6526,7 @@ dependencies = [ "group 0.13.0", "pairing 0.23.0", "rand_core", - "sp1-lib 1.2.0-rc1", + "sp1-lib 1.2.0-rc2", "subtle", ] @@ -6681,9 +6643,9 @@ dependencies = [ [[package]] name = "superchain-primitives" -version = "0.2.2" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92c0bb828219b159e625b816e9248adafb028eabb86917b0dfbca9c658c0990" +checksum = "aa28a95195192539fa2a3ff607057b08c6ad0839b9edb2aff17917c93c42d661" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6918,9 +6880,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.39.3" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes", @@ -7034,7 +6996,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.4.0", + "indexmap 2.5.0", "toml_datetime", "winnow 0.5.40", ] @@ -7045,7 +7007,7 @@ version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ - "indexmap 2.4.0", + "indexmap 2.5.0", "serde", "serde_spanned", "toml_datetime", @@ -7523,9 +7485,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.3" +version = "0.26.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" +checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" dependencies = [ "rustls-pki-types", ] @@ -7570,7 +7532,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.48.0", ] [[package]] @@ -7815,7 +7777,7 @@ dependencies = [ "js-sys", "log", "pharos", - "rustc_version 0.4.0", + "rustc_version 0.4.1", "send_wrapper 0.6.0", "thiserror", "wasm-bindgen", @@ -7899,23 +7861,3 @@ dependencies = [ "sha3", "subtle", ] - -[[package]] -name = "zkvm-host" -version = "0.1.0" -dependencies = [ - "anyhow", - "cargo_metadata", - "clap", - "csv", - "dotenv", - "kona-host", - "log", - "num-format", - "op-succinct-client-utils", - "op-succinct-host-utils", - "revm", - "sp1-build", - "sp1-sdk", - "tokio", -] diff --git a/Cargo.toml b/Cargo.toml index 986a5f4e..42baf699 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,8 +2,7 @@ members = [ "utils/*", "programs/*", - "native-host", - "zkvm-host", + "scripts/*", "proposer/succinct", ] resolver = "2" @@ -19,6 +18,8 @@ repository = "" # kona # TODO: Change to stable tag when released. +# Note: Explicitly needed to downgrade superchain-primitives to 0.3.1. +# cargo update -p superchain-primitives@0.3.2 --precise 0.3.1 kona-common = { git = "https://github.com/ethereum-optimism/kona", branch = "main" } kona-common-proc = { git = "https://github.com/ethereum-optimism/kona", branch = "main" } kona-preimage = { git = "https://github.com/ethereum-optimism/kona", branch = "main", features = [ @@ -58,9 +59,10 @@ rkyv = "0.7.44" hex = "0.4.3" # local +op-succinct-prove = { path = "scripts/prove" } +op-succinct-witnessgen = { path = "scripts/witnessgen" } op-succinct-client-utils = { path = "utils/client" } op-succinct-host-utils = { path = "utils/host" } -zkvm-host = { path = "zkvm-host" } op-succinct-proposer = { path = "proposer/succinct" } # ethereum diff --git a/proposer/succinct/Dockerfile.server b/proposer/succinct/Dockerfile.server index 50d5a15c..7d0f562d 100644 --- a/proposer/succinct/Dockerfile.server +++ b/proposer/succinct/Dockerfile.server @@ -27,9 +27,9 @@ RUN curl -L https://sp1.succinct.xyz | bash && \ # Copy the relevant OP Succinct server files. COPY Cargo.toml Cargo.lock ./ -COPY zkvm-host ./zkvm-host +COPY scripts/prove ./scripts/prove COPY proposer/succinct ./proposer/succinct -COPY native-host ./native-host +COPY scripts/witnessgen ./scripts/witnessgen COPY elf ./elf COPY utils ./utils COPY programs ./programs diff --git a/zkvm-host/CYCLE_COUNT.md b/scripts/prove/CYCLE_COUNT.md similarity index 100% rename from zkvm-host/CYCLE_COUNT.md rename to scripts/prove/CYCLE_COUNT.md diff --git a/zkvm-host/Cargo.toml b/scripts/prove/Cargo.toml similarity index 96% rename from zkvm-host/Cargo.toml rename to scripts/prove/Cargo.toml index c3b9c129..42bf0f62 100644 --- a/zkvm-host/Cargo.toml +++ b/scripts/prove/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "zkvm-host" +name = "op-succinct-prove" version = "0.1.0" edition.workspace = true license.workspace = true diff --git a/zkvm-host/bin/agg.rs b/scripts/prove/bin/agg.rs similarity index 95% rename from zkvm-host/bin/agg.rs rename to scripts/prove/bin/agg.rs index b11bb978..559d7603 100644 --- a/zkvm-host/bin/agg.rs +++ b/scripts/prove/bin/agg.rs @@ -10,8 +10,8 @@ use op_succinct_host_utils::{ }; use sp1_sdk::{utils, HashableKey, ProverClient, SP1Proof, SP1ProofWithPublicValues}; -pub const AGG_ELF: &[u8] = include_bytes!("../../elf/aggregation-elf"); -pub const MULTI_BLOCK_ELF: &[u8] = include_bytes!("../../elf/range-elf"); +pub const AGG_ELF: &[u8] = include_bytes!("../../../elf/aggregation-elf"); +pub const MULTI_BLOCK_ELF: &[u8] = include_bytes!("../../../elf/range-elf"); #[derive(Parser, Debug)] #[command(author, version, about, long_about = None)] diff --git a/zkvm-host/bin/multi.rs b/scripts/prove/bin/multi.rs similarity index 97% rename from zkvm-host/bin/multi.rs rename to scripts/prove/bin/multi.rs index 8d8ea065..27c331d6 100644 --- a/zkvm-host/bin/multi.rs +++ b/scripts/prove/bin/multi.rs @@ -11,7 +11,7 @@ use op_succinct_host_utils::{ }; use sp1_sdk::{utils, ProverClient}; -pub const MULTI_BLOCK_ELF: &[u8] = include_bytes!("../../elf/range-elf"); +pub const MULTI_BLOCK_ELF: &[u8] = include_bytes!("../../../elf/range-elf"); #[derive(Parser, Debug)] #[command(author, version, about, long_about = None)] diff --git a/zkvm-host/bin/single.rs b/scripts/prove/bin/single.rs similarity index 95% rename from zkvm-host/bin/single.rs rename to scripts/prove/bin/single.rs index 3e00be55..704e5c99 100644 --- a/zkvm-host/bin/single.rs +++ b/scripts/prove/bin/single.rs @@ -7,7 +7,7 @@ use num_format::{Locale, ToFormattedString}; use op_succinct_host_utils::{fetcher::OPSuccinctDataFetcher, get_proof_stdin, ProgramType}; use sp1_sdk::{utils, ProverClient}; -pub const SINGLE_BLOCK_ELF: &[u8] = include_bytes!("../../elf/fault-proof-elf"); +pub const SINGLE_BLOCK_ELF: &[u8] = include_bytes!("../../../elf/fault-proof-elf"); #[derive(Parser, Debug)] #[command(author, version, about, long_about = None)] diff --git a/zkvm-host/build.rs b/scripts/prove/build.rs similarity index 100% rename from zkvm-host/build.rs rename to scripts/prove/build.rs diff --git a/native-host/Cargo.toml b/scripts/witnessgen/Cargo.toml similarity index 92% rename from native-host/Cargo.toml rename to scripts/witnessgen/Cargo.toml index 40d8f81c..2515f4ca 100644 --- a/native-host/Cargo.toml +++ b/scripts/witnessgen/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "native-host" +name = "op-succinct-witnessgen" version = "0.1.0" license.workspace = true edition.workspace = true diff --git a/native-host/bin/native_host_runner.rs b/scripts/witnessgen/bin/native_host_runner.rs similarity index 100% rename from native-host/bin/native_host_runner.rs rename to scripts/witnessgen/bin/native_host_runner.rs diff --git a/native-host/src/main.rs b/scripts/witnessgen/src/main.rs similarity index 100% rename from native-host/src/main.rs rename to scripts/witnessgen/src/main.rs