AztecProtocol · AztecBot · Jul 1, 2026 · Jul 1, 2026 · Jul 1, 2026 · Jul 1, 2026
@@ -166,11 +166,15 @@ function main {
     echo "SKIP_COMPAT_E2E=1" >> $GITHUB_ENV
   fi
 
+<<<<<<< HEAD
   # Benching modes run their benches on a dedicated, fixed-hardware box (stable numbers)
   # and publish the result; ci-fast never benches. For grind runs (merge-queue-heavy fires
   # ~10 instances) only the first instance keeps BENCH_UPLOAD=1 — multi_job_run forces the
   # rest to 0 so they bench inline as a breakage check without racing the upload. The
   # destination (bench/next vs bench/prs) is BENCH_BRANCH below.
+=======
+  # Determine if benchmarks should be uploaded (merge-queue, full, or full-no-test-cache modes)
+>>>>>>> origin/v5-next
   if [[ "$ci_mode" == "merge-queue" || "$ci_mode" == "merge-queue-heavy" || "$ci_mode" == "full" || "$ci_mode" == "full-no-test-cache" ]]; then
     echo "BENCH_UPLOAD=1" >> $GITHUB_ENV
   fi

@@ -30,8 +30,12 @@ jobs:
       github.event_name == 'workflow_dispatch' ||
       (github.event_name == 'workflow_run'
        && github.event.workflow_run.conclusion == 'success'
+<<<<<<< HEAD
        && !contains(github.event.workflow_run.head_branch, '-commit.')
        && github.repository != 'AztecProtocol/aztec-packages-private')
+=======
+       && !contains(github.event.workflow_run.head_branch, '-commit.'))
+>>>>>>> origin/v5-next
     env:
       VERSION: ${{ github.event.inputs.version || github.event.workflow_run.head_branch }}
     steps:

@@ -216,7 +216,11 @@ jobs:
       fail-fast: false
       matrix:
         test_set: ["1", "2"]
+<<<<<<< HEAD
     # We run on the current next (v6) public nightly tag, or when the ci-network-scenario label is present in a PR.
+=======
+    # We run on the current v5-next nightly tag (private repo only), or when the ci-network-scenario label is present in a PR.
+>>>>>>> origin/v5-next
     needs: [ci, validate-nightly-tag]
     if: |
       always()
@@ -226,8 +230,13 @@ jobs:
       && (
         (
           needs.validate-nightly-tag.outputs.is_current == 'true'
+<<<<<<< HEAD
           && github.repository == 'AztecProtocol/aztec-packages'
           && startsWith(github.ref_name, 'v6.')
+=======
+          && github.repository == 'AztecProtocol/aztec-packages-private'
+          && startsWith(github.ref_name, 'v5.')
+>>>>>>> origin/v5-next
         )
         || contains(github.event.pull_request.labels.*.name, 'ci-network-scenario')
       )

@@ -24,8 +24,13 @@ jobs:
             branch="${{ github.ref_name }}"
 
             # Determine base branch. Most trains target next; trains suffixed
+<<<<<<< HEAD
             # with -v<N> (e.g. spartan-v5, fairies-v5) target the matching
             # release line (v5-next) instead.
+=======
+            # with -v<N> (e.g. spartan-v5, fairies-v5, spartan-v6) target the
+            # matching release line (v5-next, v6-next) instead.
+>>>>>>> origin/v5-next
             base_branch="next"
             if [[ "$branch" =~ -v([0-9]+)$ ]]; then
               base_branch="v${BASH_REMATCH[1]}-next"
@@ -55,10 +60,14 @@ jobs:
 
               # Create PR with ci-no-squash label
               labels="ci-no-squash"
-              if [[ "$branch" == "merge-train/spartan" || "$branch" == "merge-train/spartan-v5" || "$branch" == "merge-train/ci" ]]; then
+              if [[ "$branch" == "merge-train/spartan" || "$branch" == "merge-train/spartan-v5" || "$branch" == "merge-train/spartan-v6" || "$branch" == "merge-train/ci" ]]; then
                 labels="$labels,ci-full-no-test-cache"
               fi
+<<<<<<< HEAD
               # Trains targeting a v<N>-next release line (v5-next) are
+=======
+              # Trains targeting a v<N>-next release line (v5-next, v6-next) are
+>>>>>>> origin/v5-next
               # forward-ported into their base via the private-port-next driver.
               if [[ "$base_branch" =~ ^v[0-9]+-next$ ]]; then
                 labels="$labels,private-port-next"

@@ -5,6 +5,7 @@ on:
     branches:
       - next
       - v5-next
+      - v6-next
 
 jobs:
   merge-to-trains:
@@ -27,13 +28,26 @@ jobs:
           GH_TOKEN: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}
           COMMIT_SHA: ${{ github.sha }}
         run: |
+<<<<<<< HEAD
           # The -v<N> trains track the matching release line (v5-next); every
           # other train tracks next. Sync only the trains fed by the branch
           # that was just pushed.
+=======
+          # The -v<N> trains track the matching release line (v5-next, v6-next);
+          # every other train tracks next. Sync only the trains fed by the
+          # branch that was just pushed.
+>>>>>>> origin/v5-next
           if [[ "${{ github.ref_name }}" == "v5-next" ]]; then
             for branch in merge-train/spartan-v5 merge-train/fairies-v5; do
               ./scripts/merge-train/merge-next.sh "$branch" v5-next || true
             done
+<<<<<<< HEAD
+=======
+          elif [[ "${{ github.ref_name }}" == "v6-next" ]]; then
+            for branch in merge-train/spartan-v6; do
+              ./scripts/merge-train/merge-next.sh "$branch" v6-next || true
+            done
+>>>>>>> origin/v5-next
           else
             for branch in merge-train/avm merge-train/barretenberg merge-train/ci merge-train/docs merge-train/fairies merge-train/spartan; do
               ./scripts/merge-train/merge-next.sh "$branch" || true

@@ -38,6 +38,24 @@ jobs:
           BASE_BRANCH: v5-next
         run: ./ci3/merge_train_stale_check merge-train/spartan-v5 '#team-alpha'
 
+<<<<<<< HEAD
+=======
+  spartan-v6:
+    name: Check merge-train/spartan-v6
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: read
+    steps:
+      - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+      - name: Run stale check
+        env:
+          GH_TOKEN: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}
+          SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
+          BASE_BRANCH: v6-next
+        run: ./ci3/merge_train_stale_check merge-train/spartan-v6 '#team-alpha'
+
+>>>>>>> origin/v5-next
   fairies-v5:
     name: Check merge-train/fairies-v5
     runs-on: ubuntu-latest

@@ -0,0 +1,32 @@
+name: Nightly Release Tag (v5-next)
+on:
+  schedule:
+    # Run the workflow every night at 5:00 AM UTC.
+    - cron: "0 5 * * *"
+  workflow_dispatch: {}
+
+permissions:
+  contents: write
+
+concurrency:
+  group: ${{ github.workflow }}-v5-next
+
+jobs:
+  nightly-release-tag-v5-next:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+        with:
+          ref: v5-next
+          token: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}
+
+      - name: Create v5-next Nightly Tag
+        run: |
+          git config --global user.email "tech@aztecprotocol.com"
+          git config --global user.name "AztecBot"
+          current_version=$(jq -r '."."' .release-please-manifest.json)
+          echo "Current version: $current_version"
+          nightly_tag="v${current_version}-nightly.$(date -u +%Y%m%d)"
+          echo "v5-next nightly tag: $nightly_tag"
+          git tag -a "$nightly_tag" -m "$nightly_tag"
+          git push origin "$nightly_tag"
@@ -212,11 +212,21 @@ jobs:
         with:
           ref: ${{ needs.select-image.outputs.source_ref }}
 
+<<<<<<< HEAD
       - name: Configure AWS credentials (OIDC)
         uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: ${{ secrets.AWS_OIDC_ROLE_ARN }}
           aws-region: us-east-2
+=======
+      - name: Cleanup network resources
+        uses: ./.github/actions/network-teardown
+        with:
+          env_file: tps-scenario
+          namespace: nightly-bench
+          gcp_sa_key: ${{ secrets.GCP_SA_KEY }}
+          gcp_project_id: ${{ secrets.GCP_PROJECT_ID }}
+>>>>>>> origin/v5-next
 
       - name: Cleanup network resources
         uses: ./.github/actions/network-teardown
@@ -390,11 +400,21 @@ jobs:
         with:
           ref: ${{ needs.select-image.outputs.source_ref }}
 
+<<<<<<< HEAD
       - name: Configure AWS credentials (OIDC)
         uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: ${{ secrets.AWS_OIDC_ROLE_ARN }}
           aws-region: us-east-2
+=======
+      - name: Cleanup network resources
+        uses: ./.github/actions/network-teardown
+        with:
+          env_file: prove-n-tps-fake
+          namespace: prove-n-tps-fake
+          gcp_sa_key: ${{ secrets.GCP_SA_KEY }}
+          gcp_project_id: ${{ secrets.GCP_PROJECT_ID }}
+>>>>>>> origin/v5-next
 
       - name: Cleanup network resources
         uses: ./.github/actions/network-teardown
@@ -568,11 +588,21 @@ jobs:
         with:
           ref: ${{ needs.select-image.outputs.source_ref }}
 
+<<<<<<< HEAD
       - name: Configure AWS credentials (OIDC)
         uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: ${{ secrets.AWS_OIDC_ROLE_ARN }}
           aws-region: us-east-2
+=======
+      - name: Cleanup network resources
+        uses: ./.github/actions/network-teardown
+        with:
+          env_file: block-capacity
+          namespace: nightly-block-capacity
+          gcp_sa_key: ${{ secrets.GCP_SA_KEY }}
+          gcp_project_id: ${{ secrets.GCP_PROJECT_ID }}
+>>>>>>> origin/v5-next
 
       - name: Cleanup network resources
         uses: ./.github/actions/network-teardown

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "6.0.0"
+  ".": "5.1.0"
 }
diff --git a/.test_patterns.yml b/.test_patterns.yml
@@ -422,11 +422,6 @@ tests:
     owners:
       - *martin
 
-  - regex: "yarn-project/scripts/run_test.sh bb-prover/src/avm_proving_tests/avm_"
-    error_regex: "timeout: sending signal"
-    owners:
-      - *charlie
-
   - regex: "run_test.sh simple tx_stats_bench"
     error_regex: "✕ verifies transactions at 10 TPS"
     owners:

diff --git a/Makefile b/Makefile
@@ -55,7 +55,11 @@ endef
 
 # Fast bootstrap.
 fast: release-image barretenberg boxes playground docs aztec-up \
+<<<<<<< HEAD
 		  bb-tests l1-contracts-tests yarn-project-tests boxes-tests playground-tests aztec-up-tests docs-tests noir-protocol-circuits-tests contract-snapshots-tests release-image-tests spartan claude-tests ipc-codegen-tests
+=======
+		  bb-tests l1-contracts-tests yarn-project-tests boxes-tests playground-tests aztec-up-tests docs-tests noir-protocol-circuits-tests contract-snapshots-tests release-image-tests spartan claude-tests
+>>>>>>> origin/v5-next
 
 # Full bootstrap.
 full: fast bb-full-tests bb-cpp-full yarn-project-benches

diff --git a/barretenberg/cpp/scripts/chonk-inputs.hash b/barretenberg/cpp/scripts/chonk-inputs.hash
@@ -1 +1,5 @@
+<<<<<<< HEAD
 42ffe8bc8b4f60d8
+=======
+30325f8d3e30771a
+>>>>>>> origin/v5-next
diff --git a/barretenberg/cpp/src/barretenberg/bbapi/bbapi.test.cpp b/barretenberg/cpp/src/barretenberg/bbapi/bbapi.test.cpp
@@ -8,6 +8,7 @@
 #include "barretenberg/common/utils.hpp"
 #include "barretenberg/serialize/test_helper.hpp"
 #include "msgpack/v3/sbuffer_decl.hpp"
+#include <cstdlib>
 #include <gtest/gtest.h>
 
 using namespace bb;
@@ -28,7 +29,8 @@ using Commands = ::testing::Types<bbapi::CircuitProve,
                                   bbapi::ChonkProve,
                                   bbapi::ChonkComputeVk,
                                   bbapi::ChonkCheckPrecomputedVk,
-                                  bbapi::ChonkBatchVerify>;
+                                  bbapi::ChonkBatchVerify,
+                                  bbapi::SetMsmLegacy>;
 
 // Typed test suites
 template <typename T> class BBApiMsgpack : public ::testing::Test {};
@@ -48,6 +50,28 @@ TYPED_TEST(BBApiMsgpack, DefaultConstructorRoundtrip)
     std::cout << msgpack_schema_to_string(command) << " " << msgpack_schema_to_string(response) << std::endl;
 }
 
+TEST(BBApiConfig, SetMsmLegacyTogglesFacade)
+{
+    bbapi::BBApiRequest request{};
+
+    // Legacy MSM is the default: with no API override and neither env var set, the facade
+    // routes to the legacy path.
+    scalar_multiplication::clear_legacy_msm_override();
+    if (std::getenv("BB_MSM_LEGACY") == nullptr && std::getenv("BB_MSM_NEW") == nullptr) {
+        EXPECT_TRUE(scalar_multiplication::use_legacy_msm());
+    }
+
+    auto enabled = bbapi::SetMsmLegacy{ .enabled = true }.execute(request);
+    EXPECT_TRUE(enabled.enabled);
+    EXPECT_TRUE(scalar_multiplication::use_legacy_msm());
+
+    auto disabled = bbapi::SetMsmLegacy{ .enabled = false }.execute(request);
+    EXPECT_FALSE(disabled.enabled);
+    EXPECT_FALSE(scalar_multiplication::use_legacy_msm());
+
+    scalar_multiplication::clear_legacy_msm_override();
+}
+
 // Regression tests for input validation at API boundaries.
 // These ensure non-canonical field encodings and trailing bytes are rejected.
 

diff --git a/barretenberg/cpp/src/barretenberg/bbapi/bbapi_execute.hpp b/barretenberg/cpp/src/barretenberg/bbapi/bbapi_execute.hpp
@@ -78,6 +78,7 @@ using Command = NamedUnion<AvmProve,
                            ChonkBatchVerifierQueue,
                            ChonkBatchVerifierStop,
                            SrsInitGrumpkinSrs,
+                           SetMsmLegacy,
                            Shutdown>;
 
 using CommandResponse = NamedUnion<ErrorResponse,
@@ -145,6 +146,7 @@ using CommandResponse = NamedUnion<ErrorResponse,
                                    ChonkBatchVerifierQueue::Response,
                                    ChonkBatchVerifierStop::Response,
                                    SrsInitGrumpkinSrs::Response,
+                                   SetMsmLegacy::Response,
                                    Shutdown::Response>;
 
 /**

diff --git a/barretenberg/cpp/src/barretenberg/bbapi/bbapi_shared.hpp b/barretenberg/cpp/src/barretenberg/bbapi/bbapi_shared.hpp
@@ -25,13 +25,20 @@
 #include <string>
 #include <vector>
 
+<<<<<<< HEAD
 // The FIFO-streaming Chonk batch verifier service relies on POSIX named pipes and signals
 // (open/lstat/SIGPIPE), which are unavailable on wasm and on Windows (MinGW). Those platforms
 // compile throwing stubs instead. This macro guards the service across bbapi_shared.hpp,
 // bbapi_chonk.hpp, and bbapi_chonk.cpp.
 #if !defined(__wasm__) && !defined(_WIN32)
 #define BB_HAS_BATCH_VERIFIER_SERVICE
 #endif
+=======
+namespace bb::scalar_multiplication {
+[[nodiscard]] bool use_legacy_msm() noexcept;
+void set_legacy_msm_override(bool enabled) noexcept;
+} // namespace bb::scalar_multiplication
+>>>>>>> origin/v5-next
 
 namespace bb::bbapi {
 
@@ -234,6 +241,26 @@ struct Shutdown {
     bool operator==(const Shutdown&) const = default;
 };
 
+struct SetMsmLegacy {
+    static constexpr const char MSGPACK_SCHEMA_NAME[] = "SetMsmLegacy";
+    bool enabled = false;
+
+    struct Response {
+        static constexpr const char MSGPACK_SCHEMA_NAME[] = "SetMsmLegacyResponse";
+        bool enabled = false;
+        SERIALIZATION_FIELDS(enabled);
+        bool operator==(const Response&) const = default;
+    };
+
+    SERIALIZATION_FIELDS(enabled);
+    Response execute(const BBApiRequest&) const
+    {
+        scalar_multiplication::set_legacy_msm_override(enabled);
+        return { .enabled = scalar_multiplication::use_legacy_msm() };
+    }
+    bool operator==(const SetMsmLegacy&) const = default;
+};
+
 /**
  * @brief Concatenate public inputs and proof into a complete proof for verification
  * @details Joins the separated public_inputs and proof portions back together.