feat: on-chain proof verification test for c0 [skip-line-limit]

.github/workflows/ci.yml

@@ -22,6 +22,7 @@ env:
   NODE_VERSION: 22
   RUST_TOOLCHAIN: 1.86.0
   NOIR_TOOLCHAIN: v1.0.0-beta.15
+  BB_VERSION: 3.0.0-nightly.20251104
   HARDHAT_VAR_MNEMONIC: 'test test test test test test test test test test test junk'
   HARDHAT_VAR_INFURA_API_KEY: 'zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz'
   PRIVATE_KEY: '0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80'
@@ -32,7 +33,7 @@ permissions:
   packages: write
 
 jobs:
-  rust_unit:
+  rust_tests:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
@@ -75,46 +76,6 @@ jobs:
       - name: Run Unit Tests
         run: 'cargo test --lib && cargo test --doc'
 
-  rust_integration:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-
-      - name: Cache Rust dependencies
-        uses: ./.github/actions/cache-dependencies
-
-      - name: Install Rust
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          toolchain: ${{ env.RUST_TOOLCHAIN }}
-
-        # We must install foundry in order to be able to test anvil
-      - name: Install Foundry
-        uses: foundry-rs/foundry-toolchain@v1
-
-      - name: Install solc
-        run: |
-          sudo add-apt-repository ppa:ethereum/ethereum \
-          && sudo apt-get update -y \
-          && sudo apt-get install -y solc
-
-      - name: pnpm-setup
-        uses: pnpm/action-setup@v4
-
-        # We need to setup node in order to compile the hardhat contracts to get the artifacts
-      - name: 'Setup node'
-        uses: actions/setup-node@v4
-        with:
-          node-version: ${{ env.NODE_VERSION }}
-          cache: 'pnpm'
-          cache-dependency-path: pnpm-lock.yaml
-
-      - name: 'Install the dependencies'
-        run: 'pnpm install --frozen-lockfile'
-
-      - name: Checking code format rust
-        run: pnpm rust:lint
-
       - name: Run Integration Tests
         run: 'cargo test --test integration -- --nocapture'
 
@@ -310,14 +271,6 @@ jobs:
       - name: 'Install the dependencies'
         run: 'pnpm install --frozen-lockfile'
 
-      - name: 'Lint the code'
-        run: 'pnpm lint'
-
-      - name: 'Add lint summary'
-        run: |
-          echo "## Lint results" >> $GITHUB_STEP_SUMMARY
-          echo "✅ Passed" >> $GITHUB_STEP_SUMMARY
-
       - name: 'Run prebuild'
         run: 'pnpm test:integration prebuild'
 
@@ -611,7 +564,7 @@ jobs:
           path: ./examples/CRISP/playwright-report/
           retention-days: 30
 
-  test_enclave_circuits:
+  build_circuits:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
@@ -623,19 +576,85 @@ jobs:
         with:
           toolchain: ${{ env.NOIR_TOOLCHAIN }}
 
+      - name: Install Barretenberg (bb)
+        run: |
+          curl -fsSL "https://github.com/AztecProtocol/aztec-packages/releases/download/v${{ env.BB_VERSION }}/barretenberg-amd64-linux.tar.gz" -o bb.tar.gz
+          mkdir -p bb_extract && tar -xzf bb.tar.gz -C bb_extract
+          BB_BIN=$(find bb_extract -name bb -type f | head -n 1)
+          sudo mv "$BB_BIN" /usr/local/bin/bb
+          chmod +x /usr/local/bin/bb
+          bb --version
+
       - name: Check formatting
         run: ./scripts/lint-circuits.sh
 
       - name: Test Noir circuits
         run: ./scripts/test-circuits.sh
 
-      - name: Upload circuit artifacts
+      - name: pnpm-setup
+        uses: pnpm/action-setup@v4
+
+      - name: Setup node
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+          cache: 'pnpm'
+          cache-dependency-path: pnpm-lock.yaml
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Build circuits
+        run: pnpm build:circuits
+
+      - name: Upload compiled circuit artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: circuit-artifacts
-          path: circuits/target/
+          name: compiled-circuits
+          path: |
+            circuits/bin/dkg/target/
+            circuits/bin/threshold/target/
           retention-days: 1
-          if-no-files-found: warn
+          if-no-files-found: error
+
+  zk_prover_e2e:
+    runs-on: ubuntu-latest
+    needs: [build_circuits]
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Cache Rust dependencies
+        uses: ./.github/actions/cache-dependencies
+
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: ${{ env.RUST_TOOLCHAIN }}
+
+      - name: Install Barretenberg (bb)
+        run: |
+          curl -fsSL "https://github.com/AztecProtocol/aztec-packages/releases/download/v${{ env.BB_VERSION }}/barretenberg-amd64-linux.tar.gz" -o bb.tar.gz
+          mkdir -p bb_extract && tar -xzf bb.tar.gz -C bb_extract
+          BB_BIN=$(find bb_extract -name bb -type f | head -n 1)
+          sudo mv "$BB_BIN" /usr/local/bin/bb
+          chmod +x /usr/local/bin/bb
+          bb --version
+
+      - name: Download compiled circuit artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: compiled-circuits
+          path: circuits/bin/
+
+      - name: Verify circuit artifacts
+        run: |
+          echo "DKG circuits:"
+          ls -la circuits/bin/dkg/target/*.json circuits/bin/dkg/target/*.vk
+          echo "Threshold circuits:"
+          ls -la circuits/bin/threshold/target/*.json circuits/bin/threshold/target/*.vk
+
+      - name: Run ZK prover e2e tests
+        run: cargo test -p e3-zk-prover --test local_e2e_tests -- --nocapture
 
   build_e3_support_dev:
     runs-on: ubuntu-latest

crates/cli/src/noir.rs

@@ -126,9 +126,18 @@ async fn execute_status(backend: &ZkBackend) -> Result<()> {
 }
 
 async fn execute_setup(backend: &ZkBackend, force: bool) -> Result<()> {
+    println!("Setting up ZK prover...\n");
+    println!(
+        "  target bb version:       {}",
+        backend.config.required_bb_version
+    );
+    println!(
+        "  target circuits version: {}\n",
+        backend.config.required_circuits_version
+    );
+
     if force {
         println!("Force reinstalling ZK prover components...\n");
-        println!("Setting up ZK prover...\n");
 
         // Force reinstall by directly downloading components
         backend
@@ -142,22 +151,49 @@ async fn execute_setup(backend: &ZkBackend, force: bool) -> Result<()> {
     } else {
         let status = backend.check_status().await;
         if matches!(status, SetupStatus::Ready) {
+            let version_info = backend.load_version_info().await;
             println!("ZK prover is already set up and up to date.");
+            println!(
+                "  bb version:         {}",
+                version_info.bb_version.as_deref().unwrap_or("unknown")
+            );
+            println!(
+                "  circuits version:   {}",
+                version_info
+                    .circuits_version
+                    .as_deref()
+                    .unwrap_or("unknown")
+            );
             println!("  Use --force to reinstall.");
             return Ok(());
         }
 
-        println!("Setting up ZK prover...\n");
-
         backend
             .ensure_installed()
             .await
             .map_err(|e| anyhow!("Setup failed: {}", e))?;
     }
 
+    let version_info = backend.load_version_info().await;
+
     println!("\nZK prover setup complete!");
-    println!("  bb binary: {}", backend.bb_binary.display());
-    println!("  circuits: {}", backend.circuits_dir.display());
+    println!();
+    println!("  bb binary:          {}", backend.bb_binary.display());
+    println!(
+        "  bb version:         {}",
+        version_info.bb_version.as_deref().unwrap_or("unknown")
+    );
+    println!("  circuits dir:       {}", backend.circuits_dir.display());
+    println!(
+        "  circuits version:   {}",
+        version_info
+            .circuits_version
+            .as_deref()
+            .unwrap_or("unknown")
+    );
+    if let Some(ref ts) = version_info.last_updated {
+        println!("  last updated:       {}", ts);
+    }
 
     Ok(())
 }

crates/events/src/enclave_event/proof.rs

@@ -44,20 +44,18 @@ pub enum CircuitName {
     SkShareComputation,
     /// E_SM share computation proof (C2b).
     ESmShareComputation,
-    /// Encrypted sk share proof (C3a).
-    SkShareEncryption,
-    /// Encrypted E_SM share proof (C3b).
-    ESmShareEncryption,
-    /// Sk share decryption proof (C4a).
-    DkgSkShareDecryption,
-    /// E_SM share decryption proof (C4b).
-    DkgESmShareDecryption,
+    /// Share encryption proof (C3).
+    ShareEncryption,
+    /// DKG share decryption proof (C4).
+    DkgShareDecryption,
     /// Public key aggregation proof (C5).
     PkAggregation,
     /// Decryption share proof (C6).
     ThresholdShareDecryption,
-    /// Decrypted shares aggregation proof (C7).
-    DecryptedSharesAggregation,
+    /// Decrypted shares aggregation proof — BigNum variant (C7a).
+    DecryptedSharesAggregationBn,
+    /// Decrypted shares aggregation proof — Modular variant (C7b).
+    DecryptedSharesAggregationMod,
 }
 
 impl CircuitName {
@@ -67,13 +65,12 @@ impl CircuitName {
             CircuitName::PkGeneration => "pk_generation",
             CircuitName::SkShareComputation => "sk_share_computation",
             CircuitName::ESmShareComputation => "e_sm_share_computation",
-            CircuitName::SkShareEncryption => "sk_share_encryption",
-            CircuitName::ESmShareEncryption => "e_sm_share_encryption",
-            CircuitName::DkgSkShareDecryption => "dkg_sk_share_decryption",
-            CircuitName::DkgESmShareDecryption => "dkg_e_sm_share_decryption",
+            CircuitName::ShareEncryption => "share_encryption",
+            CircuitName::DkgShareDecryption => "share_decryption",
             CircuitName::PkAggregation => "pk_aggregation",
-            CircuitName::ThresholdShareDecryption => "threshold_share_decryption",
-            CircuitName::DecryptedSharesAggregation => "decrypted_shares_aggregation",
+            CircuitName::ThresholdShareDecryption => "share_decryption",
+            CircuitName::DecryptedSharesAggregationBn => "decrypted_shares_aggregation_bn",
+            CircuitName::DecryptedSharesAggregationMod => "decrypted_shares_aggregation_mod",
         }
     }
 
@@ -82,14 +79,13 @@ impl CircuitName {
             CircuitName::PkBfv => "dkg",
             CircuitName::SkShareComputation => "dkg",
             CircuitName::ESmShareComputation => "dkg",
-            CircuitName::SkShareEncryption => "dkg",
-            CircuitName::ESmShareEncryption => "dkg",
-            CircuitName::DkgSkShareDecryption => "dkg",
-            CircuitName::DkgESmShareDecryption => "dkg",
+            CircuitName::ShareEncryption => "dkg",
+            CircuitName::DkgShareDecryption => "dkg",
             CircuitName::PkGeneration => "threshold",
             CircuitName::ThresholdShareDecryption => "threshold",
             CircuitName::PkAggregation => "threshold",
-            CircuitName::DecryptedSharesAggregation => "threshold",
+            CircuitName::DecryptedSharesAggregationBn => "threshold",
+            CircuitName::DecryptedSharesAggregationMod => "threshold",
         }
     }