From b37864309aa4dc08a6f0737c45c325e7ed41ecff Mon Sep 17 00:00:00 2001 From: nhtyy Date: Fri, 29 Nov 2024 10:44:04 -0800 Subject: [PATCH] fix: prep versions for release --- Cargo.lock | 48 ++++++++++++------------- Cargo.toml | 42 +++++++++++----------- book/writing-programs/patched-crates.md | 3 ++ examples/Cargo.toml | 7 +--- 4 files changed, 49 insertions(+), 51 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e9fa5a807b..1660eea168 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6830,7 +6830,7 @@ dependencies = [ [[package]] name = "sp1-build" -version = "3.3.0" +version = "3.4.0" dependencies = [ "anyhow", "cargo_metadata", @@ -6841,7 +6841,7 @@ dependencies = [ [[package]] name = "sp1-cli" -version = "3.3.0" +version = "3.4.0" dependencies = [ "anstyle", "anyhow", @@ -6869,7 +6869,7 @@ dependencies = [ [[package]] name = "sp1-core-executor" -version = "3.3.0" +version = "3.4.0" dependencies = [ "bincode", "bytemuck", @@ -6902,7 +6902,7 @@ dependencies = [ [[package]] name = "sp1-core-machine" -version = "3.3.0" +version = "3.4.0" dependencies = [ "bincode", "cfg-if", @@ -6951,7 +6951,7 @@ dependencies = [ [[package]] name = "sp1-cuda" -version = "3.3.0" +version = "3.4.0" dependencies = [ "bincode", "ctrlc", @@ -6968,7 +6968,7 @@ dependencies = [ [[package]] name = "sp1-curves" -version = "3.3.0" +version = "3.4.0" dependencies = [ "cfg-if", "dashu", @@ -6989,7 +6989,7 @@ dependencies = [ [[package]] name = "sp1-derive" -version = "3.3.0" +version = "3.4.0" dependencies = [ "quote", "syn 1.0.109", @@ -6997,7 +6997,7 @@ dependencies = [ [[package]] name = "sp1-eval" -version = "3.3.0" +version = "3.4.0" dependencies = [ "anyhow", "bincode", @@ -7017,7 +7017,7 @@ dependencies = [ [[package]] name = "sp1-helper" -version = "3.3.0" +version = "3.4.0" dependencies = [ "sp1-build", ] @@ -7034,7 +7034,7 @@ dependencies = [ [[package]] name = "sp1-lib" -version = "3.3.0" +version = "3.4.0" dependencies = [ "bincode", "serde", @@ -7042,7 +7042,7 @@ dependencies = [ [[package]] name = "sp1-perf" -version = "3.3.0" +version = "3.4.0" dependencies = [ "anyhow", "bincode", @@ -7064,7 +7064,7 @@ dependencies = [ [[package]] name = "sp1-primitives" -version = "3.3.0" +version = "3.4.0" dependencies = [ "bincode", "hex", @@ -7080,7 +7080,7 @@ dependencies = [ [[package]] name = "sp1-prover" -version = "3.3.0" +version = "3.4.0" dependencies = [ "anyhow", "bincode", @@ -7120,7 +7120,7 @@ dependencies = [ [[package]] name = "sp1-recursion-circuit" -version = "3.3.0" +version = "3.4.0" dependencies = [ "ff 0.13.0", "hashbrown 0.14.5", @@ -7156,7 +7156,7 @@ dependencies = [ [[package]] name = "sp1-recursion-compiler" -version = "3.3.0" +version = "3.4.0" dependencies = [ "backtrace", "criterion", @@ -7181,7 +7181,7 @@ dependencies = [ [[package]] name = "sp1-recursion-core" -version = "3.3.0" +version = "3.4.0" dependencies = [ "backtrace", "ff 0.13.0", @@ -7216,7 +7216,7 @@ dependencies = [ [[package]] name = "sp1-recursion-derive" -version = "3.3.0" +version = "3.4.0" dependencies = [ "quote", "syn 1.0.109", @@ -7224,7 +7224,7 @@ dependencies = [ [[package]] name = "sp1-recursion-gnark-cli" -version = "3.3.0" +version = "3.4.0" dependencies = [ "bincode", "clap", @@ -7233,7 +7233,7 @@ dependencies = [ [[package]] name = "sp1-recursion-gnark-ffi" -version = "3.3.0" +version = "3.4.0" dependencies = [ "anyhow", "bincode", @@ -7257,7 +7257,7 @@ dependencies = [ [[package]] name = "sp1-sdk" -version = "3.3.0" +version = "3.4.0" dependencies = [ "alloy-primitives 0.8.11", "alloy-signer", @@ -7303,7 +7303,7 @@ dependencies = [ [[package]] name = "sp1-stark" -version = "3.3.0" +version = "3.4.0" dependencies = [ "arrayref", "getrandom 0.2.15", @@ -7338,7 +7338,7 @@ dependencies = [ [[package]] name = "sp1-verifier" -version = "3.3.0" +version = "3.4.0" dependencies = [ "hex", "lazy_static", @@ -7352,7 +7352,7 @@ dependencies = [ [[package]] name = "sp1-zkvm" -version = "3.3.0" +version = "3.4.0" dependencies = [ "cfg-if", "getrandom 0.2.15", @@ -7362,7 +7362,7 @@ dependencies = [ "p3-field", "rand 0.8.5", "sha2 0.10.8", - "sp1-lib 3.3.0", + "sp1-lib 3.4.0", "sp1-primitives", ] diff --git a/Cargo.toml b/Cargo.toml index 0633339d9c..9d2991044d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace.package] -version = "3.3.0" +version = "3.4.0" 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.3.0" } -sp1-cli = { path = "crates/cli", version = "3.3.0", default-features = false } -sp1-core-machine = { path = "crates/core/machine", version = "3.3.0" } -sp1-core-executor = { path = "crates/core/executor", version = "3.3.0" } -sp1-curves = { path = "crates/curves", version = "3.3.0" } -sp1-derive = { path = "crates/derive", version = "3.3.0" } -sp1-eval = { path = "crates/eval", version = "3.3.0" } -sp1-helper = { path = "crates/helper", version = "3.3.0", default-features = false } -sp1-primitives = { path = "crates/primitives", version = "3.3.0" } -sp1-prover = { path = "crates/prover", version = "3.3.0" } -sp1-recursion-compiler = { path = "crates/recursion/compiler", version = "3.3.0" } -sp1-recursion-core = { path = "crates/recursion/core", version = "3.3.0", default-features = false } -sp1-recursion-derive = { path = "crates/recursion/derive", version = "3.3.0", default-features = false } -sp1-recursion-gnark-ffi = { path = "crates/recursion/gnark-ffi", version = "3.3.0", default-features = false } -sp1-recursion-circuit = { path = "crates/recursion/circuit", version = "3.3.0", default-features = false } -sp1-sdk = { path = "crates/sdk", version = "3.3.0" } -sp1-cuda = { path = "crates/cuda", version = "3.3.0" } -sp1-stark = { path = "crates/stark", version = "3.3.0" } -sp1-lib = { path = "crates/zkvm/lib", version = "3.3.0", default-features = false } -sp1-zkvm = { path = "crates/zkvm/entrypoint", version = "3.3.0", default-features = false } +sp1-build = { path = "crates/build", version = "3.4.0" } +sp1-cli = { path = "crates/cli", version = "3.4.0", default-features = false } +sp1-core-machine = { path = "crates/core/machine", version = "3.4.0" } +sp1-core-executor = { path = "crates/core/executor", version = "3.4.0" } +sp1-curves = { path = "crates/curves", version = "3.4.0" } +sp1-derive = { path = "crates/derive", version = "3.4.0" } +sp1-eval = { path = "crates/eval", version = "3.4.0" } +sp1-helper = { path = "crates/helper", version = "3.4.0", default-features = false } +sp1-primitives = { path = "crates/primitives", version = "3.4.0" } +sp1-prover = { path = "crates/prover", version = "3.4.0" } +sp1-recursion-compiler = { path = "crates/recursion/compiler", version = "3.4.0" } +sp1-recursion-core = { path = "crates/recursion/core", version = "3.4.0", default-features = false } +sp1-recursion-derive = { path = "crates/recursion/derive", version = "3.4.0", default-features = false } +sp1-recursion-gnark-ffi = { path = "crates/recursion/gnark-ffi", version = "3.4.0", default-features = false } +sp1-recursion-circuit = { path = "crates/recursion/circuit", version = "3.4.0", default-features = false } +sp1-sdk = { path = "crates/sdk", version = "3.4.0" } +sp1-cuda = { path = "crates/cuda", version = "3.4.0" } +sp1-stark = { path = "crates/stark", version = "3.4.0" } +sp1-lib = { path = "crates/zkvm/lib", version = "3.4.0", default-features = false } +sp1-zkvm = { path = "crates/zkvm/entrypoint", version = "3.4.0", default-features = false } # p3 p3-air = "0.1.4-succinct" diff --git a/book/writing-programs/patched-crates.md b/book/writing-programs/patched-crates.md index c3a7358f82..bb64c78df6 100644 --- a/book/writing-programs/patched-crates.md +++ b/book/writing-programs/patched-crates.md @@ -36,6 +36,9 @@ sha3-v0-10-6 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", packa sha3-v0-10-8 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha3", tag = "sha3-v0.10.8-patch-v1" } crypto-bigint = { git = "https://github.com/sp1-patches/RustCrypto-bigint", tag = "crypto_bigint-v0.5.5-patch-v1" } tiny-keccak = { git = "https://github.com/sp1-patches/tiny-keccak", tag = "tiny_keccak-v2.0.2-patch-v1" } +# For sp1 versions >= 3.4.0 +curve25519-dalek = { git = "https://github.com/sp1-patches/curve25519-dalek", tag = "patch-v4.1.3-v3.4.0" } +# For sp1 versions < 3.4.0 curve25519-dalek = { git = "https://github.com/sp1-patches/curve25519-dalek", tag = "curve25519_dalek-v4.1.3-patch-v1" } curve25519-dalek-ng = { git = "https://github.com/sp1-patches/curve25519-dalek-ng", tag = "curve25519_dalek_ng-v4.1.1-patch-v1" } ed25519-consensus = { git = "https://github.com/sp1-patches/ed25519-consensus", tag = "ed25519_consensus-v2.1.0-patch-v1" } diff --git a/examples/Cargo.toml b/examples/Cargo.toml index 6a0c8ae75e..f5d06c2216 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -61,7 +61,7 @@ sp1-lib = { path = "../crates/zkvm/lib", default-features = false } sp1-zkvm = { path = "../crates/zkvm/entrypoint", default-features = false } [patch.crates-io] -# curve25519-dalek = { git = "https://github.com/sp1-patches/curve25519-dalek", tag = "curve25519_dalek-v4.1.3-patch-v1" } +curve25519-dalek = { git = "https://github.com/sp1-patches/curve25519-dalek", tag = "curve25519_dalek-v4.1.3-patch-v1" } curve25519-dalek-ng = { git = "https://github.com/sp1-patches/curve25519-dalek-ng", tag = "curve25519_dalek_ng-v4.1.1-patch-v1" } ecdsa-core = { git = "https://github.com/sp1-patches/signatures", package = "ecdsa", branch = "umadayal/secp256r1" } ed25519-consensus = { git = "https://github.com/sp1-patches/ed25519-consensus", tag = "ed25519_consensus-v2.1.0-patch-v1" } @@ -73,8 +73,3 @@ sha2-v0-9-8 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", packag tiny-keccak = { git = "https://github.com/sp1-patches/tiny-keccak", tag = "tiny_keccak-v2.0.2-patch-v1" } substrate-bn = { git = "https://github.com/sp1-patches/bn", tag = "substrate_bn-v0.6.0-patch-v1" } bls12_381 = { git = "https://github.com/sp1-patches/bls12_381", tag = "bls12_381-v0.8.0-patch-v1" } - -# todo remove -sp1-lib = { path = "../crates/zkvm/lib" } -sp1-curves = { path = "../crates/curves" } -curve25519-dalek = { git = "https://github.com/sp1-patches/curve25519-dalek", branch = "n/patch-eddecompress-panic" }