Merge pull request #13 from AztecProtocol/jc/simplify-recursion

Adding bb_proof_verification dependency and updating proof verification method to use verify_ultrahonkzk_proof

Author: critesjosh

.github/workflows/recursive-verification-tests.yml

@@ -49,6 +49,7 @@ jobs:
       - name: Set Aztec version and start sandbox
         run: |
           aztec-up ${{ env.AZTEC_VERSION }}
+          docker tag aztecprotocol/aztec:${{ env.AZTEC_VERSION }} aztecprotocol/aztec:latest
           aztec start --sandbox &
 
       - name: Wait for sandbox to be ready
@@ -70,7 +71,7 @@ jobs:
 
       - name: Install project dependencies
         working-directory: recursive_verification
-        run: bun install
+        run: bun install --frozen-lockfile
 
       - name: Compile Noir circuit
         working-directory: recursive_verification/circuit

recursive_verification/contract/Nargo.toml

@@ -7,3 +7,4 @@ authors = ["Satyam Bansal"]
 aztec = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v3.0.0-devnet.4", directory = "noir-projects/aztec-nr/aztec" }
 value_note = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v3.0.0-devnet.4", directory = "noir-projects/aztec-nr/value-note" }
 easy_private_state = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v3.0.0-devnet.4", directory = "noir-projects/aztec-nr/easy-private-state" }
+bb_proof_verification = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v3.0.0-devnet.4", directory = "barretenberg/noir/bb_proof_verification" }

recursive_verification/contract/src/main.nr

@@ -4,14 +4,14 @@ use aztec::macros::aztec;
 pub contract ValueNotEqual {
     global HONK_VK_SIZE: u32 = 115;
     global HONK_PROOF_SIZE: u32 = 492 + 16;
-    global HONK_IDENTIFIER: u32 = 7;
 
     use aztec::{
         macros::{functions::{external, initializer}, storage::storage},
         oracle::debug_log::debug_log_format,
         protocol_types::{address::AztecAddress, traits::ToField},
         state_vars::Map,
     };
+    use bb_proof_verification::verify_ultrahonkzk_proof;
     use easy_private_state::EasyPrivateUint;
 
     #[storage]
@@ -32,10 +32,10 @@ pub contract ValueNotEqual {
         verification_key: [Field; HONK_VK_SIZE],
         proof: [Field; HONK_PROOF_SIZE],
         public_inputs: [Field; 1],
-        vk_hash: Field
+        vk_hash: Field,
     ) {
         debug_log_format("Incrementing counter for owner {0}", [owner.to_field()]);
-        std::verify_proof_with_type(verification_key, proof, public_inputs, vk_hash, HONK_IDENTIFIER);
+        verify_ultrahonkzk_proof(verification_key, proof, public_inputs, vk_hash);
         ValueNotEqual::at(context.this_address()).emit_in_public(12345).enqueue(&mut context);
         let counters = storage.counters;
         counters.at(owner).add(1, owner);