refactor: split zkvm crate into entrypoint and precompiles

succinctlabs · Feb 20, 2024 · 13c82b4 · 13c82b4
1 parent b4dfee6
commit 13c82b4
Show file tree

Hide file tree

Showing 91 changed files with 456 additions and 146 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace]
-members = ["core", "cli", "derive", "zkvm"]
+members = ["core", "cli", "derive", "zkvm/*"]
 exclude = ["examples/target"]
 resolver = "2"
 

diff --git a/examples/chess/program/Cargo.lock b/examples/chess/program/Cargo.lock
diff --git a/examples/chess/program/Cargo.toml b/examples/chess/program/Cargo.toml
@@ -6,4 +6,4 @@ edition = "2021"
 
 [dependencies]
 chess = "3.2.0"
-sp1-zkvm = { path = "../../../zkvm" }
+sp1-zkvm = { path = "../../../zkvm/entrypoint" }
diff --git a/examples/chess/program/elf/riscv32im-succinct-zkvm-elf b/examples/chess/program/elf/riscv32im-succinct-zkvm-elf
diff --git a/examples/ed25519/program/Cargo.lock b/examples/ed25519/program/Cargo.lock
diff --git a/examples/ed25519/program/Cargo.toml b/examples/ed25519/program/Cargo.toml
@@ -5,7 +5,7 @@ name = "ed25519-program"
 edition = "2021"
 
 [dependencies]
-sp1-zkvm = { path = "../../../zkvm" }
+sp1-zkvm = { path = "../../../zkvm/entrypoint" }
 ed25519-dalek = { git = "https://github.com/dalek-cryptography/curve25519-dalek.git", rev = "0b45e00", version = "2.1.0" }
 hex-literal = "0.4.1"
 

diff --git a/examples/ed25519/program/elf/riscv32im-succinct-zkvm-elf b/examples/ed25519/program/elf/riscv32im-succinct-zkvm-elf
diff --git a/examples/fibonacci-io/program/Cargo.lock b/examples/fibonacci-io/program/Cargo.lock
diff --git a/examples/fibonacci-io/program/Cargo.toml b/examples/fibonacci-io/program/Cargo.toml
@@ -5,4 +5,4 @@ name = "fibonacci-io-program"
 edition = "2021"
 
 [dependencies]
-sp1-zkvm = { path = "../../../zkvm" }
+sp1-zkvm = { path = "../../../zkvm/entrypoint" }
diff --git a/examples/fibonacci-io/program/elf/riscv32im-succinct-zkvm-elf b/examples/fibonacci-io/program/elf/riscv32im-succinct-zkvm-elf
diff --git a/examples/fibonacci/program/Cargo.lock b/examples/fibonacci/program/Cargo.lock
diff --git a/examples/fibonacci/program/Cargo.toml b/examples/fibonacci/program/Cargo.toml
@@ -5,4 +5,4 @@ name = "fibonacci-program"
 edition = "2021"
 
 [dependencies]
-sp1-zkvm = { path = "../../../zkvm" }
+sp1-zkvm = { path = "../../../zkvm/entrypoint" }
diff --git a/examples/fibonacci/program/elf/riscv32im-succinct-zkvm-elf b/examples/fibonacci/program/elf/riscv32im-succinct-zkvm-elf
diff --git a/examples/io/program/Cargo.lock b/examples/io/program/Cargo.lock
diff --git a/examples/io/program/Cargo.toml b/examples/io/program/Cargo.toml
@@ -5,5 +5,5 @@ name = "io-program"
 edition = "2021"
 
 [dependencies]
-sp1-zkvm = { path = "../../../zkvm" }
+sp1-zkvm = { path = "../../../zkvm/entrypoint" }
 serde = { version = "1.0.195", features = ["derive"] }
diff --git a/examples/io/program/elf/riscv32im-succinct-zkvm-elf b/examples/io/program/elf/riscv32im-succinct-zkvm-elf
diff --git a/examples/json/program/Cargo.lock b/examples/json/program/Cargo.lock
diff --git a/examples/json/program/Cargo.toml b/examples/json/program/Cargo.toml
@@ -5,5 +5,5 @@ name = "json-program"
 edition = "2021"
 
 [dependencies]
-sp1-zkvm = { path = "../../../zkvm" }
+sp1-zkvm = { path = "../../../zkvm/entrypoint" }
 serde_json = "1.0.113"
diff --git a/examples/json/program/elf/riscv32im-succinct-zkvm-elf b/examples/json/program/elf/riscv32im-succinct-zkvm-elf
diff --git a/examples/regex/program/Cargo.lock b/examples/regex/program/Cargo.lock
diff --git a/examples/regex/program/Cargo.toml b/examples/regex/program/Cargo.toml
@@ -5,5 +5,5 @@ name = "regex-program"
 edition = "2021"
 
 [dependencies]
-sp1-zkvm = { path = "../../../zkvm" }
+sp1-zkvm = { path = "../../../zkvm/entrypoint" }
 regex = "1.10.3"
diff --git a/examples/regex/program/elf/riscv32im-succinct-zkvm-elf b/examples/regex/program/elf/riscv32im-succinct-zkvm-elf
diff --git a/examples/rsa/program/Cargo.lock b/examples/rsa/program/Cargo.lock
diff --git a/examples/rsa/program/Cargo.toml b/examples/rsa/program/Cargo.toml
@@ -5,7 +5,7 @@ name = "rsa-program"
 edition = "2021"
 
 [dependencies]
-sp1-zkvm = { path = "../../../zkvm" }
+sp1-zkvm = { path = "../../../zkvm/entrypoint" }
 digest = "0.10.7"
 rand = "0.8.5"
 rsa = "0.6" # Check for the latest version

diff --git a/examples/rsa/program/elf/riscv32im-succinct-zkvm-elf b/examples/rsa/program/elf/riscv32im-succinct-zkvm-elf
diff --git a/examples/ssz-withdrawals/program/Cargo.lock b/examples/ssz-withdrawals/program/Cargo.lock
diff --git a/examples/ssz-withdrawals/program/Cargo.toml b/examples/ssz-withdrawals/program/Cargo.toml
@@ -5,7 +5,7 @@ name = "ssz-withdrawals-program"
 edition = "2021"
 
 [dependencies]
-sp1-zkvm = { path = "../../../zkvm" }
+sp1-zkvm = { path = "../../../zkvm/entrypoint" }
 hex-literal = "0.4.1"
 sha2 = "0.9.8"
 ssz_rs = { version = "0.9.0", features = ["serde"] }

diff --git a/examples/ssz-withdrawals/program/elf/riscv32im-succinct-zkvm-elf b/examples/ssz-withdrawals/program/elf/riscv32im-succinct-zkvm-elf
diff --git a/examples/tendermint/program/Cargo.lock b/examples/tendermint/program/Cargo.lock
diff --git a/examples/tendermint/program/Cargo.toml b/examples/tendermint/program/Cargo.toml
@@ -5,7 +5,7 @@ name = "tendermint-program"
 edition = "2021"
 
 [dependencies]
-sp1-zkvm = { path = "../../../zkvm" }
+sp1-zkvm = { path = "../../../zkvm/entrypoint" }
 serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 tendermint = { version = "0.34.0", default-features = false }

diff --git a/examples/tendermint/program/elf/riscv32im-succinct-zkvm-elf b/examples/tendermint/program/elf/riscv32im-succinct-zkvm-elf
diff --git a/tests/blake3-compress/Cargo.lock b/tests/blake3-compress/Cargo.lock
diff --git a/tests/blake3-compress/Cargo.toml b/tests/blake3-compress/Cargo.toml
@@ -5,4 +5,4 @@ name = "blake3-compress-test"
 edition = "2021"
 
 [dependencies]
-sp1-zkvm = { path = "../../zkvm" }
+sp1-zkvm = { path = "../../zkvm/entrypoint" }
diff --git a/tests/blake3-compress/elf/riscv32im-succinct-zkvm-elf b/tests/blake3-compress/elf/riscv32im-succinct-zkvm-elf
diff --git a/tests/cycle-tracker/Cargo.lock b/tests/cycle-tracker/Cargo.lock
diff --git a/tests/cycle-tracker/Cargo.toml b/tests/cycle-tracker/Cargo.toml
@@ -5,5 +5,5 @@ name = "cycle-tracker-test"
 edition = "2021"
 
 [dependencies]
-sp1-zkvm = { path = "../../zkvm" }
+sp1-zkvm = { path = "../../zkvm/entrypoint" }
 sp1-derive = { path = "../../derive" }
diff --git a/tests/cycle-tracker/elf/riscv32im-succinct-zkvm-elf b/tests/cycle-tracker/elf/riscv32im-succinct-zkvm-elf
diff --git a/tests/ecrecover/Cargo.lock b/tests/ecrecover/Cargo.lock