diff --git a/Cargo.lock b/Cargo.lock index a2bdb335..1e55f9b1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -299,7 +299,7 @@ dependencies = [ "const-hex", "derive_more 1.0.0", "foldhash", - "getrandom", + "getrandom 0.2.12", "hashbrown 0.15.2", "indexmap 2.6.0", "itoa", @@ -1002,6 +1002,12 @@ dependencies = [ "rand", ] +[[package]] +name = "arraydeque" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236" + [[package]] name = "arrayvec" version = "0.7.4" @@ -1223,9 +1229,9 @@ dependencies = [ [[package]] name = "bonsai-sdk" -version = "1.2.2" +version = "1.3.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a6c42e9ac4df9f62aade6f4a7fab56db33d4518d1cac37434f040f610f6d40" +checksum = "3c49e03d822e1948ab91acd586de5a5c7790f2380886cc29d64504e2a6445b6a" dependencies = [ "duplicate", "maybe-async", @@ -1364,16 +1370,16 @@ dependencies = [ [[package]] name = "cargo_metadata" -version = "0.18.1" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" +checksum = "8769706aad5d996120af43197bf46ef6ad0fda35216b4505f926a365a232d924" dependencies = [ "camino", "cargo-platform", - "semver 1.0.22", + "semver 1.0.25", "serde", "serde_json", - "thiserror 1.0.64", + "thiserror 2.0.11", ] [[package]] @@ -1431,7 +1437,7 @@ dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.11.1", + "strsim", ] [[package]] @@ -1687,9 +1693,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ "darling_core", "darling_macro", @@ -1697,23 +1703,23 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim 0.10.0", + "strsim", "syn 2.0.87", ] [[package]] name = "darling_macro" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", @@ -1783,6 +1789,37 @@ dependencies = [ "syn 2.0.87", ] +[[package]] +name = "derive_builder" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.87", +] + +[[package]] +name = "derive_builder_macro" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" +dependencies = [ + "derive_builder_core", + "syn 2.0.87", +] + [[package]] name = "derive_more" version = "0.99.18" @@ -1800,7 +1837,16 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" dependencies = [ - "derive_more-impl", + "derive_more-impl 1.0.0", +] + +[[package]] +name = "derive_more" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678" +dependencies = [ + "derive_more-impl 2.0.1", ] [[package]] @@ -1816,6 +1862,18 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "derive_more-impl" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", + "unicode-xid", +] + [[package]] name = "digest" version = "0.9.0" @@ -1980,6 +2038,15 @@ dependencies = [ "zeroize", ] +[[package]] +name = "encoding_rs" +version = "0.8.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" +dependencies = [ + "cfg-if", +] + [[package]] name = "enr" version = "0.12.1" @@ -2068,12 +2135,12 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.8" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2348,7 +2415,19 @@ checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.13.3+wasi-0.2.2", + "windows-targets 0.52.6", ] [[package]] @@ -2423,6 +2502,9 @@ name = "hashbrown" version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash", +] [[package]] name = "hashbrown" @@ -2437,6 +2519,15 @@ dependencies = [ "serde", ] +[[package]] +name = "hashlink" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" +dependencies = [ + "hashbrown 0.14.5", +] + [[package]] name = "heck" version = "0.4.1" @@ -2730,6 +2821,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + [[package]] name = "itertools" version = "0.13.0" @@ -2840,9 +2940,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.159" +version = "0.2.170" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" +checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828" [[package]] name = "libm" @@ -2908,6 +3008,64 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "malachite" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fbdf9cb251732db30a7200ebb6ae5d22fe8e11397364416617d2c2cf0c51cb5" +dependencies = [ + "malachite-base", + "malachite-float", + "malachite-nz", + "malachite-q", +] + +[[package]] +name = "malachite-base" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ea0ed76adf7defc1a92240b5c36d5368cfe9251640dcce5bd2d0b7c1fd87aeb" +dependencies = [ + "hashbrown 0.14.5", + "itertools 0.11.0", + "libm", + "ryu", +] + +[[package]] +name = "malachite-float" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af9d20db1c73759c1377db7b27575df6f2eab7368809dd62c0a715dc1bcc39f7" +dependencies = [ + "itertools 0.11.0", + "malachite-base", + "malachite-nz", + "malachite-q", +] + +[[package]] +name = "malachite-nz" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34a79feebb2bc9aa7762047c8e5495269a367da6b5a90a99882a0aeeac1841f7" +dependencies = [ + "itertools 0.11.0", + "libm", + "malachite-base", +] + +[[package]] +name = "malachite-q" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50f235d5747b1256b47620f5640c2a17a88c7569eebdf27cd9cb130e1a619191" +dependencies = [ + "itertools 0.11.0", + "malachite-base", + "malachite-nz", +] + [[package]] name = "malloc_buf" version = "0.0.6" @@ -3019,7 +3177,7 @@ checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ "hermit-abi", "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.52.0", ] @@ -3622,7 +3780,7 @@ version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.22.22", + "toml_edit 0.22.24", ] [[package]] @@ -3863,7 +4021,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom", + "getrandom 0.2.12", ] [[package]] @@ -3922,7 +4080,7 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ - "getrandom", + "getrandom 0.2.12", "libredox", "thiserror 1.0.64", ] @@ -4587,7 +4745,7 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", "cfg-if", - "getrandom", + "getrandom 0.2.12", "libc", "spin 0.9.8", "untrusted", @@ -4605,12 +4763,13 @@ dependencies = [ [[package]] name = "risc0-binfmt" -version = "1.2.2" +version = "1.3.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fac7b3a4d7f6e86b2be2daf0ec53b9b8740895ff8279011cee24e4bae72cd77e" +checksum = "253c4dea656db2eda4fffebeb9782f3c3413f73bd6032bdbd388a5aac862e39b" dependencies = [ "anyhow", "borsh", + "derive_more 1.0.0", "elf", "risc0-zkp", "risc0-zkvm-platform", @@ -4620,28 +4779,31 @@ dependencies = [ [[package]] name = "risc0-build" -version = "1.2.2" +version = "2.0.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4481ff9a05c3d96c0df2278a4681172fb40291253049a3ab57ffa2c46c24a0ba" +checksum = "96dbd6c06c79b474704aff381c7cbbf1294401880a13bf08efcf7c8c79baedad" dependencies = [ "anyhow", "cargo_metadata", + "derive_builder", "dirs", "docker-generate", "hex", "risc0-binfmt", "risc0-zkp", "risc0-zkvm-platform", + "rzup", "serde", "serde_json", + "stability", "tempfile", ] [[package]] name = "risc0-build-kernel" -version = "1.2.2" +version = "1.3.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23f29e33a7c90e9c326e2af642030ff155f88338ebbf09d64ac5faacabd423e1" +checksum = "576aaacc0ea4e324745fded3e0a31f228d6815954dd1149ba495aae653d000fb" dependencies = [ "cc", "directories", @@ -4654,9 +4816,9 @@ dependencies = [ [[package]] name = "risc0-circuit-keccak" -version = "1.2.2" +version = "1.3.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25beb2e593a72e4baa3ed9a18a2ee4148f629bfa9dcdac5cbe84faa12d2590d1" +checksum = "fc543b01c3c4278d2a49bf205504cf32a577827367a69acc6e1683c1876a02eb" dependencies = [ "anyhow", "bytemuck", @@ -4676,9 +4838,9 @@ dependencies = [ [[package]] name = "risc0-circuit-keccak-sys" -version = "1.2.2" +version = "1.3.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a910fc9d6c0b57628326b38358c5bd2bfb44d4588e6308a08072e7a4dd31378" +checksum = "97cc4ad9b6b7db6a6324fa7f730d9936771984413cd54eb4e2896ab0cb8bf667" dependencies = [ "cc", "cust", @@ -4692,9 +4854,9 @@ dependencies = [ [[package]] name = "risc0-circuit-recursion" -version = "1.2.2" +version = "1.3.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e02357d6333355b2f9f3903149757fec59c59ef7cefd7494738446f33148cd00" +checksum = "ba0ae9430b01572e20e43280cbfdf7ec8133480a0866974cef440bea45e42cf0" dependencies = [ "anyhow", "bytemuck", @@ -4718,9 +4880,9 @@ dependencies = [ [[package]] name = "risc0-circuit-recursion-sys" -version = "1.2.2" +version = "1.3.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2ef7b40cbafb07ec994c4d317096e72cf22998f6c0e7873db31bbb2f6377478" +checksum = "d8fc6fc72d33a3a987ba4f46734c2b0228d84d1f31b924c838115512b05aacb0" dependencies = [ "glob", "risc0-build-kernel", @@ -4731,9 +4893,9 @@ dependencies = [ [[package]] name = "risc0-circuit-rv32im" -version = "1.2.2" +version = "1.3.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d062e3ee0a8a788cfeff90777e95792d58520fb71b40c28a04000277a3f0054d" +checksum = "5a715b318b7e892557933b69b7332fae16f22633bc487cd1c45b457400d60302" dependencies = [ "anyhow", "auto_ops", @@ -4746,8 +4908,8 @@ dependencies = [ "derive_more 1.0.0", "enum-map", "lazy-regex", + "malachite", "metal", - "num-bigint 0.4.6", "num-derive", "num-traits", "rand", @@ -4760,14 +4922,15 @@ dependencies = [ "risc0-zkvm-platform", "serde", "sha2", + "smallvec", "tracing", ] [[package]] name = "risc0-circuit-rv32im-sys" -version = "1.2.2" +version = "1.3.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28a380438dbfcc4e1780f455bb63d3aac7c821e06e188f18652467915209d4f9" +checksum = "77fd6016d9dd98579f7a4876d19ea3eceb30f12f481521c0b51395048651c5fb" dependencies = [ "glob", "risc0-build-kernel", @@ -4778,9 +4941,9 @@ dependencies = [ [[package]] name = "risc0-core" -version = "1.2.2" +version = "1.3.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da950fcd306644dc5c2c0a09ad288901450eb5f41c42f4f2120be2949f63cd2e" +checksum = "2d8e1a37b233b2c16d84db616bb8ae165e953dcf06de9f64cd3d8d5c902e8bc9" dependencies = [ "bytemuck", "nvtx", @@ -4806,9 +4969,9 @@ dependencies = [ [[package]] name = "risc0-groth16" -version = "1.2.2" +version = "1.3.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "414481d8f3f8c666a7f45b03dd9c5e32cc6dadb2abd0f55b9460386f731eeb4a" +checksum = "d60003870cb21e500c19c827b7d3d908820e7cdfd5986a18f477ac8005263801" dependencies = [ "anyhow", "ark-bn254", @@ -4831,9 +4994,9 @@ dependencies = [ [[package]] name = "risc0-sys" -version = "1.2.2" +version = "1.3.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "048046fedafcab0084477b31a8ba3b9e25c6dc9d0fa5fafa7ed16de03f46e459" +checksum = "59d9d2e18fe886c923a3c89e2787b944df6be6782764edc66d78cb3409db3c5d" dependencies = [ "anyhow", "cust", @@ -4843,9 +5006,9 @@ dependencies = [ [[package]] name = "risc0-zkp" -version = "1.2.2" +version = "1.3.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddf3776370f26ea04e50f7e6f9d2468807aa1049063ca1b9000e1974d092ddc5" +checksum = "e188a0ce7bc634a117cd289eaa498bd50b7c54231878a0b843869f8018e6b60f" dependencies = [ "anyhow", "blake2", @@ -4869,14 +5032,15 @@ dependencies = [ "risc0-zkvm-platform", "serde", "sha2", + "stability", "tracing", ] [[package]] name = "risc0-zkvm" -version = "1.2.2" +version = "1.3.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6700c4875b90726b7bf9e981fccbde4ea11b3593d3b2ac6fa09c96f6de166152" +checksum = "92f5c1a602d33b7db8cd96166eca43a26fcbb433746a16e7388f9a310f873035" dependencies = [ "addr2line 0.22.0", "anyhow", @@ -4885,9 +5049,10 @@ dependencies = [ "borsh", "bytemuck", "bytes", + "derive_more 2.0.1", "elf", "enum-map", - "getrandom", + "getrandom 0.2.12", "hex", "keccak", "lazy-regex", @@ -4907,7 +5072,8 @@ dependencies = [ "risc0-zkvm-platform", "rrs-lib", "rustc-demangle", - "semver 1.0.22", + "rzup", + "semver 1.0.25", "serde", "sha2", "stability", @@ -4918,13 +5084,13 @@ dependencies = [ [[package]] name = "risc0-zkvm-platform" -version = "1.2.2" +version = "1.3.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6b5ac61f6d36b02655a415a8a2afd021aa260402d45deff5524c80dbc521f29" +checksum = "f38cf59c4722f6b42bd361aa11058bf14b995de6cdd48e27d6862d712602cc63" dependencies = [ "bytemuck", "cfg-if", - "getrandom", + "getrandom 0.2.12", "libm", "stability", ] @@ -5085,20 +5251,20 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ - "semver 1.0.22", + "semver 1.0.25", ] [[package]] name = "rustix" -version = "0.38.37" +version = "0.38.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" dependencies = [ "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -5176,6 +5342,21 @@ version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +[[package]] +name = "rzup" +version = "0.3.0-rc.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11733f92111d8e67d4981f15d6685f4777e5ffb33cbcec98779ceeeab22beadf" +dependencies = [ + "semver 1.0.25", + "serde", + "strum", + "tempfile", + "thiserror 2.0.11", + "toml", + "yaml-rust2", +] + [[package]] name = "schannel" version = "0.1.26" @@ -5259,9 +5440,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.22" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03" dependencies = [ "serde", ] @@ -5283,18 +5464,18 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.210" +version = "1.0.218" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +checksum = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.210" +version = "1.0.218" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b" dependencies = [ "proc-macro2", "quote", @@ -5303,9 +5484,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "44f86c3acccc9c65b153fe1b85a3be07fe5515274ec9f0653b4a0875731c72a6" dependencies = [ "indexmap 2.6.0", "itoa", @@ -5314,6 +5495,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_spanned" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" +dependencies = [ + "serde", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -5530,12 +5720,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - [[package]] name = "strsim" version = "0.11.1" @@ -5544,20 +5728,20 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" -version = "0.26.2" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.26.2" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2", "quote", "rustversion", @@ -5652,12 +5836,13 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.13.0" +version = "3.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" +checksum = "22e5a0acb1f3f55f65cc4a866c361b2fb2a0ff6366785ae6fbb5f85df07ba230" dependencies = [ "cfg-if", "fastrand", + "getrandom 0.3.1", "once_cell", "rustix", "windows-sys 0.59.0", @@ -5878,11 +6063,26 @@ dependencies = [ "tokio", ] +[[package]] +name = "toml" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.22.24", +] + [[package]] name = "toml_datetime" version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +dependencies = [ + "serde", +] [[package]] name = "toml_edit" @@ -5897,13 +6097,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.22" +version = "0.22.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" +checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474" dependencies = [ "indexmap 2.6.0", + "serde", + "serde_spanned", "toml_datetime", - "winnow 0.6.20", + "winnow 0.7.3", ] [[package]] @@ -6207,6 +6409,15 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "wasi" +version = "0.13.3+wasi-0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2" +dependencies = [ + "wit-bindgen-rt", +] + [[package]] name = "wasm-bindgen" version = "0.2.92" @@ -6528,6 +6739,24 @@ dependencies = [ "memchr", ] +[[package]] +name = "winnow" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7f4ea97f6f78012141bcdb6a216b2609f0979ada50b20ca5b52dde2eac2bb1" +dependencies = [ + "memchr", +] + +[[package]] +name = "wit-bindgen-rt" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c" +dependencies = [ + "bitflags 2.6.0", +] + [[package]] name = "ws_stream_wasm" version = "0.7.4" @@ -6565,6 +6794,17 @@ dependencies = [ "lzma-sys", ] +[[package]] +name = "yaml-rust2" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a1a1c0bc9823338a3bdf8c61f994f23ac004c6fa32c08cd152984499b445e8d" +dependencies = [ + "arraydeque", + "encoding_rs", + "hashlink", +] + [[package]] name = "zerocopy" version = "0.7.32" diff --git a/Cargo.toml b/Cargo.toml index f0db81ee..b9ca4eca 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,15 +18,15 @@ opt-level = 3 # RISC Zero [workspace.dependencies.bonsai-sdk] -version = "1.2.2" +version = "1.3.0-rc.1" features = ["non_blocking"] [workspace.dependencies.risc0-build] -version = "1.2.2" +version = "2.0.0-rc.1" features = ["unstable"] [workspace.dependencies.risc0-zkvm] -version = "1.2.2" +version = "1.3.0-rc.1" features = ["unstable"] [workspace.dependencies.risc0-ethereum-trie] diff --git a/README.md b/README.md index 815e45d3..be312f86 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ By using reth to run the block execution process within the zkVM, we obtain a ZK ## Status -Zeth uses version `1.2.2` of the RISC Zero zkVM and version 1.1.0 of reth (backed by revm 14.0.3), but its other components are not audited for use in production. +Zeth uses version `1.3.0-rc` of the RISC Zero zkVM and version 1.1.0 of reth (backed by revm 14.0.3), but its other components are not audited for use in production. ## Prerequisites 1. [rust](https://www.rust-lang.org/tools/install) diff --git a/guests/build.rs b/guests/build.rs index b44aeab0..3316a575 100644 --- a/guests/build.rs +++ b/guests/build.rs @@ -16,20 +16,17 @@ fn main() { let cwd = std::env::current_dir().unwrap(); let root_dir = cwd.parent().map(|d| d.to_path_buf()); + let mut guest_opts = risc0_build::GuestOptionsBuilder::default(); + guest_opts.use_docker( + risc0_build::DockerOptionsBuilder::default() + .root_dir(root_dir.unwrap()) + .build() + .unwrap(), + ); let build_opts = std::collections::HashMap::from_iter( ["zeth-guests-reth-ethereum", "zeth-guests-reth-optimism"] .into_iter() - .map(|guest_pkg| { - ( - guest_pkg, - risc0_build::GuestOptions { - features: vec![], - use_docker: Some(risc0_build::DockerOptions { - root_dir: root_dir.clone(), - }), - }, - ) - }), + .map(|guest_pkg| (guest_pkg, guest_opts.build().unwrap())), ); risc0_build::embed_methods_with_options(build_opts); } diff --git a/guests/reth-ethereum/Cargo.lock b/guests/reth-ethereum/Cargo.lock index 1d29c18a..8e44d7cf 100644 --- a/guests/reth-ethereum/Cargo.lock +++ b/guests/reth-ethereum/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -69,7 +69,7 @@ dependencies = [ "alloy-serde", "auto_impl", "c-kzg", - "derive_more", + "derive_more 1.0.0", "serde", ] @@ -108,7 +108,7 @@ dependencies = [ "alloy-rlp", "alloy-serde", "c-kzg", - "derive_more", + "derive_more 1.0.0", "once_cell", "serde", "sha2", @@ -160,9 +160,9 @@ dependencies = [ "bytes", "cfg-if", "const-hex", - "derive_more", + "derive_more 1.0.0", "foldhash", - "getrandom", + "getrandom 0.2.15", "hashbrown 0.15.2", "indexmap 2.6.0", "itoa", @@ -225,7 +225,7 @@ dependencies = [ "alloy-rlp", "alloy-serde", "alloy-sol-types", - "derive_more", + "derive_more 1.0.0", "itertools 0.13.0", "serde", "serde_json", @@ -296,7 +296,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b853d42292dbb159671a3edae3b2750277ff130f32b726fe07dc2b17aa6f2b5" dependencies = [ "serde", - "winnow", + "winnow 0.6.20", ] [[package]] @@ -320,7 +320,7 @@ checksum = "e9703ce68b97f8faae6f7739d1e003fc97621b856953cbcdbb2b515743f23288" dependencies = [ "alloy-primitives", "alloy-rlp", - "derive_more", + "derive_more 1.0.0", "nybbles 0.2.1", "serde", "smallvec", @@ -336,7 +336,7 @@ dependencies = [ "alloy-primitives", "alloy-rlp", "arrayvec", - "derive_more", + "derive_more 1.0.0", "nybbles 0.3.4", "serde", "smallvec", @@ -598,6 +598,12 @@ dependencies = [ "rand", ] +[[package]] +name = "arraydeque" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236" + [[package]] name = "arrayvec" version = "0.7.6" @@ -763,9 +769,9 @@ dependencies = [ [[package]] name = "bonsai-sdk" -version = "1.2.2" +version = "1.3.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a6c42e9ac4df9f62aade6f4a7fab56db33d4518d1cac37434f040f610f6d40" +checksum = "3c49e03d822e1948ab91acd586de5a5c7790f2380886cc29d64504e2a6445b6a" dependencies = [ "duplicate", "maybe-async", @@ -902,16 +908,16 @@ dependencies = [ [[package]] name = "cargo_metadata" -version = "0.18.1" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" +checksum = "8769706aad5d996120af43197bf46ef6ad0fda35216b4505f926a365a232d924" dependencies = [ "camino", "cargo-platform", "semver 1.0.23", "serde", "serde_json", - "thiserror 1.0.65", + "thiserror 2.0.11", ] [[package]] @@ -1066,7 +1072,7 @@ version = "0.5.5" source = "git+https://github.com/risc0/RustCrypto-crypto-bigint?tag=v0.5.5-risczero.0#3ab63a6f1048833f7047d5a50532e4a4cc789384" dependencies = [ "generic-array", - "getrandom", + "getrandom 0.2.15", "rand_core", "subtle", "zeroize", @@ -1149,13 +1155,53 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "derive_builder" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.96", +] + +[[package]] +name = "derive_builder_macro" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" +dependencies = [ + "derive_builder_core", + "syn 2.0.96", +] + [[package]] name = "derive_more" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" dependencies = [ - "derive_more-impl", + "derive_more-impl 1.0.0", +] + +[[package]] +name = "derive_more" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678" +dependencies = [ + "derive_more-impl 2.0.1", ] [[package]] @@ -1171,6 +1217,18 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "derive_more-impl" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", + "unicode-xid", +] + [[package]] name = "digest" version = "0.9.0" @@ -1295,6 +1353,15 @@ dependencies = [ "zeroize", ] +[[package]] +name = "encoding_rs" +version = "0.8.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" +dependencies = [ + "cfg-if", +] + [[package]] name = "enr" version = "0.12.1" @@ -1330,12 +1397,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -1513,10 +1580,22 @@ dependencies = [ "cfg-if", "js-sys", "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", "wasm-bindgen", ] +[[package]] +name = "getrandom" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.13.3+wasi-0.2.2", + "windows-targets 0.52.6", +] + [[package]] name = "gimli" version = "0.31.1" @@ -1565,6 +1644,15 @@ dependencies = [ "ahash", ] +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash", +] + [[package]] name = "hashbrown" version = "0.15.2" @@ -1578,6 +1666,15 @@ dependencies = [ "serde", ] +[[package]] +name = "hashlink" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" +dependencies = [ + "hashbrown 0.14.5", +] + [[package]] name = "heck" version = "0.4.1" @@ -1863,7 +1960,7 @@ dependencies = [ [[package]] name = "k256" version = "0.13.3" -source = "git+https://github.com/risc0/RustCrypto-elliptic-curves?tag=k256/v0.13.3-risczero.1#ff5d67b095cfcc2569b7789f2079ed87ef2c7756" +source = "git+https://github.com/risc0/RustCrypto-elliptic-curves?tag=k256%2Fv0.13.3-risczero.1#ff5d67b095cfcc2569b7789f2079ed87ef2c7756" dependencies = [ "bytemuck", "cfg-if", @@ -2056,7 +2153,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.52.0", ] @@ -2272,7 +2369,7 @@ dependencies = [ "alloy-primitives", "alloy-rlp", "alloy-serde", - "derive_more", + "derive_more 1.0.0", "serde", "spin", ] @@ -2588,7 +2685,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d" dependencies = [ "bytes", - "getrandom", + "getrandom 0.2.15", "rand", "ring", "rustc-hash", @@ -2667,7 +2764,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom", + "getrandom 0.2.15", ] [[package]] @@ -2705,7 +2802,7 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ - "getrandom", + "getrandom 0.2.15", "libredox", "thiserror 1.0.65", ] @@ -2805,7 +2902,7 @@ dependencies = [ "alloy-primitives", "alloy-trie 0.6.0", "auto_impl", - "derive_more", + "derive_more 1.0.0", "once_cell", "reth-ethereum-forks", "reth-network-peers", @@ -2847,7 +2944,7 @@ source = "git+https://github.com/risc0/reth?branch=p1.1.0_zstd#760183fd601f61a3f dependencies = [ "alloy-primitives", "auto_impl", - "derive_more", + "derive_more 1.0.0", "reth-primitives", ] @@ -2871,7 +2968,7 @@ dependencies = [ "alloy-genesis", "alloy-primitives", "bytes", - "derive_more", + "derive_more 1.0.0", "metrics", "modular-bitfield", "parity-scale-codec", @@ -2978,7 +3075,7 @@ dependencies = [ "alloy-eips", "alloy-primitives", "alloy-rlp", - "derive_more", + "derive_more 1.0.0", "nybbles 0.2.1", "reth-consensus", "reth-prune-types", @@ -3043,7 +3140,7 @@ dependencies = [ "alloy-rpc-types", "alloy-serde", "bytes", - "derive_more", + "derive_more 1.0.0", "k256", "modular-bitfield", "once_cell", @@ -3071,7 +3168,7 @@ dependencies = [ "alloy-rlp", "byteorder", "bytes", - "derive_more", + "derive_more 1.0.0", "modular-bitfield", "reth-codecs", "revm-primitives", @@ -3086,7 +3183,7 @@ source = "git+https://github.com/risc0/reth?branch=p1.1.0_zstd#760183fd601f61a3f dependencies = [ "alloy-primitives", "bytes", - "derive_more", + "derive_more 1.0.0", "modular-bitfield", "reth-codecs", "serde", @@ -3128,7 +3225,7 @@ version = "1.1.0" source = "git+https://github.com/risc0/reth?branch=p1.1.0_zstd#760183fd601f61a3f4a1713cec27d89ace215f04" dependencies = [ "alloy-primitives", - "derive_more", + "derive_more 1.0.0", "serde", "strum", ] @@ -3160,7 +3257,7 @@ dependencies = [ "alloy-eips", "alloy-primitives", "alloy-rlp", - "derive_more", + "derive_more 1.0.0", "reth-fs-util", "reth-primitives", ] @@ -3173,7 +3270,7 @@ dependencies = [ "alloy-primitives", "alloy-rlp", "auto_impl", - "derive_more", + "derive_more 1.0.0", "itertools 0.13.0", "rayon", "reth-execution-errors", @@ -3196,7 +3293,7 @@ dependencies = [ "alloy-rlp", "alloy-trie 0.6.0", "bytes", - "derive_more", + "derive_more 1.0.0", "itertools 0.13.0", "nybbles 0.2.1", "reth-codecs", @@ -3287,7 +3384,7 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", "cfg-if", - "getrandom", + "getrandom 0.2.15", "libc", "spin", "untrusted", @@ -3315,12 +3412,13 @@ dependencies = [ [[package]] name = "risc0-binfmt" -version = "1.2.2" +version = "1.3.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fac7b3a4d7f6e86b2be2daf0ec53b9b8740895ff8279011cee24e4bae72cd77e" +checksum = "253c4dea656db2eda4fffebeb9782f3c3413f73bd6032bdbd388a5aac862e39b" dependencies = [ "anyhow", "borsh", + "derive_more 1.0.0", "elf", "risc0-zkp", "risc0-zkvm-platform", @@ -3330,28 +3428,31 @@ dependencies = [ [[package]] name = "risc0-build" -version = "1.2.2" +version = "2.0.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4481ff9a05c3d96c0df2278a4681172fb40291253049a3ab57ffa2c46c24a0ba" +checksum = "96dbd6c06c79b474704aff381c7cbbf1294401880a13bf08efcf7c8c79baedad" dependencies = [ "anyhow", "cargo_metadata", + "derive_builder", "dirs", "docker-generate", "hex", "risc0-binfmt", "risc0-zkp", "risc0-zkvm-platform", + "rzup", "serde", "serde_json", + "stability", "tempfile", ] [[package]] name = "risc0-circuit-keccak" -version = "1.2.2" +version = "1.3.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25beb2e593a72e4baa3ed9a18a2ee4148f629bfa9dcdac5cbe84faa12d2590d1" +checksum = "fc543b01c3c4278d2a49bf205504cf32a577827367a69acc6e1683c1876a02eb" dependencies = [ "anyhow", "bytemuck", @@ -3365,9 +3466,9 @@ dependencies = [ [[package]] name = "risc0-circuit-recursion" -version = "1.2.2" +version = "1.3.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e02357d6333355b2f9f3903149757fec59c59ef7cefd7494738446f33148cd00" +checksum = "ba0ae9430b01572e20e43280cbfdf7ec8133480a0866974cef440bea45e42cf0" dependencies = [ "anyhow", "bytemuck", @@ -3380,9 +3481,9 @@ dependencies = [ [[package]] name = "risc0-circuit-rv32im" -version = "1.2.2" +version = "1.3.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d062e3ee0a8a788cfeff90777e95792d58520fb71b40c28a04000277a3f0054d" +checksum = "5a715b318b7e892557933b69b7332fae16f22633bc487cd1c45b457400d60302" dependencies = [ "anyhow", "metal", @@ -3396,9 +3497,9 @@ dependencies = [ [[package]] name = "risc0-core" -version = "1.2.2" +version = "1.3.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da950fcd306644dc5c2c0a09ad288901450eb5f41c42f4f2120be2949f63cd2e" +checksum = "2d8e1a37b233b2c16d84db616bb8ae165e953dcf06de9f64cd3d8d5c902e8bc9" dependencies = [ "bytemuck", "rand_core", @@ -3422,9 +3523,9 @@ dependencies = [ [[package]] name = "risc0-groth16" -version = "1.2.2" +version = "1.3.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "414481d8f3f8c666a7f45b03dd9c5e32cc6dadb2abd0f55b9460386f731eeb4a" +checksum = "d60003870cb21e500c19c827b7d3d908820e7cdfd5986a18f477ac8005263801" dependencies = [ "anyhow", "ark-bn254", @@ -3443,9 +3544,9 @@ dependencies = [ [[package]] name = "risc0-zkp" -version = "1.2.2" +version = "1.3.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddf3776370f26ea04e50f7e6f9d2468807aa1049063ca1b9000e1974d092ddc5" +checksum = "e188a0ce7bc634a117cd289eaa498bd50b7c54231878a0b843869f8018e6b60f" dependencies = [ "anyhow", "blake2", @@ -3462,14 +3563,15 @@ dependencies = [ "risc0-zkvm-platform", "serde", "sha2", + "stability", "tracing", ] [[package]] name = "risc0-zkvm" -version = "1.2.2" +version = "1.3.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6700c4875b90726b7bf9e981fccbde4ea11b3593d3b2ac6fa09c96f6de166152" +checksum = "92f5c1a602d33b7db8cd96166eca43a26fcbb433746a16e7388f9a310f873035" dependencies = [ "anyhow", "bincode", @@ -3477,7 +3579,8 @@ dependencies = [ "borsh", "bytemuck", "bytes", - "getrandom", + "derive_more 2.0.1", + "getrandom 0.2.15", "hex", "lazy-regex", "prost", @@ -3491,6 +3594,7 @@ dependencies = [ "risc0-zkp", "risc0-zkvm-platform", "rrs-lib", + "rzup", "semver 1.0.23", "serde", "sha2", @@ -3501,13 +3605,13 @@ dependencies = [ [[package]] name = "risc0-zkvm-platform" -version = "1.2.2" +version = "1.3.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6b5ac61f6d36b02655a415a8a2afd021aa260402d45deff5524c80dbc521f29" +checksum = "f38cf59c4722f6b42bd361aa11058bf14b995de6cdd48e27d6862d712602cc63" dependencies = [ "bytemuck", "cfg-if", - "getrandom", + "getrandom 0.2.15", "libm", "stability", ] @@ -3643,15 +3747,15 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.38" +version = "0.38.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa260229e6538e52293eeb577aabd09945a09d6d9cc0fc550ed7529056c2e32a" +checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" dependencies = [ "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3721,6 +3825,21 @@ version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" +[[package]] +name = "rzup" +version = "0.3.0-rc.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11733f92111d8e67d4981f15d6685f4777e5ffb33cbcec98779ceeeab22beadf" +dependencies = [ + "semver 1.0.23", + "serde", + "strum", + "tempfile", + "thiserror 2.0.11", + "toml", + "yaml-rust2", +] + [[package]] name = "scopeguard" version = "1.2.0" @@ -3790,18 +3909,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.214" +version = "1.0.218" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5" +checksum = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.214" +version = "1.0.218" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766" +checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b" dependencies = [ "proc-macro2", "quote", @@ -3810,9 +3929,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.132" +version = "1.0.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" +checksum = "44f86c3acccc9c65b153fe1b85a3be07fe5515274ec9f0653b4a0875731c72a6" dependencies = [ "indexmap 2.6.0", "itoa", @@ -3821,6 +3940,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_spanned" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" +dependencies = [ + "serde", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -4098,12 +4226,13 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.13.0" +version = "3.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" +checksum = "22e5a0acb1f3f55f65cc4a866c361b2fb2a0ff6366785ae6fbb5f85df07ba230" dependencies = [ "cfg-if", "fastrand", + "getrandom 0.3.1", "once_cell", "rustix", "windows-sys 0.59.0", @@ -4212,7 +4341,7 @@ dependencies = [ [[package]] name = "tiny-keccak" version = "2.0.2" -source = "git+https://github.com/risc0/tiny-keccak?tag=tiny-keccak/v2.0.2-risczero.0#8fcc866dc94dcec3e79c3b2bc8fbc51b22f2d5e1" +source = "git+https://github.com/risc0/tiny-keccak?tag=tiny-keccak%2Fv2.0.2-risczero.0#8fcc866dc94dcec3e79c3b2bc8fbc51b22f2d5e1" dependencies = [ "crunchy", ] @@ -4270,21 +4399,38 @@ dependencies = [ "tokio", ] +[[package]] +name = "toml" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + [[package]] name = "toml_datetime" version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +dependencies = [ + "serde", +] [[package]] name = "toml_edit" -version = "0.22.22" +version = "0.22.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" +checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474" dependencies = [ "indexmap 2.6.0", + "serde", + "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.7.3", ] [[package]] @@ -4484,6 +4630,15 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "wasi" +version = "0.13.3+wasi-0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2" +dependencies = [ + "wit-bindgen-rt", +] + [[package]] name = "wasm-bindgen" version = "0.2.95" @@ -4789,6 +4944,24 @@ dependencies = [ "memchr", ] +[[package]] +name = "winnow" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7f4ea97f6f78012141bcdb6a216b2609f0979ada50b20ca5b52dde2eac2bb1" +dependencies = [ + "memchr", +] + +[[package]] +name = "wit-bindgen-rt" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c" +dependencies = [ + "bitflags 2.6.0", +] + [[package]] name = "wyz" version = "0.5.1" @@ -4798,6 +4971,17 @@ dependencies = [ "tap", ] +[[package]] +name = "yaml-rust2" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a1a1c0bc9823338a3bdf8c61f994f23ac004c6fa32c08cd152984499b445e8d" +dependencies = [ + "arraydeque", + "encoding_rs", + "hashlink", +] + [[package]] name = "zerocopy" version = "0.7.35" diff --git a/guests/reth-ethereum/Cargo.toml b/guests/reth-ethereum/Cargo.toml index c1f59956..290a77e6 100644 --- a/guests/reth-ethereum/Cargo.toml +++ b/guests/reth-ethereum/Cargo.toml @@ -15,11 +15,11 @@ codegen-units = 1 opt-level = 3 [dependencies.risc0-zkvm] -version = "1.2.2" +version = "1.3.0-rc.1" features = ["unstable"] [dependencies.risc0-zkvm-platform] -version = "1.2.2" +version = "1.3.0-rc.1" features = ["sys-getenv"] [dependencies.zeth-core] diff --git a/guests/reth-optimism/Cargo.lock b/guests/reth-optimism/Cargo.lock index e6125b5f..a51980d4 100644 --- a/guests/reth-optimism/Cargo.lock +++ b/guests/reth-optimism/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -69,7 +69,7 @@ dependencies = [ "alloy-serde", "auto_impl", "c-kzg", - "derive_more", + "derive_more 1.0.0", "serde", ] @@ -108,7 +108,7 @@ dependencies = [ "alloy-rlp", "alloy-serde", "c-kzg", - "derive_more", + "derive_more 1.0.0", "once_cell", "serde", "sha2", @@ -148,9 +148,9 @@ dependencies = [ "bytes", "cfg-if", "const-hex", - "derive_more", + "derive_more 1.0.0", "foldhash", - "getrandom", + "getrandom 0.2.15", "hashbrown 0.15.2", "indexmap 2.6.0", "itoa", @@ -213,7 +213,7 @@ dependencies = [ "alloy-rlp", "alloy-serde", "alloy-sol-types", - "derive_more", + "derive_more 1.0.0", "itertools 0.13.0", "serde", "serde_json", @@ -296,7 +296,7 @@ checksum = "e9703ce68b97f8faae6f7739d1e003fc97621b856953cbcdbb2b515743f23288" dependencies = [ "alloy-primitives", "alloy-rlp", - "derive_more", + "derive_more 1.0.0", "nybbles 0.2.1", "serde", "smallvec", @@ -312,7 +312,7 @@ dependencies = [ "alloy-primitives", "alloy-rlp", "arrayvec", - "derive_more", + "derive_more 1.0.0", "nybbles 0.3.4", "serde", "smallvec", @@ -574,6 +574,12 @@ dependencies = [ "rand", ] +[[package]] +name = "arraydeque" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236" + [[package]] name = "arrayvec" version = "0.7.6" @@ -739,9 +745,9 @@ dependencies = [ [[package]] name = "bonsai-sdk" -version = "1.2.2" +version = "1.3.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a6c42e9ac4df9f62aade6f4a7fab56db33d4518d1cac37434f040f610f6d40" +checksum = "3c49e03d822e1948ab91acd586de5a5c7790f2380886cc29d64504e2a6445b6a" dependencies = [ "duplicate", "maybe-async", @@ -878,16 +884,16 @@ dependencies = [ [[package]] name = "cargo_metadata" -version = "0.18.1" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" +checksum = "8769706aad5d996120af43197bf46ef6ad0fda35216b4505f926a365a232d924" dependencies = [ "camino", "cargo-platform", "semver 1.0.23", "serde", "serde_json", - "thiserror 1.0.65", + "thiserror 2.0.11", ] [[package]] @@ -1042,7 +1048,7 @@ version = "0.5.5" source = "git+https://github.com/risc0/RustCrypto-crypto-bigint?tag=v0.5.5-risczero.0#3ab63a6f1048833f7047d5a50532e4a4cc789384" dependencies = [ "generic-array", - "getrandom", + "getrandom 0.2.15", "rand_core", "subtle", "zeroize", @@ -1125,13 +1131,53 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "derive_builder" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.96", +] + +[[package]] +name = "derive_builder_macro" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" +dependencies = [ + "derive_builder_core", + "syn 2.0.96", +] + [[package]] name = "derive_more" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" dependencies = [ - "derive_more-impl", + "derive_more-impl 1.0.0", +] + +[[package]] +name = "derive_more" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678" +dependencies = [ + "derive_more-impl 2.0.1", ] [[package]] @@ -1147,6 +1193,18 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "derive_more-impl" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", + "unicode-xid", +] + [[package]] name = "digest" version = "0.9.0" @@ -1271,6 +1329,15 @@ dependencies = [ "zeroize", ] +[[package]] +name = "encoding_rs" +version = "0.8.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" +dependencies = [ + "cfg-if", +] + [[package]] name = "enr" version = "0.12.1" @@ -1306,12 +1373,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -1489,10 +1556,22 @@ dependencies = [ "cfg-if", "js-sys", "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", "wasm-bindgen", ] +[[package]] +name = "getrandom" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.13.3+wasi-0.2.2", + "windows-targets 0.52.6", +] + [[package]] name = "gimli" version = "0.31.1" @@ -1541,6 +1620,15 @@ dependencies = [ "ahash", ] +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash", +] + [[package]] name = "hashbrown" version = "0.15.2" @@ -1554,6 +1642,15 @@ dependencies = [ "serde", ] +[[package]] +name = "hashlink" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" +dependencies = [ + "hashbrown 0.14.5", +] + [[package]] name = "heck" version = "0.4.1" @@ -1839,7 +1936,7 @@ dependencies = [ [[package]] name = "k256" version = "0.13.3" -source = "git+https://github.com/risc0/RustCrypto-elliptic-curves?tag=k256/v0.13.3-risczero.1#ff5d67b095cfcc2569b7789f2079ed87ef2c7756" +source = "git+https://github.com/risc0/RustCrypto-elliptic-curves?tag=k256%2Fv0.13.3-risczero.1#ff5d67b095cfcc2569b7789f2079ed87ef2c7756" dependencies = [ "bytemuck", "cfg-if", @@ -2032,7 +2129,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.52.0", ] @@ -2248,7 +2345,7 @@ dependencies = [ "alloy-primitives", "alloy-rlp", "alloy-serde", - "derive_more", + "derive_more 1.0.0", "serde", "spin", ] @@ -2585,7 +2682,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d" dependencies = [ "bytes", - "getrandom", + "getrandom 0.2.15", "rand", "ring", "rustc-hash", @@ -2664,7 +2761,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom", + "getrandom 0.2.15", ] [[package]] @@ -2702,7 +2799,7 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ - "getrandom", + "getrandom 0.2.15", "libredox", "thiserror 1.0.65", ] @@ -2802,7 +2899,7 @@ dependencies = [ "alloy-primitives", "alloy-trie 0.6.0", "auto_impl", - "derive_more", + "derive_more 1.0.0", "once_cell", "reth-ethereum-forks", "reth-network-peers", @@ -2846,7 +2943,7 @@ source = "git+https://github.com/risc0/reth?branch=p1.1.0_zstd#760183fd601f61a3f dependencies = [ "alloy-primitives", "auto_impl", - "derive_more", + "derive_more 1.0.0", "reth-primitives", ] @@ -2870,7 +2967,7 @@ dependencies = [ "alloy-genesis", "alloy-primitives", "bytes", - "derive_more", + "derive_more 1.0.0", "metrics", "modular-bitfield", "parity-scale-codec", @@ -2945,7 +3042,7 @@ dependencies = [ "alloy-eips", "alloy-primitives", "alloy-rlp", - "derive_more", + "derive_more 1.0.0", "nybbles 0.2.1", "reth-consensus", "reth-prune-types", @@ -3006,7 +3103,7 @@ dependencies = [ "alloy-chains", "alloy-genesis", "alloy-primitives", - "derive_more", + "derive_more 1.0.0", "once_cell", "op-alloy-rpc-types", "reth-chainspec", @@ -3080,7 +3177,7 @@ dependencies = [ "alloy-rpc-types", "alloy-serde", "bytes", - "derive_more", + "derive_more 1.0.0", "k256", "modular-bitfield", "once_cell", @@ -3110,7 +3207,7 @@ dependencies = [ "alloy-rlp", "byteorder", "bytes", - "derive_more", + "derive_more 1.0.0", "modular-bitfield", "reth-codecs", "revm-primitives", @@ -3125,7 +3222,7 @@ source = "git+https://github.com/risc0/reth?branch=p1.1.0_zstd#760183fd601f61a3f dependencies = [ "alloy-primitives", "bytes", - "derive_more", + "derive_more 1.0.0", "modular-bitfield", "reth-codecs", "serde", @@ -3167,7 +3264,7 @@ version = "1.1.0" source = "git+https://github.com/risc0/reth?branch=p1.1.0_zstd#760183fd601f61a3f4a1713cec27d89ace215f04" dependencies = [ "alloy-primitives", - "derive_more", + "derive_more 1.0.0", "serde", "strum", ] @@ -3199,7 +3296,7 @@ dependencies = [ "alloy-eips", "alloy-primitives", "alloy-rlp", - "derive_more", + "derive_more 1.0.0", "reth-fs-util", "reth-primitives", ] @@ -3212,7 +3309,7 @@ dependencies = [ "alloy-primitives", "alloy-rlp", "auto_impl", - "derive_more", + "derive_more 1.0.0", "itertools 0.13.0", "rayon", "reth-execution-errors", @@ -3235,7 +3332,7 @@ dependencies = [ "alloy-rlp", "alloy-trie 0.6.0", "bytes", - "derive_more", + "derive_more 1.0.0", "itertools 0.13.0", "nybbles 0.2.1", "reth-codecs", @@ -3327,7 +3424,7 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", "cfg-if", - "getrandom", + "getrandom 0.2.15", "libc", "spin", "untrusted", @@ -3355,12 +3452,13 @@ dependencies = [ [[package]] name = "risc0-binfmt" -version = "1.2.2" +version = "1.3.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fac7b3a4d7f6e86b2be2daf0ec53b9b8740895ff8279011cee24e4bae72cd77e" +checksum = "253c4dea656db2eda4fffebeb9782f3c3413f73bd6032bdbd388a5aac862e39b" dependencies = [ "anyhow", "borsh", + "derive_more 1.0.0", "elf", "risc0-zkp", "risc0-zkvm-platform", @@ -3370,28 +3468,31 @@ dependencies = [ [[package]] name = "risc0-build" -version = "1.2.2" +version = "2.0.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4481ff9a05c3d96c0df2278a4681172fb40291253049a3ab57ffa2c46c24a0ba" +checksum = "96dbd6c06c79b474704aff381c7cbbf1294401880a13bf08efcf7c8c79baedad" dependencies = [ "anyhow", "cargo_metadata", + "derive_builder", "dirs", "docker-generate", "hex", "risc0-binfmt", "risc0-zkp", "risc0-zkvm-platform", + "rzup", "serde", "serde_json", + "stability", "tempfile", ] [[package]] name = "risc0-circuit-keccak" -version = "1.2.2" +version = "1.3.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25beb2e593a72e4baa3ed9a18a2ee4148f629bfa9dcdac5cbe84faa12d2590d1" +checksum = "fc543b01c3c4278d2a49bf205504cf32a577827367a69acc6e1683c1876a02eb" dependencies = [ "anyhow", "bytemuck", @@ -3405,9 +3506,9 @@ dependencies = [ [[package]] name = "risc0-circuit-recursion" -version = "1.2.2" +version = "1.3.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e02357d6333355b2f9f3903149757fec59c59ef7cefd7494738446f33148cd00" +checksum = "ba0ae9430b01572e20e43280cbfdf7ec8133480a0866974cef440bea45e42cf0" dependencies = [ "anyhow", "bytemuck", @@ -3420,9 +3521,9 @@ dependencies = [ [[package]] name = "risc0-circuit-rv32im" -version = "1.2.2" +version = "1.3.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d062e3ee0a8a788cfeff90777e95792d58520fb71b40c28a04000277a3f0054d" +checksum = "5a715b318b7e892557933b69b7332fae16f22633bc487cd1c45b457400d60302" dependencies = [ "anyhow", "metal", @@ -3436,9 +3537,9 @@ dependencies = [ [[package]] name = "risc0-core" -version = "1.2.2" +version = "1.3.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da950fcd306644dc5c2c0a09ad288901450eb5f41c42f4f2120be2949f63cd2e" +checksum = "2d8e1a37b233b2c16d84db616bb8ae165e953dcf06de9f64cd3d8d5c902e8bc9" dependencies = [ "bytemuck", "rand_core", @@ -3462,9 +3563,9 @@ dependencies = [ [[package]] name = "risc0-groth16" -version = "1.2.2" +version = "1.3.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "414481d8f3f8c666a7f45b03dd9c5e32cc6dadb2abd0f55b9460386f731eeb4a" +checksum = "d60003870cb21e500c19c827b7d3d908820e7cdfd5986a18f477ac8005263801" dependencies = [ "anyhow", "ark-bn254", @@ -3483,9 +3584,9 @@ dependencies = [ [[package]] name = "risc0-zkp" -version = "1.2.2" +version = "1.3.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddf3776370f26ea04e50f7e6f9d2468807aa1049063ca1b9000e1974d092ddc5" +checksum = "e188a0ce7bc634a117cd289eaa498bd50b7c54231878a0b843869f8018e6b60f" dependencies = [ "anyhow", "blake2", @@ -3502,14 +3603,15 @@ dependencies = [ "risc0-zkvm-platform", "serde", "sha2", + "stability", "tracing", ] [[package]] name = "risc0-zkvm" -version = "1.2.2" +version = "1.3.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6700c4875b90726b7bf9e981fccbde4ea11b3593d3b2ac6fa09c96f6de166152" +checksum = "92f5c1a602d33b7db8cd96166eca43a26fcbb433746a16e7388f9a310f873035" dependencies = [ "anyhow", "bincode", @@ -3517,7 +3619,8 @@ dependencies = [ "borsh", "bytemuck", "bytes", - "getrandom", + "derive_more 2.0.1", + "getrandom 0.2.15", "hex", "lazy-regex", "prost", @@ -3531,6 +3634,7 @@ dependencies = [ "risc0-zkp", "risc0-zkvm-platform", "rrs-lib", + "rzup", "semver 1.0.23", "serde", "sha2", @@ -3541,13 +3645,13 @@ dependencies = [ [[package]] name = "risc0-zkvm-platform" -version = "1.2.2" +version = "1.3.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6b5ac61f6d36b02655a415a8a2afd021aa260402d45deff5524c80dbc521f29" +checksum = "f38cf59c4722f6b42bd361aa11058bf14b995de6cdd48e27d6862d712602cc63" dependencies = [ "bytemuck", "cfg-if", - "getrandom", + "getrandom 0.2.15", "libm", "stability", ] @@ -3683,15 +3787,15 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.38" +version = "0.38.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa260229e6538e52293eeb577aabd09945a09d6d9cc0fc550ed7529056c2e32a" +checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" dependencies = [ "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3761,6 +3865,21 @@ version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" +[[package]] +name = "rzup" +version = "0.3.0-rc.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11733f92111d8e67d4981f15d6685f4777e5ffb33cbcec98779ceeeab22beadf" +dependencies = [ + "semver 1.0.23", + "serde", + "strum", + "tempfile", + "thiserror 2.0.11", + "toml", + "yaml-rust2", +] + [[package]] name = "scopeguard" version = "1.2.0" @@ -3830,18 +3949,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.214" +version = "1.0.218" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5" +checksum = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.214" +version = "1.0.218" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766" +checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b" dependencies = [ "proc-macro2", "quote", @@ -3850,9 +3969,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.132" +version = "1.0.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" +checksum = "44f86c3acccc9c65b153fe1b85a3be07fe5515274ec9f0653b4a0875731c72a6" dependencies = [ "indexmap 2.6.0", "itoa", @@ -3861,6 +3980,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_spanned" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" +dependencies = [ + "serde", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -4138,12 +4266,13 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.13.0" +version = "3.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" +checksum = "22e5a0acb1f3f55f65cc4a866c361b2fb2a0ff6366785ae6fbb5f85df07ba230" dependencies = [ "cfg-if", "fastrand", + "getrandom 0.3.1", "once_cell", "rustix", "windows-sys 0.59.0", @@ -4252,7 +4381,7 @@ dependencies = [ [[package]] name = "tiny-keccak" version = "2.0.2" -source = "git+https://github.com/risc0/tiny-keccak?tag=tiny-keccak/v2.0.2-risczero.0#8fcc866dc94dcec3e79c3b2bc8fbc51b22f2d5e1" +source = "git+https://github.com/risc0/tiny-keccak?tag=tiny-keccak%2Fv2.0.2-risczero.0#8fcc866dc94dcec3e79c3b2bc8fbc51b22f2d5e1" dependencies = [ "crunchy", ] @@ -4310,19 +4439,36 @@ dependencies = [ "tokio", ] +[[package]] +name = "toml" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + [[package]] name = "toml_datetime" version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +dependencies = [ + "serde", +] [[package]] name = "toml_edit" -version = "0.22.22" +version = "0.22.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" +checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474" dependencies = [ "indexmap 2.6.0", + "serde", + "serde_spanned", "toml_datetime", "winnow", ] @@ -4524,6 +4670,15 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "wasi" +version = "0.13.3+wasi-0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2" +dependencies = [ + "wit-bindgen-rt", +] + [[package]] name = "wasm-bindgen" version = "0.2.95" @@ -4822,13 +4977,22 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.20" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" +checksum = "0e7f4ea97f6f78012141bcdb6a216b2609f0979ada50b20ca5b52dde2eac2bb1" dependencies = [ "memchr", ] +[[package]] +name = "wit-bindgen-rt" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c" +dependencies = [ + "bitflags 2.6.0", +] + [[package]] name = "wyz" version = "0.5.1" @@ -4838,6 +5002,17 @@ dependencies = [ "tap", ] +[[package]] +name = "yaml-rust2" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a1a1c0bc9823338a3bdf8c61f994f23ac004c6fa32c08cd152984499b445e8d" +dependencies = [ + "arraydeque", + "encoding_rs", + "hashlink", +] + [[package]] name = "zerocopy" version = "0.7.35" diff --git a/guests/reth-optimism/Cargo.toml b/guests/reth-optimism/Cargo.toml index 99eed3ec..a421ab1e 100644 --- a/guests/reth-optimism/Cargo.toml +++ b/guests/reth-optimism/Cargo.toml @@ -15,11 +15,11 @@ codegen-units = 1 opt-level = 3 [dependencies.risc0-zkvm] -version = "1.2.2" +version = "1.3.0-rc.1" features = ["std", "unstable"] [dependencies.risc0-zkvm-platform] -version = "1.2.2" +version = "1.3.0-rc.1" features = ["sys-getenv"] [dependencies.zeth-core] diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 8d02abc1..b75326c4 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "1.81" +channel = "1.83" components = ["clippy", "rustfmt", "rust-src"] profile = "minimal"