From f2744e9d04f37f4a5ac8324a853c03ddbf4e787b Mon Sep 17 00:00:00 2001 From: Austin Abell Date: Mon, 9 Dec 2024 12:57:37 -0500 Subject: [PATCH 1/3] bump version to 1.2 and update patch commit --- Cargo.lock | 152 ++++++++++---------------- Cargo.toml | 8 +- guests/reth-ethereum/Cargo.lock | 55 +++++++--- guests/reth-ethereum/Cargo.toml | 9 +- guests/reth-optimism/Cargo.lock | 55 +++++++--- guests/reth-optimism/Cargo.toml | 9 +- testing/ef-tests/testguest/Cargo.toml | 5 +- 7 files changed, 148 insertions(+), 145 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index de08e88a..eae3842a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -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" @@ -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", ] @@ -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" @@ -2837,17 +2809,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" @@ -3038,6 +2999,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" @@ -3492,7 +3464,6 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn 1.0.109", "version_check", ] @@ -3793,7 +3764,6 @@ checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b" dependencies = [ "base64 0.22.1", "bytes", - "futures-channel", "futures-core", "futures-util", "http", @@ -3822,12 +3792,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", @@ -4419,9 +4387,9 @@ dependencies = [ [[package]] name = "risc0-binfmt" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9749a29181f87bebd2580b39b3ec0368daaaefbb30429ff429383a7ade360321" +checksum = "901fb75d62d70320adc7adae2abad354a3b7565603115dfb3134465227846475" dependencies = [ "anyhow", "borsh", @@ -4429,15 +4397,14 @@ dependencies = [ "risc0-zkp", "risc0-zkvm-platform", "serde", - "syn 2.0.87", "tracing", ] [[package]] name = "risc0-build" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc684382e24a8c91331040c33f1c789c755a5c1b0b8a32fefc1730ca36dd7072" +checksum = "f99fb40aeeaf59dddd6b6c3a177c95e8b3c7f0fb6de7d25a0687d12398323292" dependencies = [ "anyhow", "cargo_metadata", @@ -4454,9 +4421,9 @@ dependencies = [ [[package]] name = "risc0-build-kernel" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d9e660eee96e15354259604d6dca3ea809a759e991b606d8db7b599916848b" +checksum = "4442d03cc80f55629df6eb79dbb406d0e637ea2b683a430404dd25b46eadcd33" dependencies = [ "cc", "directories", @@ -4470,9 +4437,9 @@ dependencies = [ [[package]] name = "risc0-circuit-recursion" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90745aa984e4eb404f0e0eb6a7ab2e956d963a0dad751fb89ef138cc6e4e3afc" +checksum = "d8b0736401dd72a60a775e675bd0adba2e0e0e2ce2b73b63fda2899d9d7889b0" dependencies = [ "anyhow", "bytemuck", @@ -4496,9 +4463,9 @@ dependencies = [ [[package]] name = "risc0-circuit-recursion-sys" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd552b5590bd0c7030467c62defe2409aabd303d2dd6ff16d6f59421ae0b37a" +checksum = "0cdee375eb66d84b1f2e78e756071734e9a8271018b4351a7f158ea806838afa" dependencies = [ "glob", "risc0-build-kernel", @@ -4509,19 +4476,24 @@ dependencies = [ [[package]] name = "risc0-circuit-rv32im" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "079b2c6789c6cbfee3500aff69108f853bdfe13fd0071ac1fbe3cbf7d0866420" +checksum = "6b6d7eb9ae600c2df004bf8849db2df870fd56bd5911a2ad756fb8701350b3c6" dependencies = [ "anyhow", + "auto_ops", "bytemuck", + "byteorder", "cfg-if", "crossbeam", "crypto-bigint", "cust", - "derive-debug", + "derive_more 1.0.0", "lazy-regex", "metal", + "num-bigint 0.4.4", + "num-derive", + "num-traits", "rand", "rayon", "risc0-binfmt", @@ -4537,9 +4509,9 @@ dependencies = [ [[package]] name = "risc0-circuit-rv32im-sys" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9844bd07c18aa6a263259d0c693e54df815a9995760270ff5b5351c5f81cfc" +checksum = "964920cf4c65ed1a5bb211debb31ef6147160a858d55ec12975a2da3062064b3" dependencies = [ "glob", "risc0-build-kernel", @@ -4550,9 +4522,9 @@ dependencies = [ [[package]] name = "risc0-core" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fd39ba3f881fcf0197464bde04391602dbbb886f87fddc372a68d79aa9de9d9" +checksum = "733491635d50b742d1f30a923aa3b83d62f35cef724bbf402dfc02e6f10f587a" dependencies = [ "bytemuck", "nvtx", @@ -4562,9 +4534,9 @@ dependencies = [ [[package]] name = "risc0-groth16" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c86b43367c2f29ce1a0ee5730f0af6892e5b6197c8dded614c7ff1068afcd302" +checksum = "d5babc69b0db6906a6ff4011641109ca2ba06636096356b32208b0dfb26b3809" dependencies = [ "anyhow", "ark-bn254", @@ -4580,15 +4552,16 @@ dependencies = [ "risc0-zkp", "serde", "serde_json", + "stability", "tempfile", "tracing", ] [[package]] name = "risc0-sys" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abc7596a2ffa5e75e5a886fd95bccb0d593e769cdd2c43b83dcf2ac089423060" +checksum = "a93d549191707c61dfb45b61ccc6b1de11fe054ae24cf73efedd6ea850dc0690" dependencies = [ "anyhow", "cc", @@ -4599,9 +4572,9 @@ dependencies = [ [[package]] name = "risc0-zkp" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15b5525e1f2abaa5954579e50df0d6a5d01b456b0ac6aae0e87cf92f073e12f7" +checksum = "21eadc5099bf0d8ecaed718810dc5deaf237ae39a2fcb66e542e8f9660132617" dependencies = [ "anyhow", "blake2", @@ -4630,14 +4603,13 @@ dependencies = [ [[package]] name = "risc0-zkvm" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de11138ba073e43ec494d15728baeddbf3155fc95d5710000077eb5f7f345070" +checksum = "2b619085d02d57dcafc41eb74714682797ed666621ced1814c55bbe7ae7762ba" dependencies = [ "addr2line 0.22.0", "anyhow", "bincode", - "bonsai-sdk", "borsh", "bytemuck", "bytes", @@ -4645,6 +4617,8 @@ dependencies = [ "getrandom", "hex", "lazy-regex", + "num-bigint 0.4.4", + "num-traits", "prost", "rand", "rayon", @@ -4661,6 +4635,7 @@ dependencies = [ "semver 1.0.22", "serde", "sha2", + "sha3", "stability", "tempfile", "tracing", @@ -4669,9 +4644,9 @@ dependencies = [ [[package]] name = "risc0-zkvm-platform" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57748f1916078b24faed0bc620aa6dfc386e066e6f75a710ec0ac68f7126e7d7" +checksum = "26bbcc486222a0086d36244ae1f388cac1318270bca2dd23d77af2005d679edf" dependencies = [ "bytemuck", "getrandom", @@ -5442,9 +5417,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", @@ -5920,19 +5895,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" diff --git a/Cargo.toml b/Cargo.toml index beffa7d6..6fd3d5d1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,14 +22,14 @@ opt-level = 3 # RISC Zero [workspace.dependencies.bonsai-sdk] -version = "1.1.3" +version = "1.2.0" features = ["non_blocking"] [workspace.dependencies.risc0-build] -version = "1.1.3" +version = "1.2.0" [workspace.dependencies.risc0-zkvm] -version = "1.1.3" +version = "1.2.0" default-features = false # External @@ -85,5 +85,5 @@ serde = { version = "1.0.210", features = ["derive"] } serde_json = { version = "1.0.128", features = ["alloc"] } 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/guests/reth-ethereum/Cargo.lock b/guests/reth-ethereum/Cargo.lock index c9e64115..5f180154 100644 --- a/guests/reth-ethereum/Cargo.lock +++ b/guests/reth-ethereum/Cargo.lock @@ -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?rev=7571741274b94a50a4c8178ce1946f9626aa18fa#7571741274b94a50a4c8178ce1946f9626aa18fa" dependencies = [ + "bytemuck", "cfg-if", "ecdsa", "elliptic-curve", "once_cell", + "risc0-bigint2", "sha2", ] @@ -2663,11 +2671,21 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "risc0-bigint2" +version = "1.2.0-rc.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b95b6692674cb64b7df6a20090f3c2c7a097601480c766b5d020b7a87b3eaa18" +dependencies = [ + "include_bytes_aligned", + "stability", +] + [[package]] name = "risc0-binfmt" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9749a29181f87bebd2580b39b3ec0368daaaefbb30429ff429383a7ade360321" +checksum = "901fb75d62d70320adc7adae2abad354a3b7565603115dfb3134465227846475" dependencies = [ "anyhow", "borsh", @@ -2675,15 +2693,14 @@ dependencies = [ "risc0-zkp", "risc0-zkvm-platform", "serde", - "syn 2.0.85", "tracing", ] [[package]] name = "risc0-circuit-recursion" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90745aa984e4eb404f0e0eb6a7ab2e956d963a0dad751fb89ef138cc6e4e3afc" +checksum = "d8b0736401dd72a60a775e675bd0adba2e0e0e2ce2b73b63fda2899d9d7889b0" dependencies = [ "anyhow", "bytemuck", @@ -2696,9 +2713,9 @@ dependencies = [ [[package]] name = "risc0-circuit-rv32im" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "079b2c6789c6cbfee3500aff69108f853bdfe13fd0071ac1fbe3cbf7d0866420" +checksum = "6b6d7eb9ae600c2df004bf8849db2df870fd56bd5911a2ad756fb8701350b3c6" dependencies = [ "anyhow", "metal", @@ -2712,9 +2729,9 @@ dependencies = [ [[package]] name = "risc0-core" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fd39ba3f881fcf0197464bde04391602dbbb886f87fddc372a68d79aa9de9d9" +checksum = "733491635d50b742d1f30a923aa3b83d62f35cef724bbf402dfc02e6f10f587a" dependencies = [ "bytemuck", "rand_core", @@ -2722,9 +2739,9 @@ dependencies = [ [[package]] name = "risc0-groth16" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c86b43367c2f29ce1a0ee5730f0af6892e5b6197c8dded614c7ff1068afcd302" +checksum = "d5babc69b0db6906a6ff4011641109ca2ba06636096356b32208b0dfb26b3809" dependencies = [ "anyhow", "ark-bn254", @@ -2738,13 +2755,14 @@ dependencies = [ "risc0-binfmt", "risc0-zkp", "serde", + "stability", ] [[package]] name = "risc0-zkp" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15b5525e1f2abaa5954579e50df0d6a5d01b456b0ac6aae0e87cf92f073e12f7" +checksum = "21eadc5099bf0d8ecaed718810dc5deaf237ae39a2fcb66e542e8f9660132617" dependencies = [ "anyhow", "blake2", @@ -2766,9 +2784,9 @@ dependencies = [ [[package]] name = "risc0-zkvm" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de11138ba073e43ec494d15728baeddbf3155fc95d5710000077eb5f7f345070" +checksum = "2b619085d02d57dcafc41eb74714682797ed666621ced1814c55bbe7ae7762ba" dependencies = [ "anyhow", "borsh", @@ -2786,15 +2804,16 @@ dependencies = [ "semver 1.0.23", "serde", "sha2", + "sha3", "stability", "tracing", ] [[package]] name = "risc0-zkvm-platform" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57748f1916078b24faed0bc620aa6dfc386e066e6f75a710ec0ac68f7126e7d7" +checksum = "26bbcc486222a0086d36244ae1f388cac1318270bca2dd23d77af2005d679edf" dependencies = [ "bytemuck", "getrandom", diff --git a/guests/reth-ethereum/Cargo.toml b/guests/reth-ethereum/Cargo.toml index 3f2346dc..cc62f1ae 100644 --- a/guests/reth-ethereum/Cargo.toml +++ b/guests/reth-ethereum/Cargo.toml @@ -6,12 +6,12 @@ edition = "2021" [workspace] [dependencies.risc0-zkvm] -version = "1.1.3" +version = "1.2.0" default-features = false -features = ["std"] +features = ["std", "unstable"] [dependencies.risc0-zkvm-platform] -version = "1.1.3" +version = "1.2.0" features = ["sys-getenv"] [dependencies.zeth-core] @@ -31,6 +31,7 @@ reth-chainspec = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd" [patch.crates-io] 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", rev = "7571741274b94a50a4c8178ce1946f9626aa18fa" } +# k256 = { git = "https://github.com/risc0/RustCrypto-elliptic-curves", tag = "k256/v0.13.3-risczero.0" } 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" } diff --git a/guests/reth-optimism/Cargo.lock b/guests/reth-optimism/Cargo.lock index 83cc714f..2023a80a 100644 --- a/guests/reth-optimism/Cargo.lock +++ b/guests/reth-optimism/Cargo.lock @@ -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?rev=7571741274b94a50a4c8178ce1946f9626aa18fa#7571741274b94a50a4c8178ce1946f9626aa18fa" dependencies = [ + "bytemuck", "cfg-if", "ecdsa", "elliptic-curve", "once_cell", + "risc0-bigint2", "sha2", ] @@ -2759,11 +2767,21 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "risc0-bigint2" +version = "1.2.0-rc.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b95b6692674cb64b7df6a20090f3c2c7a097601480c766b5d020b7a87b3eaa18" +dependencies = [ + "include_bytes_aligned", + "stability", +] + [[package]] name = "risc0-binfmt" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9749a29181f87bebd2580b39b3ec0368daaaefbb30429ff429383a7ade360321" +checksum = "901fb75d62d70320adc7adae2abad354a3b7565603115dfb3134465227846475" dependencies = [ "anyhow", "borsh", @@ -2771,15 +2789,14 @@ dependencies = [ "risc0-zkp", "risc0-zkvm-platform", "serde", - "syn 2.0.85", "tracing", ] [[package]] name = "risc0-circuit-recursion" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90745aa984e4eb404f0e0eb6a7ab2e956d963a0dad751fb89ef138cc6e4e3afc" +checksum = "d8b0736401dd72a60a775e675bd0adba2e0e0e2ce2b73b63fda2899d9d7889b0" dependencies = [ "anyhow", "bytemuck", @@ -2792,9 +2809,9 @@ dependencies = [ [[package]] name = "risc0-circuit-rv32im" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "079b2c6789c6cbfee3500aff69108f853bdfe13fd0071ac1fbe3cbf7d0866420" +checksum = "6b6d7eb9ae600c2df004bf8849db2df870fd56bd5911a2ad756fb8701350b3c6" dependencies = [ "anyhow", "metal", @@ -2808,9 +2825,9 @@ dependencies = [ [[package]] name = "risc0-core" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fd39ba3f881fcf0197464bde04391602dbbb886f87fddc372a68d79aa9de9d9" +checksum = "733491635d50b742d1f30a923aa3b83d62f35cef724bbf402dfc02e6f10f587a" dependencies = [ "bytemuck", "rand_core", @@ -2818,9 +2835,9 @@ dependencies = [ [[package]] name = "risc0-groth16" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c86b43367c2f29ce1a0ee5730f0af6892e5b6197c8dded614c7ff1068afcd302" +checksum = "d5babc69b0db6906a6ff4011641109ca2ba06636096356b32208b0dfb26b3809" dependencies = [ "anyhow", "ark-bn254", @@ -2834,13 +2851,14 @@ dependencies = [ "risc0-binfmt", "risc0-zkp", "serde", + "stability", ] [[package]] name = "risc0-zkp" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15b5525e1f2abaa5954579e50df0d6a5d01b456b0ac6aae0e87cf92f073e12f7" +checksum = "21eadc5099bf0d8ecaed718810dc5deaf237ae39a2fcb66e542e8f9660132617" dependencies = [ "anyhow", "blake2", @@ -2862,9 +2880,9 @@ dependencies = [ [[package]] name = "risc0-zkvm" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de11138ba073e43ec494d15728baeddbf3155fc95d5710000077eb5f7f345070" +checksum = "2b619085d02d57dcafc41eb74714682797ed666621ced1814c55bbe7ae7762ba" dependencies = [ "anyhow", "borsh", @@ -2882,15 +2900,16 @@ dependencies = [ "semver 1.0.23", "serde", "sha2", + "sha3", "stability", "tracing", ] [[package]] name = "risc0-zkvm-platform" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57748f1916078b24faed0bc620aa6dfc386e066e6f75a710ec0ac68f7126e7d7" +checksum = "26bbcc486222a0086d36244ae1f388cac1318270bca2dd23d77af2005d679edf" dependencies = [ "bytemuck", "getrandom", diff --git a/guests/reth-optimism/Cargo.toml b/guests/reth-optimism/Cargo.toml index 6e6737b7..5acfb464 100644 --- a/guests/reth-optimism/Cargo.toml +++ b/guests/reth-optimism/Cargo.toml @@ -6,12 +6,12 @@ edition = "2021" [workspace] [dependencies.risc0-zkvm] -version = "1.1.3" +version = "1.2.0" default-features = false -features = ["std"] +features = ["std", "unstable"] [dependencies.risc0-zkvm-platform] -version = "1.1.3" +version = "1.2.0" features = ["sys-getenv"] [dependencies.zeth-core] @@ -31,6 +31,7 @@ reth-optimism-chainspec = { git = "https://github.com/risc0/reth", branch = "p1. [patch.crates-io] 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", rev = "7571741274b94a50a4c8178ce1946f9626aa18fa" } +# k256 = { git = "https://github.com/risc0/RustCrypto-elliptic-curves", tag = "k256/v0.13.3-risczero.0" } 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" } diff --git a/testing/ef-tests/testguest/Cargo.toml b/testing/ef-tests/testguest/Cargo.toml index d4d7c324..200dda9e 100644 --- a/testing/ef-tests/testguest/Cargo.toml +++ b/testing/ef-tests/testguest/Cargo.toml @@ -6,11 +6,12 @@ edition = "2021" [workspace] [dependencies] -risc0-zkvm = { version = "1.1.3", default-features = false, features = ['std'] } +risc0-zkvm = { version = "1.2.0", default-features = false, features = ['std', 'unstable'] } zeth-lib = { path = "../../../lib", default-features = false } [patch.crates-io] # use optimized risc0 circuit 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", rev = "7571741274b94a50a4c8178ce1946f9626aa18fa" } +# k256 = { git = "https://github.com/risc0/RustCrypto-elliptic-curves", tag = "k256/v0.13.3-risczero.0" } sha2 = { git = "https://github.com/risc0/RustCrypto-hashes", tag = "sha2-v0.10.6-risczero.0" } From 789f139d4e8a3ea3d31f148d2ccb5cfa693e697a Mon Sep 17 00:00:00 2001 From: Austin Abell Date: Mon, 9 Dec 2024 13:50:33 -0500 Subject: [PATCH 2/3] update patch commit, broken docker build --- guests/reth-ethereum/Cargo.lock | 6 +++--- guests/reth-ethereum/Cargo.toml | 2 +- guests/reth-optimism/Cargo.lock | 6 +++--- guests/reth-optimism/Cargo.toml | 2 +- justfile | 6 +++--- testing/ef-tests/testguest/Cargo.toml | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/guests/reth-ethereum/Cargo.lock b/guests/reth-ethereum/Cargo.lock index 5f180154..e320b2f0 100644 --- a/guests/reth-ethereum/Cargo.lock +++ b/guests/reth-ethereum/Cargo.lock @@ -1546,7 +1546,7 @@ dependencies = [ [[package]] name = "k256" version = "0.13.3" -source = "git+https://github.com/risc0/RustCrypto-elliptic-curves?rev=7571741274b94a50a4c8178ce1946f9626aa18fa#7571741274b94a50a4c8178ce1946f9626aa18fa" +source = "git+https://github.com/risc0/RustCrypto-elliptic-curves?rev=c2750428558944954af5fe147b01a67711a65062#c2750428558944954af5fe147b01a67711a65062" dependencies = [ "bytemuck", "cfg-if", @@ -2673,9 +2673,9 @@ dependencies = [ [[package]] name = "risc0-bigint2" -version = "1.2.0-rc.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b95b6692674cb64b7df6a20090f3c2c7a097601480c766b5d020b7a87b3eaa18" +checksum = "4f4c185a3bfaee681eed5bfac1440128184bf0b6544c345fb4d7bd4317c909fb" dependencies = [ "include_bytes_aligned", "stability", diff --git a/guests/reth-ethereum/Cargo.toml b/guests/reth-ethereum/Cargo.toml index cc62f1ae..123ecf3d 100644 --- a/guests/reth-ethereum/Cargo.toml +++ b/guests/reth-ethereum/Cargo.toml @@ -31,7 +31,7 @@ reth-chainspec = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd" [patch.crates-io] 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", rev = "7571741274b94a50a4c8178ce1946f9626aa18fa" } +k256 = { git = "https://github.com/risc0/RustCrypto-elliptic-curves", rev = "c2750428558944954af5fe147b01a67711a65062" } # k256 = { git = "https://github.com/risc0/RustCrypto-elliptic-curves", tag = "k256/v0.13.3-risczero.0" } 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" } diff --git a/guests/reth-optimism/Cargo.lock b/guests/reth-optimism/Cargo.lock index 2023a80a..321b2296 100644 --- a/guests/reth-optimism/Cargo.lock +++ b/guests/reth-optimism/Cargo.lock @@ -1546,7 +1546,7 @@ dependencies = [ [[package]] name = "k256" version = "0.13.3" -source = "git+https://github.com/risc0/RustCrypto-elliptic-curves?rev=7571741274b94a50a4c8178ce1946f9626aa18fa#7571741274b94a50a4c8178ce1946f9626aa18fa" +source = "git+https://github.com/risc0/RustCrypto-elliptic-curves?rev=c2750428558944954af5fe147b01a67711a65062#c2750428558944954af5fe147b01a67711a65062" dependencies = [ "bytemuck", "cfg-if", @@ -2769,9 +2769,9 @@ dependencies = [ [[package]] name = "risc0-bigint2" -version = "1.2.0-rc.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b95b6692674cb64b7df6a20090f3c2c7a097601480c766b5d020b7a87b3eaa18" +checksum = "4f4c185a3bfaee681eed5bfac1440128184bf0b6544c345fb4d7bd4317c909fb" dependencies = [ "include_bytes_aligned", "stability", diff --git a/guests/reth-optimism/Cargo.toml b/guests/reth-optimism/Cargo.toml index 5acfb464..072659a2 100644 --- a/guests/reth-optimism/Cargo.toml +++ b/guests/reth-optimism/Cargo.toml @@ -31,7 +31,7 @@ reth-optimism-chainspec = { git = "https://github.com/risc0/reth", branch = "p1. [patch.crates-io] 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", rev = "7571741274b94a50a4c8178ce1946f9626aa18fa" } +k256 = { git = "https://github.com/risc0/RustCrypto-elliptic-curves", rev = "c2750428558944954af5fe147b01a67711a65062" } # k256 = { git = "https://github.com/risc0/RustCrypto-elliptic-curves", tag = "k256/v0.13.3-risczero.0" } 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" } diff --git a/justfile b/justfile index d96cbdb1..e857e90e 100644 --- a/justfile +++ b/justfile @@ -2,11 +2,11 @@ default: just --summary --unsorted build +ARGS="--release": - cargo build -p zeth-ethereum --bin zeth-ethereum {{ARGS}} + RISC0_FEATURE_bigint2=true cargo build -p zeth-ethereum --bin zeth-ethereum {{ARGS}} - cargo build -p zeth-optimism --bin zeth-optimism {{ARGS}} + RISC0_FEATURE_bigint2=true cargo build -p zeth-optimism --bin zeth-optimism {{ARGS}} - cargo build -p zeth-benchmark --bin zeth-benchmark {{ARGS}} + RISC0_FEATURE_bigint2=true cargo build -p zeth-benchmark --bin zeth-benchmark {{ARGS}} cuda: (build "--release -F cuda") diff --git a/testing/ef-tests/testguest/Cargo.toml b/testing/ef-tests/testguest/Cargo.toml index 200dda9e..6daf7871 100644 --- a/testing/ef-tests/testguest/Cargo.toml +++ b/testing/ef-tests/testguest/Cargo.toml @@ -12,6 +12,6 @@ zeth-lib = { path = "../../../lib", default-features = false } [patch.crates-io] # use optimized risc0 circuit 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", rev = "7571741274b94a50a4c8178ce1946f9626aa18fa" } +k256 = { git = "https://github.com/risc0/RustCrypto-elliptic-curves", rev = "c2750428558944954af5fe147b01a67711a65062" } # k256 = { git = "https://github.com/risc0/RustCrypto-elliptic-curves", tag = "k256/v0.13.3-risczero.0" } sha2 = { git = "https://github.com/risc0/RustCrypto-hashes", tag = "sha2-v0.10.6-risczero.0" } From 96985e8e457ef711c3f17c3078359966f38213d7 Mon Sep 17 00:00:00 2001 From: Austin Abell Date: Mon, 9 Dec 2024 16:23:57 -0500 Subject: [PATCH 3/3] switch risc0-build to use unstable (will in future fix build issue) --- Cargo.toml | 1 + justfile | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 6fd3d5d1..a6204867 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,6 +27,7 @@ features = ["non_blocking"] [workspace.dependencies.risc0-build] version = "1.2.0" +features = ["unstable"] [workspace.dependencies.risc0-zkvm] version = "1.2.0" diff --git a/justfile b/justfile index e857e90e..d96cbdb1 100644 --- a/justfile +++ b/justfile @@ -2,11 +2,11 @@ default: just --summary --unsorted build +ARGS="--release": - RISC0_FEATURE_bigint2=true cargo build -p zeth-ethereum --bin zeth-ethereum {{ARGS}} + cargo build -p zeth-ethereum --bin zeth-ethereum {{ARGS}} - RISC0_FEATURE_bigint2=true cargo build -p zeth-optimism --bin zeth-optimism {{ARGS}} + cargo build -p zeth-optimism --bin zeth-optimism {{ARGS}} - RISC0_FEATURE_bigint2=true cargo build -p zeth-benchmark --bin zeth-benchmark {{ARGS}} + cargo build -p zeth-benchmark --bin zeth-benchmark {{ARGS}} cuda: (build "--release -F cuda")