diff --git a/.github/workflows/elf.yml b/.github/workflows/elf.yml index 4d6969e9..dd566f05 100644 --- a/.github/workflows/elf.yml +++ b/.github/workflows/elf.yml @@ -29,9 +29,9 @@ jobs: run: | # Build the binaries cd programs/range - ~/.sp1/bin/cargo-prove prove build --elf-name range-elf --docker --tag v4.0.0-rc.3 + ~/.sp1/bin/cargo-prove prove build --elf-name range-elf --docker --tag v4.0.0-rc.10 --output-directory ../../elf cd ../aggregation - ~/.sp1/bin/cargo-prove prove build --elf-name aggregation-elf --docker --tag v4.0.0-rc.3 + ~/.sp1/bin/cargo-prove prove build --elf-name aggregation-elf --docker --tag v4.0.0-rc.10 --output-directory ../../elf cd ../../ # Check for any changes in the elf directory diff --git a/Cargo.lock b/Cargo.lock index f5dde64d..b5f9dd3f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1314,7 +1314,7 @@ dependencies = [ "bitflags", "cexpr", "clang-sys", - "itertools 0.12.1", + "itertools 0.10.5", "lazy_static", "lazycell", "proc-macro2", @@ -2202,7 +2202,7 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] name = "ecdsa" version = "0.16.9" -source = "git+https://github.com/sp1-patches/signatures?tag=patch-0.16.9-sp1-4.0.0-rc.3-v2#1df079061349e013c78151f8a10a9f54b2fbf2ff" +source = "git+https://github.com/sp1-patches/signatures?tag=patch-0.16.9-sp1-4.0.0#5a0aefaef40c7a4cf991ab63f43650fea3ea0db0" dependencies = [ "cfg-if", "der", @@ -3466,9 +3466,9 @@ dependencies = [ [[package]] name = "kzg-rs" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0850eb19206463a61bede4f7b7e6b21731807137619044b1f3c287ebcfe2b3b0" +checksum = "08151404e9f89dfc6149ccb2d3e03f2c4ec4f253b721770975da1a1644c6b79f" dependencies = [ "ff 0.13.0", "hex", @@ -5368,7 +5368,7 @@ dependencies = [ [[package]] name = "rfc6979" version = "0.4.0" -source = "git+https://github.com/sp1-patches/signatures?tag=patch-0.16.9-sp1-4.0.0-rc.3-v2#1df079061349e013c78151f8a10a9f54b2fbf2ff" +source = "git+https://github.com/sp1-patches/signatures?tag=patch-0.16.9-sp1-4.0.0#5a0aefaef40c7a4cf991ab63f43650fea3ea0db0" dependencies = [ "hmac", "subtle", @@ -5994,7 +5994,7 @@ dependencies = [ [[package]] name = "sha2" version = "0.10.8" -source = "git+https://github.com/sp1-patches/RustCrypto-hashes?tag=patch-sha2-0.10.8-sp1-4.0.0-rc.3#1f224388fdede7cef649bce0d63876d1a9e3f515" +source = "git+https://github.com/sp1-patches/RustCrypto-hashes?tag=patch-sha2-0.10.8-sp1-4.0.0#1f224388fdede7cef649bce0d63876d1a9e3f515" dependencies = [ "cfg-if", "cpufeatures", @@ -6004,7 +6004,7 @@ dependencies = [ [[package]] name = "sha3" version = "0.10.8" -source = "git+https://github.com/sp1-patches/RustCrypto-hashes?tag=patch-sha3-0.10.8-sp1-4.0.0-rc.3#8f6d303c0861ba7e5adcc36207c0f41fe5edaabc" +source = "git+https://github.com/sp1-patches/RustCrypto-hashes?tag=patch-sha3-0.10.8-sp1-4.0.0#8f6d303c0861ba7e5adcc36207c0f41fe5edaabc" dependencies = [ "digest 0.10.7", "keccak", @@ -6106,9 +6106,9 @@ dependencies = [ [[package]] name = "sp1-build" -version = "4.0.0-rc.11" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a0466de2063deb545dba0723821df15e06992a05fce2981ee6334310f6ae0c" +checksum = "5e2e8eaf2d29f8e7170c1d901e7c0133399c7fe557aedea659f171a86f34a9f9" dependencies = [ "anyhow", "cargo_metadata", @@ -6119,9 +6119,9 @@ dependencies = [ [[package]] name = "sp1-core-executor" -version = "4.0.0-rc.11" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2232f1fac622da63a98893bb6014cbc8169955355999a038d4c95b0fb18a41c9" +checksum = "386bdb534e0cf3643dd9dd67ed06933730913a03dd1ab0e64893cd969c1da57a" dependencies = [ "bincode", "bytemuck", @@ -6158,9 +6158,9 @@ dependencies = [ [[package]] name = "sp1-core-machine" -version = "4.0.0-rc.11" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80bf55c47af18c3e4b369c0becd104883ef69f4bef23ce98854784247af9ae00" +checksum = "89881a2078d8e32933e9687a0f146e470842f3674f8a813524d80b7dc42eb7e9" dependencies = [ "bincode", "cbindgen", @@ -6215,9 +6215,9 @@ dependencies = [ [[package]] name = "sp1-cuda" -version = "4.0.0-rc.11" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ab934478c06447ed2f5d069df063913ae6cd1b7d09efc4ceebcf95b609c1ad" +checksum = "8ef50ff96d561bb7e8a000ec35317863a517f7c68f9d1231e1483c4e93c174a1" dependencies = [ "bincode", "ctrlc", @@ -6232,9 +6232,9 @@ dependencies = [ [[package]] name = "sp1-curves" -version = "4.0.0-rc.11" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c73ba59503249c055a44f97f895186ce6a429d856a50ac0938d4ccdeef966858" +checksum = "9b325b91b40643b36738a4abcdfde81ba8b158e04c3e1a2d94a1942df84e03c8" dependencies = [ "cfg-if", "dashu", @@ -6254,9 +6254,9 @@ dependencies = [ [[package]] name = "sp1-derive" -version = "4.0.0-rc.11" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ca695c6394f4c1d7b1e7cbdddb306c62d6cad669b5ba815ff7b77699c072bd" +checksum = "0e0d6abd68038a6f688601cdd0cbec17b56f56e5d10e3f34f1a42bee8cc7ca2c" dependencies = [ "quote", "syn 1.0.109", @@ -6264,9 +6264,9 @@ dependencies = [ [[package]] name = "sp1-lib" -version = "4.0.0-rc.11" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4eb00d2fc1c7bcd56b926e8d335a2f9979932a957d05e4050ac0d9078231dbf" +checksum = "2378a017c2159e1ab89ed73ff797771ab8b00b11ee1d86852c00c2c9fabc76ce" dependencies = [ "bincode", "serde", @@ -6275,9 +6275,9 @@ dependencies = [ [[package]] name = "sp1-primitives" -version = "4.0.0-rc.11" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08954e37cc693c59f6132db6f250b2d6b36d69a82827725ba2c00de1e8884d3f" +checksum = "dc7c741d8c2907ac96f71445ed8d7abb0fdbea115c6becbcbc7c35305068320c" dependencies = [ "bincode", "hex", @@ -6293,9 +6293,9 @@ dependencies = [ [[package]] name = "sp1-prover" -version = "4.0.0-rc.11" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d4d59bef922b73b9b406c6bd39dcdfef66433beb04ec859b8f2bb19b6e5732c" +checksum = "82833ca900c54cd9f933560b433e56be97edd7322f8ec1654037e4326f3f6b7e" dependencies = [ "anyhow", "bincode", @@ -6336,9 +6336,9 @@ dependencies = [ [[package]] name = "sp1-recursion-circuit" -version = "4.0.0-rc.11" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c5d9ac385a59197465717c0687b04e6564a1d5d2e91459c61599a1902e7f720" +checksum = "4f0e78b19138ed445e02a2c69ae2115df6be3595bb464fc0e2ade550b7b9601a" dependencies = [ "hashbrown 0.14.5", "itertools 0.13.0", @@ -6370,9 +6370,9 @@ dependencies = [ [[package]] name = "sp1-recursion-compiler" -version = "4.0.0-rc.11" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c792857d97ee7012814c7919d8b4b5ec3d78f0632debdca3f565fa4afe48c312" +checksum = "d6cd484565925bc9f10af6358ebe4f8a2193af635299725294a1ee8441854689" dependencies = [ "backtrace", "itertools 0.13.0", @@ -6392,9 +6392,9 @@ dependencies = [ [[package]] name = "sp1-recursion-core" -version = "4.0.0-rc.11" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3cf090783787865fa2e123395309e0366256977c9aeb1f20c66455244dd95df" +checksum = "781a49a2ade18ebafc090070a3ce62854ee3aed802fe0f36074cd9984e9183ce" dependencies = [ "backtrace", "cbindgen", @@ -6435,9 +6435,9 @@ dependencies = [ [[package]] name = "sp1-recursion-derive" -version = "4.0.0-rc.11" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b6b96b27d38b57e3c0541fa549016fe89c3fd8806b534dd37fe5df8e00adf1" +checksum = "5b8f0f802f8d5b1a3afca56c5b398c16a0382bef8969be8b9a3edc7b8e8b37be" dependencies = [ "quote", "syn 1.0.109", @@ -6445,9 +6445,9 @@ dependencies = [ [[package]] name = "sp1-recursion-gnark-ffi" -version = "4.0.0-rc.11" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39677668adde207270b803d72f65d329acf7cace8167c7592d6fb3c3c991c9ab" +checksum = "ff5b4480f59b320bd25beaf3b19c0d3c9b60d140a99964805b18853a611a8eaf" dependencies = [ "anyhow", "bincode", @@ -6471,9 +6471,9 @@ dependencies = [ [[package]] name = "sp1-sdk" -version = "4.0.0-rc.11" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5a369b012b852c0bbe13527573f13c7d3d7b5816221832c62bdd8b1024a5f6d" +checksum = "b47b98599a826c8d24976791495bc59c7d8be3af97a515cf5f7a7c3b02daa835" dependencies = [ "alloy-primitives", "alloy-signer 0.8.3", @@ -6519,9 +6519,9 @@ dependencies = [ [[package]] name = "sp1-stark" -version = "4.0.0-rc.11" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7fbf0a5d98aaa723ed3f675f1057eb674576dac85656aaeb37d9f15279abfdc" +checksum = "2a4779a915a218d668868fd6d11f6f225e6ec0033121345772214901edc8e9fa" dependencies = [ "arrayref", "hashbrown 0.14.5", @@ -6554,9 +6554,9 @@ dependencies = [ [[package]] name = "sp1-zkvm" -version = "4.0.0-rc.11" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "696fb397d323b05674a17044eb70478f30f786778d2e403de1ded0b14b0596f9" +checksum = "78c9380c49efdf34e6454a735922f794bb1d4b11114c302675087f110c207b56" dependencies = [ "cfg-if", "critical-section", @@ -6574,8 +6574,9 @@ dependencies = [ [[package]] name = "sp1_bls12_381" -version = "0.8.0" -source = "git+https://github.com/sp1-patches/bls12_381.git?branch=ratan%2Fpatch-0.8.0-sp1-4.0.0-rc.3-v1-rename-package#60272b6b29af7abce6953e4a410685f573e7d47b" +version = "0.8.0-sp1-4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "260e07035fec67f2018dbb70359bed671582160bbcb2419deb812e583c8c975a" dependencies = [ "cfg-if", "ff 0.13.0", @@ -6669,7 +6670,7 @@ dependencies = [ [[package]] name = "substrate-bn" version = "0.6.0" -source = "git+https://github.com/sp1-patches/bn?tag=patch-0.6.0-sp1-4.0.0-rc.3-v1#3556ab0c3fb2391613e9b848a0fd3ac48128e1b8" +source = "git+https://github.com/sp1-patches/bn?tag=patch-0.6.0-sp1-4.0.0#1bd84110963662fae88baa5ad07c9ab92b6acdbb" dependencies = [ "bytemuck", "byteorder", @@ -6920,7 +6921,7 @@ dependencies = [ [[package]] name = "tiny-keccak" version = "2.0.2" -source = "git+https://github.com/sp1-patches/tiny-keccak?tag=patch-2.0.2-sp1-4.0.0-rc.3#d2ffd330259c8f290b07d99cc1ef1f74774382c2" +source = "git+https://github.com/sp1-patches/tiny-keccak?tag=patch-2.0.2-sp1-4.0.0#d2ffd330259c8f290b07d99cc1ef1f74774382c2" dependencies = [ "cfg-if", "crunchy", diff --git a/Cargo.toml b/Cargo.toml index 79670d3d..b749b92d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -88,10 +88,10 @@ op-alloy-rpc-types-engine = { version = "0.6.8", default-features = false } op-alloy-network = { version = "0.6.8", default-features = false } # sp1 -sp1-lib = { version = "4.0.0-rc.11", features = ["verify"] } -sp1-sdk = { version = "4.0.0-rc.11" } -sp1-zkvm = {version = "4.0.0-rc.11", features = ["verify", "embedded"] } -sp1-build = { version = "4.0.0-rc.11" } +sp1-lib = { version = "4.0.0", features = ["verify"] } +sp1-sdk = { version = "4.0.0" } +sp1-zkvm = {version = "4.0.0", features = ["verify", "embedded"] } +sp1-build = { version = "4.0.0" } [profile.release-client-lto] inherits = "release" @@ -100,11 +100,10 @@ codegen-units = 1 lto = "fat" [patch.crates-io] -tiny-keccak = { git = "https://github.com/sp1-patches/tiny-keccak", tag = "patch-2.0.2-sp1-4.0.0-rc.3" } -sha2 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", tag = "patch-sha2-0.10.8-sp1-4.0.0-rc.3" } -ecdsa = { git = "https://github.com/sp1-patches/signatures", tag = "patch-0.16.9-sp1-4.0.0-rc.3-v2" } -substrate-bn = { git = "https://github.com/sp1-patches/bn", tag = "patch-0.6.0-sp1-4.0.0-rc.3-v1" } -sha3 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha3", tag = "patch-sha3-0.10.8-sp1-4.0.0-rc.3" } +tiny-keccak = { git = "https://github.com/sp1-patches/tiny-keccak", tag = "patch-2.0.2-sp1-4.0.0" } +sha2 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", tag = "patch-sha2-0.10.8-sp1-4.0.0" } +ecdsa = { git = "https://github.com/sp1-patches/signatures", tag = "patch-0.16.9-sp1-4.0.0" } +substrate-bn = { git = "https://github.com/sp1-patches/bn", tag = "patch-0.6.0-sp1-4.0.0" } +sha3 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha3", tag = "patch-sha3-0.10.8-sp1-4.0.0" } -# Note: Renamed this package to sp1_bls12_381 because it was published with that crate name to kzg_rs. -sp1_bls12_381 = { git = "https://github.com/sp1-patches/bls12_381.git", branch = "ratan/patch-0.8.0-sp1-4.0.0-rc.3-v1-rename-package" } +# Note: kzg-rs must be on version 0.2.4, https://github.com/bluealloy/revm/pull/2002. \ No newline at end of file diff --git a/book/advanced/verify-binaries.md b/book/advanced/verify-binaries.md index 3ba886f5..43a66d3a 100644 --- a/book/advanced/verify-binaries.md +++ b/book/advanced/verify-binaries.md @@ -37,11 +37,11 @@ Then build the binaries: ```bash cd programs/range # Build the range-elf -cargo prove build --elf-name range-elf --docker --tag v4.0.0-rc.3 +cargo prove build --elf-name range-elf --docker --tag v4.0.0-rc.10 cd ../aggregation # Build the aggregation-elf -cargo prove build --elf-name aggregation-elf --docker --tag v4.0.0-rc.3 +cargo prove build --elf-name aggregation-elf --docker --tag v4.0.0-rc.10 ``` Now, verify the binaries by confirming the output of `vkey` matches the vkeys on the contract. The `vkey` program outputs the verification keys diff --git a/elf/range-elf b/elf/range-elf index db9c6860..22a2b9a1 100755 Binary files a/elf/range-elf and b/elf/range-elf differ diff --git a/utils/build/src/lib.rs b/utils/build/src/lib.rs index c103a348..d39498dc 100644 --- a/utils/build/src/lib.rs +++ b/utils/build/src/lib.rs @@ -88,7 +88,7 @@ fn build_zkvm_program(program: &str) { BuildArgs { elf_name: Some(format!("{}-elf", program)), docker: true, - tag: "v4.0.0-rc.3".to_string(), + tag: "v4.0.0-rc.10".to_string(), ..Default::default() }, );