Merge pull request #2868 from o1-labs/dw/merge-back-develop-in-master

[20241209] Merge develop into master
o1-labs · Feb 3, 2025 · b0c4ec9 · b0c4ec9
2 parents 8818a11 + 0e0f707
commit b0c4ec9
Show file tree

Hide file tree

Showing 16 changed files with 45 additions and 1,856 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -79,7 +79,7 @@ strum_macros = "0.26.1"
 syn = { version = "1.0.109", features = ["full"] }
 thiserror = "1.0.30"
 tinytemplate = "1.1"
-wasm-bindgen = "=0.2.90"
+wasm-bindgen = "=0.2.87"
 
 
 arrabbiata = { path = "./arrabbiata", version = "0.1.0" }

diff --git a/circuit-construction/Cargo.toml b/circuit-construction/Cargo.toml
diff --git a/circuit-construction/src/constants.rs b/circuit-construction/src/constants.rs
diff --git a/circuit-construction/src/lib.rs b/circuit-construction/src/lib.rs
diff --git a/circuit-construction/src/prover.rs b/circuit-construction/src/prover.rs