Skip to content

Commit b0c4ec9

Browse files
authored
Merge pull request #2868 from o1-labs/dw/merge-back-develop-in-master
[20241209] Merge develop into master
2 parents 8818a11 + 0e0f707 commit b0c4ec9

File tree

16 files changed

+45
-1856
lines changed

16 files changed

+45
-1856
lines changed

Cargo.lock

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ strum_macros = "0.26.1"
7979
syn = { version = "1.0.109", features = ["full"] }
8080
thiserror = "1.0.30"
8181
tinytemplate = "1.1"
82-
wasm-bindgen = "=0.2.90"
82+
wasm-bindgen = "=0.2.87"
8383

8484

8585
arrabbiata = { path = "./arrabbiata", version = "0.1.0" }

circuit-construction/Cargo.toml

Lines changed: 0 additions & 47 deletions
This file was deleted.

circuit-construction/src/constants.rs

Lines changed: 0 additions & 44 deletions
This file was deleted.

circuit-construction/src/lib.rs

Lines changed: 0 additions & 33 deletions
This file was deleted.

circuit-construction/src/prover.rs

Lines changed: 0 additions & 136 deletions
This file was deleted.

0 commit comments

Comments
 (0)