Merge branch 'main' into uma/rebuild

succinctlabs · Apr 24, 2024 · f482fb2 · f482fb2
2 parents 0825594 + 97d4ae2
commit f482fb2
Show file tree

Hide file tree

Showing 174 changed files with 13,006 additions and 2,560 deletions.
diff --git a/.gitignore b/.gitignore
@@ -22,5 +22,5 @@ benchmark.csv
 .env
 
 # Build Artifacts
-recursion/groth16-ffi/build
+recursion/gnark-ffi/build
 prover/build
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -56,6 +56,7 @@
         // "tests/sha-compress/Cargo.toml",
         // "tests/sha-extend/Cargo.toml",
         // "tests/sha2/Cargo.toml",
+        // "tests/verify-proof/Cargo.toml",
         // // Eval.
         // "eval/Cargo.toml"
     ],

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,7 +10,7 @@ members = [
     "recursion/circuit",
     "recursion/compiler",
     "recursion/core",
-    "recursion/groth16-ffi",
+    "recursion/gnark-ffi",
     "recursion/program",
     "sdk",
     "zkvm/*",

diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -53,8 +53,8 @@ tempfile = "3.9.0"
 tracing = "0.1.40"
 tracing-forest = { version = "0.1.6", features = ["ansi", "smallvec"] }
 tracing-subscriber = { version = "0.3.17", features = ["std", "env-filter"] }
-strum_macros = "0.26.2"
-strum = "0.26.2"
+strum_macros = "0.26"
+strum = "0.26"
 web-time = "1.1.0"
 rayon-scan = "0.1.1"
 

diff --git a/core/benches/main.rs b/core/benches/main.rs
@@ -1,4 +1,5 @@
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use sp1_core::io::SP1Stdin;
 use sp1_core::runtime::{Program, Runtime};
 use sp1_core::utils::{run_and_prove, BabyBearPoseidon2};
 
@@ -21,8 +22,7 @@ pub fn criterion_benchmark(c: &mut Criterion) {
                 b.iter(|| {
                     run_and_prove(
                         black_box(program.clone()),
-                        #[allow(deprecated)]
-                        &[],
+                        &SP1Stdin::new(),
                         BabyBearPoseidon2::new(),
                     )
                 })