Merge tag 'release/v3.0.0-rc1' into scroll-dev-0909

v3.0.0-rc1

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace.package]
-version = "1.2.0"
+version = "3.0.0-rc1"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/succinctlabs/sp1"
@@ -48,29 +48,29 @@ 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-circuit-v2 = { path = "crates/recursion/circuit-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 = "3.0.0-rc1" }
+sp1-cli = { path = "crates/cli", version = "3.0.0-rc1", default-features = false }
+sp1-core-machine = { path = "crates/core/machine", version = "3.0.0-rc1" }
+sp1-core-executor = { path = "crates/core/executor", version = "3.0.0-rc1" }
+sp1-curves = { path = "crates/curves", version = "3.0.0-rc1" }
+sp1-derive = { path = "crates/derive", version = "3.0.0-rc1" }
+sp1-eval = { path = "crates/eval", version = "3.0.0-rc1" }
+sp1-helper = { path = "crates/helper", version = "3.0.0-rc1", default-features = false }
+sp1-primitives = { path = "crates/primitives", version = "3.0.0-rc1" }
+sp1-prover = { path = "crates/prover", version = "3.0.0-rc1" }
+sp1-recursion-compiler = { path = "crates/recursion/compiler", version = "3.0.0-rc1" }
+sp1-recursion-core = { path = "crates/recursion/core", version = "3.0.0-rc1", default-features = false }
+sp1-recursion-core-v2 = { path = "crates/recursion/core-v2", version = "3.0.0-rc1", default-features = false }
+sp1-recursion-circuit-v2 = { path = "crates/recursion/circuit-v2", version = "3.0.0-rc1", default-features = false }
+sp1-recursion-derive = { path = "crates/recursion/derive", version = "3.0.0-rc1", default-features = false }
+sp1-recursion-gnark-ffi = { path = "crates/recursion/gnark-ffi", version = "3.0.0-rc1", default-features = false }
+sp1-recursion-program = { path = "crates/recursion/program", version = "3.0.0-rc1", default-features = false }
+sp1-recursion-circuit = { path = "crates/recursion/circuit", version = "3.0.0-rc1", default-features = false }
+sp1-sdk = { path = "crates/sdk", version = "3.0.0-rc1" }
+sp1-cuda = { path = "crates/cuda", version = "3.0.0-rc1" }
+sp1-stark = { path = "crates/stark", version = "3.0.0-rc1" }
+sp1-lib = { path = "crates/zkvm/lib", version = "3.0.0-rc1", default-features = false }
+sp1-zkvm = { path = "crates/zkvm/entrypoint", version = "3.0.0-rc1", default-features = false }
 
 # p3
 p3-air = "0.1.3-succinct"

crates/core/machine/src/lib.rs

@@ -30,7 +30,7 @@ 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.3.0-rc2-scroll";
+pub const SP1_CIRCUIT_VERSION: &str = "v3.0.0-rc1-scroll";
 
 // Re-export the `SP1ReduceProof` struct from sp1_core_machine.
 //

crates/recursion/gnark-ffi/go/sp1/babybear/babybear.go

@@ -50,14 +50,14 @@ func NewChip(api frontend.API) *Chip {
 func Zero() Variable {
 	return Variable{
 		Value:  frontend.Variable("0"),
-		NbBits: 1,
+		NbBits: 32,
 	}
 }
 
 func One() Variable {
 	return Variable{
 		Value:  frontend.Variable("1"),
-		NbBits: 1,
+		NbBits: 32,
 	}
 }
 
@@ -69,7 +69,7 @@ func NewF(value string) Variable {
 	}
 	return Variable{
 		Value:  frontend.Variable(value),
-		NbBits: 31,
+		NbBits: 32,
 	}
 }
 
@@ -349,12 +349,12 @@ func (p *Chip) reduceWithMaxBits(x frontend.Variable, maxNbBits uint64) frontend
 	quotient := result[0]
 	remainder := result[1]
 
-	// TODO: Fix before 1.3.0.
-	// if os.Getenv("GROTH16") != "1" {
-	// 	p.RangeChecker.Check(quotient, int(maxNbBits-30))
-	// } else {
-	// 	p.api.ToBinary(quotient, int(maxNbBits-30))
-	// }
+	if os.Getenv("GROTH16") != "1" {
+		p.RangeChecker.Check(quotient, int(maxNbBits-30))
+	} else {
+		p.api.ToBinary(quotient, int(maxNbBits-30))
+	}
+
 	// Check that the remainder has size less than the BabyBear modulus, by decomposing it into a 27
 	// bit limb and a 4 bit limb.
 	new_result, new_err := p.api.Compiler().NewHint(SplitLimbsHint, 2, remainder)