diff --git a/Cargo.lock b/Cargo.lock index 9d80ef5a4..a6c276b97 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -39,7 +39,7 @@ dependencies = [ "op-succinct-client-utils", "serde_cbor", "sha2", - "sp1-lib 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp1-lib", "sp1-zkvm", ] @@ -1253,6 +1253,12 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + [[package]] name = "base64" version = "0.21.7" @@ -1515,6 +1521,20 @@ name = "bytemuck" version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b37c88a63ffd85d15b406896cc343916d7cf57838a847b3a6f2ca5d39a5695a" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fa76293b4f7bb636ab88fd78228235b5248b4d05cc589aed610f954af5d7c7a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] [[package]] name = "byteorder" @@ -1713,10 +1733,16 @@ dependencies = [ "encode_unicode", "libc", "once_cell", - "unicode-width", + "unicode-width 0.2.0", "windows-sys 0.59.0", ] +[[package]] +name = "const-default" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b396d1f76d455557e1218ec8066ae14bba60b4b36ecd55577ba979f5db7ecaa" + [[package]] name = "const-hex" version = "1.14.0" @@ -1777,6 +1803,12 @@ dependencies = [ "libc", ] +[[package]] +name = "critical-section" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b" + [[package]] name = "crossbeam-deque" version = "0.8.6" @@ -2133,7 +2165,7 @@ dependencies = [ "hex-literal", "rfc6979", "signature", - "sp1-lib 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp1-lib", "spki", ] @@ -2168,6 +2200,18 @@ dependencies = [ "zeroize", ] +[[package]] +name = "embedded-alloc" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f2de9133f68db0d4627ad69db767726c99ff8585272716708227008d3f1bddd" +dependencies = [ + "const-default", + "critical-section", + "linked_list_allocator", + "rlsf", +] + [[package]] name = "encode_unicode" version = "1.0.0" @@ -3104,7 +3148,7 @@ dependencies = [ "console", "number_prefix", "portable-atomic", - "unicode-width", + "unicode-width 0.2.0", "web-time", ] @@ -3246,6 +3290,7 @@ dependencies = [ [[package]] name = "kona-client" version = "0.1.0" +source = "git+https://github.com/succinctlabs/kona?rev=8ec836eae1cfe2ebad4624ae4f29839011382425#8ec836eae1cfe2ebad4624ae4f29839011382425" dependencies = [ "alloy-consensus 0.6.4", "alloy-eips 0.6.4", @@ -3278,6 +3323,7 @@ dependencies = [ [[package]] name = "kona-common" version = "0.1.0" +source = "git+https://github.com/succinctlabs/kona?rev=8ec836eae1cfe2ebad4624ae4f29839011382425#8ec836eae1cfe2ebad4624ae4f29839011382425" dependencies = [ "cfg-if", "linked_list_allocator", @@ -3287,6 +3333,7 @@ dependencies = [ [[package]] name = "kona-common-proc" version = "0.1.0" +source = "git+https://github.com/succinctlabs/kona?rev=8ec836eae1cfe2ebad4624ae4f29839011382425#8ec836eae1cfe2ebad4624ae4f29839011382425" dependencies = [ "anyhow", "cfg-if", @@ -3299,6 +3346,7 @@ dependencies = [ [[package]] name = "kona-derive" version = "0.1.0" +source = "git+https://github.com/succinctlabs/kona?rev=8ec836eae1cfe2ebad4624ae4f29839011382425#8ec836eae1cfe2ebad4624ae4f29839011382425" dependencies = [ "alloy-consensus 0.6.4", "alloy-eips 0.6.4", @@ -3317,6 +3365,7 @@ dependencies = [ [[package]] name = "kona-driver" version = "0.1.0" +source = "git+https://github.com/succinctlabs/kona?rev=8ec836eae1cfe2ebad4624ae4f29839011382425#8ec836eae1cfe2ebad4624ae4f29839011382425" dependencies = [ "alloy-consensus 0.6.4", "alloy-primitives", @@ -3334,6 +3383,7 @@ dependencies = [ [[package]] name = "kona-executor" version = "0.1.0" +source = "git+https://github.com/succinctlabs/kona?rev=8ec836eae1cfe2ebad4624ae4f29839011382425#8ec836eae1cfe2ebad4624ae4f29839011382425" dependencies = [ "alloy-consensus 0.6.4", "alloy-eips 0.6.4", @@ -3351,6 +3401,7 @@ dependencies = [ [[package]] name = "kona-host" version = "0.1.0" +source = "git+https://github.com/succinctlabs/kona?rev=8ec836eae1cfe2ebad4624ae4f29839011382425#8ec836eae1cfe2ebad4624ae4f29839011382425" dependencies = [ "alloy-consensus 0.6.4", "alloy-eips 0.6.4", @@ -3389,6 +3440,7 @@ dependencies = [ [[package]] name = "kona-mpt" version = "0.1.0" +source = "git+https://github.com/succinctlabs/kona?rev=8ec836eae1cfe2ebad4624ae4f29839011382425#8ec836eae1cfe2ebad4624ae4f29839011382425" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -3400,6 +3452,7 @@ dependencies = [ [[package]] name = "kona-preimage" version = "0.1.0" +source = "git+https://github.com/succinctlabs/kona?rev=8ec836eae1cfe2ebad4624ae4f29839011382425#8ec836eae1cfe2ebad4624ae4f29839011382425" dependencies = [ "alloy-primitives", "async-trait", @@ -3411,6 +3464,7 @@ dependencies = [ [[package]] name = "kona-proof" version = "0.1.0" +source = "git+https://github.com/succinctlabs/kona?rev=8ec836eae1cfe2ebad4624ae4f29839011382425#8ec836eae1cfe2ebad4624ae4f29839011382425" dependencies = [ "alloy-consensus 0.6.4", "alloy-eips 0.6.4", @@ -5468,6 +5522,18 @@ dependencies = [ "rustc-hex", ] +[[package]] +name = "rlsf" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "222fb240c3286247ecdee6fa5341e7cdad0ffdf8e7e401d9937f2d58482a20bf" +dependencies = [ + "cfg-if", + "const-default", + "libc", + "svgbobdoc", +] + [[package]] name = "rocksdb" version = "0.22.0" @@ -5993,8 +6059,7 @@ dependencies = [ [[package]] name = "sha3" version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" +source = "git+https://github.com/sp1-patches/RustCrypto-hashes?tag=sha3-v0.10.8-patch-v1#8f6d303c0861ba7e5adcc36207c0f41fe5edaabc" dependencies = [ "digest 0.10.7", "keccak", @@ -6110,7 +6175,7 @@ dependencies = [ [[package]] name = "sp1-build" version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?rev=f0b61cf262388c1be7edfcf984c8e070064e980f#f0b61cf262388c1be7edfcf984c8e070064e980f" +source = "git+https://github.com/succinctlabs/sp1.git?rev=81ff92223d7eaf073064beb853601a0511f63e04#81ff92223d7eaf073064beb853601a0511f63e04" dependencies = [ "anyhow", "cargo_metadata", @@ -6122,7 +6187,7 @@ dependencies = [ [[package]] name = "sp1-core-executor" version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?rev=f0b61cf262388c1be7edfcf984c8e070064e980f#f0b61cf262388c1be7edfcf984c8e070064e980f" +source = "git+https://github.com/succinctlabs/sp1.git?rev=81ff92223d7eaf073064beb853601a0511f63e04#81ff92223d7eaf073064beb853601a0511f63e04" dependencies = [ "bincode", "bytemuck", @@ -6141,7 +6206,7 @@ dependencies = [ "rrs-succinct", "serde", "sp1-curves", - "sp1-primitives 3.4.0 (git+https://github.com/succinctlabs/sp1.git?rev=f0b61cf262388c1be7edfcf984c8e070064e980f)", + "sp1-primitives 3.4.0 (git+https://github.com/succinctlabs/sp1.git?rev=81ff92223d7eaf073064beb853601a0511f63e04)", "sp1-stark", "strum", "strum_macros", @@ -6155,7 +6220,7 @@ dependencies = [ [[package]] name = "sp1-core-machine" version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?rev=f0b61cf262388c1be7edfcf984c8e070064e980f#f0b61cf262388c1be7edfcf984c8e070064e980f" +source = "git+https://github.com/succinctlabs/sp1.git?rev=81ff92223d7eaf073064beb853601a0511f63e04#81ff92223d7eaf073064beb853601a0511f63e04" dependencies = [ "bincode", "cfg-if", @@ -6185,7 +6250,7 @@ dependencies = [ "sp1-core-executor", "sp1-curves", "sp1-derive", - "sp1-primitives 3.4.0 (git+https://github.com/succinctlabs/sp1.git?rev=f0b61cf262388c1be7edfcf984c8e070064e980f)", + "sp1-primitives 3.4.0 (git+https://github.com/succinctlabs/sp1.git?rev=81ff92223d7eaf073064beb853601a0511f63e04)", "sp1-stark", "static_assertions", "strum", @@ -6202,7 +6267,7 @@ dependencies = [ [[package]] name = "sp1-curves" version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?rev=f0b61cf262388c1be7edfcf984c8e070064e980f#f0b61cf262388c1be7edfcf984c8e070064e980f" +source = "git+https://github.com/succinctlabs/sp1.git?rev=81ff92223d7eaf073064beb853601a0511f63e04#81ff92223d7eaf073064beb853601a0511f63e04" dependencies = [ "cfg-if", "dashu", @@ -6214,7 +6279,7 @@ dependencies = [ "p3-field", "serde", "snowbridge-amcl", - "sp1-primitives 3.4.0 (git+https://github.com/succinctlabs/sp1.git?rev=f0b61cf262388c1be7edfcf984c8e070064e980f)", + "sp1-primitives 3.4.0 (git+https://github.com/succinctlabs/sp1.git?rev=81ff92223d7eaf073064beb853601a0511f63e04)", "sp1-stark", "typenum", ] @@ -6222,36 +6287,12 @@ dependencies = [ [[package]] name = "sp1-derive" version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?rev=f0b61cf262388c1be7edfcf984c8e070064e980f#f0b61cf262388c1be7edfcf984c8e070064e980f" +source = "git+https://github.com/succinctlabs/sp1.git?rev=81ff92223d7eaf073064beb853601a0511f63e04#81ff92223d7eaf073064beb853601a0511f63e04" dependencies = [ "quote", "syn 1.0.109", ] -[[package]] -name = "sp1-lib" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bea7811abd2d3a991007fcb284f41152840b8388c171288d0c52c6793956609c" -dependencies = [ - "anyhow", - "bincode", - "cfg-if", - "hex", - "serde", - "snowbridge-amcl", -] - -[[package]] -name = "sp1-lib" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5729da1b05d56c01457e5ecabdc77f1cc941df23f2921163a2f325aec22428" -dependencies = [ - "bincode", - "serde", -] - [[package]] name = "sp1-lib" version = "3.4.0" @@ -6281,7 +6322,7 @@ dependencies = [ [[package]] name = "sp1-primitives" version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?rev=f0b61cf262388c1be7edfcf984c8e070064e980f#f0b61cf262388c1be7edfcf984c8e070064e980f" +source = "git+https://github.com/succinctlabs/sp1.git?rev=81ff92223d7eaf073064beb853601a0511f63e04#81ff92223d7eaf073064beb853601a0511f63e04" dependencies = [ "bincode", "hex", @@ -6298,7 +6339,7 @@ dependencies = [ [[package]] name = "sp1-prover" version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?rev=f0b61cf262388c1be7edfcf984c8e070064e980f#f0b61cf262388c1be7edfcf984c8e070064e980f" +source = "git+https://github.com/succinctlabs/sp1.git?rev=81ff92223d7eaf073064beb853601a0511f63e04#81ff92223d7eaf073064beb853601a0511f63e04" dependencies = [ "anyhow", "bincode", @@ -6323,7 +6364,7 @@ dependencies = [ "serial_test", "sp1-core-executor", "sp1-core-machine", - "sp1-primitives 3.4.0 (git+https://github.com/succinctlabs/sp1.git?rev=f0b61cf262388c1be7edfcf984c8e070064e980f)", + "sp1-primitives 3.4.0 (git+https://github.com/succinctlabs/sp1.git?rev=81ff92223d7eaf073064beb853601a0511f63e04)", "sp1-recursion-circuit", "sp1-recursion-compiler", "sp1-recursion-core", @@ -6339,7 +6380,7 @@ dependencies = [ [[package]] name = "sp1-recursion-circuit" version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?rev=f0b61cf262388c1be7edfcf984c8e070064e980f#f0b61cf262388c1be7edfcf984c8e070064e980f" +source = "git+https://github.com/succinctlabs/sp1.git?rev=81ff92223d7eaf073064beb853601a0511f63e04#81ff92223d7eaf073064beb853601a0511f63e04" dependencies = [ "hashbrown 0.14.5", "itertools 0.13.0", @@ -6361,7 +6402,7 @@ dependencies = [ "sp1-core-executor", "sp1-core-machine", "sp1-derive", - "sp1-primitives 3.4.0 (git+https://github.com/succinctlabs/sp1.git?rev=f0b61cf262388c1be7edfcf984c8e070064e980f)", + "sp1-primitives 3.4.0 (git+https://github.com/succinctlabs/sp1.git?rev=81ff92223d7eaf073064beb853601a0511f63e04)", "sp1-recursion-compiler", "sp1-recursion-core", "sp1-recursion-gnark-ffi", @@ -6372,7 +6413,7 @@ dependencies = [ [[package]] name = "sp1-recursion-compiler" version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?rev=f0b61cf262388c1be7edfcf984c8e070064e980f#f0b61cf262388c1be7edfcf984c8e070064e980f" +source = "git+https://github.com/succinctlabs/sp1.git?rev=81ff92223d7eaf073064beb853601a0511f63e04#81ff92223d7eaf073064beb853601a0511f63e04" dependencies = [ "backtrace", "itertools 0.13.0", @@ -6382,7 +6423,7 @@ dependencies = [ "p3-symmetric", "serde", "sp1-core-machine", - "sp1-primitives 3.4.0 (git+https://github.com/succinctlabs/sp1.git?rev=f0b61cf262388c1be7edfcf984c8e070064e980f)", + "sp1-primitives 3.4.0 (git+https://github.com/succinctlabs/sp1.git?rev=81ff92223d7eaf073064beb853601a0511f63e04)", "sp1-recursion-core", "sp1-recursion-derive", "sp1-stark", @@ -6393,7 +6434,7 @@ dependencies = [ [[package]] name = "sp1-recursion-core" version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?rev=f0b61cf262388c1be7edfcf984c8e070064e980f#f0b61cf262388c1be7edfcf984c8e070064e980f" +source = "git+https://github.com/succinctlabs/sp1.git?rev=81ff92223d7eaf073064beb853601a0511f63e04#81ff92223d7eaf073064beb853601a0511f63e04" dependencies = [ "backtrace", "ff 0.13.0", @@ -6416,7 +6457,7 @@ dependencies = [ "serde", "sp1-core-machine", "sp1-derive", - "sp1-primitives 3.4.0 (git+https://github.com/succinctlabs/sp1.git?rev=f0b61cf262388c1be7edfcf984c8e070064e980f)", + "sp1-primitives 3.4.0 (git+https://github.com/succinctlabs/sp1.git?rev=81ff92223d7eaf073064beb853601a0511f63e04)", "sp1-stark", "static_assertions", "thiserror 1.0.69", @@ -6428,7 +6469,7 @@ dependencies = [ [[package]] name = "sp1-recursion-derive" version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?rev=f0b61cf262388c1be7edfcf984c8e070064e980f#f0b61cf262388c1be7edfcf984c8e070064e980f" +source = "git+https://github.com/succinctlabs/sp1.git?rev=81ff92223d7eaf073064beb853601a0511f63e04#81ff92223d7eaf073064beb853601a0511f63e04" dependencies = [ "quote", "syn 1.0.109", @@ -6437,7 +6478,7 @@ dependencies = [ [[package]] name = "sp1-recursion-gnark-ffi" version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?rev=f0b61cf262388c1be7edfcf984c8e070064e980f#f0b61cf262388c1be7edfcf984c8e070064e980f" +source = "git+https://github.com/succinctlabs/sp1.git?rev=81ff92223d7eaf073064beb853601a0511f63e04#81ff92223d7eaf073064beb853601a0511f63e04" dependencies = [ "anyhow", "bincode", @@ -6462,7 +6503,7 @@ dependencies = [ [[package]] name = "sp1-sdk" version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?rev=f0b61cf262388c1be7edfcf984c8e070064e980f#f0b61cf262388c1be7edfcf984c8e070064e980f" +source = "git+https://github.com/succinctlabs/sp1.git?rev=81ff92223d7eaf073064beb853601a0511f63e04#81ff92223d7eaf073064beb853601a0511f63e04" dependencies = [ "alloy-primitives", "alloy-signer 0.5.4", @@ -6488,10 +6529,10 @@ dependencies = [ "reqwest-middleware", "serde", "serde_json", - "sp1-build 3.4.0 (git+https://github.com/succinctlabs/sp1.git?rev=f0b61cf262388c1be7edfcf984c8e070064e980f)", + "sp1-build 3.4.0 (git+https://github.com/succinctlabs/sp1.git?rev=81ff92223d7eaf073064beb853601a0511f63e04)", "sp1-core-executor", "sp1-core-machine", - "sp1-primitives 3.4.0 (git+https://github.com/succinctlabs/sp1.git?rev=f0b61cf262388c1be7edfcf984c8e070064e980f)", + "sp1-primitives 3.4.0 (git+https://github.com/succinctlabs/sp1.git?rev=81ff92223d7eaf073064beb853601a0511f63e04)", "sp1-prover", "sp1-stark", "strum", @@ -6508,7 +6549,7 @@ dependencies = [ [[package]] name = "sp1-stark" version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?rev=f0b61cf262388c1be7edfcf984c8e070064e980f#f0b61cf262388c1be7edfcf984c8e070064e980f" +source = "git+https://github.com/succinctlabs/sp1.git?rev=81ff92223d7eaf073064beb853601a0511f63e04#81ff92223d7eaf073064beb853601a0511f63e04" dependencies = [ "arrayref", "getrandom", @@ -6532,7 +6573,7 @@ dependencies = [ "rayon-scan", "serde", "sp1-derive", - "sp1-primitives 3.4.0 (git+https://github.com/succinctlabs/sp1.git?rev=f0b61cf262388c1be7edfcf984c8e070064e980f)", + "sp1-primitives 3.4.0 (git+https://github.com/succinctlabs/sp1.git?rev=81ff92223d7eaf073064beb853601a0511f63e04)", "strum", "strum_macros", "sysinfo 0.30.13", @@ -6546,6 +6587,8 @@ version = "3.4.0" source = "git+https://github.com/succinctlabs/sp1.git?rev=16431e6b979a617fa08994ccdaf866b22ba4b7a1#16431e6b979a617fa08994ccdaf866b22ba4b7a1" dependencies = [ "cfg-if", + "critical-section", + "embedded-alloc", "getrandom", "lazy_static", "libm", @@ -6553,22 +6596,21 @@ dependencies = [ "p3-field", "rand", "sha2", - "sp1-lib 3.4.0 (git+https://github.com/succinctlabs/sp1.git?rev=16431e6b979a617fa08994ccdaf866b22ba4b7a1)", + "sp1-lib", "sp1-primitives 3.4.0 (git+https://github.com/succinctlabs/sp1.git?rev=16431e6b979a617fa08994ccdaf866b22ba4b7a1)", ] [[package]] name = "sp1_bls12_381" version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27c4b8901334dc09099dd82f80a72ddfc76b0046f4b342584c808f1931bed5a" +source = "git+https://github.com/sp1-patches/bls12_381.git?branch=ratan%2Frename-package#3e3654ad7e4633d78c7b7b107764d89b5b7a2b7c" dependencies = [ "cfg-if", "ff 0.13.0", "group 0.13.0", "pairing 0.23.0", "rand_core", - "sp1-lib 1.2.0", + "sp1-lib", "subtle", ] @@ -6643,14 +6685,17 @@ dependencies = [ [[package]] name = "substrate-bn" version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b5bbfa79abbae15dd642ea8176a21a635ff3c00059961d1ea27ad04e5b441c" +source = "git+https://github.com/sp1-patches/bn?tag=substrate_bn-v0.6.0-patch-v2#8ef05d3969312eca34fa9f1f566a469022badda6" dependencies = [ + "bytemuck", "byteorder", + "cfg-if", "crunchy", "lazy_static", + "num-bigint 0.4.6", "rand", "rustc-hex", + "sp1-lib", ] [[package]] @@ -6668,6 +6713,19 @@ dependencies = [ "zeroize", ] +[[package]] +name = "svgbobdoc" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2c04b93fc15d79b39c63218f15e3fdffaa4c227830686e3b7c5f41244eb3e50" +dependencies = [ + "base64 0.13.1", + "proc-macro2", + "quote", + "syn 1.0.109", + "unicode-width 0.1.14", +] + [[package]] name = "syn" version = "1.0.109" @@ -7318,6 +7376,12 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" +[[package]] +name = "unicode-width" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" + [[package]] name = "unicode-width" version = "0.2.0" diff --git a/Cargo.toml b/Cargo.toml index 6ff495ae9..3afa49a25 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,29 +44,29 @@ tracing-subscriber = { version = "0.3.18", features = ["fmt"] } # kona # Note: Switch to latest version of kona once the std::process::Command issue is resolved. # Branch: patch-kona-proof-v0.1.0 -# kona-common = { git = "https://github.com/succinctlabs/kona", rev = "8ec836eae1cfe2ebad4624ae4f29839011382425" } -# kona-common-proc = { git = "https://github.com/succinctlabs/kona", rev = "8ec836eae1cfe2ebad4624ae4f29839011382425" } -# kona-preimage = { git = "https://github.com/succinctlabs/kona", rev = "8ec836eae1cfe2ebad4624ae4f29839011382425", features = [ -# "rkyv", -# ] } -# kona-mpt = { git = "https://github.com/succinctlabs/kona", rev = "8ec836eae1cfe2ebad4624ae4f29839011382425" } -# kona-driver = { git = "https://github.com/succinctlabs/kona", rev = "8ec836eae1cfe2ebad4624ae4f29839011382425" } -# kona-derive = { git = "https://github.com/succinctlabs/kona", rev = "8ec836eae1cfe2ebad4624ae4f29839011382425", default-features = false } -# kona-executor = { git = "https://github.com/succinctlabs/kona", rev = "8ec836eae1cfe2ebad4624ae4f29839011382425" } -# kona-client = { git = "https://github.com/succinctlabs/kona", rev = "8ec836eae1cfe2ebad4624ae4f29839011382425" } -# kona-host = { git = "https://github.com/succinctlabs/kona", rev = "8ec836eae1cfe2ebad4624ae4f29839011382425" } -# kona-proof = { git = "https://github.com/succinctlabs/kona", rev = "8ec836eae1cfe2ebad4624ae4f29839011382425" } - -kona-common = { path = "../kona/crates/proof-sdk/common" } -kona-common-proc = { path = "../kona/crates/proof-sdk/common-proc" } -kona-preimage = { path = "../kona/crates/proof-sdk/preimage", features = ["rkyv"] } -kona-mpt = { path = "../kona/crates/mpt" } -kona-driver = { path = "../kona/crates/driver" } -kona-derive = { path = "../kona/crates/derive", default-features = false } -kona-executor = { path = "../kona/crates/executor" } -kona-client = { path = "../kona/bin/client" } -kona-host = { path = "../kona/bin/host" } -kona-proof = { path = "../kona/crates/proof-sdk/proof" } +kona-common = { git = "https://github.com/succinctlabs/kona", rev = "8ec836eae1cfe2ebad4624ae4f29839011382425" } +kona-common-proc = { git = "https://github.com/succinctlabs/kona", rev = "8ec836eae1cfe2ebad4624ae4f29839011382425" } +kona-preimage = { git = "https://github.com/succinctlabs/kona", rev = "8ec836eae1cfe2ebad4624ae4f29839011382425", features = [ + "rkyv", +] } +kona-mpt = { git = "https://github.com/succinctlabs/kona", rev = "8ec836eae1cfe2ebad4624ae4f29839011382425" } +kona-driver = { git = "https://github.com/succinctlabs/kona", rev = "8ec836eae1cfe2ebad4624ae4f29839011382425" } +kona-derive = { git = "https://github.com/succinctlabs/kona", rev = "8ec836eae1cfe2ebad4624ae4f29839011382425", default-features = false } +kona-executor = { git = "https://github.com/succinctlabs/kona", rev = "8ec836eae1cfe2ebad4624ae4f29839011382425" } +kona-client = { git = "https://github.com/succinctlabs/kona", rev = "8ec836eae1cfe2ebad4624ae4f29839011382425" } +kona-host = { git = "https://github.com/succinctlabs/kona", rev = "8ec836eae1cfe2ebad4624ae4f29839011382425" } +kona-proof = { git = "https://github.com/succinctlabs/kona", rev = "8ec836eae1cfe2ebad4624ae4f29839011382425" } + +# kona-common = { path = "../kona/crates/proof-sdk/common" } +# kona-common-proc = { path = "../kona/crates/proof-sdk/common-proc" } +# kona-preimage = { path = "../kona/crates/proof-sdk/preimage", features = ["rkyv"] } +# kona-mpt = { path = "../kona/crates/mpt" } +# kona-driver = { path = "../kona/crates/driver" } +# kona-derive = { path = "../kona/crates/derive", default-features = false } +# kona-executor = { path = "../kona/crates/executor" } +# kona-client = { path = "../kona/bin/client" } +# kona-host = { path = "../kona/bin/host" } +# kona-proof = { path = "../kona/crates/proof-sdk/proof" } # op-succinct op-succinct-prove = { path = "scripts/prove" } @@ -79,10 +79,9 @@ op-succinct-proposer = { path = "proposer/succinct" } # Alloy alloy = { version = "0.6.4", default-features = false, features = ["full"] } # Uses sha3 instead of tiny-keccak. Reduces cycle count for Keccak by 50%. -# alloy-primitives = { version = "0.8.12", default-features = false, features = [ -# "sha3-keccak", -# ] } -alloy-primitives = { version = "0.8.12", default-features = false } +alloy-primitives = { version = "0.8.12", default-features = false, features = [ + "sha3-keccak", +] } alloy-rlp = { version = "0.3.8", default-features = false } alloy-eips = { version = "0.6.4", default-features = false } revm = { version = "16.0.0", default-features = false, features = ["kzg-rs"] } @@ -102,14 +101,13 @@ op-alloy-network = { version = "0.6.8", default-features = false } # sp1 sp1-lib = { version = "3.4.0", features = ["verify"] } # Note: This rev includes the SP1 mock groth16 bytes fix, skipping deferred verification, executor opts and network-v2 changes. -# ratan/v3.4.0-with-additions includes the network-v2 changes from `19ae3e1`. Has the latest FD's for ECDSA patch. -sp1-sdk = { git = "https://github.com/succinctlabs/sp1.git", rev = "f0b61cf262388c1be7edfcf984c8e070064e980f", features = [ +# ratan/v3.4.0-with-additions includes the network-v2 changes from `19ae3e1`. Has the latest FD's for ECDSA patch + fp2 executor fixes. +sp1-sdk = { git = "https://github.com/succinctlabs/sp1.git", rev = "81ff92223d7eaf073064beb853601a0511f63e04", features = [ "network-v2", ] } -sp1-core-executor = { git = "https://github.com/succinctlabs/sp1.git", rev = "f0b61cf262388c1be7edfcf984c8e070064e980f" } -sp1-stark = { git = "https://github.com/succinctlabs/sp1.git", rev = "f0b61cf262388c1be7edfcf984c8e070064e980f" } -sp1-zkvm = { git = "https://github.com/succinctlabs/sp1.git", rev = "16431e6b979a617fa08994ccdaf866b22ba4b7a1", features = ["verify"] } -# sp1-zkvm = { git = "https://github.com/succinctlabs/sp1.git", rev = "16431e6b979a617fa08994ccdaf866b22ba4b7a1", features = ["verify", "lib", "libm", "embedded"], default-features = false } +sp1-core-executor = { git = "https://github.com/succinctlabs/sp1.git", rev = "81ff92223d7eaf073064beb853601a0511f63e04" } +sp1-stark = { git = "https://github.com/succinctlabs/sp1.git", rev = "81ff92223d7eaf073064beb853601a0511f63e04" } +sp1-zkvm = { git = "https://github.com/succinctlabs/sp1.git", rev = "16431e6b979a617fa08994ccdaf866b22ba4b7a1", features = ["verify", "lib", "libm", "embedded"], default-features = false } sp1-build = { version = "3.4.0" } p3-baby-bear = { version = "0.1.4-succinct" } @@ -126,10 +124,12 @@ lto = "fat" tiny-keccak = { git = "https://github.com/sp1-patches/tiny-keccak", tag = "tiny_keccak-v2.0.2-patch-v1" } sha2 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", tag = "sha2-v0.10.8-patch-v1" } ecdsa = { git = "https://github.com/sp1-patches/signatures", tag = "ecdsa-v0.16.9-patch-v3.3.0" } -# substrate-bn = { git = "https://github.com/sp1-patches/bn", tag = "substrate_bn-v0.6.0-patch-v2" } -# sha3 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha3", tag = "sha3-v0.10.8-patch-v1" } +sha3 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha3", tag = "sha3-v0.10.8-patch-v1" } -# sp1-lib = { git = "https://github.com/succinctlabs/sp1.git", rev = "16431e6b979a617fa08994ccdaf866b22ba4b7a1" } +sp1-lib = { git = "https://github.com/succinctlabs/sp1.git", rev = "16431e6b979a617fa08994ccdaf866b22ba4b7a1" } # Note: Renamed this package to sp1_bls12_381 because it was published with that crate name to kzg_rs. -# sp1_bls12_381 = { git = "https://github.com/sp1-patches/bls12_381.git", branch = "ratan/rename-package" } +sp1_bls12_381 = { git = "https://github.com/sp1-patches/bls12_381.git", branch = "ratan/rename-package" } + +substrate-bn = { git = "https://github.com/sp1-patches/bn", tag = "substrate_bn-v0.6.0-patch-v2" } + diff --git a/contracts/opsuccinctl2ooconfig.json b/contracts/opsuccinctl2ooconfig.json index 8ae4512a0..385d70bbb 100644 --- a/contracts/opsuccinctl2ooconfig.json +++ b/contracts/opsuccinctl2ooconfig.json @@ -5,11 +5,11 @@ "owner": "0xDEd0000E32f8F40414d3ab3a830f735a3553E18e", "proposer": "0xDEd0000E32f8F40414d3ab3a830f735a3553E18e", "rollupConfigHash": "0x08b1efa3b7fffb2cd455c9da85e032866e03f281e8957dd651c41f7480af36b7", - "startingBlockNumber": 7868310, - "startingOutputRoot": "0xa40a3e8bc6671b4eb46fd1a527e3ad83b82e81a2001250eca2e88416cb6b1268", - "startingTimestamp": 1735072259, + "startingBlockNumber": 7905362, + "startingOutputRoot": "0x0f24f1887a123a32eff5777a974b84c0213aa7b42902177300fe0c10ab2ac046", + "startingTimestamp": 1735146363, "submissionInterval": 100000000, "verifier": "0x397A5f7f3dBd538f23DE225B51f532c34448dA9B", "aggregationVkey": "0x0008399650a23eab8c315ca2c20282c32362d3941a2a456b127d3fb12dd70187", - "rangeVkeyCommitment": "0x18bb7e7762b78cc609e1b7510269735c56c69dae6eafa08d1846a3c64ad39956" + "rangeVkeyCommitment": "0x6b0988b622bb6833629e1b4b149fe28a2ebba11e3ccf747b4131bc6a110f4232" } \ No newline at end of file diff --git a/contracts/src/OPSuccinctL2OutputOracle.sol b/contracts/src/OPSuccinctL2OutputOracle.sol index 15f4a6e7e..2c610f081 100644 --- a/contracts/src/OPSuccinctL2OutputOracle.sol +++ b/contracts/src/OPSuccinctL2OutputOracle.sol @@ -170,7 +170,7 @@ contract OPSuccinctL2OutputOracle is Initializable, ISemver { string public constant version = "v1.0.0-rc2"; /// @notice The version of the initializer on the contract. Used for managing upgrades. - uint8 public constant initializerVersion = 6; + uint8 public constant initializerVersion = 7; //////////////////////////////////////////////////////////// // Modifiers // diff --git a/elf/range-elf b/elf/range-elf index b8d09cfab..6fa213339 100755 Binary files a/elf/range-elf and b/elf/range-elf differ diff --git a/scripts/prove/bin/multi.rs b/scripts/prove/bin/multi.rs index ae228924f..6e528e6e2 100644 --- a/scripts/prove/bin/multi.rs +++ b/scripts/prove/bin/multi.rs @@ -20,7 +20,7 @@ async fn main() -> Result<()> { let args = HostExecutorArgs::parse(); dotenv::from_path(&args.env_file)?; - utils::setup_logger(); + // utils::setup_logger(); let data_fetcher = OPSuccinctDataFetcher::new_with_rollup_config(RunContext::Dev).await?; diff --git a/utils/client/src/precompiles/mod.rs b/utils/client/src/precompiles/mod.rs index fe45da100..0de4130ea 100644 --- a/utils/client/src/precompiles/mod.rs +++ b/utils/client/src/precompiles/mod.rs @@ -1,5 +1,6 @@ //! Contains the [PrecompileOverride] trait implementation for the FPVM-accelerated precompiles. use alloc::sync::Arc; +use alloy_primitives::hex; use kona_executor::{TrieDB, TrieDBProvider}; use kona_mpt::TrieHinter; use revm::{ @@ -18,13 +19,15 @@ macro_rules! create_annotated_precompile { let precompile = $precompile.precompile(); match precompile { Precompile::Standard(precompile) => { - if cfg!(target_os = "zkvm") { - println!(concat!("cycle-tracker-report-start: precompile-", $name)); - } + // if cfg!(target_os = "zkvm") { + // println!(concat!("cycle-tracker-report-start: precompile-", $name)); + // } + println!("input: {}", hex::encode(input)); let result = precompile(input, gas_limit); - if cfg!(target_os = "zkvm") { - println!(concat!("cycle-tracker-report-end: precompile-", $name)); - } + println!("result: {:?}", hex::encode(result.clone().unwrap().bytes)); + // if cfg!(target_os = "zkvm") { + // println!(concat!("cycle-tracker-report-end: precompile-", $name)); + // } result } _ => panic!("Annotated precompile must be a standard precompile."),