chore: organize workspaces (#1129)

.github/workflows/release-plz.yml

@@ -7,8 +7,7 @@ permissions:
 on:
   push:
     branches:
-      - dev
-      # - main
+      - main
 
 jobs:
   release-plz:

Cargo.toml

@@ -11,6 +11,7 @@ members = [
   "recursion/circuit",
   "recursion/compiler",
   "recursion/core",
+  "recursion/derive",
   "recursion/gnark-cli",
   "recursion/gnark-ffi",
   "recursion/program",
@@ -40,6 +41,23 @@ debug = true
 debug-assertions = true
 
 [workspace.dependencies]
+sp1-build = { path = "build", version = "1.0.0-rc.1" }
+sp1-derive = { path = "derive", version = "1.0.0-rc.1" }
+sp1-core = { path = "core", version = "1.0.0-rc.1" }
+sp1-cli = { path = "cli", version = "1.0.0-rc.1", default-features = false }
+sp1-eval = { path = "eval", version = "1.0.0-rc.1", default-features = false }
+sp1-helper = { path = "helper", version = "1.0.0-rc.1", default-features = false }
+sp1-primitives = { path = "primitives", version = "1.0.0-rc.1" }
+sp1-prover = { path = "prover", version = "1.0.0-rc.1" }
+sp1-recursion-compiler = { path = "recursion/compiler", version = "1.0.0-rc.1" }
+sp1-recursion-core = { path = "recursion/core", version = "1.0.0-rc.1", default-features = false }
+sp1-recursion-derive = { path = "recursion/derive", version = "1.0.0-rc.1", default-features = false }
+sp1-recursion-gnark-ffi = { path = "recursion/gnark-ffi", version = "1.0.0-rc.1", default-features = false }
+sp1-recursion-program = { path = "recursion/program", version = "1.0.0-rc.1", default-features = false }
+sp1-recursion-circuit = { path = "recursion/circuit", version = "1.0.0-rc.1", default-features = false }
+sp1-sdk = { path = "sdk", version = "1.0.0-rc.1" }
+sp1-lib = { path = "zkvm/lib", version = "1.0.0-rc.1", default-features = false }
+sp1-zkvm = { path = "zkvm/entrypoint", version = "1.0.0-rc.1", default-features = false }
 p3-air = "0.1.3-succinct"
 p3-field = "0.1.3-succinct"
 p3-commit = "0.1.3-succinct"

cli/Cargo.toml

@@ -21,10 +21,10 @@ vergen = { version = "8", default-features = false, features = [
 anyhow = { version = "1.0.83", features = ["backtrace"] }
 cargo_metadata = "0.18.1"
 clap = { version = "4.5.9", features = ["derive", "env"] }
-sp1-build = { path = "../build", version = "1.0.0-rc.1" }
-sp1-prover = { path = "../prover", version = "1.0.0-rc.1" }
-sp1-sdk = { path = "../sdk", version = "1.0.0-rc.1" }
-sp1-core = { path = "../core", version = "1.0.0-rc.1" }
+sp1-build = { workspace = true }
+sp1-prover = { workspace = true }
+sp1-sdk = { workspace = true }
+sp1-core = { workspace = true }
 reqwest = { version = "0.12.4", features = [
   "stream",
   "json",

core/Cargo.toml

@@ -35,8 +35,8 @@ p3-symmetric = { workspace = true }
 p3-uni-stark = { workspace = true }
 p3-util = { workspace = true }
 rrs_lib = { package = "rrs-succinct", version = "0.1.0" }
-sp1-derive = { path = "../derive", version = "1.0.0-rc.1" }
-sp1-primitives = { path = "../primitives", version = "1.0.0-rc.1" }
+sp1-derive = { workspace = true }
+sp1-primitives = { workspace = true }
 
 anyhow = "1.0.83"
 amcl = { package = "snowbridge-amcl", version = "1.0.2", default-features = false, features = [
@@ -73,7 +73,7 @@ tiny-keccak = { version = "2.0.2", features = ["keccak"] }
 criterion = "0.5.1"
 num = { version = "0.4.3", features = ["rand"] }
 rand = "0.8.5"
-sp1-zkvm = { path = "../zkvm/entrypoint", version = "1.0.0-rc.1" }
+sp1-zkvm = { workspace = true }
 
 [features]
 neon = ["p3-blake3/neon"]

core/src/lib.rs

@@ -37,4 +37,4 @@ use stark::StarkGenericConfig;
 /// 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 = "1.0.0-rc.1";
+pub const SP1_CIRCUIT_VERSION: &str = "v1.0.0-rc.1";

eval/Cargo.toml

@@ -9,8 +9,8 @@ categories = { workspace = true }
 publish = false
 
 [dependencies]
-sp1-core = { path = "../core", version = "1.0.0-rc.1" }
-sp1-prover = { path = "../prover", version = "1.0.0-rc.1" }
+sp1-core = { workspace = true }
+sp1-prover = { workspace = true }
 
 clap = { version = "4.5.9", features = ["derive"] }
 csv = "1.3.0"

examples/Cargo.toml

@@ -15,3 +15,26 @@ members = [
   "patch-testing/script",
 ]
 resolver = "2"
+
+[workspace.package]
+version = "1.0.0-rc.1"
+edition = "2021"
+
+[workspace.dependencies]
+sp1-build = { path = "../build" }
+sp1-derive = { path = "../derive" }
+sp1-core = { path = "../core" }
+sp1-cli = { path = "../cli", default-features = false }
+sp1-eval = { path = "../eval", default-features = false }
+sp1-helper = { path = "../helper", default-features = false }
+sp1-primitives = { path = "../primitives" }
+sp1-prover = { path = "../prover" }
+sp1-recursion-compiler = { path = "../recursion/compiler" }
+sp1-recursion-core = { path = "../recursion/core", default-features = false }
+sp1-recursion-derive = { path = "../recursion/derive", default-features = false }
+sp1-recursion-gnark-ffi = { path = "../recursion/gnark-ffi", default-features = false }
+sp1-recursion-program = { path = "../recursion/program", default-features = false }
+sp1-recursion-circuit = { path = "../recursion/circuit", default-features = false }
+sp1-sdk = { path = "../sdk" }
+sp1-lib = { path = "../zkvm/lib", default-features = false }
+sp1-zkvm = { path = "../zkvm/entrypoint", default-features = false }

examples/aggregation/program/Cargo.toml

@@ -8,9 +8,7 @@ publish = false
 [dependencies]
 hex = "0.4.3"
 sha2 = "0.10.8"
-sp1-zkvm = { path = "../../../zkvm/entrypoint", features = [
-	"verify",
-], version = "1.0.0-rc.1" }
+sp1-zkvm = { path = "../../../zkvm/entrypoint", features = ["verify"] }
 
 [patch.crates-io]
 sha2-v0-10-8 = { git = "https://github.com/sp1-patches/RustCrypto-hashes.git", package = "sha2", branch = "patch-v0.10.8" }

examples/aggregation/script/Cargo.toml

@@ -1,13 +1,13 @@
 [package]
 name = "aggregation-script"
-version = "1.0.0-rc.1"
-edition = "2021"
+version = { workspace = true }
+edition = { workspace = true }
 publish = false
 
 [dependencies]
 hex = "0.4.3"
-sp1-sdk = { path = "../../../sdk", version = "1.0.0-rc.1" }
+sp1-sdk = { workspace = true }
 tracing = "0.1.40"
 
 [build-dependencies]
-sp1-helper = { path = "../../../helper", version = "1.0.0-rc.1" }
+sp1-helper = { workspace = true }

examples/chess/program/Cargo.toml

@@ -6,5 +6,5 @@ edition = "2021"
 publish = false
 
 [dependencies]
+sp1-zkvm = { path = "../../../zkvm/entrypoint" }
 chess = "3.2.0"
-sp1-zkvm = { path = "../../../zkvm/entrypoint", version = "1.0.0-rc.1" }

examples/chess/script/Cargo.toml

@@ -1,11 +1,11 @@
 [package]
 name = "chess-script"
-version = "1.0.0-rc.1"
-edition = "2021"
+version = { workspace = true }
+edition = { workspace = true }
 publish = false
 
 [dependencies]
-sp1-sdk = { path = "../../../sdk", version = "1.0.0-rc.1" }
+sp1-sdk = { workspace = true }
 
 [build-dependencies]
-sp1-helper = { path = "../../../helper", version = "1.0.0-rc.1" }
+sp1-helper = { workspace = true }

examples/cycle-tracking/program/Cargo.toml

@@ -6,5 +6,5 @@ edition = "2021"
 publish = false
 
 [dependencies]
-sp1-zkvm = { path = "../../../zkvm/entrypoint", version = "1.0.0-rc.1" }
-sp1-derive = { path = "../../../derive", version = "1.0.0-rc.1" }
+sp1-zkvm = { path = "../../../zkvm/entrypoint" }
+sp1-derive = { path = "../../../derive" }

examples/cycle-tracking/script/Cargo.toml

@@ -1,11 +1,11 @@
 [package]
 name = "cycle-tracking-script"
-version = "1.0.0-rc.1"
-edition = "2021"
+version = { workspace = true }
+edition = { workspace = true }
 publish = false
 
 [dependencies]
-sp1-sdk = { path = "../../../sdk", version = "1.0.0-rc.1" }
+sp1-sdk = { workspace = true }
 
 [build-dependencies]
-sp1-helper = { path = "../../../helper", version = "1.0.0-rc.1" }
+sp1-helper = { workspace = true }

examples/fibonacci/program/Cargo.toml

@@ -6,4 +6,4 @@ edition = "2021"
 publish = false
 
 [dependencies]
-sp1-zkvm = { path = "../../../zkvm/entrypoint", version = "1.0.0-rc.1" }
+sp1-zkvm = { path = "../../../zkvm/entrypoint" }

examples/fibonacci/script/Cargo.toml

@@ -1,17 +1,17 @@
 [package]
 name = "fibonacci-script"
-version = "1.0.0-rc.1"
-edition = "2021"
+version = { workspace = true }
+edition = { workspace = true }
 default-run = "fibonacci-script"
 publish = false
 
 [dependencies]
 itertools = "0.12.1"
-sp1-sdk = { path = "../../../sdk", version = "1.0.0-rc.1" }
+sp1-sdk = { workspace = true }
 sha2 = "0.10.8"
 
 [build-dependencies]
-sp1-helper = { path = "../../../helper", version = "1.0.0-rc.1" }
+sp1-helper = { workspace = true }
 
 [[bin]]
 name = "plonk_bn254"

examples/io/program/Cargo.toml

@@ -6,5 +6,5 @@ edition = "2021"
 publish = false
 
 [dependencies]
-sp1-zkvm = { path = "../../../zkvm/entrypoint", version = "1.0.0-rc.1" }
+sp1-zkvm = { path = "../../../zkvm/entrypoint" }
 serde = { version = "1.0.195", features = ["derive"] }

examples/io/script/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
 name = "io-script"
-version = "1.0.0-rc.1"
-edition = "2021"
+version = { workspace = true }
+edition = { workspace = true }
 publish = false
 
 [dependencies]
 serde = { version = "1.0.196", features = ["derive"] }
-sp1-sdk = { path = "../../../sdk", version = "1.0.0-rc.1" }
+sp1-sdk = { workspace = true }
 
 [build-dependencies]
-sp1-helper = { path = "../../../helper", version = "1.0.0-rc.1" }
+sp1-helper = { workspace = true }

examples/is-prime/program/Cargo.toml

@@ -6,4 +6,4 @@ edition = "2021"
 publish = false
 
 [dependencies]
-sp1-zkvm = { git = "https://github.com/succinctlabs/sp1.git" }
+sp1-zkvm = { path = "../../../zkvm/entrypoint" }

examples/is-prime/script/Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "is-prime-script"
-version = "1.0.0-rc.1"
-edition = "2021"
+version = { workspace = true }
+edition = { workspace = true }
 publish = false
 
 [dependencies]
-sp1-sdk = { path = "../../../sdk", version = "1.0.0-rc.1" }
+sp1-sdk = { workspace = true }

examples/json/lib/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "lib"
-version = "1.0.0-rc.1"
-edition = "2021"
+version = { workspace = true }
+edition = { workspace = true }
 publish = false
 
 [dependencies]

examples/json/program/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 publish = false
 
 [dependencies]
-sp1-zkvm = { path = "../../../zkvm/entrypoint", version = "1.0.0-rc.1" }
+sp1-zkvm = { path = "../../../zkvm/entrypoint" }
 serde_json = "1.0.113"
 serde = "1.0.197"
-lib = { path = "../lib", version = "1.0.0-rc.1" }
+lib = { path = "../lib" }

examples/json/script/Cargo.toml

@@ -1,14 +1,14 @@
 [package]
 name = "json-script"
-version = "1.0.0-rc.1"
-edition = "2021"
+version = { workspace = true }
+edition = { workspace = true }
 publish = false
 
 [dependencies]
 serde = "1.0.197"
 serde_json = "1.0.114"
-sp1-sdk = { path = "../../../sdk", version = "1.0.0-rc.1" }
-lib = { path = "../lib", version = "1.0.0-rc.1" }
+sp1-sdk = { workspace = true }
+lib = { path = "../lib" }
 
 [build-dependencies]
-sp1-helper = { path = "../../../helper", version = "1.0.0-rc.1" }
+sp1-helper = { workspace = true }

examples/patch-testing/program/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 publish = false
 
 [dependencies]
-sp1-zkvm = { path = "../../../zkvm/entrypoint", version = "1.0.0-rc.1" }
+sp1-zkvm = { path = "../../../zkvm/entrypoint" }
 
 sha2-v0-9-8 = { version = "0.9.8", package = "sha2" }
 # Note: Can't have sha2-v0-10-6 and v0-10-8 at the same time due to crate resolution.