Merge pull request #31 from indextree/chore/contract_poseidon2

chore: change poseidon2 lib

Author: yugocabrio

.github/workflows/ci.yml

@@ -60,7 +60,7 @@ jobs:
         run: RUST_TEST_THREADS=1 cargo test --test integration_tests -- --nocapture
 
       - name: Run tornado classic tests
-        run: cargo test --manifest-path tornado_classic/contracts/Cargo.toml -- --nocapture
+        run: cargo test --manifest-path tornado_classic/contracts/Cargo.toml --features testutils -- --nocapture
 
       - name: Run tornado classic wasm-cost tests
         run: cargo test --manifest-path tornado_classic/contracts/Cargo.toml --features wasm-cost -- --nocapture

README.md

@@ -84,7 +84,7 @@ This contract does not enforce access control:
 
 ```bash
 RUST_TEST_THREADS=1 cargo test --test integration_tests -- --nocapture
-cargo test --manifest-path tornado_classic/contracts/Cargo.toml -- --nocapture
+cargo test --manifest-path tornado_classic/contracts/Cargo.toml --features testutils -- --nocapture
 ```
 
 ## References

test_snapshots/verify_fib_chain_proof_succeeds.1.json

@@ -80,26 +80,3 @@ fn print_budget_for_deploy_and_verify() {
     println!("=== verify_proof budget usage ===");
     env.cost_estimate().budget().print();
 }
-
-#[test]
-fn basic_verify_budget_test() {
-    let vk_bytes_raw: &[u8] = include_bytes!("simple_circuit/target/vk");
-    let proof_bin: &[u8] = include_bytes!("simple_circuit/target/proof");
-    let pub_inputs_bin: &[u8] = include_bytes!("simple_circuit/target/public_inputs");
-
-    let env = Env::default();
-    env.cost_estimate().budget().reset_unlimited();
-
-    let vk_bytes = Bytes::from_slice(&env, vk_bytes_raw);
-    let client = register_client(&env, &vk_bytes);
-
-    // Prepare proof inputs
-    assert_eq!(proof_bin.len(), PROOF_BYTES);
-    let proof_bytes: Bytes = Bytes::from_slice(&env, proof_bin);
-    let public_inputs: Bytes = Bytes::from_slice(&env, pub_inputs_bin);
-    let proof_for_direct = proof_bytes.clone();
-    let public_inputs_for_direct = public_inputs.clone();
-
-    client.verify_proof(&public_inputs_for_direct, &proof_for_direct);
-    env.cost_estimate().budget().print();
-}

test_snapshots/verify_simple_circuit_proof_succeeds.1.json

@@ -2,7 +2,7 @@ Tornado Classic–style Mixer (Soroban + Noir)
 
 Scope
 - Deposit stores commitments and rolls an on-chain Poseidon2 Merkle tree (depth 20).
-- Withdraw verifies a Noir UltraHonk proof against the stored root, enforces single-use nullifiers, and emits the verified recipient.
+- Withdraw verifies a Noir UltraHonk proof against the stored root and enforces single-use nullifiers.
 - Educational sample: no token flow, trusted setup, and bn254 precompile missing on Soroban networks (devnet deploy still blocked).
 
 Layout
@@ -23,14 +23,14 @@ scripts/gen_artifacts.sh   # produces target/{vk,proof,public_inputs,…}
 
 Run Contract Tests (includes real proof verification)
 ```bash
-cargo test --manifest-path tornado_classic/contracts/Cargo.toml -- --nocapture
+cargo test --manifest-path tornado_classic/contracts/Cargo.toml --features testutils -- --nocapture
 ```
 Key checks:
 - `deposit` appends to the frontier and updates the on-chain root.
-- `withdraw` takes separate `public_inputs` (three 32-byte values ordered `[root, nullifier_hash, recipient]`) and a `proof` blob (456 fields). The verifier contract now also expects `vk_bytes` as a distinct argument.
-- Nullifier mismatches or double spends fail; overwriting the root requires a configured admin actor.
+- `withdraw` takes separate `public_inputs` (two 32-byte values ordered `[root, nullifier_hash]`) and a `proof` blob (456 fields). The verifier contract now also expects `vk_bytes` as a distinct argument.
+- Invalid proofs or double spends fail; root overrides are only exposed in test builds.
 
 Quick Usage Notes
-- Call `MixerContract::configure(admin)` once (the tests use `mock_all_auths`) before any `set_root` overrides; normal deposits keep the root up to date automatically.
+- Normal deposits keep the root up to date automatically.
 - Ensure the public inputs match the Poseidon2 tree built off committed leaves.
 - This repo is instructional. For production you need audited hashes, token custody, and a native bn254 verifier.

tests/integration_tests.rs

@@ -4,4 +4,4 @@ type = "bin"
 authors = ["demo"]
 
 [dependencies]
-poseidon2 = { tag = "v0.4.0", git = "https://github.com/TaceoLabs/noir-poseidon", directory = "poseidon2" }
+poseidon = { tag = "v0.2.0", git = "https://github.com/noir-lang/poseidon" }

tornado_classic/README.md

@@ -1,21 +1,20 @@
-nullifier = "3"
-secret = "7"
+nullifier = "6364136223846793006"
+secret = "13885033948157127959"
 path_siblings = [
-  "100", "200", "300", "400", "500",
-  "600", "700", "800", "900", "1000",
-  "1100", "1200", "1300", "1400", "1500",
-  "1600", "1700", "1800", "1900", "2000"
+  "14678909342070756876",   "14340359694176818205",   "3490389784639564826",   "2377159206977889939",   "11136134660641191128",
+  "5776246781640716793",   "12360490266823512006",   "7783159857423531983",   "9857737466630432868",   "13004095818351146389",
+  "8116512559640647218",   "12170057637489489099",   "18267517067855658160",   "10007402826525227761",   "8371399485941705566",
+  "945482789575819655",   "8503743914302291388",   "4681333673231752717",   "8045448350685608778",   "12297150624705552899"
 ]
 path_bits = [
-  "0", "1", "0", "1", "0",
-  "1", "0", "1", "0", "1",
-  "0", "1", "0", "1", "0",
-  "1", "0", "1", "0", "1"
+  "0",   "1",   "0",   "1",   "0",
+  "1",   "0",   "1",   "0",   "1",
+  "0",   "1",   "0",   "1",   "0",
+  "1",   "0",   "1",   "0",   "1"
 ]
 
-# Public values are now outputs of the circuit (root, nullifier_hash, commitment).
+# Public values are now outputs of the circuit (root, nullifier_hash).
 # They no longer need to be provided here.
-nullifier_hash = "20880561256956177504774055209049453687035310356692429666068591658666436689465"
-root = "7949686520350552737436242943561594277139156253983408896060570356798148564531"
-recipient = "0"
+nullifier_hash = "1565608087449049416619061943903198865776183104520976486117587040849008336411"
+root = "2634098511163448549597990951329529553826382520699944715793596572254420631460"
 path_index = "699050"

tornado_classic/circuit/Nargo.toml

@@ -3,6 +3,7 @@ set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 PROJECT_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd)"
+REPO_ROOT="$(cd "${PROJECT_ROOT}/../.." && pwd)"
 export PATH="$HOME/.nargo/bin:$HOME/.bb/bin:${SCRIPT_DIR}:${PATH}"
 cd "${PROJECT_ROOT}"
 
@@ -79,6 +80,12 @@ fi
 echo "[1/4] nargo compile"
 "${NARGO_BIN}" compile
 
+if [[ "${GENERATE_PROVER:-1}" != "0" ]]; then
+  echo "[i] Generating Prover.toml inputs (seed=${TORNADO_SEED:-1})"
+  (cd "${REPO_ROOT}" && TORNADO_GENERATE=1 TORNADO_SEED="${TORNADO_SEED:-1}" \
+    cargo run --example populate_publics --manifest-path tornado_classic/contracts/Cargo.toml --features std)
+fi
+
 echo "[2/4] nargo execute (solve witness)"
 "${NARGO_BIN}" execute
 

tornado_classic/circuit/Prover.toml

@@ -1,14 +1,14 @@
 // Tornado Classic-style circuit
 // - Private inputs: nullifier, secret, Merkle path (siblings, path_bits)
-// - Public inputs: root, nullifier_hash, recipient
-// - Hash function uses Poseidon2 (via dep::poseidon2)
+// - Public inputs: root, nullifier_hash
+// - Hash function uses Poseidon2 (via dep::poseidon)
 // - Aligns with on-chain frontier Merkle: H = Poseidon2_2to1 (first limb),
 //   zero[0] = 0; zero[i+1] = H(zero[i], zero[i])
 
-use dep::poseidon2;
+use dep::poseidon::poseidon2::Poseidon2;
 
 fn hash2(a: Field, b: Field) -> Field {
-    poseidon2::bn254::hash_2([a, b])
+    Poseidon2::hash([a, b], 2)
 }
 
 fn constrain_bit(bit: Field) {
@@ -35,7 +35,6 @@ fn compute_root(leaf: Field, path_siblings: [Field; 20], path_bits: [Field; 20])
 pub fn main(
     root: pub Field,
     nullifier_hash: pub Field,
-    recipient: pub Field,
     nullifier: Field,
     secret: Field,
     path_siblings: [Field; 20],
@@ -52,6 +51,4 @@ pub fn main(
     let computed_root = compute_root(leaf, path_siblings, path_bits);
     assert(computed_root == root);
 
-    let recipient_square = recipient * recipient;
-    assert(recipient_square == recipient * recipient);
 }