remove evm

succinctlabs · Oct 8, 2024 · 63b1d10 · 63b1d10
1 parent d261050
commit 63b1d10
Show file tree

Hide file tree

Showing 23 changed files with 15 additions and 437 deletions.
diff --git a/.github/workflows/foundry-test.yml b/.github/workflows/foundry-test.yml
diff --git a/.gitmodules b/.gitmodules
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,7 +10,6 @@ resolver = "2"
 sp1-sdk = "2.0.0"
 sp1-zkvm = "2.0.0"
 sp1-helper = "2.0.0"
-alloy-sol-types = "0.7.7"
 serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 clap = { version = "4.0", features = ["derive", "env"] }

diff --git a/README.md b/README.md
@@ -37,35 +37,6 @@ cd script
 cargo run --release -- --prove
 ```
 
-### Generate an EVM-Compatible Proof
-
-> [!WARNING]
-> You will need at least 128GB RAM to generate a Groth16 or PLONK proof.
-
-To generate a proof that is small enough to be verified on-chain and verifiable by the EVM:
-
-```sh
-cd script
-cargo run --release --bin evm -- --system groth16
-```
-
-this will generate a Groth16 proof. If you want to generate a PLONK proof, run the following command:
-
-```sh
-cargo run --release --bin evm -- --system plonk
-```
-
-These commands will also generate fixtures that can be used to test the verification of SP1 zkVM proofs
-inside Solidity.
-
-### Retrieve the Verification Key
-
-To retrieve your `programVKey` for your on-chain contract, run the following command:
-
-```sh
-cargo prove vkey --elf elf/riscv32im-succinct-zkvm-elf
-```
-
 ## Using the Prover Network
 
 We highly recommend using the Succinct prover network for any non-trivial programs or benchmarking purposes. For more information, see the [setup guide](https://docs.succinct.xyz/generating-proofs/prover-network.html).
@@ -79,9 +50,8 @@ cp .env.example .env
 Then, set the `SP1_PROVER` environment variable to `network` and set the `SP1_PRIVATE_KEY`
 environment variable to your whitelisted private key.
 
-For example, to generate an EVM-compatible proof using the prover network, run the following
-command:
+To generate a proof, run the following command:
 
 ```sh
-SP1_PROVER=network SP1_PRIVATE_KEY=... cargo run --release --bin evm
+SP1_PROVER=network SP1_PRIVATE_KEY=... cargo run --release
 ```
diff --git a/contracts/.gitignore b/contracts/.gitignore
diff --git a/contracts/README.md b/contracts/README.md
diff --git a/contracts/foundry.toml b/contracts/foundry.toml
diff --git a/contracts/lib/forge-std b/contracts/lib/forge-std
diff --git a/contracts/lib/sp1-contracts b/contracts/lib/sp1-contracts
diff --git a/contracts/remappings.txt b/contracts/remappings.txt
diff --git a/contracts/src/Fibonacci.sol b/contracts/src/Fibonacci.sol
diff --git a/contracts/src/fixtures/groth16-fixture.json b/contracts/src/fixtures/groth16-fixture.json
diff --git a/contracts/src/fixtures/plonk-fixture.json b/contracts/src/fixtures/plonk-fixture.json
diff --git a/contracts/test/Fibonacci.t.sol b/contracts/test/Fibonacci.t.sol
diff --git a/elf/riscv32im-succinct-zkvm-elf b/elf/riscv32im-succinct-zkvm-elf
diff --git a/lib/Cargo.toml b/lib/Cargo.toml
@@ -4,4 +4,4 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-alloy-sol-types = { workspace = true }
+serde = { workspace = true }
diff --git a/lib/src/lib.rs b/lib/src/lib.rs
@@ -1,12 +1,11 @@
-use alloy_sol_types::sol;
+use serde::{Deserialize, Serialize};
 
-sol! {
-    /// The public values encoded as a struct that can be easily deserialized inside Solidity.
-    struct PublicValuesStruct {
-        uint32 n;
-        uint32 a;
-        uint32 b;
-    }
+/// The public values encoded as a struct.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct PublicValuesStruct {
+    pub n: u32,
+    pub a: u32,
+    pub b: u32,
 }
 
 /// Compute the n'th fibonacci number (wrapping around on overflows), using normal Rust code.

diff --git a/program/Cargo.toml b/program/Cargo.toml
@@ -4,6 +4,5 @@ name = "fibonacci-program"
 edition = "2021"
 
 [dependencies]
-alloy-sol-types = { workspace = true }
 sp1-zkvm = { workspace = true }
 fibonacci-lib = { workspace = true }