AztecProtocol
diff --git a/‎.github/workflows/mirror-repos.yml‎
Lines changed: 0 additions & 48 deletions b/‎.github/workflows/mirror-repos.yml‎
Lines changed: 0 additions & 48 deletions
diff --git a/‎barretenberg/cpp/pil/vm2/opcodes/emit_notehash.pil‎
Lines changed: 9 additions & 5 deletions b/‎barretenberg/cpp/pil/vm2/opcodes/emit_notehash.pil‎
Lines changed: 9 additions & 5 deletions
diff --git a/‎barretenberg/cpp/pil/vm2/opcodes/emit_nullifier.pil‎
Lines changed: 13 additions & 11 deletions b/‎barretenberg/cpp/pil/vm2/opcodes/emit_nullifier.pil‎
Lines changed: 13 additions & 11 deletions
diff --git a/‎barretenberg/cpp/pil/vm2/opcodes/sstore.pil‎
Lines changed: 4 additions & 4 deletions b/‎barretenberg/cpp/pil/vm2/opcodes/sstore.pil‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎barretenberg/cpp/src/barretenberg/dsl/acir_proofs/honk_contract.hpp‎
Lines changed: 30 additions & 37 deletions b/‎barretenberg/cpp/src/barretenberg/dsl/acir_proofs/honk_contract.hpp‎
Lines changed: 30 additions & 37 deletions
@@ -33,51 +33,3 @@ jobs:
             git push
           fi
 
-  mirror-to-aztec-nr-repo:
-    runs-on: ubuntu-latest
-    # Force sequential.
-    needs: mirror-to-barretenberg-repo
-    steps:
-      - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-        with:
-          fetch-depth: 0
-          token: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}
-      - name: Push to aztec-nr repo
-        run: |
-          SUBREPO_PATH=noir-projects/aztec-nr
-          git config --global user.name AztecBot
-          git config --global user.email [email protected]
-
-          monorepo_url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY"
-          # list all aztec-packages tags, take the "highest" version
-          monorepo_tag="$(git tag --list v* | sort --version-sort | tail -1)"
-          monorepo_protocol_circuits_path="noir-projects/noir-protocol-circuits"
-
-          # take all Nargo.toml files that reference noir-protocol-circuits
-          nargo_files="$(find $SUBREPO_PATH -name 'Nargo.toml' | xargs grep --files-with-matches 'noir-protocol-circuits')"
-
-          # match lines like this:
-          # protocol_types = { path = "../../noir-protocol-circuits/crates/types" }
-          # and replace with
-          # protocol_types = { git="https://github.com/aztecprotocol/aztec-packages", tag="v0.16.9", directory="noir-projects/noir-protocol-circuits/crates/types" }
-          for nargo_file in $nargo_files; do
-            sed --regexp-extended --in-place \
-              "s;path\s*=\s*\".*noir-protocol-circuits(.*)\";git=\"$monorepo_url\", tag=\"$monorepo_tag\", directory=\"$monorepo_protocol_circuits_path\1\";" \
-              $nargo_file
-          done
-
-          git commit --all --message "chore: replace relative paths to noir-protocol-circuits"
-
-          if ./scripts/git_subrepo.sh push $SUBREPO_PATH --branch=master; then
-            git fetch # in case a commit came after this
-            git rebase origin/master
-
-            # restore old files
-            for nargo_file in $nargo_files; do
-              git restore --source=origin/master -- $nargo_file
-            done
-            git commit --all --amend -m "$(git log -1 --pretty=%B)"
-
-            git push
-          fi
@@ -12,16 +12,20 @@ namespace execution; // this is a virtual gadget that shares rows with the execu
     pol REMAINING_NOTE_HASH_WRITES = constants.MAX_NOTE_HASHES_PER_TX -
         prev_num_note_hashes_emitted;
 
-    // TODO(dbanks12): error if in static context
+    pol commit sel_reached_max_note_hashes;
+    sel_reached_max_note_hashes * (1 - sel_reached_max_note_hashes) = 0;
 
     pol commit remaining_note_hashes_inv;
-    // Opcode errors if REMAINING_NOTE_HASH_WRITES is 0
-    #[EMIT_NOTEHASH_MAX_NOTE_HASH_WRITES_REACHED]
-    sel_execute_emit_notehash * (REMAINING_NOTE_HASH_WRITES * (sel_opcode_error * (1 - remaining_note_hashes_inv) + remaining_note_hashes_inv) - 1 + sel_opcode_error) = 0;
+    // We reached the max note hashes if REMAINING_NOTE_HASH_WRITES is 0
+    #[MAX_NOTE_HASHES_REACHED]
+    sel_execute_emit_notehash * (REMAINING_NOTE_HASH_WRITES * (sel_reached_max_note_hashes * (1 - remaining_note_hashes_inv) + remaining_note_hashes_inv) - 1 + sel_reached_max_note_hashes) = 0;
+
+    // Opcode errors if we've reached the max note hashes or if we're in a static context
+    #[OPCODE_ERROR_IF_MAX_NOTE_HASHES_REACHED_OR_STATIC]
+    sel_execute_emit_notehash * ((1 - sel_reached_max_note_hashes) * (1 - is_static) - (1 - sel_opcode_error)) = 0;
 
     // Commited since it's used in the lookup
     pol commit sel_write_note_hash;
-    #[EMIT_NOTEHASH_LIMIT_REACHED]
     sel_execute_emit_notehash * ((1 - sel_opcode_error) - sel_write_note_hash) = 0;
 
     // =========== OPCODE EXECUTION ===========
 
@@ -30,25 +30,27 @@ namespace execution; // this is a virtual gadget that shares rows with the execu
 
     // =========== VALIDATION ===========
 
-    // TODO(dbanks12): error if in static context
-
     pol REMAINING_NULLIFIER_WRITES = constants.MAX_NULLIFIERS_PER_TX -
         prev_num_nullifiers_emitted;
 
-    pol commit sel_write_nullifier;
-    // LIMIT_ERROR implies that we do NOT write the nullifier via the lookup later
-    pol LIMIT_ERROR = 1 - sel_write_nullifier;
+    pol commit sel_reached_max_nullifiers;
+    sel_reached_max_nullifiers * (1 - sel_reached_max_nullifiers) = 0;
 
     pol commit remaining_nullifiers_inv;
     // Limit error if REMAINING_NULLIFIER_WRITES is 0
-    #[EMIT_NULLIFIER_MAX_NULLIFIER_WRITES_REACHED]
-    sel_execute_emit_nullifier * (REMAINING_NULLIFIER_WRITES * (LIMIT_ERROR * (1 - remaining_nullifiers_inv) + remaining_nullifiers_inv) - 1 + LIMIT_ERROR) = 0;
+    #[MAX_NULLIFIER_WRITES_REACHED]
+    sel_execute_emit_nullifier * (REMAINING_NULLIFIER_WRITES * (sel_reached_max_nullifiers * (1 - remaining_nullifiers_inv) + remaining_nullifiers_inv) - 1 + sel_reached_max_nullifiers) = 0;
+
+    pol commit sel_write_nullifier;
+    // Validation errors if we've reached the max nullifiers or if we're in a static context
+    #[VALIDATION_ERROR_DISABLE_WRITE]
+    sel_execute_emit_nullifier * ((1 - sel_reached_max_nullifiers) * (1 - is_static) - sel_write_nullifier) = 0;
 
-    // A limit error must cause an "opcode error".
-    //     if LIMIT_ERROR == 1, sel_opcode_error must be 1
+    // A validation error must cause an "opcode error".
+    //     if sel_write_nullifier == 0, sel_opcode_error must be 1
     //     but otherwise, we don't force a value for sel_opcode_error and instead let the lookup below set it.
-    #[OPCODE_ERROR_IF_LIMIT_ERROR]
-    sel_execute_emit_nullifier * LIMIT_ERROR * (1 - sel_opcode_error) = 0;
+    #[OPCODE_ERROR_IF_VALIDATION_ERROR]
+    sel_execute_emit_nullifier * (1 - sel_write_nullifier) * (1 - sel_opcode_error) = 0;
 
     // =========== OPCODE EXECUTION ===========
 
 
@@ -23,8 +23,6 @@ namespace execution; // this is a virtual gadget that shares rows with the execu
 
     // =========== VALIDATION ===========
 
-    // TODO(dbanks12): error if in static context
-
     pol commit max_data_writes_reached;
     max_data_writes_reached * (1 - max_data_writes_reached) = 0;
 
@@ -40,8 +38,10 @@ namespace execution; // this is a virtual gadget that shares rows with the execu
     // If we are at the maximum number of data writes,
     // and the dynamic gas factor is 1 (which means that we haven't written to this slot before),
     // the opcode should fail since we can't write to this slot anymore.
-    #[SSTORE_ERROR_TOO_MANY_WRITES]
-    sel_execute_sstore * (max_data_writes_reached * dynamic_da_gas_factor - sel_opcode_error) = 0;
+    // We also should error if we are in a static context.
+    // Thus, sel_opcode_error = overflow OR static context
+    #[OPCODE_ERROR_IF_OVERFLOW_OR_STATIC]
+    sel_execute_sstore * ((1 - max_data_writes_reached * dynamic_da_gas_factor) * (1 - is_static) - (1 - sel_opcode_error)) = 0;
 
     // Commited since it's used in the lookup
     // Note: we could perform the work unconditionally here, since the roots will be reverted if sel_opcode_error is one.
 
@@ -366,14 +366,12 @@ library TranscriptLib {
     function generateTranscript(
         Honk.Proof memory proof,
         bytes32[] calldata publicInputs,
-        uint256 circuitSize,
-        uint256 publicInputsSize,
-        uint256 pubInputsOffset
+        uint256 vkHash,
+        uint256 publicInputsSize
     ) internal pure returns (Transcript memory t) {
         Fr previousChallenge;
-        (t.relationParameters, previousChallenge) = generateRelationParametersChallenges(
-            proof, publicInputs, circuitSize, publicInputsSize, pubInputsOffset, previousChallenge
-        );
+        (t.relationParameters, previousChallenge) =
+            generateRelationParametersChallenges(proof, publicInputs, vkHash, publicInputsSize, previousChallenge);
 
         (t.alphas, previousChallenge) = generateAlphaChallenges(previousChallenge, proof);
 
@@ -403,50 +401,46 @@ library TranscriptLib {
     function generateRelationParametersChallenges(
         Honk.Proof memory proof,
         bytes32[] calldata publicInputs,
-        uint256 circuitSize,
+        uint256 vkHash,
         uint256 publicInputsSize,
-        uint256 pubInputsOffset,
         Fr previousChallenge
     ) internal pure returns (Honk.RelationParameters memory rp, Fr nextPreviousChallenge) {
         (rp.eta, rp.etaTwo, rp.etaThree, previousChallenge) =
-            generateEtaChallenge(proof, publicInputs, circuitSize, publicInputsSize, pubInputsOffset);
+            generateEtaChallenge(proof, publicInputs, vkHash, publicInputsSize);
 
         (rp.beta, rp.gamma, nextPreviousChallenge) = generateBetaAndGammaChallenges(previousChallenge, proof);
     }
 
     function generateEtaChallenge(
         Honk.Proof memory proof,
         bytes32[] calldata publicInputs,
-        uint256 circuitSize,
-        uint256 publicInputsSize,
-        uint256 pubInputsOffset
+        uint256 vkHash,
+        uint256 publicInputsSize
     ) internal pure returns (Fr eta, Fr etaTwo, Fr etaThree, Fr previousChallenge) {
-        bytes32[] memory round0 = new bytes32[](3 + publicInputsSize + 12);
-        round0[0] = bytes32(circuitSize);
-        round0[1] = bytes32(publicInputsSize);
-        round0[2] = bytes32(pubInputsOffset);
+        bytes32[] memory round0 = new bytes32[](1 + publicInputsSize + 12);
+        round0[0] = bytes32(vkHash);
 
         for (uint256 i = 0; i < publicInputsSize - PAIRING_POINTS_SIZE; i++) {
-            round0[3 + i] = bytes32(publicInputs[i]);
+            round0[1 + i] = bytes32(publicInputs[i]);
         }
         for (uint256 i = 0; i < PAIRING_POINTS_SIZE; i++) {
-            round0[3 + publicInputsSize - PAIRING_POINTS_SIZE + i] = FrLib.toBytes32(proof.pairingPointObject[i]);
+            round0[1 + publicInputsSize - PAIRING_POINTS_SIZE + i] = FrLib.toBytes32(proof.pairingPointObject[i]);
         }
 
         // Create the first challenge
         // Note: w4 is added to the challenge later on
-        round0[3 + publicInputsSize] = bytes32(proof.w1.x_0);
-        round0[3 + publicInputsSize + 1] = bytes32(proof.w1.x_1);
-        round0[3 + publicInputsSize + 2] = bytes32(proof.w1.y_0);
-        round0[3 + publicInputsSize + 3] = bytes32(proof.w1.y_1);
-        round0[3 + publicInputsSize + 4] = bytes32(proof.w2.x_0);
-        round0[3 + publicInputsSize + 5] = bytes32(proof.w2.x_1);
-        round0[3 + publicInputsSize + 6] = bytes32(proof.w2.y_0);
-        round0[3 + publicInputsSize + 7] = bytes32(proof.w2.y_1);
-        round0[3 + publicInputsSize + 8] = bytes32(proof.w3.x_0);
-        round0[3 + publicInputsSize + 9] = bytes32(proof.w3.x_1);
-        round0[3 + publicInputsSize + 10] = bytes32(proof.w3.y_0);
-        round0[3 + publicInputsSize + 11] = bytes32(proof.w3.y_1);
+        round0[1 + publicInputsSize] = bytes32(proof.w1.x_0);
+        round0[1 + publicInputsSize + 1] = bytes32(proof.w1.x_1);
+        round0[1 + publicInputsSize + 2] = bytes32(proof.w1.y_0);
+        round0[1 + publicInputsSize + 3] = bytes32(proof.w1.y_1);
+        round0[1 + publicInputsSize + 4] = bytes32(proof.w2.x_0);
+        round0[1 + publicInputsSize + 5] = bytes32(proof.w2.x_1);
+        round0[1 + publicInputsSize + 6] = bytes32(proof.w2.y_0);
+        round0[1 + publicInputsSize + 7] = bytes32(proof.w2.y_1);
+        round0[1 + publicInputsSize + 8] = bytes32(proof.w3.x_0);
+        round0[1 + publicInputsSize + 9] = bytes32(proof.w3.x_1);
+        round0[1 + publicInputsSize + 10] = bytes32(proof.w3.y_0);
+        round0[1 + publicInputsSize + 11] = bytes32(proof.w3.y_1);
 
         previousChallenge = FrLib.fromBytes32(keccak256(abi.encodePacked(round0)));
         (eta, etaTwo) = splitChallenge(previousChallenge);
@@ -698,7 +692,7 @@ library RelationsLib {
         accumulateDeltaRangeRelation(purportedEvaluations, evaluations, powPartialEval);
         accumulateEllipticRelation(purportedEvaluations, evaluations, powPartialEval);
         accumulateMemoryRelation(purportedEvaluations, rp, evaluations, powPartialEval);
-        accumulateNnfRelation(purportedEvaluations, rp, evaluations, powPartialEval);
+        accumulateNnfRelation(purportedEvaluations, evaluations, powPartialEval);
         accumulatePoseidonExternalRelation(purportedEvaluations, evaluations, powPartialEval);
         accumulatePoseidonInternalRelation(purportedEvaluations, evaluations, powPartialEval);
         // batch the subrelations with the alpha challenges to obtain the full honk relation
@@ -1186,7 +1180,6 @@ library RelationsLib {
 
     function accumulateNnfRelation(
         Fr[NUMBER_OF_ENTITIES] memory p,
-        Honk.RelationParameters memory rp,
         Fr[NUMBER_OF_SUBRELATIONS] memory evals,
         Fr domainSep
     ) internal pure {
@@ -1731,11 +1724,13 @@ abstract contract BaseHonkVerifier is IVerifier {
 
     uint256 immutable $N;
     uint256 immutable $LOG_N;
+    uint256 immutable $VK_HASH;
     uint256 immutable $NUM_PUBLIC_INPUTS;
 
-    constructor(uint256 _N, uint256 _logN, uint256 _numPublicInputs) {
+    constructor(uint256 _N, uint256 _logN, uint256 _vkHash, uint256 _numPublicInputs) {
         $N = _N;
         $LOG_N = _logN;
+        $VK_HASH = _vkHash;
         $NUM_PUBLIC_INPUTS = _numPublicInputs;
     }
 
@@ -1764,9 +1759,7 @@ abstract contract BaseHonkVerifier is IVerifier {
         }
 
         // Generate the fiat shamir challenges for the whole protocol
-        Transcript memory t = TranscriptLib.generateTranscript(
-            p, publicInputs, vk.circuitSize, $NUM_PUBLIC_INPUTS, /*pubInputsOffset=*/ 1
-        );
+        Transcript memory t = TranscriptLib.generateTranscript(p, publicInputs, $VK_HASH, $NUM_PUBLIC_INPUTS);
 
         // Derive public input delta
         t.relationParameters.publicInputsDelta = computePublicInputDelta(
@@ -2170,7 +2163,7 @@ abstract contract BaseHonkVerifier is IVerifier {
     }
 }
 
-contract HonkVerifier is BaseHonkVerifier(N, LOG_N, NUMBER_OF_PUBLIC_INPUTS) {
+contract HonkVerifier is BaseHonkVerifier(N, LOG_N, VK_HASH, NUMBER_OF_PUBLIC_INPUTS) {
      function loadVerificationKey() internal pure override returns (Honk.VerificationKey memory) {
        return HonkVerificationKey.loadVerificationKey();
     }