chore: bump circom-witnesscalc version

.github/workflows/build-and-test.yml

@@ -89,7 +89,7 @@ jobs:
       - name: Install Rust toolchain
         uses: dtolnay/rust-toolchain@stable
         with:
-            toolchain: 1.81.0
+            toolchain: stable
       - name: Run ffi tests
         run: cd mopro-ffi && cargo test --release --all-features
   setup-halo2-wasm-env:
@@ -190,7 +190,7 @@ jobs:
       - name: Install Rust toolchain
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.81.0
+          toolchain: stable
           override: true
       - name: install dependencies
         run: brew install nasm
@@ -265,7 +265,7 @@ jobs:
       - name: Install Rust toolchain
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.81.0
+          toolchain: stable
           override: true
       - name: install requirements
         uses: awalsh128/cache-apt-pkgs-action@v1

Cargo.toml

@@ -1,11 +1,19 @@
 [workspace]
-members = ["mopro-ffi", "test-e2e", "cli", "mopro-wasm", "test-e2e/mopro-wasm-lib", "circom-prover"]
+members = [
+    "mopro-ffi",
+    "test-e2e",
+    "cli",
+    "mopro-wasm",
+    "test-e2e/mopro-wasm-lib",
+    "circom-prover",
+]
 resolver = "2"
 exclude = ["mopro-example-app"]
 
 [workspace.dependencies]
 plonk-fibonacci = { package = "plonk-fibonacci", git = "https://github.com/sifnoc/plonkish-fibonacci-sample.git" }
 hyperplonk-fibonacci = { package = "hyperplonk-fibonacci", git = "https://github.com/sifnoc/plonkish-fibonacci-sample.git" }
 gemini-fibonacci = { package = "gemini-fibonacci", git = "https://github.com/sifnoc/plonkish-fibonacci-sample.git" }
+rust-witness = "0.1"
 
 uniffi = { version = "=0.29.0" }

circom-prover/Cargo.toml

@@ -58,7 +58,7 @@ num-bigint = { version = "0.4.3", default-features = false, features = [
     "rand",
 ] }
 anyhow = "1.0.95"
-rust-witness = { version = "0.1", optional = true }
+rust-witness = { workspace = true, optional = true }
 byteorder = { version = "1.0.0" }
 uuid = { version = "1.9.1", features = ["v4"] }
 serde_json = "1.0.94"
@@ -91,7 +91,7 @@ rand = { version = "0.8", features = ["std"] }
 witnesscalc-adapter = { version = "0.1", optional = true }
 
 # circom-witnesscalc
-circom-witnesscalc = { version = "0.2", optional = true }
+circom-witnesscalc = { version = "0.2.1", optional = true }
 once_cell = { version = "1.21.3", optional = true }
 
 # rapidsnark
@@ -104,7 +104,7 @@ hex-literal = "0.4.1"
 
 [build-dependencies]
 # rust-witness
-rust-witness = { version = "0.1", optional = true }
+rust-witness = { workspace = true, optional = true }
 # witnesscalc-adapter
 witnesscalc-adapter = { version = "0.1", optional = true }
 # rapidsnark

circom-prover/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.81.0"
+channel = "1.89.0"

cli/Cargo.toml

@@ -24,7 +24,7 @@ include_dir = "0.7"
 dialoguer = "0.10"
 console = "0.15.8"
 anyhow = "1.0.86"
-toml = "0.8.19"
+toml = "0.9.2"
 zip = "2.2.1"
 reqwest = { version = "0.12.9", features = ["blocking"] }
 indicatif = "0.17.9"

mopro-ffi/Cargo.toml

@@ -51,7 +51,7 @@ anyhow = "1.0.86"
 color-eyre = "0.6.3"
 
 # circom deps
-rust-witness = { version = "0.1", optional = true }
+rust-witness = { workspace = true, optional = true }
 witnesscalc-adapter = { version = "0.1", optional = true }
 circom-prover = { path = "../circom-prover", optional = true }
 
@@ -60,7 +60,7 @@ circom-prover = { path = "../circom-prover", optional = true }
 noir_rs = { package = "noir", git = "https://github.com/zkmopro/noir-rs", features = [
     "barretenberg",
     "android-compat",
-], optional = true }
+], version = "1.0.0-beta.3-2", optional = true }
 
 
 # ZKP generation# build for iOS
@@ -72,7 +72,7 @@ camino = { version = "1.1.9", optional = true }
 [build-dependencies]
 uuid = { version = "1.9.1", features = ["v4"] }
 camino = "1.1.9"
-rust-witness = { version = "0.1", optional = true }
+rust-witness = { workspace = true, optional = true }
 witnesscalc-adapter = { version = "0.1", optional = true }
 
 [dev-dependencies]

test-e2e/Cargo.toml

@@ -28,7 +28,7 @@ mopro-ffi = { path = "../mopro-ffi", features = [
 mopro-wasm = { path = "../mopro-wasm" }
 
 # Circom dependencies
-rust-witness = "0.1"
+rust-witness = { workspace = true }
 witnesscalc-adapter = "0.1"
 
 # Halo2 dependencies
@@ -42,7 +42,7 @@ thiserror = "2.0.12"
 mopro-ffi = { path = "../mopro-ffi" }
 
 # Circom dependencies
-rust-witness = "0.1"
+rust-witness = { workspace = true }
 witnesscalc-adapter = "0.1"
 
 [dev-dependencies]

test-e2e/Config.toml

@@ -1,7 +1,7 @@
 build_mode = "release"
 target_adapters = [
-    "halo2",
     "circom",
+    "halo2",
 ]
 target_platforms = ["android"]
 ios = [

test-e2e/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.81.0"
+channel = "1.89.0"