From 6f28f9ef4388f308918f9740e76c317fc46b46e8 Mon Sep 17 00:00:00 2001 From: Yuwen Zhang Date: Thu, 7 Nov 2024 13:11:57 -0800 Subject: [PATCH] fix: use bn crates.io version in verifier crate and bump version --- Cargo.lock | 104 ++++++++++++++++++------------------- Cargo.toml | 42 +++++++-------- crates/verifier/Cargo.toml | 2 +- 3 files changed, 74 insertions(+), 74 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3bc6879a7..2f340dde0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -563,9 +563,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.92" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74f37166d7d48a0284b99dd824694c26119c700b53bf0d1540cdb147dbdaaf13" +checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" dependencies = [ "backtrace", ] @@ -769,9 +769,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.4" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" +checksum = "43a2b323ccce0a1d90b449fd71f2a06ca7faa7c54c2751f06c9bd851fc061059" dependencies = [ "async-lock", "cfg-if", @@ -925,9 +925,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "aws-config" -version = "1.5.9" +version = "1.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d6448cfb224dd6a9b9ac734f58622dd0d4751f3589f3b777345745f46b2eb14" +checksum = "9b49afaa341e8dd8577e1a2200468f98956d6eda50bcf4a53246cc00174ba924" dependencies = [ "aws-credential-types", "aws-runtime", @@ -993,9 +993,9 @@ dependencies = [ [[package]] name = "aws-sdk-s3" -version = "1.59.0" +version = "1.60.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f883bb1e349fa8343dc46336c252c0f32ceb6e81acb146aeef2e0f8afc9183e" +checksum = "0506cc60e392e33712d47717d5ae5760a3b134bf8ee7aea7e43df3d7e2669ae0" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1027,9 +1027,9 @@ dependencies = [ [[package]] name = "aws-sdk-sso" -version = "1.48.0" +version = "1.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded855583fa1d22e88fe39fd6062b062376e50a8211989e07cf5e38d52eb3453" +checksum = "09677244a9da92172c8dc60109b4a9658597d4d298b188dd0018b6a66b410ca4" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1049,9 +1049,9 @@ dependencies = [ [[package]] name = "aws-sdk-ssooidc" -version = "1.49.0" +version = "1.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9177ea1192e6601ae16c7273385690d88a7ed386a00b74a6bc894d12103cd933" +checksum = "81fea2f3a8bb3bd10932ae7ad59cc59f65f270fc9183a7e91f501dc5efbef7ee" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1071,9 +1071,9 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "1.48.0" +version = "1.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "823ef553cf36713c97453e2ddff1eb8f62be7f4523544e2a5db64caf80100f0a" +checksum = "53dcf5e7d9bd1517b8b998e170e650047cea8a2b85fe1835abe3210713e541b7" dependencies = [ "aws-credential-types", "aws-runtime", @@ -2216,9 +2216,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.77+curl-8.10.1" +version = "0.4.78+curl-8.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f469e8a5991f277a208224f6c7ad72ecb5f986e36d09ae1f2c1bb9259478a480" +checksum = "8eec768341c5c7789611ae51cf6c459099f22e64a5d5d0ce4892434e33821eaf" dependencies = [ "cc", "libc", @@ -4299,9 +4299,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.161" +version = "0.2.162" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" +checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398" [[package]] name = "libgit2-sys" @@ -5382,9 +5382,9 @@ dependencies = [ [[package]] name = "polling" -version = "3.7.3" +version = "3.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" +checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f" dependencies = [ "cfg-if", "concurrent-queue", @@ -6862,7 +6862,7 @@ dependencies = [ [[package]] name = "sp1-build" -version = "3.2.0" +version = "3.2.1" dependencies = [ "anyhow", "cargo_metadata", @@ -6873,7 +6873,7 @@ dependencies = [ [[package]] name = "sp1-cli" -version = "3.2.0" +version = "3.2.1" dependencies = [ "anstyle", "anyhow", @@ -6901,7 +6901,7 @@ dependencies = [ [[package]] name = "sp1-core-executor" -version = "3.2.0" +version = "3.2.1" dependencies = [ "bincode", "bytemuck", @@ -6934,7 +6934,7 @@ dependencies = [ [[package]] name = "sp1-core-machine" -version = "3.2.0" +version = "3.2.1" dependencies = [ "bincode", "cfg-if", @@ -6983,7 +6983,7 @@ dependencies = [ [[package]] name = "sp1-cuda" -version = "3.2.0" +version = "3.2.1" dependencies = [ "bincode", "ctrlc", @@ -7000,7 +7000,7 @@ dependencies = [ [[package]] name = "sp1-curves" -version = "3.2.0" +version = "3.2.1" dependencies = [ "cfg-if", "curve25519-dalek", @@ -7022,7 +7022,7 @@ dependencies = [ [[package]] name = "sp1-derive" -version = "3.2.0" +version = "3.2.1" dependencies = [ "quote", "syn 1.0.109", @@ -7030,7 +7030,7 @@ dependencies = [ [[package]] name = "sp1-eval" -version = "3.2.0" +version = "3.2.1" dependencies = [ "anyhow", "bincode", @@ -7050,16 +7050,16 @@ dependencies = [ [[package]] name = "sp1-helper" -version = "3.2.0" +version = "3.2.1" dependencies = [ "sp1-build", ] [[package]] name = "sp1-lib" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14deb700469a37ec075bcf88dac3815b026dd9c4b9cb175980826f1fbb2e4e80" +checksum = "c1aa18834c58df127706eb2fb2ea6e2892dbf0361d6b2485bf7b3fbd5f8b8c3c" dependencies = [ "bincode", "serde", @@ -7067,7 +7067,7 @@ dependencies = [ [[package]] name = "sp1-lib" -version = "3.2.0" +version = "3.2.1" dependencies = [ "bincode", "serde", @@ -7075,7 +7075,7 @@ dependencies = [ [[package]] name = "sp1-perf" -version = "3.2.0" +version = "3.2.1" dependencies = [ "anyhow", "bincode", @@ -7097,7 +7097,7 @@ dependencies = [ [[package]] name = "sp1-primitives" -version = "3.2.0" +version = "3.2.1" dependencies = [ "bincode", "hex", @@ -7113,7 +7113,7 @@ dependencies = [ [[package]] name = "sp1-prover" -version = "3.2.0" +version = "3.2.1" dependencies = [ "anyhow", "bincode", @@ -7153,7 +7153,7 @@ dependencies = [ [[package]] name = "sp1-recursion-circuit" -version = "3.2.0" +version = "3.2.1" dependencies = [ "ff 0.13.0", "hashbrown 0.14.5", @@ -7189,7 +7189,7 @@ dependencies = [ [[package]] name = "sp1-recursion-compiler" -version = "3.2.0" +version = "3.2.1" dependencies = [ "backtrace", "criterion", @@ -7214,7 +7214,7 @@ dependencies = [ [[package]] name = "sp1-recursion-core" -version = "3.2.0" +version = "3.2.1" dependencies = [ "backtrace", "ff 0.13.0", @@ -7249,7 +7249,7 @@ dependencies = [ [[package]] name = "sp1-recursion-derive" -version = "3.2.0" +version = "3.2.1" dependencies = [ "quote", "syn 1.0.109", @@ -7257,7 +7257,7 @@ dependencies = [ [[package]] name = "sp1-recursion-gnark-cli" -version = "3.2.0" +version = "3.2.1" dependencies = [ "bincode", "clap", @@ -7266,7 +7266,7 @@ dependencies = [ [[package]] name = "sp1-recursion-gnark-ffi" -version = "3.2.0" +version = "3.2.1" dependencies = [ "anyhow", "bincode", @@ -7290,7 +7290,7 @@ dependencies = [ [[package]] name = "sp1-sdk" -version = "3.2.0" +version = "3.2.1" dependencies = [ "alloy-primitives 0.8.11", "alloy-signer", @@ -7336,7 +7336,7 @@ dependencies = [ [[package]] name = "sp1-stark" -version = "3.2.0" +version = "3.2.1" dependencies = [ "arrayref", "getrandom 0.2.15", @@ -7371,7 +7371,7 @@ dependencies = [ [[package]] name = "sp1-verifier" -version = "3.2.0" +version = "3.2.1" dependencies = [ "hex", "lazy_static", @@ -7379,13 +7379,13 @@ dependencies = [ "num-traits", "sha2 0.10.8", "sp1-sdk", - "substrate-bn", + "substrate-bn-succinct", "thiserror-no-std", ] [[package]] name = "sp1-zkvm" -version = "3.2.0" +version = "3.2.1" dependencies = [ "cfg-if", "getrandom 0.2.15", @@ -7395,7 +7395,7 @@ dependencies = [ "p3-field", "rand 0.8.5", "sha2 0.10.8", - "sp1-lib 3.2.0", + "sp1-lib 3.2.1", "sp1-primitives", ] @@ -7545,9 +7545,9 @@ dependencies = [ ] [[package]] -name = "substrate-bn" +name = "substrate-bn-succinct" version = "0.6.0" -source = "git+https://github.com/sp1-patches/bn?tag=substrate_bn-v0.6.0-patch-v2#8ef05d3969312eca34fa9f1f566a469022badda6" +source = "git+https://github.com/sp1-patches/bn?branch=release-v0.6.0#7afaefe1835e4047e55d27d4efa52d791dd8a30b" dependencies = [ "bytemuck", "byteorder", @@ -7557,7 +7557,7 @@ dependencies = [ "num-bigint 0.4.6", "rand 0.8.5", "rustc-hex", - "sp1-lib 3.1.0", + "sp1-lib 3.2.0", ] [[package]] @@ -7950,9 +7950,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.41.0" +version = "1.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb" +checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33" dependencies = [ "backtrace", "bytes 1.8.0", diff --git a/Cargo.toml b/Cargo.toml index 6cf5ce777..55fc8a804 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace.package] -version = "3.2.0" +version = "3.2.1" edition = "2021" license = "MIT OR Apache-2.0" repository = "https://github.com/succinctlabs/sp1" @@ -47,26 +47,26 @@ debug-assertions = true [workspace.dependencies] # sp1 -sp1-build = { path = "crates/build", version = "3.2.0" } -sp1-cli = { path = "crates/cli", version = "3.2.0", default-features = false } -sp1-core-machine = { path = "crates/core/machine", version = "3.2.0" } -sp1-core-executor = { path = "crates/core/executor", version = "3.2.0" } -sp1-curves = { path = "crates/curves", version = "3.2.0" } -sp1-derive = { path = "crates/derive", version = "3.2.0" } -sp1-eval = { path = "crates/eval", version = "3.2.0" } -sp1-helper = { path = "crates/helper", version = "3.2.0", default-features = false } -sp1-primitives = { path = "crates/primitives", version = "3.2.0" } -sp1-prover = { path = "crates/prover", version = "3.2.0" } -sp1-recursion-compiler = { path = "crates/recursion/compiler", version = "3.2.0" } -sp1-recursion-core = { path = "crates/recursion/core", version = "3.2.0", default-features = false } -sp1-recursion-derive = { path = "crates/recursion/derive", version = "3.2.0", default-features = false } -sp1-recursion-gnark-ffi = { path = "crates/recursion/gnark-ffi", version = "3.2.0", default-features = false } -sp1-recursion-circuit = { path = "crates/recursion/circuit", version = "3.2.0", default-features = false } -sp1-sdk = { path = "crates/sdk", version = "3.2.0" } -sp1-cuda = { path = "crates/cuda", version = "3.2.0" } -sp1-stark = { path = "crates/stark", version = "3.2.0" } -sp1-lib = { path = "crates/zkvm/lib", version = "3.2.0", default-features = false } -sp1-zkvm = { path = "crates/zkvm/entrypoint", version = "3.2.0", default-features = false } +sp1-build = { path = "crates/build", version = "3.2.1" } +sp1-cli = { path = "crates/cli", version = "3.2.1", default-features = false } +sp1-core-machine = { path = "crates/core/machine", version = "3.2.1" } +sp1-core-executor = { path = "crates/core/executor", version = "3.2.1" } +sp1-curves = { path = "crates/curves", version = "3.2.1" } +sp1-derive = { path = "crates/derive", version = "3.2.1" } +sp1-eval = { path = "crates/eval", version = "3.2.1" } +sp1-helper = { path = "crates/helper", version = "3.2.1", default-features = false } +sp1-primitives = { path = "crates/primitives", version = "3.2.1" } +sp1-prover = { path = "crates/prover", version = "3.2.1" } +sp1-recursion-compiler = { path = "crates/recursion/compiler", version = "3.2.1" } +sp1-recursion-core = { path = "crates/recursion/core", version = "3.2.1", default-features = false } +sp1-recursion-derive = { path = "crates/recursion/derive", version = "3.2.1", default-features = false } +sp1-recursion-gnark-ffi = { path = "crates/recursion/gnark-ffi", version = "3.2.1", default-features = false } +sp1-recursion-circuit = { path = "crates/recursion/circuit", version = "3.2.1", default-features = false } +sp1-sdk = { path = "crates/sdk", version = "3.2.1" } +sp1-cuda = { path = "crates/cuda", version = "3.2.1" } +sp1-stark = { path = "crates/stark", version = "3.2.1" } +sp1-lib = { path = "crates/zkvm/lib", version = "3.2.1", default-features = false } +sp1-zkvm = { path = "crates/zkvm/entrypoint", version = "3.2.1", default-features = false } # p3 p3-air = "0.1.4-succinct" diff --git a/crates/verifier/Cargo.toml b/crates/verifier/Cargo.toml index 0436c54f4..4bccc87d6 100644 --- a/crates/verifier/Cargo.toml +++ b/crates/verifier/Cargo.toml @@ -10,7 +10,7 @@ keywords = { workspace = true } categories = { workspace = true } [dependencies] -bn = { git = "https://github.com/sp1-patches/bn", version = "0.6.0", tag = "substrate_bn-v0.6.0-patch-v2", package = "substrate-bn" } +bn = { git = "https://github.com/sp1-patches/bn", branch = "release-v0.6.0", package = "substrate-bn-succinct" } sha2 = { version = "0.10.8", default-features = false } thiserror-no-std = "2.0.2" hex = { version = "0.4.3", default-features = false, features = ["alloc"] }