diff --git a/Cargo.lock b/Cargo.lock index 96825e47..88171e0d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -60,7 +60,7 @@ dependencies = [ "op-succinct-client-utils", "serde_cbor", "sha2", - "sp1-lib 3.0.0-rc3 (registry+https://github.com/rust-lang/crates.io-index)", + "sp1-lib 3.0.0", "sp1-zkvm", ] @@ -1194,6 +1194,24 @@ dependencies = [ "itertools 0.12.1", "lazy_static", "lazycell", + "proc-macro2", + "quote", + "regex", + "rustc-hash 1.1.0", + "shlex", + "syn 2.0.79", +] + +[[package]] +name = "bindgen" +version = "0.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f" +dependencies = [ + "bitflags 2.6.0", + "cexpr", + "clang-sys", + "itertools 0.13.0", "log", "prettyplease", "proc-macro2", @@ -1202,7 +1220,6 @@ dependencies = [ "rustc-hash 1.1.0", "shlex", "syn 2.0.79", - "which", ] [[package]] @@ -2069,7 +2086,7 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] name = "ecdsa" version = "0.16.8" -source = "git+https://github.com/sp1-patches/signatures?branch=ratan/secp256k1-add-fixes-v0.16.8#cdeab4f0ed0d715ceae3fc6d09d16ec3ae41ead7" +source = "git+https://github.com/sp1-patches/signatures?branch=patch-ecdsa-v0.16.8#aad9626d51e830729969220eee44de082ff97d53" dependencies = [ "anyhow", "cfg-if", @@ -2079,7 +2096,7 @@ dependencies = [ "hex-literal", "rfc6979", "signature", - "sp1-lib 3.0.0-rc3 (git+https://github.com/succinctlabs/sp1.git?branch=tamir/v1.3.0-rc2)", + "sp1-lib 3.0.0", "spki", ] @@ -2968,15 +2985,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "home" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" -dependencies = [ - "windows-sys 0.52.0", -] - [[package]] name = "http" version = "0.2.12" @@ -3708,7 +3716,7 @@ version = "0.16.0+8.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce3d60bc059831dc1c83903fb45c103f75db65c5a7bf22272764d9cc683e348c" dependencies = [ - "bindgen", + "bindgen 0.69.5", "bzip2-sys", "cc", "glob", @@ -5576,7 +5584,7 @@ dependencies = [ [[package]] name = "rfc6979" version = "0.4.0" -source = "git+https://github.com/sp1-patches/signatures?branch=ratan/secp256k1-add-fixes-v0.16.8#cdeab4f0ed0d715ceae3fc6d09d16ec3ae41ead7" +source = "git+https://github.com/sp1-patches/signatures?branch=patch-ecdsa-v0.16.8#aad9626d51e830729969220eee44de082ff97d53" dependencies = [ "hmac", "subtle", @@ -6324,9 +6332,9 @@ dependencies = [ [[package]] name = "sp1-core-executor" -version = "3.0.0-rc3" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcf4d12fdcdb59632dbb8491e9f1ed5090de774b46cb5ef26ce5fcd4d024e3e" +checksum = "1ff9718f87f207404aee3f447c4438e2a35791092dc24ce65ff95db699ed49c1" dependencies = [ "bincode", "bytemuck", @@ -6358,9 +6366,9 @@ dependencies = [ [[package]] name = "sp1-core-machine" -version = "3.0.0-rc3" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a6f7b232d011a2db7a314d53ee37ef79e60c2e282e4c249c9b91041e4ff88ec" +checksum = "7ac8b5f2cecb7b2174495fc7a3e004bdb78e1c7ea44577ac0acc0d1e90b817ea" dependencies = [ "bincode", "cfg-if", @@ -6406,9 +6414,9 @@ dependencies = [ [[package]] name = "sp1-curves" -version = "3.0.0-rc3" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1c2c7fb1a24a9dcd06ffc26c4377056163cba55d47b973b19eec81442217f57" +checksum = "f1af9ff15e524ebe58286d7ee9bc345657b45b13091b5dc58fdce61542b65a47" dependencies = [ "cfg-if", "curve25519-dalek", @@ -6428,9 +6436,9 @@ dependencies = [ [[package]] name = "sp1-derive" -version = "3.0.0-rc3" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6c88b3e7ead9192679bf2ef5b0c28b6e7b9a56f929bd76851820e5e5b947bb" +checksum = "5f1490c07bd283f59169eae6e67df355b5de8ba10cc75bf6dbfc05a28fdccfc6" dependencies = [ "quote", "syn 1.0.109", @@ -6465,18 +6473,9 @@ dependencies = [ [[package]] name = "sp1-lib" -version = "3.0.0-rc3" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd5835b93e7be1840ac075bf16ddc9235a7be122e2209cf3ad3e1cb0f50353f8" -dependencies = [ - "bincode", - "serde", -] - -[[package]] -name = "sp1-lib" -version = "3.0.0-rc3" -source = "git+https://github.com/succinctlabs/sp1.git?branch=tamir/v1.3.0-rc2#d900b661e552c4cb87cd6dee56bee73d809fb426" +checksum = "9c372b16988e765af85ccf958b18b26d89c05886f2592d313a285415dcc769cb" dependencies = [ "bincode", "serde", @@ -6484,9 +6483,9 @@ dependencies = [ [[package]] name = "sp1-primitives" -version = "3.0.0-rc3" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2567220b2d8170a0c42eba514dec66b76c5c87927c9a3232ee53a56310acee72" +checksum = "025f06b633588e246308ad5f67b32f0f7d1cbeab38f7a842314699270bc706f5" dependencies = [ "bincode", "hex", @@ -6502,9 +6501,9 @@ dependencies = [ [[package]] name = "sp1-prover" -version = "3.0.0-rc3" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb59f305b4768a441049f46bc52e0d1edfd2d3179d65a3440f7396baa74e1bda" +checksum = "1bd16530cb12f1cecb1b6902142d8d0d87507f88de84bc714f10c29a7fd3769c" dependencies = [ "anyhow", "bincode", @@ -6544,9 +6543,9 @@ dependencies = [ [[package]] name = "sp1-recursion-circuit" -version = "3.0.0-rc3" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08f45e8fa3caf412251a730cdad04b36285e745a6c1b409d865bae3338a5196" +checksum = "98d0a8ceee12600bd14d2e2d31b54db00b7985e30acedbfe8e1c1a9e41d7992f" dependencies = [ "hashbrown 0.14.5", "itertools 0.13.0", @@ -6578,9 +6577,9 @@ dependencies = [ [[package]] name = "sp1-recursion-compiler" -version = "3.0.0-rc3" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "648941453ab9e8c69386df5cd660dedabe4d06c041450d8a2548ba6cefa6ed45" +checksum = "591d60768948dcef34a1fc16c3c6cf457e32fdee83d55ec14dbb94cd4447c030" dependencies = [ "backtrace", "itertools 0.13.0", @@ -6600,9 +6599,9 @@ dependencies = [ [[package]] name = "sp1-recursion-core" -version = "3.0.0-rc3" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faf8c5dc0a2c33ef1dc7da7a137574e4f1783e45489681ca01aa3309abc6adee" +checksum = "85c15a51b675accb41608f7bf7ef5f95c23b47ceac38a9a87833a2b12c3bc190" dependencies = [ "backtrace", "ff 0.13.0", @@ -6636,9 +6635,9 @@ dependencies = [ [[package]] name = "sp1-recursion-derive" -version = "3.0.0-rc3" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7807dc1a72bb7b86f2e82c414cb58b9789d880ca459b2113f7406df814945ae" +checksum = "c5b2aaa03093afb2b0f58379bb4f0d7898344ef1bb8dd326ec02db7125c1a590" dependencies = [ "quote", "syn 1.0.109", @@ -6646,13 +6645,13 @@ dependencies = [ [[package]] name = "sp1-recursion-gnark-ffi" -version = "3.0.0-rc3" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff667dda92cbe2f9382e36fe222641f60a4e794e0a3b6c7597cd6a74d79262d" +checksum = "1a12889c662cf64870e72bb3ba8096f3465bf442f5f179c07b50c86f5c47ce80" dependencies = [ "anyhow", "bincode", - "bindgen", + "bindgen 0.70.1", "cc", "cfg-if", "hex", @@ -6672,9 +6671,9 @@ dependencies = [ [[package]] name = "sp1-sdk" -version = "3.0.0-rc3" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df9a960e85019f30d96a2269bb2faa4982fbc0af784bc7c5998ae5d8ee2ea033" +checksum = "39bab15e962d1218e8ad021b2e9904597d5506d12847ef8be182385d5f3d3a6c" dependencies = [ "alloy-sol-types 0.7.7", "anyhow", @@ -6713,9 +6712,9 @@ dependencies = [ [[package]] name = "sp1-stark" -version = "3.0.0-rc3" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba8706930d1d65aa645d194b175f6c4c0f47ac7833640b4f46cf4da5964d2d1d" +checksum = "ec27b60e797a52eed7af54e032498edcaf8f1ab0649077cbaa6f146a740380dd" dependencies = [ "arrayref", "getrandom", @@ -6749,9 +6748,9 @@ dependencies = [ [[package]] name = "sp1-zkvm" -version = "3.0.0-rc3" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58c61090e56fa9f05e38295d39cb74e49391da007a05cc2f92681d7179776f7d" +checksum = "ce08dc324dade0709260b01c76c8eeb665f2ef7c652c2002e2edf5a492ded7f1" dependencies = [ "cfg-if", "getrandom", @@ -6761,7 +6760,7 @@ dependencies = [ "p3-field", "rand", "sha2", - "sp1-lib 3.0.0-rc3 (registry+https://github.com/rust-lang/crates.io-index)", + "sp1-lib 3.0.0", "sp1-primitives", ] @@ -7751,18 +7750,6 @@ dependencies = [ "rustls-pki-types", ] -[[package]] -name = "which" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -dependencies = [ - "either", - "home", - "once_cell", - "rustix", -] - [[package]] name = "widestring" version = "1.1.0" diff --git a/Cargo.toml b/Cargo.toml index d3f7d9f8..13732dce 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -81,10 +81,10 @@ op-alloy-rpc-types-engine = { version = "0.4.0", default-features = false } op-alloy-network = { version = "0.4.0", default-features = false } # sp1 -sp1-lib = { version = "3.0.0-rc3", features = ["verify"] } -sp1-zkvm = { version = "3.0.0-rc3", features = ["verify"] } -sp1-sdk = { version = "3.0.0-rc3" } -sp1-build = { version = "3.0.0-rc3" } +sp1-lib = { version = "3.0.0", features = ["verify"] } +sp1-zkvm = { version = "3.0.0", features = ["verify"] } +sp1-sdk = { version = "3.0.0" } +sp1-build = { version = "3.0.0" } [profile.release-client-lto] inherits = "release" @@ -95,7 +95,6 @@ lto = "fat" [patch.crates-io] tiny-keccak = { git = "https://github.com/sp1-patches/tiny-keccak", branch = "patch-v2.0.2" } sha2 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", branch = "patch-sha2-v0.10.8" } -# TODO: Update this to patch-ecdsa-v0.16.8 when updating SP1 to v3.0.0. -ecdsa = { git = "https://github.com/sp1-patches/signatures", branch = "ratan/secp256k1-add-fixes-v0.16.8" } +ecdsa = { git = "https://github.com/sp1-patches/signatures", branch = "patch-ecdsa-v0.16.8" } bn = { git = "https://github.com/0xWOLAND/bn.git", package = "substrate-bn" } sha3 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha3", branch = "patch-sha3-v0.10.8" } diff --git a/contracts/opsuccinctl2ooconfig.json b/contracts/opsuccinctl2ooconfig.json index a3ddc6dc..fc188d3c 100644 --- a/contracts/opsuccinctl2ooconfig.json +++ b/contracts/opsuccinctl2ooconfig.json @@ -1,14 +1,14 @@ { "challenger": "0x0000000000000000000000000000000000000000", "finalizationPeriod": 0, - "l2BlockTime": 2, + "l2BlockTime": 10, "proposer": "0xDEd0000E32f8F40414d3ab3a830f735a3553E18e", - "rollupConfigHash": "0x8dad3aa88de72762859feb6781d937efa8f39c8b681a51443b0abfde108fbbcd", - "startingBlockNumber": 3730147, - "startingOutputRoot": "0xf407882134911ff651913f160094a25432595681e8d80780beb0d3bab091cd75", - "startingTimestamp": 1729812782, - "submissionInterval": 10, + "rollupConfigHash": "0x7ca9e1e9829e0e28c934debd1adab0592b4a906d48b01d750ec46c02d09ad833", + "startingBlockNumber": 189844, + "startingOutputRoot": "0x349580265330723772a762b228da0b4f2488d8aa89e3716a47e4ab3e23e018f8", + "startingTimestamp": 1729904164, + "submissionInterval": 1200, "verifierGateway": "0x3B6041173B80E77f038f3F2C0f9744f04837185e", - "aggregationVkey": "0x005b650a80bf636cca3ec505db06e8feed106518ddb60ddc676ba2a60b3d996e", - "rangeVkeyCommitment": "0x65f38ee76137657870e8ea9c700ba929050206996b86e596264399302636ecde" + "aggregationVkey": "0x00bc1916ee812b6de22411eb6f13b36b05ae09845535c99cb0f27176674c3064", + "rangeVkeyCommitment": "0x05d515a12d9e84e55ae64bf9427d2dc63f32b97841cf0fe822c67d1b31238624" } \ No newline at end of file diff --git a/elf/aggregation-elf b/elf/aggregation-elf index 5519fbeb..690179db 100755 Binary files a/elf/aggregation-elf and b/elf/aggregation-elf differ diff --git a/elf/fault-proof-elf b/elf/fault-proof-elf index 937d54dd..abc291bb 100755 Binary files a/elf/fault-proof-elf and b/elf/fault-proof-elf differ diff --git a/elf/range-elf b/elf/range-elf index 21c13e68..1916c67a 100755 Binary files a/elf/range-elf and b/elf/range-elf differ diff --git a/scripts/utils/Cargo.toml b/scripts/utils/Cargo.toml index 35eb7a2b..60197ef2 100644 --- a/scripts/utils/Cargo.toml +++ b/scripts/utils/Cargo.toml @@ -11,10 +11,6 @@ homepage.workspace = true name = "fetch-and-save-proof" path = "bin/fetch_and_save_proof.rs" -[[bin]] -name = "update-vkeys" -path = "bin/update_vkeys.rs" - [[bin]] name = "vkey" path = "bin/vkey.rs"