AztecProtocol
diff --git a/‎barretenberg/cpp/pil/vm2/precomputed.pil‎
Lines changed: 21 additions & 23 deletions b/‎barretenberg/cpp/pil/vm2/precomputed.pil‎
Lines changed: 21 additions & 23 deletions
diff --git a/‎barretenberg/cpp/pil/vm2/tx.pil‎
Lines changed: 19 additions & 25 deletions b/‎barretenberg/cpp/pil/vm2/tx.pil‎
Lines changed: 19 additions & 25 deletions
diff --git a/‎barretenberg/cpp/pil/vm2/tx_context.pil‎
Lines changed: 3 additions & 3 deletions b/‎barretenberg/cpp/pil/vm2/tx_context.pil‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎barretenberg/cpp/scripts/test_chonk_standalone_vks_havent_changed.sh‎
Lines changed: 1 addition & 1 deletion b/‎barretenberg/cpp/scripts/test_chonk_standalone_vks_havent_changed.sh‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎barretenberg/cpp/src/barretenberg/chonk/README.md‎
Lines changed: 17 additions & 16 deletions b/‎barretenberg/cpp/src/barretenberg/chonk/README.md‎
Lines changed: 17 additions & 16 deletions
@@ -209,7 +209,7 @@ pol constant sel_mem_tag_out_of_range;
 // - instruction size (in bytes): instr_size
 // - Selector on whether the instruction has a tag: sel_has_tag
 // - Selector on whether operand op2 is a tag: sel_tag_is_op2
-// 
+//
 // Used by the instruction fetching subtrace to decode raw bytecode.
 // Selectors for operands decomposition into bytes (required by instr_fetching.pil)
 // This table is populated by a map generated by a cpp test defined in op_decomposition.test.cpp.
@@ -361,22 +361,23 @@ pol constant addressing_gas;
 // properties: which tree operations are allowed, public-input offsets, revert behavior.
 // Used by the transaction trace to enforce phase-based constraints.
 //
-// Example trace (idx encodes the TransactionPhase enum; abbreviated column names):
-//   idx | sel_phase | is_call | is_teardown | is_collect_fee | is_tree_padding | is_cleanup | is_revertible | nr_null | nr_note | nr_l2l1 | r_null | r_note | r_l2l1 | next_on_revert
-//   ----+-----------+---------+-------------+----------------+-----------------+------------+---------------+---------+---------+---------+--------+--------+--------+---------------
-//     0 |         1 |       0 |           0 |              0 |               0 |          0 |             0 |       1 |       0 |       0 |      0 |      0 |      0 |              0  (NR_NULLIFIER_INSERTION)
-//     1 |         1 |       0 |           0 |              0 |               0 |          0 |             0 |       0 |       1 |       0 |      0 |      0 |      0 |              0  (NR_NOTE_INSERTION)
-//     2 |         1 |       0 |           0 |              0 |               0 |          0 |             0 |       0 |       0 |       1 |      0 |      0 |      0 |              0  (NR_L2_TO_L1_MESSAGE)
-//     3 |         1 |       1 |           0 |              0 |               0 |          0 |             0 |       0 |       0 |       0 |      0 |      0 |      0 |              0  (SETUP)
-//     4 |         1 |       0 |           0 |              0 |               0 |          0 |             1 |       0 |       0 |       0 |      1 |      0 |      0 |              8  (R_NULLIFIER_INSERTION)
-//     5 |         1 |       0 |           0 |              0 |               0 |          0 |             1 |       0 |       0 |       0 |      0 |      1 |      0 |              8  (R_NOTE_INSERTION)
-//     6 |         1 |       0 |           0 |              0 |               0 |          0 |             1 |       0 |       0 |       0 |      0 |      0 |      1 |              8  (R_L2_TO_L1_MESSAGE)
-//     7 |         1 |       1 |           0 |              0 |               0 |          0 |             1 |       0 |       0 |       0 |      0 |      0 |      0 |              8  (APP_LOGIC)
-//     8 |         1 |       1 |           1 |              0 |               0 |          0 |             1 |       0 |       0 |       0 |      0 |      0 |      0 |              9  (TEARDOWN)
-//     9 |         1 |       0 |           0 |              1 |               0 |          0 |             0 |       0 |       0 |       0 |      0 |      0 |      0 |              0  (COLLECT_GAS_FEES)
-//    10 |         1 |       0 |           0 |              0 |               1 |          0 |             0 |       0 |       0 |       0 |      0 |      0 |      0 |              0  (TREE_PADDING)
-//    11 |         1 |       0 |           0 |              0 |               0 |          1 |             0 |       0 |       0 |       0 |      0 |      0 |      0 |              0  (CLEANUP)
-//    12 |         0 |       0 |           0 |              0 |               0 |          0 |             0 |       0 |       0 |       0 |      0 |      0 |      0 |              0  (beyond phase range)
+// Example trace (idx encodes the TransactionPhase enum; abbreviated column names).
+// Whether an append is revertible or not is determined by `is_revertible`.
+//   idx | sel_phase | is_call | is_teardown | is_collect_fee | is_tree_padding | is_cleanup | is_revertible | append_null | append_note | append_l2l1 | next_on_revert
+//   ----+-----------+---------+-------------+----------------+-----------------+------------+---------------+-------------+-------------+-------------+---------------
+//     0 |         1 |       0 |           0 |              0 |               0 |          0 |             0 |           1 |           0 |           0 |              0  (NR_NULLIFIER_INSERTION)
+//     1 |         1 |       0 |           0 |              0 |               0 |          0 |             0 |           0 |           1 |           0 |              0  (NR_NOTE_INSERTION)
+//     2 |         1 |       0 |           0 |              0 |               0 |          0 |             0 |           0 |           0 |           1 |              0  (NR_L2_TO_L1_MESSAGE)
+//     3 |         1 |       1 |           0 |              0 |               0 |          0 |             0 |           0 |           0 |           0 |              0  (SETUP)
+//     4 |         1 |       0 |           0 |              0 |               0 |          0 |             1 |           1 |           0 |           0 |              8  (R_NULLIFIER_INSERTION)
+//     5 |         1 |       0 |           0 |              0 |               0 |          0 |             1 |           0 |           1 |           0 |              8  (R_NOTE_INSERTION)
+//     6 |         1 |       0 |           0 |              0 |               0 |          0 |             1 |           0 |           0 |           1 |              8  (R_L2_TO_L1_MESSAGE)
+//     7 |         1 |       1 |           0 |              0 |               0 |          0 |             1 |           0 |           0 |           0 |              8  (APP_LOGIC)
+//     8 |         1 |       1 |           1 |              0 |               0 |          0 |             1 |           0 |           0 |           0 |              9  (TEARDOWN)
+//     9 |         1 |       0 |           0 |              1 |               0 |          0 |             0 |           0 |           0 |           0 |              0  (COLLECT_GAS_FEES)
+//    10 |         1 |       0 |           0 |              0 |               1 |          0 |             0 |           0 |           0 |           0 |              0  (TREE_PADDING)
+//    11 |         1 |       0 |           0 |              0 |               0 |          1 |             0 |           0 |           0 |           0 |              0  (CLEANUP)
+//    12 |         0 |       0 |           0 |              0 |               0 |          0 |             0 |           0 |           0 |           0 |              0  (beyond phase range)
 
 // Phase Table for Tx Trace
 pol constant sel_phase; // Selector for phase table
@@ -389,12 +390,9 @@ pol constant is_cleanup;
 pol constant is_revertible;
 pol constant read_pi_start_offset;
 pol constant read_pi_length_offset;
-pol constant sel_non_revertible_append_note_hash;
-pol constant sel_non_revertible_append_nullifier;
-pol constant sel_non_revertible_append_l2_l1_msg;
-pol constant sel_revertible_append_note_hash;
-pol constant sel_revertible_append_nullifier;
-pol constant sel_revertible_append_l2_l1_msg;
+pol constant sel_append_note_hash;
+pol constant sel_append_nullifier;
+pol constant sel_append_l2_l1_msg;
 pol constant next_phase_on_revert;
 
 // ===== Section 12: Keccak round constants =====
 
@@ -209,12 +209,9 @@ namespace tx;
         is_revertible,
         read_pi_start_offset,
         read_pi_length_offset,
-        sel_non_revertible_append_note_hash,
-        sel_non_revertible_append_nullifier,
-        sel_non_revertible_append_l2_l1_msg,
-        sel_revertible_append_note_hash,
-        sel_revertible_append_nullifier,
-        sel_revertible_append_l2_l1_msg,
+        sel_append_note_hash,
+        sel_append_nullifier,
+        sel_append_l2_l1_msg,
         next_phase_on_revert
     }
     in
@@ -228,12 +225,9 @@ namespace tx;
         precomputed.is_revertible,
         precomputed.read_pi_start_offset,
         precomputed.read_pi_length_offset,
-        precomputed.sel_non_revertible_append_note_hash,
-        precomputed.sel_non_revertible_append_nullifier,
-        precomputed.sel_non_revertible_append_l2_l1_msg,
-        precomputed.sel_revertible_append_note_hash,
-        precomputed.sel_revertible_append_nullifier,
-        precomputed.sel_revertible_append_l2_l1_msg,
+        precomputed.sel_append_note_hash,
+        precomputed.sel_append_nullifier,
+        precomputed.sel_append_l2_l1_msg,
         precomputed.next_phase_on_revert
     };
 
@@ -465,18 +459,16 @@ namespace tx;
    /***************************************************************************
     * Private Side Effect Insertions
     **************************************************************************/
-    pol commit sel_revertible_append_note_hash; // @boolean
-    pol commit sel_non_revertible_append_note_hash; // @boolean
-    pol commit sel_revertible_append_nullifier; // @boolean
-    pol commit sel_non_revertible_append_nullifier; // @boolean
-    pol commit sel_revertible_append_l2_l1_msg; // @boolean
-    pol commit sel_non_revertible_append_l2_l1_msg; // @boolean
-    // The 6 above selectors are booleans thanks to #[READ_PHASE_SPEC] on active rows.
+    pol commit sel_append_note_hash; // @boolean
+    pol commit sel_append_nullifier; // @boolean
+    pol commit sel_append_l2_l1_msg; // @boolean
+    // The 3 above selectors are booleans thanks to #[READ_PHASE_SPEC] on active rows.
     // Furthermore, phase spec guarantees that they are mutually exclusive.
+    // Whether such an append is revertible or not is determined by `is_revertible`.
 
     // A tree selector means we need to get the tree value
-    pol commit is_tree_insert_phase; // @boolean on active rows (follows from mutual exclusivity of the 6 above selectors)
-    is_tree_insert_phase = sel_revertible_append_note_hash + sel_non_revertible_append_note_hash + sel_revertible_append_nullifier + sel_non_revertible_append_nullifier;
+    pol commit is_tree_insert_phase; // @boolean on active rows (follows from mutual exclusivity of the above selectors)
+    is_tree_insert_phase = sel_append_note_hash + sel_append_nullifier;
     pol commit leaf_value;
     // Shared column to track the inverse of the remaining side effects for note hashes, nullifiers, and L2 to L1 messages
     pol commit remaining_side_effects_inv;
@@ -491,7 +483,7 @@ namespace tx;
 
     // ===== NOTE HASHES =====
     pol commit sel_try_note_hash_append; // @boolean (follows from definition)
-    sel_try_note_hash_append = (sel - is_padded) * (sel_revertible_append_note_hash + sel_non_revertible_append_note_hash);
+    sel_try_note_hash_append = (sel - is_padded) * sel_append_note_hash;
 
     // If we are at the maximum emitted note hashes, we must revert
     pol REMAINING_NOTE_HASH_WRITES = constants.MAX_NOTE_HASHES_PER_TX - prev_num_note_hashes_emitted;
@@ -509,7 +501,9 @@ namespace tx;
         prev_note_hash_tree_size,
         prev_note_hash_tree_root,
         precomputed.zero, // Already siloed. (No need to pass address.)
-        sel_revertible_append_note_hash, // Not unique for revertible note hashes.
+        is_revertible, // Used as `sel_unique`: revertible note hashes need to be made unique with a nonce.
+                       // On rows where sel_note_hash_append == 1 (NR_NOTE_INSERTION or R_NOTE_INSERTION),
+                       // is_revertible is exactly the discriminator we want.
         prev_num_note_hashes_emitted,
         discard, // from tx_discard.pil virtual trace
         next_note_hash_tree_root
@@ -532,7 +526,7 @@ namespace tx;
 
     // ===== NULLIFIERS =====
     pol commit sel_try_nullifier_append; // @boolean (follows from definition)
-    sel_try_nullifier_append = (sel - is_padded) * (sel_revertible_append_nullifier + sel_non_revertible_append_nullifier);
+    sel_try_nullifier_append = (sel - is_padded) * sel_append_nullifier;
 
     pol commit nullifier_limit_error; // @boolean
     nullifier_limit_error * (1 - nullifier_limit_error) = 0;
@@ -594,7 +588,7 @@ namespace tx;
 
     // ===== L2 - L1 Messages =====
     pol commit sel_try_l2_l1_msg_append; // @boolean (follows from definition)
-    sel_try_l2_l1_msg_append = (sel - is_padded) * (sel_revertible_append_l2_l1_msg + sel_non_revertible_append_l2_l1_msg);
+    sel_try_l2_l1_msg_append = (sel - is_padded) * sel_append_l2_l1_msg;
 
     pol commit l2_l1_msg_contract_address;
     pol commit l2_l1_msg_recipient;
 
@@ -330,12 +330,12 @@ namespace tx;
     NOT_LAST_ROW * (1 - is_teardown') * (da_gas_limit - da_gas_limit') = 0;
 
     // Selectors to allow prev => next state changes in the different phases
-    pol SEL_CAN_EMIT_NOTE_HASH = is_public_call_request + sel_non_revertible_append_note_hash + sel_revertible_append_note_hash;
-    pol SEL_CAN_EMIT_NULLIFIER = is_public_call_request + sel_non_revertible_append_nullifier + sel_revertible_append_nullifier;
+    pol SEL_CAN_EMIT_NOTE_HASH = is_public_call_request + sel_append_note_hash;
+    pol SEL_CAN_EMIT_NULLIFIER = is_public_call_request + sel_append_nullifier;
     pol SEL_CAN_WRITE_PUBLIC_DATA = is_public_call_request + is_collect_fee;
     pol SEL_CAN_WRITE_WRITTEN_PUBLIC_DATA_SLOTS = is_public_call_request;
     pol SEL_CAN_EMIT_PUBLIC_LOG = is_public_call_request;
-    pol SEL_CAN_EMIT_L2_L1_MSG = is_public_call_request + sel_non_revertible_append_l2_l1_msg + sel_revertible_append_l2_l1_msg;
+    pol SEL_CAN_EMIT_L2_L1_MSG = is_public_call_request + sel_append_l2_l1_msg;
     // The 6 above selectors are booleans on active rows due to #[READ_PHASE_SPEC] and
     // mutual exclusivity of the selectors on the right-hand side.
 
 
@@ -21,7 +21,7 @@ script_path="$root/barretenberg/cpp/scripts/test_chonk_standalone_vks_havent_cha
 # - Generate a hash for versioning: sha256sum bb-chonk-inputs.tar.gz
 # - Upload the compressed results: aws s3 cp bb-chonk-inputs.tar.gz s3://aztec-ci-artifacts/protocol/bb-chonk-inputs-[hash(0:8)].tar.gz
 # Note: In case of the "Test suite failed to run ... Unexpected token 'with' " error, need to run: docker pull aztecprotocol/build:3.0
-pinned_short_hash="c09aeb0c"
+pinned_short_hash="341842bf"
 pinned_chonk_inputs_url="https://aztec-ci-artifacts.s3.us-east-2.amazonaws.com/protocol/bb-chonk-inputs-${pinned_short_hash}.tar.gz"
 
 function update_pinned_hash_in_script {
 
@@ -111,8 +111,8 @@ MegaZK Oink → Merge → ECCVM → Translator Oink + Joint Sumcheck + Joint PCS
 
 Concretely (`ChonkVerifier::reduce_to_ipa_claim` / `ChonkVerifier::verify`):
 
-1. **MegaZK Oink verification**: `BatchedHonkTranslatorVerifier::verify_mega_zk_oink` processes the hiding kernel's pre-sumcheck proof and extracts `HidingKernelIO` (pairing points, calldata commitment, ECC op wire commitments)
-2. **Databus consistency check**: Asserts the hiding kernel's calldata commitment equals its `kernel_return_data` commitment
+1. **MegaZK Oink verification**: `BatchedHonkTranslatorVerifier::verify_mega_zk_oink` processes the hiding kernel's pre-sumcheck proof and extracts `HidingKernelIO` (pairing points, kernel return data commitment, ECC op wire commitments)
+2. **Databus consistency check**: Asserts the hiding kernel's kernel calldata commitment equals the `kernel_return_data` commitment contained it its public inputs
 3. **Merge verification**: Verifies the hiding kernel's APPEND-mode merge proof using the ECC op wire commitments from step 1 and `ecc_op_tables` from `HidingKernelIO`
 4. **ECCVM verification**: Reduces to an IPA opening claim; extracts translator input parameters (`v`, `x`, `accumulated_result`)
 5. **Joint verification**: `BatchedHonkTranslatorVerifier::verify` processes the translator Oink, runs the 17-round joint sumcheck, and performs the joint Shplemini/KZG PCS reduction
@@ -269,13 +269,13 @@ The databus solves this by using **commitments** instead of raw data. Rather tha
 
 | Column | Purpose |
 |--------|---------|
-| `calldata` | Input from previous kernel's return data ($C_i$) |
-| `secondary_calldata` | Input from previous app's return data ($C'_i$) |
+| `kernel_calldata` | Input from previous kernel's return data ($C_i$) |
+| `app_calldata[0..2]` | Inputs from up to three apps' return data ($C'_{i,j}$) |
 | `return_data` | Output to be consumed by next circuit ($R_i$) |
 
-App circuits only produce `return_data` (no calldata). Kernel circuits receive both:
-- `calldata` from the previous kernel's return data
-- `secondary_calldata` from the corresponding app's return data
+App circuits only produce `return_data` (no calldata). Kernel circuits receive:
+- `kernel_calldata` from the previous kernel's return data
+- `app_calldata[0..2]` from the corresponding apps' return data
 
 #### Lookup Relations
 
@@ -301,7 +301,7 @@ $$\sum_{i=0}^{n-1} a_i \cdot I_i \cdot (w_{1,i} + w_{2,i}\beta + \gamma) - q_{bu
 
 Inverse correctness is enforced by two separate gating subrelations: $(I \cdot L \cdot T - 1) \cdot \text{is\_read} = 0$ on read rows, and $(I \cdot L \cdot T - 1) \cdot \text{count} = 0$ on write rows. At inactive rows (where both gates are zero), $I$ is unconstrained but the lookup identity contribution is also zero, so the prover gets no free degrees of freedom.
 
-**Multiple columns**: Each bus column (calldata, secondary_calldata, return_data) has separate subrelations, distinguished by column-specific selectors $q_j$.
+**Multiple columns**: Each bus column (kernel calldata, three app calldata columns, return data) has separate subrelations, distinguished by column-specific selectors $q_j$.
 
 #### Population
 
@@ -315,14 +315,15 @@ The databus columns are populated from ACIR constraints generated by the Noir co
 ```
 App₀ ──return_data [R'₀]──┐
                           ↓
-                    Kernel₀ ←─calldata─── (empty for first kernel)
+                    Kernel₀ ←─kernel_calldata─── (empty for first kernel)
+                            ←─app_calldata[0] [C'₀,0]─── App₀.return_data
                       │
                 return_data [R₀]
                       ↓
 App₁ ──return_data [R'₁]──┐
                           ↓
-                    Kernel₁ ←─calldata [C₁]─── Kernel₀.return_data
-                            ←─secondary_calldata [C'₁]─── App₁.return_data
+                    Kernel₁ ←─kernel_calldata [C₁]─── Kernel₀.return_data
+                            ←─app_calldata[0] [C'₁,0]─── App₁.return_data
                       │
                 return_data [R₁]
                       ↓
@@ -685,8 +686,8 @@ Kernel circuits output a structured public input block that carries cross-circui
 struct KernelIO {
     PairingInputs pairing_inputs;      // Accumulated {P0, P1} for deferred pairing check
     G1 kernel_return_data;             // Commitment to this kernel's return data
-    G1 app_return_data;                // Commitment to the app's return data
-    TableCommitments ecc_op_tables;    // [M_1]...[M_4] merged op queue tables from Merge
+    std::array<G1, MAX_APPS_PER_KERNEL> app_return_data; // App return data commitments
+    FF ecc_op_hash;                    // Running hash over ECC op column commitments
     FF output_hn_accum_hash;           // Hash of the HyperNova accumulator state
 };
 
@@ -722,10 +723,10 @@ The [Databus](#databus) section explains how circuits pass data via commitment e
 
 ```cpp
 // Kernel's calldata must match previous kernel's return_data
-kernel_input.kernel_return_data.incomplete_assert_equal(witness_commitments.calldata);
+kernel_input.kernel_return_data.incomplete_assert_equal(witness_commitments.kernel_calldata);
 
-// Kernel's secondary_calldata must match previous app's return_data
-kernel_input.app_return_data.incomplete_assert_equal(witness_commitments.secondary_calldata);
+// Each app calldata column must match the corresponding app's return_data
+kernel_input.app_return_data[idx].incomplete_assert_equal(*app_calldata_commitments[idx]);
 ```
 
 The `incomplete_assert_equal` (for non-native G1 points) adds in-circuit constraints that the commitments are equal. Combined with the HyperNova binding of public inputs to proofs, tampering with databus content invalidates the proof.