Merge branch 'jl/e2e' of https://github.com/noir-lang/eth-proofs into jl/e2e

Author: jialinli98

.github/workflows/circuits_profile.yaml

@@ -20,7 +20,7 @@ jobs:
           toolchain: 1.0.0-beta.18
 
       - name: Run nargo info
-        run: nargo info --workspace --silence-warnings --skip-brillig-constraints-check | tee profiling_info.txt
+        run: nargo info --workspace --silence-warnings | tee profiling_info.txt
 
       - name: Archive profiling artifacts
         uses: actions/upload-artifact@v4

.github/workflows/contract_test.yml

@@ -31,18 +31,34 @@ jobs:
         with:
           toolchain: 1.0.0-beta.18
 
-      # Note: Solidity verifier generation is not yet supported for UltraHonk in Nargo 1.0+
-      # Using pre-generated verifier contracts committed to the repository
-      # TODO: Re-enable when bb write_solidity_verifier supports Honk
-      # - name: Generate Verifier Contracts
-      #   run: |
-      #     nargo compile --workspace
-      #     bb write_solidity_verifier -k ./target/get_storage/vk/vk -o ./contract/get_storage/plonk_vk.sol
-      #     bb write_solidity_verifier -k ./target/get_account/vk/vk -o ./contract/get_account/plonk_vk.sol
-      #     bb write_solidity_verifier -k ./target/get_header/vk/vk -o ./contract/get_header/plonk_vk.sol
-      #     bb write_solidity_verifier -k ./target/get_receipt/vk/vk -o ./contract/get_receipt/plonk_vk.sol
-      #     bb write_solidity_verifier -k ./target/get_transaction/vk/vk -o ./contract/get_transaction/plonk_vk.sol
-      #     bb write_solidity_verifier -k ./target/get_log/vk/vk -o ./contract/get_log/plonk_vk.sol
+      - name: Install Barretenberg
+        run: |
+          curl -L https://raw.githubusercontent.com/AztecProtocol/aztec-packages/refs/heads/next/barretenberg/bbup/install | bash
+          ~/.bb/bbup -nv 1.0.0-beta.18
+          sudo apt install libc++-dev
+
+      - name: Compile Circuits
+        run: nargo compile --workspace --skip-brillig-constraints-check
+
+      - name: Generate Verification Keys
+        run: |
+          export PATH="$HOME/.bb:$PATH"
+          bb write_vk -b ./target/get_header.json -o ./target/get_header
+          bb write_vk -b ./target/get_account.json -o ./target/get_account
+          bb write_vk -b ./target/get_storage.json -o ./target/get_storage
+          bb write_vk -b ./target/get_receipt.json -o ./target/get_receipt
+          bb write_vk -b ./target/get_transaction.json -o ./target/get_transaction
+          bb write_vk -b ./target/get_log.json -o ./target/get_log
+
+      - name: Generate Solidity Verifier Contracts
+        run: |
+          export PATH="$HOME/.bb:$PATH"
+          bb write_solidity_verifier -k ./target/get_header -o ./ethereum/contracts/src/generated-verifier/GetHeaderUltraPLONKVerifier.sol
+          bb write_solidity_verifier -k ./target/get_account -o ./ethereum/contracts/src/generated-verifier/GetAccountUltraPLONKVerifier.sol
+          bb write_solidity_verifier -k ./target/get_storage -o ./ethereum/contracts/src/generated-verifier/GetStorageUltraPLONKVerifier.sol
+          bb write_solidity_verifier -k ./target/get_receipt -o ./ethereum/contracts/src/generated-verifier/GetReceiptUltraPLONKVerifier.sol
+          bb write_solidity_verifier -k ./target/get_transaction -o ./ethereum/contracts/src/generated-verifier/GetTransactionUltraPLONKVerifier.sol
+          bb write_solidity_verifier -k ./target/get_log -o ./ethereum/contracts/src/generated-verifier/GetLogUltraPLONKVerifier.sol
 
       - name: Run Forge build
         run: |

.github/workflows/e2e_test.yaml

@@ -61,36 +61,19 @@ jobs:
           nargo execute --package get_transaction --oracle-resolver=http://localhost:5555 --skip-brillig-constraints-check
           nargo execute --package get_log --oracle-resolver=http://localhost:5555 --skip-brillig-constraints-check
 
-      - name: Debug - List Generated Files
-        run: |
-          echo "=== Checking target directories ==="
-          find . -name "*.json" -path "*/target/*" -type f
-          echo "=== Checking for .gz files ==="
-          find . -name "*.gz" -path "*/target/*" -type f
-          echo "=== Directory structure of ethereum/circuits/get_header/target ==="
-          ls -la ethereum/circuits/get_header/target/ || echo "Directory not found"
-
       - name: Generate Proofs
         run: |
           export PATH="$HOME/.bb:$PATH"
-          bb prove -b ./ethereum/circuits/get_header/target/get_header.json -w ./ethereum/circuits/get_header/target/get_header.gz -o ./ethereum/circuits/get_header/target/proof
-          bb prove -b ./ethereum/circuits/get_account/target/get_account.json -w ./ethereum/circuits/get_account/target/get_account.gz -o ./ethereum/circuits/get_account/target/proof
-          bb prove -b ./ethereum/circuits/get_storage/target/get_storage.json -w ./ethereum/circuits/get_storage/target/get_storage.gz -o ./ethereum/circuits/get_storage/target/proof
-          bb prove -b ./ethereum/circuits/get_receipt/target/get_receipt.json -w ./ethereum/circuits/get_receipt/target/get_receipt.gz -o ./ethereum/circuits/get_receipt/target/proof
-          bb prove -b ./ethereum/circuits/get_transaction/target/get_transaction.json -w ./ethereum/circuits/get_transaction/target/get_transaction.gz -o ./ethereum/circuits/get_transaction/target/proof
-          bb prove -b ./ethereum/circuits/get_log/target/get_log.json -w ./ethereum/circuits/get_log/target/get_log.gz -o ./ethereum/circuits/get_log/target/proof
-
-      # Note: Solidity verifier generation is not yet supported for UltraHonk in Nargo 1.0+
-      # Using pre-generated verifier contracts committed to the repository
-      # TODO: Re-enable when bb write_solidity_verifier supports Honk
-      # - name: Generate Verifier Contracts
-      #   run: |
-      #     bb write_solidity_verifier -k ./target/get_header/vk/vk -o ./contract/get_header/plonk_vk.sol
-      #     bb write_solidity_verifier -k ./target/get_account/vk/vk -o ./contract/get_account/plonk_vk.sol
-      #     bb write_solidity_verifier -k ./target/get_storage/vk/vk -o ./contract/get_storage/plonk_vk.sol
-      #     bb write_solidity_verifier -k ./target/get_receipt/vk/vk -o ./contract/get_receipt/plonk_vk.sol
-      #     bb write_solidity_verifier -k ./target/get_transaction/vk/vk -o ./contract/get_transaction/plonk_vk.sol
-      #     bb write_solidity_verifier -k ./target/get_log/vk/vk -o ./contract/get_log/plonk_vk.sol
+          bb prove -b ./target/get_header.json -w ./target/get_header.gz --write_vk -o ./target/get_header
+          bb prove -b ./target/get_account.json -w ./target/get_account.gz --write_vk -o ./target/get_account
+          bb prove -b ./target/get_storage.json -w ./target/get_storage.gz --write_vk -o ./target/get_storage
+          bb prove -b ./target/get_receipt.json -w ./target/get_receipt.gz --write_vk -o ./target/get_receipt
+          bb prove -b ./target/get_transaction.json -w ./target/get_transaction.gz --write_vk -o ./target/get_transaction
+          bb prove -b ./target/get_log.json -w ./target/get_log.gz --write_vk -o ./target/get_log
+
+      # Note: Solidity verifiers are pre-generated and committed to ethereum/contracts/src/generated-verifier/
+      # Generating them in CI causes OOM errors due to high memory requirements
+      # To regenerate: bb write_solidity_verifier -k ./target/get_header -o ./ethereum/contracts/src/generated-verifier/GetHeaderUltraPLONKVerifier.sol
 
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1

.gitignore

@@ -12,3 +12,6 @@ dist
 coverage
 .DS_Store
 .vscode/
+
+# Generated Solidity verifiers (created in CI)
+ethereum/contracts/src/generated-verifier/*.sol