chore: merging next to merge-train/fairies

.claude/skills/updating-changelog/SKILL.md

@@ -14,7 +14,7 @@ Read `.release-please-manifest.json` to get the version (e.g., `{"." : "4.0.0"}`
 **Target files:**
 
 - Aztec contract developers: `docs/docs-developers/docs/resources/migration_notes.md`
-- Node operators and Ethereum contract developers: `docs/docs-network/reference/changelog/v{major}.md`
+- Node operators and Ethereum contract developers: `docs/docs-operate/operators/reference/changelog/v{major}.md`
 
 ### 2. Analyze Branch Changes
 
@@ -60,7 +60,7 @@ Explanation of what changed.
 
 ## Node Operator Changelog Format
 
-**File:** `docs/docs-network/reference/changelog/v{major}.md`
+**File:** `docs/docs-operate/operators/reference/changelog/v{major}.md`
 
 **Breaking changes:**
 ````markdown

.github/ci3_labels_to_env.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # Determines CI mode from labels and environment variables.
-# Called by ci3.yml to set CI_MODE and related environment variables.
+# Called by ci3.yml and ci3-external.yml to set CI_MODE and related environment variables.
 # Outputs environment variables to GITHUB_ENV for use in subsequent steps.
 set -euo pipefail
 
@@ -23,7 +23,7 @@ function main {
   local target_branch
   if [ "${GITHUB_EVENT_NAME:-}" == "merge_group" ]; then
     target_branch="${MERGE_GROUP_BASE_REF:-}"
-  elif [ "${GITHUB_EVENT_NAME:-}" == "pull_request" ]; then
+  elif [ "${GITHUB_EVENT_NAME:-}" == "pull_request" ] || [ "${GITHUB_EVENT_NAME:-}" == "pull_request_target" ]; then
     target_branch="${PR_BASE_REF:-}"
   else
     target_branch="${GITHUB_REF_NAME:-}"

.github/workflows/ci3-external.yml

@@ -59,6 +59,14 @@ jobs:
           fi
           GITHUB_TOKEN=${{ secrets.AZTEC_BOT_GITHUB_TOKEN }} gh pr edit ${{ github.event.pull_request.number }} --remove-label "ci-external-once"
 
+      - name: Determine CI Mode
+        env:
+          MERGE_GROUP_BASE_REF: ${{ github.event.merge_group.base_ref }}
+          PR_BASE_REF: ${{ github.event.pull_request.base.ref }}
+          GITHUB_REF_NAME: ${{ github.ref_name }}
+          GITHUB_TOKEN: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}
+        run: ./.github/ci3_labels_to_env.sh ${{ join(github.event.pull_request.labels.*.name, ' ') }}
+
       - name: Run
         env:
           REF_NAME: repo-fork/${{ github.repository }}/${{ github.head_ref }}
@@ -78,7 +86,7 @@ jobs:
           PR_HEAD_REF: ${{ github.event.pull_request.head.ref }}
           PR_COMMITS: ${{ github.event.pull_request.commits }}
           GITHUB_REF_NAME: ${{ github.ref_name }}
-        run: ./.github/ci3.sh "${{ join(github.event.pull_request.labels.*.name, ',') }}"
+        run: ./.github/ci3.sh $CI_MODE
 
       - name: Post-Actions
         if: always()

.github/workflows/ci3.yml

@@ -94,6 +94,7 @@ jobs:
           PR_COMMITS: ${{ github.event.pull_request.commits }}
           PR_NUMBER: ${{ github.event.pull_request.number }}
           GITHUB_REF_NAME: ${{ github.ref_name }}
+          GITHUB_ACTOR: ${{ github.actor }}
         # NOTE: $CI_MODE is set in the Determine CI Mode step.
         run: ./.github/ci3.sh $CI_MODE
 

.github/workflows/merge-queue-dequeue-notify.yml

@@ -1,14 +1,14 @@
-name: Notify Slack on Merge Queue Dequeue
+name: Notify Slack on Merge Train Events
 
 on:
   pull_request:
-    types: [dequeued]
+    types: [dequeued, closed]
 
 jobs:
-  notify-slack:
-    name: Notify Slack
+  notify-dequeued:
+    name: Notify Slack (Dequeued)
     runs-on: ubuntu-latest
-    if: startsWith(github.event.pull_request.head.ref, 'merge-train/') && github.event.pull_request.merged != true
+    if: github.event.action == 'dequeued' && startsWith(github.event.pull_request.head.ref, 'merge-train/') && github.event.pull_request.merged != true
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -21,3 +21,20 @@ jobs:
           REF_NAME: ${{ github.event.pull_request.head.ref }}
           PR_URL: ${{ github.event.pull_request.html_url }}
         run: ./ci3/merge_train_failure_slack_notify --dequeued
+
+  notify-merged:
+    name: Notify Slack (Merged)
+    runs-on: ubuntu-latest
+    if: github.event.action == 'closed' && github.event.pull_request.merged == true && startsWith(github.event.pull_request.head.ref, 'merge-train/')
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.base.ref }}
+
+      - name: Send Slack notification
+        env:
+          SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
+          REF_NAME: ${{ github.event.pull_request.head.ref }}
+          PR_URL: ${{ github.event.pull_request.html_url }}
+        run: ./ci3/merge_train_failure_slack_notify --merged

.github/workflows/weekly-proving-bench.yml

@@ -47,7 +47,7 @@ jobs:
           fi
 
       - name: Run real proving benchmarks
-        timeout-minutes: 150
+        timeout-minutes: 180
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -57,7 +57,7 @@ jobs:
           GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
           SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
           RUN_ID: ${{ github.run_id }}
-          AWS_SHUTDOWN_TIME: 150
+          AWS_SHUTDOWN_TIME: 180
           NO_SPOT: 1
         run: |
           ./.github/ci3.sh network-proving-bench prove-n-tps-real prove-n-tps-real "aztecprotocol/aztec:${{ steps.nightly-tag.outputs.nightly_tag }}"

.test_patterns.yml

@@ -309,6 +309,11 @@ tests:
     owners:
       - *palla
 
+  - regex: "src/e2e_block_building.test.ts"
+    error_regex: "✕ processes txs until hitting timetable"
+    owners:
+      - *palla
+
   # http://ci.aztec-labs.com/e8228a36afda93b8
   # Test passed but there was an error on stopping
   - regex: "playground/scripts/run_test.sh"

barretenberg/cpp/scripts/audit/audit_scopes/logic_scope_doc.md → barretenberg/cpp/scripts/audit/audit_scopes/logic_audit_scope.md

@@ -2,20 +2,29 @@
 
 Repository: https://github.com/AztecProtocol/aztec-packages
 
-Commit hash: TBD
+Commit hash: e4712cda8def49d75fbba2d361625fc5e21945f5
 
 ## Files to Audit
 
 Note: Paths relative to `aztec-packages/barretenberg/cpp/src/barretenberg`
 
+### stdlib (core logic implementation)
+
 1. `stdlib/primitives/logic/logic.hpp`
 2. `stdlib/primitives/logic/logic.cpp`
 3. `stdlib_circuit_builders/plookup_tables/uint.hpp` (lookup tables)
 
+### dsl (ACIR interface)
+
+4. `dsl/acir_format/logic_constraint.hpp` — ACIR struct and gate function declarations
+5. `dsl/acir_format/logic_constraint.cpp` — Converts ACIR logic constraints into stdlib circuit gates
+
 ## Summary of Module
 
 The `logic` module provides circuit-friendly implementations of bitwise logical operations (XOR and AND) over variable-length unsigned integers using plookup tables.
 
+### stdlib layer
+
 Main function: `create_logic_constraint(a, b, num_bits, is_xor_gate)`
 
 - Computes `a XOR b` or `a AND b` for inputs up to `num_bits` in length
@@ -31,10 +40,19 @@ The implementation:
 - If both inputs are constants, the operation is computed natively without circuit constraints
 - If one input is constant, it is converted to a witness before processing
 
+### dsl layer
+
+The DSL layer bridges ACIR opcodes (`BlackBoxFuncCall::AND`, `BlackBoxFuncCall::XOR`) to the stdlib logic implementation:
+
+- `acir_to_constraint_buf.cpp` deserializes ACIR AND/XOR black box calls into `LogicConstraint` structs (deserialization file itself is out of scope)
+- `create_logic_gate` converts `WitnessOrConstant` inputs to `field_ct` via `to_field_ct`, calls `stdlib::logic::create_logic_constraint`, and asserts the computed result equals the ACIR-provided result witness
+
 ## Test Files
 
 1. `stdlib/primitives/logic/logic.test.cpp`
+2. `dsl/acir_format/logic_constraint.test.cpp`
 
 ## Dependencies
 
 - Plookup read: `stdlib/primitives/plookup/plookup.hpp`
+- ACIR format core: `dsl/acir_format/acir_format.hpp` (constraint application loop)

barretenberg/cpp/src/barretenberg/avm_fuzzer/harness/alu.fuzzer.cpp

@@ -42,8 +42,9 @@ struct AluFuzzerInput {
     MemoryValue a;
     MemoryValue b;
     MemoryValue c = MemoryValue::from_tag(MemoryTag::FF, 0); // Placeholder for result
-    int op_id = 0;                                           // For execution trace alu_op_id
-
+    uint16_t op_id = 0;                                      // For execution trace alu_op_id
+    // We serialise MemoryValues as FF + 1 byte for tag to save 31 bytes per value:
+    static const size_t size = (3 * (sizeof(FF) + 1)) + sizeof(uint16_t);
     // Serialize to buffer
     void to_buffer(uint8_t* buffer) const
     {
@@ -58,7 +59,7 @@ struct AluFuzzerInput {
         buffer += sizeof(FF) + 1;
         write_mem_value(buffer, c);
         buffer += sizeof(FF) + 1;
-        serialize::write(buffer, static_cast<uint16_t>(op_id));
+        serialize::write(buffer, op_id);
     }
 
     static AluFuzzerInput from_buffer(const uint8_t* buffer)
@@ -88,11 +89,11 @@ struct AluFuzzerInput {
 
 extern "C" size_t LLVMFuzzerCustomMutator(uint8_t* data, size_t size, size_t max_size, unsigned int seed)
 {
-    if (size < sizeof(AluFuzzerInput)) {
+    if (size < AluFuzzerInput::size) {
         // Initialize with default input
         AluFuzzerInput input;
         input.to_buffer(data);
-        return sizeof(AluFuzzerInput);
+        return AluFuzzerInput::size;
     }
 
     std::mt19937_64 rng(seed);
@@ -119,7 +120,6 @@ extern "C" size_t LLVMFuzzerCustomMutator(uint8_t* data, size_t size, size_t max
 
     auto random_mem_value_from_tag = [&rng](MemoryTag tag) -> MemoryValue {
         std::uniform_int_distribution<uint64_t> dist(0, std::numeric_limits<uint64_t>::max());
-        // TODO(MW): Use array?
         FF value = FF(dist(rng), dist(rng), dist(rng), dist(rng));
         // Do we want the option of making "invalid tag" values, where the value is out of range for the tag?
         // These aren't currently possible with this function since MemoryValue::from_tag will throw in that case.
@@ -135,9 +135,9 @@ extern "C" size_t LLVMFuzzerCustomMutator(uint8_t* data, size_t size, size_t max
     // Deserialize current input
     AluFuzzerInput input = AluFuzzerInput::from_buffer(data);
 
-    // Choose random ALU operation
+    // Choose random ALU operation (11 possible operations with op_id = 2^index)
     std::uniform_int_distribution<int> dist(0, 11);
-    input.op_id = 1 << dist(rng);
+    input.op_id = static_cast<uint16_t>(1 << dist(rng));
 
     // Choose test case (TODO(MW): what else do we want here?)
     dist = std::uniform_int_distribution<int>(0, 4);
@@ -187,18 +187,18 @@ extern "C" size_t LLVMFuzzerCustomMutator(uint8_t* data, size_t size, size_t max
     // Serialize mutated input back to buffer
     input.to_buffer(data);
 
-    if (max_size > sizeof(AluFuzzerInput)) {
-        return sizeof(AluFuzzerInput);
+    if (max_size > AluFuzzerInput::size) {
+        return AluFuzzerInput::size;
     }
 
-    return sizeof(AluFuzzerInput);
+    return AluFuzzerInput::size;
 }
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
 {
     using bb::avm2::MemoryValue;
 
-    if (size < sizeof(AluFuzzerInput)) {
+    if (size < AluFuzzerInput::size) {
         info("Input size too small");
         return 0;
     }

barretenberg/cpp/src/barretenberg/dsl/acir_format/logic_constraint.cpp

@@ -1,5 +1,5 @@
 // === AUDIT STATUS ===
-// internal:    { status: Planned, auditors: [], commit: }
+// internal:    { status: Complete, auditors: [Suyash], commit: e4712cda8def49d75fbba2d361625fc5e21945f5 }
 // external_1:  { status: not started, auditors: [], commit: }
 // external_2:  { status: not started, auditors: [], commit: }
 // =====================

barretenberg/cpp/src/barretenberg/dsl/acir_format/logic_constraint.hpp

@@ -1,5 +1,5 @@
 // === AUDIT STATUS ===
-// internal:    { status: Planned, auditors: [], commit: }
+// internal:    { status: Complete, auditors: [Suyash], commit: e4712cda8def49d75fbba2d361625fc5e21945f5 }
 // external_1:  { status: not started, auditors: [], commit: }
 // external_2:  { status: not started, auditors: [], commit: }
 // =====================

barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.cpp

@@ -1,5 +1,5 @@
 // === AUDIT STATUS ===
-// internal:    { status: Planned, auditors: [], commit: }
+// internal:    { status: Complete, auditors: [Suyash], commit: e4712cda8def49d75fbba2d361625fc5e21945f5 }
 // external_1:  { status: not started, auditors: [], commit: }
 // external_2:  { status: not started, auditors: [], commit: }
 // =====================

barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.hpp

@@ -1,5 +1,5 @@
 // === AUDIT STATUS ===
-// internal:    { status: Planned, auditors: [], commit: }
+// internal:    { status: Complete, auditors: [Suyash], commit: e4712cda8def49d75fbba2d361625fc5e21945f5 }
 // external_1:  { status: not started, auditors: [], commit: }
 // external_2:  { status: not started, auditors: [], commit: }
 // =====================

barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/plookup_tables/uint.hpp

@@ -1,5 +1,5 @@
 // === AUDIT STATUS ===
-// internal:    { status: Planned, auditors: [], commit: }
+// internal:    { status: Complete, auditors: [Suyash], commit: e4712cda8def49d75fbba2d361625fc5e21945f5 }
 // external_1:  { status: not started, auditors: [], commit: }
 // external_2:  { status: not started, auditors: [], commit: }
 // =====================

barretenberg/cpp/src/barretenberg/vm2/common/aztec_constants.hpp

@@ -237,12 +237,12 @@
 #define AVM_TORADIXBE_DYN_L2_GAS 3
 #define AVM_BITWISE_DYN_L2_GAS 3
 #define AVM_EMITPUBLICLOG_DYN_L2_GAS 3
-#define AVM_EMITNOTEHASH_BASE_DA_GAS 512
-#define AVM_EMITNULLIFIER_BASE_DA_GAS 512
-#define AVM_SENDL2TOL1MSG_BASE_DA_GAS 512
-#define AVM_EMITPUBLICLOG_BASE_DA_GAS 1024
-#define AVM_EMITPUBLICLOG_DYN_DA_GAS 512
-#define AVM_SSTORE_DYN_DA_GAS 1024
+#define AVM_EMITNOTEHASH_BASE_DA_GAS 32
+#define AVM_EMITNULLIFIER_BASE_DA_GAS 32
+#define AVM_SENDL2TOL1MSG_BASE_DA_GAS 32
+#define AVM_EMITPUBLICLOG_BASE_DA_GAS 64
+#define AVM_EMITPUBLICLOG_DYN_DA_GAS 32
+#define AVM_SSTORE_DYN_DA_GAS 64
 #define AVM_WRITTEN_PUBLIC_DATA_SLOTS_TREE_HEIGHT 6
 #define AVM_WRITTEN_PUBLIC_DATA_SLOTS_TREE_INITIAL_ROOT                                                                \
     "0x2870b93163d4fd6ada360fe48ee1e8e8e69308af34cdfaeffacbbe5929e2466d"

barretenberg/cpp/src/barretenberg/vm2/constraining/avm_fixed_vk.hpp

@@ -17,7 +17,7 @@ class AvmHardCodedVKAndHash {
     using FF = bb::curve::BN254::ScalarField;
 
     // Precomputed VK hash (hash of all commitments below).
-    static FF vk_hash() { return FF(uint256_t("0x1f47e68404e58fcde864ff61573d61acab5832efb230f9a32ae68044d31dfd19")); }
+    static FF vk_hash() { return FF(uint256_t("0x02296b934ced1a5cdacae120d2032d88a119bdb0738d4c4f3ada4f5a831a5153")); }
 
     static constexpr std::array<Commitment, NUM_PRECOMPUTED_ENTITIES> get_all()
     {
@@ -59,13 +59,13 @@ class AvmHardCodedVKAndHash {
                 uint256_t(
                     "0x09f2eef32136799118634a108531dc248506d5f58f64885575b245865b56d48e")), // precomputed_exec_opcode
             Commitment(
-                uint256_t("0x0188169f0225c14e925347c4f9f192d191b2ab6ca2fbc1d0453f48af5d9c667b"),
+                uint256_t("0x09bd44905d676585d8c7a91c8ba8fd6b1b598326cb80b95e80b4b39703c7e2c8"),
                 uint256_t(
-                    "0x25b997de6f92af3ea3b409b41437fea01980b344a12fabc6b833656f26d6e954")), // precomputed_exec_opcode_base_da_gas
+                    "0x1bec3a67476715f88745bc09b1ea57859c8fe809fae4376efab6ba773ea7f6d4")), // precomputed_exec_opcode_base_da_gas
             Commitment(
-                uint256_t("0x1ddbbb27c627edafce021d5f332867ac9234c6f507442633bff9a5dbb4d02803"),
+                uint256_t("0x0f5b3fee86f9815eb0be052412de7f2a4c82f678604ba9e161c4412529810057"),
                 uint256_t(
-                    "0x10fda7a2360b21bbfbb1e815377adc0fa869bbcb4a46b29c31ae017893fdfb0d")), // precomputed_exec_opcode_dynamic_da_gas
+                    "0x1ad065dec1d51664807b4d551d0eb8abe0b061b8380dde6d662e2df36a1f85c8")), // precomputed_exec_opcode_dynamic_da_gas
             Commitment(
                 uint256_t("0x06c03e425e92d09aa8243220a0968b4d7d00c89e541a2b6095920883a8a6fa72"),
                 uint256_t(

barretenberg/docs/docs/bb-cli-reference.md

@@ -10,7 +10,7 @@ sidebar_position: 1000
 *This documentation is auto-generated from the `bb` CLI help output.*
 
 
-*Generated: Tue 17 Feb 2026 04:44:25 UTC*
+*Generated: Wed 18 Feb 2026 04:46:30 UTC*
 
 *Command: `bb`*
 

barretenberg/docs/versioned_docs/version-v4.0.0-nightly.20260217/bb-cli-reference.md → barretenberg/docs/versioned_docs/version-v4.0.0-nightly.20260218/bb-cli-reference.md

@@ -10,7 +10,7 @@ sidebar_position: 1000
 *This documentation is auto-generated from the `bb` CLI help output.*
 
 
-*Generated: Tue 17 Feb 2026 04:44:25 UTC*
+*Generated: Wed 18 Feb 2026 04:46:30 UTC*
 
 *Command: `bb`*
 

barretenberg/docs/versions.json

@@ -1,4 +1,4 @@
 [
   "v0.87.0",
-  "v4.0.0-nightly.20260217"
+  "v4.0.0-nightly.20260218"
 ]

barretenberg/sol/scripts/copy_optimized_to_cpp.sh

@@ -97,22 +97,17 @@ awk '
 awk '
     BEGIN {
         in_unroll = 0
-        unroll_label = ""
     }
     # Detect UNROLL_SECTION_START
     /\{\{[[:space:]]*UNROLL_SECTION_START[[:space:]]+[^}]+\}\}/ {
         print  # Print the start marker
         in_unroll = 1
-        # Extract the label for matching with END
-        match($0, /UNROLL_SECTION_START[[:space:]]+([^[:space:]}\]]+)/, arr)
-        unroll_label = arr[1]
         next
     }
     # Detect UNROLL_SECTION_END
     /\{\{[[:space:]]*UNROLL_SECTION_END[[:space:]]+[^}]+\}\}/ {
         print  # Print the end marker
         in_unroll = 0
-        unroll_label = ""
         next
     }
     # Skip lines inside unroll sections