diff --git a/Cargo.lock b/Cargo.lock index e19827ad..307725a8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -810,7 +810,7 @@ dependencies = [ "ark-serialize 0.3.0", "ark-std 0.3.0", "derivative", - "num-bigint 0.4.4", + "num-bigint 0.4.6", "num-traits", "paste", "rustc_version 0.3.3", @@ -830,7 +830,7 @@ dependencies = [ "derivative", "digest 0.10.7", "itertools 0.10.5", - "num-bigint 0.4.4", + "num-bigint 0.4.6", "num-traits", "paste", "rustc_version 0.4.1", @@ -863,7 +863,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db2fd794a08ccb318058009eefdf15bcaaaaf6f8161eb3345f907222bac38b20" dependencies = [ - "num-bigint 0.4.4", + "num-bigint 0.4.6", "num-traits", "quote", "syn 1.0.109", @@ -875,7 +875,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565" dependencies = [ - "num-bigint 0.4.4", + "num-bigint 0.4.6", "num-traits", "proc-macro2", "quote", @@ -941,7 +941,7 @@ dependencies = [ "ark-serialize-derive", "ark-std 0.4.0", "digest 0.10.7", - "num-bigint 0.4.4", + "num-bigint 0.4.6", ] [[package]] @@ -1058,6 +1058,12 @@ dependencies = [ "syn 2.0.87", ] +[[package]] +name = "auto_ops" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7460f7dd8e100147b82a63afca1a20eb6c231ee36b90ba7272e14951cb58af59" + [[package]] name = "autocfg" version = "1.1.0" @@ -1197,19 +1203,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "bonsai-sdk" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2c2e9e4e10cef33bd6ee36198f8f91b0fed0d0c265da9fe88e87b18f7e29192" -dependencies = [ - "duplicate", - "maybe-async", - "reqwest", - "serde", - "thiserror", -] - [[package]] name = "borsh" version = "1.5.1" @@ -1248,9 +1241,9 @@ checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" [[package]] name = "bytemuck" -version = "1.19.0" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d" +checksum = "8b37c88a63ffd85d15b406896cc343916d7cf57838a847b3a6f2ca5d39a5695a" dependencies = [ "bytemuck_derive", ] @@ -1274,9 +1267,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" dependencies = [ "serde", ] @@ -1330,9 +1323,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.30" +version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945" +checksum = "27f657647bcff5394bf56c7317665bbf790a137a50eaaa5c6bfbb9e27a518f2d" dependencies = [ "jobserver", "libc", @@ -1723,17 +1716,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "derive-debug" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e53ef7e1cf756fd5a8e74b9a0a9504ec446eddde86c3063a76ff26a13b7773b1" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "derive_arbitrary" version = "1.3.2" @@ -1878,16 +1860,6 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" -[[package]] -name = "duplicate" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de78e66ac9061e030587b2a2e75cc88f22304913c907b11307bca737141230cb" -dependencies = [ - "heck 0.4.1", - "proc-macro-error", -] - [[package]] name = "dyn-clone" version = "1.0.17" @@ -1955,6 +1927,26 @@ dependencies = [ "zeroize", ] +[[package]] +name = "enum-map" +version = "2.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6866f3bfdf8207509a033af1a75a7b08abda06bbaaeae6669323fd5a097df2e9" +dependencies = [ + "enum-map-derive", +] + +[[package]] +name = "enum-map-derive" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "enumn" version = "0.1.13" @@ -2824,6 +2816,17 @@ dependencies = [ "hashbrown 0.15.0", ] +[[package]] +name = "lzma-sys" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + [[package]] name = "malloc_buf" version = "0.0.6" @@ -2843,17 +2846,6 @@ dependencies = [ "rawpointer", ] -[[package]] -name = "maybe-async" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cf92c10c7e361d6b99666ec1c6f9805b0bea2c3bd8c78dc6fe98ac5bd78db11" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", -] - [[package]] name = "memchr" version = "2.7.4" @@ -2999,7 +2991,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" dependencies = [ - "num-bigint 0.4.4", + "num-bigint 0.4.6", "num-complex", "num-integer", "num-iter", @@ -3020,11 +3012,10 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ - "autocfg", "num-integer", "num-traits", ] @@ -3044,6 +3035,17 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" +[[package]] +name = "num-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "num-integer" version = "0.1.46" @@ -3071,7 +3073,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" dependencies = [ "autocfg", - "num-bigint 0.4.4", + "num-bigint 0.4.6", "num-integer", "num-traits", ] @@ -3498,7 +3500,6 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn 1.0.109", "version_check", ] @@ -3805,7 +3806,6 @@ checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b" dependencies = [ "base64 0.22.1", "bytes", - "futures-channel", "futures-core", "futures-util", "http", @@ -3834,12 +3834,10 @@ dependencies = [ "tokio", "tokio-native-tls", "tokio-rustls", - "tokio-util", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", - "wasm-streams", "web-sys", "webpki-roots", "windows-registry", @@ -4431,9 +4429,8 @@ dependencies = [ [[package]] name = "risc0-binfmt" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9749a29181f87bebd2580b39b3ec0368daaaefbb30429ff429383a7ade360321" +version = "1.3.0-alpha.1" +source = "git+https://github.com/risc0/risc0?rev=e98cdad96cfecb3d959cb62abf566e5b17a0d649#e98cdad96cfecb3d959cb62abf566e5b17a0d649" dependencies = [ "anyhow", "borsh", @@ -4441,15 +4438,13 @@ dependencies = [ "risc0-zkp", "risc0-zkvm-platform", "serde", - "syn 2.0.87", "tracing", ] [[package]] name = "risc0-build" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc684382e24a8c91331040c33f1c789c755a5c1b0b8a32fefc1730ca36dd7072" +version = "1.3.0-alpha.1" +source = "git+https://github.com/risc0/risc0?rev=e98cdad96cfecb3d959cb62abf566e5b17a0d649#e98cdad96cfecb3d959cb62abf566e5b17a0d649" dependencies = [ "anyhow", "cargo_metadata", @@ -4466,9 +4461,8 @@ dependencies = [ [[package]] name = "risc0-build-kernel" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d9e660eee96e15354259604d6dca3ea809a759e991b606d8db7b599916848b" +version = "1.3.0-alpha.1" +source = "git+https://github.com/risc0/risc0?rev=e98cdad96cfecb3d959cb62abf566e5b17a0d649#e98cdad96cfecb3d959cb62abf566e5b17a0d649" dependencies = [ "cc", "directories", @@ -4477,14 +4471,47 @@ dependencies = [ "rayon", "sha2", "tempfile", - "which 6.0.3", +] + +[[package]] +name = "risc0-circuit-keccak" +version = "1.3.0-alpha.1" +source = "git+https://github.com/risc0/risc0?rev=e98cdad96cfecb3d959cb62abf566e5b17a0d649#e98cdad96cfecb3d959cb62abf566e5b17a0d649" +dependencies = [ + "anyhow", + "bytemuck", + "cfg-if", + "paste", + "rayon", + "risc0-binfmt", + "risc0-circuit-keccak-sys", + "risc0-circuit-recursion", + "risc0-core", + "risc0-sys", + "risc0-zkp", + "tracing", + "xz2", +] + +[[package]] +name = "risc0-circuit-keccak-sys" +version = "1.3.0-alpha.1" +source = "git+https://github.com/risc0/risc0?rev=e98cdad96cfecb3d959cb62abf566e5b17a0d649#e98cdad96cfecb3d959cb62abf566e5b17a0d649" +dependencies = [ + "cc", + "cust", + "derive_more 1.0.0", + "glob", + "risc0-build-kernel", + "risc0-core", + "risc0-sys", + "sppark", ] [[package]] name = "risc0-circuit-recursion" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90745aa984e4eb404f0e0eb6a7ab2e956d963a0dad751fb89ef138cc6e4e3afc" +version = "1.3.0-alpha.1" +source = "git+https://github.com/risc0/risc0?rev=e98cdad96cfecb3d959cb62abf566e5b17a0d649#e98cdad96cfecb3d959cb62abf566e5b17a0d649" dependencies = [ "anyhow", "bytemuck", @@ -4508,9 +4535,8 @@ dependencies = [ [[package]] name = "risc0-circuit-recursion-sys" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd552b5590bd0c7030467c62defe2409aabd303d2dd6ff16d6f59421ae0b37a" +version = "1.3.0-alpha.1" +source = "git+https://github.com/risc0/risc0?rev=e98cdad96cfecb3d959cb62abf566e5b17a0d649#e98cdad96cfecb3d959cb62abf566e5b17a0d649" dependencies = [ "glob", "risc0-build-kernel", @@ -4521,19 +4547,24 @@ dependencies = [ [[package]] name = "risc0-circuit-rv32im" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "079b2c6789c6cbfee3500aff69108f853bdfe13fd0071ac1fbe3cbf7d0866420" +version = "1.3.0-alpha.1" +source = "git+https://github.com/risc0/risc0?rev=e98cdad96cfecb3d959cb62abf566e5b17a0d649#e98cdad96cfecb3d959cb62abf566e5b17a0d649" dependencies = [ "anyhow", + "auto_ops", "bytemuck", + "byteorder", "cfg-if", "crossbeam", "crypto-bigint", "cust", - "derive-debug", + "derive_more 1.0.0", + "enum-map", "lazy-regex", "metal", + "num-bigint 0.4.6", + "num-derive", + "num-traits", "rand", "rayon", "risc0-binfmt", @@ -4549,9 +4580,8 @@ dependencies = [ [[package]] name = "risc0-circuit-rv32im-sys" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9844bd07c18aa6a263259d0c693e54df815a9995760270ff5b5351c5f81cfc" +version = "1.3.0-alpha.1" +source = "git+https://github.com/risc0/risc0?rev=e98cdad96cfecb3d959cb62abf566e5b17a0d649#e98cdad96cfecb3d959cb62abf566e5b17a0d649" dependencies = [ "glob", "risc0-build-kernel", @@ -4562,9 +4592,8 @@ dependencies = [ [[package]] name = "risc0-core" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fd39ba3f881fcf0197464bde04391602dbbb886f87fddc372a68d79aa9de9d9" +version = "1.3.0-alpha.1" +source = "git+https://github.com/risc0/risc0?rev=e98cdad96cfecb3d959cb62abf566e5b17a0d649#e98cdad96cfecb3d959cb62abf566e5b17a0d649" dependencies = [ "bytemuck", "nvtx", @@ -4574,9 +4603,8 @@ dependencies = [ [[package]] name = "risc0-groth16" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c86b43367c2f29ce1a0ee5730f0af6892e5b6197c8dded614c7ff1068afcd302" +version = "1.3.0-alpha.1" +source = "git+https://github.com/risc0/risc0?rev=e98cdad96cfecb3d959cb62abf566e5b17a0d649#e98cdad96cfecb3d959cb62abf566e5b17a0d649" dependencies = [ "anyhow", "ark-bn254", @@ -4585,25 +4613,24 @@ dependencies = [ "ark-serialize 0.4.2", "bytemuck", "hex", - "num-bigint 0.4.4", + "num-bigint 0.4.6", "num-traits", "risc0-binfmt", "risc0-core", "risc0-zkp", "serde", "serde_json", + "stability", "tempfile", "tracing", ] [[package]] name = "risc0-sys" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abc7596a2ffa5e75e5a886fd95bccb0d593e769cdd2c43b83dcf2ac089423060" +version = "1.3.0-alpha.1" +source = "git+https://github.com/risc0/risc0?rev=e98cdad96cfecb3d959cb62abf566e5b17a0d649#e98cdad96cfecb3d959cb62abf566e5b17a0d649" dependencies = [ "anyhow", - "cc", "cust", "risc0-build-kernel", "sppark", @@ -4611,9 +4638,8 @@ dependencies = [ [[package]] name = "risc0-zkp" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15b5525e1f2abaa5954579e50df0d6a5d01b456b0ac6aae0e87cf92f073e12f7" +version = "1.3.0-alpha.1" +source = "git+https://github.com/risc0/risc0?rev=e98cdad96cfecb3d959cb62abf566e5b17a0d649#e98cdad96cfecb3d959cb62abf566e5b17a0d649" dependencies = [ "anyhow", "blake2", @@ -4642,26 +4668,29 @@ dependencies = [ [[package]] name = "risc0-zkvm" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de11138ba073e43ec494d15728baeddbf3155fc95d5710000077eb5f7f345070" +version = "1.3.0-alpha.1" +source = "git+https://github.com/risc0/risc0?rev=e98cdad96cfecb3d959cb62abf566e5b17a0d649#e98cdad96cfecb3d959cb62abf566e5b17a0d649" dependencies = [ "addr2line 0.22.0", "anyhow", "bincode", - "bonsai-sdk", "borsh", "bytemuck", "bytes", "elf", + "enum-map", "getrandom", "hex", + "keccak", "lazy-regex", + "num-bigint 0.4.6", + "num-traits", "prost", "rand", "rayon", "risc0-binfmt", "risc0-build", + "risc0-circuit-keccak", "risc0-circuit-recursion", "risc0-circuit-rv32im", "risc0-core", @@ -4681,9 +4710,8 @@ dependencies = [ [[package]] name = "risc0-zkvm-platform" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57748f1916078b24faed0bc620aa6dfc386e066e6f75a710ec0ac68f7126e7d7" +version = "1.3.0-alpha.1" +source = "git+https://github.com/risc0/risc0?rev=e98cdad96cfecb3d959cb62abf566e5b17a0d649#e98cdad96cfecb3d959cb62abf566e5b17a0d649" dependencies = [ "bytemuck", "getrandom", @@ -4762,7 +4790,7 @@ dependencies = [ "ark-ff 0.4.2", "bytes", "fastrlp", - "num-bigint 0.4.4", + "num-bigint 0.4.6", "num-traits", "parity-scale-codec", "primitive-types", @@ -5215,12 +5243,12 @@ dependencies = [ [[package]] name = "sppark" -version = "0.1.8" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55f3833d30846a26110dccb1d5366314c2c52516a9173b74238c16b24b1a9f9" +checksum = "ac5090642d9ae844edd9a5c23cb1fce6724ca88d50c55178ee8d1f656df5826b" dependencies = [ "cc", - "which 4.4.2", + "which", ] [[package]] @@ -5484,9 +5512,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.40.0" +version = "1.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33" dependencies = [ "backtrace", "bytes", @@ -5962,19 +5990,6 @@ version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" -[[package]] -name = "wasm-streams" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e072d4e72f700fb3443d8fe94a39315df013eef1104903cdb0a2abd322bbecd" -dependencies = [ - "futures-util", - "js-sys", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - [[package]] name = "web-sys" version = "0.3.69" @@ -6006,18 +6021,6 @@ dependencies = [ "rustix", ] -[[package]] -name = "which" -version = "6.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ee928febd44d98f2f459a4a79bd4d928591333a494a10a868418ac1b39cf1f" -dependencies = [ - "either", - "home", - "rustix", - "winsafe", -] - [[package]] name = "widestring" version = "1.1.0" @@ -6229,12 +6232,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "winsafe" -version = "0.0.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" - [[package]] name = "ws_stream_wasm" version = "0.7.4" @@ -6263,6 +6260,15 @@ dependencies = [ "tap", ] +[[package]] +name = "xz2" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2" +dependencies = [ + "lzma-sys", +] + [[package]] name = "zerocopy" version = "0.7.32" diff --git a/Cargo.toml b/Cargo.toml index c7895237..1ad5ca98 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,11 +1,6 @@ [workspace] resolver = "2" -members = [ - "bin/*", - "crates/*", - "guests", - "testing/ef-tests", -] +members = ["bin/*", "crates/*", "guests", "testing/ef-tests"] # Always optimize; building and running the guest takes much longer without optimization. [profile.dev] @@ -23,14 +18,18 @@ opt-level = 3 # RISC Zero [workspace.dependencies.bonsai-sdk] -version = "1.1.3" +git = "https://github.com/risc0/risc0" +rev = "e98cdad96cfecb3d959cb62abf566e5b17a0d649" features = ["non_blocking"] [workspace.dependencies.risc0-build] -version = "1.1.3" +git = "https://github.com/risc0/risc0" +rev = "e98cdad96cfecb3d959cb62abf566e5b17a0d649" +features = ["unstable"] [workspace.dependencies.risc0-zkvm] -version = "1.1.3" +git = "https://github.com/risc0/risc0" +rev = "e98cdad96cfecb3d959cb62abf566e5b17a0d649" default-features = false # External @@ -48,18 +47,33 @@ op-alloy-provider = "0.4.0" op-alloy-rpc-types = "0.4.0" # Reth -reth-chainspec = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd", default-features = false, features = ["std"] } +reth-chainspec = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd", default-features = false, features = [ + "std", +] } reth-consensus = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd" } reth-ethereum-consensus = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd" } -reth-evm = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd", default-features = false, features = ["std"] } -reth-evm-ethereum = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd", default-features = false, features = ["std"] } -reth-optimism-chainspec = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd", default-features = false, features = ["std"] } +reth-evm = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd", default-features = false, features = [ + "std", +] } +reth-evm-ethereum = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd", default-features = false, features = [ + "std", +] } +reth-optimism-chainspec = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd", default-features = false, features = [ + "std", +] } reth-optimism-consensus = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd" } reth-optimism-evm = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd", default-features = false } reth-optimism-forks = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd", default-features = false } -reth-primitives = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd", default-features = false, features = ["std", "alloy-compat"] } -reth-revm = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd", default-features = false, features = ["std"] } -reth-storage-errors = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd", default-features = false, features = ["std"] } +reth-primitives = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd", default-features = false, features = [ + "std", + "alloy-compat", +] } +reth-revm = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd", default-features = false, features = [ + "std", +] } +reth-storage-errors = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd", default-features = false, features = [ + "std", +] } # Zeth zeth = { path = "crates/zeth" } @@ -87,5 +101,5 @@ serde_json = { version = "1.0.128", features = ["alloc"] } serde_with = "3.7.0" thiserror = "1.0.64" tiny-keccak = "2.0.2" -tokio = { version = "1.40.0", features = ["full"] } +tokio = { version = "1.41.0", features = ["full"] } tracing = { version = "0.1.40", features = ["log"] } diff --git a/bin/ethereum/data/ethereum/1-21231350.json.gz b/bin/ethereum/data/ethereum/1-21231350.json.gz new file mode 100644 index 00000000..07a13bb4 Binary files /dev/null and b/bin/ethereum/data/ethereum/1-21231350.json.gz differ diff --git a/guests/reth-ethereum/Cargo.lock b/guests/reth-ethereum/Cargo.lock index c9e64115..892aa8a2 100644 --- a/guests/reth-ethereum/Cargo.lock +++ b/guests/reth-ethereum/Cargo.lock @@ -742,9 +742,9 @@ checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" [[package]] name = "bytemuck" -version = "1.19.0" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d" +checksum = "8b37c88a63ffd85d15b406896cc343916d7cf57838a847b3a6f2ca5d39a5695a" dependencies = [ "bytemuck_derive", ] @@ -1473,6 +1473,12 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "include_bytes_aligned" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ee796ad498c8d9a1d68e477df8f754ed784ef875de1414ebdaf169f70a6a784" + [[package]] name = "indexmap" version = "1.9.3" @@ -1540,12 +1546,14 @@ dependencies = [ [[package]] name = "k256" version = "0.13.3" -source = "git+https://github.com/risc0/RustCrypto-elliptic-curves?tag=k256/v0.13.3-risczero.0#d4f457a04410397cbb652a67c168b6cd6e9757c4" +source = "git+https://github.com/risc0/RustCrypto-elliptic-curves?tag=k256/v0.13.3-risczero.1#ff5d67b095cfcc2569b7789f2079ed87ef2c7756" dependencies = [ + "bytemuck", "cfg-if", "ecdsa", "elliptic-curve", "once_cell", + "risc0-bigint2", "sha2", ] @@ -2664,10 +2672,19 @@ dependencies = [ ] [[package]] -name = "risc0-binfmt" -version = "1.1.3" +name = "risc0-bigint2" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9749a29181f87bebd2580b39b3ec0368daaaefbb30429ff429383a7ade360321" +checksum = "4f4c185a3bfaee681eed5bfac1440128184bf0b6544c345fb4d7bd4317c909fb" +dependencies = [ + "include_bytes_aligned", + "stability", +] + +[[package]] +name = "risc0-binfmt" +version = "1.3.0-alpha.1" +source = "git+https://github.com/risc0/risc0?rev=e98cdad96cfecb3d959cb62abf566e5b17a0d649#e98cdad96cfecb3d959cb62abf566e5b17a0d649" dependencies = [ "anyhow", "borsh", @@ -2675,15 +2692,28 @@ dependencies = [ "risc0-zkp", "risc0-zkvm-platform", "serde", - "syn 2.0.85", + "tracing", +] + +[[package]] +name = "risc0-circuit-keccak" +version = "1.3.0-alpha.1" +source = "git+https://github.com/risc0/risc0?rev=e98cdad96cfecb3d959cb62abf566e5b17a0d649#e98cdad96cfecb3d959cb62abf566e5b17a0d649" +dependencies = [ + "anyhow", + "bytemuck", + "paste", + "risc0-binfmt", + "risc0-circuit-recursion", + "risc0-core", + "risc0-zkp", "tracing", ] [[package]] name = "risc0-circuit-recursion" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90745aa984e4eb404f0e0eb6a7ab2e956d963a0dad751fb89ef138cc6e4e3afc" +version = "1.3.0-alpha.1" +source = "git+https://github.com/risc0/risc0?rev=e98cdad96cfecb3d959cb62abf566e5b17a0d649#e98cdad96cfecb3d959cb62abf566e5b17a0d649" dependencies = [ "anyhow", "bytemuck", @@ -2696,9 +2726,8 @@ dependencies = [ [[package]] name = "risc0-circuit-rv32im" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "079b2c6789c6cbfee3500aff69108f853bdfe13fd0071ac1fbe3cbf7d0866420" +version = "1.3.0-alpha.1" +source = "git+https://github.com/risc0/risc0?rev=e98cdad96cfecb3d959cb62abf566e5b17a0d649#e98cdad96cfecb3d959cb62abf566e5b17a0d649" dependencies = [ "anyhow", "metal", @@ -2712,9 +2741,8 @@ dependencies = [ [[package]] name = "risc0-core" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fd39ba3f881fcf0197464bde04391602dbbb886f87fddc372a68d79aa9de9d9" +version = "1.3.0-alpha.1" +source = "git+https://github.com/risc0/risc0?rev=e98cdad96cfecb3d959cb62abf566e5b17a0d649#e98cdad96cfecb3d959cb62abf566e5b17a0d649" dependencies = [ "bytemuck", "rand_core", @@ -2722,9 +2750,8 @@ dependencies = [ [[package]] name = "risc0-groth16" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c86b43367c2f29ce1a0ee5730f0af6892e5b6197c8dded614c7ff1068afcd302" +version = "1.3.0-alpha.1" +source = "git+https://github.com/risc0/risc0?rev=e98cdad96cfecb3d959cb62abf566e5b17a0d649#e98cdad96cfecb3d959cb62abf566e5b17a0d649" dependencies = [ "anyhow", "ark-bn254", @@ -2738,13 +2765,13 @@ dependencies = [ "risc0-binfmt", "risc0-zkp", "serde", + "stability", ] [[package]] name = "risc0-zkp" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15b5525e1f2abaa5954579e50df0d6a5d01b456b0ac6aae0e87cf92f073e12f7" +version = "1.3.0-alpha.1" +source = "git+https://github.com/risc0/risc0?rev=e98cdad96cfecb3d959cb62abf566e5b17a0d649#e98cdad96cfecb3d959cb62abf566e5b17a0d649" dependencies = [ "anyhow", "blake2", @@ -2766,9 +2793,8 @@ dependencies = [ [[package]] name = "risc0-zkvm" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de11138ba073e43ec494d15728baeddbf3155fc95d5710000077eb5f7f345070" +version = "1.3.0-alpha.1" +source = "git+https://github.com/risc0/risc0?rev=e98cdad96cfecb3d959cb62abf566e5b17a0d649#e98cdad96cfecb3d959cb62abf566e5b17a0d649" dependencies = [ "anyhow", "borsh", @@ -2776,6 +2802,7 @@ dependencies = [ "getrandom", "hex", "risc0-binfmt", + "risc0-circuit-keccak", "risc0-circuit-recursion", "risc0-circuit-rv32im", "risc0-core", @@ -2792,9 +2819,8 @@ dependencies = [ [[package]] name = "risc0-zkvm-platform" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57748f1916078b24faed0bc620aa6dfc386e066e6f75a710ec0ac68f7126e7d7" +version = "1.3.0-alpha.1" +source = "git+https://github.com/risc0/risc0?rev=e98cdad96cfecb3d959cb62abf566e5b17a0d649#e98cdad96cfecb3d959cb62abf566e5b17a0d649" dependencies = [ "bytemuck", "getrandom", @@ -3352,10 +3378,10 @@ dependencies = [ [[package]] name = "tiny-keccak" version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +source = "git+https://github.com/risc0/tiny-keccak?rev=b93afa7dc803d2db6ddae7df15e9db5a79212ba0#b93afa7dc803d2db6ddae7df15e9db5a79212ba0" dependencies = [ "crunchy", + "risc0-zkvm", ] [[package]] diff --git a/guests/reth-ethereum/Cargo.toml b/guests/reth-ethereum/Cargo.toml index 3f2346dc..996ed4c4 100644 --- a/guests/reth-ethereum/Cargo.toml +++ b/guests/reth-ethereum/Cargo.toml @@ -6,12 +6,14 @@ edition = "2021" [workspace] [dependencies.risc0-zkvm] -version = "1.1.3" +git = "https://github.com/risc0/risc0" +rev = "e98cdad96cfecb3d959cb62abf566e5b17a0d649" default-features = false -features = ["std"] +features = ["std", "unstable"] [dependencies.risc0-zkvm-platform] -version = "1.1.3" +git = "https://github.com/risc0/risc0" +rev = "e98cdad96cfecb3d959cb62abf566e5b17a0d649" features = ["sys-getenv"] [dependencies.zeth-core] @@ -27,10 +29,13 @@ anyhow = { version = "1.0.86", default-features = false } c-kzg = { version = "=1.0.3", features = ["risc0-ffi"] } lazy_static = "1.5.0" -reth-chainspec = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd", default-features = false, features = ["std"] } +reth-chainspec = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd", default-features = false, features = [ + "std", +] } [patch.crates-io] +c-kzg = { git = "https://github.com/risc0/c-kzg-4844.git", branch = "p1.0.3" } crypto-bigint = { git = "https://github.com/risc0/RustCrypto-crypto-bigint", tag = "v0.5.5-risczero.0" } -k256 = { git = "https://github.com/risc0/RustCrypto-elliptic-curves", tag = "k256/v0.13.3-risczero.0" } +k256 = { git = "https://github.com/risc0/RustCrypto-elliptic-curves", tag = "k256/v0.13.3-risczero.1" } sha2 = { git = "https://github.com/risc0/RustCrypto-hashes", tag = "sha2-v0.10.6-risczero.0" } -c-kzg = { git = "https://github.com/risc0/c-kzg-4844.git", branch = "p1.0.3" } +tiny-keccak = { git = "https://github.com/risc0/tiny-keccak", rev = "b93afa7dc803d2db6ddae7df15e9db5a79212ba0" } diff --git a/guests/reth-optimism/Cargo.lock b/guests/reth-optimism/Cargo.lock index 83cc714f..416722f3 100644 --- a/guests/reth-optimism/Cargo.lock +++ b/guests/reth-optimism/Cargo.lock @@ -742,9 +742,9 @@ checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" [[package]] name = "bytemuck" -version = "1.19.0" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d" +checksum = "8b37c88a63ffd85d15b406896cc343916d7cf57838a847b3a6f2ca5d39a5695a" dependencies = [ "bytemuck_derive", ] @@ -1473,6 +1473,12 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "include_bytes_aligned" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ee796ad498c8d9a1d68e477df8f754ed784ef875de1414ebdaf169f70a6a784" + [[package]] name = "indexmap" version = "1.9.3" @@ -1540,12 +1546,14 @@ dependencies = [ [[package]] name = "k256" version = "0.13.3" -source = "git+https://github.com/risc0/RustCrypto-elliptic-curves?tag=k256/v0.13.3-risczero.0#d4f457a04410397cbb652a67c168b6cd6e9757c4" +source = "git+https://github.com/risc0/RustCrypto-elliptic-curves?tag=k256/v0.13.3-risczero.1#ff5d67b095cfcc2569b7789f2079ed87ef2c7756" dependencies = [ + "bytemuck", "cfg-if", "ecdsa", "elliptic-curve", "once_cell", + "risc0-bigint2", "sha2", ] @@ -2760,10 +2768,19 @@ dependencies = [ ] [[package]] -name = "risc0-binfmt" -version = "1.1.3" +name = "risc0-bigint2" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9749a29181f87bebd2580b39b3ec0368daaaefbb30429ff429383a7ade360321" +checksum = "4f4c185a3bfaee681eed5bfac1440128184bf0b6544c345fb4d7bd4317c909fb" +dependencies = [ + "include_bytes_aligned", + "stability", +] + +[[package]] +name = "risc0-binfmt" +version = "1.3.0-alpha.1" +source = "git+https://github.com/risc0/risc0?rev=e98cdad96cfecb3d959cb62abf566e5b17a0d649#e98cdad96cfecb3d959cb62abf566e5b17a0d649" dependencies = [ "anyhow", "borsh", @@ -2771,15 +2788,28 @@ dependencies = [ "risc0-zkp", "risc0-zkvm-platform", "serde", - "syn 2.0.85", + "tracing", +] + +[[package]] +name = "risc0-circuit-keccak" +version = "1.3.0-alpha.1" +source = "git+https://github.com/risc0/risc0?rev=e98cdad96cfecb3d959cb62abf566e5b17a0d649#e98cdad96cfecb3d959cb62abf566e5b17a0d649" +dependencies = [ + "anyhow", + "bytemuck", + "paste", + "risc0-binfmt", + "risc0-circuit-recursion", + "risc0-core", + "risc0-zkp", "tracing", ] [[package]] name = "risc0-circuit-recursion" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90745aa984e4eb404f0e0eb6a7ab2e956d963a0dad751fb89ef138cc6e4e3afc" +version = "1.3.0-alpha.1" +source = "git+https://github.com/risc0/risc0?rev=e98cdad96cfecb3d959cb62abf566e5b17a0d649#e98cdad96cfecb3d959cb62abf566e5b17a0d649" dependencies = [ "anyhow", "bytemuck", @@ -2792,9 +2822,8 @@ dependencies = [ [[package]] name = "risc0-circuit-rv32im" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "079b2c6789c6cbfee3500aff69108f853bdfe13fd0071ac1fbe3cbf7d0866420" +version = "1.3.0-alpha.1" +source = "git+https://github.com/risc0/risc0?rev=e98cdad96cfecb3d959cb62abf566e5b17a0d649#e98cdad96cfecb3d959cb62abf566e5b17a0d649" dependencies = [ "anyhow", "metal", @@ -2808,9 +2837,8 @@ dependencies = [ [[package]] name = "risc0-core" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fd39ba3f881fcf0197464bde04391602dbbb886f87fddc372a68d79aa9de9d9" +version = "1.3.0-alpha.1" +source = "git+https://github.com/risc0/risc0?rev=e98cdad96cfecb3d959cb62abf566e5b17a0d649#e98cdad96cfecb3d959cb62abf566e5b17a0d649" dependencies = [ "bytemuck", "rand_core", @@ -2818,9 +2846,8 @@ dependencies = [ [[package]] name = "risc0-groth16" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c86b43367c2f29ce1a0ee5730f0af6892e5b6197c8dded614c7ff1068afcd302" +version = "1.3.0-alpha.1" +source = "git+https://github.com/risc0/risc0?rev=e98cdad96cfecb3d959cb62abf566e5b17a0d649#e98cdad96cfecb3d959cb62abf566e5b17a0d649" dependencies = [ "anyhow", "ark-bn254", @@ -2834,13 +2861,13 @@ dependencies = [ "risc0-binfmt", "risc0-zkp", "serde", + "stability", ] [[package]] name = "risc0-zkp" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15b5525e1f2abaa5954579e50df0d6a5d01b456b0ac6aae0e87cf92f073e12f7" +version = "1.3.0-alpha.1" +source = "git+https://github.com/risc0/risc0?rev=e98cdad96cfecb3d959cb62abf566e5b17a0d649#e98cdad96cfecb3d959cb62abf566e5b17a0d649" dependencies = [ "anyhow", "blake2", @@ -2862,9 +2889,8 @@ dependencies = [ [[package]] name = "risc0-zkvm" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de11138ba073e43ec494d15728baeddbf3155fc95d5710000077eb5f7f345070" +version = "1.3.0-alpha.1" +source = "git+https://github.com/risc0/risc0?rev=e98cdad96cfecb3d959cb62abf566e5b17a0d649#e98cdad96cfecb3d959cb62abf566e5b17a0d649" dependencies = [ "anyhow", "borsh", @@ -2872,6 +2898,7 @@ dependencies = [ "getrandom", "hex", "risc0-binfmt", + "risc0-circuit-keccak", "risc0-circuit-recursion", "risc0-circuit-rv32im", "risc0-core", @@ -2888,9 +2915,8 @@ dependencies = [ [[package]] name = "risc0-zkvm-platform" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57748f1916078b24faed0bc620aa6dfc386e066e6f75a710ec0ac68f7126e7d7" +version = "1.3.0-alpha.1" +source = "git+https://github.com/risc0/risc0?rev=e98cdad96cfecb3d959cb62abf566e5b17a0d649#e98cdad96cfecb3d959cb62abf566e5b17a0d649" dependencies = [ "bytemuck", "getrandom", @@ -3448,10 +3474,10 @@ dependencies = [ [[package]] name = "tiny-keccak" version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +source = "git+https://github.com/risc0/tiny-keccak?rev=b93afa7dc803d2db6ddae7df15e9db5a79212ba0#b93afa7dc803d2db6ddae7df15e9db5a79212ba0" dependencies = [ "crunchy", + "risc0-zkvm", ] [[package]] diff --git a/guests/reth-optimism/Cargo.toml b/guests/reth-optimism/Cargo.toml index 6e6737b7..90a67309 100644 --- a/guests/reth-optimism/Cargo.toml +++ b/guests/reth-optimism/Cargo.toml @@ -6,12 +6,14 @@ edition = "2021" [workspace] [dependencies.risc0-zkvm] -version = "1.1.3" +git = "https://github.com/risc0/risc0" +rev = "e98cdad96cfecb3d959cb62abf566e5b17a0d649" default-features = false -features = ["std"] +features = ["std", "unstable"] [dependencies.risc0-zkvm-platform] -version = "1.1.3" +git = "https://github.com/risc0/risc0" +rev = "e98cdad96cfecb3d959cb62abf566e5b17a0d649" features = ["sys-getenv"] [dependencies.zeth-core] @@ -27,10 +29,13 @@ anyhow = { version = "1.0.86", default-features = false } c-kzg = { version = "=1.0.3", features = ["risc0-ffi"] } lazy_static = "1.5.0" -reth-optimism-chainspec = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd", default-features = false, features = ["std"] } +reth-optimism-chainspec = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd", default-features = false, features = [ + "std", +] } [patch.crates-io] +c-kzg = { git = "https://github.com/risc0/c-kzg-4844.git", branch = "p1.0.3" } crypto-bigint = { git = "https://github.com/risc0/RustCrypto-crypto-bigint", tag = "v0.5.5-risczero.0" } -k256 = { git = "https://github.com/risc0/RustCrypto-elliptic-curves", tag = "k256/v0.13.3-risczero.0" } +k256 = { git = "https://github.com/risc0/RustCrypto-elliptic-curves", tag = "k256/v0.13.3-risczero.1" } sha2 = { git = "https://github.com/risc0/RustCrypto-hashes", tag = "sha2-v0.10.6-risczero.0" } -c-kzg = { git = "https://github.com/risc0/c-kzg-4844.git", branch = "p1.0.3" } +tiny-keccak = { git = "https://github.com/risc0/tiny-keccak", rev = "b93afa7dc803d2db6ddae7df15e9db5a79212ba0" } diff --git a/rust-toolchain b/rust-toolchain.toml similarity index 80% rename from rust-toolchain rename to rust-toolchain.toml index 3fd28115..8d02abc1 100644 --- a/rust-toolchain +++ b/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "stable" +channel = "1.81" components = ["clippy", "rustfmt", "rust-src"] profile = "minimal"