From aa6d3a9918e3dc8537b904caaaad69fa2539be7d Mon Sep 17 00:00:00 2001 From: mattstam Date: Fri, 13 Sep 2024 11:16:24 -0700 Subject: [PATCH 1/4] chore: bump version and generate changelog --- Cargo.toml | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 07d4d800f4..3d0fd3a064 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace.package] -version = "1.2.0" +version = "2.0.0" edition = "2021" license = "MIT OR Apache-2.0" repository = "https://github.com/succinctlabs/sp1" @@ -48,28 +48,28 @@ debug-assertions = true [workspace.dependencies] # sp1 -sp1-build = { path = "crates/build", version = "1.2.0" } -sp1-cli = { path = "crates/cli", version = "1.2.0", default-features = false } -sp1-core-machine = { path = "crates/core/machine", version = "1.2.0" } -sp1-core-executor = { path = "crates/core/executor", version = "1.2.0" } -sp1-curves = { path = "crates/curves", version = "1.2.0" } -sp1-derive = { path = "crates/derive", version = "1.2.0" } -sp1-eval = { path = "crates/eval", version = "1.2.0" } -sp1-helper = { path = "crates/helper", version = "1.2.0", default-features = false } -sp1-primitives = { path = "crates/primitives", version = "1.2.0" } -sp1-prover = { path = "crates/prover", version = "1.2.0" } -sp1-recursion-compiler = { path = "crates/recursion/compiler", version = "1.2.0" } -sp1-recursion-core = { path = "crates/recursion/core", version = "1.2.0", default-features = false } -sp1-recursion-core-v2 = { path = "crates/recursion/core-v2", version = "1.2.0", default-features = false } -sp1-recursion-derive = { path = "crates/recursion/derive", version = "1.2.0", default-features = false } -sp1-recursion-gnark-ffi = { path = "crates/recursion/gnark-ffi", version = "1.2.0", default-features = false } -sp1-recursion-program = { path = "crates/recursion/program", version = "1.2.0", default-features = false } -sp1-recursion-circuit = { path = "crates/recursion/circuit", version = "1.2.0", default-features = false } -sp1-sdk = { path = "crates/sdk", version = "1.2.0" } -sp1-cuda = { path = "crates/cuda", version = "1.2.0" } -sp1-stark = { path = "crates/stark", version = "1.2.0" } -sp1-lib = { path = "crates/zkvm/lib", version = "1.2.0", default-features = false } -sp1-zkvm = { path = "crates/zkvm/entrypoint", version = "1.2.0", default-features = false } +sp1-build = { path = "crates/build", version = "2.0.0" } +sp1-cli = { path = "crates/cli", version = "2.0.0", default-features = false } +sp1-core-machine = { path = "crates/core/machine", version = "2.0.0" } +sp1-core-executor = { path = "crates/core/executor", version = "2.0.0" } +sp1-curves = { path = "crates/curves", version = "2.0.0" } +sp1-derive = { path = "crates/derive", version = "2.0.0" } +sp1-eval = { path = "crates/eval", version = "2.0.0" } +sp1-helper = { path = "crates/helper", version = "2.0.0", default-features = false } +sp1-primitives = { path = "crates/primitives", version = "2.0.0" } +sp1-prover = { path = "crates/prover", version = "2.0.0" } +sp1-recursion-compiler = { path = "crates/recursion/compiler", version = "2.0.0" } +sp1-recursion-core = { path = "crates/recursion/core", version = "2.0.0", default-features = false } +sp1-recursion-core-v2 = { path = "crates/recursion/core-v2", version = "2.0.0", default-features = false } +sp1-recursion-derive = { path = "crates/recursion/derive", version = "2.0.0", default-features = false } +sp1-recursion-gnark-ffi = { path = "crates/recursion/gnark-ffi", version = "2.0.0", default-features = false } +sp1-recursion-program = { path = "crates/recursion/program", version = "2.0.0", default-features = false } +sp1-recursion-circuit = { path = "crates/recursion/circuit", version = "2.0.0", default-features = false } +sp1-sdk = { path = "crates/sdk", version = "2.0.0" } +sp1-cuda = { path = "crates/cuda", version = "2.0.0" } +sp1-stark = { path = "crates/stark", version = "2.0.0" } +sp1-lib = { path = "crates/zkvm/lib", version = "2.0.0", default-features = false } +sp1-zkvm = { path = "crates/zkvm/entrypoint", version = "2.0.0", default-features = false } # p3 p3-air = "0.1.3-succinct" From d770e96cc64a30c260eb276a1c478feacc33565b Mon Sep 17 00:00:00 2001 From: John Guibas Date: Thu, 12 Sep 2024 13:52:15 -0700 Subject: [PATCH 2/4] fix: bit counting --- .gitignore | 5 +++-- .../recursion/gnark-ffi/go/sp1/babybear/babybear.go | 11 +++-------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index c50ea62a6e..2b4a7389e1 100644 --- a/.gitignore +++ b/.gitignore @@ -23,5 +23,6 @@ benchmark.csv # Build Artifacts recursion/gnark-ffi/build -prover/build -prover/*.tar.gz \ No newline at end of file +crates/prover/build +crates/prover/data +crates/prover/*.tar.gz \ No newline at end of file diff --git a/crates/recursion/gnark-ffi/go/sp1/babybear/babybear.go b/crates/recursion/gnark-ffi/go/sp1/babybear/babybear.go index 2df5facf2a..31baba23e8 100644 --- a/crates/recursion/gnark-ffi/go/sp1/babybear/babybear.go +++ b/crates/recursion/gnark-ffi/go/sp1/babybear/babybear.go @@ -50,26 +50,21 @@ func NewChip(api frontend.API) *Chip { func Zero() Variable { return Variable{ Value: frontend.Variable("0"), - NbBits: 0, + NbBits: 32, } } func One() Variable { return Variable{ Value: frontend.Variable("1"), - NbBits: 1, + NbBits: 32, } } func NewF(value string) Variable { - if value == "0" { - return Zero() - } else if value == "1" { - return One() - } return Variable{ Value: frontend.Variable(value), - NbBits: 31, + NbBits: 32, } } From 1fe59294c3cedf385b800d2a62b5ae0c4eeb236d Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Thu, 12 Sep 2024 21:01:25 +0000 Subject: [PATCH 3/4] update to 1.2.1 --- crates/core/machine/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/core/machine/src/lib.rs b/crates/core/machine/src/lib.rs index bb11135186..94966595de 100644 --- a/crates/core/machine/src/lib.rs +++ b/crates/core/machine/src/lib.rs @@ -30,4 +30,4 @@ pub mod utils; /// This string should be updated whenever any step in verifying an SP1 proof changes, including /// core, recursion, and plonk-bn254. This string is used to download SP1 artifacts and the gnark /// docker image. -pub const SP1_CIRCUIT_VERSION: &str = "v1.2.0"; +pub const SP1_CIRCUIT_VERSION: &str = "v1.2.1"; From f09bb3bc890b92fbbce9c57e98256c1f4d63e33b Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Thu, 12 Sep 2024 23:31:33 +0000 Subject: [PATCH 4/4] fix: semvar --- crates/core/machine/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/core/machine/src/lib.rs b/crates/core/machine/src/lib.rs index 94966595de..6fd698c897 100644 --- a/crates/core/machine/src/lib.rs +++ b/crates/core/machine/src/lib.rs @@ -30,4 +30,4 @@ pub mod utils; /// This string should be updated whenever any step in verifying an SP1 proof changes, including /// core, recursion, and plonk-bn254. This string is used to download SP1 artifacts and the gnark /// docker image. -pub const SP1_CIRCUIT_VERSION: &str = "v1.2.1"; +pub const SP1_CIRCUIT_VERSION: &str = "v2.0.0";