diff --git a/.claude/skills/release-network-docs/SKILL.md b/.claude/skills/release-network-docs/SKILL.md
index 29eceb3ca4ba..0307e1c2f4d6 100644
--- a/.claude/skills/release-network-docs/SKILL.md
+++ b/.claude/skills/release-network-docs/SKILL.md
@@ -21,12 +21,14 @@ self-identify its release type, ask the user to confirm.
 
 **This skill does NOT:**
 
-- Generate API docs (aztec-nr or TypeScript)
+- Generate developer API docs (aztec-nr or TypeScript)
 - Generate CLI reference docs
 - Update developer version config or cut developer versioned docs
 - Update migration notes
-- Require aztec CLI or nargo (yarn-project build is only needed for node API
-  reference regeneration in Step 5b, which can be skipped)
+- Require aztec CLI, nargo, or yarn-project build
+
+**This skill DOES** regenerate the Node JSON-RPC API reference for the
+versioned docs (see Step 5a).
 
 ## Usage
 
@@ -82,18 +84,6 @@ git tag -l "v<nodeVersion>"
 - If the tag exists but is not checked out: `git checkout v<nodeVersion>`
 - **Abort if the tag doesn't exist** — the release hasn't been tagged yet.
 
-#### Pre-release workflow
-
-If the user provides a target version that differs from the `nodeVersion`
-returned by the RPC (e.g. the network is still running `4.1.3` but the user
-wants to prepare docs for `4.2.0`), this is a **pre-release** docs preparation.
-Ask the user to confirm the target version, then use that version instead of
-`nodeVersion` throughout the remaining steps. The git tag for the target version
-must still exist. Contract addresses from the RPC reflect the *current* network
-state (the old version); they are still valid if the upgrade reuses the same
-contracts, but ask the user to confirm whether any addresses will change at
-upgrade time.
-
 ### Step 3: Identify and Resolve Missing Contract Addresses
 
 The `networks.md` L1 table includes contracts that are **not** returned by
@@ -105,12 +95,8 @@ The Rollup and Registry addresses are already known from the RPC response. Use
 them to query additional addresses on L1. Determine the L1 RPC from the chain
 ID: `1` → Ethereum mainnet, `11155111` → Sepolia.
 
-First check whether the RPC response already includes `gseAddress` in
-`l1ContractAddresses` — newer node versions return it directly. If present,
-use it and skip the on-chain query for GSE.
-
 ```bash
-# GSE (Governance Staking Escrow) — from Rollup (skip if already in RPC response)
+# GSE (Governance Staking Escrow) — from Rollup
 cast call <ROLLUP_ADDRESS> "getGSE()(address)" --rpc-url <L1_RPC>
 
 # Slasher — from Rollup
@@ -182,27 +168,29 @@ Ask the user if any content changes are needed in `docs/docs-operate/`:
 - Operator changelog updates (if not handled by `/updating-changelog`)
 
 If the user has content changes, apply them to the source files in
-`docs/docs-operate/`. If no content changes are needed, skip to Step 5b.
-
-### Step 5b: Regenerate Node API Reference Docs
+`docs/docs-operate/`. If no content changes are needed, skip to Step 5a.
 
-Regenerate the Node JSON-RPC API reference documentation. This script parses the
-TypeScript interface definitions and Zod schemas in `yarn-project/stdlib/src/interfaces/`
-to produce a complete markdown reference for the `node_` and `nodeAdmin_` RPC methods.
+### Step 5a: Regenerate Node API Reference
 
-**Prerequisite:** `yarn-project` must be built (`cd yarn-project && yarn && yarn build`).
-This is the only heavy build dependency for this skill and is only needed for this
-step. If the node API has not changed since the last release, you can skip this step.
+The Node JSON-RPC API reference is auto-generated from TypeScript source. It
+must be regenerated from the release tag's source files to ensure the versioned
+docs reflect the actual API at that release.
 
 ```bash
 cd docs
 yarn generate:node-api-reference
 ```
 
-This updates `docs/docs-operate/operators/reference/node-api-reference.md`.
+This writes to `docs/docs-operate/operators/reference/node-api-reference.md`
+using the source files from the currently checked-out tag. The generator parses
+`yarn-project/stdlib/src/interfaces/aztec-node.ts` and
+`yarn-project/stdlib/src/interfaces/aztec-node-admin.ts` directly (no
+yarn-project build needed, but `yarn-project/node_modules/` must be installed
+so `npx tsx` can resolve `typescript` — run `yarn install` from `yarn-project`
+if needed).
 
-The file is auto-generated — do not hand-edit it. When cutting network versioned
-docs (Step 7), the generated content is included in the snapshot automatically.
+Verify the output lists the expected number of methods and has no ungrouped
+methods warnings.
 
 ### Step 6: Build and Validate
 
@@ -318,11 +306,13 @@ Check for stash conflicts. Then report to the user:
 - **Some addresses are not in the RPC**: Contracts like Staking Registry,
   Reward Booster, Tally Slashing Proposer, and others must be queried on-chain,
   obtained from deployment output, or confirmed unchanged by the user.
-- **Mostly lightweight**: This skill does not require aztec CLI or nargo. The
-  only heavy dependency is `yarn-project` build, needed only for regenerating
-  the node API reference (Step 5b) — skip that step if the node API hasn't
-  changed. Otherwise only `yarn` (for the docs build), `curl`/`jq` (for the
-  RPC query), and `cast` (for on-chain address queries) are needed.
+- **No heavy prerequisites**: This skill does not require aztec CLI, nargo, or
+  a yarn-project build. Only `yarn` (for the docs build), `curl`/`jq` (for
+  the RPC query), and `cast` (for on-chain address queries) are needed.
+- **Node API reference is auto-generated**: Run `yarn generate:node-api-reference`
+  (Step 5a) before building. The generator parses TypeScript source directly, so
+  no yarn-project build is required — but `yarn-project/node_modules/` must exist
+  (run `yarn install` from `yarn-project` if missing).
 - **Build must pass**: Do not cut versioned docs until `yarn build` succeeds.
 - **COMMIT_TAG needs `v` prefix**: The preprocessor uses COMMIT_TAG for GitHub
   URLs and git tag references. Omitting the `v` will break links in versioned
diff --git a/.github/ci3_labels_to_env.sh b/.github/ci3_labels_to_env.sh
index ac602e6a3767..476a4f201f05 100755
--- a/.github/ci3_labels_to_env.sh
+++ b/.github/ci3_labels_to_env.sh
@@ -37,6 +37,11 @@ function main {
     echo "NO_FAIL_FAST=1" >> $GITHUB_ENV
   fi
 
+  # Handle skip-compat-e2e label (escape hatch for backwards compat test failures on release PRs)
+  if has_label "ci-skip-compat-e2e"; then
+    echo "SKIP_COMPAT_E2E=1" >> $GITHUB_ENV
+  fi
+
   # Determine CI mode based on event, labels, and target branch
   local ci_mode
   if [ "${GITHUB_EVENT_NAME:-}" == "merge_group" ] || has_label "ci-merge-queue"; then
diff --git a/.github/workflows/aztec-cli-acceptance-test.yml b/.github/workflows/aztec-cli-acceptance-test.yml
new file mode 100644
index 000000000000..85c607c888c5
--- /dev/null
+++ b/.github/workflows/aztec-cli-acceptance-test.yml
@@ -0,0 +1,66 @@
+# Validates that a published Aztec CLI release can be installed and used end-to-end.
+# Runs after CI3 completes a tag release (via workflow_run), or manually via workflow_dispatch.
+name: Aztec CLI Acceptance Test
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: "Version to install (e.g. latest, nightly, 4.3.0, 4.3.0-nightly.20260420)"
+        required: true
+        type: string
+  workflow_run:
+    workflows: ["CI3"]
+    types:
+      - completed
+    branches:
+      - "v*"
+
+jobs:
+  release-acceptance:
+    runs-on: ubuntu-latest
+    if: >-
+      github.event_name == 'workflow_dispatch' ||
+      (github.event_name == 'workflow_run'
+       && github.event.workflow_run.conclusion == 'success'
+       && !contains(github.event.workflow_run.head_branch, '-commit.'))
+    timeout-minutes: 30
+    env:
+      VERSION: ${{ github.event.inputs.version || github.event.workflow_run.head_branch }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        with:
+          ref: ${{ github.event.workflow_run.head_sha || github.sha }}
+
+      # Node is only used to run the .ts harness in run-test.sh, which needs >=22.18 for TS
+      # type-stripping. The aztec CLI installer manages its own node version independently.
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+
+      - name: Run Aztec CLI acceptance test
+        run: ./aztec-up/test/aztec-cli-acceptance-test/run-test.sh
+
+      - name: Notify Slack on success
+        if: success() && github.event_name != 'workflow_dispatch'
+        env:
+          SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
+        run: |
+          export CI=1
+          ./ci3/slack_notify "#team-fairies" \
+            "Aztec CLI Acceptance Test passed for version ${VERSION} :white_check_mark:"
+
+      - name: Notify Slack and dispatch ClaudeBox on failure
+        if: failure() && github.event_name != 'workflow_dispatch'
+        env:
+          SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}
+        run: |
+          RUN_URL="https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+          export CI=1
+          ./ci3/slack_notify_with_claudebox_kickoff "#team-fairies" \
+            "Aztec CLI Acceptance Test FAILED (version ${VERSION}): <${RUN_URL}|View Run>" \
+            "Aztec CLI acceptance test failed for version ${VERSION}. CI run: ${RUN_URL}. Investigate the failure and explain the root cause." \
+            --link "$RUN_URL"
diff --git a/.github/workflows/ci3.yml b/.github/workflows/ci3.yml
index 56d5c7004824..e924fcdd97a0 100644
--- a/.github/workflows/ci3.yml
+++ b/.github/workflows/ci3.yml
@@ -445,3 +445,108 @@ jobs:
           AWS_SHUTDOWN_TIME: 180
         run: |
           ./.github/ci3.sh network-tests-kind
+
+  # Backwards compatibility e2e tests.
+  # Runs e2e tests with contract artifacts from every prior stable release to validate
+  # that new client code works with old contract artifacts ("new pxe / old contracts").
+  # Blocking for stable/RC releases: ci-release-publish requires this job to pass before
+  # publishing. Observational for nightlies: runs, but continue-on-error keeps the workflow
+  # green and ci-release-publish's condition publishes nightlies regardless of the result.
+  # Escape hatch: ci-skip-compat-e2e label makes failures non-blocking on release PRs.
+  ci-compat-e2e:
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: read
+    needs: [ci]
+    if: |
+      always()
+      && (needs.ci.result == 'success' || needs.ci.result == 'skipped')
+      && github.event.pull_request.head.repo.fork != true
+      && github.event.pull_request.draft == false
+      && (
+        (startsWith(github.ref, 'refs/tags/v') && !contains(github.ref_name, '-commit.'))
+        || contains(github.event.pull_request.labels.*.name, 'ci-compat-e2e')
+        || contains(github.event.pull_request.labels.*.name, 'ci-release-pr')
+      )
+    # Non-blocking for nightlies and when ci-skip-compat-e2e escape hatch is applied.
+    continue-on-error: ${{ contains(github.ref_name, '-nightly.') || contains(github.event.pull_request.labels.*.name, 'ci-skip-compat-e2e') }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        with:
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
+
+      - 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
+          role-session-name: ci3-compat-e2e-${{ github.run_id }}
+          role-duration-seconds: 21600 # 6h – covers AWS_SHUTDOWN_TIME (300 min) + 60 min buffer
+
+      - name: Run Backwards Compatibility E2E Tests
+        timeout-minutes: 330
+        env:
+          GITHUB_TOKEN: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}
+          BUILD_INSTANCE_SSH_KEY: ${{ secrets.BUILD_INSTANCE_SSH_KEY }}
+          GCP_SA_KEY: ${{ secrets.GCP_SA_KEY }}
+          DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
+          DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+          SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
+          CI3_INSTANCE_PROFILE_NAME: ${{ secrets.CI3_INSTANCE_PROFILE_NAME }}
+          CI3_SECURITY_GROUP_ID: ${{ secrets.CI3_SECURITY_GROUP_ID }}
+          RUN_ID: ${{ github.run_id }}
+          AWS_SHUTDOWN_TIME: 300
+        run: ./.github/ci3.sh compat-e2e
+
+  # Publishes the release (npm, Docker, GitHub release, aztec-up scripts, etc.).
+  # Gated on ci-compat-e2e: a compat regression blocks stable/RC publishing. Nightlies
+  # publish regardless — compat-e2e runs there observationally. Dev `-commit.` tags from
+  # the ci-release-pr flow never reach this job (they are not real releases).
+  ci-release-publish:
+    runs-on: ubuntu-latest
+    environment: master
+    permissions:
+      id-token: write
+      contents: read
+    needs: [ci, ci-compat-e2e]
+    if: |
+      startsWith(github.ref, 'refs/tags/v')
+      && !contains(github.ref_name, '-commit.')
+      && needs.ci.result == 'success'
+      && (
+        contains(github.ref_name, '-nightly.')
+        || needs.ci-compat-e2e.result == 'success'
+      )
+    steps:
+      - name: Checkout
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        with:
+          ref: ${{ github.sha }}
+
+      - 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
+          role-session-name: ci3-release-publish-${{ github.run_id }}
+          role-duration-seconds: 21600
+
+      - name: Run Release Publish
+        env:
+          GITHUB_TOKEN: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}
+          BUILD_INSTANCE_SSH_KEY: ${{ secrets.BUILD_INSTANCE_SSH_KEY }}
+          GCP_SA_KEY: ${{ secrets.GCP_SA_KEY }}
+          GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
+          DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
+          DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+          CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
+          NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
+          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+          SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
+          CI3_INSTANCE_PROFILE_NAME: ${{ secrets.CI3_INSTANCE_PROFILE_NAME }}
+          CI3_SECURITY_GROUP_ID: ${{ secrets.CI3_SECURITY_GROUP_ID }}
+          RUN_ID: ${{ github.run_id }}
+        run: ./.github/ci3.sh release-publish
diff --git a/.github/workflows/docs-typesense.yml b/.github/workflows/docs-typesense.yml
index 85fdf3c382e2..8cc3726256d8 100644
--- a/.github/workflows/docs-typesense.yml
+++ b/.github/workflows/docs-typesense.yml
@@ -27,11 +27,50 @@ jobs:
           fetch-depth: 0
 
       - name: Reindex with Typesense docsearch-scraper
+        env:
+          # Fail the run if the scraper indexes fewer than this many records.
+          # The docsearch-scraper container exits 0 even when its config is broken
+          # and the index ends up nearly empty, so this guard turns a silent
+          # regression (which happened with #22861 dropping the index from
+          # ~12k to 48 records) into a loud CI failure.
+          MIN_HITS: "5000"
+          TYPESENSE_API_KEY: ${{ secrets.TYPESENSE_API_KEY }}
+          TYPESENSE_HOST: ${{ secrets.TYPESENSE_HOST }}
         run: |
+          set -euo pipefail
+
           docker run \
-            -e "TYPESENSE_API_KEY=${{ secrets.TYPESENSE_API_KEY }}" \
-            -e "TYPESENSE_HOST=${{ secrets.TYPESENSE_HOST }}" \
+            -e "TYPESENSE_API_KEY=$TYPESENSE_API_KEY" \
+            -e "TYPESENSE_HOST=$TYPESENSE_HOST" \
             -e "TYPESENSE_PORT=443" \
             -e "TYPESENSE_PROTOCOL=https" \
-            -e "CONFIG=$(cat docs/typesense.config.json | jq -r tostring)" \
-            typesense/docsearch-scraper:0.11.0
+            -e "CONFIG=$(cat docs/typesense.config.json)" \
+            typesense/docsearch-scraper:0.11.0 2>&1 | tee scraper.log
+
+          nb_hits=$(grep -oE 'Nb hits: *[0-9]+' scraper.log | tail -1 | grep -oE '[0-9]+' || true)
+          if [ -z "$nb_hits" ]; then
+            echo "::error::Could not parse 'Nb hits' from scraper output, assuming index is broken."
+            exit 1
+          fi
+          echo "Indexed $nb_hits records (threshold: $MIN_HITS)"
+          if [ "$nb_hits" -lt "$MIN_HITS" ]; then
+            echo "::error::Indexed only $nb_hits records (expected at least $MIN_HITS). Search index is likely broken."
+            exit 1
+          fi
+
+          # Log how many api-nr records are visible in the live index. The
+          # docusaurus theme always prepends `default` to its contextual
+          # docusaurus_tag filter, and no docusaurus page is stamped with
+          # `default` (each carries its plugin-context tag instead), so this
+          # facet count is effectively the count of indexed api-nr records.
+          # Informational only: the count varies with aztec-nr content size.
+          api_hits=$(curl -fsS \
+            "https://$TYPESENSE_HOST/collections/aztec-docs/documents/search" \
+            -H "X-TYPESENSE-API-KEY: $TYPESENSE_API_KEY" \
+            -G \
+            --data-urlencode "q=*" \
+            --data-urlencode "query_by=hierarchy.lvl0" \
+            --data-urlencode "filter_by=docusaurus_tag:=[default]&&language:=en" \
+            --data-urlencode "per_page=1" \
+            | jq -r '.found')
+          echo "api-nr records visible under docusaurus_tag:=[default]: $api_hits"
diff --git a/.github/workflows/full-dev-path.yml b/.github/workflows/full-dev-path.yml
deleted file mode 100644
index 5eee9fa514a0..000000000000
--- a/.github/workflows/full-dev-path.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-# Tests that the installed Aztec toolchain works end-to-end.
-# Exercises the full developer onboarding path: aztec init -> compile -> test -> start -> codegen -> TS end-to-end test.
-name: Full Dev Path Test
-
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: "Version to install (e.g. latest, nightly, 4.3.0, 4.3.0-nightly.20260420)"
-        required: true
-        type: string
-  push:
-    tags:
-      - "v*"
-
-jobs:
-  full-dev-path:
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    env:
-      VERSION: ${{ github.event.inputs.version || github.ref_name }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-
-      - name: Run full dev path test
-        run: ./aztec-up/test/full-dev-path/run-test.sh
-
-      - name: Notify Slack on success
-        if: success() && github.event_name != 'workflow_dispatch'
-        env:
-          SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
-        run: |
-          export CI=1
-          ./ci3/slack_notify "#team-fairies" \
-            "Full Dev Path Test passed for version ${VERSION} :white_check_mark:"
-
-      - name: Notify Slack and dispatch ClaudeBox on failure
-        if: failure() && github.event_name != 'workflow_dispatch'
-        env:
-          SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
-          GITHUB_TOKEN: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}
-        run: |
-          RUN_URL="https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
-          export CI=1
-          ./ci3/slack_notify_with_claudebox_kickoff "#team-fairies" \
-            "Full Dev Path Test FAILED (version ${VERSION}): <${RUN_URL}|View Run>" \
-            "Full dev path test failed for version ${VERSION}. CI run: ${RUN_URL}. Investigate the failure and explain the root cause." \
-            --link "$RUN_URL"
diff --git a/.github/workflows/metrics-deploy.yml b/.github/workflows/metrics-deploy.yml
index ae99d66aa728..b8774a1a7e96 100644
--- a/.github/workflows/metrics-deploy.yml
+++ b/.github/workflows/metrics-deploy.yml
@@ -37,6 +37,11 @@ on:
         required: true
         type: string
         default: "grafana-dashboard-password"
+      slack_alert_mention_user_ids:
+        description: Optional Terraform list of Slack user IDs to mention on Grafana alert notifications
+        required: false
+        type: string
+        default: '["U0AHB6VR8N5"]'
     secrets:
       GCP_SA_KEY:
         required: true
@@ -70,6 +75,10 @@ on:
         description: The name of the secret which holds the Grafana dashboard password
         required: true
         default: "grafana-dashboard-password"
+      slack_alert_mention_user_ids:
+        description: Optional Terraform list of Slack user IDs to mention on Grafana alert notifications
+        required: false
+        default: '["U0AHB6VR8N5"]'
 
 jobs:
   metrics_deployment:
@@ -96,6 +105,7 @@ jobs:
       SLACK_WEBHOOK_NEXT_NET_SECRET_NAME: slack-webhook-next-net-url
       SLACK_WEBHOOK_TESTNET_SECRET_NAME: slack-webhook-testnet-url
       SLACK_WEBHOOK_MAINNET_SECRET_NAME: slack-webhook-mainnet-url
+      TF_VAR_SLACK_ALERT_MENTION_USER_IDS: ${{ inputs.slack_alert_mention_user_ids }}
 
     steps:
       - name: Checkout code
@@ -129,10 +139,6 @@ jobs:
             echo "Terraform state bucket already exists"
           fi
 
-      - name: Import Dashboard
-        working-directory: ./spartan/metrics
-        run: ./copy-dashboard.sh
-
       - name: Setup Terraform
         uses: hashicorp/setup-terraform@633666f66e0061ca3b725c73b2ec20cd13a8fdd1
         with:
diff --git a/.github/workflows/pull-noir.yml b/.github/workflows/pull-noir.yml
index 2209aff23489..9a7f811b1e7b 100644
--- a/.github/workflows/pull-noir.yml
+++ b/.github/workflows/pull-noir.yml
@@ -68,7 +68,13 @@ jobs:
           cd ../..
           # Update Cargo.lock if needed, but don't fail if transpiler no longer builds
           cargo check --manifest-path avm-transpiler/Cargo.toml || true
-          git add noir/noir-repo avm-transpiler/Cargo.lock
+          # Update yarn.lock to pick up any changes to noir's JS packages (versions
+          # or the file: hash of noir_js). --mode=update-lockfile skips linking and
+          # build scripts. Don't fail the workflow if yarn errors out -- a partial
+          # update is still useful for the resulting PR.
+          corepack enable
+          (cd yarn-project && yarn install --mode=update-lockfile) || true
+          git add noir/noir-repo avm-transpiler/Cargo.lock yarn-project/yarn.lock
 
       - name: Check for existing PR
         if: steps.noir_versions.outputs.update_needed == 'true'
diff --git a/.test_patterns.yml b/.test_patterns.yml
index 5a334cd586c6..6b1cc561f658 100644
--- a/.test_patterns.yml
+++ b/.test_patterns.yml
@@ -60,9 +60,6 @@ tests:
     error_regex: "Aborted.*core dumped"
     owners:
       - *adam
-  - regex: "barretenberg/cpp/scripts/run_bench.sh wasm bb-micro-bench/wasm/chonk build-wasm-threads/bin/chonk_bench"
-    owners:
-      - *luke
 
   # noir
   # Something to do with how I run the tests now. Think these are fine in nextest.
@@ -146,6 +143,11 @@ tests:
       - *palla
 
   # yarn-project tests
+  # Attempt to catch all kv-store browser test failures (consider them quarantined for now)
+  - regex: "yarn-project/kv-store"
+    error_regex: "vitest"
+    owners:
+      - *martin
   - regex: "yarn-project/kv-store"
     error_regex: "Could not import your test module"
     owners:
@@ -153,7 +155,7 @@ tests:
   - regex: "yarn-project/kv-store"
     error_regex: "timeout: sending signal TERM to command"
     owners:
-      - *alex
+      - *martin
   - regex: "yarn-project/kv-store"
     error_regex: "Failed to fetch dynamically imported module"
     owners:
@@ -183,6 +185,14 @@ tests:
       - *phil
       - *palla
 
+  # http://ci.aztec-labs.com/64a972aafaa40dd0
+  # ProvingBroker › Retries › does not retry if job is stale — kv-store closes
+  # before the broker's final reportProvingJobError write lands.
+  - regex: "prover-client/src/proving_broker/proving_broker.test.ts"
+    error_regex: "does not retry if job is stale|Store is closed"
+    owners:
+      - *alex
+
   # Nightly GKE tests
   - regex: "spartan/bootstrap.sh"
     owners:
@@ -284,11 +294,6 @@ tests:
     owners:
       - *palla
 
-  - regex: "bb-micro-bench/wasm/chonk build-wasm-threads/bin/chonk_bench"
-    error_regex: "core dumped"
-    owners:
-      - *adam
-
   - regex: "src/e2e_token_bridge_tutorial.test.ts"
     error_regex: "Error: Unable to find low leaf for block"
     owners:
diff --git a/AGENTS.md b/AGENTS.md
new file mode 100644
index 000000000000..7c665258297b
--- /dev/null
+++ b/AGENTS.md
@@ -0,0 +1,54 @@
+This repo uses CLAUDE.md files. When working in a module, look for the CLAUDE.md. *Immediately read the root ./CLAUDE.md here*.
+
+## Specialist subagents
+
+Domain-expert references under `.claude/agents/`:
+
+- `analyze-logs` — `.claude/agents/analyze-logs.md` — Deep-read test logs and extract relevant info; runs in a separate context to avoid polluting the main conversation.
+- `aztec-wallet` — `.claude/agents/aztec-wallet.md` — Execute cli-wallet commands against live Aztec networks (account setup, contract deployment, function calls, fee juice bridging).
+- `identify-ci-failures` — `.claude/agents/identify-ci-failures.md` — Identify CI failures from a PR number, CI URL, or log hash; returns a structured list of failures with downloaded log paths.
+- `network-logs` — `.claude/agents/network-logs.md` — Query GCP Cloud Logging for live Aztec network deployments (block production, proving status, errors).
+
+## Skills
+
+Task-specific workflows. When the user asks for one of these, read the matching `SKILL.md` (or `*.md` under `commands/`) and follow its instructions.
+
+Repo-wide (`.claude/skills/<name>/SKILL.md`):
+
+- `acir-formal-proofs` — Build/run ACIR formal proof tests with SMT verification; updates the README results table.
+- `adding-benchmarks` — Add new benchmarks to the CI pipeline (JSON files, `bootstrap.sh` wiring, `ci3.yml` upload).
+- `aztec-wallet` — Run `cli-wallet` against a live Aztec network: deploy contracts, send transactions, query state, bridge funds, manage accounts.
+- `backport` — Backport a merged PR to a release branch (e.g. `v4`, `v4-devnet-2`), resolving conflicts if needed.
+- `ci-logs` — Analyze CI logs from `ci.aztec-labs.com`. Use instead of `WebFetch` for CI URLs.
+- `cycle` — Show Linear issues for the current cycle, grouped by status.
+- `fix` — Analyze Linear issues, validate them against the codebase, and open draft fix PRs.
+- `merge-train-infra` — Reference for merge-train automation internals (workflows, scripts, CI integration).
+- `merge-trains` — Guide for working with merge-train branches: PR creation, base branch choice, labels, failure handling.
+- `network-logs` — Query and analyze logs from live Aztec network deployments on GCP Cloud Logging.
+- `noir-sync-update` — Follow-on updates after bumping the `noir/noir-repo` submodule (`Cargo.lock`, `yarn.lock`, etc.).
+- `release-docs` — Build and update the developer documentation site for a new release.
+- `release-network-docs` — Update network/operator documentation for a mainnet/testnet release without touching developer docs.
+- `update-doc-references` — Update documentation when source files it references change in a PR.
+- `updating-changelog` — Update changelog/migration notes for contract developers and node operators based on branch changes.
+
+Barretenberg-scoped (`barretenberg/.claude/skills/<name>/SKILL.md`):
+
+- `benchmark-chonk` — Run realistic Chonk (client IVC) benchmarks; native + WASM, per-circuit breakdowns, `BB_BENCH` instrumentation.
+- `profile-chonk` — Run Chonk prover on the remote EC2 and collect Perfetto-compatible traces with a one-click UI link.
+- `remote-bench` — Run benchmarks on the dedicated remote EC2 benchmarking machine (noise-free, single-run).
+- `stdlib-point-at-infinity` — Guidelines for handling point-at-infinity in stdlib circuit types (serialization, public inputs, `cycle_group`/`biggroup`).
+- `sumcheck` — Comprehensive reference for the Sumcheck protocol implementation in barretenberg (prover/verifier, relations, ZK sumcheck, ECCVM committed sumcheck).
+
+Yarn-project-scoped (`yarn-project/.claude/skills/<name>/SKILL.md`):
+
+- `debug-e2e` — Interactive ping-pong debugging for failed e2e tests; delegates log reading to subagents.
+- `fix-pr` — Autonomous workflow that fixes a failing PR by analyzing CI logs, rebasing, fixing, and pushing.
+- `read-gist` — Fetch and display a GitHub gist.
+- `readme-writer` — Guidelines for writing module READMEs that explain how a module works.
+- `rebase-pr` — Rebase a PR on its base branch, fix conflicts, and verify the build.
+- `unit-test-implementation` — Best practices for unit tests in the TS monorepo (mocking, organization, helpers, assertions).
+- `worktree-spawn` — Spawn an independent Claude instance in a git worktree to work on a task in parallel.
+
+Docs slash-commands (`docs/.claude/commands/<name>.md`):
+
+- `review-docs` — Review documentation for correctness, accuracy, and adherence to conventions.
diff --git a/SECURITY.md b/SECURITY.md
index 5dc0da97c908..1a10d07e7ece 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -6,9 +6,11 @@ We welcome external submissions in the meantime. To submit a vulnerability, plea
 
 ## Reporting Security Vulnerabilities
 
-- **Do not** open public GitHub issues or pull requests for suspected security vulnerabilities.
+Please use [Aztec Network Bug Bounty](https://cantina.xyz/bounties/80e74370-10d8-4e52-8e4b-7294deb7c9ee) to submit vulnerabilities. If the vulnerability is not in scope of the bug bounty program, please use the following procedure.
 
-Instead, please use the [Private Vulnerability Reporting](https://github.com/AztecProtocol/aztec-packages/security/advisories/new) process on GitHub. 
+**Do not** open public GitHub issues or pull requests for suspected security vulnerabilities.
+
+Instead, please use the [Private Vulnerability Reporting](https://github.com/AztecProtocol/aztec-packages/security/advisories/new) process on GitHub.
 
 - Navigate to the "Security" tab of this repository.
 - Click "Report a vulnerability" on the left sidebar.
diff --git a/avm-transpiler/Cargo.lock b/avm-transpiler/Cargo.lock
index 0766dd7b08a0..a99f3f100e89 100644
--- a/avm-transpiler/Cargo.lock
+++ b/avm-transpiler/Cargo.lock
@@ -790,9 +790,9 @@ checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
 
 [[package]]
 name = "ecdsa"
-version = "0.17.0-rc.16"
+version = "0.17.0-rc.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91bbdd377139884fafcad8dc43a760a3e1e681aa26db910257fa6535b70e1829"
+checksum = "54fb064faabbee66e1fc8e5c5a9458d4269dc2d8b638fe86a425adb2510d1a96"
 dependencies = [
  "der",
  "digest 0.11.2",
@@ -823,9 +823,9 @@ checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 
 [[package]]
 name = "elliptic-curve"
-version = "0.14.0-rc.29"
+version = "0.14.0-rc.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e84043d573efd4ac9d2d125817979a379204bf7e328b25a4a30487e8d100e618"
+checksum = "cda94f31325c4275e9706adecbb6f0650dee2f904c915a98e3d81adaaaa757aa"
 dependencies = [
  "base16ct",
  "crypto-bigint",
@@ -1177,9 +1177,9 @@ dependencies = [
 
 [[package]]
 name = "k256"
-version = "0.14.0-rc.8"
+version = "0.14.0-rc.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d2c6c227649d5ec80eaae541f1736232641a0bcdb3062a52b34edb42054158"
+checksum = "1b382cbfd43caf55991a93850ce538aa1aa67bb264af367d22dfe7937c4e997d"
 dependencies = [
  "cpubits",
  "ecdsa",
@@ -1435,9 +1435,9 @@ checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
 
 [[package]]
 name = "p256"
-version = "0.14.0-rc.8"
+version = "0.14.0-rc.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44f0a10fe314869359cb2901342b045f4e5a962ef9febc006f03d2a8c848fe4c"
+checksum = "8b97e3bf0465157ae90975ff52dbeb1362ba618924878c9f74c25baa27a65f9a"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -1481,9 +1481,9 @@ checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
 
 [[package]]
 name = "pkcs8"
-version = "0.11.0-rc.11"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12922b6296c06eb741b02d7b5161e3aaa22864af38dfa025a1a3ba3f68c84577"
+checksum = "451913da69c775a56034ea8d9003d27ee8948e12443eae7c038ba100a4f21cb7"
 dependencies = [
  "der",
  "spki",
@@ -1531,9 +1531,9 @@ dependencies = [
 
 [[package]]
 name = "primefield"
-version = "0.14.0-rc.8"
+version = "0.14.0-rc.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6543f5eec854fbf74ba5ef651fbdc9408919b47c3e1526623687135c16d12e9"
+checksum = "1b52e6ee42db392378a95622b463c9740631171d1efce43fa445a569c1600cb6"
 dependencies = [
  "crypto-bigint",
  "crypto-common 0.2.1",
@@ -1545,9 +1545,9 @@ dependencies = [
 
 [[package]]
 name = "primeorder"
-version = "0.14.0-rc.8"
+version = "0.14.0-rc.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "569d9ad6ef822bb0322c7e7d84e5e286244050bd5246cac4c013535ae91c2c90"
+checksum = "0556580e42c19833f5d232aca11a7687a503ee41f937b54f5ae1d50fc2a6a36a"
 dependencies = [
  "elliptic-curve",
 ]
@@ -1744,9 +1744,9 @@ checksum = "781442f29170c5c93b7185ad559492601acdc71d5bb0706f5868094f45cfcd08"
 
 [[package]]
 name = "rustcrypto-ff"
-version = "0.14.0-rc.0"
+version = "0.14.0-rc.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5db129183b2c139d7d87d08be57cba626c715789db17aec65c8866bfd767d1f"
+checksum = "fd2a8adb347447693cd2ba0d218c4b66c62da9b0a5672b17b981e4291ec65ff6"
 dependencies = [
  "rand_core 0.10.0",
  "subtle",
@@ -1754,9 +1754,9 @@ dependencies = [
 
 [[package]]
 name = "rustcrypto-group"
-version = "0.14.0-rc.0"
+version = "0.14.0-rc.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c4b1463f274a3ff6fb2f44da43e576cb9424367bd96f185ead87b52fe00523"
+checksum = "369f9b61aa45933c062c9f6b5c3c50ab710687eca83dd3802653b140b43f85ed"
 dependencies = [
  "rand_core 0.10.0",
  "rustcrypto-ff",
@@ -1978,9 +1978,9 @@ dependencies = [
 
 [[package]]
 name = "spki"
-version = "0.8.0-rc.4"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8baeff88f34ed0691978ec34440140e1572b68c7dd4a495fd14a3dc1944daa80"
+checksum = "1d9efca8738c78ee9484207732f728b1ef517bbb1833d6fc0879ca898a522f6f"
 dependencies = [
  "base64ct",
  "der",
diff --git a/aztec-up/README.md b/aztec-up/README.md
index e2f3ec2edbd8..5548356922b5 100644
--- a/aztec-up/README.md
+++ b/aztec-up/README.md
@@ -9,9 +9,14 @@ That is all.
 This will install into `~/.aztec/bin` a collection of scripts to help with running aztec containers, and will update
 the user's `PATH` variable in their shell startup script so they can be found.
 
-- `aztec` - a collection of tools to compile and test contracts, to launch subsystems and interact with the aztec network."
-- `aztec-up` - a tool to install and manage aztec toolchain versions."
-- `aztec-wallet` - our minimalistic CLI wallet"
+- `aztec` - compiles and tests contracts, launches infrastructure subsystems, interacts with the network.
+- `aztec-up` - a version manager for the Aztec toolchain.
+- `aztec-wallet` - a tool for interacting with the Aztec network.
+- `aztec-bb` - the Barretenberg proving backend.
+- `aztec-nargo` - the Noir compiler and simulator.
+- `aztec-forge`, `aztec-cast`, `aztec-anvil`, `aztec-chisel` - the bundled Foundry tools.
+
+Foundry, Noir, and Barretenberg are bundled at the versions `aztec` needs. Your own `forge` / `nargo` / `bb` installs still work under their bare names.
 
 After installed, you can use `aztec-up` to install specific versions.
 
diff --git a/aztec-up/bin/0.0.1/aztec-install b/aztec-up/bin/0.0.1/aztec-install
index 6d0321d49b71..1a5faaa4355e 100755
--- a/aztec-up/bin/0.0.1/aztec-install
+++ b/aztec-up/bin/0.0.1/aztec-install
@@ -94,12 +94,14 @@ function title {
   echo -e "Installing version: ${bold}${o}$VERSION${r}"
   echo
   echo -e "This script installs the following and updates your PATH if necessary:"
-  echo -e "  ${bold}${g}nargo${r}          - the noir programming language compiler and simulator."
-  echo -e "  ${bold}${g}noir-profiler${r}  - a profiler for analyzing and visualizing noir programs."
-  echo -e "  ${bold}${g}bb${r}             - the barretenberg proving backend."
   echo -e "  ${bold}${g}aztec${r}          - compiles and tests contracts, interacts with the network."
   echo -e "  ${bold}${g}aztec-up${r}       - installs and manages aztec toolchain versions."
   echo -e "  ${bold}${g}aztec-wallet${r}   - a minimalistic wallet cli."
+  echo -e "  ${bold}${g}aztec-bb${r}       - the barretenberg proving backend."
+  echo -e "  ${bold}${g}aztec-nargo${r}    - the noir compiler and simulator."
+  echo -e "  ${bold}${g}aztec-forge${r}, ${bold}${g}aztec-cast${r}, ${bold}${g}aztec-anvil${r}, ${bold}${g}aztec-chisel${r} - the bundled foundry tools."
+  echo
+  echo -e "Foundry, Noir, and Barretenberg are bundled at the versions ${bold}${g}aztec${r} needs. Your own ${bold}${g}forge${r} / ${bold}${g}nargo${r} / ${bold}${g}bb${r} installs still work under their bare names."
   echo
   read -p "Do you wish to continue? (Y/n) " -n 1 -r
   echo
diff --git a/aztec-up/bin/0.0.1/install b/aztec-up/bin/0.0.1/install
index 9d5b3f500871..6f3dfadfedf9 100755
--- a/aztec-up/bin/0.0.1/install
+++ b/aztec-up/bin/0.0.1/install
@@ -37,6 +37,12 @@ export FORCE_COLOR=1
 # Version-specific paths
 version_path="$AZTEC_HOME/versions/$VERSION"
 version_bin_path="$version_path/bin"
+# Native binaries (forge/nargo/anvil/...) live here and are NOT on the user's PATH.
+# The aztec wrapper prepends this directory to its child PATH so subprocesses
+# spawned from the aztec workflow (which call sibling tools by basename) resolve
+# to the bundled binaries. User-facing access is only via the aztec-* symlinks
+# in version_bin_path.
+version_internal_bin_path="$version_path/internal-bin"
 
 os="$(uname -s)"
 
@@ -137,7 +143,15 @@ function install_noir {
   set -euo pipefail
 
   if [[ -n ${NARGO:-} ]]; then
-    cp "$NARGO" "$version_bin_path/nargo"
+    cp "$NARGO" "$version_internal_bin_path/nargo"
+    # noir's release build co-locates `noir-profiler` next to `nargo`
+    # (see noir/bootstrap.sh::build_native). Copy it too so the
+    # `aztec-noir-profiler` symlink in install_native_symlinks resolves.
+    local nargo_dir
+    nargo_dir=$(dirname "$NARGO")
+    if [ -f "$nargo_dir/noir-profiler" ]; then
+      cp "$nargo_dir/noir-profiler" "$version_internal_bin_path/noir-profiler"
+    fi
   else
     local noir_version
     noir_version=$(get_version "noir")
@@ -150,13 +164,12 @@ function install_noir {
     # Always install/update noirup
     curl -Ls https://raw.githubusercontent.com/noir-lang/noirup/refs/heads/main/install | bash
 
-    # Install noir to temp location and move to version directory
+    # Install noir to temp location and move into internal-bin (off PATH).
     NARGO_HOME="$temp_nargo_home" "$HOME/.nargo/bin/noirup" -v "$noir_version"
 
-    # Move the nargo binary to our version bin directory
-    mv "$temp_nargo_home/bin/nargo" "$version_bin_path/nargo"
+    mv "$temp_nargo_home/bin/nargo" "$version_internal_bin_path/nargo"
     # Also move noir-profiler, needed by `aztec profile flamegraph`
-    mv "$temp_nargo_home/bin/noir-profiler" "$version_bin_path/noir-profiler"
+    mv "$temp_nargo_home/bin/noir-profiler" "$version_internal_bin_path/noir-profiler"
 
     # Cleanup temp directory
     rm -rf "$temp_nargo_home"
@@ -173,16 +186,20 @@ function install_foundry {
   temp_foundry_dir=$(mktemp -d) || { echo "Error: Failed to create temp directory" >&2; exit 1; }
   mkdir -p "$temp_foundry_dir/bin"
 
-  # Always install/update foundryup
-  curl --max-time 30 -L https://foundry.paradigm.xyz | bash
+  # The foundry installer defaults to $XDG_CONFIG_HOME/.foundry when that var is set, which
+  # puts foundryup somewhere we don't expect. We'll pin FOUNDRY_DIR so we control the install
+  # location regardless of the caller's environment.
+  local foundry_home="$HOME/.foundry"
+  FOUNDRY_DIR="$foundry_home" curl --max-time 30 -L https://foundry.paradigm.xyz | FOUNDRY_DIR="$foundry_home" bash
 
   # Install foundry to temp location and move to version directory
-  FOUNDRY_DIR="$temp_foundry_dir" timeout 30 "$HOME/.foundry/bin/foundryup" -i "$foundry_version"
+  FOUNDRY_DIR="$temp_foundry_dir" timeout 30 "$foundry_home/bin/foundryup" -i "$foundry_version"
 
-  # Move the foundry binaries to our version bin directory
+  # Move the foundry binaries into internal-bin (off PATH); aztec-forge etc.
+  # symlinks in version_bin_path expose them under aztec-prefixed names.
   for binary in forge cast anvil chisel; do
     if [ -f "$temp_foundry_dir/bin/$binary" ]; then
-      mv "$temp_foundry_dir/bin/$binary" "$version_bin_path/$binary"
+      mv "$temp_foundry_dir/bin/$binary" "$version_internal_bin_path/$binary"
     fi
   done
 
@@ -197,32 +214,88 @@ function install_aztec_packages {
   npm install @aztec/aztec@$VERSION @aztec/cli-wallet@$VERSION @aztec/bb.js@$VERSION --prefix "$version_path"
 }
 
-function symlink_aztec_bins {
+# Expose every native tool in internal-bin under an aztec-<tool> symlink in bin.
+# Bare `forge`/`nargo`/etc. are intentionally NOT on PATH so they cannot shadow
+# user-installed tools.
+function install_native_symlinks {
+  set -euo pipefail
+  local tool
+  for tool in forge cast anvil chisel nargo noir-profiler; do
+    if [ ! -e "$version_internal_bin_path/$tool" ]; then
+      echo "Error: expected bundled binary '$tool' missing from $version_internal_bin_path" >&2
+      exit 1
+    fi
+    ln -sfn "../internal-bin/$tool" "$version_bin_path/aztec-$tool"
+  done
+}
+
+# Npm bins are NOT mirrored into internal-bin. The contract for any TS tool
+# that needs to spawn a sibling binary is to resolve an absolute bundled
+# path itself (e.g. via @aztec/bb.js findBbBinary(), or a BB-style env
+# var) -- never by basename + PATH lookup. If you find yourself wanting to
+# add an npm bin to internal-bin so a child process can find it on PATH,
+# fix the caller instead of broadening this list.
+function install_npm_bin_symlinks {
   set -euo pipefail
-  # Populate version_bin_path with symlinks to @aztec-owned bins only. Adding
-  # node_modules/.bin wholesale to PATH would shadow user-installed tools
-  # (jest, tsc, semver, ...) with Aztec's transitive dependencies.
   local npm_bin_dir="$version_path/node_modules/.bin"
   [ -d "$npm_bin_dir" ] || return 0
 
-  local bin_link bin_name target
+  local bin_link bin_name target link_name
   for bin_link in "$npm_bin_dir"/*; do
     [ -L "$bin_link" ] || continue
     target=$(readlink "$bin_link")
     # npm writes relative symlinks like ../@aztec/aztec/... for scoped packages.
     [[ "$target" == ../@aztec/* ]] || continue
     bin_name=$(basename "$bin_link")
-    if [ -e "$version_bin_path/$bin_name" ] && [ ! -L "$version_bin_path/$bin_name" ]; then
-      echo_yellow "refusing to overwrite non-symlink $bin_name; @aztec package bin collides with a hand-installed toolchain binary" >&2
+
+    # `aztec` is a wrapper, written by install_aztec_wrapper.
+    [[ "$bin_name" == "aztec" ]] && continue
+
+    # Already prefixed (e.g. aztec-wallet) keeps its name; everything else gets
+    # renamed to aztec-<orig> so it cannot shadow a user-installed binary.
+    if [[ "$bin_name" == aztec-* ]]; then
+      link_name="$bin_name"
+    else
+      link_name="aztec-$bin_name"
+    fi
+
+    if [ -e "$version_bin_path/$link_name" ] && [ ! -L "$version_bin_path/$link_name" ]; then
+      echo_yellow "refusing to overwrite non-symlink $link_name; @aztec package bin collides with a hand-installed toolchain binary" >&2
       exit 1
     fi
-    ln -sfn "../node_modules/.bin/$bin_name" "$version_bin_path/$bin_name"
+    ln -sfn "../node_modules/.bin/$bin_name" "$version_bin_path/$link_name"
   done
 }
 
+# Wrapper for `aztec`: prepends internal-bin to PATH so the aztec workflow
+# resolves bundled native tools by basename. yarn-project/aztec/scripts/aztec.sh
+# (the npm bin entry of @aztec/aztec) calls bare `nargo` (line 36, in `aztec
+# test`) and bare `anvil` (line 55-56, in `aztec start --local-network`); the
+# TS commands it spawns also fall back to bare `forge` / `nargo` /
+# `noir-profiler` when their respective env vars are unset. The wrapper is
+# kept minimal -- it is the only place we maintain a PATH-based execution
+# context, by design (see install_npm_bin_symlinks for the rationale).
+# BASH_SOURCE[0] (not $0) so PATH-name invocation still resolves internal-bin
+# from the wrapper's actual location.
+function install_aztec_wrapper {
+  set -euo pipefail
+  local wrapper="$version_bin_path/aztec"
+  cat > "$wrapper" <<'EOF'
+#!/usr/bin/env bash
+# Auto-generated by aztec-up. Do not edit.
+set -euo pipefail
+self_dir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
+internal_bin="$self_dir/../internal-bin"
+export PATH="$internal_bin:$PATH"
+exec "$self_dir/../node_modules/.bin/aztec" "$@"
+EOF
+  chmod +x "$wrapper"
+}
+
 function main {
-  # Create version directory
+  # Create version directories. bin/ is exposed on PATH; internal-bin/ is not.
   mkdir -p "$version_bin_path"
+  mkdir -p "$version_internal_bin_path"
 
   # Download versions manifest
   echo -n "Installing version manifest... "
@@ -247,14 +320,23 @@ function main {
   dump_fail retry install_foundry
   echo_green "done."
 
+  # Expose native tools as aztec-forge / aztec-nargo / etc.
+  echo -n "Linking aztec native tools... "
+  dump_fail install_native_symlinks
+  echo_green "done."
+
   # Install aztec npm packages
-  echo -n "Installing aztec packages... "
+  echo -n "Installing aztec npm packages... "
   dump_fail retry install_aztec_packages
   echo_green "done."
 
-  # Expose only @aztec-owned bins on PATH (drops transitive npm deps).
+  # Expose @aztec-owned npm bins under aztec-prefixed symlinks. Bare names
+  # (bb, pxe, txe, ...) are intentionally NOT exposed as they would shadow
+  # user-installed tools.
   echo -n "Making aztec commands available... "
-  dump_fail retry symlink_aztec_bins
+  dump_fail install_npm_bin_symlinks
+  # Wrap `aztec` so its subprocesses see internal-bin on PATH.
+  dump_fail install_aztec_wrapper
   echo_green "done."
 }
 
diff --git a/aztec-up/bootstrap.sh b/aztec-up/bootstrap.sh
index c9bb4139611b..dad8802868d8 100755
--- a/aztec-up/bootstrap.sh
+++ b/aztec-up/bootstrap.sh
@@ -106,7 +106,7 @@ EOF
 }
 
 function test_cmds {
-  for test in amm_flow bridge_and_claim basic_install counter_contract default_scaffold; do
+  for test in amm_flow bridge_and_claim basic_install counter_contract default_scaffold no_shadow_user_bins; do
     echo "$hash:TIMEOUT=15m aztec-up/scripts/run_test.sh $test"
   done
 }
@@ -236,8 +236,8 @@ function install_on_mac_vm {
     . "\$HOME/.nvm/nvm.sh"
 
     # Verify installation.
-    nargo --version
-    bb --version
+    aztec-nargo --version
+    aztec-bb --version
     aztec --version
 REMOTE_EOF
 }
diff --git a/aztec-up/scripts/run_isolated_test.sh b/aztec-up/scripts/run_isolated_test.sh
index 970724ec1871..b6615a7aac43 100755
--- a/aztec-up/scripts/run_isolated_test.sh
+++ b/aztec-up/scripts/run_isolated_test.sh
@@ -98,9 +98,9 @@ EOF
   echo "Version information:"
 
   bash -i -c -e '
-    forge --version
+    aztec-forge --version
     echo
-    nargo --version
+    aztec-nargo --version
     echo
     echo -n "aztec version: "
     aztec --version
diff --git a/aztec-up/test/full-dev-path/README.md b/aztec-up/test/aztec-cli-acceptance-test/README.md
similarity index 68%
rename from aztec-up/test/full-dev-path/README.md
rename to aztec-up/test/aztec-cli-acceptance-test/README.md
index fa3ef2896770..f37c307d6418 100644
--- a/aztec-up/test/full-dev-path/README.md
+++ b/aztec-up/test/aztec-cli-acceptance-test/README.md
@@ -1,6 +1,6 @@
-# Full Dev Path Test
+# Aztec CLI Acceptance Test
 
-Tests that the installed Aztec toolchain works end-to-end. Exercises the complete developer onboarding path:
+Tests that the installed Aztec CLI toolchain works end-to-end. Exercises the complete developer onboarding path:
 
 1. `aztec init` - scaffold a new workspace with a Counter contract and test crate
 2. `aztec compile` - compile the scaffolded contract
@@ -30,6 +30,6 @@ VERSION=4.3.0 ./run-test.sh
 
 ## Architecture
 
-- **`run-test.sh`** - Bash launcher. Runs the aztec installer (unless skipped), sets up PATH, then `exec node full-dev-path.ts`.
-- **`full-dev-path.ts`** - Orchestrator. Runs each CLI step against the installed toolchain and, after codegen, copies `counter.test.ts` into the scaffolded workspace and spawns `node --test` on it. Each phase is wrapped in `step(name, fn)` so failures clearly identify which step broke. Always emits a machine-readable result line for CI/Slack integration: `TEST_RESULT=pass version=...` on success, or `TEST_RESULT=fail step=... version=... error="..."` on failure (with a full banner printed above it).
+- **`run-test.sh`** - Bash launcher. Runs the aztec installer (unless skipped), sets up PATH, then `exec node aztec-cli-acceptance-test.ts`.
+- **`aztec-cli-acceptance-test.ts`** - Orchestrator. Runs each CLI step against the installed toolchain and, after codegen, copies `counter.test.ts` into the scaffolded workspace and spawns `node --test` on it. Each phase is wrapped in `step(name, fn)` so failures clearly identify which step broke. Always emits a machine-readable result line for CI/Slack integration: `TEST_RESULT=pass version=...` on success, or `TEST_RESULT=fail step=... version=... error="..."` on failure (with a full banner printed above it).
 - **`counter.test.ts`** - The `node:test` suite that drives the deployed Counter end-to-end through the codegen'd bindings. Lives here as a template; copied into the workspace at test time so it can statically `import { CounterContract } from './artifacts/Counter.js'` with real codegen types and resolve `@aztec/*` via the workspace's `node_modules` symlink to the install.
diff --git a/aztec-up/test/full-dev-path/full-dev-path.ts b/aztec-up/test/aztec-cli-acceptance-test/aztec-cli-acceptance-test.ts
similarity index 60%
rename from aztec-up/test/full-dev-path/full-dev-path.ts
rename to aztec-up/test/aztec-cli-acceptance-test/aztec-cli-acceptance-test.ts
index 93c7eaa8fb0c..0b59db12d893 100644
--- a/aztec-up/test/full-dev-path/full-dev-path.ts
+++ b/aztec-up/test/aztec-cli-acceptance-test/aztec-cli-acceptance-test.ts
@@ -13,7 +13,7 @@
 // Every phase is wrapped in step(name, ...). The script always emits a `TEST_RESULT=pass|fail ...` line for CI
 // parsing; on failure it also prints a banner identifying the step that failed.
 
-import { execFileSync, spawn } from 'node:child_process';
+import { execFileSync, spawn } from "node:child_process";
 import {
   closeSync,
   copyFileSync,
@@ -25,35 +25,39 @@ import {
   readFileSync,
   rmSync,
   symlinkSync,
-} from 'node:fs';
-import { tmpdir } from 'node:os';
-import { dirname, join, resolve } from 'node:path';
-import { fileURLToPath } from 'node:url';
-import { setTimeout as delay } from 'node:timers/promises';
+} from "node:fs";
+import { tmpdir } from "node:os";
+import { dirname, join, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+import { setTimeout as delay } from "node:timers/promises";
 
 const NODE_PORT = 8080;
 const LOCAL_NETWORK_READY_TIMEOUT_MS = 600_000; // 10 minutes
 const POLL_INTERVAL_MS = 2000; // 2 seconds
 
 const SCRIPT_DIR = dirname(fileURLToPath(import.meta.url));
-const COUNTER_TEST_TEMPLATE = join(SCRIPT_DIR, 'counter.test.ts');
+const COUNTER_TEST_TEMPLATE = join(SCRIPT_DIR, "counter.test.ts");
 
 // Defaults to ~/.aztec/current (the symlink aztec-up maintains); fails if no package.json is found there.
-const AZTEC_INSTALL_DIR = process.env.AZTEC_INSTALL_DIR ?? join(process.env.HOME ?? '', '.aztec/current');
-if (!existsSync(join(AZTEC_INSTALL_DIR, 'package.json'))) {
-  console.error(`FATAL: AZTEC_INSTALL_DIR does not point at an installed aztec: ${AZTEC_INSTALL_DIR}`);
+const AZTEC_INSTALL_DIR =
+  process.env.AZTEC_INSTALL_DIR ??
+  join(process.env.HOME ?? "", ".aztec/current");
+if (!existsSync(join(AZTEC_INSTALL_DIR, "package.json"))) {
+  console.error(
+    `FATAL: AZTEC_INSTALL_DIR does not point at an installed aztec: ${AZTEC_INSTALL_DIR}`,
+  );
   process.exit(2);
 }
 
-const TMP_DIR = mkdtempSync(join(tmpdir(), 'aztec-full-dev-path-'));
-const WORKSPACE_DIR = join(TMP_DIR, 'my_workspace');
+const TMP_DIR = mkdtempSync(join(tmpdir(), "aztec-cli-acceptance-test-"));
+const WORKSPACE_DIR = join(TMP_DIR, "my_workspace");
 
 // Exit codes follow the Unix 128+signal convention for signal terminations.
-process.on('SIGINT', () => {
+process.on("SIGINT", () => {
   leaveTmpDirForInspection();
   process.exit(130);
 });
-process.on('SIGTERM', () => {
+process.on("SIGTERM", () => {
   leaveTmpDirForInspection();
   process.exit(143);
 });
@@ -76,8 +80,8 @@ if (result.ok) {
 
 async function main(): Promise<RunResult> {
   log(`Working in ${TMP_DIR}`);
-  let stepName = '<startup>';
-  let aztecVersion = 'unknown';
+  let stepName = "<startup>";
+  let aztecVersion = "unknown";
 
   async function step<T>(name: string, fn: () => T | Promise<T>): Promise<T> {
     stepName = name;
@@ -89,21 +93,36 @@ async function main(): Promise<RunResult> {
   }
 
   try {
-    aztecVersion = await step('Checking installed tool versions', logVersions);
-    await step('Scaffolding new workspace (aztec init)', scaffoldWorkspace);
-    await step('Verifying scaffold structure', assertScaffold);
-    await step('Compiling contract (aztec compile)', () => run('aztec', ['compile'], WORKSPACE_DIR));
-
-    const artifactPath = await step('Locating compiled artifact', locateArtifact);
+    aztecVersion = await step("Checking installed tool versions", logVersions);
+    await step("Scaffolding new workspace (aztec init)", scaffoldWorkspace);
+    await step("Verifying scaffold structure", assertScaffold);
+    await step("Compiling contract (aztec compile)", () =>
+      run("aztec", ["compile"], WORKSPACE_DIR),
+    );
+
+    const artifactPath = await step(
+      "Locating compiled artifact",
+      locateArtifact,
+    );
     log(`    artifact at ${artifactPath}`);
 
-    await step('Running TXE tests (aztec test)', () => run('aztec', ['test'], WORKSPACE_DIR));
+    await step("Running TXE tests (aztec test)", () =>
+      run("aztec", ["test"], WORKSPACE_DIR),
+    );
 
-    await step('Starting local sandbox (aztec start --local-network)', startLocalNetwork);
+    await step(
+      "Starting local sandbox (aztec start --local-network)",
+      startLocalNetwork,
+    );
 
-    await step('Generating TypeScript bindings (aztec codegen)', () => codegen(artifactPath));
+    await step("Generating TypeScript bindings (aztec codegen)", () =>
+      codegen(artifactPath),
+    );
 
-    await step('Running TypeScript end-to-end test (node --test)', runTsEndToEndTest);
+    await step(
+      "Running TypeScript end-to-end test (node --test)",
+      runTsEndToEndTest,
+    );
     return { ok: true, aztecVersion };
   } catch (error) {
     return { ok: false, stepName, aztecVersion, error };
@@ -113,16 +132,18 @@ async function main(): Promise<RunResult> {
 function scaffoldWorkspace() {
   // aztec init scaffolds in pwd and uses the directory name as the package name; create the dir first.
   mkdirSync(WORKSPACE_DIR, { recursive: true });
-  run('aztec', ['init'], WORKSPACE_DIR);
+  run("aztec", ["init"], WORKSPACE_DIR);
 }
 
 function logVersions(): string {
-  log('Tool versions:');
-  let aztecVersion = 'unknown';
-  for (const cmd of ['aztec', 'nargo', 'bb', 'aztec-wallet']) {
-    const version = execFileSync(cmd, ['--version'], { encoding: 'utf8' }).trim().split('\n')[0];
+  log("Tool versions:");
+  let aztecVersion = "unknown";
+  for (const cmd of ["aztec", "aztec-nargo", "aztec-bb", "aztec-wallet"]) {
+    const version = execFileSync(cmd, ["--version"], { encoding: "utf8" })
+      .trim()
+      .split("\n")[0];
     console.log(`  ${cmd}: ${version}`);
-    if (cmd === 'aztec') {
+    if (cmd === "aztec") {
       aztecVersion = version;
     }
   }
@@ -131,9 +152,9 @@ function logVersions(): string {
 
 function assertScaffold() {
   // aztec init scaffolds a workspace with `<name>_contract/` (Counter) and `<name>_test/` crates.
-  const packageName = 'my_workspace';
+  const packageName = "my_workspace";
   const required = [
-    'Nargo.toml',
+    "Nargo.toml",
     `${packageName}_contract/Nargo.toml`,
     `${packageName}_contract/src/main.nr`,
     `${packageName}_test/Nargo.toml`,
@@ -148,32 +169,34 @@ function assertScaffold() {
 }
 
 function locateArtifact(): string {
-  const matches = globSync('**/target/*-Counter.json', { cwd: WORKSPACE_DIR });
+  const matches = globSync("**/target/*-Counter.json", { cwd: WORKSPACE_DIR });
   if (matches.length === 0) {
-    fail('compiled Counter artifact not found under target/');
+    fail("compiled Counter artifact not found under target/");
   }
   if (matches.length > 1) {
-    fail(`expected one Counter artifact, found ${matches.length}: ${matches.join(', ')}`);
+    fail(
+      `expected one Counter artifact, found ${matches.length}: ${matches.join(", ")}`,
+    );
   }
   return resolve(WORKSPACE_DIR, matches[0]);
 }
 
 async function startLocalNetwork(): Promise<void> {
-  const logPath = join(TMP_DIR, 'local_network.log');
-  const logFd = openSync(logPath, 'a');
-  const proc = spawn('aztec', ['start', '--local-network'], {
+  const logPath = join(TMP_DIR, "local_network.log");
+  const logFd = openSync(logPath, "a");
+  const proc = spawn("aztec", ["start", "--local-network"], {
     cwd: TMP_DIR,
-    stdio: ['ignore', logFd, logFd],
-    env: { ...process.env, LOG_LEVEL: 'silent', PXE_PROVER: 'none' },
+    stdio: ["ignore", logFd, logFd],
+    env: { ...process.env, LOG_LEVEL: "silent", PXE_PROVER: "none" },
   });
   closeSync(logFd);
   log(`    local-network pid=${proc.pid}, log=${logPath}`);
 
   // Kill the network on process exit (including SIGINT/SIGTERM via the signal handlers).
-  process.on('exit', () => {
+  process.on("exit", () => {
     if (proc.exitCode === null) {
       try {
-        proc.kill('SIGTERM');
+        proc.kill("SIGTERM");
       } catch {}
     }
   });
@@ -182,16 +205,20 @@ async function startLocalNetwork(): Promise<void> {
   while (true) {
     if (proc.exitCode !== null) {
       dumpTail(logPath);
-      fail(`local-network exited early with code ${proc.exitCode} (see ${logPath})`);
+      fail(
+        `local-network exited early with code ${proc.exitCode} (see ${logPath})`,
+      );
     }
     if (Date.now() > deadline) {
       dumpTail(logPath);
-      fail(`timed out after ${msToSecs(LOCAL_NETWORK_READY_TIMEOUT_MS)}s waiting for local-network /status (see ${logPath})`);
+      fail(
+        `timed out after ${msToSecs(LOCAL_NETWORK_READY_TIMEOUT_MS)}s waiting for local-network /status (see ${logPath})`,
+      );
     }
     try {
       const res = await fetch(`http://localhost:${NODE_PORT}/status`);
       if (res.ok) {
-        log('    local-network ready');
+        log("    local-network ready");
         return;
       }
     } catch {
@@ -202,11 +229,11 @@ async function startLocalNetwork(): Promise<void> {
 }
 
 function codegen(artifactPath: string) {
-  const artifactsOutDir = join(WORKSPACE_DIR, 'artifacts');
+  const artifactsOutDir = join(WORKSPACE_DIR, "artifacts");
   mkdirSync(artifactsOutDir, { recursive: true });
-  const targetDir = resolve(artifactPath, '..');
-  run('aztec', ['codegen', targetDir, '-o', artifactsOutDir], WORKSPACE_DIR);
-  const codegenTs = join(artifactsOutDir, 'Counter.ts');
+  const targetDir = resolve(artifactPath, "..");
+  run("aztec", ["codegen", targetDir, "-o", artifactsOutDir], WORKSPACE_DIR);
+  const codegenTs = join(artifactsOutDir, "Counter.ts");
   if (!existsSync(codegenTs)) {
     fail(`codegen did not emit Counter.ts (wrote to ${artifactsOutDir})`);
   }
@@ -215,23 +242,26 @@ function codegen(artifactPath: string) {
 function runTsEndToEndTest() {
   // Point the workspace at the installed node_modules so @aztec/* imports (and transitive deps
   // of the codegen'd Counter.ts) resolve to the same bundle a real user would have.
-  const modulesLink = join(WORKSPACE_DIR, 'node_modules');
+  const modulesLink = join(WORKSPACE_DIR, "node_modules");
   if (!existsSync(modulesLink)) {
-    symlinkSync(join(AZTEC_INSTALL_DIR, 'node_modules'), modulesLink, 'dir');
+    symlinkSync(join(AZTEC_INSTALL_DIR, "node_modules"), modulesLink, "dir");
   }
-  const testDest = join(WORKSPACE_DIR, 'counter.test.ts');
+  const testDest = join(WORKSPACE_DIR, "counter.test.ts");
   copyFileSync(COUNTER_TEST_TEMPLATE, testDest);
 
-  run('node', ['--no-warnings', '--test', testDest], WORKSPACE_DIR);
+  run("node", ["--no-warnings", "--test", testDest], WORKSPACE_DIR);
 }
 
 function reportFailure(stepName: string, aztecVersion: string, err: unknown) {
   const message = err instanceof Error ? err.message : String(err);
-  const childExit = typeof (err as { status?: unknown })?.status === 'number' ? (err as { status: number }).status : undefined;
-  const banner = '='.repeat(72);
+  const childExit =
+    typeof (err as { status?: unknown })?.status === "number"
+      ? (err as { status: number }).status
+      : undefined;
+  const banner = "=".repeat(72);
 
   console.error(`\n${banner}`);
-  console.error('FULL DEV PATH TEST FAILED');
+  console.error("AZTEC CLI ACCEPTANCE TEST FAILED");
   console.error(banner);
   console.error(`Step:        ${stepName}`);
   console.error(`Version:     ${aztecVersion}`);
@@ -241,13 +271,15 @@ function reportFailure(stepName: string, aztecVersion: string, err: unknown) {
   console.error(`Tmp dir:     ${TMP_DIR}`);
   console.error(`Error:       ${message}`);
   if (err instanceof Error && err.stack) {
-    console.error('');
+    console.error("");
     console.error(err.stack);
   }
   console.error(banner);
-  const safeStep = stepName.replace(/\s+/g, '_');
-  const safeError = message.replace(/[\r\n]+/g, ' ').slice(0, 240);
-  console.log(`TEST_RESULT=fail step=${safeStep} version=${aztecVersion} error="${safeError}"`);
+  const safeStep = stepName.replace(/\s+/g, "_");
+  const safeError = message.replace(/[\r\n]+/g, " ").slice(0, 240);
+  console.log(
+    `TEST_RESULT=fail step=${safeStep} version=${aztecVersion} error="${safeError}"`,
+  );
 }
 
 function msToSecs(ms: number): string {
@@ -255,7 +287,7 @@ function msToSecs(ms: number): string {
 }
 
 function run(cmd: string, args: string[], cwd: string) {
-  execFileSync(cmd, args, { cwd, stdio: 'inherit' });
+  execFileSync(cmd, args, { cwd, stdio: "inherit" });
 }
 
 function log(msg: string) {
@@ -276,7 +308,9 @@ function dumpTail(path: string, lines = 100) {
   }
   console.error(`--- last ${lines} lines of ${path} ---`);
   try {
-    console.error(readFileSync(path, 'utf8').split('\n').slice(-lines).join('\n'));
+    console.error(
+      readFileSync(path, "utf8").split("\n").slice(-lines).join("\n"),
+    );
   } catch {
     console.error(`(failed to read ${path})`);
   }
diff --git a/aztec-up/test/full-dev-path/counter.test.ts b/aztec-up/test/aztec-cli-acceptance-test/counter.test.ts
similarity index 100%
rename from aztec-up/test/full-dev-path/counter.test.ts
rename to aztec-up/test/aztec-cli-acceptance-test/counter.test.ts
diff --git a/aztec-up/test/full-dev-path/run-test.sh b/aztec-up/test/aztec-cli-acceptance-test/run-test.sh
similarity index 87%
rename from aztec-up/test/full-dev-path/run-test.sh
rename to aztec-up/test/aztec-cli-acceptance-test/run-test.sh
index 52e79d56a2a9..2ea5413c43fd 100755
--- a/aztec-up/test/full-dev-path/run-test.sh
+++ b/aztec-up/test/aztec-cli-acceptance-test/run-test.sh
@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
-# Launcher for the full-dev-path test.
+# Launcher for the Aztec CLI acceptance test.
 #
 # Steps:
 #   1. Install Node via NVM if not present (skipped with SKIP_INSTALL=1)
 #   2. Install the Aztec toolchain via the public installer (skipped with SKIP_INSTALL=1)
-#   3. Run full-dev-path.ts which exercises the installed toolchain end-to-end
+#   3. Run aztec-cli-acceptance-test.ts which exercises the installed toolchain end-to-end
 #
 # Env vars:
 #   SKIP_INSTALL=1      Skip steps 1-2 and use the already-installed toolchain (dev-box inner loop).
@@ -37,4 +37,4 @@ export PATH="$HOME/.aztec/current/bin:$HOME/.aztec/bin:$PATH"
 export AZTEC_INSTALL_DIR="${AZTEC_INSTALL_DIR:-$HOME/.aztec/current}"
 
 echo ">>> Running test"
-exec node --no-warnings "${script_dir}/full-dev-path.ts"
+exec node --no-warnings "${script_dir}/aztec-cli-acceptance-test.ts"
diff --git a/aztec-up/test/basic_install.sh b/aztec-up/test/basic_install.sh
index b7973431f612..497aeda2b873 100755
--- a/aztec-up/test/basic_install.sh
+++ b/aztec-up/test/basic_install.sh
@@ -2,8 +2,8 @@
 set -euo pipefail
 
 echo
-echo "nargo version: $(nargo --version | head -1 | cut -d' ' -f4)"
-echo "bb version: $(bb --version)"
+echo "nargo version: $(aztec-nargo --version | head -1 | cut -d' ' -f4)"
+echo "bb version: $(aztec-bb --version)"
 echo "aztec version: $(aztec --version)"
 echo "aztec-wallet version: $(aztec-wallet --version)"
 echo
diff --git a/aztec-up/test/no_shadow_user_bins.sh b/aztec-up/test/no_shadow_user_bins.sh
new file mode 100755
index 000000000000..cb0bfec5273c
--- /dev/null
+++ b/aztec-up/test/no_shadow_user_bins.sh
@@ -0,0 +1,82 @@
+#!/usr/bin/env bash
+# Regression test: nothing the aztec installer ships is exposed under a
+# bare name on PATH. Every entry in $HOME/.aztec/current/bin is `aztec` or
+# `aztec-*`. Native binaries live in current/internal-bin (off PATH) and are
+# reachable only via the `aztec-*` symlinks or via the `aztec` wrapper, which
+# prepends internal-bin to PATH for its subprocesses.
+set -euo pipefail
+
+aztec_bin="$HOME/.aztec/current/bin"
+
+# Names this test exercises. Pre-create user-installed sentinel shims that
+# print known strings, then assert bare names resolve to them after install
+# (i.e. NOT shadowed by aztec). The shim directory comes AFTER the aztec bin
+# on PATH, mirroring a realistic user setup where the shell PATH update was
+# the last step. Names cover every bare bin the installer used to expose.
+shadow_targets=(
+  forge cast anvil chisel
+  nargo noir-profiler noir-codegen
+  bb bb-cli
+  pxe txe validator-client blob-client
+)
+user_bin="$HOME/.local/bin"
+mkdir -p "$user_bin"
+for tool in "${shadow_targets[@]}"; do
+  printf '#!/usr/bin/env bash\necho "user-%s"\n' "$tool" > "$user_bin/$tool"
+  chmod +x "$user_bin/$tool"
+done
+export PATH="$PATH:$user_bin"
+
+# Bins known to support --version cleanly under the new (aztec-prefixed) layout.
+runs_version=(aztec aztec-forge aztec-cast aztec-anvil aztec-chisel aztec-nargo aztec-noir-profiler)
+
+function assert_no_shadowing {
+  local tool resolved
+  for tool in "${shadow_targets[@]}"; do
+    resolved=$(command -v "$tool")
+    if [[ "$resolved" == "$HOME/.aztec/"* ]]; then
+      echo "FAIL: bare '$tool' shadowed by aztec at $resolved"
+      exit 1
+    fi
+    if [[ "$("$tool")" != "user-$tool" ]]; then
+      echo "FAIL: bare '$tool' did not invoke user shim"
+      exit 1
+    fi
+  done
+}
+
+function assert_bin_only_aztec_prefixed {
+  local entry name
+  for entry in "$aztec_bin"/*; do
+    [ -e "$entry" ] || continue
+    name=$(basename "$entry")
+    if [[ "$name" != "aztec" && "$name" != aztec-* ]]; then
+      echo "FAIL: bare-named entry in $aztec_bin: $name"
+      exit 1
+    fi
+  done
+}
+
+function assert_aztec_bins_run {
+  local name resolved
+  for name in "${runs_version[@]}"; do
+    if ! resolved=$(command -v "$name"); then
+      echo "FAIL: $name not on PATH"
+      exit 1
+    fi
+    if [[ "$resolved" != "$HOME/.aztec/"* ]]; then
+      echo "FAIL: $name resolves outside aztec ($resolved)"
+      exit 1
+    fi
+    if ! "$name" --version >/dev/null 2>&1; then
+      echo "FAIL: $name --version exited non-zero"
+      exit 1
+    fi
+  done
+}
+
+assert_no_shadowing
+assert_bin_only_aztec_prefixed
+assert_aztec_bins_run
+
+echo "PASS: aztec installer does not shadow user binaries"
diff --git a/barretenberg/.claude/skills/benchmark-chonk/SKILL.md b/barretenberg/.claude/skills/benchmark-chonk/SKILL.md
index ec480bcf79a0..07afa48c2bbe 100644
--- a/barretenberg/.claude/skills/benchmark-chonk/SKILL.md
+++ b/barretenberg/.claude/skills/benchmark-chonk/SKILL.md
@@ -6,16 +6,9 @@ argument-hint: <action> e.g. "run", "compare", "wasm", "instrument <area>", "per
 
 # Benchmark Chonk
 
-Run realistic Chonk IVC benchmarks using **pinned protocol inputs** (real transaction flows captured from end-to-end tests), not the synthetic `chonk_bench` target. The synthetic benchmark (`chonk_bench`) uses trivially small mock circuits — it is useful for quick regression checks but does NOT reflect production proving performance. Users invoking `/benchmark-chonk` want the real thing.
+Run realistic Chonk IVC benchmarks using **pinned protocol inputs** (real transaction flows captured from end-to-end tests).
 
-## What makes this different from `chonk_bench`
-
-| | `chonk_bench` (synthetic) | This skill (realistic) |
-|---|---|---|
-| Input data | Mock circuits via `test_bench_shared.hpp` | Pinned msgpack from real Aztec transactions |
-| Circuit count | 2 or 5 tiny circuits | Full transaction flows (10+ circuits) |
-| Circuit variety | All identical | Mixed: app, kernel, tail, public |
-| BB command | `./chonk_bench --benchmark_filter=...` | `bb prove --scheme chonk --ivc_inputs_path ...` |
+**Chonk has no synthetic micro-benchmark.** Past attempts (`chonk_bench`) used trivially small mock circuits and produced misleading numbers — the target was deleted to prevent regression of that mistake. Always benchmark Chonk via `bb prove --scheme chonk` against pinned `ivc-inputs.msgpack` for real transaction flows. If a Chonk proving question seems to call for a micro-benchmark, the answer is still `bb prove` on a real flow.
 
 ## Step 1: Get pinned IVC inputs
 
@@ -158,7 +151,7 @@ The macros create `BenchReporter` RAII objects that:
 
 ### Google Benchmark integration
 
-For `chonk_bench` and other `.bench.cpp` targets:
+For `.bench.cpp` targets that integrate BB_BENCH into Google Benchmark counters:
 ```cpp
 #include "barretenberg/common/google_bb_bench.hpp"
 
@@ -275,15 +268,15 @@ python3 barretenberg/cpp/scripts/extract_component_benchmarks.py <output_dir> <n
 
 This reads `benchmark_breakdown.json`, finds operations matching key components (sumcheck, pcs, pippenger, commitment, circuit, oink, compute), and appends them to `benchmarks.bench.json` with stacked chart markers for the dashboard.
 
-## A/B comparison scripts
+## A/B comparison
+
+For Chonk A/B between branches, run `bb prove --scheme chonk` against the same pinned `ivc-inputs.msgpack` on each branch and compare the resulting `--bench_out_hierarchical` JSON manually. Use the **remote machine** (`/remote-bench`) for stable, single-run numbers.
 
-These use Google Benchmark's `compare.py` for statistical analysis. Note: these use the **remote machine** — see `/remote-bench`.
+The generic Google-Benchmark A/B scripts still exist for non-Chonk targets:
 
 | Script | What it compares |
 |--------|-----------------|
-| `scripts/compare_chonk_bench.sh` | Native ChonkBench/Full/6, branch vs baseline |
-| `scripts/compare_chonk_bench_wasm.sh` | WASM ChonkBench/Full/6, branch vs baseline |
-| `scripts/compare_branch_vs_baseline_remote.sh` | Generic native A/B |
+| `scripts/compare_branch_vs_baseline_remote.sh` | Generic native A/B (any `*_bench` target) |
 | `scripts/compare_branch_vs_baseline_remote_wasm.sh` | Generic WASM A/B |
 
 ## Key scripts reference
@@ -293,7 +286,6 @@ These use Google Benchmark's `compare.py` for statistical analysis. Note: these
 | `scripts/test_chonk_standalone_vks_havent_changed.sh` | Download/update/verify pinned inputs |
 | `scripts/ci_benchmark_ivc_flows.sh` | CI: proves a flow, extracts components, uploads to dashboard |
 | `scripts/benchmark_example_ivc_flow_remote.sh` | Proves a pinned flow on the remote machine (uses `/remote-bench`) |
-| `scripts/benchmark_chonk.sh` | Synthetic `chonk_bench` on remote |
 | `scripts/wasmtime.sh` | wasmtime wrapper with standard flags |
 | `scripts/extract_component_benchmarks.py` | Extract component timings from hierarchical breakdown |
 
@@ -307,7 +299,7 @@ These use Google Benchmark's `compare.py` for statistical analysis. Note: these
 - **WASM preset:** `wasm-threads`. Build dir is `build-wasm-threads/`. The preset enables `ENABLE_WASM_BENCH=ON` automatically.
 - **WASM is ~2.8x slower than native** — this ratio is consistent across all circuit types.
 - **CRS:** Ensure `~/.bb-crs` exists. For WASM, wasmtime needs `--dir=$HOME/.bb-crs`.
-- **`BB_BENCH=1` vs `--print_bench`:** Either activates profiling. `--print_bench` also triggers the hierarchical tree output to stderr. In `chonk_bench`, the `GOOGLE_BB_BENCH_REPORTER` macro enables it automatically when `BB_BENCH=1` is set.
+- **`BB_BENCH=1` vs `--print_bench`:** Either activates profiling. `--print_bench` also triggers the hierarchical tree output to stderr. In Google-Benchmark targets that wrap their loops with `GOOGLE_BB_BENCH_REPORTER`, the same activation happens automatically when `BB_BENCH=1` is set.
 - **Dashboard:** CI uploads breakdown data to `bench/bb-breakdown/` on S3. The dashboard at `ci3/dashboard/chonk-breakdowns/` visualizes it.
 - **Rebuilding after instrumentation changes:** Only `ninja bb` is needed — no need to reconfigure.
 
diff --git a/barretenberg/.claude/skills/remote-bench/SKILL.md b/barretenberg/.claude/skills/remote-bench/SKILL.md
index 56bab0fa04f0..88b34c8c9ef7 100644
--- a/barretenberg/.claude/skills/remote-bench/SKILL.md
+++ b/barretenberg/.claude/skills/remote-bench/SKILL.md
@@ -1,7 +1,7 @@
 ---
 name: remote-bench
 description: Run benchmarks on the dedicated remote EC2 benchmarking machine for noise-free, single-run results. Handles env var validation, lock management, binary transfer, and result collection. Use with /benchmark-chonk or any BB benchmark target.
-argument-hint: <target> e.g. "bb", "chonk_bench", "ultra_honk_bench", "wasm bb"
+argument-hint: <target> e.g. "bb", "ultra_honk_bench", "wasm bb"
 ---
 
 # Remote Bench
@@ -95,7 +95,7 @@ The standard flow used by `scripts/benchmark_remote.sh`:
 ```bash
 cd barretenberg/cpp
 
-BENCHMARK="bb"                    # or chonk_bench, ultra_honk_bench, etc.
+BENCHMARK="bb"                    # or ultra_honk_bench, etc. (Chonk: use bb with --scheme chonk on real example flows — there is no synthetic chonk benchmark)
 PRESET="clang20-no-avm"          # or clang20
 BUILD_DIR="build-no-avm"         # matches preset
 
@@ -204,14 +204,14 @@ Compare current branch vs baseline (builds and runs both on remote):
 
 ```bash
 # Native
-./scripts/compare_chonk_bench.sh                # ChonkBench/Full/6
 ./scripts/compare_branch_vs_baseline_remote.sh <target> '<filter>'
 
 # WASM
-./scripts/compare_chonk_bench_wasm.sh           # ChonkBench/Full/6
 ./scripts/compare_branch_vs_baseline_remote_wasm.sh <target> '<filter>'
 ```
 
+For Chonk A/B, do not use a synthetic benchmark — measure `bb prove --scheme chonk` against pinned `ivc-inputs.msgpack` for both branches and compare manually.
+
 These use Google Benchmark's `compare.py` for statistical analysis. Note: comparison scripts check out the baseline branch locally, so your working tree must be clean.
 
 ## Scripts reference
@@ -220,10 +220,7 @@ These use Google Benchmark's `compare.py` for statistical analysis. Note: compar
 |--------|---------|
 | `scripts/benchmark_remote.sh` | Generic: build locally, scp, run remotely |
 | `scripts/benchmark_wasm_remote.sh` | Same for WASM (wasmtime on remote) |
-| `scripts/benchmark_example_ivc_flow_remote.sh` | Chonk with pinned inputs on remote |
-| `scripts/benchmark_chonk.sh` | Synthetic chonk_bench on remote |
-| `scripts/compare_chonk_bench.sh` | A/B native comparison |
-| `scripts/compare_chonk_bench_wasm.sh` | A/B WASM comparison |
+| `scripts/benchmark_example_ivc_flow_remote.sh` | Chonk with pinned inputs on remote (the only realistic Chonk bench) |
 | `scripts/compare_branch_vs_baseline_remote.sh` | Generic A/B native |
 | `scripts/compare_branch_vs_baseline_remote_wasm.sh` | Generic A/B WASM |
 | `scripts/_benchmark_remote_lock.sh` | Lock mechanism (source it, don't run it) |
diff --git a/barretenberg/AGENTS.md b/barretenberg/AGENTS.md
new file mode 120000
index 000000000000..681311eb9cf4
--- /dev/null
+++ b/barretenberg/AGENTS.md
@@ -0,0 +1 @@
+CLAUDE.md
\ No newline at end of file
diff --git a/barretenberg/bbup/bbup b/barretenberg/bbup/bbup
index e50950c8e734..037f80eb2545 100755
--- a/barretenberg/bbup/bbup
+++ b/barretenberg/bbup/bbup
@@ -50,8 +50,8 @@ get_bb_version_for_noir() {
 
     local lookup_url="https://raw.githubusercontent.com/AztecProtocol/aztec-packages/next/barretenberg/bbup/bb-versions.json"
 
-    # Extract BB version from install script
-    local bb_version=$(curl --fail -s "$lookup_url" | jq -r --arg version "$resolved_version" '.[$version]')
+    # bb-versions.json is a flat "<noir-version>": "<bb-version>" map with one entry per line.
+    local bb_version=$(curl --fail -s "$lookup_url" | grep -F "\"$resolved_version\":" | head -1 | cut -d'"' -f4)
     echo "$bb_version"
 }
 
diff --git a/barretenberg/cpp/AGENTS.md b/barretenberg/cpp/AGENTS.md
new file mode 120000
index 000000000000..681311eb9cf4
--- /dev/null
+++ b/barretenberg/cpp/AGENTS.md
@@ -0,0 +1 @@
+CLAUDE.md
\ No newline at end of file
diff --git a/barretenberg/cpp/CLAUDE.md b/barretenberg/cpp/CLAUDE.md
index b2b1dfeb8f8c..b2fb9b3aadac 100644
--- a/barretenberg/cpp/CLAUDE.md
+++ b/barretenberg/cpp/CLAUDE.md
@@ -108,6 +108,27 @@ Key constants to watch:
 
 If C++ static_asserts fail after your changes, update both the assert values AND the corresponding Noir constants, then run `yarn remake-constants`.
 
+## Prover.toml Fixtures
+
+Proof-length-affecting changes (e.g. `CHONK_PROOF_LENGTH` bumps from MegaFlavor entity additions) make the committed `Prover.toml` fixtures stale. `nargo execute --program-dir <crate>` then fails with `Type Array { length: N, typ: Field } is expected to have length N but value Vec(...)`.
+
+Regenerate via the e2e prover full test with fake proofs:
+
+```bash
+cd yarn-project
+AZTEC_GENERATE_TEST_DATA=1 FAKE_PROOFS=1 yarn workspace @aztec/end-to-end test full.test
+```
+
+`FAKE_PROOFS=1` skips real proving — runs in ~2 min (orchestrator + witness generation only). Writes 12 `Prover.toml` files under `noir-projects/noir-protocol-circuits/crates/<circuit>/Prover.toml`.
+
+For circuits not exercised by `full.test.ts` (`rollup-tx-merge`, `rollup-block-root`, `rollup-block-root-single-tx`, `rollup-block-merge`, `rollup-checkpoint-root`, `rollup-block-root-first-empty-tx`), additionally run:
+
+```bash
+AZTEC_GENERATE_TEST_DATA=1 yarn workspace @aztec/prover-client test orchestrator_single_checkpoint
+```
+
+Verify with `nargo execute --program-dir noir-projects/noir-protocol-circuits/crates/<crate>` for any previously-failing crate; should print `Circuit witness successfully solved`.
+
 ## Verification Keys
 
 **IMPORTANT**: When making barretenberg changes that could affect verification keys, you must verify that VKs haven't changed unexpectedly, or
diff --git a/barretenberg/cpp/CMakePresets.json b/barretenberg/cpp/CMakePresets.json
index 8b67388d33c3..3d5b17a58d32 100644
--- a/barretenberg/cpp/CMakePresets.json
+++ b/barretenberg/cpp/CMakePresets.json
@@ -788,7 +788,6 @@
         "barretenberg-debug.wasm",
         "ecc_tests",
         "ultra_honk_bench",
-        "chonk_bench",
         "bb"
       ]
     },
diff --git a/barretenberg/cpp/bootstrap.sh b/barretenberg/cpp/bootstrap.sh
index b9c2f351d656..b8ccc9b2a486 100755
--- a/barretenberg/cpp/bootstrap.sh
+++ b/barretenberg/cpp/bootstrap.sh
@@ -87,6 +87,15 @@ function preset_cache_paths {
       find $build_dir/bin $build_dir/lib \
         -maxdepth 1 \( -name "$t" -o -name "$t.exe" -o -name "$t.node" -o -name "lib${t}.a" \) \
         2>/dev/null
+      # Emscripten emits a .js loader and a .worker.mjs pthread worker as
+      # side-outputs of any .wasm executable target; cache them next to the
+      # .wasm so consumers like bb.js see a complete artifact set on cache hit.
+      if [[ "$t" == *.wasm ]]; then
+        local stem="${t%.wasm}"
+        find $build_dir/bin -maxdepth 1 \
+          \( -name "$stem.js" -o -name "$stem.worker.mjs" \) \
+          2>/dev/null
+      fi
     done
   fi
 }
@@ -265,7 +274,11 @@ function test_cmds_native {
       done || (echo "Failed to list tests in $bin" && exit 1)
   done
 
-  echo "$hash barretenberg/cpp/scripts/test_chonk_standalone_vks_havent_changed.sh"
+  # The pinned IVC inputs / VKs live in the public repo; the private fork
+  # carries divergent circuits so the check is expected to fail there.
+  if [[ "${GITHUB_REPOSITORY,,}" != "aztecprotocol/aztec-packages-private" ]]; then
+    echo "$hash barretenberg/cpp/scripts/test_chonk_standalone_vks_havent_changed.sh"
+  fi
 }
 
 function test_cmds_wasm_threads {
@@ -320,12 +333,8 @@ function bench_cmds {
   prefix="$hash:CPUS=8"
   echo "$prefix barretenberg/cpp/scripts/run_bench.sh native bb-micro-bench/native/ultra_honk $native_build_dir/bin/ultra_honk_bench construct_proof_ultrahonk_power_of_2/20$"
   echo "$prefix barretenberg/cpp/scripts/run_bench.sh native bb-micro-bench/native/ultra_honk_zk $native_build_dir/bin/ultra_honk_bench construct_proof_ultrahonk_zk_power_of_2/20$"
-  echo "$prefix barretenberg/cpp/scripts/run_bench.sh native bb-micro-bench/native/chonk $native_build_dir/bin/chonk_bench ChonkBench/Full/5$"
   echo "$prefix barretenberg/cpp/scripts/run_bench.sh wasm bb-micro-bench/wasm/ultra_honk build-wasm-threads/bin/ultra_honk_bench construct_proof_ultrahonk_power_of_2/20$"
   echo "$prefix barretenberg/cpp/scripts/run_bench.sh wasm bb-micro-bench/wasm/ultra_honk_zk build-wasm-threads/bin/ultra_honk_bench construct_proof_ultrahonk_zk_power_of_2/20$"
-  echo "$prefix barretenberg/cpp/scripts/run_bench.sh wasm bb-micro-bench/wasm/chonk build-wasm-threads/bin/chonk_bench ChonkBench/Full/5$"
-  prefix="$hash:CPUS=1"
-  echo "$prefix barretenberg/cpp/scripts/run_bench.sh native bb-micro-bench/native/chonk_verify $native_build_dir/bin/chonk_bench VerificationOnly$"
 }
 
 # Runs benchmarks sharded over machine cores.
diff --git a/barretenberg/cpp/pil/vm2/AGENTS.md b/barretenberg/cpp/pil/vm2/AGENTS.md
new file mode 120000
index 000000000000..681311eb9cf4
--- /dev/null
+++ b/barretenberg/cpp/pil/vm2/AGENTS.md
@@ -0,0 +1 @@
+CLAUDE.md
\ No newline at end of file
diff --git a/barretenberg/cpp/pil/vm2/precomputed.pil b/barretenberg/cpp/pil/vm2/precomputed.pil
index a8611d6826da..734d6b761e46 100644
--- a/barretenberg/cpp/pil/vm2/precomputed.pil
+++ b/barretenberg/cpp/pil/vm2/precomputed.pil
@@ -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 =====
diff --git a/barretenberg/cpp/pil/vm2/tx.pil b/barretenberg/cpp/pil/vm2/tx.pil
index 0b4b62757ecd..fefc07a34d31 100644
--- a/barretenberg/cpp/pil/vm2/tx.pil
+++ b/barretenberg/cpp/pil/vm2/tx.pil
@@ -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;
diff --git a/barretenberg/cpp/pil/vm2/tx_context.pil b/barretenberg/cpp/pil/vm2/tx_context.pil
index d17074b09cd7..832773e0f5d8 100644
--- a/barretenberg/cpp/pil/vm2/tx_context.pil
+++ b/barretenberg/cpp/pil/vm2/tx_context.pil
@@ -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.
 
diff --git a/barretenberg/cpp/scripts/README.md b/barretenberg/cpp/scripts/README.md
index ee686390d982..378c8562da47 100644
--- a/barretenberg/cpp/scripts/README.md
+++ b/barretenberg/cpp/scripts/README.md
@@ -28,7 +28,8 @@ There are scripts that:
 4. If `ssh` worked, the setup is complete.
 
 ## How
-- `./scripts/benchmark_chonk.sh` lets you run `chonk_bench` remotely and analyze the results.
 - `./scripts/benchmark_example_ivc_flow_remote.sh` copies the example flow input you'd like to run to the remote machine, runs `bb prove`, and analyze the results.
     - For the script to work you need to have the example flows downloaded locally, by `AZTEC_CACHE_COMMIT=origin/next~3 FORCE_CACHE_DOWNLOAD=1 yarn-project/end-to-end/bootstrap.sh build_bench`
 - If you have other special needs, look inside the above scripts and see what parameters you can give, or use `./scripts/benchmark_remote.sh`.
+
+Chonk proving must always be measured on real example app flows via `benchmark_example_ivc_flow_remote.sh` — there is no synthetic chonk benchmark, and there should not be one. Running synthetic Chonk benchmarks gives misleading numbers because the mock circuits do not reflect production proving costs.
diff --git a/barretenberg/cpp/scripts/benchmark_chonk.sh b/barretenberg/cpp/scripts/benchmark_chonk.sh
deleted file mode 100755
index bd0abef06bb1..000000000000
--- a/barretenberg/cpp/scripts/benchmark_chonk.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-set -eu
-
-TARGET=${1:-"chonk_bench"}
-BENCHMARK="ChonkBench/Full/5"
-BUILD_DIR="build"
-FILTER="${BENCHMARK}$" # '$' to ensure only specified bench is run
-
-# Move above script dir.
-cd $(dirname $0)/..
-
-# Measure the benchmarks with ops time counting
-./scripts/benchmark_remote.sh "$TARGET"\
-                              "BB_BENCH=1 ./$TARGET --benchmark_filter=$FILTER\
-                                         --benchmark_out=$TARGET.json\
-                                         --benchmark_out_format=json"\
-                              clang20\
-                              "$BUILD_DIR"
-
-# Retrieve output from benching instance
-cd $BUILD_DIR
-scp $BB_SSH_KEY $BB_SSH_INSTANCE:$BB_SSH_CPP_PATH/build/$TARGET.json .
diff --git a/barretenberg/cpp/scripts/benchmark_remote.sh b/barretenberg/cpp/scripts/benchmark_remote.sh
index a85d5c202d0f..eca222bd6860 100755
--- a/barretenberg/cpp/scripts/benchmark_remote.sh
+++ b/barretenberg/cpp/scripts/benchmark_remote.sh
@@ -7,7 +7,7 @@
 #    - BB_SSH_CPP_PATH: Path to barretenberg/cpp in a cloned repository on the EC2 instance
 set -eu
 
-BENCHMARK=${1:-chonk_bench}
+BENCHMARK=${1:?usage: benchmark_remote.sh <bench_target> [command] [preset] [build_dir]}
 COMMAND=${2:-./$BENCHMARK}
 PRESET=${3:-clang20-no-avm}
 BUILD_DIR=${4:-build}
diff --git a/barretenberg/cpp/scripts/benchmark_wasm.sh b/barretenberg/cpp/scripts/benchmark_wasm.sh
index f7bbd7edc9f2..7097b914209f 100755
--- a/barretenberg/cpp/scripts/benchmark_wasm.sh
+++ b/barretenberg/cpp/scripts/benchmark_wasm.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 set -eu
 
-BENCHMARK=${1:-chonk_bench}
-COMMAND=${2:-./bin/$BENCHMARK --benchmark_filter=ChonkBench/Full/6}
+BENCHMARK=${1:?usage: benchmark_wasm.sh <bench_target> [command]}
+COMMAND=${2:-./bin/$BENCHMARK}
 HARDWARE_CONCURRENCY=${HARDWARE_CONCURRENCY:-16}
 
 # Move above script dir.
diff --git a/barretenberg/cpp/scripts/compare_branch_vs_baseline.sh b/barretenberg/cpp/scripts/compare_branch_vs_baseline.sh
index f7af1e2f438d..e1552f8c18bb 100755
--- a/barretenberg/cpp/scripts/compare_branch_vs_baseline.sh
+++ b/barretenberg/cpp/scripts/compare_branch_vs_baseline.sh
@@ -10,7 +10,7 @@
 # it is up to date with local master, and run the script.
 
 # Specify the benchmark suite and the "baseline" branch against which to compare
-BENCHMARK=${1:-chonk_bench}
+BENCHMARK=${1:?usage: compare_branch_vs_baseline.sh <bench_target> [filter] [preset] [build_dir]}
 FILTER=${2:-""}
 PRESET=${3:-clang20}
 BUILD_DIR=${4:-build}
diff --git a/barretenberg/cpp/scripts/compare_branch_vs_baseline_remote.sh b/barretenberg/cpp/scripts/compare_branch_vs_baseline_remote.sh
index 748bb978fef4..c29f29defef4 100755
--- a/barretenberg/cpp/scripts/compare_branch_vs_baseline_remote.sh
+++ b/barretenberg/cpp/scripts/compare_branch_vs_baseline_remote.sh
@@ -10,7 +10,7 @@
 # it is up to date with local master, and run the script.
 
 # Specify the benchmark suite and the "baseline" branch against which to compare
-BENCHMARK=${1:-chonk_bench}
+BENCHMARK=${1:?usage: compare_branch_vs_baseline_remote.sh <bench_target> [filter] [preset] [build_dir]}
 FILTER=${2:-"*."}
 PRESET=${3:-clang20}
 BUILD_DIR=${4:-build}
diff --git a/barretenberg/cpp/scripts/compare_chonk_bench.sh b/barretenberg/cpp/scripts/compare_chonk_bench.sh
deleted file mode 100755
index 2d2e0a66d75e..000000000000
--- a/barretenberg/cpp/scripts/compare_chonk_bench.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-set -eu
-
-./scripts/compare_branch_vs_baseline_remote.sh chonk_bench 'Full/6$'
\ No newline at end of file
diff --git a/barretenberg/cpp/scripts/compare_chonk_bench_wasm.sh b/barretenberg/cpp/scripts/compare_chonk_bench_wasm.sh
deleted file mode 100755
index 77e7d43204c8..000000000000
--- a/barretenberg/cpp/scripts/compare_chonk_bench_wasm.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-set -eu
-
-./scripts/compare_branch_vs_baseline_remote_wasm.sh chonk_bench 'Full/6$'
\ No newline at end of file
diff --git a/barretenberg/cpp/scripts/profile_tracy_capture_mainframe_view_local.sh b/barretenberg/cpp/scripts/profile_tracy_capture_mainframe_view_local.sh
index 45032d6bbef2..89046fed0d9d 100755
--- a/barretenberg/cpp/scripts/profile_tracy_capture_mainframe_view_local.sh
+++ b/barretenberg/cpp/scripts/profile_tracy_capture_mainframe_view_local.sh
@@ -11,8 +11,8 @@
 set -eux
 USER=${1:-$USER}
 BOX=$USER-box
-TARGET=${2:-chonk_bench}
-COMMAND=${3:-./bin/$TARGET --benchmark_filter=ChonkBench/Full/6"\$"}
+TARGET=${2:?usage: profile_tracy_capture_mainframe_view_local.sh <user> <bench_target> [command]}
+COMMAND=${3:-./bin/$TARGET}
 HARDWARE_CONCURRENCY=${HARDWARE_CONCURRENCY:-16}
 # Can also set PRESET=tracy-gates env variable
 PRESET=${PRESET:-tracy-memory}
diff --git a/barretenberg/cpp/scripts/profile_wasm_samply.sh b/barretenberg/cpp/scripts/profile_wasm_samply.sh
index 3bfc7a80dd4b..218ed2b8f89c 100755
--- a/barretenberg/cpp/scripts/profile_wasm_samply.sh
+++ b/barretenberg/cpp/scripts/profile_wasm_samply.sh
@@ -2,8 +2,8 @@
 #!/usr/bin/env bash
 set -eu
 
-BENCHMARK=${1:-chonk_bench}
-COMMAND=${2:-./bin/$BENCHMARK --benchmark_filter=ChonkBench/Full/6}
+BENCHMARK=${1:?usage: profile_wasm_samply.sh <bench_target> [command]}
+COMMAND=${2:-./bin/$BENCHMARK}
 HARDWARE_CONCURRENCY=${HARDWARE_CONCURRENCY:-16}
 
 # Move above script dir.
diff --git a/barretenberg/cpp/scripts/test_chonk_standalone_vks_havent_changed.sh b/barretenberg/cpp/scripts/test_chonk_standalone_vks_havent_changed.sh
index bf61dd398a7f..a11ea58edcf0 100755
--- a/barretenberg/cpp/scripts/test_chonk_standalone_vks_havent_changed.sh
+++ b/barretenberg/cpp/scripts/test_chonk_standalone_vks_havent_changed.sh
@@ -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="ae9c2d06"
+pinned_short_hash="20c388cc"
 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 {
diff --git a/barretenberg/cpp/src/barretenberg/api/api_avm.hpp b/barretenberg/cpp/src/barretenberg/api/api_avm.hpp
index e21e383c203e..fa49a1b041e0 100644
--- a/barretenberg/cpp/src/barretenberg/api/api_avm.hpp
+++ b/barretenberg/cpp/src/barretenberg/api/api_avm.hpp
@@ -1,8 +1,38 @@
 #pragma once
 #include <filesystem>
+#include <vector>
+
+#include "barretenberg/ecc/curves/bn254/fr.hpp"
 
 namespace bb {
 
+/**
+ * @brief Result of in-memory AVM proving.
+ */
+struct AvmProveResult {
+    std::vector<bb::fr> proof;
+};
+
+/**
+ * @brief Prove an AVM transaction from serialized inputs (msgpack bytes).
+ * Callers that need to verify the proof should call avm_verify_from_bytes separately.
+ */
+AvmProveResult avm_prove_from_bytes(std::vector<uint8_t> inputs);
+
+/**
+ * @brief Verify an AVM proof from serialized data.
+ * @param proof The proof as a vector of field elements.
+ * @param public_inputs Serialized public inputs (msgpack bytes).
+ * @return true if verification succeeds.
+ */
+bool avm_verify_from_bytes(std::vector<bb::fr> proof, std::vector<uint8_t> public_inputs);
+
+/**
+ * @brief Check the AVM circuit from serialized inputs (msgpack bytes).
+ * @return true if the circuit check passes.
+ */
+bool avm_check_circuit_from_bytes(std::vector<uint8_t> inputs);
+
 // Global flag indicating AVM support is available
 extern const bool avm_enabled;
 
diff --git a/barretenberg/cpp/src/barretenberg/avm_fuzzer/harness/ecc.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/avm_fuzzer/harness/ecc.fuzzer.cpp
index 9987593ec2a4..19e79a8078ed 100644
--- a/barretenberg/cpp/src/barretenberg/avm_fuzzer/harness/ecc.fuzzer.cpp
+++ b/barretenberg/cpp/src/barretenberg/avm_fuzzer/harness/ecc.fuzzer.cpp
@@ -114,11 +114,25 @@ struct EccFuzzerInput {
 
     static EccFuzzerInput from_buffer(const uint8_t* buffer)
     {
+        // Note: we cannot use AffinePoint::serialize_from_buffer() because this now throws if the point is not on the
+        // curve. We want to test such points so have to deserialize manually:
+        auto read_point = [](const uint8_t* src) -> AffinePoint {
+            bool is_point_at_infinity =
+                std::all_of(src, src + (sizeof(Fq) * 2), [](uint8_t val) { return val == 255; });
+            if (is_point_at_infinity) {
+                return AffinePoint::infinity();
+            }
+            AffinePoint result;
+            read(src, result.x);
+            read(src, result.y);
+            return result;
+        };
+
         EccFuzzerInput input;
         size_t offset = 0;
-        input.p = AffinePoint::serialize_from_buffer(buffer + offset);
+        input.p = read_point(buffer + offset);
         offset += sizeof(AffinePoint);
-        input.q = AffinePoint::serialize_from_buffer(buffer + offset);
+        input.q = read_point(buffer + offset);
         offset += sizeof(AffinePoint);
         input.scalar = Fq::serialize_from_buffer(buffer + offset);
         offset += sizeof(Fq);
diff --git a/barretenberg/cpp/src/barretenberg/avm_fuzzer/run_fuzzer.sh b/barretenberg/cpp/src/barretenberg/avm_fuzzer/run_fuzzer.sh
index 0c0f6cd4dc11..38b56e0f172b 100755
--- a/barretenberg/cpp/src/barretenberg/avm_fuzzer/run_fuzzer.sh
+++ b/barretenberg/cpp/src/barretenberg/avm_fuzzer/run_fuzzer.sh
@@ -145,9 +145,9 @@ fi
 
 # Set build directory based on command
 if [ "$COMMAND" = "coverage" ]; then
-    BUILD_DIR="$CPP_DIR/build-coverage"
-    BUILD_PRESET="clang20-coverage"
-    BUILD_CMAKE_FLAGS="-DCOVERAGE_AVM=ON -DFUZZING=ON -DFUZZING_AVM=ON"
+    BUILD_DIR="$CPP_DIR/build-fuzzing-avm-cov"
+    BUILD_PRESET="fuzzing-avm"
+    BUILD_CMAKE_FLAGS="-DCOVERAGE=ON -DCOVERAGE_AVM=ON"
 else
     BUILD_DIR="$CPP_DIR/build-fuzzing-avm"
     BUILD_PRESET="fuzzing-avm"
@@ -170,9 +170,9 @@ build_fuzzer() {
     if [ ! -f "$BUILD_DIR/CMakeCache.txt" ]; then
         echo "Configuring cmake..."
         if [ -n "$BUILD_CMAKE_FLAGS" ]; then
-            cmake --preset "$BUILD_PRESET" $BUILD_CMAKE_FLAGS
+            cmake --preset "$BUILD_PRESET" -B "$BUILD_DIR" $BUILD_CMAKE_FLAGS
         else
-            cmake --preset "$BUILD_PRESET"
+            cmake --preset "$BUILD_PRESET" -B "$BUILD_DIR"
         fi
     fi
 
@@ -314,13 +314,14 @@ if [ "$COMMAND" = "coverage" ] && [ -f "$LLVM_PROFILE_FILE" ]; then
     echo "=========================================="
 
     COVERAGE_DATA="$COVERAGE_OUTPUT_DIR/bb_avm.profdata"
-    # Merge all profraw and profdata files in coverage directory
-    COVERAGE_FILES=("$COVERAGE_OUTPUT_DIR"/*.profraw "$COVERAGE_OUTPUT_DIR"/*.profdata)
+    # Merge all profraw and profdata files in coverage directory (skip globs that match nothing)
+    COVERAGE_FILES=()
+    for f in "$COVERAGE_OUTPUT_DIR"/*.profraw "$COVERAGE_OUTPUT_DIR"/*.profdata; do
+        [ -f "$f" ] && COVERAGE_FILES+=("$f")
+    done
     echo "Merging coverage files:"
     for f in "${COVERAGE_FILES[@]}"; do
-        if [ -f "$f" ]; then
-            echo "  $f"
-        fi
+        echo "  $f"
     done
     echo ""
     llvm-profdata-20 merge -sparse "${COVERAGE_FILES[@]}" -o "$COVERAGE_DATA"
diff --git a/barretenberg/cpp/src/barretenberg/bbapi/bbapi_avm.cpp b/barretenberg/cpp/src/barretenberg/bbapi/bbapi_avm.cpp
new file mode 100644
index 000000000000..945b8018930e
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/bbapi/bbapi_avm.cpp
@@ -0,0 +1,52 @@
+#include "barretenberg/bbapi/bbapi_avm.hpp"
+#include "barretenberg/api/api_avm.hpp"
+#include "barretenberg/vm2/tooling/stats.hpp"
+
+namespace bb::bbapi {
+
+namespace {
+
+// Reset the AVM per-stage timings registry so the snapshot we return reflects only this call.
+void reset_avm_stats()
+{
+    ::bb::avm2::Stats::get().reset();
+}
+
+// Take a snapshot of the AVM per-stage timings registry and convert it to the wire-format struct.
+std::vector<AvmStat> snapshot_avm_stats()
+{
+    auto snapshot = ::bb::avm2::Stats::get().snapshot();
+    std::vector<AvmStat> result;
+    result.reserve(snapshot.size());
+    for (auto& [name, value] : snapshot) {
+        result.push_back(AvmStat{ .name = std::move(name), .value_ms = value });
+    }
+    return result;
+}
+
+} // namespace
+
+AvmProve::Response AvmProve::execute(const BBApiRequest& /*request*/) &&
+{
+    reset_avm_stats();
+    auto result = avm_prove_from_bytes(std::move(inputs));
+    return Response{
+        .proof = std::move(result.proof),
+        .stats = snapshot_avm_stats(),
+    };
+}
+
+AvmVerify::Response AvmVerify::execute(const BBApiRequest& /*request*/) &&
+{
+    bool verified = avm_verify_from_bytes(std::move(proof), std::move(public_inputs));
+    return Response{ .verified = verified };
+}
+
+AvmCheckCircuit::Response AvmCheckCircuit::execute(const BBApiRequest& /*request*/) &&
+{
+    reset_avm_stats();
+    bool passed = avm_check_circuit_from_bytes(std::move(inputs));
+    return Response{ .passed = passed, .stats = snapshot_avm_stats() };
+}
+
+} // namespace bb::bbapi
diff --git a/barretenberg/cpp/src/barretenberg/bbapi/bbapi_avm.hpp b/barretenberg/cpp/src/barretenberg/bbapi/bbapi_avm.hpp
new file mode 100644
index 000000000000..2457b5e1fa8e
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/bbapi/bbapi_avm.hpp
@@ -0,0 +1,102 @@
+#pragma once
+/**
+ * @file bbapi_avm.hpp
+ * @brief AVM-specific command definitions for the Barretenberg RPC API.
+ *
+ * This file contains command structures for AVM operations including proving,
+ * verification, and circuit checking. When built with bb (non-AVM), these
+ * commands return an error response. When built with bb-avm, they work normally.
+ */
+#include "barretenberg/bbapi/bbapi_shared.hpp"
+#include "barretenberg/common/named_union.hpp"
+#include "barretenberg/ecc/curves/bn254/fr.hpp"
+#include "barretenberg/serialize/msgpack.hpp"
+#include <cstdint>
+#include <string>
+#include <vector>
+
+namespace bb::bbapi {
+
+/**
+ * @struct AvmStat
+ * @brief A single AVM per-stage timing entry. `value_ms` is wall-clock milliseconds captured by
+ * bb::avm2::Stats during a prove or check-circuit call.
+ */
+struct AvmStat {
+    static constexpr const char MSGPACK_SCHEMA_NAME[] = "AvmStat";
+
+    std::string name;
+    uint64_t value_ms;
+    SERIALIZATION_FIELDS(name, value_ms);
+    bool operator==(const AvmStat&) const = default;
+};
+
+/**
+ * @struct AvmProve
+ * @brief Prove an AVM transaction from serialized inputs.
+ * The inputs are opaque msgpack bytes of AvmProvingInputs. Callers should call AvmVerify
+ * separately if they need to verify the resulting proof.
+ */
+struct AvmProve {
+    static constexpr const char MSGPACK_SCHEMA_NAME[] = "AvmProve";
+
+    struct Response {
+        static constexpr const char MSGPACK_SCHEMA_NAME[] = "AvmProveResponse";
+
+        std::vector<bb::fr> proof;
+        std::vector<AvmStat> stats;
+        SERIALIZATION_FIELDS(proof, stats);
+        bool operator==(const Response&) const = default;
+    };
+
+    std::vector<uint8_t> inputs;
+    SERIALIZATION_FIELDS(inputs);
+    Response execute(const BBApiRequest& request = {}) &&;
+    bool operator==(const AvmProve&) const = default;
+};
+
+/**
+ * @struct AvmVerify
+ * @brief Verify an AVM proof against serialized public inputs.
+ */
+struct AvmVerify {
+    static constexpr const char MSGPACK_SCHEMA_NAME[] = "AvmVerify";
+
+    struct Response {
+        static constexpr const char MSGPACK_SCHEMA_NAME[] = "AvmVerifyResponse";
+
+        bool verified;
+        SERIALIZATION_FIELDS(verified);
+        bool operator==(const Response&) const = default;
+    };
+
+    std::vector<bb::fr> proof;
+    std::vector<uint8_t> public_inputs;
+    SERIALIZATION_FIELDS(proof, public_inputs);
+    Response execute(const BBApiRequest& request = {}) &&;
+    bool operator==(const AvmVerify&) const = default;
+};
+
+/**
+ * @struct AvmCheckCircuit
+ * @brief Check the AVM circuit from serialized inputs.
+ */
+struct AvmCheckCircuit {
+    static constexpr const char MSGPACK_SCHEMA_NAME[] = "AvmCheckCircuit";
+
+    struct Response {
+        static constexpr const char MSGPACK_SCHEMA_NAME[] = "AvmCheckCircuitResponse";
+
+        bool passed;
+        std::vector<AvmStat> stats;
+        SERIALIZATION_FIELDS(passed, stats);
+        bool operator==(const Response&) const = default;
+    };
+
+    std::vector<uint8_t> inputs;
+    SERIALIZATION_FIELDS(inputs);
+    Response execute(const BBApiRequest& request = {}) &&;
+    bool operator==(const AvmCheckCircuit&) const = default;
+};
+
+} // namespace bb::bbapi
diff --git a/barretenberg/cpp/src/barretenberg/bbapi/bbapi_ecc.cpp b/barretenberg/cpp/src/barretenberg/bbapi/bbapi_ecc.cpp
index 533f541db738..7bcc3fc2edfc 100644
--- a/barretenberg/cpp/src/barretenberg/bbapi/bbapi_ecc.cpp
+++ b/barretenberg/cpp/src/barretenberg/bbapi/bbapi_ecc.cpp
@@ -99,6 +99,12 @@ Bn254G2Mul::Response Bn254G2Mul::execute(BBApiRequest& request) &&
     if (!point.on_curve()) {
         BBAPI_ERROR(request, "Input point must be on the curve");
     }
+    // BN254 G2 has cofactor h2 ≈ 2^254. An on-curve point may lie in a cofactor subgroup of order
+    // dividing h2 rather than the prime-order subgroup; we do not want to allow such points
+    // as inputs to bbapi.
+    if (!point.is_in_prime_subgroup()) {
+        BBAPI_ERROR(request, "Input point must lie in the prime-order subgroup");
+    }
     auto result = point * scalar;
     if (!result.on_curve()) {
         BBAPI_ERROR(request, "Output point must be on the curve");
diff --git a/barretenberg/cpp/src/barretenberg/bbapi/bbapi_execute.hpp b/barretenberg/cpp/src/barretenberg/bbapi/bbapi_execute.hpp
index e9031a9363ec..ebfce39ddb7b 100644
--- a/barretenberg/cpp/src/barretenberg/bbapi/bbapi_execute.hpp
+++ b/barretenberg/cpp/src/barretenberg/bbapi/bbapi_execute.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "barretenberg/bbapi/bbapi_avm.hpp"
 #include "barretenberg/bbapi/bbapi_chonk.hpp"
 #include "barretenberg/bbapi/bbapi_crypto.hpp"
 #include "barretenberg/bbapi/bbapi_ecc.hpp"
@@ -13,7 +14,10 @@
 
 namespace bb::bbapi {
 
-using Command = NamedUnion<CircuitProve,
+using Command = NamedUnion<AvmProve,
+                           AvmVerify,
+                           AvmCheckCircuit,
+                           CircuitProve,
                            CircuitComputeVk,
                            CircuitStats,
                            CircuitVerify,
@@ -73,6 +77,9 @@ using Command = NamedUnion<CircuitProve,
                            Shutdown>;
 
 using CommandResponse = NamedUnion<ErrorResponse,
+                                   AvmProve::Response,
+                                   AvmVerify::Response,
+                                   AvmCheckCircuit::Response,
                                    CircuitProve::Response,
                                    CircuitComputeVk::Response,
                                    CircuitStats::Response,
diff --git a/barretenberg/cpp/src/barretenberg/bbapi/bbapi_srs.cpp b/barretenberg/cpp/src/barretenberg/bbapi/bbapi_srs.cpp
index 1225e844bd4e..2c3051da29e2 100644
--- a/barretenberg/cpp/src/barretenberg/bbapi/bbapi_srs.cpp
+++ b/barretenberg/cpp/src/barretenberg/bbapi/bbapi_srs.cpp
@@ -50,8 +50,15 @@ SrsInitSrs::Response SrsInitSrs::execute(BB_UNUSED BBApiRequest& request) &&
                        std::to_string(bytes_per_point));
     }
 
-    // Parse G2 point from buffer (128 bytes)
+    // Parse G2 point from buffer (128 bytes). `serialize_from_buffer` validates that the bytes
+    // decode to a curve point but does NOT enforce subgroup membership. BN254 G2 has a non-trivial
+    // cofactor (h2 ≈ 2^254), so a curve point may lie in a small cofactor subgroup of order
+    // dividing h2 rather than the prime-order subgroup of order r. Reject anything outside
+    // the prime-order subgroup before it reaches the SRS factory.
     auto g2_point_elem = from_buffer<g2::affine_element>(g2_point.data());
+    if (!g2_point_elem.is_in_prime_subgroup()) {
+        throw_or_abort("SrsInitSrs: g2_point is not in the BN254 G2 prime-order subgroup");
+    }
 
     // Initialize BN254 SRS
     bb::srs::init_bn254_mem_crs_factory(g1_points, g2_point_elem);
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/benchmark/CMakeLists.txt
index 12d08f15e49a..32eb72345a8c 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/CMakeLists.txt
+++ b/barretenberg/cpp/src/barretenberg/benchmark/CMakeLists.txt
@@ -3,7 +3,6 @@ add_subdirectory(decrypt_bench)
 add_subdirectory(goblin_bench)
 add_subdirectory(ipa_bench)
 add_subdirectory(ipc_bench)
-add_subdirectory(chonk_bench)
 add_subdirectory(pippenger_bench)
 add_subdirectory(relations_bench)
 add_subdirectory(poseidon2_bench)
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/chonk_bench/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/benchmark/chonk_bench/CMakeLists.txt
deleted file mode 100644
index 9f1df1bd7f32..000000000000
--- a/barretenberg/cpp/src/barretenberg/benchmark/chonk_bench/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-barretenberg_module(chonk_bench vm2_stub chonk stdlib_honk_verifier stdlib_sha256 stdlib_primitives)
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/chonk_bench/chonk.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/chonk_bench/chonk.bench.cpp
deleted file mode 100644
index 025fbeb4ab8b..000000000000
--- a/barretenberg/cpp/src/barretenberg/benchmark/chonk_bench/chonk.bench.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-/**
- * @warning These benchmarks use functions that are tested elsewhere to guard against regressions in the benchmark.
- * Please do not anything that is untested.
- */
-
-#include <benchmark/benchmark.h>
-#include <chrono>
-
-#include "barretenberg/api/file_io.hpp"
-#include "barretenberg/chonk/chonk_verifier.hpp"
-#include "barretenberg/chonk/proof_compression.hpp"
-#include "barretenberg/chonk/test_bench_shared.hpp"
-#include "barretenberg/common/google_bb_bench.hpp"
-#include "barretenberg/common/thread.hpp"
-#include "barretenberg/honk/proof_length.hpp"
-#include "barretenberg/srs/global_crs.hpp"
-
-using namespace benchmark;
-using namespace bb;
-
-namespace {
-
-/**
- * @brief Benchmark suite for the aztec Chonk scheme
- */
-class ChonkBench : public benchmark::Fixture {
-  public:
-    // Number of function circuits to accumulate (based on Zac's target numbers)
-    static constexpr size_t NUM_ITERATIONS_MEDIUM_COMPLEXITY = 5;
-
-    void SetUp([[maybe_unused]] const ::benchmark::State& state) override
-    {
-        bb::srs::init_file_crs_factory(bb::srs::bb_crs_path());
-    }
-};
-
-/**
- * @brief Benchmark only the verification work for the IVC protocol
- */
-BENCHMARK_DEFINE_F(ChonkBench, VerificationOnly)(benchmark::State& state)
-{
-    size_t NUM_APP_CIRCUITS = 1;
-    auto precomputed_vks = precompute_vks(NUM_APP_CIRCUITS);
-    auto [proof, vk_and_hash] = accumulate_and_prove_with_precomputed_vks(NUM_APP_CIRCUITS, precomputed_vks);
-
-    for (auto _ : state) {
-        GOOGLE_BB_BENCH_REPORTER(state);
-        ChonkNativeVerifier verifier(vk_and_hash);
-        benchmark::DoNotOptimize(verifier.verify(proof));
-    }
-}
-
-/**
- * @brief Benchmark the prover work for the full IVC protocol
- */
-BENCHMARK_DEFINE_F(ChonkBench, Full)(benchmark::State& state)
-{
-    size_t NUM_APP_CIRCUITS = static_cast<size_t>(state.range(0));
-    auto precomputed_vks = precompute_vks(NUM_APP_CIRCUITS);
-
-    for (auto _ : state) {
-        GOOGLE_BB_BENCH_REPORTER(state);
-        accumulate_and_prove_with_precomputed_vks(NUM_APP_CIRCUITS, precomputed_vks);
-    }
-}
-
-/**
- * @brief Benchmark proof compression (prover-side cost)
- */
-BENCHMARK_DEFINE_F(ChonkBench, ProofCompress)(benchmark::State& state)
-{
-    size_t NUM_APP_CIRCUITS = 1;
-    auto precomputed_vks = precompute_vks(NUM_APP_CIRCUITS);
-    auto [proof, vk_and_hash] = accumulate_and_prove_with_precomputed_vks(NUM_APP_CIRCUITS, precomputed_vks);
-
-    for (auto _ : state) {
-        benchmark::DoNotOptimize(ProofCompressor::compress_chonk_proof(proof));
-    }
-}
-
-/**
- * @brief Benchmark proof decompression (verifier-side cost)
- */
-BENCHMARK_DEFINE_F(ChonkBench, ProofDecompress)(benchmark::State& state)
-{
-    size_t NUM_APP_CIRCUITS = 1;
-    auto precomputed_vks = precompute_vks(NUM_APP_CIRCUITS);
-    auto [proof, vk_and_hash] = accumulate_and_prove_with_precomputed_vks(NUM_APP_CIRCUITS, precomputed_vks);
-
-    auto compressed = ProofCompressor::compress_chonk_proof(proof);
-    size_t mega_num_pub_inputs =
-        proof.hiding_oink_proof.size() - ProofLength::Oink<MegaZKFlavor>::LENGTH_WITHOUT_PUB_INPUTS;
-
-    for (auto _ : state) {
-        benchmark::DoNotOptimize(ProofCompressor::decompress_chonk_proof(compressed, mega_num_pub_inputs));
-    }
-}
-
-/**
- * @brief Benchmark N individual Chonk verifications (sequential). Baseline for batch comparison.
- */
-BENCHMARK_DEFINE_F(ChonkBench, VerifyIndividual)(benchmark::State& state)
-{
-    const size_t num_proofs = static_cast<size_t>(state.range(0));
-    auto precomputed_vks = precompute_vks(1);
-
-    // Generate a single proof and reuse it N times
-    auto [proof, vk_and_hash] = accumulate_and_prove_with_precomputed_vks(1, precomputed_vks);
-
-    for (auto _ : state) {
-        for (size_t i = 0; i < num_proofs; i++) {
-            ChonkNativeVerifier verifier(vk_and_hash);
-            benchmark::DoNotOptimize(verifier.verify(proof));
-        }
-    }
-}
-
-#define ARGS Arg(ChonkBench::NUM_ITERATIONS_MEDIUM_COMPLEXITY)->Arg(2)
-
-BENCHMARK_REGISTER_F(ChonkBench, Full)->Unit(benchmark::kMillisecond)->ARGS;
-BENCHMARK_REGISTER_F(ChonkBench, VerificationOnly)->Unit(benchmark::kMillisecond);
-BENCHMARK_REGISTER_F(ChonkBench, ProofCompress)->Unit(benchmark::kMillisecond);
-BENCHMARK_REGISTER_F(ChonkBench, ProofDecompress)->Unit(benchmark::kMillisecond);
-BENCHMARK_REGISTER_F(ChonkBench, VerifyIndividual)->Unit(benchmark::kMillisecond)->Arg(1)->Arg(2)->Arg(4)->Arg(8);
-
-/**
- * @brief Benchmark BN254 G1 point decompression (used by SRS compressed download)
- */
-void bn254_point_decompression(benchmark::State& state)
-{
-    constexpr size_t NUM_POINTS = 1 << 17; // 131072 — typical circuit size
-
-    // Read compressed points from disk (32 bytes each, big-endian uint256_t)
-    auto compressed_buf = read_file(bb::srs::bb_crs_path() / "bn254_g1_compressed.dat", NUM_POINTS * sizeof(uint256_t));
-    std::vector<uint256_t> compressed(NUM_POINTS);
-    for (size_t i = 0; i < NUM_POINTS; ++i) {
-        compressed[i] = from_buffer<uint256_t>(compressed_buf, i * sizeof(uint256_t));
-    }
-
-    for (auto _ : state) {
-        std::vector<g1::affine_element> points(NUM_POINTS);
-        parallel_for([&](ThreadChunk chunk) {
-            for (auto i : chunk.range(NUM_POINTS)) {
-                points[i] = g1::affine_element::from_compressed(compressed[i]);
-            }
-        });
-        benchmark::DoNotOptimize(points);
-    }
-}
-BENCHMARK(bn254_point_decompression)->Unit(benchmark::kMillisecond);
-
-} // namespace
-
-BENCHMARK_MAIN();
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/pippenger_bench/bn254_decompress.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/pippenger_bench/bn254_decompress.bench.cpp
new file mode 100644
index 000000000000..f9c74bc60ea5
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/benchmark/pippenger_bench/bn254_decompress.bench.cpp
@@ -0,0 +1,41 @@
+#include <benchmark/benchmark.h>
+
+#include "barretenberg/api/file_io.hpp"
+#include "barretenberg/common/thread.hpp"
+#include "barretenberg/ecc/curves/bn254/g1.hpp"
+#include "barretenberg/srs/global_crs.hpp"
+
+using namespace benchmark;
+using namespace bb;
+
+namespace {
+
+/**
+ * @brief Benchmark BN254 G1 point decompression (used by SRS compressed download)
+ */
+void bn254_point_decompression(benchmark::State& state)
+{
+    constexpr size_t NUM_POINTS = 1 << 17; // 131072 — typical circuit size
+
+    // Read compressed points from disk (32 bytes each, big-endian uint256_t)
+    auto compressed_buf = read_file(bb::srs::bb_crs_path() / "bn254_g1_compressed.dat", NUM_POINTS * sizeof(uint256_t));
+    std::vector<uint256_t> compressed(NUM_POINTS);
+    for (size_t i = 0; i < NUM_POINTS; ++i) {
+        compressed[i] = from_buffer<uint256_t>(compressed_buf, i * sizeof(uint256_t));
+    }
+
+    for (auto _ : state) {
+        std::vector<g1::affine_element> points(NUM_POINTS);
+        parallel_for([&](ThreadChunk chunk) {
+            for (auto i : chunk.range(NUM_POINTS)) {
+                points[i] = g1::affine_element::from_compressed(compressed[i]);
+            }
+        });
+        benchmark::DoNotOptimize(points);
+    }
+}
+BENCHMARK(bn254_point_decompression)->Unit(benchmark::kMillisecond);
+
+} // namespace
+
+BENCHMARK_MAIN();
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/pippenger_bench/thread_scaling.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/pippenger_bench/thread_scaling.bench.cpp
new file mode 100644
index 000000000000..c7e4c15cb324
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/benchmark/pippenger_bench/thread_scaling.bench.cpp
@@ -0,0 +1,139 @@
+/**
+ * @brief Pippenger thread-scaling benchmark for heterogeneous scalar distributions.
+ *
+ * MSM::batch_multi_scalar_mul partitions work across threads by cumulative per-scalar
+ * weight (see get_work_units in scalar_multiplication.cpp), where each scalar's weight
+ * is ceil(bit_length / bits_per_slice) -- i.e. the number of nonzero c-bit slices it
+ * contributes to bucket accumulation. Small scalars weigh less because their high-order
+ * slices are zero and get filtered by the zero-bucket pre-sort. This benchmark exercises
+ * pathological and typical bit-size distributions to verify thread scaling stays uniform.
+ *
+ * Distributions contrasted here:
+ *   - Clustered:    first half small (32-bit), second half full random -- stresses the
+ *                   weighted split; count-based partitioning would give half the threads
+ *                   ~all of the heavy work.
+ *   - UniformMixed: small/full randomly interleaved -- isolates heterogeneity alone.
+ *   - AllFull:      all full random (z_perm-like baseline).
+ *
+ * Expected: all three scale comparably under the weighted partition.
+ */
+#include "barretenberg/common/thread.hpp"
+#include "barretenberg/ecc/curves/bn254/bn254.hpp"
+#include "barretenberg/ecc/scalar_multiplication/scalar_multiplication.hpp"
+#include "barretenberg/numeric/random/engine.hpp"
+#include "barretenberg/srs/global_crs.hpp"
+
+#include <benchmark/benchmark.h>
+
+#include "barretenberg/common/google_bb_bench.hpp"
+
+using namespace benchmark;
+
+using Curve = bb::curve::BN254;
+using Fr = Curve::ScalarField;
+using G1 = Curve::AffineElement;
+
+namespace {
+
+constexpr size_t MSM_SIZE = 1 << 20;
+
+enum class Distribution { Clustered, UniformMixed, AllFull };
+
+class ThreadScalingBench : public benchmark::Fixture {
+  public:
+    std::shared_ptr<bb::srs::factories::Crs<Curve>> srs;
+    bb::numeric::RNG& engine = bb::numeric::get_debug_randomness();
+
+    void SetUp([[maybe_unused]] const ::benchmark::State& state) override
+    {
+        if (srs) {
+            return;
+        }
+        bb::srs::init_file_crs_factory(bb::srs::bb_crs_path());
+        srs = bb::srs::get_crs_factory<Curve>()->get_crs(MSM_SIZE);
+    }
+
+    // 32-bit "small" value -- mimics witness indices, booleans, limbs.
+    // On BN254 (254-bit field) with ~14 bits per Pippenger slice, only the lowest
+    // ~2-3 rounds produce nonzero slices for these scalars; the rest get filtered.
+    Fr small_scalar() { return Fr(static_cast<uint64_t>(engine.get_random_uint32())); }
+    Fr full_scalar() { return Fr::random_element(&engine); }
+
+    std::vector<Fr> build_scalars(Distribution dist)
+    {
+        std::vector<Fr> scalars(MSM_SIZE);
+        switch (dist) {
+        case Distribution::Clustered:
+            for (size_t i = 0; i < MSM_SIZE / 2; ++i) {
+                scalars[i] = small_scalar();
+            }
+            for (size_t i = MSM_SIZE / 2; i < MSM_SIZE; ++i) {
+                scalars[i] = full_scalar();
+            }
+            break;
+        case Distribution::UniformMixed:
+            for (size_t i = 0; i < MSM_SIZE; ++i) {
+                scalars[i] = (engine.get_random_uint32() & 1U) ? small_scalar() : full_scalar();
+            }
+            break;
+        case Distribution::AllFull:
+            for (size_t i = 0; i < MSM_SIZE; ++i) {
+                scalars[i] = full_scalar();
+            }
+            break;
+        }
+        return scalars;
+    }
+};
+
+static void run_msm(ThreadScalingBench& fx, benchmark::State& state, Distribution dist)
+{
+    const size_t num_threads = static_cast<size_t>(state.range(0));
+
+    // Rebuild per-invocation of the bench is fine: scalars get mutated (Montgomery
+    // round-trip) inside batch_multi_scalar_mul, and we want consistent input across iterations.
+    std::vector<Fr> scalars = fx.build_scalars(dist);
+
+    std::vector<std::span<Fr>> scalar_spans;
+    std::vector<std::span<const G1>> point_spans;
+    scalar_spans.emplace_back(scalars);
+    point_spans.emplace_back(fx.srs->get_monomial_points().subspan(0, MSM_SIZE));
+
+    const size_t original_concurrency = bb::get_num_cpus();
+    bb::set_parallel_for_concurrency(num_threads);
+
+    for (auto _ : state) {
+        GOOGLE_BB_BENCH_REPORTER(state);
+        bb::scalar_multiplication::MSM<Curve>::batch_multi_scalar_mul(point_spans, scalar_spans, false);
+    }
+
+    bb::set_parallel_for_concurrency(original_concurrency);
+}
+
+BENCHMARK_DEFINE_F(ThreadScalingBench, Clustered)(benchmark::State& state)
+{
+    run_msm(*this, state, Distribution::Clustered);
+}
+BENCHMARK_DEFINE_F(ThreadScalingBench, UniformMixed)(benchmark::State& state)
+{
+    run_msm(*this, state, Distribution::UniformMixed);
+}
+BENCHMARK_DEFINE_F(ThreadScalingBench, AllFull)(benchmark::State& state)
+{
+    run_msm(*this, state, Distribution::AllFull);
+}
+
+static void ThreadSweep(benchmark::internal::Benchmark* b)
+{
+    for (int64_t t : { 1, 2, 4, 8 }) {
+        b->Arg(t);
+    }
+}
+
+BENCHMARK_REGISTER_F(ThreadScalingBench, Clustered)->Unit(benchmark::kMillisecond)->Apply(ThreadSweep);
+BENCHMARK_REGISTER_F(ThreadScalingBench, UniformMixed)->Unit(benchmark::kMillisecond)->Apply(ThreadSweep);
+BENCHMARK_REGISTER_F(ThreadScalingBench, AllFull)->Unit(benchmark::kMillisecond)->Apply(ThreadSweep);
+
+} // namespace
+
+BENCHMARK_MAIN();
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/relations.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/relations.bench.cpp
index 1a2acbf93f2e..58dce9fa322a 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/relations.bench.cpp
+++ b/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/relations.bench.cpp
@@ -61,7 +61,9 @@ BENCHMARK(execute_relation_for_univariates<UltraFlavor, UltraPermutationRelation
 BENCHMARK(execute_relation_for_univariates<MegaFlavor, EccOpQueueRelation<Fr>>);
 BENCHMARK(execute_relation_for_univariates<MegaFlavor, DatabusLookupRelation<Fr>>);
 BENCHMARK(execute_relation_for_univariates<MegaFlavor, Poseidon2ExternalRelation<Fr>>);
-BENCHMARK(execute_relation_for_univariates<MegaFlavor, Poseidon2InternalRelation<Fr>>);
+BENCHMARK(execute_relation_for_univariates<MegaFlavor, Poseidon2QuadInternalRelation<Fr>>);
+BENCHMARK(execute_relation_for_univariates<MegaFlavor, Poseidon2QuadInternalTerminalRelation<Fr>>);
+BENCHMARK(execute_relation_for_univariates<MegaFlavor, Poseidon2TransitionEntryRelation<Fr>>);
 
 // Ultra relations (verifier work)
 BENCHMARK(execute_relation_for_values<UltraFlavor, ArithmeticRelation<Fr>>);
@@ -76,7 +78,9 @@ BENCHMARK(execute_relation_for_values<UltraFlavor, UltraPermutationRelation<Fr>>
 BENCHMARK(execute_relation_for_values<MegaFlavor, EccOpQueueRelation<Fr>>);
 BENCHMARK(execute_relation_for_values<MegaFlavor, DatabusLookupRelation<Fr>>);
 BENCHMARK(execute_relation_for_values<MegaFlavor, Poseidon2ExternalRelation<Fr>>);
-BENCHMARK(execute_relation_for_values<MegaFlavor, Poseidon2InternalRelation<Fr>>);
+BENCHMARK(execute_relation_for_values<MegaFlavor, Poseidon2QuadInternalRelation<Fr>>);
+BENCHMARK(execute_relation_for_values<MegaFlavor, Poseidon2QuadInternalTerminalRelation<Fr>>);
+BENCHMARK(execute_relation_for_values<MegaFlavor, Poseidon2TransitionEntryRelation<Fr>>);
 
 // Translator VM
 BENCHMARK(execute_relation_for_values<TranslatorFlavor, TranslatorDecompositionRelation<Fr>>);
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/mega_honk.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/mega_honk.bench.cpp
index 6c79987705f3..81246ee0f1b8 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/mega_honk.bench.cpp
+++ b/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/mega_honk.bench.cpp
@@ -1,6 +1,7 @@
 #include <benchmark/benchmark.h>
 
 #include "barretenberg/benchmark/ultra_bench/mock_circuits.hpp"
+#include "barretenberg/common/bb_bench.hpp"
 #include "barretenberg/stdlib_circuit_builders/mega_circuit_builder.hpp"
 
 using namespace benchmark;
@@ -41,7 +42,37 @@ static void get_row_power_of_2(State& state) noexcept
     }
 }
 
+/**
+ * @brief Benchmark: Mega Honk proof of a single poseidon2 hash over a vector of state.range(0) elements.
+ */
+static void construct_proof_megahonk_poseidon2_hash(State& state) noexcept
+{
+    const auto num_inputs = static_cast<size_t>(state.range(0));
+
+    MegaCircuitBuilder builder;
+    bb::generate_poseidon2_hash_test_circuit<MegaCircuitBuilder>(builder, num_inputs);
+    auto instance = std::make_shared<ProverInstance_<MegaFlavor>>(builder);
+    info("construct_proof_megahonk_poseidon2_hash: num_inputs=",
+         num_inputs,
+         ", actual_gates=",
+         builder.num_gates(),
+         ", dyadic_size=",
+         instance->dyadic_size());
+
+    bb::mock_circuits::construct_proof_with_specified_num_iterations<MegaProver>(
+        state, &bb::generate_poseidon2_hash_test_circuit<MegaCircuitBuilder>, num_inputs);
+}
+
 // Define benchmarks
+// Sweep input sizes so dyadic domain ranges 2^15..2^19 (Mega: ~12 gates/input).
+BENCHMARK(construct_proof_megahonk_poseidon2_hash)
+    ->Arg(1500)
+    ->Arg(3000)
+    ->Arg(6000)
+    ->Arg(12000)
+    ->Arg(24000)
+    ->Arg(50000)
+    ->Unit(kMillisecond);
 
 // This exists due to an issue where get_row was blowing up in time
 BENCHMARK_CAPTURE(construct_proof_megahonk, sha256, &generate_sha256_test_circuit<MegaCircuitBuilder>)
@@ -61,4 +92,18 @@ BENCHMARK(construct_proof_megahonk_power_of_2)
     ->DenseRange(15, 20)
     ->Unit(kMillisecond);
 
-BENCHMARK_MAIN();
+int main(int argc, char** argv)
+{
+    bb::detail::use_bb_bench = true;
+
+    ::benchmark::Initialize(&argc, argv);
+    if (::benchmark::ReportUnrecognizedArguments(argc, argv))
+        return 1;
+    ::benchmark::RunSpecifiedBenchmarks();
+    ::benchmark::Shutdown();
+
+    std::cout << "\n=== Detailed BB_BENCH Profiling Stats ===\n";
+    bb::detail::GLOBAL_BENCH_STATS.print_aggregate_counts_hierarchical(std::cout);
+
+    return 0;
+}
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/ultra_honk.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/ultra_honk.bench.cpp
index 29eadf766572..b2bb734571e8 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/ultra_honk.bench.cpp
+++ b/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/ultra_honk.bench.cpp
@@ -88,7 +88,38 @@ static void construct_proof_ultrahonk_1M_gates_dyadic_2_21(State& state) noexcep
         state, &bb::mock_circuits::generate_basic_arithmetic_circuit_with_target_gates<UltraCircuitBuilder>, num_gates);
 }
 
+/**
+ * @brief Benchmark: Ultra Honk proof of a single poseidon2 hash over a vector of state.range(0) elements.
+ */
+static void construct_proof_ultrahonk_poseidon2_hash(State& state) noexcept
+{
+    const auto num_inputs = static_cast<size_t>(state.range(0));
+
+    UltraCircuitBuilder builder;
+    bb::generate_poseidon2_hash_test_circuit<UltraCircuitBuilder>(builder, num_inputs);
+    auto instance = std::make_shared<ProverInstance_<UltraFlavor>>(builder);
+    info("construct_proof_ultrahonk_poseidon2_hash: num_inputs=",
+         num_inputs,
+         ", actual_gates=",
+         builder.num_gates(),
+         ", dyadic_size=",
+         instance->dyadic_size());
+
+    bb::mock_circuits::construct_proof_with_specified_num_iterations<UltraProver>(
+        state, &bb::generate_poseidon2_hash_test_circuit<UltraCircuitBuilder>, num_inputs);
+}
+
 // Define benchmarks
+// Sweep input sizes so dyadic domain ranges 2^15..2^19 (Ultra: ~25 gates/input).
+BENCHMARK(construct_proof_ultrahonk_poseidon2_hash)
+    ->Arg(750)
+    ->Arg(1500)
+    ->Arg(3000)
+    ->Arg(6000)
+    ->Arg(12000)
+    ->Arg(50000)
+    ->Unit(kMillisecond);
+
 BENCHMARK_CAPTURE(construct_proof_ultrahonk, sha256, &generate_sha256_test_circuit<UltraCircuitBuilder>)
     ->Unit(kMillisecond);
 BENCHMARK_CAPTURE(construct_proof_ultrahonk,
diff --git a/barretenberg/cpp/src/barretenberg/boomerang_value_detection/gate_patterns.hpp b/barretenberg/cpp/src/barretenberg/boomerang_value_detection/gate_patterns.hpp
index 256e545c8ccd..ec6d51e28e69 100644
--- a/barretenberg/cpp/src/barretenberg/boomerang_value_detection/gate_patterns.hpp
+++ b/barretenberg/cpp/src/barretenberg/boomerang_value_detection/gate_patterns.hpp
@@ -322,6 +322,81 @@ inline const GatePattern POSEIDON2_EXTERNAL = { .name = "poseidon2_external",
                                                     { Wire::W_4_SHIFT, [](const Selectors&) { return true; } },
                                                 } };
 
+// ============================================================================
+// Poseidon2 Initial External Pattern (from poseidon2_initial_external_relation.hpp)
+//
+// All 4 current wires and all 4 shifted wires are constrained
+//
+// gate_selector = q_poseidon2_external_initial
+// ============================================================================
+
+inline const GatePattern POSEIDON2_INITIAL_EXTERNAL = { .name = "poseidon2_initial_external",
+                                                        .wires = {
+                                                            { Wire::W_L, [](const Selectors&) { return true; } },
+                                                            { Wire::W_R, [](const Selectors&) { return true; } },
+                                                            { Wire::W_O, [](const Selectors&) { return true; } },
+                                                            { Wire::W_4, [](const Selectors&) { return true; } },
+                                                            { Wire::W_L_SHIFT, [](const Selectors&) { return true; } },
+                                                            { Wire::W_R_SHIFT, [](const Selectors&) { return true; } },
+                                                            { Wire::W_O_SHIFT, [](const Selectors&) { return true; } },
+                                                            { Wire::W_4_SHIFT, [](const Selectors&) { return true; } },
+                                                        } };
+
+// ============================================================================
+// Poseidon2 Quad-Internal Pattern (from poseidon2_quad_internal_relation.hpp)
+//
+// gate_selector = q_poseidon2_quad_internal
+// ============================================================================
+
+inline const GatePattern POSEIDON2_QUAD_INTERNAL = { .name = "poseidon2_quad_internal",
+                                                     .wires = {
+                                                         { Wire::W_L, [](const Selectors&) { return true; } },
+                                                         { Wire::W_R, [](const Selectors&) { return true; } },
+                                                         { Wire::W_O, [](const Selectors&) { return true; } },
+                                                         { Wire::W_4, [](const Selectors&) { return true; } },
+                                                         { Wire::W_L_SHIFT, [](const Selectors&) { return true; } },
+                                                         { Wire::W_R_SHIFT, [](const Selectors&) { return true; } },
+                                                         { Wire::W_O_SHIFT, [](const Selectors&) { return true; } },
+                                                         { Wire::W_4_SHIFT, [](const Selectors&) { return true; } },
+                                                     } };
+
+// ============================================================================
+// Poseidon2 Quad-Internal Terminal Pattern
+// (from poseidon2_quad_internal_terminal_relation.hpp)
+//
+// gate_selector = q_poseidon2_quad_internal_terminal
+// ============================================================================
+
+inline const GatePattern
+    POSEIDON2_QUAD_INTERNAL_TERMINAL = { .name = "poseidon2_quad_internal_terminal",
+                                         .wires = {
+                                             { Wire::W_L, [](const Selectors&) { return true; } },
+                                             { Wire::W_R, [](const Selectors&) { return true; } },
+                                             { Wire::W_O, [](const Selectors&) { return true; } },
+                                             { Wire::W_4, [](const Selectors&) { return true; } },
+                                             { Wire::W_L_SHIFT, [](const Selectors&) { return true; } },
+                                             { Wire::W_R_SHIFT, [](const Selectors&) { return true; } },
+                                             { Wire::W_O_SHIFT, [](const Selectors&) { return true; } },
+                                             { Wire::W_4_SHIFT, [](const Selectors&) { return true; } },
+                                         } };
+
+// ============================================================================
+// Poseidon2 Transition Entry Pattern (from poseidon2_transition_entry_relation.hpp)
+//
+// gate_selector = q_poseidon2_transition_entry
+// ============================================================================
+
+inline const GatePattern POSEIDON2_TRANSITION_ENTRY = { .name = "poseidon2_transition_entry",
+                                                        .wires = {
+                                                            { Wire::W_L, [](const Selectors&) { return true; } },
+                                                            { Wire::W_R, [](const Selectors&) { return true; } },
+                                                            { Wire::W_O, [](const Selectors&) { return true; } },
+                                                            { Wire::W_4, [](const Selectors&) { return true; } },
+                                                            { Wire::W_R_SHIFT, [](const Selectors&) { return true; } },
+                                                            { Wire::W_O_SHIFT, [](const Selectors&) { return true; } },
+                                                            { Wire::W_4_SHIFT, [](const Selectors&) { return true; } },
+                                                        } };
+
 // ============================================================================
 // Databus Pattern (from databus_lookup_relation.hpp)
 //
diff --git a/barretenberg/cpp/src/barretenberg/boomerang_value_detection/gate_patterns.test.cpp b/barretenberg/cpp/src/barretenberg/boomerang_value_detection/gate_patterns.test.cpp
index 7337f59aa433..5b25ee622591 100644
--- a/barretenberg/cpp/src/barretenberg/boomerang_value_detection/gate_patterns.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/boomerang_value_detection/gate_patterns.test.cpp
@@ -11,6 +11,7 @@
 
 #include "gate_patterns.hpp"
 #include "barretenberg/flavor/mega_flavor.hpp"
+#include "barretenberg/flavor/ultra_flavor.hpp"
 #include "barretenberg/relations/databus_lookup_relation.hpp"
 #include "barretenberg/relations/delta_range_constraint_relation.hpp"
 #include "barretenberg/relations/elliptic_relation.hpp"
@@ -18,6 +19,7 @@
 #include "barretenberg/relations/memory_relation.hpp"
 #include "barretenberg/relations/non_native_field_relation.hpp"
 #include "barretenberg/relations/poseidon2_external_relation.hpp"
+#include "barretenberg/relations/poseidon2_initial_external_relation.hpp"
 #include "barretenberg/relations/poseidon2_internal_relation.hpp"
 #include "barretenberg/relations/relation_parameters.hpp"
 #include "barretenberg/relations/ultra_arithmetic_relation.hpp"
@@ -30,16 +32,16 @@ using namespace bb::gate_patterns;
 using FF = fr;
 using Entities = MegaFlavor::AllValues;
 
-Entities get_random_entities()
+template <typename E> E get_random_entities()
 {
-    Entities entities;
+    E entities;
     for (auto& field : entities.get_all()) {
         field = FF::random_element();
     }
     return entities;
 }
 
-FF& get_wire(Entities& entities, Wire wire)
+template <typename E> FF& get_wire(E& entities, Wire wire)
 {
     switch (wire) {
     case Wire::W_L:
@@ -62,7 +64,7 @@ FF& get_wire(Entities& entities, Wire wire)
     __builtin_unreachable();
 }
 
-Selectors make_selectors(const Entities& entities, int64_t gate_selector_value)
+template <typename E> Selectors make_selectors(const E& entities, int64_t gate_selector_value)
 {
     return Selectors{
         .gate_selector = gate_selector_value,
@@ -94,8 +96,8 @@ std::set<Wire> get_pattern_wires(const GatePattern& pattern, const Selectors& se
  *
  * This is the ground truth: perturb each wire and see if the output changes.
  */
-template <typename Relation>
-std::set<Wire> get_actually_constrained_wires(const Entities& entities, const auto& parameters)
+template <typename Relation, typename E>
+std::set<Wire> get_actually_constrained_wires(const E& entities, const auto& parameters)
 {
     std::set<Wire> constrained;
 
@@ -112,7 +114,7 @@ std::set<Wire> get_actually_constrained_wires(const Entities& entities, const au
                        Wire::W_R_SHIFT,
                        Wire::W_O_SHIFT,
                        Wire::W_4_SHIFT }) {
-        Entities perturbed = entities;
+        E perturbed = entities;
         get_wire(perturbed, wire) += FF::random_element();
 
         typename Relation::SumcheckArrayOfValuesOverSubrelations perturbed_result{};
@@ -131,9 +133,10 @@ std::set<Wire> get_actually_constrained_wires(const Entities& entities, const au
  *
  * @param configure_selectors Lambda that configures entity selectors and returns the gate selector field value
  */
-template <typename Relation> void verify_pattern(const GatePattern& pattern, auto configure_selectors)
+template <typename Relation, typename E = Entities>
+void verify_pattern(const GatePattern& pattern, auto configure_selectors)
 {
-    Entities entities = get_random_entities();
+    E entities = get_random_entities<E>();
     FF gate_selector = configure_selectors(entities);
     int64_t gate_selector_value = static_cast<int64_t>(uint64_t(gate_selector));
 
@@ -141,7 +144,7 @@ template <typename Relation> void verify_pattern(const GatePattern& pattern, aut
     auto pattern_claims = get_pattern_wires(pattern, selectors);
 
     auto parameters = RelationParameters<FF>::get_random();
-    auto actually_constrained = get_actually_constrained_wires<Relation>(entities, parameters);
+    auto actually_constrained = get_actually_constrained_wires<Relation, E>(entities, parameters);
 
     EXPECT_EQ(actually_constrained, pattern_claims);
 }
@@ -288,8 +291,11 @@ TEST(PatternTest, MemoryRamConsistency)
 
 TEST(PatternTest, Poseidon2Internal)
 {
-    verify_pattern<Poseidon2InternalRelation<FF>>(POSEIDON2_INTERNAL,
-                                                  [](Entities& e) { return e.q_poseidon2_internal = FF(1); });
+    // q_poseidon2_internal lives on UltraFlavor only; MegaFlavor covers all internal rounds via the
+    // compressed quad-internal block.
+    using UltraEntities = UltraFlavor::AllValues;
+    verify_pattern<Poseidon2InternalRelation<FF>, UltraEntities>(
+        POSEIDON2_INTERNAL, [](UltraEntities& e) { return e.q_poseidon2_internal = FF(1); });
 }
 
 TEST(PatternTest, Poseidon2External)
@@ -298,6 +304,12 @@ TEST(PatternTest, Poseidon2External)
                                                   [](Entities& e) { return e.q_poseidon2_external = FF(1); });
 }
 
+TEST(PatternTest, Poseidon2InitialExternal)
+{
+    verify_pattern<Poseidon2InitialExternalRelation<FF>>(
+        POSEIDON2_INITIAL_EXTERNAL, [](Entities& e) { return e.q_poseidon2_external_initial = FF(1); });
+}
+
 TEST(PatternTest, LookupBasic)
 {
     verify_pattern<LogDerivLookupRelation<FF>>(LOOKUP, [](Entities& e) {
@@ -363,7 +375,7 @@ TEST(PatternTest, DetectOverConstrained)
                                                   } };
 
     // q_arith=3 disables mul term, q_2=0 means w_r has no linear term, so w_r is unconstrained
-    Entities entities = get_random_entities();
+    Entities entities = get_random_entities<Entities>();
     entities.q_arith = FF(3);
     entities.q_m = FF(1);
     entities.q_l = FF(1);
@@ -373,7 +385,7 @@ TEST(PatternTest, DetectOverConstrained)
     auto pattern_claims = get_pattern_wires(OVERCONSTRAINED_PATTERN, selectors);
     auto correct_claims = get_pattern_wires(ARITHMETIC, selectors);
     auto parameters = RelationParameters<FF>::get_random();
-    auto actually_constrained = get_actually_constrained_wires<ArithmeticRelation<FF>>(entities, parameters);
+    auto actually_constrained = get_actually_constrained_wires<ArithmeticRelation<FF>, Entities>(entities, parameters);
 
     EXPECT_TRUE(pattern_claims.contains(Wire::W_R)) << "Over-constrained pattern claims W_R";
     EXPECT_FALSE(actually_constrained.contains(Wire::W_R)) << "Relation does not constrain W_R in this config";
@@ -402,7 +414,7 @@ TEST(PatternTest, DetectUnderConstrained)
                                      } };
 
     // RAM consistency check: q_3 != 0
-    Entities entities = get_random_entities();
+    Entities entities = get_random_entities<Entities>();
     entities.q_memory = FF(1);
     entities.q_o = FF(1); // q_3
 
@@ -410,7 +422,7 @@ TEST(PatternTest, DetectUnderConstrained)
     auto pattern_claims = get_pattern_wires(UNDERCONSTRAINED_PATTERN, selectors);
     auto correct_claims = get_pattern_wires(MEMORY, selectors);
     auto parameters = RelationParameters<FF>::get_random();
-    auto actually_constrained = get_actually_constrained_wires<MemoryRelation<FF>>(entities, parameters);
+    auto actually_constrained = get_actually_constrained_wires<MemoryRelation<FF>, Entities>(entities, parameters);
 
     EXPECT_FALSE(pattern_claims.contains(Wire::W_L)) << "Under-constrained pattern missing W_L";
     EXPECT_FALSE(pattern_claims.contains(Wire::W_R)) << "Under-constrained pattern missing W_R";
diff --git a/barretenberg/cpp/src/barretenberg/boomerang_value_detection/graph.cpp b/barretenberg/cpp/src/barretenberg/boomerang_value_detection/graph.cpp
index da01c5e79321..e225957330a0 100644
--- a/barretenberg/cpp/src/barretenberg/boomerang_value_detection/graph.cpp
+++ b/barretenberg/cpp/src/barretenberg/boomerang_value_detection/graph.cpp
@@ -272,8 +272,15 @@ template <typename FF, typename CircuitBuilder> void StaticAnalyzer_<FF, Circuit
             try_pattern(ARITHMETIC, blk.q_arith());
             try_pattern(ELLIPTIC, blk.q_elliptic());
             try_pattern(LOOKUP, blk.q_lookup());
-            try_pattern(POSEIDON2_INTERNAL, blk.q_poseidon2_internal());
             try_pattern(POSEIDON2_EXTERNAL, blk.q_poseidon2_external());
+            if constexpr (IsMegaBuilder<CircuitBuilder>) {
+                try_pattern(POSEIDON2_QUAD_INTERNAL, blk.q_poseidon2_quad_internal());
+                try_pattern(POSEIDON2_QUAD_INTERNAL_TERMINAL, blk.q_poseidon2_quad_internal_terminal());
+                try_pattern(POSEIDON2_TRANSITION_ENTRY, blk.q_poseidon2_transition_entry());
+                try_pattern(POSEIDON2_INITIAL_EXTERNAL, blk.q_poseidon2_external_initial());
+            } else {
+                try_pattern(POSEIDON2_INTERNAL, blk.q_poseidon2_internal());
+            }
             try_pattern(NON_NATIVE_FIELD, blk.q_nnf());
             try_pattern(MEMORY, blk.q_memory()); // consistency gates only; access gates via ROM/RAM transcripts
             try_pattern(DELTA_RANGE, blk.q_delta_range());
@@ -1244,11 +1251,22 @@ void StaticAnalyzer_<FF, CircuitBuilder>::print_delta_range_gate_info(size_t gat
 template <typename FF, typename CircuitBuilder>
 void StaticAnalyzer_<FF, CircuitBuilder>::print_poseidon2s_gate_info(size_t gate_index, auto& block)
 {
-    auto internal_selector = block.q_poseidon2_internal()[gate_index];
     auto external_selector = block.q_poseidon2_external()[gate_index];
-    if (!internal_selector.is_zero() || !external_selector.is_zero()) {
-        info("q_poseidon2_internal == ", internal_selector);
+    bool nonzero = !external_selector.is_zero();
+    if constexpr (IsMegaBuilder<CircuitBuilder>) {
+        nonzero = nonzero || !block.q_poseidon2_external_initial()[gate_index].is_zero() ||
+                  !block.q_poseidon2_quad_internal()[gate_index].is_zero();
+    } else {
+        nonzero = nonzero || !block.q_poseidon2_internal()[gate_index].is_zero();
+    }
+    if (nonzero) {
         info("q_poseidon2_external == ", external_selector);
+        if constexpr (IsMegaBuilder<CircuitBuilder>) {
+            info("q_poseidon2_external_initial == ", block.q_poseidon2_external_initial()[gate_index]);
+            info("q_poseidon2_quad_internal == ", block.q_poseidon2_quad_internal()[gate_index]);
+        } else {
+            info("q_poseidon2_internal == ", block.q_poseidon2_internal()[gate_index]);
+        }
         info("w_1 == ", block.w_l()[gate_index]);
         info("w_2 == ", block.w_r()[gate_index]);
         info("w_3 == ", block.w_o()[gate_index]);
diff --git a/barretenberg/cpp/src/barretenberg/boomerang_value_detection/graph_description_goblin.test.cpp b/barretenberg/cpp/src/barretenberg/boomerang_value_detection/graph_description_goblin.test.cpp
index 77cae1d02c09..c24a9d649c4f 100644
--- a/barretenberg/cpp/src/barretenberg/boomerang_value_detection/graph_description_goblin.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/boomerang_value_detection/graph_description_goblin.test.cpp
@@ -45,14 +45,16 @@ class BoomerangGoblinRecursiveVerifierTests : public testing::Test {
     {
         Goblin goblin;
         GoblinMockCircuits::construct_and_merge_mock_circuits(goblin, 5);
+        goblin.op_queue->construct_zk_columns();
 
         // Merge the ecc ops from the newly constructed circuit
         auto goblin_proof = goblin.prove();
         // Subtable values and commitments - needed for (Recursive)MergeVerifier
         MergeCommitments merge_commitments;
         auto t_current = goblin.op_queue->construct_current_ultra_ops_subtable_columns();
-        auto T_prev = goblin.op_queue->construct_previous_ultra_ops_table_columns();
-        CommitmentKey<curve::BN254> pcs_commitment_key(goblin.op_queue->get_ultra_ops_table_num_rows());
+        auto T_prev = goblin.op_queue->construct_table_columns_up_to_tail();
+        CommitmentKey<curve::BN254> pcs_commitment_key(goblin.op_queue->get_ultra_ops_table_num_rows() +
+                                                       UltraEccOpsTable::ZK_ULTRA_OPS);
         for (size_t idx = 0; idx < MegaFlavor::NUM_WIRES; idx++) {
             merge_commitments.t_commitments[idx] = pcs_commitment_key.commit(t_current[idx]);
             merge_commitments.T_prev_commitments[idx] = pcs_commitment_key.commit(T_prev[idx]);
@@ -86,7 +88,7 @@ TEST_F(BoomerangGoblinRecursiveVerifierTests, graph_description_basic)
 
     auto transcript = std::make_shared<GoblinRecursiveVerifier::Transcript>();
     GoblinStdlibProof stdlib_proof(builder, proof);
-    GoblinRecursiveVerifier verifier{ transcript, stdlib_proof, recursive_merge_commitments, MergeSettings::APPEND };
+    GoblinRecursiveVerifier verifier{ transcript, stdlib_proof, recursive_merge_commitments };
     GoblinRecursiveVerifier::ReductionResult output = verifier.reduce_to_pairing_check_and_ipa_opening();
 
     // Aggregate merge + translator pairing points
diff --git a/barretenberg/cpp/src/barretenberg/boomerang_value_detection/graph_description_goblin_avm.test.cpp b/barretenberg/cpp/src/barretenberg/boomerang_value_detection/graph_description_goblin_avm.test.cpp
index 2475005c0de3..945f7f82cfcb 100644
--- a/barretenberg/cpp/src/barretenberg/boomerang_value_detection/graph_description_goblin_avm.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/boomerang_value_detection/graph_description_goblin_avm.test.cpp
@@ -54,17 +54,14 @@ class BoomerangGoblinAvmRecursiveVerifierTests : public testing::Test {
         GoblinAvm goblin(inner_builder);
         MockCircuits::construct_arithmetic_circuit(inner_builder);
 
-        // Build a MegaAvm prover instance to get ecc_op_wire commitments matching the real flow.
-        auto mega_avm_instance = std::make_shared<ProverInstance_<MegaAvmFlavor>>(inner_builder);
-        CommitmentKey<curve::BN254> pcs_commitment_key(mega_avm_instance->dyadic_size());
-
         auto goblin_proof = goblin.prove();
 
-        // Commit to ecc_op_wire polynomials from the MegaAvm prover instance
+        // Commit to op_queue columns.
         TableCommitments table_commitments;
-        size_t idx = 0;
-        for (auto& wire : mega_avm_instance->polynomials.get_ecc_op_wires()) {
-            table_commitments[idx++] = pcs_commitment_key.commit(wire);
+        auto ultra_ops_table_columns = goblin.op_queue->construct_ultra_ops_table_columns(/*include_zk_ops=*/false);
+        CommitmentKey<curve::BN254> pcs_commitment_key(goblin.op_queue->get_ultra_ops_table_num_rows());
+        for (size_t idx = 0; idx < MegaFlavor::NUM_WIRES; idx++) {
+            table_commitments[idx] = pcs_commitment_key.commit(ultra_ops_table_columns[idx]);
         }
 
         RecursiveTableCommitments recursive_table_commitments;
diff --git a/barretenberg/cpp/src/barretenberg/boomerang_value_detection/graph_description_merge_recursive_verifier.test.cpp b/barretenberg/cpp/src/barretenberg/boomerang_value_detection/graph_description_merge_recursive_verifier.test.cpp
index f2565ca29c7b..fd1229684835 100644
--- a/barretenberg/cpp/src/barretenberg/boomerang_value_detection/graph_description_merge_recursive_verifier.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/boomerang_value_detection/graph_description_merge_recursive_verifier.test.cpp
@@ -47,22 +47,37 @@ template <class RecursiveBuilder> class BoomerangRecursiveMergeVerifierTest : pu
         EXPECT_EQ(result.second.size(), 0);
     }
 
-    static void prove_and_verify_merge(const std::shared_ptr<ECCOpQueue>& op_queue,
-                                       const MergeSettings settings = MergeSettings::PREPEND,
-                                       const bool run_analyzer = false)
+    static std::shared_ptr<ECCOpQueue> construct_final_merge_op_queue(const size_t num_subtables_up_to_tail)
+    {
+        auto op_queue = std::make_shared<ECCOpQueue>();
+
+        for (size_t idx = 0; idx < num_subtables_up_to_tail; ++idx) {
+            InnerBuilder circuit{ op_queue };
+            GoblinMockCircuits::construct_simple_circuit(circuit);
+            op_queue->merge();
+        }
+
+        op_queue->construct_zk_columns();
+
+        InnerBuilder hiding_circuit{ op_queue };
+        GoblinMockCircuits::construct_simple_circuit(hiding_circuit);
+        return op_queue;
+    }
+
+    static void prove_and_verify_merge(const std::shared_ptr<ECCOpQueue>& op_queue, const bool run_analyzer = false)
 
     {
         RecursiveBuilder outer_circuit;
 
         auto prover_transcript = std::make_shared<NativeTranscript>();
-        MergeProver merge_prover{ op_queue, prover_transcript, settings };
+        MergeProver merge_prover{ op_queue, prover_transcript };
         auto merge_proof = merge_prover.construct_proof();
 
         // Subtable values and commitments - needed for (Recursive)MergeVerifier
         MergeCommitments merge_commitments;
         RecursiveMergeCommitments recursive_merge_commitments;
         auto t_current = op_queue->construct_current_ultra_ops_subtable_columns();
-        auto T_prev = op_queue->construct_previous_ultra_ops_table_columns();
+        auto T_prev = op_queue->construct_table_columns_up_to_tail();
         for (size_t idx = 0; idx < InnerFlavor::NUM_WIRES; idx++) {
             merge_commitments.t_commitments[idx] = merge_prover.pcs_commitment_key.commit(t_current[idx]);
             merge_commitments.T_prev_commitments[idx] = merge_prover.pcs_commitment_key.commit(T_prev[idx]);
@@ -78,7 +93,7 @@ template <class RecursiveBuilder> class BoomerangRecursiveMergeVerifierTest : pu
 
         // Create a recursive merge verification circuit for the merge proof
         auto merge_transcript = std::make_shared<StdlibTranscript<RecursiveBuilder>>();
-        RecursiveMergeVerifier verifier{ settings, merge_transcript };
+        RecursiveMergeVerifier verifier{ merge_transcript };
         const stdlib::Proof<RecursiveBuilder> stdlib_merge_proof(outer_circuit, merge_proof);
         auto [pairing_points, merged_commitments, reduction_succeeded] =
             verifier.reduce_to_pairing_check(stdlib_merge_proof, recursive_merge_commitments);
@@ -96,38 +111,10 @@ template <class RecursiveBuilder> class BoomerangRecursiveMergeVerifierTest : pu
         }
     }
 
-    static void test_recursive_merge_verification_prepend()
-    {
-        auto op_queue = std::make_shared<ECCOpQueue>();
-
-        InnerBuilder circuit{ op_queue };
-        GoblinMockCircuits::construct_simple_circuit(circuit);
-        prove_and_verify_merge(op_queue);
-
-        InnerBuilder circuit2{ op_queue };
-        GoblinMockCircuits::construct_simple_circuit(circuit2);
-        prove_and_verify_merge(op_queue);
-
-        InnerBuilder circuit3{ op_queue };
-        GoblinMockCircuits::construct_simple_circuit(circuit3);
-        prove_and_verify_merge(op_queue, MergeSettings::PREPEND, true);
-    }
-
-    static void test_recursive_merge_verification_append()
+    static void test_recursive_merge_verification()
     {
-        auto op_queue = std::make_shared<ECCOpQueue>();
-
-        InnerBuilder circuit{ op_queue };
-        GoblinMockCircuits::construct_simple_circuit(circuit);
-        prove_and_verify_merge(op_queue);
-
-        InnerBuilder circuit2{ op_queue };
-        GoblinMockCircuits::construct_simple_circuit(circuit2);
-        prove_and_verify_merge(op_queue);
-
-        InnerBuilder circuit3{ op_queue };
-        GoblinMockCircuits::construct_simple_circuit(circuit3);
-        prove_and_verify_merge(op_queue, MergeSettings::APPEND, true);
+        auto op_queue = construct_final_merge_op_queue(/*num_subtables_up_to_tail=*/3);
+        prove_and_verify_merge(op_queue, /*run_analyzer=*/true);
     }
 };
 
@@ -135,14 +122,9 @@ using Builder = testing::Types<MegaCircuitBuilder>;
 
 TYPED_TEST_SUITE(BoomerangRecursiveMergeVerifierTest, Builder);
 
-TYPED_TEST(BoomerangRecursiveMergeVerifierTest, RecursiveVerificationPrepend)
-{
-    TestFixture::test_recursive_merge_verification_prepend();
-};
-
-TYPED_TEST(BoomerangRecursiveMergeVerifierTest, RecursiveVerificationAppend)
+TYPED_TEST(BoomerangRecursiveMergeVerifierTest, RecursiveMergeVerification)
 {
-    TestFixture::test_recursive_merge_verification_append();
+    TestFixture::test_recursive_merge_verification();
 };
 
 } // namespace bb::stdlib::recursion::goblin
diff --git a/barretenberg/cpp/src/barretenberg/chonk/README.md b/barretenberg/cpp/src/barretenberg/chonk/README.md
index d3963fa4adc4..8f6193b1c517 100644
--- a/barretenberg/cpp/src/barretenberg/chonk/README.md
+++ b/barretenberg/cpp/src/barretenberg/chonk/README.md
@@ -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₁]
                       ↓
@@ -400,13 +401,12 @@ A Chonk proof must reveal nothing about the private execution. ZK is achieved th
 
 The op queue contains EC operations from all circuits and must be hidden:
 
-1. **`hide_op_queue_accumulation_result`**: Hides the final accumulator point
-2. **`hide_op_queue_content_in_tail`**: Protects tail kernel op queue data
-3. **`hide_op_queue_content_in_hiding`**: Final ZK protection in Hiding kernel
+1. **Batch merge ZK prefix**: `BatchMergeProver` constructs the initial ZK rows used to hide the op queue up to the tail.
+2. **`hide_op_queue_content_in_hiding`**: Adds the final random non-ops in the hiding kernel.
 
 ### Constant Merged Table Size for ZK
 
-**Problem**: The final merge step uses APPEND mode. If the merged table size varied with transaction complexity, an observer could infer information about the transaction from the proof structure.
+**Problem**: The final merge step appends the hiding kernel table to the accumulated table. If the merged table size varied with transaction complexity, an observer could infer information about the transaction from the proof structure.
 
 **Solution**: We always merge to a **uniform total size** = `OP_QUEUE_SIZE`. In the code, `shift_size` is set to `(OP_QUEUE_SIZE - |hiding_ops|) × NUM_ROWS_PER_OP`, which represents the total degree of the prepended table and places the hiding kernel's ops at fixed positions at the end of the table, regardless of how many ops the actual transaction used.
 
@@ -686,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
 };
 
@@ -723,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.
@@ -791,7 +791,7 @@ The type is assigned to the circuit being accumulated based on its position:
 |-----------------|------------|-------------|
 | Circuit 0 | `OINK` | First app - no prior accumulator, just Oink verification |
 | Circuits 1..n-4 | `HN` | Apps, inner kernels, reset kernels - standard HyperNova folding |
-| Circuit n-3 | `HN_TAIL` | Pre-tail kernel - adds ZK masking at op queue start |
+| Circuit n-3 | `HN_TAIL` | Pre-tail kernel |
 | Circuit n-2 | `HN_FINAL` | Tail kernel - final folding + decider verification |
 | Circuit n-1 | `MEGA` | Hiding kernel - MegaZK proof, no folding |
 
@@ -802,8 +802,8 @@ The type indicates which proof is being verified BY the current kernel:
 |---------------------|-------------------|---------|
 | `OINK` | Init kernel (circuit 1) | Verify first app's Oink proof |
 | `HN` | Inner/reset kernel | Verify standard HN folding proof |
-| `HN_TAIL` | **Tail kernel** (circuit n-2) | Verify pre-tail kernel's proof, add ZK ops |
-| `HN_FINAL` | **Hiding kernel** (circuit n-1) | Verify tail kernel's proof + decider |
+| `HN_TAIL` | **Tail kernel** (circuit n-2) | Verify pre-tail kernel's proof |
+| `HN_FINAL` | **Hiding kernel** (circuit n-1) | Verify tail kernel's proof + verify batch merge +  decider |
 
 **Key Point**: `HN_TAIL` is the proof FROM circuit n-3, verified BY the tail kernel (n-2). Similarly, `HN_FINAL` is the proof FROM the tail kernel (n-2), verified BY the hiding kernel (n-1).
 
@@ -891,7 +891,7 @@ kernel_io.reconstruct_from_public(oink_result.public_inputs);
 - Extracts `ecc_op_tables` = $[M_{tail}]$ from `HidingKernelIO` public inputs
 - MegaZK verification (completed by the joint sumcheck+PCS) ensures `ecc_op_tables` is bound to the hiding kernel's proof
 
-**Step 6: Final merge (APPEND mode) - merges hiding kernel's ops with constant shift size**
+**Step 6: Final merge - merges hiding kernel's ops with constant shift size**
 
 ### Key Verifier Guarantees
 
diff --git a/barretenberg/cpp/src/barretenberg/chonk/batched_honk_translator/batched_honk_translator.test.cpp b/barretenberg/cpp/src/barretenberg/chonk/batched_honk_translator/batched_honk_translator.test.cpp
index 37901dc78b48..fc147b7964f8 100644
--- a/barretenberg/cpp/src/barretenberg/chonk/batched_honk_translator/batched_honk_translator.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/chonk/batched_honk_translator/batched_honk_translator.test.cpp
@@ -68,13 +68,13 @@ class BatchedHonkTranslatorTests : public ::testing::Test {
                                                                       size_t circuit_size_param = 500)
     {
         auto op_queue = std::make_shared<ECCOpQueue>();
-        op_queue->no_op_ultra_only();
-        add_random_ops(op_queue, TranslatorCircuitBuilder::NUM_RANDOM_OPS_START);
-        add_mixed_ops(op_queue, circuit_size_param / 2);
-        op_queue->merge();
+        // Construct zk_columns
+        op_queue->construct_zk_columns();
+        // Table with correct final structure for translator
         add_mixed_ops(op_queue, circuit_size_param / 2);
         add_random_ops(op_queue, TranslatorCircuitBuilder::NUM_RANDOM_OPS_END);
-        op_queue->merge(MergeSettings::APPEND, op_queue->get_append_offset());
+        // Merge with fixed append
+        op_queue->merge_fixed_append(op_queue->get_append_offset());
 
         TranslatorCircuitBuilder circuit(batching_challenge_v, evaluation_input_x, op_queue);
         return std::make_shared<TranslatorProvingKey>(circuit);
@@ -140,10 +140,14 @@ class BatchedHonkTranslatorTests : public ::testing::Test {
             m.add_entry(round, "ECC_OP_WIRE_" + std::to_string(i), G);
         }
         // DataBus entities:
-        for (const auto& label : { "CALLDATA",
-                                   "CALLDATA_READ_COUNTS",
-                                   "SECONDARY_CALLDATA",
-                                   "SECONDARY_CALLDATA_READ_COUNTS",
+        for (const auto& label : { "KERNEL_CALLDATA",
+                                   "KERNEL_CALLDATA_READ_COUNTS",
+                                   "FIRST_APP_CALLDATA",
+                                   "FIRST_APP_CALLDATA_READ_COUNTS",
+                                   "SECOND_APP_CALLDATA",
+                                   "SECOND_APP_CALLDATA_READ_COUNTS",
+                                   "THIRD_APP_CALLDATA",
+                                   "THIRD_APP_CALLDATA_READ_COUNTS",
                                    "RETURN_DATA",
                                    "RETURN_DATA_READ_COUNTS" }) {
             m.add_entry(round, label, G);
@@ -160,8 +164,10 @@ class BatchedHonkTranslatorTests : public ::testing::Test {
 
         // ── Round 2: MegaZK logderiv inverses + Z_PERM + translator Oink ─────────
         m.add_entry(round, "LOOKUP_INVERSES", G);
-        m.add_entry(round, "CALLDATA_INVERSES", G);
-        m.add_entry(round, "SECONDARY_CALLDATA_INVERSES", G);
+        m.add_entry(round, "KERNEL_CALLDATA_INVERSES", G);
+        m.add_entry(round, "FIRST_APP_CALLDATA_INVERSES", G);
+        m.add_entry(round, "SECOND_APP_CALLDATA_INVERSES", G);
+        m.add_entry(round, "THIRD_APP_CALLDATA_INVERSES", G);
         m.add_entry(round, "RETURN_DATA_INVERSES", G);
         m.add_entry(round, "Z_PERM", G);
         // Translator Oink: vk_hash, masking commitment, 10 wire commitments
diff --git a/barretenberg/cpp/src/barretenberg/chonk/batched_honk_translator/batched_honk_translator_verifier.cpp b/barretenberg/cpp/src/barretenberg/chonk/batched_honk_translator/batched_honk_translator_verifier.cpp
index cc727a5d0aae..23fb5bd7bbe4 100644
--- a/barretenberg/cpp/src/barretenberg/chonk/batched_honk_translator/batched_honk_translator_verifier.cpp
+++ b/barretenberg/cpp/src/barretenberg/chonk/batched_honk_translator/batched_honk_translator_verifier.cpp
@@ -55,7 +55,7 @@ typename BatchedHonkTranslatorVerifier_<Curve>::OinkResult BatchedHonkTranslator
 
     return OinkResult{
         .public_inputs = mega_zk_verifier_instance->public_inputs,
-        .calldata_commitment = mega_zk_verifier_instance->witness_commitments.calldata,
+        .kernel_calldata_commitment = mega_zk_verifier_instance->witness_commitments.kernel_calldata,
         .ecc_op_wires = mega_zk_verifier_instance->witness_commitments.get_ecc_op_wires().get_copy(),
     };
 }
diff --git a/barretenberg/cpp/src/barretenberg/chonk/batched_honk_translator/batched_honk_translator_verifier.hpp b/barretenberg/cpp/src/barretenberg/chonk/batched_honk_translator/batched_honk_translator_verifier.hpp
index 51dde12dd1ab..07d2d68172df 100644
--- a/barretenberg/cpp/src/barretenberg/chonk/batched_honk_translator/batched_honk_translator_verifier.hpp
+++ b/barretenberg/cpp/src/barretenberg/chonk/batched_honk_translator/batched_honk_translator_verifier.hpp
@@ -99,7 +99,7 @@ template <typename Curve> class BatchedHonkTranslatorVerifier_ {
      */
     struct OinkResult {
         std::vector<FF> public_inputs;
-        Commitment calldata_commitment;
+        Commitment kernel_calldata_commitment;
         std::array<Commitment, MegaZKFlavorT::NUM_WIRES> ecc_op_wires;
     };
 
@@ -114,7 +114,7 @@ template <typename Curve> class BatchedHonkTranslatorVerifier_ {
     /**
      * @brief Phase 1: Verify the MegaZK Oink phase on the shared transcript.
      * @details Loads mega_zk_proof into the transcript, runs OinkVerifier, stores verifier instance.
-     * @return OinkResult with public inputs, calldata commitment, and ECC op wires.
+     * @return OinkResult with public inputs, kernel calldata commitment, and ECC op wires.
      */
     OinkResult verify_mega_zk_oink(const Proof& mega_zk_proof);
 
diff --git a/barretenberg/cpp/src/barretenberg/chonk/chonk.cpp b/barretenberg/cpp/src/barretenberg/chonk/chonk.cpp
index b05ac4daebab..38cc184773af 100644
--- a/barretenberg/cpp/src/barretenberg/chonk/chonk.cpp
+++ b/barretenberg/cpp/src/barretenberg/chonk/chonk.cpp
@@ -19,6 +19,7 @@
 #include "barretenberg/translator_vm/translator_proving_key.hpp"
 #include "barretenberg/ultra_honk/oink_prover.hpp"
 #include "barretenberg/ultra_honk/oink_verifier.hpp"
+#include <array>
 
 namespace bb {
 
@@ -132,7 +133,7 @@ Chonk::FoldingResult Chonk::verify_folding(
 /**
  * @brief Process public inputs from a verified circuit and perform databus consistency checks
  * @details For kernel circuits: reconstructs KernelIO from public inputs, verifies that databus return data commitments
- * match witness commitments, checks accumulator hash consistency, and returns the kernel's ECC op table commitments.
+ * match witness commitments, checks accumulator hash consistency, and returns the kernel's ECC op running hash.
  * For app circuits: reconstructs AppIO from public inputs and extracts pairing points.
  * In both cases, updates the bus depot with the appropriate return data commitment.
  *
@@ -164,21 +165,25 @@ Chonk::PublicInputsResult Chonk::process_public_inputs_and_consistency_checks(
 
         // Kernel return data
         bool kernel_return_data_match =
-            kernel_input.kernel_return_data.get_value() == witness_commitments.calldata.get_value();
+            kernel_input.kernel_return_data.get_value() == witness_commitments.kernel_calldata.get_value();
         BB_ASSERT_DEBUG(kernel_return_data_match,
-                        "kernel_return_data mismatch: proof contains " << kernel_input.kernel_return_data.get_value()
-                                                                       << " but calldata commitment is "
-                                                                       << witness_commitments.calldata.get_value());
-        kernel_input.kernel_return_data.incomplete_assert_equal(witness_commitments.calldata);
-
-        // App return data
-        bool app_return_data_match =
-            kernel_input.app_return_data.get_value() == witness_commitments.secondary_calldata.get_value();
-        BB_ASSERT_DEBUG(app_return_data_match,
-                        "app_return_data mismatch: proof contains "
-                            << kernel_input.app_return_data.get_value() << " but secondary_calldata commitment is "
-                            << witness_commitments.secondary_calldata.get_value());
-        kernel_input.app_return_data.incomplete_assert_equal(witness_commitments.secondary_calldata);
+                        "kernel_return_data mismatch: proof contains "
+                            << kernel_input.kernel_return_data.get_value() << " but kernel_calldata commitment is "
+                            << witness_commitments.kernel_calldata.get_value());
+        kernel_input.kernel_return_data.incomplete_assert_equal(witness_commitments.kernel_calldata);
+
+        const std::array app_calldata_commitments{ &witness_commitments.first_app_calldata,
+                                                   &witness_commitments.second_app_calldata,
+                                                   &witness_commitments.third_app_calldata };
+        for (size_t idx = 0; idx < MAX_APPS_PER_KERNEL; ++idx) {
+            bool app_return_data_match =
+                kernel_input.app_return_data[idx].get_value() == app_calldata_commitments[idx]->get_value();
+            BB_ASSERT_DEBUG(app_return_data_match,
+                            "app_return_data mismatch: proof contains "
+                                << kernel_input.app_return_data[idx].get_value() << " but app calldata commitment "
+                                << idx << " is " << app_calldata_commitments[idx]->get_value());
+            kernel_input.app_return_data[idx].incomplete_assert_equal(*app_calldata_commitments[idx]);
+        }
 
         // ============= Perform accumulator hash consistency check =========================
 
@@ -195,14 +200,14 @@ Chonk::PublicInputsResult Chonk::process_public_inputs_and_consistency_checks(
 
         bus_depot.set_kernel_return_data_commitment(witness_commitments.return_data);
 
-        return { std::move(kernel_input.pairing_inputs), std::move(kernel_input.ecc_op_tables) };
+        return { std::move(kernel_input.pairing_inputs), std::move(kernel_input.ecc_op_hash) };
     }
 
     // App circuit path
     AppIO app_input; // pairing points
     app_input.reconstruct_from_public(public_inputs);
 
-    // Set the app return data commitment to be propagated via the public inputs
+    // Set the app return data commitment to be propagated via the public inputs. The depot owns slot allocation.
     bus_depot.set_app_return_data_commitment(witness_commitments.return_data);
 
     return { std::move(app_input.pairing_inputs), std::nullopt };
@@ -217,23 +222,19 @@ Chonk::PublicInputsResult Chonk::process_public_inputs_and_consistency_checks(
  * @param circuit
  * @param verifier_inputs {proof, vkey, type (Oink/HN)} A set of inputs for recursive verification
  * @param input_verifier_accumulator The accumulator from the previous step of recursive verification
- * @param T_prev_commitments The ECC-op table from the previous step of recursive verification (the concatenation of all
- * ECC-op subtables up to the previous folding step)
+ * @param running_hash Running hash of ECC-op column commitments from prior steps in this kernel.
  * @param accumulation_recursive_transcript Transcript shared across recursive verification of the folding of
  * K_{i-1} (kernel), A_{i,1} (app), .., A_{i, n} (app)
  */
-std::tuple<std::optional<Chonk::RecursiveVerifierAccumulator>,
-           std::vector<Chonk::PairingPoints>,
-           Chonk::TableCommitments>
+std::tuple<std::optional<Chonk::RecursiveVerifierAccumulator>, std::vector<Chonk::PairingPoints>, Chonk::StdlibFF>
 Chonk::recursive_verification_and_consistency_checks(
     ClientCircuit& circuit,
     const StdlibVerifierInputs& verifier_inputs,
     const std::optional<RecursiveVerifierAccumulator>& input_verifier_accumulator,
-    const TableCommitments& T_prev_commitments,
+    const std::optional<StdlibFF>& running_hash,
     const std::shared_ptr<RecursiveTranscript>& accumulation_recursive_transcript)
 {
     BB_BENCH_NAME("Chonk::recursive_verification_and_consistency_checks");
-    using MergeCommitments = Goblin::MergeRecursiveVerifier::InputCommitments;
 
     auto verifier_instance = std::make_shared<RecursiveVerifierInstance>(verifier_inputs.honk_vk_and_hash);
 
@@ -256,35 +257,28 @@ Chonk::recursive_verification_and_consistency_checks(
     std::vector<StdlibFF> public_inputs = std::move(verifier_instance->public_inputs);
 
     // Step 2: Process public inputs and perform databus consistency checks
-    auto [io_pairing_points, T_prev_override] = process_public_inputs_and_consistency_checks(
+    auto [io_pairing_points, previous_ecc_op_hash] = process_public_inputs_and_consistency_checks(
         verifier_inputs, public_inputs, witness_commitments, prev_accum_hash);
 
-    // Determine T_prev for merge verification
-    MergeCommitments merge_commitments;
-    if (verifier_inputs.type == QUEUE_TYPE::OINK) {
-        // T_prev = 0 in the first recursive verification
-        merge_commitments.T_prev_commitments = stdlib::recursion::honk::empty_ecc_op_tables(circuit);
-    } else if (T_prev_override) {
-        // T_prev_override is set only when the current circuit being folded is a kernel
-        // in which case it is equal to the ECC-op tables reconstructed from the public inputs
-        BB_ASSERT_EQ(verifier_inputs.is_kernel, true, "T_prev_override should only be set for kernels");
-        merge_commitments.T_prev_commitments = std::move(*T_prev_override);
-    } else {
-        merge_commitments.T_prev_commitments = T_prev_commitments;
+    std::optional<StdlibFF> updated_hash = running_hash;
+    if (previous_ecc_op_hash.has_value()) {
+        BB_ASSERT_EQ(verifier_inputs.is_kernel, true, "previous_ecc_op_hash should only be set for kernels");
+        BB_ASSERT(!running_hash.has_value(), "Running hash should not be set when recursively verifying a kernel");
+        updated_hash = previous_ecc_op_hash.value();
     }
 
-    // Step 3: Recursively verify the merge proof
-    merge_commitments.t_commitments = witness_commitments.get_ecc_op_wires().get_copy();
-    auto [merge_pairing_points, merged_table_commitments] =
-        goblin.recursively_verify_merge(circuit, merge_commitments, accumulation_recursive_transcript);
+    // Step 3: Update the running ECC op hash with this circuit's ECC op column commitments.
+    auto ecc_op_col_commitments = witness_commitments.get_ecc_op_wires().get_copy();
+    const std::vector<RecursiveCommitment> ecc_op_col_commitments_vec(ecc_op_col_commitments.begin(),
+                                                                      ecc_op_col_commitments.end());
+    updated_hash = Goblin::BatchMergeRecursiveVerifier::ecc_op_hash_step(ecc_op_col_commitments_vec, updated_hash);
 
     // Combine all pairing points
     std::vector<PairingPoints> all_points;
     all_points.insert(all_points.end(), folding_points.begin(), folding_points.end());
     all_points.emplace_back(std::move(io_pairing_points));
-    all_points.emplace_back(merge_pairing_points);
 
-    return { std::move(output_accumulator), std::move(all_points), merged_table_commitments };
+    return { std::move(output_accumulator), std::move(all_points), updated_hash.value() };
 }
 
 /**
@@ -294,7 +288,7 @@ Chonk::recursive_verification_and_consistency_checks(
  * proofs for each circuit, this method adds recursive verification constraints to kernel circuits.
  *
  * The method performs the following steps:
- *   1. SETUP: Initialize transcript, determine kernel type, add ZK masking for tail kernel
+ *   1. SETUP: Initialize transcript and determine kernel type
  *   2. VERIFICATION LOOP: Process each entry in stdlib_verification_queue (folding + merge + databus)
  *   3. OUTPUT: Set public inputs (KernelIO or HidingKernelIO) for propagation to next kernel
  *
@@ -308,8 +302,8 @@ void Chonk::complete_kernel_circuit_logic(ClientCircuit& circuit)
     // Transcript is shared across recursive verification of the folding of K_{i-1} (kernel) and A_{i} (app)
     auto accumulation_recursive_transcript = std::make_shared<RecursiveTranscript>();
 
-    // T_prev: commitment to previous merged table, propagated via public inputs
-    TableCommitments T_prev_commitments;
+    // Running Poseidon2 hash over ECC op column commitments, propagated through kernel public inputs.
+    std::optional<StdlibFF> running_hash = std::nullopt;
 
     // Convert native verification queue to circuit witnesses
     if (stdlib_verification_queue.empty()) {
@@ -317,34 +311,20 @@ void Chonk::complete_kernel_circuit_logic(ClientCircuit& circuit)
     }
 
     // Determine kernel type from queue contents
-    bool is_init_kernel =
-        stdlib_verification_queue.size() == 1 && (stdlib_verification_queue.front().type == QUEUE_TYPE::OINK);
-
-    bool is_tail_kernel =
-        stdlib_verification_queue.size() == 1 && (stdlib_verification_queue.front().type == QUEUE_TYPE::HN_TAIL);
+    bool is_init_kernel = stdlib_verification_queue.front().type == QUEUE_TYPE::OINK;
 
     bool is_hiding_kernel =
         stdlib_verification_queue.size() == 1 && (stdlib_verification_queue.front().type == QUEUE_TYPE::HN_FINAL);
 
     // The ECC-op subtable for a kernel begins with an eq-and-reset to ensure that the preceding circuit's subtable
     // cannot affect the ECC-op accumulator for the kernel.
-    if (is_tail_kernel) {
-        BB_ASSERT_EQ(circuit.op_queue->get_current_subtable_size(),
-                     0U,
-                     "tail kernel ecc ops table should be empty at this point");
-        // Add a no-op to make the op queue wires in Translator shiftable
-        circuit.queue_ecc_no_op();
-        // Add randomness at the beginning of the tail kernel (whose ecc ops fall at the beginning of the op queue
-        // table) to ensure the CHONK proof doesn't leak information about the actual content of the op queue
-        hide_op_queue_content_in_tail(circuit);
-
-        // Add the hiding op with random (non-curve) Px, Py values for statistical hiding of accumulated_result.
-        hide_op_queue_accumulation_result(circuit);
-    }
     circuit.queue_ecc_eq();
 
     // Step 2: VERIFICATION LOOP - Recursively verify each proof in the queue
 
+    BB_ASSERT(bus_depot.app_return_data_slots_are_empty(),
+              "DataBusDepot has stale app return-data slots at kernel-completion boundary");
+
     std::vector<PairingPoints> points_accumulator;
     std::optional<RecursiveVerifierAccumulator> current_stdlib_verifier_accumulator;
     if (!is_init_kernel) {
@@ -354,15 +334,15 @@ void Chonk::complete_kernel_circuit_logic(ClientCircuit& circuit)
     while (!stdlib_verification_queue.empty()) {
         const StdlibVerifierInputs& verifier_input = stdlib_verification_queue.front();
 
-        auto [output_stdlib_verifier_accumulator, pairing_points, merged_table_commitments] =
+        auto [output_stdlib_verifier_accumulator, pairing_points, updated_hash] =
             recursive_verification_and_consistency_checks(circuit,
                                                           verifier_input,
                                                           current_stdlib_verifier_accumulator,
-                                                          T_prev_commitments,
+                                                          running_hash,
                                                           accumulation_recursive_transcript);
         points_accumulator.insert(points_accumulator.end(), pairing_points.begin(), pairing_points.end());
-        // Update commitment to the status of the op_queue
-        T_prev_commitments = merged_table_commitments;
+        running_hash = updated_hash;
+
         // Update the output verifier accumulator
         current_stdlib_verifier_accumulator = output_stdlib_verifier_accumulator;
 
@@ -370,31 +350,44 @@ void Chonk::complete_kernel_circuit_logic(ClientCircuit& circuit)
     }
 
     // Step 3: OUTPUT - Set public inputs for propagation to next kernel
-
-    PairingPoints pairing_points_aggregator = PairingPoints::aggregate_multiple(points_accumulator);
+    BB_ASSERT_EQ(running_hash.has_value(), true, "Running hash should be set for public input propagation");
 
     // Output differs based on kernel type: HidingKernelIO (no accum hash) vs KernelIO (with accum hash)
     if (is_hiding_kernel) {
         BB_ASSERT_EQ(current_stdlib_verifier_accumulator.has_value(), false);
 
+        // Perform batch merge verification
+        auto [batch_pairing_points, batch_merged_table_commitments] =
+            goblin.recursively_verify_batch_merge(circuit, running_hash.value());
+
+        // Append batch merge pairing points to the list of pairing points
+        points_accumulator.emplace_back(batch_pairing_points);
+
+        // Compute aggregated pairing points for output
+        PairingPoints pairing_points_aggregator = PairingPoints::aggregate_multiple(points_accumulator);
+
         // Add randomness at the end of the hiding kernel (whose ecc ops fall right at the end of the op queue table) to
         // ensure the Chonk proof doesn't leak information about the actual content of the op queue
         hide_op_queue_content_in_hiding(circuit);
 
-        // Propagate public inputs
         HidingKernelIO hiding_output{ pairing_points_aggregator,
                                       bus_depot.get_kernel_return_data_commitment(circuit),
-                                      T_prev_commitments };
+                                      std::move(batch_merged_table_commitments) };
         hiding_output.set_public();
     } else {
         BB_ASSERT_NEQ(current_stdlib_verifier_accumulator.has_value(), false);
 
+        // Compute aggregated pairing points for output
+        PairingPoints pairing_points_aggregator = PairingPoints::aggregate_multiple(points_accumulator);
+
         // Extract native verifier accumulator from the stdlib accum to use it in the next round
         recursive_verifier_native_accum = current_stdlib_verifier_accumulator->get_value<VerifierAccumulator>();
 
-        // Get databus commitments
         auto kernel_return_data_commitment = bus_depot.get_kernel_return_data_commitment(circuit);
-        auto app_return_data_commitment = bus_depot.get_app_return_data_commitment(circuit);
+        KernelIO::AppReturnDataCommitments app_return_data_commitments;
+        for (size_t idx = 0; idx < MAX_APPS_PER_KERNEL; ++idx) {
+            app_return_data_commitments[idx] = bus_depot.get_app_return_data_commitment(circuit, idx);
+        }
 
         // Compute hash of output accumulator
         RecursiveTranscript hash_transcript;
@@ -410,8 +403,8 @@ void Chonk::complete_kernel_circuit_logic(ClientCircuit& circuit)
         // Propagate public inputs
         KernelIO kernel_output{ pairing_points_aggregator,
                                 kernel_return_data_commitment,
-                                app_return_data_commitment,
-                                T_prev_commitments,
+                                app_return_data_commitments,
+                                running_hash.value(),
                                 current_verifier_accum_hash };
         kernel_output.set_public();
     }
@@ -457,10 +450,20 @@ void Chonk::accumulate_hiding_kernel(ClientCircuit& circuit, const std::shared_p
     for (auto& block : circuit.blocks.get()) {
         block.free_data();
     }
-    hiding_vk = std::make_shared<MegaZKVerificationKey>(hiding_prover_inst->get_precomputed());
+    // MegaZKFlavor inherits VerificationKey from MegaFlavor unchanged, so MegaZKVerificationKey
+    // and MegaVerificationKey are the same type. Reuse the caller-supplied precomputed VK when
+    // present to skip the 31 sequential commitments in the NativeVerificationKey_ ctor.
+    static_assert(
+        std::is_same_v<MegaVerificationKey, MegaZKVerificationKey>,
+        "hiding-kernel precomputed VK reuse relies on MegaZKFlavor inheriting VerificationKey from MegaFlavor");
+    if (precomputed_vk) {
+        hiding_vk = precomputed_vk;
+    } else {
+        hiding_vk = std::make_shared<MegaZKVerificationKey>(hiding_prover_inst->get_precomputed());
+    }
 
     // Push VK to queue so get_hiding_kernel_vk_and_hash() can find it.
-    VerifierInputs queue_entry{ {}, precomputed_vk, QUEUE_TYPE::MEGA, /*is_kernel=*/true };
+    VerifierInputs queue_entry{ {}, hiding_vk, QUEUE_TYPE::MEGA, /*is_kernel=*/true };
     verification_queue.push_back(queue_entry);
     num_circuits_accumulated++;
 }
@@ -552,7 +555,8 @@ void Chonk::accumulate_and_fold(ClientCircuit& circuit,
 #ifndef NDEBUG
     update_native_verifier_accumulator(queue_entry, verifier_transcript);
 #endif
-    goblin.prove_merge(prover_accumulation_transcript);
+    // Keep one subtable per folded circuit and prove the batched merge after the tail kernel.
+    goblin.op_queue->merge();
 
     num_circuits_accumulated++;
 }
@@ -586,34 +590,13 @@ void Chonk::accumulate(ClientCircuit& circuit, const std::shared_ptr<MegaVerific
     } else {
         accumulate_and_fold(circuit, precomputed_vk, queue_type, std::move(prover_instance));
     }
-}
 
-/**
- * @brief Add a hiding op with fully random Px, Py field elements to prevent information leakage in Translator proof.
- *
- * @details The Translator circuit builder evaluates a batched polynomial (representing the four op queue polynomials
- * in UltraOp format) at a random challenge x. This evaluation result (called accumulated_result in translator) is
- * included in the translator proof and verified against the equivalent computation performed by ECCVM (in
- * verify_translation, establishing equivalence between ECCVM and UltraOp format).
- *
- */
-void Chonk::hide_op_queue_accumulation_result(ClientCircuit& circuit)
-{
-    // Use random Fq field elements as Px and Py.
-    using Fq = curve::Grumpkin::ScalarField; // Same as BN254::BaseField
-    circuit.queue_ecc_hiding_op(Fq::random_element(), Fq::random_element());
-}
-
-/**
- * @brief Adds three random non-ops to the tail kernel for zero-knowledge.
- *
- * @details See MERGE_PROTOCOL.md (ZK Considerations) for detailed analysis.
- */
-void Chonk::hide_op_queue_content_in_tail(ClientCircuit& circuit)
-{
-    circuit.queue_ecc_random_op();
-    circuit.queue_ecc_random_op();
-    circuit.queue_ecc_random_op();
+    prover_instance.reset();
+    if (queue_type == QUEUE_TYPE::HN_FINAL) {
+        prover_accumulator = ProverAccumulator(); // Free the prover accumulator now that it's no longer needed in the
+                                                  // remaining fold of the hiding kernel
+        goblin.prove_batch_merge();
+    }
 }
 
 /**
@@ -632,7 +615,7 @@ void Chonk::hide_op_queue_content_in_hiding(ClientCircuit& circuit)
  *
  * @details Orchestrates the batched proving flow on a shared transcript:
  *   1. MegaZK Oink (pre-sumcheck commitments for the hiding kernel)
- *   2. Merge proof (APPEND — final subtable from hiding kernel)
+ *   2. Merge proof (fixed-location append of the final subtable from the hiding kernel)
  *   3. ECCVM proof (produces translation challenges v, x)
  *   4. IPA proof (separate transcript)
  *   5. Translator Oink + Joint sumcheck + Joint PCS
@@ -643,8 +626,6 @@ void Chonk::hide_op_queue_content_in_hiding(ClientCircuit& circuit)
 ChonkProof Chonk::prove()
 {
     BB_BENCH_NAME("Chonk::prove");
-    // Deallocate the HN accumulator — no longer needed.
-    prover_accumulator = ProverAccumulator();
 
     // Share transcript between all provers.
     goblin.transcript = transcript;
@@ -653,12 +634,9 @@ ChonkProof Chonk::prove()
     BatchedHonkTranslatorProver batched_prover(hiding_prover_inst, hiding_vk, transcript);
     auto hiding_oink_proof = batched_prover.prove_mega_zk_oink();
 
-    // Phase 2: Merge proof on the shared transcript (APPEND — hiding kernel's subtable).
-    goblin.prove_merge(transcript, MergeSettings::APPEND);
-    BB_ASSERT_EQ(goblin.merge_verification_queue.size(),
-                 1U,
-                 "Chonk::prove: merge_verification_queue should contain only a single proof at this stage.");
-    auto merge_proof = goblin.merge_verification_queue.back();
+    // Phase 2: Merge proof on the shared transcript (fixed append — hiding kernel's subtable).
+    auto merge_proof = goblin.prove_merge(transcript);
+    info("Goblin: num ultra ops = ", goblin.op_queue->get_ultra_ops_count());
 
     // Phase 3: ECCVM proof on the shared transcript.
     vinfo("prove eccvm...");
diff --git a/barretenberg/cpp/src/barretenberg/chonk/chonk.hpp b/barretenberg/cpp/src/barretenberg/chonk/chonk.hpp
index 1adb143bcc86..ca5480642892 100644
--- a/barretenberg/cpp/src/barretenberg/chonk/chonk.hpp
+++ b/barretenberg/cpp/src/barretenberg/chonk/chonk.hpp
@@ -89,7 +89,7 @@ class Chonk : public IVCBase {
 
     struct PublicInputsResult {
         PairingPoints pairing_points;
-        std::optional<TableCommitments> T_prev_commitments; // set only for kernels
+        std::optional<StdlibFF> ecc_op_hash; // set only for kernels
     };
 
     /**
@@ -101,7 +101,7 @@ class Chonk : public IVCBase {
      * State machine transitions based on `num_circuits_accumulated`:
      *   - OINK:     First app (circuit 0) - no prior accumulator, just Oink verification
      *   - HN:       Apps 1..n-3, inner kernels, and reset kernels - full HyperNova folding verification
-     *   - HN_TAIL:  Circuit n-3 (last kernel before tail) - adds ZK masking at op queue start
+     *   - HN_TAIL:  Circuit n-3 (last kernel before tail)
      *   - HN_FINAL: Circuit n-2 (tail kernel) - final folding + decider verification
      *   - MEGA:     Circuit n-1 (hiding kernel) - MegaZK proof, no folding
      *
@@ -196,12 +196,12 @@ class Chonk : public IVCBase {
                                                const std::vector<std::shared_ptr<RecursiveVKAndHash>>& input_keys = {});
 
     [[nodiscard("Pairing points should be accumulated")]] std::
-        tuple<std::optional<RecursiveVerifierAccumulator>, std::vector<PairingPoints>, TableCommitments>
+        tuple<std::optional<RecursiveVerifierAccumulator>, std::vector<PairingPoints>, StdlibFF>
         recursive_verification_and_consistency_checks(
             ClientCircuit& circuit,
             const StdlibVerifierInputs& verifier_inputs,
             const std::optional<RecursiveVerifierAccumulator>& input_verifier_accumulator,
-            const TableCommitments& T_prev_commitments,
+            const std::optional<StdlibFF>& running_hash,
             const std::shared_ptr<RecursiveTranscript>& accumulation_recursive_transcript);
 
     // Complete the logic of a kernel circuit (e.g. HN/merge recursive verification, databus consistency checks)
@@ -219,8 +219,6 @@ class Chonk : public IVCBase {
 
     ChonkProof prove();
 
-    static void hide_op_queue_accumulation_result(ClientCircuit& circuit);
-    static void hide_op_queue_content_in_tail(ClientCircuit& circuit);
     static void hide_op_queue_content_in_hiding(ClientCircuit& circuit);
 
     /**
diff --git a/barretenberg/cpp/src/barretenberg/chonk/chonk.test.cpp b/barretenberg/cpp/src/barretenberg/chonk/chonk.test.cpp
index f45c55269170..8bb61abc00ef 100644
--- a/barretenberg/cpp/src/barretenberg/chonk/chonk.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/chonk/chonk.test.cpp
@@ -1,3 +1,4 @@
+#include <functional>
 #include <ranges>
 #include <sys/resource.h>
 
@@ -22,7 +23,22 @@
 
 using namespace bb;
 
-static constexpr size_t SMALL_LOG_2_NUM_GATES = 5;
+namespace {
+
+constexpr size_t SMALL_LOG_2_NUM_GATES = 5;
+
+/**
+ * @brief Enum for specifying which KernelIO field to tamper with in tests.
+ */
+enum class KernelIOField : uint8_t {
+    PAIRING_INPUTS,
+    ACCUMULATOR_HASH,
+    KERNEL_RETURN_DATA,
+    APP_RETURN_DATA,
+    ECC_OP_HASH
+};
+
+} // namespace
 
 class ChonkTests : public ::testing::Test {
   protected:
@@ -40,6 +56,11 @@ class ChonkTests : public ::testing::Test {
     using ChonkVerifier = ChonkNativeVerifier;
 
   public:
+    /**
+     * @brief Hook fired after each accumulate() inside run_ivc.
+     */
+    using AccumulateHook = std::function<void(Chonk&, size_t)>;
+
     /**
      * @brief Tamper with a proof
      * @details The first value in the proof after the public inputs is the commitment to the wire w.l (see
@@ -58,17 +79,30 @@ class ChonkTests : public ::testing::Test {
         }
     }
 
-    static std::pair<ChonkProof, std::shared_ptr<MegaZKFlavor::VKAndHash>> accumulate_and_prove_ivc(
-        size_t num_app_circuits, TestSettings settings = {}, bool check_circuit_sizes = false)
+    static std::pair<ChonkProof, std::shared_ptr<MegaZKFlavor::VKAndHash>> run_ivc(
+        size_t num_app_circuits,
+        TestSettings settings = {},
+        const AccumulateHook& post_hook = nullptr,
+        bool check_circuit_sizes = false)
     {
         CircuitProducer circuit_producer(num_app_circuits);
-        const size_t num_circuits = circuit_producer.total_num_circuits;
-        Chonk ivc{ num_circuits };
+        return run_ivc_impl(circuit_producer, settings, post_hook, check_circuit_sizes);
+    };
 
-        for (size_t j = 0; j < num_circuits; ++j) {
-            circuit_producer.construct_and_accumulate_next_circuit(ivc, settings, check_circuit_sizes);
-        }
-        return { ivc.prove(), ivc.get_hiding_kernel_vk_and_hash() };
+    static std::pair<ChonkProof, std::shared_ptr<MegaZKFlavor::VKAndHash>> run_ivc(
+        std::vector<bool> leading_is_kernel_flags,
+        TestSettings settings = {},
+        const AccumulateHook& post_hook = nullptr,
+        bool check_circuit_sizes = false)
+    {
+        CircuitProducer circuit_producer(std::move(leading_is_kernel_flags), /*large_first_app=*/false);
+        return run_ivc_impl(circuit_producer, settings, post_hook, check_circuit_sizes);
+    };
+
+    static std::pair<ChonkProof, std::shared_ptr<MegaZKFlavor::VKAndHash>> accumulate_and_prove_ivc(
+        size_t num_app_circuits, TestSettings settings = {}, bool check_circuit_sizes = false)
+    {
+        return run_ivc(num_app_circuits, settings, /*post_hook=*/nullptr, check_circuit_sizes);
     };
 
     static bool verify_chonk(const ChonkProof& proof, const std::shared_ptr<MegaZKFlavor::VKAndHash>& vk_and_hash)
@@ -77,11 +111,6 @@ class ChonkTests : public ::testing::Test {
         return verifier.verify(proof);
     }
 
-    /**
-     * @brief Enum for specifying which KernelIO field to tamper with in tests
-     */
-    enum class KernelIOField { PAIRING_INPUTS, ACCUMULATOR_HASH, KERNEL_RETURN_DATA, APP_RETURN_DATA, ECC_OP_TABLES };
-
     /**
      * @brief Helper function to test tampering with AppIO pairing inputs
      * @details Accumulates circuits, doubles the app pairing points (creating valid but different points),
@@ -91,17 +120,8 @@ class ChonkTests : public ::testing::Test {
     {
         BB_DISABLE_ASSERTS();
 
-        const size_t NUM_APP_CIRCUITS = 2;
-        CircuitProducer circuit_producer(NUM_APP_CIRCUITS);
-        const size_t NUM_CIRCUITS = circuit_producer.total_num_circuits;
-        Chonk ivc{ NUM_CIRCUITS };
         TestSettings settings{ .log2_num_gates = SMALL_LOG_2_NUM_GATES };
-
-        for (size_t idx = 0; idx < NUM_CIRCUITS; ++idx) {
-            auto [circuit, vk] = circuit_producer.create_next_circuit_and_vk(ivc, settings);
-            ivc.accumulate(circuit, vk);
-
-            // After accumulating 3 circuits (app, kernel, app), we have 2 proofs in the queue
+        auto [proof, vk] = run_ivc(/*num_app_circuits=*/2, settings, [](Chonk& ivc, size_t idx) {
             if (idx == 2) {
                 EXPECT_EQ(ivc.verification_queue.size(), 2);
 
@@ -120,10 +140,8 @@ class ChonkTests : public ::testing::Test {
 
                 app_io.to_proof(app_entry.proof, num_public_inputs);
             }
-        }
-
-        auto proof = ivc.prove();
-        EXPECT_FALSE(verify_chonk(proof, ivc.get_hiding_kernel_vk_and_hash()));
+        });
+        EXPECT_FALSE(verify_chonk(proof, vk));
     }
 
     /**
@@ -135,17 +153,8 @@ class ChonkTests : public ::testing::Test {
     {
         BB_DISABLE_ASSERTS();
 
-        const size_t NUM_APP_CIRCUITS = 2;
-        CircuitProducer circuit_producer(NUM_APP_CIRCUITS);
-        const size_t NUM_CIRCUITS = circuit_producer.total_num_circuits;
-        Chonk ivc{ NUM_CIRCUITS };
         TestSettings settings{ .log2_num_gates = SMALL_LOG_2_NUM_GATES };
-
-        for (size_t idx = 0; idx < NUM_CIRCUITS; ++idx) {
-            auto [circuit, vk] = circuit_producer.create_next_circuit_and_vk(ivc, settings);
-            ivc.accumulate(circuit, vk);
-
-            // After accumulating 3 circuits (app, kernel, app), we have 2 proofs in the queue
+        auto [proof, vk] = run_ivc(/*num_app_circuits=*/2, settings, [field_to_tamper](Chonk& ivc, size_t idx) {
             if (idx == 2) {
                 EXPECT_EQ(ivc.verification_queue.size(), 2);
 
@@ -159,9 +168,12 @@ class ChonkTests : public ::testing::Test {
                 // Tamper with the specified field
                 switch (field_to_tamper) {
                 case KernelIOField::PAIRING_INPUTS: {
-                    // Replace with a different valid pairing: P0 = G1, P1 = -G1 satisfies e(G1,[1])·e(-G1,[x]) != 1
-                    // so instead use P0 + random offset to break binding without breaking the pairing trivially
-                    kernel_io.pairing_inputs.P0() = kernel_io.pairing_inputs.P0() + Commitment::one();
+                    // Set P0 to [x]₁ (the first SRS point after [1]) and P1 to [1]₁
+                    kernel_io.pairing_inputs.P0() =
+                        srs::get_crs_factory<curve::BN254>()->get_crs(2)->get_monomial_points()[1];
+                    kernel_io.pairing_inputs.P1() = -Commitment::one();
+
+                    EXPECT_TRUE(kernel_io.pairing_inputs.check());
                     break;
                 }
                 case KernelIOField::ACCUMULATOR_HASH:
@@ -171,19 +183,17 @@ class ChonkTests : public ::testing::Test {
                     kernel_io.kernel_return_data = kernel_io.kernel_return_data + Commitment::one();
                     break;
                 case KernelIOField::APP_RETURN_DATA:
-                    kernel_io.app_return_data = kernel_io.app_return_data + Commitment::one();
+                    kernel_io.app_return_data[0] = kernel_io.app_return_data[0] + Commitment::one();
                     break;
-                case KernelIOField::ECC_OP_TABLES:
-                    kernel_io.ecc_op_tables[0] = kernel_io.ecc_op_tables[0] + Commitment::one();
+                case KernelIOField::ECC_OP_HASH:
+                    kernel_io.ecc_op_hash += FF(1);
                     break;
                 }
 
                 kernel_io.to_proof(kernel_entry.proof, num_public_inputs);
             }
-        }
-
-        auto proof = ivc.prove();
-        EXPECT_FALSE(verify_chonk(proof, ivc.get_hiding_kernel_vk_and_hash()));
+        });
+        EXPECT_FALSE(verify_chonk(proof, vk));
     }
 
     /**
@@ -202,33 +212,27 @@ class ChonkTests : public ::testing::Test {
         using KernelIOSerde = bb::stdlib::recursion::honk::KernelIOSerde;
 
         const size_t NUM_APP_CIRCUITS = 2;
-        CircuitProducer circuit_producer(NUM_APP_CIRCUITS);
-        const size_t NUM_CIRCUITS = circuit_producer.total_num_circuits;
-        Chonk ivc{ NUM_CIRCUITS };
+        const size_t NUM_TOTAL_CIRCUITS = NUM_APP_CIRCUITS * 2 + /*num_trailing_kernels*/ 3;
         TestSettings settings{ .log2_num_gates = SMALL_LOG_2_NUM_GATES };
 
-        // Extract tail kernel IO before the last accumulation consumes the verification queue.
-        // The tail kernel (HN_FINAL) uses KernelIO format; the hiding kernel uses HidingKernelIO.
+        // Extract tail kernel IO before the hiding kernel consumes the verification queue.
         KernelIOSerde tail_io;
-        for (size_t idx = 0; idx < NUM_CIRCUITS; ++idx) {
-            if (idx == NUM_CIRCUITS - 1) {
-                for (auto& it : std::ranges::reverse_view(ivc.verification_queue)) {
-                    if (it.is_kernel) {
-                        size_t num_public_inputs = it.honk_vk->num_public_inputs;
-                        ASSERT_EQ(num_public_inputs, KernelIOSerde::PUBLIC_INPUTS_SIZE)
-                            << "Tail kernel should use KernelIO format";
-                        ASSERT_GT(it.proof.size(), num_public_inputs) << "Tail kernel proof too small";
-                        tail_io = KernelIOSerde::from_proof(it.proof, num_public_inputs);
-                        break;
+        auto [proof, vk_and_hash] =
+            run_ivc(/*num_app_circuits=*/NUM_APP_CIRCUITS, settings, [&tail_io](Chonk& ivc, size_t idx) {
+                // With 2 apps the layout is [app, kernel, app, kernel, reset, tail, hiding].
+                if (idx == NUM_TOTAL_CIRCUITS - 2) {
+                    for (auto& it : std::ranges::reverse_view(ivc.verification_queue)) {
+                        if (it.is_kernel) {
+                            size_t num_public_inputs = it.honk_vk->num_public_inputs;
+                            ASSERT_EQ(num_public_inputs, KernelIOSerde::PUBLIC_INPUTS_SIZE)
+                                << "Tail kernel should use KernelIO format";
+                            ASSERT_GT(it.proof.size(), num_public_inputs) << "Tail kernel proof too small";
+                            tail_io = KernelIOSerde::from_proof(it.proof, num_public_inputs);
+                            break;
+                        }
                     }
                 }
-            }
-            auto [circuit, vk] = circuit_producer.create_next_circuit_and_vk(ivc, settings);
-            ivc.accumulate(circuit, vk);
-        }
-
-        auto proof = ivc.prove();
-        auto vk_and_hash = ivc.get_hiding_kernel_vk_and_hash();
+            });
 
         size_t hiding_kernel_pub_inputs = vk_and_hash->vk->num_public_inputs;
         ASSERT_EQ(hiding_kernel_pub_inputs, HidingKernelIOSerde::PUBLIC_INPUTS_SIZE)
@@ -240,13 +244,32 @@ class ChonkTests : public ::testing::Test {
             << "kernel_return_data mismatch: Tail has " << tail_io.kernel_return_data << " but HidingKernel has "
             << hiding_io.kernel_return_data;
     }
+
+  private:
+    static std::pair<ChonkProof, std::shared_ptr<MegaZKFlavor::VKAndHash>> run_ivc_impl(
+        CircuitProducer& circuit_producer,
+        TestSettings settings,
+        const AccumulateHook& post_hook,
+        bool check_circuit_sizes)
+    {
+        const size_t num_circuits = circuit_producer.total_num_circuits;
+        Chonk ivc{ num_circuits };
+
+        for (size_t idx = 0; idx < num_circuits; ++idx) {
+            circuit_producer.construct_and_accumulate_next_circuit(ivc, settings, check_circuit_sizes);
+            if (post_hook) {
+                post_hook(ivc, idx);
+            }
+        }
+        return { ivc.prove(), ivc.get_hiding_kernel_vk_and_hash() };
+    }
 };
 
 /**
  * @brief Test sizes of the circuits generated by MockCircuitProducer
  *
  * @details The sizes of the circuits depends on the TestSettings:
- *  - No settings: first app is 2^19, all other apps are 2^17, all the kernels are 2^18
+ *  - No settings: first app is 2^19, all other apps are 2^17, init kernel is 2^17, inner kernels are 2^18
  *  - Settings: apps are 2^(log2_num_gates + 2), all kernels are smaller than 2^19
  */
 TEST_F(ChonkTests, TestCircuitSizes)
@@ -405,7 +428,7 @@ HEAVY_TEST(ChonkKernelCapacity, MaxCapacityPassing)
 {
     bb::srs::init_file_crs_factory(bb::srs::bb_crs_path());
 
-    const size_t NUM_APP_CIRCUITS = 21;
+    const size_t NUM_APP_CIRCUITS = (CHONK_MAX_NUM_CIRCUITS - /*trailing kernels*/ 3) / 2;
     auto [proof, vk] = ChonkTests::accumulate_and_prove_ivc(NUM_APP_CIRCUITS);
 
     bool verified = ChonkTests::verify_chonk(proof, vk);
@@ -455,15 +478,7 @@ TEST_F(ChonkTests, MsgpackProofFromFileOrBuffer)
     }
 };
 
-/**
- * @brief Test that tampering with kernel pairing inputs causes verification to fail
- * @details Pairing points (P0, P1) accumulate across the IVC chain through aggregation.
- * Even if we replace them with pairing points satisfying pairing check, the public input binding should must catch it.
- */
-TEST_F(ChonkTests, KernelPairingInputsTamperingFailure)
-{
-    ChonkTests::test_kernel_io_tampering(KernelIOField::PAIRING_INPUTS);
-}
+class KernelIOTamperingTests : public ChonkTests, public testing::WithParamInterface<KernelIOField> {};
 
 /**
  * @brief Test that tampering with app pairing inputs causes verification to fail
@@ -475,46 +490,33 @@ TEST_F(ChonkTests, AppPairingInputsTamperingFailure)
     ChonkTests::test_app_io_tampering();
 }
 
-/**
- * @brief Verify that tampering with the accumulator hash in public inputs causes IVC verification failure
- * @details Each kernel outputs `output_hn_accum_hash` as a public input. The next kernel computes the hash of its
- * input accumulator and compares it with the hash from the previous kernel's public inputs via assert_equal.
- * This test tampers with the hash to verify the binding.
- */
-TEST_F(ChonkTests, AccumulatorHashTamperingFailure)
-{
-    ChonkTests::test_kernel_io_tampering(KernelIOField::ACCUMULATOR_HASH);
-}
-
-/**
- * @brief Test that tampering with kernel_return_data causes verification to fail
- * @details kernel_return_data is the commitment to the kernel's return data which must match
- * the calldata commitment of the next circuit. Tampering should cause databus consistency check to fail.
- */
-TEST_F(ChonkTests, KernelReturnDataTamperingFailure)
+TEST_P(KernelIOTamperingTests, CausesVerificationFailure)
 {
-    ChonkTests::test_kernel_io_tampering(KernelIOField::KERNEL_RETURN_DATA);
+    test_kernel_io_tampering(GetParam());
 }
 
-/**
- * @brief Test that tampering with app_return_data causes verification to fail
- * @details app_return_data is the commitment to the app's return data which must match
- * the secondary_calldata commitment of the next circuit.
- */
-TEST_F(ChonkTests, AppReturnDataTamperingFailure)
-{
-    ChonkTests::test_kernel_io_tampering(KernelIOField::APP_RETURN_DATA);
-}
-
-/**
- * @brief Test that tampering with ecc_op_tables causes verification to fail
- * @details ecc_op_tables contains commitments to merged ECC operation tables (T_prev).
- * Tampering causes the recursive merge verification to fail.
- */
-TEST_F(ChonkTests, EccOpTablesTamperingFailure)
-{
-    ChonkTests::test_kernel_io_tampering(KernelIOField::ECC_OP_TABLES);
-}
+INSTANTIATE_TEST_SUITE_P(All,
+                         KernelIOTamperingTests,
+                         testing::Values(KernelIOField::PAIRING_INPUTS,
+                                         KernelIOField::ACCUMULATOR_HASH,
+                                         KernelIOField::KERNEL_RETURN_DATA,
+                                         KernelIOField::APP_RETURN_DATA,
+                                         KernelIOField::ECC_OP_HASH),
+                         [](const testing::TestParamInfo<KernelIOField>& info) {
+                             switch (info.param) {
+                             case KernelIOField::PAIRING_INPUTS:
+                                 return "PairingInputs";
+                             case KernelIOField::ACCUMULATOR_HASH:
+                                 return "AccumulatorHash";
+                             case KernelIOField::KERNEL_RETURN_DATA:
+                                 return "KernelReturnData";
+                             case KernelIOField::APP_RETURN_DATA:
+                                 return "AppReturnData";
+                             case KernelIOField::ECC_OP_HASH:
+                                 return "EccOpHash";
+                             }
+                             return "Unknown";
+                         });
 
 /**
  * @brief Test that kernel_return_data is consistently propagated from Tail kernel to HidingKernel proof
diff --git a/barretenberg/cpp/src/barretenberg/chonk/chonk_transcript_invariants.test.cpp b/barretenberg/cpp/src/barretenberg/chonk/chonk_transcript_invariants.test.cpp
index 5a5b50c4aaa3..d4e07c6def0f 100644
--- a/barretenberg/cpp/src/barretenberg/chonk/chonk_transcript_invariants.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/chonk/chonk_transcript_invariants.test.cpp
@@ -62,22 +62,29 @@ class ChonkTranscriptInvariantTests : public ::testing::Test {
  *
  * Per-circuit transcript breakdown (from complete_kernel_circuit_logic):
  * - App circuits (0, 2): 0 transcripts - use native HN folding prover
- * - Non-hiding kernels (1, 3, 4, 5): 3 transcripts each:
- *     1. accumulation_recursive_transcript - shared across HN/Merge recursive verification
+ * - Init kernel (1): 2 transcripts:
+ *     1. accumulation_recursive_transcript
+ *     2. hash_transcript - for computing accumulator hash to propagate in public inputs
+ * - Intermediate kernel (3): 3 transcripts:
+ *     1. accumulation_recursive_transcript - shared across recursive verification
  *     2. PairingPoints::aggregate_multiple - for batching pairing points with Fiat-Shamir separator
  *     3. hash_transcript - for computing accumulator hash to propagate in public inputs
- * - Hiding kernel (6): 2 transcripts (no hash_transcript since it doesn't propagate an accumulator):
+ * - Reset and tail kernels (4, 5): 2 transcripts each:
+ *     1. accumulation_recursive_transcript
+ *     2. hash_transcript - for computing accumulator hash to propagate in public inputs
+ * - Hiding kernel (6): 3 transcripts:
  *     1. accumulation_recursive_transcript
- *     2. PairingPoints::aggregate_multiple
+ *     2. batch_merge_transcript - for final batch merge verification
+ *     3. PairingPoints::aggregate_multiple
  *
- * Total: 0 + 3 + 0 + 3 + 3 + 3 + 2 = 14 transcripts
+ * Total: 0 + 2 + 0 + 3 + 2 + 2 + 3 = 12 transcripts
  */
 TEST_F(ChonkTranscriptInvariantTests, AccumulationTranscriptCount)
 {
     // Pinned expected transcript count for 2 app circuits
-    constexpr size_t EXPECTED_TOTAL_TRANSCRIPTS = 14;
+    constexpr size_t EXPECTED_TOTAL_TRANSCRIPTS = 12;
     constexpr size_t EXPECTED_NUM_CIRCUITS = 7;
-    constexpr std::array<size_t, EXPECTED_NUM_CIRCUITS> EXPECTED_CIRCUIT_TRANSCRIPTS = { 0, 3, 0, 3, 3, 3, 2 };
+    constexpr std::array<size_t, EXPECTED_NUM_CIRCUITS> EXPECTED_CIRCUIT_TRANSCRIPTS = { 0, 2, 0, 3, 2, 2, 3 };
 
     // Record transcript index before IVC
     size_t index_before_ivc = bb::unique_transcript_index.load();
diff --git a/barretenberg/cpp/src/barretenberg/chonk/chonk_verifier.cpp b/barretenberg/cpp/src/barretenberg/chonk/chonk_verifier.cpp
index abc9d380747f..4a0664087ca1 100644
--- a/barretenberg/cpp/src/barretenberg/chonk/chonk_verifier.cpp
+++ b/barretenberg/cpp/src/barretenberg/chonk/chonk_verifier.cpp
@@ -42,9 +42,9 @@ template <> ChonkVerifier<false>::IPAReductionResult ChonkVerifier<false>::reduc
     }
 
     // Step 2: Databus consistency check
-    const Commitment calldata_commitment = oink_result.calldata_commitment;
+    const Commitment kernel_calldata_commitment = oink_result.kernel_calldata_commitment;
     const Commitment return_data_commitment = kernel_io.kernel_return_data;
-    bool databus_consistency_verified = (calldata_commitment == return_data_commitment);
+    bool databus_consistency_verified = (kernel_calldata_commitment == return_data_commitment);
     vinfo("ChonkVerifier: databus consistency verified: ", databus_consistency_verified);
     if (!databus_consistency_verified) {
         info("ChonkVerifier: verification failed at databus consistency check");
@@ -54,7 +54,7 @@ template <> ChonkVerifier<false>::IPAReductionResult ChonkVerifier<false>::reduc
     // Step 3: Merge verification
     MergeCommitments merge_commitments{ .t_commitments = oink_result.ecc_op_wires,
                                         .T_prev_commitments = kernel_io.ecc_op_tables };
-    GoblinVerifier::MergeVerifier merge_verifier{ MergeSettings::APPEND, transcript };
+    GoblinVerifier::MergeVerifier merge_verifier{ transcript };
     auto merge_result = merge_verifier.reduce_to_pairing_check(proof.merge_proof, merge_commitments);
     vinfo("ChonkVerifier: Merge reduced to pairing check: ", merge_result.reduction_succeeded ? "true" : "false");
 
@@ -146,16 +146,16 @@ template <> ChonkVerifier<true>::Output ChonkVerifier<true>::verify(const Proof&
     kernel_io.reconstruct_from_public(oink_result.public_inputs);
 
     // Step 2: Databus consistency check (in-circuit)
-    const Commitment calldata_commitment = oink_result.calldata_commitment;
-    if (kernel_io.kernel_return_data.get_value() != calldata_commitment.get_value()) {
+    const Commitment kernel_calldata_commitment = oink_result.kernel_calldata_commitment;
+    if (kernel_io.kernel_return_data.get_value() != kernel_calldata_commitment.get_value()) {
         info("ChonkRecursiveVerifier: Databus Consistency check failure");
     }
-    kernel_io.kernel_return_data.incomplete_assert_equal(calldata_commitment);
+    kernel_io.kernel_return_data.incomplete_assert_equal(kernel_calldata_commitment);
 
     // Step 3: Merge verification
     MergeCommitments merge_commitments{ .t_commitments = oink_result.ecc_op_wires,
                                         .T_prev_commitments = kernel_io.ecc_op_tables };
-    typename GoblinVerifier::MergeVerifier merge_verifier{ MergeSettings::APPEND, transcript };
+    typename GoblinVerifier::MergeVerifier merge_verifier{ transcript };
     auto merge_result = merge_verifier.reduce_to_pairing_check(proof.merge_proof, merge_commitments);
     vinfo("ChonkRecursiveVerifier: Merge reduced to pairing check: ",
           merge_result.reduction_succeeded ? "true" : "false");
diff --git a/barretenberg/cpp/src/barretenberg/chonk/mock_circuit_producer.hpp b/barretenberg/cpp/src/barretenberg/chonk/mock_circuit_producer.hpp
index ca14ddb4ff0e..08f4a2d3cb6d 100644
--- a/barretenberg/cpp/src/barretenberg/chonk/mock_circuit_producer.hpp
+++ b/barretenberg/cpp/src/barretenberg/chonk/mock_circuit_producer.hpp
@@ -13,8 +13,8 @@ namespace {
 /**
  * @brief Test utility for coordinating passing of databus data between mocked private function execution circuits
  * @details Facilitates testing of the databus consistency checks that establish the correct passing of databus data
- * between circuits. Generates arbitrary return data for each app/kernel. Sets the kernel calldata and
- * secondary_calldata based respectively on the previous kernel return data and app return data.
+ * between circuits. Generates arbitrary return data for each app/kernel. Sets the kernel calldata and app calldata
+ * columns based respectively on the previous kernel return data and each app return data.
  */
 class MockDatabusProducer {
   private:
@@ -24,7 +24,7 @@ class MockDatabusProducer {
     using BusDataArray = std::vector<FF>;
 
     static constexpr size_t BUS_ARRAY_SIZE = 3; // arbitrary length of mock bus inputs
-    BusDataArray app_return_data;
+    std::array<BusDataArray, MAX_APPS_PER_KERNEL> app_return_data;
     BusDataArray kernel_return_data;
 
     FF dummy_return_val = 1; // use simple return val for easier test debugging
@@ -41,31 +41,38 @@ class MockDatabusProducer {
 
   public:
     /**
-     * @brief Update the app return data and populate it in the app circuit
+     * @brief Update the next app return data and populate it in the app circuit. App slots are processed in order.
      */
     void populate_app_databus(ClientCircuit& circuit)
     {
-        app_return_data = generate_random_bus_array();
-        for (auto& val : app_return_data) {
-            circuit.add_public_return_data(circuit.add_variable(val));
+        for (auto& app_data : app_return_data) {
+            if (app_data.empty()) {
+                app_data = generate_random_bus_array();
+                for (auto& val : app_data) {
+                    circuit.add_public_return_data(circuit.add_variable(val));
+                }
+                return;
+            }
         }
     };
 
     /**
-     * @brief Populate the calldata and secondary calldata in the kernel from respectively the previous kernel and app
-     * return data. Update and populate the return data for the present kernel.
+     * @brief Populate the kernel calldata and app calldata columns from respectively the previous kernel and app return
+     * data. Update and populate the return data for the present kernel.
      */
     void populate_kernel_databus(ClientCircuit& circuit)
     {
-        // Populate calldata from previous kernel return data (if it exists)
+        // Populate kernel calldata from previous kernel return data (if it exists)
         for (auto& val : kernel_return_data) {
-            circuit.add_public_calldata(circuit.add_variable(val));
+            circuit.add_public_calldata(BusId::KERNEL_CALLDATA, circuit.add_variable(val));
         }
-        // Populate secondary_calldata from app return data (if it exists), then clear the app return data
-        for (auto& val : app_return_data) {
-            circuit.add_public_secondary_calldata(circuit.add_variable(val));
+        // Populate app calldata from app return data (if it exists), then clear the app return data
+        for (size_t idx = 0; idx < app_return_data.size(); ++idx) {
+            for (auto& val : app_return_data[idx]) {
+                circuit.add_public_calldata(static_cast<BusId>(idx + 1), circuit.add_variable(val));
+            }
+            app_return_data[idx].clear();
         }
-        app_return_data.clear();
 
         // Mock the return data for the present kernel circuit
         kernel_return_data = generate_random_bus_array();
@@ -73,12 +80,6 @@ class MockDatabusProducer {
             circuit.add_public_return_data(circuit.add_variable(val));
         }
     };
-
-    /**
-     * @brief Add an arbitrary value to the app return data. This leads to a descrepency between the values used by the
-     * app itself and the secondary_calldata values in the kernel that will be set based on these tampered values.
-     */
-    void tamper_with_app_return_data() { app_return_data.emplace_back(17); }
 };
 
 /**
@@ -133,6 +134,18 @@ class PrivateFunctionExecutionMockCircuitProducer {
         }
     }
 
+    PrivateFunctionExecutionMockCircuitProducer(std::vector<bool> leading_is_kernel_flags, bool large_first_app = false)
+        : is_kernel_flags(std::move(leading_is_kernel_flags))
+        , large_first_app(large_first_app)
+    {
+        BB_ASSERT(!is_kernel_flags.empty(), "Mock circuit layout must contain at least one leading circuit");
+        BB_ASSERT_EQ(is_kernel_flags[0], false, "Mock circuit layout must start with an app circuit");
+        for (size_t i = 0; i < NUM_TRAILING_KERNELS; ++i) {
+            is_kernel_flags.emplace_back(true);
+        }
+        total_num_circuits = is_kernel_flags.size();
+    }
+
     /**
      * @brief Precompute the verification key for the given circuit.
      */
@@ -225,12 +238,14 @@ class PrivateFunctionExecutionMockCircuitProducer {
                     if (is_trailing_kernel) {
                         // Trailing kernels should be significantly smaller, with hiding kernel < 2^16
                         BB_ASSERT_LTE(log2_dyadic_size,
-                                      16UL,
+                                      17UL,
                                       "Trailing kernel circuit size has exceeded expected bound (should be <= 2^16).");
                         vinfo("Log number of gates in a trailing kernel circuit is: ", log2_dyadic_size);
                     } else {
+                        const bool is_init_kernel = circuit_counter == 2;
+                        const size_t expected_log2_dyadic_size = is_init_kernel ? 17UL : 18UL;
                         BB_ASSERT_EQ(log2_dyadic_size,
-                                     18UL,
+                                     expected_log2_dyadic_size,
                                      "There has been a change in the number of gates of a mock kernel circuit.");
                     }
                 } else {
@@ -264,11 +279,6 @@ class PrivateFunctionExecutionMockCircuitProducer {
         auto [circuit, vk] = create_next_circuit_and_vk(ivc, settings, check_circuit_sizes);
         ivc.accumulate(circuit, vk);
     }
-
-    /**
-     * @brief Tamper with databus data to facilitate failure testing
-     */
-    void tamper_with_databus() { mock_databus.tamper_with_app_return_data(); }
 };
 
 } // namespace
diff --git a/barretenberg/cpp/src/barretenberg/chonk/test_bench_shared.hpp b/barretenberg/cpp/src/barretenberg/chonk/test_bench_shared.hpp
index 233ac460ac71..9d79e8e3dffc 100644
--- a/barretenberg/cpp/src/barretenberg/chonk/test_bench_shared.hpp
+++ b/barretenberg/cpp/src/barretenberg/chonk/test_bench_shared.hpp
@@ -7,15 +7,9 @@
 
 namespace bb {
 
-/**
- * @brief Perform a specified number of circuit accumulation rounds
- *
- * @param NUM_CIRCUITS Number of circuits to accumulate (apps + kernels)
- */
 std::pair<ChonkProof, std::shared_ptr<MegaZKFlavor::VKAndHash>> accumulate_and_prove_with_precomputed_vks(
-    size_t num_app_circuits, auto& precomputed_vks, const bool large_first_app = true)
+    PrivateFunctionExecutionMockCircuitProducer& circuit_producer, auto& precomputed_vks)
 {
-    PrivateFunctionExecutionMockCircuitProducer circuit_producer(num_app_circuits, large_first_app);
     const size_t NUM_CIRCUITS = circuit_producer.total_num_circuits;
     Chonk ivc{ NUM_CIRCUITS };
 
@@ -33,11 +27,28 @@ std::pair<ChonkProof, std::shared_ptr<MegaZKFlavor::VKAndHash>> accumulate_and_p
     return { ivc.prove(), ivc.get_hiding_kernel_vk_and_hash() };
 }
 
-std::vector<std::shared_ptr<typename MegaFlavor::VerificationKey>> precompute_vks(const size_t num_app_circuits,
-                                                                                  const bool large_first_app = true)
+/**
+ * @brief Perform a specified number of circuit accumulation rounds
+ *
+ * @param num_app_circuits Number of app circuits to accumulate
+ */
+std::pair<ChonkProof, std::shared_ptr<MegaZKFlavor::VKAndHash>> accumulate_and_prove_with_precomputed_vks(
+    size_t num_app_circuits, auto& precomputed_vks, const bool large_first_app = true)
+{
+    PrivateFunctionExecutionMockCircuitProducer circuit_producer(num_app_circuits, large_first_app);
+    return accumulate_and_prove_with_precomputed_vks(circuit_producer, precomputed_vks);
+}
+
+std::pair<ChonkProof, std::shared_ptr<MegaZKFlavor::VKAndHash>> accumulate_and_prove_with_precomputed_vks(
+    std::vector<bool> leading_is_kernel_flags, auto& precomputed_vks, const bool large_first_app = false)
+{
+    PrivateFunctionExecutionMockCircuitProducer circuit_producer(std::move(leading_is_kernel_flags), large_first_app);
+    return accumulate_and_prove_with_precomputed_vks(circuit_producer, precomputed_vks);
+}
+
+std::vector<std::shared_ptr<typename MegaFlavor::VerificationKey>> precompute_vks(
+    PrivateFunctionExecutionMockCircuitProducer& circuit_producer)
 {
-    using CircuitProducer = PrivateFunctionExecutionMockCircuitProducer;
-    CircuitProducer circuit_producer(num_app_circuits, large_first_app);
     const size_t NUM_CIRCUITS = circuit_producer.total_num_circuits;
     Chonk ivc{ NUM_CIRCUITS };
 
@@ -46,7 +57,7 @@ std::vector<std::shared_ptr<typename MegaFlavor::VerificationKey>> precompute_vk
 
         auto circuit = circuit_producer.create_next_circuit(ivc);
         const bool is_hiding_kernel = (j == NUM_CIRCUITS - 1);
-        auto vk = CircuitProducer::get_verification_key(circuit, is_hiding_kernel);
+        auto vk = PrivateFunctionExecutionMockCircuitProducer::get_verification_key(circuit, is_hiding_kernel);
         vkeys.push_back(vk);
         ivc.accumulate(circuit, vk);
     }
@@ -54,4 +65,18 @@ std::vector<std::shared_ptr<typename MegaFlavor::VerificationKey>> precompute_vk
     return vkeys;
 }
 
+std::vector<std::shared_ptr<typename MegaFlavor::VerificationKey>> precompute_vks(const size_t num_app_circuits,
+                                                                                  const bool large_first_app = true)
+{
+    PrivateFunctionExecutionMockCircuitProducer circuit_producer(num_app_circuits, large_first_app);
+    return precompute_vks(circuit_producer);
+}
+
+std::vector<std::shared_ptr<typename MegaFlavor::VerificationKey>> precompute_vks(
+    std::vector<bool> leading_is_kernel_flags, const bool large_first_app = false)
+{
+    PrivateFunctionExecutionMockCircuitProducer circuit_producer(std::move(leading_is_kernel_flags), large_first_app);
+    return precompute_vks(circuit_producer);
+}
+
 } // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/circuit_checker/mega_circuit_builder.test.cpp b/barretenberg/cpp/src/barretenberg/circuit_checker/mega_circuit_builder.test.cpp
index 05dd9f15a08e..e923638d315e 100644
--- a/barretenberg/cpp/src/barretenberg/circuit_checker/mega_circuit_builder.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/circuit_checker/mega_circuit_builder.test.cpp
@@ -165,8 +165,8 @@ TEST(MegaCircuitBuilder, GoblinEccOpQueueUltraOps)
 
 /**
  * @brief Check that the selector partitioning is correct for the mega circuit builder
- * @details We check that for the arithmetic, delta_range, elliptic, memory, nnf, lookup, busread, poseidon2_external,
- * poseidon2_internal blocks, and the other selectors are zero on that block.
+ * @details We check that for the arithmetic, delta_range, elliptic, memory, nnf, lookup, busread, poseidon2_external
+ * blocks, and the other selectors are zero on that block.
  */
 TEST(MegaCircuitBuilder, CompleteSelectorPartitioningCheck)
 {
@@ -203,8 +203,12 @@ TEST(MegaCircuitBuilder, CompleteSelectorPartitioningCheck)
             if (&block != &builder.blocks.poseidon2_external) {
                 EXPECT_EQ(block.q_poseidon2_external()[i], 0);
             }
-            if (&block != &builder.blocks.poseidon2_internal) {
-                EXPECT_EQ(block.q_poseidon2_internal()[i], 0);
+            // The Mega compressed Poseidon2 relations are selected only inside `poseidon2_quad_internal`;
+            // all three selectors must be zero on every other block.
+            if (&block != &builder.blocks.poseidon2_quad_internal) {
+                EXPECT_EQ(block.q_poseidon2_quad_internal()[i], 0);
+                EXPECT_EQ(block.q_poseidon2_quad_internal_terminal()[i], 0);
+                EXPECT_EQ(block.q_poseidon2_transition_entry()[i], 0);
             }
         }
     }
@@ -272,9 +276,8 @@ TEST(MegaCircuitBuilder, EmptyCircuitFinalization)
     EXPECT_EQ(builder.blocks.memory.size(), 0);
     EXPECT_EQ(builder.blocks.nnf.size(), 0);
     EXPECT_EQ(builder.blocks.poseidon2_external.size(), 0);
-    EXPECT_EQ(builder.blocks.poseidon2_internal.size(), 0);
-    EXPECT_EQ(builder.get_calldata().size(), 0);
-    EXPECT_EQ(builder.get_secondary_calldata().size(), 0);
+    EXPECT_EQ(builder.get_calldata(BusId::KERNEL_CALLDATA).size(), 0);
+    EXPECT_EQ(builder.get_calldata(BusId::APP_CALLDATA).size(), 0);
     EXPECT_EQ(builder.get_return_data().size(), 0);
 
     EXPECT_TRUE(CircuitChecker::check(builder));
@@ -289,13 +292,13 @@ TEST(MegaCircuitBuilder, DatabusOutOfBoundsReadFails)
 
     // Add single entry to calldata
     auto val = builder.add_variable(fr(42));
-    builder.add_public_calldata(val);
+    builder.add_public_calldata(BusId::KERNEL_CALLDATA, val);
 
     // Try to read at index 1 (out of bounds - only index 0 exists)
     auto bad_idx = builder.add_variable(fr(1));
 
     // This should trigger an assertion in read_calldata
-    EXPECT_THROW(builder.read_calldata(bad_idx), std::runtime_error);
+    EXPECT_THROW(builder.read_calldata(BusId::KERNEL_CALLDATA, bad_idx), std::runtime_error);
 }
 
 } // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/circuit_checker/ultra_circuit_checker.cpp b/barretenberg/cpp/src/barretenberg/circuit_checker/ultra_circuit_checker.cpp
index 30b9c10e5f18..71aaa07a188c 100644
--- a/barretenberg/cpp/src/barretenberg/circuit_checker/ultra_circuit_checker.cpp
+++ b/barretenberg/cpp/src/barretenberg/circuit_checker/ultra_circuit_checker.cpp
@@ -175,9 +175,13 @@ bool UltraCircuitChecker::check_block(Builder& builder,
         if (!result) {
             return report_fail("Failed Lookup check relation at row idx = ", idx);
         }
-        result = result && check_relation<PoseidonInternal>(values, params);
-        if (!result) {
-            return report_fail("Failed PoseidonInternal relation at row idx = ", idx);
+        if constexpr (!IsMegaBuilder<Builder>) {
+            // Mega covers all internal rounds via the compressed block; there is no
+            // q_poseidon2_internal selector in MegaFlavor.
+            result = result && check_relation<PoseidonInternal>(values, params);
+            if (!result) {
+                return report_fail("Failed PoseidonInternal relation at row idx = ", idx);
+            }
         }
         result = result && check_relation<PoseidonExternal>(values, params);
         if (!result) {
@@ -185,6 +189,22 @@ bool UltraCircuitChecker::check_block(Builder& builder,
         }
 
         if constexpr (IsMegaBuilder<Builder>) {
+            result = result && check_relation<PoseidonInitialExternal>(values, params);
+            if (!result) {
+                return report_fail("Failed PoseidonInitialExternal relation at row idx = ", idx);
+            }
+            result = result && check_relation<PoseidonQuadInternal>(values, params);
+            if (!result) {
+                return report_fail("Failed PoseidonQuadInternal relation at row idx = ", idx);
+            }
+            result = result && check_relation<PoseidonQuadInternalTerminal>(values, params);
+            if (!result) {
+                return report_fail("Failed PoseidonQuadInternalTerminal relation at row idx = ", idx);
+            }
+            result = result && check_relation<PoseidonTransitionEntry>(values, params);
+            if (!result) {
+                return report_fail("Failed PoseidonTransitionEntry relation at row idx = ", idx);
+            }
             result = result && check_databus_read(values, builder);
             if (!result) {
                 return report_fail("Failed databus read at row idx = ", idx);
@@ -242,7 +262,9 @@ template <typename Builder> bool UltraCircuitChecker::check_databus_read(auto& v
         auto value = values.w_l;
 
         // Map bus_idx → wire-linear selector on the values struct (mirrors BusData<i>::selector in the relation).
-        const std::array<const FF*, NUM_BUS_COLUMNS> bus_selectors{ &values.q_l, &values.q_r, &values.q_o };
+        const std::array<const FF*, NUM_BUS_COLUMNS> bus_selectors{
+            &values.q_l, &values.q_r, &values.q_o, &values.q_4, &values.q_m
+        };
 
         // Locate the bus column being read (exactly one selector should be active on a busread row) and look up the
         // expected value from the builder's bus vector.
@@ -360,10 +382,16 @@ void UltraCircuitChecker::populate_values(
     values.q_memory = block.q_memory()[idx];
     values.q_nnf = block.q_nnf()[idx];
     values.q_lookup = block.q_lookup()[idx];
-    values.q_poseidon2_internal = block.q_poseidon2_internal()[idx];
     values.q_poseidon2_external = block.q_poseidon2_external()[idx];
     if constexpr (IsMegaBuilder<Builder>) {
+        values.q_5 = block.q_5()[idx];
+        values.q_poseidon2_external_initial = block.q_poseidon2_external_initial()[idx];
+        values.q_poseidon2_quad_internal = block.q_poseidon2_quad_internal()[idx];
+        values.q_poseidon2_quad_internal_terminal = block.q_poseidon2_quad_internal_terminal()[idx];
+        values.q_poseidon2_transition_entry = block.q_poseidon2_transition_entry()[idx];
         values.q_busread = block.q_busread()[idx];
+    } else {
+        values.q_poseidon2_internal = block.q_poseidon2_internal()[idx];
     }
 }
 
diff --git a/barretenberg/cpp/src/barretenberg/circuit_checker/ultra_circuit_checker.hpp b/barretenberg/cpp/src/barretenberg/circuit_checker/ultra_circuit_checker.hpp
index 43ef54a47ecc..ed59806ccabd 100644
--- a/barretenberg/cpp/src/barretenberg/circuit_checker/ultra_circuit_checker.hpp
+++ b/barretenberg/cpp/src/barretenberg/circuit_checker/ultra_circuit_checker.hpp
@@ -6,7 +6,11 @@
 #include "barretenberg/relations/memory_relation.hpp"
 #include "barretenberg/relations/non_native_field_relation.hpp"
 #include "barretenberg/relations/poseidon2_external_relation.hpp"
+#include "barretenberg/relations/poseidon2_initial_external_relation.hpp"
 #include "barretenberg/relations/poseidon2_internal_relation.hpp"
+#include "barretenberg/relations/poseidon2_quad_internal_relation.hpp"
+#include "barretenberg/relations/poseidon2_quad_internal_terminal_relation.hpp"
+#include "barretenberg/relations/poseidon2_transition_entry_relation.hpp"
 #include "barretenberg/relations/relation_parameters.hpp"
 #include "barretenberg/relations/ultra_arithmetic_relation.hpp"
 #include "barretenberg/stdlib_circuit_builders/ultra_circuit_builder.hpp"
@@ -24,7 +28,11 @@ class UltraCircuitChecker {
     using NonNativeField = NonNativeFieldRelation<FF>;
     using DeltaRangeConstraint = DeltaRangeConstraintRelation<FF>;
     using PoseidonExternal = Poseidon2ExternalRelation<FF>;
+    using PoseidonInitialExternal = Poseidon2InitialExternalRelation<FF>;
     using PoseidonInternal = Poseidon2InternalRelation<FF>;
+    using PoseidonQuadInternal = Poseidon2QuadInternalRelation<FF>;
+    using PoseidonQuadInternalTerminal = Poseidon2QuadInternalTerminalRelation<FF>;
+    using PoseidonTransitionEntry = Poseidon2TransitionEntryRelation<FF>;
     using Params = RelationParameters<FF>;
 
     /**
diff --git a/barretenberg/cpp/src/barretenberg/commitment_schemes/gemini/gemini.hpp b/barretenberg/cpp/src/barretenberg/commitment_schemes/gemini/gemini.hpp
index 24479d52b138..0cc9972c85c2 100644
--- a/barretenberg/cpp/src/barretenberg/commitment_schemes/gemini/gemini.hpp
+++ b/barretenberg/cpp/src/barretenberg/commitment_schemes/gemini/gemini.hpp
@@ -183,12 +183,21 @@ template <typename Curve> class GeminiProver_ {
             BB_BENCH_NAME("compute_batched");
             Fr running_scalar(1);
 
-            // Batch base polynomials; updates running_scalar in place
+            // Batch base polynomials via a single fused parallel_for over the destination range,
+            // amortising N× parallel_for startup overhead into 1×. Updates running_scalar in place.
             auto batch = [&](Polynomial& batched, const RefVector<Polynomial>& polynomials_to_batch) {
-                for (auto& poly : polynomials_to_batch) {
-                    batched.add_scaled(poly, running_scalar);
+                const size_t n = polynomials_to_batch.size();
+                std::vector<PolynomialSpan<const Fr>> sources;
+                std::vector<Fr> scalars;
+                sources.reserve(n);
+                scalars.reserve(n);
+                for (size_t i = 0; i < n; ++i) {
+                    sources.emplace_back(polynomials_to_batch[i]);
+                    scalars.push_back(running_scalar);
                     running_scalar *= challenge;
                 }
+                add_scaled_batch(
+                    batched, std::span<const PolynomialSpan<const Fr>>(sources), std::span<const Fr>(scalars));
             };
 
             // Batch tails into a small accumulator with the correct rho power per tail.
diff --git a/barretenberg/cpp/src/barretenberg/constants.hpp b/barretenberg/cpp/src/barretenberg/constants.hpp
index 405f690b9e26..1a6d03a3c0f5 100644
--- a/barretenberg/cpp/src/barretenberg/constants.hpp
+++ b/barretenberg/cpp/src/barretenberg/constants.hpp
@@ -61,4 +61,16 @@ static constexpr uint32_t NUM_TRANSLATION_EVALUATIONS = 5;
 
 // The number of leading zero rows in the execution trace. Used to enable shifted polynomials.
 static constexpr size_t NUM_ZERO_ROWS = 1;
+
+// The maximum number of app circuits a single kernel can recursively verify in one accumulation group.
+static constexpr uint8_t MAX_APPS_PER_KERNEL = 3;
+
+static constexpr size_t CHONK_MAX_NUM_CIRCUITS = 48 + /*trailing kernels*/ 3;
+
+static constexpr size_t BATCH_MERGE_PROOF_SIZE =
+    /*num subtables*/ 1 +
+    /*shift sizes*/ CHONK_MAX_NUM_CIRCUITS +
+    /*commitments*/ (4 * (4 * (CHONK_MAX_NUM_CIRCUITS + /*zk tables, merged tables*/ 2) + /*degree check*/ 1)) +
+    /*evals*/ (4 * (CHONK_MAX_NUM_CIRCUITS + 2) + 1) +
+    /*shplonk and kzg*/ 8;
 } // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/crypto/poseidon2/README.md b/barretenberg/cpp/src/barretenberg/crypto/poseidon2/README.md
index cf4d815d84f2..198223839525 100644
--- a/barretenberg/cpp/src/barretenberg/crypto/poseidon2/README.md
+++ b/barretenberg/cpp/src/barretenberg/crypto/poseidon2/README.md
@@ -8,7 +8,7 @@ Poseidon2 hash function for BN254 scalar field. Reference: https://eprint.iacr.o
 Fast hashing outside circuits: Merkle trees, protocol operations, witness generation.
 
 ### Circuit (`stdlib/hash/poseidon2/`)
-The circuit implementation uses **native Poseidon2 to compute witness values**, then records them into custom gates. The round function is not re-implemented with arithmetic gates—instead, custom gate relations (`Poseidon2ExternalRelation`, `Poseidon2InternalRelation`) verify the witnesses satisfy Poseidon2 equations.
+The circuit implementation uses **native Poseidon2 to compute witness values**, then records them into custom gates. The round function is not re-implemented with arithmetic gates. The canonical circuit documentation, including the Mega K=4 quad-internal layout and soundness argument, lives in `stdlib/hash/poseidon2/README.md`.
 
 ### TypeScript (`yarn-project/foundation/src/crypto/poseidon/`)
 Client-side hashing in Node.js and browser via WASM. The TypeScript wrapper (`poseidon2Hash`, `poseidon2Permutation`) calls `c_bind.cpp` exports through `bb.js`. Used by sequencer, PXE, and wallet for computing hashes that must match on-chain verification.
diff --git a/barretenberg/cpp/src/barretenberg/crypto/poseidon2/poseidon2_quad_closed_form.test.cpp b/barretenberg/cpp/src/barretenberg/crypto/poseidon2/poseidon2_quad_closed_form.test.cpp
new file mode 100644
index 000000000000..78a6f04e5dc2
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/crypto/poseidon2/poseidon2_quad_closed_form.test.cpp
@@ -0,0 +1,180 @@
+// Equivalence test: closed-form 4-round propagation vs. step iteration.
+//
+// The K=4 compressed Poseidon2 internal-round relation currently computes (out_0..out_3) from
+// (w_l, w_r, w_o, w_4, q_l..q_4) via:
+//   1) S-boxes  u_k = (w_k + q_k)^5  for k = 0..3
+//   2) Vandermonde RHS  b_1, b_2, b_3  (linear in w_r, w_o, w_4 and u_0, u_1, u_2)
+//   3) Lagrange solve   s_j^{(0)} = α_j^(1) b_1 + α_j^(2) b_2 + α_j^(3) b_3
+//   4) Four step iterations of the internal-MDS update on (s_1, s_2, s_3)
+//   5) out_0 = D_1 u_3 + T_3,  out_{1,2,3} = state[1..3] at round 4
+//
+// Steps 2..5 are linear in (w_r, w_o, w_4, u_0..u_3) (everything is linear once the four S-boxes
+// are taken as opaque inputs). They can be folded into a single linear map. This test verifies
+// that the coefficient tables consumed by the relations agree with explicit step iteration on
+// random inputs.
+
+#include "barretenberg/crypto/poseidon2/poseidon2_quad_params.hpp"
+#include "barretenberg/ecc/curves/bn254/fr.hpp"
+
+#include <array>
+#include <gtest/gtest.h>
+
+namespace {
+
+using FF = bb::fr;
+using QuadParams = bb::crypto::Poseidon2QuadBn254Params;
+
+struct Out {
+    FF out_0, out_1, out_2, out_3;
+};
+
+// Reference: same body as Poseidon2QuadInternalRelationImpl::accumulate, evaluated
+// in plain field arithmetic.
+Out reference_step_iter(FF s1, FF s2, FF s3, FF u0, FF u1, FF u2, FF u3)
+{
+    auto step = [](FF& x1, FF& x2, FF& x3, const FF& u) {
+        FF sum = x1 + x2 + x3;
+        FF t = u + sum;
+        FF n1 = t + x1 * (QuadParams::D2 - FF(1));
+        FF n2 = t + x2 * (QuadParams::D3 - FF(1));
+        FF n3 = t + x3 * (QuadParams::D4 - FF(1));
+        x1 = n1;
+        x2 = n2;
+        x3 = n3;
+    };
+    step(s1, s2, s3, u0);
+    step(s1, s2, s3, u1);
+    step(s1, s2, s3, u2);
+    FF T_3 = s1 + s2 + s3;
+    FF out_0 = u3 * QuadParams::D1 + T_3;
+    step(s1, s2, s3, u3);
+    return { out_0, s1, s2, s3 };
+}
+
+Out closed_form(FF w_r, FF w_o, FF w_4, FF u0, FF u1, FF u2, FF u3)
+{
+    const auto& table = QuadParams::tables.closed_form;
+    auto eval = [&](size_t row) {
+        return table[row][0] * w_r + table[row][1] * w_o + table[row][2] * w_4 + table[row][3] * u0 +
+               table[row][4] * u1 + table[row][5] * u2 + table[row][6] * u3;
+    };
+    return { eval(0), eval(1), eval(2), eval(3) };
+}
+
+// Reference path: derive (s_1^{(0)}, s_2^{(0)}, s_3^{(0)}) from (w_*, u_*) via the b_k formulas
+// + Lagrange solve, then iterate the internal-MDS steps explicitly.
+Out reference_from_wires(FF w_r, FF w_o, FF w_4, FF u0, FF u1, FF u2, FF u3)
+{
+    const FF D1 = QuadParams::D1;
+    const FF S = QuadParams::SIGMA;
+    FF b_1 = w_r - D1 * u0;
+    FF b_2 = -FF(2) * w_r + w_o + (FF(2) * D1 - FF(3)) * u0 - D1 * u1;
+    FF b_3 = -(S + FF(2)) * w_r - w_o + w_4 + ((S + FF(2)) * D1 - S - FF(3)) * u0 + (D1 - FF(3)) * u1 - D1 * u2;
+    FF s1 = QuadParams::alpha_1_1 * b_1 + QuadParams::alpha_1_2 * b_2 + QuadParams::alpha_1_3 * b_3;
+    FF s2 = QuadParams::alpha_2_1 * b_1 + QuadParams::alpha_2_2 * b_2 + QuadParams::alpha_2_3 * b_3;
+    FF s3 = QuadParams::alpha_3_1 * b_1 + QuadParams::alpha_3_2 * b_2 + QuadParams::alpha_3_3 * b_3;
+    return reference_step_iter(s1, s2, s3, u0, u1, u2, u3);
+}
+
+} // namespace
+
+TEST(Poseidon2QuadClosedForm, ForwardVandermondeLhsMatchesWeightedSum)
+{
+    // Sanity: each forward-Vandermonde LHS row should equal the weighted sum of the
+    // out_1, out_2, out_3 closed-form rows.
+    const std::array<std::array<FF, 3>, 3> weights = {
+        { { FF(1), FF(1), FF(1) },
+          { QuadParams::D2, QuadParams::D3, QuadParams::D4 },
+          { QuadParams::D2 * QuadParams::D2, QuadParams::D3 * QuadParams::D3, QuadParams::D4 * QuadParams::D4 } }
+    };
+    for (size_t k = 0; k < 3; ++k) {
+        for (size_t i = 0; i < 7; ++i) {
+            FF expected = weights[k][0] * QuadParams::tables.closed_form[1][i] +
+                          weights[k][1] * QuadParams::tables.closed_form[2][i] +
+                          weights[k][2] * QuadParams::tables.closed_form[3][i];
+            EXPECT_EQ(QuadParams::tables.forward_vandermonde_lhs[k][i], expected) << "row " << k << " col " << i;
+        }
+    }
+}
+
+TEST(Poseidon2QuadClosedForm, MatchesStepIteration)
+{
+    for (int trial = 0; trial < 100; ++trial) {
+        FF w_r = FF::random_element();
+        FF w_o = FF::random_element();
+        FF w_4 = FF::random_element();
+        FF u0 = FF::random_element();
+        FF u1 = FF::random_element();
+        FF u2 = FF::random_element();
+        FF u3 = FF::random_element();
+
+        Out ref = reference_from_wires(w_r, w_o, w_4, u0, u1, u2, u3);
+        Out cf = closed_form(w_r, w_o, w_4, u0, u1, u2, u3);
+
+        EXPECT_EQ(ref.out_0, cf.out_0) << "trial " << trial;
+        EXPECT_EQ(ref.out_1, cf.out_1) << "trial " << trial;
+        EXPECT_EQ(ref.out_2, cf.out_2) << "trial " << trial;
+        EXPECT_EQ(ref.out_3, cf.out_3) << "trial " << trial;
+    }
+}
+
+// The terminal relation `Poseidon2QuadInternalTerminalRelationImpl::accumulate` exploits the
+// fact that the U_3 coefficient of out_1, out_2, out_3 in the closed-form table is identically
+// 1, allowing it to write `+ u_3` instead of `+ u_3 * C[k][6]` (lines 85-87 of
+// poseidon2_quad_internal_terminal_relation.hpp). This invariant is hard-coded by `build_out_j`
+// (`r[U_3] = FF(1)`); if a future refactor removes that line, the terminal relation becomes
+// silently incorrect. This sentinel test pins the invariant.
+TEST(Poseidon2QuadClosedForm, TerminalU3CoefIsOne)
+{
+    EXPECT_EQ(QuadParams::tables.closed_form[QuadParams::OUT_1][QuadParams::U_3], FF(1));
+    EXPECT_EQ(QuadParams::tables.closed_form[QuadParams::OUT_2][QuadParams::U_3], FF(1));
+    EXPECT_EQ(QuadParams::tables.closed_form[QuadParams::OUT_3][QuadParams::U_3], FF(1));
+}
+
+// Edge-case adversarial inputs. The 100 random trials in `MatchesStepIteration` are
+// statistically sufficient (false-positive prob ~ 100/p), but they may miss bugs that only
+// manifest at special field-arithmetic boundary values. This test exercises:
+//   - All-zero inputs (a fixed point of the linear dynamics).
+//   - 1 and -1 (smallest nonzero values).
+//   - Inputs producing u_k = 0 for various k (testing the "driver = 0" sub-cases).
+//   - p/2 and other large values (exercising any path that branches on representation).
+TEST(Poseidon2QuadClosedForm, MatchesStepIterationOnEdgeCases)
+{
+    const FF zero = FF::zero();
+    const FF one = FF(1);
+    const FF neg_one = -FF(1);
+    const FF p_half = -(one * (FF(2).invert())); // (-1)/2 = (p-1)/2 mod p
+
+    struct Trial {
+        const char* name;
+        FF w_r, w_o, w_4, u0, u1, u2, u3;
+    };
+
+    const std::array<Trial, 8> trials = { {
+        { "all_zero", zero, zero, zero, zero, zero, zero, zero },
+        { "all_one", one, one, one, one, one, one, one },
+        { "all_neg_one", neg_one, neg_one, neg_one, neg_one, neg_one, neg_one, neg_one },
+        { "p_half", p_half, p_half, p_half, p_half, p_half, p_half, p_half },
+        { "u0_zero", one, one, one, zero, one, one, one },
+        { "u3_zero", one, one, one, one, one, one, zero },
+        { "all_u_zero", FF::random_element(), FF::random_element(), FF::random_element(), zero, zero, zero, zero },
+        { "all_w_zero",
+          zero,
+          zero,
+          zero,
+          FF::random_element(),
+          FF::random_element(),
+          FF::random_element(),
+          FF::random_element() },
+    } };
+
+    for (const auto& t : trials) {
+        Out ref = reference_from_wires(t.w_r, t.w_o, t.w_4, t.u0, t.u1, t.u2, t.u3);
+        Out cf = closed_form(t.w_r, t.w_o, t.w_4, t.u0, t.u1, t.u2, t.u3);
+
+        EXPECT_EQ(ref.out_0, cf.out_0) << "trial " << t.name;
+        EXPECT_EQ(ref.out_1, cf.out_1) << "trial " << t.name;
+        EXPECT_EQ(ref.out_2, cf.out_2) << "trial " << t.name;
+        EXPECT_EQ(ref.out_3, cf.out_3) << "trial " << t.name;
+    }
+}
diff --git a/barretenberg/cpp/src/barretenberg/crypto/poseidon2/poseidon2_quad_params.hpp b/barretenberg/cpp/src/barretenberg/crypto/poseidon2/poseidon2_quad_params.hpp
new file mode 100644
index 000000000000..6eebc963be1b
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/crypto/poseidon2/poseidon2_quad_params.hpp
@@ -0,0 +1,313 @@
+// Derived parameters for the K=4 "quad" compressed Poseidon2 internal-round encoding on BN254.
+// Treated like the base Poseidon2 constants: fixed, derivable from the sponge spec, pre-computed.
+//
+// See `barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/README.md` for the algebraic
+// derivation. The short version:
+//
+//   The compressed K=4 row stores state[0] at 4 consecutive internal rounds. Solving for the
+//   non-S-boxed elements (s_1, s_2, s_3) at row-start reduces (via row-reduction) to a 3x3
+//   Vandermonde system with nodes (D_2, D_3, D_4). Its Lagrange-basis inverse has 9 fixed
+//   coefficients α_j^(k) that let us write s_j = Σ_k α_j^(k) b_k where b_k are linear in wires.
+//
+// This file exposes those 9 coefficients, the derived diagonal constants used by the entry
+// relation, and the closed-form propagation tables consumed by the quad relations.
+//
+// Static assertions guard invertibility: the three Vandermonde differences (D_3 - D_2),
+// (D_4 - D_2), (D_4 - D_3) must all be nonzero.
+
+#pragma once
+
+#include "barretenberg/crypto/poseidon2/poseidon2_params.hpp"
+#include "barretenberg/ecc/curves/bn254/fr.hpp"
+
+#include <array>
+#include <cstddef>
+
+namespace bb::crypto {
+
+struct Poseidon2QuadBn254Params {
+    using FF = Poseidon2Bn254ScalarFieldParams::FF;
+    static constexpr size_t VANDERMONDE_SIZE = Poseidon2Bn254ScalarFieldParams::t - 1;
+
+    // Internal matrix diagonal D_i (computed from the stored `D_i - 1` values).
+    static constexpr FF D1 = FF(1) + Poseidon2Bn254ScalarFieldParams::internal_matrix_diagonal_minus_one[0];
+    static constexpr FF D2 = FF(1) + Poseidon2Bn254ScalarFieldParams::internal_matrix_diagonal_minus_one[1];
+    static constexpr FF D3 = FF(1) + Poseidon2Bn254ScalarFieldParams::internal_matrix_diagonal_minus_one[2];
+    static constexpr FF D4 = FF(1) + Poseidon2Bn254ScalarFieldParams::internal_matrix_diagonal_minus_one[3];
+
+    static constexpr FF SIGMA = D2 + D3 + D4; // Σ = D_2 + D_3 + D_4, recurs in the relation algebra
+
+  private:
+    // Vandermonde differences (used below and also asserted non-zero).
+    static constexpr FF D2_minus_D3 = D2 - D3;
+    static constexpr FF D2_minus_D4 = D2 - D4;
+    static constexpr FF D3_minus_D4 = D3 - D4;
+
+    // 1 / ((D_2 - D_3)(D_2 - D_4)) — denominator for α_1^(·)
+    static constexpr FF inv_denom_1 = (D2_minus_D3 * D2_minus_D4).invert();
+    // 1 / ((D_3 - D_2)(D_3 - D_4)) — denominator for α_2^(·)
+    static constexpr FF inv_denom_2 = ((-D2_minus_D3) * D3_minus_D4).invert();
+    // 1 / ((D_4 - D_2)(D_4 - D_3)) — denominator for α_3^(·)
+    static constexpr FF inv_denom_3 = ((-D2_minus_D4) * (-D3_minus_D4)).invert();
+
+    // Invertibility guard. det(V) = (D_3 - D_2)(D_4 - D_2)(D_4 - D_3).
+    static_assert(!D2_minus_D3.is_zero(), "Poseidon2 quad: D_2 == D_3, Vandermonde singular");
+    static_assert(!D2_minus_D4.is_zero(), "Poseidon2 quad: D_2 == D_4, Vandermonde singular");
+    static_assert(!D3_minus_D4.is_zero(), "Poseidon2 quad: D_3 == D_4, Vandermonde singular");
+
+  public:
+    // Lagrange basis coefficients α_j^(k).
+    //
+    //   s_j = α_j^(1) * b_1 + α_j^(2) * b_2 + α_j^(3) * b_3
+    //
+    // where b_k is the k-th right-hand side of the row-reduced Vandermonde system. These are
+    // the coefficients of the Lagrange polynomial at node D_{j+1} (taking nodes (D_2, D_3, D_4)):
+    //
+    //   L_j(x) = α_j^(1) + α_j^(2) * x + α_j^(3) * x^2
+    //          = Π_{k ≠ j} (x - D_{k+1}) / (D_{j+1} - D_{k+1})
+    //
+    // Concretely:
+    //   α_1^(1) =  D_3 * D_4     / ((D_2 - D_3)(D_2 - D_4))
+    //   α_1^(2) = -(D_3 + D_4)   / ((D_2 - D_3)(D_2 - D_4))
+    //   α_1^(3) =  1             / ((D_2 - D_3)(D_2 - D_4))
+    //   (and analogously for α_2^(k), α_3^(k))
+    // α_j^(1): constant term of L_j.
+    static constexpr FF alpha_1_1 = D3 * D4 * inv_denom_1;
+    static constexpr FF alpha_2_1 = D2 * D4 * inv_denom_2;
+    static constexpr FF alpha_3_1 = D2 * D3 * inv_denom_3;
+
+    // α_j^(2): linear term (negated sum of other nodes, divided by the denominator)
+    static constexpr FF alpha_1_2 = -(D3 + D4) * inv_denom_1;
+    static constexpr FF alpha_2_2 = -(D2 + D4) * inv_denom_2;
+    static constexpr FF alpha_3_2 = -(D2 + D3) * inv_denom_3;
+
+    // α_j^(3): quadratic term (pure reciprocal of the denominator)
+    static constexpr FF alpha_1_3 = inv_denom_1;
+    static constexpr FF alpha_2_3 = inv_denom_2;
+    static constexpr FF alpha_3_3 = inv_denom_3;
+
+    // Closed-form 4-round propagation coefficients.
+    //
+    // The four-round internal-block update on the non-S-boxed lanes (s_1, s_2, s_3) is linear
+    // once the four S-boxed scalars u_k = (w_k + c_k)^5 are taken as opaque inputs:
+    //
+    //   step(v, u) = A v + u · 1,    A = [[D_2,1,1],[1,D_3,1],[1,1,D_4]]
+    //
+    // After 4 rounds with inputs u_0..u_3, the state-at-round-4 components (out_1, out_2, out_3)
+    // and the state-at-round-3 row-sum T_3 (used by out_0 = D_1 u_3 + T_3) are all fixed linear
+    // combinations of (w_r, w_o, w_4, u_0, u_1, u_2, u_3), where the (w_r, w_o, w_4)-dependence
+    // enters through  s^{(0)} = V^{-1} b  and  b_k = linear(w_*, u_0..u_2). Composing  A^4 V^{-1}
+    // with the b_k formulas gives the 28 constants below, one per (output, input) cell.
+    //
+    // Equivalence to the step iteration is verified in a unit test (see `poseidon2_quad_closed_form.test.cpp`).
+    //
+    // Linear round-propagation vectors  (A^k · 1)_j  for k = 1, 2.
+    //
+    // Used by both the entry relation (which checks state[0] at rounds 1, 2 from a standard
+    // encoded predecessor) and the closed-form table builder below. These simple scalar formulas
+    // remain constexpr.
+    //
+    //   A_one[j]  = (A · 1)_j   = D_{j+1} + 2
+    //   A2_one[j] = (A^2 · 1)_j = D_{j+1}^2 + D_{j+1} + Σ + 4
+    //   sum_A_one = 1^T A · 1   = Σ + 6  (also = (A · 1) summed over rows)
+    static constexpr std::array<FF, VANDERMONDE_SIZE> A_one = { D2 + FF(2), D3 + FF(2), D4 + FF(2) };
+    static constexpr std::array<FF, VANDERMONDE_SIZE> A2_one = {
+        D2 * D2 + D2 + SIGMA + FF(4),
+        D3* D3 + D3 + SIGMA + FF(4),
+        D4* D4 + D4 + SIGMA + FF(4),
+    };
+    static constexpr FF sum_A_one = SIGMA + FF(6);
+
+    // Closed-form coefficient table layout. Each row gives coefficients for the inputs
+    //   (w_r, w_o, w_4, u_0, u_1, u_2, u_3),
+    // where u_k = (s_0^{(k)} + c_k)^5.
+    //
+    //   closed_form[j] for j in {0,1,2,3}: coefficients of out_j, i.e. state[j] after four
+    //                                      internal rounds. The terminal relation consumes all
+    //                                      four rows; the interior relation consumes row 0.
+    //
+    //   forward_vandermonde_lhs[k] for k in {0,1,2}: coefficients of the forward-Vandermonde
+    //                                                combinations used by the interior relation:
+    //                                                row 0 = out_1 + out_2 + out_3
+    //                                                row 1 = D_2 out_1 + D_3 out_2 + D_4 out_3
+    //                                                row 2 = D_2^2 out_1 + D_3^2 out_2 + D_4^2 out_3
+    enum ClosedFormColumn : size_t {
+        W_R,
+        W_O,
+        W_4,
+        U_0,
+        U_1,
+        U_2,
+        U_3,
+    };
+    enum ClosedFormOutput : size_t {
+        OUT_0,
+        OUT_1,
+        OUT_2,
+        OUT_3,
+    };
+    static constexpr size_t CLOSED_FORM_INPUT_COUNT = VANDERMONDE_SIZE + Poseidon2Bn254ScalarFieldParams::t;
+    static_assert(CLOSED_FORM_INPUT_COUNT == U_3 + 1);
+    using ClosedFormRow = std::array<FF, CLOSED_FORM_INPUT_COUNT>;
+    using ClosedFormTable = std::array<ClosedFormRow, 4>;
+    using ForwardVandermondeTable = std::array<ClosedFormRow, VANDERMONDE_SIZE>;
+
+  private:
+    // Derive the coefficient tables once from the fixed Poseidon2 parameters. The relation code
+    // reads only the resulting `closed_form` and `forward_vandermonde_lhs` tables.
+    struct Tables {
+        ClosedFormTable closed_form;
+        ForwardVandermondeTable forward_vandermonde_lhs;
+    };
+
+    using Mat = std::array<std::array<FF, VANDERMONDE_SIZE>, VANDERMONDE_SIZE>;
+    using Vec = std::array<FF, VANDERMONDE_SIZE>;
+
+    static constexpr Mat matrix_multiply(const Mat& a, const Mat& b)
+    {
+        Mat r{};
+        for (size_t i = 0; i < VANDERMONDE_SIZE; ++i) {
+            for (size_t j = 0; j < VANDERMONDE_SIZE; ++j) {
+                FF s = FF(0);
+                for (size_t k = 0; k < VANDERMONDE_SIZE; ++k) {
+                    s += a[i][k] * b[k][j];
+                }
+                r[i][j] = s;
+            }
+        }
+        return r;
+    }
+
+    static constexpr Vec matrix_vector_multiply(const Mat& a, const Vec& v)
+    {
+        Vec r{};
+        for (size_t i = 0; i < VANDERMONDE_SIZE; ++i) {
+            FF s = FF(0);
+            for (size_t k = 0; k < VANDERMONDE_SIZE; ++k) {
+                s += a[i][k] * v[k];
+            }
+            r[i] = s;
+        }
+        return r;
+    }
+
+    static constexpr Vec vector_matrix_multiply(const Vec& v, const Mat& a)
+    {
+        Vec r{};
+        for (size_t j = 0; j < VANDERMONDE_SIZE; ++j) {
+            FF s = FF(0);
+            for (size_t k = 0; k < VANDERMONDE_SIZE; ++k) {
+                s += v[k] * a[k][j];
+            }
+            r[j] = s;
+        }
+        return r;
+    }
+
+    static constexpr FF vector_sum(const Vec& v)
+    {
+        FF result = FF(0);
+        for (const auto& entry : v) {
+            result += entry;
+        }
+        return result;
+    }
+
+    static constexpr ClosedFormRow weighted_closed_form_sum(const Vec& weights, const ClosedFormTable& table)
+    {
+        ClosedFormRow r{};
+        for (size_t i = 0; i < CLOSED_FORM_INPUT_COUNT; ++i) {
+            r[i] = weights[0] * table[OUT_1][i] + weights[1] * table[OUT_2][i] + weights[2] * table[OUT_3][i];
+        }
+        return r;
+    }
+
+    static Tables build_tables()
+    {
+        const Vec ones = { FF(1), FF(1), FF(1) };
+        // A: internal-round update on (s_1, s_2, s_3). step(v, u) = A v + u·1.
+        const Mat A = { { { D2, FF(1), FF(1) }, { FF(1), D3, FF(1) }, { FF(1), FF(1), D4 } } };
+        const Mat A2 = matrix_multiply(A, A);
+        const Mat A3 = matrix_multiply(A2, A);
+        const Mat A4 = matrix_multiply(A3, A);
+        const Vec A_one = matrix_vector_multiply(A, ones);
+        const Vec A2_one = matrix_vector_multiply(A2, ones);
+        const Vec A3_one = matrix_vector_multiply(A3, ones);
+
+        // V_inv (rows are Lagrange coefs α_j^(*)).
+        const Mat Vinv = { { { alpha_1_1, alpha_1_2, alpha_1_3 },
+                             { alpha_2_1, alpha_2_2, alpha_2_3 },
+                             { alpha_3_1, alpha_3_2, alpha_3_3 } } };
+        // M = A^4 · V_inv: maps b → b-derived part of out_{1,2,3} at round 4.
+        const Mat M = matrix_multiply(A4, Vinv);
+
+        // B_w: rows are w-coefs of b_1, b_2, b_3 on (w_r, w_o, w_4).
+        const Mat Bw = { { { FF(1), FF(0), FF(0) }, { -FF(2), FF(1), FF(0) }, { -(SIGMA + FF(2)), -FF(1), FF(1) } } };
+        // B_u: rows are (u_0, u_1, u_2)-coefs of b_1, b_2, b_3.
+        const Mat Bu = { { { -D1, FF(0), FF(0) },
+                           { FF(2) * D1 - FF(3), -D1, FF(0) },
+                           { (SIGMA + FF(2)) * D1 - SIGMA - FF(3), D1 - FF(3), -D1 } } };
+
+        const Mat Mw = matrix_multiply(M, Bw);  // w-coefs of out_{1,2,3}
+        const Mat MBu = matrix_multiply(M, Bu); // b-derived part of u-coefs
+
+        // T_3 = sum of state[1..3] at round 3.
+        // q_T3 = (1^T A^3) · V_inv: projection coefficients for the b-derived part of T_3.
+        const Vec col_sum_A3 = vector_matrix_multiply(ones, A3);
+        const Vec q_T3 = vector_matrix_multiply(col_sum_A3, Vinv);
+        const FF sum_A_one = vector_sum(A_one);
+        const FF sum_A2_one = vector_sum(A2_one);
+
+        const Vec row0_wire_coefficients = vector_matrix_multiply(q_T3, Bw);
+        const Vec row0_u_coefficients = vector_matrix_multiply(q_T3, Bu);
+
+        // out_0 = D_1 u_3 + T_3.
+        // T_3's wire-coefs:  q_T3 · B_w  (1×3 · 3×3 → 1×3)
+        // T_3's u-coefs:     q_T3 · B_u  + (sum_A2_one, sum_A_one, 3) inhomogeneous additions
+        ClosedFormRow row0{};
+        for (size_t i = 0; i < VANDERMONDE_SIZE; ++i) {
+            row0[i] = row0_wire_coefficients[i];
+        }
+        row0[U_0] = row0_u_coefficients[0] + sum_A2_one;
+        row0[U_1] = row0_u_coefficients[1] + sum_A_one;
+        row0[U_2] = row0_u_coefficients[2] + FF(3);
+        row0[U_3] = D1;
+
+        // out_j (j=1,2,3): u_3 coefficient is identically 1 (free add at use site).
+        auto build_out_j = [&](size_t j) {
+            ClosedFormRow r{};
+            r[W_R] = Mw[j][0];
+            r[W_O] = Mw[j][1];
+            r[W_4] = Mw[j][2];
+            r[U_0] = MBu[j][0] + A3_one[j];
+            r[U_1] = MBu[j][1] + A2_one[j];
+            r[U_2] = MBu[j][2] + A_one[j];
+            r[U_3] = FF(1);
+            return r;
+        };
+
+        ClosedFormTable closed_form_table{ row0, build_out_j(0), build_out_j(1), build_out_j(2) };
+
+        // Forward-Vandermonde LHS rows: linear combinations across out_{1,2,3} weighted by
+        //   row 0: (1, 1, 1)              → out_1 + out_2 + out_3
+        //   row 1: (D_2, D_3, D_4)        → D_2 out_1 + D_3 out_2 + D_4 out_3
+        //   row 2: (D_2², D_3², D_4²)     → D_2² out_1 + D_3² out_2 + D_4² out_3
+        // Each row's coefficients on (w_*, u_*) are obtained by the same weighted sum applied
+        // to the corresponding (w_*, u_*) coefficients of out_1..out_3.
+        const std::array<Vec, VANDERMONDE_SIZE> lhs_weights = {
+            { { FF(1), FF(1), FF(1) }, { D2, D3, D4 }, { D2 * D2, D3 * D3, D4 * D4 } }
+        };
+        ForwardVandermondeTable lhs_table{};
+        for (size_t k = 0; k < VANDERMONDE_SIZE; ++k) {
+            lhs_table[k] = weighted_closed_form_sum(lhs_weights[k], closed_form_table);
+        }
+
+        return Tables{ closed_form_table, lhs_table };
+    }
+
+  public:
+    // Public coefficient tables consumed by the relations.
+    static inline const Tables tables = build_tables();
+};
+
+} // namespace bb::crypto
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_to_constraint_buf.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_to_constraint_buf.cpp
index c8450c7ff09f..3a9beb0f8071 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_to_constraint_buf.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_to_constraint_buf.cpp
@@ -802,10 +802,12 @@ BlockConstraint memory_init_to_block_constraint(Acir::Opcode::MemoryInit const&
     // array.
     if (std::holds_alternative<Acir::BlockType::CallData>(mem_init.block_type.value)) {
         uint32_t calldata_id = std::get<Acir::BlockType::CallData>(mem_init.block_type.value).value;
-        BB_ASSERT(calldata_id == 0 || calldata_id == 1, "acir_format::handle_memory_init: Unsupported calldata id");
+        BB_ASSERT_LTE(calldata_id,
+                      MAX_APPS_PER_KERNEL,
+                      "acir_format::handle_memory_init: calldata id exceeds kernel + MAX_APPS_PER_KERNEL app columns");
 
         block.type = BlockType::CallData;
-        block.calldata_id = calldata_id == 0 ? CallDataType::Primary : CallDataType::Secondary;
+        block.calldata_id = static_cast<CallDataType>(calldata_id);
     } else if (std::holds_alternative<Acir::BlockType::ReturnData>(mem_init.block_type.value)) {
         block.type = BlockType::ReturnData;
     }
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.cpp
index b492baa9c1c6..09ea9da9e5ff 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.cpp
@@ -165,17 +165,15 @@ void process_call_data_operations(Builder& builder,
         }
     };
 
-    // Process primary or secondary calldata based on calldata_id
-    switch (constraint.calldata_id) {
-    case CallDataType::Primary:
-        process_calldata(databus.calldata);
-        break;
-    case CallDataType::Secondary:
-        process_calldata(databus.secondary_calldata);
-        break;
-    default:
-        bb::assert_failure("Databus only supports two calldata arrays.");
-        break;
+    // Process kernel or app calldata based on the ACIR calldata id. Id 0 is kernel calldata; app calldata ids start at
+    // 1 and map directly onto app_calldata[id - 1].
+    const auto calldata_id = static_cast<uint32_t>(constraint.calldata_id);
+    if (calldata_id == static_cast<uint32_t>(CallDataType::KernelCalldata)) {
+        process_calldata(databus.kernel_calldata);
+    } else {
+        const size_t app_calldata_idx = calldata_id - /*shift by kernel calldata*/ 1;
+        BB_ASSERT_LT(app_calldata_idx, MAX_APPS_PER_KERNEL, "Databus app calldata index out of bounds");
+        process_calldata(databus.app_calldata[app_calldata_idx]);
     }
 }
 
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.hpp
index 4123c1e485f3..9051224267d7 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.hpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.hpp
@@ -5,6 +5,7 @@
 // =====================
 
 #pragma once
+#include "barretenberg/constants.hpp"
 #include "barretenberg/dsl/acir_format/witness_constant.hpp"
 #include "barretenberg/stdlib/primitives/field/field.hpp"
 #include <cstdint>
@@ -17,10 +18,12 @@ enum AccessType : std::uint8_t {
     Write = 1,
 };
 
-enum CallDataType : std::uint8_t {
-    None = 0,
-    Primary = 1,
-    Secondary = 2,
+enum CallDataType : std::uint32_t {
+    KernelCalldata = 0,
+    FirstAppCalldata = 1,
+    SecondAppCalldata = 2,
+    ThirdAppCalldata = 3,
+    None = bb::MAX_APPS_PER_KERNEL + 1, // Used for non-calldata blocks
 };
 
 /**
@@ -46,8 +49,8 @@ enum BlockType : std::uint8_t {
  * @details 1. init holds the initial values of the RAM/ROM/CallData/ReturnData table
  *          2. trace holds the sequence of memory operations (reads/writes) performed on the table
  *          3. type indicates the type of memory being constrained (RAM/ROM/CallData/ReturnData)
- *          4. calldata_id (used only for CallData) indicates whether we are operating on primary (kernel) or secondary
- *             (app) calldata
+ *          4. calldata_id (used only for CallData) indicates whether we are operating on kernel calldata or an app
+ *             calldata slot. The kernel calldata id is 0, app calldata ids are in [1, MAX_APPS_PER_KERNEL].
  */
 struct BlockConstraint {
     std::vector<uint32_t> init;
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.test.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.test.cpp
index 0507713f4e77..f055cb751974 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.test.cpp
@@ -509,12 +509,14 @@ class CallDataTestingFunctions {
     }
 };
 
-using CallDataTestConfigs = testing::Types<CallDataTestParams<CallDataType::Primary, 0, 0, false>,
-                                           CallDataTestParams<CallDataType::Primary, 10, 5, false>,
-                                           CallDataTestParams<CallDataType::Primary, 10, 5, true>,
-                                           CallDataTestParams<CallDataType::Secondary, 0, 0, false>,
-                                           CallDataTestParams<CallDataType::Secondary, 10, 5, false>,
-                                           CallDataTestParams<CallDataType::Secondary, 10, 5, true>>;
+using CallDataTestConfigs = testing::Types<CallDataTestParams<CallDataType::KernelCalldata, 0, 0, false>,
+                                           CallDataTestParams<CallDataType::KernelCalldata, 10, 5, false>,
+                                           CallDataTestParams<CallDataType::KernelCalldata, 10, 5, true>,
+                                           CallDataTestParams<CallDataType::FirstAppCalldata, 0, 0, false>,
+                                           CallDataTestParams<CallDataType::FirstAppCalldata, 10, 5, false>,
+                                           CallDataTestParams<CallDataType::FirstAppCalldata, 10, 5, true>,
+                                           CallDataTestParams<CallDataType::SecondAppCalldata, 10, 5, false>,
+                                           CallDataTestParams<CallDataType::ThirdAppCalldata, 10, 5, false>>;
 
 template <typename Params>
 class CallDataTests : public ::testing::Test,
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/gate_count_constants.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/gate_count_constants.hpp
index 56c67dcc1a58..b7ed640ce3a2 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/gate_count_constants.hpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/gate_count_constants.hpp
@@ -41,7 +41,8 @@ inline constexpr size_t ECDSA_SECP256R1 = 72611 + ZERO_GATE + (IsMegaBuilder<Bui
 template <typename Builder> inline constexpr size_t BLAKE2S = 2952 + ZERO_GATE + MEGA_OFFSET<Builder>;
 template <typename Builder> inline constexpr size_t BLAKE3 = 2158 + ZERO_GATE + MEGA_OFFSET<Builder>;
 template <typename Builder> inline constexpr size_t KECCAK_PERMUTATION = 17387 + ZERO_GATE + MEGA_OFFSET<Builder>;
-template <typename Builder> inline constexpr size_t POSEIDON2_PERMUTATION = 73 + ZERO_GATE + MEGA_OFFSET<Builder>;
+template <typename Builder>
+inline constexpr size_t POSEIDON2_PERMUTATION = (IsMegaBuilder<Builder> ? 27 : 73) + ZERO_GATE + MEGA_OFFSET<Builder>;
 template <typename Builder> inline constexpr size_t MULTI_SCALAR_MUL = 3563 + ZERO_GATE;
 template <typename Builder> inline constexpr size_t EC_ADD = 84 + ZERO_GATE + MEGA_OFFSET<Builder>;
 template <typename Builder> inline constexpr size_t BLOCK_ROM_READ = 9 + ZERO_GATE + MEGA_OFFSET<Builder>;
@@ -83,24 +84,24 @@ constexpr std::tuple<size_t, size_t> HONK_RECURSION_CONSTANTS(
     } else if constexpr (std::is_same_v<RecursiveFlavor, bb::UltraRecursiveFlavor_<MegaCircuitBuilder>>) {
         switch (mode) {
         case PredicateTestCase::ConstantTrue:
-            return std::make_tuple(20817, 73);
+            return std::make_tuple(11848, 73);
         case PredicateTestCase::WitnessTrue:
         case PredicateTestCase::WitnessFalse:
-            return std::make_tuple(21874, 73);
+            return std::make_tuple(12905, 73);
         }
     } else if constexpr (std::is_same_v<RecursiveFlavor, bb::UltraZKRecursiveFlavor_<MegaCircuitBuilder>>) {
         switch (mode) {
         case PredicateTestCase::ConstantTrue:
-            return std::make_tuple(24993, 77);
+            return std::make_tuple(14506, 77);
         case PredicateTestCase::WitnessTrue:
         case PredicateTestCase::WitnessFalse:
-            return std::make_tuple(26146, 77);
+            return std::make_tuple(15659, 77);
         }
     } else if constexpr (std::is_same_v<RecursiveFlavor, bb::MegaZKRecursiveFlavor_<UltraCircuitBuilder>>) {
         if (mode != PredicateTestCase::ConstantTrue) {
             bb::assert_failure("Unhandled mode in MegaZKRecursiveFlavor.");
         }
-        return std::make_tuple(768328, 0);
+        return std::make_tuple(856820, 0);
     } else {
         bb::assert_failure("Unhandled recursive flavor.");
     }
@@ -113,7 +114,7 @@ constexpr std::tuple<size_t, size_t> HONK_RECURSION_CONSTANTS(
 // ========================================
 
 // Gate count for Chonk recursive verification (Ultra with RollupIO)
-inline constexpr size_t CHONK_RECURSION_GATES = 1474677;
+inline constexpr size_t CHONK_RECURSION_GATES = 1563538;
 
 // ========================================
 // Hypernova Recursion Constants
@@ -123,30 +124,31 @@ inline constexpr size_t CHONK_RECURSION_GATES = 1474677;
 inline constexpr size_t MSM_ROWS_OFFSET = 2;
 
 // Init kernel gate counts (verifies OINK proof)
-inline constexpr size_t INIT_KERNEL_GATE_COUNT = 24457;
-inline constexpr size_t INIT_KERNEL_ECC_ROWS = 815 + MSM_ROWS_OFFSET;
-inline constexpr size_t INIT_KERNEL_ULTRA_OPS = 86;
+inline constexpr size_t INIT_KERNEL_GATE_COUNT = 13449;
+inline constexpr size_t INIT_KERNEL_ECC_ROWS = 623 + MSM_ROWS_OFFSET;
+inline constexpr size_t INIT_KERNEL_ULTRA_OPS = 70;
 
 // Inner kernel gate counts (verifies HN proof for previous kernel + HN for app)
-inline constexpr size_t INNER_KERNEL_GATE_COUNT_HN = 59251;
-inline constexpr size_t INNER_KERNEL_ECC_ROWS = 1634 + MSM_ROWS_OFFSET;
-inline constexpr size_t INNER_KERNEL_ULTRA_OPS = 173;
+inline constexpr size_t INNER_KERNEL_GATE_COUNT_HN = 31092;
+inline constexpr size_t INNER_KERNEL_ECC_ROWS = 1312 + MSM_ROWS_OFFSET;
+inline constexpr size_t INNER_KERNEL_ULTRA_OPS = 149;
 
 // Tail kernel gate counts (verifies HN_TAIL proof)
-inline constexpr size_t TAIL_KERNEL_GATE_COUNT = 32249;
-inline constexpr size_t TAIL_KERNEL_ECC_ROWS = 881 + MSM_ROWS_OFFSET;
-inline constexpr size_t TAIL_KERNEL_ULTRA_OPS = 93;
+inline constexpr size_t TAIL_KERNEL_GATE_COUNT = 17323;
+inline constexpr size_t TAIL_KERNEL_ECC_ROWS = 656 + MSM_ROWS_OFFSET;
+inline constexpr size_t TAIL_KERNEL_ULTRA_OPS = 72;
 
 // Hiding kernel gate counts (verifies HN_FINAL proof)
-inline constexpr size_t HIDING_KERNEL_GATE_COUNT = 35622;
-inline constexpr size_t HIDING_KERNEL_ECC_ROWS = 1374 + MSM_ROWS_OFFSET;
-inline constexpr size_t HIDING_KERNEL_ULTRA_OPS = 124;
+inline constexpr size_t HIDING_KERNEL_GATE_COUNT = 39627;
+inline constexpr size_t HIDING_KERNEL_ECC_ROWS = 4872 + MSM_ROWS_OFFSET;
+inline constexpr size_t HIDING_KERNEL_ULTRA_OPS = 334;
 
 // ========================================
 // ECCVM Recursive Verifier Constants
 // ========================================
 
 // Gate count for ECCVM recursive verifier (Ultra-arithmetized)
+// Trigger rebuild
 inline constexpr size_t ECCVM_RECURSIVE_VERIFIER_GATE_COUNT = 220788;
 
 // ========================================
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/hypernova_recursion_constraint.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/hypernova_recursion_constraint.cpp
index 256b6cc761b6..8e70a6b34d8c 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/hypernova_recursion_constraint.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/hypernova_recursion_constraint.cpp
@@ -24,58 +24,67 @@ using namespace bb;
  * - INNER kernel: Two HN constraints (verifies previous kernel + new app)
  * - RESET kernel: Single HN constraint (verifies kernel only, resets accumulation)
  * - TAIL kernel: Single HN_TAIL constraint (final kernel before hiding kernel)
- * - HIDING kernel: Single HN_FINAL constraint (adds ZK hiding)
+ * - HIDING kernel: Single HN_FINAL constraint (adds ZK hiding and verifies one batch merge proof)
  *
  * @param constraints The IVC recursion constraints extracted from an Aztec kernel's ACIR
  * @return Chonk instance with mock verification queue entries matching the constraint pattern
  */
 std::shared_ptr<Chonk> create_mock_chonk_from_constraints(const std::vector<RecursionConstraint>& constraints)
 {
-    auto ivc = std::make_shared<Chonk>(std::max(constraints.size(), static_cast<size_t>(4)));
-
+    auto ivc = std::make_shared<Chonk>(std::max(constraints.size(), static_cast<size_t>(MAX_APPS_PER_KERNEL + 1)));
     // Check constraint proof type. Throws if proof_type is not a valid HyperNova type
     auto constraint_has_type = [](const RecursionConstraint& c, Chonk::QUEUE_TYPE expected) {
         return proof_type_to_chonk_queue_type(c.proof_type) == expected;
     };
 
+    BB_ASSERT(!constraints.empty(), "At least one recursion constraint is required to determine Chonk state");
+    const bool is_init = constraint_has_type(constraints[0], Chonk::QUEUE_TYPE::OINK);
+    const bool is_reset = (constraints.size() == 1 && constraint_has_type(constraints[0], Chonk::QUEUE_TYPE::HN));
+    const bool is_tail = (constraints.size() == 1 && constraint_has_type(constraints[0], Chonk::QUEUE_TYPE::HN_TAIL));
+    const bool is_hiding =
+        (constraints.size() == 1 && constraint_has_type(constraints[0], Chonk::QUEUE_TYPE::HN_FINAL));
+    const size_t upper_bound = is_init ? MAX_APPS_PER_KERNEL : MAX_APPS_PER_KERNEL + 1;
+    BB_ASSERT_LTE(constraints.size(), upper_bound, "Too many recursion constraints encountered when mocking IVC state");
+
     // Match constraint patterns to kernel types and populate appropriate mock data:
 
     // INIT kernel: Verifies first app circuit (no prior accumulator exists)
-    if (constraints.size() == 1 && constraint_has_type(constraints[0], Chonk::QUEUE_TYPE::OINK)) {
+    if (is_init) {
         mock_chonk_accumulation(ivc, Chonk::QUEUE_TYPE::OINK, /*is_kernel=*/false);
+        for (size_t idx = 1; idx < constraints.size(); idx++) {
+            BB_ASSERT(constraint_has_type(constraints[idx], Chonk::QUEUE_TYPE::HN),
+                      "Subsequent constraints in init kernel must be HN type");
+            mock_chonk_accumulation(ivc, Chonk::QUEUE_TYPE::HN, /*is_kernel=*/false);
+        }
         return ivc;
     }
 
     // RESET kernel: Verifies only a previous kernel (resets the IVC accumulation)
-    if (constraints.size() == 1 && constraint_has_type(constraints[0], Chonk::QUEUE_TYPE::HN)) {
+    if (is_reset) {
         mock_chonk_accumulation(ivc, Chonk::QUEUE_TYPE::HN, /*is_kernel=*/true);
         return ivc;
     }
 
-    // TAIL kernel: Final kernel in the chain before generating tube proof
-    if (constraints.size() == 1 && constraint_has_type(constraints[0], Chonk::QUEUE_TYPE::HN_TAIL)) {
+    // TAIL kernel: Final kernel in the chain before hiding kernel
+    if (is_tail) {
         mock_chonk_accumulation(ivc, Chonk::QUEUE_TYPE::HN_TAIL, /*is_kernel=*/true);
         return ivc;
     }
 
-    // INNER kernel: Verifies previous kernel + new app circuit
-    if (constraints.size() == 2) {
-        BB_ASSERT(constraint_has_type(constraints[0], Chonk::QUEUE_TYPE::HN),
-                  "Inner kernel first constraint must be HN type");
-        BB_ASSERT(constraint_has_type(constraints[1], Chonk::QUEUE_TYPE::HN),
-                  "Inner kernel second constraint must be HN type");
-        mock_chonk_accumulation(ivc, Chonk::QUEUE_TYPE::HN, /*is_kernel=*/true);
-        mock_chonk_accumulation(ivc, Chonk::QUEUE_TYPE::HN, /*is_kernel=*/false);
-        return ivc;
-    }
-
     // HIDING kernel: Adds zero-knowledge hiding to the final proof
-    if (constraints.size() == 1 && constraint_has_type(constraints[0], Chonk::QUEUE_TYPE::HN_FINAL)) {
+    if (is_hiding) {
         mock_chonk_accumulation(ivc, Chonk::QUEUE_TYPE::HN_FINAL, /*is_kernel=*/true);
         return ivc;
     }
 
-    throw_or_abort("Invalid set of IVC recursion constraints!");
+    // INNER kernel: Verifies previous kernel + app circuits
+    bool is_kernel = true;
+    for (const auto& constraint : constraints) {
+        BB_ASSERT(constraint_has_type(constraint, Chonk::QUEUE_TYPE::HN),
+                  "All constraints in inner kernel must be HN type");
+        mock_chonk_accumulation(ivc, Chonk::QUEUE_TYPE::HN, /*is_kernel=*/is_kernel);
+        is_kernel = false; // First constraint verifies previous kernel, subsequent constraints verify apps
+    }
     return ivc;
 }
 
@@ -139,8 +148,7 @@ Chonk::VerifierInputs create_mock_verification_queue_entry(const Chonk::QUEUE_TY
  * 1. Initializes the recursive verifier accumulator (challenge vector, evaluations, commitments)
  *    - This is hashed in-circuit to bind the accumulator state
  * 2. Adds a mock verification queue entry (proof + VK) for the accumulated circuit
- * 3. Adds a mock merge proof
- * 4. For HN_FINAL: also adds a mock decider/PCS proof
+ * 3. For HN_FINAL: adds one mock batch merge proof and a mock decider/PCS proof
  *
  * @param ivc The Chonk instance to populate
  * @param type Verification queue type determining proof structure
@@ -160,8 +168,8 @@ void mock_chonk_accumulation(const std::shared_ptr<Chonk>& ivc, Chonk::QUEUE_TYP
 
     Chonk::VerifierInputs entry = acir_format::create_mock_verification_queue_entry(type, is_kernel);
     ivc->verification_queue.emplace_back(entry);
-    ivc->goblin.merge_verification_queue.emplace_back(acir_format::create_mock_merge_proof());
     if (type == Chonk::QUEUE_TYPE::HN_FINAL) {
+        ivc->goblin.batch_merge_proof = acir_format::create_mock_batch_merge_proof();
         ivc->decider_proof = acir_format::create_mock_pcs_proof<Chonk::Flavor>();
     }
     ivc->num_circuits_accumulated++;
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/hypernova_recursion_constraint.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/hypernova_recursion_constraint.hpp
index 57610ec4dc29..3b0c1f8b1241 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/hypernova_recursion_constraint.hpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/hypernova_recursion_constraint.hpp
@@ -37,13 +37,13 @@ using namespace bb;
  * @details Analyzes the constraint types to determine what mock data is needed (Oink proof, HN proof, etc.)
  *
  * @param constraints The IVC recursion constraints from an Aztec kernel program
- * @return A Chonk instance with mock verification queue entries and merge proofs
+ * @return A Chonk instance with mock verification queue entries and for the hiding kernels a batch merge proof
  */
 std::shared_ptr<Chonk> create_mock_chonk_from_constraints(const std::vector<RecursionConstraint>& constraints);
 
 /**
  * @brief Add mock accumulation data to a Chonk instance
- * @details Populates the verification queue with a mock proof/VK entry and adds a mock merge proof.
+ * @details Populates the verification queue with a mock proof/VK entry. HN_FINAL also gets a mock batch merge proof.
  * Also initializes the recursive verifier accumulator which is hashed into the circuit.
  *
  * @param ivc The Chonk instance to populate
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/hypernova_recursion_constraint.test.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/hypernova_recursion_constraint.test.cpp
index 7e7dcdc43287..8bfcdee19220 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/hypernova_recursion_constraint.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/hypernova_recursion_constraint.test.cpp
@@ -212,10 +212,9 @@ class HypernovaRecursionConstraintTest : public ::testing::Test {
         program.constraints.max_witness_index = static_cast<uint32_t>(program.witness.size() - 1);
         program.constraints.num_acir_opcodes = static_cast<uint32_t>(hn_recursion_constraints.size());
         program.constraints.hn_recursion_constraints = hn_recursion_constraints;
-        program.constraints.original_opcode_indices =
-            hn_recursion_constraints.size() == 1
-                ? AcirFormatOriginalOpcodeIndices{ .hn_recursion_constraints = { 0 } }
-                : AcirFormatOriginalOpcodeIndices{ .hn_recursion_constraints = { 0, 1 } };
+        for (size_t idx = 0; idx < hn_recursion_constraints.size(); ++idx) {
+            program.constraints.original_opcode_indices.hn_recursion_constraints.push_back(static_cast<uint32_t>(idx));
+        }
 
         return program;
     }
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/mock_verifier_inputs.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/mock_verifier_inputs.cpp
index 892f5c976b7d..0aae5c8887e8 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/mock_verifier_inputs.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/mock_verifier_inputs.cpp
@@ -307,6 +307,39 @@ Goblin::MergeProof create_mock_merge_proof()
     return proof;
 }
 
+HonkProof create_mock_batch_merge_proof()
+{
+    HonkProof proof;
+
+    constexpr size_t NUM_WIRES = Goblin::BatchMergeRecursiveVerifier::NUM_WIRES;
+    constexpr size_t MAX_MERGE_SIZE = Goblin::BatchMergeRecursiveVerifier::MAX_MERGE_SIZE;
+
+    // Commitments to the fixed-width list of subtables.
+    populate_field_elements_for_mock_commitments(proof, MAX_MERGE_SIZE * NUM_WIRES);
+
+    // Commitments to the ZK masking table.
+    populate_field_elements_for_mock_commitments(proof, NUM_WIRES);
+
+    // Number of real subtables. Keep it in [1, MAX_MERGE_SIZE] so recursive range checks can be constructed.
+    populate_field_elements<fr>(proof, 1, /*value=*/fr{ 1 });
+
+    // Shift sizes.
+    populate_field_elements<fr>(proof, 1, /*value=*/fr{ 2 });
+    populate_field_elements<fr>(proof, MAX_MERGE_SIZE - 1, /*value=*/fr{ 0 });
+
+    // Merged table commitments and degree-check polynomial commitment.
+    populate_field_elements_for_mock_commitments(proof, NUM_WIRES + 1);
+
+    // Evaluations: C_i(kappa), optional ZK C_i(kappa), T(kappa), and G(kappa^{-1}).
+    const size_t num_evaluations = (MAX_MERGE_SIZE * NUM_WIRES) + NUM_WIRES + NUM_WIRES + 1;
+    populate_field_elements(proof, num_evaluations);
+
+    // Shplonk quotient commitment and KZG opening commitment.
+    populate_field_elements_for_mock_commitments(proof, 2);
+
+    return proof;
+}
+
 /**
  * @brief Create a mock pre-ipa proof which has the correct structure but is not necessarily valid
  *
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/mock_verifier_inputs.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/mock_verifier_inputs.hpp
index ab578e02ac68..63c1c65b8692 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/mock_verifier_inputs.hpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/mock_verifier_inputs.hpp
@@ -104,6 +104,12 @@ std::pair<bb::HonkProof, std::shared_ptr<typename Flavor::VerificationKey>> cons
  */
 bb::Goblin::MergeProof create_mock_merge_proof();
 
+/**
+ * @brief Create a mock batch merge proof which has the correct structure but is not necessarily valid
+ *
+ */
+bb::HonkProof create_mock_batch_merge_proof();
+
 /**
  * @brief Create a mock pre-ipa proof which has the correct structure but is not necessarily valid
  *
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/mock_verifier_inputs.test.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/mock_verifier_inputs.test.cpp
index 19752c2db0aa..4207472fefa3 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/mock_verifier_inputs.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/mock_verifier_inputs.test.cpp
@@ -1,5 +1,6 @@
 #include "barretenberg/dsl/acir_format/mock_verifier_inputs.hpp"
 #include "barretenberg/chonk/chonk_proof.hpp"
+#include "barretenberg/flavor/mega_zk_flavor.hpp"
 #include "barretenberg/honk/proof_length.hpp"
 
 #include <gtest/gtest.h>
@@ -22,8 +23,12 @@ static_assert(HIDING_KERNEL_PUBLIC_INPUTS_SIZE == 28,
               "HIDING_KERNEL_IO_PUBLIC_INPUTS_SIZE changed - update constants.nr");
 
 // Component proof lengths (used in Noir)
-static_assert(MERGE_PROOF_SIZE == 42, "MERGE_PROOF_SIZE changed - update constants.nr");
-static_assert(ECCVMFlavor::PROOF_LENGTH == 608, "ECCVM proof size changed - update constants.nr");
+static_assert(MERGE_PROOF_SIZE == 42,
+              "MERGE_PROOF_SIZE changed - update CHONK_MERGE_PROOF_SIZE in constants.nr "
+              "and run `yarn remake-constants`");
+static_assert(ECCVMFlavor::PROOF_LENGTH == 608,
+              "ECCVM proof size changed - update CHONK_ECCVM_PROOF_LENGTH in constants.nr "
+              "and run `yarn remake-constants`");
 static_assert(IPA_PROOF_LENGTH == 64, "IPA_PROOF_LENGTH changed - update constants.nr");
 static_assert(TranslatorFlavor::PROOF_LENGTH == 483, "Translator proof size changed - update constants.nr");
 
@@ -32,7 +37,17 @@ static_assert(
     ProofLength::Honk<UltraFlavor>::expected_proof_size<stdlib::recursion::honk::DefaultIO<UltraCircuitBuilder>>(
         UltraFlavor::VIRTUAL_LOG_N) == 410,
     "RECURSIVE_PROOF_LENGTH changed - update constants.nr");
-static_assert(ChonkProof::PROOF_LENGTH == 1315, "CHONK_PROOF_LENGTH changed - update constants.nr");
+static_assert(ChonkProof::PROOF_LENGTH == 1349, "CHONK_PROOF_LENGTH changed - update constants.nr");
+static_assert(ChonkProof::HIDING_OINK_LENGTH == 108,
+              "ChonkProof::HIDING_OINK_LENGTH changed - update CHONK_HIDING_OINK_LENGTH in constants.nr "
+              "and run `yarn remake-constants`");
+static_assert(ChonkProof::JOINT_PROOF_LENGTH == 499,
+              "ChonkProof::JOINT_PROOF_LENGTH changed - update CHONK_JOINT_PROOF_LENGTH in constants.nr "
+              "and run `yarn remake-constants`");
+static_assert(MegaFlavor::VerificationKey::calc_num_data_types() == 143,
+              "MEGA_VK_LENGTH_IN_FIELDS changed - update constants.nr");
+static_assert(MegaZKFlavor::VerificationKey::calc_num_data_types() == 143,
+              "MegaZK VK size changed - update constants.nr");
 static_assert(ProofLength::MultilinearBatching<MultilinearBatchingFlavor>::LENGTH == 136,
               "MultilinearBatching proof size changed - update constants.nr");
 
@@ -45,6 +60,15 @@ TEST_F(MockVerifierInputsTest, MockMergeProofSize)
     EXPECT_EQ(merge_proof.size(), MERGE_PROOF_SIZE);
 }
 
+/**
+ * @brief Check that mock batch merge proof has the expected size
+ */
+TEST_F(MockVerifierInputsTest, MockBatchMergeProofSize)
+{
+    HonkProof batch_merge_proof = create_mock_batch_merge_proof();
+    EXPECT_EQ(batch_merge_proof.size(), BATCH_MERGE_PROOF_SIZE);
+}
+
 /**
  * @brief Check that mock ECCVM proof has the expected size
  */
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/opcode_gate_count.test.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/opcode_gate_count.test.cpp
index a12e9ffd9edf..47aa78abb04e 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/opcode_gate_count.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/opcode_gate_count.test.cpp
@@ -592,13 +592,13 @@ TYPED_TEST(OpcodeGateCountTests, BlockCallData)
         .value = WitnessOrConstant<bb::fr>::from_index(3), // 10
     });
 
-    // Primary calldata
+    // Kernel calldata
     {
         BlockConstraint block_constraint{
             .init = init,
             .trace = trace,
             .type = BlockType::CallData,
-            .calldata_id = CallDataType::Primary,
+            .calldata_id = CallDataType::KernelCalldata,
         };
 
         AcirFormat constraint_system = constraint_to_acir_format(block_constraint);
@@ -614,13 +614,13 @@ TYPED_TEST(OpcodeGateCountTests, BlockCallData)
         EXPECT_EQ(program.constraints.gates_per_opcode, std::vector<size_t>({ BLOCK_CALLDATA<TypeParam> }));
     }
 
-    // Secondary calldata
+    // App calldata
     {
         BlockConstraint block_constraint{
             .init = init,
             .trace = trace,
             .type = BlockType::CallData,
-            .calldata_id = CallDataType::Secondary,
+            .calldata_id = CallDataType::FirstAppCalldata,
         };
 
         AcirFormat constraint_system = constraint_to_acir_format(block_constraint);
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/test_class.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/test_class.hpp
index 89a12f07dfa3..749eb5d35f18 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/test_class.hpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/test_class.hpp
@@ -105,7 +105,7 @@ inline Acir::BlockType block_type_to_acir_block_type(BlockType type, CallDataTyp
         // ROM and RAM both map to Memory in ACIR
         return Acir::BlockType{ .value = Acir::BlockType::Memory{} };
     case BlockType::CallData: {
-        uint32_t id = (calldata_id == CallDataType::Primary) ? 0 : 1;
+        uint32_t id = static_cast<uint32_t>(calldata_id);
         return Acir::BlockType{ .value = Acir::BlockType::CallData{ .value = id } };
     }
     case BlockType::ReturnData:
diff --git a/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/g2.test.cpp b/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/g2.test.cpp
index b7f46c27cd45..2a8006308441 100644
--- a/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/g2.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/g2.test.cpp
@@ -182,3 +182,49 @@ TEST(g2, GeneratorIsCorrect)
                                       fq("0x090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b") } };
     EXPECT_EQ(generator, expected);
 }
+
+// The generator, infinity, and arbitrary scalar multiples of the generator must be accepted as
+// members of the BN254 G2 prime-order subgroup.
+TEST(g2, IsInPrimeSubgroupAcceptsSubgroupPoints)
+{
+    const g2::affine_element gen(Bn254G2Params::one_x, Bn254G2Params::one_y);
+    EXPECT_TRUE(gen.is_in_prime_subgroup());
+    EXPECT_TRUE(g2::affine_element::infinity().is_in_prime_subgroup());
+
+    for (size_t i = 0; i < 4; ++i) {
+        const g2::affine_element P(g2::element(gen) * fr::random_element());
+        EXPECT_TRUE(P.is_in_prime_subgroup());
+    }
+}
+
+// BN254 G2 has cofactor h2 ≈ 2^254, so on-curve does NOT imply prime-order subgroup membership. The hardcoded point
+// below was constructed by sampling x = i + u (for the smallest positive integer i that yields a curve point) and
+// recovering y via Fq2 sqrt; because only a 1/h2 fraction of E'(Fq2) lies in G_r, this specimen lies in a cofactor
+// subgroup. Such a point must be rejected. Coordinates are in Montgomery form to match `Bn254G2Params::one_x` etc.
+TEST(g2, IsInPrimeSubgroupRejectsCofactorPoint)
+{
+    const g2::affine_element off_subgroup{
+        fq2{ fq(2), fq(1) },
+        fq2{ fq("0x101f7278419308b95099eca02dcee0c5381f4d26d1d62313f057167f064101ce"),
+             fq("0x2b76c179599bb92a963dac85546a005a777f7c13f6a7b75d5918b6b5808f5fde") }
+    };
+    ASSERT_TRUE(off_subgroup.on_curve());
+    EXPECT_FALSE(off_subgroup.is_in_prime_subgroup());
+
+    // Sanity check that scalar multiplication via the Fr-typed `*` operator does NOT detect
+    // subgroup membership — multiplying by `Fr(0)` (the additive identity, which equals `r mod r`)
+    // gives infinity for every input, including off-subgroup points. This is precisely why
+    // is_in_prime_subgroup() routes through a uint256_t scalar instead.
+    EXPECT_TRUE((off_subgroup * fr::zero()).is_point_at_infinity());
+}
+
+// Off-curve coordinates must be rejected: the Weierstrass group law is unsound off-curve, so the
+// [r]·P trick can return a false positive on attacker-supplied (x, y) that happens to satisfy
+// y² = x³ + b' for some b' ≠ b with a prime-r factor in its order.
+TEST(g2, IsInPrimeSubgroupRejectsOffCurvePoint)
+{
+    g2::affine_element off_curve(Bn254G2Params::one_x, Bn254G2Params::one_y);
+    off_curve.y += fq2::one();
+    ASSERT_FALSE(off_curve.on_curve());
+    EXPECT_FALSE(off_curve.is_in_prime_subgroup());
+}
diff --git a/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/pairing.hpp b/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/pairing.hpp
index c55643b6f545..0559234f9600 100644
--- a/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/pairing.hpp
+++ b/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/pairing.hpp
@@ -195,10 +195,13 @@ constexpr fq12 final_exponentiation_tricky_part(const fq12& elt);
 // ======================
 // Pairing
 //
-// NOTE: All points supplied for pairing calculations are checked to be on the curve. This is equivalent to a subgroup
-// membership check for points in G1 = BN254. We don't implement subgroup membership checks for G2 because the only
-// place in the codebase where we use pairings is in PairingPoints::check(), which takes two points P1, P2 in G1
-// and checks e(P1, [1]) * e(P2, [x]) = 1. The points [1] and [x] are taken from the SRS, so we know they belong to G2.
+// NOTE: All points supplied for pairing calculations are checked to be on the curve. For G1 = BN254 this is equivalent
+// to a subgroup membership check (cofactor 1). For G2 = BN254 twist, on-curve does NOT imply membership in the
+// prime-order subgroup because the cofactor is non-trivial. The two G2 points consumed inside pairings come from
+// PairingPoints::check(), which feeds them the SRS values [1]_2 and [x]_2 — the SRS ingress (bbapi::SrsInitSrs)
+// invokes `affine_element::is_in_prime_subgroup()` on the user-supplied [x]_2 before installation, so by the time
+// they reach this file they are already known to be in the prime-order subgroup. Any future code path that brings a
+// new G2 point in from outside the SRS must run the subgroup check itself.
 //
 // ======================
 
diff --git a/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element.hpp b/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element.hpp
index fbe908ca6ae4..dc64aa6cbf80 100644
--- a/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element.hpp
+++ b/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element.hpp
@@ -92,6 +92,22 @@ template <typename Fq_, typename Fr_, typename Params_> class alignas(64) affine
 
     [[nodiscard]] constexpr bool on_curve() const noexcept;
 
+    /**
+     * @brief Check that the point lies in the prime-order subgroup of size `Fr::modulus`.
+     *
+     * @details For curves whose cofactor is 1 (e.g. BN254 G1, Grumpkin) every on-curve point trivially
+     * satisfies this, so callers that already validated `on_curve()` can skip the call. For curves with
+     * non-trivial cofactor (notably BN254 G2, with cofactor h2 ≈ 2^254), `on_curve()` alone is
+     * insufficient: an attacker can supply a curve point that lies in a small subgroup of order
+     * dividing h2 and pass `on_curve()`. This routine performs the full subgroup check via `[r]·P == ∞`.
+     *
+     * @note Not constant-time. Intended for one-shot validation of public, externally-supplied points
+     * (e.g. at the bbapi boundary or when loading SRS bytes).
+     *
+     * @return true iff `*this` is the point at infinity or has order dividing `Fr::modulus`.
+     */
+    [[nodiscard]] bool is_in_prime_subgroup() const noexcept;
+
     static constexpr std::optional<affine_element> derive_from_x_coordinate(const Fq& x, bool sign_bit) noexcept;
 
     /**
diff --git a/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element.test.cpp b/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element.test.cpp
index 474c4f5e113d..66d77b6bf49d 100644
--- a/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element.test.cpp
@@ -310,6 +310,19 @@ template <typename G1> class TestAffineElement : public testing::Test {
         auto reconstructed = FrCodec::deserialize_from_fields<affine_element>(limbs);
         EXPECT_EQ(reconstructed, point);
     }
+
+    // The point at infinity, the generator, and any scalar multiple of the generator must all be
+    // recognized as members of the prime-order subgroup.
+    static void test_is_in_prime_subgroup_accepts_subgroup_points()
+    {
+        EXPECT_TRUE(affine_element::infinity().is_in_prime_subgroup());
+        EXPECT_TRUE(affine_element::one().is_in_prime_subgroup());
+
+        for (size_t i = 0; i < 8; ++i) {
+            affine_element P = affine_element(element::random_element());
+            EXPECT_TRUE(P.is_in_prime_subgroup());
+        }
+    }
 };
 
 // using TestTypes = testing::Types<bb::g1>;
@@ -469,6 +482,12 @@ TYPED_TEST(TestAffineElement, DeserializeOffCurveThrows)
     TestFixture::test_deserialize_off_curve_throws();
 }
 
+// Verify is_in_prime_subgroup accepts known prime-order subgroup points
+TYPED_TEST(TestAffineElement, IsInPrimeSubgroupAcceptsSubgroupPoints)
+{
+    TestFixture::test_is_in_prime_subgroup_accepts_subgroup_points();
+}
+
 // Verify that from_compressed returns the (0,0) sentinel for x values with no valid y.
 TYPED_TEST(TestAffineElement, PointCompressionInvalidX)
 {
diff --git a/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element_impl.hpp b/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element_impl.hpp
index 242cbb5dd4d8..336f65cc8efd 100644
--- a/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element_impl.hpp
+++ b/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element_impl.hpp
@@ -132,6 +132,35 @@ template <class Fq, class Fr, class T> constexpr bool affine_element<Fq, Fr, T>:
     return (xxx == yy);
 }
 
+template <class Fq, class Fr, class T> bool affine_element<Fq, Fr, T>::is_in_prime_subgroup() const noexcept
+{
+    if (is_point_at_infinity()) {
+        return true;
+    }
+    // Weierstrass group law is unsound for off-curve coordinates, so the [r]·P trick can
+    // give a false positive on points that satisfy y² = x³ + b' for some b' ≠ b. Reject
+    // those up front.
+    if (!on_curve()) {
+        return false;
+    }
+    using Element = element<Fq, Fr, T>;
+
+    // To compute r * P, we convert modulus r to u256 and perform a left-to-right double-and-add.
+    constexpr uint256_t r = Fr::modulus;
+    const uint64_t r_msb = r.get_msb();
+
+    // Left-to-right double-and-add over the bits of r below the MSB. The MSB itself is consumed by
+    // initializing `acc` with `*this`. Loop terminates via unsigned underflow (i wraps past 0).
+    Element acc(*this);
+    for (uint64_t i = r_msb - 1; i < r_msb; --i) {
+        acc.self_dbl();
+        if (r.get_bit(i)) {
+            acc += *this;
+        }
+    }
+    return acc.is_point_at_infinity();
+}
+
 template <class Fq, class Fr, class T>
 constexpr bool affine_element<Fq, Fr, T>::operator==(const affine_element& other) const noexcept
 {
diff --git a/barretenberg/cpp/src/barretenberg/ecc/groups/element.hpp b/barretenberg/cpp/src/barretenberg/ecc/groups/element.hpp
index 5cfb5870960d..0925671702e9 100644
--- a/barretenberg/cpp/src/barretenberg/ecc/groups/element.hpp
+++ b/barretenberg/cpp/src/barretenberg/ecc/groups/element.hpp
@@ -22,10 +22,12 @@ namespace bb::group_elements {
  * @brief element class. Implements ecc group arithmetic using Jacobian coordinates
  * See https://hyperelliptic.org/EFD/g1p/auto-shortw-jacobian-0.html#doubling-dbl-2009-l
  *
- * Note: Currently subgroup checks are NOT IMPLEMENTED
- * Our current implementation uses G1 points that have a cofactor of 1.
- * All G2 points are precomputed (generator [1]_2 and trusted setup point [x]_2).
- * Explicitly assume precomputed points are valid members of the prime-order subgroup for G2.
+ * Note: BN254 / Grumpkin G1 have cofactor 1, so on-curve membership coincides with prime-order
+ * subgroup membership. BN254 G2 has a non-trivial cofactor; an explicit subgroup check is provided
+ * by `affine_element::is_in_prime_subgroup()` and must be applied to externally-supplied G2 bytes
+ * (see bbapi). The arithmetic in this file does not rederive subgroup membership and assumes the
+ * caller already ensured operands are valid prime-order subgroup elements.
+ *
  * @tparam Fq prime field the curve is defined over
  * @tparam Fr prime field whose characteristic equals the size of the prime-order elliptic curve subgroup
  * @tparam Params curve parameters
diff --git a/barretenberg/cpp/src/barretenberg/ecc/groups/group.hpp b/barretenberg/cpp/src/barretenberg/ecc/groups/group.hpp
index f84796a54d68..eead3428a5ac 100644
--- a/barretenberg/cpp/src/barretenberg/ecc/groups/group.hpp
+++ b/barretenberg/cpp/src/barretenberg/ecc/groups/group.hpp
@@ -24,10 +24,12 @@ namespace bb {
  * @brief group class. Represents an elliptic curve group element.
  * Group is parametrised by Fq and Fr
  *
- * Note: Currently subgroup checks are NOT IMPLEMENTED
- * Our current implementation uses G1 points that have a cofactor of 1.
- * All G2 points are precomputed (generator [1]_2 and trusted setup point [x]_2).
- * Explicitly assume precomputed points are valid members of the prime-order subgroup for G2.
+ * Note: BN254 / Grumpkin G1 have cofactor 1, so `affine_element::on_curve()` is itself a subgroup
+ * check. BN254 G2 has a non-trivial cofactor, so callers that accept externally-supplied G2 bytes
+ * must additionally invoke `affine_element::is_in_prime_subgroup()` to reject cofactor-subgroup
+ * points before they reach pairing-based verifiers; routine internal G2 arithmetic stays inside
+ * the prime-order subgroup because every starting point is the precomputed generator [1]_2 or the
+ * SRS point [x]_2.
  *
  * @tparam Fq
  * @tparam subgroup_field
diff --git a/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/scalar_multiplication.cpp b/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/scalar_multiplication.cpp
index 512712190943..c5f50fdff5b2 100644
--- a/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/scalar_multiplication.cpp
+++ b/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/scalar_multiplication.cpp
@@ -85,29 +85,116 @@ void MSM<Curve>::transform_scalar_and_get_nonzero_scalar_indices(std::span<typen
     });
 }
 
+template <typename Curve>
+void MSM<Curve>::compute_scalar_slice_weights(std::span<const typename Curve::ScalarField> scalars,
+                                              std::span<const uint32_t> nonzero_indices,
+                                              uint32_t bits_per_slice,
+                                              std::vector<uint16_t>& weights) noexcept
+{
+    // weight = ceil(bit_length / bps) + FIXED_PER_SCALAR_WEIGHT. The fixed term approximates the
+    // O(num_rounds) per-scalar overhead in build_schedule, sort_schedule, and reduce_buckets that
+    // doesn't scale with bit_length. Without it, threads assigned many lightweight scalars end up
+    // with disproportionate build/sort/reduce work (empirically observed via per-phase profiling).
+    // Max is ceil(NUM_BITS_IN_FIELD / 1) + FIXED.
+    static constexpr uint16_t FIXED_PER_SCALAR_WEIGHT = 4;
+    static_assert(NUM_BITS_IN_FIELD + FIXED_PER_SCALAR_WEIGHT <= std::numeric_limits<uint16_t>::max(),
+                  "slice-count weight overflows uint16_t");
+    BB_ASSERT_GT(bits_per_slice, 0U);
+
+    const size_t n = nonzero_indices.size();
+    weights.resize(n);
+
+    parallel_for([&](const ThreadChunk& chunk) {
+        for (size_t k : chunk.range(n)) {
+            const auto& scalar = scalars[nonzero_indices[k]];
+            // Scalars were filtered for nonzero and are in non-Montgomery form, so get_msb()
+            // returns a valid bit index in [0, NUM_BITS_IN_FIELD).
+            const uint64_t msb = uint256_t{ scalar.data[0], scalar.data[1], scalar.data[2], scalar.data[3] }.get_msb();
+            const size_t bit_length = static_cast<size_t>(msb) + 1;
+            weights[k] =
+                static_cast<uint16_t>((bit_length + bits_per_slice - 1) / bits_per_slice) + FIXED_PER_SCALAR_WEIGHT;
+        }
+    });
+}
+
+template <typename Curve>
+std::vector<typename MSM<Curve>::ThreadWorkUnits> MSM<Curve>::partition_by_weight(
+    std::span<const std::vector<uint16_t>> msm_scalar_weights, size_t num_threads) noexcept
+{
+    BB_ASSERT_GT(num_threads, 0U);
+    std::vector<ThreadWorkUnits> work_units(num_threads);
+
+    size_t grand_total_weight = 0;
+    for (const auto& weights : msm_scalar_weights) {
+        for (uint16_t w : weights) {
+            grand_total_weight += w;
+        }
+    }
+    if (grand_total_weight == 0) {
+        return work_units;
+    }
+
+    const size_t weight_per_thread = numeric::ceil_div(grand_total_weight, num_threads);
+
+    size_t thread_accumulated_weight = 0;
+    size_t current_thread_idx = 0;
+    for (size_t i = 0; i < msm_scalar_weights.size(); ++i) {
+        const auto& weights = msm_scalar_weights[i];
+        const size_t n = weights.size();
+
+        size_t start = 0;
+        for (size_t k = 0; k < n; ++k) {
+            thread_accumulated_weight += weights[k];
+
+            if (current_thread_idx < num_threads - 1 && thread_accumulated_weight >= weight_per_thread) {
+                work_units[current_thread_idx].push_back(MSMWorkUnit{
+                    .batch_msm_index = i,
+                    .start_index = start,
+                    .size = k + 1 - start,
+                });
+                start = k + 1;
+                current_thread_idx++;
+                thread_accumulated_weight = 0;
+            }
+        }
+        if (start < n) {
+            work_units[current_thread_idx].push_back(MSMWorkUnit{
+                .batch_msm_index = i,
+                .start_index = start,
+                .size = n - start,
+            });
+        }
+    }
+    return work_units;
+}
+
 template <typename Curve>
 std::vector<typename MSM<Curve>::ThreadWorkUnits> MSM<Curve>::get_work_units(
     std::span<std::span<ScalarField>> scalars, std::vector<std::vector<uint32_t>>& msm_scalar_indices) noexcept
 {
     const size_t num_msms = scalars.size();
     msm_scalar_indices.resize(num_msms);
-    for (size_t i = 0; i < num_msms; ++i) {
-        transform_scalar_and_get_nonzero_scalar_indices(scalars[i], msm_scalar_indices[i]);
-    }
 
+    // Weight scalars by their Pippenger cost (slice count + fixed overhead, see
+    // compute_scalar_slice_weights) to improve thread balancing.
+    std::vector<std::vector<uint16_t>> msm_scalar_weights(num_msms);
     size_t total_work = 0;
-    for (const auto& indices : msm_scalar_indices) {
-        total_work += indices.size();
+    for (size_t i = 0; i < num_msms; ++i) {
+        transform_scalar_and_get_nonzero_scalar_indices(scalars[i], msm_scalar_indices[i]);
+        const size_t n = msm_scalar_indices[i].size();
+        total_work += n;
+        if (n == 0) {
+            continue;
+        }
+        const uint32_t bps = get_optimal_log_num_buckets(n);
+        compute_scalar_slice_weights(scalars[i], msm_scalar_indices[i], bps, msm_scalar_weights[i]);
     }
 
     const size_t num_threads = get_num_cpus();
-    std::vector<ThreadWorkUnits> work_units(num_threads);
-
-    const size_t work_per_thread = numeric::ceil_div(total_work, num_threads);
-    const size_t work_of_last_thread = total_work - (work_per_thread * (num_threads - 1));
 
     // Only use a single work unit if we don't have enough work for every thread
     if (num_threads > total_work) {
+        std::vector<ThreadWorkUnits> work_units(num_threads);
         for (size_t i = 0; i < num_msms; ++i) {
             work_units[0].push_back(MSMWorkUnit{
                 .batch_msm_index = i,
@@ -118,37 +205,7 @@ std::vector<typename MSM<Curve>::ThreadWorkUnits> MSM<Curve>::get_work_units(
         return work_units;
     }
 
-    size_t thread_accumulated_work = 0;
-    size_t current_thread_idx = 0;
-    for (size_t i = 0; i < num_msms; ++i) {
-        size_t msm_work_remaining = msm_scalar_indices[i].size();
-        const size_t initial_msm_work = msm_work_remaining;
-
-        while (msm_work_remaining > 0) {
-            BB_ASSERT_LT(current_thread_idx, work_units.size());
-
-            const size_t total_thread_work =
-                (current_thread_idx == num_threads - 1) ? work_of_last_thread : work_per_thread;
-            const size_t available_thread_work = total_thread_work - thread_accumulated_work;
-            const size_t work_to_assign = std::min(available_thread_work, msm_work_remaining);
-
-            work_units[current_thread_idx].push_back(MSMWorkUnit{
-                .batch_msm_index = i,
-                .start_index = initial_msm_work - msm_work_remaining,
-                .size = work_to_assign,
-            });
-
-            thread_accumulated_work += work_to_assign;
-            msm_work_remaining -= work_to_assign;
-
-            // Move to next thread if current thread is full
-            if (thread_accumulated_work >= total_thread_work) {
-                current_thread_idx++;
-                thread_accumulated_work = 0;
-            }
-        }
-    }
-    return work_units;
+    return partition_by_weight(msm_scalar_weights, num_threads);
 }
 
 /**
diff --git a/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/scalar_multiplication.hpp b/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/scalar_multiplication.hpp
index 36352c269131..c03f679b61bc 100644
--- a/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/scalar_multiplication.hpp
+++ b/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/scalar_multiplication.hpp
@@ -240,6 +240,14 @@ template <typename Curve> class MSM {
     /** @brief Compute optimal bits per slice by minimizing cost over c in [1, MAX_SLICE_BITS) */
     static uint32_t get_optimal_log_num_buckets(size_t num_points) noexcept;
 
+    /** @brief Partition per-MSM scalar weights into num_threads work units of approximately
+     *         equal cumulative weight.
+     *  @details Curve-independent and side-effect-free. The walk closes a work unit every time
+     *           the running weight crosses the per-thread target, except on the last thread
+     *           which absorbs any remainder so rounding drift doesn't leave work stranded. */
+    static std::vector<ThreadWorkUnits> partition_by_weight(std::span<const std::vector<uint16_t>> msm_scalar_weights,
+                                                            size_t num_threads) noexcept;
+
     /** @brief Process sorted point schedule into bucket accumulators using batched affine additions */
     static void batch_accumulate_points_into_buckets(std::span<const uint64_t> point_schedule,
                                                      std::span<const AffineElement> points,
@@ -288,7 +296,20 @@ template <typename Curve> class MSM {
     static void transform_scalar_and_get_nonzero_scalar_indices(std::span<ScalarField> scalars,
                                                                 std::vector<uint32_t>& nonzero_scalar_indices) noexcept;
 
-    /** @brief Distribute multiple MSMs across threads with balanced point counts */
+    /** @brief Compute per-scalar slice-count weights ceil(bit_length / bits_per_slice).
+     *  @details Parallel over nonzero_indices. Scalars must be in non-Montgomery form (as left
+     *           by transform_scalar_and_get_nonzero_scalar_indices). Weights drive thread
+     *           partitioning in get_work_units. */
+    static void compute_scalar_slice_weights(std::span<const ScalarField> scalars,
+                                             std::span<const uint32_t> nonzero_indices,
+                                             uint32_t bits_per_slice,
+                                             std::vector<uint16_t>& weights) noexcept;
+
+    /** @brief Distribute multiple MSMs across threads with balanced bucket-accumulation work.
+     *  @details Per-thread assignment is a contiguous range of each MSM's nonzero-scalar
+     *           indices, sized by cumulative slice-count weight ceil(bit_length / c). This is
+     *           the actual number of nonzero c-bit slices a scalar contributes — the quantity
+     *           that drives bucket-accumulation cost. */
     static std::vector<ThreadWorkUnits> get_work_units(std::span<std::span<ScalarField>> scalars,
                                                        std::vector<std::vector<uint32_t>>& msm_scalar_indices) noexcept;
 
diff --git a/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/scalar_multiplication.test.cpp b/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/scalar_multiplication.test.cpp
index 2c7df6638998..24107df4ab30 100644
--- a/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/scalar_multiplication.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/scalar_multiplication.test.cpp
@@ -701,6 +701,151 @@ TYPED_TEST(ScalarMultiplicationTest, PippengerUnsafeFreeFunction)
     this->test_pippenger_unsafe_free_function();
 }
 
+// Curve-independent unit tests for the work-unit partitioner.
+// partition_by_weight is the load-bearing balancing logic in get_work_units; pinning its
+// behavior with synthetic weights makes regressions in the partition algorithm visible
+// without needing a full MSM run.
+namespace {
+
+using PartitionMSM = scalar_multiplication::MSM<curve::BN254>;
+using WorkUnit = PartitionMSM::MSMWorkUnit;
+
+// Total weight assigned to a thread (sum of WorkUnit sizes weighted by the input vector).
+size_t thread_weight(const std::vector<WorkUnit>& units, const std::vector<std::vector<uint16_t>>& weights)
+{
+    size_t total = 0;
+    for (const auto& u : units) {
+        for (size_t k = 0; k < u.size; ++k) {
+            total += weights[u.batch_msm_index][u.start_index + k];
+        }
+    }
+    return total;
+}
+
+} // namespace
+
+TEST(PartitionByWeight, NoMsmsReturnsEmptyThreads)
+{
+    auto units = PartitionMSM::partition_by_weight({}, 8);
+    ASSERT_EQ(units.size(), 8U);
+    for (const auto& t : units) {
+        EXPECT_TRUE(t.empty());
+    }
+}
+
+TEST(PartitionByWeight, AllEmptyMsmsReturnsEmptyThreads)
+{
+    std::vector<std::vector<uint16_t>> weights{ {}, {}, {} };
+    auto units = PartitionMSM::partition_by_weight(weights, 4);
+    ASSERT_EQ(units.size(), 4U);
+    for (const auto& t : units) {
+        EXPECT_TRUE(t.empty());
+    }
+}
+
+TEST(PartitionByWeight, SingleThreadGetsEverything)
+{
+    std::vector<std::vector<uint16_t>> weights{ { 5, 5, 5, 5, 5 } };
+    auto units = PartitionMSM::partition_by_weight(weights, 1);
+    ASSERT_EQ(units.size(), 1U);
+    ASSERT_EQ(units[0].size(), 1U);
+    EXPECT_EQ(units[0][0].batch_msm_index, 0U);
+    EXPECT_EQ(units[0][0].start_index, 0U);
+    EXPECT_EQ(units[0][0].size, 5U);
+}
+
+TEST(PartitionByWeight, EvenSplitAcrossThreads)
+{
+    // 8 weights of 5 => total 40, target 10 per thread (4 threads), so 2 weights per thread.
+    std::vector<std::vector<uint16_t>> weights{ { 5, 5, 5, 5, 5, 5, 5, 5 } };
+    auto units = PartitionMSM::partition_by_weight(weights, 4);
+    ASSERT_EQ(units.size(), 4U);
+    for (size_t t = 0; t < 4; ++t) {
+        ASSERT_EQ(units[t].size(), 1U) << "thread " << t;
+        EXPECT_EQ(units[t][0].size, 2U) << "thread " << t;
+        EXPECT_EQ(thread_weight(units[t], weights), 10U) << "thread " << t;
+    }
+}
+
+TEST(PartitionByWeight, HeavyFirstWeightClosesFirstThreadEarly)
+{
+    // First weight alone exceeds the per-thread target; remainder is evenly split.
+    std::vector<std::vector<uint16_t>> weights{ { 100, 5, 5, 5, 5 } };
+    auto units = PartitionMSM::partition_by_weight(weights, 4);
+    ASSERT_EQ(units.size(), 4U);
+    // Thread 0 should close after the heavy weight.
+    ASSERT_FALSE(units[0].empty());
+    EXPECT_EQ(units[0][0].start_index, 0U);
+    EXPECT_EQ(units[0][0].size, 1U);
+    // Total assigned across all threads must equal n.
+    size_t total_assigned = 0;
+    for (const auto& t : units) {
+        for (const auto& u : t) {
+            total_assigned += u.size;
+        }
+    }
+    EXPECT_EQ(total_assigned, 5U);
+}
+
+TEST(PartitionByWeight, BoundaryStraddlesMsm)
+{
+    // Two MSMs of 4 weights of 5 each => total 40, 4 threads, target 10.
+    // Boundary should land mid-MSM if weights cross between MSMs.
+    std::vector<std::vector<uint16_t>> weights{ { 5, 5, 5, 5 }, { 5, 5, 5, 5 } };
+    auto units = PartitionMSM::partition_by_weight(weights, 4);
+    ASSERT_EQ(units.size(), 4U);
+    size_t total_assigned = 0;
+    for (const auto& t : units) {
+        for (const auto& u : t) {
+            total_assigned += u.size;
+        }
+    }
+    EXPECT_EQ(total_assigned, 8U);
+    // Each thread should carry exactly weight 10.
+    for (size_t t = 0; t < 4; ++t) {
+        EXPECT_EQ(thread_weight(units[t], weights), 10U) << "thread " << t;
+    }
+}
+
+TEST(PartitionByWeight, LastThreadAbsorbsRemainder)
+{
+    // weights {7,7,1}, num_threads=3 => total 15, target = ceil(15/3) = 5.
+    // Walk: T0 closes after weight 7, T1 closes after weight 7, then weight 1 trails.
+    // Without the "current_thread_idx < num_threads - 1" guard the partitioner would
+    // refuse to close T2 (running weight 1 < target 5) and the trailing weight would
+    // be lost. The guard makes T2 absorb it via the post-loop push.
+    std::vector<std::vector<uint16_t>> weights{ { 7, 7, 1 } };
+    auto units = PartitionMSM::partition_by_weight(weights, 3);
+    ASSERT_EQ(units.size(), 3U);
+    size_t total_assigned = 0;
+    for (const auto& t : units) {
+        for (const auto& u : t) {
+            total_assigned += u.size;
+        }
+    }
+    EXPECT_EQ(total_assigned, 3U);
+    ASSERT_EQ(units[2].size(), 1U);
+    EXPECT_EQ(units[2][0].start_index, 2U);
+    EXPECT_EQ(units[2][0].size, 1U);
+    EXPECT_EQ(thread_weight(units[2], weights), 1U);
+}
+
+TEST(PartitionByWeight, MoreThreadsThanScalars)
+{
+    // 3 weights of 5 => total 15, 8 threads, target ceil(15/8)=2.
+    // Each weight (5) immediately crosses target => first 3 threads each get one scalar.
+    std::vector<std::vector<uint16_t>> weights{ { 5, 5, 5 } };
+    auto units = PartitionMSM::partition_by_weight(weights, 8);
+    ASSERT_EQ(units.size(), 8U);
+    for (size_t t = 0; t < 3; ++t) {
+        ASSERT_EQ(units[t].size(), 1U) << "thread " << t;
+        EXPECT_EQ(units[t][0].size, 1U);
+    }
+    for (size_t t = 3; t < 8; ++t) {
+        EXPECT_TRUE(units[t].empty()) << "thread " << t;
+    }
+}
+
 // Non-templated test for explicit small inputs
 TEST(ScalarMultiplication, SmallInputsExplicit)
 {
diff --git a/barretenberg/cpp/src/barretenberg/flavor/flavor.hpp b/barretenberg/cpp/src/barretenberg/flavor/flavor.hpp
index c8fa282fe79f..f0aa5678ac70 100644
--- a/barretenberg/cpp/src/barretenberg/flavor/flavor.hpp
+++ b/barretenberg/cpp/src/barretenberg/flavor/flavor.hpp
@@ -197,7 +197,7 @@ class NativeVerificationKey_ : public PrecomputedCommitments {
      * @brief Calculate the number of field elements needed for serialization
      * @return size_t Number of field elements
      */
-    static size_t calc_num_data_types()
+    static constexpr size_t calc_num_data_types()
     {
         size_t commitments_size = PrecomputedCommitments::size() * Codec::template calc_num_fields<Commitment>();
         size_t metadata_size = MetaData::NUM_FIELDS * Codec::template calc_num_fields<uint64_t>();
diff --git a/barretenberg/cpp/src/barretenberg/flavor/mega_flavor.hpp b/barretenberg/cpp/src/barretenberg/flavor/mega_flavor.hpp
index 81508cb9266f..016c5acb1c64 100644
--- a/barretenberg/cpp/src/barretenberg/flavor/mega_flavor.hpp
+++ b/barretenberg/cpp/src/barretenberg/flavor/mega_flavor.hpp
@@ -24,7 +24,10 @@
 #include "barretenberg/relations/non_native_field_relation.hpp"
 #include "barretenberg/relations/permutation_relation.hpp"
 #include "barretenberg/relations/poseidon2_external_relation.hpp"
-#include "barretenberg/relations/poseidon2_internal_relation.hpp"
+#include "barretenberg/relations/poseidon2_initial_external_relation.hpp"
+#include "barretenberg/relations/poseidon2_quad_internal_relation.hpp"
+#include "barretenberg/relations/poseidon2_quad_internal_terminal_relation.hpp"
+#include "barretenberg/relations/poseidon2_transition_entry_relation.hpp"
 #include "barretenberg/relations/relation_tuple_helpers.hpp"
 #include "barretenberg/relations/ultra_arithmetic_relation.hpp"
 #include "barretenberg/stdlib_circuit_builders/mega_circuit_builder.hpp"
@@ -71,7 +74,10 @@ class MegaFlavor {
                                   bb::EccOpQueueRelation<FF>,
                                   bb::DatabusLookupRelation<FF>,
                                   bb::Poseidon2ExternalRelation<FF>,
-                                  bb::Poseidon2InternalRelation<FF>>;
+                                  bb::Poseidon2InitialExternalRelation<FF>,
+                                  bb::Poseidon2QuadInternalRelation<FF>,
+                                  bb::Poseidon2QuadInternalTerminalRelation<FF>,
+                                  bb::Poseidon2TransitionEntryRelation<FF>>;
     using Relations = Relations_<FF>;
 
     static constexpr size_t MAX_PARTIAL_RELATION_LENGTH = compute_max_partial_relation_length<Relations>();
@@ -93,8 +99,10 @@ class MegaFlavor {
      * @details Used to build the proving key and verification key.
      *
      * These polynomials fall into several categories based on their origin:
-     * - **Circuit selectors** (q_m, q_c, q_l, q_r, q_o, q_4, q_busread, q_lookup, q_arith, q_delta_range,
-     *   q_elliptic, q_memory, q_nnf, q_poseidon2_external, q_poseidon2_internal): Populated directly from
+     * - **Circuit selectors** (q_m, q_c, q_l, q_r, q_o, q_4, q_5, q_busread, q_lookup, q_arith, q_delta_range,
+     *   q_elliptic, q_memory, q_nnf, q_poseidon2_external, q_poseidon2_external_initial,
+     *   q_poseidon2_quad_internal, q_poseidon2_quad_internal_terminal, q_poseidon2_transition_entry):
+     *   Populated directly from
      *   the circuit builder's execution trace blocks.
      * - **Permutation polynomials** (sigma_1-4, id_1-4): Computed from wire copy cycles.
      * - **Table polynomials** (table_1-4): Populated from lookup tables in the circuit.
@@ -109,40 +117,44 @@ class MegaFlavor {
         bool operator==(const PrecomputedEntities&) const = default;
         using DataType = DataType_;
         DEFINE_FLAVOR_MEMBERS(DataType,
-                              q_m,                  // column 0
-                              q_c,                  // column 1
-                              q_l,                  // column 2
-                              q_r,                  // column 3
-                              q_o,                  // column 4
-                              q_4,                  // column 5
-                              q_busread,            // column 6
-                              q_lookup,             // column 7
-                              q_arith,              // column 8
-                              q_delta_range,        // column 9
-                              q_elliptic,           // column 10
-                              q_memory,             // column 11
-                              q_nnf,                // column 12
-                              q_poseidon2_external, // column 13
-                              q_poseidon2_internal, // column 14
-                              sigma_1,              // column 15
-                              sigma_2,              // column 16
-                              sigma_3,              // column 17
-                              sigma_4,              // column 18
-                              id_1,                 // column 19
-                              id_2,                 // column 20
-                              id_3,                 // column 21
-                              id_4,                 // column 22
-                              table_1,              // column 23
-                              table_2,              // column 24
-                              table_3,              // column 25
-                              table_4,              // column 26
-                              lagrange_first,       // column 27
-                              lagrange_last,        // column 28
-                              lagrange_ecc_op,      // column 29 // indicator poly for ecc op gates
-                              databus_id            // column 30 // id polynomial, i.e. id_i = i
+                              q_m,                                // column 0
+                              q_c,                                // column 1
+                              q_l,                                // column 2
+                              q_r,                                // column 3
+                              q_o,                                // column 4
+                              q_4,                                // column 5
+                              q_5,                                // column 6
+                              q_busread,                          // column 7
+                              q_lookup,                           // column 8
+                              q_arith,                            // column 9
+                              q_delta_range,                      // column 10
+                              q_elliptic,                         // column 11
+                              q_memory,                           // column 12
+                              q_nnf,                              // column 13
+                              q_poseidon2_external,               // column 14
+                              q_poseidon2_external_initial,       // column 15
+                              q_poseidon2_quad_internal,          // column 16
+                              q_poseidon2_quad_internal_terminal, // column 17
+                              q_poseidon2_transition_entry,       // column 18
+                              sigma_1,                            // column 19
+                              sigma_2,                            // column 20
+                              sigma_3,                            // column 21
+                              sigma_4,                            // column 22
+                              id_1,                               // column 23
+                              id_2,                               // column 24
+                              id_3,                               // column 25
+                              id_4,                               // column 26
+                              table_1,                            // column 27
+                              table_2,                            // column 28
+                              table_3,                            // column 29
+                              table_4,                            // column 30
+                              lagrange_first,                     // column 31
+                              lagrange_last,                      // column 32
+                              lagrange_ecc_op,                    // column 33 // indicator poly for ecc op gates
+                              databus_id                          // column 34 // id polynomial, i.e. id_i = i
         )
 
-        auto get_non_gate_selectors() { return RefArray{ q_m, q_c, q_l, q_r, q_o, q_4 }; };
+        auto get_non_gate_selectors() { return RefArray{ q_m, q_c, q_l, q_r, q_o, q_4, q_5 }; };
         auto get_gate_selectors()
         {
             return RefArray{
@@ -154,7 +166,10 @@ class MegaFlavor {
                 q_memory,
                 q_nnf,
                 q_poseidon2_external,
-                q_poseidon2_internal,
+                q_poseidon2_external_initial,
+                q_poseidon2_quad_internal,
+                q_poseidon2_quad_internal_terminal,
+                q_poseidon2_transition_entry,
             };
         }
         auto get_selectors() { return concatenate(get_non_gate_selectors(), get_gate_selectors()); }
@@ -178,23 +193,29 @@ class MegaFlavor {
     template <typename DataType> class DerivedEntities {
       public:
         DEFINE_FLAVOR_MEMBERS(DataType,
-                              z_perm,                         // column 4
-                              lookup_inverses,                // column 5
-                              lookup_read_counts,             // column 6
-                              lookup_read_tags,               // column 7
-                              ecc_op_wire_1,                  // column 8
-                              ecc_op_wire_2,                  // column 9
-                              ecc_op_wire_3,                  // column 10
-                              ecc_op_wire_4,                  // column 11
-                              calldata,                       // column 12
-                              calldata_read_counts,           // column 13
-                              calldata_inverses,              // column 14
-                              secondary_calldata,             // column 15
-                              secondary_calldata_read_counts, // column 16
-                              secondary_calldata_inverses,    // column 17
-                              return_data,                    // column 18
-                              return_data_read_counts,        // column 19
-                              return_data_inverses);          // column 20
+                              z_perm,                          // column 4
+                              lookup_inverses,                 // column 5
+                              lookup_read_counts,              // column 6
+                              lookup_read_tags,                // column 7
+                              ecc_op_wire_1,                   // column 8
+                              ecc_op_wire_2,                   // column 9
+                              ecc_op_wire_3,                   // column 10
+                              ecc_op_wire_4,                   // column 11
+                              kernel_calldata,                 // column 12
+                              kernel_calldata_read_counts,     // column 13
+                              kernel_calldata_inverses,        // column 14
+                              first_app_calldata,              // column 15
+                              first_app_calldata_read_counts,  // column 16
+                              first_app_calldata_inverses,     // column 17
+                              second_app_calldata,             // column 18
+                              second_app_calldata_read_counts, // column 19
+                              second_app_calldata_inverses,    // column 20
+                              third_app_calldata,              // column 21
+                              third_app_calldata_read_counts,  // column 22
+                              third_app_calldata_inverses,     // column 23
+                              return_data,                     // column 24
+                              return_data_read_counts,         // column 25
+                              return_data_inverses);           // column 26
         auto get_to_be_shifted() { return RefArray{ z_perm }; };
     };
 
@@ -219,22 +240,30 @@ class MegaFlavor {
         template <size_t bus_idx> auto databus_entities_for_bus()
         {
             if constexpr (bus_idx == 0) {
-                return RefArray{ this->calldata, this->calldata_read_counts };
+                return RefArray{ this->kernel_calldata, this->kernel_calldata_read_counts };
             } else if constexpr (bus_idx == 1) {
-                return RefArray{ this->secondary_calldata, this->secondary_calldata_read_counts };
+                return RefArray{ this->first_app_calldata, this->first_app_calldata_read_counts };
+            } else if constexpr (bus_idx == 2) {
+                return RefArray{ this->second_app_calldata, this->second_app_calldata_read_counts };
+            } else if constexpr (bus_idx == 3) {
+                return RefArray{ this->third_app_calldata, this->third_app_calldata_read_counts };
             } else {
-                static_assert(bus_idx == 2);
+                static_assert(bus_idx == 4);
                 return RefArray{ this->return_data, this->return_data_read_counts };
             }
         }
         template <size_t bus_idx> auto databus_inverse_for_bus()
         {
             if constexpr (bus_idx == 0) {
-                return RefArray{ this->calldata_inverses };
+                return RefArray{ this->kernel_calldata_inverses };
             } else if constexpr (bus_idx == 1) {
-                return RefArray{ this->secondary_calldata_inverses };
+                return RefArray{ this->first_app_calldata_inverses };
+            } else if constexpr (bus_idx == 2) {
+                return RefArray{ this->second_app_calldata_inverses };
+            } else if constexpr (bus_idx == 3) {
+                return RefArray{ this->third_app_calldata_inverses };
             } else {
-                static_assert(bus_idx == 2);
+                static_assert(bus_idx == 4);
                 return RefArray{ this->return_data_inverses };
             }
         }
@@ -389,12 +418,18 @@ class MegaFlavor {
             ecc_op_wire_2 = "ECC_OP_WIRE_2";
             ecc_op_wire_3 = "ECC_OP_WIRE_3";
             ecc_op_wire_4 = "ECC_OP_WIRE_4";
-            calldata = "CALLDATA";
-            calldata_read_counts = "CALLDATA_READ_COUNTS";
-            calldata_inverses = "CALLDATA_INVERSES";
-            secondary_calldata = "SECONDARY_CALLDATA";
-            secondary_calldata_read_counts = "SECONDARY_CALLDATA_READ_COUNTS";
-            secondary_calldata_inverses = "SECONDARY_CALLDATA_INVERSES";
+            kernel_calldata = "KERNEL_CALLDATA";
+            kernel_calldata_read_counts = "KERNEL_CALLDATA_READ_COUNTS";
+            kernel_calldata_inverses = "KERNEL_CALLDATA_INVERSES";
+            first_app_calldata = "FIRST_APP_CALLDATA";
+            first_app_calldata_read_counts = "FIRST_APP_CALLDATA_READ_COUNTS";
+            first_app_calldata_inverses = "FIRST_APP_CALLDATA_INVERSES";
+            second_app_calldata = "SECOND_APP_CALLDATA";
+            second_app_calldata_read_counts = "SECOND_APP_CALLDATA_READ_COUNTS";
+            second_app_calldata_inverses = "SECOND_APP_CALLDATA_INVERSES";
+            third_app_calldata = "THIRD_APP_CALLDATA";
+            third_app_calldata_read_counts = "THIRD_APP_CALLDATA_READ_COUNTS";
+            third_app_calldata_inverses = "THIRD_APP_CALLDATA_INVERSES";
             return_data = "RETURN_DATA";
             return_data_read_counts = "RETURN_DATA_READ_COUNTS";
             return_data_inverses = "RETURN_DATA_INVERSES";
@@ -404,6 +439,7 @@ class MegaFlavor {
             q_r = "Q_R";
             q_o = "Q_O";
             q_4 = "Q_4";
+            q_5 = "Q_5";
             q_m = "Q_M";
             q_busread = "Q_BUSREAD";
             q_lookup = "Q_LOOKUP";
@@ -413,7 +449,10 @@ class MegaFlavor {
             q_memory = "Q_MEMORY";
             q_nnf = "Q_NNF";
             q_poseidon2_external = "Q_POSEIDON2_EXTERNAL";
-            q_poseidon2_internal = "Q_POSEIDON2_INTERNAL";
+            q_poseidon2_external_initial = "Q_POSEIDON2_EXTERNAL_INITIAL";
+            q_poseidon2_quad_internal = "Q_POSEIDON2_QUAD_INTERNAL";
+            q_poseidon2_quad_internal_terminal = "Q_POSEIDON2_QUAD_INTERNAL_TERMINAL";
+            q_poseidon2_transition_entry = "Q_POSEIDON2_TRANSITION_ENTRY";
             sigma_1 = "SIGMA_1";
             sigma_2 = "SIGMA_2";
             sigma_3 = "SIGMA_3";
diff --git a/barretenberg/cpp/src/barretenberg/flavor/partially_evaluated_multivariates.hpp b/barretenberg/cpp/src/barretenberg/flavor/partially_evaluated_multivariates.hpp
index c6017731c72d..0f67ddf9b713 100644
--- a/barretenberg/cpp/src/barretenberg/flavor/partially_evaluated_multivariates.hpp
+++ b/barretenberg/cpp/src/barretenberg/flavor/partially_evaluated_multivariates.hpp
@@ -33,7 +33,8 @@ class PartiallyEvaluatedMultivariatesBase : public AllEntitiesBase {
         for (auto [poly, full_poly] : zip_view(this->get_all(), full_polynomials.get_all())) {
             // After the initial sumcheck round, the new size is CEIL(size/2).
             size_t desired_size = (full_poly.end_index() / 2) + (full_poly.end_index() % 2);
-            poly = Polynomial(desired_size, circuit_size / 2);
+            // partially_evaluate writes to [0, desired_size) before any read; backing memory can be left uninitialized.
+            poly = Polynomial(desired_size, circuit_size / 2, 0, Polynomial::DontZeroMemory::FLAG);
         }
     }
 };
diff --git a/barretenberg/cpp/src/barretenberg/flavor/test_utils/proof_structures.hpp b/barretenberg/cpp/src/barretenberg/flavor/test_utils/proof_structures.hpp
index 8b553aa2450e..63c7f427a38d 100644
--- a/barretenberg/cpp/src/barretenberg/flavor/test_utils/proof_structures.hpp
+++ b/barretenberg/cpp/src/barretenberg/flavor/test_utils/proof_structures.hpp
@@ -318,18 +318,24 @@ template <typename Flavor> struct MegaStructuredProofBase : StructuredProofHelpe
     Commitment ecc_op_wire_2_comm;
     Commitment ecc_op_wire_3_comm;
     Commitment ecc_op_wire_4_comm;
-    Commitment calldata_comm;
-    Commitment calldata_read_counts_comm;
-    Commitment secondary_calldata_comm;
-    Commitment secondary_calldata_read_counts_comm;
+    Commitment kernel_calldata_comm;
+    Commitment kernel_calldata_read_counts_comm;
+    Commitment first_app_calldata_comm;
+    Commitment first_app_calldata_read_counts_comm;
+    Commitment second_app_calldata_comm;
+    Commitment second_app_calldata_read_counts_comm;
+    Commitment third_app_calldata_comm;
+    Commitment third_app_calldata_read_counts_comm;
     Commitment return_data_comm;
     Commitment return_data_read_counts_comm;
     Commitment lookup_read_counts_comm;
     Commitment lookup_read_tags_comm;
     Commitment w_4_comm;
     Commitment lookup_inverses_comm;
-    Commitment calldata_inverses_comm;
-    Commitment secondary_calldata_inverses_comm;
+    Commitment kernel_calldata_inverses_comm;
+    Commitment first_app_calldata_inverses_comm;
+    Commitment second_app_calldata_inverses_comm;
+    Commitment third_app_calldata_inverses_comm;
     Commitment return_data_inverses_comm;
     Commitment z_perm_comm;
     std::vector<bb::Univariate<FF, BATCHED_RELATION_PARTIAL_LENGTH>> sumcheck_univariates;
@@ -358,18 +364,24 @@ template <typename Flavor> struct MegaStructuredProofBase : StructuredProofHelpe
         ecc_op_wire_2_comm = this->template deserialize_from_buffer<Commitment>(proof_data, offset);
         ecc_op_wire_3_comm = this->template deserialize_from_buffer<Commitment>(proof_data, offset);
         ecc_op_wire_4_comm = this->template deserialize_from_buffer<Commitment>(proof_data, offset);
-        calldata_comm = this->template deserialize_from_buffer<Commitment>(proof_data, offset);
-        calldata_read_counts_comm = this->template deserialize_from_buffer<Commitment>(proof_data, offset);
-        secondary_calldata_comm = this->template deserialize_from_buffer<Commitment>(proof_data, offset);
-        secondary_calldata_read_counts_comm = this->template deserialize_from_buffer<Commitment>(proof_data, offset);
+        kernel_calldata_comm = this->template deserialize_from_buffer<Commitment>(proof_data, offset);
+        kernel_calldata_read_counts_comm = this->template deserialize_from_buffer<Commitment>(proof_data, offset);
+        first_app_calldata_comm = this->template deserialize_from_buffer<Commitment>(proof_data, offset);
+        first_app_calldata_read_counts_comm = this->template deserialize_from_buffer<Commitment>(proof_data, offset);
+        second_app_calldata_comm = this->template deserialize_from_buffer<Commitment>(proof_data, offset);
+        second_app_calldata_read_counts_comm = this->template deserialize_from_buffer<Commitment>(proof_data, offset);
+        third_app_calldata_comm = this->template deserialize_from_buffer<Commitment>(proof_data, offset);
+        third_app_calldata_read_counts_comm = this->template deserialize_from_buffer<Commitment>(proof_data, offset);
         return_data_comm = this->template deserialize_from_buffer<Commitment>(proof_data, offset);
         return_data_read_counts_comm = this->template deserialize_from_buffer<Commitment>(proof_data, offset);
         lookup_read_counts_comm = this->template deserialize_from_buffer<Commitment>(proof_data, offset);
         lookup_read_tags_comm = this->template deserialize_from_buffer<Commitment>(proof_data, offset);
         w_4_comm = this->template deserialize_from_buffer<Commitment>(proof_data, offset);
         lookup_inverses_comm = this->template deserialize_from_buffer<Commitment>(proof_data, offset);
-        calldata_inverses_comm = this->template deserialize_from_buffer<Commitment>(proof_data, offset);
-        secondary_calldata_inverses_comm = this->template deserialize_from_buffer<Commitment>(proof_data, offset);
+        kernel_calldata_inverses_comm = this->template deserialize_from_buffer<Commitment>(proof_data, offset);
+        first_app_calldata_inverses_comm = this->template deserialize_from_buffer<Commitment>(proof_data, offset);
+        second_app_calldata_inverses_comm = this->template deserialize_from_buffer<Commitment>(proof_data, offset);
+        third_app_calldata_inverses_comm = this->template deserialize_from_buffer<Commitment>(proof_data, offset);
         return_data_inverses_comm = this->template deserialize_from_buffer<Commitment>(proof_data, offset);
         z_perm_comm = this->template deserialize_from_buffer<Commitment>(proof_data, offset);
     }
@@ -384,18 +396,24 @@ template <typename Flavor> struct MegaStructuredProofBase : StructuredProofHelpe
         Base::serialize_to_buffer(ecc_op_wire_2_comm, proof_data);
         Base::serialize_to_buffer(ecc_op_wire_3_comm, proof_data);
         Base::serialize_to_buffer(ecc_op_wire_4_comm, proof_data);
-        Base::serialize_to_buffer(calldata_comm, proof_data);
-        Base::serialize_to_buffer(calldata_read_counts_comm, proof_data);
-        Base::serialize_to_buffer(secondary_calldata_comm, proof_data);
-        Base::serialize_to_buffer(secondary_calldata_read_counts_comm, proof_data);
+        Base::serialize_to_buffer(kernel_calldata_comm, proof_data);
+        Base::serialize_to_buffer(kernel_calldata_read_counts_comm, proof_data);
+        Base::serialize_to_buffer(first_app_calldata_comm, proof_data);
+        Base::serialize_to_buffer(first_app_calldata_read_counts_comm, proof_data);
+        Base::serialize_to_buffer(second_app_calldata_comm, proof_data);
+        Base::serialize_to_buffer(second_app_calldata_read_counts_comm, proof_data);
+        Base::serialize_to_buffer(third_app_calldata_comm, proof_data);
+        Base::serialize_to_buffer(third_app_calldata_read_counts_comm, proof_data);
         Base::serialize_to_buffer(return_data_comm, proof_data);
         Base::serialize_to_buffer(return_data_read_counts_comm, proof_data);
         Base::serialize_to_buffer(lookup_read_counts_comm, proof_data);
         Base::serialize_to_buffer(lookup_read_tags_comm, proof_data);
         Base::serialize_to_buffer(w_4_comm, proof_data);
         Base::serialize_to_buffer(lookup_inverses_comm, proof_data);
-        Base::serialize_to_buffer(calldata_inverses_comm, proof_data);
-        Base::serialize_to_buffer(secondary_calldata_inverses_comm, proof_data);
+        Base::serialize_to_buffer(kernel_calldata_inverses_comm, proof_data);
+        Base::serialize_to_buffer(first_app_calldata_inverses_comm, proof_data);
+        Base::serialize_to_buffer(second_app_calldata_inverses_comm, proof_data);
+        Base::serialize_to_buffer(third_app_calldata_inverses_comm, proof_data);
         Base::serialize_to_buffer(return_data_inverses_comm, proof_data);
         Base::serialize_to_buffer(z_perm_comm, proof_data);
     }
diff --git a/barretenberg/cpp/src/barretenberg/goblin/BATCH_MERGE_PROTOCOL.md b/barretenberg/cpp/src/barretenberg/goblin/BATCH_MERGE_PROTOCOL.md
new file mode 100644
index 000000000000..4702c17981ad
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/goblin/BATCH_MERGE_PROTOCOL.md
@@ -0,0 +1,218 @@
+# Batch Merge Protocol
+
+For a more detailed explanation of Chonk, see [REFERENCE TO CHONK DOC].
+
+During Chonk, circuits perform BN254 elliptic-curve operations that are delegated to Goblin rather than executed directly in the circuit. Each circuit exposes four `ecc_op_wire` commitments, one for each operation-table column.
+
+There are two distinct merge mechanisms:
+
+- The **Merge Protocol** in `MERGE_PROTOCOL.md` proves the latest pairwise merge relation. It checks one step of the form
+  $$
+  M_j(X) = L_j(X) + X^\ell R_j(X)
+  $$
+  for each column $j \in \{1,2,3,4\}$, together with a degree check for the left table. It should be read as the latest-merge protocol, including the soundness and degree-of-freedom analysis for that final merge.
+- The **Batch Merge Protocol** proves, in one proof, that a committed aggregate table is the concatenation of all accumulated subtables bound by a running commitment hash, with a zero-knowledge prefix prepended by the batch merge prover.
+
+The batch merge protocol therefore does not replace the latest merge proof. Batch merge establishes the accumulated table up to the batch-merge output: all subtables bound by the running hash, plus the ZK prefix. The latest merge protocol is then responsible for the final pairwise merge involving the hiding-kernel table.
+
+## Relation to the Merge Protocol
+
+The Merge Protocol proves only a current/latest merge step. Given commitments to two tables $L_j$ and $R_j$, it proves that the output commitment opens to
+
+$$
+M_j(X) = L_j(X) + X^\ell R_j(X)
+$$
+
+for each wire column $j$, where $\ell$ is the unshifted size of $L_j$.
+
+The Batch Merge Protocol proves a different statement. It receives a running hash that binds a sequence of subtable commitments and proves that the output aggregate commitment opens to the concatenation of every accumulated subtable, preceded by the batch-merge ZK prefix:
+
+$$
+F_j(X) = f_{0,j}(X) + \sum_{i=1}^{N} X^{k_i} f_{i,j}(X),
+\qquad
+k_i = s_0 + \sum_{m < i} s_m.
+$$
+
+Here:
+
+- $j \in \{1,2,3,4\}$ indexes the op-queue columns.
+- $f_{0,j}$ is the ZK-prefix column.
+- $f_{i,j}$ is the $j$-th column of the $i$-th accumulated subtable.
+- $s_0$ is the fixed ZK-prefix size.
+- $s_i$ is the claimed size bound for subtable $i$.
+
+Thus:
+
+- Merge Protocol: latest pairwise merge only.
+- Batch Merge Protocol: batched merge of all accumulated subtables plus the ZK prefix.
+
+## Running Commitment Hash
+
+Each kernel updates a running hash of the op-queue commitments it observes. If the previous hash is $h_{i-1}$ and the next subtable commitments are
+
+$$
+T_i = ([f_{i,1}], [f_{i,2}], [f_{i,3}], [f_{i,4}]),
+$$
+
+then the next hash is
+
+$$
+h_i = \text{Poseidon2}(h_{i-1}, T_i).
+$$
+
+The final kernel receives the resulting hash and passes it to the batch merge verifier. The verifier recomputes the same hash chain from the commitments supplied in the batch merge proof and checks that the selected hash value equals the public input hash. In the implementation this is optimized by reusing transcript challenges: `Transcript::get_challenge("HASH_i")` updates the transcript and yields the hash-chain element. The verifier compares the lower 127 bits of the supplied hash, so the hash-binding collision probability is $2^{-127}$.
+
+## Protocol Statement
+
+Let $M$ be the maximum number of subtables supported by the verifier, and let $N \leq M$ be the actual number of accumulated subtables sent by the prover. The prover and verifier work over four columns, but it is useful to write the statement per column.
+
+Public input:
+
+- A binding hash $h$ for the accumulated subtable commitments.
+
+Prover data:
+
+- Subtable polynomials $f_{i,j}$ for $i = 1,\ldots,N$ and $j = 1,\ldots,4$.
+- ZK-prefix polynomials $f_{0,j}$.
+- Aggregate polynomials
+  $$
+  F_j(X) = f_{0,j}(X) + \sum_{i=1}^{N} X^{k_i} f_{i,j}(X),
+  \qquad
+  k_i = s_0 + \sum_{m<i} s_m.
+  $$
+
+The verifier should be convinced that:
+
+1. The running hash $h$ binds the commitments to $f_{1,j},\ldots,f_{N,j}$.
+2. Each aggregate commitment $[F_j]$ is the concatenation of the ZK prefix and the $N$ accumulated subtables.
+3. The claimed size bounds are respected:
+   $$
+   \deg(f_{0,j}) < s_0,\qquad \deg(f_{i,j}) < s_i \text{ for } i=1,\ldots,N.
+   $$
+4. The unused subtable slots $i>N$ are zero and do not affect the concatenation.
+
+## Implemented Protocol
+
+The implementation uses flattened table indices. Index $0$ is the ZK prefix, and indices $1,\ldots,M$ are the possible accumulated subtables. For each table index $i$ and column $j$, let $C_{i,j}$ denote the corresponding polynomial:
+
+$$
+C_{0,j} = f_{0,j}, \qquad C_{i,j} = f_{i,j} \text{ for } i \geq 1.
+$$
+
+The verifier uses size parameters
+
+$$
+\sigma_0 = \texttt{UltraEccOpsTable::ZK\_ULTRA\_OPS},
+\qquad
+\sigma_i =
+\begin{cases}
+s_i & i \leq N,\\
+0 & i > N.
+\end{cases}
+$$
+
+### Prover
+
+1. Commit to all real accumulated subtable columns $[C_{i,j}]$ for $i=1,\ldots,N$.
+2. Send identity commitments for unused slots $i=N+1,\ldots,M$.
+3. Create and commit to the ZK-prefix columns $[C_{0,j}]$ using `ECCOpQueue::construct_zk_columns()`.
+4. Send $N$ and the subtable sizes $s_i$ for all $M$ possible subtable slots.
+5. Construct and commit to the merged table columns $[F_j]$.
+6. Derive batching challenges $1,\alpha,\alpha^2,\ldots$.
+7. Construct the degree-check polynomial over the active slots
+   $$
+   G(X) = \sum_{i=0}^{N}\sum_{j=1}^{4}
+          \alpha_{i,j}\, X^{\sigma_i-1} C_{i,j}(X^{-1}),
+   $$
+   where the $i=0$ terms are the ZK-prefix columns. Unused columns are treated as zero by the verifier.
+8. Derive an evaluation challenge $\kappa$.
+9. Send evaluations $C_{i,j}(\kappa)$, $F_j(\kappa)$, and $G(\kappa^{-1})$.
+10. Use Shplonk/KZG to prove all claimed openings.
+
+### Verifier
+
+The verifier recomputes the hash chain, receives commitments/evaluations, and performs three algebraic checks before reducing all openings to a single KZG pairing check.
+
+#### Concatenation Check
+
+For each column $j$, the verifier checks
+
+$$
+F_j(\kappa) = C_{0,j}(\kappa) + \kappa^{\sigma_0} C_{1,j}(\kappa) + \kappa^{\sigma_0+\sigma_1} C_{2,j}(\kappa) + \cdots + \kappa^{\sum_{m=0}^{M-1}\sigma_m} C_{M,j}(\kappa).
+$$
+
+In code this is evaluated with Horner's rule from the last table slot down to the ZK prefix. Since $\sigma_i=0$ and $C_{i,j}(\kappa)=0$ for unused slots, indices $i>N$ do not contribute.
+
+#### Degree Check
+
+For each committed column $C_{i,j}$, the reversed-polynomial identity gives
+
+$$
+\left(X^{\sigma_i-1} C_{i,j}(X^{-1})\right)(\kappa^{-1}) = \kappa^{1-\sigma_i} C_{i,j}(\kappa)
+$$
+
+The verifier checks the batched identity
+
+$$
+G(\kappa^{-1}) = \sum_{i=0}^{M}\sum_{j=1}^{4} \alpha_{i,j}\, \kappa^{1-\sigma_i} C_{i,j}(\kappa)
+$$
+
+This proves the degree bounds $\deg(C_{i,j}) < \sigma_i$ for all active table slots, except with the batching and Schwartz-Zippel failure probabilities. In particular, unused slots have $\sigma_i=0$ which means the right hand side has a term of the form
+$$
+X^{-1} C_{i,j}(X^{-1})
+$$
+Unless $C_{i,j} = 0$ such a terms contributes negative powers of $X$, which means the right hand side is not a polynomial, while the left hand side is (because it was committed to).
+
+
+#### Hash Consistency Check
+
+The verifier constructs an indicator array for the prover-supplied $N$ and selects the calculated hash after the $N$-th subtable. It then checks that this selected hash equals the public binding hash.
+
+The verifier also enforces $1 \leq N \leq M$. In recursive verification this is encoded by the product
+
+$$
+\prod_{i=1}^{M}(N-i)=0.
+$$
+
+## Adding ZK
+
+The batch merge output is part of the Goblin-facing accumulated operation table, so it must not reveal the real accumulated operations. Batch merge adds zero-knowledge by prepending a fixed-size ZK prefix $T_0$.
+
+This prefix is produced by `ECCOpQueue::construct_zk_columns()` and consists of:
+
+- one no-op;
+- three random Ultra-only ops;
+- one valid hiding op included in the ECCVM table.
+
+The prefix size is fixed:
+
+$$
+s_0 := \texttt{UltraEccOpsTable::ZK\_ULTRA\_OPS}.
+$$
+
+The prover therefore does not send $s_0$ as a variable size. The verifier uses the constant prefix size when computing concatenation offsets and degree-check powers.
+
+This prefix is the beginning-side ZK contribution. The hiding kernel later contributes the final random non-ops at the end of the table, and the latest Merge Protocol proves the corresponding final merge step. See `MERGE_PROTOCOL.md` for the latest-merge soundness and degree-of-freedom analysis.
+
+## Layout Notes
+
+The batch merge algebra above is written without duplicating the trace-layout discussion from `MERGE_PROTOCOL.md`. The implementation must still produce commitments with the layout expected downstream by the latest merge, Translator, and ECCVM checks.
+
+The important separation is:
+
+- Batch merge proves the hash-bound accumulated subtables plus the ZK prefix.
+- Latest merge proves the final append/prepend relation for the current hiding-kernel table and performs the final layout alignment discussed in `MERGE_PROTOCOL.md`.
+
+## Soundness Considerations
+
+The prover controls several values: $N$, the subtable sizes $s_i$, the column commitments, the aggregate commitments, and the evaluations. The protocol constrains these as follows:
+
+- **Commitment binding:** KZG binds each sent commitment to a unique polynomial under the standard binding assumption.
+- **Hash binding:** The public hash binds the active subtable commitments up to a $2^{-127}$ collision probability from the transcript-hash optimization.
+- **Number of subtables:** The verifier enforces $1 \leq N \leq M$ and masks unused sizes with the indicator array.
+- **Unused slots:** Slots $i>N$ are committed as identity and opened at zero. Their sizes are zeroed by the verifier.
+- **Degree bounds:** The reversed-polynomial identity proves $\deg(C_{i,j}) < \sigma_i$ for each active slot.
+- **Concatenation:** The random evaluation check proves that the aggregate commitments open to the concatenation determined by the same size parameters.
+- **PCS openings:** Shplonk batches all openings, and KZG reduces the final claim to pairing points.
+
+The remaining failure probabilities are the usual Schwartz-Zippel probability for the random evaluation point, batching soundness for the degree-check challenge, Shplonk batching soundness, KZG binding, and the hash-chain collision probability described above.
diff --git a/barretenberg/cpp/src/barretenberg/goblin/batch_merge.test.cpp b/barretenberg/cpp/src/barretenberg/goblin/batch_merge.test.cpp
new file mode 100644
index 000000000000..28c9f9c115e7
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/goblin/batch_merge.test.cpp
@@ -0,0 +1,616 @@
+// === AUDIT STATUS ===
+// internal:    { status: not started, auditors: [], commit: }
+// external_1:  { status: not started, auditors: [], commit: }
+// external_2:  { status: not started, auditors: [], commit: }
+// =====================
+
+#include "barretenberg/boomerang_value_detection/graph.hpp"
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
+#include "barretenberg/commitment_schemes/shplonk/shplonk.hpp"
+#include "barretenberg/common/test.hpp"
+#include "barretenberg/crypto/poseidon2/poseidon2.hpp"
+#include "barretenberg/goblin/batch_merge_prover.hpp"
+#include "barretenberg/goblin/batch_merge_verifier.hpp"
+#include "barretenberg/op_queue/ecc_op_queue.hpp"
+#include "barretenberg/srs/global_crs.hpp"
+#include "barretenberg/stdlib/primitives/curves/bn254.hpp"
+#include "barretenberg/stdlib/proof/proof.hpp"
+#include "barretenberg/transcript/transcript.hpp"
+
+namespace bb {
+
+using NativeCurve = curve::BN254;
+using NativeG1 = NativeCurve::AffineElement;
+
+static constexpr size_t NUM_WIRES = MegaExecutionTraceBlocks::NUM_WIRES;
+static constexpr size_t NUM_FRS_COMM = NativeTranscript::Codec::template calc_num_fields<NativeG1>();
+
+template <typename Curve, typename = void> struct BuilderTypeHelper {
+    struct DummyBuilder {};
+    using type = DummyBuilder;
+};
+
+template <typename Curve> struct BuilderTypeHelper<Curve, std::enable_if_t<Curve::is_stdlib_type>> {
+    using type = typename Curve::Builder;
+};
+
+enum class FaultMode : uint8_t {
+    NONE,
+    WRONG_MERGED_TABLE,       // merged table commitment/evals/opening are self-consistent but table is wrong
+    BAD_DEGREE_CHECK_POLY,    // degree-check commitment/eval/opening are self-consistent but polynomial is wrong
+    PADDING_NOT_INFINITY,     // padded slot sends non-zero shift size and non-zero commitment/eval
+    SHIFT_SIZE_MINUS_ONE,     // send k-1 as shift size for a subtable polynomial of size k
+    ZK_TABLE_DEGREE_TOO_HIGH, // zk table has degree above verifier hard-coded ZK shift
+    ZERO_SUBTABLES_CLAIM,     // send 0 as number of subtables,
+    TOO_MANY_SUBTABLES,       // send a number of subtables above the max that the verifier is configured for
+};
+
+void populate_subtable(const std::shared_ptr<ECCOpQueue>& op_queue, size_t num_ops)
+{
+    for (size_t i = 0; i < num_ops; ++i) {
+        op_queue->add_accumulate(NativeG1::random_element());
+        op_queue->mul_accumulate(NativeG1::random_element(), bb::fr::random_element());
+        op_queue->eq_and_reset();
+    }
+}
+
+std::shared_ptr<ECCOpQueue> make_op_queue_with_n_subtables(size_t n)
+{
+    const size_t max_op_queue_ops = 10;
+    auto op_queue = std::make_shared<ECCOpQueue>();
+    for (size_t i = 0; i < n; ++i) {
+        if (i > 0) {
+            op_queue->initialize_new_subtable();
+        }
+        populate_subtable(op_queue, ((1 + i) % max_op_queue_ops) + 1); // +1 to avoid empty subtables
+        op_queue->merge();
+    }
+    return op_queue;
+}
+
+/**
+ * Running hash over all MAX_SUBTABLES slots.
+ * Real subtables are in slots [0, ..., N-1]; padded slots [N, ..., MAX_SUBTABLES-1]
+ * are hashed as well (their commitments should be points at infinity).
+ */
+bb::fr compute_running_hash(const std::vector<bb::fr>& proof, size_t N)
+{
+    std::vector<bb::fr> round_inputs;
+    bb::fr previous_challenge(0);
+    bool is_first_challenge = true;
+
+    for (size_t subtable_idx = 0; subtable_idx < N; ++subtable_idx) {
+        round_inputs.clear();
+        if (!is_first_challenge) {
+            round_inputs.push_back(previous_challenge);
+        }
+        for (size_t col = 0; col < NUM_WIRES; ++col) {
+            const size_t global_col_idx = (subtable_idx * NUM_WIRES) + col;
+            const size_t base = (global_col_idx * NUM_FRS_COMM);
+            for (size_t j = 0; j < NUM_FRS_COMM; ++j) {
+                round_inputs.push_back(proof[base + j]);
+            }
+        }
+
+        // Transcript logic: hash full round buffer, then split into two challenge parts; get_challenge uses part[0].
+        const bb::fr full_hash = crypto::Poseidon2<crypto::Poseidon2Bn254ScalarFieldParams>::hash(round_inputs);
+        previous_challenge = full_hash;
+        is_first_challenge = false;
+    }
+
+    return previous_challenge;
+}
+
+/**
+ * Local prover copy used only in tests, with controlled fault injection points.
+ * Important: faults are applied before data is sent to transcript, so Fiat–Shamir remains consistent.
+ */
+class TweakableBatchMergeProver : public BatchMergeProver {
+    using Curve = curve::BN254;
+    using FF = Curve::ScalarField;
+    using PCS = KZG<Curve>;
+    using Polynomial = bb::Polynomial<FF>;
+    using OpeningClaim = ProverOpeningClaim<Curve>;
+    using Transcript = NativeTranscript;
+
+  public:
+    explicit TweakableBatchMergeProver(const std::shared_ptr<ECCOpQueue>& op_queue,
+                                       size_t max_subtables,
+                                       FaultMode mode = FaultMode::NONE)
+        : BatchMergeProver(op_queue, max_subtables)
+        , fault_mode(mode)
+    {}
+
+    MergeProof construct_proof()
+    {
+        const size_t M = max_subtables;
+
+        // Step 1
+        std::vector<std::array<Polynomial, NUM_WIRES>> subtable_cols = op_queue->construct_subtable_columns();
+
+        size_t N = subtable_cols.size();
+
+        std::vector<size_t> shift_sizes(N);
+        size_t max_shift_size = 0;
+        for (size_t i = 0; i < N; ++i) {
+            shift_sizes[i] = subtable_cols[i][0].size();
+            max_shift_size = std::max(max_shift_size, shift_sizes[i]);
+        }
+
+        // Step 2: commit subtable columns
+        Polynomial zero_poly(0);
+        for (size_t idx = 0; idx < N; ++idx) {
+            for (size_t col = 0; col < NUM_WIRES; ++col) {
+                const Polynomial& col_to_commit =
+                    (fault_mode == FaultMode::ZERO_SUBTABLES_CLAIM) ? zero_poly : subtable_cols[idx][col];
+                transcript->send_to_verifier("COLUMN_" + std::to_string(col) + "_" + std::to_string(idx),
+                                             pcs_commitment_key.commit(col_to_commit));
+            }
+            [[maybe_unused]] FF _ = transcript->template get_challenge<FF>("HASH_" + std::to_string(idx));
+        }
+
+        Polynomial one_poly(1);
+        one_poly.at(0) = 1;
+        for (size_t idx = N; idx < M; ++idx) {
+            for (size_t col = 0; col < NUM_WIRES; ++col) {
+                const bool non_infinity_padding =
+                    (fault_mode == FaultMode::PADDING_NOT_INFINITY && idx == N && col == 0);
+                transcript->send_to_verifier("COLUMN_" + std::to_string(col) + "_" + std::to_string(idx),
+                                             pcs_commitment_key.commit(non_infinity_padding ? one_poly : zero_poly));
+            }
+            [[maybe_unused]] FF _ = transcript->template get_challenge<FF>("HASH_" + std::to_string(idx));
+        }
+
+        // Step 2.b: Send the masking table
+        std::array<Polynomial, NUM_WIRES> zk_columns = op_queue->construct_zk_columns();
+
+        if (fault_mode == FaultMode::ZK_TABLE_DEGREE_TOO_HIGH) {
+            for (size_t col = 0; col < NUM_WIRES; ++col) {
+                // Make zk column degree exceed verifier's hard-coded ZK shift (= ZK_ULTRA_OPS).
+                Polynomial larger_zk_col(zk_columns[col], zk_columns[col].size() + 1);
+                larger_zk_col.at(larger_zk_col.size() - 1) = FF(1);
+                zk_columns[col] = std::move(larger_zk_col);
+            }
+        }
+
+        for (size_t col = 0; col < NUM_WIRES; ++col) {
+            transcript->send_to_verifier("ZK_COLUMN_" + std::to_string(col),
+                                         pcs_commitment_key.commit(zk_columns[col]));
+        }
+        max_shift_size = std::max(max_shift_size, zk_columns[0].size());
+
+        // Step 2.c: Flatten the columns for easier utilisation
+        std::vector<Polynomial> flattened_cols;
+        flattened_cols.reserve((subtable_cols.size() * NUM_WIRES) + NUM_WIRES);
+        for (size_t col = 0; col < NUM_WIRES; ++col) {
+            flattened_cols.push_back(std::move(zk_columns[col]));
+        }
+        for (auto& subtable_col : subtable_cols) {
+            for (size_t col = 0; col < NUM_WIRES; ++col) {
+                if (fault_mode == FaultMode::ZERO_SUBTABLES_CLAIM) {
+                    flattened_cols.push_back(Polynomial(1));
+                } else {
+                    flattened_cols.push_back(std::move(subtable_col[col]));
+                }
+            }
+        }
+
+        // Step 3
+        uint32_t sent_num_subtables = static_cast<uint32_t>(N);
+        if (fault_mode == FaultMode::ZERO_SUBTABLES_CLAIM) {
+            sent_num_subtables = 0;
+        }
+        transcript->send_to_verifier("NUM_SUBTABLES", sent_num_subtables);
+        for (size_t i = 0; i < M; ++i) {
+            uint32_t sent_shift_size = static_cast<uint32_t>(i < N ? shift_sizes[i] : 0);
+            if (fault_mode == FaultMode::PADDING_NOT_INFINITY && i == N && N < M) {
+                sent_shift_size = 1;
+            }
+            if (fault_mode == FaultMode::SHIFT_SIZE_MINUS_ONE && i == 0 && N > 0) {
+                BB_ASSERT_GT(shift_sizes[0], 0U);
+                sent_shift_size = static_cast<uint32_t>(shift_sizes[0] - 1);
+            }
+            if (fault_mode == FaultMode::ZERO_SUBTABLES_CLAIM && i == N && N < M) {
+                sent_shift_size = 0;
+            }
+            transcript->send_to_verifier("SHIFT_SIZE_" + std::to_string(i), sent_shift_size);
+        }
+
+        // Step 4: merged table
+        std::array<Polynomial, NUM_WIRES> merged_table(op_queue->construct_ultra_ops_table_columns());
+        if (fault_mode == FaultMode::WRONG_MERGED_TABLE && !merged_table[0].is_empty()) {
+            merged_table[0].at(0) += FF(1);
+        } else if (fault_mode == FaultMode::ZERO_SUBTABLES_CLAIM) {
+            for (size_t col = 0; col < NUM_WIRES; ++col) {
+                merged_table[col] = Polynomial(1);
+            }
+        }
+        for (size_t col = 0; col < NUM_WIRES; ++col) {
+            transcript->send_to_verifier("MERGED_COLUMN_" + std::to_string(col),
+                                         pcs_commitment_key.commit(merged_table[col]));
+        }
+
+        // Step 5
+        const FF degree_check_challenge = transcript->template get_challenge<FF>("DEGREE_CHECK_CHALLENGE");
+        const size_t num_degree_check_challenges = (M * NUM_WIRES) + NUM_WIRES;
+        std::vector<FF> degree_check_challenges = { FF(1), degree_check_challenge };
+        for (size_t idx = 2; idx < num_degree_check_challenges; ++idx) {
+            degree_check_challenges.push_back(degree_check_challenges.back() * degree_check_challenge);
+        }
+
+        // Step 6: degree-check poly
+        if (fault_mode == FaultMode::TOO_MANY_SUBTABLES) {
+            // This is the case in which we test that if the prover sends more columns than the max number of tables
+            // then the verifier rejects
+            size_t diff = flattened_cols.size() - num_degree_check_challenges;
+            for (size_t idx = 0; idx < diff * NUM_WIRES; ++idx) {
+                // Add challenges for the extra columns sent by the prover
+                degree_check_challenges.push_back(degree_check_challenges.back() * degree_check_challenge);
+            }
+        }
+
+        Polynomial degree_check_poly =
+            compute_degree_check_polynomial(flattened_cols, degree_check_challenges, max_shift_size);
+
+        if (fault_mode == FaultMode::TOO_MANY_SUBTABLES) {
+            // Remove the extra challenge added above to keep the degree check poly consistent with the rest of the
+            // proof
+            degree_check_challenges.pop_back();
+        }
+
+        if (fault_mode == FaultMode::BAD_DEGREE_CHECK_POLY && !degree_check_poly.is_empty()) {
+            degree_check_poly.at(0) += FF(1);
+        }
+
+        transcript->send_to_verifier("DEGREE_CHECK_POLY", pcs_commitment_key.commit(degree_check_poly));
+
+        // Step 7
+        const FF kappa = transcript->template get_challenge<FF>("KAPPA");
+        const FF kappa_inv = kappa.invert();
+
+        // Step 8: evals
+        std::vector<FF> evals;
+        const size_t num_actual_flattened_cols = (N * NUM_WIRES) + NUM_WIRES;
+        const size_t num_flattened_col_evals = (M * NUM_WIRES) + NUM_WIRES;
+        for (size_t flat_idx = 0; flat_idx < num_flattened_col_evals; ++flat_idx) {
+            FF eval = FF(0);
+            if (flat_idx < num_actual_flattened_cols) {
+                eval = flattened_cols[flat_idx].evaluate(kappa);
+            } else if (fault_mode == FaultMode::PADDING_NOT_INFINITY && flat_idx == num_actual_flattened_cols) {
+                eval = FF(1); // matches one_poly commitment at the first padded slot
+            }
+            evals.push_back(eval);
+            transcript->send_to_verifier("C_EVAL_" + std::to_string(flat_idx), eval);
+        }
+
+        for (size_t col = 0; col < NUM_WIRES; ++col) {
+            evals.push_back(merged_table[col].evaluate(kappa));
+            transcript->send_to_verifier("MERGED_EVAL_" + std::to_string(col), evals.back());
+        }
+
+        evals.push_back(degree_check_poly.evaluate(kappa_inv));
+        transcript->send_to_verifier("DEGREE_CHECK_EVAL", evals.back());
+
+        // Step 9
+        const size_t num_opening_claims = ((M + 1) * NUM_WIRES) + 1 + NUM_WIRES;
+        std::vector<OpeningClaim> opening_claims;
+        opening_claims.reserve(num_opening_claims);
+
+        for (size_t idx = 0; idx < num_flattened_col_evals; ++idx) {
+            if (idx < num_actual_flattened_cols) {
+                opening_claims.push_back({ std::move(flattened_cols[idx]), { kappa, evals[idx] } });
+            } else {
+                opening_claims.push_back({ Polynomial(1), { kappa, FF(0) } });
+            }
+        }
+
+        for (size_t idx = 0; idx < NUM_WIRES; ++idx) {
+            opening_claims.push_back(
+                { std::move(merged_table[idx]), { kappa, evals[(M * NUM_WIRES) + NUM_WIRES + idx] } });
+        }
+
+        opening_claims.push_back({ std::move(degree_check_poly), { kappa_inv, evals.back() } });
+
+        auto shplonk_opening_claim = ShplonkProver::prove(pcs_commitment_key, opening_claims, transcript);
+
+        PCS::compute_opening_proof(pcs_commitment_key, shplonk_opening_claim, transcript);
+        return transcript->export_proof();
+    }
+
+  private:
+    FaultMode fault_mode;
+};
+
+// Custom parameter struct to hold both Curve type and NumSubtables value
+template <typename Curve, size_t N> struct TestParam {
+    using CurveType = Curve;
+    static constexpr size_t NumSubtables = N;
+};
+
+// Specialize the fixture to extract both template parameters from TypeParam
+template <typename Param> class BatchMergeTests : public testing::Test {
+  public:
+    using Curve = typename Param::CurveType;
+    static constexpr size_t NumSubtables = Param::NumSubtables;
+    using FF = typename Curve::ScalarField;
+    using Verifier = BatchMergeVerifier_<Curve, NumSubtables>;
+    using Proof = typename Verifier::Proof;
+    using Transcript = typename Verifier::Transcript;
+    static constexpr bool IsRecursive = Curve::is_stdlib_type;
+    using BuilderType = typename BuilderTypeHelper<Curve>::type;
+
+    static constexpr size_t VERIFIER_NUM_GATES = NumSubtables == 9 ? 6362 : 22624;
+    static constexpr size_t ZK_OFFSET = NumSubtables == 9 ? 666 : 520;
+
+    struct VerifyResult {
+        bool reduction_ok;
+        bool pairing_ok;
+        bool circuit_ok;
+    };
+
+    static void SetUpTestSuite() { bb::srs::init_file_crs_factory(bb::srs::bb_crs_path()); }
+
+    static Proof create_proof(BuilderType& builder, const std::vector<bb::fr>& native_proof)
+    {
+        if constexpr (IsRecursive) {
+            stdlib::Proof<BuilderType> stdlib_proof(builder, native_proof);
+            return stdlib_proof;
+        } else {
+            (void)builder;
+            return native_proof;
+        }
+    }
+
+    static FF create_hash(BuilderType& builder, const bb::fr& native_hash)
+    {
+        if constexpr (IsRecursive) {
+            auto hash = FF::from_witness(&builder, native_hash);
+            hash.unset_free_witness_tag();
+            return hash;
+        } else {
+            (void)builder;
+            return native_hash;
+        }
+    }
+
+    static bool check_circuit(BuilderType& builder)
+    {
+        if constexpr (IsRecursive) {
+            return CircuitChecker::check(builder);
+        } else {
+            (void)builder;
+            return true;
+        }
+    }
+
+    static VerifyResult prove_and_verify(const std::shared_ptr<ECCOpQueue>& op_queue,
+                                         FaultMode fault_mode = FaultMode::NONE,
+                                         bool wrong_hash = false,
+                                         bool check_manifest = false)
+    {
+        TranscriptManifest prover_manifest;
+        std::vector<bb::fr> native_proof;
+        if (fault_mode == FaultMode::NONE) {
+            BatchMergeProver prover{ op_queue, NumSubtables };
+            if (check_manifest) {
+                prover.transcript->enable_manifest();
+            }
+
+            native_proof = prover.construct_proof();
+            if (check_manifest) {
+                prover_manifest = prover.transcript->get_manifest();
+            }
+        } else {
+            TweakableBatchMergeProver prover{ op_queue, NumSubtables, fault_mode };
+            if (check_manifest) {
+                prover.transcript->enable_manifest();
+            }
+
+            native_proof = prover.construct_proof();
+            if (check_manifest) {
+                prover_manifest = prover.transcript->get_manifest();
+            }
+        }
+
+        bb::fr native_hash = compute_running_hash(native_proof, op_queue->num_subtables());
+        if (wrong_hash) {
+            native_hash += bb::fr(1);
+        }
+
+        BuilderType builder;
+        Proof proof = create_proof(builder, native_proof);
+        FF hash = create_hash(builder, native_hash);
+
+        Verifier verifier;
+        if (check_manifest) {
+            verifier.transcript->enable_manifest();
+        }
+        auto result = verifier.reduce_to_pairing_check(proof, hash);
+
+        if (check_manifest) {
+            // Check consistency of manifests
+            auto verifier_manifest = verifier.transcript->get_manifest();
+            EXPECT_EQ(prover_manifest.size(), verifier_manifest.size());
+            for (size_t i = 0; i < prover_manifest.size(); ++i) {
+                EXPECT_EQ(prover_manifest[i], verifier_manifest[i]);
+            }
+        }
+
+        if constexpr (Curve::is_stdlib_type) {
+            EXPECT_EQ(builder.get_num_finalized_gates_inefficient(), VERIFIER_NUM_GATES + ZK_OFFSET);
+        }
+
+        return { result.reduction_succeeded, result.pairing_points.check(), check_circuit(builder) };
+    }
+};
+
+using TestParams = ::testing::Types<TestParam<curve::BN254, 9>,
+                                    TestParam<curve::BN254, CHONK_MAX_NUM_CIRCUITS>,
+                                    TestParam<stdlib::bn254<MegaCircuitBuilder>, 9>,
+                                    TestParam<stdlib::bn254<MegaCircuitBuilder>, CHONK_MAX_NUM_CIRCUITS>>;
+TYPED_TEST_SUITE(BatchMergeTests, TestParams);
+
+// Completeness
+
+TYPED_TEST(BatchMergeTests, ValidProofPassesWithPadding)
+{
+    auto op_queue = make_op_queue_with_n_subtables(3);
+    auto res = TestFixture::prove_and_verify(op_queue, FaultMode::NONE, false, /*check_manifest*/ true);
+    EXPECT_TRUE(res.reduction_ok);
+    EXPECT_TRUE(res.pairing_ok);
+    EXPECT_TRUE(res.circuit_ok);
+}
+
+TYPED_TEST(BatchMergeTests, ValidProofMaxSizePasses)
+{
+    auto op_queue = make_op_queue_with_n_subtables(TestFixture::NumSubtables);
+    auto res = TestFixture::prove_and_verify(op_queue);
+    EXPECT_TRUE(res.reduction_ok);
+    EXPECT_TRUE(res.pairing_ok);
+    EXPECT_TRUE(res.circuit_ok);
+}
+
+// Soundness
+
+TYPED_TEST(BatchMergeTests, ZeroSubtablesFails)
+{
+    BB_DISABLE_ASSERTS();
+    auto op_queue = make_op_queue_with_n_subtables(3);
+    auto res = TestFixture::prove_and_verify(op_queue, FaultMode::ZERO_SUBTABLES_CLAIM);
+    EXPECT_FALSE(res.reduction_ok); // Caught by product check
+    EXPECT_TRUE(res.pairing_ok);
+    if constexpr (TestFixture::IsRecursive) {
+        EXPECT_FALSE(res.circuit_ok);
+    }
+}
+
+TYPED_TEST(BatchMergeTests, TooManySubtablesFails)
+{
+    if constexpr (!TestFixture::Curve::is_stdlib_type) {
+        GTEST_SKIP() << "This test in native setting fails due to a deserialization failure. The verifier path in the "
+                        "same for native and recursive code, so it's enough to test the recursive code.";
+    } else {
+        BB_DISABLE_ASSERTS();
+        auto op_queue = make_op_queue_with_n_subtables(TestFixture::NumSubtables + 1);
+        auto res = TestFixture::prove_and_verify(op_queue, FaultMode::TOO_MANY_SUBTABLES);
+        EXPECT_FALSE(res.reduction_ok); // Caught by product check
+        EXPECT_FALSE(res.pairing_ok);   // Verifier uses fewer commitments than the one sent
+        if constexpr (TestFixture::IsRecursive) {
+            EXPECT_FALSE(res.circuit_ok); // Assertions fail
+        }
+    }
+}
+
+TYPED_TEST(BatchMergeTests, WrongMergedTableFails)
+{
+    auto op_queue = make_op_queue_with_n_subtables(2);
+    auto res = TestFixture::prove_and_verify(op_queue, FaultMode::WRONG_MERGED_TABLE);
+    EXPECT_FALSE(res.reduction_ok); // Caught by the concatenation check
+    EXPECT_TRUE(res.pairing_ok);
+    if constexpr (TestFixture::IsRecursive) {
+        EXPECT_FALSE(res.circuit_ok);
+    }
+}
+
+TYPED_TEST(BatchMergeTests, WrongHashFails)
+{
+    auto op_queue = make_op_queue_with_n_subtables(4);
+    auto res = TestFixture::prove_and_verify(op_queue, FaultMode::NONE, true);
+    EXPECT_FALSE(res.reduction_ok); // Caught by the hash check
+    EXPECT_TRUE(res.pairing_ok);
+    if constexpr (TestFixture::IsRecursive) {
+        EXPECT_FALSE(res.circuit_ok);
+    }
+}
+
+TYPED_TEST(BatchMergeTests, BadSubtableDegreeCheckFails)
+{
+    auto op_queue = make_op_queue_with_n_subtables(6);
+    auto res = TestFixture::prove_and_verify(op_queue, FaultMode::BAD_DEGREE_CHECK_POLY);
+    EXPECT_FALSE(res.reduction_ok); // Caught by the degree check
+    EXPECT_TRUE(res.pairing_ok);
+    if constexpr (TestFixture::IsRecursive) {
+        EXPECT_FALSE(res.circuit_ok);
+    }
+}
+
+TYPED_TEST(BatchMergeTests, PaddingTableNotInfinityFails)
+{
+    auto op_queue = make_op_queue_with_n_subtables(3);
+    auto res = TestFixture::prove_and_verify(op_queue, FaultMode::PADDING_NOT_INFINITY);
+    EXPECT_FALSE(res.reduction_ok); // Caught by the degree check: shift sizes are zeroed out >= N
+    EXPECT_TRUE(res.pairing_ok);    // PCS is consistent
+    if constexpr (TestFixture::IsRecursive) {
+        EXPECT_FALSE(res.circuit_ok); // Caught by the degree check: shift sizes are zeroed out >= N
+    }
+}
+
+TYPED_TEST(BatchMergeTests, ShiftSizeMinusOneFailsReductionOnly)
+{
+    auto op_queue = make_op_queue_with_n_subtables(7);
+    auto res = TestFixture::prove_and_verify(op_queue, FaultMode::SHIFT_SIZE_MINUS_ONE);
+    EXPECT_FALSE(res.reduction_ok); // Caught by the degree check
+    EXPECT_TRUE(res.pairing_ok);
+    if constexpr (TestFixture::IsRecursive) {
+        EXPECT_FALSE(res.circuit_ok);
+    }
+}
+
+TYPED_TEST(BatchMergeTests, ZKTableDegreeTooHighFailsReductionOnly)
+{
+    auto op_queue = make_op_queue_with_n_subtables(5);
+    auto res = TestFixture::prove_and_verify(op_queue, FaultMode::ZK_TABLE_DEGREE_TOO_HIGH);
+    EXPECT_FALSE(res.reduction_ok); // Caught by degree/concatenation reductions via hard-coded ZK shift.
+    EXPECT_TRUE(res.pairing_ok);    // PCS opening remains self-consistent with sent commitments/evals.
+    if constexpr (TestFixture::IsRecursive) {
+        EXPECT_FALSE(res.circuit_ok);
+    }
+}
+
+// Static analysis of the recursive verifier circuit: every variable must belong to a single connected
+// component (no disjoint subgraphs) and there must be no variables that participate in only one gate
+// (i.e. no unconstrained witnesses).
+TYPED_TEST(BatchMergeTests, GraphDescription)
+{
+    if constexpr (!TestFixture::IsRecursive) {
+        GTEST_SKIP() << "Graph description analysis only applies to stdlib (recursive) verifier circuits.";
+    } else {
+        using BuilderType = typename TestFixture::BuilderType;
+        using FF = typename TestFixture::FF;
+        using Proof = typename TestFixture::Proof;
+        using Verifier = typename TestFixture::Verifier;
+
+        auto op_queue = make_op_queue_with_n_subtables(5);
+        BatchMergeProver prover{ op_queue, TestFixture::NumSubtables };
+        auto native_proof = prover.construct_proof();
+        const bb::fr native_hash = compute_running_hash(native_proof, op_queue->num_subtables());
+
+        BuilderType builder;
+        Proof proof = TestFixture::create_proof(builder, native_proof);
+        FF hash = TestFixture::create_hash(builder, native_hash);
+        // The hash is consumed only via split_challenge, which yields a low/high pair via a single arithmetic
+        // gate: hash = lo + 2^127 * hi. The verifier subsequently uses only the low half, so hash itself
+        // appears in only that one gate. Pin it so the StaticAnalyzer doesn't flag it as unconstrained.
+        hash.fix_witness();
+
+        Verifier verifier;
+        auto result = verifier.reduce_to_pairing_check(proof, hash);
+
+        // The pairing points are public outputs from the recursive verifier that will be verified externally via a
+        // pairing check. Their output coordinates may not appear in multiple constraint gates; fix_witness() pins
+        // them so the StaticAnalyzer doesn't flag the coordinate limbs as unconstrained.
+        result.pairing_points.fix_witness();
+
+        builder.finalize_circuit();
+
+        using Analyzer =
+            std::conditional_t<IsMegaBuilder<BuilderType>, cdg::MegaStaticAnalyzer, cdg::UltraStaticAnalyzer>;
+        auto graph = Analyzer(builder);
+        auto [cc, variables_in_one_gate] = graph.analyze_circuit(/*filter_cc=*/true);
+
+        EXPECT_EQ(cc.size(), 1);
+        EXPECT_EQ(variables_in_one_gate.size(), 0);
+    }
+}
+
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/goblin/batch_merge_prover.cpp b/barretenberg/cpp/src/barretenberg/goblin/batch_merge_prover.cpp
new file mode 100644
index 000000000000..7245b05b1990
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/goblin/batch_merge_prover.cpp
@@ -0,0 +1,209 @@
+// === AUDIT STATUS ===
+// internal:    { status: not started, auditors: [], commit: }
+// external_1:  { status: not started, auditors: [], commit: }
+// external_2:  { status: not started, auditors: [], commit: }
+// =====================
+
+#include "batch_merge_prover.hpp"
+
+#include "barretenberg/commitment_schemes/shplonk/shplonk.hpp"
+#include <algorithm>
+
+namespace bb {
+
+BatchMergeProver::BatchMergeProver(const std::shared_ptr<ECCOpQueue>& op_queue, size_t max_subtables)
+    : transcript(std::make_shared<Transcript>())
+    , op_queue(op_queue)
+    , max_subtables(max_subtables)
+{
+    // The commitment key must be large enough for the full merged table (plus the zk offset).
+    pcs_commitment_key = CommitmentKey(op_queue->get_ultra_ops_table_num_rows() + UltraEccOpsTable::ZK_ULTRA_OPS);
+}
+
+typename BatchMergeProver::Polynomial BatchMergeProver::compute_degree_check_polynomial(
+    const std::vector<Polynomial>& flattened_columns,
+    const std::vector<FF>& degree_check_challenges,
+    const size_t max_size)
+{
+    // Zero initialization
+    Polynomial reversed_batched_poly(max_size);
+    std::vector<Polynomial> reversed_columns;
+    reversed_columns.reserve(flattened_columns.size());
+    for (const auto& poly : flattened_columns) {
+        reversed_columns.emplace_back(poly.reverse());
+    }
+
+    std::vector<PolynomialSpan<const FF>> reversed_column_spans;
+    std::vector<FF> scalars;
+    reversed_column_spans.reserve(flattened_columns.size());
+    scalars.reserve(flattened_columns.size());
+    for (size_t idx = 0; idx < flattened_columns.size(); ++idx) {
+        reversed_column_spans.emplace_back(reversed_columns[idx]);
+        scalars.push_back(degree_check_challenges[idx]);
+    }
+
+    add_scaled_batch(reversed_batched_poly,
+                     std::span<const PolynomialSpan<const FF>>(reversed_column_spans),
+                     std::span<const FF>(scalars));
+
+    return reversed_batched_poly;
+}
+
+typename BatchMergeProver::MergeProof BatchMergeProver::construct_proof()
+{
+    BB_BENCH_NAME("BatchMergeProver::construct_proof");
+    const size_t M = max_subtables;
+
+    // -------------------------------------------------------------------------
+    // Step 1: Gather subtable column polynomials and their shift sizes
+    // -------------------------------------------------------------------------
+    std::vector<std::array<Polynomial, NUM_WIRES>> subtable_cols = op_queue->construct_subtable_columns();
+
+    size_t N = subtable_cols.size();
+    BB_ASSERT_LTE(N, M, "BatchMergeProver: more subtables than max_subtables");
+
+    std::vector<size_t> shift_sizes(N);
+    size_t max_shift_size = 0;
+    for (size_t i = 0; i < N; ++i) {
+        shift_sizes[i] = subtable_cols[i][0].size(); // number of rows per poly
+        max_shift_size = std::max(max_shift_size, shift_sizes[i]);
+    }
+
+    // -------------------------------------------------------------------------
+    // Step 2: Commit to columns to be merged
+    // -------------------------------------------------------------------------
+    for (size_t idx = 0; idx < N; ++idx) {
+        for (size_t col = 0; col < NUM_WIRES; ++col) {
+            transcript->send_to_verifier("COLUMN_" + std::to_string(col) + "_" + std::to_string(idx),
+                                         pcs_commitment_key.commit(subtable_cols[idx][col]));
+        }
+        // update hash after each subtable to match verifier's transcript
+        [[maybe_unused]] FF _ = transcript->template get_challenge<FF>("HASH_" + std::to_string(idx));
+    }
+
+    Commitment infinity = Commitment::infinity();
+    for (size_t idx = N; idx < M; ++idx) {
+        for (size_t col = 0; col < NUM_WIRES; ++col) {
+            transcript->send_to_verifier("COLUMN_" + std::to_string(col) + "_" + std::to_string(idx), infinity);
+        }
+        // update hash after each subtable to match verifier's transcript
+        [[maybe_unused]] FF _ = transcript->template get_challenge<FF>("HASH_" + std::to_string(idx));
+    }
+
+    // -------------------------------------------------------------------------
+    // Step 2.b: Send the masking table
+    // -------------------------------------------------------------------------
+    std::array<Polynomial, NUM_WIRES> zk_columns = op_queue->construct_zk_columns();
+    for (size_t col = 0; col < NUM_WIRES; ++col) {
+        transcript->send_to_verifier("ZK_COLUMN_" + std::to_string(col), pcs_commitment_key.commit(zk_columns[col]));
+    }
+    max_shift_size = std::max(max_shift_size, zk_columns[0].size());
+
+    // -------------------------------------------------------------------------
+    // Step 2.c: Flatten the columns for easier utilization
+    // -------------------------------------------------------------------------
+    std::vector<Polynomial> flattened_cols;
+    flattened_cols.reserve((subtable_cols.size() * NUM_WIRES) + NUM_WIRES);
+    for (size_t col = 0; col < NUM_WIRES; ++col) {
+        flattened_cols.push_back(std::move(zk_columns[col]));
+    }
+    for (auto& subtable_col : subtable_cols) {
+        for (size_t col = 0; col < NUM_WIRES; col++) {
+            flattened_cols.push_back(std::move(subtable_col[col]));
+        }
+    }
+
+    // -------------------------------------------------------------------------
+    // Step 3: Send N and shift sizes to the verifier
+    // -------------------------------------------------------------------------
+    transcript->send_to_verifier("NUM_SUBTABLES", static_cast<uint32_t>(N));
+    for (size_t i = 0; i < M; ++i) {
+        transcript->send_to_verifier("SHIFT_SIZE_" + std::to_string(i),
+                                     static_cast<uint32_t>(i < N ? shift_sizes[i] : 0));
+    }
+
+    // -------------------------------------------------------------------------
+    // Step 4: Construct and commit to T (full merged table)
+    // -------------------------------------------------------------------------
+    std::array<Polynomial, NUM_WIRES> merged_table(op_queue->construct_ultra_ops_table_columns());
+    for (size_t col = 0; col < NUM_WIRES; ++col) {
+        transcript->send_to_verifier("MERGED_COLUMN_" + std::to_string(col),
+                                     pcs_commitment_key.commit(merged_table[col]));
+    }
+
+    // -------------------------------------------------------------------------
+    // Step 5: Compute degree check batching challenges 1, α, α^2, .., α^{(M + 1) * NUM_WIRES -1}
+    // -------------------------------------------------------------------------
+    const FF degree_check_challenge = transcript->template get_challenge<FF>("DEGREE_CHECK_CHALLENGE");
+    const size_t num_degree_check_challenges = (M + 1) * NUM_WIRES;
+    std::vector<FF> degree_check_challenges = { FF(1), degree_check_challenge };
+    for (size_t idx = 2; idx < num_degree_check_challenges; idx++) {
+        degree_check_challenges.push_back(degree_check_challenges.back() * degree_check_challenge);
+    }
+
+    // -------------------------------------------------------------------------
+    // Step 6: Compute G = sum_i α_i * C_i(1 / X) * X^{shift_size_i - 1}, commit, send [G]
+    // -------------------------------------------------------------------------
+    Polynomial degree_check_poly =
+        compute_degree_check_polynomial(flattened_cols, degree_check_challenges, max_shift_size);
+    transcript->send_to_verifier("DEGREE_CHECK_POLY", pcs_commitment_key.commit(degree_check_poly));
+
+    // -------------------------------------------------------------------------
+    // Step 7: Evaluation challenge κ
+    // -------------------------------------------------------------------------
+    const FF kappa = transcript->template get_challenge<FF>("KAPPA");
+    const FF kappa_inv = kappa.invert();
+
+    // -------------------------------------------------------------------------
+    // Step 8: Compute and send evaluations C_i(κ), T(κ), G(κ^{-1})
+    // -------------------------------------------------------------------------
+    // C_i_col(κ)
+    std::vector<FF> evals;
+    const size_t num_actual_flattened_cols = (N * NUM_WIRES) + NUM_WIRES;
+    const size_t num_flattened_col_evals = (M * NUM_WIRES) + NUM_WIRES;
+    for (size_t col = 0; col < num_flattened_col_evals; ++col) {
+        evals.push_back(col < num_actual_flattened_cols ? flattened_cols[col].evaluate(kappa) : FF(0));
+        transcript->send_to_verifier("C_EVAL_" + std::to_string(col), evals.back());
+    }
+
+    // T_col(κ)
+    for (size_t col = 0; col < NUM_WIRES; ++col) {
+        evals.push_back(merged_table[col].evaluate(kappa));
+        transcript->send_to_verifier("MERGED_EVAL_" + std::to_string(col), evals.back());
+    }
+
+    // G_col(κ^{-1})
+    evals.push_back(degree_check_poly.evaluate(kappa_inv));
+    transcript->send_to_verifier("DEGREE_CHECK_EVAL", evals.back());
+
+    // -------------------------------------------------------------------------
+    // Step 9: Shplonk to open
+    //   zk columns
+    //   for C_i(κ)
+    //   T(κ)
+    //   for G(κ^{-1})
+    // -------------------------------------------------------------------------
+    const size_t num_opening_claims = ((M + 2) * NUM_WIRES) + 1;
+    std::vector<OpeningClaim> opening_claims;
+    opening_claims.reserve(num_opening_claims);
+    for (size_t idx = 0; idx < num_flattened_col_evals; ++idx) {
+        if (idx >= num_actual_flattened_cols || flattened_cols[idx].size() == 0) {
+            // We use Polynomial(1) to avoid failures in Shplonk due to accessing empty polynomials
+            opening_claims.push_back({ Polynomial(1), { kappa, FF(0) } });
+        } else {
+            opening_claims.push_back({ std::move(flattened_cols[idx]), { kappa, evals[idx] } });
+        }
+    }
+    for (size_t idx = 0; idx < NUM_WIRES; ++idx) {
+        opening_claims.push_back({ std::move(merged_table[idx]), { kappa, evals[((M + 1) * NUM_WIRES) + idx] } });
+    }
+    opening_claims.push_back({ std::move(degree_check_poly), { kappa_inv, evals.back() } });
+
+    auto shplonk_opening_claim = ShplonkProver::prove(pcs_commitment_key, opening_claims, transcript);
+
+    PCS::compute_opening_proof(pcs_commitment_key, shplonk_opening_claim, transcript);
+
+    return transcript->export_proof();
+}
+
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/goblin/batch_merge_prover.hpp b/barretenberg/cpp/src/barretenberg/goblin/batch_merge_prover.hpp
new file mode 100644
index 000000000000..5d4e2173331f
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/goblin/batch_merge_prover.hpp
@@ -0,0 +1,74 @@
+// === AUDIT STATUS ===
+// internal:    { status: not started, auditors: [], commit: }
+// external_1:  { status: not started, auditors: [], commit: }
+// external_2:  { status: not started, auditors: [], commit: }
+// =====================
+
+#pragma once
+
+#include "barretenberg/commitment_schemes/claim.hpp"
+#include "barretenberg/commitment_schemes/shplonk/shplonk.hpp"
+#include "barretenberg/flavor/mega_flavor.hpp"
+#include "barretenberg/goblin/merge_prover.hpp"
+#include "barretenberg/honk/proof_system/types/proof.hpp"
+#include "barretenberg/op_queue/ecc_op_queue.hpp"
+#include "barretenberg/transcript/transcript.hpp"
+
+namespace bb {
+
+/**
+ * @brief Batch merge prover
+ *
+ * @details This prover proves that the full merged table T is the correct concatenation of all N accumulated subtables
+ * C_0, ..., C_{N-1} (padded to MAX_SUBTABLES M).
+ */
+class BatchMergeProver {
+  protected:
+    using Curve = curve::BN254;
+    using FF = Curve::ScalarField;
+    using Commitment = Curve::AffineElement;
+    using Polynomial = bb::Polynomial<FF>;
+    using CommitmentKey = bb::CommitmentKey<Curve>;
+    using PCS = KZG<Curve>;
+    using OpeningClaim = ProverOpeningClaim<Curve>;
+    using Transcript = NativeTranscript;
+    using ShplonkProver = ShplonkProver_<Curve>;
+
+  public:
+    using MergeProof = std::vector<FF>;
+
+    static constexpr size_t NUM_WIRES = MegaExecutionTraceBlocks::NUM_WIRES;
+
+    /**
+     * @param op_queue   The ECC op queue containing all accumulated subtables (N subtables, in append order).
+     * @param transcript Shared prover transcript.
+     * @param max_subtables M: the fixed maximum number of subtables (CHONK_MAX_ACCUMULATION_STEPS).
+     */
+    explicit BatchMergeProver(const std::shared_ptr<ECCOpQueue>& op_queue, size_t max_subtables);
+
+    /**
+     * @brief Construct the batch merge proof.
+     *
+     * @details Proves that the full merged table T is the correct concatenation of all N subtables
+     * C_0, ..., C_{N-1} stored in the op_queue in append order (C_0 oldest, C_{N-1} most recently merged) together with
+     * an additional zero-knowledge commitment C_zk (prepended at the beginning).
+     *
+     */
+    MergeProof construct_proof();
+
+    // Exposed for test access
+    CommitmentKey pcs_commitment_key;
+
+    // Public for testing purposes
+    std::shared_ptr<Transcript> transcript;
+
+  protected:
+    std::shared_ptr<ECCOpQueue> op_queue;
+    size_t max_subtables; // M
+
+    static Polynomial compute_degree_check_polynomial(const std::vector<Polynomial>& flattened_columns,
+                                                      const std::vector<FF>& degree_check_challenges,
+                                                      const size_t max_size);
+};
+
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/goblin/batch_merge_verifier.cpp b/barretenberg/cpp/src/barretenberg/goblin/batch_merge_verifier.cpp
new file mode 100644
index 000000000000..1d4d14092a9a
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/goblin/batch_merge_verifier.cpp
@@ -0,0 +1,409 @@
+// === AUDIT STATUS ===
+// internal:    { status: not started, auditors: [], commit: }
+// external_1:  { status: not started, auditors: [], commit: }
+// external_2:  { status: not started, auditors: [], commit: }
+// =====================
+
+#include "batch_merge_verifier.hpp"
+#include "barretenberg/commitment_schemes/shplonk/shplonk.hpp"
+#include "barretenberg/stdlib/primitives/curves/bn254.hpp"
+#include "barretenberg/stdlib/proof/proof.hpp"
+
+namespace bb {
+
+template <typename Curve, size_t MaxMergeSize>
+typename BatchMergeVerifier_<Curve, MaxMergeSize>::ReductionResult BatchMergeVerifier_<Curve, MaxMergeSize>::
+    reduce_to_pairing_check(const Proof& proof, const FF hash)
+{
+    BB_BENCH_NAME("BatchMergeVerifier::reduce_to_pairing_check");
+
+    transcript->load_proof(proof);
+
+    // Get the lowest 127 bits of the hash
+    // We compare the calculated hashes against this value so that we can reuse the transcript hash calculations
+    // A collision happens with probability 2^{-127}
+    const FF binding_hash = std::get<0>(Transcript::Codec::split_challenge(hash));
+
+    // -------------------------------------------------------------------------
+    // Step 1: Receive commitments to columns to be merged
+    // -------------------------------------------------------------------------
+    std::vector<std::vector<Commitment>> subtable_cols(MAX_MERGE_SIZE, std::vector<Commitment>(NUM_WIRES));
+    std::vector<FF> calculated_hashes;
+    for (size_t idx = 0; idx < MAX_MERGE_SIZE; ++idx) {
+        for (size_t col = 0; col < NUM_WIRES; ++col) {
+            subtable_cols[idx][col] = transcript->template receive_from_prover<Commitment>(
+                "COLUMN_" + std::to_string(col) + "_" + std::to_string(idx));
+        }
+        calculated_hashes.push_back(transcript->template get_challenge<FF>("HASH_" + std::to_string(idx)));
+    }
+
+    // -------------------------------------------------------------------------
+    // Step 1.b: Receive commitments to the masking table
+    // -------------------------------------------------------------------------
+    std::array<Commitment, NUM_WIRES> zk_columns;
+    for (size_t col = 0; col < NUM_WIRES; ++col) {
+        zk_columns[col] = transcript->template receive_from_prover<Commitment>("ZK_COLUMN_" + std::to_string(col));
+    }
+
+    // -------------------------------------------------------------------------
+    // Step 1.c: Flatten the columns for easier utilization
+    // -------------------------------------------------------------------------
+    std::vector<Commitment> flattened_cols;
+    flattened_cols.reserve(NUM_EVALS_FROM_COLUMNS);
+    for (size_t col = 0; col < NUM_WIRES; ++col) {
+        flattened_cols.push_back(std::move(zk_columns[col]));
+    }
+    for (auto& subtable_col : subtable_cols) {
+        for (size_t col = 0; col < NUM_WIRES; col++) {
+            flattened_cols.push_back(std::move(subtable_col[col]));
+        }
+    }
+
+    // -------------------------------------------------------------------------
+    // Step 2: Receive N and shift sizes from the proof
+    // -------------------------------------------------------------------------
+    const FF N = transcript->template receive_from_prover<FF>("NUM_SUBTABLES");
+
+    // -------------------------------------------------------------------------
+    // Step 2.a: Enforce 1 <= N <= MAX_MERGE_SIZE
+    // -------------------------------------------------------------------------
+    FF running_product = FF(1);
+    for (size_t idx = 0; idx < MAX_MERGE_SIZE; idx++) {
+        running_product *= (N - FF(idx + 1));
+    }
+
+    bool is_valid_num_subtables = true;
+    if constexpr (IsRecursive) {
+        is_valid_num_subtables = running_product.get_value().is_zero();
+        running_product.assert_equal(FF(0));
+    } else {
+        is_valid_num_subtables = running_product.is_zero();
+    }
+
+    std::vector<FF> shift_sizes;
+    shift_sizes.reserve(NUM_COLUMN_TABLES);
+    shift_sizes.push_back(FF(UltraEccOpsTable::ZK_ULTRA_OPS));
+    // Array s.t. indicator_array[i] = (i < N)
+    std::vector<FF> indicator_array = compute_indicator_array(N);
+
+    for (size_t i = 0; i < MAX_MERGE_SIZE; ++i) {
+        size_t idx = 1 + i;
+        shift_sizes.push_back(transcript->template receive_from_prover<FF>("SHIFT_SIZE_" + std::to_string(i)));
+        shift_sizes[idx] = shift_sizes[idx] * indicator_array[i]; // zero out shift sizes for unused subtables
+    }
+
+    // -------------------------------------------------------------------------
+    // Step 3: Receive [T] commitments from proof
+    // -------------------------------------------------------------------------
+    TableCommitments merged_commitments;
+    for (size_t col = 0; col < NUM_WIRES; ++col) {
+        merged_commitments[col] =
+            transcript->template receive_from_prover<Commitment>("MERGED_COLUMN_" + std::to_string(col));
+    }
+
+    // -------------------------------------------------------------------------
+    // Step 4: Compute degree check challenges 1, α, α^2, .., α^{(M + 1) * NUM_WIRES-1}
+    // -------------------------------------------------------------------------
+    std::vector<FF> degree_check_challenges;
+    degree_check_challenges.reserve(NUM_EVALS_FROM_COLUMNS);
+    const FF degree_check_challenge = transcript->template get_challenge<FF>("DEGREE_CHECK_CHALLENGE");
+    degree_check_challenges = { FF(1), degree_check_challenge };
+    for (size_t idx = 2; idx < NUM_EVALS_FROM_COLUMNS; idx++) {
+        degree_check_challenges.push_back(degree_check_challenges.back() * degree_check_challenge);
+    }
+
+    // -------------------------------------------------------------------------
+    // Step 5: Receive [G] commitments from proof
+    // -------------------------------------------------------------------------
+    Commitment degree_check_commitment = transcript->template receive_from_prover<Commitment>("DEGREE_CHECK_POLY");
+
+    // -------------------------------------------------------------------------
+    // Step 6: Compute evaluation challenge κ, powers of kappa and their inverses
+    // -------------------------------------------------------------------------
+    const FF kappa = transcript->template get_challenge<FF>("KAPPA");
+    const FF kappa_inv = kappa.invert();
+
+    std::vector<FF> powers_of_kappa;
+    powers_of_kappa.reserve(shift_sizes.size());
+    for (const FF& shift_size : shift_sizes) {
+        if constexpr (IsRecursive) {
+            // Shift sizes are at most 2^CONST_OP_QUEUE_LOG_SIZE so the implicit range constraint enforced by pow is
+            // always satisfied
+            powers_of_kappa.push_back(kappa.template pow<CONST_OP_QUEUE_LOG_SIZE + 1>(shift_size));
+        } else {
+            BB_ASSERT_LT(
+                static_cast<uint32_t>(shift_size), 1UL << (CONST_OP_QUEUE_LOG_SIZE + 1), "Shift size is too large");
+            powers_of_kappa.push_back(kappa.pow(shift_size));
+        }
+    }
+
+    std::vector<FF> powers_of_kappa_inv;
+    powers_of_kappa_inv.reserve(powers_of_kappa.size());
+    if constexpr (IsRecursive) {
+        for (const FF& kappa_pow : powers_of_kappa) {
+            powers_of_kappa_inv.push_back(kappa_pow.invert());
+        }
+    } else {
+        powers_of_kappa_inv = powers_of_kappa;
+        FF::batch_invert(powers_of_kappa_inv);
+    }
+
+    // -------------------------------------------------------------------------
+    // Step 7: Receive evaluations
+    // -------------------------------------------------------------------------
+    // C_i_col(κ)
+    std::vector<FF> evals;
+    evals.reserve(NUM_EVALS);
+    for (size_t i = 0; i < NUM_EVALS_FROM_COLUMNS; ++i) {
+        const FF received_eval = transcript->template receive_from_prover<FF>("C_EVAL_" + std::to_string(i));
+        evals.push_back(received_eval);
+    }
+
+    // T_col(κ)
+    for (size_t col = 0; col < NUM_WIRES; ++col) {
+        evals.push_back(transcript->template receive_from_prover<FF>("MERGED_EVAL_" + std::to_string(col)));
+    }
+
+    // G_col(κ^{-1})
+    evals.push_back(transcript->template receive_from_prover<FF>("DEGREE_CHECK_EVAL"));
+
+    // -------------------------------------------------------------------------
+    // Step 9: Verify concatenation identity, degree identity, and hash consistency
+    // -------------------------------------------------------------------------
+
+    std::vector<OriginTag> origin_tags;
+    if constexpr (IsRecursive) {
+        // To prevent an OriginTag false positive, we re-tag the powers of kappa with the round
+        // provenance of evals
+        for (FF& kappa_pow : powers_of_kappa) {
+            origin_tags.push_back(kappa_pow.get_origin_tag());
+            kappa_pow.set_origin_tag(evals[0].get_origin_tag());
+        }
+        for (FF& kappa_pow : powers_of_kappa_inv) {
+            kappa_pow.set_origin_tag(evals[0].get_origin_tag());
+        }
+    }
+
+    const bool concatenation_verified = check_concatenation_identity(evals, powers_of_kappa);
+    const bool degree_check_verified =
+        check_degree_identity(evals, powers_of_kappa_inv, kappa, degree_check_challenges);
+    const bool hash_verified = check_hash_consistency(binding_hash, calculated_hashes, indicator_array);
+
+    // Reset origin tags
+    if constexpr (IsRecursive) {
+        for (auto [kappa_pow, origin_tag] : zip_view(powers_of_kappa, origin_tags)) {
+            kappa_pow.set_origin_tag(origin_tag);
+        }
+        for (auto [kappa_pow, origin_tag] : zip_view(powers_of_kappa_inv, origin_tags)) {
+            kappa_pow.set_origin_tag(origin_tag);
+        }
+    }
+
+    // -------------------------------------------------------------------------
+    // Run Shplonk and reduce to KZG pairing check
+    // -------------------------------------------------------------------------
+    std::vector<OpeningClaim<Curve>> opening_claims;
+    opening_claims.reserve(NUM_OPENING_CLAIMS);
+    for (size_t idx = 0; idx < NUM_EVALS_FROM_COLUMNS; ++idx) {
+        opening_claims.push_back(OpeningClaim<Curve>{ { kappa, evals[idx] }, flattened_cols[idx] });
+    }
+    for (size_t idx = 0; idx < NUM_WIRES; ++idx) {
+        opening_claims.push_back(
+            OpeningClaim<Curve>{ { kappa, evals[NUM_EVALS_FROM_COLUMNS + idx] }, merged_commitments[idx] });
+    }
+    opening_claims.push_back(OpeningClaim<Curve>{ { kappa_inv, evals.back() }, degree_check_commitment });
+
+    ShplonkVerifier shplonk_verifier = ShplonkVerifier::reduce_verification_no_finalize(opening_claims, transcript);
+
+    Commitment g1_identity;
+    if constexpr (IsRecursive) {
+        g1_identity = Commitment::one(kappa.get_context());
+    } else {
+        g1_identity = Commitment::one();
+    }
+    BatchOpeningClaim<Curve> batch_claim = shplonk_verifier.export_batch_opening_claim(g1_identity);
+
+    BB_ASSERT(batch_claim.commitments.size() == MERGE_BATCHED_CLAIM_SIZE);
+    BB_ASSERT(batch_claim.scalars.size() == MERGE_BATCHED_CLAIM_SIZE);
+
+    PairingPoints pairing_points = PCS::reduce_verify_batch_opening_claim(std::move(batch_claim), transcript);
+
+    vinfo("BatchMergeVerifier: concatenation check passed: ", concatenation_verified ? "true" : "false");
+    vinfo("BatchMergeVerifier: degree check passed: ", degree_check_verified ? "true" : "false");
+    vinfo("BatchMergeVerifier: hash check passed: ", hash_verified ? "true" : "false");
+    vinfo("BatchMergeVerifier: is N in [1, MAX_MERGE_SIZE]: ", is_valid_num_subtables ? "true" : "false");
+
+    return { pairing_points,
+             merged_commitments,
+             degree_check_verified && concatenation_verified && hash_verified && is_valid_num_subtables };
+}
+
+template <typename Curve, size_t MaxMergeSize>
+std::vector<typename BatchMergeVerifier_<Curve, MaxMergeSize>::FF> BatchMergeVerifier_<Curve, MaxMergeSize>::
+    compute_indicator_array(const FF& N) const
+{
+    // Array s.t. indicator_array[i] = (i < N)
+    std::vector<FF> indicator_array;
+    if constexpr (IsRecursive) {
+        BB_ASSERT_GT(N.get_value(), 0U);
+
+        // Create the array
+        // Note that N is automatically range constrainted because we assert that 1 <= N <= MAX_MERGE_SIZE
+        for (size_t idx = 0; idx < MAX_MERGE_SIZE; idx++) {
+            const FF idx_wit = FF(idx);
+            indicator_array.push_back(idx_wit.template ranged_less_than<LOG_MAX_MERGE_SIZE + 1>(N));
+        }
+    } else {
+        BB_ASSERT_GT(static_cast<uint32_t>(N), 0U);
+        for (size_t idx = 0; idx < MAX_MERGE_SIZE; idx++) {
+            indicator_array.push_back(idx < static_cast<uint32_t>(N) ? FF(1) : FF(0));
+        }
+    }
+
+    return indicator_array;
+}
+
+template <typename Curve, size_t MaxMergeSize>
+std::vector<typename BatchMergeVerifier_<Curve, MaxMergeSize>::FF> BatchMergeVerifier_<Curve, MaxMergeSize>::
+    compute_dirac_array(const std::vector<FF>& indicator_array) const
+{
+    // Shift to the left the indicator array (i < N) to get shifted_indicator_array[i] = (i < N - 1)
+    std::vector<FF> shifted_indicator_array;
+    shifted_indicator_array.reserve(MAX_MERGE_SIZE);
+    for (size_t i = 0; i < MAX_MERGE_SIZE - 1; ++i) {
+        shifted_indicator_array.push_back(indicator_array[i + 1]);
+    }
+    shifted_indicator_array.push_back(FF(0));
+
+    // Construct array s.t. dirac_array[i] = (i == N - 1)
+    std::vector<FF> dirac_array;
+    dirac_array.reserve(MAX_MERGE_SIZE);
+    for (size_t i = 0; i < MAX_MERGE_SIZE; ++i) {
+        dirac_array.push_back(indicator_array[i] - shifted_indicator_array[i]);
+    }
+
+    return dirac_array;
+}
+
+template <typename Curve, size_t MaxMergeSize>
+bool BatchMergeVerifier_<Curve, MaxMergeSize>::check_concatenation_identity(
+    std::vector<FF>& evals, const std::vector<FF>& pow_kappa_subtable_size) const
+{
+    bool concatenation_verified = true;
+    for (size_t j = 0; j < NUM_WIRES; ++j) {
+        FF concatenation_diff = evals[((NUM_COLUMN_TABLES - 1) * NUM_WIRES) + j];
+        // Horner: i from N-1 down to 0 — accum ← accum · κ^{size_i} + T_{i,j}(κ).
+        for (size_t i_rev = 1; i_rev < NUM_COLUMN_TABLES; ++i_rev) {
+            const size_t i = NUM_COLUMN_TABLES - 1 - i_rev;
+            concatenation_diff *= pow_kappa_subtable_size[i];
+            concatenation_diff += evals[(i * NUM_WIRES) + j];
+        }
+        concatenation_diff -= evals[NUM_EVALS_FROM_COLUMNS + j];
+
+        if constexpr (IsRecursive) {
+            concatenation_verified &= concatenation_diff.get_value() == 0;
+            concatenation_diff.assert_equal(FF(0),
+                                            "assert_equal: merge concatenation identity failed in Merge Verifier");
+        } else {
+            concatenation_verified &= concatenation_diff == 0;
+        }
+    }
+    return concatenation_verified;
+}
+
+template <typename Curve, size_t MaxMergeSize>
+bool BatchMergeVerifier_<Curve, MaxMergeSize>::check_degree_identity(
+    std::vector<FF>& evals,
+    const std::vector<FF>& powers_of_kappa_inv,
+    const FF& kappa,
+    const std::vector<FF>& degree_check_challenges) const
+{
+    FF degree_check_diff(0);
+    for (size_t i = 0; i < powers_of_kappa_inv.size(); ++i) {
+        for (size_t j = 0; j < NUM_WIRES; ++j) {
+            degree_check_diff +=
+                degree_check_challenges[(i * NUM_WIRES) + j] * powers_of_kappa_inv[i] * evals[(i * NUM_WIRES) + j];
+        }
+    }
+    degree_check_diff *= kappa;
+    degree_check_diff -= evals.back();
+
+    bool degree_check_verified = true;
+    if constexpr (IsRecursive) {
+        degree_check_verified &= degree_check_diff.get_value() == 0;
+        degree_check_diff.assert_equal(FF(0), "assert_equal: merge degree identity failed in Merge Verifier");
+    } else {
+        degree_check_verified &= degree_check_diff == 0;
+    }
+
+    return degree_check_verified;
+}
+
+template <typename Curve, size_t MaxMergeSize>
+typename BatchMergeVerifier_<Curve, MaxMergeSize>::FF BatchMergeVerifier_<Curve, MaxMergeSize>::ecc_op_hash_step(
+    const std::vector<Commitment>& col_commitments, const std::optional<FF>& prev_hash)
+{
+    std::vector<FF> hash_inputs;
+    if (prev_hash.has_value()) {
+        if constexpr (IsRecursive) {
+            const FF& h = prev_hash.value();
+            h.set_origin_tag(OriginTag::constant());
+            hash_inputs.push_back(h);
+        } else {
+            hash_inputs.push_back(prev_hash.value());
+        }
+    }
+    for (const auto& com : col_commitments) {
+        auto com_serialized = Transcript::Codec::serialize_to_fields(com);
+        if constexpr (IsRecursive) {
+            for (auto& el : com_serialized) {
+                el.set_origin_tag(OriginTag::constant());
+            }
+        }
+        hash_inputs.insert(hash_inputs.end(), com_serialized.begin(), com_serialized.end());
+    }
+    if constexpr (IsRecursive) {
+        FF hash_result = stdlib::poseidon2<typename Curve::Builder>::hash(hash_inputs);
+        hash_result.unset_free_witness_tag();
+        hash_result.set_origin_tag(OriginTag::constant());
+        return hash_result;
+    } else {
+        return crypto::Poseidon2<crypto::Poseidon2Bn254ScalarFieldParams>::hash(hash_inputs);
+    }
+}
+
+template <typename Curve, size_t MaxMergeSize>
+bool BatchMergeVerifier_<Curve, MaxMergeSize>::check_hash_consistency(const FF& hash,
+                                                                      const std::vector<FF>& calculated_hashes,
+                                                                      const std::vector<FF>& indicator_array) const
+{
+    // Construct array s.t. dirac_array[i] = (i == N - 1)
+    std::vector<FF> dirac_array = compute_dirac_array(indicator_array);
+
+    // Compute element-wise product of extended_hash and dirac_array
+    FF expected_hash = dirac_array[0] * calculated_hashes[0];
+    for (size_t i = 1; i < MAX_MERGE_SIZE; ++i) {
+        expected_hash += calculated_hashes[i] * dirac_array[i];
+    }
+
+    FF hash_diff = expected_hash - hash;
+    bool verified = true;
+    if constexpr (IsRecursive) {
+        verified = hash_diff.get_value() == 0;
+        hash_diff.assert_equal(FF(0), "BatchMergeVerifier: column commitments hash mismatch");
+    } else {
+        verified = hash_diff == FF(0);
+    }
+
+    return verified;
+}
+
+// Explicit template instantiations
+template class BatchMergeVerifier_<curve::BN254, CHONK_MAX_NUM_CIRCUITS>;
+template class BatchMergeVerifier_<stdlib::bn254<MegaCircuitBuilder>, CHONK_MAX_NUM_CIRCUITS>;
+
+// For testing
+template class BatchMergeVerifier_<curve::BN254, 9>;
+template class BatchMergeVerifier_<stdlib::bn254<MegaCircuitBuilder>, 9>;
+
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/goblin/batch_merge_verifier.hpp b/barretenberg/cpp/src/barretenberg/goblin/batch_merge_verifier.hpp
new file mode 100644
index 000000000000..129691b5f9f6
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/goblin/batch_merge_verifier.hpp
@@ -0,0 +1,138 @@
+// === AUDIT STATUS ===
+// internal:    { status: not started, auditors: [], commit: }
+// external_1:  { status: not started, auditors: [], commit: }
+// external_2:  { status: not started, auditors: [], commit: }
+// =====================
+
+#pragma once
+
+#include "barretenberg/commitment_schemes/claim.hpp"
+#include "barretenberg/commitment_schemes/kzg/kzg.hpp"
+#include "barretenberg/commitment_schemes/shplonk/shplonk.hpp"
+#include "barretenberg/flavor/mega_flavor.hpp"
+#include "barretenberg/honk/proof_system/types/proof.hpp"
+#include "barretenberg/srs/global_crs.hpp"
+#include "barretenberg/transcript/transcript.hpp"
+
+namespace bb {
+
+/**
+ * @brief Unified batch verifier for the batch Goblin ECC op queue merge protocol.
+ * @details Works for both native verification and recursive (in-circuit) verification.
+ *
+ * @tparam Curve     The curve type (native curve::BN254 or stdlib bn254<Builder>)
+ * @tparam MaxMergeSize The maximum number of subtables that can be merged
+ */
+template <typename Curve, size_t MaxMergeSize> class BatchMergeVerifier_ {
+  public:
+    using FF = typename Curve::ScalarField;
+    using Commitment = typename Curve::AffineElement;
+    using PCS = bb::KZG<Curve>;
+    using PairingPoints =
+        std::conditional_t<Curve::is_stdlib_type, stdlib::recursion::PairingPoints<Curve>, bb::PairingPoints<Curve>>;
+    using Proof = std::vector<FF>;
+    using Transcript = TranscriptFor_t<Curve>;
+    using ShplonkVerifier = ShplonkVerifier_<Curve>;
+
+    static constexpr size_t NUM_WIRES = MegaExecutionTraceBlocks::NUM_WIRES;
+    static constexpr size_t MAX_MERGE_SIZE = MaxMergeSize;
+    static constexpr size_t LOG_MAX_MERGE_SIZE = static_cast<size_t>(numeric::get_msb(MAX_MERGE_SIZE));
+    static constexpr bool IsRecursive = Curve::is_stdlib_type;
+    static constexpr size_t NUM_COLUMN_TABLES = MAX_MERGE_SIZE + 1; // ZK table + subtables
+    static constexpr size_t NUM_EVALS_FROM_COLUMNS = NUM_COLUMN_TABLES * NUM_WIRES;
+    static constexpr size_t NUM_EVALS =
+        ((MAX_MERGE_SIZE + 2) * NUM_WIRES) + 1; // ZK table, subtables, merged tables, degree check poly
+    static constexpr size_t NUM_OPENING_CLAIMS = NUM_EVALS;
+    static constexpr size_t MERGE_BATCHED_CLAIM_SIZE = NUM_OPENING_CLAIMS + 2; // Add Shplonk quotient + identity
+
+    using TableCommitments = std::array<Commitment, NUM_WIRES>;
+
+    /**
+     * @brief Result of batch merge verification.
+     */
+    struct ReductionResult {
+        PairingPoints pairing_points;
+        TableCommitments merged_commitments; // [T_0]..[T_{NUM_WIRES-1}]
+        bool reduction_succeeded = false;
+    };
+
+    // Public for testing purposes
+    std::shared_ptr<Transcript> transcript;
+
+    explicit BatchMergeVerifier_()
+        : transcript(std::make_shared<Transcript>())
+    {}
+
+    /**
+     * @brief Reduce the batch merge proof to a pairing check.
+     *
+     *
+     * @param proof                Batch merge proof.
+     * @param hash                 Running hash of the column commitments [C_0]..[C_{M-1}]
+     * @return ReductionResult with pairing points and merged table commitments.
+     */
+    [[nodiscard("Verification result should be checked")]] ReductionResult reduce_to_pairing_check(const Proof& proof,
+                                                                                                   const FF hash);
+
+    /**
+     * @brief Compute one step of the ECC op running hash
+     * @details Returns Poseidon2([prev_hash, serialize_to_fields(col_commitments)]).
+     */
+    static FF ecc_op_hash_step(const std::vector<Commitment>& col_commitments,
+                               const std::optional<FF>& prev_hash = std::nullopt);
+
+  private:
+    /**
+     * @brief Compute array of length M := MaxMergeSize s.t. indicator_array[i] = (i < N).
+     *
+     * @param N
+     * @return std::vector<FF>
+     */
+    std::vector<FF> compute_indicator_array(const FF& N) const;
+
+    /**
+     * @brief Compute array of length M := MaxMergeSize s.t. dirac_array[i] = (i == N - 1)
+     *
+     * @param indicator_array
+     * @return std::vector<FF>
+     */
+    std::vector<FF> compute_dirac_array(const std::vector<FF>& indicator_array) const;
+
+    /**
+     * @brief Verify the concatenation identity T(κ) = Σ_i C_i(κ) · κ^{offset_i} for every column.
+     * @details offset_i = Σ_{j<i} shift_sizes[j]
+     *
+     * @param evals Evaluations of C_i(κ) and T(κ) received from the proof
+     * @param pow_kappa_subtable_size Precomputed κ^{shift_sizes[i]} for each subtable i
+     */
+    bool check_concatenation_identity(std::vector<FF>& evals, const std::vector<FF>& pow_kappa_subtable_size) const;
+
+    /**
+     * @brief Verify the degree identity
+     *      G(κ⁻¹) = Σ_{i,col} α_{i,col} · C_i_col(κ) · κ^{1 − shift_sizes[j]}
+     * @details This is a single combined check across all subtables and columns.
+     */
+    bool check_degree_identity(std::vector<FF>& evals,
+                               const std::vector<FF>& powers_of_kappa_inv,
+                               const FF& kappa,
+                               const std::vector<FF>& degree_check_challenges) const;
+
+    /**
+     * @brief Verify that the column commitments in the proof match the running hash from accumulation.
+     * @details This ensures that the commitments provided in the proof are consistent with the expected
+     * running hash computed during the accumulation process.
+     */
+    bool check_hash_consistency(const FF& hash,
+                                const std::vector<FF>& calculated_hashes,
+                                const std::vector<FF>& indicator_array) const;
+};
+
+// Type aliases for convenience
+using BatchMergeVerifier = BatchMergeVerifier_<curve::BN254, CHONK_MAX_NUM_CIRCUITS>;
+
+namespace stdlib::recursion::goblin {
+template <typename Builder>
+using BatchMergeRecursiveVerifier = BatchMergeVerifier_<bn254<Builder>, CHONK_MAX_NUM_CIRCUITS>;
+} // namespace stdlib::recursion::goblin
+
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/goblin/goblin.cpp b/barretenberg/cpp/src/barretenberg/goblin/goblin.cpp
index bda0d945258e..e6d966bac0c5 100644
--- a/barretenberg/cpp/src/barretenberg/goblin/goblin.cpp
+++ b/barretenberg/cpp/src/barretenberg/goblin/goblin.cpp
@@ -25,11 +25,11 @@ Goblin::Goblin(const std::shared_ptr<Transcript>& transcript)
     : transcript(transcript)
 {}
 
-void Goblin::prove_merge(const std::shared_ptr<Transcript>& transcript, const MergeSettings merge_settings)
+Goblin::MergeProof Goblin::prove_merge(const std::shared_ptr<Transcript>& transcript) const
 {
     BB_BENCH_NAME("Goblin::prove_merge");
-    MergeProver merge_prover{ op_queue, transcript, merge_settings };
-    merge_verification_queue.push_back(merge_prover.construct_proof());
+    MergeProver merge_prover{ op_queue, transcript };
+    return merge_prover.construct_proof();
 }
 
 void Goblin::prove_eccvm()
@@ -70,14 +70,9 @@ GoblinProof Goblin::prove()
 {
     BB_BENCH_NAME("Goblin::prove");
 
-    prove_merge(transcript, MergeSettings::APPEND); // Use shared transcript for merge proving
+    goblin_proof.merge_proof = prove_merge(transcript); // Use shared transcript for merge proving
     info("Goblin: num ultra ops = ", op_queue->get_ultra_ops_count());
 
-    BB_ASSERT_EQ(merge_verification_queue.size(),
-                 1U,
-                 "Goblin::prove: merge_verification_queue should contain only a single proof at this stage.");
-    goblin_proof.merge_proof = merge_verification_queue.back();
-
     vinfo("prove eccvm...");
     prove_eccvm();
     vinfo("finished eccvm proving.");
@@ -88,29 +83,45 @@ GoblinProof Goblin::prove()
 }
 
 /**
- * @brief Recursively verify the next merge proof in the queue.
- * @details Merge proofs are verified in FIFO order to match the circuit accumulation order.
- * Each kernel verifies the merge proof from its corresponding app circuit. Since circuits
- * are accumulated in sequence (e.g., App₀ → Kernel₀ → App₁ → Kernel₁ → ..., though
- * in practice there can be repeated kernels such as inner → reset), the merge proofs must be
- * verified in the same order to maintain consistency of the op queue commitments.
+ * @brief Generate proof of the batch merge
+ *
+ * @details During Chonk, we accumulate all the ecc ops into subtables. After having accumulated the tail circuit, we
+ * generate a proof of the batch merge: we take the tables T_1, .., T_N (where T_N is the table of ecc ops coming from
+ * the tail circuit) and we generate a proof that T_zk || T_1 || .. || T_N = T, where T_zk is a table generated on the
+ * fly by the prover to make the merged table T zero-knowledge. The consistency between the commitments sent by the
+ * prover in the batch merge and the ones generated during Chonk accumulation is enforced via a hash check: each kernel
+ * updates a running hash using the commitments to the ecc op tables of the circuits it folds. The final hash is passed
+ * to the batch merge verifier, which uses it to enforce the consistency between the data sent by the prover and the one
+ * used during accumulation.
+ *
  */
-std::pair<Goblin::PairingPoints, Goblin::RecursiveTableCommitments> Goblin::recursively_verify_merge(
-    MegaBuilder& builder,
-    const RecursiveMergeCommitments& merge_commitments,
-    const std::shared_ptr<RecursiveTranscript>& transcript,
-    const MergeSettings merge_settings)
+void Goblin::prove_batch_merge()
 {
-    BB_ASSERT(!merge_verification_queue.empty());
-    const MergeProof& merge_proof = merge_verification_queue.front();
-    const stdlib::Proof<MegaBuilder> stdlib_merge_proof(builder, merge_proof);
+    BB_BENCH_NAME("Goblin::prove_batch_merge");
+    BatchMergeProver prover{ op_queue, CHONK_MAX_NUM_CIRCUITS };
+    batch_merge_proof = prover.construct_proof();
+}
 
-    MergeRecursiveVerifier merge_verifier{ merge_settings, transcript };
-    auto merge_result = merge_verifier.reduce_to_pairing_check(stdlib_merge_proof, merge_commitments);
+/**
+ * @brief Recursively verify the batch merge proof
+ *
+ * @param builder
+ * @param hash Hash computed by the kernels during Chonk accumulation
+ *
+ * @details The hash commits to the data used during accumulation and is used by the batch merge verifier to enforce
+ * consistency between the data sent by the prover and the one used during accumulation.
+ * @return std::pair<Goblin::PairingPoints, Goblin::BatchRecursiveTableCommitments>
+ */
+std::pair<Goblin::PairingPoints, Goblin::BatchRecursiveTableCommitments> Goblin::recursively_verify_batch_merge(
+    MegaBuilder& builder, const BatchMergeRecursiveVerifier::FF& hash) const
+{
+    BB_ASSERT(!batch_merge_proof.empty(), "Goblin::recursively_verify_batch_merge: no batch merge proof available");
+    const stdlib::Proof<MegaBuilder> stdlib_proof(builder, batch_merge_proof);
 
-    merge_verification_queue.pop_front(); // remove the processed proof from the queue
+    BatchMergeRecursiveVerifier verifier;
+    auto result = verifier.reduce_to_pairing_check(stdlib_proof, hash);
 
-    return { merge_result.pairing_points, merge_result.merged_commitments };
+    return { result.pairing_points, result.merged_commitments };
 }
 
 } // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/goblin/goblin.hpp b/barretenberg/cpp/src/barretenberg/goblin/goblin.hpp
index 543e78266051..fed3a6e869e9 100644
--- a/barretenberg/cpp/src/barretenberg/goblin/goblin.hpp
+++ b/barretenberg/cpp/src/barretenberg/goblin/goblin.hpp
@@ -9,6 +9,8 @@
 #include "barretenberg/eccvm/eccvm_flavor.hpp"
 #include "barretenberg/eccvm/eccvm_prover.hpp"
 #include "barretenberg/flavor/mega_flavor.hpp"
+#include "barretenberg/goblin/batch_merge_prover.hpp"
+#include "barretenberg/goblin/batch_merge_verifier.hpp"
 #include "barretenberg/goblin/merge_prover.hpp"
 #include "barretenberg/goblin/merge_verifier.hpp"
 #include "barretenberg/goblin/types.hpp"
@@ -38,12 +40,15 @@ class Goblin {
     using ECCVMProvingKey = ECCVMFlavor::ProvingKey;
     using TranslatorBuilder = TranslatorCircuitBuilder;
     using MergeProof = MergeProver::MergeProof;
+    using BatchMergeProof = BatchMergeProver::MergeProof;
     using ECCVMVerificationKey = ECCVMFlavor::VerificationKey;
     using TranslatorVerificationKey = TranslatorFlavor::VerificationKey;
     using MergeRecursiveVerifier = stdlib::recursion::goblin::MergeRecursiveVerifier<MegaBuilder>;
+    using BatchMergeRecursiveVerifier = stdlib::recursion::goblin::BatchMergeRecursiveVerifier<MegaBuilder>;
     using PairingPoints = MergeRecursiveVerifier::PairingPoints;
     using TableCommitments = MergeVerifier::TableCommitments;
     using RecursiveTableCommitments = MergeRecursiveVerifier::TableCommitments;
+    using BatchRecursiveTableCommitments = BatchMergeRecursiveVerifier::TableCommitments;
     using MergeCommitments = MergeVerifier::InputCommitments;
     using RecursiveMergeCommitments = MergeRecursiveVerifier::InputCommitments;
     using RecursiveCommitment = MergeRecursiveVerifier::Commitment;
@@ -59,7 +64,7 @@ class Goblin {
     fq evaluation_challenge_x;              // challenge for evaluating the translation polynomials
     std::shared_ptr<Transcript> transcript; // shared between ECCVM and Translator
 
-    std::deque<MergeProof> merge_verification_queue; // queue of merge proofs to be verified
+    BatchMergeProof batch_merge_proof; // delayed batch merge proof for Chonk
 
     struct VerificationKey {
         std::shared_ptr<ECCVMVerificationKey> eccvm_verification_key = std::make_shared<ECCVMVerificationKey>();
@@ -70,13 +75,11 @@ class Goblin {
     Goblin(const std::shared_ptr<Transcript>& transcript = std::make_shared<Transcript>());
 
     /**
-     * @brief Construct a merge proof for the goblin ECC ops in the provided circuit; append the proof to the
-     * merge_verification_queue.
-     *
-     * @param transcript
+     * @brief Construct a single-step merge proof for the most recently merged subtable.
+     * @details In the Chonk flow this is invoked only for the final fixed-location append of the hiding kernel
+     * subtable; multi-subtable merges are handled by prove_batch_merge().
      */
-    void prove_merge(const std::shared_ptr<Transcript>& transcript = std::make_shared<Transcript>(),
-                     const MergeSettings merge_settings = MergeSettings::PREPEND);
+    MergeProof prove_merge(const std::shared_ptr<Transcript>& transcript = std::make_shared<Transcript>()) const;
 
     /**
      * @brief Construct an ECCVM proof and IPA opening proof.
@@ -99,20 +102,34 @@ class Goblin {
     GoblinProof prove();
 
     /**
-     * @brief Recursively verify the next merge proof in the merge verification queue.
-     * @details Proofs are verified in a FIFO manner
+     * @brief Recursively verify the most recent single-step merge proof.
+     * @details In Chonk this is invoked once per IVC, recursively verifying the hiding kernel's fixed-location
+     * append against the prior aggregate table.
      *
      * @param builder The circuit in which the recursive verification will be performed.
-     * @param inputs_commitments The commitment used by the Merge verifier
+     * @param inputs_commitments The commitments used by the Merge verifier (subtable + prior aggregate)
      * @param transcript The transcript to be passed to the MergeRecursiveVerifier.
-     * @param merge_settings How the most recent ecc op subtable is going to be merged into the table of ecc ops
      * @return Pair of PairingPoints and commitments to the merged tables as read from the proof by the Merge verifier
      */
     std::pair<PairingPoints, RecursiveTableCommitments> recursively_verify_merge(
         MegaBuilder& builder,
         const RecursiveMergeCommitments& merge_commitments,
-        const std::shared_ptr<RecursiveTranscript>& transcript,
-        const MergeSettings merge_settings = MergeSettings::PREPEND);
+        const std::shared_ptr<RecursiveTranscript>& transcript);
+
+    /**
+     * @brief Construct a batched merge proof for all subtables accumulated during the IVC.
+     * @details Proves in a single shot that the full merged table is the correct concatenation of all per-circuit
+     * subtables. Run once at the end of the IVC.
+     */
+    void prove_batch_merge();
+
+    /**
+     * @brief Recursively verify the batched merge proof inside the hiding kernel.
+     * @details `hash` is the running ECC-op hash chained over all per-circuit subtable commitments observed
+     * during accumulation; the in-circuit verifier checks the proof's column commitments against it.
+     */
+    std::pair<PairingPoints, BatchRecursiveTableCommitments> recursively_verify_batch_merge(
+        MegaBuilder& builder, const BatchMergeRecursiveVerifier::FF& hash) const;
 };
 
 } // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/goblin/goblin_verifier.cpp b/barretenberg/cpp/src/barretenberg/goblin/goblin_verifier.cpp
index 9386174b39b8..50c01d4776df 100644
--- a/barretenberg/cpp/src/barretenberg/goblin/goblin_verifier.cpp
+++ b/barretenberg/cpp/src/barretenberg/goblin/goblin_verifier.cpp
@@ -20,7 +20,7 @@ typename GoblinVerifier_<Curve>::ReductionResult GoblinVerifier_<Curve>::reduce_
 {
     BB_BENCH_NAME("GoblinVerifier::reduce");
     // Step 1: Verify the merge proof
-    MergeVerifier merge_verifier{ merge_settings, transcript };
+    MergeVerifier merge_verifier{ transcript };
     auto merge_result = merge_verifier.reduce_to_pairing_check(proof.merge_proof, merge_commitments);
     vinfo("Goblin: Merge reduced to pairing check successfully: ", merge_result.reduction_succeeded ? "true" : "false");
 
diff --git a/barretenberg/cpp/src/barretenberg/goblin/goblin_verifier.hpp b/barretenberg/cpp/src/barretenberg/goblin/goblin_verifier.hpp
index d48ef3690f7c..96390bb89d02 100644
--- a/barretenberg/cpp/src/barretenberg/goblin/goblin_verifier.hpp
+++ b/barretenberg/cpp/src/barretenberg/goblin/goblin_verifier.hpp
@@ -71,16 +71,13 @@ template <typename Curve> class GoblinVerifier_ {
      * @param transcript Shared transcript for Fiat-Shamir
      * @param proof The complete Goblin proof containing Merge, ECCVM, IPA, and Translator proofs
      * @param merge_commitments The input commitments for the Merge verifier (t and T_prev tables)
-     * @param merge_settings How the ecc op subtable was merged (PREPEND or APPEND)
      */
     GoblinVerifier_(std::shared_ptr<Transcript> transcript,
                     const GoblinProof& proof,
-                    const MergeCommitments& merge_commitments,
-                    MergeSettings merge_settings)
+                    const MergeCommitments& merge_commitments)
         : transcript(std::move(transcript))
         , proof(proof)
         , merge_commitments(merge_commitments)
-        , merge_settings(merge_settings)
     {}
 
     /**
@@ -105,7 +102,6 @@ template <typename Curve> class GoblinVerifier_ {
     std::shared_ptr<Transcript> transcript;
     GoblinProof proof;
     MergeCommitments merge_commitments;
-    MergeSettings merge_settings;
 };
 
 // Type aliases for convenience
diff --git a/barretenberg/cpp/src/barretenberg/goblin/goblin_verifier.test.cpp b/barretenberg/cpp/src/barretenberg/goblin/goblin_verifier.test.cpp
index 993df8f96547..4e6be6894799 100644
--- a/barretenberg/cpp/src/barretenberg/goblin/goblin_verifier.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/goblin/goblin_verifier.test.cpp
@@ -64,14 +64,16 @@ class GoblinRecursiveVerifierTests : public testing::Test {
 
         Goblin goblin;
         GoblinMockCircuits::construct_and_merge_mock_circuits(goblin, num_circuits);
+        goblin.op_queue->construct_zk_columns();
 
         // Merge the ecc ops from the newly constructed circuit
         auto goblin_proof = goblin.prove();
         // Subtable values and commitments - needed for (Recursive)MergeVerifier
         MergeCommitments merge_commitments;
         auto t_current = goblin.op_queue->construct_current_ultra_ops_subtable_columns();
-        auto T_prev = goblin.op_queue->construct_previous_ultra_ops_table_columns();
-        CommitmentKey<curve::BN254> pcs_commitment_key(goblin.op_queue->get_ultra_ops_table_num_rows());
+        auto T_prev = goblin.op_queue->construct_table_columns_up_to_tail();
+        CommitmentKey<curve::BN254> pcs_commitment_key(goblin.op_queue->get_ultra_ops_table_num_rows() +
+                                                       UltraEccOpsTable::ZK_ULTRA_OPS);
         for (size_t idx = 0; idx < MegaFlavor::NUM_WIRES; idx++) {
             merge_commitments.t_commitments[idx] = pcs_commitment_key.commit(t_current[idx]);
             merge_commitments.T_prev_commitments[idx] = pcs_commitment_key.commit(T_prev[idx]);
@@ -105,7 +107,7 @@ TEST_F(GoblinRecursiveVerifierTests, NativeVerification)
     auto [proof, merge_commitments, _] = create_goblin_prover_output();
 
     auto transcript = std::make_shared<NativeTranscript>();
-    bb::GoblinVerifier verifier(transcript, proof, merge_commitments, MergeSettings::APPEND);
+    bb::GoblinVerifier verifier(transcript, proof, merge_commitments);
     auto result = verifier.reduce_to_pairing_check_and_ipa_opening();
 
     // Check pairing points (aggregate merge + translator)
@@ -132,9 +134,7 @@ TEST_F(GoblinRecursiveVerifierTests, Basic)
 
     auto transcript = std::make_shared<Transcript>();
     GoblinStdlibProof stdlib_proof(builder, proof);
-    bb::GoblinRecursiveVerifier verifier{
-        transcript, stdlib_proof, recursive_merge_commitments, MergeSettings::APPEND
-    };
+    bb::GoblinRecursiveVerifier verifier{ transcript, stdlib_proof, recursive_merge_commitments };
     auto output = verifier.reduce_to_pairing_check_and_ipa_opening();
 
     // Aggregate merge + translator pairing points
@@ -181,9 +181,7 @@ TEST_F(GoblinRecursiveVerifierTests, IndependentVKHash)
 
         auto transcript = std::make_shared<Transcript>();
         GoblinStdlibProof stdlib_proof(builder, proof);
-        bb::GoblinRecursiveVerifier verifier{
-            transcript, stdlib_proof, recursive_merge_commitments, MergeSettings::APPEND
-        };
+        bb::GoblinRecursiveVerifier verifier{ transcript, stdlib_proof, recursive_merge_commitments };
         auto output = verifier.reduce_to_pairing_check_and_ipa_opening();
 
         // Aggregate merge + translator pairing points
@@ -241,9 +239,7 @@ TEST_F(GoblinRecursiveVerifierTests, MergeToTranslatorBindingFailure)
 
     auto transcript = std::make_shared<Transcript>();
     GoblinStdlibProof stdlib_proof(builder, proof);
-    bb::GoblinRecursiveVerifier verifier{
-        transcript, stdlib_proof, recursive_merge_commitments, MergeSettings::APPEND
-    };
+    bb::GoblinRecursiveVerifier verifier{ transcript, stdlib_proof, recursive_merge_commitments };
     auto goblin_rec_verifier_output = verifier.reduce_to_pairing_check_and_ipa_opening();
 
     // Aggregate merge + translator pairing points
@@ -277,9 +273,7 @@ TEST_F(GoblinRecursiveVerifierTests, ECCVMToTranslatorBindingFailure)
 
     auto transcript = std::make_shared<Transcript>();
     GoblinStdlibProof stdlib_proof(builder, proof);
-    bb::GoblinRecursiveVerifier verifier{
-        transcript, stdlib_proof, recursive_merge_commitments, MergeSettings::APPEND
-    };
+    bb::GoblinRecursiveVerifier verifier{ transcript, stdlib_proof, recursive_merge_commitments };
     [[maybe_unused]] auto goblin_rec_verifier_output = verifier.reduce_to_pairing_check_and_ipa_opening();
 
     EXPECT_FALSE(CircuitChecker::check(builder));
diff --git a/barretenberg/cpp/src/barretenberg/goblin/merge.test.cpp b/barretenberg/cpp/src/barretenberg/goblin/merge.test.cpp
index 6877a6043b80..a68d3fb3adaf 100644
--- a/barretenberg/cpp/src/barretenberg/goblin/merge.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/goblin/merge.test.cpp
@@ -50,6 +50,25 @@ template <typename Curve> class MergeTests : public testing::Test {
 
     enum class TamperProofMode : uint8_t { None, Shift, MCommitment, LEval };
 
+    static std::shared_ptr<ECCOpQueue> construct_final_merge_op_queue(const size_t num_subtables_up_to_tail = 1)
+    {
+        using InnerFlavor = MegaFlavor;
+        using InnerBuilder = typename InnerFlavor::CircuitBuilder;
+
+        auto op_queue = std::make_shared<ECCOpQueue>();
+        for (size_t idx = 0; idx < num_subtables_up_to_tail; ++idx) {
+            InnerBuilder circuit{ op_queue };
+            GoblinMockCircuits::construct_simple_circuit(circuit);
+            op_queue->merge();
+        }
+
+        op_queue->construct_zk_columns();
+
+        InnerBuilder hiding_circuit{ op_queue };
+        GoblinMockCircuits::construct_simple_circuit(hiding_circuit);
+        return op_queue;
+    }
+
     /**
      * @brief Convert a stdlib type to its native value
      * @details In native context, returns value as-is; in recursive context, extracts the native value
@@ -151,19 +170,18 @@ template <typename Curve> class MergeTests : public testing::Test {
      * @details Creates a merge proof, optionally tampers with it, then verifies in the appropriate context
      */
     static void prove_and_verify_merge(const std::shared_ptr<ECCOpQueue>& op_queue,
-                                       const MergeSettings settings = MergeSettings::PREPEND,
                                        const TamperProofMode tampering_mode = TamperProofMode::None,
                                        const bool expected = true)
     {
         // Create native merge proof
         auto prover_transcript = std::make_shared<NativeTranscript>();
-        MergeProver merge_prover{ op_queue, prover_transcript, settings };
+        MergeProver merge_prover{ op_queue, prover_transcript };
         auto native_proof = merge_prover.construct_proof();
         tamper_with_proof(native_proof, tampering_mode);
 
         // Construct shifted column polynomials matching the circuit's ecc_op_wire layout
         auto t_current = op_queue->construct_current_ultra_ops_subtable_columns();
-        auto T_prev = op_queue->construct_previous_ultra_ops_table_columns();
+        auto T_prev = op_queue->construct_table_columns_up_to_tail();
 
         std::array<curve::BN254::AffineElement, NUM_WIRES> native_t_commitments;
         std::array<curve::BN254::AffineElement, NUM_WIRES> native_T_prev_commitments;
@@ -191,7 +209,7 @@ template <typename Curve> class MergeTests : public testing::Test {
 
         // Verify the proof
         auto transcript = std::make_shared<Transcript>();
-        MergeVerifierType verifier{ settings, transcript };
+        MergeVerifierType verifier{ transcript };
         auto result = verifier.reduce_to_pairing_check(proof, input_commitments);
 
         // Perform pairing check and verify
@@ -220,15 +238,11 @@ template <typename Curve> class MergeTests : public testing::Test {
      */
     static void test_merge_proof_size()
     {
-        using InnerFlavor = MegaFlavor;
-        using InnerBuilder = typename InnerFlavor::CircuitBuilder;
-
-        InnerBuilder builder;
-        GoblinMockCircuits::construct_simple_circuit(builder);
+        auto op_queue = construct_final_merge_op_queue();
 
         // Construct a merge proof and ensure its size matches expectation
         auto transcript = std::make_shared<NativeTranscript>();
-        MergeProver merge_prover{ builder.op_queue, transcript };
+        MergeProver merge_prover{ op_queue, transcript };
         auto merge_proof = merge_prover.construct_proof();
 
         EXPECT_EQ(merge_proof.size(), MERGE_PROOF_SIZE);
@@ -239,111 +253,48 @@ template <typename Curve> class MergeTests : public testing::Test {
      */
     static void test_single_merge()
     {
-        using InnerFlavor = MegaFlavor;
-        using InnerBuilder = typename InnerFlavor::CircuitBuilder;
-
-        auto op_queue = std::make_shared<ECCOpQueue>();
-        InnerBuilder circuit{ op_queue };
-        GoblinMockCircuits::construct_simple_circuit(circuit);
+        auto op_queue = construct_final_merge_op_queue();
 
         prove_and_verify_merge(op_queue);
     }
 
     /**
-     * @brief Test multiple merge proofs with prepend mode
+     * @brief Test a final merge proof with multiple historical subtables up to the tail.
      */
-    static void test_multiple_merges_prepend()
+    static void test_multiple_merges()
     {
-        using InnerFlavor = MegaFlavor;
-        using InnerBuilder = typename InnerFlavor::CircuitBuilder;
-
-        auto op_queue = std::make_shared<ECCOpQueue>();
-
-        // First circuit
-        InnerBuilder circuit1{ op_queue };
-        GoblinMockCircuits::construct_simple_circuit(circuit1);
-        prove_and_verify_merge(op_queue);
-
-        // Second circuit
-        InnerBuilder circuit2{ op_queue };
-        GoblinMockCircuits::construct_simple_circuit(circuit2);
-        prove_and_verify_merge(op_queue);
-
-        // Third circuit
-        InnerBuilder circuit3{ op_queue };
-        GoblinMockCircuits::construct_simple_circuit(circuit3);
+        auto op_queue = construct_final_merge_op_queue(/*num_subtables_up_to_tail=*/3);
         prove_and_verify_merge(op_queue);
     }
 
-    /**
-     * @brief Test merge proof with append mode
-     */
-    static void test_merge_prepend_then_append()
-    {
-        using InnerFlavor = MegaFlavor;
-        using InnerBuilder = typename InnerFlavor::CircuitBuilder;
-
-        auto op_queue = std::make_shared<ECCOpQueue>();
-
-        // First circuit with prepend
-        InnerBuilder circuit1{ op_queue };
-        GoblinMockCircuits::construct_simple_circuit(circuit1);
-        prove_and_verify_merge(op_queue);
-
-        // Second circuit with prepend
-        InnerBuilder circuit2{ op_queue };
-        GoblinMockCircuits::construct_simple_circuit(circuit2);
-        prove_and_verify_merge(op_queue);
-
-        // Third circuit with append
-        InnerBuilder circuit3{ op_queue };
-        GoblinMockCircuits::construct_simple_circuit(circuit3);
-        prove_and_verify_merge(op_queue, MergeSettings::APPEND);
-    }
-
     /**
      * @brief Test failure when degree(l) > shift_size (as read from the proof)
      */
-    static void test_degree_check_failure(const MergeSettings settings = MergeSettings::PREPEND)
+    static void test_degree_check_failure()
     {
-        using InnerFlavor = MegaFlavor;
-        using InnerBuilder = typename InnerFlavor::CircuitBuilder;
-
-        auto op_queue = std::make_shared<ECCOpQueue>();
-        InnerBuilder circuit{ op_queue };
-        GoblinMockCircuits::construct_simple_circuit(circuit);
+        auto op_queue = construct_final_merge_op_queue();
 
-        prove_and_verify_merge(op_queue, settings, TamperProofMode::Shift, false);
+        prove_and_verify_merge(op_queue, TamperProofMode::Shift, false);
     }
 
     /**
      * @brief Test failure when m ≠ l + X^k r
      */
-    static void test_merge_failure(const MergeSettings settings = MergeSettings::PREPEND)
+    static void test_merge_failure()
     {
-        using InnerFlavor = MegaFlavor;
-        using InnerBuilder = typename InnerFlavor::CircuitBuilder;
-
-        auto op_queue = std::make_shared<ECCOpQueue>();
-        InnerBuilder circuit{ op_queue };
-        GoblinMockCircuits::construct_simple_circuit(circuit);
+        auto op_queue = construct_final_merge_op_queue();
 
-        prove_and_verify_merge(op_queue, settings, TamperProofMode::MCommitment, false);
+        prove_and_verify_merge(op_queue, TamperProofMode::MCommitment, false);
     }
 
     /**
      * @brief Test failure when g_j(kappa) ≠ kappa^{k-1} * l_j(1/kappa)
      */
-    static void test_eval_failure(const MergeSettings settings = MergeSettings::PREPEND)
+    static void test_eval_failure()
     {
-        using InnerFlavor = MegaFlavor;
-        using InnerBuilder = typename InnerFlavor::CircuitBuilder;
-
-        auto op_queue = std::make_shared<ECCOpQueue>();
-        InnerBuilder circuit{ op_queue };
-        GoblinMockCircuits::construct_simple_circuit(circuit);
+        auto op_queue = construct_final_merge_op_queue();
 
-        prove_and_verify_merge(op_queue, settings, TamperProofMode::LEval, false);
+        prove_and_verify_merge(op_queue, TamperProofMode::LEval, false);
     }
 
     /**
@@ -372,7 +323,8 @@ template <typename Curve> class MergeTests : public testing::Test {
             op_queue->merge();
 
             // Right table = the merged previous table; Left table = empty
-            std::array<Polynomial, NUM_WIRES> right_table = op_queue->construct_ultra_ops_table_columns();
+            std::array<Polynomial, NUM_WIRES> right_table =
+                op_queue->construct_ultra_ops_table_columns(/*include_zk_ops=*/false);
             std::array<Polynomial, NUM_WIRES> left_table;
             std::array<Polynomial, NUM_WIRES> merged_table;
             for (size_t idx = 0; idx < NUM_WIRES; idx++) {
@@ -474,16 +426,15 @@ template <typename Curve> class MergeTests : public testing::Test {
 
             auto native_proof = prover_transcript->export_proof();
 
-            // === Verify with unmodified verifier (which has BB_ASSERT_GT for shift_size > 0) ===
-            // Build input commitments: t = empty (zero commits), T_prev = right table
+            // Build input commitments: T_prev = empty (zero commits), t = right table
             InputCommitments input_commitments;
             for (size_t idx = 0; idx < NUM_WIRES; idx++) {
-                input_commitments.t_commitments[idx] = ck.commit(left_table[idx]);
-                input_commitments.T_prev_commitments[idx] = ck.commit(right_table[idx]);
+                input_commitments.t_commitments[idx] = ck.commit(right_table[idx]);
+                input_commitments.T_prev_commitments[idx] = ck.commit(left_table[idx]);
             }
 
             auto verifier_transcript = std::make_shared<NativeTranscript>();
-            MergeVerifierType verifier{ MergeSettings::PREPEND, verifier_transcript };
+            MergeVerifierType verifier{ verifier_transcript };
             auto result = verifier.reduce_to_pairing_check(native_proof, input_commitments);
 
             bool pairing_verified = result.pairing_points.check();
@@ -510,44 +461,24 @@ TYPED_TEST(MergeTests, SingleMerge)
     TestFixture::test_single_merge();
 }
 
-TYPED_TEST(MergeTests, MultipleMergesPrepend)
-{
-    TestFixture::test_multiple_merges_prepend();
-}
-
-TYPED_TEST(MergeTests, MergePrependThenAppend)
-{
-    TestFixture::test_merge_prepend_then_append();
-}
-
-TYPED_TEST(MergeTests, DegreeCheckFailurePrepend)
+TYPED_TEST(MergeTests, MultipleMerges)
 {
-    TestFixture::test_degree_check_failure(MergeSettings::PREPEND);
+    TestFixture::test_multiple_merges();
 }
 
-TYPED_TEST(MergeTests, DegreeCheckFailureAppend)
+TYPED_TEST(MergeTests, DegreeCheckFailure)
 {
-    TestFixture::test_degree_check_failure(MergeSettings::APPEND);
+    TestFixture::test_degree_check_failure();
 }
 
-TYPED_TEST(MergeTests, MergeFailurePrepend)
+TYPED_TEST(MergeTests, MergeFailure)
 {
-    TestFixture::test_merge_failure(MergeSettings::PREPEND);
+    TestFixture::test_merge_failure();
 }
 
-TYPED_TEST(MergeTests, MergeFailureAppend)
+TYPED_TEST(MergeTests, EvalFailure)
 {
-    TestFixture::test_merge_failure(MergeSettings::APPEND);
-}
-
-TYPED_TEST(MergeTests, EvalFailurePrepend)
-{
-    TestFixture::test_eval_failure(MergeSettings::PREPEND);
-}
-
-TYPED_TEST(MergeTests, EvalFailureAppend)
-{
-    TestFixture::test_eval_failure(MergeSettings::APPEND);
+    TestFixture::test_eval_failure();
 }
 
 TYPED_TEST(MergeTests, HonestEmptyLeftTable)
@@ -577,31 +508,25 @@ TYPED_TEST(MergeTests, DifferentTranscriptOriginTagFailure)
     using BuilderType = typename TestFixture::BuilderType;
     using MergeVerifierType = typename TestFixture::MergeVerifierType;
     using Transcript = typename TestFixture::Transcript;
-    using InnerFlavor = MegaFlavor;
-    using InnerBuilder = typename InnerFlavor::CircuitBuilder;
     constexpr size_t NUM_WIRES = TestFixture::NUM_WIRES;
 
     // Create single builder for both verifiers (realistic - both in same circuit)
     BuilderType builder;
 
     // === Generate two separate merge proofs (simulating two independent merge operations) ===
-    auto op_queue_1 = std::make_shared<ECCOpQueue>();
-    InnerBuilder circuit_1{ op_queue_1 };
-    GoblinMockCircuits::construct_simple_circuit(circuit_1);
+    auto op_queue_1 = TestFixture::construct_final_merge_op_queue();
     auto prover_transcript_1 = std::make_shared<NativeTranscript>();
     MergeProver prover_1{ op_queue_1, prover_transcript_1 };
     auto proof_1 = prover_1.construct_proof();
 
-    auto op_queue_2 = std::make_shared<ECCOpQueue>();
-    InnerBuilder circuit_2{ op_queue_2 };
-    GoblinMockCircuits::construct_simple_circuit(circuit_2);
+    auto op_queue_2 = TestFixture::construct_final_merge_op_queue();
     auto prover_transcript_2 = std::make_shared<NativeTranscript>();
     MergeProver prover_2{ op_queue_2, prover_transcript_2 };
     auto proof_2 = prover_2.construct_proof();
 
     // Get native commitments for proof 1 (shifted to match circuit ecc_op_wire layout)
     auto t_1 = op_queue_1->construct_current_ultra_ops_subtable_columns();
-    auto T_prev_1 = op_queue_1->construct_previous_ultra_ops_table_columns();
+    auto T_prev_1 = op_queue_1->construct_table_columns_up_to_tail();
     std::array<curve::BN254::AffineElement, NUM_WIRES> native_t_commitments_1;
     std::array<curve::BN254::AffineElement, NUM_WIRES> native_T_prev_commitments_1;
     for (size_t idx = 0; idx < NUM_WIRES; idx++) {
@@ -611,7 +536,7 @@ TYPED_TEST(MergeTests, DifferentTranscriptOriginTagFailure)
 
     // === Create first verifier with its own transcript instance ===
     auto transcript_1 = std::make_shared<Transcript>();
-    [[maybe_unused]] MergeVerifierType verifier_1{ MergeSettings::PREPEND, transcript_1 };
+    [[maybe_unused]] MergeVerifierType verifier_1{ transcript_1 };
 
     [[maybe_unused]] auto proof_1_recursive = TestFixture::create_proof(builder, proof_1);
 
@@ -627,7 +552,7 @@ TYPED_TEST(MergeTests, DifferentTranscriptOriginTagFailure)
     // === Create second verifier with a DIFFERENT transcript instance ===
     // This simulates having two independent merge verifiers in the same circuit
     auto transcript_2 = std::make_shared<Transcript>();
-    MergeVerifierType verifier_2{ MergeSettings::PREPEND, transcript_2 };
+    MergeVerifierType verifier_2{ transcript_2 };
 
     auto proof_2_recursive = TestFixture::create_proof(builder, proof_2);
 
@@ -738,13 +663,7 @@ class MergeTranscriptTests : public ::testing::Test {
  */
 TEST_F(MergeTranscriptTests, ProverManifestConsistency)
 {
-    using InnerFlavor = MegaFlavor;
-    using InnerBuilder = typename InnerFlavor::CircuitBuilder;
-
-    // Construct a simple circuit to generate merge proof
-    auto op_queue = std::make_shared<ECCOpQueue>();
-    InnerBuilder circuit{ op_queue };
-    GoblinMockCircuits::construct_simple_circuit(circuit);
+    auto op_queue = MergeTests<curve::BN254>::construct_final_merge_op_queue();
 
     // Construct merge proof with manifest enabled
     auto transcript = std::make_shared<NativeTranscript>();
@@ -770,13 +689,7 @@ TEST_F(MergeTranscriptTests, ProverManifestConsistency)
  */
 TEST_F(MergeTranscriptTests, VerifierManifestConsistency)
 {
-    using InnerFlavor = MegaFlavor;
-    using InnerBuilder = typename InnerFlavor::CircuitBuilder;
-
-    // Construct a simple circuit
-    auto op_queue = std::make_shared<ECCOpQueue>();
-    InnerBuilder circuit{ op_queue };
-    GoblinMockCircuits::construct_simple_circuit(circuit);
+    auto op_queue = MergeTests<curve::BN254>::construct_final_merge_op_queue();
 
     // Generate merge proof with prover manifest enabled
     auto prover_transcript = std::make_shared<NativeTranscript>();
@@ -787,7 +700,7 @@ TEST_F(MergeTranscriptTests, VerifierManifestConsistency)
     // Construct commitments for verifier (shifted to match circuit ecc_op_wire layout)
     MergeVerifier::InputCommitments merge_commitments;
     auto t_current = op_queue->construct_current_ultra_ops_subtable_columns();
-    auto T_prev = op_queue->construct_previous_ultra_ops_table_columns();
+    auto T_prev = op_queue->construct_table_columns_up_to_tail();
     for (size_t idx = 0; idx < MegaFlavor::NUM_WIRES; idx++) {
         merge_commitments.t_commitments[idx] = merge_prover.pcs_commitment_key.commit(t_current[idx]);
         merge_commitments.T_prev_commitments[idx] = merge_prover.pcs_commitment_key.commit(T_prev[idx]);
@@ -796,7 +709,7 @@ TEST_F(MergeTranscriptTests, VerifierManifestConsistency)
     // Verify proof with verifier manifest enabled
     auto verifier_transcript = std::make_shared<NativeTranscript>();
     verifier_transcript->enable_manifest();
-    MergeVerifier merge_verifier{ MergeSettings::PREPEND, verifier_transcript };
+    MergeVerifier merge_verifier{ verifier_transcript };
     auto result = merge_verifier.reduce_to_pairing_check(merge_proof, merge_commitments);
 
     // Verification should succeed
diff --git a/barretenberg/cpp/src/barretenberg/goblin/merge_prover.cpp b/barretenberg/cpp/src/barretenberg/goblin/merge_prover.cpp
index 5e4254917944..62ef391290bd 100644
--- a/barretenberg/cpp/src/barretenberg/goblin/merge_prover.cpp
+++ b/barretenberg/cpp/src/barretenberg/goblin/merge_prover.cpp
@@ -16,29 +16,23 @@ namespace bb {
  * @details We require an SRS at least as large as the current ultra ecc ops table
  * TODO(https://github.com/AztecProtocol/barretenberg/issues/1267): consider possible efficiency improvements
  */
-MergeProver::MergeProver(const std::shared_ptr<ECCOpQueue>& op_queue,
-                         std::shared_ptr<Transcript> transcript,
-                         MergeSettings settings)
+MergeProver::MergeProver(const std::shared_ptr<ECCOpQueue>& op_queue, std::shared_ptr<Transcript> transcript)
     : transcript(std::move(transcript))
     , op_queue(op_queue)
-    , settings(settings)
 {
-    // Merge the current subtable (for which a merge proof is being constructed) prior to
-    // procedeing with proving.
-    if (settings == MergeSettings::APPEND) {
-        op_queue->merge(settings, op_queue->get_append_offset());
+    // MergeProver is used only for the final merge, where the hiding kernel subtable is appended at a fixed offset.
+    const size_t append_offset = op_queue->get_append_offset();
+    fixed_append_shift_size = UltraEccOpsTable::ZK_ULTRA_OPS + (append_offset * UltraEccOpsTable::NUM_ROWS_PER_OP);
+    op_queue->merge_fixed_append(append_offset);
 
-    } else {
-        op_queue->merge(settings);
-    }
-
-    pcs_commitment_key = CommitmentKey(op_queue->get_ultra_ops_table_num_rows());
+    pcs_commitment_key = CommitmentKey(op_queue->get_ultra_ops_table_num_rows() + UltraEccOpsTable::ZK_ULTRA_OPS);
 };
 
 MergeProver::Polynomial MergeProver::compute_degree_check_polynomial(
-    const std::array<Polynomial, NUM_WIRES>& left_table, const std::vector<FF>& degree_check_challenges)
+    const std::array<Polynomial, NUM_WIRES>& left_table, const std::vector<FF>& degree_check_challenges) const
 {
-    Polynomial reversed_batched_left_tables(left_table[0].size());
+    // The left table has a fixed length, so we need to compute the reverse according to that length
+    Polynomial reversed_batched_left_tables(fixed_append_shift_size);
     for (size_t idx = 0; idx < NUM_WIRES; idx++) {
         reversed_batched_left_tables.add_scaled(left_table[idx], degree_check_challenges[idx]);
     }
@@ -153,8 +147,8 @@ MergeProver::OpeningClaim MergeProver::compute_shplonk_opening_claim(
  * @details Proves that M_j(X) = L_j(X) + X^k * R_j(X) and deg(L_j) < k for j = 1,2,3,4.
  * Uses degree-check polynomial G(X) and Shplonk for batched openings.
  *
- * For PREPEND: L = subtable (t), R = previous table (T_prev)
- * For APPEND:  L = previous table (T_prev), R = subtable (t)
+ * L = aggregate table up to and including the tail subtable (T_tail), R = the hiding kernel's subtable (t,
+ * appended at a fixed offset and carrying APPEND_TRACE_OFFSET leading zeros), M = the resulting full table (T).
  *
  * @see MERGE_PROTOCOL.md for complete protocol specification.
  * @return MergeProver::MergeProof
@@ -166,19 +160,12 @@ MergeProver::MergeProof MergeProver::construct_proof()
     std::array<Polynomial, NUM_WIRES> right_table;
     std::array<Polynomial, NUM_WIRES> merged_table = op_queue->construct_ultra_ops_table_columns(); // T
 
-    if (settings == MergeSettings::PREPEND) {
-        left_table = op_queue->construct_current_ultra_ops_subtable_columns(); // t
-        right_table = op_queue->construct_previous_ultra_ops_table_columns();  // T_prev
-    } else {
-        left_table = op_queue->construct_previous_ultra_ops_table_columns();    // T_prev
-        right_table = op_queue->construct_current_ultra_ops_subtable_columns(); // t (hiding kernel subtable,
-                                                                                // carries MegaZKFlavor::TRACE_OFFSET
-                                                                                // leading zeros internally)
-    }
+    left_table = op_queue->construct_table_columns_up_to_tail();            // T_tail
+    right_table = op_queue->construct_current_ultra_ops_subtable_columns(); // t (fixed append carries
+                                                                            // APPEND_TRACE_OFFSET leading zeros)
 
     // Send shift_size to the verifier
-    const size_t shift_size = left_table[0].size();
-    transcript->send_to_verifier("shift_size", static_cast<uint32_t>(shift_size));
+    transcript->send_to_verifier("shift_size", static_cast<uint32_t>(fixed_append_shift_size));
 
     // Compute commitments [M_j] and send to the verifier
     for (size_t idx = 0; idx < NUM_WIRES; ++idx) {
diff --git a/barretenberg/cpp/src/barretenberg/goblin/merge_prover.hpp b/barretenberg/cpp/src/barretenberg/goblin/merge_prover.hpp
index b62c2fe37857..252a7217225a 100644
--- a/barretenberg/cpp/src/barretenberg/goblin/merge_prover.hpp
+++ b/barretenberg/cpp/src/barretenberg/goblin/merge_prover.hpp
@@ -17,8 +17,11 @@
 namespace bb {
 
 /**
- * @brief Prover class for the Goblin ECC op queue transcript merge protocol
- *
+ * @brief Prover for the single-step Goblin ECC op queue merge protocol.
+ * @details Proves that the most recently merged subtable concatenates correctly with the prior aggregate table to
+ * form the new aggregate table. Used in the Chonk flow only for the final merge of the hiding kernel's subtable
+ * (placed at a fixed offset). For the multi-subtable batched merge proven once at the end of an IVC, see
+ * BatchMergeProver.
  */
 class MergeProver {
     using Curve = curve::BN254;
@@ -35,9 +38,7 @@ class MergeProver {
     using MergeProof = std::vector<FF>;
     static constexpr size_t NUM_WIRES = MegaExecutionTraceBlocks::NUM_WIRES;
 
-    explicit MergeProver(const std::shared_ptr<ECCOpQueue>& op_queue,
-                         std::shared_ptr<Transcript> transcript,
-                         MergeSettings settings = MergeSettings::PREPEND);
+    explicit MergeProver(const std::shared_ptr<ECCOpQueue>& op_queue, std::shared_ptr<Transcript> transcript);
 
     BB_PROFILE MergeProof construct_proof();
 
@@ -48,7 +49,7 @@ class MergeProver {
   private:
     std::shared_ptr<Transcript> transcript;
     std::shared_ptr<ECCOpQueue> op_queue;
-    MergeSettings settings;
+    size_t fixed_append_shift_size = 0;
 
     std::vector<std::string> labels_degree_check = { "LEFT_TABLE_DEGREE_CHECK_0",
                                                      "LEFT_TABLE_DEGREE_CHECK_1",
@@ -77,8 +78,8 @@ class MergeProver {
      * @param degree_check_challenges
      * @return Polynomial
      */
-    static Polynomial compute_degree_check_polynomial(const std::array<Polynomial, NUM_WIRES>& left_table,
-                                                      const std::vector<FF>& degree_check_challenges);
+    Polynomial compute_degree_check_polynomial(const std::array<Polynomial, NUM_WIRES>& left_table,
+                                               const std::vector<FF>& degree_check_challenges) const;
 
     /**
      * @brief Compute the batched Shplonk quotient polynomial.
diff --git a/barretenberg/cpp/src/barretenberg/goblin/merge_verifier.cpp b/barretenberg/cpp/src/barretenberg/goblin/merge_verifier.cpp
index b2dcfb66bfd2..bd714c42ed46 100644
--- a/barretenberg/cpp/src/barretenberg/goblin/merge_verifier.cpp
+++ b/barretenberg/cpp/src/barretenberg/goblin/merge_verifier.cpp
@@ -109,7 +109,8 @@ BatchOpeningClaim<Curve> MergeVerifier_<Curve>::compute_shplonk_opening_claim(
  *
  * @see MERGE_PROTOCOL.md for complete protocol specification.
  * @param proof The merge proof to verify
- * @param input_commitments Commitments to subtable (t) and previous table (T_prev)
+ * @param input_commitments Commitments to the subtable being merged (t) and to the aggregate table prior to this
+ * merge (T_prev, covering all subtables up to and including the tail)
  * @return VerificationResult containing pairing points, merged table commitments, and check results
  */
 template <typename Curve>
@@ -131,14 +132,11 @@ typename MergeVerifier_<Curve>::ReductionResult MergeVerifier_<Curve>::reduce_to
     // The vector is composed of: [L_1], .., [L_4], [R_1], .., [R_4], [M_1], .., [M_4], [G]
     std::vector<Commitment> table_commitments;
     table_commitments.reserve((3 * NUM_WIRES) + 1);
-    for (size_t idx = 0; idx < NUM_WIRES; ++idx) {
-        table_commitments.emplace_back(settings == MergeSettings::PREPEND ? input_commitments.t_commitments[idx]
-                                                                          : input_commitments.T_prev_commitments[idx]);
-    }
-    for (size_t idx = 0; idx < NUM_WIRES; ++idx) {
-        table_commitments.emplace_back(settings == MergeSettings::PREPEND ? input_commitments.T_prev_commitments[idx]
-                                                                          : input_commitments.t_commitments[idx]);
-    }
+    table_commitments.insert(table_commitments.end(),
+                             input_commitments.T_prev_commitments.begin(),
+                             input_commitments.T_prev_commitments.end());
+    table_commitments.insert(
+        table_commitments.end(), input_commitments.t_commitments.begin(), input_commitments.t_commitments.end());
     for (size_t idx = 0; idx < NUM_WIRES; ++idx) {
         table_commitments.emplace_back(
             transcript->template receive_from_prover<Commitment>("MERGED_TABLE_" + std::to_string(idx)));
diff --git a/barretenberg/cpp/src/barretenberg/goblin/merge_verifier.hpp b/barretenberg/cpp/src/barretenberg/goblin/merge_verifier.hpp
index dcbfdf80d8df..b87a1712741d 100644
--- a/barretenberg/cpp/src/barretenberg/goblin/merge_verifier.hpp
+++ b/barretenberg/cpp/src/barretenberg/goblin/merge_verifier.hpp
@@ -16,8 +16,10 @@
 namespace bb {
 
 /**
- * @brief Unified verifier class for the Goblin ECC op queue transcript merge protocol
- * @details Works for both native verification and recursive (in-circuit) verification
+ * @brief Verifier for the single-step Goblin ECC op queue merge protocol.
+ * @details Works for both native verification and recursive (in-circuit) verification. In the Chonk flow this
+ * verifier is used only for the final merge of the hiding kernel's subtable; the multi-subtable batched merge
+ * proven once at the end of an IVC is handled by BatchMergeVerifier_.
  * @tparam Curve The curve type (native curve::BN254 or stdlib bn254<Builder>)
  */
 template <typename Curve> class MergeVerifier_ {
@@ -43,9 +45,10 @@ template <typename Curve> class MergeVerifier_ {
 
     /**
      * Commitments used by the verifier to run the verification algorithm. They contain:
-     *  - `t_commitments`: the subtable commitments data, containing the commitments to t_j read from the transcript by
-     *     the HN verifier with which the Merge verifier shares a transcript
-     *  - `T_prev_commitments`: the commitments to the full op_queue table after the previous iteration of merge
+     *  - `t_commitments`: commitments to the subtable being merged (t_j), read from the transcript by the HN
+     *     verifier with which the Merge verifier shares a transcript
+     *  - `T_prev_commitments`: commitments to the aggregate op_queue table prior to this merge (i.e. covering all
+     *     subtables up to and including the tail subtable, but excluding the one currently being appended)
      */
     struct InputCommitments {
         TableCommitments t_commitments;
@@ -63,13 +66,10 @@ template <typename Curve> class MergeVerifier_ {
         bool reduction_succeeded = false; // Aggregate of degree and concatenation checks
     };
 
-    MergeSettings settings;
     std::shared_ptr<Transcript> transcript;
 
-    explicit MergeVerifier_(const MergeSettings settings = MergeSettings::PREPEND,
-                            std::shared_ptr<Transcript> transcript = std::make_shared<Transcript>())
-        : settings(settings)
-        , transcript(std::move(transcript))
+    explicit MergeVerifier_(std::shared_ptr<Transcript> transcript = std::make_shared<Transcript>())
+        : transcript(std::move(transcript))
     {}
 
     /**
diff --git a/barretenberg/cpp/src/barretenberg/goblin/mock_circuits.hpp b/barretenberg/cpp/src/barretenberg/goblin/mock_circuits.hpp
index 93d0df6ef0d9..968285021d4a 100644
--- a/barretenberg/cpp/src/barretenberg/goblin/mock_circuits.hpp
+++ b/barretenberg/cpp/src/barretenberg/goblin/mock_circuits.hpp
@@ -8,6 +8,7 @@
 #include "barretenberg/srs/global_crs.hpp"
 #include "barretenberg/stdlib/encryption/ecdsa/ecdsa.hpp"
 #include "barretenberg/stdlib/hash/keccak/keccak.hpp"
+#include "barretenberg/stdlib/hash/poseidon2/poseidon2.hpp"
 #include "barretenberg/stdlib/hash/sha256/sha256.hpp"
 #include "barretenberg/stdlib/primitives/curves/secp256k1.hpp"
 #include "barretenberg/stdlib/special_public_inputs/special_public_inputs.hpp"
@@ -50,6 +51,24 @@ template <typename Builder> void generate_sha256_test_circuit(Builder& builder,
     }
 }
 
+/**
+ * @brief Generate a test circuit that computes a single poseidon2 hash over a vector of `num_inputs` field elements.
+ */
+template <typename Builder> void generate_poseidon2_hash_test_circuit(Builder& builder, size_t num_inputs)
+{
+    using field_ct = stdlib::field_t<Builder>;
+    using witness_ct = stdlib::witness_t<Builder>;
+
+    std::vector<field_ct> inputs;
+    inputs.reserve(num_inputs);
+    for (size_t i = 0; i < num_inputs; i++) {
+        inputs.emplace_back(witness_ct(&builder, bb::fr(i + 1)));
+    }
+
+    auto out = stdlib::poseidon2<Builder>::hash(inputs);
+    out.set_public();
+}
+
 class GoblinMockCircuits {
   public:
     using Curve = curve::BN254;
@@ -139,22 +158,10 @@ class GoblinMockCircuits {
 
     static void construct_and_merge_mock_circuits(Goblin& goblin, const size_t num_circuits = 3)
     {
-        using Fq = curve::Grumpkin::ScalarField;
         for (size_t idx = 0; idx < num_circuits - 1; ++idx) {
             MegaCircuitBuilder builder{ goblin.op_queue };
-            if (idx == num_circuits - 2) {
-                // The tail circuit's subtable is prepended last and sits at the top of the aggregate op queue table.
-                // The initial no-op gives the Translator's op queue wires their 2 shiftability-required leading zeros.
-                builder.queue_ecc_no_op();
-                // Add random ops at START for Translator ZK (lands at beginning of op queue table)
-                randomise_op_queue(builder, TranslatorCircuitBuilder::NUM_RANDOM_OPS_START);
-                // Add hiding op for ECCVM ZK (prepended to ECCVM ops at row 1)
-                builder.queue_ecc_hiding_op(Fq::random_element(), Fq::random_element());
-            }
             construct_simple_circuit(builder);
-            goblin.prove_merge();
-            // Pop the merge proof from the queue, Goblin will be verified at the end
-            goblin.merge_verification_queue.pop_front();
+            goblin.op_queue->merge();
         }
         MegaCircuitBuilder builder{ goblin.op_queue };
         GoblinMockCircuits::construct_simple_circuit(builder);
diff --git a/barretenberg/cpp/src/barretenberg/goblin_avm/goblin_verifier.test.cpp b/barretenberg/cpp/src/barretenberg/goblin_avm/goblin_verifier.test.cpp
index 809a35681539..70669da886e6 100644
--- a/barretenberg/cpp/src/barretenberg/goblin_avm/goblin_verifier.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/goblin_avm/goblin_verifier.test.cpp
@@ -96,7 +96,7 @@ class GoblinAvmRecursiveVerifierTests : public testing::Test {
 
         // Commit to op_queue columns.
         TableCommitments table_commitments;
-        auto ultra_ops_table_columns = goblin.op_queue->construct_ultra_ops_table_columns();
+        auto ultra_ops_table_columns = goblin.op_queue->construct_ultra_ops_table_columns(/*include_zk_ops*/ false);
         CommitmentKey<curve::BN254> pcs_commitment_key(goblin.op_queue->get_ultra_ops_table_num_rows());
         for (size_t idx = 0; idx < MegaFlavor::NUM_WIRES; idx++) {
             table_commitments[idx] = pcs_commitment_key.commit(ultra_ops_table_columns[idx]);
diff --git a/barretenberg/cpp/src/barretenberg/honk/composer/permutation_lib.hpp b/barretenberg/cpp/src/barretenberg/honk/composer/permutation_lib.hpp
index bd3e9648eee9..1e11af85d9ab 100644
--- a/barretenberg/cpp/src/barretenberg/honk/composer/permutation_lib.hpp
+++ b/barretenberg/cpp/src/barretenberg/honk/composer/permutation_lib.hpp
@@ -134,44 +134,47 @@ PermutationMapping<Flavor::NUM_WIRES> compute_permutation_mapping(
     // Represents the idx of a variable in circuit_constructor.variables
     std::span<const uint32_t> real_variable_tags = circuit_constructor.real_variable_tags;
 
-    // Go through each cycle
-    for (size_t cycle_idx = 0; cycle_idx < wire_copy_cycles.size(); ++cycle_idx) {
-        // We go through the cycle and fill-out/modify `mapping`. Following the generalized permutation algorithm, we
-        // take separate care of first/last node handling.
-        const CyclicPermutation& cycle = wire_copy_cycles[cycle_idx];
-        const auto cycle_size = cycle.size();
-        if (cycle_size == 0) {
-            continue;
-        }
+    // Cycles are disjoint by construction of the generalized permutation argument: every (gate_idx, wire_idx) position
+    // belongs to exactly one variable, hence to exactly one cycle. Per-(col, row) writes from different cycles never
+    // alias, so parallelising across cycle_idx is safe without per-thread staging or merge.
+    parallel_for_heuristic(
+        wire_copy_cycles.size(),
+        [&](size_t cycle_idx) {
+            const CyclicPermutation& cycle = wire_copy_cycles[cycle_idx];
+            const auto cycle_size = cycle.size();
+            if (cycle_size == 0) {
+                return;
+            }
 
-        const cycle_node& first_node = cycle[0];
-        const cycle_node& last_node = cycle[cycle_size - 1];
+            const cycle_node& first_node = cycle[0];
+            const cycle_node& last_node = cycle[cycle_size - 1];
 
-        const auto first_row = static_cast<ptrdiff_t>(first_node.gate_idx);
-        const auto first_col = first_node.wire_idx;
-        const auto last_row = static_cast<ptrdiff_t>(last_node.gate_idx);
-        const auto last_col = last_node.wire_idx;
+            const auto first_row = static_cast<ptrdiff_t>(first_node.gate_idx);
+            const auto first_col = first_node.wire_idx;
+            const auto last_row = static_cast<ptrdiff_t>(last_node.gate_idx);
+            const auto last_col = last_node.wire_idx;
 
-        // First node: id gets tagged with the cycle's variable tag
-        mapping.ids[first_col].is_tag[first_row] = true;
-        mapping.ids[first_col].row_idx[first_row] = real_variable_tags[cycle_idx];
+            // First node: id gets tagged with the cycle's variable tag
+            mapping.ids[first_col].is_tag[first_row] = true;
+            mapping.ids[first_col].row_idx[first_row] = real_variable_tags[cycle_idx];
 
-        // Last node: sigma gets tagged and points to tau(tag) instead of wrapping to first node
-        mapping.sigmas[last_col].is_tag[last_row] = true;
-        mapping.sigmas[last_col].row_idx[last_row] = circuit_constructor.tau().at(real_variable_tags[cycle_idx]);
+            // Last node: sigma gets tagged and points to tau(tag) instead of wrapping to first node
+            mapping.sigmas[last_col].is_tag[last_row] = true;
+            mapping.sigmas[last_col].row_idx[last_row] = circuit_constructor.tau().at(real_variable_tags[cycle_idx]);
 
-        // All nodes except the last: sigma points to the next node in the cycle
-        for (size_t node_idx = 0; node_idx + 1 < cycle_size; ++node_idx) {
-            const cycle_node& current_node = cycle[node_idx];
-            const cycle_node& next_node = cycle[node_idx + 1];
+            // All nodes except the last: sigma points to the next node in the cycle
+            for (size_t node_idx = 0; node_idx + 1 < cycle_size; ++node_idx) {
+                const cycle_node& current_node = cycle[node_idx];
+                const cycle_node& next_node = cycle[node_idx + 1];
 
-            const auto current_row = static_cast<ptrdiff_t>(current_node.gate_idx);
-            const auto current_col = current_node.wire_idx;
-            // Point current node to next node.
-            mapping.sigmas[current_col].row_idx[current_row] = next_node.gate_idx;
-            mapping.sigmas[current_col].col_idx[current_row] = static_cast<uint8_t>(next_node.wire_idx);
-        }
-    }
+                const auto current_row = static_cast<ptrdiff_t>(current_node.gate_idx);
+                const auto current_col = current_node.wire_idx;
+                // Point current node to next node.
+                mapping.sigmas[current_col].row_idx[current_row] = next_node.gate_idx;
+                mapping.sigmas[current_col].col_idx[current_row] = static_cast<uint8_t>(next_node.wire_idx);
+            }
+        },
+        /*heuristic_cost=*/thread_heuristics::FF_COPY_COST * 8);
 
     // Add information about public inputs so that the cycles can be altered later; See the construction of the
     // permutation polynomials for details. This _only_ effects sigma_0, the 0th sigma polynomial, as the structure of
diff --git a/barretenberg/cpp/src/barretenberg/honk/execution_trace/execution_trace_block.hpp b/barretenberg/cpp/src/barretenberg/honk/execution_trace/execution_trace_block.hpp
index 901b6266fc56..a0c8886c53e3 100644
--- a/barretenberg/cpp/src/barretenberg/honk/execution_trace/execution_trace_block.hpp
+++ b/barretenberg/cpp/src/barretenberg/honk/execution_trace/execution_trace_block.hpp
@@ -315,9 +315,10 @@ template <typename FF, size_t NUM_WIRES_> class ExecutionTraceBlock {
     Selector<FF>& q_2() { return non_gate_selectors[3]; };
     Selector<FF>& q_3() { return non_gate_selectors[4]; };
     Selector<FF>& q_4() { return non_gate_selectors[5]; };
+    Selector<FF>& q_5() { return non_gate_selectors[6]; };
 
   protected:
-    std::array<SlabVectorSelector<FF>, 6> non_gate_selectors;
+    std::array<SlabVectorSelector<FF>, 7> non_gate_selectors;
 };
 
 } // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/honk/execution_trace/gate_data.hpp b/barretenberg/cpp/src/barretenberg/honk/execution_trace/gate_data.hpp
index e5eb13a515f4..ffc8d414ce5e 100644
--- a/barretenberg/cpp/src/barretenberg/honk/execution_trace/gate_data.hpp
+++ b/barretenberg/cpp/src/barretenberg/honk/execution_trace/gate_data.hpp
@@ -110,6 +110,15 @@ template <typename FF> struct poseidon2_external_gate_ {
     size_t round_idx;
 };
 
+// Initial linear layer gate for Poseidon2. Wires hold the raw permutation input; the next row
+// holds M_E * input and is consumed by the first external-round gate.
+template <typename FF> struct poseidon2_initial_external_gate_ {
+    uint32_t a;
+    uint32_t b;
+    uint32_t c;
+    uint32_t d;
+};
+
 // Internal gate data for poseidon2 internal round
 template <typename FF> struct poseidon2_internal_gate_ {
     uint32_t a;
@@ -118,4 +127,39 @@ template <typename FF> struct poseidon2_internal_gate_ {
     uint32_t d;
     size_t round_idx;
 };
+
+// K=4 compressed internal-round gate: processes FOUR consecutive internal rounds per row.
+// Wires: a = state[0] at round 4i+0, b = state[0] at round 4i+1,
+//        c = state[0] at round 4i+2, d = state[0] at round 4i+3.
+// (s_1, s_2, s_3) at row start are reconstructed inside the relation via a 3x3 Vandermonde solve.
+//
+// Round constants on the row (see Poseidon2QuadInternalRelationImpl):
+//   q_l, q_r, q_o, q_4 = c_{4i}, c_{4i+1}, c_{4i+2}, c_{4i+3}   // this quad's 4 S-box constants
+//   q_m, q_c, q_5      = c_{4(i+1)}, c_{4(i+1)+1}, c_{4(i+1)+2} // next quad's first 3 constants
+//                                                               // (unused on terminal row)
+template <typename FF> struct poseidon2_quad_internal_gate_ {
+    uint32_t a;             // state[0] at round 4i+0
+    uint32_t b;             // state[0] at round 4i+1
+    uint32_t c;             // state[0] at round 4i+2
+    uint32_t d;             // state[0] at round 4i+3
+    size_t round_idx_start; // absolute round_constants index of round 4i (this quad's 1st round)
+    size_t next_pair_start; // absolute round_constants index of round 4(i+1) (next quad's 1st round);
+                            // ignored when is_terminal = true
+    bool is_terminal;       // true on the last compressed row (successor is standard-encoded)
+};
+
+// Entry transition gate: standard-encoded state (s_0, s_1, s_2, s_3) at round `round_idx_start`
+// whose successor is the first K=4 compressed row. The relation forces the successor's
+// w_r_shift, w_o_shift, w_4_shift to state[0] at rounds start+1, start+2, start+3 respectively.
+//
+// Round constants on the row:
+//   q_l, q_r, q_o = c_{start}, c_{start+1}, c_{start+2}   (first 3 internal round constants)
+//   q_4, q_m, q_c, q_5 = 0 (unused)
+template <typename FF> struct poseidon2_transition_entry_gate_ {
+    uint32_t a;             // s_0
+    uint32_t b;             // s_1
+    uint32_t c;             // s_2
+    uint32_t d;             // s_3
+    size_t round_idx_start; // absolute round_constants index of the first internal round
+};
 } // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/honk/execution_trace/mega_execution_trace.hpp b/barretenberg/cpp/src/barretenberg/honk/execution_trace/mega_execution_trace.hpp
index b9cb166ec021..d32faa088106 100644
--- a/barretenberg/cpp/src/barretenberg/honk/execution_trace/mega_execution_trace.hpp
+++ b/barretenberg/cpp/src/barretenberg/honk/execution_trace/mega_execution_trace.hpp
@@ -29,7 +29,10 @@ class MegaTraceBlock : public ExecutionTraceBlock<fr, /*NUM_WIRES_ */ 4> {
     virtual SelectorType& q_memory() { return this->zero_selectors[5]; };
     virtual SelectorType& q_nnf() { return this->zero_selectors[6]; };
     virtual SelectorType& q_poseidon2_external() { return this->zero_selectors[7]; };
-    virtual SelectorType& q_poseidon2_internal() { return this->zero_selectors[8]; };
+    virtual SelectorType& q_poseidon2_external_initial() { return this->zero_selectors[8]; };
+    virtual SelectorType& q_poseidon2_quad_internal() { return this->zero_selectors[9]; };
+    virtual SelectorType& q_poseidon2_quad_internal_terminal() { return this->zero_selectors[10]; };
+    virtual SelectorType& q_poseidon2_transition_entry() { return this->zero_selectors[11]; };
 
     virtual const SelectorType& q_busread() const { return this->zero_selectors[0]; };
     virtual const SelectorType& q_lookup() const { return this->zero_selectors[1]; };
@@ -39,7 +42,10 @@ class MegaTraceBlock : public ExecutionTraceBlock<fr, /*NUM_WIRES_ */ 4> {
     virtual const SelectorType& q_memory() const { return this->zero_selectors[5]; };
     virtual const SelectorType& q_nnf() const { return this->zero_selectors[6]; };
     virtual const SelectorType& q_poseidon2_external() const { return this->zero_selectors[7]; };
-    virtual const SelectorType& q_poseidon2_internal() const { return this->zero_selectors[8]; };
+    virtual const SelectorType& q_poseidon2_external_initial() const { return this->zero_selectors[8]; };
+    virtual const SelectorType& q_poseidon2_quad_internal() const { return this->zero_selectors[9]; };
+    virtual const SelectorType& q_poseidon2_quad_internal_terminal() const { return this->zero_selectors[10]; };
+    virtual const SelectorType& q_poseidon2_transition_entry() const { return this->zero_selectors[11]; };
 
     RefVector<SelectorType> get_gate_selectors()
     {
@@ -52,7 +58,10 @@ class MegaTraceBlock : public ExecutionTraceBlock<fr, /*NUM_WIRES_ */ 4> {
             q_memory(),
             q_nnf(),
             q_poseidon2_external(),
-            q_poseidon2_internal(),
+            q_poseidon2_external_initial(),
+            q_poseidon2_quad_internal(),
+            q_poseidon2_quad_internal_terminal(),
+            q_poseidon2_transition_entry(),
         };
     }
 
@@ -65,6 +74,7 @@ class MegaTraceBlock : public ExecutionTraceBlock<fr, /*NUM_WIRES_ */ 4> {
             q_2(),
             q_3(),
             q_4(),
+            q_5(),
             q_busread(),
             q_lookup(),
             q_arith(),
@@ -73,7 +83,10 @@ class MegaTraceBlock : public ExecutionTraceBlock<fr, /*NUM_WIRES_ */ 4> {
             q_memory(),
             q_nnf(),
             q_poseidon2_external(),
-            q_poseidon2_internal(),
+            q_poseidon2_external_initial(),
+            q_poseidon2_quad_internal(),
+            q_poseidon2_quad_internal_terminal(),
+            q_poseidon2_transition_entry(),
         };
     }
 
@@ -99,7 +112,7 @@ class MegaTraceBlock : public ExecutionTraceBlock<fr, /*NUM_WIRES_ */ 4> {
     virtual void set_gate_selector([[maybe_unused]] const fr& value) {}
 
   private:
-    std::array<ZeroSelector<fr>, 9> zero_selectors;
+    std::array<ZeroSelector<fr>, 12> zero_selectors;
 };
 
 class MegaTracePublicInputBlock : public MegaTraceBlock {};
@@ -118,7 +131,10 @@ class MegaTraceBusReadBlock : public MegaTraceBlock {
         q_memory().emplace_back(0);
         q_nnf().emplace_back(0);
         q_poseidon2_external().emplace_back(0);
-        q_poseidon2_internal().emplace_back(0);
+        q_poseidon2_external_initial().emplace_back(0);
+        q_poseidon2_quad_internal().emplace_back(0);
+        q_poseidon2_quad_internal_terminal().emplace_back(0);
+        q_poseidon2_transition_entry().emplace_back(0);
     }
 
   private:
@@ -139,7 +155,10 @@ class MegaTraceLookupBlock : public MegaTraceBlock {
         q_memory().emplace_back(0);
         q_nnf().emplace_back(0);
         q_poseidon2_external().emplace_back(0);
-        q_poseidon2_internal().emplace_back(0);
+        q_poseidon2_external_initial().emplace_back(0);
+        q_poseidon2_quad_internal().emplace_back(0);
+        q_poseidon2_quad_internal_terminal().emplace_back(0);
+        q_poseidon2_transition_entry().emplace_back(0);
     }
 
   private:
@@ -160,7 +179,10 @@ class MegaTraceArithmeticBlock : public MegaTraceBlock {
         q_memory().emplace_back(0);
         q_nnf().emplace_back(0);
         q_poseidon2_external().emplace_back(0);
-        q_poseidon2_internal().emplace_back(0);
+        q_poseidon2_external_initial().emplace_back(0);
+        q_poseidon2_quad_internal().emplace_back(0);
+        q_poseidon2_quad_internal_terminal().emplace_back(0);
+        q_poseidon2_transition_entry().emplace_back(0);
     }
 
   private:
@@ -181,7 +203,10 @@ class MegaTraceDeltaRangeBlock : public MegaTraceBlock {
         q_memory().emplace_back(0);
         q_nnf().emplace_back(0);
         q_poseidon2_external().emplace_back(0);
-        q_poseidon2_internal().emplace_back(0);
+        q_poseidon2_external_initial().emplace_back(0);
+        q_poseidon2_quad_internal().emplace_back(0);
+        q_poseidon2_quad_internal_terminal().emplace_back(0);
+        q_poseidon2_transition_entry().emplace_back(0);
     }
 
   private:
@@ -202,7 +227,10 @@ class MegaTraceEllipticBlock : public MegaTraceBlock {
         q_memory().emplace_back(0);
         q_nnf().emplace_back(0);
         q_poseidon2_external().emplace_back(0);
-        q_poseidon2_internal().emplace_back(0);
+        q_poseidon2_external_initial().emplace_back(0);
+        q_poseidon2_quad_internal().emplace_back(0);
+        q_poseidon2_quad_internal_terminal().emplace_back(0);
+        q_poseidon2_transition_entry().emplace_back(0);
     }
 
   private:
@@ -223,7 +251,10 @@ class MegaTraceMemoryBlock : public MegaTraceBlock {
         gate_selector.emplace_back(value);
         q_nnf().emplace_back(0);
         q_poseidon2_external().emplace_back(0);
-        q_poseidon2_internal().emplace_back(0);
+        q_poseidon2_external_initial().emplace_back(0);
+        q_poseidon2_quad_internal().emplace_back(0);
+        q_poseidon2_quad_internal_terminal().emplace_back(0);
+        q_poseidon2_transition_entry().emplace_back(0);
     }
 
   private:
@@ -244,7 +275,10 @@ class MegaTraceNonNativeFieldBlock : public MegaTraceBlock {
         q_memory().emplace_back(0);
         gate_selector.emplace_back(value);
         q_poseidon2_external().emplace_back(0);
-        q_poseidon2_internal().emplace_back(0);
+        q_poseidon2_external_initial().emplace_back(0);
+        q_poseidon2_quad_internal().emplace_back(0);
+        q_poseidon2_quad_internal_terminal().emplace_back(0);
+        q_poseidon2_transition_entry().emplace_back(0);
     }
 
   private:
@@ -254,7 +288,11 @@ class MegaTraceNonNativeFieldBlock : public MegaTraceBlock {
 class MegaTracePoseidon2ExternalBlock : public MegaTraceBlock {
   public:
     SelectorType& q_poseidon2_external() override { return gate_selector; }
+    SelectorType& q_poseidon2_external_initial() override { return initial_selector; }
+    const SelectorType& q_poseidon2_external() const override { return gate_selector; }
+    const SelectorType& q_poseidon2_external_initial() const override { return initial_selector; }
 
+    // Activates q_poseidon2_external on the row; used for ordinary external-round rows.
     void set_gate_selector(const fr& value) override
     {
         q_busread().emplace_back(0);
@@ -265,17 +303,45 @@ class MegaTracePoseidon2ExternalBlock : public MegaTraceBlock {
         q_memory().emplace_back(0);
         q_nnf().emplace_back(0);
         gate_selector.emplace_back(value);
-        q_poseidon2_internal().emplace_back(0);
+        initial_selector.emplace_back(0);
+        q_poseidon2_quad_internal().emplace_back(0);
+        q_poseidon2_quad_internal_terminal().emplace_back(0);
+        q_poseidon2_transition_entry().emplace_back(0);
+    }
+
+    // Activates q_poseidon2_external_initial on the row; used for the initial-linear-layer row
+    // sitting immediately before the first external-round row of each Poseidon2 hash.
+    void set_initial_gate_selector(const fr& value)
+    {
+        q_busread().emplace_back(0);
+        q_lookup().emplace_back(0);
+        q_arith().emplace_back(0);
+        q_delta_range().emplace_back(0);
+        q_elliptic().emplace_back(0);
+        q_memory().emplace_back(0);
+        q_nnf().emplace_back(0);
+        gate_selector.emplace_back(0);
+        initial_selector.emplace_back(value);
+        q_poseidon2_quad_internal().emplace_back(0);
+        q_poseidon2_quad_internal_terminal().emplace_back(0);
+        q_poseidon2_transition_entry().emplace_back(0);
     }
 
   private:
     SlabVectorSelector<fr> gate_selector;
+    SlabVectorSelector<fr> initial_selector;
 };
 
-class MegaTracePoseidon2InternalBlock : public MegaTraceBlock {
+class MegaTracePoseidon2QuadInternalBlock : public MegaTraceBlock {
   public:
-    SelectorType& q_poseidon2_internal() override { return gate_selector; }
-
+    SelectorType& q_poseidon2_quad_internal() override { return interior_selector; }
+    SelectorType& q_poseidon2_quad_internal_terminal() override { return terminal_selector; }
+    SelectorType& q_poseidon2_transition_entry() override { return entry_selector; }
+    const SelectorType& q_poseidon2_quad_internal() const override { return interior_selector; }
+    const SelectorType& q_poseidon2_quad_internal_terminal() const override { return terminal_selector; }
+    const SelectorType& q_poseidon2_transition_entry() const override { return entry_selector; }
+
+    // Activates q_poseidon2_quad_internal on the row; used for interior compressed rows.
     void set_gate_selector(const fr& value) override
     {
         q_busread().emplace_back(0);
@@ -286,11 +352,50 @@ class MegaTracePoseidon2InternalBlock : public MegaTraceBlock {
         q_memory().emplace_back(0);
         q_nnf().emplace_back(0);
         q_poseidon2_external().emplace_back(0);
-        gate_selector.emplace_back(value);
+        q_poseidon2_external_initial().emplace_back(0);
+        interior_selector.emplace_back(value);
+        terminal_selector.emplace_back(0);
+        entry_selector.emplace_back(0);
+    }
+
+    // Activates q_poseidon2_quad_internal_terminal on the row; used for the terminal compressed row.
+    void set_terminal_gate_selector(const fr& value)
+    {
+        q_busread().emplace_back(0);
+        q_lookup().emplace_back(0);
+        q_arith().emplace_back(0);
+        q_delta_range().emplace_back(0);
+        q_elliptic().emplace_back(0);
+        q_memory().emplace_back(0);
+        q_nnf().emplace_back(0);
+        q_poseidon2_external().emplace_back(0);
+        q_poseidon2_external_initial().emplace_back(0);
+        interior_selector.emplace_back(0);
+        terminal_selector.emplace_back(value);
+        entry_selector.emplace_back(0);
+    }
+
+    // Activates q_poseidon2_transition_entry on the row; used for the standard->compressed entry row.
+    void set_entry_gate_selector(const fr& value)
+    {
+        q_busread().emplace_back(0);
+        q_lookup().emplace_back(0);
+        q_arith().emplace_back(0);
+        q_delta_range().emplace_back(0);
+        q_elliptic().emplace_back(0);
+        q_memory().emplace_back(0);
+        q_nnf().emplace_back(0);
+        q_poseidon2_external().emplace_back(0);
+        q_poseidon2_external_initial().emplace_back(0);
+        interior_selector.emplace_back(0);
+        terminal_selector.emplace_back(0);
+        entry_selector.emplace_back(value);
     }
 
   private:
-    SlabVectorSelector<fr> gate_selector;
+    SlabVectorSelector<fr> interior_selector;
+    SlabVectorSelector<fr> terminal_selector;
+    SlabVectorSelector<fr> entry_selector;
 };
 
 /**
@@ -318,14 +423,23 @@ struct MegaTraceBlockData {
     MegaTraceMemoryBlock memory;
     MegaTraceNonNativeFieldBlock nnf;
     MegaTracePoseidon2ExternalBlock poseidon2_external;
-    MegaTracePoseidon2InternalBlock poseidon2_internal;
+    MegaTracePoseidon2QuadInternalBlock poseidon2_quad_internal;
 
     static constexpr size_t NUM_BLOCKS = 11;
 
     std::vector<std::string_view> get_labels() const
     {
-        return { "ecc_op",   "busread", "lookup", "pub_inputs",         "arithmetic",        "delta_range",
-                 "elliptic", "memory",  "nnf",    "poseidon2_external", "poseidon2_internal" };
+        return { "ecc_op",
+                 "busread",
+                 "lookup",
+                 "pub_inputs",
+                 "arithmetic",
+                 "delta_range",
+                 "elliptic",
+                 "memory",
+                 "nnf",
+                 "poseidon2_external",
+                 "poseidon2_quad_internal" };
     }
 
     auto get()
@@ -340,7 +454,7 @@ struct MegaTraceBlockData {
                                                                  &memory,
                                                                  &nnf,
                                                                  &poseidon2_external,
-                                                                 &poseidon2_internal });
+                                                                 &poseidon2_quad_internal });
     }
 
     auto get() const
@@ -355,12 +469,15 @@ struct MegaTraceBlockData {
                                                                        &memory,
                                                                        &nnf,
                                                                        &poseidon2_external,
-                                                                       &poseidon2_internal });
+                                                                       &poseidon2_quad_internal });
     }
 
     auto get_gate_blocks() const
     {
-        return RefArray(std::array<const MegaTraceBlock*, 9>{
+        // Order must match get_gate_selectors() in MegaFlavor: poseidon2_external appears twice
+        // (regular + initial) and poseidon2_quad_internal appears three times (interior /
+        // terminal / entry).
+        return RefArray(std::array<const MegaTraceBlock*, 12>{
             &busread,
             &lookup,
             &arithmetic,
@@ -368,8 +485,11 @@ struct MegaTraceBlockData {
             &elliptic,
             &memory,
             &nnf,
-            &poseidon2_external,
-            &poseidon2_internal,
+            &poseidon2_external,      // q_poseidon2_external
+            &poseidon2_external,      // q_poseidon2_external_initial
+            &poseidon2_quad_internal, // q_poseidon2_quad_internal
+            &poseidon2_quad_internal, // q_poseidon2_quad_internal_terminal
+            &poseidon2_quad_internal, // q_poseidon2_transition_entry
         });
     }
 
@@ -406,7 +526,7 @@ class MegaExecutionTraceBlocks : public MegaTraceBlockData {
         info("memory        :\t", this->memory.size());
         info("nnf           :\t", this->nnf.size());
         info("poseidon ext  :\t", this->poseidon2_external.size());
-        info("poseidon int  :\t", this->poseidon2_internal.size());
+        info("poseidon quad :\t", this->poseidon2_quad_internal.size());
         info("");
         info("Total size: ", get_total_size());
     }
diff --git a/barretenberg/cpp/src/barretenberg/honk/relation_checker.hpp b/barretenberg/cpp/src/barretenberg/honk/relation_checker.hpp
index 5bbc044a8b83..3d3fc12786b3 100644
--- a/barretenberg/cpp/src/barretenberg/honk/relation_checker.hpp
+++ b/barretenberg/cpp/src/barretenberg/honk/relation_checker.hpp
@@ -167,18 +167,74 @@ template <> class RelationChecker<MegaFlavor> : public RelationChecker<void> {
     {
         using FF = MegaFlavor::FF;
 
-        // Start with all relations that are shared with Ultra
-        AllSubrelationFailures all_subrelation_failures = RelationChecker<UltraFlavor>::check_all(polynomials, params);
+        AllSubrelationFailures all_subrelation_failures;
+
+        // Linearly independent relations shared with Ultra --- EXCEPT Poseidon2InternalRelation,
+        // which is not present in MegaFlavor (Mega covers all internal rounds via the compressed
+        // quad-internal block).
+        auto arith = Base::check<ArithmeticRelation<FF>>(polynomials, params, "UltraArithmetic");
+        if (!arith.empty()) {
+            all_subrelation_failures["UltraArithmetic"] = arith;
+        }
+        auto perm = Base::check<UltraPermutationRelation<FF>>(polynomials, params, "UltraPermutation");
+        if (!perm.empty()) {
+            all_subrelation_failures["UltraPermutation"] = perm;
+        }
+        auto delta_range = Base::check<DeltaRangeConstraintRelation<FF>>(polynomials, params, "DeltaRangeConstraint");
+        if (!delta_range.empty()) {
+            all_subrelation_failures["UltraDeltaRange"] = delta_range;
+        }
+        auto elliptic = Base::check<EllipticRelation<FF>>(polynomials, params, "Elliptic");
+        if (!elliptic.empty()) {
+            all_subrelation_failures["UltraElliptic"] = elliptic;
+        }
+        auto memory = Base::check<MemoryRelation<FF>>(polynomials, params, "Memory");
+        if (!memory.empty()) {
+            all_subrelation_failures["UltraMemory"] = memory;
+        }
+        auto nnf = Base::check<NonNativeFieldRelation<FF>>(polynomials, params, "NonNativeField");
+        if (!nnf.empty()) {
+            all_subrelation_failures["NonNativeField"] = nnf;
+        }
+        auto p2_ext = Base::check<Poseidon2ExternalRelation<FF>>(polynomials, params, "Poseidon2External");
+        if (!p2_ext.empty()) {
+            all_subrelation_failures["UltraPoseidon2External"] = p2_ext;
+        }
+        auto p2_initial_ext =
+            Base::check<Poseidon2InitialExternalRelation<FF>>(polynomials, params, "Poseidon2InitialExternal");
+        if (!p2_initial_ext.empty()) {
+            all_subrelation_failures["Poseidon2InitialExternal"] = p2_initial_ext;
+        }
+
+        // Compressed quad-internal relations (Mega-only, replacing Poseidon2InternalRelation).
+        auto p2_quad = Base::check<Poseidon2QuadInternalRelation<FF>>(polynomials, params, "Poseidon2QuadInternal");
+        if (!p2_quad.empty()) {
+            all_subrelation_failures["Poseidon2QuadInternal"] = p2_quad;
+        }
+        auto p2_quad_term = Base::check<Poseidon2QuadInternalTerminalRelation<FF>>(
+            polynomials, params, "Poseidon2QuadInternalTerminal");
+        if (!p2_quad_term.empty()) {
+            all_subrelation_failures["Poseidon2QuadInternalTerminal"] = p2_quad_term;
+        }
+        auto p2_entry =
+            Base::check<Poseidon2TransitionEntryRelation<FF>>(polynomials, params, "Poseidon2TransitionEntry");
+        if (!p2_entry.empty()) {
+            all_subrelation_failures["Poseidon2TransitionEntry"] = p2_entry;
+        }
+
+        // Linearly-dependent log-derivative lookup (shared with Ultra).
+        auto logderiv = Base::check<LogDerivLookupRelation<FF>, true>(polynomials, params, "LogDerivLookup");
+        if (!logderiv.empty()) {
+            all_subrelation_failures["UltraLogDerivative"] = logderiv;
+        }
 
-        // Mega-specific relations
-        // There is one relation that does not `have_linearly_dependent`.
+        // Mega-specific relations.
         auto mega_ecc_op_queue_subrelation_failures =
             Base::check<EccOpQueueRelation<FF>>(polynomials, params, "EccOpQueue");
         if (!mega_ecc_op_queue_subrelation_failures.empty()) {
             all_subrelation_failures["MegaEccOpQueue"] = mega_ecc_op_queue_subrelation_failures;
         }
 
-        // There is one one relation that satisfies `have_linearly_dependent`
         auto mega_databus_lookup_subrelation_failures =
             Base::check<DatabusLookupRelation<FF>, true>(polynomials, params, "DatabusLookup");
         if (!mega_databus_lookup_subrelation_failures.empty()) {
diff --git a/barretenberg/cpp/src/barretenberg/honk/types/public_inputs_type.hpp b/barretenberg/cpp/src/barretenberg/honk/types/public_inputs_type.hpp
index f1803b17f02e..4aa381d53fd0 100644
--- a/barretenberg/cpp/src/barretenberg/honk/types/public_inputs_type.hpp
+++ b/barretenberg/cpp/src/barretenberg/honk/types/public_inputs_type.hpp
@@ -6,6 +6,7 @@
 
 #pragma once
 
+#include "barretenberg/constants.hpp"
 #include <cstdint>
 
 namespace bb {
@@ -53,12 +54,15 @@ static constexpr std::size_t INVALID_PUBLIC_INPUTS_SIZE = 0;
 static constexpr std::size_t MEGA_EXECUTION_TRACE_NUM_WIRES = 4;
 
 // Number of bb::fr elements used to represent the public inputs of an INIT/INNER/RESET/TAIL kernel
-static constexpr std::size_t KERNEL_PUBLIC_INPUTS_SIZE =
-    /*pairing_inputs*/ PAIRING_POINTS_SIZE +
-    /*kernel_return_data*/ GOBLIN_GROUP_PUBLIC_INPUTS_SIZE +
-    /*app_return_data*/ GOBLIN_GROUP_PUBLIC_INPUTS_SIZE +
-    /*table_commitments*/ (MEGA_EXECUTION_TRACE_NUM_WIRES * GOBLIN_GROUP_PUBLIC_INPUTS_SIZE) +
-    /*output_hn_accum_hash*/ FR_PUBLIC_INPUTS_SIZE;
+// verifying num_apps application circuits in its accumulation group.
+constexpr std::size_t kernel_public_inputs_size(std::size_t num_apps)
+{
+    return /*pairing_inputs*/ PAIRING_POINTS_SIZE +
+           /*kernel_return_data*/ GOBLIN_GROUP_PUBLIC_INPUTS_SIZE +
+           /*app_return_data[num_apps]*/ (num_apps * GOBLIN_GROUP_PUBLIC_INPUTS_SIZE) +
+           /*ecc_op_hash*/ FR_PUBLIC_INPUTS_SIZE +
+           /*output_hn_accum_hash*/ FR_PUBLIC_INPUTS_SIZE;
+}
 
 // Number of bb::fr elements used to represent the default public inputs, i.e., the pairing points
 static constexpr std::size_t DEFAULT_PUBLIC_INPUTS_SIZE = PAIRING_POINTS_SIZE;
diff --git a/barretenberg/cpp/src/barretenberg/hypernova/hypernova_prover.cpp b/barretenberg/cpp/src/barretenberg/hypernova/hypernova_prover.cpp
index 8951b38af7e0..5248dc9dd6a1 100644
--- a/barretenberg/cpp/src/barretenberg/hypernova/hypernova_prover.cpp
+++ b/barretenberg/cpp/src/barretenberg/hypernova/hypernova_prover.cpp
@@ -91,18 +91,24 @@ Polynomial<HypernovaFoldingProver::FF> HypernovaFoldingProver::batch_polynomials
         max_end = std::max(max_end, polynomials_to_batch[idx].end_index());
     }
 
+    // Treat polynomials_to_batch[0] as the destination's starting state (its scalar is implicitly 1).
+    // The remaining N-1 sources are fused into a single parallel_for via add_scaled_batch.
+    std::vector<PolynomialSpan<const FF>> sources;
+    sources.reserve(N - 1);
+    for (size_t i = 1; i < N; ++i) {
+        sources.emplace_back(polynomials_to_batch[i]);
+    }
+    auto tail_scalars = std::span<const FF>(challenges).subspan(1);
+
+    auto sources_span = std::span<const PolynomialSpan<const FF>>(sources);
     if (min_start < polynomials_to_batch[0].start_index() || max_end > polynomials_to_batch[0].end_index()) {
         Polynomial<FF> result(max_end - min_start, full_batched_size, min_start);
         result += polynomials_to_batch[0];
-        for (size_t idx = 1; idx < N; idx++) {
-            result.add_scaled(polynomials_to_batch[idx], challenges[idx]);
-        }
+        add_scaled_batch(result, sources_span, tail_scalars);
         return result;
     }
 
-    for (size_t idx = 1; idx < N; idx++) {
-        polynomials_to_batch[0].add_scaled(polynomials_to_batch[idx], challenges[idx]);
-    }
+    add_scaled_batch(polynomials_to_batch[0], sources_span, tail_scalars);
 
     return polynomials_to_batch[0];
 };
diff --git a/barretenberg/cpp/src/barretenberg/hypernova/hypernova_verifier.test.cpp b/barretenberg/cpp/src/barretenberg/hypernova/hypernova_verifier.test.cpp
index 65057dff5c11..67a7292b0570 100644
--- a/barretenberg/cpp/src/barretenberg/hypernova/hypernova_verifier.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/hypernova/hypernova_verifier.test.cpp
@@ -189,7 +189,8 @@ class HypernovaFoldingVerifierTests : public ::testing::Test {
         for (const auto& wire : { "ECC_OP_WIRE_1", "ECC_OP_WIRE_2", "ECC_OP_WIRE_3", "ECC_OP_WIRE_4" }) {
             manifest.add_entry(round, wire, frs_per_G);
         }
-        for (const auto& bus : { "CALLDATA", "SECONDARY_CALLDATA", "RETURN_DATA" }) {
+        for (const auto& bus :
+             { "KERNEL_CALLDATA", "FIRST_APP_CALLDATA", "SECOND_APP_CALLDATA", "THIRD_APP_CALLDATA", "RETURN_DATA" }) {
             manifest.add_entry(round, bus, frs_per_G);
             manifest.add_entry(round, std::string(bus) + "_READ_COUNTS", frs_per_G);
         }
@@ -206,8 +207,10 @@ class HypernovaFoldingVerifierTests : public ::testing::Test {
         manifest.add_challenge(round, "alpha");
         manifest.add_challenge(round, "HypernovaFoldingProver:gate_challenge");
         manifest.add_entry(round, "LOOKUP_INVERSES", frs_per_G);
-        manifest.add_entry(round, "CALLDATA_INVERSES", frs_per_G);
-        manifest.add_entry(round, "SECONDARY_CALLDATA_INVERSES", frs_per_G);
+        manifest.add_entry(round, "KERNEL_CALLDATA_INVERSES", frs_per_G);
+        manifest.add_entry(round, "FIRST_APP_CALLDATA_INVERSES", frs_per_G);
+        manifest.add_entry(round, "SECOND_APP_CALLDATA_INVERSES", frs_per_G);
+        manifest.add_entry(round, "THIRD_APP_CALLDATA_INVERSES", frs_per_G);
         manifest.add_entry(round, "RETURN_DATA_INVERSES", frs_per_G);
         manifest.add_entry(round, "Z_PERM", frs_per_G);
         round++;
@@ -226,7 +229,7 @@ class HypernovaFoldingVerifierTests : public ::testing::Test {
         for (size_t i = 0; i < MegaFlavor::NUM_SHIFTED_ENTITIES - 1; ++i) {
             manifest.add_challenge(round, "shifted_challenge_" + std::to_string(i));
         }
-        manifest.add_entry(round, "Sumcheck:evaluations", 57);
+        manifest.add_entry(round, "Sumcheck:evaluations", MegaFlavor::NUM_ALL_ENTITIES);
         round++;
 
         // Round 25: Sumcheck:alpha + MLB accumulator data (Sumcheck:alpha is consecutive challenge)
diff --git a/barretenberg/cpp/src/barretenberg/numeric/random/engine.cpp b/barretenberg/cpp/src/barretenberg/numeric/random/engine.cpp
index e54ce8da56ca..e4d377ae683f 100644
--- a/barretenberg/cpp/src/barretenberg/numeric/random/engine.cpp
+++ b/barretenberg/cpp/src/barretenberg/numeric/random/engine.cpp
@@ -6,7 +6,9 @@
 
 #include "engine.hpp"
 #include "barretenberg/common/assert.hpp"
+#include "barretenberg/common/throw_or_abort.hpp"
 #include <array>
+#include <cerrno>
 #include <cstring>
 #include <functional>
 #include <memory>
@@ -82,6 +84,9 @@ template <size_t size_in_unsigned_ints> std::array<unsigned int, size_in_unsigne
         }
         size_t bytes_left = RANDOM_BUFFER_SIZE;
         uint8_t* current_offset = random_buffer_wrapper.buffer.get();
+        // Bound EINTR retries so a pathological signal storm cannot mask a genuine fault.
+        constexpr int MAX_EINTR_RETRIES = 16;
+        int eintr_retries = 0;
         // Sample until we fill the buffer
         while (bytes_left != 0) {
 #if defined(__wasm__) || defined(__APPLE__)
@@ -106,11 +111,20 @@ template <size_t size_in_unsigned_ints> std::array<unsigned int, size_in_unsigne
             // Sample from urandom on native
             auto read_bytes = getrandom(current_offset, bytes_left, 0);
 #endif
-            // If we read something, update the leftover
-            if (read_bytes != -1) {
+            if (read_bytes > 0) {
                 current_offset += read_bytes;
                 bytes_left -= static_cast<size_t>(read_bytes);
+                continue;
             }
+            // read_bytes <= 0: failure or EOF. On platforms that report EINTR via errno, retry a
+            // bounded number of times; any other failure (including read_bytes == 0, e.g. a
+            // sealed/stubbed urandom returning EOF) is fatal.
+#if !defined(_WIN32)
+            if (read_bytes == -1 && errno == EINTR && eintr_retries++ < MAX_EINTR_RETRIES) {
+                continue;
+            }
+#endif
+            throw_or_abort("CSPRNG read failed: cannot retrieve entropy from system source");
         }
         random_buffer_wrapper.offset = 0;
     }
diff --git a/barretenberg/cpp/src/barretenberg/numeric/uint128/uint128.test.cpp b/barretenberg/cpp/src/barretenberg/numeric/uint128/uint128.test.cpp
index ecf457ad9756..c3dc53198747 100644
--- a/barretenberg/cpp/src/barretenberg/numeric/uint128/uint128.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/numeric/uint128/uint128.test.cpp
@@ -78,6 +78,9 @@ TEST(uint128, DivAndMod)
         b.data[3] = (i > 0) ? 0 : b.data[3];
         b.data[2] = (i > 1) ? 0 : b.data[2];
         b.data[1] = (i > 2) ? 0 : b.data[1];
+        if (b == 0) {
+            b = 1;
+        }
         uint128_t q = a / b;
         uint128_t r = a % b;
 
@@ -89,18 +92,10 @@ TEST(uint128, DivAndMod)
     }
 
     uint128_t a = engine.get_random_uint128();
-    uint128_t b = 0;
-
+    uint128_t b = a;
     uint128_t q = a / b;
     uint128_t r = a % b;
 
-    EXPECT_EQ(q, uint128_t(0));
-    EXPECT_EQ(r, uint128_t(0));
-
-    b = a;
-    q = a / b;
-    r = a % b;
-
     EXPECT_EQ(q, uint128_t(1));
     EXPECT_EQ(r, uint128_t(0));
 }
diff --git a/barretenberg/cpp/src/barretenberg/numeric/uint128/uint128_impl.hpp b/barretenberg/cpp/src/barretenberg/numeric/uint128/uint128_impl.hpp
index 2d5214b63f8d..ea12c3748bcc 100644
--- a/barretenberg/cpp/src/barretenberg/numeric/uint128/uint128_impl.hpp
+++ b/barretenberg/cpp/src/barretenberg/numeric/uint128/uint128_impl.hpp
@@ -9,6 +9,7 @@
 #include "../bitop/get_msb.hpp"
 #include "./uint128.hpp"
 #include "barretenberg/common/assert.hpp"
+#include "barretenberg/common/throw_or_abort.hpp"
 namespace bb::numeric {
 
 constexpr std::pair<uint32_t, uint32_t> uint128_t::mul_wide(const uint32_t a, const uint32_t b)
@@ -83,7 +84,10 @@ constexpr uint32_t uint128_t::mac_discard_hi(const uint32_t a,
 
 constexpr std::pair<uint128_t, uint128_t> uint128_t::divmod(const uint128_t& b) const
 {
-    if (*this == 0 || b == 0) {
+    if (b == 0) {
+        throw_or_abort("uint128_t::divmod: divisor must be nonzero");
+    }
+    if (*this == 0) {
         return { 0, 0 };
     }
     if (b == 1) {
@@ -163,6 +167,9 @@ constexpr std::pair<uint128_t, uint128_t> uint128_t::mul_extended(const uint128_
  */
 constexpr uint128_t uint128_t::slice(const uint64_t start, const uint64_t end) const
 {
+    // Plain assert is used here because BB_ASSERT_DEBUG defines a std::ostringstream, which is
+    // a non-literal type and therefore disallowed in the body of a constexpr function before C++23.
+    assert(start <= end);
     const uint64_t range = end - start;
     const uint128_t mask = (range == 128) ? -uint128_t(1) : (uint128_t(1) << range) - 1;
     return ((*this) >> start) & mask;
diff --git a/barretenberg/cpp/src/barretenberg/numeric/uint256/uint256.hpp b/barretenberg/cpp/src/barretenberg/numeric/uint256/uint256.hpp
index f679dfd1c4b5..90e6468dea2f 100644
--- a/barretenberg/cpp/src/barretenberg/numeric/uint256/uint256.hpp
+++ b/barretenberg/cpp/src/barretenberg/numeric/uint256/uint256.hpp
@@ -63,7 +63,7 @@ class alignas(32) uint256_t {
     {}
     constexpr uint256_t(uint256_t&& other) noexcept = default;
 
-    explicit constexpr uint256_t(const std::string& input) noexcept
+    explicit constexpr uint256_t(const std::string& input)
     {
         /* Quick and dirty conversion from a single character to its hex equivelent */
         constexpr auto HexCharToInt = [](uint8_t Input) {
diff --git a/barretenberg/cpp/src/barretenberg/numeric/uint256/uint256.test.cpp b/barretenberg/cpp/src/barretenberg/numeric/uint256/uint256.test.cpp
index 710d3e0d83f6..b1c2903e71b7 100644
--- a/barretenberg/cpp/src/barretenberg/numeric/uint256/uint256.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/numeric/uint256/uint256.test.cpp
@@ -97,6 +97,9 @@ TEST(uint256, DivAndMod)
         b.data[3] = (i > 0) ? 0 : b.data[3];
         b.data[2] = (i > 1) ? 0 : b.data[2];
         b.data[1] = (i > 2) ? 0 : b.data[1];
+        if (b == 0) {
+            b = 1;
+        }
         uint256_t q = a / b;
         uint256_t r = a % b;
 
@@ -108,18 +111,10 @@ TEST(uint256, DivAndMod)
     }
 
     uint256_t a = engine.get_random_uint256();
-    uint256_t b = 0;
-
+    uint256_t b = a;
     uint256_t q = a / b;
     uint256_t r = a % b;
 
-    EXPECT_EQ(q, uint256_t(0));
-    EXPECT_EQ(r, uint256_t(0));
-
-    b = a;
-    q = a / b;
-    r = a % b;
-
     EXPECT_EQ(q, uint256_t(1));
     EXPECT_EQ(r, uint256_t(0));
 }
diff --git a/barretenberg/cpp/src/barretenberg/numeric/uint256/uint256_impl.hpp b/barretenberg/cpp/src/barretenberg/numeric/uint256/uint256_impl.hpp
index 21b706759fe4..6e0cecdac05e 100644
--- a/barretenberg/cpp/src/barretenberg/numeric/uint256/uint256_impl.hpp
+++ b/barretenberg/cpp/src/barretenberg/numeric/uint256/uint256_impl.hpp
@@ -134,7 +134,10 @@ constexpr std::array<uint64_t, WASM_NUM_LIMBS> uint256_t::wasm_convert(const uin
 #endif
 constexpr std::pair<uint256_t, uint256_t> uint256_t::divmod(const uint256_t& b) const
 {
-    if (*this == 0 || b == 0) {
+    if (b == 0) {
+        throw_or_abort("uint256_t::divmod: divisor must be nonzero");
+    }
+    if (*this == 0) {
         return { 0, 0 };
     }
     if (b == 1) {
@@ -189,7 +192,10 @@ constexpr std::pair<uint256_t, uint256_t> uint256_t::divmod(const uint256_t& b)
  */
 constexpr std::pair<uint256_t, uint64_t> uint256_t::divmod(uint64_t b) const
 {
-    if (*this == 0 || b == 0) {
+    if (b == 0) {
+        throw_or_abort("uint256_t::divmod: divisor must be nonzero");
+    }
+    if (*this == 0) {
         return { 0, 0 };
     }
     if (b == 1) {
@@ -329,7 +335,9 @@ constexpr std::pair<uint256_t, uint256_t> uint256_t::mul_extended(const uint256_
  */
 constexpr uint256_t uint256_t::slice(const uint64_t start, const uint64_t end) const
 {
-    assert(start < end);
+    // Plain assert is used here because BB_ASSERT_DEBUG defines a std::ostringstream, which is
+    // a non-literal type and therefore disallowed in the body of a constexpr function before C++23.
+    assert(start <= end);
     const uint64_t range = end - start;
     const uint256_t mask = (range == 256) ? -uint256_t(1) : (uint256_t(1) << range) - 1;
     return ((*this) >> start) & mask;
diff --git a/barretenberg/cpp/src/barretenberg/numeric/uintx/uintx.hpp b/barretenberg/cpp/src/barretenberg/numeric/uintx/uintx.hpp
index 9e95aee67ba1..5bf55babe908 100644
--- a/barretenberg/cpp/src/barretenberg/numeric/uintx/uintx.hpp
+++ b/barretenberg/cpp/src/barretenberg/numeric/uintx/uintx.hpp
@@ -80,6 +80,9 @@ template <class base_uint> class uintx {
      */
     constexpr uintx slice(const uint64_t start, const uint64_t end) const
     {
+        // Plain assert is used here because BB_ASSERT_DEBUG defines a std::ostringstream, which is
+        // a non-literal type and therefore disallowed in the body of a constexpr function before C++23.
+        assert(start <= end);
         const uint64_t range = end - start;
         const uintx mask = (uintx(1) << range) - 1;
         return ((*this) >> start) & mask;
diff --git a/barretenberg/cpp/src/barretenberg/numeric/uintx/uintx_impl.hpp b/barretenberg/cpp/src/barretenberg/numeric/uintx/uintx_impl.hpp
index b4faf8a927c2..7ec76dfccb7b 100644
--- a/barretenberg/cpp/src/barretenberg/numeric/uintx/uintx_impl.hpp
+++ b/barretenberg/cpp/src/barretenberg/numeric/uintx/uintx_impl.hpp
@@ -63,7 +63,8 @@ std::pair<uintx<base_uint>, uintx<base_uint>> uintx<base_uint>::divmod_base(cons
 /**
  * Computes invmod. Only for internal usage within the class.
  * This is an insecure version of the algorithm that doesn't take into account the 0 case and cases when modulus is
- *close to the top margin.
+ * close to the top margin. The result is only meaningful when *this and modulus are coprime; non-coprime inputs
+ * return an unspecified value (callers must guarantee coprimality or guard against the result being used).
  *
  * @param modulus The modulus of the ring
  *
@@ -104,9 +105,7 @@ template <class base_uint> uintx<base_uint> uintx<base_uint>::unsafe_invmod(cons
 template <class base_uint> uintx<base_uint> uintx<base_uint>::invmod(const uintx& modulus) const
 {
     BB_ASSERT((*this) != 0);
-    if (modulus == 0) {
-        return 0;
-    }
+    BB_ASSERT(modulus != 0);
     if (modulus.get_msb() >= (2 * base_uint::length() - 1)) {
         uintx<uintx<base_uint>> a_expanded(*this);
         uintx<uintx<base_uint>> modulus_expanded(modulus);
diff --git a/barretenberg/cpp/src/barretenberg/op_queue/ecc_op_queue.hpp b/barretenberg/cpp/src/barretenberg/op_queue/ecc_op_queue.hpp
index 7e05175a3518..d2c6fc003ba8 100644
--- a/barretenberg/cpp/src/barretenberg/op_queue/ecc_op_queue.hpp
+++ b/barretenberg/cpp/src/barretenberg/op_queue/ecc_op_queue.hpp
@@ -31,8 +31,7 @@ namespace bb {
  * - Updates the native accumulator (shadow computation for verification)
  * - Appends to both ECCVM and Ultra tables
  *
- * Tables grow via prepending subtables (one per circuit in an IVC). The deque-based storage avoids
- * expensive memory reallocation. See ecc_ops_table.hpp for details.
+ * Tables grow by appending subtables (one per circuit in an IVC). See ecc_ops_table.hpp for details.
  *
  * TODO(https://github.com/AztecProtocol/barretenberg/issues/1267): consider possible efficiency improvements
  */
@@ -50,13 +49,14 @@ class ECCOpQueue {
     EccvmOpsTable eccvm_ops_table;    // table of ops in the ECCVM format
     UltraEccOpsTable ultra_ops_table; // table of ops in the Ultra-arithmetization format
 
-    // Storage for the reconstructed eccvm ops table in contiguous memory. (Intended to be constructed once and for all
-    // prior to ECCVM construction to avoid repeated prepending of subtables in physical memory).
+    // Storage for the reconstructed eccvm ops table in contiguous memory. (Intended to be constructed once and for
+    // all prior to ECCVM construction to avoid repeated traversal of the per-subtable storage.)
     std::vector<ECCVMOperation> eccvm_ops_reconstructed;
 
-    // Storage for the reconstructed ultra ops table in contiguous memory. (Intended to be constructed once and for all
-    // prior to Translator circuit construction to avoid repeated prepending of subtables in physical memory).
-    std::vector<UltraOp> ultra_ops_reconstructed;
+    // Storage for the reconstructed ultra ops tables in contiguous memory. (Intended to be constructed once and for
+    // all prior to Translator circuit construction to avoid repeated traversal of the per-subtable storage.)
+    std::vector<UltraOp> ultra_ops_zk_reconstructed;    // Chonk table
+    std::vector<UltraOp> ultra_ops_no_zk_reconstructed; // AVM table
 
     // Tracks number of muls and size of eccvm in real time as the op queue is updated
     EccvmRowTracker eccvm_row_tracker;
@@ -78,6 +78,8 @@ class ECCOpQueue {
         ultra_ops_table.create_new_subtable();
     }
 
+    size_t num_subtables() const { return eccvm_ops_table.num_subtables(); }
+
     size_t get_current_subtable_size() const { return ultra_ops_table.get_current_subtable_size(); }
 
     /**
@@ -89,25 +91,47 @@ class ECCOpQueue {
     size_t get_append_offset() const
     {
         constexpr size_t reserved_op_slots = UltraEccOpsTable::APPEND_TRACE_OFFSET / UltraEccOpsTable::NUM_ROWS_PER_OP;
-        return OP_QUEUE_SIZE - get_current_subtable_size() - reserved_op_slots;
+        constexpr size_t zk_op_slots = UltraEccOpsTable::ZK_ULTRA_OPS / UltraEccOpsTable::NUM_ROWS_PER_OP;
+        return OP_QUEUE_SIZE - get_current_subtable_size() - reserved_op_slots - zk_op_slots;
+    }
+
+    void merge()
+    {
+        eccvm_ops_table.merge();
+        ultra_ops_table.merge();
     }
 
-    void merge(MergeSettings settings = MergeSettings::PREPEND, std::optional<size_t> ultra_fixed_offset = std::nullopt)
+    void merge_fixed_append(size_t ultra_fixed_offset)
     {
-        eccvm_ops_table.merge(settings);
-        ultra_ops_table.merge(settings, ultra_fixed_offset);
+        eccvm_ops_table.merge();
+        ultra_ops_table.merge_with_fixed_append_offset(ultra_fixed_offset);
+    }
+
+    std::array<Polynomial<Fr>, ULTRA_TABLE_WIDTH> construct_zk_columns()
+    {
+        auto [column_polynomials, hiding_op] = ultra_ops_table.construct_zk_columns();
+        this->hiding_op_for_eccvm = hiding_op;
+        this->has_hiding_op = true;
+
+        return column_polynomials;
+    }
+
+    std::vector<std::array<Polynomial<Fr>, ULTRA_TABLE_WIDTH>> construct_subtable_columns() const
+    {
+        return ultra_ops_table.construct_subtable_columns();
     }
 
     // Construct column polynomials for the full aggregate ultra ops table
-    std::array<Polynomial<Fr>, ULTRA_TABLE_WIDTH> construct_ultra_ops_table_columns() const
+    std::array<Polynomial<Fr>, ULTRA_TABLE_WIDTH> construct_ultra_ops_table_columns(
+        const bool include_zk_ops = true) const
     {
-        return ultra_ops_table.construct_table_columns();
+        return ultra_ops_table.construct_table_columns(include_zk_ops);
     }
 
-    // Construct column polynomials for the aggregate table excluding the most recent subtable
-    std::array<Polynomial<Fr>, ULTRA_TABLE_WIDTH> construct_previous_ultra_ops_table_columns() const
+    // Construct column polynomials for the aggregate table up to and including the tail subtable.
+    std::array<Polynomial<Fr>, ULTRA_TABLE_WIDTH> construct_table_columns_up_to_tail() const
     {
-        return ultra_ops_table.construct_previous_table_columns();
+        return ultra_ops_table.construct_table_columns_up_to_tail();
     }
 
     // Construct column polynomials for the most recently merged subtable
@@ -119,19 +143,26 @@ class ECCOpQueue {
     // Reconstruct the full table of eccvm ops in contiguous memory from the independent subtables
     void construct_full_eccvm_ops_table() { eccvm_ops_reconstructed = eccvm_ops_table.get_reconstructed(); }
 
-    // Reconstruct the full table of ultra ops in contiguous memory from the independent subtables
-    void construct_full_ultra_ops_table() { ultra_ops_reconstructed = ultra_ops_table.get_reconstructed(); }
+    // Reconstruct the ZK-prefixed full table of ultra ops in contiguous memory from the independent subtables.
+    void construct_zk_reconstructed_ultra_ops_table()
+    {
+        ultra_ops_zk_reconstructed = ultra_ops_table.get_zk_reconstructed_ultra_ops();
+    }
 
+    // Reconstruct the non-ZK full table of ultra ops in contiguous memory from the independent subtables.
+    void construct_no_zk_reconstructed_ultra_ops_table()
+    {
+        ultra_ops_no_zk_reconstructed = ultra_ops_table.get_no_zk_reconstructed_ultra_ops();
+    }
+
+    // Excludes the optional ZK prefix; see UltraEccOpsTable::num_ultra_rows
     size_t get_ultra_ops_table_num_rows() const { return ultra_ops_table.num_ultra_rows(); }
     size_t get_ultra_ops_count() const { return ultra_ops_table.num_ops(); } // actual operation count without padding
-    size_t get_current_ultra_ops_subtable_num_rows() const { return ultra_ops_table.current_ultra_subtable_size(); }
-    size_t get_previous_ultra_ops_table_num_rows() const { return ultra_ops_table.previous_ultra_table_size(); }
-
-    // TODO(https://github.com/AztecProtocol/barretenberg/issues/1339): Consider making the ultra and eccvm ops
-    // getters more memory efficient
+    // Excludes the optional ZK prefix, same as get_ultra_ops_table_num_rows.
+    size_t get_ultra_ops_table_num_rows_up_to_tail() const { return ultra_ops_table.ultra_table_size_up_to_tail(); }
 
     // Get the full table of ECCVM ops in contiguous memory; construct it if it has not been constructed already.
-    // The hiding op (set via append_hiding_op) is always prepended at index 0.
+    // The hiding op is always prepended at index 0.
     std::vector<ECCVMOperation>& get_eccvm_ops()
     {
         if (eccvm_ops_reconstructed.empty()) {
@@ -145,12 +176,20 @@ class ECCOpQueue {
         return eccvm_ops_reconstructed;
     }
 
-    std::vector<UltraOp>& get_ultra_ops()
+    std::vector<UltraOp>& get_no_zk_reconstructed_ultra_ops()
+    {
+        if (ultra_ops_no_zk_reconstructed.empty()) {
+            construct_no_zk_reconstructed_ultra_ops_table();
+        }
+        return ultra_ops_no_zk_reconstructed;
+    }
+
+    std::vector<UltraOp>& get_zk_reconstructed_ultra_ops()
     {
-        if (ultra_ops_reconstructed.empty()) {
-            construct_full_ultra_ops_table();
+        if (ultra_ops_zk_reconstructed.empty()) {
+            construct_zk_reconstructed_ultra_ops_table();
         }
-        return ultra_ops_reconstructed;
+        return ultra_ops_zk_reconstructed;
     }
 
     /**
@@ -249,9 +288,8 @@ class ECCOpQueue {
     /**
      * @brief Writes a no-op to the ultra ops table but adds no eccvm operations.
      *
-     * @details Used by the tail kernel to ensure the op queue wires in Translator are shiftable: the no-op
-     * contributes two zero rows at the start of the tail subtable, which ends up at the top of the final aggregate
-     * table (because the tail is prepended last), giving the Translator's op queue wires two leading zero rows.
+     * @details Adds two zero rows (one no-op = NUM_ROWS_PER_OP rows) to the ultra ops table. Translator needs two
+     * leading zero rows for polynomial shiftability.
      */
     UltraOp no_op_ultra_only()
     {
@@ -319,7 +357,8 @@ class ECCOpQueue {
      * on-curve check is similarly gated. q_reset = 1 is required for Translator compatibility (only opcodes {0,3,4,8}
      * are allowed).
      *
-     * This method should be called ONCE per IVC in the tail kernel, after the random non-ops.
+     * This method writes the same hiding op to both the ECCVM and Ultra tables in one step, ensuring the two
+     * representations agree (required for the translation check).
      *
      * @param Px Random field element (not necessarily a valid x-coordinate on BN254)
      * @param Py Random field element (not necessarily a valid y-coordinate on BN254)
@@ -327,34 +366,10 @@ class ECCOpQueue {
      */
     UltraOp append_hiding_op(const Fq& Px, const Fq& Py)
     {
-        // Create an ECCVM operation with q_eq = 1, q_reset = 1 (opcode = 3) and the random Px, Py values.
-        // We construct the base_point directly with the raw coordinates - it may not be on the curve.
-        // Note: reset = true is required for Translator compatibility (only opcodes {0,3,4,8} are allowed)
-        EccOpCode op_code{ .eq = true, .reset = true }; // q_eq = 1, q_reset = 1
-        Point base_point;
-        base_point.x = Px;
-        base_point.y = Py;
-        // Note: We don't call is_point_at_infinity() or any curve operations on this point
-
-        // Store the hiding op for ECCVM - it will be prepended to the front during reconstruction (index 0 -> row 1)
-        hiding_op_for_eccvm = ECCVMOperation{ .op_code = op_code, .base_point = base_point };
-        has_hiding_op = true;
+        auto [ultra_op, eccvm_op] = UltraEccOpsTable::make_hiding_op_pair(Px, Py);
 
-        // Push to Ultra ops through normal flow (appends to current subtable)
-        // Decompose Px, Py (Fq) into hi-lo chunks (Fr)
-        const size_t CHUNK_SIZE = 2 * stdlib::NUM_LIMB_BITS_IN_FIELD_SIMULATION;
-        uint256_t x_256(Px);
-        uint256_t y_256(Py);
-        UltraOp ultra_op{
-            .op_code = op_code,
-            .x_lo = Fr(x_256.slice(0, CHUNK_SIZE)),
-            .x_hi = Fr(x_256.slice(CHUNK_SIZE, CHUNK_SIZE * 2)),
-            .y_lo = Fr(y_256.slice(0, CHUNK_SIZE)),
-            .y_hi = Fr(y_256.slice(CHUNK_SIZE, CHUNK_SIZE * 2)),
-            .z_1 = Fr(0),
-            .z_2 = Fr(0),
-            .return_is_infinity = false,
-        };
+        hiding_op_for_eccvm = eccvm_op;
+        has_hiding_op = true;
         ultra_ops_table.push(ultra_op);
 
         // Do NOT update the accumulator - the hiding op doesn't perform any actual EC computation
@@ -363,17 +378,15 @@ class ECCOpQueue {
 
   private:
     // === Hiding Op State ===
-    // The hiding op is handled asymmetrically but ends up at the same functional relative position in both:
-    // - ECCVM: Stored here and prepended at index 0 during get_eccvm_ops() reconstruction
-    // - Ultra: Pushed to ultra_ops_table at index 4 (after 1 no-op + 3 random padding ops)
-    //
-    // Both end up with hiding op as the first "real" op because:
-    // - ECCVM: prepending puts it at index 0; padding ops don't exist in ECCVM table
-    // - Translator: skips first 4 Ultra ops (padding), so accumulation starts at the hiding op
-    //
-    // This alignment is required for the translation check (ECCVM and Translator must compute
-    // the same accumulated_result). ECCVM places it at row 1 (lagrange_second) where on-curve
-    // and eq constraints are gated off, allowing non-curve (x, y) values.
+    // The hiding op exists in both the ECCVM and Ultra tables (same Px, Py values, opcode q_eq=q_reset=1) so the
+    // translation check holds. It is set by exactly one of two entry points, depending on the proving flow:
+    //   - Chonk: UltraEccOpsTable::construct_zk_columns() builds the full ZK prefix (1 no-op + 3 random + 1 hiding)
+    //     at the front of the reconstructed Ultra table; the hiding op lands at index 4.
+    //   - Goblin AVM: append_hiding_op() pushes the Ultra side into the current subtable directly, with no surrounding
+    //     prefix.
+    // In both cases the ECCVM side is stored here and prepended to the reconstructed ECCVM table at index 0 by
+    // get_eccvm_ops(), placing it at row 1 (lagrange_second) where the on-curve and eq constraints are gated off
+    // so that non-curve (x, y) values are accepted.
     ECCVMOperation hiding_op_for_eccvm;
     bool has_hiding_op = false;
 
diff --git a/barretenberg/cpp/src/barretenberg/op_queue/ecc_op_queue.test.cpp b/barretenberg/cpp/src/barretenberg/op_queue/ecc_op_queue.test.cpp
index 0629ecc6b6b4..69a82589214b 100644
--- a/barretenberg/cpp/src/barretenberg/op_queue/ecc_op_queue.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/op_queue/ecc_op_queue.test.cpp
@@ -30,42 +30,33 @@ class ECCOpQueueTest {
      * @brief Check that the table column polynomials reconstructed by the op queue have the correct relationship
      *
      */
-    static void check_table_column_polynomials(const std::shared_ptr<bb::ECCOpQueue>& op_queue,
-                                               MergeSettings settings,
-                                               std::optional<size_t> ultra_fixed_offset = std::nullopt)
+    static void check_final_table_column_polynomials(const std::shared_ptr<bb::ECCOpQueue>& op_queue,
+                                                     std::optional<size_t> ultra_fixed_offset = std::nullopt)
     {
-        // Construct column polynomials corresponding to the full table (T), the previous table (T_prev), and the
-        // current subtable (t_current)
+        // Construct column polynomials corresponding to the full table (T), the table up to and including the tail
+        // (T_tail, the second to last table), and the current subtable (t_current). T and T_tail both include the ZK
+        // preamble.
         auto table_polynomials = op_queue->construct_ultra_ops_table_columns();
-        auto prev_table_polynomials = op_queue->construct_previous_ultra_ops_table_columns();
+        auto tail_table_polynomials = op_queue->construct_table_columns_up_to_tail();
         auto subtable_polynomials = op_queue->construct_current_ultra_ops_subtable_columns();
 
-        // Check T(x) = t_current(x) + x^k * T_prev(x) at a single random challenge point
+        // Check T(x) = T_tail(x) + x^k * t_current(x) at a single random challenge point
         Fr eval_challenge = Fr::random_element();
-        for (auto [table_poly, prev_table_poly, subtable_poly] :
-             zip_view(table_polynomials, prev_table_polynomials, subtable_polynomials)) {
+        for (auto [table_poly, tail_table_poly, subtable_poly] :
+             zip_view(table_polynomials, tail_table_polynomials, subtable_polynomials)) {
             const Fr table_eval = table_poly.evaluate(eval_challenge); // T(x)
-            // Check that the previous table polynomial is constructed correctly according to the merge settings by
-            // checking the identity at a single point
-            if (settings == MergeSettings::PREPEND) {
-                // T(x) = t_current(x) + x^k * T_prev(x), where k is the size of the current subtable
-                const size_t current_subtable_size = op_queue->get_current_ultra_ops_subtable_num_rows(); // k
-                const Fr subtable_eval = subtable_poly.evaluate(eval_challenge); // t_current(x)
-                const Fr shifted_previous_table_eval = prev_table_poly.evaluate(eval_challenge) *
-                                                       eval_challenge.pow(current_subtable_size); // x^k * T_prev(x)
-                EXPECT_EQ(table_eval, subtable_eval + shifted_previous_table_eval);
-            } else {
-                // APPEND merge performs concatenation directly to end of previous table or at a specified fixed offset
-                const size_t prev_table_size = op_queue->get_previous_ultra_ops_table_num_rows(); // k
-                const size_t shift_magnitude = ultra_fixed_offset.has_value()
-                                                   ? ultra_fixed_offset.value() * bb::UltraEccOpsTable::NUM_ROWS_PER_OP
-                                                   : prev_table_size; // k
-                // T(x) = T_prev(x) + x^k * t_current(x), where k is the shift magnitude
-                const Fr prev_table_eval = prev_table_poly.evaluate(eval_challenge); // T_prev(x)
-                const Fr shifted_subtable_eval =
-                    subtable_poly.evaluate(eval_challenge) * eval_challenge.pow(shift_magnitude); // x^k * t_current(x)
-                EXPECT_EQ(table_eval, shifted_subtable_eval + prev_table_eval);
-            }
+            // APPEND merge performs concatenation directly to end of previous table or at a specified fixed offset.
+            const size_t tail_table_size = op_queue->get_ultra_ops_table_num_rows_up_to_tail(); // k
+            const size_t shift_magnitude =
+                ultra_fixed_offset.has_value()
+                    ? bb::UltraEccOpsTable::ZK_ULTRA_OPS +
+                          (ultra_fixed_offset.value() * bb::UltraEccOpsTable::NUM_ROWS_PER_OP)
+                    : tail_table_size; // k
+            // T(x) = T_tail(x) + x^k * t_current(x), where k is the shift magnitude.
+            const Fr tail_table_eval = tail_table_poly.evaluate(eval_challenge); // T_tail(x)
+            const Fr shifted_subtable_eval =
+                subtable_poly.evaluate(eval_challenge) * eval_challenge.pow(shift_magnitude); // x^k * t_current(x)
+            EXPECT_EQ(table_eval, shifted_subtable_eval + tail_table_eval);
         }
     }
 
@@ -74,13 +65,18 @@ class ECCOpQueueTest {
      *
      * @param op_queue
      */
-    static void check_opcode_consistency_with_eccvm(const std::shared_ptr<bb::ECCOpQueue>& op_queue)
+    static void check_opcode_consistency_with_eccvm(const std::shared_ptr<bb::ECCOpQueue>& op_queue,
+                                                    const bool include_zk_ops = false)
     {
-        auto ultra_table = op_queue->get_ultra_ops();
+        auto ultra_table =
+            include_zk_ops ? op_queue->get_zk_reconstructed_ultra_ops() : op_queue->get_no_zk_reconstructed_ultra_ops();
         auto eccvm_table = op_queue->get_eccvm_ops();
 
         size_t j = 0;
         for (const auto& ultra_op : ultra_table) {
+            if (ultra_op.op_code.is_random_op) {
+                continue;
+            }
             if (ultra_op.op_code.value() == 0) {
                 continue;
             }
@@ -130,9 +126,8 @@ TEST(ECCOpQueueTest, InternalAccumulatorCorrectness)
     EXPECT_TRUE(op_queue.get_accumulator().is_point_at_infinity());
 }
 
-// Check that the ECC op queue correctly constructs the table column polynomials for the full table, the previous table,
-// and the current subtable via successive prepending of subtables
-TEST(ECCOpQueueTest, ColumnPolynomialConstructionPrependOnly)
+// Check that the ECC op queue correctly reconstructs subtables via successive appending of subtables.
+TEST(ECCOpQueueTest, ColumnPolynomialConstruction)
 {
     using Fq = curve::Grumpkin::ScalarField;
 
@@ -143,81 +138,43 @@ TEST(ECCOpQueueTest, ColumnPolynomialConstructionPrependOnly)
     const size_t NUM_SUBTABLES = 5;
     for (size_t i = 0; i < NUM_SUBTABLES; ++i) {
         op_queue->initialize_new_subtable();
-        // For prepend: the last subtable becomes the first in the final table.
-        // Add hiding op at the START of the last subtable so it lands at index 0.
-        if (i == NUM_SUBTABLES - 1) {
+        // Add hiding op to the first subtable so the Ultra and ECCVM opcode streams have matching order.
+        if (i == 0) {
             op_queue->append_hiding_op(Fq::random_element(), Fq::random_element());
         }
         ECCOpQueueTest::populate_an_arbitrary_subtable_of_ops(op_queue, /*initialize=*/false);
-        MergeSettings settings = MergeSettings::PREPEND;
-        op_queue->merge(settings);
-        ECCOpQueueTest::check_table_column_polynomials(op_queue, settings);
+        op_queue->merge();
     }
 
+    op_queue->construct_zk_columns();
     ECCOpQueueTest::check_opcode_consistency_with_eccvm(op_queue);
 }
 
-TEST(ECCOpQueueTest, ColumnPolynomialConstructionPrependThenAppend)
+TEST(ECCOpQueueTest, ColumnPolynomialConstructionUpToTailWithZkThenFixedAppend)
 {
-    using Fq = curve::Grumpkin::ScalarField;
-
     // Instantiate an EccOpQueue and populate it with several subtables of ECC ops
     auto op_queue = std::make_shared<bb::ECCOpQueue>();
 
-    // Check that the table polynomials have the correct form after each subtable concatenation
-    const size_t NUM_SUBTABLES = 2;
-    for (size_t i = 0; i < NUM_SUBTABLES; ++i) {
+    // Construct app/kernel subtables followed by the tail subtable.
+    const size_t NUM_SUBTABLES_THROUGH_TAIL = 3;
+    for (size_t i = 0; i < NUM_SUBTABLES_THROUGH_TAIL; ++i) {
         op_queue->initialize_new_subtable();
-        // For prepend: the last prepended subtable (i=1) becomes first in the final table.
-        // Add hiding op at the START of that subtable so it lands at index 0.
-        if (i == NUM_SUBTABLES - 1) {
-            op_queue->append_hiding_op(Fq::random_element(), Fq::random_element());
-        }
         ECCOpQueueTest::populate_an_arbitrary_subtable_of_ops(op_queue, /*initialize=*/false);
-        MergeSettings settings = MergeSettings::PREPEND;
-        op_queue->merge(settings);
-        ECCOpQueueTest::check_table_column_polynomials(op_queue, settings);
+        op_queue->merge();
     }
 
-    // Do a single append operation (goes at end, after prepended subtables)
-    ECCOpQueueTest::populate_an_arbitrary_subtable_of_ops(op_queue);
-    MergeSettings settings = MergeSettings::APPEND;
-    op_queue->merge(settings);
-    ECCOpQueueTest::check_table_column_polynomials(op_queue, settings);
-
-    ECCOpQueueTest::check_opcode_consistency_with_eccvm(op_queue);
-}
-
-TEST(ECCOpQueueTest, ColumnPolynomialConstructionPrependThenAppendAtFixedOffset)
-{
-    using Fq = curve::Grumpkin::ScalarField;
-
-    // Instantiate an EccOpQueue and populate it with several subtables of ECC ops
-    auto op_queue = std::make_shared<bb::ECCOpQueue>();
-
-    // Check that the table polynomials have the correct form after each subtable concatenation
-    const size_t NUM_SUBTABLES = 2;
-    for (size_t i = 0; i < NUM_SUBTABLES; ++i) {
-        op_queue->initialize_new_subtable();
-        // For prepend: the last prepended subtable (i=1) becomes first in the final table.
-        // Add hiding op at the START of that subtable so it lands at index 0.
-        if (i == NUM_SUBTABLES - 1) {
-            op_queue->append_hiding_op(Fq::random_element(), Fq::random_element());
-        }
-        ECCOpQueueTest::populate_an_arbitrary_subtable_of_ops(op_queue, /*initialize=*/false);
-        MergeSettings settings = MergeSettings::PREPEND;
-        op_queue->merge(settings);
-        ECCOpQueueTest::check_table_column_polynomials(op_queue, settings);
-    }
+    op_queue->construct_zk_columns();
 
-    // Do a single append operation at a fixed offset (sufficiently large as to not overlap with the existing table)
+    // Do a single append operation at a fixed offset for the hiding kernel subtable.
     const size_t ultra_fixed_offset = op_queue->get_ultra_ops_table_num_rows() + 20;
     ECCOpQueueTest::populate_an_arbitrary_subtable_of_ops(op_queue);
-    MergeSettings settings = MergeSettings::APPEND;
-    op_queue->merge(settings, ultra_fixed_offset);
-    ECCOpQueueTest::check_table_column_polynomials(op_queue, settings, ultra_fixed_offset);
+    op_queue->merge_fixed_append(ultra_fixed_offset);
+    auto table_up_to_tail = op_queue->construct_table_columns_up_to_tail();
+    EXPECT_EQ(table_up_to_tail[0].size(),
+              bb::UltraEccOpsTable::ZK_ULTRA_OPS + op_queue->get_ultra_ops_table_num_rows_up_to_tail());
+    ECCOpQueueTest::check_final_table_column_polynomials(op_queue, ultra_fixed_offset);
 
-    ECCOpQueueTest::check_opcode_consistency_with_eccvm(op_queue);
+    ECCOpQueueTest::check_opcode_consistency_with_eccvm(op_queue, /*include_zk_ops=*/true);
 }
 
 // Verify correct handling of point at infinity in add and mul operations
@@ -305,9 +262,10 @@ TEST(ECCOpQueueTest, HidingOpPositionConsistency)
     op_queue->eq_and_reset();
     op_queue->merge();
 
-    // Get the reconstructed tables
+    // Get the reconstructed ECCVM table and raw Ultra table. This test is checking the explicitly appended hiding op
+    // in the raw subtable, not the Chonk ZK-prefixed reconstruction.
     const auto& eccvm_ops = op_queue->get_eccvm_ops();
-    const auto& ultra_ops = op_queue->get_ultra_ops();
+    const auto& ultra_ops = op_queue->get_no_zk_reconstructed_ultra_ops();
 
     // === ECCVM Table Checks ===
     // Hiding op should be at index 0 (prepended during get_eccvm_ops())
@@ -318,7 +276,7 @@ TEST(ECCOpQueueTest, HidingOpPositionConsistency)
     EXPECT_EQ(eccvm_hiding_op.base_point.y, hiding_y);
 
     // === Ultra Table Checks ===
-    // Without tail kernel padding, the hiding op should be at index 2:
+    // By construction, the hiding op should be at index 2:
     //   index 0: add_accumulate(P1)
     //   index 1: mul_accumulate(P2, z)
     //   index 2: append_hiding_op (eq+reset opcode)
diff --git a/barretenberg/cpp/src/barretenberg/op_queue/ecc_ops_table.hpp b/barretenberg/cpp/src/barretenberg/op_queue/ecc_ops_table.hpp
index 176a054cd5c0..2db17c6c4d93 100644
--- a/barretenberg/cpp/src/barretenberg/op_queue/ecc_ops_table.hpp
+++ b/barretenberg/cpp/src/barretenberg/op_queue/ecc_ops_table.hpp
@@ -12,14 +12,13 @@
 #include "barretenberg/eccvm/eccvm_builder_types.hpp"
 #include "barretenberg/polynomials/polynomial.hpp"
 #include "barretenberg/stdlib/primitives/bigfield/constants.hpp"
-#include <deque>
+#include <vector>
 namespace bb {
 
-/**
- * @brief The MergeSettings define whether an current subtable will be added at the beginning (PREPEND) or at the end
- * (APPEND) of the EccOpQueue.
- */
-enum MergeSettings { PREPEND, APPEND };
+// Constants determining the structure of the zk columns. These must match the structure expected by Translator.
+static constexpr size_t ECC_NUM_RANDOM_OPS_START = 3;
+static constexpr size_t ECC_NUM_NO_OPS_START = 1;
+static constexpr size_t ECC_NUM_HIDING_OPS_START = 1;
 
 /**
  * @brief Defines the opcodes for ECC operations used in both the Ultra and ECCVM formats. There are three opcodes that
@@ -109,16 +108,14 @@ struct ECCVMOperation {
 
 /**
  * @brief A table of ECC operations
- * @details The table is constructed via concatenation of subtables of ECC operations. The table concatentation protocol
- * (Merge protocol) requires that the concatenation be achieved via PRE-pending successive tables. To avoid the need for
- * expensive memory reallocations associated with physically prepending, the subtables are stored as a std::deque that
- * can be traversed to reconstruct the columns of the aggregate tables as needed (e.g. in corresponding polynomials).
+ * @details The table is constructed via append-only concatenation of subtables of ECC operations. Subtables are stored
+ * in chronological order.
  *
  * @tparam OpFormat Format of the ECC operations stored in the table
  */
 template <typename OpFormat> class EccOpsTable {
     using Subtable = std::vector<OpFormat>;
-    std::deque<Subtable> table;
+    std::vector<Subtable> table;
     Subtable current_subtable; // used to store the current subtable before it is added to the table
   public:
     size_t size() const
@@ -183,19 +180,9 @@ template <typename OpFormat> class EccOpsTable {
         return reconstructed_table;
     }
 
-    void merge(MergeSettings settings = MergeSettings::PREPEND)
+    void merge()
     {
-        if (current_subtable.empty()) {
-            return; // nothing to merge
-        }
-
-        // Based on merge settings add the current subtable to either the beginning or end of the full table
-        if (settings == MergeSettings::PREPEND) {
-            table.push_front(std::move(current_subtable));
-        } else {
-            table.push_back(std::move(current_subtable));
-        }
-
+        table.push_back(std::move(current_subtable));
         current_subtable.clear(); // clear the current subtable after merging
         BB_ASSERT(current_subtable.empty(), "current subtable should be empty after merging. Check the merge logic.");
     }
@@ -224,6 +211,8 @@ class UltraEccOpsTable {
   public:
     static constexpr size_t TABLE_WIDTH = 4;     // dictated by the number of wires in the Ultra arithmetization
     static constexpr size_t NUM_ROWS_PER_OP = 2; // A single ECC op is split across two width-4 rows
+    static constexpr size_t ZK_ULTRA_OPS =
+        (ECC_NUM_RANDOM_OPS_START + ECC_NUM_NO_OPS_START + ECC_NUM_HIDING_OPS_START) * NUM_ROWS_PER_OP;
 
     // Leading-zero preamble on the APPEND subtable. Matches the appender flavor's TRACE_OFFSET, i.e. the
     // number of leading zeros carried by its ecc_op_wire polynomial commitments. Sourced from
@@ -232,158 +221,262 @@ class UltraEccOpsTable {
     static constexpr size_t APPEND_TRACE_OFFSET = NUM_DISABLED_ROWS_IN_SUMCHECK;
     static_assert(APPEND_TRACE_OFFSET % NUM_ROWS_PER_OP == 0);
 
+    /**
+     * @brief Build a hiding op as paired Ultra and ECCVM operations from raw Fq coordinates.
+     *
+     * @details Uses opcode q_eq=q_reset=1 (value 3) for Translator compatibility. The base point is constructed
+     * directly from (Px, Py); these are not required to lie on the curve since on-curve and equality constraints
+     * are gated off at the row where the hiding op lands (lagrange_second in ECCVM). z_1 and z_2 are zero in the
+     * Ultra representation since the hiding op performs no scalar multiplication.
+     */
+    static std::pair<UltraOp, ECCVMOperation> make_hiding_op_pair(const curve::BN254::BaseField& Px,
+                                                                  const curve::BN254::BaseField& Py)
+    {
+        using Fr = curve::BN254::ScalarField;
+        using Point = curve::BN254::AffineElement;
+
+        EccOpCode op_code{ .eq = true, .reset = true };
+        Point base_point;
+        base_point.x = Px;
+        base_point.y = Py;
+
+        constexpr size_t CHUNK_SIZE = 2 * stdlib::NUM_LIMB_BITS_IN_FIELD_SIMULATION;
+        uint256_t x_256(Px);
+        uint256_t y_256(Py);
+        UltraOp ultra_op{
+            .op_code = op_code,
+            .x_lo = Fr(x_256.slice(0, CHUNK_SIZE)),
+            .x_hi = Fr(x_256.slice(CHUNK_SIZE, CHUNK_SIZE * 2)),
+            .y_lo = Fr(y_256.slice(0, CHUNK_SIZE)),
+            .y_hi = Fr(y_256.slice(CHUNK_SIZE, CHUNK_SIZE * 2)),
+            .z_1 = Fr(0),
+            .z_2 = Fr(0),
+            .return_is_infinity = false,
+        };
+        ECCVMOperation eccvm_op{ .op_code = op_code, .base_point = base_point };
+        return { ultra_op, eccvm_op };
+    }
+
   private:
     using Curve = curve::BN254;
     using Fr = Curve::ScalarField;
     using UltraOpsTable = EccOpsTable<UltraOp>;
     using ColumnPolynomials = std::array<Polynomial<Fr>, TABLE_WIDTH>;
 
-    std::optional<size_t> current_subtable_idx; // index of the most recently merged subtable (nullopt if empty merge)
     UltraOpsTable table;
+    std::vector<UltraOp> zk_ops; // ops used to mask real ops in Chonk
 
-    // For fixed-location append functionality.
-    // APPEND mode places the current subtable at a fixed position at the end of the table, ensuring a
-    // constant total table size (used for zero-knowledge when the appending circuit is ZK). See
-    // chonk/README.md "Constant Merged Table Size for ZK". (Only applicable for ultra ops.)
+    // Set by merge_with_fixed_append_offset to record the row offset (in NUM_ROWS_PER_OP units) at which the
+    // most recent subtable should be placed when constructing the full table polynomials. Setting this value
+    // also ensures that subsequent reconstructions/polynomial constructions include the APPEND_TRACE_OFFSET
+    // leading-zero preamble for the appended subtable, so the resulting commitments line up with the
+    // appender flavor's ecc_op_wire commitments. See chonk/README.md "Constant Merged Table Size for ZK".
     std::optional<size_t> fixed_append_offset;
-    bool has_fixed_append = false;
-
-    // Size of the appended subtable (including its APPEND_TRACE_OFFSET preamble) in rows, if any.
-    size_t appended_subtable_span() const
-    {
-        BB_ASSERT(has_fixed_append, "Appended subtable span called without fixed append");
-        BB_ASSERT(!table.get().empty(), "Appended subtable span called on empty table");
-
-        return APPEND_TRACE_OFFSET + (table.get().back().size() * NUM_ROWS_PER_OP);
-    }
 
   public:
     // Returns the number of ECC operations in the table
     size_t num_ops() const { return table.size(); }
 
-    // Returns the number of rows in the Ultra execution trace (each op occupies NUM_ROWS_PER_OP rows)
+    // Returns the number of rows in the Ultra execution trace (each op occupies NUM_ROWS_PER_OP rows).
+    // NOTE: this count covers the merged subtables only and EXCLUDES the ZK prefix (zk_ops, size ZK_ULTRA_OPS).
+    // Callers that need the full polynomial size (e.g. for sizing a commitment key) must add ZK_ULTRA_OPS.
     size_t num_ultra_rows() const
     {
-        size_t base_size = (table.size() * NUM_ROWS_PER_OP) + (has_fixed_append ? APPEND_TRACE_OFFSET : 0);
-        if (has_fixed_append && fixed_append_offset.has_value()) {
-            // Include zeros gap and final subtable at fixed location (subtable span includes preamble)
-            return std::max(base_size, (fixed_append_offset.value() * NUM_ROWS_PER_OP) + appended_subtable_span());
+        if (!has_fixed_append_offset()) {
+            return table.size() * NUM_ROWS_PER_OP;
         }
-        return base_size;
+        BB_ASSERT(!table.get().empty(), "Fixed-append set but no subtables present");
+        // Last subtable starts at fixed_append_offset (in op units), preceded by APPEND_TRACE_OFFSET zero rows.
+        const size_t last_subtable_rows = table.get().back().size() * NUM_ROWS_PER_OP;
+        return (fixed_append_offset.value() * NUM_ROWS_PER_OP) + APPEND_TRACE_OFFSET + last_subtable_rows;
     }
-    size_t current_ultra_subtable_size() const
+    size_t ultra_table_size_up_to_tail() const
     {
-        if (!current_subtable_idx.has_value()) {
-            return 0;
+        BB_ASSERT_EQ(
+            table.get_current_subtable_size(),
+            0UL,
+            "Current subtable should be merged before computing the size of table of operations up to the tail.");
+        BB_ASSERT_GT(table.num_subtables(), 1UL, "Cannot compute tail table size without at least two tables.");
+        size_t size = 0;
+        for (size_t subtable_idx = 0; subtable_idx < table.num_subtables() - 1; ++subtable_idx) {
+            size += table.get()[subtable_idx].size() * NUM_ROWS_PER_OP;
         }
-        const bool is_appended_subtable = has_fixed_append && current_subtable_idx.value() == table.num_subtables() - 1;
-        const size_t ops_rows = table.get()[current_subtable_idx.value()].size() * NUM_ROWS_PER_OP;
-        return is_appended_subtable ? APPEND_TRACE_OFFSET + ops_rows : ops_rows;
+        return size;
     }
-    size_t previous_ultra_table_size() const { return (num_ultra_rows() - current_ultra_subtable_size()); }
     void create_new_subtable(size_t size_hint = 0) { table.create_new_subtable(size_hint); }
     void push(const UltraOp& op) { table.push(op); }
-    void merge(MergeSettings settings = MergeSettings::PREPEND, std::optional<size_t> offset = std::nullopt)
+    bool has_fixed_append_offset() const { return fixed_append_offset.has_value(); }
+    bool has_zk_ops() const { return !zk_ops.empty(); }
+    void merge()
     {
-        const size_t num_subtables_before = table.num_subtables();
-        if (settings == MergeSettings::APPEND) {
-            // All appends are treated as fixed-location for ultra ops
-            BB_ASSERT(!has_fixed_append, "Can only perform fixed-location append once");
-            // Set fixed location at which to append ultra ops. If nullopt --> append right after prepended tables
-            fixed_append_offset = offset;
-            has_fixed_append = true;
-            table.merge(settings);
-            current_subtable_idx = table.num_subtables() - 1;
-        } else { // MergeSettings::PREPEND
-            table.merge(settings);
-            // Only update current_subtable_idx if a subtable was actually added (non-empty merge)
-            current_subtable_idx =
-                (table.num_subtables() > num_subtables_before) ? std::optional<size_t>(0) : std::nullopt;
+        BB_ASSERT(!has_fixed_append_offset(), "Cannot perform regular merge after fixed-location append");
+        table.merge();
+    }
+    void merge_with_fixed_append_offset(size_t offset)
+    {
+        BB_ASSERT(!has_fixed_append_offset(), "Can only perform fixed-location append once");
+
+        size_t prior_subtables_size = 0;
+        for (const auto& subtable : table.get()) {
+            prior_subtables_size += subtable.size();
         }
+        BB_ASSERT_LTE(prior_subtables_size,
+                      offset,
+                      "Merged table size exceeds fixed append offset. This means that there are too many ops before "
+                      "the last subtable. The last subtable doesn't fit at the end of the op queue.");
+
+        fixed_append_offset = offset;
+        table.merge();
     }
 
     size_t get_current_subtable_size() const { return table.get_current_subtable_size(); }
 
-    std::vector<UltraOp> get_reconstructed() const
+    std::vector<UltraOp> get_no_zk_reconstructed_ultra_ops() const
     {
-        if (has_fixed_append && fixed_append_offset.has_value()) {
-            return get_reconstructed_with_fixed_append();
-        }
-        return table.get_reconstructed();
+        return get_reconstructed(/*include_zk_ops=*/false);
     }
-    std::vector<UltraOp> get_reconstructed_with_fixed_append() const
-    {
 
-        BB_ASSERT(get_current_subtable_size() == 0,
-                  "current subtable should be merged before reconstructing the full table of operations.");
+    std::vector<UltraOp> get_zk_reconstructed_ultra_ops() const { return get_reconstructed(/*include_zk_ops=*/true); }
+
+  private:
+    // Reconstruct the full table of ultra ops in contiguous memory. When include_zk_ops is set, the result includes
+    // the ZK prefix at the front. Under fixed-location append, the result then has gap no-ops up to the fixed offset,
+    // the APPEND_TRACE_OFFSET zero preamble, then the most recently merged subtable.
+    std::vector<UltraOp> get_reconstructed(const bool include_zk_ops) const
+    {
+        BB_ASSERT_EQ(get_current_subtable_size(),
+                     0UL,
+                     "current subtable should be merged before reconstructing the full table of operations.");
+        BB_ASSERT(!include_zk_ops || has_zk_ops(), "ZK ops must be constructed before reconstructing the Ultra table.");
 
         std::vector<UltraOp> reconstructed_table;
         reconstructed_table.reserve(1 << CONST_OP_QUEUE_LOG_SIZE);
 
-        for (size_t subtable_idx = 0; subtable_idx < table.num_subtables() - 1; subtable_idx++) {
-            const auto& subtable = table.get()[subtable_idx];
-            for (const auto& op : subtable) {
-                reconstructed_table.push_back(op);
-            }
+        if (include_zk_ops) {
+            reconstructed_table.insert(reconstructed_table.end(), zk_ops.begin(), zk_ops.end());
         }
 
-        // Fill gap with no-ops up to fixed_append_offset, then add no-ops to match the APPEND_TRACE_OFFSET preamble
-        if (has_fixed_append && fixed_append_offset.has_value()) {
-            size_t current_size = reconstructed_table.size();
-            size_t target_offset = fixed_append_offset.value();
-            BB_ASSERT_LTE(current_size, target_offset, "Current table size is larger than fixed append offset.");
-
-            constexpr size_t preamble_op_slots = APPEND_TRACE_OFFSET / NUM_ROWS_PER_OP;
-            reconstructed_table.insert(
-                reconstructed_table.end(), target_offset + preamble_op_slots - current_size, UltraOp{ /*no-op*/ });
+        if (!has_fixed_append_offset()) {
+            for (const auto& subtable : table.get()) {
+                reconstructed_table.insert(reconstructed_table.end(), subtable.begin(), subtable.end());
+            }
+            return reconstructed_table;
         }
 
-        // Add the final subtable (appended at fixed location)
-        const auto& final_subtable = table.get()[table.num_subtables() - 1];
-        for (const auto& op : final_subtable) {
-            reconstructed_table.push_back(op);
+        // Previously-merged subtables (everything except the most recent)
+        for (size_t idx = 0; idx + 1 < table.num_subtables(); ++idx) {
+            const auto& subtable = table.get()[idx];
+            reconstructed_table.insert(reconstructed_table.end(), subtable.begin(), subtable.end());
         }
+
+        // Pad with no-ops up to fixed offset + APPEND_TRACE_OFFSET preamble
+        constexpr size_t preamble_op_slots = APPEND_TRACE_OFFSET / NUM_ROWS_PER_OP;
+        const size_t zk_offset_ops = include_zk_ops ? zk_ops.size() : 0;
+        const size_t target_op_count = fixed_append_offset.value() + zk_offset_ops + preamble_op_slots;
+        BB_ASSERT_LTE(
+            reconstructed_table.size(), target_op_count, "Current table size is larger than fixed append offset.");
+        reconstructed_table.insert(
+            reconstructed_table.end(), target_op_count - reconstructed_table.size(), UltraOp{ /* no-op */ });
+
+        // Final subtable
+        const auto& final_subtable = table.get().back();
+        reconstructed_table.insert(reconstructed_table.end(), final_subtable.begin(), final_subtable.end());
         return reconstructed_table;
     }
 
-    // Construct column polynomials for the full ultra ecc ops table
-    ColumnPolynomials construct_table_columns() const
+  public:
+    std::pair<ColumnPolynomials, ECCVMOperation> construct_zk_columns()
     {
-        const size_t poly_size = num_ultra_rows();
+        BB_ASSERT(!has_zk_ops(), "ZK ops should only be constructed once.");
+
+        // Construct the table of ops
+        for (size_t idx = 0; idx < ECC_NUM_NO_OPS_START; idx++) {
+            zk_ops.push_back(UltraOp{ /* no_op */ });
+        }
 
-        if (has_fixed_append) {
-            return construct_column_polynomials_with_fixed_append(poly_size);
+        // Each random op contributes 8 fresh Fr values to the column polynomials, masking commitments and
+        // evaluations of the columns in the merge protocol and Translator.
+        for (size_t idx = 0; idx < ECC_NUM_RANDOM_OPS_START; idx++) {
+            zk_ops.push_back(UltraOp{ .op_code = EccOpCode{ .is_random_op = true,
+                                                            .random_value_1 = Fr::random_element(),
+                                                            .random_value_2 = Fr::random_element() },
+                                      .x_lo = Fr::random_element(),
+                                      .x_hi = Fr::random_element(),
+                                      .y_lo = Fr::random_element(),
+                                      .y_hi = Fr::random_element(),
+                                      .z_1 = Fr::random_element(),
+                                      .z_2 = Fr::random_element(),
+                                      .return_is_infinity = false });
         }
 
-        return construct_column_polynomials_from_subtables(poly_size, 0, table.num_subtables());
+        using Fq = curve::BN254::BaseField;
+        auto [hiding_ultra_op, hiding_eccvm_op] = make_hiding_op_pair(Fq::random_element(), Fq::random_element());
+        zk_ops.push_back(hiding_ultra_op);
+
+        const size_t poly_size = (zk_ops.size() * NUM_ROWS_PER_OP);
+        BB_ASSERT_EQ(poly_size, ZK_ULTRA_OPS);
+
+        // Construct the column polynomials
+        ColumnPolynomials column_polynomials;
+        for (auto& poly : column_polynomials) {
+            poly = Polynomial<Fr>(poly_size);
+        }
+
+        size_t i = 0;
+        for (const auto& op : zk_ops) {
+            write_op_to_polynomials(column_polynomials, op, i);
+            i += NUM_ROWS_PER_OP;
+        }
+
+        return { column_polynomials, hiding_eccvm_op };
     }
 
-    // Construct column polynomials for the aggregate table excluding the most recent subtable
-    ColumnPolynomials construct_previous_table_columns() const
+    // Construct column polynomials for all subtables
+    std::vector<ColumnPolynomials> construct_subtable_columns() const
     {
-        const size_t poly_size = previous_ultra_table_size();
-        if (!current_subtable_idx.has_value()) {
-            // Empty merge: the entire table is "previous"
-            return construct_column_polynomials_from_subtables(poly_size, 0, table.num_subtables());
+        std::vector<ColumnPolynomials> subtable_columns;
+
+        for (size_t idx = 0; idx < table.num_subtables(); idx++) {
+            const auto& subtable = table.get()[idx];
+            const size_t poly_size = (subtable.size() * NUM_ROWS_PER_OP);
+            ColumnPolynomials columns = construct_columns_in_range(poly_size, idx, idx + 1);
+            subtable_columns.push_back(std::move(columns));
         }
-        const size_t idx = current_subtable_idx.value();
-        const size_t subtable_start_idx = idx == 0 ? 1 : 0;
-        const size_t subtable_end_idx = idx == 0 ? table.num_subtables() : table.num_subtables() - 1;
 
-        return construct_column_polynomials_from_subtables(poly_size, subtable_start_idx, subtable_end_idx);
+        return subtable_columns;
+    }
+
+    // Construct column polynomials for the full ultra ecc ops table
+    ColumnPolynomials construct_table_columns(const bool include_zk_ops = true) const
+    {
+        BB_ASSERT(!include_zk_ops || has_zk_ops(),
+                  "ZK ops must be constructed before constructing the full Ultra table with ZK ops.");
+        return construct_columns_in_range(
+            num_ultra_rows(), 0, table.num_subtables(), include_zk_ops, fixed_append_offset);
+    }
+
+    // Construct column polynomials for the aggregate table up to and including the tail subtable.
+    ColumnPolynomials construct_table_columns_up_to_tail() const
+    {
+        BB_ASSERT(has_zk_ops(), "ZK ops should have been constructed before constructing the table up to tail");
+        BB_ASSERT_GT(table.num_subtables(),
+                     1UL,
+                     "There should be at least two subtables (including the tail) to construct the table up to tail");
+        BB_ASSERT_GT(table.num_subtables(), 0UL, "Cannot construct table up to tail without a current subtable");
+
+        return construct_columns_in_range(
+            ultra_table_size_up_to_tail(), 0, table.num_subtables() - 1, /*include_zk_ops=*/true);
     }
 
-    // Construct the columns of the current subtable (first or last depending on prepend/append).
-    // For the APPEND path the returned polynomials carry APPEND_TRACE_OFFSET leading zero rows so their
+    // Construct the columns of the most recently merged subtable.
+    // Under fixed-location append, the returned polynomials carry APPEND_TRACE_OFFSET leading zero rows so their
     // commitments match the appender's ecc_op_wire commitments.
     ColumnPolynomials construct_current_ultra_ops_subtable_columns() const
     {
-        if (!current_subtable_idx.has_value()) {
-            return ColumnPolynomials{};
-        }
-        const bool is_appended_subtable = has_fixed_append && current_subtable_idx.value() == table.num_subtables() - 1;
-        const size_t leading_zeros = is_appended_subtable ? APPEND_TRACE_OFFSET : 0;
-        const size_t poly_size = current_ultra_subtable_size();
+        BB_ASSERT(table.num_subtables() > 0, "Cannot construct current subtable columns with no merged subtables");
+        const size_t leading_zeros = has_fixed_append_offset() ? APPEND_TRACE_OFFSET : 0;
+        const auto& subtable = table.get().back();
+        const size_t poly_size = leading_zeros + (subtable.size() * NUM_ROWS_PER_OP);
 
         ColumnPolynomials column_polynomials;
         if (poly_size == 0) {
@@ -394,7 +487,6 @@ class UltraEccOpsTable {
         }
 
         size_t row = leading_zeros;
-        const auto& subtable = table.get()[current_subtable_idx.value()];
         for (const auto& op : subtable) {
             write_op_to_polynomials(column_polynomials, op, row);
             row += NUM_ROWS_PER_OP;
@@ -423,69 +515,65 @@ class UltraEccOpsTable {
     }
 
     /**
-     * @brief Construct polynomials with fixed-location append
-     * @details Process prepended subtables first, then place the appended subtable at the fixed offset. The appended
-     * subtable's ops are preceded by APPEND_TRACE_OFFSET zero rows.
+     * @brief Construct column polynomials covering subtables [start, end), optionally with a ZK prefix and an
+     * optional fixed-location placement of the last-in-range subtable.
+     *
+     * @details Layout (rows in NUM_ROWS_PER_OP units, advancing left to right):
+     *   [optional ZK prefix] [subtables [start, sequential_end)] [optional gap] [optional last-in-range subtable
+     *                                                                            preceded by APPEND_TRACE_OFFSET]
+     *
+     * If `fixed_append_offset_for_last` is set, sequential_end = end - 1 and the last-in-range subtable is placed
+     * at row `(zk_size + offset * NUM_ROWS_PER_OP + APPEND_TRACE_OFFSET)`. Any intervening rows are left at the
+     * zero-initialized default. Otherwise sequential_end = end and there is no gap.
      */
-    ColumnPolynomials construct_column_polynomials_with_fixed_append(const size_t poly_size) const
+    ColumnPolynomials construct_columns_in_range(
+        const size_t poly_size,
+        const size_t subtable_start_idx,
+        const size_t subtable_end_idx,
+        const bool include_zk_ops = false,
+        const std::optional<size_t> fixed_append_offset_for_last = std::nullopt) const
     {
+        const size_t final_poly_size = poly_size + (include_zk_ops ? ZK_ULTRA_OPS : 0);
+
         ColumnPolynomials column_polynomials;
-        if (poly_size == 0) {
+        if (final_poly_size == 0) {
             return column_polynomials;
         }
         for (auto& poly : column_polynomials) {
-            poly = Polynomial<Fr>(poly_size); // Initialized to zeros
-        }
-
-        // Process all prepended subtables (all except last)
-        size_t i = 0;
-        for (size_t subtable_idx = 0; subtable_idx < table.num_subtables() - 1; subtable_idx++) {
-            const auto& subtable = table.get()[subtable_idx];
-            for (const auto& op : subtable) {
-                write_op_to_polynomials(column_polynomials, op, i);
-                i += NUM_ROWS_PER_OP;
-            }
+            poly = Polynomial<Fr>(final_poly_size);
         }
 
-        // Place the appended subtable at the fixed offset (skipping its leading-zero preamble).
-        size_t append_position = fixed_append_offset.has_value() ? fixed_append_offset.value() * NUM_ROWS_PER_OP : i;
-        const auto& appended_subtable = table.get()[table.num_subtables() - 1];
+        size_t row = 0;
 
-        size_t j = append_position + APPEND_TRACE_OFFSET;
-        for (const auto& op : appended_subtable) {
-            write_op_to_polynomials(column_polynomials, op, j);
-            j += NUM_ROWS_PER_OP;
+        if (include_zk_ops) {
+            BB_ASSERT(has_zk_ops(), "ZK ops should have been constructed before including them in the columns");
+            for (const auto& op : zk_ops) {
+                write_op_to_polynomials(column_polynomials, op, row);
+                row += NUM_ROWS_PER_OP;
+            }
         }
 
-        // Any gap between prepended tables and appended table remains zeros (from initialization)
-        return column_polynomials;
-    }
-
-    /**
-     * @brief Construct polynomials corresponding to the columns of the reconstructed ultra ops table for the given
-     * range of subtables
-     * @param target_columns
-     */
-    ColumnPolynomials construct_column_polynomials_from_subtables(const size_t poly_size,
-                                                                  const size_t subtable_start_idx,
-                                                                  const size_t subtable_end_idx) const
-    {
-        ColumnPolynomials column_polynomials;
-        if (poly_size == 0) {
-            return column_polynomials;
-        }
-        for (auto& poly : column_polynomials) {
-            poly = Polynomial<Fr>(poly_size);
+        // Lay out subtables sequentially. If a fixed-append target is set, exclude the last-in-range subtable
+        // from the sequential pass; it is placed at the fixed offset below.
+        const size_t sequential_end =
+            fixed_append_offset_for_last.has_value() ? subtable_end_idx - 1 : subtable_end_idx;
+        for (size_t idx = subtable_start_idx; idx < sequential_end; ++idx) {
+            for (const auto& op : table.get()[idx]) {
+                write_op_to_polynomials(column_polynomials, op, row);
+                row += NUM_ROWS_PER_OP;
+            }
         }
 
-        size_t i = 0;
-        for (size_t subtable_idx = subtable_start_idx; subtable_idx < subtable_end_idx; ++subtable_idx) {
-            const auto& subtable = table.get()[subtable_idx];
-            for (const auto& op : subtable) {
-                write_op_to_polynomials(column_polynomials, op, i);
-                i += NUM_ROWS_PER_OP;
+        if (fixed_append_offset_for_last.has_value()) {
+            const size_t zk_prefix_rows = include_zk_ops ? ZK_ULTRA_OPS : 0;
+            size_t append_row =
+                zk_prefix_rows + (fixed_append_offset_for_last.value() * NUM_ROWS_PER_OP) + APPEND_TRACE_OFFSET;
+            for (const auto& op : table.get()[subtable_end_idx - 1]) {
+                write_op_to_polynomials(column_polynomials, op, append_row);
+                append_row += NUM_ROWS_PER_OP;
             }
         }
+
         return column_polynomials;
     }
 };
diff --git a/barretenberg/cpp/src/barretenberg/op_queue/ecc_ops_table.test.cpp b/barretenberg/cpp/src/barretenberg/op_queue/ecc_ops_table.test.cpp
index 9ec2bb2063f5..27e39214530d 100644
--- a/barretenberg/cpp/src/barretenberg/op_queue/ecc_ops_table.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/op_queue/ecc_ops_table.test.cpp
@@ -61,7 +61,7 @@ class EccOpsTableTest : public ::testing::Test {
         }
     };
 
-    // Mock ultra ops table that constructs a concatenated table from successively prepended subtables
+    // Mock ultra ops table that constructs a concatenated table from successively appended subtables.
     struct MockUltraOpsTable {
         std::array<std::vector<Scalar>, 4> columns;
         void append(const UltraOp& op)
@@ -101,7 +101,7 @@ class EccOpsTableTest : public ::testing::Test {
         size_t size() const { return columns[0].size(); }
     };
 
-    // Mock eccvm ops table that constructs a concatenated table from successively prepended subtables
+    // Mock eccvm ops table that constructs a concatenated table from successively appended subtables.
     struct MockEccvmOpsTable {
         std::vector<ECCVMOperation> eccvm_ops;
 
@@ -116,8 +116,8 @@ class EccOpsTableTest : public ::testing::Test {
     };
 };
 
-// Ensure UltraOpsTable correctly constructs a concatenated table from successively prepended subtables
-TEST(EccOpsTableTest, UltraOpsTablePrependOnly)
+// Ensure UltraOpsTable correctly constructs a concatenated table from successively appended subtables.
+TEST(EccOpsTableTest, UltraOpsTable)
 {
     using Fr = fr;
     using TableGenerator = EccOpsTableTest::UltraOpTableGenerator;
@@ -139,8 +139,7 @@ TEST(EccOpsTableTest, UltraOpsTablePrependOnly)
         ultra_ops_table.merge();
     }
 
-    std::reverse(subtables.begin(), subtables.end());
-    // Construct the mock ultra ops table which contains the subtables ordered in reverse (as if prepended)
+    // Construct the mock ultra ops table which contains the subtables in append order.
     EccOpsTableTest::MockUltraOpsTable expected_ultra_ops_table(subtables);
 
     // Check that the ultra ops table internal to the op queue has the correct size
@@ -148,62 +147,19 @@ TEST(EccOpsTableTest, UltraOpsTablePrependOnly)
     EXPECT_EQ(ultra_ops_table.num_ops(), expected_num_ops);
 
     // Construct polynomials corresponding to the columns of the ultra ops table
+    ultra_ops_table.construct_zk_columns();
     std::array<Polynomial<Fr>, 4> ultra_ops_table_polynomials = ultra_ops_table.construct_table_columns();
+    std::array<Polynomial<Fr>, 4> no_zk_ultra_ops_table_polynomials =
+        ultra_ops_table.construct_table_columns(/*include_zk_ops=*/false);
 
     // Check that the ultra ops table constructed by the op queue matches the expected table
-    for (auto [expected_column, poly] : zip_view(expected_ultra_ops_table.columns, ultra_ops_table_polynomials)) {
-        for (auto [expected_value, value] : zip_view(expected_column, poly.coeffs())) {
-            EXPECT_EQ(expected_value, value);
-        }
-    }
-}
-
-TEST(EccOpsTableTest, UltraOpsPrependThenAppend)
-{
-    using Fr = fr;
-    using TableGenerator = EccOpsTableTest::UltraOpTableGenerator;
-
-    // Construct sets of ultra ops, each representing those added by a single circuit
-    const size_t NUM_SUBTABLES = 3;
-    std::vector<size_t> subtable_op_counts = { 4, 2, 7 };
-
-    TableGenerator table_generator;
-    auto subtables = table_generator.generate_subtables(NUM_SUBTABLES, subtable_op_counts);
-
-    // Construct the concatenated table internal to the op queue
-    UltraEccOpsTable ultra_ops_table;
-    std::array<MergeSettings, NUM_SUBTABLES> merge_settings = { MergeSettings::PREPEND,
-                                                                MergeSettings::PREPEND,
-                                                                MergeSettings::APPEND };
-    for (const auto& [subtable_ops, setting] : zip_view(subtables, merge_settings)) {
-        ultra_ops_table.create_new_subtable();
-        for (const auto& op : subtable_ops) {
-            ultra_ops_table.push(op);
-        }
-        ultra_ops_table.merge(setting);
-    }
-
-    std::vector<std::vector<UltraOp>> ordered_subtables;
-    for (auto [subtable, setting] : zip_view(subtables, merge_settings)) {
-        auto it = setting == MergeSettings::PREPEND ? ordered_subtables.begin() : ordered_subtables.end();
-        ordered_subtables.insert(it, subtable);
-    }
-
-    // Construct the mock ultra ops table. The final APPEND carries APPEND_TRACE_OFFSET preamble rows.
-    EccOpsTableTest::MockUltraOpsTable expected_ultra_ops_table(ordered_subtables,
-                                                                /*last_subtable_has_preamble=*/true);
-
-    // Check that the ultra ops table internal to the op queue has the correct size
-    auto expected_num_ops = std::accumulate(subtable_op_counts.begin(), subtable_op_counts.end(), size_t(0));
-    EXPECT_EQ(ultra_ops_table.num_ops(), expected_num_ops);
-
-    // Construct polynomials corresponding to the columns of the ultra ops table
-    std::array<Polynomial<Fr>, 4> ultra_ops_table_polynomials = ultra_ops_table.construct_table_columns();
-
-    // Check that the ultra ops table constructed by the op queue matches the expected table
-    for (auto [expected_column, poly] : zip_view(expected_ultra_ops_table.columns, ultra_ops_table_polynomials)) {
-        for (auto [expected_value, value] : zip_view(expected_column, poly.coeffs())) {
-            EXPECT_EQ(expected_value, value);
+    for (auto [expected_column, poly, no_zk_poly] :
+         zip_view(expected_ultra_ops_table.columns, ultra_ops_table_polynomials, no_zk_ultra_ops_table_polynomials)) {
+        EXPECT_EQ(poly.size(), UltraEccOpsTable::ZK_ULTRA_OPS + expected_column.size());
+        EXPECT_EQ(no_zk_poly.size(), expected_column.size());
+        for (size_t row = 0; row < expected_column.size(); ++row) {
+            EXPECT_EQ(expected_column[row], poly.at(UltraEccOpsTable::ZK_ULTRA_OPS + row));
+            EXPECT_EQ(expected_column[row], no_zk_poly.at(row));
         }
     }
 }
@@ -222,23 +178,24 @@ TEST(EccOpsTableTest, UltraOpsFixedLocationAppendNoGap)
 
     // Construct the concatenated table with fixed-location append (no explicit offset)
     UltraEccOpsTable ultra_ops_table;
-    std::array<MergeSettings, NUM_SUBTABLES> merge_settings = { MergeSettings::PREPEND,
-                                                                MergeSettings::PREPEND,
-                                                                MergeSettings::APPEND };
-
     for (size_t i = 0; i < NUM_SUBTABLES; ++i) {
         ultra_ops_table.create_new_subtable();
         for (const auto& op : subtables[i]) {
             ultra_ops_table.push(op);
         }
 
-        // For APPEND (last subtable), don't provide an offset (default to right after prepended tables)
-        ultra_ops_table.merge(merge_settings[i]);
+        if (i == NUM_SUBTABLES - 1) {
+            // No-gap fixed-append: place the appended subtable immediately after the prior subtables.
+            const size_t no_gap_offset = subtable_op_counts[0] + subtable_op_counts[1];
+            ultra_ops_table.merge_with_fixed_append_offset(no_gap_offset);
+        } else {
+            ultra_ops_table.merge();
+        }
     }
 
-    // Expected order: subtable[1], subtable[0], subtable[2] (no gap). The final APPEND carries
+    // Expected order: subtable[0], subtable[1], subtable[2] (no gap). The final APPEND carries
     // APPEND_TRACE_OFFSET preamble rows.
-    std::vector<std::vector<UltraOp>> ordered_subtables = { subtables[1], subtables[0], subtables[2] };
+    std::vector<std::vector<UltraOp>> ordered_subtables = { subtables[0], subtables[1], subtables[2] };
 
     // Construct the mock ultra ops table
     EccOpsTableTest::MockUltraOpsTable expected_ultra_ops_table(ordered_subtables,
@@ -249,12 +206,14 @@ TEST(EccOpsTableTest, UltraOpsFixedLocationAppendNoGap)
     EXPECT_EQ(ultra_ops_table.num_ops(), expected_num_ops);
 
     // Construct polynomials corresponding to the columns of the ultra ops table
+    ultra_ops_table.construct_zk_columns();
     std::array<Polynomial<Fr>, 4> ultra_ops_table_polynomials = ultra_ops_table.construct_table_columns();
 
     // Check that the ultra ops table matches the expected table
     for (auto [expected_column, poly] : zip_view(expected_ultra_ops_table.columns, ultra_ops_table_polynomials)) {
-        for (auto [expected_value, value] : zip_view(expected_column, poly.coeffs())) {
-            EXPECT_EQ(expected_value, value);
+        EXPECT_EQ(poly.size(), UltraEccOpsTable::ZK_ULTRA_OPS + expected_column.size());
+        for (size_t row = 0; row < expected_column.size(); ++row) {
+            EXPECT_EQ(expected_column[row], poly.at(UltraEccOpsTable::ZK_ULTRA_OPS + row));
         }
     }
 }
@@ -275,15 +234,11 @@ TEST(EccOpsTableTest, UltraOpsFixedLocationAppendWithGap)
 
     // Construct the concatenated table with fixed-location append at specific offset
     UltraEccOpsTable ultra_ops_table;
-    std::array<MergeSettings, NUM_SUBTABLES> merge_settings = { MergeSettings::PREPEND,
-                                                                MergeSettings::PREPEND,
-                                                                MergeSettings::APPEND };
-
-    // Define a fixed offset at which to append the table (must be greater than the total size of the prepended tables)
+    // Define a fixed offset at which to append the table (must be greater than the total size of the prior tables).
     const size_t fixed_offset = 20;
     const size_t fixed_offset_num_rows = fixed_offset * ULTRA_ROWS_PER_OP;
-    const size_t prepended_size = (subtable_op_counts[0] + subtable_op_counts[1]) * ULTRA_ROWS_PER_OP;
-    BB_ASSERT(fixed_offset_num_rows > prepended_size);
+    const size_t prior_subtables_size = (subtable_op_counts[0] + subtable_op_counts[1]) * ULTRA_ROWS_PER_OP;
+    BB_ASSERT(fixed_offset_num_rows > prior_subtables_size);
 
     // Construct the ultra ops table
     for (size_t i = 0; i < NUM_SUBTABLES; ++i) {
@@ -292,11 +247,10 @@ TEST(EccOpsTableTest, UltraOpsFixedLocationAppendWithGap)
             ultra_ops_table.push(op);
         }
 
-        // For APPEND (last subtable), provide a fixed offset
-        if (merge_settings[i] == MergeSettings::APPEND) {
-            ultra_ops_table.merge(merge_settings[i], fixed_offset);
+        if (i == NUM_SUBTABLES - 1) {
+            ultra_ops_table.merge_with_fixed_append_offset(fixed_offset);
         } else {
-            ultra_ops_table.merge(merge_settings[i]);
+            ultra_ops_table.merge();
         }
     }
 
@@ -308,32 +262,33 @@ TEST(EccOpsTableTest, UltraOpsFixedLocationAppendWithGap)
     constexpr size_t LEADING_ZEROS = UltraEccOpsTable::APPEND_TRACE_OFFSET;
     size_t expected_poly_size = fixed_offset_num_rows + LEADING_ZEROS + (subtable_op_counts[2] * ULTRA_ROWS_PER_OP);
     EXPECT_EQ(ultra_ops_table.num_ultra_rows(), expected_poly_size);
+    ultra_ops_table.construct_zk_columns();
+    const size_t zk_prefix_rows = UltraEccOpsTable::ZK_ULTRA_OPS;
 
     // Construct polynomials corresponding to the columns of the ultra ops table
     std::array<Polynomial<Fr>, 4> ultra_ops_table_polynomials = ultra_ops_table.construct_table_columns();
 
     // Verify each polynomial has the expected size
     for (const auto& poly : ultra_ops_table_polynomials) {
-        EXPECT_EQ(poly.size(), expected_poly_size);
+        EXPECT_EQ(poly.size(), zk_prefix_rows + expected_poly_size);
     }
 
     // Construct expected table with zeros in the gap
-    // Order: subtable[1], subtable[0], zeros, subtable[2]
-    std::vector<std::vector<UltraOp>> ordered_subtables = { subtables[1], subtables[0] };
-    EccOpsTableTest::MockUltraOpsTable expected_prepended_table(ordered_subtables);
-
-    // Check prepended subtables are at the beginning
-    for (auto [ultra_op_poly, expected_poly] :
-         zip_view(ultra_ops_table_polynomials, expected_prepended_table.columns)) {
-        for (size_t row = 0; row < prepended_size; ++row) {
-            EXPECT_EQ(ultra_op_poly.at(row), expected_poly[row]);
+    // Order: subtable[0], subtable[1], zeros, subtable[2]
+    std::vector<std::vector<UltraOp>> ordered_subtables = { subtables[0], subtables[1] };
+    EccOpsTableTest::MockUltraOpsTable expected_prior_table(ordered_subtables);
+
+    // Check prior subtables are at the beginning.
+    for (auto [ultra_op_poly, expected_poly] : zip_view(ultra_ops_table_polynomials, expected_prior_table.columns)) {
+        for (size_t row = 0; row < prior_subtables_size; ++row) {
+            EXPECT_EQ(ultra_op_poly.at(zk_prefix_rows + row), expected_poly[row]);
         }
     }
 
-    // Check gap from prepended tables up to (fixed_offset + preamble) is filled with zeros.
+    // Check gap from prior tables up to (fixed_offset + preamble) is filled with zeros.
     for (auto ultra_op_poly : ultra_ops_table_polynomials) {
-        for (size_t row = prepended_size; row < fixed_offset_num_rows + LEADING_ZEROS; ++row) {
-            EXPECT_EQ(ultra_op_poly.at(row), Fr::zero());
+        for (size_t row = prior_subtables_size; row < fixed_offset_num_rows + LEADING_ZEROS; ++row) {
+            EXPECT_EQ(ultra_op_poly.at(zk_prefix_rows + row), Fr::zero());
         }
     }
 
@@ -342,7 +297,8 @@ TEST(EccOpsTableTest, UltraOpsFixedLocationAppendWithGap)
     EccOpsTableTest::MockUltraOpsTable expected_appended_table(appended_subtables);
     for (auto [ultra_op_poly, expected_poly] : zip_view(ultra_ops_table_polynomials, expected_appended_table.columns)) {
         for (size_t row = 0; row < subtable_op_counts[2] * ULTRA_ROWS_PER_OP; row++) {
-            EXPECT_EQ(ultra_op_poly.at(fixed_offset_num_rows + LEADING_ZEROS + row), expected_poly[row]);
+            EXPECT_EQ(ultra_op_poly.at(zk_prefix_rows + fixed_offset_num_rows + LEADING_ZEROS + row),
+                      expected_poly[row]);
         }
     }
 
@@ -352,11 +308,11 @@ TEST(EccOpsTableTest, UltraOpsFixedLocationAppendWithGap)
         std::vector<UltraOp> expected_reconstructed;
         expected_reconstructed.reserve(expected_num_ops + fixed_offset);
 
-        // Order: subtable[1], subtable[0], no-ops range (including APPEND_TRACE_OFFSET preamble), subtable[2]
-        for (const auto& op : subtables[1]) {
+        // Order: subtable[0], subtable[1], no-ops range (including APPEND_TRACE_OFFSET preamble), subtable[2]
+        for (const auto& op : subtables[0]) {
             expected_reconstructed.push_back(op);
         }
-        for (const auto& op : subtables[0]) {
+        for (const auto& op : subtables[1]) {
             expected_reconstructed.push_back(op);
         }
 
@@ -372,14 +328,15 @@ TEST(EccOpsTableTest, UltraOpsFixedLocationAppendWithGap)
             expected_reconstructed.push_back(op);
         }
 
-        EXPECT_EQ(expected_reconstructed.size(), ultra_ops_table.get_reconstructed().size());
+        const auto reconstructed = ultra_ops_table.get_no_zk_reconstructed_ultra_ops();
+        EXPECT_EQ(expected_reconstructed.size(), reconstructed.size());
 
         // Compare to the op-queue's reconstruction (should include the gap as no-ops)
-        EXPECT_EQ(expected_reconstructed, ultra_ops_table.get_reconstructed());
+        EXPECT_EQ(expected_reconstructed, reconstructed);
     }
 }
 
-// Ensure EccvmOpsTable correctly constructs a concatenated table from successively prepended subtables
+// Ensure EccvmOpsTable correctly constructs a concatenated table from successively appended subtables
 TEST(EccOpsTableTest, EccvmOpsTable)
 {
 
@@ -403,8 +360,7 @@ TEST(EccOpsTableTest, EccvmOpsTable)
         eccvm_ops_table.merge();
     }
 
-    std::reverse(subtables.begin(), subtables.end());
-    // Construct the mock eccvm ops table which contains the subtables ordered in reverse (as if prepended)
+    // Construct the mock eccvm ops table which contains the subtables in append order.
     EccOpsTableTest::MockEccvmOpsTable expected_eccvm_ops_table(subtables);
 
     // Check that the table has the correct size
@@ -420,9 +376,9 @@ TEST(EccOpsTableTest, EccvmOpsTable)
     EXPECT_EQ(expected_eccvm_ops_table.eccvm_ops, eccvm_ops_table.get_reconstructed());
 }
 
-// Ensure EccvmOpsTable correctly constructs a concatenated table from successively prepended and then appended
+// Ensure EccvmOpsTable correctly constructs a concatenated table from successively appended
 // subtables
-TEST(EccOpsTableTest, EccvmOpsTablePrependThenAppend)
+TEST(EccOpsTableTest, EccvmOpsTableAppendOnly)
 {
 
     // Construct sets of eccvm ops, each representing those added by a single circuit
@@ -435,27 +391,18 @@ TEST(EccOpsTableTest, EccvmOpsTablePrependThenAppend)
     TableGenerator table_generator;
     auto subtables = table_generator.generate_subtables(NUM_SUBTABLES, subtable_op_counts);
 
-    std::array<MergeSettings, NUM_SUBTABLES> merge_settings = { MergeSettings::PREPEND,
-                                                                MergeSettings::PREPEND,
-                                                                MergeSettings::APPEND };
     // Construct the concatenated eccvm ops table
     EccvmOpsTable eccvm_ops_table;
-    for (const auto& [subtable_ops, setting] : zip_view(subtables, merge_settings)) {
+    for (const auto& subtable_ops : subtables) {
         eccvm_ops_table.create_new_subtable();
         for (const auto& op : subtable_ops) {
             eccvm_ops_table.push(op);
         }
-        eccvm_ops_table.merge(setting);
-    }
-
-    std::vector<std::vector<ECCVMOperation>> ordered_subtables;
-    for (auto [subtable, setting] : zip_view(subtables, merge_settings)) {
-        auto it = setting == MergeSettings::PREPEND ? ordered_subtables.begin() : ordered_subtables.end();
-        ordered_subtables.insert(it, subtable);
+        eccvm_ops_table.merge();
     }
 
-    // Construct the mock ultra ops table which contains the subtables ordered in reverse (as if prepended)
-    EccOpsTableTest::MockEccvmOpsTable expected_eccvm_ops_table(ordered_subtables);
+    // Construct the mock eccvm ops table which contains the subtables in append order.
+    EccOpsTableTest::MockEccvmOpsTable expected_eccvm_ops_table(subtables);
 
     // Check that the table has the correct size
     auto expected_num_ops = std::accumulate(subtable_op_counts.begin(), subtable_op_counts.end(), size_t(0));
diff --git a/barretenberg/cpp/src/barretenberg/polynomials/polynomial.cpp b/barretenberg/cpp/src/barretenberg/polynomials/polynomial.cpp
index 0b0bf79f9b27..a22ff4875daa 100644
--- a/barretenberg/cpp/src/barretenberg/polynomials/polynomial.cpp
+++ b/barretenberg/cpp/src/barretenberg/polynomials/polynomial.cpp
@@ -284,6 +284,52 @@ void Polynomial<Fr>::add_scaled_chunk(const ThreadChunk& chunk,
     }
 }
 
+template <typename Fr>
+void add_scaled_batch(Polynomial<Fr>& dst,
+                      std::span<const PolynomialSpan<const Fr>> sources,
+                      std::span<const Fr> scalars)
+{
+    BB_BENCH_NAME("add_scaled_batch");
+    BB_ASSERT_EQ(sources.size(), scalars.size(), "sources and scalars must have the same length");
+    if (sources.empty()) {
+        return;
+    }
+
+    size_t min_start = sources[0].start_index;
+    size_t max_end = sources[0].end_index();
+    for (size_t i = 1; i < sources.size(); ++i) {
+        min_start = std::min(min_start, sources[i].start_index);
+        max_end = std::max(max_end, sources[i].end_index());
+    }
+    BB_ASSERT_LTE(dst.start_index(), min_start);
+    BB_ASSERT_GTE(dst.end_index(), max_end);
+
+    const size_t union_size = max_end - min_start;
+    parallel_for([&](const ThreadChunk& chunk) {
+        BB_BENCH_TRACY_NAME("add_scaled_batch/chunk");
+        auto chunk_indices = chunk.range(union_size, min_start);
+        if (chunk_indices.empty()) {
+            return;
+        }
+        auto chunk_start = chunk_indices.front();
+        auto chunk_end = chunk_indices.back();
+
+        for (size_t k = 0; k < sources.size(); ++k) {
+            const auto& src = sources[k];
+            const Fr& c = scalars[k];
+            const size_t src_start = src.start_index;
+            const size_t src_end = src.end_index();
+
+            const size_t idx_start = std::max(chunk_start, src_start);
+            const size_t idx_end = std::min(chunk_end + 1, src_end);
+
+            for (size_t i = idx_start; i < idx_end; ++i) {
+                dst.at(i) += c * src[i];
+            }
+        }
+    });
+}
+
 template <typename Fr> Polynomial<Fr> Polynomial<Fr>::shifted() const
 {
     BB_ASSERT_GTE(coefficients_.start_, static_cast<size_t>(1));
@@ -308,4 +354,11 @@ template <typename Fr> Polynomial<Fr> Polynomial<Fr>::reverse() const
 
 template class Polynomial<bb::fr>;
 template class Polynomial<grumpkin::fr>;
+
+template void add_scaled_batch<bb::fr>(Polynomial<bb::fr>& dst,
+                                       std::span<const PolynomialSpan<const bb::fr>> sources,
+                                       std::span<const bb::fr> scalars);
+template void add_scaled_batch<grumpkin::fr>(Polynomial<grumpkin::fr>& dst,
+                                             std::span<const PolynomialSpan<const grumpkin::fr>> sources,
+                                             std::span<const grumpkin::fr> scalars);
 } // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/polynomials/polynomial.hpp b/barretenberg/cpp/src/barretenberg/polynomials/polynomial.hpp
index cd97628e0e04..7ac33b963303 100644
--- a/barretenberg/cpp/src/barretenberg/polynomials/polynomial.hpp
+++ b/barretenberg/cpp/src/barretenberg/polynomials/polynomial.hpp
@@ -126,6 +126,15 @@ template <typename Fr> class Polynomial {
         }
         return p;
     }
+    /**
+     * @brief Overload of `shiftable` that leaves the backing memory uninitialized.
+     * @details Use only when the caller writes every cell in [NUM_ZERO_ROWS, NUM_ZERO_ROWS + size)
+     *          before any read.
+     */
+    static Polynomial shiftable(size_t size, size_t virtual_size, DontZeroMemory flag)
+    {
+        return Polynomial(/*actual size*/ size - NUM_ZERO_ROWS, virtual_size, /*shiftable offset*/ NUM_ZERO_ROWS, flag);
+    }
     // Allow polynomials to be entirely reset/dormant
     Polynomial() = default;
 
@@ -403,6 +412,22 @@ template <typename Fr> class Polynomial {
     // Namely, it supports polynomial shifts and 'virtual' zeroes past a size up until a 'virtual' size.
     SharedShiftedVirtualZeroesArray<Fr> coefficients_;
 };
+
+/**
+ * @brief Fused parallel batched add: dst += sum_i scalars[i] * sources[i].
+ *
+ * Equivalent to invoking dst.add_scaled(sources[i], scalars[i]) for each i, but issues a single
+ * parallel_for over the destination range and visits every source within each chunk. Amortises
+ * the per-call parallel_for startup cost from N× down to 1×, which dominates the cost of small-N
+ * batched add-scaled patterns at high core counts.
+ *
+ * Each source must satisfy add_scaled's precondition: dst's index range covers the source's.
+ */
+template <typename Fr>
+void add_scaled_batch(Polynomial<Fr>& dst,
+                      std::span<const PolynomialSpan<const Fr>> sources,
+                      std::span<const Fr> scalars);
+
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-c-arrays)
 template <typename Fr> std::shared_ptr<Fr[]> _allocate_aligned_memory(size_t n_elements)
 {
diff --git a/barretenberg/cpp/src/barretenberg/relations/databus_lookup_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/databus_lookup_relation.hpp
index 122af1c441e1..122243a676ff 100644
--- a/barretenberg/cpp/src/barretenberg/relations/databus_lookup_relation.hpp
+++ b/barretenberg/cpp/src/barretenberg/relations/databus_lookup_relation.hpp
@@ -112,28 +112,46 @@ template <typename FF_> class DatabusLookupRelationImpl {
     // Interface for easy access of databus components by column (bus_idx)
     template <size_t bus_idx, typename AllEntities> struct BusData;
 
-    // Specialization for calldata (bus_idx = 0)
+    // Specialization for kernel_calldata (bus_idx = 0)
     template <typename AllEntities> struct BusData</*bus_idx=*/0, AllEntities> {
-        static auto& values(const AllEntities& in) { return in.calldata; }
+        static auto& values(const AllEntities& in) { return in.kernel_calldata; }
         static auto& selector(const AllEntities& in) { return in.q_l; }
-        static auto& inverses(AllEntities& in) { return in.calldata_inverses; }
-        static auto& inverses(const AllEntities& in) { return in.calldata_inverses; } // const version
-        static auto& read_counts(const AllEntities& in) { return in.calldata_read_counts; }
+        static auto& inverses(AllEntities& in) { return in.kernel_calldata_inverses; }
+        static auto& inverses(const AllEntities& in) { return in.kernel_calldata_inverses; } // const version
+        static auto& read_counts(const AllEntities& in) { return in.kernel_calldata_read_counts; }
     };
 
-    // Specialization for secondary_calldata (bus_idx = 1)
+    // Specialization for first_app_calldata (bus_idx = 1)
     template <typename AllEntities> struct BusData</*bus_idx=*/1, AllEntities> {
-        static auto& values(const AllEntities& in) { return in.secondary_calldata; }
+        static auto& values(const AllEntities& in) { return in.first_app_calldata; }
         static auto& selector(const AllEntities& in) { return in.q_r; }
-        static auto& inverses(AllEntities& in) { return in.secondary_calldata_inverses; }
-        static auto& inverses(const AllEntities& in) { return in.secondary_calldata_inverses; } // const version
-        static auto& read_counts(const AllEntities& in) { return in.secondary_calldata_read_counts; }
+        static auto& inverses(AllEntities& in) { return in.first_app_calldata_inverses; }
+        static auto& inverses(const AllEntities& in) { return in.first_app_calldata_inverses; } // const version
+        static auto& read_counts(const AllEntities& in) { return in.first_app_calldata_read_counts; }
     };
 
-    // Specialization for return data (bus_idx = 2)
+    // Specialization for second_app_calldata (bus_idx = 2)
     template <typename AllEntities> struct BusData</*bus_idx=*/2, AllEntities> {
-        static auto& values(const AllEntities& in) { return in.return_data; }
+        static auto& values(const AllEntities& in) { return in.second_app_calldata; }
         static auto& selector(const AllEntities& in) { return in.q_o; }
+        static auto& inverses(AllEntities& in) { return in.second_app_calldata_inverses; }
+        static auto& inverses(const AllEntities& in) { return in.second_app_calldata_inverses; } // const version
+        static auto& read_counts(const AllEntities& in) { return in.second_app_calldata_read_counts; }
+    };
+
+    // Specialization for third_app_calldata (bus_idx = 3)
+    template <typename AllEntities> struct BusData</*bus_idx=*/3, AllEntities> {
+        static auto& values(const AllEntities& in) { return in.third_app_calldata; }
+        static auto& selector(const AllEntities& in) { return in.q_4; }
+        static auto& inverses(AllEntities& in) { return in.third_app_calldata_inverses; }
+        static auto& inverses(const AllEntities& in) { return in.third_app_calldata_inverses; } // const version
+        static auto& read_counts(const AllEntities& in) { return in.third_app_calldata_read_counts; }
+    };
+
+    // Specialization for return data (bus_idx = 4)
+    template <typename AllEntities> struct BusData</*bus_idx=*/4, AllEntities> {
+        static auto& values(const AllEntities& in) { return in.return_data; }
+        static auto& selector(const AllEntities& in) { return in.q_m; }
         static auto& inverses(AllEntities& in) { return in.return_data_inverses; }
         static auto& inverses(const AllEntities& in) { return in.return_data_inverses; } // const version
         static auto& read_counts(const AllEntities& in) { return in.return_data_read_counts; }
@@ -143,7 +161,7 @@ template <typename FF_> class DatabusLookupRelationImpl {
      * @brief Compute scalar for read term in log derivative lookup argument
      *
      * @details The selector indicating read from bus column \f$j\f$ is given by
-     * \f$q_{\text{busread}} \cdot q_j\f$, where \f$j \in \{1, 2, 3\}\f$.
+     * \f$q_{\text{busread}} \cdot q_j\f$, where \f$j \in \{1, 2, 3, 4, 5\}\f$.
      *
      */
     template <typename Accumulator, size_t bus_idx, typename AllEntities>
diff --git a/barretenberg/cpp/src/barretenberg/relations/databus_lookup_relation_consistency.test.cpp b/barretenberg/cpp/src/barretenberg/relations/databus_lookup_relation_consistency.test.cpp
index 3e560312c52b..cfd5f78443f2 100644
--- a/barretenberg/cpp/src/barretenberg/relations/databus_lookup_relation_consistency.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/relations/databus_lookup_relation_consistency.test.cpp
@@ -32,21 +32,33 @@ struct DatabusInputElements {
     FF q_busread;
 
     // Column selectors (determine which bus column is being read)
-    FF q_l; // calldata selector
-    FF q_r; // secondary_calldata selector
-    FF q_o; // return_data selector
-
-    // Calldata (bus_idx = 0)
-    FF calldata;
-    FF calldata_read_counts;
-    FF calldata_inverses;
-
-    // Secondary calldata (bus_idx = 1)
-    FF secondary_calldata;
-    FF secondary_calldata_read_counts;
-    FF secondary_calldata_inverses;
-
-    // Return data (bus_idx = 2)
+    FF q_l; // kernel calldata selector
+    FF q_r; // first app calldata selector
+    FF q_o; // second app calldata selector
+    FF q_4; // third app calldata selector
+    FF q_m; // return data selector
+
+    // Kernel calldata (bus_idx = 0)
+    FF kernel_calldata;
+    FF kernel_calldata_read_counts;
+    FF kernel_calldata_inverses;
+
+    // First app calldata (bus_idx = 1)
+    FF first_app_calldata;
+    FF first_app_calldata_read_counts;
+    FF first_app_calldata_inverses;
+
+    // Second app calldata (bus_idx = 2)
+    FF second_app_calldata;
+    FF second_app_calldata_read_counts;
+    FF second_app_calldata_inverses;
+
+    // Third app calldata (bus_idx = 3)
+    FF third_app_calldata;
+    FF third_app_calldata_read_counts;
+    FF third_app_calldata_inverses;
+
+    // Return data (bus_idx = 4)
     FF return_data;
     FF return_data_read_counts;
     FF return_data_inverses;
@@ -61,40 +73,52 @@ struct DatabusInputElements {
         result.q_l = FF::random_element();
         result.q_r = FF::random_element();
         result.q_o = FF::random_element();
-        result.calldata = FF::random_element();
-        result.calldata_read_counts = FF::random_element();
-        result.calldata_inverses = FF::random_element();
-        result.secondary_calldata = FF::random_element();
-        result.secondary_calldata_read_counts = FF::random_element();
-        result.secondary_calldata_inverses = FF::random_element();
+        result.q_4 = FF::random_element();
+        result.q_m = FF::random_element();
+        result.kernel_calldata = FF::random_element();
+        result.kernel_calldata_read_counts = FF::random_element();
+        result.kernel_calldata_inverses = FF::random_element();
+        result.first_app_calldata = FF::random_element();
+        result.first_app_calldata_read_counts = FF::random_element();
+        result.first_app_calldata_inverses = FF::random_element();
+        result.second_app_calldata = FF::random_element();
+        result.second_app_calldata_read_counts = FF::random_element();
+        result.second_app_calldata_inverses = FF::random_element();
+        result.third_app_calldata = FF::random_element();
+        result.third_app_calldata_read_counts = FF::random_element();
+        result.third_app_calldata_inverses = FF::random_element();
         result.return_data = FF::random_element();
         result.return_data_read_counts = FF::random_element();
         result.return_data_inverses = FF::random_element();
         return result;
     }
 
-    // Create inputs representing a valid read gate for calldata
+    // Create inputs representing a valid read gate for kernel_calldata
     static DatabusInputElements get_valid_calldata_read()
     {
         DatabusInputElements result{};
 
-        // Set up a read from calldata at index 5, value 42
-        result.w_l = FF(42);       // value being read
-        result.w_r = FF(5);        // index
-        result.databus_id = FF(5); // same index in the bus
-        result.calldata = FF(42);  // value in bus matches
+        // Set up a read from kernel_calldata at index 5, value 42
+        result.w_l = FF(42);             // value being read
+        result.w_r = FF(5);              // index
+        result.databus_id = FF(5);       // same index in the bus
+        result.kernel_calldata = FF(42); // value in bus matches
 
-        // Enable read gate for calldata
+        // Enable read gate for kernel_calldata
         result.q_busread = FF(1);
-        result.q_l = FF(1); // calldata selector
+        result.q_l = FF(1); // kernel_calldata selector
         result.q_r = FF(0);
         result.q_o = FF(0);
+        result.q_4 = FF(0);
+        result.q_m = FF(0);
 
         // Read counts
-        result.calldata_read_counts = FF(1);
+        result.kernel_calldata_read_counts = FF(1);
 
         // Other columns inactive
-        result.secondary_calldata_read_counts = FF(0);
+        result.first_app_calldata_read_counts = FF(0);
+        result.second_app_calldata_read_counts = FF(0);
+        result.third_app_calldata_read_counts = FF(0);
         result.return_data_read_counts = FF(0);
 
         return result;
@@ -104,7 +128,7 @@ struct DatabusInputElements {
 class DatabusLookupRelationConsistency : public testing::Test {
   public:
     using Relation = DatabusLookupRelationImpl<FF>;
-    static constexpr size_t NUM_SUBRELATIONS = 9; // 3 subrelations per bus column, 3 columns
+    static constexpr size_t NUM_SUBRELATIONS = Relation::SUBRELATION_PARTIAL_LENGTHS.size();
 
     /**
      * @brief Validate that the relation's accumulate function produces expected values
@@ -122,12 +146,13 @@ class DatabusLookupRelationConsistency : public testing::Test {
 /**
  * @brief Helper to compute all expected subrelation values for a given input
  */
-static std::array<FF, 9> compute_expected_values(const DatabusInputElements& in, const RelationParameters<FF>& params)
+static std::array<FF, DatabusLookupRelationConsistency::NUM_SUBRELATIONS> compute_expected_values(
+    const DatabusInputElements& in, const RelationParameters<FF>& params)
 {
     const auto& beta = params.beta;
     const auto& gamma = params.gamma;
 
-    std::array<FF, 9> expected_values;
+    std::array<FF, DatabusLookupRelationConsistency::NUM_SUBRELATIONS> expected_values;
     std::fill(expected_values.begin(), expected_values.end(), FF(0));
 
     // Read term (same for all columns): value + index * beta + gamma
@@ -152,15 +177,24 @@ static std::array<FF, 9> compute_expected_values(const DatabusInputElements& in,
             expected_values[bus_idx * 3 + 2] = (is_read * table_term - read_counts * lookup_term) * inverses;
         };
 
-    // Bus column 0 (calldata)
-    compute_column_subrelations(0, in.q_l, in.calldata, in.calldata_read_counts, in.calldata_inverses);
+    // Bus column 0 (kernel_calldata)
+    compute_column_subrelations(
+        0, in.q_l, in.kernel_calldata, in.kernel_calldata_read_counts, in.kernel_calldata_inverses);
+
+    // Bus column 1 (first_app_calldata)
+    compute_column_subrelations(
+        1, in.q_r, in.first_app_calldata, in.first_app_calldata_read_counts, in.first_app_calldata_inverses);
+
+    // Bus column 2 (second_app_calldata)
+    compute_column_subrelations(
+        2, in.q_o, in.second_app_calldata, in.second_app_calldata_read_counts, in.second_app_calldata_inverses);
 
-    // Bus column 1 (secondary_calldata)
+    // Bus column 3 (third_app_calldata)
     compute_column_subrelations(
-        1, in.q_r, in.secondary_calldata, in.secondary_calldata_read_counts, in.secondary_calldata_inverses);
+        3, in.q_4, in.third_app_calldata, in.third_app_calldata_read_counts, in.third_app_calldata_inverses);
 
-    // Bus column 2 (return_data)
-    compute_column_subrelations(2, in.q_o, in.return_data, in.return_data_read_counts, in.return_data_inverses);
+    // Bus column 4 (return_data)
+    compute_column_subrelations(4, in.q_m, in.return_data, in.return_data_read_counts, in.return_data_inverses);
 
     return expected_values;
 }
@@ -197,16 +231,28 @@ TEST_F(DatabusLookupRelationConsistency, InactiveGates)
     in.q_l = FF(0);
     in.q_r = FF(0);
     in.q_o = FF(0);
-    in.calldata_read_counts = FF(0);
-    in.secondary_calldata_read_counts = FF(0);
+    in.q_4 = FF(0);
+    in.q_m = FF(0);
+    in.kernel_calldata_read_counts = FF(0);
+    in.first_app_calldata_read_counts = FF(0);
+    in.second_app_calldata_read_counts = FF(0);
+    in.third_app_calldata_read_counts = FF(0);
     in.return_data_read_counts = FF(0);
 
     // Set other values non-zero to ensure they don't affect inactive gates
     in.w_l = FF(42);
     in.w_r = FF(5);
     in.databus_id = FF(5);
-    in.calldata = FF(42);
-    in.calldata_inverses = FF(0); // inverse should be 0 when inactive
+    in.kernel_calldata = FF(42);
+    in.kernel_calldata_inverses = FF(0); // inverse should be 0 when inactive
+    in.first_app_calldata = FF(100);
+    in.first_app_calldata_inverses = FF(0);
+    in.second_app_calldata = FF(200);
+    in.second_app_calldata_inverses = FF(0);
+    in.third_app_calldata = FF(300);
+    in.third_app_calldata_inverses = FF(0);
+    in.return_data = FF(400);
+    in.return_data_inverses = FF(0);
 
     std::array<FF, NUM_SUBRELATIONS> accumulator{};
     Relation::accumulate(accumulator, in, parameters, FF(1));
@@ -229,31 +275,35 @@ TEST_F(DatabusLookupRelationConsistency, ValidInverseComputation)
 
     DatabusInputElements in{};
 
-    // Set up a read gate for calldata
+    // Set up a read gate for kernel_calldata
     in.q_busread = FF(1);
-    in.q_l = FF(1); // calldata selector
+    in.q_l = FF(1); // kernel_calldata selector
     in.q_r = FF(0);
     in.q_o = FF(0);
 
     // Value and index
     FF value = FF(42);
     FF index = FF(5);
-    in.w_l = value;        // value being read
-    in.w_r = index;        // index
-    in.databus_id = index; // same index in the bus
-    in.calldata = value;   // value in bus matches
+    in.w_l = value;             // value being read
+    in.w_r = index;             // index
+    in.databus_id = index;      // same index in the bus
+    in.kernel_calldata = value; // value in bus matches
 
     // Compute the correct inverse
     auto lookup_term = value + index * beta + gamma;
     auto table_term = value + index * beta + gamma; // same since value and index match
     auto inverse = (lookup_term * table_term).invert();
-    in.calldata_inverses = inverse;
+    in.kernel_calldata_inverses = inverse;
 
-    in.calldata_read_counts = FF(1);
+    in.kernel_calldata_read_counts = FF(1);
 
     // Other columns inactive
-    in.secondary_calldata_read_counts = FF(0);
-    in.secondary_calldata_inverses = FF(0);
+    in.first_app_calldata_read_counts = FF(0);
+    in.first_app_calldata_inverses = FF(0);
+    in.second_app_calldata_read_counts = FF(0);
+    in.second_app_calldata_inverses = FF(0);
+    in.third_app_calldata_read_counts = FF(0);
+    in.third_app_calldata_inverses = FF(0);
     in.return_data_read_counts = FF(0);
     in.return_data_inverses = FF(0);
 
@@ -286,7 +336,7 @@ TEST_F(DatabusLookupRelationConsistency, MismatchedReadWriteTerms)
 
     DatabusInputElements in{};
 
-    // Set up a read gate for calldata
+    // Set up a read gate for kernel_calldata
     in.q_busread = FF(1);
     in.q_l = FF(1);
     in.q_r = FF(0);
@@ -300,16 +350,20 @@ TEST_F(DatabusLookupRelationConsistency, MismatchedReadWriteTerms)
     in.w_l = read_value;
     in.w_r = index;
     in.databus_id = index;
-    in.calldata = bus_value;
+    in.kernel_calldata = bus_value;
 
     auto lookup_term = read_value + index * beta + gamma;
     auto table_term = bus_value + index * beta + gamma;
     auto inverse = (lookup_term * table_term).invert();
-    in.calldata_inverses = inverse;
-
-    in.calldata_read_counts = FF(1);
-    in.secondary_calldata_read_counts = FF(0);
-    in.secondary_calldata_inverses = FF(0);
+    in.kernel_calldata_inverses = inverse;
+
+    in.kernel_calldata_read_counts = FF(1);
+    in.first_app_calldata_read_counts = FF(0);
+    in.first_app_calldata_inverses = FF(0);
+    in.second_app_calldata_read_counts = FF(0);
+    in.second_app_calldata_inverses = FF(0);
+    in.third_app_calldata_read_counts = FF(0);
+    in.third_app_calldata_inverses = FF(0);
     in.return_data_read_counts = FF(0);
     in.return_data_inverses = FF(0);
 
@@ -343,19 +397,23 @@ TEST_F(DatabusLookupRelationConsistency, InverseUnconstrainedAtInactiveRows)
     in.q_l = FF(0);
     in.q_r = FF(0);
     in.q_o = FF(0);
-    in.calldata_read_counts = FF(0);
-    in.secondary_calldata_read_counts = FF(0);
+    in.kernel_calldata_read_counts = FF(0);
+    in.first_app_calldata_read_counts = FF(0);
+    in.second_app_calldata_read_counts = FF(0);
+    in.third_app_calldata_read_counts = FF(0);
     in.return_data_read_counts = FF(0);
 
     // Set inverses to arbitrary nonzero values — should not matter
-    in.calldata_inverses = FF(999);
-    in.secondary_calldata_inverses = FF(777);
-    in.return_data_inverses = FF(555);
+    in.kernel_calldata_inverses = FF(999);
+    in.first_app_calldata_inverses = FF(777);
+    in.second_app_calldata_inverses = FF(555);
+    in.third_app_calldata_inverses = FF(333);
+    in.return_data_inverses = FF(111);
 
     in.w_l = FF(42);
     in.w_r = FF(5);
     in.databus_id = FF(5);
-    in.calldata = FF(42);
+    in.kernel_calldata = FF(42);
 
     std::array<FF, NUM_SUBRELATIONS> accumulator{};
     Relation::accumulate(accumulator, in, parameters, FF(1));
@@ -397,13 +455,17 @@ TEST_F(DatabusLookupRelationConsistency, WrongInverseOnReadRowFails)
     in.w_l = value;
     in.w_r = index;
     in.databus_id = index;
-    in.calldata = value;
+    in.kernel_calldata = value;
 
     // Set a WRONG inverse (just some arbitrary value, not 1/(L*T))
-    in.calldata_inverses = FF(777);
-    in.calldata_read_counts = FF(0); // pure read row, no write
-    in.secondary_calldata_read_counts = FF(0);
-    in.secondary_calldata_inverses = FF(0);
+    in.kernel_calldata_inverses = FF(777);
+    in.kernel_calldata_read_counts = FF(0); // pure read row, no write
+    in.first_app_calldata_read_counts = FF(0);
+    in.first_app_calldata_inverses = FF(0);
+    in.second_app_calldata_read_counts = FF(0);
+    in.second_app_calldata_inverses = FF(0);
+    in.third_app_calldata_read_counts = FF(0);
+    in.third_app_calldata_inverses = FF(0);
     in.return_data_read_counts = FF(0);
     in.return_data_inverses = FF(0);
 
@@ -442,16 +504,20 @@ TEST_F(DatabusLookupRelationConsistency, WrongInverseOnWriteRowFails)
     FF value = FF(42);
     FF index = FF(5);
     in.databus_id = index;
-    in.calldata = value;
+    in.kernel_calldata = value;
     in.w_l = FF(0); // irrelevant (no read gate)
     in.w_r = FF(0);
 
     // Row has nonzero read_count (it's been read from elsewhere) but wrong inverse
-    in.calldata_read_counts = FF(3);
-    in.calldata_inverses = FF(999); // WRONG
-
-    in.secondary_calldata_read_counts = FF(0);
-    in.secondary_calldata_inverses = FF(0);
+    in.kernel_calldata_read_counts = FF(3);
+    in.kernel_calldata_inverses = FF(999); // WRONG
+
+    in.first_app_calldata_read_counts = FF(0);
+    in.first_app_calldata_inverses = FF(0);
+    in.second_app_calldata_read_counts = FF(0);
+    in.second_app_calldata_inverses = FF(0);
+    in.third_app_calldata_read_counts = FF(0);
+    in.third_app_calldata_inverses = FF(0);
     in.return_data_read_counts = FF(0);
     in.return_data_inverses = FF(0);
 
@@ -490,7 +556,7 @@ TEST_F(DatabusLookupRelationConsistency, CorrectInverseOnWriteRow)
     FF value = FF(42);
     FF index = FF(5);
     in.databus_id = index;
-    in.calldata = value;
+    in.kernel_calldata = value;
     in.w_l = FF(0);
     in.w_r = FF(0);
 
@@ -498,11 +564,15 @@ TEST_F(DatabusLookupRelationConsistency, CorrectInverseOnWriteRow)
     auto table_term = value + index * beta + gamma;
 
     // Correct inverse
-    in.calldata_inverses = (lookup_term * table_term).invert();
-    in.calldata_read_counts = FF(3);
-
-    in.secondary_calldata_read_counts = FF(0);
-    in.secondary_calldata_inverses = FF(0);
+    in.kernel_calldata_inverses = (lookup_term * table_term).invert();
+    in.kernel_calldata_read_counts = FF(3);
+
+    in.first_app_calldata_read_counts = FF(0);
+    in.first_app_calldata_inverses = FF(0);
+    in.second_app_calldata_read_counts = FF(0);
+    in.second_app_calldata_inverses = FF(0);
+    in.third_app_calldata_read_counts = FF(0);
+    in.third_app_calldata_inverses = FF(0);
     in.return_data_read_counts = FF(0);
     in.return_data_inverses = FF(0);
 
diff --git a/barretenberg/cpp/src/barretenberg/relations/poseidon2_initial_external_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/poseidon2_initial_external_relation.hpp
new file mode 100644
index 000000000000..3bcc759c2251
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/relations/poseidon2_initial_external_relation.hpp
@@ -0,0 +1,86 @@
+#pragma once
+#include "barretenberg/relations/relation_types.hpp"
+
+namespace bb {
+
+/**
+ * @brief Initial-linear-layer relation for Poseidon2 (Mega).
+ *
+ * @details Poseidon2 begins with a linear-only application of the external matrix. Given input
+ * \f$ \mathbf{x} = (x_0, x_1, x_2, x_3) \f$, this relation enforces
+ * \f$ \mathbf{y} = M_E \cdot \mathbf{x} \f$.
+ *
+ * The row's wires hold the raw input; the next row's wires hold M_E · input. That next row is
+ * the first external-round row, which consumes M_E · input as its starting state.
+ *
+ * Subrelations (each × q_poseidon2_external_initial × gate separator, partial degree 3):
+ *   A_0:  5 w_l + 7 w_r +   w_o + 3 w_4  =  w_l_shift
+ *   A_1:  4 w_l + 6 w_r +   w_o +   w_4  =  w_r_shift
+ *   A_2:    w_l + 3 w_r + 5 w_o + 7 w_4  =  w_o_shift
+ *   A_3:    w_l +   w_r + 4 w_o + 6 w_4  =  w_4_shift
+ */
+template <typename FF_> class Poseidon2InitialExternalRelationImpl {
+  public:
+    using FF = FF_;
+
+    static constexpr std::array<size_t, 4> SUBRELATION_PARTIAL_LENGTHS{
+        3, // A_0
+        3, // A_1
+        3, // A_2
+        3, // A_3
+    };
+
+    template <typename AllEntities> inline static bool skip(const AllEntities& in)
+    {
+        return in.q_poseidon2_external_initial.is_zero();
+    }
+
+    template <typename ContainerOverSubrelations, typename AllEntities, typename Parameters>
+    void static accumulate(ContainerOverSubrelations& evals,
+                           const AllEntities& in,
+                           const Parameters&,
+                           const FF& scaling_factor)
+    {
+        using Accumulator = std::tuple_element_t<0, ContainerOverSubrelations>;
+        using CoeffAcc = typename Accumulator::CoefficientAccumulator;
+
+        const auto x_0 = CoeffAcc(in.w_l);
+        const auto x_1 = CoeffAcc(in.w_r);
+        const auto x_2 = CoeffAcc(in.w_o);
+        const auto x_3 = CoeffAcc(in.w_4);
+        const auto y_0 = CoeffAcc(in.w_l_shift);
+        const auto y_1 = CoeffAcc(in.w_r_shift);
+        const auto y_2 = CoeffAcc(in.w_o_shift);
+        const auto y_3 = CoeffAcc(in.w_4_shift);
+
+        const auto q_sel = CoeffAcc(in.q_poseidon2_external_initial);
+        const auto q_by_scaling = Accumulator(q_sel * scaling_factor);
+
+        // Shared partial sums for M_E:
+        //   y0 = 5x0 + 7x1 +  x2 + 3x3 = (4x0 + 6x1 + x2 + x3) + (x0 + x1 + 2x3)
+        //   y1 = 4x0 + 6x1 +  x2 +  x3 = (2x0 + 2x1) + (2x0 + 2x1) + (2x1 + x2 + x3)
+        //   y2 =  x0 + 3x1 + 5x2 + 7x3 = (2x1 + x2 + x3) + (x0 + x1 + 4x2 + 6x3)
+        //   y3 =  x0 +  x1 + 4x2 + 6x3
+        auto t0 = x_0 + x_1;      // x0 + x1
+        auto t1 = x_2 + x_3;      // x2 + x3
+        auto t2 = x_1 + x_1 + t1; // 2x1 + x2 + x3
+        auto t3 = x_3 + x_3 + t0; // x0 + x1 + 2x3
+
+        auto y3_calc = t1 + t1;
+        y3_calc = y3_calc + y3_calc + t3; // 4x2 + 4x3 + (x0 + x1 + 2x3) = x0 + x1 + 4x2 + 6x3
+        auto y1_calc = t0 + t0;
+        y1_calc = y1_calc + y1_calc + t2; // 4x0 + 4x1 + (2x1 + x2 + x3) = 4x0 + 6x1 + x2 + x3
+        auto y0_calc = t3 + y1_calc;      // (x0 + x1 + 2x3) + (4x0 + 6x1 + x2 + x3) = 5x0 + 7x1 + x2 + 3x3
+        auto y2_calc = t2 + y3_calc;      // (2x1 + x2 + x3) + (x0 + x1 + 4x2 + 6x3) = x0 + 3x1 + 5x2 + 7x3
+
+        // Each subrelation: q_sel · (y_k_calc - y_k) = 0.
+        std::get<0>(evals) += q_by_scaling * Accumulator(y0_calc - y_0);
+        std::get<1>(evals) += q_by_scaling * Accumulator(y1_calc - y_1);
+        std::get<2>(evals) += q_by_scaling * Accumulator(y2_calc - y_2);
+        std::get<3>(evals) += q_by_scaling * Accumulator(y3_calc - y_3);
+    }
+};
+
+template <typename FF> using Poseidon2InitialExternalRelation = Relation<Poseidon2InitialExternalRelationImpl<FF>>;
+
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/relations/poseidon2_quad_internal_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/poseidon2_quad_internal_relation.hpp
new file mode 100644
index 000000000000..c3521d8ccba8
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/relations/poseidon2_quad_internal_relation.hpp
@@ -0,0 +1,193 @@
+#pragma once
+#include "barretenberg/crypto/poseidon2/poseidon2_params.hpp"
+#include "barretenberg/crypto/poseidon2/poseidon2_quad_params.hpp"
+#include "relation_types.hpp"
+
+namespace bb {
+
+/**
+ * @brief K=4 compressed internal-round relation for Poseidon2.
+ *
+ * @details Each active row stores state[0] at four consecutive internal rounds:
+ *     w_l = s_0^{(0)}, w_r = s_0^{(1)}, w_o = s_0^{(2)}, w_4 = s_0^{(3)}
+ * and uses q_l, q_r, q_o, q_4 as the four current-round constants. For a non-terminal row, q_m,
+ * q_c, q_5 contain the next quad's first three constants.
+ *
+ * `Poseidon2QuadBn254Params` provides closed-form coefficients for the state after four rounds:
+ *     (out_0, out_1, out_2, out_3).
+ * This relation connects that output to the next compressed row:
+ *     A_0: out_0 = w_l_shift                                                       (direct)
+ *     A_1: out_1 + out_2 + out_3           = b_1_next
+ *     A_2: D_2 out_1 + D_3 out_2 + D_4 out_3 = b_2_next
+ *     A_3: D_2^2 out_1 + D_3^2 out_2 + D_4^2 out_3 = b_3_next
+ * where b_k_next are the Vandermonde right-hand sides reconstructed from the shifted row.
+ *
+ * High-level picture. The relation never recovers any hidden-lane vector — at runtime there is
+ * no matrix inversion and no committed s_1, s_2, s_3 anywhere. Instead, both sides of the
+ * cross-row hidden-lane equation are computed as linear combinations of committed wires, and
+ * only those linear combinations are compared. The trick is:
+ *
+ *   1. Predicted output (from current row): the full state vector at internal round 4(i+1) —
+ *      i.e. one round past the four rounds covered by this quad — is denoted
+ *        (out_0, out_1, out_2, out_3).
+ *      Each component is a fixed linear combination of the current row's committed lane-0 chain
+ *      and S-box outputs (u_0..u_3), precomputed as the closed-form matrix C in
+ *      `Poseidon2QuadBn254Params::tables.closed_form`. Then apply V to the predicted hidden
+ *      lanes (out_1, out_2, out_3) — that's also a fixed linear combination of the same wires,
+ *      precomputed as `forward_vandermonde_lhs`. Call the result LHS_k for k = 1, 2, 3.
+ *   2. Encoded next-row input (from next row): the next row's start-of-row hidden lanes
+ *      (s_1', s_2', s_3') are NOT committed. But Theorem (1) of QUAD_THEOREM.md says
+ *        V · (s_1', s_2', s_3')^T  =  (b_1', b_2', b_3')
+ *      where the b'-formulas express b_k' as an explicit linear combination of the next row's
+ *      committed lane-0 chain and S-box outputs (using the next quad's first three round
+ *      constants, carried on this row in q_m, q_c, q_5 because Mega lacks shifted selectors).
+ *      So V · (next row's hidden input) is computable without ever committing the hidden input
+ *      — call this RHS_k.
+ *   3. Set them equal:
+ *        - lane 0: out_0 = w_l_shift directly (subrelation A_0).
+ *        - lanes 1..3: LHS_k = RHS_k for k = 1, 2, 3 (subrelations A_1, A_2, A_3).
+ *      Both sides are polynomials in committed wires; the verifier evaluates them and checks
+ *      equality. No hidden lanes are ever materialized; no V^{-1} is ever applied at runtime.
+ *
+ * Why equality of encodings suffices. We're really enforcing
+ *      V · (out_1, out_2, out_3)^T  =  V · (s_1', s_2', s_3')^T.
+ * Because V is invertible (D_2, D_3, D_4 pairwise distinct, statically asserted in
+ * `poseidon2_quad_params.hpp`), this is mathematically equivalent to the desired
+ *      (out_1, out_2, out_3)  =  (s_1', s_2', s_3').
+ *
+ * Degree: each subrelation has degree 5 in any single sumcheck variable (all S-boxes land on
+ * distinct wires). Plus selector + gate separator = 7.
+ */
+template <typename FF_> class Poseidon2QuadInternalRelationImpl {
+  public:
+    using FF = FF_;
+    using QuadParams = crypto::Poseidon2QuadBn254Params;
+
+    static constexpr std::array<size_t, 4> SUBRELATION_PARTIAL_LENGTHS{
+        7, // A_0: out_0 - w_l_shift
+        7, // A_1: forward Vandermonde row 1
+        7, // A_2: forward Vandermonde row 2
+        7, // A_3: forward Vandermonde row 3
+    };
+
+    // Constants used by the shifted-row Vandermonde RHS reconstruction.
+    static constexpr fr D1 = QuadParams::D1;
+    static constexpr fr SIGMA_PLUS_2 = QuadParams::SIGMA + fr(2);                   // Σ + 2
+    static constexpr fr B3_U0_COEF = SIGMA_PLUS_2 * D1 - QuadParams::SIGMA - fr(3); // (Σ+2) D_1 - Σ - 3
+    static constexpr fr D1_MINUS_3 = D1 - fr(3);                                    // D_1 - 3
+
+    /**
+     * @brief Skip when the selector is identically zero on this row.
+     */
+    template <typename AllEntities> inline static bool skip(const AllEntities& in)
+    {
+        return in.q_poseidon2_quad_internal.is_zero();
+    }
+
+    template <typename ContainerOverSubrelations, typename AllEntities, typename Parameters>
+    void static accumulate(ContainerOverSubrelations& evals,
+                           const AllEntities& in,
+                           const Parameters&,
+                           const FF& scaling_factor)
+    {
+        using Accumulator = std::tuple_element_t<0, ContainerOverSubrelations>;
+        using CoeffAcc = typename Accumulator::CoefficientAccumulator;
+
+        // Wire values: current row's committed lane-0 chain (state[0] at the four rounds covered
+        // by this quad).
+        const auto w_l = CoeffAcc(in.w_l); // s_0^(0): row's lane-0 at round 4i
+        const auto w_r = CoeffAcc(in.w_r); // s_0^(1): row's lane-0 at round 4i+1
+        const auto w_o = CoeffAcc(in.w_o); // s_0^(2): row's lane-0 at round 4i+2
+        const auto w_4 = CoeffAcc(in.w_4); // s_0^(3): row's lane-0 at round 4i+3
+
+        // Next row's committed lane-0 chain.
+        const auto w_l_shift = CoeffAcc(in.w_l_shift); // next row's s_0^(0) (= state[0] at round 4(i+1))
+        const auto w_r_shift = CoeffAcc(in.w_r_shift); // next row's s_0^(1)
+        const auto w_o_shift = CoeffAcc(in.w_o_shift); // next row's s_0^(2)
+        const auto w_4_shift = CoeffAcc(in.w_4_shift); // next row's s_0^(3)
+
+        // Round constants (current row), used to compute u_0..u_3.
+        const auto q_l = CoeffAcc(in.q_l); // c_{4i}
+        const auto q_r = CoeffAcc(in.q_r); // c_{4i+1}
+        const auto q_o = CoeffAcc(in.q_o); // c_{4i+2}
+        const auto q_4 = CoeffAcc(in.q_4); // c_{4i+3}
+        // Next quad's first three round constants. Needed to compute u_0', u_1', u_2', which
+        // appear in the b'-formulas (RHS of the cross-row encoding equation). Carried on the
+        // current row in q_m, q_c, q_5 because Mega has no shifted selectors.
+        const auto q_m = CoeffAcc(in.q_m); // c_{4(i+1)}
+        const auto q_c = CoeffAcc(in.q_c); // c_{4(i+1)+1}
+        const auto q_5 = CoeffAcc(in.q_5); // c_{4(i+1)+2}
+
+        const auto q_sel = CoeffAcc(in.q_poseidon2_quad_internal);
+
+        // Helper: compute fifth power as Accumulator (degree 5 in the input wire).
+        auto pow5 = [](const Accumulator& x) -> Accumulator {
+            auto sq = x.sqr();
+            auto quart = sq.sqr();
+            return quart * x;
+        };
+
+        // ── Current row: u_k = (s_0^{(k)} + c_k)^5. The four S-box outputs feed the closed-form
+        //                   prediction of the row-end state. ──
+        auto u_0 = pow5(Accumulator(w_l + q_l)); // u_0 = (s_0^(0) + c_{4i})^5
+        auto u_1 = pow5(Accumulator(w_r + q_r)); // u_1 = (s_0^(1) + c_{4i+1})^5
+        auto u_2 = pow5(Accumulator(w_o + q_o)); // u_2 = (s_0^(2) + c_{4i+2})^5
+        auto u_3 = pow5(Accumulator(w_4 + q_4)); // u_3 = (s_0^(3) + c_{4i+3})^5
+
+        // ── Next row's S-box outputs. Together with the next row's lane-0 wires they let us
+        //    forward-compute V · (next row's hidden lanes) via the b'-formulas, without ever
+        //    materializing the hidden lanes themselves. Only three (not four) because the
+        //    b'-formulas only depend on u_0', u_1', u_2'. ──
+        auto u_0_next = pow5(Accumulator(w_l_shift + q_m)); // u_0' = (next_s_0^(0) + c_{4(i+1)})^5
+        auto u_1_next = pow5(Accumulator(w_r_shift + q_c)); // u_1' = (next_s_0^(1) + c_{4(i+1)+1})^5
+        auto u_2_next = pow5(Accumulator(w_o_shift + q_5)); // u_2' = (next_s_0^(2) + c_{4(i+1)+2})^5
+        auto u_0_next_D1 = u_0_next * D1;                   // CSE: D_1 · u_0' is reused in A_1 and A_2
+
+        // Precomputed coefficient vectors. Each is indexed [W_R, W_O, W_4, U_0, U_1, U_2, U_3].
+        const auto& cf0 = QuadParams::tables.closed_form[0];            // out_0 (row-end lane 0)
+        const auto& l0 = QuadParams::tables.forward_vandermonde_lhs[0]; // out_1 + out_2 + out_3
+        const auto& l1 = QuadParams::tables.forward_vandermonde_lhs[1]; // D_2 out_1 + D_3 out_2 + D_4 out_3
+        const auto& l2 = QuadParams::tables.forward_vandermonde_lhs[2]; // D_2² out_1 + D_3² out_2 + D_4² out_3
+
+        // Wire-only parts of the four subrelations. Each subrelation A_K has the form
+        //   A_K  =  (LHS_K computed from current row)  -  (RHS_K computed from next row).
+        // wpK_full collects all the wire-only terms (no u_*) from BOTH sides at once; the u_*
+        // terms are folded in below in aK_body.
+        //   A_0:  LHS = out_0,                              RHS = w_l_shift.
+        //   A_1:  LHS = out_1 + out_2 + out_3,              RHS = b_1' = w_r' - D_1 u_0'.
+        //   A_2:  LHS = D_2 out_1 + D_3 out_2 + D_4 out_3,  RHS = b_2' = w_o' - 2 w_r' + (2 D_1 - 3) u_0' - D_1 u_1'.
+        //   A_3:  LHS = D_2² out_1 + D_3² out_2 + D_4² out_3, RHS = b_3' = w_4' - w_o' - (Σ+2) w_r' + ...
+        // The LHS wire contributions come from cf0 / l0 / l1 / l2 (forward V applied to predicted
+        // output); the RHS wire contributions are the shifted lane-0 wires multiplied by the
+        // coefficients with which they appear in the b'-formulas above.
+        auto wp0_full = w_r * cf0[0] + w_o * cf0[1] + w_4 * cf0[2] - w_l_shift;
+        auto wp1_full = w_r * l0[0] + w_o * l0[1] + w_4 * l0[2] - w_r_shift;
+        auto wp2_full = w_r * l1[0] + w_o * l1[1] + w_4 * l1[2] - w_o_shift + w_r_shift + w_r_shift;
+        auto wp3_full = w_r * l2[0] + w_o * l2[1] + w_4 * l2[2] - w_4_shift + w_o_shift + w_r_shift * SIGMA_PLUS_2;
+
+        const auto q_times_scaling_m = q_sel * scaling_factor;
+        const auto q_times_scaling = Accumulator(q_times_scaling_m);
+
+        // A_0: out_0 - w_l_shift = 0.
+        auto a0_body = u_0 * cf0[3] + u_1 * cf0[4] + u_2 * cf0[5] + u_3 * cf0[6] + Accumulator(wp0_full);
+        std::get<0>(evals) += q_times_scaling * a0_body;
+
+        // A_1: (out_1 + out_2 + out_3) - b_1_next = 0.
+        auto a1_body = u_0 * l0[3] + u_1 * l0[4] + u_2 * l0[5] + u_3 * l0[6] + u_0_next_D1 + Accumulator(wp1_full);
+        std::get<1>(evals) += q_times_scaling * a1_body;
+
+        // A_2: (D_2 out_1 + D_3 out_2 + D_4 out_3) - b_2_next = 0.
+        auto a2_body = u_0 * l1[3] + u_1 * l1[4] + u_2 * l1[5] + u_3 * l1[6] - (u_0_next_D1 + u_0_next_D1) +
+                       (u_0_next + u_0_next + u_0_next) + u_1_next * D1 + Accumulator(wp2_full);
+        std::get<2>(evals) += q_times_scaling * a2_body;
+
+        // A_3: (D_2^2 out_1 + D_3^2 out_2 + D_4^2 out_3) - b_3_next = 0.
+        auto a3_body = u_0 * l2[3] + u_1 * l2[4] + u_2 * l2[5] + u_3 * l2[6] - u_0_next * B3_U0_COEF -
+                       u_1_next * D1_MINUS_3 + u_2_next * D1 + Accumulator(wp3_full);
+        std::get<3>(evals) += q_times_scaling * a3_body;
+    }
+};
+
+template <typename FF> using Poseidon2QuadInternalRelation = Relation<Poseidon2QuadInternalRelationImpl<FF>>;
+
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/relations/poseidon2_quad_internal_terminal_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/poseidon2_quad_internal_terminal_relation.hpp
new file mode 100644
index 000000000000..dc3330182994
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/relations/poseidon2_quad_internal_terminal_relation.hpp
@@ -0,0 +1,99 @@
+#pragma once
+#include "barretenberg/crypto/poseidon2/poseidon2_params.hpp"
+#include "barretenberg/crypto/poseidon2/poseidon2_quad_params.hpp"
+#include "relation_types.hpp"
+
+namespace bb {
+
+/**
+ * @brief Terminal variant of the K=4 compressed internal-round relation.
+ *
+ * @details Same four-round closed-form computation as `Poseidon2QuadInternalRelationImpl`, but
+ * the successor is the standard-encoded bridge row rather than another compressed row. The four
+ * subrelations directly match (out_0, out_1, out_2, out_3) against
+ * (w_l_shift, w_r_shift, w_o_shift, w_4_shift).
+ *
+ * This ties the compressed chain's output state (state[0..3] after 56 internal rounds) to
+ * witnesses that the first final-external gate consumes via shared witness indices.
+ *
+ * Selector layout on the terminal row:
+ *     q_l = c_{4i}, q_r = c_{4i+1}, q_o = c_{4i+2}, q_4 = c_{4i+3}   // this final quad
+ *     q_m, q_c, q_5 = 0 (unused — no next quad)
+ */
+template <typename FF_> class Poseidon2QuadInternalTerminalRelationImpl {
+  public:
+    using FF = FF_;
+    using QuadParams = crypto::Poseidon2QuadBn254Params;
+
+    static constexpr std::array<size_t, 4> SUBRELATION_PARTIAL_LENGTHS{ 7, 7, 7, 7 };
+
+    template <typename AllEntities> inline static bool skip(const AllEntities& in)
+    {
+        return in.q_poseidon2_quad_internal_terminal.is_zero();
+    }
+
+    template <typename ContainerOverSubrelations, typename AllEntities, typename Parameters>
+    void static accumulate(ContainerOverSubrelations& evals,
+                           const AllEntities& in,
+                           const Parameters& /*params*/,
+                           const FF& scaling_factor)
+    {
+        using Accumulator = std::tuple_element_t<0, ContainerOverSubrelations>;
+        using CoeffAcc = typename Accumulator::CoefficientAccumulator;
+
+        const auto w_l = CoeffAcc(in.w_l);
+        const auto w_r = CoeffAcc(in.w_r);
+        const auto w_o = CoeffAcc(in.w_o);
+        const auto w_4 = CoeffAcc(in.w_4);
+
+        const auto w_l_shift = CoeffAcc(in.w_l_shift);
+        const auto w_r_shift = CoeffAcc(in.w_r_shift);
+        const auto w_o_shift = CoeffAcc(in.w_o_shift);
+        const auto w_4_shift = CoeffAcc(in.w_4_shift);
+
+        const auto q_l = CoeffAcc(in.q_l);
+        const auto q_r = CoeffAcc(in.q_r);
+        const auto q_o = CoeffAcc(in.q_o);
+        const auto q_4 = CoeffAcc(in.q_4);
+
+        const auto q_sel = CoeffAcc(in.q_poseidon2_quad_internal_terminal);
+
+        auto pow5 = [](const Accumulator& x) -> Accumulator {
+            auto sq = x.sqr();
+            auto quart = sq.sqr();
+            return quart * x;
+        };
+
+        // S-boxes for the four rounds.
+        auto u_0 = pow5(Accumulator(w_l + q_l));
+        auto u_1 = pow5(Accumulator(w_r + q_r));
+        auto u_2 = pow5(Accumulator(w_o + q_o));
+        auto u_3 = pow5(Accumulator(w_4 + q_4));
+
+        // Closed-form output rows, with shifted bridge-row terms folded into the wire part.
+        const auto& C = QuadParams::tables.closed_form;
+        auto wp_0 = w_r * C[0][0] + w_o * C[0][1] + w_4 * C[0][2] - w_l_shift;
+        auto wp_1 = w_r * C[1][0] + w_o * C[1][1] + w_4 * C[1][2] - w_r_shift;
+        auto wp_2 = w_r * C[2][0] + w_o * C[2][1] + w_4 * C[2][2] - w_o_shift;
+        auto wp_3 = w_r * C[3][0] + w_o * C[3][1] + w_4 * C[3][2] - w_4_shift;
+
+        const auto q_by_scaling_m = q_sel * scaling_factor;
+        const auto q_by_scaling = Accumulator(q_by_scaling_m);
+
+        // Subrelation bodies: out_k - w_*_shift = 0.
+        auto a0_body = u_0 * C[0][3] + u_1 * C[0][4] + u_2 * C[0][5] + u_3 * C[0][6] + Accumulator(wp_0);
+        auto a1_body = u_0 * C[1][3] + u_1 * C[1][4] + u_2 * C[1][5] + u_3 + Accumulator(wp_1);
+        auto a2_body = u_0 * C[2][3] + u_1 * C[2][4] + u_2 * C[2][5] + u_3 + Accumulator(wp_2);
+        auto a3_body = u_0 * C[3][3] + u_1 * C[3][4] + u_2 * C[3][5] + u_3 + Accumulator(wp_3);
+
+        std::get<0>(evals) += q_by_scaling * a0_body;
+        std::get<1>(evals) += q_by_scaling * a1_body;
+        std::get<2>(evals) += q_by_scaling * a2_body;
+        std::get<3>(evals) += q_by_scaling * a3_body;
+    }
+};
+
+template <typename FF>
+using Poseidon2QuadInternalTerminalRelation = Relation<Poseidon2QuadInternalTerminalRelationImpl<FF>>;
+
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/relations/poseidon2_transition_entry_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/poseidon2_transition_entry_relation.hpp
new file mode 100644
index 000000000000..2f6568819fc2
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/relations/poseidon2_transition_entry_relation.hpp
@@ -0,0 +1,134 @@
+#pragma once
+#include "barretenberg/crypto/poseidon2/poseidon2_params.hpp"
+#include "barretenberg/crypto/poseidon2/poseidon2_quad_params.hpp"
+#include "relation_types.hpp"
+
+namespace bb {
+
+/**
+ * @brief Entry transition relation for the K=4 compressed Poseidon2 internal block.
+ *
+ * @details The entry row holds the external-round output in standard encoding:
+ *     (w_l, w_r, w_o, w_4) = (s_0, s_1, s_2, s_3) at the internal-block entry.
+ * Its wires share witness indices with the `poseidon2_external` propagate row, so they
+ * are copy-constrained to the true external output by the permutation relation.
+ *
+ * The successor is the first compressed row, whose wires encode state[0] at 4 consecutive rounds:
+ *     (w_l_shift, w_r_shift, w_o_shift, w_4_shift)
+ *       = (state[0] at round 0, round 1, round 2, round 3).
+ *
+ * w_l_shift = state[0] at round 0 = s_0 is enforced by the permutation relation because it shares
+ * the entry row's w_l witness. The three subrelations below cover rounds 1, 2, 3.
+ *
+ * Each subrelation computes state[0] at the target round using the previous shifted wire, keeping
+ * the per-variable degree at 5.
+ *
+ * Subrelations (each × q_poseidon2_transition_entry × gate separator, degree 7):
+ *
+ *   A_0 (round 1):
+ *     w_r_shift = D_1 u_0 + w_r + w_o + w_4,     u_0 = (w_l + q_l)^5
+ *
+ *   A_1 (round 2):
+ *     w_o_shift = D_1 u_1 + 3 u_0 + (D_2+2) w_r + (D_3+2) w_o + (D_4+2) w_4
+ *     where u_1 = (w_r_shift + q_r)^5.
+ *
+ *   A_2 (round 3):
+ *     w_4_shift = D_1 u_2 + 3 u_1 + (Σ + 6) u_0
+ *                 + (D_2^2 + D_2 + Σ + 4) w_r
+ *                 + (D_3^2 + D_3 + Σ + 4) w_o
+ *                 + (D_4^2 + D_4 + Σ + 4) w_4
+ *     where u_2 = (w_o_shift + q_o)^5.
+ *
+ * Selector layout on the entry row:
+ *     q_l = c_{rounds_f_begin + 0}   // 1st internal round constant
+ *     q_r = c_{rounds_f_begin + 1}
+ *     q_o = c_{rounds_f_begin + 2}
+ *     q_4, q_m, q_c, q_5 = 0 (unused)
+ */
+template <typename FF_> class Poseidon2TransitionEntryRelationImpl {
+  public:
+    using FF = FF_;
+    using QuadParams = crypto::Poseidon2QuadBn254Params;
+
+    static constexpr std::array<size_t, 3> SUBRELATION_PARTIAL_LENGTHS{
+        7, // A_0: w_r_shift check  (state[0] at round 1)
+        7, // A_1: w_o_shift check  (state[0] at round 2)
+        7, // A_2: w_4_shift check  (state[0] at round 3)
+    };
+
+    static constexpr fr D1 = QuadParams::D1;
+
+    // Linear round-propagation vectors shared with the closed-form interior relation:
+    //   A_one[j]  = D_{j+1} + 2                    — wire coefs in A_1 (state[0] at round 2)
+    //   A2_one[j] = D_{j+1}^2 + D_{j+1} + Σ + 4    — wire coefs in A_2 (state[0] at round 3)
+    //   sum_A_one = Σ + 6                          — u_0 coefficient in A_2
+    static constexpr auto& A_one = QuadParams::A_one;
+    static constexpr auto& A2_one = QuadParams::A2_one;
+    static constexpr fr sum_A_one = QuadParams::sum_A_one;
+
+    template <typename AllEntities> inline static bool skip(const AllEntities& in)
+    {
+        return in.q_poseidon2_transition_entry.is_zero();
+    }
+
+    template <typename ContainerOverSubrelations, typename AllEntities, typename Parameters>
+    void static accumulate(ContainerOverSubrelations& evals,
+                           const AllEntities& in,
+                           const Parameters& /*params*/,
+                           const FF& scaling_factor)
+    {
+        using Accumulator = std::tuple_element_t<0, ContainerOverSubrelations>;
+        using CoeffAcc = typename Accumulator::CoefficientAccumulator;
+
+        const auto w_l = CoeffAcc(in.w_l);
+        const auto w_r = CoeffAcc(in.w_r);
+        const auto w_o = CoeffAcc(in.w_o);
+        const auto w_4 = CoeffAcc(in.w_4);
+
+        const auto w_r_shift = CoeffAcc(in.w_r_shift);
+        const auto w_o_shift = CoeffAcc(in.w_o_shift);
+        const auto w_4_shift = CoeffAcc(in.w_4_shift);
+
+        const auto q_l = CoeffAcc(in.q_l);
+        const auto q_r = CoeffAcc(in.q_r);
+        const auto q_o = CoeffAcc(in.q_o);
+        const auto q_sel = CoeffAcc(in.q_poseidon2_transition_entry);
+
+        auto pow5 = [](const Accumulator& x) -> Accumulator {
+            auto sq = x.sqr();
+            auto quart = sq.sqr();
+            return quart * x;
+        };
+
+        // u_0 = (w_l + q_l)^5
+        auto u_0 = pow5(Accumulator(w_l + q_l));
+        // u_1 = (w_r_shift + q_r)^5
+        auto u_1 = pow5(Accumulator(w_r_shift + q_r));
+        // u_2 = (w_o_shift + q_o)^5
+        auto u_2 = pow5(Accumulator(w_o_shift + q_o));
+
+        const auto q_by_scaling_m = q_sel * scaling_factor;
+        const auto q_by_scaling = Accumulator(q_by_scaling_m);
+
+        // Wire parts of the three subrelations, including shifted-row targets.
+        auto wp_0 = w_r + w_o + w_4 - w_r_shift;
+        auto wp_1 = w_r * A_one[0] + w_o * A_one[1] + w_4 * A_one[2] - w_o_shift;
+        auto wp_2 = w_r * A2_one[0] + w_o * A2_one[1] + w_4 * A2_one[2] - w_4_shift;
+
+        // A_0: D_1 u_0 + (w_r + w_o + w_4) - w_r_shift = 0.
+        auto a0_body = u_0 * D1 + Accumulator(wp_0);
+        std::get<0>(evals) += q_by_scaling * a0_body;
+
+        // A_1: D_1 u_1 + 3 u_0 + (A·1)_j-weighted wire combo - w_o_shift = 0.
+        auto a1_body = u_1 * D1 + u_0 * fr(3) + Accumulator(wp_1);
+        std::get<1>(evals) += q_by_scaling * a1_body;
+
+        // A_2: D_1 u_2 + 3 u_1 + (Σ+6) u_0 + (A^2·1)_j-weighted wire combo - w_4_shift = 0.
+        auto a2_body = u_2 * D1 + u_1 * fr(3) + u_0 * sum_A_one + Accumulator(wp_2);
+        std::get<2>(evals) += q_by_scaling * a2_body;
+    }
+};
+
+template <typename FF> using Poseidon2TransitionEntryRelation = Relation<Poseidon2TransitionEntryRelationImpl<FF>>;
+
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/srs/factories/bn254_crs_data.hpp b/barretenberg/cpp/src/barretenberg/srs/factories/bn254_crs_data.hpp
index dcef92ac7df3..1766ac1465c0 100644
--- a/barretenberg/cpp/src/barretenberg/srs/factories/bn254_crs_data.hpp
+++ b/barretenberg/cpp/src/barretenberg/srs/factories/bn254_crs_data.hpp
@@ -30,6 +30,34 @@ inline g1::affine_element get_bn254_g1_second_element()
     return from_buffer<g1::affine_element>(g1_second_data);
 }
 
+/**
+ * @brief Raw 128-byte serialization of the BN254 G2 trusted-setup point [x]_2.
+ * @details Identical to the contents of `bn254_g2.dat` distributed at
+ * https://crs.aztec-cdn.foundation/g2.dat. Exposed as a public constant so callers can
+ * SHA-256-pin the exact CDN bytes (see `BN254_G2_ELEMENT_SHA256` below).
+ */
+inline constexpr std::array<uint8_t, 128> BN254_G2_ELEMENT_BYTES = {
+    0x01, 0x18, 0xc4, 0xd5, 0xb8, 0x37, 0xbc, 0xc2, 0xbc, 0x89, 0xb5, 0xb3, 0x98, 0xb5, 0x97, 0x4e, 0x9f, 0x59, 0x44,
+    0x07, 0x3b, 0x32, 0x07, 0x8b, 0x7e, 0x23, 0x1f, 0xec, 0x93, 0x88, 0x83, 0xb0, 0x26, 0x0e, 0x01, 0xb2, 0x51, 0xf6,
+    0xf1, 0xc7, 0xe7, 0xff, 0x4e, 0x58, 0x07, 0x91, 0xde, 0xe8, 0xea, 0x51, 0xd8, 0x7a, 0x35, 0x8e, 0x03, 0x8b, 0x4e,
+    0xfe, 0x30, 0xfa, 0xc0, 0x93, 0x83, 0xc1, 0x22, 0xfe, 0xbd, 0xa3, 0xc0, 0xc0, 0x63, 0x2a, 0x56, 0x47, 0x5b, 0x42,
+    0x14, 0xe5, 0x61, 0x5e, 0x11, 0xe6, 0xdd, 0x3f, 0x96, 0xe6, 0xce, 0xa2, 0x85, 0x4a, 0x87, 0xd4, 0xda, 0xcc, 0x5e,
+    0x55, 0x04, 0xfc, 0x63, 0x69, 0xf7, 0x11, 0x0f, 0xe3, 0xd2, 0x51, 0x56, 0xc1, 0xbb, 0x9a, 0x72, 0x85, 0x9c, 0xf2,
+    0xa0, 0x46, 0x41, 0xf9, 0x9b, 0xa4, 0xee, 0x41, 0x3c, 0x80, 0xda, 0x6a, 0x5f, 0xe4
+};
+
+/**
+ * @brief SHA-256 hash of `BN254_G2_ELEMENT_BYTES`.
+ * @details Pinned so any G2 ingress (network download, on-disk cache, bbapi caller) can verify it
+ * is delivering the canonical Aztec trusted-setup [x]_2. Mirrors the `BN254_G1_CHUNK_HASHES`
+ * mechanism used for the (much larger) G1 CRS. Update this constant only in lockstep with
+ * `BN254_G2_ELEMENT_BYTES`; the test `CrsFactory.Bn254G2HashMatchesPinnedBytes` enforces this.
+ */
+inline constexpr std::array<uint8_t, 32> BN254_G2_ELEMENT_SHA256 = { 0x01, 0x79, 0x7b, 0xfc, 0x4d, 0xe5, 0xa9, 0x6f,
+                                                                     0x0e, 0x51, 0x6a, 0x9e, 0xa4, 0x53, 0x7d, 0x18,
+                                                                     0x78, 0x6d, 0xc3, 0x0c, 0xb9, 0x91, 0xac, 0xa4,
+                                                                     0x27, 0x4c, 0x95, 0x82, 0x2b, 0x69, 0xc3, 0x2f };
+
 /**
  * @brief Reference BN254 G2 element from the trusted setup CRS
  * @details This is the single G2 point used in the BN254 CRS for verification.
@@ -37,18 +65,7 @@ inline g1::affine_element get_bn254_g1_second_element()
  */
 inline g2::affine_element get_bn254_g2_crs_element()
 {
-    // Hardcoded G2 element (128 bytes) - see reference URL above
-    static constexpr uint8_t g2_data[128] = {
-        0x01, 0x18, 0xc4, 0xd5, 0xb8, 0x37, 0xbc, 0xc2, 0xbc, 0x89, 0xb5, 0xb3, 0x98, 0xb5, 0x97, 0x4e,
-        0x9f, 0x59, 0x44, 0x07, 0x3b, 0x32, 0x07, 0x8b, 0x7e, 0x23, 0x1f, 0xec, 0x93, 0x88, 0x83, 0xb0,
-        0x26, 0x0e, 0x01, 0xb2, 0x51, 0xf6, 0xf1, 0xc7, 0xe7, 0xff, 0x4e, 0x58, 0x07, 0x91, 0xde, 0xe8,
-        0xea, 0x51, 0xd8, 0x7a, 0x35, 0x8e, 0x03, 0x8b, 0x4e, 0xfe, 0x30, 0xfa, 0xc0, 0x93, 0x83, 0xc1,
-        0x22, 0xfe, 0xbd, 0xa3, 0xc0, 0xc0, 0x63, 0x2a, 0x56, 0x47, 0x5b, 0x42, 0x14, 0xe5, 0x61, 0x5e,
-        0x11, 0xe6, 0xdd, 0x3f, 0x96, 0xe6, 0xce, 0xa2, 0x85, 0x4a, 0x87, 0xd4, 0xda, 0xcc, 0x5e, 0x55,
-        0x04, 0xfc, 0x63, 0x69, 0xf7, 0x11, 0x0f, 0xe3, 0xd2, 0x51, 0x56, 0xc1, 0xbb, 0x9a, 0x72, 0x85,
-        0x9c, 0xf2, 0xa0, 0x46, 0x41, 0xf9, 0x9b, 0xa4, 0xee, 0x41, 0x3c, 0x80, 0xda, 0x6a, 0x5f, 0xe4
-    };
-    return from_buffer<g2::affine_element>(g2_data);
+    return from_buffer<g2::affine_element>(BN254_G2_ELEMENT_BYTES.data());
 }
 
 /**
diff --git a/barretenberg/cpp/src/barretenberg/srs/factories/crs_factory.test.cpp b/barretenberg/cpp/src/barretenberg/srs/factories/crs_factory.test.cpp
index 4d89330f886c..5d1585a6175b 100644
--- a/barretenberg/cpp/src/barretenberg/srs/factories/crs_factory.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/srs/factories/crs_factory.test.cpp
@@ -29,9 +29,8 @@ void check_bn254_consistency(const fs::path& crs_download_path, size_t num_point
     // Use get_bn254_g1_data to load reference points (handles compressed/uncompressed automatically)
     auto g1_points = bb::get_bn254_g1_data(bb::srs::bb_crs_path(), num_points, /*allow_download=*/false);
 
-    // read G2
-    auto g2_buf = read_file(bb::srs::bb_crs_path() / "bn254_g2.dat", sizeof(g2::affine_element));
-    auto g2_point = from_buffer<g2::affine_element>(g2_buf);
+    // read and verify G2 (SHA-256-pinned + subgroup-checked)
+    auto g2_point = bb::get_bn254_g2_data(bb::srs::bb_crs_path());
 
     // build in-memory CRS
     MemBn254CrsFactory mem_crs(g1_points, g2_point);
@@ -123,6 +122,64 @@ TEST(CrsFactory, DISABLED_Bn254Fallback)
     fs::remove_all(temp_crs_path);
 }
 
+// The hardcoded `[x]_2` baked into the BB native binary must be a member of the BN254 G2 prime-order subgroup.
+TEST(CrsFactory, Bn254HardcodedG2IsInPrimeSubgroup)
+{
+    auto g2_point = bb::srs::get_bn254_g2_crs_element();
+    ASSERT_TRUE(g2_point.on_curve());
+    EXPECT_TRUE(g2_point.is_in_prime_subgroup());
+}
+
+// Locks `BN254_G2_ELEMENT_SHA256` to the actual hash of `BN254_G2_ELEMENT_BYTES`. If anyone edits
+// the bytes without recomputing the hash (or vice versa), this fails and forces them to fix it.
+TEST(CrsFactory, Bn254G2HashMatchesPinnedBytes)
+{
+    auto hash = bb::crypto::sha256(
+        std::span<const uint8_t>(bb::srs::BN254_G2_ELEMENT_BYTES.data(), bb::srs::BN254_G2_ELEMENT_BYTES.size()));
+    EXPECT_EQ(hash, bb::srs::BN254_G2_ELEMENT_SHA256);
+}
+
+// Round-trip: the on-disk `bn254_g2.dat` provisioned by `barretenberg/crs/bootstrap.sh` must
+// match the pinned canonical bytes byte-for-byte and pass subgroup validation. This catches
+// corruption, accidental SRS swaps, or an outdated CDN payload.
+TEST(CrsFactory, Bn254G2DataLoadsAndVerifies)
+{
+    auto g2_point = bb::get_bn254_g2_data(bb::srs::bb_crs_path());
+    EXPECT_EQ(g2_point, bb::srs::get_bn254_g2_crs_element());
+}
+
+// A tampered `bn254_g2.dat` (corrupted single byte) must be rejected by the SHA-256 check.
+TEST(CrsFactory, Bn254G2CorruptionDetected)
+{
+    const std::filesystem::path temp_path = "barretenberg_srs_test_crs_g2_corruption";
+    fs::remove_all(temp_path);
+    fs::create_directories(temp_path);
+
+    auto corrupted =
+        std::vector<uint8_t>(bb::srs::BN254_G2_ELEMENT_BYTES.begin(), bb::srs::BN254_G2_ELEMENT_BYTES.end());
+    corrupted[64] ^= 0xFF;
+    bb::write_file(temp_path / "bn254_g2.dat", corrupted);
+
+    EXPECT_THROW_OR_ABORT(bb::get_bn254_g2_data(temp_path), "SHA-256 mismatch");
+
+    fs::remove_all(temp_path);
+}
+
+// Check that a `bn254_g2.dat` containing the point at infinity is rejected, even though it is technically on-curve.
+TEST(CrsFactory, Bn254G2InfinityRejected)
+{
+    const std::filesystem::path temp_path = "barretenberg_srs_test_crs_g2_infinity";
+    fs::remove_all(temp_path);
+    fs::create_directories(temp_path);
+
+    std::vector<uint8_t> infinity_bytes(128, 0xFF);
+    bb::write_file(temp_path / "bn254_g2.dat", infinity_bytes);
+
+    EXPECT_THROW_OR_ABORT(bb::get_bn254_g2_data(temp_path), "point at infinity");
+
+    fs::remove_all(temp_path);
+}
+
 TEST(CrsFactory, Bn254CompressedChunkHashFirstChunk)
 {
     // Download the first chunk of compressed CRS from CDN and verify its hash.
diff --git a/barretenberg/cpp/src/barretenberg/srs/factories/get_bn254_crs.cpp b/barretenberg/cpp/src/barretenberg/srs/factories/get_bn254_crs.cpp
index 4b95fcefb2a9..a1e807ccf0e1 100644
--- a/barretenberg/cpp/src/barretenberg/srs/factories/get_bn254_crs.cpp
+++ b/barretenberg/cpp/src/barretenberg/srs/factories/get_bn254_crs.cpp
@@ -69,6 +69,18 @@ size_t round_up_to_chunk_boundary(size_t num_points)
  * @details Verifies all complete chunks in parallel across available cores with early-exit
  * on first mismatch. Also verifies the partial last chunk (if present) so every downloaded byte
  * is covered. Uses std::span to avoid per-chunk memory allocation.
+ *
+ * @note Intentionally invoked from a single site — `download_bn254_g1_data` below — and not from
+ * the cache-hit, MemBn254Crs ctor, or `bbapi::SrsInitSrs` paths. This is the only path that
+ * (a) fetches CRS bytes over plain HTTP, and (b) does not consume bytes that have already been
+ * hash-verified upstream:
+ *   - the cache-hit paths (uncompressed and compressed) read bytes that were verified by this
+ *     function on a previous run before being cached;
+ *   - `bbapi::SrsInitSrs` (bb.js / WASM) receives bytes that bb.js itself fetched over HTTPS,
+ *     where TLS provides transport integrity;
+ *   - `MemBn254Crs` is constructed in-process from already-validated points.
+ * Therefore re-anchoring at every additional call site is redundant; this anchor exists
+ * specifically to compensate for the plain-HTTP fetch on the fresh-download path.
  */
 void verify_bn254_crs_integrity(const std::vector<uint8_t>& data)
 {
@@ -264,4 +276,35 @@ std::vector<g1::affine_element> get_bn254_g1_data(const std::filesystem::path& p
     return get_bn254_g1_data(path, num_points, allow_download, CRS_PRIMARY_URL, CRS_FALLBACK_URL);
 }
 
+// Loads the canonical 128-byte serialization of [x]_2 from disk and verifies it against the pinned
+// SHA-256 and the BN254 G2 prime-order subgroup.
+g2::affine_element get_bn254_g2_data(const std::filesystem::path& path)
+{
+    constexpr size_t G2_BYTES = 128;
+    auto g2_path = path / "bn254_g2.dat";
+    if (get_file_size(g2_path) != G2_BYTES) {
+        throw_or_abort("bn254 g2 data not found at " + path.string() +
+                       " or has wrong size. Run barretenberg/crs/bootstrap.sh to provision.");
+    }
+    auto data = read_file(g2_path, G2_BYTES);
+    auto point = from_buffer<g2::affine_element>(data.data());
+
+    // Reject the point at infinity: it is a member of every subgroup (so subgroup check passes)
+    // but `e(−W, O) = 1` for every W, which collapses the KZG verifier's pairing check and lets
+    // a malicious prover forge arbitrary openings.
+    if (point.is_point_at_infinity()) {
+        throw_or_abort("bn254 g2 cannot be the point at infinity");
+    }
+
+    // Verify SHA-256 hash of the raw bytes matches the pinned constant for canonical [x]_2.
+    auto hash = bb::crypto::sha256(std::span<const uint8_t>(data.data(), data.size()));
+    if (hash != bb::srs::BN254_G2_ELEMENT_SHA256) {
+        throw_or_abort("bn254 g2 SHA-256 mismatch: payload does not match the canonical [x]_2");
+    }
+    if (!point.is_in_prime_subgroup()) {
+        throw_or_abort("bn254 g2 deserialized to a point outside the prime-order subgroup");
+    }
+    return point;
+}
+
 } // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/srs/factories/get_bn254_crs.hpp b/barretenberg/cpp/src/barretenberg/srs/factories/get_bn254_crs.hpp
index 807c3ef4d60d..38893eaf0e41 100644
--- a/barretenberg/cpp/src/barretenberg/srs/factories/get_bn254_crs.hpp
+++ b/barretenberg/cpp/src/barretenberg/srs/factories/get_bn254_crs.hpp
@@ -17,5 +17,5 @@ std::vector<g1::affine_element> get_bn254_g1_data(const std::filesystem::path& p
                                                   const std::string& primary_url,
                                                   const std::string& fallback_url);
 
-g2::affine_element get_bn254_g2_data(const std::filesystem::path& path, bool allow_download = true);
+g2::affine_element get_bn254_g2_data(const std::filesystem::path& path);
 } // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/QUAD_THEOREM.md b/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/QUAD_THEOREM.md
new file mode 100644
index 000000000000..3f530bc36b87
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/QUAD_THEOREM.md
@@ -0,0 +1,397 @@
+# The Core Soundness Theorem (Abstract Form)
+
+This note states, in pure linear-algebra terms with no reference to Poseidon2,
+the single mathematical fact that makes the K=4 compressed internal-round
+layout sound.
+
+For the Poseidon2-specific construction this theorem underpins — the trace
+layout, the explicit $b_k$ formulas, the closed-form coefficient table $C$,
+the entry/interior/terminal subrelations, and the witness-materialization
+strategy — see [README.md](README.md), in particular the
+[Mega Internal Compression](README.md#mega-internal-compression) and
+[Soundness Argument](README.md#soundness-argument) sections.
+
+## Setup
+
+Fix a field $\mathbb{F}$.
+
+Fix four scalars $D_1, D_2, D_3, D_4 \in \mathbb{F}$. The only constraint that
+matters is
+
+$$D_2,\ D_3,\ D_4 \text{ are pairwise distinct.}$$
+
+$D_1$ is unconstrained — it plays no role in the bijection, only in the output
+formula.
+
+Fix an arbitrary "S-box" function $\sigma : \mathbb{F} \to \mathbb{F}$. For
+Poseidon2 on BN254, $\sigma(x) = x^5$. The theorem does **not** use any
+property of $\sigma$ other than that it is a deterministic function. The same
+soundness argument therefore works for any choice of $\sigma$. (Somewhat surprisingly, it works for the zero function!)
+
+Define the $3 \times 3$ matrix $A$ acting on $\mathbb{F}^3$ by
+
+$$A = \mathrm{diag}(D_2, D_3, D_4) + (J - I),$$
+
+where $J$ is the $3 \times 3$ all-ones matrix and $I$ the $3 \times 3$
+identity. Equivalently, for $\vec{v} \in \mathbb{F}^3$ and $i \in \{1, 2, 3\}$,
+
+$$(A \vec{v})_i = D_i\, v_i + \sum_{j \ne i} v_j.$$
+
+Written out:
+
+$$
+A = \begin{bmatrix} D_2 & 1 & 1 \\ 1 & D_3 & 1 \\ 1 & 1 & D_4 \end{bmatrix}.
+$$
+
+Let $\vec{1}$ denote the all-ones column vector in $\mathbb{F}^3$.
+
+## The Dynamical System
+
+The state space is $\mathbb{F} \times \mathbb{F}^3$. We write a state as
+$(s, \vec{v})$ with $s \in \mathbb{F}$ (the *observed lane*) and $\vec{v} \in \mathbb{F}^3$
+(the *hidden lanes*).
+
+Each step is parametrized by a "round constant" $c \in \mathbb{F}$. Given a
+current state $(s, \vec{v})$ and round constant $c$, the next state is
+
+$$\mathrm{next}(s, \vec{v}, c) = \bigl(\, D_1\, \sigma(s + c) + \vec{1}^\top \vec{v},\ \ A \vec{v} + \sigma(s + c) \cdot \vec{1}\, \bigr).$$
+
+In words: compute the S-box output $u := \sigma(s + c)$ (which is notably independent of $\vec{v}$). Then the new observed lane is $D_1 u + \vec{1}^\top \vec{v}$, and the new hidden lanes are $A \vec{v}$ shifted by $u$ in every coordinate.
+
+This is exactly the Poseidon2 internal round acting on
+$(\text{state}[0],\ \text{state}[1..3])$ with $\sigma(x) = x^5$ and round
+constant $c$.
+
+## The Four-Step Iteration
+
+Fix four round constants $c_0, c_1, c_2, c_3 \in \mathbb{F}$. Starting from a
+state $(s_0, \vec{v}_0)$, iterate the step four times:
+
+$$(s_{k+1},\ \vec{v}_{k+1}) = \mathrm{next}(s_k,\ \vec{v}_k,\ c_k), \qquad k = 0, 1, 2, 3.$$
+
+Define the four S-box outputs
+
+$$u_k := \sigma(s_k + c_k), \qquad k = 0, 1, 2, 3.$$
+
+The *lane-0 chain* of the iteration is the tuple $(s_0, s_1, s_2, s_3, s_4)$.
+The *row commitments* the prover supplies are
+
+$$(s_0,\ s_1,\ s_2,\ s_3),$$
+
+the four observed-lane values *before* each S-box. Crucially, the prover does
+**not** commit $\vec{v}_0$. The *row output* is the full final state
+
+$$\mathrm{out} := (s_4, \vec{v}_4) \in \mathbb{F} \times \mathbb{F}^3.$$
+
+## A Crucial Point: Treating the $s_k$ as Independent (or why is the reconstruction of the hidden $\vec{v}_0$ linear?)
+
+Before stating the theorem, it is essential to be precise about what is "committed" versus "derived" — otherwise the statement is wrong. 
+
+A naive reading of the dynamical system says: starting from $(s_0, \vec{v}_0)$
+together with the round constants, the entire iteration is determined. So
+$s_1, s_2, s_3$ are **functions** of $(s_0, \vec{v}_0)$, computed by cascading
+$\sigma$ four times. Under this reading, the map $\vec{v}_0 \mapsto (s_1, s_2, s_3)$
+(with $s_0, c_k$ fixed) is **highly nonlinear** — each $s_{k+1}$ depends on
+$\sigma(s_k + c_k)$, which depends on $\sigma(s_{k-1} + c_{k-1})$, and so on,
+giving a tower of $\sigma$'s with combined degree $5^3$ if $\sigma(x) = x^5$.
+
+That naive reading is **not** what the circuit checks. The compressed-row
+relation does *not* receive $\vec{v}_0$ and recompute the iteration. Instead, the
+prover commits **four independent wires** $(s_0, s_1, s_2, s_3)$, and the
+relation asks:
+
+> Does there exist a $\vec{v}_0 \in \mathbb{F}^3$ such that the four committed
+> values $(s_0, s_1, s_2, s_3)$, together with the recurrence, are
+> consistent — and if so, is that $\vec{v}_0$ unique?
+
+Under this question, $u_k = \sigma(s_k + c_k)$ for $k = 0, 1, 2, 3$ are
+**fixed scalars** computed from the committed wires $s_k$ and the publicly
+known round constants. They do not "cascade through $\sigma$" in $\vec{v}_0$,
+because the $s_k$ are committed independently rather than derived from
+$\vec{v}_0$. With the $u_k$ treated as constants, the constraints
+
+$$
+\begin{aligned}
+s_1 &= D_1 u_0 + \vec{1}^\top \vec{v}_0, \\
+s_2 &= D_1 u_1 + \vec{1}^\top (A \vec{v}_0 + u_0 \vec{1}), \\
+s_3 &= D_1 u_2 + \vec{1}^\top (A^2 \vec{v}_0 + A u_0 \vec{1} + u_1 \vec{1}),
+\end{aligned}
+$$
+
+become a **linear system in $\vec{v}_0$**. This is the system the proof inverts.
+
+Two consequences of this design choice:
+
+* **Per-variable degree stays at 5.** Because the $s_k$ are independent
+  wires, each $u_k$ is a single $\sigma$ applied to one wire — degree 5 in
+  that wire — rather than a cascade that would push the degree to $5^k$. The
+  cost is committing three extra wires per row; the benefit is that the
+  relation polynomial has manageable degree.
+
+* **The recurrence is checked, not assumed.** What forces the prover to use
+  the *correct* $s_1, s_2, s_3$ (i.e. the values that the honest dynamics
+  would produce) is precisely the four subrelations $A_0, A_1, A_2, A_3$
+  that constrain consistency between the committed $s_k$, the unique
+  $\vec{v}_0$ recovered from them, and the adjacent row. Row-locally, every
+  committed lane-0 chain recovers a unique hidden state; globally, a dishonest
+  chain is rejected when its resulting output fails to match the successor row
+  constraints.
+
+With this understanding in place, "the map $\vec{v}_0 \mapsto (s_1, s_2, s_3)$"
+in the theorem below means **the linear-in-$\vec{v}_0$ component of the system
+above**, with the committed-wire S-box outputs $u_0, u_1, u_2$ treated as
+known scalars. This map is genuinely affine in $\vec{v}_0$.
+
+## The Theorem
+
+**Theorem (Quad-row soundness).** *Suppose $D_2, D_3, D_4$ are pairwise
+distinct in $\mathbb{F}$. Then:*
+
+**(1) Hidden-lane uniqueness.** *Fix any committed values
+$(s_0, s_1, s_2, s_3) \in \mathbb{F}^4$, any round constants
+$(c_0, c_1, c_2, c_3) \in \mathbb{F}^4$, and let $u_k := \sigma(s_k + c_k)$
+for $k = 0, 1, 2, 3$ be the resulting fixed scalars. Then there is at most
+one $\vec{v}_0 \in \mathbb{F}^3$ for which the recurrence is consistent with the
+committed $s_k$. Equivalently, the affine map*
+
+$$\vec{v}_0 \ \longmapsto\ (s_1,\ s_2,\ s_3) \qquad (\text{with } s_0,\ c_k,\ u_0, u_1, u_2 \text{ all held fixed})$$
+
+*is a bijection $\mathbb{F}^3 \to \mathbb{F}^3$. Its linear part, after
+subtracting the parts of $(s_1, s_2, s_3)$ that depend only on $s_0$, the
+round constants, and $(u_0, u_1, u_2)$, is captured (after a change of
+basis) by the Vandermonde matrix*
+
+$$
+V = \begin{bmatrix} 1 & 1 & 1 \\ D_2 & D_3 & D_4 \\ D_2^2 & D_3^2 & D_4^2 \end{bmatrix},
+$$
+
+*whose determinant is*
+
+$$\det(V) = (D_3 - D_2)(D_4 - D_2)(D_4 - D_3),$$
+
+*nonzero exactly when the three nodes are pairwise distinct.*
+
+**(2) Closed-form output.** *Once $\vec{v}_0$ is pinned by (1), the output $\mathrm{out}$
+is a fixed $\mathbb{F}$-linear function of $(s_1, s_2, s_3, u_0, u_1, u_2, u_3)$.
+There is a $4 \times 7$ matrix $C$ over $\mathbb{F}$, depending only on
+$(D_1, D_2, D_3, D_4)$, such that*
+
+$$\mathrm{out} = C \cdot (s_1,\ s_2,\ s_3,\ u_0,\ u_1,\ u_2,\ u_3)^\top.$$
+
+*Note that $s_0$ does not appear in this input vector — it enters only through
+$u_0 = \sigma(s_0 + c_0)$.*
+
+The matrix $C$ is what `poseidon2_quad_params.hpp` precomputes and what
+`poseidon2_quad_closed_form.test.cpp` cross-checks against direct iteration.
+
+## What the Theorem Buys You in the Circuit
+
+The relation commits only the lane-0 chain $(s_0, s_1, s_2, s_3)$ on each
+compressed row. Part (1) says the prover gets no freedom in $\vec{v}_0$ — it is
+forced by the committed values together with the publicly fixed round
+constants. Part (2) says the row's output state is a fixed linear function of
+seven quantities, four of which are already committed wires and three of
+which are S-box outputs of committed wires; this is exactly what the four
+interior subrelations check.
+
+In the circuit, the theorem is used in the forward direction: the current
+compressed row determines a unique full four-round output. For an interior
+transition, the relation checks that the successor compressed row starts from
+that output state: its first lane-0 wire equals the output's lane 0, and its
+reconstructed hidden start lanes equal the output's hidden lanes.
+
+The same Vandermonde inversion is also used at the row-to-row boundary: when
+both adjacent rows hide their $\vec{v}$'s, comparing $\vec{v}$'s directly is impossible,
+so the relation instead compares their image under $V$. Because $V$ is
+bijective, equality of images is equivalent to equality of preimages.
+
+## Proof of Part (1): Why the Vandermonde Appears
+
+Recall that $u_0, u_1, u_2, u_3$ are taken as **fixed scalars**, computed
+from the committed wires $s_0, s_1, s_2, s_3$ and the public round
+constants. With the $u_k$ frozen, the recurrence on the hidden lanes is
+linear in $\vec{v}_0$:
+
+$$\vec{v}_{k+1} = A \vec{v}_k + u_k \cdot \vec{1},$$
+
+so
+
+$$\vec{v}_1 = A \vec{v}_0 + u_0 \vec{1},$$
+
+$$\vec{v}_2 = A^2 \vec{v}_0 + (A u_0 + u_1)\, \vec{1},$$
+
+$$\vec{v}_3 = A^3 \vec{v}_0 + (A^2 u_0 + A u_1 + u_2)\, \vec{1}.$$
+
+The observed-lane recurrence reads
+
+$$s_{k+1} = D_1 u_k + \vec{1}^\top \vec{v}_k.$$
+
+Substituting and collecting all terms that do not involve $\vec{v}_0$ — call this
+the *driver-only piece*, since it depends only on $(s_0, c_0, c_1, c_2, c_3,
+u_0, u_1, u_2)$, all of which are fixed scalars — gives
+
+$$s_1 - (\text{driver-only}) = \vec{1}^\top \vec{v}_0,$$
+
+$$s_2 - (\text{driver-only}) = \vec{1}^\top A \vec{v}_0,$$
+
+$$s_3 - (\text{driver-only}) = \vec{1}^\top A^2 \vec{v}_0.$$
+
+In matrix form, the linear part of the map $\vec{v}_0 \mapsto (s_1, s_2, s_3)$ is
+
+$$
+K = \begin{bmatrix} \vec{1}^\top \\ \vec{1}^\top A \\ \vec{1}^\top A^2 \end{bmatrix}
+\quad (\text{a } 3 \times 3 \text{ matrix}).
+$$
+
+The question reduces to: **when is $K$ invertible?**
+
+### A is Diagonalizable with Eigenvalues $D_2, D_3, D_4$
+
+A short calculation gives the characteristic polynomial of $A$:
+
+$$\det(A - x I) = (D_2 - x)(D_3 - x)(D_4 - x).$$
+
+So the eigenvalues of $A$ are exactly $D_2, D_3, D_4$. When they are pairwise
+distinct, $A$ is diagonalizable: there is an invertible $P$ with
+
+$$A = P\, \mathrm{diag}(D_2, D_3, D_4)\, P^{-1}.$$
+
+### $K$ Invertible $\iff$ Vandermonde Invertible
+
+Using $A^k = P\, \mathrm{diag}(D_2^k, D_3^k, D_4^k)\, P^{-1}$,
+
+$$\vec{1}^\top A^k = (P^\top \vec{1})^\top \mathrm{diag}(D_2^k, D_3^k, D_4^k)\, P^{-1}.$$
+
+Set $\vec{w} := P^\top \vec{1} = (w_1, w_2, w_3) \in \mathbb{F}^3$. Stacking the
+three rows for $k = 0, 1, 2$,
+
+$$
+K = \begin{bmatrix} w_1 & w_2 & w_3 \\ w_1 D_2 & w_2 D_3 & w_3 D_4 \\ w_1 D_2^2 & w_2 D_3^2 & w_3 D_4^2 \end{bmatrix} P^{-1}.
+$$
+
+The middle matrix factors as
+
+$$
+\begin{bmatrix} w_1 & w_2 & w_3 \\ w_1 D_2 & w_2 D_3 & w_3 D_4 \\ w_1 D_2^2 & w_2 D_3^2 & w_3 D_4^2 \end{bmatrix} = \begin{bmatrix} 1 & 1 & 1 \\ D_2 & D_3 & D_4 \\ D_2^2 & D_3^2 & D_4^2 \end{bmatrix} \begin{bmatrix} w_1 & 0 & 0 \\ 0 & w_2 & 0 \\ 0 & 0 & w_3 \end{bmatrix} = V \cdot \mathrm{diag}(\vec{w}),
+$$
+
+so $K = V \cdot \mathrm{diag}(\vec{w}) \cdot P^{-1}$ and therefore
+
+$$\det(K) = \det(V) \cdot w_1 w_2 w_3 \cdot \det(P^{-1}).$$
+
+Since $P$ is invertible, $\det(P^{-1}) \ne 0$, so $K$ is invertible iff
+$\det(V) \ne 0$ **and** every $w_i \ne 0$.
+
+* $\det(V) = (D_3 - D_2)(D_4 - D_2)(D_4 - D_3) \ne 0$ iff $D_2, D_3, D_4$ are
+  pairwise distinct. *(This is the static_assert in `poseidon2_quad_params.hpp`.)*
+* $w_i = (P^\top \vec{1})_i$ is the projection of $\vec{1}$ onto the
+  $i$-th left eigenvector of $A$. For this specific $A = \mathrm{diag}(D) + J - I$,
+  each eigenvector on a distinct eigenvalue has nonzero coordinate sum, so
+  $w_i \ne 0$ automatically.
+
+Therefore $K$ is invertible exactly when $D_2, D_3, D_4$ are pairwise
+distinct.
+
+## Proof of Part (2): The Closed Form $C$
+
+Once $\vec{v}_0$ is determined by part (1), every subsequent $\vec{v}_k$ is determined by
+the recurrence $\vec{v}_{k+1} = A \vec{v}_k + u_k \vec{1}$. Iterating four times,
+
+$$\vec{v}_4 = A^4 \vec{v}_0 + (A^3 u_0 + A^2 u_1 + A u_2 + u_3)\, \vec{1},$$
+
+$$s_4 = D_1 u_3 + \vec{1}^\top \vec{v}_3.$$
+
+Substituting $\vec{v}_0 = K^{-1} \cdot (\text{linear in } s_1, s_2, s_3, u_0, u_1, u_2)$
+into both expressions yields
+
+$$\mathrm{out} = C \cdot (s_1, s_2, s_3, u_0, u_1, u_2, u_3)^\top$$
+
+for a fixed $4 \times 7$ matrix $C$ over $\mathbb{F}$. The explicit
+construction of $C$ is in `poseidon2_quad_params.hpp::build_tables`, and the
+random equivalence test in `poseidon2_quad_closed_form.test.cpp` cross-checks
+it against direct four-step iteration.
+
+## What This Depends On
+
+* **$D_2, D_3, D_4$ pairwise distinct.** Asserted at compile time in
+  `poseidon2_quad_params.hpp`.
+* **The all-ones vector has nonzero projection onto every left eigenvector of
+  $A$.** Automatic for $A = \mathrm{diag}(D) + J - I$ when the $D_i$ are
+  distinct, but worth flagging as a side condition; it is what lets
+  "Vandermonde invertible" suffice without a separate runtime check.
+* **$\sigma$ is deterministic.** Used implicitly when we treat $u_k$ as a
+  function of $(s_k, c_k)$. No other property of $\sigma$ matters — in
+  particular the soundness argument is independent of the algebraic degree of
+  the S-box.
+
+That is the entire mathematical content of the soundness proof.
+
+## Generalization: What Other Matrices Would Work?
+
+The proof above used very little structure of $A$. Stripped to its essentials,
+the construction works for any $3 \times 3$ matrix that satisfies a single
+*observability* condition. Stated for general dimension $n$ in place of $3$:
+
+### The Abstract Setup
+
+Replace $\mathbb{F}^3$ by $\mathbb{F}^n$, and choose:
+
+* an $n \times n$ matrix $A$ over $\mathbb{F}$ (the hidden-lane update),
+* a column vector $\vec{b} \in \mathbb{F}^n$ (the *input direction*,
+  controlling how the driver $u$ enters the hidden lanes: $\vec{v}_{k+1} = A \vec{v}_k + u_k \vec{b}$),
+* a row vector $\vec{c}^\top \in \mathbb{F}^n$ (the *output direction*,
+  controlling how the hidden lanes feed back to the observed lane:
+  $s_{k+1} = D_1 u_k + \vec{c}^\top \vec{v}_k$).
+
+In Poseidon2's case, $n = 3$ and $\vec{b} = \vec{c} = \vec{1}$, but
+nothing in the proof actually requires $\vec{b} = \vec{c}$, nor that
+either equals the all-ones vector.
+
+### The Key Condition
+
+Running the system $n$ steps, the linear part of the map
+$\vec{v}_0 \mapsto (s_1, \ldots, s_n)$ is the **observability matrix**
+
+$$
+K = \begin{bmatrix} \vec{c}^\top \\ \vec{c}^\top A \\ \vdots \\ \vec{c}^\top A^{n-1} \end{bmatrix}.
+$$
+
+The construction is sound iff $K$ is invertible — equivalently, iff the pair
+$(A, \vec{c}^\top)$ is *observable*. Note that $\vec{b}$ does not appear in
+the condition: the input direction affects the driver-only piece but not
+recoverability of $\vec{v}_0$.
+
+When $A$ is diagonalizable with distinct eigenvalues $\lambda_1, \ldots, \lambda_n$,
+the same factorization as in the Poseidon2 proof shows $K$ is invertible iff:
+
+1. The $\lambda_i$ are pairwise distinct (Vandermonde nondegeneracy), **and**
+2. $\vec{c}$ has nonzero projection onto every left eigenvector of $A$.
+
+So observability of $(A, \vec{c}^\top)$ — a single condition — splits into
+"distinct eigenvalues" + "output not orthogonal to any eigenvector" in the
+diagonalizable case. Poseidon2 satisfies both: condition (1) by the static
+assertion that $D_2, D_3, D_4$ are distinct, condition (2) automatically
+because eigenvectors of $\mathrm{diag}(D) + J - I$ on distinct eigenvalues
+have nonzero coordinate sum.
+
+### Quick Examples
+
+**Works:** any pure-diagonal $A = \mathrm{diag}(\lambda_1, \ldots, \lambda_n)$
+with distinct $\lambda_i$ and $\vec{c}$ entrywise nonzero; companion matrices
+of separable polynomials with $\vec{c} = \vec{e}_1$; generic circulants over a
+field containing the relevant roots of unity.
+
+**Fails:** $A = \lambda I$ (every vector is an eigenvector, $K$ has rank 1);
+any $A$ with a repeated eigenvalue when $\vec{c}^\top$ annihilates the
+difference of two eigenvectors on that eigenvalue (then $\vec{v}_0$ and a
+shift by that difference produce identical lane-0 chains — a free witness
+channel for the prover).
+
+### Takeaway
+
+The Poseidon2 quad-row layout is one instance of a general phenomenon: any
+observable single-input single-output linear system of dimension $n$ admits
+an $n$-step compression where only the observed lane is committed and the
+hidden state is recovered by inverting the observability matrix. The
+Vandermonde appears as a clean sufficient condition when $A$ is diagonalizable;
+the underlying requirement is just observability.
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/README.md b/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/README.md
index 1c32fa69269c..969f651c6f8a 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/README.md
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/README.md
@@ -1,5 +1,4 @@
-
-#  stdlib Poseidon2 Hash Implementation
+# Stdlib Poseidon2 Hash Implementation
 
 Poseidon2 is a **SNARK-friendly cryptographic hash** designed to be efficient inside prime-field arithmetic circuits.
 It follows the [Poseidon2 paper](https://eprint.iacr.org/2023/323.pdf) and refines the original Poseidon hash.
@@ -7,151 +6,579 @@ It follows the [Poseidon2 paper](https://eprint.iacr.org/2023/323.pdf) and refin
 This implementation includes:
 
 - A **sponge construction** over the BN254 scalar field following the (draft) C2SP Poseidon Sponge spec based on the [Duplex Sponge model](https://keccak.team/files/SpongeDuplex.pdf).
-- The **Poseidon2 permutation**, i.e.\ the round function used by the sponge.
+- The **Poseidon2 permutation**, i.e. the round function used by the sponge.
 - **Circuit custom gate relations** that enforce the permutation’s correctness.
 
+## Contents
+
+- [The Sponge Construction](#the-sponge-construction)
+- [The Poseidon2 Permutation](#the-poseidon2-permutation)
+- [Trace Layouts](#trace-layouts)
+- [Initial External Linear Layer](#initial-external-linear-layer)
+- [External Round Subrelations](#external-round-subrelations)
+- [Mega Internal Compression](#mega-internal-compression)
+- [Compressed Block Subrelations](#compressed-block-subrelations)
+- [Soundness Argument](#soundness-argument)
+- [Witness Materialization](#witness-materialization)
+- [Selectors and File Map](#selectors-and-file-map)
 
 ## The Sponge Construction
 
-The sponge absorbs input elements into an internal state, applies permutations, and squeezes output elements.
+The sponge absorbs input elements into an internal state, applies permutations, and squeezes
+output elements.
 
-#### Sponge constants.
- - **State size (t)**:  4 field elements
- - **Rate (r)**:  3 elements
- - **Capacity (c)**:  1 element
+| Parameter | Value |
+|-----------|-------|
+| State size | $t = 4$ field elements |
+| Rate | $r = 3$ field elements |
+| Capacity | $c = 1$ field element |
+| Domain separator | $\mathrm{IV} = \texttt{input\_length} \ll 64$ |
 
+Let the input be:
 
-### Details
+$$
+\mathbf{a} = (a_0, a_1, \ldots, a_{N-1})
+$$
 
-Let the input be
-\f[
-\mathbf{a} = (a_0, a_1, \dots, a_{N-1}).
-\f]
-Partition it into blocks of size \f$r=3\f$:
-\f[
-B_j = (a_{3j},, a_{3j+1},, a_{3j+2}) \quad\text{(pad missing entries with  0)},\qquad
-m = \left\lceil \frac{N}{3}\right\rceil .
-\f]
+Partition it into rate-sized blocks:
 
-### Padding
-In Poseidon paper, the padding scheme for variable input length hashing suggests padding with \f$ 10^\ast\f$.
+$$
+B_j = (a_{3j}, a_{3j+1}, a_{3j+2}), \qquad
+m = \left\lceil \frac{N}{3}\right\rceil
+$$
 
-"Domain Separation for Poseidon" section (see 4.2 in [Poseidon](https://eprint.iacr.org/2019/458.pdf)) suggests using domain separation IV defined as follows
-\f[
-    \mathrm{IV} = (\texttt{input_length}^{64})
-\f]
-Initialize the state:
-\f[
-    \mathbf{s}^{(0)} = (0,0,0,\mathrm{IV}).
-\f]
+Missing entries in the final block are padded with $0$. This is safe for the variable-length
+sponge because the input length is part of the domain separator. The initial state is:
 
-Since we only use Poseidon2 sponge with variable length inputs and the length is a part of domain separation, we can pad the inputs with \f$ 0^\ast \f$, which would not lead to collisions (tested \ref  StdlibPoseidon2< Builder >::test_padding_collisions "here").
+$$
+\mathbf{s}^{(0)} = (0, 0, 0, \mathrm{IV})
+$$
 
-Note that we initialize \f$ \mathrm{IV} \f$ as a fixed witness. It ensures that the first invocation of the Poseidon2 permutation leads to a state where all entries are **normalized** witnesses, i.e. they have `multiplicative_constant` equal 1, and `additive_constant` equal 0.
+For each block $j = 0, \ldots, m - 1$:
 
-#### Absorb phase
+$$
+\mathbf{s}^{(j+1)} = P\left(\mathbf{s}^{(j)} + (B_j, 0)\right)
+$$
 
-For each block \f$j=0,\dots,m-1\f$,
-\f[
-\mathbf{s}^{(j+1)} = P\left(\mathbf{s}^{(j)} + (B_j,0)\right),
-\f]
-where \f$P\f$ is the Poseidon2 permutation and \f$(B_j,0)\f$ is an array of size \f$ 4 \f$ with \f$r\f$ state elements and a \f$0\f$ capacity limb.
+where $P$ is the Poseidon2 permutation. The single-output squeeze is:
 
-#### Squeeze (single output)
+$$
+y_0 = \left(P(\mathbf{s}^{(m)})\right)_0
+$$
 
-After absorption, produce one output field element via one duplex step:
-\f[
-y_0 = \big(P(\mathbf{s}^{(m)})\big)_0.
-\f]
+The IV is created as a fixed witness so the first permutation starts from normalized stdlib
+field values.
 
 ## The Poseidon2 Permutation
 
-Each permutation consists of:
-
-1. **Initial linear layer**: multiply state by external matrix \f$M_E\f$. Corresponds to  \ref bb::stdlib::Poseidon2Permutation< Builder >::matrix_multiplication_external	 "matrix_multiplication_external" method.
-2. **4 External rounds (full S-box)**:
-   - Record the state and the correspoding round constants \f$ c_{0}^{(i)} \f$ into a \ref bb::UltraCircuitBuilder_< FF >::create_poseidon2_external_gate "Poseidon2 External Gate".
-   - _Natively_ compute the next state.
-   - Re-write the state with the new witnesses.
-   - After the final round, \ref bb::stdlib::Poseidon2Permutation< Builder >::record_current_state_into_next_row "record the computed state" in the next row of the Poseidon2 **external** gates block,
-   as it is required for the custom gate relation.
-3. **56 Internal rounds (partial S-box)**:
-   - Record the state and the correspoding round constants \f$ c_{0}^{(i)} \f$ into a \ref bb::UltraCircuitBuilder_< FF >::create_poseidon2_internal_gate "Poseidon2 Internal Gate".
-   - _Natively_ compute the next state.
-   - Re-write the state with the new witnesses.
-   - After the final round, \ref bb::stdlib::Poseidon2Permutation< Builder >::record_current_state_into_next_row "record the computed state" in the next row of the Poseidon2 **internal** gates block,
-4. **Final external rounds** (same as step 2).
-
-Note that in general, step 1 requires 6 arithmetic gates, the steps 2-4 create total number of rounds + 3 gates. Hence a single invocation of Poseidon2 Permutation results in 73 gates.
-
-### External Matrix
-As proposed in Section 5.1 of [Poseidon2 paper](https://eprint.iacr.org/2023/323.pdf), we set
-\f[
+The mathematical permutation is identical in Ultra and Mega. The difference is only how the
+permutation is encoded in the trace.
+
+```text
+input state
+    |
+    v
+initial external linear layer M_E
+    |
+    v
+4 external rounds  : full S-box on all 4 state entries, then M_E
+    |
+    v
+56 internal rounds : S-box only on state[0], then M_I
+    |
+    v
+4 external rounds  : full S-box on all 4 state entries, then M_E
+    |
+    v
+output state
+```
+
+External matrix:
+
+$$
 M_E =
-    \begin{bmatrix}
-    5 & 7 & 1 & 3 \\
-    4 & 6 & 1 & 1 \\
-    1 & 3 & 5 & 7 \\
-    1 & 1 & 4 & 6
-    \end{bmatrix}
-\f]
+\begin{bmatrix}
+5 & 7 & 1 & 3 \\
+4 & 6 & 1 & 1 \\
+1 & 3 & 5 & 7 \\
+1 & 1 & 4 & 6
+\end{bmatrix}
+$$
 
+Internal matrix, written with the actual diagonal entries $D_i$:
 
-### Internal Matrix
-
-\f[
+$$
 M_I =
-    \begin{bmatrix}
-    D_1 & 1   & 1   & 1 \\
-    1   & D_2 & 1   & 1 \\
-    1   & 1   & D_3 & 1 \\
-    1   & 1   & 1   & D_4
-    \end{bmatrix}
-\f]
-
-**Implementation note:** The code stores `internal_matrix_diagonal_minus_one[i] = D_i - 1` (not the actual diagonal values \f$D_i\f$).
-This is because the algorithm computes \f$v_i = (D_i - 1) \cdot u_i + \text{sum}\f$ where \f$\text{sum} = u_1 + u_2 + u_3 + u_4\f$,
-which equals \f$D_i \cdot u_i + (\text{sum of other elements})\f$.
-
-### Constants
-
-The constants are generated using the sage [script authored by Markus Schofnegger](https://github.com/HorizenLabs/poseidon2/blob/main/poseidon2_rust_params.sage) from Horizen Labs.
-
-### Security Level
-Based on Section 3.2 of [Poseidon2 paper](https://eprint.iacr.org/2023/323.pdf).
-
-Given \f$ R_P = 56 \f$, \f$ R_F = 8\f$, \f$ d = 5\f$, \f$ \log_2(p)  \approx 254 \f$, we get \f$ 128 \f$ bits of security.
-
-## Custom Gate Relations
-
-For an external round with state \f$ \mathbf{u}=(u_1,u_2,u_3,u_4) \f$, define \f$ \mathbf{v}=M_E\cdot\mathbf{u}\f$.
-\ref bb::Poseidon2ExternalRelationImpl< FF_ > "Poseidon2 External Relation" enforces that the permuted values equal the values in the next row (accessed via shifts):
-\f[
-v_k = w_{k,\mathrm{shift}} \qquad \text{for } k \in \{1,2,3,4\}.
-\f]
-
-We encode four independent constraints under a selector \f$ q_{\mathrm{poseidon2_external}}\f$ and aggregate them with
-independent challenges \f$ \alpha_i = \alpha_{i, Poseidon2_ext}\f$ from `SubrelationSeparators`:
-\f[
-q_{\mathrm{poseidon2_external}}\cdot
-\Big(
-\alpha_0\big(v_1 - w_{1,\mathrm{shift}}\big) +
-\alpha_1\big(v_2 - w_{2,\mathrm{shift}}\big) +
-\alpha_2\big(v_3 - w_{3,\mathrm{shift}}\big) +
-\alpha_3\big(v_4 - w_{4,\mathrm{shift}}\big)
-\Big) = 0.
-\f]
-To ensure that the relation holds point-wise on the hypercube, the equation above is also multiplied by the appropriate
-scaling factor arising from \ref bb::GateSeparatorPolynomial< FF > "GateSeparatorPolynomial".
-
-\ref bb::Poseidon2InternalRelationImpl< FF_ > "Internal rounds" follow the same pattern, using \f$ M_I \f$ and the partial S-box on the first element.
-
-
-## Number of Gates
-
-Hashing a single field element costs \f$ 73 \f$ gates. As above, let \f$ N > 1\f$ be the input size. Define \f$ m = \lceil N/3 \rceil \f$ and let \f$ N_3 = N\pmod{3} \f$. The number of gates depends on the number of padded fields equal to \f$ N_3 \f$. If \f$ N_3 =  0\f$, we get
-\f[ 1 +  73\cdot m + 3\cdot (m - 1) \f]
-gates, otherwise we get
-\f[ 1 +  73\cdot m + 3\cdot (m - 2)  + N_3.\f]
-
-According to TACEO blog post [Poseidon{2} for Noir](https://core.taceo.io/articles/poseidon2-for-noir/), a single permutation cost for \f$ t = 4 \f$ implemented without Poseidon2 custom gates is \f$ 2313 \f$ gates.
+\begin{bmatrix}
+D_1 & 1 & 1 & 1 \\
+1 & D_2 & 1 & 1 \\
+1 & 1 & D_3 & 1 \\
+1 & 1 & 1 & D_4
+\end{bmatrix}
+$$
+
+The parameter table stores `internal_matrix_diagonal_minus_one[i] = D_i - 1`, not $D_i$
+itself. This lets the implementation compute the internal matrix product as
+`(D_i - 1) * x_i + sum(x)`, which is equal to $D_i x_i + \sum_{j \ne i} x_j$.
+
+The constants are generated from the Sage script authored by Markus Schofnegger in the Horizen
+Labs Poseidon2 parameter tooling. With `R_P = 56`, `R_F = 8`, `d = 5`, and a 254-bit scalar
+field, the parameter set targets 128-bit security.
+
+## Trace Layouts
+
+Ultra uses the direct layout: one row per internal round, and six arithmetic rows for the
+initial external linear layer.
+
+```text
+Ultra permutation rows
+
+6  arithmetic rows                 initial M_E
+4  poseidon2_external rows          first external rounds
+1  poseidon2_external propagate
+56 poseidon2_internal rows          one partial round each
+1  poseidon2_internal propagate
+4  poseidon2_external rows          final external rounds
+1  poseidon2_external propagate
+--
+73 rows
+```
+
+Mega keeps the same permutation but uses custom rows for the initial external linear layer and
+compresses all 56 internal rounds into K=4 rows.
+
+```text
+Mega permutation rows
+
+1      poseidon2_external           q_poseidon2_external_initial
+4 + 1  poseidon2_external           first external rounds + propagate
+1      poseidon2_quad_internal      q_poseidon2_transition_entry
+13     poseidon2_quad_internal      q_poseidon2_quad_internal
+1      poseidon2_quad_internal      q_poseidon2_quad_internal_terminal
+1      poseidon2_quad_internal      selector-unconstrained standard bridge
+4 + 1  poseidon2_external           final external rounds + propagate
+--
+27 rows
+```
+
+The stdlib hash also has one fixed-witness IV row outside the permutation when it starts from
+the sponge IV.
+
+## Initial External Linear Layer
+
+The initial external linear layer has no S-boxes. Mega constrains it in one row under
+`q_poseidon2_external_initial`, while Ultra emits arithmetic rows for the same matrix product.
+Given:
+
+$$
+\mathbf{x} =
+\begin{bmatrix}
+w_l \\
+w_r \\
+w_o \\
+w_4
+\end{bmatrix},
+\qquad
+\mathbf{y} =
+M_E\mathbf{x},
+$$
+
+the four subrelations constrain the shifted row:
+
+$$
+\begin{aligned}
+A_0 &: y_0 - w_l' = 0, \\
+A_1 &: y_1 - w_r' = 0, \\
+A_2 &: y_2 - w_o' = 0, \\
+A_3 &: y_3 - w_4' = 0.
+\end{aligned}
+$$
+
+## External Round Subrelations
+
+An external round starts from a standard-encoded row:
+
+$$
+(w_l, w_r, w_o, w_4)
+$$
+
+with round constants in `(q_l, q_r, q_o, q_4)`. The relation computes:
+
+$$
+\begin{aligned}
+u_1 &= (w_l + q_l)^5, \\
+u_2 &= (w_r + q_r)^5, \\
+u_3 &= (w_o + q_o)^5, \\
+u_4 &= (w_4 + q_4)^5,
+\end{aligned}
+$$
+
+then applies the external matrix:
+
+$$
+\begin{bmatrix} v_1 \\ v_2 \\ v_3 \\ v_4 \end{bmatrix} = M_E \begin{bmatrix} u_1 \\ u_2 \\ u_3 \\ u_4 \end{bmatrix}.
+$$
+
+The four external subrelations constrain the result against the shifted row:
+
+$$
+\begin{aligned}
+A_0 &: v_1 - w_l' = 0, \\
+A_1 &: v_2 - w_r' = 0, \\
+A_2 &: v_3 - w_o' = 0, \\
+A_3 &: v_4 - w_4' = 0.
+\end{aligned}
+$$
+
+## Mega Internal Compression
+
+Mega uses a K=4 layout: each compressed row commits four consecutive `state[0]` values instead of the full state at every internal round. This is sound because only `state[0]` passes through the internal-round S-box. Once the four S-box outputs are fixed, the update of `state[1..3]` is linear and can be checked through an invertible 3 by 3 linear encoding.
+
+For a self-contained linear-algebra statement of the underlying soundness theorem — abstracted away from Poseidon2-specific notation, with a proof and a discussion of which other matrices the same construction would work for — see [QUAD_THEOREM.md](QUAD_THEOREM.md).
+
+For a quad row that starts at internal round `4i`:
+
+| Wire | Meaning |
+|------|---------|
+| `w_l` | `state[0]` at round `4i` |
+| `w_r` | `state[0]` at round `4i + 1` |
+| `w_o` | `state[0]` at round `4i + 2` |
+| `w_4` | `state[0]` at round `4i + 3` |
+
+The row selectors carry the current quad constants and, for interior rows, the next quad's first
+three constants:
+
+| Selector | Value |
+|----------|-------|
+| `q_l` | `c_{4i}` |
+| `q_r` | `c_{4i+1}` |
+| `q_o` | `c_{4i+2}` |
+| `q_4` | `c_{4i+3}` |
+| `q_m` | `c_{4(i+1)}` |
+| `q_c` | `c_{4(i+1)+1}` |
+| `q_5` | `c_{4(i+1)+2}` |
+
+The compression picture is:
+
+```text
+standard state before internal rounds
+    (s0, s1, s2, s3)
+       |
+       | q_poseidon2_transition_entry
+       v
+first quad row
+    (s0^0, s0^1, s0^2, s0^3)
+       |
+       | 13 q_poseidon2_quad_internal rows
+       v
+terminal quad row
+    (s0^52, s0^53, s0^54, s0^55)
+       |
+       | q_poseidon2_quad_internal_terminal
+       v
+standard bridge row
+    (s0^56, s1^56, s2^56, s3^56)
+       |
+       v
+final external rounds
+```
+
+## Compressed Block Subrelations
+
+Every subrelation in the compressed block enforces the Poseidon2 internal-round recurrence in the encoding appropriate for its boundary:
+
+| Boundary | What's known | What the subrelations enforce |
+|---|---|---|
+| **Entry** | full standard state at row-start | first three `state[0]` values of the first compressed row |
+| **Interior** | `state[0]` chain on this row and the next | four-round output, with the next row's `state[1..3]` checked through the same linear encoding |
+| **Terminal** | `state[0]` chain on this row, full standard state on the next bridge row | four-round output matched directly against the bridge row |
+
+The interior and terminal boundaries share a four-round closed form that we cover first.
+
+### Closed Form for Four Rounds
+
+Write the committed quad-row wires as:
+
+$$
+(w_l, w_r, w_o, w_4) = (s_0^{(0)}, s_0^{(1)}, s_0^{(2)}, s_0^{(3)})
+$$
+
+and define the four S-box outputs:
+
+$$
+u_k = (s_0^{(k)} + c_{4i+k})^5, \qquad k \in \{0, 1, 2, 3\}.
+$$
+
+The row does not store `state[1..3]`. Instead, the claimed successor values
+$w_r = s_0^{(1)}$, $w_o = s_0^{(2)}$, and $w_4 = s_0^{(3)}$ determine three linear
+combinations of the hidden start-of-row values
+$(s_1^{(0)}, s_2^{(0)}, s_3^{(0)})$. For this reconstruction, use Vandermonde nodes
+$\lambda_1 = D_2$, $\lambda_2 = D_3$, and $\lambda_3 = D_4$:
+
+$$
+\begin{bmatrix} 1 & 1 & 1 \\ \lambda_1 & \lambda_2 & \lambda_3 \\ \lambda_1^2 & \lambda_2^2 & \lambda_3^2 \end{bmatrix} \begin{bmatrix} s_1^{(0)} \\ s_2^{(0)} \\ s_3^{(0)} \end{bmatrix} = \begin{bmatrix} b_1 \\ b_2 \\ b_3 \end{bmatrix}.
+$$
+
+Solving the internal-round recurrence gives the right-hand sides:
+
+$$
+\begin{aligned}
+b_1 &= w_r - D_1 u_0, \\
+b_2 &= w_o - 2w_r + (2D_1 - 3)u_0 - D_1u_1, \\
+b_3 &= w_4 - w_o - (\Sigma + 2)w_r \\
+    &\quad + ((\Sigma + 2)D_1 - \Sigma - 3)u_0
+       + (D_1 - 3)u_1 - D_1u_2, \\
+\Sigma &= D_2 + D_3 + D_4.
+\end{aligned}
+$$
+
+The Vandermonde determinant is:
+
+$$
+(\lambda_2 - \lambda_1)(\lambda_3 - \lambda_1)(\lambda_3 - \lambda_2).
+$$
+
+`poseidon2_quad_params.hpp` has `static_assert`s that the three nodes are pairwise distinct,
+so the hidden start-of-row `state[1..3]` values are uniquely determined by the committed
+`state[0]` chain.
+
+After this reconstruction, iterating four internal rounds expresses the row-end state as a
+fixed linear combination of $(w_r, w_o, w_4, u_0, u_1, u_2, u_3)$:
+
+$$
+\operatorname{out} =
+C \cdot
+\begin{bmatrix}
+w_r \\
+w_o \\
+w_4 \\
+u_0 \\
+u_1 \\
+u_2 \\
+u_3
+\end{bmatrix},
+\qquad
+\operatorname{out} =
+(\operatorname{out}_0, \operatorname{out}_1, \operatorname{out}_2, \operatorname{out}_3)
+= (s_0^{(4)}, s_1^{(4)}, s_2^{(4)}, s_3^{(4)}).
+$$
+
+The coefficients of $C$ are precomputed in `poseidon2_quad_params.hpp` and unit-tested against
+explicit four-step iteration in `poseidon2_quad_closed_form.test.cpp`.
+
+`w_l` does not appear in the input vector because it enters only through $u_0 = (w_l + c_{4i})^5$.
+
+Thus `out` is the predicted Poseidon2 state after the four internal rounds represented by this
+quad row. The boundary subrelations check this predicted state against the successor row. For a
+terminal row, the successor exposes all four output state entries directly. For an interior row,
+the successor again exposes only its `state[0]` chain, so the relation compares `out_0`
+directly and compares `out_1..out_3` through the same Vandermonde encoding.
+
+### Entry: Standard to First Quad Row
+
+The entry row holds $(s_0^{(0)}, s_1^{(0)}, s_2^{(0)}, s_3^{(0)})$ in standard encoding; the
+first compressed row encodes $s_0$ at rounds $0, 1, 2, 3$ as $(w_l', w_r', w_o', w_4')$. The
+entry row's `w_l` and the first compressed row's `w_l'` share a witness index, so the
+permutation argument enforces that both occurrences carry $s_0^{(0)}$.
+
+The three subrelations enforce the `state[0]` recurrence at $k = 0, 1, 2$. Because
+`state[1..3]` are committed on the standard entry row, this boundary does not need a
+Vandermonde reconstruction. With $u_0 = (s_0^{(0)} + c_0)^5$,
+$u_1 = (w_r' + c_1)^5$, $u_2 = (w_o' + c_2)^5$, and $\Sigma = D_2 + D_3 + D_4$:
+
+$$
+\begin{aligned}
+\operatorname{entry}_1 &= D_1 u_0 + s_1^{(0)} + s_2^{(0)} + s_3^{(0)}, \\
+\operatorname{entry}_2 &= D_1 u_1 + 3 u_0
+    + (D_2 + 2) s_1^{(0)} + (D_3 + 2) s_2^{(0)} + (D_4 + 2) s_3^{(0)}, \\
+\operatorname{entry}_3 &= D_1 u_2 + 3 u_1 + (\Sigma + 6) u_0 \\
+    &\quad + (D_2^2 + D_2 + \Sigma + 4) s_1^{(0)}
+        + (D_3^2 + D_3 + \Sigma + 4) s_2^{(0)}
+        + (D_4^2 + D_4 + \Sigma + 4) s_3^{(0)}.
+\end{aligned}
+$$
+
+The entry subrelations are:
+
+$$
+\begin{aligned}
+A_0 &: \operatorname{entry}_1 - w_r' = 0, \\
+A_1 &: \operatorname{entry}_2 - w_o' = 0, \\
+A_2 &: \operatorname{entry}_3 - w_4' = 0.
+\end{aligned}
+$$
+
+Each later S-box ($u_1, u_2$) consumes an already-committed compressed-row wire instead of
+inlining the previous round's S-box, keeping per-variable degree at 5.
+
+This boundary has no hidden degrees of freedom: after the shared witness index fixes $w_l'$,
+the three equations above form a triangular system in the remaining first-compressed-row
+variables $(w_r', w_o', w_4')$. `A_0` fixes $w_r'$. Then `A_1` uses that fixed $w_r'$ in
+$u_1 = (w_r' + c_1)^5$ and fixes $w_o'$. Then `A_2` uses that fixed $w_o'$ in
+$u_2 = (w_o' + c_2)^5$ and fixes $w_4'$. Each subrelation has coefficient $-1$ on the next
+wire it solves for, so the first compressed row is uniquely determined by the standard entry
+state and the fixed round constants.
+
+### Terminal: Final Quad Row to Bridge Row
+
+The terminal row's successor is the standard bridge row carrying $(s_0^{(4)}, s_1^{(4)},
+s_2^{(4)}, s_3^{(4)})$. The four subrelations match the closed-form output directly:
+
+$$
+\begin{aligned}
+A_0 &: \operatorname{out}_0 - w_l' = 0, \\
+A_1 &: \operatorname{out}_1 - w_r' = 0, \\
+A_2 &: \operatorname{out}_2 - w_o' = 0, \\
+A_3 &: \operatorname{out}_3 - w_4' = 0.
+\end{aligned}
+$$
+
+The bridge row's wire indices are reused by the first final-external-round gate, so the same
+four witnesses feed the next standard-encoded block.
+
+This boundary has no hidden degrees of freedom: the successor is a full standard-encoded row,
+and each equation has coefficient $-1$ on a distinct shifted bridge wire. Once the current
+terminal quad row determines `out`, the four bridge wires $(w_l', w_r', w_o', w_4')$ are
+uniquely determined.
+
+### Interior: Quad Row to Quad Row
+
+The interior row's successor is another compressed row that commits only $s_0$ at four rounds.
+The next row's `state[1..3]` values are not committed. Instead, the relation compares their
+Vandermonde encoding against the encoding reconstructed from the next row's `state[0]` chain.
+
+Note that the predicted outputs $(\operatorname{out}_0, \ldots, \operatorname{out}_3)$ are
+themselves **not committed** as wires — they are symbolic linear combinations of the current
+row's committed wires and S-box outputs, expanded inline by the relation. Only $w_l'$ on the
+next row is a fresh witness; the equalities below relate that wire (and the next row's other
+committed lane-0 wires, through the Vandermonde encoding) to a polynomial in the current row's
+wires.
+
+This enforces:
+
+- **$A_0$:** $\operatorname{out}_0 = w_l'$ — first $s_0$ value of the next row matches the
+  predicted $s_0^{(4)}$.
+- **$A_1, A_2, A_3$:** the three Vandermonde combinations of
+  $(\operatorname{out}_1, \operatorname{out}_2, \operatorname{out}_3)$ match the next row's
+  reconstructed encoding.
+
+Concretely, with $b_1'$, $b_2'$, and $b_3'$ reconstructed from the next row's `state[0]` chain
+using the same formulas as above:
+
+$$
+\begin{aligned}
+A_0 &: \operatorname{out}_0 - w_l' = 0, \\
+A_1 &: \operatorname{out}_1 + \operatorname{out}_2 + \operatorname{out}_3 - b_1' = 0, \\
+A_2 &: \lambda_1 \operatorname{out}_1 + \lambda_2 \operatorname{out}_2
+      + \lambda_3 \operatorname{out}_3 - b_2' = 0, \\
+A_3 &: \lambda_1^2 \operatorname{out}_1 + \lambda_2^2 \operatorname{out}_2
+      + \lambda_3^2 \operatorname{out}_3 - b_3' = 0.
+\end{aligned}
+$$
+
+Each subrelation has per-variable degree 5 before multiplying by selector and gate separator,
+giving partial length 7.
+
+This quad-row-to-quad-row transition has no hidden degrees of freedom either. `A_0` fixes the next row's first
+`state[0]` value. The remaining three equations say that the Vandermonde encoding of
+$(\operatorname{out}_1, \operatorname{out}_2, \operatorname{out}_3)$ equals
+$(b_1', b_2', b_3')$, the encoding reconstructed from the next row's claimed `state[0]` chain.
+Because the Vandermonde matrix is invertible, equality of these three encoded values is
+equivalent to equality of the underlying `state[1..3]` values.
+
+## Soundness Argument
+
+The proof obligation is: every accepting Mega trace describes the same 56 internal rounds as the
+direct standard encoding.
+
+```text
+external output
+   |
+   | shared witness indices + entry transition
+   v
+quad row 0
+   |
+   | quad-row-to-quad-row transition
+   v
+quad row 1
+   |
+   | repeated for rows 1..12
+   v
+quad row 13
+   |
+   | terminal transition + shared witness indices
+   v
+final external input
+```
+
+For each interior quad-row-to-quad-row transition:
+
+Steps 1 and 2 are the row-local content of [QUAD_THEOREM.md](QUAD_THEOREM.md); this section
+composes that theorem with the entry, interior, terminal, and shared-witness boundary checks.
+
+1. The row's four `state[0]` values uniquely determine the hidden starting `state[1..3]` values
+   by the Vandermonde reconstruction.
+2. The fixed linear map `C` computes the unique four-round output `out`.
+3. `A_0` fixes the successor row's first `state[0]` value to `out_0`.
+4. `A_1..A_3` force the successor row's reconstructed `state[1..3]` values to equal
+   `(out_1, out_2, out_3)`.
+
+The non-interior transitions close the chain:
+
+| Transition | Why the prover has no freedom |
+|----------|-------------------------------|
+| External output -> entry row | Standard state wires share witness indices with the external propagate row. |
+| Entry row -> first quad row | The entry transition is triangular in `(w_r', w_o', w_4')`, after shared witness indices fix `w_l'`. |
+| Final quad row -> bridge row | The terminal transition directly fixes all four shifted bridge wires. |
+| Bridge row -> final external rows | Bridge witnesses share witness indices with the final external rows. |
+
+Thus the compressed block has no independent witness channel: each committed `state[0]` value
+is fixed by the previous state, and each uncommitted `state[1..3]` value is fixed implicitly by
+an invertible encoding. The terminal bridge then materializes the unique final full state.
+
+## Witness Materialization
+
+Interior quad rows materialize only the next `state[0]` witness. The relation reconstructs
+`state[1..3]` algebraically when checking the row transition, so those three witnesses are not
+created on non-terminal quad rows.
+
+The terminal row materializes the full four-entry state because the following final external
+rounds use the standard encoding.
+
+```text
+non-terminal quad output: create witness for next state[0] only
+terminal quad output:     create witnesses for state[0], state[1], state[2], state[3]
+```
+
+This saves 39 witness variables per permutation: 13 non-terminal quad rows times 3 omitted
+state entries.
+
+## Selectors and File Map
+
+Mega removes `q_poseidon2_internal` and adds the following Poseidon2-specific selectors:
+
+| Selector | Purpose |
+|----------|---------|
+| `q_poseidon2_external_initial` | Initial external linear layer |
+| `q_poseidon2_transition_entry` | Standard-to-quad boundary |
+| `q_poseidon2_quad_internal` | Interior K=4 rows |
+| `q_poseidon2_quad_internal_terminal` | Quad-to-standard terminal boundary |
+| `q_5` | Non-gate selector for the next quad's third round constant |
+
+`q_m`, `q_c`, and `q_5` duplicate the next quad row's first three round constants on the current
+row. They are carried explicitly because Mega relations currently have shifted wire values but do
+not have shifted selector values such as `q_l_shift`, `q_r_shift`, or `q_o_shift`.
+
+Implementation entry points:
+
+| File | Purpose |
+|------|---------|
+| `poseidon2_permutation.cpp` | stdlib permutation trace emission |
+| `relations/poseidon2_initial_external_relation.hpp` | Mega initial linear layer relation |
+| `relations/poseidon2_external_relation.hpp` | External round relation |
+| `relations/poseidon2_transition_entry_relation.hpp` | Entry boundary relation |
+| `relations/poseidon2_quad_internal_relation.hpp` | Interior quad relation |
+| `relations/poseidon2_quad_internal_terminal_relation.hpp` | Terminal boundary relation |
+| `crypto/poseidon2/poseidon2_quad_params.hpp` | Vandermonde constants and static checks |
+| `honk/execution_trace/mega_execution_trace.hpp` | Mega trace blocks and selector partitioning |
+| `flavor/mega_flavor.hpp` | Mega relation and selector set |
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2.quad_internal_soundness.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2.quad_internal_soundness.test.cpp
new file mode 100644
index 000000000000..c6d370fa6155
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2.quad_internal_soundness.test.cpp
@@ -0,0 +1,186 @@
+// Regression tests for the Mega Poseidon2 quad-internal layout and boundary soundness.
+//
+// The Mega Poseidon2 permutation uses a compressed internal block with an entry transition
+// row (standard -> compressed) and a terminal row (compressed -> standard). The transition
+// rows are tied to the surrounding standard-encoded states via copy constraints and shifted
+// wires:
+//
+//   - Entry  (q_poseidon2_transition_entry):
+//       w_r_shift - D_1 (w_l + q_l)^5 - w_r - w_o - w_4 = 0
+//     ties the first compressed row's `w_r` (= v_0 = state[0] one round ahead) to the
+//     standard `s_1` at round `rounds_f_begin`.
+//
+//   - Terminal (q_poseidon2_quad_internal_terminal):
+//       out_k - w_{k,shift} = 0 for k in {0, 1, 2, 3}
+//     ties the compressed chain's computed state at round `p_end` to the selector-unconstrained
+//     standard bridge row consumed by the final external rounds via shared witness indices.
+//
+// CircuitChecker iterates row-major-then-relation-major and short-circuits on the first
+// failing relation. This means a corruption that would in principle break multiple relations
+// is reported as breaking the first one the checker reaches; the tests below note the
+// expected first-detector where it matters.
+
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
+#include "barretenberg/flavor/mega_flavor.hpp"
+#include "barretenberg/op_queue/ecc_op_queue.hpp"
+#include "barretenberg/stdlib/hash/poseidon2/poseidon2_permutation.hpp"
+#include "barretenberg/stdlib/primitives/field/field.hpp"
+#include "barretenberg/stdlib_circuit_builders/mega_circuit_builder.hpp"
+
+#include <gtest/gtest.h>
+
+using namespace bb;
+
+namespace {
+
+class Poseidon2QuadInternalSoundnessTests : public ::testing::Test {
+  public:
+    using Builder = MegaCircuitBuilder;
+    using FF = MegaFlavor::FF;
+    // Quad-internal block layout produced by stdlib::Poseidon2Permutation on Mega:
+    //   row 0        : entry transition (standard encoding)
+    //   rows 1 .. 13 : interior compressed rows
+    //   row 14       : terminal compressed row
+    //   row 15       : standard transition row (selector-unconstrained, copy-constrained to final external rounds)
+    static constexpr size_t quad_entry_row = 0;
+    static constexpr size_t quad_first_interior_row = 1;
+
+    // Build an honest Poseidon2 circuit: hashes a single fixed field element through the
+    // `Poseidon2Permutation::permutation` call used by the stdlib.
+    static std::unique_ptr<Builder> build_honest_permutation(const FF& input_value)
+    {
+        auto builder = std::make_unique<Builder>(std::make_shared<ECCOpQueue>(), /*is_write_vk_mode=*/true);
+        using State = stdlib::Poseidon2Permutation<Builder>::State;
+        State input{
+            stdlib::field_t<Builder>(stdlib::witness_t<Builder>(builder.get(), input_value)),
+            stdlib::field_t<Builder>(stdlib::witness_t<Builder>(builder.get(), FF::zero())),
+            stdlib::field_t<Builder>(stdlib::witness_t<Builder>(builder.get(), FF::zero())),
+            stdlib::field_t<Builder>(stdlib::witness_t<Builder>(builder.get(), FF::zero())),
+        };
+        (void)stdlib::Poseidon2Permutation<Builder>::permutation(builder.get(), input);
+        return builder;
+    }
+};
+
+TEST_F(Poseidon2QuadInternalSoundnessTests, DoesNotMaterializeUnusedNonTerminalStateLimbs)
+{
+    auto builder = std::make_unique<Builder>(std::make_shared<ECCOpQueue>(), /*is_write_vk_mode=*/true);
+    const size_t initial_num_variables = builder->get_num_variables();
+
+    using State = stdlib::Poseidon2Permutation<Builder>::State;
+    State input{
+        stdlib::field_t<Builder>(stdlib::witness_t<Builder>(builder.get(), FF(uint256_t(0xdeadbeefULL)))),
+        stdlib::field_t<Builder>(stdlib::witness_t<Builder>(builder.get(), FF::zero())),
+        stdlib::field_t<Builder>(stdlib::witness_t<Builder>(builder.get(), FF::zero())),
+        stdlib::field_t<Builder>(stdlib::witness_t<Builder>(builder.get(), FF::zero())),
+    };
+    (void)stdlib::Poseidon2Permutation<Builder>::permutation(builder.get(), input);
+
+    // Initial input witnesses + initial-linear-layer output + first-half external-round outputs +
+    // compressed internal witnesses + final-half external-round outputs.
+    //
+    // The non-terminal compressed rows only need state[0] at the next row; state[1..3] are derived by
+    // the relation and are not materialized until the terminal row bridges back to standard encoding.
+    constexpr size_t input_witnesses = 4;
+    constexpr size_t initial_external_output_witnesses = 4;
+    constexpr size_t external_output_witnesses = 8 * 4;
+    constexpr size_t compressed_intermediate_witnesses = 14 * 3;
+    constexpr size_t compressed_next_state_zero_witnesses = 14;
+    constexpr size_t compressed_terminal_standard_limbs = 3;
+    constexpr size_t expected_num_variables = input_witnesses + initial_external_output_witnesses +
+                                              external_output_witnesses + compressed_intermediate_witnesses +
+                                              compressed_next_state_zero_witnesses + compressed_terminal_standard_limbs;
+
+    EXPECT_EQ(builder->get_num_variables() - initial_num_variables, expected_num_variables);
+    EXPECT_TRUE(CircuitChecker::check(*builder));
+}
+
+// Entry boundary: tampering the first compressed row's `w_r` (= intermediate_s0) breaks the
+// entry-transition relation, which enforces
+//   w_r_shift = D_1 (s_0 + c)^5 + s_1 + s_2 + s_3
+// on the entry row (w_r_shift lives in the first compressed row and is the tampered witness).
+TEST_F(Poseidon2QuadInternalSoundnessTests, EntryBoundaryRejectsTamperedIntermediateS0)
+{
+    auto builder = build_honest_permutation(FF(uint256_t(0x1234ULL)));
+    ASSERT_TRUE(CircuitChecker::check(*builder));
+
+    auto& quad = builder->blocks.poseidon2_quad_internal;
+    // Shift the first interior compressed row's w_r (= intermediate_s0) by a nonzero delta.
+    const uint32_t w_r_idx = quad.w_r()[quad_first_interior_row];
+    builder->set_variable(w_r_idx, builder->get_variable(w_r_idx) + FF(1));
+
+    EXPECT_FALSE(CircuitChecker::check(*builder));
+}
+
+// Entry boundary: tampering the entry row's `w_r` (= standard s_1 at round rounds_f_begin)
+// breaks the entry-transition relation as well. `w_r` of the entry row is copy-constrained
+// to the external block's propagate row; modifying it invalidates both the external chain
+// and the entry relation.
+TEST_F(Poseidon2QuadInternalSoundnessTests, EntryBoundaryRejectsTamperedStateOne)
+{
+    auto builder = build_honest_permutation(FF(uint256_t(0xabcdULL)));
+    ASSERT_TRUE(CircuitChecker::check(*builder));
+
+    auto& quad = builder->blocks.poseidon2_quad_internal;
+    const uint32_t w_r_idx = quad.w_r()[quad_entry_row];
+    builder->set_variable(w_r_idx, builder->get_variable(w_r_idx) + FF(7));
+
+    EXPECT_FALSE(CircuitChecker::check(*builder));
+}
+
+// Exit boundary: the standard bridge row (last row of poseidon2_quad_internal) holds `state[1]`
+// at round p_end in its `w_r`. Shifting that witness breaks the terminal relation, which enforces
+// out_1 (computed by the last compressed row) == w_r_shift (the bridge row's w_r).
+TEST_F(Poseidon2QuadInternalSoundnessTests, ExitBoundaryRejectsTamperedStateOne)
+{
+    auto builder = build_honest_permutation(FF(uint256_t(0xcafebabeULL)));
+    ASSERT_TRUE(CircuitChecker::check(*builder));
+
+    auto& quad = builder->blocks.poseidon2_quad_internal;
+    // Last row of the quad-internal block is the standard transition row holding
+    // (s_0, s_1, s_2, s_3) at round p_end in standard encoding.
+    const size_t quad_std_transition_row = quad.size() - 1;
+    const uint32_t state1_idx = quad.w_r()[quad_std_transition_row];
+    builder->set_variable(state1_idx, builder->get_variable(state1_idx) + FF(1));
+
+    EXPECT_FALSE(CircuitChecker::check(*builder));
+}
+
+// Interior chain: corrupting any wire on an interior compressed row breaks the chain's
+// quad-internal relation locally.
+TEST_F(Poseidon2QuadInternalSoundnessTests, InteriorRelationRejectsTamperedWire)
+{
+    auto builder = build_honest_permutation(FF(uint256_t(0xfeedf00dULL)));
+    ASSERT_TRUE(CircuitChecker::check(*builder));
+
+    auto& quad = builder->blocks.poseidon2_quad_internal;
+    // Pick some middle interior row.
+    const size_t interior_row = quad_first_interior_row + 5;
+    const uint32_t w_o_idx = quad.w_o()[interior_row];
+    builder->set_variable(w_o_idx, builder->get_variable(w_o_idx) + FF(1));
+
+    EXPECT_FALSE(CircuitChecker::check(*builder));
+}
+
+// Cross-row encoding test: the interior subrelations A_1, A_2, A_3 compare row i's predicted
+// (out_1, out_2, out_3) against row i+1's reconstructed Vandermonde encoding (b_1', b_2',
+// b_3'), where b_k' is built from row i+1's lane-0 chain. Tampering an interior row's wire
+// perturbs that reconstruction at the *previous* row without touching the previous row's
+// own committed wires — exercising the bijectivity-of-V mechanism that lets the relation
+// compare uncommitted hidden lanes. The tampered wire is also row i+1's own committed wire,
+// so the tamper would also break row i+1's own relation; CircuitChecker may report either
+// site, but both are exercising the same Vandermonde-encoding equality.
+TEST_F(Poseidon2QuadInternalSoundnessTests, CrossRowVandermondeEncodingMismatchRejected)
+{
+    auto builder = build_honest_permutation(FF(uint256_t(0xCAFE1234ULL)));
+    ASSERT_TRUE(CircuitChecker::check(*builder));
+
+    auto& quad = builder->blocks.poseidon2_quad_internal;
+    const size_t row_i_plus_1 = quad_first_interior_row + 6;
+    const uint32_t idx = quad.w_o()[row_i_plus_1];
+    builder->set_variable(idx, builder->get_variable(idx) + FF(1));
+
+    EXPECT_FALSE(CircuitChecker::check(*builder));
+}
+
+} // namespace
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2.test.cpp
index c5ed32d06871..d4436ccf03e5 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2.test.cpp
@@ -12,12 +12,8 @@ auto& engine = numeric::get_debug_randomness();
 }
 
 template <typename Builder> class StdlibPoseidon2 : public testing::Test {
-    using curve = stdlib::bn254<Builder>;
-
-    using byte_array_ct = stdlib::byte_array<Builder>;
     using field_ct = stdlib::field_t<Builder>;
     using witness_ct = stdlib::witness_t<Builder>;
-    using public_witness_ct = stdlib::public_witness_t<Builder>;
     using poseidon2 = typename stdlib::poseidon2<Builder>;
     using native_poseidon2 = crypto::Poseidon2<crypto::Poseidon2Bn254ScalarFieldParams>;
 
@@ -27,16 +23,26 @@ template <typename Builder> class StdlibPoseidon2 : public testing::Test {
 
     static std::size_t gate_count(std::size_t N)
     {
+        // Number of Poseidon2 permutation invocations
+        size_t P_N = (N + 2) / 3;
+        // Number of extra additions in squeeze
+        size_t N_3 = N % 3;
+
+        if constexpr (IsMegaBuilder<Builder>) {
+            // Mega uses the K=4 compressed encoding with a custom initial-linear-layer row.
+            if (P_N == 1) {
+                return 28;
+            }
+            return (N_3 == 0) ? (30 * P_N - 2) : (30 * P_N - 5 + N_3);
+        }
+
+        // Ultra uses the standard single-round encoding (73 gates).
+        constexpr size_t P_cost = 73;
         if (N == 1) {
-            return 73;
+            return P_cost;
         }
-        const size_t P_cost = 73;
         const size_t D_full_adds = 3;
 
-        // Number of Poseidon2 permutation invocations
-        size_t P_N = (N + 2) / 3;
-        // Number of extra additions in sqeeze
-        size_t N_3 = N % 3;
         if (N_3 == 0) {
             return (1 + P_N * P_cost + (P_N - 1) * D_full_adds);
         } else {
@@ -95,8 +101,6 @@ template <typename Builder> class StdlibPoseidon2 : public testing::Test {
 
         left.set_public();
 
-        info("num gates = ", builder.get_num_finalized_gates_inefficient());
-
         bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
@@ -136,7 +140,6 @@ template <typename Builder> class StdlibPoseidon2 : public testing::Test {
             }
         }
 
-        native_poseidon2::hash(inputs);
         EXPECT_THROW_WITH_MESSAGE(poseidon2::hash(witness_inputs), "Sponge inputs should not be stdlib constants");
     }
 
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2_permutation.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2_permutation.cpp
index b79ebb541f57..3ef08c15c7d9 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2_permutation.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2_permutation.cpp
@@ -9,76 +9,208 @@
 #include "barretenberg/honk/execution_trace/gate_data.hpp"
 
 namespace bb::stdlib {
+namespace {
 
 template <typename Builder>
-typename Poseidon2Permutation<Builder>::State Poseidon2Permutation<Builder>::permutation(
-    Builder* builder, const typename Poseidon2Permutation<Builder>::State& input)
+void materialize_constants_for_initial_layer(Builder* builder, typename Poseidon2Permutation<Builder>::State& state)
 {
-    State current_state(input);
-    NativeState current_native_state;
-    for (size_t i = 0; i < t; ++i) {
-        current_native_state[i] = current_state[i].get_value();
+    // The Mega initial-external custom gate records its four inputs by witness index. A constant field_t has no
+    // witness index until it is put into the builder's constant table, while the Ultra six-gate computation below can
+    // use constant field_t values directly.
+    for (auto& state_limb : state) {
+        if (state_limb.is_constant()) {
+            state_limb =
+                field_t<Builder>::from_witness_index(builder, builder->put_constant_variable(state_limb.get_value()));
+        }
     }
+}
 
-    // Apply 1st linear layer both natively and in-circuit.
-    NativePermutation::matrix_multiplication_external(current_native_state);
-    matrix_multiplication_external(current_state);
+template <typename Builder>
+void sync_native_state_from_state(typename Poseidon2Permutation<Builder>::NativeState& native_state,
+                                  const typename Poseidon2Permutation<Builder>::State& state)
+{
+    for (size_t i = 0; i < Poseidon2Permutation<Builder>::t; ++i) {
+        native_state[i] = state[i].get_value();
+    }
+}
 
-    // First set of external rounds
-    constexpr size_t rounds_f_beginning = rounds_f / 2;
-    for (size_t i = 0; i < rounds_f_beginning; ++i) {
+template <typename Builder>
+void apply_external_rounds(Builder* builder,
+                           typename Poseidon2Permutation<Builder>::State& current_state,
+                           typename Poseidon2Permutation<Builder>::NativeState& current_native_state,
+                           const size_t begin,
+                           const size_t end)
+{
+    using Permutation = Poseidon2Permutation<Builder>;
+    using FF = typename Permutation::FF;
+    using Witness = witness_t<Builder>;
+
+    for (size_t i = begin; i < end; ++i) {
         poseidon2_external_gate_<FF> in{ current_state[0].get_witness_index(),
                                          current_state[1].get_witness_index(),
                                          current_state[2].get_witness_index(),
                                          current_state[3].get_witness_index(),
                                          i };
         builder->create_poseidon2_external_gate(in);
-        // calculate the new witnesses
-        NativePermutation::add_round_constants(current_native_state, round_constants[i]);
-        NativePermutation::apply_sbox(current_native_state);
-        NativePermutation::matrix_multiplication_external(current_native_state);
-        for (size_t j = 0; j < t; ++j) {
-            current_state[j] = witness_t<Builder>(builder, current_native_state[j]);
+        Permutation::NativePermutation::add_round_constants(current_native_state, Permutation::round_constants[i]);
+        Permutation::NativePermutation::apply_sbox(current_native_state);
+        Permutation::NativePermutation::matrix_multiplication_external(current_native_state);
+        for (size_t j = 0; j < Permutation::t; ++j) {
+            current_state[j] = Witness(builder, current_native_state[j]);
         }
     }
+}
 
-    propagate_current_state_to_next_row(builder, current_state, builder->blocks.poseidon2_external);
+template <typename Builder>
+void apply_standard_internal_rounds(Builder* builder,
+                                    typename Poseidon2Permutation<Builder>::State& current_state,
+                                    typename Poseidon2Permutation<Builder>::NativeState& current_native_state,
+                                    const size_t rounds_f_beginning,
+                                    const size_t p_end)
+{
+    using Permutation = Poseidon2Permutation<Builder>;
+    using Witness = witness_t<Builder>;
 
-    // Internal rounds
-    const size_t p_end = rounds_f_beginning + rounds_p;
     for (size_t i = rounds_f_beginning; i < p_end; ++i) {
-        poseidon2_internal_gate_<FF> in{ current_state[0].get_witness_index(),
-                                         current_state[1].get_witness_index(),
-                                         current_state[2].get_witness_index(),
-                                         current_state[3].get_witness_index(),
-                                         i };
+        poseidon2_internal_gate_<typename Permutation::FF> in{ current_state[0].get_witness_index(),
+                                                               current_state[1].get_witness_index(),
+                                                               current_state[2].get_witness_index(),
+                                                               current_state[3].get_witness_index(),
+                                                               i };
         builder->create_poseidon2_internal_gate(in);
-        current_native_state[0] += round_constants[i][0];
-        NativePermutation::apply_single_sbox(current_native_state[0]);
-        NativePermutation::matrix_multiplication_internal(current_native_state);
-        for (size_t j = 0; j < t; ++j) {
-            current_state[j] = witness_t<Builder>(builder, current_native_state[j]);
+        current_native_state[0] += Permutation::round_constants[i][0];
+        Permutation::NativePermutation::apply_single_sbox(current_native_state[0]);
+        Permutation::NativePermutation::matrix_multiplication_internal(current_native_state);
+        for (size_t j = 0; j < Permutation::t; ++j) {
+            current_state[j] = Witness(builder, current_native_state[j]);
         }
     }
+    Permutation::propagate_current_state_to_next_row(builder, current_state, builder->blocks.poseidon2_internal);
+}
 
-    propagate_current_state_to_next_row(builder, current_state, builder->blocks.poseidon2_internal);
+void apply_mega_internal_rounds(MegaCircuitBuilder* builder,
+                                typename Poseidon2Permutation<MegaCircuitBuilder>::State& current_state,
+                                typename Poseidon2Permutation<MegaCircuitBuilder>::NativeState& current_native_state,
+                                const size_t rounds_f_beginning)
+{
+    using Permutation = Poseidon2Permutation<MegaCircuitBuilder>;
+    using FF = typename Permutation::FF;
+    using NativeState = typename Permutation::NativeState;
+    using Witness = witness_t<MegaCircuitBuilder>;
 
-    // Remaining external rounds
-    for (size_t i = p_end; i < NUM_ROUNDS; ++i) {
-        poseidon2_external_gate_<FF> in{ current_state[0].get_witness_index(),
-                                         current_state[1].get_witness_index(),
-                                         current_state[2].get_witness_index(),
-                                         current_state[3].get_witness_index(),
-                                         i };
-        builder->create_poseidon2_external_gate(in);
-        // calculate the new witnesses
-        NativePermutation::add_round_constants(current_native_state, round_constants[i]);
-        NativePermutation::apply_sbox(current_native_state);
-        NativePermutation::matrix_multiplication_external(current_native_state);
-        for (size_t j = 0; j < t; ++j) {
-            current_state[j] = witness_t<Builder>(builder, current_native_state[j]);
+    // K=4 compressed encoding: w_l, w_r, w_o, w_4 = state[0] at rounds 4i+0, 4i+1, 4i+2, 4i+3.
+    // (s_1, s_2, s_3) at row-start are derived inside the relation via a 3x3 Vandermonde solve.
+    static_assert(Permutation::rounds_p % 4 == 0);
+    constexpr size_t num_quad_rows = Permutation::rounds_p / 4; // 14 rows for rounds_p = 56
+
+    // Entry transition row (standard encoding): its wires share witness indices with the external
+    // block's propagate row, so they are the true external output. The relation forces the first
+    // compressed row's (w_r_shift, w_o_shift, w_4_shift) to state[0] at rounds start+1, +2, +3.
+    {
+        poseidon2_transition_entry_gate_<FF> in{
+            current_state[0].get_witness_index(),
+            current_state[1].get_witness_index(),
+            current_state[2].get_witness_index(),
+            current_state[3].get_witness_index(),
+            rounds_f_beginning,
+        };
+        builder->create_poseidon2_transition_entry_gate(in);
+    }
+
+    auto advance_internal_round = [](NativeState& state, const FF& round_constant) {
+        state[0] += round_constant;
+        Permutation::NativePermutation::apply_single_sbox(state[0]);
+        Permutation::NativePermutation::matrix_multiplication_internal(state);
+    };
+
+    // Helper: emit one K=4 compressed row (interior or terminal) and advance `current_state`
+    // by 4 internal rounds. The row wires are state[0] at rounds start, start+1, start+2, start+3.
+    auto emit_quad_row = [&](size_t quad_idx, bool is_terminal) {
+        const size_t start = rounds_f_beginning + (4 * quad_idx);
+        const size_t next_start = start + 4; // ignored on terminal
+
+        NativeState state_after_1 = current_native_state;
+        advance_internal_round(state_after_1, Permutation::round_constants[start + 0][0]);
+        auto s0_at_1 = Witness(builder, state_after_1[0]);
+
+        NativeState state_after_2 = state_after_1;
+        advance_internal_round(state_after_2, Permutation::round_constants[start + 1][0]);
+        auto s0_at_2 = Witness(builder, state_after_2[0]);
+
+        NativeState state_after_3 = state_after_2;
+        advance_internal_round(state_after_3, Permutation::round_constants[start + 2][0]);
+        auto s0_at_3 = Witness(builder, state_after_3[0]);
+
+        poseidon2_quad_internal_gate_<FF> in{
+            current_state[0].get_witness_index(), // state[0] at round start
+            s0_at_1.witness_index,                // state[0] at round start+1
+            s0_at_2.witness_index,                // state[0] at round start+2
+            s0_at_3.witness_index,                // state[0] at round start+3
+            start,
+            next_start,
+            is_terminal,
+        };
+        builder->create_poseidon2_quad_internal_gate(in);
+
+        // Advance native state by the 4th round to land on state at round start+4.
+        current_native_state = state_after_3;
+        advance_internal_round(current_native_state, Permutation::round_constants[start + 3][0]);
+
+        // The next non-terminal compressed row only consumes state[0] at round start+4. The remaining limbs are
+        // derived inside the relation and do not need witnesses until the terminal row bridges back to the
+        // standard encoding consumed by the final external rounds.
+        current_state[0] = Witness(builder, current_native_state[0]);
+        if (is_terminal) {
+            for (size_t j = 1; j < Permutation::t; ++j) {
+                current_state[j] = Witness(builder, current_native_state[j]);
+            }
         }
+    };
+
+    // 13 interior compressed rows (covering rounds 0..51 relative)
+    for (size_t q = 0; q < num_quad_rows - 1; ++q) {
+        emit_quad_row(q, /*is_terminal=*/false);
     }
+    // 1 terminal compressed row (covering rounds 52..55 relative)
+    emit_quad_row(num_quad_rows - 1, /*is_terminal=*/true);
+
+    // Standard-transition bridge row: selector-unconstrained, holds state at round p_end in standard
+    // encoding. Shared witness indices with the first final-external gate below.
+    builder->create_unconstrained_gate(builder->blocks.poseidon2_quad_internal,
+                                       current_state[0].get_witness_index(),
+                                       current_state[1].get_witness_index(),
+                                       current_state[2].get_witness_index(),
+                                       current_state[3].get_witness_index());
+}
+
+} // namespace
+
+template <typename Builder>
+typename Poseidon2Permutation<Builder>::State Poseidon2Permutation<Builder>::permutation(
+    Builder* builder, const typename Poseidon2Permutation<Builder>::State& input)
+{
+    State current_state(input);
+    NativeState current_native_state;
+
+    matrix_multiplication_external(current_state);
+    sync_native_state_from_state<Builder>(current_native_state, current_state);
+
+    // First set of external rounds
+    constexpr size_t rounds_f_beginning = rounds_f / 2;
+    apply_external_rounds(builder, current_state, current_native_state, /*begin=*/0, /*end=*/rounds_f_beginning);
+
+    propagate_current_state_to_next_row(builder, current_state, builder->blocks.poseidon2_external);
+
+    // Internal rounds: Mega uses a K=4 compressed block; Ultra keeps the standard one-round layout.
+    const size_t p_end = rounds_f_beginning + rounds_p;
+    if constexpr (IsMegaBuilder<Builder>) {
+        apply_mega_internal_rounds(builder, current_state, current_native_state, rounds_f_beginning);
+    } else {
+        apply_standard_internal_rounds(builder, current_state, current_native_state, rounds_f_beginning, p_end);
+    }
+
+    // Remaining external rounds
+    apply_external_rounds(builder, current_state, current_native_state, /*begin=*/p_end, /*end=*/NUM_ROUNDS);
 
     propagate_current_state_to_next_row(builder, current_state, builder->blocks.poseidon2_external);
 
@@ -91,7 +223,8 @@ typename Poseidon2Permutation<Builder>::State Poseidon2Permutation<Builder>::per
  * \text{state}[3])^{\top}\f$. Where \f$ M_E \f$ is the external round matrix. See `Poseidon2ExternalRelationImpl`.
  */
 template <typename Builder>
-void Poseidon2Permutation<Builder>::matrix_multiplication_external(typename Poseidon2Permutation<Builder>::State& state)
+void Poseidon2Permutation<Builder>::matrix_multiplication_external(State& state)
+    requires(!IsMegaBuilder<Builder>)
 {
     const bb::fr two(2);
     const bb::fr four(4);
@@ -115,6 +248,31 @@ void Poseidon2Permutation<Builder>::matrix_multiplication_external(typename Pose
     state[2] = state[3] + tmp2;
 }
 
+template <typename Builder>
+void Poseidon2Permutation<Builder>::matrix_multiplication_external(State& state)
+    requires IsMegaBuilder<Builder>
+{
+    Builder* builder = validate_context<Builder>(state);
+    BB_ASSERT(builder != nullptr, "Poseidon2 Mega initial external layer needs a builder context");
+
+    NativeState native_state;
+    for (size_t i = 0; i < t; ++i) {
+        native_state[i] = state[i].get_value();
+    }
+    NativePermutation::matrix_multiplication_external(native_state);
+
+    materialize_constants_for_initial_layer(builder, state);
+
+    poseidon2_initial_external_gate_<FF> in{ state[0].get_witness_index(),
+                                             state[1].get_witness_index(),
+                                             state[2].get_witness_index(),
+                                             state[3].get_witness_index() };
+    builder->create_poseidon2_initial_external_gate(in);
+    for (size_t j = 0; j < t; ++j) {
+        state[j] = witness_t<Builder>(builder, native_state[j]);
+    }
+}
+
 template class Poseidon2Permutation<MegaCircuitBuilder>;
 template class Poseidon2Permutation<UltraCircuitBuilder>;
 
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2_permutation.hpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2_permutation.hpp
index 8114bf7323d9..15c3c9b14964 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2_permutation.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2_permutation.hpp
@@ -10,6 +10,7 @@
 #include <cstdint>
 
 #include "barretenberg/crypto/poseidon2/poseidon2_permutation.hpp"
+#include "barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp"
 #include "barretenberg/stdlib/primitives/field/field.hpp"
 
 namespace bb::stdlib {
@@ -19,12 +20,14 @@ namespace bb::stdlib {
  * @details The permutation consists of one initial linear layer, then a set of external rounds, a set of internal
  * rounds, and a set of external rounds.
  *
- * Note that except for the inital linear layer, we compute the round results natively and record them into Poseidon2
- * custom gates. This allows us to heavily reduce the number of arithmetic gates, that would have been otherwise
- * required to perform expensive non-linear S-box operations in-circuit.
+ * Note that we compute the round results natively and record them into Poseidon2 custom gates. This allows us to
+ * heavily reduce the number of arithmetic gates that would have been otherwise required to perform expensive
+ * non-linear S-box operations in-circuit.
  *
- * The external rounds are constrained via `Poseidon2ExternalRelationImpl`.
- * The internal rounds are constrained via `Poseidon2InternalRelationImpl`.
+ * The external rounds are constrained via `Poseidon2ExternalRelationImpl`; Mega also uses
+ * `Poseidon2InitialExternalRelationImpl` for the initial external linear layer. Mega constrains the internal rounds via
+ * a K=4 compressed block (`Poseidon2TransitionEntryRelationImpl`, `Poseidon2QuadInternalRelationImpl`, and
+ * `Poseidon2QuadInternalTerminalRelationImpl`); Ultra uses `Poseidon2InternalRelationImpl`.
  *
  */
 template <typename Builder> class Poseidon2Permutation {
@@ -61,10 +64,13 @@ template <typename Builder> class Poseidon2Permutation {
     static State permutation(Builder* builder, const State& input);
 
     /**
-     * @brief In-circuit method to efficiently multiply the inital state by the external matrix \f$ M_E \f$. Uses 6
-     * aritmetic gates.
+     * @brief In-circuit method to efficiently multiply the initial state by the external matrix \f$ M_E \f$.
      */
-    static void matrix_multiplication_external(State& state);
+    static void matrix_multiplication_external(State& state)
+        requires IsMegaBuilder<Builder>;
+
+    static void matrix_multiplication_external(State& state)
+        requires(!IsMegaBuilder<Builder>);
 
     /**
      * @brief  The result of applying a round of Poseidon2 is stored in the next row and is accessed by Poseidon2
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/databus/databus.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/databus/databus.hpp
index 209125db27c4..6f57902aa8f4 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/databus/databus.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/databus/databus.hpp
@@ -23,6 +23,8 @@ template <typename Builder> class databus {
         using field_pt = field_t<Builder>;
 
       public:
+        bus_vector() = default;
+
         bus_vector(const BusId bus_idx)
             : bus_idx(bus_idx) {};
 
@@ -59,9 +61,15 @@ template <typename Builder> class databus {
     };
 
   public:
-    // The columns of the DataBus
-    bus_vector calldata{ BusId::CALLDATA };
-    bus_vector secondary_calldata{ BusId::SECONDARY_CALLDATA };
+    // The columns of the DataBus.
+    bus_vector kernel_calldata{ BusId::KERNEL_CALLDATA };
+    std::array<bus_vector, MAX_APPS_PER_KERNEL> app_calldata = []() {
+        std::array<bus_vector, MAX_APPS_PER_KERNEL> result{};
+        for (uint8_t idx = 0; idx < MAX_APPS_PER_KERNEL; ++idx) {
+            result[idx] = bus_vector{ static_cast<BusId>(idx + 1) };
+        }
+        return result;
+    }();
     bus_vector return_data{ BusId::RETURNDATA };
 };
 
@@ -73,13 +81,12 @@ template <typename Builder> class databus {
  * \pi_i, and it has access to [C_i] directly from \pi_i. The consistency checks in circuit (i+1) are thus of the
  * form \pi_i.public_inputs.[R_{i-1}] = \pi_i.[C_i].
  *
- * For consistent behavior across kernels, every kernel propagates two return data commitments via its
- * public inputs. If one of either the app or kernel return data does not exist, it is populated with a default
- * value that will satisfy the consistency check on the next cycle. For example, the first kernel has no previous
- * kernel to verify and thus neither receives a previous kernel return data commitment nor a calldata input
- * corresponding to a previous kernel. The "empty" calldata will be populated with a default value, resulting in a
- * default commitment value. We set the same value for the missing return data herein so that the commitments agree
- * and the corresponding consistency check will be satisfied in the kernel in which it's performed.
+ * For consistent behavior across kernels, every kernel propagates `MAX_APPS_PER_KERNEL + 1` return-data commitments
+ * via its public inputs: one for the previous kernel and one per app slot. If any of these does not exist (e.g., the
+ * first kernel has no previous kernel; a kernel with fewer than MAX apps leaves the trailing app slots unset), it is
+ * populated with a default commitment value that will satisfy the consistency check on the next cycle. The "empty"
+ * calldata column on the next kernel side will commit to the same default value, so the commitments agree and the
+ * consistency check passes trivially.
  *
  * @tparam Builder
  */
@@ -91,11 +98,15 @@ template <class Builder> class DataBusDepot {
     using FrNative = typename Curve::ScalarFieldNative;
 
     // Storage for the return data commitments to be propagated via the public inputs
-    Commitment app_return_data_commitment;
+    std::array<Commitment, MAX_APPS_PER_KERNEL> app_return_data_commitments;
     Commitment kernel_return_data_commitment;
 
     // Existence flags indicating whether each return data commitment has been set
-    bool app_return_data_commitment_exists = false;
+    std::array<bool, MAX_APPS_PER_KERNEL> app_return_data_commitment_exists = []() {
+        std::array<bool, MAX_APPS_PER_KERNEL> result{};
+        result.fill(false);
+        return result;
+    }();
     bool kernel_return_data_commitment_exists = false;
 
     void set_kernel_return_data_commitment(const Commitment& commitment)
@@ -104,10 +115,39 @@ template <class Builder> class DataBusDepot {
         kernel_return_data_commitment_exists = true;
     }
 
+    /**
+     * @brief Whether all app return-data slots are currently empty.
+     * @details Used to assert the kernel-boundary invariant: at the start of each kernel completion, every slot must
+     * have been drained by the prior kernel's get-loop so that `set_app_return_data_commitment` begins filling from
+     * slot 0.
+     */
+    bool app_return_data_slots_are_empty() const
+    {
+        for (size_t idx = 0; idx < MAX_APPS_PER_KERNEL; ++idx) {
+            if (app_return_data_commitment_exists[idx]) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * @brief Record an app return-data commitment in the next available slot.
+     * @details Slot assignment is implicit: the depot fills slot 0 first, then slot 1, etc., as apps are processed in
+     * the kernel's verification queue. Slots are released by `get_app_return_data_commitment`; each kernel-completion
+     * pass drains every slot via the get-loop in `Chonk::complete_kernel_circuit_logic`, so the next kernel begins
+     * filling from slot 0 again.
+     */
     void set_app_return_data_commitment(const Commitment& commitment)
     {
-        app_return_data_commitment = commitment;
-        app_return_data_commitment_exists = true;
+        for (size_t idx = 0; idx < MAX_APPS_PER_KERNEL; ++idx) {
+            if (!app_return_data_commitment_exists[idx]) {
+                app_return_data_commitments[idx] = commitment;
+                app_return_data_commitment_exists[idx] = true;
+                return;
+            }
+        }
+        BB_ASSERT(false, "DataBusDepot has no free app return-data slot");
     }
 
     /**
@@ -139,13 +179,14 @@ template <class Builder> class DataBusDepot {
      * @brief Get the previously set app return data commitment if it exists, else a default one
      *
      */
-    Commitment get_app_return_data_commitment(Builder& builder)
+    Commitment get_app_return_data_commitment(Builder& builder, const size_t idx)
     {
-        if (!app_return_data_commitment_exists) {
+        BB_ASSERT_LT(idx, MAX_APPS_PER_KERNEL, "DataBusDepot app return-data index out of bounds");
+        if (!app_return_data_commitment_exists[idx]) {
             return construct_default_commitment(builder);
         }
-        app_return_data_commitment_exists = false; // Reset the existence flag after retrieval
-        return app_return_data_commitment;
+        app_return_data_commitment_exists[idx] = false; // Reset the existence flag after retrieval
+        return app_return_data_commitments[idx];
     }
 };
 
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/databus/databus.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/databus/databus.test.cpp
index 6a5e11197833..6b7b3482bf5c 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/databus/databus.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/databus/databus.test.cpp
@@ -41,7 +41,7 @@ TEST(Databus, CallDataAndReturnData)
     for (auto& value : raw_calldata_values) {
         calldata_values.emplace_back(witness_ct(&builder, value));
     }
-    databus.calldata.set_values(calldata_values);
+    databus.kernel_calldata.set_values(calldata_values);
 
     // Populate the return data in the databus
     std::vector<field_ct> return_data_values;
@@ -53,14 +53,14 @@ TEST(Databus, CallDataAndReturnData)
     // Establish that the first two outputs are simply copied over from the inputs. Each 'copy' requires two read gates.
     field_ct idx_0(witness_ct(&builder, 0));
     field_ct idx_1(witness_ct(&builder, 1));
-    databus.calldata[idx_0].assert_equal(databus.return_data[idx_0]);
-    databus.calldata[idx_1].assert_equal(databus.return_data[idx_1]);
+    databus.kernel_calldata[idx_0].assert_equal(databus.return_data[idx_0]);
+    databus.kernel_calldata[idx_1].assert_equal(databus.return_data[idx_1]);
 
     // Get the last two entries in calldata and compute their sum
     field_ct idx_2(witness_ct(&builder, 2));
     field_ct idx_3(witness_ct(&builder, 3));
     // This line creates an arithmetic gate and two calldata read gates (via operator[]).
-    field_ct sum = databus.calldata[idx_2] + databus.calldata[idx_3];
+    field_ct sum = databus.kernel_calldata[idx_2] + databus.kernel_calldata[idx_3];
 
     // Read the last index of the return data. (Creates a return data read gate via operator[]).
     field_ct idx(witness_ct(&builder, 2));
@@ -124,14 +124,14 @@ TEST(Databus, UnnormalizedEntryAccess)
         // add the value to itself to make it unnormalized (the multiplicative constant will be 2)
         returndata_entries.emplace_back(entry_witness + entry_witness);
     }
-    databus.calldata.set_values(calldata_entries);
+    databus.kernel_calldata.set_values(calldata_entries);
     databus.return_data.set_values(returndata_entries);
     field_ct idx_0 = witness_ct(&builder, 0);
     field_ct idx_1 = witness_ct(&builder, 1);
     field_ct idx_2 = witness_ct(&builder, 2);
-    databus.return_data[idx_0].assert_equal(databus.calldata[idx_0] + databus.calldata[idx_0]);
-    databus.return_data[idx_1].assert_equal(databus.calldata[idx_1] + databus.calldata[idx_1]);
-    databus.return_data[idx_2].assert_equal(databus.calldata[idx_2] + databus.calldata[idx_2]);
+    databus.return_data[idx_0].assert_equal(databus.kernel_calldata[idx_0] + databus.kernel_calldata[idx_0]);
+    databus.return_data[idx_1].assert_equal(databus.kernel_calldata[idx_1] + databus.kernel_calldata[idx_1]);
+    databus.return_data[idx_2].assert_equal(databus.kernel_calldata[idx_2] + databus.kernel_calldata[idx_2]);
     EXPECT_TRUE(CircuitChecker::check(builder));
 }
 
@@ -150,7 +150,7 @@ TEST(Databus, ConstantAndUnnormalizedIndices)
     for (auto& value : raw_calldata_values) {
         calldata_values.emplace_back(witness_ct(&builder, value));
     }
-    databus.calldata.set_values(calldata_values);
+    databus.kernel_calldata.set_values(calldata_values);
 
     // Populate the return data in the databus
     std::vector<field_ct> returndata_values;
@@ -164,10 +164,10 @@ TEST(Databus, ConstantAndUnnormalizedIndices)
     field_ct idx_1(witness_ct(&builder, 1));
     // un-normalized index (with multiplicative constant 2)
     field_ct idx_2 = idx_1 + idx_1;
-    field_ct sum = databus.calldata[idx_0] + databus.calldata[idx_1] + databus.calldata[idx_2];
+    field_ct sum = databus.kernel_calldata[idx_0] + databus.kernel_calldata[idx_1] + databus.kernel_calldata[idx_2];
 
-    databus.return_data[idx_0].assert_equal(databus.calldata[idx_0]);
-    databus.return_data[idx_1].assert_equal(databus.calldata[idx_1]);
+    databus.return_data[idx_0].assert_equal(databus.kernel_calldata[idx_0]);
+    databus.return_data[idx_1].assert_equal(databus.kernel_calldata[idx_1]);
     databus.return_data[idx_2].assert_equal(sum);
 
     EXPECT_TRUE(CircuitChecker::check(builder));
@@ -218,7 +218,7 @@ TEST(Databus, BadCopyFailure)
 
     // Populate calldata with a single input
     fr input = 13;
-    databus.calldata.set_values({ witness_ct(&builder, input) });
+    databus.kernel_calldata.set_values({ witness_ct(&builder, input) });
 
     // Populate return data with an output different from the input
     fr output = input - 1;
@@ -227,7 +227,7 @@ TEST(Databus, BadCopyFailure)
     // Attempt to attest that the calldata has been copied into the return data
     size_t raw_idx = 0; // read at 0th index
     field_ct idx(witness_ct(&builder, raw_idx));
-    databus.calldata[idx].assert_equal(databus.return_data[idx]);
+    databus.kernel_calldata[idx].assert_equal(databus.return_data[idx]);
 
     // Since the output data is not a copy of the input, the checker should fail
     EXPECT_FALSE(CircuitChecker::check(builder));
@@ -251,7 +251,7 @@ TEST(Databus, DuplicateRead)
     for (auto& value : raw_calldata_values) {
         calldata_values.emplace_back(witness_ct(&builder, value));
     }
-    databus.calldata.set_values(calldata_values);
+    databus.kernel_calldata.set_values(calldata_values);
 
     // Populate the return data in the databus
     std::vector<field_ct> return_data_values;
@@ -264,10 +264,10 @@ TEST(Databus, DuplicateRead)
     field_ct idx_1(witness_ct(&builder, 1));
     field_ct idx_2(witness_ct(&builder, 2));
 
-    databus.calldata[idx_1];
-    databus.calldata[idx_1];
-    databus.calldata[idx_1];
-    databus.calldata[idx_2];
+    databus.kernel_calldata[idx_1];
+    databus.kernel_calldata[idx_1];
+    databus.kernel_calldata[idx_1];
+    databus.kernel_calldata[idx_2];
 
     databus.return_data[idx_2];
     databus.return_data[idx_2];
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.cpp
index b1d7ad6b01ca..978c7eee75ba 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.cpp
@@ -464,10 +464,12 @@ template <typename Builder> field_t<Builder> field_t<Builder>::pow(const uint32_
  * @brief Raise a field_t to a power of an exponent (field_t). Note that the exponent must not exceed 32 bits and is
  * implicitly range constrained.
  */
-template <typename Builder> field_t<Builder> field_t<Builder>::pow(const field_t& exponent) const
+template <typename Builder>
+template <size_t num_bits>
+field_t<Builder> field_t<Builder>::pow(const field_t& exponent) const
 {
     uint256_t exponent_value = exponent.get_value();
-    BB_ASSERT_LT(exponent_value.get_msb(), 32U, "Exponent too large in field_t::pow");
+    BB_ASSERT_LT(exponent_value.get_msb(), num_bits, "Exponent too large in field_t::pow");
 
     if (is_constant() && exponent.is_constant()) {
         return field_t(get_value().pow(exponent_value));
@@ -479,14 +481,14 @@ template <typename Builder> field_t<Builder> field_t<Builder>::pow(const field_t
 
     auto* ctx = validate_context(context, exponent.context);
 
-    std::array<bool_t<Builder>, 32> exponent_bits;
+    std::array<bool_t<Builder>, num_bits> exponent_bits;
     // Collect individual bits as bool_t's
     for (size_t i = 0; i < exponent_bits.size(); ++i) {
         uint256_t value_bit = exponent_value & 1;
         bool_t<Builder> bit;
         bit = bool_t<Builder>(witness_t<Builder>(ctx, value_bit.data[0]));
         bit.set_origin_tag(exponent.tag);
-        exponent_bits[31 - i] = bit;
+        exponent_bits[num_bits - 1 - i] = bit;
         exponent_value >>= 1;
     }
 
@@ -501,7 +503,7 @@ template <typename Builder> field_t<Builder> field_t<Builder>::pow(const field_t
     // Compute the result of exponentiation
     field_t accumulator(ctx, bb::fr::one());
     const field_t one(bb::fr::one());
-    for (size_t i = 0; i < 32; ++i) {
+    for (size_t i = 0; i < num_bits; ++i) {
         accumulator *= accumulator;
         // If current bit == 1, multiply by the base, else propagate the accumulator
         const field_t multiplier = conditional_assign_internal(exponent_bits[i], *this, one);
@@ -1346,6 +1348,19 @@ std::pair<field_t<Builder>, field_t<Builder>> field_t<Builder>::no_wrap_split_at
     return std::make_pair(lo_wit, hi_wit);
 }
 
+// Explicit instantations of pow
+template field_t<bb::UltraCircuitBuilder> field_t<UltraCircuitBuilder>::pow<32UL>(
+    const field_t<bb::UltraCircuitBuilder>&) const;
+
+template field_t<bb::MegaCircuitBuilder> field_t<MegaCircuitBuilder>::pow<32UL>(
+    const field_t<bb::MegaCircuitBuilder>&) const;
+
+template field_t<bb::UltraCircuitBuilder> field_t<UltraCircuitBuilder>::pow<CONST_OP_QUEUE_LOG_SIZE + 1>(
+    const field_t<bb::UltraCircuitBuilder>&) const;
+
+template field_t<bb::MegaCircuitBuilder> field_t<MegaCircuitBuilder>::pow<CONST_OP_QUEUE_LOG_SIZE + 1>(
+    const field_t<bb::MegaCircuitBuilder>&) const;
+
 template class field_t<bb::UltraCircuitBuilder>;
 template class field_t<bb::MegaCircuitBuilder>;
 
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.hpp
index dc2890ee1bcf..a81eec3564f2 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.hpp
@@ -283,8 +283,8 @@ template <typename Builder_> class field_t {
     field_t sqr() const { return operator*(*this); }
 
     field_t pow(const uint32_t& exponent) const;
-    // N.B. we implicitly range-constrain 'exponent' to be a 32-bit integer!
-    field_t pow(const field_t& exponent) const;
+    // N.B. we implicitly range-constrain 'exponent' to be a num_bits-bit integer!
+    template <size_t num_bits = 32> field_t pow(const field_t& exponent) const;
 
     field_t operator+=(const field_t& other)
     {
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.test.cpp
index 3e93b25b5342..f6d5e5fd1845 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.test.cpp
@@ -1045,14 +1045,16 @@ template <typename Builder> class stdlib_field : public testing::Test {
         EXPECT_EQ(result, false);
     }
 
-    static void test_pow()
+    static void test_pow(uint32_t max_exponent_bits)
     {
         Builder builder = Builder();
 
-        std::array<uint32_t, 3> const_exponent_values{ 0, 1, engine.get_random_uint32() };
-        std::array<field_ct, 3> witness_exponent_values{ witness_ct(&builder, 0),
-                                                         witness_ct(&builder, 1),
-                                                         witness_ct(&builder, engine.get_random_uint32()) };
+        std::array<uint32_t, 3> const_exponent_values{ 0, 1, engine.get_random_uint32() % (1 << max_exponent_bits) };
+        std::array<field_ct, 3> witness_exponent_values{
+            witness_ct(&builder, 0),
+            witness_ct(&builder, 1),
+            witness_ct(&builder, engine.get_random_uint32() % (1 << max_exponent_bits))
+        };
 
         std::array<uint256_t, 3> base_values{ 0, 1, engine.get_random_uint256() };
         for (auto& base : base_values) {
@@ -1063,7 +1065,13 @@ template <typename Builder> class stdlib_field : public testing::Test {
                 EXPECT_EQ(result.get_value(), bb::fr(base).pow(exponent));
                 // Test witness base && integer exponent cases
                 field_ct witness_base(witness_ct(&builder, base));
-                result = witness_base.pow(exponent);
+                if (max_exponent_bits == 32) {
+                    result = witness_base.pow(exponent);
+                } else if (max_exponent_bits == CONST_OP_QUEUE_LOG_SIZE + 1) {
+                    result = witness_base.template pow<CONST_OP_QUEUE_LOG_SIZE + 1>(exponent);
+                } else {
+                    bb::assert_failure("Invalid max_exponent_bits value in test_pow");
+                }
 
                 if (exponent != 0) {
                     EXPECT_TRUE(!result.is_constant());
@@ -1085,7 +1093,13 @@ template <typename Builder> class stdlib_field : public testing::Test {
                 EXPECT_EQ(result.get_value(), bb::fr(base).pow(exponent.get_value()));
                 // Test witness base && witness exponent cases
                 field_ct witness_base(witness_ct(&builder, base));
-                result = witness_base.pow(exponent);
+                if (max_exponent_bits == 32) {
+                    result = witness_base.pow(exponent);
+                } else if (max_exponent_bits == CONST_OP_QUEUE_LOG_SIZE + 1) {
+                    result = witness_base.template pow<CONST_OP_QUEUE_LOG_SIZE + 1>(exponent);
+                } else {
+                    bb::assert_failure("Invalid max_exponent_bits value in test_pow");
+                }
 
                 EXPECT_TRUE(!result.is_constant());
                 EXPECT_EQ(result.get_value(), bb::fr(base).pow(exponent.get_value()));
@@ -1095,21 +1109,51 @@ template <typename Builder> class stdlib_field : public testing::Test {
         }
     }
 
-    static void test_pow_exponent_out_of_range()
+    static void test_pow_witness_exponent_out_of_range(uint32_t max_exponent_bits)
     {
-        Builder builder = Builder();
 
         fr base_val(engine.get_random_uint256());
-        uint64_t exponent_val = engine.get_random_uint32();
-        exponent_val += (uint64_t(1) << 32);
+        uint64_t exponent_val = engine.get_random_uint32() % (uint64_t(1) << max_exponent_bits);
+        exponent_val += (uint64_t(1) << max_exponent_bits);
+
+        Builder builder = Builder();
 
         [[maybe_unused]] field_ct base = witness_ct(&builder, base_val);
         field_ct exponent = witness_ct(&builder, exponent_val);
-        EXPECT_THROW_WITH_MESSAGE(base.pow(exponent), "Exponent too large in field_t::pow");
+        field_ct result;
+        if (max_exponent_bits == 32) {
+            result = base.pow(exponent);
+        } else if (max_exponent_bits == CONST_OP_QUEUE_LOG_SIZE + 1) {
+            result = base.template pow<CONST_OP_QUEUE_LOG_SIZE + 1>(exponent);
+        } else {
+            bb::assert_failure("Invalid max_exponent_bits value in test_pow");
+        }
+
+        EXPECT_FALSE(CircuitChecker::check(builder));
+        EXPECT_TRUE(builder.failed());
+        EXPECT_EQ(builder.err(), "field_t::pow exponent accumulator incorrect");
+    }
+
+    static void test_pow_constant_exponent_out_of_range(uint32_t max_exponent_bits)
+
+    {
+        fr base_val(engine.get_random_uint256());
+        uint64_t exponent_val = engine.get_random_uint32() % (uint64_t(1) << max_exponent_bits);
+        exponent_val += (uint64_t(1) << max_exponent_bits);
 
-        exponent = field_ct(exponent_val);
-        EXPECT_THROW_WITH_MESSAGE(base.pow(exponent), "Exponent too large in field_t::pow");
-    };
+        Builder builder = Builder();
+
+        [[maybe_unused]] field_ct base = witness_ct(&builder, base_val);
+        field_ct exponent = field_ct(exponent_val);
+        if (max_exponent_bits == 32) {
+            EXPECT_THROW_WITH_MESSAGE(base.pow(exponent), "Exponent too large in field_t::pow");
+        } else if (max_exponent_bits == CONST_OP_QUEUE_LOG_SIZE + 1) {
+            EXPECT_THROW_WITH_MESSAGE(base.template pow<CONST_OP_QUEUE_LOG_SIZE + 1>(exponent),
+                                      "Exponent too large in field_t::pow");
+        } else {
+            bb::assert_failure("Invalid max_exponent_bits value in test_pow");
+        }
+    }
 
     static void test_copy_as_new_witness()
     {
@@ -1701,13 +1745,31 @@ TYPED_TEST(stdlib_field, test_postfix_increment)
 {
     TestFixture::test_postfix_increment();
 }
-TYPED_TEST(stdlib_field, test_pow)
+TYPED_TEST(stdlib_field, test_pow_op_queue)
+{
+    TestFixture::test_pow(/*max_exponent_bits*/ CONST_OP_QUEUE_LOG_SIZE + 1);
+}
+TYPED_TEST(stdlib_field, test_pow_32)
+{
+    TestFixture::test_pow(/*max_exponent_bits*/ 32);
+}
+TYPED_TEST(stdlib_field, test_pow_witness_exponent_out_of_range_op_queue)
+{
+    BB_DISABLE_ASSERTS();
+    TestFixture::test_pow_witness_exponent_out_of_range(/*max_exponent_bits*/ CONST_OP_QUEUE_LOG_SIZE + 1);
+}
+TYPED_TEST(stdlib_field, test_pow_witness_exponent_out_of_range_32)
+{
+    BB_DISABLE_ASSERTS();
+    TestFixture::test_pow_witness_exponent_out_of_range(/*max_exponent_bits*/ 32);
+}
+TYPED_TEST(stdlib_field, test_pow_constant_exponent_out_of_range_op_queue)
 {
-    TestFixture::test_pow();
+    TestFixture::test_pow_constant_exponent_out_of_range(/*max_exponent_bits*/ CONST_OP_QUEUE_LOG_SIZE + 1);
 }
-TYPED_TEST(stdlib_field, test_pow_exponent_out_of_range)
+TYPED_TEST(stdlib_field, test_pow_constant_exponent_out_of_range_32)
 {
-    TestFixture::test_pow_exponent_out_of_range();
+    TestFixture::test_pow_constant_exponent_out_of_range(/*max_exponent_bits*/ 32);
 }
 TYPED_TEST(stdlib_field, test_prefix_increment)
 {
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/pairing_points.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/pairing_points.hpp
index c87964f35620..bc6d43ae5a0e 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/pairing_points.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/pairing_points.hpp
@@ -96,7 +96,10 @@ template <typename Curve> struct PairingPoints {
     static PairingPoints aggregate_multiple(std::vector<PairingPoints>& pairing_points, bool handle_edge_cases = true)
     {
         size_t num_points = pairing_points.size();
-        BB_ASSERT_GT(num_points, 1UL, "This method should be used only with more than one pairing point.");
+        BB_ASSERT_GT(num_points, 0UL, "Must provide at least one PairingPoints for aggregation");
+        if (num_points == 1) {
+            return pairing_points[0];
+        }
 
         std::vector<Group> first_components;
         first_components.reserve(num_points);
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/special_public_inputs/special_public_inputs.hpp b/barretenberg/cpp/src/barretenberg/stdlib/special_public_inputs/special_public_inputs.hpp
index da41c21df951..c9d36be8fc9a 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/special_public_inputs/special_public_inputs.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/special_public_inputs/special_public_inputs.hpp
@@ -7,7 +7,7 @@
 // Special public inputs designed propagate data between Chonk and Rollup circuits.
 //
 // These structures are binding several Chonk components:
-//   - KernelIO:        Standard kernel outputs (pairing points, databus, ecc_op_tables, accum hash)
+//   - KernelIO:        Standard kernel outputs (pairing points, databus, ecc_op_hash, accum hash)
 //   - HidingKernelIO:  Final kernel outputs (no accum hash since folding terminates)
 //   - AppIO/DefaultIO: App circuit outputs (just pairing points)
 //   - RollupIO:        Rollup circuit outputs (pairing points + IPA claim)
@@ -55,10 +55,11 @@ std::array<typename bn254<Builder>::Group, Builder::NUM_WIRES> empty_ecc_op_tabl
 }
 
 /**
- * @brief Manages the data that is propagated on the public inputs of a kernel circuit
+ * @brief Manages the data that is propagated on the public inputs of a kernel circuit.
  *
+ * @tparam N Number of app return-data commitments carried by the kernel public inputs.
  */
-class KernelIO {
+template <size_t N> class KernelIO_ {
   public:
     using Builder = MegaCircuitBuilder;   // kernel builder is always Mega
     using Curve = stdlib::bn254<Builder>; // curve is always bn254
@@ -66,19 +67,20 @@ class KernelIO {
     using FF = Curve::ScalarField;
     using PairingInputs = stdlib::recursion::PairingPoints<Curve>;
     using TableCommitments = std::array<G1, Builder::NUM_WIRES>;
+    using AppReturnDataCommitments = std::array<G1, N>;
 
     using PublicPoint = stdlib::PublicInputComponent<G1>;
     using PublicPairingPoints = stdlib::PublicInputComponent<PairingInputs>;
     using PublicFF = stdlib::PublicInputComponent<FF>;
 
-    PairingInputs pairing_inputs;   // Inputs {P0, P1} to an EC pairing check
-    G1 kernel_return_data;          // Commitment to the return data of a kernel circuit
-    G1 app_return_data;             // Commitment to the return data of an app circuit
-    TableCommitments ecc_op_tables; // commitments to merged tables obtained from recursive Merge verification
-    FF output_hn_accum_hash;        // hash of the output HN verifier accumulator
+    PairingInputs pairing_inputs;             // Inputs {P0, P1} to an EC pairing check
+    G1 kernel_return_data;                    // Commitment to the return data of a kernel circuit
+    AppReturnDataCommitments app_return_data; // Commitment to each verified app circuit's return data
+    FF ecc_op_hash;                           // Running Poseidon2 hash over ECC op column commitments
+    FF output_hn_accum_hash;                  // hash of the output HN verifier accumulator
 
     // Total size of the kernel IO public inputs
-    static constexpr size_t PUBLIC_INPUTS_SIZE = KERNEL_PUBLIC_INPUTS_SIZE;
+    static constexpr size_t PUBLIC_INPUTS_SIZE = kernel_public_inputs_size(N);
     static constexpr bool HasIPA = false;
 
     /**
@@ -97,12 +99,12 @@ class KernelIO {
         index += PairingInputs::PUBLIC_INPUTS_SIZE;
         kernel_return_data = PublicPoint::reconstruct(public_inputs, PublicComponentKey{ index });
         index += G1::PUBLIC_INPUTS_SIZE;
-        app_return_data = PublicPoint::reconstruct(public_inputs, PublicComponentKey{ index });
-        index += G1::PUBLIC_INPUTS_SIZE;
-        for (auto& table_commitment : ecc_op_tables) {
-            table_commitment = PublicPoint::reconstruct(public_inputs, PublicComponentKey{ index });
+        for (auto& app_commitment : app_return_data) {
+            app_commitment = PublicPoint::reconstruct(public_inputs, PublicComponentKey{ index });
             index += G1::PUBLIC_INPUTS_SIZE;
         }
+        ecc_op_hash = PublicFF::reconstruct(public_inputs, PublicComponentKey{ index });
+        index += FF::PUBLIC_INPUTS_SIZE;
         output_hn_accum_hash = PublicFF::reconstruct(public_inputs, PublicComponentKey{ index });
         index += FF::PUBLIC_INPUTS_SIZE;
     }
@@ -117,10 +119,10 @@ class KernelIO {
 
         pairing_inputs.set_public(builder);
         kernel_return_data.set_public();
-        app_return_data.set_public();
-        for (auto& table_commitment : ecc_op_tables) {
-            table_commitment.set_public();
+        for (auto& app_commitment : app_return_data) {
+            app_commitment.set_public();
         }
+        ecc_op_hash.set_public();
         output_hn_accum_hash.set_public();
 
         // Finalize the public inputs to ensure no more public inputs can be added hereafter.
@@ -133,22 +135,21 @@ class KernelIO {
      */
     static void add_default(Builder& builder)
     {
-        KernelIO inputs;
+        KernelIO_ inputs;
 
         inputs.pairing_inputs = PairingInputs::construct_default();
         inputs.kernel_return_data = DataBusDepot<Builder>::construct_default_commitment(builder);
-        inputs.app_return_data = DataBusDepot<Builder>::construct_default_commitment(builder);
-        for (auto& table_commitment : inputs.ecc_op_tables) {
-            table_commitment = G1(typename G1::BaseField(nullptr, uint256_t(DEFAULT_ECC_COMMITMENT.x)),
-                                  typename G1::BaseField(nullptr, uint256_t(DEFAULT_ECC_COMMITMENT.y)),
-                                  /*assert_on_curve=*/false);
-            table_commitment.convert_constant_to_fixed_witness(&builder);
+        for (auto& app_commitment : inputs.app_return_data) {
+            app_commitment = DataBusDepot<Builder>::construct_default_commitment(builder);
         }
+        inputs.ecc_op_hash = FF::from_witness(&builder, typename FF::native(0));
         inputs.output_hn_accum_hash = FF::from_witness(&builder, typename FF::native(0));
         inputs.set_public();
     }
 };
 
+using KernelIO = KernelIO_<MAX_APPS_PER_KERNEL>;
+
 /**
  * @brief Manages the data that is propagated on the public inputs of an application/function circuit
  *
@@ -282,7 +283,8 @@ template <class Builder_> class HidingKernelIO {
 
     PairingInputs pairing_inputs;   // Inputs {P0, P1} to an EC pairing check
     G1 kernel_return_data;          // Commitment to the return data of the tail kernel circuit
-    TableCommitments ecc_op_tables; // commitments to merged tables obtained from final Merge verification
+    TableCommitments ecc_op_tables; // commitments to the full merged op queue tables, obtained from the
+                                    // batched merge verification performed inside the hiding kernel
 
     // Total size of the IO public inputs
     static constexpr size_t PUBLIC_INPUTS_SIZE = HIDING_KERNEL_PUBLIC_INPUTS_SIZE;
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/special_public_inputs/special_public_inputs.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/special_public_inputs/special_public_inputs.test.cpp
index 8541f67e6df3..0c489ead75d9 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/special_public_inputs/special_public_inputs.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/special_public_inputs/special_public_inputs.test.cpp
@@ -21,16 +21,14 @@ TEST_F(SpecialPublicInputsTests, Basic)
     using G1Native = Curve::GroupNative::affine_element;
     using FFNative = Curve::ScalarFieldNative;
 
-    static constexpr size_t NUM_WIRES = Builder::NUM_WIRES;
-
     G1Native P0_val = G1Native::random_element();
     G1Native P1_val = G1Native::random_element();
     G1Native kernel_return_data_val = G1Native::random_element();
-    G1Native app_return_data_val = G1Native::random_element();
-    std::array<G1Native, NUM_WIRES> ecc_op_tables_val;
-    for (auto& commitment : ecc_op_tables_val) {
-        commitment = G1Native::random_element();
+    std::array<G1Native, MAX_APPS_PER_KERNEL> app_return_data_val;
+    for (auto& value : app_return_data_val) {
+        value = G1Native::random_element();
     }
+    FFNative ecc_op_hash_val = FFNative::random_element();
     FFNative output_hn_accum_hash_val = FFNative::random_element();
 
     // Store the public inputs of the first circuit to be used by the second
@@ -45,10 +43,10 @@ TEST_F(SpecialPublicInputsTests, Basic)
         PairingInputs pairing_inputs{ G1::from_witness(&builder, P0_val), G1::from_witness(&builder, P1_val) };
         kernel_output.pairing_inputs = pairing_inputs;
         kernel_output.kernel_return_data = G1::from_witness(&builder, kernel_return_data_val);
-        kernel_output.app_return_data = G1::from_witness(&builder, app_return_data_val);
-        for (auto [table_commitment, table_val] : zip_view(kernel_output.ecc_op_tables, ecc_op_tables_val)) {
-            table_commitment = G1::from_witness(&builder, table_val);
+        for (size_t idx = 0; idx < MAX_APPS_PER_KERNEL; ++idx) {
+            kernel_output.app_return_data[idx] = G1::from_witness(&builder, app_return_data_val[idx]);
         }
+        kernel_output.ecc_op_hash = FF::from_witness(&builder, ecc_op_hash_val);
         kernel_output.output_hn_accum_hash = FF::from_witness(&builder, output_hn_accum_hash_val);
 
         // Propagate the kernel output via the public inputs
@@ -77,10 +75,10 @@ TEST_F(SpecialPublicInputsTests, Basic)
         EXPECT_EQ(kernel_input.pairing_inputs.P0().get_value(), P0_val);
         EXPECT_EQ(kernel_input.pairing_inputs.P1().get_value(), P1_val);
         EXPECT_EQ(kernel_input.kernel_return_data.get_value(), kernel_return_data_val);
-        EXPECT_EQ(kernel_input.app_return_data.get_value(), app_return_data_val);
-        for (auto [reconstructed_commitment, commitment] : zip_view(kernel_input.ecc_op_tables, ecc_op_tables_val)) {
-            EXPECT_EQ(reconstructed_commitment.get_value(), commitment);
+        for (size_t idx = 0; idx < MAX_APPS_PER_KERNEL; ++idx) {
+            EXPECT_EQ(kernel_input.app_return_data[idx].get_value(), app_return_data_val[idx]);
         }
+        EXPECT_EQ(kernel_input.ecc_op_hash.get_value(), ecc_op_hash_val);
         EXPECT_EQ(kernel_input.output_hn_accum_hash.get_value(), output_hn_accum_hash_val);
     }
 }
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/special_public_inputs/special_public_inputs_test_serde.hpp b/barretenberg/cpp/src/barretenberg/stdlib/special_public_inputs/special_public_inputs_test_serde.hpp
index b0046fb376b1..c1e2c3bcbab7 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/special_public_inputs/special_public_inputs_test_serde.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/special_public_inputs/special_public_inputs_test_serde.hpp
@@ -12,22 +12,22 @@ namespace bb::stdlib::recursion::honk {
 /**
  * @brief **For test purposes only**: Native representation and serde for KernelIO public inputs
  * @details Used for testing and verification with native bb::fr vectors.
- * Mirrors the structure of stdlib KernelIO but works with native types.
+ * Mirrors the structure of stdlib KernelIO_<N> but works with native types.
  */
-class KernelIOSerde {
+template <size_t N> class KernelIOSerde_ {
   public:
     using NativeFF = bb::fr;
     using NativeG1 = curve::BN254::AffineElement;
     using NativeFq = curve::BN254::BaseField;
     using NativePairingPoints = bb::PairingPoints<curve::BN254>;
-    using NativeTableCommitments = std::array<NativeG1, MegaCircuitBuilder::NUM_WIRES>;
+    using NativeAppReturnDataCommitments = std::array<NativeG1, N>;
 
-    static constexpr size_t PUBLIC_INPUTS_SIZE = KERNEL_PUBLIC_INPUTS_SIZE;
+    static constexpr size_t PUBLIC_INPUTS_SIZE = kernel_public_inputs_size(N);
 
     NativePairingPoints pairing_inputs;
     NativeG1 kernel_return_data;
-    NativeG1 app_return_data;
-    NativeTableCommitments ecc_op_tables;
+    NativeAppReturnDataCommitments app_return_data;
+    NativeFF ecc_op_hash;
     NativeFF output_hn_accum_hash;
 
     /**
@@ -37,9 +37,9 @@ class KernelIOSerde {
      * @details KernelIO is at the END of the public inputs section, so we start at
      *          offset (num_public_inputs - PUBLIC_INPUTS_SIZE)
      */
-    static KernelIOSerde from_proof(const std::vector<NativeFF>& proof, size_t num_public_inputs)
+    static KernelIOSerde_ from_proof(const std::vector<NativeFF>& proof, size_t num_public_inputs)
     {
-        KernelIOSerde result;
+        KernelIOSerde_ result;
         // KernelIO is at the end of public inputs, which are at the start of the proof
         size_t idx = num_public_inputs - PUBLIC_INPUTS_SIZE;
 
@@ -54,10 +54,10 @@ class KernelIOSerde {
         result.pairing_inputs.P0() = deserialize_point();
         result.pairing_inputs.P1() = deserialize_point();
         result.kernel_return_data = deserialize_point();
-        result.app_return_data = deserialize_point();
-        for (auto& commitment : result.ecc_op_tables) {
-            commitment = deserialize_point();
+        for (auto& app_commitment : result.app_return_data) {
+            app_commitment = deserialize_point();
         }
+        result.ecc_op_hash = proof[idx++];
         result.output_hn_accum_hash = proof[idx];
 
         return result;
@@ -96,14 +96,16 @@ class KernelIOSerde {
         serialize_point(pairing_inputs.P0());
         serialize_point(pairing_inputs.P1());
         serialize_point(kernel_return_data);
-        serialize_point(app_return_data);
-        for (const auto& commitment : ecc_op_tables) {
-            serialize_point(commitment);
+        for (const auto& app_commitment : app_return_data) {
+            serialize_point(app_commitment);
         }
+        proof[idx++] = ecc_op_hash;
         proof[idx] = output_hn_accum_hash;
     }
 };
 
+using KernelIOSerde = KernelIOSerde_<MAX_APPS_PER_KERNEL>;
+
 /**
  * @brief Native representation and serde for HidingKernelIO public inputs
  * @details Used for testing and verification with native bb::fr vectors.
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/translator_vm_verifier/translator_recursive_verifier.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/translator_vm_verifier/translator_recursive_verifier.test.cpp
index 78d2392263ce..b652b40ff24c 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/translator_vm_verifier/translator_recursive_verifier.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/translator_vm_verifier/translator_recursive_verifier.test.cpp
@@ -73,13 +73,11 @@ class TranslatorRecursiveTests : public ::testing::Test {
 
         // Add the same operations to the ECC op queue; the native computation is performed under the hood.
         auto op_queue = std::make_shared<bb::ECCOpQueue>();
-        op_queue->no_op_ultra_only();
-        add_random_ops(op_queue, InnerBuilder::NUM_RANDOM_OPS_START);
-        add_mixed_ops(op_queue, circuit_size_parameter / 2);
-        op_queue->merge();
+        // Construct zk columns
+        op_queue->construct_zk_columns();
         add_mixed_ops(op_queue, circuit_size_parameter / 2);
         add_random_ops(op_queue, InnerBuilder::NUM_RANDOM_OPS_END);
-        op_queue->merge(MergeSettings::APPEND, op_queue->get_append_offset());
+        op_queue->merge_fixed_append(op_queue->get_append_offset());
 
         return InnerBuilder{ batching_challenge_v, evaluation_challenge_x, op_queue };
     }
diff --git a/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/README.md b/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/README.md
index 6c22d9f0d223..0f5c66171664 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/README.md
+++ b/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/README.md
@@ -79,7 +79,11 @@ builder.assert_equal(idx_a, idx_b);
 | `q_memory` | RAM/ROM memory operations |
 | `q_lookup` | Lookup gate |
 | `q_poseidon2_external` | Poseidon2 external rounds |
-| `q_poseidon2_internal` | Poseidon2 internal rounds |
+| `q_poseidon2_internal` | Poseidon2 internal rounds (Ultra) |
+| `q_poseidon2_external_initial` | Poseidon2 initial external linear layer (Mega) |
+| `q_poseidon2_transition_entry` | Poseidon2 standard-to-quad boundary (Mega) |
+| `q_poseidon2_quad_internal` | Poseidon2 K=4 internal rows (Mega) |
+| `q_poseidon2_quad_internal_terminal` | Poseidon2 quad-to-standard boundary (Mega) |
 | `q_busread` | Databus read (Mega only) |
 
 Note: no selector exists for gates representing deferred ECC operations in the Mega builder. However, there is a selector in the Mega circuit itself for deferred ECC ops: `lagrange_ecc_op`. This is not stored in the builder; the selector is populated later, in `trace_to_polynomials.cpp`, as it can be efficiently derived once the builder phase has completed.
@@ -110,6 +114,10 @@ The execution trace is constructed in the form of **blocks** (`ExecutionTraceBlo
 **Mega blocks** (includes all Ultra blocks, plus):
 - `ecc_op` — Deferred ECC operations for Goblin (must be first in trace)
 - `busread` — Databus read operations
+- `poseidon2_quad_internal` — Poseidon2 K=4 internal-round compression
+
+Mega does not use the Ultra `poseidon2_internal` block for Poseidon2. The canonical Poseidon2
+circuit layout and soundness argument live in `stdlib/hash/poseidon2/README.md`.
 
 Within a given block, the corresponding gate selector is not always non-zero (hence why we have to track its values at all). This is because many gates make use of a shift mechanism that allow the constraint at row `i` to incorporate wire values at row `i+1`. In this case, row `i+1` may or may not be otherwise constrained, i.e. the gate selector at row `i+1` may take value 0.
 
@@ -156,11 +164,11 @@ Beyond basic arithmetic, specialized gates provide efficient constraints for var
 | **Arithmetic** | `ArithmeticRelation` | Width-4 arithmetic with extended modes (see above) |
 | **Delta Range** | `DeltaRangeConstraintRelation` | Efficient range constraints |
 | **Elliptic** | `EllipticRelation` | EC point addition/doubling on Grumpkin |
-| **Poseidon2** | `Poseidon2External/InternalRelation` | Optimized hash function rounds |
+| **Poseidon2** | `Poseidon2ExternalRelation`, `Poseidon2InternalRelation` (Ultra), `Poseidon2InitialExternalRelation`, `Poseidon2QuadInternalRelation` (Mega) | Optimized hash function rounds |
 | **Lookup** | `LogDerivLookupRelation` | Table-based lookups (plookup) |
 | **Memory** | `MemoryRelation` | ROM reads, RAM read/write consistency |
 | **Non-native field** | `NonNativeFieldRelation` | Arithmetic over non-native fields via limb decomposition |
-| **Databus** (Mega) | `DatabusLookupRelation` | Reads from calldata/returndata vectors |
+| **Databus** (Mega) | `DatabusLookupRelation` | Reads from kernel/app calldata and return data vectors |
 | **ECC Op Queue** (Mega) | `EccOpQueueRelation` | Deferred ECC operations for Goblin |
 
 ## Public Inputs
@@ -196,9 +204,9 @@ Mega is used in the context of client-side proving of Aztec transactions and for
 
 For large amounts of public data shared between multiple circuits (common in Aztec transactions), MegaCircuitBuilder provides the **DataBus**—a more efficient mechanism where prover cost scales with the number of *reads* rather than total data size.
 
-Mega supports lookup-style reads on three bus vectors:
-- `calldata`: Primary input data
-- `secondary_calldata`: Additional input data
+Mega supports lookup-style reads on five bus vectors:
+- `kernel_calldata`: Input from the previous kernel's return data
+- `app_calldata[0..2]`: Inputs from up to three app circuits' return data
 - `returndata`: Output data
 
 See `databus.hpp` in this directory for implementation details.
diff --git a/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/databus.hpp b/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/databus.hpp
index 07173d8d7386..9a9bbd4d8821 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/databus.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/databus.hpp
@@ -7,16 +7,12 @@
 #pragma once
 
 #include "barretenberg/common/assert.hpp"
+#include "barretenberg/constants.hpp"
 #include "barretenberg/ecc/curves/bn254/fr.hpp"
 #include "barretenberg/public_input_component/public_component_key.hpp"
 #include <cstdint>
 namespace bb {
 
-// We assume all kernels have space for two return data commitments on their public inputs
-constexpr uint32_t NUM_DATABUS_COMMITMENTS = 2;
-constexpr uint32_t PROPAGATED_DATABUS_COMMITMENT_SIZE = 8;
-constexpr uint32_t PROPAGATED_DATABUS_COMMITMENTS_SIZE = PROPAGATED_DATABUS_COMMITMENT_SIZE * NUM_DATABUS_COMMITMENTS;
-
 /**
  * @brief A DataBus column
  *
@@ -73,9 +69,14 @@ struct BusVector {
  * in-circuit as we would with public inputs).
  *
  */
-constexpr size_t NUM_BUS_COLUMNS = 3;
+constexpr size_t NUM_BUS_COLUMNS = MAX_APPS_PER_KERNEL + /*kernel calldata*/ 1 + /*kernel returndata*/ 1;
 
 using DataBus = std::array<BusVector, NUM_BUS_COLUMNS>;
-enum class BusId { CALLDATA, SECONDARY_CALLDATA, RETURNDATA };
+enum class BusId : uint8_t {
+    KERNEL_CALLDATA = 0,
+    APP_CALLDATA = 1,
+    RETURNDATA = MAX_APPS_PER_KERNEL + 1,
+};
+static_assert(static_cast<size_t>(BusId::RETURNDATA) == NUM_BUS_COLUMNS - 1, "BusId enum must match DataBus layout");
 
 } // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/mega_circuit_builder.cpp b/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/mega_circuit_builder.cpp
index 16e46cb11eb2..f47c9d340f0c 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/mega_circuit_builder.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/mega_circuit_builder.cpp
@@ -245,10 +245,94 @@ template <typename FF> void MegaCircuitBuilder_<FF>::apply_databus_selectors(con
     block.q_1().emplace_back(idx == 0 ? 1 : 0);
     block.q_2().emplace_back(idx == 1 ? 1 : 0);
     block.q_3().emplace_back(idx == 2 ? 1 : 0);
+    block.q_4().emplace_back(idx == 3 ? 1 : 0);
+    block.q_5().emplace_back(0);
+    block.q_m().emplace_back(idx == 4 ? 1 : 0);
+    block.q_c().emplace_back(0);
+    block.set_gate_selector(1);
+}
+
+/**
+ * @brief Poseidon2 initial linear layer gate, activates the q_poseidon2_external_initial selector and relation.
+ * @details Constrains the whole initial linear layer with a bespoke row.
+ */
+template <typename FF>
+void MegaCircuitBuilder_<FF>::create_poseidon2_initial_external_gate(const poseidon2_initial_external_gate_<FF>& in)
+{
+    auto& block = this->blocks.poseidon2_external;
+    block.populate_wires(in.a, in.b, in.c, in.d);
+    block.q_m().emplace_back(0);
+    block.q_1().emplace_back(0);
+    block.q_2().emplace_back(0);
+    block.q_3().emplace_back(0);
+    block.q_c().emplace_back(0);
     block.q_4().emplace_back(0);
+    block.q_5().emplace_back(0);
+    block.set_initial_gate_selector(1);
+    this->check_selector_length_consistency();
+    this->increment_num_gates();
+}
+
+/**
+ * @brief Poseidon2 K=4 compressed internal-round gate: processes FOUR consecutive internal rounds per row.
+ * @details
+ *   Wires:     a, b, c, d = state[0] at rounds 4i+0, 4i+1, 4i+2, 4i+3
+ *   Selectors: q_1, q_2, q_3, q_4 = c_{4i}, c_{4i+1}, c_{4i+2}, c_{4i+3}   (this quad's 4 constants)
+ *              q_m, q_c, q_5      = c_{4(i+1)}, c_{4(i+1)+1}, c_{4(i+1)+2} (next quad's first 3, for
+ *                                                                           the shifted Vandermonde check)
+ *   Terminal rows use q_poseidon2_quad_internal_terminal and set q_m, q_c, q_5 = 0 (no next quad).
+ */
+template <typename FF>
+void MegaCircuitBuilder_<FF>::create_poseidon2_quad_internal_gate(const poseidon2_quad_internal_gate_<FF>& in)
+{
+    auto& block = this->blocks.poseidon2_quad_internal;
+    block.populate_wires(in.a, in.b, in.c, in.d);
+    const auto& rc = crypto::Poseidon2Bn254ScalarFieldParams::round_constants;
+    block.q_1().emplace_back(rc[in.round_idx_start + 0][0]);
+    block.q_2().emplace_back(rc[in.round_idx_start + 1][0]);
+    block.q_3().emplace_back(rc[in.round_idx_start + 2][0]);
+    block.q_4().emplace_back(rc[in.round_idx_start + 3][0]);
+    if (in.is_terminal) {
+        block.q_m().emplace_back(0);
+        block.q_c().emplace_back(0);
+        block.q_5().emplace_back(0);
+        block.set_terminal_gate_selector(1);
+    } else {
+        block.q_m().emplace_back(rc[in.next_pair_start + 0][0]);
+        block.q_c().emplace_back(rc[in.next_pair_start + 1][0]);
+        block.q_5().emplace_back(rc[in.next_pair_start + 2][0]);
+        block.set_gate_selector(1);
+    }
+    this->check_selector_length_consistency();
+    this->increment_num_gates();
+}
+
+/**
+ * @brief Poseidon2 transition-entry gate: standard → K=4 compressed encoding boundary.
+ * @details Placed immediately before the first compressed row.
+ *   Wires:     a, b, c, d = (s_0, s_1, s_2, s_3) at round `round_idx_start` (standard encoding)
+ *   Selectors: q_1, q_2, q_3 = c_{start}, c_{start+1}, c_{start+2}
+ *              q_4, q_m, q_c, q_5 = 0 (unused)
+ *
+ * Enforces the successor's (w_r_shift, w_o_shift, w_4_shift) equal state[0] at rounds
+ * `start+1, start+2, start+3` respectively, via 3 degree-7 subrelations.
+ */
+template <typename FF>
+void MegaCircuitBuilder_<FF>::create_poseidon2_transition_entry_gate(const poseidon2_transition_entry_gate_<FF>& in)
+{
+    auto& block = this->blocks.poseidon2_quad_internal;
+    block.populate_wires(in.a, in.b, in.c, in.d);
+    const auto& rc = crypto::Poseidon2Bn254ScalarFieldParams::round_constants;
     block.q_m().emplace_back(0);
+    block.q_1().emplace_back(rc[in.round_idx_start + 0][0]);
+    block.q_2().emplace_back(rc[in.round_idx_start + 1][0]);
+    block.q_3().emplace_back(rc[in.round_idx_start + 2][0]);
+    block.q_4().emplace_back(0);
+    block.q_5().emplace_back(0);
     block.q_c().emplace_back(0);
-    block.set_gate_selector(1);
+    block.set_entry_gate_selector(1);
+    this->check_selector_length_consistency();
+    this->increment_num_gates();
 }
 
 template class MegaCircuitBuilder_<bb::fr>;
diff --git a/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/mega_circuit_builder.hpp b/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/mega_circuit_builder.hpp
index 16c5c4dbbfb4..7c8eb2271310 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/mega_circuit_builder.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/mega_circuit_builder.hpp
@@ -122,23 +122,17 @@ template <typename FF> class MegaCircuitBuilder_ : public UltraCircuitBuilder_<M
 
     void finalize_circuit();
 
-    size_t get_num_constant_gates() const override { return 0; }
+    void create_poseidon2_initial_external_gate(const poseidon2_initial_external_gate_<FF>& in);
+    void create_poseidon2_quad_internal_gate(const poseidon2_quad_internal_gate_<FF>& in);
+    void create_poseidon2_transition_entry_gate(const poseidon2_transition_entry_gate_<FF>& in);
 
-    /**
-     * @brief Add a witness variable to the public calldata.
-     *
-     */
-    void add_public_calldata(const uint32_t& in) { return append_to_bus_vector(BusId::CALLDATA, in); }
+    size_t get_num_constant_gates() const override { return 0; }
 
     /**
-     * @brief Add a witness variable to secondary_calldata.
-     * @details In practice this is used in aztec by the kernel circuit to recieve output from a function circuit
+     * @brief Add a witness variable to the specified calldata bus.
      *
      */
-    void add_public_secondary_calldata(const uint32_t& in)
-    {
-        return append_to_bus_vector(BusId::SECONDARY_CALLDATA, in);
-    }
+    void add_public_calldata(BusId bus_idx, const uint32_t& in) { return append_to_bus_vector(bus_idx, in); }
 
     /**
      * @brief Add a witness variable to the public return_data.
@@ -149,25 +143,12 @@ template <typename FF> class MegaCircuitBuilder_ : public UltraCircuitBuilder_<M
     uint32_t read_bus_vector(BusId bus_idx, const uint32_t& read_idx_witness_idx);
 
     /**
-     * @brief Read from calldata and create a corresponding databus read gate
+     * @brief Read from the specified calldata bus and create a corresponding databus read gate
      *
-     * @param read_idx_witness_idx Witness index for the calldata read index
-     * @return uint32_t Witness index for the result of the read
-     */
-    uint32_t read_calldata(const uint32_t& read_idx_witness_idx)
-    {
-        return read_bus_vector(BusId::CALLDATA, read_idx_witness_idx);
-    };
-
-    /**
-     * @brief Read from secondary_calldata and create a corresponding databus read gate
-     *
-     * @param read_idx_witness_idx Witness index for the secondary_calldata read index
-     * @return uint32_t Witness index for the result of the read
      */
-    uint32_t read_secondary_calldata(const uint32_t& read_idx_witness_idx)
+    uint32_t read_calldata(BusId bus_idx, const uint32_t& read_idx_witness_idx)
     {
-        return read_bus_vector(BusId::SECONDARY_CALLDATA, read_idx_witness_idx);
+        return read_bus_vector(bus_idx, read_idx_witness_idx);
     };
 
     /**
@@ -186,8 +167,7 @@ template <typename FF> class MegaCircuitBuilder_ : public UltraCircuitBuilder_<M
         databus[static_cast<size_t>(bus_idx)].append(witness_idx);
     }
 
-    const BusVector& get_calldata() const { return databus[static_cast<size_t>(BusId::CALLDATA)]; }
-    const BusVector& get_secondary_calldata() const { return databus[static_cast<size_t>(BusId::SECONDARY_CALLDATA)]; }
+    const BusVector& get_calldata(BusId idx) const { return databus[static_cast<size_t>(idx)]; }
     const BusVector& get_return_data() const { return databus[static_cast<size_t>(BusId::RETURNDATA)]; }
     // Indexed access to the databus columns; enables NUM_BUS_COLUMNS-driven iteration over bus vectors.
     const BusVector& get_bus_vector(size_t bus_idx) const { return databus[bus_idx]; }
diff --git a/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/ultra_circuit_builder.cpp b/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/ultra_circuit_builder.cpp
index 7afb7a7537b0..a123531888de 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/ultra_circuit_builder.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/ultra_circuit_builder.cpp
@@ -128,6 +128,7 @@ void UltraCircuitBuilder_<ExecutionTrace>::create_big_mul_add_gate(const mul_qua
     blocks.arithmetic.q_3().emplace_back(in.c_scaling);
     blocks.arithmetic.q_c().emplace_back(in.const_scaling);
     blocks.arithmetic.q_4().emplace_back(in.d_scaling);
+    blocks.arithmetic.q_5().emplace_back(0);
     blocks.arithmetic.set_gate_selector(include_next_gate_w_4 ? 2 : 1);
     check_selector_length_consistency();
     this->increment_num_gates();
@@ -153,6 +154,7 @@ void UltraCircuitBuilder_<ExecutionTrace>::create_big_add_gate(const add_quad_<F
     blocks.arithmetic.q_3().emplace_back(in.c_scaling);
     blocks.arithmetic.q_c().emplace_back(in.const_scaling);
     blocks.arithmetic.q_4().emplace_back(in.d_scaling);
+    blocks.arithmetic.q_5().emplace_back(0);
     blocks.arithmetic.set_gate_selector(include_next_gate_w_4 ? 2 : 1);
     check_selector_length_consistency();
     this->increment_num_gates();
@@ -175,6 +177,7 @@ void UltraCircuitBuilder_<ExecutionTrace>::create_bool_gate(const uint32_t varia
     blocks.arithmetic.q_3().emplace_back(0);
     blocks.arithmetic.q_c().emplace_back(0);
     blocks.arithmetic.q_4().emplace_back(0);
+    blocks.arithmetic.q_5().emplace_back(0);
     blocks.arithmetic.set_gate_selector(1);
     check_selector_length_consistency();
     this->increment_num_gates();
@@ -198,6 +201,7 @@ void UltraCircuitBuilder_<ExecutionTrace>::create_arithmetic_gate(const arithmet
     blocks.arithmetic.q_3().emplace_back(in.q_o);
     blocks.arithmetic.q_c().emplace_back(in.q_c);
     blocks.arithmetic.q_4().emplace_back(0);
+    blocks.arithmetic.q_5().emplace_back(0);
     blocks.arithmetic.set_gate_selector(1);
     check_selector_length_consistency();
     this->increment_num_gates();
@@ -243,6 +247,7 @@ void UltraCircuitBuilder_<ExecutionTrace>::create_ecc_add_gate(const ecc_add_gat
         block.populate_wires(this->zero_idx(), in.x1, in.y1, this->zero_idx());
         block.q_3().emplace_back(0);
         block.q_4().emplace_back(0);
+        block.q_5().emplace_back(0);
         block.q_1().emplace_back(q_sign);
 
         block.q_2().emplace_back(0);
@@ -297,6 +302,7 @@ void UltraCircuitBuilder_<ExecutionTrace>::create_ecc_dbl_gate(const ecc_dbl_gat
         block.q_3().emplace_back(0);
         block.q_c().emplace_back(0);
         block.q_4().emplace_back(0);
+        block.q_5().emplace_back(0);
         block.set_gate_selector(1);
         check_selector_length_consistency();
         this->increment_num_gates();
@@ -326,6 +332,7 @@ void UltraCircuitBuilder_<ExecutionTrace>::fix_witness(const uint32_t witness_in
     blocks.arithmetic.q_3().emplace_back(0);
     blocks.arithmetic.q_c().emplace_back(-witness_value);
     blocks.arithmetic.q_4().emplace_back(0);
+    blocks.arithmetic.q_5().emplace_back(0);
     blocks.arithmetic.set_gate_selector(1);
     check_selector_length_consistency();
     this->increment_num_gates();
@@ -397,6 +404,7 @@ void UltraCircuitBuilder_<ExecutionTrace>::create_lookup_gate(const uint32_t key
     blocks.lookup.q_c().emplace_back(column_3_step_size);
     blocks.lookup.q_1().emplace_back(0);
     blocks.lookup.q_4().emplace_back(0);
+    blocks.lookup.q_5().emplace_back(0);
 
     check_selector_length_consistency();
     this->increment_num_gates();
@@ -778,6 +786,7 @@ void UltraCircuitBuilder_<ExecutionTrace>::enforce_small_deltas(const std::vecto
         blocks.delta_range.q_3().emplace_back(0);
         blocks.delta_range.q_c().emplace_back(0);
         blocks.delta_range.q_4().emplace_back(0);
+        blocks.delta_range.q_5().emplace_back(0);
         blocks.delta_range.set_gate_selector(1);
         check_selector_length_consistency();
     }
@@ -838,6 +847,7 @@ void UltraCircuitBuilder_<ExecutionTrace>::create_sort_constraint_with_edges(
         block.q_3().emplace_back(0);
         block.q_c().emplace_back(0);
         block.q_4().emplace_back(0);
+        block.q_5().emplace_back(0);
         block.set_gate_selector(1);
         check_selector_length_consistency();
     }
@@ -888,6 +898,7 @@ void UltraCircuitBuilder_<ExecutionTrace>::apply_memory_selectors(const MEMORY_S
         block.q_2().emplace_back(1);
         block.q_3().emplace_back(0);
         block.q_4().emplace_back(0);
+        block.q_5().emplace_back(0);
         block.q_m().emplace_back(0);
         block.q_c().emplace_back(0);
         check_selector_length_consistency();
@@ -903,6 +914,7 @@ void UltraCircuitBuilder_<ExecutionTrace>::apply_memory_selectors(const MEMORY_S
         block.q_2().emplace_back(0);
         block.q_3().emplace_back(1);
         block.q_4().emplace_back(0);
+        block.q_5().emplace_back(0);
         block.q_m().emplace_back(0);
         block.q_c().emplace_back(0);
         check_selector_length_consistency();
@@ -915,6 +927,7 @@ void UltraCircuitBuilder_<ExecutionTrace>::apply_memory_selectors(const MEMORY_S
         block.q_2().emplace_back(0);
         block.q_3().emplace_back(0);
         block.q_4().emplace_back(1);
+        block.q_5().emplace_back(0);
         block.q_m().emplace_back(0);
         block.q_c().emplace_back(0);
         check_selector_length_consistency();
@@ -928,6 +941,7 @@ void UltraCircuitBuilder_<ExecutionTrace>::apply_memory_selectors(const MEMORY_S
         block.q_2().emplace_back(0);
         block.q_3().emplace_back(0);
         block.q_4().emplace_back(0);
+        block.q_5().emplace_back(0);
         block.q_m().emplace_back(1); // validate record witness is correctly computed
         block.q_c().emplace_back(0); // read/write flag stored in q_c
         check_selector_length_consistency();
@@ -941,6 +955,7 @@ void UltraCircuitBuilder_<ExecutionTrace>::apply_memory_selectors(const MEMORY_S
         block.q_2().emplace_back(0);
         block.q_3().emplace_back(0);
         block.q_4().emplace_back(0);
+        block.q_5().emplace_back(0);
         block.q_m().emplace_back(1); // validate record witness is correctly computed
         block.q_c().emplace_back(0); // read/write flag stored in q_c
         check_selector_length_consistency();
@@ -954,6 +969,7 @@ void UltraCircuitBuilder_<ExecutionTrace>::apply_memory_selectors(const MEMORY_S
         block.q_2().emplace_back(0);
         block.q_3().emplace_back(0);
         block.q_4().emplace_back(0);
+        block.q_5().emplace_back(0);
         block.q_m().emplace_back(1); // validate record witness is correctly computed
         block.q_c().emplace_back(1); // read/write flag stored in q_c
         check_selector_length_consistency();
@@ -964,6 +980,7 @@ void UltraCircuitBuilder_<ExecutionTrace>::apply_memory_selectors(const MEMORY_S
         block.q_2().emplace_back(0);
         block.q_3().emplace_back(0);
         block.q_4().emplace_back(0);
+        block.q_5().emplace_back(0);
         block.q_m().emplace_back(0);
         block.q_c().emplace_back(0);
         check_selector_length_consistency();
@@ -1006,6 +1023,7 @@ void UltraCircuitBuilder_<ExecutionTrace>::apply_nnf_selectors(const NNF_SELECTO
         block.q_2().emplace_back(0);
         block.q_3().emplace_back(1);
         block.q_4().emplace_back(1);
+        block.q_5().emplace_back(0);
         block.q_m().emplace_back(0);
         block.q_c().emplace_back(0);
         check_selector_length_consistency();
@@ -1016,6 +1034,7 @@ void UltraCircuitBuilder_<ExecutionTrace>::apply_nnf_selectors(const NNF_SELECTO
         block.q_2().emplace_back(0);
         block.q_3().emplace_back(1);
         block.q_4().emplace_back(0);
+        block.q_5().emplace_back(0);
         block.q_m().emplace_back(1);
         block.q_c().emplace_back(0);
         check_selector_length_consistency();
@@ -1026,6 +1045,7 @@ void UltraCircuitBuilder_<ExecutionTrace>::apply_nnf_selectors(const NNF_SELECTO
         block.q_2().emplace_back(1);
         block.q_3().emplace_back(1);
         block.q_4().emplace_back(0);
+        block.q_5().emplace_back(0);
         block.q_m().emplace_back(0);
         block.q_c().emplace_back(0);
         check_selector_length_consistency();
@@ -1036,6 +1056,7 @@ void UltraCircuitBuilder_<ExecutionTrace>::apply_nnf_selectors(const NNF_SELECTO
         block.q_2().emplace_back(1);
         block.q_3().emplace_back(0);
         block.q_4().emplace_back(1);
+        block.q_5().emplace_back(0);
         block.q_m().emplace_back(0);
         block.q_c().emplace_back(0);
         check_selector_length_consistency();
@@ -1046,6 +1067,7 @@ void UltraCircuitBuilder_<ExecutionTrace>::apply_nnf_selectors(const NNF_SELECTO
         block.q_2().emplace_back(1);
         block.q_3().emplace_back(0);
         block.q_4().emplace_back(0);
+        block.q_5().emplace_back(0);
         block.q_m().emplace_back(1);
         block.q_c().emplace_back(0);
         check_selector_length_consistency();
@@ -1056,6 +1078,7 @@ void UltraCircuitBuilder_<ExecutionTrace>::apply_nnf_selectors(const NNF_SELECTO
         block.q_2().emplace_back(0);
         block.q_3().emplace_back(0);
         block.q_4().emplace_back(0);
+        block.q_5().emplace_back(0);
         block.q_m().emplace_back(0);
         block.q_c().emplace_back(0);
         check_selector_length_consistency();
@@ -1502,6 +1525,7 @@ std::array<uint32_t, 5> UltraCircuitBuilder_<ExecutionTrace>::evaluate_non_nativ
     block.q_2().emplace_back(-x_mulconst0 * linear_term_scale_factor);
     block.q_3().emplace_back(-y_mulconst0 * linear_term_scale_factor);
     block.q_4().emplace_back(0);
+    block.q_5().emplace_back(0);
     block.q_c().emplace_back(-addconst0 * linear_term_scale_factor);
     block.set_gate_selector(3);
 
@@ -1510,6 +1534,7 @@ std::array<uint32_t, 5> UltraCircuitBuilder_<ExecutionTrace>::evaluate_non_nativ
     block.q_2().emplace_back(-x_mulconst1);
     block.q_3().emplace_back(-y_mulconst1);
     block.q_4().emplace_back(0);
+    block.q_5().emplace_back(0);
     block.q_c().emplace_back(-addconst1);
     block.set_gate_selector(2);
 
@@ -1518,6 +1543,7 @@ std::array<uint32_t, 5> UltraCircuitBuilder_<ExecutionTrace>::evaluate_non_nativ
     block.q_2().emplace_back(-y_mulconst2);
     block.q_3().emplace_back(1);
     block.q_4().emplace_back(0);
+    block.q_5().emplace_back(0);
     block.q_c().emplace_back(-addconst2);
     block.set_gate_selector(1);
 
@@ -1526,6 +1552,7 @@ std::array<uint32_t, 5> UltraCircuitBuilder_<ExecutionTrace>::evaluate_non_nativ
     block.q_2().emplace_back(-y_mulconst3);
     block.q_3().emplace_back(1);
     block.q_4().emplace_back(0);
+    block.q_5().emplace_back(0);
     block.q_c().emplace_back(-addconst3);
     block.set_gate_selector(1);
 
@@ -1627,6 +1654,7 @@ std::array<uint32_t, 5> UltraCircuitBuilder_<ExecutionTrace>::evaluate_non_nativ
     block.q_2().emplace_back(-x_mulconst0 * linear_term_scale_factor);
     block.q_3().emplace_back(y_mulconst0 * linear_term_scale_factor);
     block.q_4().emplace_back(0);
+    block.q_5().emplace_back(0);
     block.q_c().emplace_back(-addconst0 * linear_term_scale_factor);
     block.set_gate_selector(3);
 
@@ -1635,6 +1663,7 @@ std::array<uint32_t, 5> UltraCircuitBuilder_<ExecutionTrace>::evaluate_non_nativ
     block.q_2().emplace_back(-x_mulconst1);
     block.q_3().emplace_back(y_mulconst1);
     block.q_4().emplace_back(0);
+    block.q_5().emplace_back(0);
     block.q_c().emplace_back(-addconst1);
     block.set_gate_selector(2);
 
@@ -1643,6 +1672,7 @@ std::array<uint32_t, 5> UltraCircuitBuilder_<ExecutionTrace>::evaluate_non_nativ
     block.q_2().emplace_back(y_mulconst2);
     block.q_3().emplace_back(1);
     block.q_4().emplace_back(0);
+    block.q_5().emplace_back(0);
     block.q_c().emplace_back(-addconst2);
     block.set_gate_selector(1);
 
@@ -1651,6 +1681,7 @@ std::array<uint32_t, 5> UltraCircuitBuilder_<ExecutionTrace>::evaluate_non_nativ
     block.q_2().emplace_back(y_mulconst3);
     block.q_3().emplace_back(1);
     block.q_4().emplace_back(0);
+    block.q_5().emplace_back(0);
     block.q_c().emplace_back(-addconst3);
     block.set_gate_selector(1);
 
@@ -1800,28 +1831,35 @@ void UltraCircuitBuilder_<FF>::create_poseidon2_external_gate(const poseidon2_ex
     block.q_3().emplace_back(crypto::Poseidon2Bn254ScalarFieldParams::round_constants[in.round_idx][2]);
     block.q_c().emplace_back(0);
     block.q_4().emplace_back(crypto::Poseidon2Bn254ScalarFieldParams::round_constants[in.round_idx][3]);
+    block.q_5().emplace_back(0);
     block.set_gate_selector(1);
     this->check_selector_length_consistency();
     this->increment_num_gates();
 }
 
 /**
- * @brief Poseidon2 internal round gate, activates the q_poseidon2_internal selector and relation
+ * @brief Poseidon2 internal round gate, activates the q_poseidon2_internal selector and relation.
+ *        Ultra-only: Mega covers all internal rounds via the compressed quad-internal block.
  */
 template <typename FF>
 void UltraCircuitBuilder_<FF>::create_poseidon2_internal_gate(const poseidon2_internal_gate_<FF>& in)
 {
-    auto& block = this->blocks.poseidon2_internal;
-    block.populate_wires(in.a, in.b, in.c, in.d);
-    block.q_m().emplace_back(0);
-    block.q_1().emplace_back(crypto::Poseidon2Bn254ScalarFieldParams::round_constants[in.round_idx][0]);
-    block.q_2().emplace_back(0);
-    block.q_3().emplace_back(0);
-    block.q_c().emplace_back(0);
-    block.q_4().emplace_back(0);
-    block.set_gate_selector(1);
-    this->check_selector_length_consistency();
-    this->increment_num_gates();
+    if constexpr (requires { this->blocks.poseidon2_internal; }) {
+        auto& block = this->blocks.poseidon2_internal;
+        block.populate_wires(in.a, in.b, in.c, in.d);
+        block.q_m().emplace_back(0);
+        block.q_1().emplace_back(crypto::Poseidon2Bn254ScalarFieldParams::round_constants[in.round_idx][0]);
+        block.q_2().emplace_back(0);
+        block.q_3().emplace_back(0);
+        block.q_c().emplace_back(0);
+        block.q_4().emplace_back(0);
+        block.q_5().emplace_back(0);
+        block.set_gate_selector(1);
+        this->check_selector_length_consistency();
+        this->increment_num_gates();
+    } else {
+        throw_or_abort("create_poseidon2_internal_gate is Ultra-only (Mega uses the compressed block)");
+    }
 }
 
 /**
diff --git a/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/ultra_circuit_builder.hpp b/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/ultra_circuit_builder.hpp
index 92bf603ef8c8..999d1b4a742b 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/ultra_circuit_builder.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/ultra_circuit_builder.hpp
@@ -488,6 +488,7 @@ class UltraCircuitBuilder_ : public CircuitBuilderBase<typename ExecutionTrace_:
         block.q_3().emplace_back(0);
         block.q_c().emplace_back(0);
         block.q_4().emplace_back(0);
+        block.q_5().emplace_back(0);
         block.set_gate_selector(0); // all selectors zero
 
         check_selector_length_consistency();
diff --git a/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck.hpp b/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck.hpp
index 14a65afa33ff..50026a759c1b 100644
--- a/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck.hpp
+++ b/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck.hpp
@@ -16,6 +16,7 @@
 #include "barretenberg/transcript/transcript.hpp"
 #include "barretenberg/ultra_honk/prover_instance.hpp"
 #include "sumcheck_round.hpp"
+#include <memory>
 
 namespace bb {
 
@@ -874,7 +875,11 @@ template <typename Flavor> class SumcheckVerifier {
         // For other flavors, we perform the sumcheck univariate consistency check
 
         bool verified = true;
-        ClaimedEvaluations purported_evaluations;
+        // Heap-allocate ClaimedEvaluations (AllValues) to keep the sumcheck-verify stack frame small.
+        // For recursive flavors with many columns (e.g. AVM), holding this inline on the stack can exceed the 8 MB
+        // stack limit once nested inside the inner-Mega AVM recursive verifier chain
+        auto purported_evaluations_storage = std::make_unique<ClaimedEvaluations>();
+        ClaimedEvaluations& purported_evaluations = *purported_evaluations_storage;
         for (size_t round_idx = 0; round_idx < virtual_log_n; round_idx++) {
             round.process_round(transcript, multivariate_challenge, gate_separators, round_idx);
             verified = verified && !round.round_failed;
@@ -895,15 +900,16 @@ template <typename Flavor> class SumcheckVerifier {
         if constexpr (IsTranslatorFlavor<Flavor>) {
             // Translator path: receive full-circuit evaluations, set them, and complete
             // (computable precomputed selectors + L_0 scaling of minicircuit wires already placed above)
-            auto get_full_circuit_evaluations =
+            auto get_full_circuit_evaluations = std::make_unique<std::array<FF, Flavor::NUM_FULL_CIRCUIT_EVALUATIONS>>(
                 transcript->template receive_from_prover<std::array<FF, Flavor::NUM_FULL_CIRCUIT_EVALUATIONS>>(
-                    "Sumcheck:evaluations");
+                    "Sumcheck:evaluations"));
             Flavor::complete_full_circuit_evaluations(
-                purported_evaluations, get_full_circuit_evaluations, std::span<const FF>(multivariate_challenge));
+                purported_evaluations, *get_full_circuit_evaluations, std::span<const FF>(multivariate_challenge));
         } else {
-            auto transcript_evaluations =
-                transcript->template receive_from_prover<std::array<FF, NUM_POLYNOMIALS>>("Sumcheck:evaluations");
-            for (auto [eval, transcript_eval] : zip_view(purported_evaluations.get_all(), transcript_evaluations)) {
+            // Heap-allocate transcript_evaluations for the same reason as purported_evaluations above.
+            auto transcript_evaluations = std::make_unique<std::array<FF, NUM_POLYNOMIALS>>(
+                transcript->template receive_from_prover<std::array<FF, NUM_POLYNOMIALS>>("Sumcheck:evaluations"));
+            for (auto [eval, transcript_eval] : zip_view(purported_evaluations.get_all(), *transcript_evaluations)) {
                 eval = transcript_eval;
             }
         }
@@ -932,7 +938,7 @@ template <typename Flavor> class SumcheckVerifier {
 
         // For ZK Flavors: the evaluations of Libra univariates are included in the Sumcheck Output
         return SumcheckOutput<Flavor>{ .challenge = multivariate_challenge,
-                                       .claimed_evaluations = purported_evaluations,
+                                       .claimed_evaluations = std::move(purported_evaluations),
                                        .verified = verified,
                                        .claimed_libra_evaluation = zk_correction_handler.get_libra_evaluation(),
                                        .round_univariate_commitments = round.get_round_univariate_commitments(),
diff --git a/barretenberg/cpp/src/barretenberg/trace_to_polynomials/trace_to_polynomials.cpp b/barretenberg/cpp/src/barretenberg/trace_to_polynomials/trace_to_polynomials.cpp
index 85ba07682b47..98e86abc86b1 100644
--- a/barretenberg/cpp/src/barretenberg/trace_to_polynomials/trace_to_polynomials.cpp
+++ b/barretenberg/cpp/src/barretenberg/trace_to_polynomials/trace_to_polynomials.cpp
@@ -6,6 +6,7 @@
 
 #include "trace_to_polynomials.hpp"
 #include "barretenberg/common/assert.hpp"
+#include "barretenberg/common/thread.hpp"
 #include "barretenberg/constants.hpp"
 #include "barretenberg/ext/starknet/flavor/ultra_starknet_flavor.hpp"
 #include "barretenberg/ext/starknet/flavor/ultra_starknet_zk_flavor.hpp"
@@ -52,45 +53,90 @@ std::vector<CyclicPermutation> TraceToPolynomials<Flavor>::populate_wires_and_se
     RefArray<Polynomial, NUM_WIRES> wires = polynomials.get_wires();
     auto selectors = polynomials.get_selectors();
 
-    // For each block in the trace, populate wire polys, copy cycles and selector polys
-    for (auto& block : builder.blocks.get()) {
-        const uint32_t offset = block.trace_offset();
-        const uint32_t block_size = static_cast<uint32_t>(block.size());
+    // Two-phase parallelisation. Phase 1 fans out over blocks to populate wires and emit copy-cycle
+    // nodes; phase 2 fans out over a flattened (block, selector) task list to fill selectors.
+    auto blocks_array = builder.blocks.get();
+    const size_t num_blocks = blocks_array.size();
 
-        // Update wire polynomials and copy cycles
-        // NB: The order of row/column loops is arbitrary but needs to be row/column to match old copy_cycle code
-        {
-            BB_BENCH_NAME("populating wires and copy_cycles");
+    // Pre-pass: count copy-cycle sizes per real-variable index so each copy_cycles[i] can be
+    // reserve()d once before the serial concat in phase 1.5, avoiding repeated reallocations.
+    {
+        BB_BENCH_NAME("counting copy_cycles");
+        std::vector<uint32_t> cycle_counts(builder.real_variable_index.size(), 0);
+        for (auto& block : blocks_array) {
+            const uint32_t block_size = static_cast<uint32_t>(block.size());
+            for (uint32_t block_row_idx = 0; block_row_idx < block_size; ++block_row_idx) {
+                for (uint32_t wire_idx = 0; wire_idx < NUM_WIRES; ++wire_idx) {
+                    uint32_t var_idx = block.wires[wire_idx][block_row_idx];
+                    // var_idx may be untrusted (e.g. from ACIR) so use .at() to catch OOB. This validates real_var_idx
+                    // as an in-range index for both cycle_counts and copy_cycles (same size), which is why phase 1.5
+                    // below can index copy_cycles[real_var_idx] without .at().
+                    ++cycle_counts.at(builder.real_variable_index.at(var_idx));
+                }
+            }
+        }
+        for (size_t i = 0; i < copy_cycles.size(); ++i) {
+            copy_cycles[i].reserve(cycle_counts[i]);
+        }
+    }
 
+    // Phase 1: per-block parallel pass over wires and emit copy-cycle nodes.
+    std::vector<std::vector<std::pair<uint32_t, cycle_node>>> per_block_nodes(num_blocks);
+    {
+        BB_BENCH_NAME("populate_wires_and_emit_cycles");
+        parallel_for(num_blocks, [&](size_t block_idx) {
+            auto& block = blocks_array[block_idx];
+            const uint32_t offset = block.trace_offset();
+            const uint32_t block_size = static_cast<uint32_t>(block.size());
+            auto& local_nodes = per_block_nodes[block_idx];
+            local_nodes.reserve(static_cast<size_t>(block_size) * NUM_WIRES);
+
+            // NB: The order of row/column loops is arbitrary but needs to be row/column to match old copy_cycle code.
             for (uint32_t block_row_idx = 0; block_row_idx < block_size; ++block_row_idx) {
                 for (uint32_t wire_idx = 0; wire_idx < NUM_WIRES; ++wire_idx) {
                     uint32_t var_idx = block.wires[wire_idx][block_row_idx]; // an index into the variables array
-                    // Use .at() for bounds checking - fuzzer found OOB with malformed ACIR
+                    // Use .at() so out-of-range var_idx is caught instead of producing a silent OOB read.
                     uint32_t real_var_idx = builder.real_variable_index.at(var_idx);
                     uint32_t trace_row_idx = block_row_idx + offset;
                     // Insert the real witness values from this block into the wire polys at the correct offset
                     wires[wire_idx].at(trace_row_idx) = builder.get_variable(var_idx);
-                    // Add the address of the witness value to its corresponding copy cycle
-                    // Note that the copy_cycles are indexed by real_variable_indices.
-                    copy_cycles.at(real_var_idx).emplace_back(cycle_node{ wire_idx, trace_row_idx });
+                    local_nodes.emplace_back(real_var_idx, cycle_node{ wire_idx, trace_row_idx });
                 }
             }
+        });
+    }
+
+    // Phase 1.5: Serial concat in block order to preserve cycle-node ordering within each variable's cycle list.
+    {
+        BB_BENCH_NAME("fill_copy_cycles");
+        for (const auto& block_nodes : per_block_nodes) {
+            for (const auto& [real_var_idx, node] : block_nodes) {
+                copy_cycles[real_var_idx].emplace_back(node);
+            }
         }
+    }
 
-        {
-            BB_BENCH_NAME("populating selectors");
-            RefVector<Selector<FF>> block_selectors = block.get_selectors();
-            // Insert the selector values for this block into the selector polynomials at the correct offset
-            // TODO(https://github.com/AztecProtocol/barretenberg/issues/398): implicit arithmetization/flavor
-            // consistency
-            for (size_t selector_idx = 0; selector_idx < block_selectors.size(); selector_idx++) {
-                auto& selector = block_selectors[selector_idx];
-                for (size_t row_idx = 0; row_idx < block_size; ++row_idx) {
-                    size_t trace_row_idx = row_idx + offset;
-                    selectors[selector_idx].set_if_valid_index(trace_row_idx, selector[row_idx]);
-                }
+    // Phase 2: parallel selector filling across a flattened (block_idx, selector_idx) task list.
+    {
+        BB_BENCH_NAME("populate_selectors");
+        std::vector<std::pair<size_t, size_t>> selector_tasks;
+        for (size_t block_idx = 0; block_idx < num_blocks; ++block_idx) {
+            const size_t num_selectors = blocks_array[block_idx].get_selectors().size();
+            for (size_t selector_idx = 0; selector_idx < num_selectors; ++selector_idx) {
+                selector_tasks.emplace_back(block_idx, selector_idx);
             }
         }
+        parallel_for(selector_tasks.size(), [&](size_t task_idx) {
+            const auto [block_idx, selector_idx] = selector_tasks[task_idx];
+            auto& block = blocks_array[block_idx];
+            const size_t offset = block.trace_offset();
+            const size_t block_size = block.size();
+            RefVector<Selector<FF>> block_selectors = block.get_selectors();
+            auto& selector = block_selectors[selector_idx];
+            for (size_t row_idx = 0; row_idx < block_size; ++row_idx) {
+                selectors[selector_idx].set_if_valid_index(row_idx + offset, selector[row_idx]);
+            }
+        });
     }
 
     return copy_cycles;
diff --git a/barretenberg/cpp/src/barretenberg/transcript/README.md b/barretenberg/cpp/src/barretenberg/transcript/README.md
index b707f9e65e10..d69d6eff24bb 100644
--- a/barretenberg/cpp/src/barretenberg/transcript/README.md
+++ b/barretenberg/cpp/src/barretenberg/transcript/README.md
@@ -280,9 +280,9 @@ Origin tags prevent these violations by **tainting** each value with metadata tr
 
 ```cpp
 struct OriginTag {
-    size_t transcript_index;           // Which transcript instance created this value
-    numeric::uint256_t round_provenance; // Which protocol rounds contributed to this value
-    bool instant_death;          // Poison flag - abort on any arithmetic
+    size_t transcript_index;             // Which transcript instance created this value
+    numeric::uint512_t round_provenance; // Which protocol rounds contributed to this value
+    bool instant_death;                  // Poison flag - abort on any arithmetic
 };
 ```
 
@@ -303,42 +303,42 @@ transcript_index = unique_transcript_index.fetch_add(1);
 
 #### round_provenance - Round Tracking Bitmask
 
-A 256-bit value split into two 128-bit halves:
+A 512-bit value split into two 256-bit halves:
 
 ```
-[Upper 128 bits: Challenges] [Lower 128 bits: Submitted Values]
+[Upper 256 bits: Challenges] [Lower 256 bits: Submitted Values]
 ```
 
-- **Bit `i` in lower 128 bits**: This value uses data submitted in round `i`
-- **Bit `i` in upper 128 bits**: This value uses a challenge generated in round `i`
+- **Bit `i` in lower 256 bits**: This value uses data submitted in round `i`
+- **Bit `i` in upper 256 bits**: This value uses a challenge generated in round `i`
 
 **Construction**:
 ```cpp
 // SINGLE BIT EXAMPLES - Values from one round only
 
 // Submitted value in round 3
-round_provenance = (1 << 3);  // 0x0000...0008 (bit 3 in lower 128 bits)
+round_provenance = (1 << 3);  // 0x0000...0008 (bit 3 in lower 256 bits)
 
 // Challenge from round 5
-round_provenance = (1 << (5 + 128));  // 0x0020...0000 (bit 5 in upper 128 bits)
+round_provenance = (1 << (5 + 256));  // 0x0020...0000 (bit 5 in upper 256 bits)
 
 
 // MULTIPLE BITS EXAMPLES - Values combined from multiple rounds
 
 // Value depending on submitted data from BOTH round 0 AND round 2
-round_provenance = (1 << 0) | (1 << 2);  // 0x0000...0005 (bits 0 and 2 in lower 128)
+round_provenance = (1 << 0) | (1 << 2);  // 0x0000...0005 (bits 0 and 2 in lower 256)
 // Meaning: "This value incorporates data submitted in rounds 0 AND 2"
 
 // Value depending on challenges from BOTH round 1 AND round 3
-round_provenance = (1 << (1 + 128)) | (1 << (3 + 128));  // 0x000A...0000 (bits 1 and 3 in upper 128)
+round_provenance = (1 << (1 + 256)) | (1 << (3 + 256));  // 0x000A...0000 (bits 1 and 3 in upper 256)
 // Meaning: "This value incorporates challenges from rounds 1 AND 3"
 
 // Value depending on submitted data (round 0) AND challenge (round 0)
-round_provenance = (1 << 0) | (1 << (0 + 128));  // 0x0001...0001 (bit 0 in both halves)
+round_provenance = (1 << 0) | (1 << (0 + 256));  // 0x0001...0001 (bit 0 in both halves)
 // Meaning: "This value uses both the data submitted in round 0 AND the challenge from round 0"
 
 // Complex example: submitted data from rounds 0,1 and challenges from rounds 0,2
-round_provenance = (1 << 0) | (1 << 1) | (1 << (0 + 128)) | (1 << (2 + 128));
+round_provenance = (1 << 0) | (1 << 1) | (1 << (0 + 256)) | (1 << (2 + 256));
 //          0x0005...0003
 // Meaning: "This value's computation involved:
 //          - Submitted values from rounds 0 and 1
@@ -397,7 +397,7 @@ OriginTag::OriginTag(const OriginTag& tag_a, const OriginTag& tag_b)
     }
 
     // 5. Check cross-round contamination (the critical security check)
-    check_round_provenances(tag_a.round_provenance, tag_b.round_provenance);
+    check_round_provenance(tag_a.round_provenance, tag_b.round_provenance);
 
     // 6. Merge the tags
     transcript_index = tag_a.transcript_index;
@@ -422,23 +422,23 @@ In recursive verification (in-circuit mode), values receive origin tags when the
 // Recursive verifier receives wire commitment from proof (round 0)
 auto comm = transcript->receive_from_prover<Commitment>("wire_comm");
 // comm.get_origin_tag() = OriginTag(transcript_id, round=0, is_submitted=true)
-//   → round_provenance = 0x0000...0001 (bit 0 set in lower 128 bits)
+//   → round_provenance = 0x0000...0001 (bit 0 set in lower 256 bits)
 
 // Verifier generates challenge after round 0 data
 auto beta = transcript->get_challenge<FF>("beta");
 // beta.get_origin_tag() = OriginTag(transcript_id, round=0, is_submitted=false)
-//   → round_provenance = 0x0001...0000 (bit 0 set in upper 128 bits)
+//   → round_provenance = 0x0001...0000 (bit 0 set in upper 256 bits)
 ```
 
 **Tag construction** (in `origin_tag.hpp:OriginTag` constructor):
 ```cpp
 OriginTag(size_t parent_index, size_t child_index, bool is_submitted = true)
     : transcript_index(parent_index)
-    , round_provenance((static_cast<uint256_t>(1) << (child_index + (is_submitted ? 0 : 128))))
+    , round_provenance((static_cast<uint512_t>(1) << (child_index + (is_submitted ? 0 : 256))))
 ```
 
-- Submitted values: bit shifted by `child_index` (lower 128 bits)
-- Challenges: bit shifted by `child_index + 128` (upper 128 bits)
+- Submitted values: bit shifted by `child_index` (lower 256 bits)
+- Challenges: bit shifted by `child_index + 256` (upper 256 bits)
 
 #### 2. Tag Merging Example
 
@@ -458,21 +458,26 @@ This merged tag now carries the full provenance: it depends on data submitted in
 
 #### 3. The Cross-Round Check
 
-The critical security check in `check_round_provenances()`:
+The critical security check in `check_round_provenance()`:
 
 ```cpp
-void check_round_provenances(const uint256_t& tag_a, const uint256_t& tag_b)
+void check_round_provenance(const uint512_t& provenance_a, const uint512_t& provenance_b)
 {
-    const uint128_t* challenges_a = (const uint128_t*)(&tag_a.data[2]);  // Upper 128 bits
-    const uint128_t* submitted_a = (const uint128_t*)(&tag_a.data[0]);   // Lower 128 bits
+    // Lower 256 bits = submitted rounds, Upper 256 bits = challenge rounds
+    const uint256_t& submitted_a = provenance_a.lo;
+    const uint256_t& submitted_b = provenance_b.lo;
 
-    // Similar for tag_b...
+    // Nothing to check if either has no submitted data or both are from the same round(s)
+    if (submitted_a == 0 || submitted_b == 0 || submitted_a == submitted_b) {
+        return;
+    }
 
-    // VIOLATION: Two submitted values from different rounds mixing without challenges
-    if (*challenges_a == 0 && *challenges_b == 0 &&     // Neither has challenge bits set
-        *submitted_a != 0 && *submitted_b != 0 &&        // Both have submitted bits set
-        *submitted_a != *submitted_b) {                  // From different rounds
-        throw_or_abort("Submitted values from 2 different rounds are mixing without challenges");
+    // VIOLATION: max challenge round must be >= max submitted round, otherwise the submitted
+    // values from different rounds were combined without a challenge that binds the later round.
+    const int max_challenge_round = highest_set_bit_256(provenance_a.hi | provenance_b.hi);
+    const int max_submitted_round = highest_set_bit_256(submitted_a | submitted_b);
+    if (max_challenge_round < max_submitted_round) {
+        throw_or_abort("Round provenance check failed: max challenge round < max submitted round");
     }
 }
 ```
@@ -587,27 +592,29 @@ ROUND 2 - LOG DERIVATIVE INVERSE (challenge_generation_phase=true → false, rou
 │ receive_from_prover("lookup_inverses")   │──► Origin tag: OriginTag(42, 2, true)
 └──────────────────────────────────────────┘    round_provenance = 0x0000...0004 (bit 2 lower)
 
+┌──────────────────────────────────┐
+│ get_challenge("delta")           │──► Tag: OriginTag(42, 2, false)
+└──────────────────────────────────┘    round_provenance = 0x0004...0000 (bit 2 upper)
+
     ** Example: Tag merging with cross-round values **
 
-    combined = eta * lookup_inverses
+    combined = delta * lookup_inverses
          │
          │ Tag Merging:
-         │  eta.tag            = OriginTag(42, 0, false) → 0x0001...0000
-         │  lookup_inv.tag     = OriginTag(42, 2, true)  → 0x0000...0004
-         │  combined.tag       = OriginTag(42, parent)   → 0x0001...0004 (OR'd)
+         │  delta.tag           = OriginTag(42, 2, false) → 0x0004...0000
+         │  lookup_inv.tag      = OriginTag(42, 2, true)  → 0x0000...0004
+         │  combined.tag        = OriginTag(42, parent)   → 0x0004...0004 (OR'd)
          │
          ▼
     ┌─────────────────────────────────────────────┐
-    │ check_round_provenances(eta.tag, lookup_inv.tag)   │
+    │ check_round_provenance(delta.tag, lookup_inv.tag)  │
     └─────────────────────────────────────────────┘
          │
-         │ CHECK: Submitted values from different rounds?
-         │   challenges_eta   = 0x0001...0000 (non-zero) ✓
-         │   submitted_eta    = 0x0000...0000 (zero)
-         │   challenges_inv   = 0x0000...0000 (zero)
-         │   submitted_inv    = 0x0000...0004 (non-zero)
+         │ CHECK: max challenge round >= max submitted round?
+         │   max challenge round = 2 (delta is round-2 challenge)
+         │   max submitted round = 2 (lookup_inverses submitted in round 2)
          │
-         │ ✓ PASS: eta has challenge bits, prevents cross-round violation
+         │ ✓ PASS: 2 >= 2. Round-2 challenge correctly binds round-2 submitted data.
          │
          ▼
     combined (FF witness with merged tag)
@@ -618,35 +625,34 @@ ORIGIN TAG VIOLATION EXAMPLE (Cross-Round Contamination)
 
     ┌──────────────────────────────────┐
     │ Round 0: w_l (wire commitment)   │ tag = OriginTag(42, 0, true)
-    │          round_provenance = 0x...0001   │      (bit 0 in lower 128 bits)
+    │          round_provenance = 0x...0001   │      (bit 0 in lower 256 bits)
     └──────────────────────────────────┘
                                 │
-                                │ (eta challenges generated)
+                                │ (eta challenges generated → tag has bit 0 in upper 256 bits)
                                 │
     ┌──────────────────────────────────┐
     │ Round 1: w_4 (4th wire)          │ tag = OriginTag(42, 1, true)
-    │          round_provenance = 0x...0002   │      (bit 1 in lower 128 bits)
+    │          round_provenance = 0x...0002   │      (bit 1 in lower 256 bits)
     └──────────────────────────────────┘
                                 │
                                 ▼
-                    ❌ VIOLATION: Direct mixing without challenges
-                    result = w_l + w_4
+                    ❌ VIOLATION: round-0 challenge cannot bind round-1 submission
+                    result = eta * w_l + w_4
                                 │
-                    check_round_provenances() detects:
-                      challenges_w_l = 0 (no challenges involved)
-                      challenges_w_4 = 0 (no challenges involved)
-                      submitted_w_l  = 0x...0001 (from round 0)
-                      submitted_w_4  = 0x...0002 (from round 1)
-                      submitted_w_l != submitted_w_4  ← DIFFERENT ROUNDS!
+                    check_round_provenance() detects:
+                      max challenge round  = 0 (only eta involved, from round 0)
+                      max submitted round  = 1 (w_4 was submitted in round 1)
+                      0 < 1  ← challenge does not reach the latest submitted round!
 
-                    → throw_or_abort("Submitted values from 2 different
-                                      rounds are mixing without challenges")
+                    → throw_or_abort("Round provenance check failed:
+                                      max challenge round < max submitted round")
 
-    ✅ CORRECT: Must use challenge to combine cross-round values
-                    result = eta * w_l + w_4
+    ✅ CORRECT: Use a challenge from round >= max submitted round
+                    auto beta = transcript->get_challenge<FF>("beta");  // round-1 challenge
+                    result = beta * w_l + w_4
                       │
-                      │ eta.tag has challenge bits from round 0
-                      │ → Properly binds the two rounds together
+                      │ beta.tag has challenge bits from round 1
+                      │ max challenge round = 1, max submitted round = 1 → PASS
                       ▼
                     OK (merged tag tracks both rounds AND challenge)
 
diff --git a/barretenberg/cpp/src/barretenberg/transcript/origin_tag.cpp b/barretenberg/cpp/src/barretenberg/transcript/origin_tag.cpp
index e9d60e3a82fe..d8cc514ef3e1 100644
--- a/barretenberg/cpp/src/barretenberg/transcript/origin_tag.cpp
+++ b/barretenberg/cpp/src/barretenberg/transcript/origin_tag.cpp
@@ -7,7 +7,6 @@
 #include "barretenberg/transcript/origin_tag.hpp"
 #include "barretenberg/common/throw_or_abort.hpp"
 #include "barretenberg/numeric/uint256/uint256.hpp"
-#include <cstring>
 #include <string>
 
 namespace bb {
@@ -16,32 +15,21 @@ using namespace numeric;
 
 namespace {
 /**
- * @brief Find the position of the highest set bit in a uint128_t
- * @return -1 if no bits are set, otherwise the bit position (0-127)
+ * @brief Find the position of the highest set bit in a uint256_t
+ * @return -1 if no bits are set, otherwise the bit position (0-255)
  */
-inline int highest_set_bit_128(uint128_t value)
+inline int highest_set_bit_256(uint256_t value)
 {
     if (value == 0) {
         return -1;
     }
-    // Check high 64 bits first
-    auto high = static_cast<uint64_t>(value >> 64);
-    if (high != 0) {
-        return 127 - __builtin_clzll(high);
+    for (int idx = 0; idx < 4; idx++) {
+        auto chunk = static_cast<uint64_t>(value >> (64 * (3 - idx)));
+        if (chunk != 0) {
+            return 255 - (idx * 64) - __builtin_clzll(chunk);
+        }
     }
-    // Check low 64 bits
-    auto low = static_cast<uint64_t>(value);
-    return 63 - __builtin_clzll(low);
-}
-
-/**
- * @brief Safely extract uint128_t from uint256_t data array using memcpy to avoid strict aliasing issues
- */
-inline uint128_t extract_uint128(const uint64_t* data)
-{
-    uint128_t result = 0;
-    std::memcpy(&result, data, sizeof(uint128_t));
-    return result;
+    return -1;
 }
 } // namespace
 
@@ -60,11 +48,11 @@ inline uint128_t extract_uint128(const uint64_t* data)
  * @param provenance_a Round provenance of first element
  * @param provenance_b Round provenance of second element
  */
-void check_round_provenance(const uint256_t& provenance_a, const uint256_t& provenance_b)
+void check_round_provenance(const uint512_t& provenance_a, const uint512_t& provenance_b)
 {
-    // Lower 128 bits = submitted rounds, Upper 128 bits = challenge rounds
-    const auto submitted_a = extract_uint128(&provenance_a.data[0]);
-    const auto submitted_b = extract_uint128(&provenance_b.data[0]);
+    // Lower 256 bits = submitted rounds, Upper 256 bits = challenge rounds
+    const uint256_t& submitted_a = provenance_a.lo;
+    const uint256_t& submitted_b = provenance_b.lo;
 
     // Nothing to check if either has no submitted data or both are from the same round(s)
     if (submitted_a == 0 || submitted_b == 0 || submitted_a == submitted_b) {
@@ -72,10 +60,8 @@ void check_round_provenance(const uint256_t& provenance_a, const uint256_t& prov
     }
 
     // Ensure that values from different rounds are not mixing without max challenge round >= max submitted round
-    const auto challenges_a = extract_uint128(&provenance_a.data[2]);
-    const auto challenges_b = extract_uint128(&provenance_b.data[2]);
-    const int max_challenge_round = highest_set_bit_128(challenges_a | challenges_b);
-    const int max_submitted_round = highest_set_bit_128(submitted_a | submitted_b);
+    const int max_challenge_round = highest_set_bit_256(provenance_a.hi | provenance_b.hi);
+    const int max_submitted_round = highest_set_bit_256(submitted_a | submitted_b);
 
     if (max_challenge_round < max_submitted_round) {
         throw_or_abort("Round provenance check failed: max challenge round (" + std::to_string(max_challenge_round) +
diff --git a/barretenberg/cpp/src/barretenberg/transcript/origin_tag.hpp b/barretenberg/cpp/src/barretenberg/transcript/origin_tag.hpp
index 634dc8c3ce02..44873fecf2a8 100644
--- a/barretenberg/cpp/src/barretenberg/transcript/origin_tag.hpp
+++ b/barretenberg/cpp/src/barretenberg/transcript/origin_tag.hpp
@@ -16,7 +16,7 @@
 #include "barretenberg/common/assert.hpp"
 #include "barretenberg/common/throw_or_abort.hpp"
 #include "barretenberg/numeric/uint256/uint256.hpp"
-#include <atomic>
+#include "barretenberg/numeric/uintx/uintx.hpp"
 #include <cstddef>
 #include <iterator>
 #include <ostream>
@@ -65,7 +65,7 @@ template <typename T> constexpr bool is_iterable_v = is_iterable<T>::value;
 
 namespace bb {
 
-void check_round_provenance(const uint256_t& provenance_a, const uint256_t& provenance_b);
+void check_round_provenance(const uint512_t& provenance_a, const uint512_t& provenance_b);
 #ifndef AZTEC_NO_ORIGIN_TAGS
 struct OriginTag {
 
@@ -87,10 +87,10 @@ struct OriginTag {
     size_t transcript_index = FREE_WITNESS;
 
     // round_provenance specifies which submitted values and challenges have been used to generate this element
-    // The lower 128 bits represent using a submitted value from a corresponding round (the shift represents the
-    // round) The higher 128 bits represent using a challenge value from an corresponding round (the shift
+    // The lower 256 bits represent using a submitted value from a corresponding round (the shift represents the
+    // round) The higher 256 bits represent using a challenge value from an corresponding round (the shift
     // represents the round)
-    numeric::uint256_t round_provenance = numeric::uint256_t(0);
+    numeric::uint512_t round_provenance = numeric::uint512_t(0);
 
     // Instant death is used for poisoning values we should never use in arithmetic
     bool instant_death = false;
@@ -117,9 +117,9 @@ struct OriginTag {
      */
     OriginTag(size_t transcript_idx, size_t round_number, bool is_submitted = true)
         : transcript_index(transcript_idx)
-        , round_provenance((static_cast<uint256_t>(1) << (round_number + (is_submitted ? 0 : 128))))
+        , round_provenance((static_cast<uint512_t>(1) << (round_number + (is_submitted ? 0 : 256))))
     {
-        BB_ASSERT_LT(round_number, 128U);
+        BB_ASSERT_LT(round_number, 256U);
     }
 
     /**
@@ -166,19 +166,19 @@ struct OriginTag {
     void set_free_witness()
     {
         transcript_index = FREE_WITNESS;
-        round_provenance = 0;
+        round_provenance = numeric::uint512_t(0);
     }
     void unset_free_witness()
     {
         transcript_index = CONSTANT;
-        round_provenance = numeric::uint256_t(0);
+        round_provenance = numeric::uint512_t(0);
     }
 
     bool is_constant() const { return transcript_index == CONSTANT && !instant_death; }
     void set_constant()
     {
         transcript_index = CONSTANT;
-        round_provenance = numeric::uint256_t(0);
+        round_provenance = numeric::uint512_t(0);
     }
 
     // Static factory methods for cleaner syntax
@@ -206,7 +206,7 @@ struct OriginTag {
     /**
      * @brief Clear the round_provenance to address round provenance false positives.
      */
-    void clear_round_provenance() { round_provenance = numeric::uint256_t(0); }
+    void clear_round_provenance() { round_provenance = numeric::uint512_t(0); }
 };
 inline std::ostream& operator<<(std::ostream& os, OriginTag const& v)
 {
diff --git a/barretenberg/cpp/src/barretenberg/translator_vm/relation_correctness.test.cpp b/barretenberg/cpp/src/barretenberg/translator_vm/relation_correctness.test.cpp
index 26673dbbb3bc..e79da1cd25e1 100644
--- a/barretenberg/cpp/src/barretenberg/translator_vm/relation_correctness.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/translator_vm/relation_correctness.test.cpp
@@ -454,10 +454,7 @@ TEST_F(TranslatorRelationCorrectnessTests, NonNative)
     auto& engine = numeric::get_debug_randomness();
 
     auto op_queue = std::make_shared<bb::ECCOpQueue>();
-    op_queue->no_op_ultra_only();
-    op_queue->random_op_ultra_only();
-    op_queue->random_op_ultra_only();
-    op_queue->random_op_ultra_only();
+    op_queue->construct_zk_columns();
 
     // Generate random EccOpQueue actions
 
@@ -490,7 +487,7 @@ TEST_F(TranslatorRelationCorrectnessTests, NonNative)
     }
     op_queue->random_op_ultra_only();
     op_queue->random_op_ultra_only();
-    op_queue->merge(MergeSettings::APPEND, op_queue->get_append_offset());
+    op_queue->merge_fixed_append(op_queue->get_append_offset());
 
     const auto batching_challenge_v = BF::random_element(&engine);
     const auto evaluation_input_x = BF::random_element(&engine);
diff --git a/barretenberg/cpp/src/barretenberg/translator_vm/relation_failure.test.cpp b/barretenberg/cpp/src/barretenberg/translator_vm/relation_failure.test.cpp
index 9bbdf7efc014..591d32629ccb 100644
--- a/barretenberg/cpp/src/barretenberg/translator_vm/relation_failure.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/translator_vm/relation_failure.test.cpp
@@ -125,12 +125,9 @@ ValidTranslatorState build_valid_accumulator_transfer_state()
     auto& engine = numeric::get_debug_randomness();
 
     auto op_queue = std::make_shared<ECCOpQueue>();
-    op_queue->no_op_ultra_only();
+    op_queue->construct_zk_columns();
 
-    // Add random start ops, then mixed ops, merge, more mixed ops, random end ops, final merge
-    for (size_t i = 0; i < Flavor::CircuitBuilder::NUM_RANDOM_OPS_START; i++) {
-        op_queue->random_op_ultra_only();
-    }
+    // Add mixed ops, merge, more mixed ops, random end ops, final merge
     for (size_t i = 0; i < 50; i++) {
         op_queue->add_accumulate(GroupElement::random_element(&engine));
         op_queue->mul_accumulate(GroupElement::random_element(&engine), FF::random_element(&engine));
@@ -145,7 +142,7 @@ ValidTranslatorState build_valid_accumulator_transfer_state()
     for (size_t i = 0; i < Flavor::CircuitBuilder::NUM_RANDOM_OPS_END; i++) {
         op_queue->random_op_ultra_only();
     }
-    op_queue->merge(MergeSettings::APPEND, op_queue->get_append_offset());
+    op_queue->merge_fixed_append(op_queue->get_append_offset());
 
     const auto batching_challenge_v = BF::random_element(&engine);
     const auto evaluation_input_x = BF::random_element(&engine);
diff --git a/barretenberg/cpp/src/barretenberg/translator_vm/translator.test.cpp b/barretenberg/cpp/src/barretenberg/translator_vm/translator.test.cpp
index 5c8654e80448..6187dd7706b1 100644
--- a/barretenberg/cpp/src/barretenberg/translator_vm/translator.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/translator_vm/translator.test.cpp
@@ -189,15 +189,14 @@ class TranslatorTests : public ::testing::Test {
                                                 const size_t circuit_size_parameter = 500)
     {
 
-        // Add the same operations to the ECC op queue; the native computation is performed under the hood.
-        auto op_queue = std::make_shared<bb::ECCOpQueue>();
-        op_queue->no_op_ultra_only();
-        add_random_ops(op_queue, CircuitBuilder::NUM_RANDOM_OPS_START);
+        auto op_queue = std::make_shared<ECCOpQueue>();
+        // Construct zk_columns
+        op_queue->construct_zk_columns();
+        // Table with correct final structure for translator
         add_mixed_ops(op_queue, circuit_size_parameter / 2);
-        op_queue->merge();
-        add_mixed_ops(op_queue, circuit_size_parameter / 2);
-        add_random_ops(op_queue, CircuitBuilder::NUM_RANDOM_OPS_END);
-        op_queue->merge(MergeSettings::APPEND, op_queue->get_append_offset());
+        add_random_ops(op_queue, TranslatorCircuitBuilder::NUM_RANDOM_OPS_END);
+        // Merge with fixed append
+        op_queue->merge_fixed_append(op_queue->get_append_offset());
 
         return CircuitBuilder{ batching_challenge_v, evaluation_challenge_x, op_queue };
     }
diff --git a/barretenberg/cpp/src/barretenberg/translator_vm/translator_circuit_builder.cpp b/barretenberg/cpp/src/barretenberg/translator_vm/translator_circuit_builder.cpp
index e36eb88eae9a..0e1683e333e2 100644
--- a/barretenberg/cpp/src/barretenberg/translator_vm/translator_circuit_builder.cpp
+++ b/barretenberg/cpp/src/barretenberg/translator_vm/translator_circuit_builder.cpp
@@ -427,7 +427,11 @@ void TranslatorCircuitBuilder::feed_ecc_op_queue_into_circuit(const std::shared_
 {
     BB_BENCH_NAME("TranslatorCircuitBuilder::feed_ecc_op_queue_into_circuit");
     using Fq = bb::fq;
-    const auto& ultra_ops = ecc_op_queue->get_ultra_ops();
+    // If in AVM mode, we use the non-zk reconstructed ultra ops as the structure required by Translator is added by the
+    // GoblinAVM constructor. In Chonk, this structure is given by the zk columns, so we use the zk reconstructed
+    // ultra ops.
+    const auto& ultra_ops =
+        avm_mode ? ecc_op_queue->get_no_zk_reconstructed_ultra_ops() : ecc_op_queue->get_zk_reconstructed_ultra_ops();
     std::vector<Fq> accumulator_trace;
     Fq current_accumulator(0);
     if (ultra_ops.empty()) {
diff --git a/barretenberg/cpp/src/barretenberg/translator_vm/translator_circuit_builder.hpp b/barretenberg/cpp/src/barretenberg/translator_vm/translator_circuit_builder.hpp
index ac6804b56b2d..7487cf2dff55 100644
--- a/barretenberg/cpp/src/barretenberg/translator_vm/translator_circuit_builder.hpp
+++ b/barretenberg/cpp/src/barretenberg/translator_vm/translator_circuit_builder.hpp
@@ -246,6 +246,7 @@ class TranslatorCircuitBuilder : public CircuitBuilderBase<bb::fr> {
     // Number of random ops at the beginning of Translator trace
     static constexpr size_t NUM_RANDOM_OPS_START = 3;
     static_assert(NUM_RANDOM_OPS_START == 3);
+    static_assert(NUM_RANDOM_OPS_START == ECC_NUM_RANDOM_OPS_START);
 
     // Number of random ops at the end of Translator trace
     static constexpr size_t NUM_RANDOM_OPS_END = 2;
diff --git a/barretenberg/cpp/src/barretenberg/translator_vm/translator_circuit_builder.test.cpp b/barretenberg/cpp/src/barretenberg/translator_vm/translator_circuit_builder.test.cpp
index ccf5c0c9867b..0fcf673c8c6e 100644
--- a/barretenberg/cpp/src/barretenberg/translator_vm/translator_circuit_builder.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/translator_vm/translator_circuit_builder.test.cpp
@@ -13,7 +13,10 @@ auto& engine = numeric::get_debug_randomness();
 /**
  * @brief Helper function to compute the expected accumulator result manually
  */
-fq compute_expected_result(const std::shared_ptr<ECCOpQueue>& op_queue, const fq& batching_challenge, const fq& x)
+fq compute_expected_result(const std::shared_ptr<ECCOpQueue>& op_queue,
+                           const fq& batching_challenge,
+                           const fq& x,
+                           bool include_zk = true)
 {
     using Fq = fq;
     Fq x_inv = x.invert();
@@ -24,7 +27,8 @@ fq compute_expected_result(const std::shared_ptr<ECCOpQueue>& op_queue, const fq
     Fq z_2_accumulator = Fq(0);
     Fq x_pow = Fq(1);
 
-    const auto& ultra_ops = op_queue->get_ultra_ops();
+    const auto& ultra_ops =
+        include_zk ? op_queue->get_zk_reconstructed_ultra_ops() : op_queue->get_no_zk_reconstructed_ultra_ops();
     for (const auto& ultra_op : ultra_ops) {
         if (ultra_op.op_code.is_random_op || ultra_op.op_code.value() == 0) {
             continue;
@@ -68,10 +72,7 @@ TEST(TranslatorCircuitBuilder, SeveralOperationCorrectness)
 
     // Add the same operations to the ECC op queue; the native computation is performed under the hood.
     auto op_queue = std::make_shared<ECCOpQueue>();
-    op_queue->no_op_ultra_only();
-    op_queue->random_op_ultra_only();
-    op_queue->random_op_ultra_only();
-    op_queue->random_op_ultra_only();
+    op_queue->construct_zk_columns();
     op_queue->add_accumulate(P1);
     op_queue->mul_accumulate(P2, z);
     op_queue->eq_and_reset();
@@ -86,7 +87,7 @@ TEST(TranslatorCircuitBuilder, SeveralOperationCorrectness)
     // Placeholder for randomness
     op_queue->random_op_ultra_only();
     op_queue->random_op_ultra_only();
-    op_queue->merge(MergeSettings::APPEND, op_queue->get_append_offset());
+    op_queue->merge_fixed_append(op_queue->get_append_offset());
 
     Fq batching_challenge = Fq::random_element();
     Fq x = Fq::random_element();
@@ -106,15 +107,12 @@ TEST(TranslatorCircuitBuilder, MinimalOperations)
     using Fq = fq;
 
     auto op_queue = std::make_shared<ECCOpQueue>();
-    op_queue->no_op_ultra_only();
-    op_queue->random_op_ultra_only();
-    op_queue->random_op_ultra_only();
-    op_queue->random_op_ultra_only();
+    op_queue->construct_zk_columns();
     op_queue->eq_and_reset();
     op_queue->merge();
     op_queue->random_op_ultra_only();
     op_queue->random_op_ultra_only();
-    op_queue->merge(MergeSettings::APPEND, op_queue->get_append_offset());
+    op_queue->merge_fixed_append(op_queue->get_append_offset());
 
     Fq batching_challenge = Fq::random_element();
     Fq x = Fq::random_element();
@@ -133,10 +131,7 @@ TEST(TranslatorCircuitBuilder, OnlyAddOperations)
     auto P2 = point::random_element();
 
     auto op_queue = std::make_shared<ECCOpQueue>();
-    op_queue->no_op_ultra_only();
-    op_queue->random_op_ultra_only();
-    op_queue->random_op_ultra_only();
-    op_queue->random_op_ultra_only();
+    op_queue->construct_zk_columns();
     op_queue->add_accumulate(P1);
     op_queue->add_accumulate(P2);
     op_queue->add_accumulate(P1);
@@ -144,7 +139,7 @@ TEST(TranslatorCircuitBuilder, OnlyAddOperations)
     op_queue->merge();
     op_queue->random_op_ultra_only();
     op_queue->random_op_ultra_only();
-    op_queue->merge(MergeSettings::APPEND, op_queue->get_append_offset());
+    op_queue->merge_fixed_append(op_queue->get_append_offset());
 
     Fq batching_challenge = Fq::random_element();
     Fq x = Fq::random_element();
@@ -169,17 +164,14 @@ TEST(TranslatorCircuitBuilder, OnlyMulOperations)
     auto z2 = scalar::random_element();
 
     auto op_queue = std::make_shared<ECCOpQueue>();
-    op_queue->no_op_ultra_only();
-    op_queue->random_op_ultra_only();
-    op_queue->random_op_ultra_only();
-    op_queue->random_op_ultra_only();
+    op_queue->construct_zk_columns();
     op_queue->mul_accumulate(P, z1);
     op_queue->mul_accumulate(P, z2);
     op_queue->eq_and_reset();
     op_queue->merge();
     op_queue->random_op_ultra_only();
     op_queue->random_op_ultra_only();
-    op_queue->merge(MergeSettings::APPEND, op_queue->get_append_offset());
+    op_queue->merge_fixed_append(op_queue->get_append_offset());
 
     Fq batching_challenge = Fq::random_element();
     Fq x = Fq::random_element();
@@ -201,17 +193,14 @@ TEST(TranslatorCircuitBuilder, InterspersedNoOps)
     auto P = point::random_element();
 
     auto op_queue = std::make_shared<ECCOpQueue>();
-    op_queue->no_op_ultra_only();
-    op_queue->random_op_ultra_only();
-    op_queue->random_op_ultra_only();
-    op_queue->random_op_ultra_only();
+    op_queue->construct_zk_columns();
     op_queue->add_accumulate(P);
     op_queue->add_accumulate(P);
     op_queue->eq_and_reset();
     op_queue->merge();
     op_queue->random_op_ultra_only();
     op_queue->random_op_ultra_only();
-    op_queue->merge(MergeSettings::APPEND, op_queue->get_append_offset());
+    op_queue->merge_fixed_append(op_queue->get_append_offset());
 
     Fq batching_challenge = Fq::random_element();
     Fq x = Fq::random_element();
@@ -233,16 +222,13 @@ TEST(TranslatorCircuitBuilder, PointAtInfinity)
     auto P_infinity = point::infinity();
 
     auto op_queue = std::make_shared<ECCOpQueue>();
-    op_queue->no_op_ultra_only();
-    op_queue->random_op_ultra_only();
-    op_queue->random_op_ultra_only();
-    op_queue->random_op_ultra_only();
+    op_queue->construct_zk_columns();
     op_queue->add_accumulate(P_infinity);
     op_queue->eq_and_reset();
     op_queue->merge();
     op_queue->random_op_ultra_only();
     op_queue->random_op_ultra_only();
-    op_queue->merge(MergeSettings::APPEND, op_queue->get_append_offset());
+    op_queue->merge_fixed_append(op_queue->get_append_offset());
 
     Fq batching_challenge = Fq::random_element();
     Fq x = Fq::random_element();
@@ -266,16 +252,13 @@ TEST(TranslatorCircuitBuilder, ZeroScalar)
     auto zero = scalar::zero();
 
     auto op_queue = std::make_shared<ECCOpQueue>();
-    op_queue->no_op_ultra_only();
-    op_queue->random_op_ultra_only();
-    op_queue->random_op_ultra_only();
-    op_queue->random_op_ultra_only();
+    op_queue->construct_zk_columns();
     op_queue->mul_accumulate(P, zero);
     op_queue->eq_and_reset();
     op_queue->merge();
     op_queue->random_op_ultra_only();
     op_queue->random_op_ultra_only();
-    op_queue->merge(MergeSettings::APPEND, op_queue->get_append_offset());
+    op_queue->merge_fixed_append(op_queue->get_append_offset());
 
     Fq batching_challenge = Fq::random_element();
     Fq x = Fq::random_element();
@@ -296,10 +279,7 @@ TEST(TranslatorCircuitBuilder, ManyOperations)
     using Fq = fq;
 
     auto op_queue = std::make_shared<ECCOpQueue>();
-    op_queue->no_op_ultra_only();
-    op_queue->random_op_ultra_only();
-    op_queue->random_op_ultra_only();
-    op_queue->random_op_ultra_only();
+    op_queue->construct_zk_columns();
 
     // Add many operations
     for (size_t i = 0; i < 20; ++i) {
@@ -313,7 +293,7 @@ TEST(TranslatorCircuitBuilder, ManyOperations)
     op_queue->merge();
     op_queue->random_op_ultra_only();
     op_queue->random_op_ultra_only();
-    op_queue->merge(MergeSettings::APPEND, op_queue->get_append_offset());
+    op_queue->merge_fixed_append(op_queue->get_append_offset());
 
     Fq batching_challenge = Fq::random_element();
     Fq x = Fq::random_element();
@@ -340,37 +320,41 @@ TEST(TranslatorCircuitBuilder, Determinism)
 
     // Build first circuit
     auto op_queue1 = std::make_shared<ECCOpQueue>();
-    op_queue1->no_op_ultra_only();
-    op_queue1->random_op_ultra_only();
-    op_queue1->random_op_ultra_only();
-    op_queue1->random_op_ultra_only();
+    op_queue1->construct_zk_columns();
     op_queue1->add_accumulate(P);
     op_queue1->mul_accumulate(P, z);
     op_queue1->eq_and_reset();
     op_queue1->merge();
     op_queue1->random_op_ultra_only();
     op_queue1->random_op_ultra_only();
-    op_queue1->merge(MergeSettings::APPEND, op_queue1->get_append_offset());
+    op_queue1->merge_fixed_append(op_queue1->get_append_offset());
 
     auto circuit_builder1 = TranslatorCircuitBuilder(batching_challenge, x, op_queue1);
     auto result1 = CircuitChecker::get_computation_result(circuit_builder1);
 
     // Build second circuit with same operations
     auto op_queue2 = std::make_shared<ECCOpQueue>();
-    op_queue2->no_op_ultra_only();
-    op_queue2->random_op_ultra_only();
-    op_queue2->random_op_ultra_only();
-    op_queue2->random_op_ultra_only();
+    op_queue2->construct_zk_columns();
     op_queue2->add_accumulate(P);
     op_queue2->mul_accumulate(P, z);
     op_queue2->eq_and_reset();
     op_queue2->merge();
     op_queue2->random_op_ultra_only();
     op_queue2->random_op_ultra_only();
-    op_queue2->merge(MergeSettings::APPEND, op_queue2->get_append_offset());
+    op_queue2->merge_fixed_append(op_queue2->get_append_offset());
 
     auto circuit_builder2 = TranslatorCircuitBuilder(batching_challenge, x, op_queue2);
     auto result2 = CircuitChecker::get_computation_result(circuit_builder2);
 
-    EXPECT_EQ(result1, result2);
+    // Compute contributions
+    Fq op_queue_1_with_randomness = compute_expected_result(op_queue1, batching_challenge, x, /*include_zk=*/true);
+    Fq op_queue_2_with_randomness = compute_expected_result(op_queue2, batching_challenge, x, /*include_zk=*/true);
+    Fq op_queue_1_without_randomness = compute_expected_result(op_queue1, batching_challenge, x, /*include_zk=*/false);
+    Fq op_queue_2_without_randomness = compute_expected_result(op_queue2, batching_challenge, x, /*include_zk=*/false);
+    Fq op_queue_1_randomness =
+        op_queue_1_with_randomness - op_queue_1_without_randomness * x.invert().pow(UltraEccOpsTable::ZK_ULTRA_OPS);
+    Fq op_queue_2_randomness =
+        op_queue_2_with_randomness - op_queue_2_without_randomness * x.invert().pow(UltraEccOpsTable::ZK_ULTRA_OPS);
+
+    EXPECT_EQ(result1 - result2, op_queue_1_randomness - op_queue_2_randomness);
 }
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/README.md b/barretenberg/cpp/src/barretenberg/ultra_honk/README.md
index d25571a12e1e..1a8453c825ce 100644
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/README.md
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/README.md
@@ -128,7 +128,7 @@ Not all subrelations are enforced pointwise at every row. Some identities are de
 | # | Relation | Selector | Subrelations | Max Partial Length | Description |
 |---|---|---|---|---|---|
 | 10 | `EccOpQueueRelation` | `q_busread` | 8 | 3 | ECC operation queue wire consistency (Goblin) |
-| 11 | `DatabusLookupRelation` | (structural) | 9 | 5 | Log-derivative databus reads (calldata, return data, secondary calldata; 3 subrelations each) |
+| 11 | `DatabusLookupRelation` | (structural) | 15 | 5 | Log-derivative databus reads (kernel calldata, 3 app calldata columns, return data; 3 subrelations each) |
 
 See also: [LogUp README](../relations/LOGUP_README.md), [Permutation Argument README](../relations/PERMUTATION_ARGUMENT_README.md), [Generic LogUp README](../relations/generic_lookup/GENERIC_LOGUP_README.md), [Generic Permutation README](../relations/generic_permutation/GENERIC_PERMUTATION_README.md)
 
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/databus.test.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/databus.test.cpp
index 2bf5e816818f..9177d7b31433 100644
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/databus.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/databus.test.cpp
@@ -1,3 +1,4 @@
+#include "barretenberg/stdlib_circuit_builders/databus.hpp"
 #include <cstddef>
 #include <cstdint>
 #include <gtest/gtest.h>
@@ -61,10 +62,7 @@ template <typename Flavor> class DataBusTests : public ::testing::Test {
      * @param read_bus_data Method for reading from a given bus column
      * @return Builder
      */
-    static Builder construct_circuit_with_databus_reads(
-        Builder& builder,
-        const std::function<void(Builder&, uint32_t)>& add_bus_data,
-        const std::function<uint32_t(Builder&, uint32_t)>& read_bus_data)
+    static Builder construct_circuit_with_databus_reads(Builder& builder, const BusId& bus_idx)
     {
 
         const uint32_t NUM_BUS_ENTRIES = 5; // number of entries in the bus column
@@ -74,49 +72,18 @@ template <typename Flavor> class DataBusTests : public ::testing::Test {
         for (size_t i = 0; i < NUM_BUS_ENTRIES; ++i) {
             FF val = FF::random_element();
             uint32_t val_witness_idx = builder.add_variable(val);
-            add_bus_data(builder, val_witness_idx);
+            builder.add_public_calldata(bus_idx, val_witness_idx);
         }
 
         // Read from the bus at some random indices
         for (size_t i = 0; i < NUM_READS; ++i) {
             uint32_t read_idx = engine.get_random_uint32() % NUM_BUS_ENTRIES;
             uint32_t read_idx_witness_idx = builder.add_variable(FF(read_idx));
-            read_bus_data(builder, read_idx_witness_idx);
+            builder.read_calldata(bus_idx, read_idx_witness_idx);
         }
 
         return builder;
     }
-
-    static Builder construct_circuit_with_calldata_reads(Builder& builder)
-    {
-        // Define interfaces for the add and read methods for databus calldata
-        auto add_method = [](Builder& builder, uint32_t witness_idx) { builder.add_public_calldata(witness_idx); };
-        auto read_method = [](Builder& builder, uint32_t witness_idx) { return builder.read_calldata(witness_idx); };
-
-        return construct_circuit_with_databus_reads(builder, add_method, read_method);
-    }
-
-    static Builder construct_circuit_with_secondary_calldata_reads(Builder& builder)
-    {
-        // Define interfaces for the add and read methods for databus secondary_calldata
-        auto add_method = [](Builder& builder, uint32_t witness_idx) {
-            builder.add_public_secondary_calldata(witness_idx);
-        };
-        auto read_method = [](Builder& builder, uint32_t witness_idx) {
-            return builder.read_secondary_calldata(witness_idx);
-        };
-
-        return construct_circuit_with_databus_reads(builder, add_method, read_method);
-    }
-
-    static Builder construct_circuit_with_return_data_reads(Builder& builder)
-    {
-        // Define interfaces for the add and read methods for databus return data
-        auto add_method = [](Builder& builder, uint32_t witness_idx) { builder.add_public_return_data(witness_idx); };
-        auto read_method = [](Builder& builder, uint32_t witness_idx) { return builder.read_return_data(witness_idx); };
-
-        return construct_circuit_with_databus_reads(builder, add_method, read_method);
-    }
 };
 
 TYPED_TEST_SUITE(DataBusTests, FlavorTypes);
@@ -125,24 +92,27 @@ TYPED_TEST_SUITE(DataBusTests, FlavorTypes);
  * @brief Test proof construction/verification for a circuit with calldata lookup gates
  *
  */
-TYPED_TEST(DataBusTests, CallDataRead)
+TYPED_TEST(DataBusTests, KernelCallDataRead)
 {
     typename TypeParam::CircuitBuilder builder = this->construct_test_builder();
-    this->construct_circuit_with_calldata_reads(builder);
+    this->construct_circuit_with_databus_reads(builder, BusId::KERNEL_CALLDATA);
     EXPECT_TRUE(CircuitChecker::check(builder));
     EXPECT_TRUE(this->construct_and_verify_proof(builder));
 }
 
 /**
- * @brief Test proof construction/verification for a circuit with secondary_calldata lookup gates
+ * @brief Test proof construction/verification for circuits with app calldata lookup gates
  *
  */
-TYPED_TEST(DataBusTests, CallData2Read)
+TYPED_TEST(DataBusTests, AppCallDataRead)
 {
-    typename TypeParam::CircuitBuilder builder = this->construct_test_builder();
-    this->construct_circuit_with_secondary_calldata_reads(builder);
+    for (size_t idx = 0; idx < MAX_APPS_PER_KERNEL; ++idx) {
+        typename TypeParam::CircuitBuilder builder = this->construct_test_builder();
+        this->construct_circuit_with_databus_reads(builder, static_cast<BusId>(idx + 1));
 
-    EXPECT_TRUE(this->construct_and_verify_proof(builder));
+        EXPECT_TRUE(CircuitChecker::check(builder)) << "Circuit check failed for app calldata bus with index " << idx;
+        EXPECT_TRUE(this->construct_and_verify_proof(builder)) << "Failed for app calldata bus with index " << idx;
+    }
 }
 
 /**
@@ -152,8 +122,9 @@ TYPED_TEST(DataBusTests, CallData2Read)
 TYPED_TEST(DataBusTests, ReturnDataRead)
 {
     typename TypeParam::CircuitBuilder builder = this->construct_test_builder();
-    this->construct_circuit_with_return_data_reads(builder);
+    this->construct_circuit_with_databus_reads(builder, BusId::RETURNDATA);
 
+    EXPECT_TRUE(CircuitChecker::check(builder));
     EXPECT_TRUE(this->construct_and_verify_proof(builder));
 }
 
@@ -164,10 +135,13 @@ TYPED_TEST(DataBusTests, ReturnDataRead)
 TYPED_TEST(DataBusTests, ReadAll)
 {
     typename TypeParam::CircuitBuilder builder = this->construct_test_builder();
-    this->construct_circuit_with_calldata_reads(builder);
-    this->construct_circuit_with_secondary_calldata_reads(builder);
-    this->construct_circuit_with_return_data_reads(builder);
+    this->construct_circuit_with_databus_reads(builder, BusId::KERNEL_CALLDATA);
+    for (size_t idx = 0; idx < MAX_APPS_PER_KERNEL; ++idx) {
+        this->construct_circuit_with_databus_reads(builder, static_cast<BusId>(idx + 1));
+    }
+    this->construct_circuit_with_databus_reads(builder, BusId::RETURNDATA);
 
+    EXPECT_TRUE(CircuitChecker::check(builder));
     EXPECT_TRUE(this->construct_and_verify_proof(builder));
 }
 
@@ -186,7 +160,7 @@ TYPED_TEST(DataBusTests, CallDataDuplicateRead)
 
     std::vector<FF> calldata_values = { 7, 10, 3, 12, 1 };
     for (auto& val : calldata_values) {
-        builder.add_public_calldata(builder.add_variable(val));
+        builder.add_public_calldata(BusId::KERNEL_CALLDATA, builder.add_variable(val));
     }
 
     // Define some read indices with a duplicate
@@ -198,7 +172,7 @@ TYPED_TEST(DataBusTests, CallDataDuplicateRead)
         // Create a variable corresponding to the index at which we want to read into calldata
         uint32_t read_idx_witness_idx = builder.add_variable(FF(read_idx));
 
-        auto value_witness_idx = builder.read_calldata(read_idx_witness_idx);
+        auto value_witness_idx = builder.read_calldata(BusId::KERNEL_CALLDATA, read_idx_witness_idx);
         result_witness_indices.emplace_back(value_witness_idx);
     }
 
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/honk_transcript.test.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/honk_transcript.test.cpp
index d3b8a054ed94..b9ca7b6557f2 100644
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/honk_transcript.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/honk_transcript.test.cpp
@@ -106,10 +106,14 @@ template <typename Flavor> class HonkTranscriptTests : public ::testing::Test {
             manifest_expected.add_entry(round, "ECC_OP_WIRE_2", data_types_per_G);
             manifest_expected.add_entry(round, "ECC_OP_WIRE_3", data_types_per_G);
             manifest_expected.add_entry(round, "ECC_OP_WIRE_4", data_types_per_G);
-            manifest_expected.add_entry(round, "CALLDATA", data_types_per_G);
-            manifest_expected.add_entry(round, "CALLDATA_READ_COUNTS", data_types_per_G);
-            manifest_expected.add_entry(round, "SECONDARY_CALLDATA", data_types_per_G);
-            manifest_expected.add_entry(round, "SECONDARY_CALLDATA_READ_COUNTS", data_types_per_G);
+            manifest_expected.add_entry(round, "KERNEL_CALLDATA", data_types_per_G);
+            manifest_expected.add_entry(round, "KERNEL_CALLDATA_READ_COUNTS", data_types_per_G);
+            manifest_expected.add_entry(round, "FIRST_APP_CALLDATA", data_types_per_G);
+            manifest_expected.add_entry(round, "FIRST_APP_CALLDATA_READ_COUNTS", data_types_per_G);
+            manifest_expected.add_entry(round, "SECOND_APP_CALLDATA", data_types_per_G);
+            manifest_expected.add_entry(round, "SECOND_APP_CALLDATA_READ_COUNTS", data_types_per_G);
+            manifest_expected.add_entry(round, "THIRD_APP_CALLDATA", data_types_per_G);
+            manifest_expected.add_entry(round, "THIRD_APP_CALLDATA_READ_COUNTS", data_types_per_G);
             manifest_expected.add_entry(round, "RETURN_DATA", data_types_per_G);
             manifest_expected.add_entry(round, "RETURN_DATA_READ_COUNTS", data_types_per_G);
         }
@@ -126,8 +130,10 @@ template <typename Flavor> class HonkTranscriptTests : public ::testing::Test {
         manifest_expected.add_entry(round, "LOOKUP_INVERSES", data_types_per_G);
         // Mega-specific databus inverse commitments
         if constexpr (IsMegaFlavor<Flavor>) {
-            manifest_expected.add_entry(round, "CALLDATA_INVERSES", data_types_per_G);
-            manifest_expected.add_entry(round, "SECONDARY_CALLDATA_INVERSES", data_types_per_G);
+            manifest_expected.add_entry(round, "KERNEL_CALLDATA_INVERSES", data_types_per_G);
+            manifest_expected.add_entry(round, "FIRST_APP_CALLDATA_INVERSES", data_types_per_G);
+            manifest_expected.add_entry(round, "SECOND_APP_CALLDATA_INVERSES", data_types_per_G);
+            manifest_expected.add_entry(round, "THIRD_APP_CALLDATA_INVERSES", data_types_per_G);
             manifest_expected.add_entry(round, "RETURN_DATA_INVERSES", data_types_per_G);
         }
         manifest_expected.add_entry(round, "Z_PERM", data_types_per_G);
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/mega_honk.test.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/mega_honk.test.cpp
index 7feb27ae1174..3d6737aeaf03 100644
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/mega_honk.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/mega_honk.test.cpp
@@ -308,6 +308,12 @@ TYPED_TEST(MegaHonkTests, WitnessPolynomialsMasked)
             EXPECT_TRUE(has_masking) << label << " should be masked";
         };
 
+        auto check_unmasked = [](const auto& poly, const std::string& label) {
+            for (size_t j = 0; j < NUM_MASKED_ROWS; j++) {
+                EXPECT_TRUE(poly[NUM_ZERO_ROWS + j].is_zero()) << label << " should not be masked";
+            }
+        };
+
         auto& polys = prover_instance->polynomials;
         check_masked(polys.w_l, "w_l");
         check_masked(polys.w_r, "w_r");
@@ -317,11 +323,18 @@ TYPED_TEST(MegaHonkTests, WitnessPolynomialsMasked)
         check_masked(polys.lookup_read_counts, "lookup_read_counts");
         check_masked(polys.lookup_read_tags, "lookup_read_tags");
         check_masked(polys.lookup_inverses, "lookup_inverses");
-        check_masked(polys.calldata_read_counts, "calldata_read_counts");
-        check_masked(polys.calldata_inverses, "calldata_inverses");
-        check_masked(polys.secondary_calldata, "secondary_calldata");
-        check_masked(polys.secondary_calldata_read_counts, "secondary_calldata_read_counts");
-        check_masked(polys.secondary_calldata_inverses, "secondary_calldata_inverses");
+        check_unmasked(polys.kernel_calldata, "kernel_calldata");
+        check_masked(polys.kernel_calldata_read_counts, "kernel_calldata_read_counts");
+        check_masked(polys.kernel_calldata_inverses, "kernel_calldata_inverses");
+        check_masked(polys.first_app_calldata, "first_app_calldata");
+        check_masked(polys.first_app_calldata_read_counts, "first_app_calldata_read_counts");
+        check_masked(polys.first_app_calldata_inverses, "first_app_calldata_inverses");
+        check_masked(polys.second_app_calldata, "second_app_calldata");
+        check_masked(polys.second_app_calldata_read_counts, "second_app_calldata_read_counts");
+        check_masked(polys.second_app_calldata_inverses, "second_app_calldata_inverses");
+        check_masked(polys.third_app_calldata, "third_app_calldata");
+        check_masked(polys.third_app_calldata_read_counts, "third_app_calldata_read_counts");
+        check_masked(polys.third_app_calldata_inverses, "third_app_calldata_inverses");
         check_masked(polys.return_data, "return_data");
         check_masked(polys.return_data_read_counts, "return_data_read_counts");
         check_masked(polys.return_data_inverses, "return_data_inverses");
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/oink_prover.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/oink_prover.cpp
index 32494b09caea..d2157c11fe73 100644
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/oink_prover.cpp
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/oink_prover.cpp
@@ -186,9 +186,10 @@ template <typename Flavor> void OinkProver<Flavor>::commit_to_z_perm()
 template <typename Flavor> void OinkProver<Flavor>::commit_to_masking_poly()
 {
     if constexpr (flavor_has_gemini_masking<Flavor>()) {
-        // Gemini masking poly only needs to cover the actual polynomial extent, not full dyadic size
-        const size_t polynomial_size = prover_instance->polynomials.max_end_index();
-        prover_instance->polynomials.gemini_masking_poly = Polynomial<FF>::random(polynomial_size);
+        // virtual_size = dyadic_size matches every other witness poly, so sumcheck's pairwise read
+        // past end_index lands in the virtual-zero region.
+        prover_instance->polynomials.gemini_masking_poly = Polynomial<FF>::random(
+            prover_instance->polynomials.max_end_index(), prover_instance->dyadic_size(), /*start_index=*/0);
 
         // Commit to the masking polynomial and send to transcript
         auto masking_commitment = commitment_key.commit(prover_instance->polynomials.gemini_masking_poly);
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/prover_instance.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/prover_instance.cpp
index fe42a5e54451..a43e408dc808 100644
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/prover_instance.cpp
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/prover_instance.cpp
@@ -154,12 +154,14 @@ template <typename Flavor> void ProverInstance_<Flavor>::allocate_permutation_ar
 {
     BB_BENCH_NAME("allocate_permutation_argument_polynomials");
 
-    // Sigma and ID polynomials are zero outside the active trace range
+    // Sigma and ID polynomials are zero outside the active trace range. Inside the active range,
+    // compute_honk_style_permutation_lagrange_polynomials_from_mapping writes every cell, so the
+    // backing memory can be left uninitialized.
     for (auto& sigma : polynomials.get_sigmas()) {
-        sigma = Polynomial::shiftable(trace_active_range_size(), dyadic_size());
+        sigma = Polynomial::shiftable(trace_active_range_size(), dyadic_size(), Polynomial::DontZeroMemory::FLAG);
     }
     for (auto& id : polynomials.get_ids()) {
-        id = Polynomial::shiftable(trace_active_range_size(), dyadic_size());
+        id = Polynomial::shiftable(trace_active_range_size(), dyadic_size(), Polynomial::DontZeroMemory::FLAG);
     }
 
     polynomials.z_perm = Polynomial::shiftable(trace_active_range_size(), dyadic_size(), Flavor::HasZK);
@@ -248,7 +250,7 @@ void ProverInstance_<Flavor>::allocate_databus_polynomials(const Circuit& circui
 
     // Databus data uses NUM_DISABLED_ROWS_IN_SUMCHECK as its offset rather than Flavor::TRACE_OFFSET so that
     // commitments match across the IVC boundary (a non-ZK kernel's return_data is copy-constrained to a MegaZK
-    // hiding kernel's calldata). MegaZK additionally requires this offset to clear the masking region
+    // hiding kernel's kernel_calldata). MegaZK additionally requires this offset to clear the masking region
     // [1, NUM_DISABLED_ROWS_IN_SUMCHECK); non-ZK Mega mirrors the layout even though it has no masking.
     const auto offset_size = [](size_t content) -> size_t { return NUM_DISABLED_ROWS_IN_SUMCHECK + content; };
 
@@ -272,7 +274,7 @@ void ProverInstance_<Flavor>::allocate_databus_polynomials(const Circuit& circui
         inverse_ref[0] = Polynomial(std::max(offset_size(bus_size), q_busread_end), dyadic_size());
 
         if constexpr (Flavor::HasZK) {
-            // Mask databus witness polynomials. The calldata values column (bus_idx == 0) is NOT
+            // Mask databus witness polynomials. The kernel_calldata values column (bus_idx == 0) is NOT
             // masked; its read_counts column is.
             auto& values_poly = entities[0];
             auto& read_counts_poly = entities[1];
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/relation_correctness.test.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/relation_correctness.test.cpp
index 46d4af703c5f..8b0858953704 100644
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/relation_correctness.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/relation_correctness.test.cpp
@@ -180,10 +180,13 @@ void create_some_databus_gates(auto& builder)
 {
     using FF = typename Flavor::FF;
     auto val = builder.add_variable(FF::random_element());
-    builder.add_public_calldata(val);
-    builder.read_calldata(builder.add_variable(FF(0)));
-    builder.add_public_secondary_calldata(val);
-    builder.read_secondary_calldata(builder.add_variable(FF(0)));
+    builder.add_public_calldata(BusId::KERNEL_CALLDATA, val);
+    builder.read_calldata(BusId::KERNEL_CALLDATA, builder.add_variable(FF(0)));
+    for (size_t app_idx = 0; app_idx < MAX_APPS_PER_KERNEL; ++app_idx) {
+        auto bus_id = static_cast<BusId>(static_cast<size_t>(BusId::APP_CALLDATA) + app_idx);
+        builder.add_public_calldata(bus_id, val);
+        builder.read_calldata(bus_id, builder.add_variable(FF(0)));
+    }
     builder.add_public_return_data(val);
     builder.read_return_data(builder.add_variable(FF(0)));
 }
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_verifier.hpp b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_verifier.hpp
index 5ff2ed46805c..7caa9d3e1ab6 100644
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_verifier.hpp
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_verifier.hpp
@@ -201,12 +201,12 @@ template <typename Flavor, class IO> class UltraVerifier_ {
     }
 
     /**
-     * @brief Get calldata commitment (MegaFlavor only)
+     * @brief Get kernel calldata commitment (MegaFlavor only)
      */
-    const Commitment& get_calldata_commitment() const
+    const Commitment& get_kernel_calldata_commitment() const
         requires IsMegaFlavor<Flavor>
     {
-        return verifier_instance->witness_commitments.calldata;
+        return verifier_instance->witness_commitments.kernel_calldata;
     }
 
     /**
diff --git a/barretenberg/cpp/src/barretenberg/vm2/AGENTS.md b/barretenberg/cpp/src/barretenberg/vm2/AGENTS.md
new file mode 120000
index 000000000000..681311eb9cf4
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/vm2/AGENTS.md
@@ -0,0 +1 @@
+CLAUDE.md
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/vm2/api_avm.cpp b/barretenberg/cpp/src/barretenberg/vm2/api_avm.cpp
index 2252ee3731ba..c7d92325fca7 100644
--- a/barretenberg/cpp/src/barretenberg/vm2/api_avm.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm2/api_avm.cpp
@@ -2,6 +2,7 @@
 
 #include <filesystem>
 
+#include "barretenberg/api/api_avm.hpp"
 #include "barretenberg/api/file_io.hpp"
 #include "barretenberg/common/map.hpp"
 #include "barretenberg/vm2/avm_api.hpp"
@@ -94,4 +95,39 @@ void avm_write_verification_key(const std::filesystem::path& output_path)
     write_file(output_path / "vk", vk);
 }
 
+AvmProveResult avm_prove_from_bytes(std::vector<uint8_t> inputs)
+{
+    avm2::AvmAPI avm;
+    auto proving_inputs = avm2::AvmAPI::ProvingInputs::from(inputs);
+    auto proof = avm.prove(proving_inputs);
+
+    print_avm_stats();
+
+    return AvmProveResult{ .proof = std::move(proof) };
+}
+
+bool avm_verify_from_bytes(std::vector<bb::fr> proof, std::vector<uint8_t> public_inputs)
+{
+    auto pi = avm2::PublicInputs::from(public_inputs);
+
+    avm2::AvmAPI avm;
+    bool res = avm.verify(proof, pi);
+    info("verification: ", res ? "success" : "failure");
+
+    print_avm_stats();
+    return res;
+}
+
+bool avm_check_circuit_from_bytes(std::vector<uint8_t> inputs)
+{
+    avm2::AvmAPI avm;
+    auto proving_inputs = avm2::AvmAPI::ProvingInputs::from(inputs);
+
+    bool res = avm.check_circuit(proving_inputs);
+    info("circuit check: ", res ? "success" : "failure");
+
+    print_avm_stats();
+    return res;
+}
+
 } // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/vm2/constraining/avm_fixed_vk.hpp b/barretenberg/cpp/src/barretenberg/vm2/constraining/avm_fixed_vk.hpp
index 52906d44e2c2..c060244f6965 100644
--- a/barretenberg/cpp/src/barretenberg/vm2/constraining/avm_fixed_vk.hpp
+++ b/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("0x183783fd7c3f269b595307224be99cf3773b781f8d1d59a305ce711101d43a60")); }
+    static FF vk_hash() { return FF(uint256_t("0x23a03c6f87c465dbecc386b091e8123a8936597b5b0749f276d042a8964bd390")); }
 
     static constexpr std::array<Commitment, NUM_PRECOMPUTED_ENTITIES> get_all()
     {
@@ -232,6 +232,18 @@ class AvmHardCodedVKAndHash {
                 uint256_t("0x0752e216f6398f2dc16b86cd762f9bd9f961964f9c6a354530c45b04920f06ab"),
                 uint256_t(
                     "0x062522db0dc283ad1d328147904f0fdc0e44add870aa0b099cf16c3d73352a9e")), // precomputed_sel_addressing_gas
+            Commitment(
+                uint256_t("0x095419f3dc475e499012c5d001c266643669a19173217b51fd5f2a86b3e1a8b2"),
+                uint256_t(
+                    "0x0f9bf4c4f62da52213998f25ab3eca754175cf4580e070f1abb251e2d8a8e64a")), // precomputed_sel_append_l2_l1_msg
+            Commitment(
+                uint256_t("0x2932e8961b4b905fe11c2f93092e57d7e541a9bb00aca69af2a6d213577670ea"),
+                uint256_t(
+                    "0x20b57b640b0186c53727c6f4724dc71b51387a34d8db51af06b1f9ad3a92d467")), // precomputed_sel_append_note_hash
+            Commitment(
+                uint256_t("0x1eba8da14083ce2c1b307a5493006a232c89e55fa657f9c193f5654990f06544"),
+                uint256_t(
+                    "0x07b64d628ee70ee71e89aaabb91abd9005096a24e8c4cd3543cbf1b9344e108f")), // precomputed_sel_append_nullifier
             Commitment(
                 uint256_t("0x2059be69211e5ea9bb365ab69c1132eb7b7c6814925453953f62bf731e5e42f9"),
                 uint256_t(
@@ -280,18 +292,6 @@ class AvmHardCodedVKAndHash {
                 uint256_t("0x089cdab4e8e8381977b093cb267a1b7c8c60f4466c39a99af1247e37fe56ebfe"),
                 uint256_t(
                     "0x1144347d2bfe5c1f4a6d44418562facb9a5c9c7bf2b6b463424e8b0915254710")), // precomputed_sel_mem_tag_out_of_range
-            Commitment(
-                uint256_t("0x020ad6e43ccd48a6a39e43897cc85187bd364919be8a3b82d4809715cfe489db"),
-                uint256_t(
-                    "0x21a79ebae2ea3d92b49c521407d2600ac061146f2c188c6c6a33c598179e4543")), // precomputed_sel_non_revertible_append_l2_l1_msg
-            Commitment(
-                uint256_t("0x2d360628289ff943ff6bd1a87bbe4e62abe7fb61ba83effd266f22bdcf31e6f9"),
-                uint256_t(
-                    "0x26b92a79e563c3f48252cce7feeca2f0f8d33dcb4ef7b0643bf07bd405700aaa")), // precomputed_sel_non_revertible_append_note_hash
-            Commitment(
-                uint256_t("0x0000000000000000000000000000000000000000000000000000000000000001"),
-                uint256_t(
-                    "0x0000000000000000000000000000000000000000000000000000000000000002")), // precomputed_sel_non_revertible_append_nullifier
             Commitment(
                 uint256_t("0x0bf1970c2e92fee577ba15d063fa78fdd17752cafd19261ff0f176a1d3348769"),
                 uint256_t(
@@ -404,18 +404,6 @@ class AvmHardCodedVKAndHash {
                 uint256_t("0x2e51e57417ece86800e7afa2ac53cfffcf35343cfb4bad1f6016a5b657fc3bfe"),
                 uint256_t(
                     "0x2c8617a36d1bbb5e7bf06c192e8ffc9aa90c714d222f8c8c29ed6a8a7e5eb717")), // precomputed_sel_range_8
-            Commitment(
-                uint256_t("0x262d212add82bcbcf96d0773c59926e1b8e68e45c662f9348f2e4f64770595b3"),
-                uint256_t(
-                    "0x2fe4de705da2b7bfb03cb3baa199ed4cc97e6ce620d0e939b603493223e88703")), // precomputed_sel_revertible_append_l2_l1_msg
-            Commitment(
-                uint256_t("0x041008987db8f55ded689b589133da9860150ed8c97b6bb5e87f0a31f78582b8"),
-                uint256_t(
-                    "0x113ecb4f4d07b4efb19a22b59e5634d58e5f1d5a433b08a32f1ac2bdd0e7c01a")), // precomputed_sel_revertible_append_note_hash
-            Commitment(
-                uint256_t("0x2a56ce41f6b0be13b9c26747621b821eee81b23a887f299049b14c11e98460d6"),
-                uint256_t(
-                    "0x1aa98f2de3ddda547d8f6de4e725ded5827d6338c78656c0d12ca1aea6ef2c7c")), // precomputed_sel_revertible_append_nullifier
             Commitment(
                 uint256_t("0x2db8d548af3efd182047c9081ce2870f3c2e7a96b4a6469aca26167209285d9b"),
                 uint256_t(
diff --git a/barretenberg/cpp/src/barretenberg/vm2/constraining/prover.cpp b/barretenberg/cpp/src/barretenberg/vm2/constraining/prover.cpp
index d6d6723a6da8..ab7410838ff5 100644
--- a/barretenberg/cpp/src/barretenberg/vm2/constraining/prover.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm2/constraining/prover.cpp
@@ -180,7 +180,7 @@ void AvmProver::execute_relation_check_rounds()
 /**
  * @brief Run the PCS to prove that the claimed evaluations are correct.
  *
- * @details To optimize the usage of the ECCVM, we batch the polynomials using short scalars before executing Shplemini.
+ * @details To optimize performance time, we batch the polynomials using short scalars before executing Shplemini.
  * The batching proceeds in two phases (note that the unshifted polynomials contain copies of the shifted polynomials
  * that have not been shifted yet; this allows us to save some work by batching the shifted polynomials in their
  * to_be_shifted form and later shift them):
@@ -196,7 +196,7 @@ void AvmProver::execute_pcs_rounds()
     using PolynomialBatcher = GeminiProver_<Curve>::PolynomialBatcher;
     using Challenges = Flavor::AllEntities<FF>;
 
-    // Batch polynomials using short scalars to reduce ECCVM circuit size
+    // Batch polynomials using short scalars
     auto unshifted_polys = prover_polynomials.get_unshifted();
     auto shifted_polys = prover_polynomials.get_to_be_shifted();
 
@@ -216,18 +216,49 @@ void AvmProver::execute_pcs_rounds()
         return static_cast<size_t>(std::distance(polys.begin(), it));
     };
 
+    auto add_scaled_batched =
+        [](Polynomial& dst, const std::span<Polynomial>& sources, const std::span<FF>& scalars, const size_t skip_idx) {
+            const size_t num_slots = bb::get_num_cpus();
+            std::vector<Polynomial> batched_polys(num_slots);
+            for (auto& poly : batched_polys) {
+                poly = Polynomial(dst.size(), dst.virtual_size(), dst.start_index());
+            }
+
+            // Chunks are consumed dynamically via an atomic counter: faster threads naturally pick up
+            // more chunks while the slot they write to stays fixed for the life of their outer task.
+            std::atomic<size_t> next_poly(0);
+
+            // Accumulate polynomials: each thread picks up the next available polynomial
+            parallel_for(num_slots, [&](size_t slot_id) {
+                while (true) {
+                    const size_t poly_id = next_poly.fetch_add(1, std::memory_order_relaxed);
+                    if (poly_id >= sources.size()) {
+                        break;
+                    }
+                    if (poly_id == skip_idx) {
+                        continue;
+                    }
+
+                    const size_t start_idx = sources[poly_id].start_index();
+                    const size_t end_idx = sources[poly_id].end_index();
+                    for (size_t idx = start_idx; idx < end_idx; idx++) {
+                        batched_polys[slot_id].at(idx) += scalars[poly_id] * sources[poly_id][idx];
+                    }
+                }
+            });
+
+            for (const auto& poly : batched_polys) {
+                dst += poly;
+            }
+        };
+
     // Batch to be shifted polys in their to_be_shifted form
     // Search for poly with largest end index to avoid allocating a zero polynomial of circuit size
     size_t max_idx = index_of_max_end_index(shifted_polys);
 
     Polynomial batched_shifted = std::move(shifted_polys[max_idx]);
     batched_shifted *= shifted_challenges[max_idx];
-    for (size_t idx = 0; const auto [poly, challenge] : zip_view(shifted_polys, shifted_challenges)) {
-        if (idx != max_idx) {
-            batched_shifted.add_scaled(poly, challenge);
-        }
-        idx++;
-    }
+    add_scaled_batched(batched_shifted, shifted_polys, shifted_challenges, max_idx);
 
     // Batch unshifted polys (to avoid allocating a zero polynomial of circuit size, we initialize the batched
     // polynomial with the polynomial of the largest size)
@@ -236,15 +267,15 @@ void AvmProver::execute_pcs_rounds()
     Polynomial batched_unshifted = std::move(unshifted_polys[max_idx]);
     batched_unshifted *= unshifted_challenges[max_idx];
     batched_unshifted += batched_shifted;
-    for (size_t idx = 0; const auto [poly, challenge] : zip_view(unshifted_polys, unshifted_challenges)) {
-        // Only operate in the range of not to be shifted polys, as the contribution for those has already been added
-        if (idx < WIRES_TO_BE_SHIFTED_START_IDX || idx >= WIRES_TO_BE_SHIFTED_END_IDX) {
-            if (idx != max_idx) {
-                batched_unshifted.add_scaled(poly, challenge);
-            }
-        }
-        idx++;
-    }
+    add_scaled_batched(batched_unshifted,
+                       unshifted_polys.subspan(0, WIRES_TO_BE_SHIFTED_START_IDX),
+                       unshifted_challenges.subspan(0, WIRES_TO_BE_SHIFTED_START_IDX),
+                       max_idx);
+    add_scaled_batched(batched_unshifted,
+                       unshifted_polys.subspan(WIRES_TO_BE_SHIFTED_END_IDX),
+                       unshifted_challenges.subspan(WIRES_TO_BE_SHIFTED_END_IDX),
+                       max_idx > WIRES_TO_BE_SHIFTED_END_IDX ? max_idx - WIRES_TO_BE_SHIFTED_END_IDX
+                                                             : unshifted_polys.size());
 
     const size_t circuit_dyadic_size = numeric::round_up_power_2(batched_unshifted.end_index());
 
@@ -289,5 +320,4 @@ HonkProof AvmProver::construct_proof()
 
     return export_proof();
 }
-
 } // namespace bb::avm2
diff --git a/barretenberg/cpp/src/barretenberg/vm2/constraining/relations/bc_retrieval.test.cpp b/barretenberg/cpp/src/barretenberg/vm2/constraining/relations/bc_retrieval.test.cpp
index f0296d21eb02..2614c9590ee1 100644
--- a/barretenberg/cpp/src/barretenberg/vm2/constraining/relations/bc_retrieval.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm2/constraining/relations/bc_retrieval.test.cpp
@@ -104,7 +104,7 @@ TEST_F(BytecodeRetrievalConstrainingTest, SuccessfulRetrieval)
     ClassIdDerivationTraceBuilder class_id_builder;
     IndexedTreeCheckTraceBuilder indexed_tree_check_builder;
 
-    FF nullifier_root = FF::random_element();
+    FF nullifier_tree_root = FF::random_element();
     FF public_data_tree_root = FF::random_element();
 
     ContractInstance instance = random_contract_instance();
@@ -123,7 +123,7 @@ TEST_F(BytecodeRetrievalConstrainingTest, SuccessfulRetrieval)
     contract_instance_retrieval_builder.process({ {
                                                     .address = instance.deployer,
                                                     .contract_instance = { instance },
-                                                    .nullifier_tree_root = nullifier_root,
+                                                    .nullifier_tree_root = nullifier_tree_root,
                                                     .public_data_tree_root = public_data_tree_root,
                                                     .exists = true,
                                                 } },
@@ -176,7 +176,7 @@ TEST_F(BytecodeRetrievalConstrainingTest, SuccessfulRetrieval)
                                   .address = instance.deployer,
                                   .current_class_id = instance.current_contract_class_id,
                                   .contract_class = klass,
-                                  .nullifier_root = nullifier_root,
+                                  .nullifier_tree_root = nullifier_tree_root,
                                   .public_data_tree_root = public_data_tree_root,
                                   .retrieved_bytecodes_snapshot_before = snapshot_before,
                                   .retrieved_bytecodes_snapshot_after = snapshot_after,
@@ -197,7 +197,7 @@ TEST_F(BytecodeRetrievalConstrainingTest, TooManyBytecodes)
     TestTraceContainer trace = init_trace();
     BytecodeTraceBuilder builder;
 
-    FF nullifier_root = FF::random_element();
+    FF nullifier_tree_root = FF::random_element();
     FF public_data_tree_root = FF::random_element();
 
     ContractInstance instance = random_contract_instance();
@@ -221,7 +221,7 @@ TEST_F(BytecodeRetrievalConstrainingTest, TooManyBytecodes)
                                   .bytecode_id = 0, // bytecode_id equals commitment
                                   .address = instance.deployer,
                                   .current_class_id = instance.current_contract_class_id,
-                                  .nullifier_root = nullifier_root,
+                                  .nullifier_tree_root = nullifier_tree_root,
                                   .public_data_tree_root = public_data_tree_root,
                                   .retrieved_bytecodes_snapshot_before = snapshot_before,
                                   .retrieved_bytecodes_snapshot_after = snapshot_after,
@@ -328,7 +328,7 @@ TEST_F(BytecodeRetrievalConstrainingTestFewerMocks, SuccessfulRetrievalFewerMock
 {
     TestTraceContainer trace = init_trace();
 
-    FF nullifier_root = FF::random_element();
+    FF nullifier_tree_root = FF::random_element();
     FF public_data_tree_root = FF::random_element();
 
     ContractInstance instance = random_contract_instance();
@@ -356,7 +356,7 @@ TEST_F(BytecodeRetrievalConstrainingTestFewerMocks, SuccessfulRetrievalFewerMock
     contract_instance_retrieval_builder.process({ {
                                                     .address = instance.deployer,
                                                     .contract_instance = { instance },
-                                                    .nullifier_tree_root = nullifier_root,
+                                                    .nullifier_tree_root = nullifier_tree_root,
                                                     .public_data_tree_root = public_data_tree_root,
                                                     .exists = true,
                                                 } },
@@ -386,7 +386,7 @@ TEST_F(BytecodeRetrievalConstrainingTestFewerMocks, SuccessfulRetrievalFewerMock
                                   .address = instance.deployer,
                                   .current_class_id = instance.current_contract_class_id,
                                   .contract_class = klass,
-                                  .nullifier_root = nullifier_root,
+                                  .nullifier_tree_root = nullifier_tree_root,
                                   .public_data_tree_root = public_data_tree_root,
                                   .retrieved_bytecodes_snapshot_before = snapshot_before,
                                   .retrieved_bytecodes_snapshot_after = snapshot_after,
@@ -412,7 +412,7 @@ TEST_F(BytecodeRetrievalConstrainingTestFewerMocks, SuccessfulRepeatedRetrievalF
 {
     TestTraceContainer trace = init_trace();
 
-    FF nullifier_root = FF::random_element();
+    FF nullifier_tree_root = FF::random_element();
     FF public_data_tree_root = FF::random_element();
 
     ContractInstance instance = random_contract_instance();
@@ -441,7 +441,7 @@ TEST_F(BytecodeRetrievalConstrainingTestFewerMocks, SuccessfulRepeatedRetrievalF
     contract_instance_retrieval_builder.process({ {
                                                     .address = instance.deployer,
                                                     .contract_instance = { instance },
-                                                    .nullifier_tree_root = nullifier_root,
+                                                    .nullifier_tree_root = nullifier_tree_root,
                                                     .public_data_tree_root = public_data_tree_root,
                                                     .exists = true,
                                                 } },
@@ -478,7 +478,7 @@ TEST_F(BytecodeRetrievalConstrainingTestFewerMocks, SuccessfulRepeatedRetrievalF
                                     .address = instance.deployer,
                                     .current_class_id = instance.current_contract_class_id,
                                     .contract_class = klass,
-                                    .nullifier_root = nullifier_root,
+                                    .nullifier_tree_root = nullifier_tree_root,
                                     .public_data_tree_root = public_data_tree_root,
                                     .retrieved_bytecodes_snapshot_before = snapshot_before,
                                     .retrieved_bytecodes_snapshot_after = snapshot_after,
@@ -489,7 +489,7 @@ TEST_F(BytecodeRetrievalConstrainingTestFewerMocks, SuccessfulRepeatedRetrievalF
                                     .address = instance.deployer,
                                     .current_class_id = instance.current_contract_class_id,
                                     .contract_class = klass,
-                                    .nullifier_root = nullifier_root,
+                                    .nullifier_tree_root = nullifier_tree_root,
                                     .public_data_tree_root = public_data_tree_root,
                                     .retrieved_bytecodes_snapshot_before = snapshot_after,
                                     .retrieved_bytecodes_snapshot_after = snapshot_after,
diff --git a/barretenberg/cpp/src/barretenberg/vm2/constraining/relations/tx.test.cpp b/barretenberg/cpp/src/barretenberg/vm2/constraining/relations/tx.test.cpp
index 23fc4ba1a774..2330f2d13d62 100644
--- a/barretenberg/cpp/src/barretenberg/vm2/constraining/relations/tx.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm2/constraining/relations/tx.test.cpp
@@ -95,7 +95,7 @@ class TxExecutionConstrainingTestHelper : public ::testing::Test {
                 { C::tx_phase_value, static_cast<uint8_t>(TransactionPhase::NR_NULLIFIER_INSERTION) },
                 { C::tx_is_padded, 1 },
                 { C::tx_is_tree_insert_phase, 1 },
-                { C::tx_sel_non_revertible_append_nullifier, 1 },
+                { C::tx_sel_append_nullifier, 1 },
 
                 { C::tx_read_pi_start_offset,
                   AVM_PUBLIC_INPUTS_PREVIOUS_NON_REVERTIBLE_ACCUMULATED_DATA_NULLIFIERS_ROW_IDX },
@@ -114,7 +114,7 @@ class TxExecutionConstrainingTestHelper : public ::testing::Test {
                       { C::tx_phase_value, static_cast<uint8_t>(TransactionPhase::NR_NOTE_INSERTION) },
                       { C::tx_is_padded, 1 },
                       { C::tx_is_tree_insert_phase, 1 },
-                      { C::tx_sel_non_revertible_append_note_hash, 1 },
+                      { C::tx_sel_append_note_hash, 1 },
                       { C::tx_read_pi_start_offset,
                         AVM_PUBLIC_INPUTS_PREVIOUS_NON_REVERTIBLE_ACCUMULATED_DATA_NOTE_HASHES_ROW_IDX },
                       { C::tx_read_pi_offset,
@@ -132,7 +132,7 @@ class TxExecutionConstrainingTestHelper : public ::testing::Test {
                 { C::tx_sel, 1 },
                 { C::tx_phase_value, static_cast<uint8_t>(TransactionPhase::NR_L2_TO_L1_MESSAGE) },
                 { C::tx_is_padded, 1 },
-                { C::tx_sel_non_revertible_append_l2_l1_msg, 1 },
+                { C::tx_sel_append_l2_l1_msg, 1 },
 
                 { C::tx_read_pi_start_offset,
                   AVM_PUBLIC_INPUTS_PREVIOUS_NON_REVERTIBLE_ACCUMULATED_DATA_L2_TO_L1_MSGS_ROW_IDX },
@@ -187,7 +187,7 @@ class TxExecutionConstrainingTestHelper : public ::testing::Test {
                 { C::tx_phase_value, static_cast<uint8_t>(TransactionPhase::R_NULLIFIER_INSERTION) },
                 { C::tx_is_padded, 1 },
                 { C::tx_is_tree_insert_phase, 1 },
-                { C::tx_sel_revertible_append_nullifier, 1 },
+                { C::tx_sel_append_nullifier, 1 },
                 { C::tx_is_revertible, 1 },
                 { C::tx_read_pi_start_offset,
                   AVM_PUBLIC_INPUTS_PREVIOUS_REVERTIBLE_ACCUMULATED_DATA_NULLIFIERS_ROW_IDX },
@@ -206,7 +206,7 @@ class TxExecutionConstrainingTestHelper : public ::testing::Test {
                 { C::tx_phase_value, static_cast<uint8_t>(TransactionPhase::R_NOTE_INSERTION) },
                 { C::tx_is_padded, 1 },
                 { C::tx_is_tree_insert_phase, 1 },
-                { C::tx_sel_revertible_append_note_hash, 1 },
+                { C::tx_sel_append_note_hash, 1 },
                 { C::tx_is_revertible, 1 },
                 { C::tx_read_pi_start_offset,
                   AVM_PUBLIC_INPUTS_PREVIOUS_REVERTIBLE_ACCUMULATED_DATA_NOTE_HASHES_ROW_IDX },
@@ -224,7 +224,7 @@ class TxExecutionConstrainingTestHelper : public ::testing::Test {
                 { C::tx_sel, 1 },
                 { C::tx_phase_value, static_cast<uint8_t>(TransactionPhase::R_L2_TO_L1_MESSAGE) },
                 { C::tx_is_padded, 1 },
-                { C::tx_sel_revertible_append_l2_l1_msg, 1 },
+                { C::tx_sel_append_l2_l1_msg, 1 },
                 { C::tx_is_revertible, 1 },
                 { C::tx_read_pi_start_offset,
                   AVM_PUBLIC_INPUTS_PREVIOUS_REVERTIBLE_ACCUMULATED_DATA_L2_TO_L1_MSGS_ROW_IDX },
@@ -423,7 +423,7 @@ TEST_F(TxExecutionConstrainingTestHelper, JumpOnRevert)
     trace.set(7,
               { {
                   { C::tx_is_padded, 0 },
-                  { C::tx_sel_revertible_append_l2_l1_msg, 0 }, // switch off for testing
+                  { C::tx_sel_append_l2_l1_msg, 0 }, // switch off for testing
                   { C::tx_remaining_phase_counter, 1 },
                   { C::tx_remaining_phase_inv, 1 },
                   { C::tx_is_revertible, 1 },
@@ -488,7 +488,7 @@ TEST(TxExecutionConstrainingTest, WriteTreeValue)
           { C::tx_read_pi_offset, AVM_PUBLIC_INPUTS_PREVIOUS_NON_REVERTIBLE_ACCUMULATED_DATA_L2_TO_L1_MSGS_ROW_IDX },
           { C::tx_write_pi_offset, AVM_PUBLIC_INPUTS_AVM_ACCUMULATED_DATA_L2_TO_L1_MSGS_ROW_IDX },
 
-          { C::tx_sel_non_revertible_append_l2_l1_msg, 1 },
+          { C::tx_sel_append_l2_l1_msg, 1 },
           { C::tx_l2_l1_msg_content,
             test_public_inputs.previous_non_revertible_accumulated_data.l2_to_l1_msgs[0].message.content },
           { C::tx_l2_l1_msg_recipient,
@@ -546,7 +546,7 @@ TEST(TxExecutionConstrainingTest, WriteTreeValue)
           { C::tx_read_pi_offset, AVM_PUBLIC_INPUTS_PREVIOUS_REVERTIBLE_ACCUMULATED_DATA_L2_TO_L1_MSGS_ROW_IDX },
           { C::tx_write_pi_offset, AVM_PUBLIC_INPUTS_AVM_ACCUMULATED_DATA_L2_TO_L1_MSGS_ROW_IDX + 1 },
 
-          { C::tx_sel_revertible_append_l2_l1_msg, 1 },
+          { C::tx_sel_append_l2_l1_msg, 1 },
           { C::tx_l2_l1_msg_content,
             test_public_inputs.previous_revertible_accumulated_data.l2_to_l1_msgs[0].message.content },
           { C::tx_l2_l1_msg_recipient,
diff --git a/barretenberg/cpp/src/barretenberg/vm2/generated/columns.hpp b/barretenberg/cpp/src/barretenberg/vm2/generated/columns.hpp
index c5f65f828e6a..3d1bfac00e40 100644
--- a/barretenberg/cpp/src/barretenberg/vm2/generated/columns.hpp
+++ b/barretenberg/cpp/src/barretenberg/vm2/generated/columns.hpp
@@ -7,8 +7,8 @@
 namespace bb::avm2 {
 
 // clang-format off
-#define AVM2_PRECOMPUTED_ENTITIES_E(e) e precomputed_addressing_gas, e precomputed_bitwise_input_a, e precomputed_bitwise_input_b, e precomputed_bitwise_output_and, e precomputed_bitwise_output_or, e precomputed_bitwise_output_xor, e precomputed_dyn_gas_id, e precomputed_envvar_pi_row_idx, e precomputed_exec_opcode, e precomputed_exec_opcode_base_da_gas, e precomputed_exec_opcode_dynamic_da_gas, e precomputed_exec_opcode_dynamic_l2_gas, e precomputed_exec_opcode_opcode_gas, e precomputed_expected_tag_reg_0_, e precomputed_expected_tag_reg_1_, e precomputed_expected_tag_reg_2_, e precomputed_expected_tag_reg_3_, e precomputed_expected_tag_reg_4_, e precomputed_expected_tag_reg_5_, e precomputed_first_row, e precomputed_idx, e precomputed_instr_size, e precomputed_invalid_envvar_enum, e precomputed_is_address, e precomputed_is_class_id, e precomputed_is_cleanup, e precomputed_is_collect_fee, e precomputed_is_dagasleft, e precomputed_is_deployer, e precomputed_is_init_hash, e precomputed_is_isstaticcall, e precomputed_is_l2gasleft, e precomputed_is_public_call_request, e precomputed_is_revertible, e precomputed_is_sender, e precomputed_is_teardown, e precomputed_is_transactionfee, e precomputed_is_tree_padding, e precomputed_is_valid_member_enum, e precomputed_keccak_round_constant, e precomputed_next_phase_on_revert, e precomputed_opcode_out_of_range, e precomputed_out_tag, e precomputed_p_decomposition_limb, e precomputed_p_decomposition_limb_index, e precomputed_p_decomposition_radix, e precomputed_power_of_2, e precomputed_read_pi_length_offset, e precomputed_read_pi_start_offset, e precomputed_rw_reg_0_, e precomputed_rw_reg_1_, e precomputed_rw_reg_2_, e precomputed_rw_reg_3_, e precomputed_rw_reg_4_, e precomputed_rw_reg_5_, e precomputed_sel_addressing_gas, e precomputed_sel_envvar_pi_lookup_col0, e precomputed_sel_envvar_pi_lookup_col1, e precomputed_sel_exec_spec, e precomputed_sel_has_tag, e precomputed_sel_keccak, e precomputed_sel_mem_op_reg_0_, e precomputed_sel_mem_op_reg_1_, e precomputed_sel_mem_op_reg_2_, e precomputed_sel_mem_op_reg_3_, e precomputed_sel_mem_op_reg_4_, e precomputed_sel_mem_op_reg_5_, e precomputed_sel_mem_tag_out_of_range, e precomputed_sel_non_revertible_append_l2_l1_msg, e precomputed_sel_non_revertible_append_note_hash, e precomputed_sel_non_revertible_append_nullifier, e precomputed_sel_op_dc_0, e precomputed_sel_op_dc_1, e precomputed_sel_op_dc_10, e precomputed_sel_op_dc_11, e precomputed_sel_op_dc_12, e precomputed_sel_op_dc_13, e precomputed_sel_op_dc_14, e precomputed_sel_op_dc_15, e precomputed_sel_op_dc_16, e precomputed_sel_op_dc_2, e precomputed_sel_op_dc_3, e precomputed_sel_op_dc_4, e precomputed_sel_op_dc_5, e precomputed_sel_op_dc_6, e precomputed_sel_op_dc_7, e precomputed_sel_op_dc_8, e precomputed_sel_op_dc_9, e precomputed_sel_op_is_address_0_, e precomputed_sel_op_is_address_1_, e precomputed_sel_op_is_address_2_, e precomputed_sel_op_is_address_3_, e precomputed_sel_op_is_address_4_, e precomputed_sel_op_is_address_5_, e precomputed_sel_op_is_address_6_, e precomputed_sel_p_decomposition, e precomputed_sel_phase, e precomputed_sel_range_16, e precomputed_sel_range_8, e precomputed_sel_revertible_append_l2_l1_msg, e precomputed_sel_revertible_append_note_hash, e precomputed_sel_revertible_append_nullifier, e precomputed_sel_sha256_compression, e precomputed_sel_tag_check_reg_0_, e precomputed_sel_tag_check_reg_1_, e precomputed_sel_tag_check_reg_2_, e precomputed_sel_tag_check_reg_3_, e precomputed_sel_tag_check_reg_4_, e precomputed_sel_tag_check_reg_5_, e precomputed_sel_tag_is_op2, e precomputed_sel_tag_parameters, e precomputed_sel_to_radix_p_limb_counts, e precomputed_sha256_compression_round_constant, e precomputed_subtrace_id, e precomputed_subtrace_operation_id, e precomputed_tag_byte_length, e precomputed_tag_max_bits, e precomputed_tag_max_value, e precomputed_to_radix_num_limbs_for_p, e precomputed_to_radix_safe_limbs, e precomputed_zero, e public_inputs_sel
-#define AVM2_WIRE_ENTITIES_E(e) e public_inputs_cols_0_, e public_inputs_cols_1_, e public_inputs_cols_2_, e public_inputs_cols_3_, e address_derivation_address, e address_derivation_address_y, e address_derivation_class_id, e address_derivation_const_four, e address_derivation_const_thirteen, e address_derivation_const_three, e address_derivation_const_two, e address_derivation_deployer_addr, e address_derivation_g1_x, e address_derivation_g1_y, e address_derivation_incoming_viewing_key_x, e address_derivation_incoming_viewing_key_y, e address_derivation_init_hash, e address_derivation_nullifier_key_x, e address_derivation_nullifier_key_y, e address_derivation_outgoing_viewing_key_x, e address_derivation_outgoing_viewing_key_y, e address_derivation_partial_address, e address_derivation_partial_address_domain_separator, e address_derivation_preaddress, e address_derivation_preaddress_domain_separator, e address_derivation_preaddress_public_key_x, e address_derivation_preaddress_public_key_y, e address_derivation_public_keys_hash, e address_derivation_public_keys_hash_domain_separator, e address_derivation_salt, e address_derivation_salted_init_hash, e address_derivation_salted_init_hash_domain_separator, e address_derivation_sel, e address_derivation_tagging_key_x, e address_derivation_tagging_key_y, e alu_a_hi, e alu_a_hi_bits, e alu_a_lo, e alu_a_lo_bits, e alu_ab_diff_inv, e alu_ab_tags_diff_inv, e alu_b_hi, e alu_b_inv, e alu_b_lo, e alu_c_hi, e alu_cf, e alu_constant_64, e alu_gt_input_a, e alu_gt_input_b, e alu_gt_result_c, e alu_helper1, e alu_ia, e alu_ia_tag, e alu_ib, e alu_ib_tag, e alu_ic, e alu_ic_tag, e alu_max_bits, e alu_max_value, e alu_mid, e alu_mid_bits, e alu_op_id, e alu_sel, e alu_sel_ab_tag_mismatch, e alu_sel_decompose_a, e alu_sel_div_0_err, e alu_sel_div_no_err, e alu_sel_err, e alu_sel_ff_gt, e alu_sel_int_gt, e alu_sel_is_ff, e alu_sel_is_u128, e alu_sel_mul_div_u128, e alu_sel_mul_no_err_non_ff, e alu_sel_op_add, e alu_sel_op_div, e alu_sel_op_eq, e alu_sel_op_fdiv, e alu_sel_op_lt, e alu_sel_op_lte, e alu_sel_op_mul, e alu_sel_op_not, e alu_sel_op_shl, e alu_sel_op_shr, e alu_sel_op_sub, e alu_sel_op_truncate, e alu_sel_shift_ops_no_overflow, e alu_sel_tag_err, e alu_sel_trunc_gte_128, e alu_sel_trunc_lt_128, e alu_sel_trunc_non_trivial, e alu_sel_trunc_trivial, e alu_shift_lo_bits, e alu_tag_ff_diff_inv, e alu_tag_u128_diff_inv, e alu_two_pow_shift_lo_bits, e bc_decomposition_bytes_pc_plus_36, e bc_decomposition_bytes_rem_inv, e bc_decomposition_bytes_rem_min_one_inv, e bc_decomposition_bytes_to_read, e bc_decomposition_last_of_contract, e bc_decomposition_next_packed_pc_min_pc_inv, e bc_decomposition_packed_field, e bc_decomposition_sel_packed, e bc_decomposition_sel_packed_read_0_, e bc_decomposition_sel_packed_read_1_, e bc_decomposition_sel_packed_read_2_, e bc_decomposition_sel_windows_eq_remaining, e bc_decomposition_windows_min_remaining_inv, e bc_hashing_end, e bc_hashing_input_len, e bc_hashing_packed_fields_0, e bc_hashing_packed_fields_1, e bc_hashing_packed_fields_2, e bc_hashing_pc_index, e bc_hashing_pc_index_2, e bc_hashing_sel_not_padding_1, e bc_hashing_sel_not_padding_2, e bc_hashing_size_in_bytes, e bc_retrieval_address, e bc_retrieval_artifact_hash, e bc_retrieval_bytecode_id, e bc_retrieval_current_class_id, e bc_retrieval_error, e bc_retrieval_instance_exists, e bc_retrieval_is_new_class, e bc_retrieval_next_retrieved_bytecodes_tree_root, e bc_retrieval_next_retrieved_bytecodes_tree_size, e bc_retrieval_no_remaining_bytecodes, e bc_retrieval_nullifier_tree_root, e bc_retrieval_prev_retrieved_bytecodes_tree_root, e bc_retrieval_prev_retrieved_bytecodes_tree_size, e bc_retrieval_private_functions_root, e bc_retrieval_public_data_tree_root, e bc_retrieval_remaining_bytecodes_inv, e bc_retrieval_retrieved_bytecodes_merkle_separator, e bc_retrieval_retrieved_bytecodes_tree_height, e bc_retrieval_sel, e bc_retrieval_should_retrieve, e bitwise_ctr_min_one_inv, e bitwise_end, e bitwise_err, e bitwise_ia_byte, e bitwise_ib_byte, e bitwise_ic_byte, e bitwise_output_and, e bitwise_output_or, e bitwise_output_xor, e bitwise_sel_and, e bitwise_sel_compute, e bitwise_sel_get_ctr, e bitwise_sel_or, e bitwise_sel_tag_ff_err, e bitwise_sel_tag_mismatch_err, e bitwise_sel_xor, e bitwise_start_keccak, e bitwise_start_sha256, e bitwise_tag_a, e bitwise_tag_a_inv, e bitwise_tag_ab_diff_inv, e bitwise_tag_b, e bitwise_tag_c, e calldata_end, e calldata_hashing_end, e calldata_hashing_index_1_, e calldata_hashing_index_2_, e calldata_hashing_input_0_, e calldata_hashing_input_1_, e calldata_hashing_input_2_, e calldata_hashing_input_len, e calldata_hashing_sel_end_not_empty, e calldata_hashing_sel_not_padding_1, e calldata_hashing_sel_not_padding_2, e calldata_hashing_sel_not_start, e calldata_value, e class_id_derivation_artifact_hash, e class_id_derivation_class_id, e class_id_derivation_const_four, e class_id_derivation_gen_index_contract_class_id, e class_id_derivation_private_functions_root, e class_id_derivation_public_bytecode_commitment, e class_id_derivation_sel, e context_stack_bytecode_id, e context_stack_context_id, e context_stack_contract_address, e context_stack_entered_context_id, e context_stack_internal_call_id, e context_stack_internal_call_return_id, e context_stack_is_static, e context_stack_msg_sender, e context_stack_next_internal_call_id, e context_stack_next_pc, e context_stack_note_hash_tree_root, e context_stack_note_hash_tree_size, e context_stack_nullifier_tree_root, e context_stack_nullifier_tree_size, e context_stack_num_l2_to_l1_messages, e context_stack_num_note_hashes_emitted, e context_stack_num_nullifiers_emitted, e context_stack_num_public_log_fields, e context_stack_parent_calldata_addr, e context_stack_parent_calldata_size, e context_stack_parent_da_gas_limit, e context_stack_parent_da_gas_used, e context_stack_parent_id, e context_stack_parent_l2_gas_limit, e context_stack_parent_l2_gas_used, e context_stack_public_data_tree_root, e context_stack_public_data_tree_size, e context_stack_sel, e context_stack_written_public_data_slots_tree_root, e context_stack_written_public_data_slots_tree_size, e contract_instance_retrieval_address, e contract_instance_retrieval_address_sub_one, e contract_instance_retrieval_current_class_id, e contract_instance_retrieval_deployer_addr, e contract_instance_retrieval_deployer_protocol_contract_address, e contract_instance_retrieval_derived_address, e contract_instance_retrieval_derived_address_pi_index, e contract_instance_retrieval_exists, e contract_instance_retrieval_incoming_viewing_key_x, e contract_instance_retrieval_incoming_viewing_key_y, e contract_instance_retrieval_init_hash, e contract_instance_retrieval_is_protocol_contract, e contract_instance_retrieval_max_protocol_contracts, e contract_instance_retrieval_nullifier_key_x, e contract_instance_retrieval_nullifier_key_y, e contract_instance_retrieval_nullifier_merkle_separator, e contract_instance_retrieval_nullifier_tree_height, e contract_instance_retrieval_nullifier_tree_root, e contract_instance_retrieval_original_class_id, e contract_instance_retrieval_outgoing_viewing_key_x, e contract_instance_retrieval_outgoing_viewing_key_y, e contract_instance_retrieval_protocol_contract_derived_address_inv, e contract_instance_retrieval_public_data_tree_root, e contract_instance_retrieval_salt, e contract_instance_retrieval_sel, e contract_instance_retrieval_should_check_for_update, e contract_instance_retrieval_should_check_nullifier, e contract_instance_retrieval_siloing_separator, e contract_instance_retrieval_tagging_key_x, e contract_instance_retrieval_tagging_key_y, e data_copy_cd_copy_col_read, e data_copy_clamped_read_index_upper_bound, e data_copy_dst_out_of_range_err, e data_copy_end, e data_copy_is_top_level, e data_copy_mem_size, e data_copy_offset, e data_copy_offset_plus_size, e data_copy_offset_plus_size_is_gt, e data_copy_parent_id_inv, e data_copy_read_addr_plus_one, e data_copy_read_addr_upper_bound, e data_copy_reads_left_inv, e data_copy_sel_cd_copy_start, e data_copy_sel_has_reads, e data_copy_sel_mem_read, e data_copy_sel_mem_write, e data_copy_sel_rd_copy_start, e data_copy_sel_write_count_is_zero, e data_copy_src_addr, e data_copy_src_data_size, e data_copy_src_reads_exceed_mem, e data_copy_start_no_err, e data_copy_tag, e data_copy_value, e data_copy_write_addr_upper_bound, e data_copy_write_count_minus_one_inv, e data_copy_write_count_zero_inv, e ecc_add_mem_dst_addr_0_, e ecc_add_mem_dst_addr_1_, e ecc_add_mem_dst_addr_2_, e ecc_add_mem_err, e ecc_add_mem_execution_clk, e ecc_add_mem_max_mem_addr, e ecc_add_mem_p_is_inf, e ecc_add_mem_p_is_on_curve_eqn, e ecc_add_mem_p_is_on_curve_eqn_inv, e ecc_add_mem_p_x, e ecc_add_mem_p_x_n, e ecc_add_mem_p_y, e ecc_add_mem_p_y_n, e ecc_add_mem_q_is_inf, e ecc_add_mem_q_is_on_curve_eqn, e ecc_add_mem_q_is_on_curve_eqn_inv, e ecc_add_mem_q_x, e ecc_add_mem_q_x_n, e ecc_add_mem_q_y, e ecc_add_mem_q_y_n, e ecc_add_mem_res_is_inf, e ecc_add_mem_res_x, e ecc_add_mem_res_y, e ecc_add_mem_sel, e ecc_add_mem_sel_dst_out_of_range_err, e ecc_add_mem_sel_p_not_on_curve_err, e ecc_add_mem_sel_q_not_on_curve_err, e ecc_add_mem_sel_should_exec, e ecc_add_mem_space_id, e ecc_add_op, e ecc_double_op, e ecc_inv_2_p_y, e ecc_inv_x_diff, e ecc_inv_y_diff, e ecc_lambda, e ecc_p_is_inf, e ecc_p_x, e ecc_p_y, e ecc_q_is_inf, e ecc_q_x, e ecc_q_y, e ecc_r_is_inf, e ecc_r_x, e ecc_r_y, e ecc_result_infinity, e ecc_sel, e ecc_use_computed_result, e ecc_x_match, e ecc_y_match, e emit_public_log_discard, e emit_public_log_end, e emit_public_log_end_log_address_upper_bound, e emit_public_log_error, e emit_public_log_error_too_many_log_fields, e emit_public_log_expected_next_log_fields, e emit_public_log_is_static, e emit_public_log_log_size, e emit_public_log_max_mem_size, e emit_public_log_max_public_logs_payload_length, e emit_public_log_next_num_public_log_fields, e emit_public_log_prev_num_public_log_fields, e emit_public_log_public_inputs_value, e emit_public_log_remaining_rows_inv, e emit_public_log_sel_read_memory, e emit_public_log_tag, e emit_public_log_tag_inv, e emit_public_log_value, e execution_addressing_error_collection_inv, e execution_addressing_gas, e execution_addressing_mode, e execution_base_address_tag, e execution_base_address_tag_diff_inv, e execution_base_address_val, e execution_base_da_gas, e execution_batched_tags_diff_inv, e execution_batched_tags_diff_inv_reg, e execution_da_gas_left, e execution_da_gas_used, e execution_dying_context_diff_inv, e execution_dying_context_id_inv, e execution_dyn_gas_id, e execution_dynamic_da_gas, e execution_dynamic_da_gas_factor, e execution_dynamic_l2_gas, e execution_dynamic_l2_gas_factor, e execution_enqueued_call_end, e execution_envvar_pi_row_idx, e execution_exec_opcode, e execution_expected_tag_reg_0_, e execution_expected_tag_reg_1_, e execution_expected_tag_reg_2_, e execution_expected_tag_reg_3_, e execution_expected_tag_reg_4_, e execution_expected_tag_reg_5_, e execution_has_parent_ctx, e execution_highest_address, e execution_instr_size, e execution_internal_call_return_id_inv, e execution_is_address, e execution_is_da_gas_left_gt_allocated, e execution_is_dagasleft, e execution_is_dying_context, e execution_is_isstaticcall, e execution_is_l2_gas_left_gt_allocated, e execution_is_l2gasleft, e execution_is_parent_id_inv, e execution_is_sender, e execution_is_transactionfee, e execution_l1_to_l2_msg_leaf_in_range, e execution_l1_to_l2_msg_tree_leaf_count, e execution_l2_gas_left, e execution_l2_gas_used, e execution_max_data_writes_reached, e execution_max_eth_address_value, e execution_mem_tag_reg_0_, e execution_mem_tag_reg_1_, e execution_mem_tag_reg_2_, e execution_mem_tag_reg_3_, e execution_mem_tag_reg_4_, e execution_mem_tag_reg_5_, e execution_nested_failure, e execution_nested_return, e execution_next_pc, e execution_note_hash_leaf_in_range, e execution_note_hash_tree_leaf_count, e execution_note_hash_tree_root, e execution_note_hash_tree_size, e execution_nullifier_merkle_separator, e execution_nullifier_pi_offset, e execution_nullifier_siloing_separator, e execution_nullifier_tree_height, e execution_nullifier_tree_root, e execution_nullifier_tree_size, e execution_num_l2_to_l1_messages, e execution_num_note_hashes_emitted, e execution_num_nullifiers_emitted, e execution_num_p_limbs, e execution_num_public_log_fields, e execution_num_relative_operands_inv, e execution_op_0_, e execution_op_1_, e execution_op_2_, e execution_op_3_, e execution_op_4_, e execution_op_5_, e execution_op_6_, e execution_op_after_relative_0_, e execution_op_after_relative_1_, e execution_op_after_relative_2_, e execution_op_after_relative_3_, e execution_op_after_relative_4_, e execution_op_after_relative_5_, e execution_op_after_relative_6_, e execution_opcode_gas, e execution_out_of_gas_da, e execution_out_of_gas_l2, e execution_public_data_tree_root, e execution_public_data_tree_size, e execution_public_inputs_index, e execution_register_0_, e execution_register_1_, e execution_register_2_, e execution_register_3_, e execution_register_4_, e execution_register_5_, e execution_remaining_data_writes_inv, e execution_remaining_l2_to_l1_msgs_inv, e execution_remaining_note_hashes_inv, e execution_remaining_nullifiers_inv, e execution_retrieved_bytecodes_tree_root, e execution_retrieved_bytecodes_tree_size, e execution_rop_0_, e execution_rop_1_, e execution_rop_2_, e execution_rop_3_, e execution_rop_4_, e execution_rop_5_, e execution_rop_6_, e execution_rop_tag_0_, e execution_rop_tag_1_, e execution_rop_tag_2_, e execution_rop_tag_3_, e execution_rop_tag_4_, e execution_rop_tag_5_, e execution_rop_tag_6_, e execution_rw_reg_0_, e execution_rw_reg_1_, e execution_rw_reg_2_, e execution_rw_reg_3_, e execution_rw_reg_4_, e execution_rw_reg_5_, e execution_sel_addressing_error, e execution_sel_apply_indirection_0_, e execution_sel_apply_indirection_1_, e execution_sel_apply_indirection_2_, e execution_sel_apply_indirection_3_, e execution_sel_apply_indirection_4_, e execution_sel_apply_indirection_5_, e execution_sel_apply_indirection_6_, e execution_sel_base_address_failure, e execution_sel_bytecode_retrieval_failure, e execution_sel_bytecode_retrieval_success, e execution_sel_check_gas, e execution_sel_do_base_check, e execution_sel_enter_call, e execution_sel_envvar_pi_lookup_col0, e execution_sel_envvar_pi_lookup_col1, e execution_sel_error, e execution_sel_exec_dispatch_alu, e execution_sel_exec_dispatch_bitwise, e execution_sel_exec_dispatch_calldata_copy, e execution_sel_exec_dispatch_cast, e execution_sel_exec_dispatch_ecc_add, e execution_sel_exec_dispatch_emit_public_log, e execution_sel_exec_dispatch_execution, e execution_sel_exec_dispatch_get_contract_instance, e execution_sel_exec_dispatch_keccakf1600, e execution_sel_exec_dispatch_poseidon2_perm, e execution_sel_exec_dispatch_returndata_copy, e execution_sel_exec_dispatch_set, e execution_sel_exec_dispatch_sha256_compression, e execution_sel_exec_dispatch_to_radix, e execution_sel_execute_call, e execution_sel_execute_debug_log, e execution_sel_execute_emit_notehash, e execution_sel_execute_emit_nullifier, e execution_sel_execute_get_env_var, e execution_sel_execute_internal_call, e execution_sel_execute_internal_return, e execution_sel_execute_jump, e execution_sel_execute_jumpi, e execution_sel_execute_l1_to_l2_message_exists, e execution_sel_execute_mov, e execution_sel_execute_notehash_exists, e execution_sel_execute_nullifier_exists, e execution_sel_execute_opcode, e execution_sel_execute_return, e execution_sel_execute_returndata_size, e execution_sel_execute_revert, e execution_sel_execute_send_l2_to_l1_msg, e execution_sel_execute_sload, e execution_sel_execute_sstore, e execution_sel_execute_static_call, e execution_sel_execute_success_copy, e execution_sel_exit_call, e execution_sel_failure, e execution_sel_gas_bitwise, e execution_sel_gas_calldata_copy, e execution_sel_gas_emit_public_log, e execution_sel_gas_returndata_copy, e execution_sel_gas_sstore, e execution_sel_gas_to_radix, e execution_sel_instruction_fetching_failure, e execution_sel_instruction_fetching_success, e execution_sel_l2_to_l1_msg_limit_error, e execution_sel_lookup_num_p_limbs, e execution_sel_mem_op_reg_0_, e execution_sel_mem_op_reg_1_, e execution_sel_mem_op_reg_2_, e execution_sel_mem_op_reg_3_, e execution_sel_mem_op_reg_4_, e execution_sel_mem_op_reg_5_, e execution_sel_op_do_overflow_check_0_, e execution_sel_op_do_overflow_check_1_, e execution_sel_op_do_overflow_check_2_, e execution_sel_op_do_overflow_check_3_, e execution_sel_op_do_overflow_check_4_, e execution_sel_op_do_overflow_check_5_, e execution_sel_op_do_overflow_check_6_, e execution_sel_op_is_address_0_, e execution_sel_op_is_address_1_, e execution_sel_op_is_address_2_, e execution_sel_op_is_address_3_, e execution_sel_op_is_address_4_, e execution_sel_op_is_address_5_, e execution_sel_op_is_address_6_, e execution_sel_op_is_indirect_wire_0_, e execution_sel_op_is_indirect_wire_1_, e execution_sel_op_is_indirect_wire_2_, e execution_sel_op_is_indirect_wire_3_, e execution_sel_op_is_indirect_wire_4_, e execution_sel_op_is_indirect_wire_5_, e execution_sel_op_is_indirect_wire_6_, e execution_sel_op_is_indirect_wire_7_, e execution_sel_op_is_relative_wire_0_, e execution_sel_op_is_relative_wire_1_, e execution_sel_op_is_relative_wire_2_, e execution_sel_op_is_relative_wire_3_, e execution_sel_op_is_relative_wire_4_, e execution_sel_op_is_relative_wire_5_, e execution_sel_op_is_relative_wire_6_, e execution_sel_op_is_relative_wire_7_, e execution_sel_op_reg_effective_0_, e execution_sel_op_reg_effective_1_, e execution_sel_op_reg_effective_2_, e execution_sel_op_reg_effective_3_, e execution_sel_op_reg_effective_4_, e execution_sel_op_reg_effective_5_, e execution_sel_opcode_error, e execution_sel_out_of_gas, e execution_sel_radix_gt_256, e execution_sel_reached_max_note_hashes, e execution_sel_reached_max_nullifiers, e execution_sel_read_registers, e execution_sel_read_unwind_call_stack, e execution_sel_register_read_error, e execution_sel_relative_overflow_0_, e execution_sel_relative_overflow_1_, e execution_sel_relative_overflow_2_, e execution_sel_relative_overflow_3_, e execution_sel_relative_overflow_4_, e execution_sel_relative_overflow_5_, e execution_sel_relative_overflow_6_, e execution_sel_some_final_check_failed, e execution_sel_tag_check_reg_0_, e execution_sel_tag_check_reg_1_, e execution_sel_tag_check_reg_2_, e execution_sel_tag_check_reg_3_, e execution_sel_tag_check_reg_4_, e execution_sel_tag_check_reg_5_, e execution_sel_too_large_recipient_error, e execution_sel_use_num_limbs, e execution_sel_write_l2_to_l1_msg, e execution_sel_write_note_hash, e execution_sel_write_nullifier, e execution_sel_write_public_data, e execution_sel_write_registers, e execution_subtrace_id, e execution_subtrace_operation_id, e execution_total_gas_da, e execution_total_gas_l2, e execution_two_five_six, e execution_value_from_pi, e execution_written_public_data_slots_tree_root, e execution_written_public_data_slots_tree_size, e execution_written_slots_merkle_separator, e execution_written_slots_tree_height, e execution_written_slots_tree_siloing_separator, e ff_gt_a, e ff_gt_b, e ff_gt_borrow, e ff_gt_constant_128, e ff_gt_end, e ff_gt_p_a_borrow, e ff_gt_p_b_borrow, e ff_gt_res_hi, e ff_gt_res_lo, e ff_gt_result, e get_contract_instance_clk, e get_contract_instance_contract_address, e get_contract_instance_dst_offset, e get_contract_instance_dst_offset_diff_max_inv, e get_contract_instance_exists_tag, e get_contract_instance_instance_exists, e get_contract_instance_is_class_id, e get_contract_instance_is_deployer, e get_contract_instance_is_init_hash, e get_contract_instance_is_valid_member_enum, e get_contract_instance_is_valid_writes_in_bounds, e get_contract_instance_member_enum, e get_contract_instance_member_tag, e get_contract_instance_member_write_offset, e get_contract_instance_nullifier_tree_root, e get_contract_instance_public_data_tree_root, e get_contract_instance_retrieved_class_id, e get_contract_instance_retrieved_deployer_addr, e get_contract_instance_retrieved_init_hash, e get_contract_instance_sel, e get_contract_instance_sel_error, e get_contract_instance_selected_member, e get_contract_instance_space_id, e gt_abs_diff, e gt_input_a, e gt_input_b, e gt_num_bits, e gt_res, e gt_sel, e gt_sel_addressing, e gt_sel_alu, e gt_sel_gas, e gt_sel_others, e gt_sel_sha256, e indexed_tree_check_address, e indexed_tree_check_const_three, e indexed_tree_check_discard, e indexed_tree_check_exists, e indexed_tree_check_intermediate_root, e indexed_tree_check_low_leaf_hash, e indexed_tree_check_low_leaf_index, e indexed_tree_check_low_leaf_next_index, e indexed_tree_check_low_leaf_next_value, e indexed_tree_check_low_leaf_value, e indexed_tree_check_merkle_hash_separator, e indexed_tree_check_new_leaf_hash, e indexed_tree_check_next_value_inv, e indexed_tree_check_next_value_is_nonzero, e indexed_tree_check_not_exists, e indexed_tree_check_public_inputs_index, e indexed_tree_check_root, e indexed_tree_check_sel, e indexed_tree_check_sel_insert, e indexed_tree_check_sel_silo, e indexed_tree_check_sel_write_to_public_inputs, e indexed_tree_check_siloed_value, e indexed_tree_check_siloing_separator, e indexed_tree_check_tree_height, e indexed_tree_check_tree_size_after_write, e indexed_tree_check_tree_size_before_write, e indexed_tree_check_updated_low_leaf_hash, e indexed_tree_check_updated_low_leaf_next_index, e indexed_tree_check_updated_low_leaf_next_value, e indexed_tree_check_value, e indexed_tree_check_value_low_leaf_value_diff_inv, e indexed_tree_check_write, e indexed_tree_check_write_root, e instr_fetching_addressing_mode, e instr_fetching_bd0, e instr_fetching_bd1, e instr_fetching_bd10, e instr_fetching_bd11, e instr_fetching_bd12, e instr_fetching_bd13, e instr_fetching_bd14, e instr_fetching_bd15, e instr_fetching_bd16, e instr_fetching_bd17, e instr_fetching_bd18, e instr_fetching_bd19, e instr_fetching_bd2, e instr_fetching_bd20, e instr_fetching_bd21, e instr_fetching_bd22, e instr_fetching_bd23, e instr_fetching_bd24, e instr_fetching_bd25, e instr_fetching_bd26, e instr_fetching_bd27, e instr_fetching_bd28, e instr_fetching_bd29, e instr_fetching_bd3, e instr_fetching_bd30, e instr_fetching_bd31, e instr_fetching_bd32, e instr_fetching_bd33, e instr_fetching_bd34, e instr_fetching_bd35, e instr_fetching_bd36, e instr_fetching_bd4, e instr_fetching_bd5, e instr_fetching_bd6, e instr_fetching_bd7, e instr_fetching_bd8, e instr_fetching_bd9, e instr_fetching_bytecode_id, e instr_fetching_bytecode_size, e instr_fetching_bytes_to_read, e instr_fetching_exec_opcode, e instr_fetching_instr_abs_diff, e instr_fetching_instr_out_of_range, e instr_fetching_instr_size, e instr_fetching_op1, e instr_fetching_op2, e instr_fetching_op3, e instr_fetching_op4, e instr_fetching_op5, e instr_fetching_op6, e instr_fetching_op7, e instr_fetching_opcode_out_of_range, e instr_fetching_pc, e instr_fetching_pc_abs_diff, e instr_fetching_pc_out_of_range, e instr_fetching_pc_size_in_bits, e instr_fetching_sel, e instr_fetching_sel_has_tag, e instr_fetching_sel_op_dc_0, e instr_fetching_sel_op_dc_1, e instr_fetching_sel_op_dc_10, e instr_fetching_sel_op_dc_11, e instr_fetching_sel_op_dc_12, e instr_fetching_sel_op_dc_13, e instr_fetching_sel_op_dc_14, e instr_fetching_sel_op_dc_15, e instr_fetching_sel_op_dc_16, e instr_fetching_sel_op_dc_2, e instr_fetching_sel_op_dc_3, e instr_fetching_sel_op_dc_4, e instr_fetching_sel_op_dc_5, e instr_fetching_sel_op_dc_6, e instr_fetching_sel_op_dc_7, e instr_fetching_sel_op_dc_8, e instr_fetching_sel_op_dc_9, e instr_fetching_sel_parsing_err, e instr_fetching_sel_pc_in_range, e instr_fetching_sel_tag_is_op2, e instr_fetching_tag_out_of_range, e instr_fetching_tag_value, e internal_call_stack_call_id, e internal_call_stack_context_id, e internal_call_stack_entered_call_id, e internal_call_stack_return_call_id, e internal_call_stack_return_pc, e internal_call_stack_sel, e keccak_memory_ctr_end, e keccak_memory_end, e keccak_memory_single_tag_error, e keccak_memory_state_size_min_ctr_inv, e keccak_memory_tag, e keccak_memory_tag_min_u64_inv, e keccak_memory_val_24_, e keccakf1600_bitwise_and_op_id, e keccakf1600_bitwise_xor_op_id, e keccakf1600_dst_out_of_range_error, e keccakf1600_end, e keccakf1600_error, e keccakf1600_highest_slice_address, e keccakf1600_rot_64_min_len_01, e keccakf1600_rot_64_min_len_03, e keccakf1600_rot_64_min_len_11, e keccakf1600_rot_64_min_len_13, e keccakf1600_rot_64_min_len_20, e keccakf1600_rot_64_min_len_22, e keccakf1600_rot_64_min_len_24, e keccakf1600_rot_64_min_len_31, e keccakf1600_rot_64_min_len_34, e keccakf1600_rot_64_min_len_42, e keccakf1600_rot_len_02, e keccakf1600_rot_len_04, e keccakf1600_rot_len_10, e keccakf1600_rot_len_12, e keccakf1600_rot_len_14, e keccakf1600_rot_len_21, e keccakf1600_rot_len_23, e keccakf1600_rot_len_30, e keccakf1600_rot_len_32, e keccakf1600_rot_len_33, e keccakf1600_rot_len_40, e keccakf1600_rot_len_41, e keccakf1600_rot_len_43, e keccakf1600_rot_len_44, e keccakf1600_round_cst, e keccakf1600_sel_slice_read, e keccakf1600_sel_slice_write, e keccakf1600_src_addr, e keccakf1600_src_out_of_range_error, e keccakf1600_state_chi_00, e keccakf1600_state_chi_01, e keccakf1600_state_chi_02, e keccakf1600_state_chi_03, e keccakf1600_state_chi_04, e keccakf1600_state_chi_10, e keccakf1600_state_chi_11, e keccakf1600_state_chi_12, e keccakf1600_state_chi_13, e keccakf1600_state_chi_14, e keccakf1600_state_chi_20, e keccakf1600_state_chi_21, e keccakf1600_state_chi_22, e keccakf1600_state_chi_23, e keccakf1600_state_chi_24, e keccakf1600_state_chi_30, e keccakf1600_state_chi_31, e keccakf1600_state_chi_32, e keccakf1600_state_chi_33, e keccakf1600_state_chi_34, e keccakf1600_state_chi_40, e keccakf1600_state_chi_41, e keccakf1600_state_chi_42, e keccakf1600_state_chi_43, e keccakf1600_state_chi_44, e keccakf1600_state_iota_00, e keccakf1600_state_pi_and_00, e keccakf1600_state_pi_and_01, e keccakf1600_state_pi_and_02, e keccakf1600_state_pi_and_03, e keccakf1600_state_pi_and_04, e keccakf1600_state_pi_and_10, e keccakf1600_state_pi_and_11, e keccakf1600_state_pi_and_12, e keccakf1600_state_pi_and_13, e keccakf1600_state_pi_and_14, e keccakf1600_state_pi_and_20, e keccakf1600_state_pi_and_21, e keccakf1600_state_pi_and_22, e keccakf1600_state_pi_and_23, e keccakf1600_state_pi_and_24, e keccakf1600_state_pi_and_30, e keccakf1600_state_pi_and_31, e keccakf1600_state_pi_and_32, e keccakf1600_state_pi_and_33, e keccakf1600_state_pi_and_34, e keccakf1600_state_pi_and_40, e keccakf1600_state_pi_and_41, e keccakf1600_state_pi_and_42, e keccakf1600_state_pi_and_43, e keccakf1600_state_pi_and_44, e keccakf1600_state_pi_not_00, e keccakf1600_state_pi_not_01, e keccakf1600_state_pi_not_02, e keccakf1600_state_pi_not_03, e keccakf1600_state_pi_not_04, e keccakf1600_state_pi_not_10, e keccakf1600_state_pi_not_11, e keccakf1600_state_pi_not_12, e keccakf1600_state_pi_not_13, e keccakf1600_state_pi_not_14, e keccakf1600_state_pi_not_20, e keccakf1600_state_pi_not_21, e keccakf1600_state_pi_not_22, e keccakf1600_state_pi_not_23, e keccakf1600_state_pi_not_24, e keccakf1600_state_pi_not_30, e keccakf1600_state_pi_not_31, e keccakf1600_state_pi_not_32, e keccakf1600_state_pi_not_33, e keccakf1600_state_pi_not_34, e keccakf1600_state_pi_not_40, e keccakf1600_state_pi_not_41, e keccakf1600_state_pi_not_42, e keccakf1600_state_pi_not_43, e keccakf1600_state_pi_not_44, e keccakf1600_state_rho_01, e keccakf1600_state_rho_02, e keccakf1600_state_rho_03, e keccakf1600_state_rho_04, e keccakf1600_state_rho_10, e keccakf1600_state_rho_11, e keccakf1600_state_rho_12, e keccakf1600_state_rho_13, e keccakf1600_state_rho_14, e keccakf1600_state_rho_20, e keccakf1600_state_rho_21, e keccakf1600_state_rho_22, e keccakf1600_state_rho_23, e keccakf1600_state_rho_24, e keccakf1600_state_rho_30, e keccakf1600_state_rho_31, e keccakf1600_state_rho_32, e keccakf1600_state_rho_33, e keccakf1600_state_rho_34, e keccakf1600_state_rho_40, e keccakf1600_state_rho_41, e keccakf1600_state_rho_42, e keccakf1600_state_rho_43, e keccakf1600_state_rho_44, e keccakf1600_state_theta_00, e keccakf1600_state_theta_01, e keccakf1600_state_theta_02, e keccakf1600_state_theta_03, e keccakf1600_state_theta_04, e keccakf1600_state_theta_10, e keccakf1600_state_theta_11, e keccakf1600_state_theta_12, e keccakf1600_state_theta_13, e keccakf1600_state_theta_14, e keccakf1600_state_theta_20, e keccakf1600_state_theta_21, e keccakf1600_state_theta_22, e keccakf1600_state_theta_23, e keccakf1600_state_theta_24, e keccakf1600_state_theta_30, e keccakf1600_state_theta_31, e keccakf1600_state_theta_32, e keccakf1600_state_theta_33, e keccakf1600_state_theta_34, e keccakf1600_state_theta_40, e keccakf1600_state_theta_41, e keccakf1600_state_theta_42, e keccakf1600_state_theta_43, e keccakf1600_state_theta_44, e keccakf1600_state_theta_hi_02, e keccakf1600_state_theta_hi_04, e keccakf1600_state_theta_hi_10, e keccakf1600_state_theta_hi_12, e keccakf1600_state_theta_hi_14, e keccakf1600_state_theta_hi_21, e keccakf1600_state_theta_hi_23, e keccakf1600_state_theta_hi_30, e keccakf1600_state_theta_hi_32, e keccakf1600_state_theta_hi_33, e keccakf1600_state_theta_hi_40, e keccakf1600_state_theta_hi_41, e keccakf1600_state_theta_hi_43, e keccakf1600_state_theta_hi_44, e keccakf1600_state_theta_low_01, e keccakf1600_state_theta_low_03, e keccakf1600_state_theta_low_11, e keccakf1600_state_theta_low_13, e keccakf1600_state_theta_low_20, e keccakf1600_state_theta_low_22, e keccakf1600_state_theta_low_24, e keccakf1600_state_theta_low_31, e keccakf1600_state_theta_low_34, e keccakf1600_state_theta_low_42, e keccakf1600_tag_error, e keccakf1600_tag_u64, e keccakf1600_theta_combined_xor_0, e keccakf1600_theta_combined_xor_1, e keccakf1600_theta_combined_xor_2, e keccakf1600_theta_combined_xor_3, e keccakf1600_theta_combined_xor_4, e keccakf1600_theta_xor_01, e keccakf1600_theta_xor_02, e keccakf1600_theta_xor_03, e keccakf1600_theta_xor_11, e keccakf1600_theta_xor_12, e keccakf1600_theta_xor_13, e keccakf1600_theta_xor_21, e keccakf1600_theta_xor_22, e keccakf1600_theta_xor_23, e keccakf1600_theta_xor_31, e keccakf1600_theta_xor_32, e keccakf1600_theta_xor_33, e keccakf1600_theta_xor_41, e keccakf1600_theta_xor_42, e keccakf1600_theta_xor_43, e keccakf1600_theta_xor_row_0, e keccakf1600_theta_xor_row_1, e keccakf1600_theta_xor_row_2, e keccakf1600_theta_xor_row_3, e keccakf1600_theta_xor_row_4, e keccakf1600_theta_xor_row_msb_0, e keccakf1600_theta_xor_row_msb_1, e keccakf1600_theta_xor_row_msb_2, e keccakf1600_theta_xor_row_msb_3, e keccakf1600_theta_xor_row_msb_4, e keccakf1600_theta_xor_row_rotl1_0, e keccakf1600_theta_xor_row_rotl1_1, e keccakf1600_theta_xor_row_rotl1_2, e keccakf1600_theta_xor_row_rotl1_3, e keccakf1600_theta_xor_row_rotl1_4, e l1_to_l2_message_tree_check_exists, e l1_to_l2_message_tree_check_l1_to_l2_message_tree_height, e l1_to_l2_message_tree_check_leaf_index, e l1_to_l2_message_tree_check_leaf_value, e l1_to_l2_message_tree_check_leaf_value_msg_hash_diff_inv, e l1_to_l2_message_tree_check_merkle_hash_separator, e l1_to_l2_message_tree_check_msg_hash, e l1_to_l2_message_tree_check_root, e l1_to_l2_message_tree_check_sel, e memory_diff, e memory_glob_addr_diff_inv, e memory_last_access, e memory_limb_0_, e memory_limb_1_, e memory_limb_2_, e memory_max_bits, e memory_sel_addressing_base, e memory_sel_addressing_indirect_0_, e memory_sel_addressing_indirect_1_, e memory_sel_addressing_indirect_2_, e memory_sel_addressing_indirect_3_, e memory_sel_addressing_indirect_4_, e memory_sel_addressing_indirect_5_, e memory_sel_addressing_indirect_6_, e memory_sel_data_copy_read, e memory_sel_data_copy_write, e memory_sel_ecc_write_0_, e memory_sel_ecc_write_1_, e memory_sel_ecc_write_2_, e memory_sel_get_contract_instance_exists_write, e memory_sel_get_contract_instance_member_write, e memory_sel_keccak, e memory_sel_poseidon2_read_0_, e memory_sel_poseidon2_read_1_, e memory_sel_poseidon2_read_2_, e memory_sel_poseidon2_read_3_, e memory_sel_poseidon2_write_0_, e memory_sel_poseidon2_write_1_, e memory_sel_poseidon2_write_2_, e memory_sel_poseidon2_write_3_, e memory_sel_public_log_read, e memory_sel_register_op_0_, e memory_sel_register_op_1_, e memory_sel_register_op_2_, e memory_sel_register_op_3_, e memory_sel_register_op_4_, e memory_sel_register_op_5_, e memory_sel_rng_chk, e memory_sel_rng_write, e memory_sel_sha256_op_0_, e memory_sel_sha256_op_1_, e memory_sel_sha256_op_2_, e memory_sel_sha256_op_3_, e memory_sel_sha256_op_4_, e memory_sel_sha256_op_5_, e memory_sel_sha256_op_6_, e memory_sel_sha256_op_7_, e memory_sel_sha256_read, e memory_sel_tag_is_ff, e memory_sel_to_radix_write, e memory_tag_ff_diff_inv, e merkle_check_const_three, e merkle_check_end, e merkle_check_index_is_even, e merkle_check_path_len_min_one_inv, e merkle_check_read_left_node, e merkle_check_read_output_hash, e merkle_check_read_right_node, e merkle_check_sibling, e merkle_check_write_left_node, e merkle_check_write_output_hash, e merkle_check_write_right_node, e note_hash_tree_check_address, e note_hash_tree_check_const_three, e note_hash_tree_check_discard, e note_hash_tree_check_exists, e note_hash_tree_check_first_nullifier, e note_hash_tree_check_first_nullifier_pi_index, e note_hash_tree_check_leaf_index, e note_hash_tree_check_merkle_hash_separator, e note_hash_tree_check_next_leaf_value, e note_hash_tree_check_next_root, e note_hash_tree_check_nonce, e note_hash_tree_check_nonce_separator, e note_hash_tree_check_note_hash, e note_hash_tree_check_note_hash_index, e note_hash_tree_check_note_hash_tree_height, e note_hash_tree_check_prev_leaf_value, e note_hash_tree_check_prev_leaf_value_unique_note_hash_diff_inv, e note_hash_tree_check_prev_root, e note_hash_tree_check_public_inputs_index, e note_hash_tree_check_sel, e note_hash_tree_check_sel_silo, e note_hash_tree_check_sel_unique, e note_hash_tree_check_sel_write_to_public_inputs, e note_hash_tree_check_siloed_note_hash, e note_hash_tree_check_siloing_separator, e note_hash_tree_check_unique_note_hash, e note_hash_tree_check_unique_note_hash_separator, e note_hash_tree_check_write, e poseidon2_hash_b_0, e poseidon2_hash_b_1, e poseidon2_hash_b_2, e poseidon2_hash_b_3, e poseidon2_hash_end, e poseidon2_hash_input_len, e poseidon2_hash_num_perm_rounds_rem_min_one_inv, e poseidon2_hash_padding, e poseidon2_perm_B_10_0, e poseidon2_perm_B_10_1, e poseidon2_perm_B_10_2, e poseidon2_perm_B_10_3, e poseidon2_perm_B_11_0, e poseidon2_perm_B_11_1, e poseidon2_perm_B_11_2, e poseidon2_perm_B_11_3, e poseidon2_perm_B_12_0, e poseidon2_perm_B_12_1, e poseidon2_perm_B_12_2, e poseidon2_perm_B_12_3, e poseidon2_perm_B_13_0, e poseidon2_perm_B_13_1, e poseidon2_perm_B_13_2, e poseidon2_perm_B_13_3, e poseidon2_perm_B_14_0, e poseidon2_perm_B_14_1, e poseidon2_perm_B_14_2, e poseidon2_perm_B_14_3, e poseidon2_perm_B_15_0, e poseidon2_perm_B_15_1, e poseidon2_perm_B_15_2, e poseidon2_perm_B_15_3, e poseidon2_perm_B_16_0, e poseidon2_perm_B_16_1, e poseidon2_perm_B_16_2, e poseidon2_perm_B_16_3, e poseidon2_perm_B_17_0, e poseidon2_perm_B_17_1, e poseidon2_perm_B_17_2, e poseidon2_perm_B_17_3, e poseidon2_perm_B_18_0, e poseidon2_perm_B_18_1, e poseidon2_perm_B_18_2, e poseidon2_perm_B_18_3, e poseidon2_perm_B_19_0, e poseidon2_perm_B_19_1, e poseidon2_perm_B_19_2, e poseidon2_perm_B_19_3, e poseidon2_perm_B_20_0, e poseidon2_perm_B_20_1, e poseidon2_perm_B_20_2, e poseidon2_perm_B_20_3, e poseidon2_perm_B_21_0, e poseidon2_perm_B_21_1, e poseidon2_perm_B_21_2, e poseidon2_perm_B_21_3, e poseidon2_perm_B_22_0, e poseidon2_perm_B_22_1, e poseidon2_perm_B_22_2, e poseidon2_perm_B_22_3, e poseidon2_perm_B_23_0, e poseidon2_perm_B_23_1, e poseidon2_perm_B_23_2, e poseidon2_perm_B_23_3, e poseidon2_perm_B_24_0, e poseidon2_perm_B_24_1, e poseidon2_perm_B_24_2, e poseidon2_perm_B_24_3, e poseidon2_perm_B_25_0, e poseidon2_perm_B_25_1, e poseidon2_perm_B_25_2, e poseidon2_perm_B_25_3, e poseidon2_perm_B_26_0, e poseidon2_perm_B_26_1, e poseidon2_perm_B_26_2, e poseidon2_perm_B_26_3, e poseidon2_perm_B_27_0, e poseidon2_perm_B_27_1, e poseidon2_perm_B_27_2, e poseidon2_perm_B_27_3, e poseidon2_perm_B_28_0, e poseidon2_perm_B_28_1, e poseidon2_perm_B_28_2, e poseidon2_perm_B_28_3, e poseidon2_perm_B_29_0, e poseidon2_perm_B_29_1, e poseidon2_perm_B_29_2, e poseidon2_perm_B_29_3, e poseidon2_perm_B_30_0, e poseidon2_perm_B_30_1, e poseidon2_perm_B_30_2, e poseidon2_perm_B_30_3, e poseidon2_perm_B_31_0, e poseidon2_perm_B_31_1, e poseidon2_perm_B_31_2, e poseidon2_perm_B_31_3, e poseidon2_perm_B_32_0, e poseidon2_perm_B_32_1, e poseidon2_perm_B_32_2, e poseidon2_perm_B_32_3, e poseidon2_perm_B_33_0, e poseidon2_perm_B_33_1, e poseidon2_perm_B_33_2, e poseidon2_perm_B_33_3, e poseidon2_perm_B_34_0, e poseidon2_perm_B_34_1, e poseidon2_perm_B_34_2, e poseidon2_perm_B_34_3, e poseidon2_perm_B_35_0, e poseidon2_perm_B_35_1, e poseidon2_perm_B_35_2, e poseidon2_perm_B_35_3, e poseidon2_perm_B_36_0, e poseidon2_perm_B_36_1, e poseidon2_perm_B_36_2, e poseidon2_perm_B_36_3, e poseidon2_perm_B_37_0, e poseidon2_perm_B_37_1, e poseidon2_perm_B_37_2, e poseidon2_perm_B_37_3, e poseidon2_perm_B_38_0, e poseidon2_perm_B_38_1, e poseidon2_perm_B_38_2, e poseidon2_perm_B_38_3, e poseidon2_perm_B_39_0, e poseidon2_perm_B_39_1, e poseidon2_perm_B_39_2, e poseidon2_perm_B_39_3, e poseidon2_perm_B_40_0, e poseidon2_perm_B_40_1, e poseidon2_perm_B_40_2, e poseidon2_perm_B_40_3, e poseidon2_perm_B_41_0, e poseidon2_perm_B_41_1, e poseidon2_perm_B_41_2, e poseidon2_perm_B_41_3, e poseidon2_perm_B_42_0, e poseidon2_perm_B_42_1, e poseidon2_perm_B_42_2, e poseidon2_perm_B_42_3, e poseidon2_perm_B_43_0, e poseidon2_perm_B_43_1, e poseidon2_perm_B_43_2, e poseidon2_perm_B_43_3, e poseidon2_perm_B_44_0, e poseidon2_perm_B_44_1, e poseidon2_perm_B_44_2, e poseidon2_perm_B_44_3, e poseidon2_perm_B_45_0, e poseidon2_perm_B_45_1, e poseidon2_perm_B_45_2, e poseidon2_perm_B_45_3, e poseidon2_perm_B_46_0, e poseidon2_perm_B_46_1, e poseidon2_perm_B_46_2, e poseidon2_perm_B_46_3, e poseidon2_perm_B_47_0, e poseidon2_perm_B_47_1, e poseidon2_perm_B_47_2, e poseidon2_perm_B_47_3, e poseidon2_perm_B_48_0, e poseidon2_perm_B_48_1, e poseidon2_perm_B_48_2, e poseidon2_perm_B_48_3, e poseidon2_perm_B_49_0, e poseidon2_perm_B_49_1, e poseidon2_perm_B_49_2, e poseidon2_perm_B_49_3, e poseidon2_perm_B_4_0, e poseidon2_perm_B_4_1, e poseidon2_perm_B_4_2, e poseidon2_perm_B_4_3, e poseidon2_perm_B_50_0, e poseidon2_perm_B_50_1, e poseidon2_perm_B_50_2, e poseidon2_perm_B_50_3, e poseidon2_perm_B_51_0, e poseidon2_perm_B_51_1, e poseidon2_perm_B_51_2, e poseidon2_perm_B_51_3, e poseidon2_perm_B_52_0, e poseidon2_perm_B_52_1, e poseidon2_perm_B_52_2, e poseidon2_perm_B_52_3, e poseidon2_perm_B_53_0, e poseidon2_perm_B_53_1, e poseidon2_perm_B_53_2, e poseidon2_perm_B_53_3, e poseidon2_perm_B_54_0, e poseidon2_perm_B_54_1, e poseidon2_perm_B_54_2, e poseidon2_perm_B_54_3, e poseidon2_perm_B_55_0, e poseidon2_perm_B_55_1, e poseidon2_perm_B_55_2, e poseidon2_perm_B_55_3, e poseidon2_perm_B_56_0, e poseidon2_perm_B_56_1, e poseidon2_perm_B_56_2, e poseidon2_perm_B_56_3, e poseidon2_perm_B_57_0, e poseidon2_perm_B_57_1, e poseidon2_perm_B_57_2, e poseidon2_perm_B_57_3, e poseidon2_perm_B_58_0, e poseidon2_perm_B_58_1, e poseidon2_perm_B_58_2, e poseidon2_perm_B_58_3, e poseidon2_perm_B_59_0, e poseidon2_perm_B_59_1, e poseidon2_perm_B_59_2, e poseidon2_perm_B_59_3, e poseidon2_perm_B_5_0, e poseidon2_perm_B_5_1, e poseidon2_perm_B_5_2, e poseidon2_perm_B_5_3, e poseidon2_perm_B_6_0, e poseidon2_perm_B_6_1, e poseidon2_perm_B_6_2, e poseidon2_perm_B_6_3, e poseidon2_perm_B_7_0, e poseidon2_perm_B_7_1, e poseidon2_perm_B_7_2, e poseidon2_perm_B_7_3, e poseidon2_perm_B_8_0, e poseidon2_perm_B_8_1, e poseidon2_perm_B_8_2, e poseidon2_perm_B_8_3, e poseidon2_perm_B_9_0, e poseidon2_perm_B_9_1, e poseidon2_perm_B_9_2, e poseidon2_perm_B_9_3, e poseidon2_perm_EXT_LAYER_4, e poseidon2_perm_EXT_LAYER_5, e poseidon2_perm_EXT_LAYER_6, e poseidon2_perm_EXT_LAYER_7, e poseidon2_perm_T_0_4, e poseidon2_perm_T_0_5, e poseidon2_perm_T_0_6, e poseidon2_perm_T_0_7, e poseidon2_perm_T_1_4, e poseidon2_perm_T_1_5, e poseidon2_perm_T_1_6, e poseidon2_perm_T_1_7, e poseidon2_perm_T_2_4, e poseidon2_perm_T_2_5, e poseidon2_perm_T_2_6, e poseidon2_perm_T_2_7, e poseidon2_perm_T_3_4, e poseidon2_perm_T_3_5, e poseidon2_perm_T_3_6, e poseidon2_perm_T_3_7, e poseidon2_perm_T_60_4, e poseidon2_perm_T_60_5, e poseidon2_perm_T_60_6, e poseidon2_perm_T_60_7, e poseidon2_perm_T_61_4, e poseidon2_perm_T_61_5, e poseidon2_perm_T_61_6, e poseidon2_perm_T_61_7, e poseidon2_perm_T_62_4, e poseidon2_perm_T_62_5, e poseidon2_perm_T_62_6, e poseidon2_perm_T_62_7, e poseidon2_perm_T_63_4, e poseidon2_perm_T_63_5, e poseidon2_perm_T_63_6, e poseidon2_perm_T_63_7, e poseidon2_perm_a_0, e poseidon2_perm_a_1, e poseidon2_perm_a_2, e poseidon2_perm_a_3, e poseidon2_perm_b_0, e poseidon2_perm_b_1, e poseidon2_perm_b_2, e poseidon2_perm_b_3, e poseidon2_perm_mem_batch_tag_inv, e poseidon2_perm_mem_err, e poseidon2_perm_mem_execution_clk, e poseidon2_perm_mem_input_0_, e poseidon2_perm_mem_input_1_, e poseidon2_perm_mem_input_2_, e poseidon2_perm_mem_input_3_, e poseidon2_perm_mem_input_tag_0_, e poseidon2_perm_mem_input_tag_1_, e poseidon2_perm_mem_input_tag_2_, e poseidon2_perm_mem_input_tag_3_, e poseidon2_perm_mem_max_mem_addr, e poseidon2_perm_mem_output_0_, e poseidon2_perm_mem_output_1_, e poseidon2_perm_mem_output_2_, e poseidon2_perm_mem_output_3_, e poseidon2_perm_mem_read_address_0_, e poseidon2_perm_mem_read_address_1_, e poseidon2_perm_mem_read_address_2_, e poseidon2_perm_mem_read_address_3_, e poseidon2_perm_mem_sel, e poseidon2_perm_mem_sel_dst_out_of_range_err, e poseidon2_perm_mem_sel_invalid_tag_err, e poseidon2_perm_mem_sel_should_exec, e poseidon2_perm_mem_sel_should_read_mem, e poseidon2_perm_mem_sel_src_out_of_range_err, e poseidon2_perm_mem_space_id, e poseidon2_perm_mem_write_address_0_, e poseidon2_perm_mem_write_address_1_, e poseidon2_perm_mem_write_address_2_, e poseidon2_perm_mem_write_address_3_, e poseidon2_perm_sel, e public_data_check_address, e public_data_check_clk_diff_hi, e public_data_check_clk_diff_lo, e public_data_check_const_four, e public_data_check_const_three, e public_data_check_discard, e public_data_check_end, e public_data_check_final_value, e public_data_check_intermediate_root, e public_data_check_leaf_not_exists, e public_data_check_leaf_slot, e public_data_check_leaf_slot_low_leaf_slot_diff_inv, e public_data_check_length_pi_idx, e public_data_check_low_leaf_hash, e public_data_check_low_leaf_index, e public_data_check_low_leaf_next_index, e public_data_check_low_leaf_next_slot, e public_data_check_low_leaf_slot, e public_data_check_low_leaf_value, e public_data_check_merkle_hash_separator, e public_data_check_new_leaf_hash, e public_data_check_next_slot_inv, e public_data_check_next_slot_is_nonzero, e public_data_check_non_discarded_write, e public_data_check_non_protocol_write, e public_data_check_not_end, e public_data_check_protocol_write, e public_data_check_public_data_writes_length, e public_data_check_root, e public_data_check_sel_write_to_public_inputs, e public_data_check_should_insert, e public_data_check_siloing_separator, e public_data_check_slot, e public_data_check_tree_height, e public_data_check_tree_size_after_write, e public_data_check_tree_size_before_write, e public_data_check_updated_low_leaf_hash, e public_data_check_updated_low_leaf_next_index, e public_data_check_updated_low_leaf_next_slot, e public_data_check_updated_low_leaf_value, e public_data_check_value, e public_data_check_write, e public_data_check_write_root, e public_data_squash_check_clock, e public_data_squash_clk_diff_hi, e public_data_squash_clk_diff_lo, e public_data_squash_leaf_slot_increase, e public_data_squash_value, e range_check_dyn_diff, e range_check_dyn_rng_chk_bits, e range_check_dyn_rng_chk_pow_2, e range_check_is_lte_u112, e range_check_is_lte_u128, e range_check_is_lte_u16, e range_check_is_lte_u32, e range_check_is_lte_u48, e range_check_is_lte_u64, e range_check_is_lte_u80, e range_check_is_lte_u96, e range_check_rng_chk_bits, e range_check_sel, e range_check_sel_alu, e range_check_sel_gt, e range_check_sel_keccak, e range_check_sel_memory, e range_check_sel_r0_16_bit_rng_lookup, e range_check_sel_r1_16_bit_rng_lookup, e range_check_sel_r2_16_bit_rng_lookup, e range_check_sel_r3_16_bit_rng_lookup, e range_check_sel_r4_16_bit_rng_lookup, e range_check_sel_r5_16_bit_rng_lookup, e range_check_sel_r6_16_bit_rng_lookup, e range_check_u16_r0, e range_check_u16_r1, e range_check_u16_r2, e range_check_u16_r3, e range_check_u16_r4, e range_check_u16_r5, e range_check_u16_r6, e range_check_u16_r7, e range_check_value, e scalar_mul_bit, e scalar_mul_const_two, e scalar_mul_end, e scalar_mul_sel_not_end, e scalar_mul_should_add, e sha256_a_and_b, e sha256_a_and_b_xor_a_and_c, e sha256_a_and_c, e sha256_a_rotr_13, e sha256_a_rotr_2, e sha256_a_rotr_22, e sha256_a_rotr_2_xor_a_rotr_13, e sha256_and_op_id, e sha256_b_and_c, e sha256_batch_tag_inv, e sha256_ch, e sha256_computed_w_lhs, e sha256_computed_w_rhs, e sha256_e_and_f, e sha256_e_rotr_11, e sha256_e_rotr_25, e sha256_e_rotr_6, e sha256_e_rotr_6_xor_e_rotr_11, e sha256_end, e sha256_err, e sha256_input, e sha256_input_rounds_rem_inv, e sha256_input_tag, e sha256_input_tag_diff_inv, e sha256_last, e sha256_lhs_w_10, e sha256_lhs_w_3, e sha256_maj, e sha256_max_input_addr, e sha256_max_mem_addr, e sha256_max_output_addr, e sha256_max_state_addr, e sha256_mem_out_of_range_err, e sha256_memory_address_0_, e sha256_memory_address_1_, e sha256_memory_address_2_, e sha256_memory_address_3_, e sha256_memory_address_4_, e sha256_memory_address_5_, e sha256_memory_address_6_, e sha256_memory_address_7_, e sha256_memory_register_0_, e sha256_memory_register_1_, e sha256_memory_register_2_, e sha256_memory_register_3_, e sha256_memory_register_4_, e sha256_memory_register_5_, e sha256_memory_register_6_, e sha256_memory_register_7_, e sha256_memory_tag_0_, e sha256_memory_tag_1_, e sha256_memory_tag_2_, e sha256_memory_tag_3_, e sha256_memory_tag_4_, e sha256_memory_tag_5_, e sha256_memory_tag_6_, e sha256_memory_tag_7_, e sha256_next_a_lhs, e sha256_next_a_rhs, e sha256_next_e_lhs, e sha256_next_e_rhs, e sha256_not_e, e sha256_not_e_and_g, e sha256_output_a_lhs, e sha256_output_a_rhs, e sha256_output_b_lhs, e sha256_output_b_rhs, e sha256_output_c_lhs, e sha256_output_c_rhs, e sha256_output_d_lhs, e sha256_output_d_rhs, e sha256_output_e_lhs, e sha256_output_e_rhs, e sha256_output_f_lhs, e sha256_output_f_rhs, e sha256_output_g_lhs, e sha256_output_g_rhs, e sha256_output_h_lhs, e sha256_output_h_rhs, e sha256_perform_round, e sha256_rhs_a_13, e sha256_rhs_a_2, e sha256_rhs_a_22, e sha256_rhs_e_11, e sha256_rhs_e_25, e sha256_rhs_e_6, e sha256_rhs_w_10, e sha256_rhs_w_17, e sha256_rhs_w_18, e sha256_rhs_w_19, e sha256_rhs_w_3, e sha256_rhs_w_7, e sha256_round_constant, e sha256_round_count, e sha256_rounds_remaining_inv, e sha256_rw, e sha256_s_0, e sha256_s_1, e sha256_sel_compute_w, e sha256_sel_input_out_of_range_err, e sha256_sel_invalid_input_row_tag_err, e sha256_sel_invalid_state_tag_err, e sha256_sel_is_input_round, e sha256_sel_mem_state_or_output, e sha256_sel_output_out_of_range_err, e sha256_sel_read_input_from_memory, e sha256_sel_state_out_of_range_err, e sha256_state_addr, e sha256_two_pow_10, e sha256_two_pow_11, e sha256_two_pow_13, e sha256_two_pow_17, e sha256_two_pow_18, e sha256_two_pow_19, e sha256_two_pow_2, e sha256_two_pow_22, e sha256_two_pow_25, e sha256_two_pow_3, e sha256_two_pow_32, e sha256_two_pow_6, e sha256_two_pow_7, e sha256_u32_tag, e sha256_w, e sha256_w_15_rotr_18, e sha256_w_15_rotr_7, e sha256_w_15_rotr_7_xor_w_15_rotr_18, e sha256_w_2_rotr_17, e sha256_w_2_rotr_17_xor_w_2_rotr_19, e sha256_w_2_rotr_19, e sha256_w_s_0, e sha256_w_s_1, e sha256_xor_op_id, e to_radix_end, e to_radix_found, e to_radix_is_unsafe_limb, e to_radix_limb_p_diff, e to_radix_limb_radix_diff, e to_radix_mem_err, e to_radix_mem_input_validation_error, e to_radix_mem_last, e to_radix_mem_limb_index_to_lookup, e to_radix_mem_limb_value, e to_radix_mem_max_mem_size, e to_radix_mem_num_limbs_inv, e to_radix_mem_num_limbs_minus_one_inv, e to_radix_mem_output_tag, e to_radix_mem_radix_min_two_inv, e to_radix_mem_sel_dst_out_of_range_err, e to_radix_mem_sel_invalid_bitwise_radix, e to_radix_mem_sel_num_limbs_is_zero, e to_radix_mem_sel_radix_eq_2, e to_radix_mem_sel_radix_gt_256_err, e to_radix_mem_sel_radix_lt_2_err, e to_radix_mem_sel_value_is_zero, e to_radix_mem_two, e to_radix_mem_two_five_six, e to_radix_mem_value_found, e to_radix_mem_value_inv, e to_radix_mem_write_addr_upper_bound, e to_radix_p_limb, e to_radix_rem_inverse, e to_radix_safety_diff_inverse, e tx_array_length_l2_to_l1_messages_pi_offset, e tx_array_length_note_hashes_pi_offset, e tx_array_length_nullifiers_pi_offset, e tx_calldata_hash, e tx_calldata_size, e tx_const_three, e tx_contract_addr, e tx_dom_sep_public_storage_map_slot, e tx_effective_fee_per_da_gas, e tx_effective_fee_per_l2_gas, e tx_end_phase, e tx_fee_juice_balance_slot, e tx_fee_juice_balances_slot_constant, e tx_fee_juice_contract_address, e tx_fee_payer, e tx_fee_payer_balance, e tx_fee_payer_new_balance, e tx_fee_payer_pi_offset, e tx_fields_length_public_logs_pi_offset, e tx_gas_limit_pi_offset, e tx_gas_used_pi_offset, e tx_is_cleanup, e tx_is_collect_fee, e tx_is_padded, e tx_is_public_call_request, e tx_is_static, e tx_is_tree_insert_phase, e tx_is_tree_padding, e tx_l1_l2_pi_offset, e tx_l2_l1_msg_content, e tx_l2_l1_msg_contract_address, e tx_l2_l1_msg_recipient, e tx_leaf_value, e tx_msg_sender, e tx_next_da_gas_used, e tx_next_da_gas_used_sent_to_enqueued_call, e tx_next_l2_gas_used, e tx_next_l2_gas_used_sent_to_enqueued_call, e tx_next_note_hash_tree_root, e tx_next_note_hash_tree_size, e tx_next_nullifier_tree_root, e tx_next_nullifier_tree_size, e tx_next_num_l2_to_l1_messages, e tx_next_num_note_hashes_emitted, e tx_next_num_nullifiers_emitted, e tx_next_num_public_log_fields, e tx_next_phase_on_revert, e tx_next_public_data_tree_root, e tx_next_public_data_tree_size, e tx_next_retrieved_bytecodes_tree_root, e tx_next_retrieved_bytecodes_tree_size, e tx_next_written_public_data_slots_tree_root, e tx_next_written_public_data_slots_tree_size, e tx_note_hash_pi_offset, e tx_nullifier_limit_error, e tx_nullifier_merkle_separator, e tx_nullifier_pi_offset, e tx_nullifier_tree_height, e tx_prev_da_gas_used_sent_to_enqueued_call, e tx_prev_l2_gas_used_sent_to_enqueued_call, e tx_public_data_pi_offset, e tx_read_pi_length_offset, e tx_read_pi_start_offset, e tx_remaining_phase_inv, e tx_remaining_phase_minus_one_inv, e tx_remaining_side_effects_inv, e tx_reverted_pi_offset, e tx_sel_l2_l1_msg_append, e tx_sel_non_revertible_append_l2_l1_msg, e tx_sel_non_revertible_append_note_hash, e tx_sel_non_revertible_append_nullifier, e tx_sel_note_hash_append, e tx_sel_nullifier_append, e tx_sel_process_call_request, e tx_sel_read_phase_length, e tx_sel_read_trees_and_gas_used, e tx_sel_revertible_append_l2_l1_msg, e tx_sel_revertible_append_note_hash, e tx_sel_revertible_append_nullifier, e tx_sel_try_l2_l1_msg_append, e tx_sel_try_note_hash_append, e tx_sel_try_nullifier_append, e tx_setup_phase_value, e tx_should_read_gas_limit, e tx_uint32_max, e tx_write_nullifier_pi_offset, e tx_write_pi_offset, e update_check_address, e update_check_const_three, e update_check_contract_instance_registry_address, e update_check_current_class_id, e update_check_delayed_public_mutable_hash_slot, e update_check_delayed_public_mutable_slot, e update_check_dom_sep_public_storage_map_slot, e update_check_hash_not_zero, e update_check_original_class_id, e update_check_public_data_tree_root, e update_check_sel, e update_check_timestamp, e update_check_timestamp_is_lt_timestamp_of_change, e update_check_timestamp_of_change, e update_check_timestamp_of_change_bit_size, e update_check_timestamp_pi_offset, e update_check_update_hash, e update_check_update_hash_inv, e update_check_update_hi_metadata, e update_check_update_hi_metadata_bit_size, e update_check_update_post_class_id_is_zero, e update_check_update_post_class_inv, e update_check_update_pre_class_id_is_zero, e update_check_update_pre_class_inv, e update_check_update_preimage_metadata, e update_check_update_preimage_post_class_id, e update_check_update_preimage_pre_class_id, e update_check_updated_class_ids_slot, e lookup_range_check_dyn_rng_chk_pow_2_counts, e lookup_range_check_dyn_diff_is_u16_counts, e lookup_range_check_r0_is_u16_counts, e lookup_range_check_r1_is_u16_counts, e lookup_range_check_r2_is_u16_counts, e lookup_range_check_r3_is_u16_counts, e lookup_range_check_r4_is_u16_counts, e lookup_range_check_r5_is_u16_counts, e lookup_range_check_r6_is_u16_counts, e lookup_range_check_r7_is_u16_counts, e lookup_ff_gt_a_lo_range_counts, e lookup_ff_gt_a_hi_range_counts, e lookup_gt_gt_range_counts, e lookup_alu_tag_max_bits_value_counts, e lookup_alu_range_check_decomposition_a_lo_counts, e lookup_alu_range_check_decomposition_a_hi_counts, e lookup_alu_range_check_decomposition_b_lo_counts, e lookup_alu_range_check_decomposition_b_hi_counts, e lookup_alu_range_check_mul_c_hi_counts, e lookup_alu_range_check_div_remainder_counts, e lookup_alu_ff_gt_counts, e lookup_alu_int_gt_counts, e lookup_alu_shifts_two_pow_counts, e lookup_alu_large_trunc_canonical_dec_counts, e lookup_alu_range_check_trunc_mid_counts, e lookup_bitwise_integral_tag_length_counts, e lookup_bitwise_byte_operations_counts, e lookup_memory_range_check_limb_0_counts, e lookup_memory_range_check_limb_1_counts, e lookup_memory_range_check_limb_2_counts, e lookup_memory_tag_max_bits_counts, e lookup_memory_range_check_write_tagged_value_counts, e lookup_data_copy_offset_plus_size_is_gt_data_size_counts, e lookup_data_copy_check_src_addr_in_range_counts, e lookup_data_copy_check_dst_addr_in_range_counts, e lookup_data_copy_sel_has_reads_counts, e lookup_data_copy_col_read_counts, e lookup_ecc_mem_check_dst_addr_in_range_counts, e lookup_ecc_mem_input_output_ecc_add_counts, e lookup_keccakf1600_theta_xor_01_counts, e lookup_keccakf1600_theta_xor_02_counts, e lookup_keccakf1600_theta_xor_03_counts, e lookup_keccakf1600_theta_xor_row_0_counts, e lookup_keccakf1600_theta_xor_11_counts, e lookup_keccakf1600_theta_xor_12_counts, e lookup_keccakf1600_theta_xor_13_counts, e lookup_keccakf1600_theta_xor_row_1_counts, e lookup_keccakf1600_theta_xor_21_counts, e lookup_keccakf1600_theta_xor_22_counts, e lookup_keccakf1600_theta_xor_23_counts, e lookup_keccakf1600_theta_xor_row_2_counts, e lookup_keccakf1600_theta_xor_31_counts, e lookup_keccakf1600_theta_xor_32_counts, e lookup_keccakf1600_theta_xor_33_counts, e lookup_keccakf1600_theta_xor_row_3_counts, e lookup_keccakf1600_theta_xor_41_counts, e lookup_keccakf1600_theta_xor_42_counts, e lookup_keccakf1600_theta_xor_43_counts, e lookup_keccakf1600_theta_xor_row_4_counts, e lookup_keccakf1600_theta_combined_xor_0_counts, e lookup_keccakf1600_theta_combined_xor_1_counts, e lookup_keccakf1600_theta_combined_xor_2_counts, e lookup_keccakf1600_theta_combined_xor_3_counts, e lookup_keccakf1600_theta_combined_xor_4_counts, e lookup_keccakf1600_state_theta_00_counts, e lookup_keccakf1600_state_theta_01_counts, e lookup_keccakf1600_state_theta_02_counts, e lookup_keccakf1600_state_theta_03_counts, e lookup_keccakf1600_state_theta_04_counts, e lookup_keccakf1600_state_theta_10_counts, e lookup_keccakf1600_state_theta_11_counts, e lookup_keccakf1600_state_theta_12_counts, e lookup_keccakf1600_state_theta_13_counts, e lookup_keccakf1600_state_theta_14_counts, e lookup_keccakf1600_state_theta_20_counts, e lookup_keccakf1600_state_theta_21_counts, e lookup_keccakf1600_state_theta_22_counts, e lookup_keccakf1600_state_theta_23_counts, e lookup_keccakf1600_state_theta_24_counts, e lookup_keccakf1600_state_theta_30_counts, e lookup_keccakf1600_state_theta_31_counts, e lookup_keccakf1600_state_theta_32_counts, e lookup_keccakf1600_state_theta_33_counts, e lookup_keccakf1600_state_theta_34_counts, e lookup_keccakf1600_state_theta_40_counts, e lookup_keccakf1600_state_theta_41_counts, e lookup_keccakf1600_state_theta_42_counts, e lookup_keccakf1600_state_theta_43_counts, e lookup_keccakf1600_state_theta_44_counts, e lookup_keccakf1600_theta_limb_02_range_counts, e lookup_keccakf1600_theta_limb_04_range_counts, e lookup_keccakf1600_theta_limb_10_range_counts, e lookup_keccakf1600_theta_limb_12_range_counts, e lookup_keccakf1600_theta_limb_14_range_counts, e lookup_keccakf1600_theta_limb_21_range_counts, e lookup_keccakf1600_theta_limb_23_range_counts, e lookup_keccakf1600_theta_limb_30_range_counts, e lookup_keccakf1600_theta_limb_32_range_counts, e lookup_keccakf1600_theta_limb_33_range_counts, e lookup_keccakf1600_theta_limb_40_range_counts, e lookup_keccakf1600_theta_limb_41_range_counts, e lookup_keccakf1600_theta_limb_43_range_counts, e lookup_keccakf1600_theta_limb_44_range_counts, e lookup_keccakf1600_theta_limb_01_range_counts, e lookup_keccakf1600_theta_limb_03_range_counts, e lookup_keccakf1600_theta_limb_11_range_counts, e lookup_keccakf1600_theta_limb_13_range_counts, e lookup_keccakf1600_theta_limb_20_range_counts, e lookup_keccakf1600_theta_limb_22_range_counts, e lookup_keccakf1600_theta_limb_24_range_counts, e lookup_keccakf1600_theta_limb_31_range_counts, e lookup_keccakf1600_theta_limb_34_range_counts, e lookup_keccakf1600_theta_limb_42_range_counts, e lookup_keccakf1600_state_pi_and_00_counts, e lookup_keccakf1600_state_pi_and_01_counts, e lookup_keccakf1600_state_pi_and_02_counts, e lookup_keccakf1600_state_pi_and_03_counts, e lookup_keccakf1600_state_pi_and_04_counts, e lookup_keccakf1600_state_pi_and_10_counts, e lookup_keccakf1600_state_pi_and_11_counts, e lookup_keccakf1600_state_pi_and_12_counts, e lookup_keccakf1600_state_pi_and_13_counts, e lookup_keccakf1600_state_pi_and_14_counts, e lookup_keccakf1600_state_pi_and_20_counts, e lookup_keccakf1600_state_pi_and_21_counts, e lookup_keccakf1600_state_pi_and_22_counts, e lookup_keccakf1600_state_pi_and_23_counts, e lookup_keccakf1600_state_pi_and_24_counts, e lookup_keccakf1600_state_pi_and_30_counts, e lookup_keccakf1600_state_pi_and_31_counts, e lookup_keccakf1600_state_pi_and_32_counts, e lookup_keccakf1600_state_pi_and_33_counts, e lookup_keccakf1600_state_pi_and_34_counts, e lookup_keccakf1600_state_pi_and_40_counts, e lookup_keccakf1600_state_pi_and_41_counts, e lookup_keccakf1600_state_pi_and_42_counts, e lookup_keccakf1600_state_pi_and_43_counts, e lookup_keccakf1600_state_pi_and_44_counts, e lookup_keccakf1600_state_chi_00_counts, e lookup_keccakf1600_state_chi_01_counts, e lookup_keccakf1600_state_chi_02_counts, e lookup_keccakf1600_state_chi_03_counts, e lookup_keccakf1600_state_chi_04_counts, e lookup_keccakf1600_state_chi_10_counts, e lookup_keccakf1600_state_chi_11_counts, e lookup_keccakf1600_state_chi_12_counts, e lookup_keccakf1600_state_chi_13_counts, e lookup_keccakf1600_state_chi_14_counts, e lookup_keccakf1600_state_chi_20_counts, e lookup_keccakf1600_state_chi_21_counts, e lookup_keccakf1600_state_chi_22_counts, e lookup_keccakf1600_state_chi_23_counts, e lookup_keccakf1600_state_chi_24_counts, e lookup_keccakf1600_state_chi_30_counts, e lookup_keccakf1600_state_chi_31_counts, e lookup_keccakf1600_state_chi_32_counts, e lookup_keccakf1600_state_chi_33_counts, e lookup_keccakf1600_state_chi_34_counts, e lookup_keccakf1600_state_chi_40_counts, e lookup_keccakf1600_state_chi_41_counts, e lookup_keccakf1600_state_chi_42_counts, e lookup_keccakf1600_state_chi_43_counts, e lookup_keccakf1600_state_chi_44_counts, e lookup_keccakf1600_round_cst_counts, e lookup_keccakf1600_state_iota_00_counts, e lookup_keccakf1600_src_out_of_range_toggle_counts, e lookup_keccakf1600_dst_out_of_range_toggle_counts, e lookup_poseidon2_mem_check_src_addr_in_range_counts, e lookup_poseidon2_mem_check_dst_addr_in_range_counts, e lookup_poseidon2_mem_input_output_poseidon2_perm_counts, e lookup_to_radix_limb_range_counts, e lookup_to_radix_limb_less_than_radix_range_counts, e lookup_to_radix_fetch_safe_limbs_counts, e lookup_to_radix_fetch_p_limb_counts, e lookup_to_radix_limb_p_diff_range_counts, e lookup_scalar_mul_to_radix_counts, e lookup_scalar_mul_double_counts, e lookup_scalar_mul_add_counts, e lookup_sha256_range_comp_w_lhs_counts, e lookup_sha256_range_comp_w_rhs_counts, e lookup_sha256_range_rhs_w_7_counts, e lookup_sha256_range_rhs_w_18_counts, e lookup_sha256_range_rhs_w_3_counts, e lookup_sha256_w_s_0_xor_0_counts, e lookup_sha256_w_s_0_xor_1_counts, e lookup_sha256_range_rhs_w_17_counts, e lookup_sha256_range_rhs_w_19_counts, e lookup_sha256_range_rhs_w_10_counts, e lookup_sha256_w_s_1_xor_0_counts, e lookup_sha256_w_s_1_xor_1_counts, e lookup_sha256_range_rhs_e_6_counts, e lookup_sha256_range_rhs_e_11_counts, e lookup_sha256_range_rhs_e_25_counts, e lookup_sha256_s_1_xor_0_counts, e lookup_sha256_s_1_xor_1_counts, e lookup_sha256_ch_and_0_counts, e lookup_sha256_ch_and_1_counts, e lookup_sha256_ch_xor_counts, e lookup_sha256_round_constant_counts, e lookup_sha256_range_rhs_a_2_counts, e lookup_sha256_range_rhs_a_13_counts, e lookup_sha256_range_rhs_a_22_counts, e lookup_sha256_s_0_xor_0_counts, e lookup_sha256_s_0_xor_1_counts, e lookup_sha256_maj_and_0_counts, e lookup_sha256_maj_and_1_counts, e lookup_sha256_maj_and_2_counts, e lookup_sha256_maj_xor_0_counts, e lookup_sha256_maj_xor_1_counts, e lookup_sha256_range_comp_next_a_lhs_counts, e lookup_sha256_range_comp_next_a_rhs_counts, e lookup_sha256_range_comp_next_e_lhs_counts, e lookup_sha256_range_comp_next_e_rhs_counts, e lookup_sha256_range_comp_a_rhs_counts, e lookup_sha256_range_comp_b_rhs_counts, e lookup_sha256_range_comp_c_rhs_counts, e lookup_sha256_range_comp_d_rhs_counts, e lookup_sha256_range_comp_e_rhs_counts, e lookup_sha256_range_comp_f_rhs_counts, e lookup_sha256_range_comp_g_rhs_counts, e lookup_sha256_range_comp_h_rhs_counts, e lookup_sha256_mem_check_state_addr_in_range_counts, e lookup_sha256_mem_check_input_addr_in_range_counts, e lookup_sha256_mem_check_output_addr_in_range_counts, e lookup_to_radix_mem_check_dst_addr_in_range_counts, e lookup_to_radix_mem_check_radix_lt_2_counts, e lookup_to_radix_mem_check_radix_gt_256_counts, e lookup_to_radix_mem_input_output_to_radix_counts, e lookup_poseidon2_hash_poseidon2_perm_counts, e lookup_address_derivation_salted_initialization_hash_poseidon2_0_counts, e lookup_address_derivation_salted_initialization_hash_poseidon2_1_counts, e lookup_address_derivation_partial_address_poseidon2_counts, e lookup_address_derivation_public_keys_hash_poseidon2_0_counts, e lookup_address_derivation_public_keys_hash_poseidon2_1_counts, e lookup_address_derivation_public_keys_hash_poseidon2_2_counts, e lookup_address_derivation_public_keys_hash_poseidon2_3_counts, e lookup_address_derivation_public_keys_hash_poseidon2_4_counts, e lookup_address_derivation_preaddress_poseidon2_counts, e lookup_address_derivation_preaddress_scalar_mul_counts, e lookup_address_derivation_address_ecadd_counts, e lookup_bc_decomposition_bytes_are_bytes_counts, e lookup_bc_hashing_poseidon2_hash_counts, e lookup_merkle_check_merkle_poseidon2_read_counts, e lookup_merkle_check_merkle_poseidon2_write_counts, e lookup_indexed_tree_check_silo_poseidon2_counts, e lookup_indexed_tree_check_low_leaf_value_validation_counts, e lookup_indexed_tree_check_low_leaf_next_value_validation_counts, e lookup_indexed_tree_check_low_leaf_poseidon2_counts, e lookup_indexed_tree_check_updated_low_leaf_poseidon2_counts, e lookup_indexed_tree_check_low_leaf_merkle_check_counts, e lookup_indexed_tree_check_new_leaf_poseidon2_counts, e lookup_indexed_tree_check_new_leaf_merkle_check_counts, e lookup_indexed_tree_check_write_value_to_public_inputs_counts, e lookup_public_data_squash_leaf_slot_increase_ff_gt_counts, e lookup_public_data_squash_clk_diff_range_lo_counts, e lookup_public_data_squash_clk_diff_range_hi_counts, e lookup_public_data_check_clk_diff_range_lo_counts, e lookup_public_data_check_clk_diff_range_hi_counts, e lookup_public_data_check_silo_poseidon2_counts, e lookup_public_data_check_low_leaf_slot_validation_counts, e lookup_public_data_check_low_leaf_next_slot_validation_counts, e lookup_public_data_check_low_leaf_poseidon2_0_counts, e lookup_public_data_check_low_leaf_poseidon2_1_counts, e lookup_public_data_check_updated_low_leaf_poseidon2_0_counts, e lookup_public_data_check_updated_low_leaf_poseidon2_1_counts, e lookup_public_data_check_low_leaf_merkle_check_counts, e lookup_public_data_check_new_leaf_poseidon2_0_counts, e lookup_public_data_check_new_leaf_poseidon2_1_counts, e lookup_public_data_check_new_leaf_merkle_check_counts, e lookup_public_data_check_write_public_data_to_public_inputs_counts, e lookup_public_data_check_write_writes_length_to_public_inputs_counts, e lookup_update_check_timestamp_from_public_inputs_counts, e lookup_update_check_delayed_public_mutable_slot_poseidon2_counts, e lookup_update_check_update_hash_public_data_read_counts, e lookup_update_check_update_hash_poseidon2_counts, e lookup_update_check_update_hi_metadata_range_counts, e lookup_update_check_update_lo_metadata_range_counts, e lookup_update_check_timestamp_is_lt_timestamp_of_change_counts, e lookup_contract_instance_retrieval_check_protocol_address_range_counts, e lookup_contract_instance_retrieval_read_derived_address_from_public_inputs_counts, e lookup_contract_instance_retrieval_deployment_nullifier_read_counts, e lookup_contract_instance_retrieval_address_derivation_counts, e lookup_contract_instance_retrieval_update_check_counts, e lookup_class_id_derivation_class_id_poseidon2_0_counts, e lookup_class_id_derivation_class_id_poseidon2_1_counts, e lookup_bc_retrieval_contract_instance_retrieval_counts, e lookup_bc_retrieval_class_id_derivation_counts, e lookup_bc_retrieval_is_new_class_check_counts, e lookup_bc_retrieval_retrieved_bytecodes_insertion_counts, e lookup_instr_fetching_pc_abs_diff_positive_counts, e lookup_instr_fetching_instr_abs_diff_positive_counts, e lookup_instr_fetching_tag_value_validation_counts, e lookup_instr_fetching_bytecode_size_from_bc_dec_counts, e lookup_instr_fetching_bytes_from_bc_dec_counts, e lookup_instr_fetching_wire_instruction_info_counts, e lookup_emit_public_log_check_memory_out_of_bounds_counts, e lookup_emit_public_log_check_log_fields_count_counts, e lookup_emit_public_log_write_data_to_public_inputs_counts, e lookup_get_contract_instance_precomputed_info_counts, e lookup_get_contract_instance_contract_instance_retrieval_counts, e lookup_l1_to_l2_message_tree_check_merkle_check_counts, e lookup_internal_call_unwind_call_stack_counts, e lookup_context_ctx_stack_rollback_counts, e lookup_context_ctx_stack_return_counts, e lookup_addressing_relative_overflow_result_0_counts, e lookup_addressing_relative_overflow_result_1_counts, e lookup_addressing_relative_overflow_result_2_counts, e lookup_addressing_relative_overflow_result_3_counts, e lookup_addressing_relative_overflow_result_4_counts, e lookup_addressing_relative_overflow_result_5_counts, e lookup_addressing_relative_overflow_result_6_counts, e lookup_gas_addressing_gas_read_counts, e lookup_gas_is_out_of_gas_l2_counts, e lookup_gas_is_out_of_gas_da_counts, e lookup_note_hash_tree_check_silo_poseidon2_counts, e lookup_note_hash_tree_check_read_first_nullifier_counts, e lookup_note_hash_tree_check_nonce_computation_poseidon2_counts, e lookup_note_hash_tree_check_unique_note_hash_poseidon2_counts, e lookup_note_hash_tree_check_merkle_check_counts, e lookup_note_hash_tree_check_write_note_hash_to_public_inputs_counts, e lookup_emit_notehash_notehash_tree_write_counts, e lookup_emit_nullifier_write_nullifier_counts, e lookup_external_call_is_l2_gas_left_gt_allocated_counts, e lookup_external_call_is_da_gas_left_gt_allocated_counts, e lookup_get_env_var_precomputed_info_counts, e lookup_get_env_var_read_from_public_inputs_col0_counts, e lookup_get_env_var_read_from_public_inputs_col1_counts, e lookup_l1_to_l2_message_exists_l1_to_l2_msg_leaf_index_in_range_counts, e lookup_l1_to_l2_message_exists_l1_to_l2_msg_read_counts, e lookup_notehash_exists_note_hash_leaf_index_in_range_counts, e lookup_notehash_exists_note_hash_read_counts, e lookup_nullifier_exists_nullifier_exists_check_counts, e lookup_send_l2_to_l1_msg_recipient_check_counts, e lookup_send_l2_to_l1_msg_write_l2_to_l1_msg_counts, e lookup_sload_storage_read_counts, e lookup_sstore_record_written_storage_slot_counts, e lookup_execution_bytecode_retrieval_result_counts, e lookup_execution_instruction_fetching_result_counts, e lookup_execution_instruction_fetching_body_counts, e lookup_execution_exec_spec_read_counts, e lookup_execution_dyn_l2_factor_bitwise_counts, e lookup_execution_check_radix_gt_256_counts, e lookup_execution_get_p_limbs_counts, e lookup_execution_get_max_limbs_counts, e lookup_execution_check_written_storage_slot_counts, e lookup_execution_dispatch_to_alu_counts, e lookup_execution_dispatch_to_bitwise_counts, e lookup_execution_dispatch_to_cast_counts, e lookup_execution_dispatch_to_set_counts, e lookup_calldata_hashing_get_calldata_field_0_counts, e lookup_calldata_hashing_get_calldata_field_1_counts, e lookup_calldata_hashing_get_calldata_field_2_counts, e lookup_calldata_hashing_poseidon2_hash_counts, e lookup_tx_context_public_inputs_note_hash_tree_counts, e lookup_tx_context_public_inputs_nullifier_tree_counts, e lookup_tx_context_public_inputs_public_data_tree_counts, e lookup_tx_context_public_inputs_l1_l2_tree_counts, e lookup_tx_context_public_inputs_gas_used_counts, e lookup_tx_context_public_inputs_read_gas_limit_counts, e lookup_tx_context_public_inputs_read_reverted_counts, e lookup_tx_context_restore_state_on_revert_counts, e lookup_tx_context_public_inputs_write_note_hash_count_counts, e lookup_tx_context_public_inputs_write_nullifier_count_counts, e lookup_tx_context_public_inputs_write_l2_to_l1_message_count_counts, e lookup_tx_context_public_inputs_write_public_log_count_counts, e lookup_tx_read_phase_spec_counts, e lookup_tx_read_phase_length_counts, e lookup_tx_read_public_call_request_phase_counts, e lookup_tx_read_tree_insert_value_counts, e lookup_tx_note_hash_append_counts, e lookup_tx_nullifier_append_counts, e lookup_tx_read_l2_l1_msg_counts, e lookup_tx_write_l2_l1_msg_counts, e lookup_tx_read_effective_fee_public_inputs_counts, e lookup_tx_read_fee_payer_public_inputs_counts, e lookup_tx_balance_slot_poseidon2_counts, e lookup_tx_balance_read_counts, e lookup_tx_balance_validation_counts, e lookup_tx_write_fee_public_inputs_counts, e bc_decomposition_bytes, e bc_decomposition_bytes_pc_plus_1, e bc_decomposition_bytes_pc_plus_10, e bc_decomposition_bytes_pc_plus_11, e bc_decomposition_bytes_pc_plus_12, e bc_decomposition_bytes_pc_plus_13, e bc_decomposition_bytes_pc_plus_14, e bc_decomposition_bytes_pc_plus_15, e bc_decomposition_bytes_pc_plus_16, e bc_decomposition_bytes_pc_plus_17, e bc_decomposition_bytes_pc_plus_18, e bc_decomposition_bytes_pc_plus_19, e bc_decomposition_bytes_pc_plus_2, e bc_decomposition_bytes_pc_plus_20, e bc_decomposition_bytes_pc_plus_21, e bc_decomposition_bytes_pc_plus_22, e bc_decomposition_bytes_pc_plus_23, e bc_decomposition_bytes_pc_plus_24, e bc_decomposition_bytes_pc_plus_25, e bc_decomposition_bytes_pc_plus_26, e bc_decomposition_bytes_pc_plus_27, e bc_decomposition_bytes_pc_plus_28, e bc_decomposition_bytes_pc_plus_29, e bc_decomposition_bytes_pc_plus_3, e bc_decomposition_bytes_pc_plus_30, e bc_decomposition_bytes_pc_plus_31, e bc_decomposition_bytes_pc_plus_32, e bc_decomposition_bytes_pc_plus_33, e bc_decomposition_bytes_pc_plus_34, e bc_decomposition_bytes_pc_plus_35, e bc_decomposition_bytes_pc_plus_4, e bc_decomposition_bytes_pc_plus_5, e bc_decomposition_bytes_pc_plus_6, e bc_decomposition_bytes_pc_plus_7, e bc_decomposition_bytes_pc_plus_8, e bc_decomposition_bytes_pc_plus_9, e bc_decomposition_bytes_remaining, e bc_decomposition_id, e bc_decomposition_next_packed_pc, e bc_decomposition_pc, e bc_decomposition_sel, e bc_decomposition_sel_windows_gt_remaining, e bc_decomposition_start, e bc_hashing_bytecode_id, e bc_hashing_padding, e bc_hashing_pc_index_1, e bc_hashing_rounds_rem, e bc_hashing_sel, e bc_hashing_sel_not_start, e bc_hashing_start, e bitwise_acc_ia, e bitwise_acc_ib, e bitwise_acc_ic, e bitwise_ctr, e bitwise_op_id, e bitwise_sel, e bitwise_start, e calldata_context_id, e calldata_hashing_calldata_size, e calldata_hashing_context_id, e calldata_hashing_index_0_, e calldata_hashing_output_hash, e calldata_hashing_rounds_rem, e calldata_hashing_sel, e calldata_hashing_start, e calldata_index, e calldata_sel, e data_copy_clk, e data_copy_copy_size, e data_copy_dst_addr, e data_copy_dst_context_id, e data_copy_padding, e data_copy_read_addr, e data_copy_reads_left, e data_copy_sel, e data_copy_sel_cd_copy, e data_copy_src_context_id, e data_copy_start, e emit_public_log_contract_address, e emit_public_log_correct_tag, e emit_public_log_error_out_of_bounds, e emit_public_log_error_tag_mismatch, e emit_public_log_execution_clk, e emit_public_log_is_write_contract_address, e emit_public_log_is_write_memory_value, e emit_public_log_log_address, e emit_public_log_public_inputs_index, e emit_public_log_remaining_rows, e emit_public_log_seen_wrong_tag, e emit_public_log_sel, e emit_public_log_sel_write_to_public_inputs, e emit_public_log_space_id, e emit_public_log_start, e execution_bytecode_id, e execution_clk, e execution_context_id, e execution_contract_address, e execution_da_gas_limit, e execution_discard, e execution_dying_context_id, e execution_enqueued_call_start, e execution_internal_call_id, e execution_internal_call_return_id, e execution_is_static, e execution_l1_l2_tree_root, e execution_l2_gas_limit, e execution_last_child_id, e execution_last_child_returndata_addr, e execution_last_child_returndata_size, e execution_last_child_success, e execution_msg_sender, e execution_next_context_id, e execution_next_internal_call_id, e execution_parent_calldata_addr, e execution_parent_calldata_size, e execution_parent_da_gas_limit, e execution_parent_da_gas_used, e execution_parent_id, e execution_parent_l2_gas_limit, e execution_parent_l2_gas_used, e execution_pc, e execution_prev_da_gas_used, e execution_prev_l2_gas_used, e execution_prev_note_hash_tree_root, e execution_prev_note_hash_tree_size, e execution_prev_nullifier_tree_root, e execution_prev_nullifier_tree_size, e execution_prev_num_l2_to_l1_messages, e execution_prev_num_note_hashes_emitted, e execution_prev_num_nullifiers_emitted, e execution_prev_num_public_log_fields, e execution_prev_public_data_tree_root, e execution_prev_public_data_tree_size, e execution_prev_retrieved_bytecodes_tree_root, e execution_prev_retrieved_bytecodes_tree_size, e execution_prev_written_public_data_slots_tree_root, e execution_prev_written_public_data_slots_tree_size, e execution_sel, e execution_sel_first_row_in_context, e execution_transaction_fee, e ff_gt_a_hi, e ff_gt_a_lo, e ff_gt_b_hi, e ff_gt_b_lo, e ff_gt_cmp_rng_ctr, e ff_gt_p_sub_a_hi, e ff_gt_p_sub_a_lo, e ff_gt_p_sub_b_hi, e ff_gt_p_sub_b_lo, e ff_gt_sel, e ff_gt_sel_dec, e ff_gt_sel_gt, e keccak_memory_addr, e keccak_memory_clk, e keccak_memory_ctr, e keccak_memory_rw, e keccak_memory_sel, e keccak_memory_space_id, e keccak_memory_start_read, e keccak_memory_start_write, e keccak_memory_tag_error, e keccak_memory_val_0_, e keccak_memory_val_10_, e keccak_memory_val_11_, e keccak_memory_val_12_, e keccak_memory_val_13_, e keccak_memory_val_14_, e keccak_memory_val_15_, e keccak_memory_val_16_, e keccak_memory_val_17_, e keccak_memory_val_18_, e keccak_memory_val_19_, e keccak_memory_val_1_, e keccak_memory_val_20_, e keccak_memory_val_21_, e keccak_memory_val_22_, e keccak_memory_val_23_, e keccak_memory_val_2_, e keccak_memory_val_3_, e keccak_memory_val_4_, e keccak_memory_val_5_, e keccak_memory_val_6_, e keccak_memory_val_7_, e keccak_memory_val_8_, e keccak_memory_val_9_, e keccakf1600_clk, e keccakf1600_dst_addr, e keccakf1600_round, e keccakf1600_sel, e keccakf1600_sel_no_error, e keccakf1600_space_id, e keccakf1600_start, e keccakf1600_state_in_00, e keccakf1600_state_in_01, e keccakf1600_state_in_02, e keccakf1600_state_in_03, e keccakf1600_state_in_04, e keccakf1600_state_in_10, e keccakf1600_state_in_11, e keccakf1600_state_in_12, e keccakf1600_state_in_13, e keccakf1600_state_in_14, e keccakf1600_state_in_20, e keccakf1600_state_in_21, e keccakf1600_state_in_22, e keccakf1600_state_in_23, e keccakf1600_state_in_24, e keccakf1600_state_in_30, e keccakf1600_state_in_31, e keccakf1600_state_in_32, e keccakf1600_state_in_33, e keccakf1600_state_in_34, e keccakf1600_state_in_40, e keccakf1600_state_in_41, e keccakf1600_state_in_42, e keccakf1600_state_in_43, e keccakf1600_state_in_44, e memory_address, e memory_clk, e memory_rw, e memory_sel, e memory_space_id, e memory_tag, e memory_value, e merkle_check_index, e merkle_check_merkle_hash_separator, e merkle_check_path_len, e merkle_check_read_node, e merkle_check_read_root, e merkle_check_sel, e merkle_check_start, e merkle_check_write, e merkle_check_write_node, e merkle_check_write_root, e poseidon2_hash_a_0, e poseidon2_hash_a_1, e poseidon2_hash_a_2, e poseidon2_hash_a_3, e poseidon2_hash_input_0, e poseidon2_hash_input_1, e poseidon2_hash_input_2, e poseidon2_hash_num_perm_rounds_rem, e poseidon2_hash_output, e poseidon2_hash_sel, e poseidon2_hash_start, e public_data_check_clk, e public_data_check_sel, e public_data_check_write_idx, e public_data_squash_clk, e public_data_squash_final_value, e public_data_squash_leaf_slot, e public_data_squash_sel, e public_data_squash_write_to_public_inputs, e scalar_mul_bit_idx, e scalar_mul_point_inf, e scalar_mul_point_x, e scalar_mul_point_y, e scalar_mul_res_inf, e scalar_mul_res_x, e scalar_mul_res_y, e scalar_mul_scalar, e scalar_mul_sel, e scalar_mul_start, e scalar_mul_temp_inf, e scalar_mul_temp_x, e scalar_mul_temp_y, e sha256_a, e sha256_b, e sha256_c, e sha256_d, e sha256_e, e sha256_execution_clk, e sha256_f, e sha256_g, e sha256_h, e sha256_helper_w0, e sha256_helper_w1, e sha256_helper_w10, e sha256_helper_w11, e sha256_helper_w12, e sha256_helper_w13, e sha256_helper_w14, e sha256_helper_w15, e sha256_helper_w2, e sha256_helper_w3, e sha256_helper_w4, e sha256_helper_w5, e sha256_helper_w6, e sha256_helper_w7, e sha256_helper_w8, e sha256_helper_w9, e sha256_init_a, e sha256_init_b, e sha256_init_c, e sha256_init_d, e sha256_init_e, e sha256_init_f, e sha256_init_g, e sha256_init_h, e sha256_input_addr, e sha256_input_rounds_rem, e sha256_output_addr, e sha256_rounds_remaining, e sha256_sel, e sha256_sel_invalid_input_tag_err, e sha256_space_id, e sha256_start, e to_radix_acc, e to_radix_acc_under_p, e to_radix_limb, e to_radix_limb_eq_p, e to_radix_limb_index, e to_radix_limb_lt_p, e to_radix_mem_dst_addr, e to_radix_mem_execution_clk, e to_radix_mem_is_output_bits, e to_radix_mem_num_limbs, e to_radix_mem_radix, e to_radix_mem_sel, e to_radix_mem_sel_should_decompose, e to_radix_mem_sel_should_write_mem, e to_radix_mem_space_id, e to_radix_mem_start, e to_radix_mem_value_to_decompose, e to_radix_not_padding_limb, e to_radix_power, e to_radix_radix, e to_radix_safe_limbs, e to_radix_sel, e to_radix_start, e to_radix_value, e tx_da_gas_limit, e tx_discard, e tx_fee, e tx_is_revertible, e tx_is_teardown, e tx_l1_l2_tree_root, e tx_l1_l2_tree_size, e tx_l2_gas_limit, e tx_next_context_id, e tx_phase_value, e tx_prev_da_gas_used, e tx_prev_l2_gas_used, e tx_prev_note_hash_tree_root, e tx_prev_note_hash_tree_size, e tx_prev_nullifier_tree_root, e tx_prev_nullifier_tree_size, e tx_prev_num_l2_to_l1_messages, e tx_prev_num_note_hashes_emitted, e tx_prev_num_nullifiers_emitted, e tx_prev_num_public_log_fields, e tx_prev_public_data_tree_root, e tx_prev_public_data_tree_size, e tx_prev_retrieved_bytecodes_tree_root, e tx_prev_retrieved_bytecodes_tree_size, e tx_prev_written_public_data_slots_tree_root, e tx_prev_written_public_data_slots_tree_size, e tx_read_pi_offset, e tx_remaining_phase_counter, e tx_reverted, e tx_sel, e tx_start_phase, e tx_start_tx, e tx_tx_reverted
+#define AVM2_PRECOMPUTED_ENTITIES_E(e) e precomputed_addressing_gas, e precomputed_bitwise_input_a, e precomputed_bitwise_input_b, e precomputed_bitwise_output_and, e precomputed_bitwise_output_or, e precomputed_bitwise_output_xor, e precomputed_dyn_gas_id, e precomputed_envvar_pi_row_idx, e precomputed_exec_opcode, e precomputed_exec_opcode_base_da_gas, e precomputed_exec_opcode_dynamic_da_gas, e precomputed_exec_opcode_dynamic_l2_gas, e precomputed_exec_opcode_opcode_gas, e precomputed_expected_tag_reg_0_, e precomputed_expected_tag_reg_1_, e precomputed_expected_tag_reg_2_, e precomputed_expected_tag_reg_3_, e precomputed_expected_tag_reg_4_, e precomputed_expected_tag_reg_5_, e precomputed_first_row, e precomputed_idx, e precomputed_instr_size, e precomputed_invalid_envvar_enum, e precomputed_is_address, e precomputed_is_class_id, e precomputed_is_cleanup, e precomputed_is_collect_fee, e precomputed_is_dagasleft, e precomputed_is_deployer, e precomputed_is_init_hash, e precomputed_is_isstaticcall, e precomputed_is_l2gasleft, e precomputed_is_public_call_request, e precomputed_is_revertible, e precomputed_is_sender, e precomputed_is_teardown, e precomputed_is_transactionfee, e precomputed_is_tree_padding, e precomputed_is_valid_member_enum, e precomputed_keccak_round_constant, e precomputed_next_phase_on_revert, e precomputed_opcode_out_of_range, e precomputed_out_tag, e precomputed_p_decomposition_limb, e precomputed_p_decomposition_limb_index, e precomputed_p_decomposition_radix, e precomputed_power_of_2, e precomputed_read_pi_length_offset, e precomputed_read_pi_start_offset, e precomputed_rw_reg_0_, e precomputed_rw_reg_1_, e precomputed_rw_reg_2_, e precomputed_rw_reg_3_, e precomputed_rw_reg_4_, e precomputed_rw_reg_5_, e precomputed_sel_addressing_gas, e precomputed_sel_append_l2_l1_msg, e precomputed_sel_append_note_hash, e precomputed_sel_append_nullifier, e precomputed_sel_envvar_pi_lookup_col0, e precomputed_sel_envvar_pi_lookup_col1, e precomputed_sel_exec_spec, e precomputed_sel_has_tag, e precomputed_sel_keccak, e precomputed_sel_mem_op_reg_0_, e precomputed_sel_mem_op_reg_1_, e precomputed_sel_mem_op_reg_2_, e precomputed_sel_mem_op_reg_3_, e precomputed_sel_mem_op_reg_4_, e precomputed_sel_mem_op_reg_5_, e precomputed_sel_mem_tag_out_of_range, e precomputed_sel_op_dc_0, e precomputed_sel_op_dc_1, e precomputed_sel_op_dc_10, e precomputed_sel_op_dc_11, e precomputed_sel_op_dc_12, e precomputed_sel_op_dc_13, e precomputed_sel_op_dc_14, e precomputed_sel_op_dc_15, e precomputed_sel_op_dc_16, e precomputed_sel_op_dc_2, e precomputed_sel_op_dc_3, e precomputed_sel_op_dc_4, e precomputed_sel_op_dc_5, e precomputed_sel_op_dc_6, e precomputed_sel_op_dc_7, e precomputed_sel_op_dc_8, e precomputed_sel_op_dc_9, e precomputed_sel_op_is_address_0_, e precomputed_sel_op_is_address_1_, e precomputed_sel_op_is_address_2_, e precomputed_sel_op_is_address_3_, e precomputed_sel_op_is_address_4_, e precomputed_sel_op_is_address_5_, e precomputed_sel_op_is_address_6_, e precomputed_sel_p_decomposition, e precomputed_sel_phase, e precomputed_sel_range_16, e precomputed_sel_range_8, e precomputed_sel_sha256_compression, e precomputed_sel_tag_check_reg_0_, e precomputed_sel_tag_check_reg_1_, e precomputed_sel_tag_check_reg_2_, e precomputed_sel_tag_check_reg_3_, e precomputed_sel_tag_check_reg_4_, e precomputed_sel_tag_check_reg_5_, e precomputed_sel_tag_is_op2, e precomputed_sel_tag_parameters, e precomputed_sel_to_radix_p_limb_counts, e precomputed_sha256_compression_round_constant, e precomputed_subtrace_id, e precomputed_subtrace_operation_id, e precomputed_tag_byte_length, e precomputed_tag_max_bits, e precomputed_tag_max_value, e precomputed_to_radix_num_limbs_for_p, e precomputed_to_radix_safe_limbs, e precomputed_zero, e public_inputs_sel
+#define AVM2_WIRE_ENTITIES_E(e) e public_inputs_cols_0_, e public_inputs_cols_1_, e public_inputs_cols_2_, e public_inputs_cols_3_, e address_derivation_address, e address_derivation_address_y, e address_derivation_class_id, e address_derivation_const_four, e address_derivation_const_thirteen, e address_derivation_const_three, e address_derivation_const_two, e address_derivation_deployer_addr, e address_derivation_g1_x, e address_derivation_g1_y, e address_derivation_incoming_viewing_key_x, e address_derivation_incoming_viewing_key_y, e address_derivation_init_hash, e address_derivation_nullifier_key_x, e address_derivation_nullifier_key_y, e address_derivation_outgoing_viewing_key_x, e address_derivation_outgoing_viewing_key_y, e address_derivation_partial_address, e address_derivation_partial_address_domain_separator, e address_derivation_preaddress, e address_derivation_preaddress_domain_separator, e address_derivation_preaddress_public_key_x, e address_derivation_preaddress_public_key_y, e address_derivation_public_keys_hash, e address_derivation_public_keys_hash_domain_separator, e address_derivation_salt, e address_derivation_salted_init_hash, e address_derivation_salted_init_hash_domain_separator, e address_derivation_sel, e address_derivation_tagging_key_x, e address_derivation_tagging_key_y, e alu_a_hi, e alu_a_hi_bits, e alu_a_lo, e alu_a_lo_bits, e alu_ab_diff_inv, e alu_ab_tags_diff_inv, e alu_b_hi, e alu_b_inv, e alu_b_lo, e alu_c_hi, e alu_cf, e alu_constant_64, e alu_gt_input_a, e alu_gt_input_b, e alu_gt_result_c, e alu_helper1, e alu_ia, e alu_ia_tag, e alu_ib, e alu_ib_tag, e alu_ic, e alu_ic_tag, e alu_max_bits, e alu_max_value, e alu_mid, e alu_mid_bits, e alu_op_id, e alu_sel, e alu_sel_ab_tag_mismatch, e alu_sel_decompose_a, e alu_sel_div_0_err, e alu_sel_div_no_err, e alu_sel_err, e alu_sel_ff_gt, e alu_sel_int_gt, e alu_sel_is_ff, e alu_sel_is_u128, e alu_sel_mul_div_u128, e alu_sel_mul_no_err_non_ff, e alu_sel_op_add, e alu_sel_op_div, e alu_sel_op_eq, e alu_sel_op_fdiv, e alu_sel_op_lt, e alu_sel_op_lte, e alu_sel_op_mul, e alu_sel_op_not, e alu_sel_op_shl, e alu_sel_op_shr, e alu_sel_op_sub, e alu_sel_op_truncate, e alu_sel_shift_ops_no_overflow, e alu_sel_tag_err, e alu_sel_trunc_gte_128, e alu_sel_trunc_lt_128, e alu_sel_trunc_non_trivial, e alu_sel_trunc_trivial, e alu_shift_lo_bits, e alu_tag_ff_diff_inv, e alu_tag_u128_diff_inv, e alu_two_pow_shift_lo_bits, e bc_decomposition_bytes_pc_plus_36, e bc_decomposition_bytes_rem_inv, e bc_decomposition_bytes_rem_min_one_inv, e bc_decomposition_bytes_to_read, e bc_decomposition_last_of_contract, e bc_decomposition_next_packed_pc_min_pc_inv, e bc_decomposition_packed_field, e bc_decomposition_sel_packed, e bc_decomposition_sel_packed_read_0_, e bc_decomposition_sel_packed_read_1_, e bc_decomposition_sel_packed_read_2_, e bc_decomposition_sel_windows_eq_remaining, e bc_decomposition_windows_min_remaining_inv, e bc_hashing_end, e bc_hashing_input_len, e bc_hashing_packed_fields_0, e bc_hashing_packed_fields_1, e bc_hashing_packed_fields_2, e bc_hashing_pc_index, e bc_hashing_pc_index_2, e bc_hashing_sel_not_padding_1, e bc_hashing_sel_not_padding_2, e bc_hashing_size_in_bytes, e bc_retrieval_address, e bc_retrieval_artifact_hash, e bc_retrieval_bytecode_id, e bc_retrieval_current_class_id, e bc_retrieval_error, e bc_retrieval_instance_exists, e bc_retrieval_is_new_class, e bc_retrieval_next_retrieved_bytecodes_tree_root, e bc_retrieval_next_retrieved_bytecodes_tree_size, e bc_retrieval_no_remaining_bytecodes, e bc_retrieval_nullifier_tree_root, e bc_retrieval_prev_retrieved_bytecodes_tree_root, e bc_retrieval_prev_retrieved_bytecodes_tree_size, e bc_retrieval_private_functions_root, e bc_retrieval_public_data_tree_root, e bc_retrieval_remaining_bytecodes_inv, e bc_retrieval_retrieved_bytecodes_merkle_separator, e bc_retrieval_retrieved_bytecodes_tree_height, e bc_retrieval_sel, e bc_retrieval_should_retrieve, e bitwise_ctr_min_one_inv, e bitwise_end, e bitwise_err, e bitwise_ia_byte, e bitwise_ib_byte, e bitwise_ic_byte, e bitwise_output_and, e bitwise_output_or, e bitwise_output_xor, e bitwise_sel_and, e bitwise_sel_compute, e bitwise_sel_get_ctr, e bitwise_sel_or, e bitwise_sel_tag_ff_err, e bitwise_sel_tag_mismatch_err, e bitwise_sel_xor, e bitwise_start_keccak, e bitwise_start_sha256, e bitwise_tag_a, e bitwise_tag_a_inv, e bitwise_tag_ab_diff_inv, e bitwise_tag_b, e bitwise_tag_c, e calldata_end, e calldata_hashing_end, e calldata_hashing_index_1_, e calldata_hashing_index_2_, e calldata_hashing_input_0_, e calldata_hashing_input_1_, e calldata_hashing_input_2_, e calldata_hashing_input_len, e calldata_hashing_sel_end_not_empty, e calldata_hashing_sel_not_padding_1, e calldata_hashing_sel_not_padding_2, e calldata_hashing_sel_not_start, e calldata_value, e class_id_derivation_artifact_hash, e class_id_derivation_class_id, e class_id_derivation_const_four, e class_id_derivation_gen_index_contract_class_id, e class_id_derivation_private_functions_root, e class_id_derivation_public_bytecode_commitment, e class_id_derivation_sel, e context_stack_bytecode_id, e context_stack_context_id, e context_stack_contract_address, e context_stack_entered_context_id, e context_stack_internal_call_id, e context_stack_internal_call_return_id, e context_stack_is_static, e context_stack_msg_sender, e context_stack_next_internal_call_id, e context_stack_next_pc, e context_stack_note_hash_tree_root, e context_stack_note_hash_tree_size, e context_stack_nullifier_tree_root, e context_stack_nullifier_tree_size, e context_stack_num_l2_to_l1_messages, e context_stack_num_note_hashes_emitted, e context_stack_num_nullifiers_emitted, e context_stack_num_public_log_fields, e context_stack_parent_calldata_addr, e context_stack_parent_calldata_size, e context_stack_parent_da_gas_limit, e context_stack_parent_da_gas_used, e context_stack_parent_id, e context_stack_parent_l2_gas_limit, e context_stack_parent_l2_gas_used, e context_stack_public_data_tree_root, e context_stack_public_data_tree_size, e context_stack_sel, e context_stack_written_public_data_slots_tree_root, e context_stack_written_public_data_slots_tree_size, e contract_instance_retrieval_address, e contract_instance_retrieval_address_sub_one, e contract_instance_retrieval_current_class_id, e contract_instance_retrieval_deployer_addr, e contract_instance_retrieval_deployer_protocol_contract_address, e contract_instance_retrieval_derived_address, e contract_instance_retrieval_derived_address_pi_index, e contract_instance_retrieval_exists, e contract_instance_retrieval_incoming_viewing_key_x, e contract_instance_retrieval_incoming_viewing_key_y, e contract_instance_retrieval_init_hash, e contract_instance_retrieval_is_protocol_contract, e contract_instance_retrieval_max_protocol_contracts, e contract_instance_retrieval_nullifier_key_x, e contract_instance_retrieval_nullifier_key_y, e contract_instance_retrieval_nullifier_merkle_separator, e contract_instance_retrieval_nullifier_tree_height, e contract_instance_retrieval_nullifier_tree_root, e contract_instance_retrieval_original_class_id, e contract_instance_retrieval_outgoing_viewing_key_x, e contract_instance_retrieval_outgoing_viewing_key_y, e contract_instance_retrieval_protocol_contract_derived_address_inv, e contract_instance_retrieval_public_data_tree_root, e contract_instance_retrieval_salt, e contract_instance_retrieval_sel, e contract_instance_retrieval_should_check_for_update, e contract_instance_retrieval_should_check_nullifier, e contract_instance_retrieval_siloing_separator, e contract_instance_retrieval_tagging_key_x, e contract_instance_retrieval_tagging_key_y, e data_copy_cd_copy_col_read, e data_copy_clamped_read_index_upper_bound, e data_copy_dst_out_of_range_err, e data_copy_end, e data_copy_is_top_level, e data_copy_mem_size, e data_copy_offset, e data_copy_offset_plus_size, e data_copy_offset_plus_size_is_gt, e data_copy_parent_id_inv, e data_copy_read_addr_plus_one, e data_copy_read_addr_upper_bound, e data_copy_reads_left_inv, e data_copy_sel_cd_copy_start, e data_copy_sel_has_reads, e data_copy_sel_mem_read, e data_copy_sel_mem_write, e data_copy_sel_rd_copy_start, e data_copy_sel_write_count_is_zero, e data_copy_src_addr, e data_copy_src_data_size, e data_copy_src_reads_exceed_mem, e data_copy_start_no_err, e data_copy_tag, e data_copy_value, e data_copy_write_addr_upper_bound, e data_copy_write_count_minus_one_inv, e data_copy_write_count_zero_inv, e ecc_add_mem_dst_addr_0_, e ecc_add_mem_dst_addr_1_, e ecc_add_mem_dst_addr_2_, e ecc_add_mem_err, e ecc_add_mem_execution_clk, e ecc_add_mem_max_mem_addr, e ecc_add_mem_p_is_inf, e ecc_add_mem_p_is_on_curve_eqn, e ecc_add_mem_p_is_on_curve_eqn_inv, e ecc_add_mem_p_x, e ecc_add_mem_p_x_n, e ecc_add_mem_p_y, e ecc_add_mem_p_y_n, e ecc_add_mem_q_is_inf, e ecc_add_mem_q_is_on_curve_eqn, e ecc_add_mem_q_is_on_curve_eqn_inv, e ecc_add_mem_q_x, e ecc_add_mem_q_x_n, e ecc_add_mem_q_y, e ecc_add_mem_q_y_n, e ecc_add_mem_res_is_inf, e ecc_add_mem_res_x, e ecc_add_mem_res_y, e ecc_add_mem_sel, e ecc_add_mem_sel_dst_out_of_range_err, e ecc_add_mem_sel_p_not_on_curve_err, e ecc_add_mem_sel_q_not_on_curve_err, e ecc_add_mem_sel_should_exec, e ecc_add_mem_space_id, e ecc_add_op, e ecc_double_op, e ecc_inv_2_p_y, e ecc_inv_x_diff, e ecc_inv_y_diff, e ecc_lambda, e ecc_p_is_inf, e ecc_p_x, e ecc_p_y, e ecc_q_is_inf, e ecc_q_x, e ecc_q_y, e ecc_r_is_inf, e ecc_r_x, e ecc_r_y, e ecc_result_infinity, e ecc_sel, e ecc_use_computed_result, e ecc_x_match, e ecc_y_match, e emit_public_log_discard, e emit_public_log_end, e emit_public_log_end_log_address_upper_bound, e emit_public_log_error, e emit_public_log_error_too_many_log_fields, e emit_public_log_expected_next_log_fields, e emit_public_log_is_static, e emit_public_log_log_size, e emit_public_log_max_mem_size, e emit_public_log_max_public_logs_payload_length, e emit_public_log_next_num_public_log_fields, e emit_public_log_prev_num_public_log_fields, e emit_public_log_public_inputs_value, e emit_public_log_remaining_rows_inv, e emit_public_log_sel_read_memory, e emit_public_log_tag, e emit_public_log_tag_inv, e emit_public_log_value, e execution_addressing_error_collection_inv, e execution_addressing_gas, e execution_addressing_mode, e execution_base_address_tag, e execution_base_address_tag_diff_inv, e execution_base_address_val, e execution_base_da_gas, e execution_batched_tags_diff_inv, e execution_batched_tags_diff_inv_reg, e execution_da_gas_left, e execution_da_gas_used, e execution_dying_context_diff_inv, e execution_dying_context_id_inv, e execution_dyn_gas_id, e execution_dynamic_da_gas, e execution_dynamic_da_gas_factor, e execution_dynamic_l2_gas, e execution_dynamic_l2_gas_factor, e execution_enqueued_call_end, e execution_envvar_pi_row_idx, e execution_exec_opcode, e execution_expected_tag_reg_0_, e execution_expected_tag_reg_1_, e execution_expected_tag_reg_2_, e execution_expected_tag_reg_3_, e execution_expected_tag_reg_4_, e execution_expected_tag_reg_5_, e execution_has_parent_ctx, e execution_highest_address, e execution_instr_size, e execution_internal_call_return_id_inv, e execution_is_address, e execution_is_da_gas_left_gt_allocated, e execution_is_dagasleft, e execution_is_dying_context, e execution_is_isstaticcall, e execution_is_l2_gas_left_gt_allocated, e execution_is_l2gasleft, e execution_is_parent_id_inv, e execution_is_sender, e execution_is_transactionfee, e execution_l1_to_l2_msg_leaf_in_range, e execution_l1_to_l2_msg_tree_leaf_count, e execution_l2_gas_left, e execution_l2_gas_used, e execution_max_data_writes_reached, e execution_max_eth_address_value, e execution_mem_tag_reg_0_, e execution_mem_tag_reg_1_, e execution_mem_tag_reg_2_, e execution_mem_tag_reg_3_, e execution_mem_tag_reg_4_, e execution_mem_tag_reg_5_, e execution_nested_failure, e execution_nested_return, e execution_next_pc, e execution_note_hash_leaf_in_range, e execution_note_hash_tree_leaf_count, e execution_note_hash_tree_root, e execution_note_hash_tree_size, e execution_nullifier_merkle_separator, e execution_nullifier_pi_offset, e execution_nullifier_siloing_separator, e execution_nullifier_tree_height, e execution_nullifier_tree_root, e execution_nullifier_tree_size, e execution_num_l2_to_l1_messages, e execution_num_note_hashes_emitted, e execution_num_nullifiers_emitted, e execution_num_p_limbs, e execution_num_public_log_fields, e execution_num_relative_operands_inv, e execution_op_0_, e execution_op_1_, e execution_op_2_, e execution_op_3_, e execution_op_4_, e execution_op_5_, e execution_op_6_, e execution_op_after_relative_0_, e execution_op_after_relative_1_, e execution_op_after_relative_2_, e execution_op_after_relative_3_, e execution_op_after_relative_4_, e execution_op_after_relative_5_, e execution_op_after_relative_6_, e execution_opcode_gas, e execution_out_of_gas_da, e execution_out_of_gas_l2, e execution_public_data_tree_root, e execution_public_data_tree_size, e execution_public_inputs_index, e execution_register_0_, e execution_register_1_, e execution_register_2_, e execution_register_3_, e execution_register_4_, e execution_register_5_, e execution_remaining_data_writes_inv, e execution_remaining_l2_to_l1_msgs_inv, e execution_remaining_note_hashes_inv, e execution_remaining_nullifiers_inv, e execution_retrieved_bytecodes_tree_root, e execution_retrieved_bytecodes_tree_size, e execution_rop_0_, e execution_rop_1_, e execution_rop_2_, e execution_rop_3_, e execution_rop_4_, e execution_rop_5_, e execution_rop_6_, e execution_rop_tag_0_, e execution_rop_tag_1_, e execution_rop_tag_2_, e execution_rop_tag_3_, e execution_rop_tag_4_, e execution_rop_tag_5_, e execution_rop_tag_6_, e execution_rw_reg_0_, e execution_rw_reg_1_, e execution_rw_reg_2_, e execution_rw_reg_3_, e execution_rw_reg_4_, e execution_rw_reg_5_, e execution_sel_addressing_error, e execution_sel_apply_indirection_0_, e execution_sel_apply_indirection_1_, e execution_sel_apply_indirection_2_, e execution_sel_apply_indirection_3_, e execution_sel_apply_indirection_4_, e execution_sel_apply_indirection_5_, e execution_sel_apply_indirection_6_, e execution_sel_base_address_failure, e execution_sel_bytecode_retrieval_failure, e execution_sel_bytecode_retrieval_success, e execution_sel_check_gas, e execution_sel_do_base_check, e execution_sel_enter_call, e execution_sel_envvar_pi_lookup_col0, e execution_sel_envvar_pi_lookup_col1, e execution_sel_error, e execution_sel_exec_dispatch_alu, e execution_sel_exec_dispatch_bitwise, e execution_sel_exec_dispatch_calldata_copy, e execution_sel_exec_dispatch_cast, e execution_sel_exec_dispatch_ecc_add, e execution_sel_exec_dispatch_emit_public_log, e execution_sel_exec_dispatch_execution, e execution_sel_exec_dispatch_get_contract_instance, e execution_sel_exec_dispatch_keccakf1600, e execution_sel_exec_dispatch_poseidon2_perm, e execution_sel_exec_dispatch_returndata_copy, e execution_sel_exec_dispatch_set, e execution_sel_exec_dispatch_sha256_compression, e execution_sel_exec_dispatch_to_radix, e execution_sel_execute_call, e execution_sel_execute_debug_log, e execution_sel_execute_emit_notehash, e execution_sel_execute_emit_nullifier, e execution_sel_execute_get_env_var, e execution_sel_execute_internal_call, e execution_sel_execute_internal_return, e execution_sel_execute_jump, e execution_sel_execute_jumpi, e execution_sel_execute_l1_to_l2_message_exists, e execution_sel_execute_mov, e execution_sel_execute_notehash_exists, e execution_sel_execute_nullifier_exists, e execution_sel_execute_opcode, e execution_sel_execute_return, e execution_sel_execute_returndata_size, e execution_sel_execute_revert, e execution_sel_execute_send_l2_to_l1_msg, e execution_sel_execute_sload, e execution_sel_execute_sstore, e execution_sel_execute_static_call, e execution_sel_execute_success_copy, e execution_sel_exit_call, e execution_sel_failure, e execution_sel_gas_bitwise, e execution_sel_gas_calldata_copy, e execution_sel_gas_emit_public_log, e execution_sel_gas_returndata_copy, e execution_sel_gas_sstore, e execution_sel_gas_to_radix, e execution_sel_instruction_fetching_failure, e execution_sel_instruction_fetching_success, e execution_sel_l2_to_l1_msg_limit_error, e execution_sel_lookup_num_p_limbs, e execution_sel_mem_op_reg_0_, e execution_sel_mem_op_reg_1_, e execution_sel_mem_op_reg_2_, e execution_sel_mem_op_reg_3_, e execution_sel_mem_op_reg_4_, e execution_sel_mem_op_reg_5_, e execution_sel_op_do_overflow_check_0_, e execution_sel_op_do_overflow_check_1_, e execution_sel_op_do_overflow_check_2_, e execution_sel_op_do_overflow_check_3_, e execution_sel_op_do_overflow_check_4_, e execution_sel_op_do_overflow_check_5_, e execution_sel_op_do_overflow_check_6_, e execution_sel_op_is_address_0_, e execution_sel_op_is_address_1_, e execution_sel_op_is_address_2_, e execution_sel_op_is_address_3_, e execution_sel_op_is_address_4_, e execution_sel_op_is_address_5_, e execution_sel_op_is_address_6_, e execution_sel_op_is_indirect_wire_0_, e execution_sel_op_is_indirect_wire_1_, e execution_sel_op_is_indirect_wire_2_, e execution_sel_op_is_indirect_wire_3_, e execution_sel_op_is_indirect_wire_4_, e execution_sel_op_is_indirect_wire_5_, e execution_sel_op_is_indirect_wire_6_, e execution_sel_op_is_indirect_wire_7_, e execution_sel_op_is_relative_wire_0_, e execution_sel_op_is_relative_wire_1_, e execution_sel_op_is_relative_wire_2_, e execution_sel_op_is_relative_wire_3_, e execution_sel_op_is_relative_wire_4_, e execution_sel_op_is_relative_wire_5_, e execution_sel_op_is_relative_wire_6_, e execution_sel_op_is_relative_wire_7_, e execution_sel_op_reg_effective_0_, e execution_sel_op_reg_effective_1_, e execution_sel_op_reg_effective_2_, e execution_sel_op_reg_effective_3_, e execution_sel_op_reg_effective_4_, e execution_sel_op_reg_effective_5_, e execution_sel_opcode_error, e execution_sel_out_of_gas, e execution_sel_radix_gt_256, e execution_sel_reached_max_note_hashes, e execution_sel_reached_max_nullifiers, e execution_sel_read_registers, e execution_sel_read_unwind_call_stack, e execution_sel_register_read_error, e execution_sel_relative_overflow_0_, e execution_sel_relative_overflow_1_, e execution_sel_relative_overflow_2_, e execution_sel_relative_overflow_3_, e execution_sel_relative_overflow_4_, e execution_sel_relative_overflow_5_, e execution_sel_relative_overflow_6_, e execution_sel_some_final_check_failed, e execution_sel_tag_check_reg_0_, e execution_sel_tag_check_reg_1_, e execution_sel_tag_check_reg_2_, e execution_sel_tag_check_reg_3_, e execution_sel_tag_check_reg_4_, e execution_sel_tag_check_reg_5_, e execution_sel_too_large_recipient_error, e execution_sel_use_num_limbs, e execution_sel_write_l2_to_l1_msg, e execution_sel_write_note_hash, e execution_sel_write_nullifier, e execution_sel_write_public_data, e execution_sel_write_registers, e execution_subtrace_id, e execution_subtrace_operation_id, e execution_total_gas_da, e execution_total_gas_l2, e execution_two_five_six, e execution_value_from_pi, e execution_written_public_data_slots_tree_root, e execution_written_public_data_slots_tree_size, e execution_written_slots_merkle_separator, e execution_written_slots_tree_height, e execution_written_slots_tree_siloing_separator, e ff_gt_a, e ff_gt_b, e ff_gt_borrow, e ff_gt_constant_128, e ff_gt_end, e ff_gt_p_a_borrow, e ff_gt_p_b_borrow, e ff_gt_res_hi, e ff_gt_res_lo, e ff_gt_result, e get_contract_instance_clk, e get_contract_instance_contract_address, e get_contract_instance_dst_offset, e get_contract_instance_dst_offset_diff_max_inv, e get_contract_instance_exists_tag, e get_contract_instance_instance_exists, e get_contract_instance_is_class_id, e get_contract_instance_is_deployer, e get_contract_instance_is_init_hash, e get_contract_instance_is_valid_member_enum, e get_contract_instance_is_valid_writes_in_bounds, e get_contract_instance_member_enum, e get_contract_instance_member_tag, e get_contract_instance_member_write_offset, e get_contract_instance_nullifier_tree_root, e get_contract_instance_public_data_tree_root, e get_contract_instance_retrieved_class_id, e get_contract_instance_retrieved_deployer_addr, e get_contract_instance_retrieved_init_hash, e get_contract_instance_sel, e get_contract_instance_sel_error, e get_contract_instance_selected_member, e get_contract_instance_space_id, e gt_abs_diff, e gt_input_a, e gt_input_b, e gt_num_bits, e gt_res, e gt_sel, e gt_sel_addressing, e gt_sel_alu, e gt_sel_gas, e gt_sel_others, e gt_sel_sha256, e indexed_tree_check_address, e indexed_tree_check_const_three, e indexed_tree_check_discard, e indexed_tree_check_exists, e indexed_tree_check_intermediate_root, e indexed_tree_check_low_leaf_hash, e indexed_tree_check_low_leaf_index, e indexed_tree_check_low_leaf_next_index, e indexed_tree_check_low_leaf_next_value, e indexed_tree_check_low_leaf_value, e indexed_tree_check_merkle_hash_separator, e indexed_tree_check_new_leaf_hash, e indexed_tree_check_next_value_inv, e indexed_tree_check_next_value_is_nonzero, e indexed_tree_check_not_exists, e indexed_tree_check_public_inputs_index, e indexed_tree_check_root, e indexed_tree_check_sel, e indexed_tree_check_sel_insert, e indexed_tree_check_sel_silo, e indexed_tree_check_sel_write_to_public_inputs, e indexed_tree_check_siloed_value, e indexed_tree_check_siloing_separator, e indexed_tree_check_tree_height, e indexed_tree_check_tree_size_after_write, e indexed_tree_check_tree_size_before_write, e indexed_tree_check_updated_low_leaf_hash, e indexed_tree_check_updated_low_leaf_next_index, e indexed_tree_check_updated_low_leaf_next_value, e indexed_tree_check_value, e indexed_tree_check_value_low_leaf_value_diff_inv, e indexed_tree_check_write, e indexed_tree_check_write_root, e instr_fetching_addressing_mode, e instr_fetching_bd0, e instr_fetching_bd1, e instr_fetching_bd10, e instr_fetching_bd11, e instr_fetching_bd12, e instr_fetching_bd13, e instr_fetching_bd14, e instr_fetching_bd15, e instr_fetching_bd16, e instr_fetching_bd17, e instr_fetching_bd18, e instr_fetching_bd19, e instr_fetching_bd2, e instr_fetching_bd20, e instr_fetching_bd21, e instr_fetching_bd22, e instr_fetching_bd23, e instr_fetching_bd24, e instr_fetching_bd25, e instr_fetching_bd26, e instr_fetching_bd27, e instr_fetching_bd28, e instr_fetching_bd29, e instr_fetching_bd3, e instr_fetching_bd30, e instr_fetching_bd31, e instr_fetching_bd32, e instr_fetching_bd33, e instr_fetching_bd34, e instr_fetching_bd35, e instr_fetching_bd36, e instr_fetching_bd4, e instr_fetching_bd5, e instr_fetching_bd6, e instr_fetching_bd7, e instr_fetching_bd8, e instr_fetching_bd9, e instr_fetching_bytecode_id, e instr_fetching_bytecode_size, e instr_fetching_bytes_to_read, e instr_fetching_exec_opcode, e instr_fetching_instr_abs_diff, e instr_fetching_instr_out_of_range, e instr_fetching_instr_size, e instr_fetching_op1, e instr_fetching_op2, e instr_fetching_op3, e instr_fetching_op4, e instr_fetching_op5, e instr_fetching_op6, e instr_fetching_op7, e instr_fetching_opcode_out_of_range, e instr_fetching_pc, e instr_fetching_pc_abs_diff, e instr_fetching_pc_out_of_range, e instr_fetching_pc_size_in_bits, e instr_fetching_sel, e instr_fetching_sel_has_tag, e instr_fetching_sel_op_dc_0, e instr_fetching_sel_op_dc_1, e instr_fetching_sel_op_dc_10, e instr_fetching_sel_op_dc_11, e instr_fetching_sel_op_dc_12, e instr_fetching_sel_op_dc_13, e instr_fetching_sel_op_dc_14, e instr_fetching_sel_op_dc_15, e instr_fetching_sel_op_dc_16, e instr_fetching_sel_op_dc_2, e instr_fetching_sel_op_dc_3, e instr_fetching_sel_op_dc_4, e instr_fetching_sel_op_dc_5, e instr_fetching_sel_op_dc_6, e instr_fetching_sel_op_dc_7, e instr_fetching_sel_op_dc_8, e instr_fetching_sel_op_dc_9, e instr_fetching_sel_parsing_err, e instr_fetching_sel_pc_in_range, e instr_fetching_sel_tag_is_op2, e instr_fetching_tag_out_of_range, e instr_fetching_tag_value, e internal_call_stack_call_id, e internal_call_stack_context_id, e internal_call_stack_entered_call_id, e internal_call_stack_return_call_id, e internal_call_stack_return_pc, e internal_call_stack_sel, e keccak_memory_ctr_end, e keccak_memory_end, e keccak_memory_single_tag_error, e keccak_memory_state_size_min_ctr_inv, e keccak_memory_tag, e keccak_memory_tag_min_u64_inv, e keccak_memory_val_24_, e keccakf1600_bitwise_and_op_id, e keccakf1600_bitwise_xor_op_id, e keccakf1600_dst_out_of_range_error, e keccakf1600_end, e keccakf1600_error, e keccakf1600_highest_slice_address, e keccakf1600_rot_64_min_len_01, e keccakf1600_rot_64_min_len_03, e keccakf1600_rot_64_min_len_11, e keccakf1600_rot_64_min_len_13, e keccakf1600_rot_64_min_len_20, e keccakf1600_rot_64_min_len_22, e keccakf1600_rot_64_min_len_24, e keccakf1600_rot_64_min_len_31, e keccakf1600_rot_64_min_len_34, e keccakf1600_rot_64_min_len_42, e keccakf1600_rot_len_02, e keccakf1600_rot_len_04, e keccakf1600_rot_len_10, e keccakf1600_rot_len_12, e keccakf1600_rot_len_14, e keccakf1600_rot_len_21, e keccakf1600_rot_len_23, e keccakf1600_rot_len_30, e keccakf1600_rot_len_32, e keccakf1600_rot_len_33, e keccakf1600_rot_len_40, e keccakf1600_rot_len_41, e keccakf1600_rot_len_43, e keccakf1600_rot_len_44, e keccakf1600_round_cst, e keccakf1600_sel_slice_read, e keccakf1600_sel_slice_write, e keccakf1600_src_addr, e keccakf1600_src_out_of_range_error, e keccakf1600_state_chi_00, e keccakf1600_state_chi_01, e keccakf1600_state_chi_02, e keccakf1600_state_chi_03, e keccakf1600_state_chi_04, e keccakf1600_state_chi_10, e keccakf1600_state_chi_11, e keccakf1600_state_chi_12, e keccakf1600_state_chi_13, e keccakf1600_state_chi_14, e keccakf1600_state_chi_20, e keccakf1600_state_chi_21, e keccakf1600_state_chi_22, e keccakf1600_state_chi_23, e keccakf1600_state_chi_24, e keccakf1600_state_chi_30, e keccakf1600_state_chi_31, e keccakf1600_state_chi_32, e keccakf1600_state_chi_33, e keccakf1600_state_chi_34, e keccakf1600_state_chi_40, e keccakf1600_state_chi_41, e keccakf1600_state_chi_42, e keccakf1600_state_chi_43, e keccakf1600_state_chi_44, e keccakf1600_state_iota_00, e keccakf1600_state_pi_and_00, e keccakf1600_state_pi_and_01, e keccakf1600_state_pi_and_02, e keccakf1600_state_pi_and_03, e keccakf1600_state_pi_and_04, e keccakf1600_state_pi_and_10, e keccakf1600_state_pi_and_11, e keccakf1600_state_pi_and_12, e keccakf1600_state_pi_and_13, e keccakf1600_state_pi_and_14, e keccakf1600_state_pi_and_20, e keccakf1600_state_pi_and_21, e keccakf1600_state_pi_and_22, e keccakf1600_state_pi_and_23, e keccakf1600_state_pi_and_24, e keccakf1600_state_pi_and_30, e keccakf1600_state_pi_and_31, e keccakf1600_state_pi_and_32, e keccakf1600_state_pi_and_33, e keccakf1600_state_pi_and_34, e keccakf1600_state_pi_and_40, e keccakf1600_state_pi_and_41, e keccakf1600_state_pi_and_42, e keccakf1600_state_pi_and_43, e keccakf1600_state_pi_and_44, e keccakf1600_state_pi_not_00, e keccakf1600_state_pi_not_01, e keccakf1600_state_pi_not_02, e keccakf1600_state_pi_not_03, e keccakf1600_state_pi_not_04, e keccakf1600_state_pi_not_10, e keccakf1600_state_pi_not_11, e keccakf1600_state_pi_not_12, e keccakf1600_state_pi_not_13, e keccakf1600_state_pi_not_14, e keccakf1600_state_pi_not_20, e keccakf1600_state_pi_not_21, e keccakf1600_state_pi_not_22, e keccakf1600_state_pi_not_23, e keccakf1600_state_pi_not_24, e keccakf1600_state_pi_not_30, e keccakf1600_state_pi_not_31, e keccakf1600_state_pi_not_32, e keccakf1600_state_pi_not_33, e keccakf1600_state_pi_not_34, e keccakf1600_state_pi_not_40, e keccakf1600_state_pi_not_41, e keccakf1600_state_pi_not_42, e keccakf1600_state_pi_not_43, e keccakf1600_state_pi_not_44, e keccakf1600_state_rho_01, e keccakf1600_state_rho_02, e keccakf1600_state_rho_03, e keccakf1600_state_rho_04, e keccakf1600_state_rho_10, e keccakf1600_state_rho_11, e keccakf1600_state_rho_12, e keccakf1600_state_rho_13, e keccakf1600_state_rho_14, e keccakf1600_state_rho_20, e keccakf1600_state_rho_21, e keccakf1600_state_rho_22, e keccakf1600_state_rho_23, e keccakf1600_state_rho_24, e keccakf1600_state_rho_30, e keccakf1600_state_rho_31, e keccakf1600_state_rho_32, e keccakf1600_state_rho_33, e keccakf1600_state_rho_34, e keccakf1600_state_rho_40, e keccakf1600_state_rho_41, e keccakf1600_state_rho_42, e keccakf1600_state_rho_43, e keccakf1600_state_rho_44, e keccakf1600_state_theta_00, e keccakf1600_state_theta_01, e keccakf1600_state_theta_02, e keccakf1600_state_theta_03, e keccakf1600_state_theta_04, e keccakf1600_state_theta_10, e keccakf1600_state_theta_11, e keccakf1600_state_theta_12, e keccakf1600_state_theta_13, e keccakf1600_state_theta_14, e keccakf1600_state_theta_20, e keccakf1600_state_theta_21, e keccakf1600_state_theta_22, e keccakf1600_state_theta_23, e keccakf1600_state_theta_24, e keccakf1600_state_theta_30, e keccakf1600_state_theta_31, e keccakf1600_state_theta_32, e keccakf1600_state_theta_33, e keccakf1600_state_theta_34, e keccakf1600_state_theta_40, e keccakf1600_state_theta_41, e keccakf1600_state_theta_42, e keccakf1600_state_theta_43, e keccakf1600_state_theta_44, e keccakf1600_state_theta_hi_02, e keccakf1600_state_theta_hi_04, e keccakf1600_state_theta_hi_10, e keccakf1600_state_theta_hi_12, e keccakf1600_state_theta_hi_14, e keccakf1600_state_theta_hi_21, e keccakf1600_state_theta_hi_23, e keccakf1600_state_theta_hi_30, e keccakf1600_state_theta_hi_32, e keccakf1600_state_theta_hi_33, e keccakf1600_state_theta_hi_40, e keccakf1600_state_theta_hi_41, e keccakf1600_state_theta_hi_43, e keccakf1600_state_theta_hi_44, e keccakf1600_state_theta_low_01, e keccakf1600_state_theta_low_03, e keccakf1600_state_theta_low_11, e keccakf1600_state_theta_low_13, e keccakf1600_state_theta_low_20, e keccakf1600_state_theta_low_22, e keccakf1600_state_theta_low_24, e keccakf1600_state_theta_low_31, e keccakf1600_state_theta_low_34, e keccakf1600_state_theta_low_42, e keccakf1600_tag_error, e keccakf1600_tag_u64, e keccakf1600_theta_combined_xor_0, e keccakf1600_theta_combined_xor_1, e keccakf1600_theta_combined_xor_2, e keccakf1600_theta_combined_xor_3, e keccakf1600_theta_combined_xor_4, e keccakf1600_theta_xor_01, e keccakf1600_theta_xor_02, e keccakf1600_theta_xor_03, e keccakf1600_theta_xor_11, e keccakf1600_theta_xor_12, e keccakf1600_theta_xor_13, e keccakf1600_theta_xor_21, e keccakf1600_theta_xor_22, e keccakf1600_theta_xor_23, e keccakf1600_theta_xor_31, e keccakf1600_theta_xor_32, e keccakf1600_theta_xor_33, e keccakf1600_theta_xor_41, e keccakf1600_theta_xor_42, e keccakf1600_theta_xor_43, e keccakf1600_theta_xor_row_0, e keccakf1600_theta_xor_row_1, e keccakf1600_theta_xor_row_2, e keccakf1600_theta_xor_row_3, e keccakf1600_theta_xor_row_4, e keccakf1600_theta_xor_row_msb_0, e keccakf1600_theta_xor_row_msb_1, e keccakf1600_theta_xor_row_msb_2, e keccakf1600_theta_xor_row_msb_3, e keccakf1600_theta_xor_row_msb_4, e keccakf1600_theta_xor_row_rotl1_0, e keccakf1600_theta_xor_row_rotl1_1, e keccakf1600_theta_xor_row_rotl1_2, e keccakf1600_theta_xor_row_rotl1_3, e keccakf1600_theta_xor_row_rotl1_4, e l1_to_l2_message_tree_check_exists, e l1_to_l2_message_tree_check_l1_to_l2_message_tree_height, e l1_to_l2_message_tree_check_leaf_index, e l1_to_l2_message_tree_check_leaf_value, e l1_to_l2_message_tree_check_leaf_value_msg_hash_diff_inv, e l1_to_l2_message_tree_check_merkle_hash_separator, e l1_to_l2_message_tree_check_msg_hash, e l1_to_l2_message_tree_check_root, e l1_to_l2_message_tree_check_sel, e memory_diff, e memory_glob_addr_diff_inv, e memory_last_access, e memory_limb_0_, e memory_limb_1_, e memory_limb_2_, e memory_max_bits, e memory_sel_addressing_base, e memory_sel_addressing_indirect_0_, e memory_sel_addressing_indirect_1_, e memory_sel_addressing_indirect_2_, e memory_sel_addressing_indirect_3_, e memory_sel_addressing_indirect_4_, e memory_sel_addressing_indirect_5_, e memory_sel_addressing_indirect_6_, e memory_sel_data_copy_read, e memory_sel_data_copy_write, e memory_sel_ecc_write_0_, e memory_sel_ecc_write_1_, e memory_sel_ecc_write_2_, e memory_sel_get_contract_instance_exists_write, e memory_sel_get_contract_instance_member_write, e memory_sel_keccak, e memory_sel_poseidon2_read_0_, e memory_sel_poseidon2_read_1_, e memory_sel_poseidon2_read_2_, e memory_sel_poseidon2_read_3_, e memory_sel_poseidon2_write_0_, e memory_sel_poseidon2_write_1_, e memory_sel_poseidon2_write_2_, e memory_sel_poseidon2_write_3_, e memory_sel_public_log_read, e memory_sel_register_op_0_, e memory_sel_register_op_1_, e memory_sel_register_op_2_, e memory_sel_register_op_3_, e memory_sel_register_op_4_, e memory_sel_register_op_5_, e memory_sel_rng_chk, e memory_sel_rng_write, e memory_sel_sha256_op_0_, e memory_sel_sha256_op_1_, e memory_sel_sha256_op_2_, e memory_sel_sha256_op_3_, e memory_sel_sha256_op_4_, e memory_sel_sha256_op_5_, e memory_sel_sha256_op_6_, e memory_sel_sha256_op_7_, e memory_sel_sha256_read, e memory_sel_tag_is_ff, e memory_sel_to_radix_write, e memory_tag_ff_diff_inv, e merkle_check_const_three, e merkle_check_end, e merkle_check_index_is_even, e merkle_check_path_len_min_one_inv, e merkle_check_read_left_node, e merkle_check_read_output_hash, e merkle_check_read_right_node, e merkle_check_sibling, e merkle_check_write_left_node, e merkle_check_write_output_hash, e merkle_check_write_right_node, e note_hash_tree_check_address, e note_hash_tree_check_const_three, e note_hash_tree_check_discard, e note_hash_tree_check_exists, e note_hash_tree_check_first_nullifier, e note_hash_tree_check_first_nullifier_pi_index, e note_hash_tree_check_leaf_index, e note_hash_tree_check_merkle_hash_separator, e note_hash_tree_check_next_leaf_value, e note_hash_tree_check_next_root, e note_hash_tree_check_nonce, e note_hash_tree_check_nonce_separator, e note_hash_tree_check_note_hash, e note_hash_tree_check_note_hash_index, e note_hash_tree_check_note_hash_tree_height, e note_hash_tree_check_prev_leaf_value, e note_hash_tree_check_prev_leaf_value_unique_note_hash_diff_inv, e note_hash_tree_check_prev_root, e note_hash_tree_check_public_inputs_index, e note_hash_tree_check_sel, e note_hash_tree_check_sel_silo, e note_hash_tree_check_sel_unique, e note_hash_tree_check_sel_write_to_public_inputs, e note_hash_tree_check_siloed_note_hash, e note_hash_tree_check_siloing_separator, e note_hash_tree_check_unique_note_hash, e note_hash_tree_check_unique_note_hash_separator, e note_hash_tree_check_write, e poseidon2_hash_b_0, e poseidon2_hash_b_1, e poseidon2_hash_b_2, e poseidon2_hash_b_3, e poseidon2_hash_end, e poseidon2_hash_input_len, e poseidon2_hash_num_perm_rounds_rem_min_one_inv, e poseidon2_hash_padding, e poseidon2_perm_B_10_0, e poseidon2_perm_B_10_1, e poseidon2_perm_B_10_2, e poseidon2_perm_B_10_3, e poseidon2_perm_B_11_0, e poseidon2_perm_B_11_1, e poseidon2_perm_B_11_2, e poseidon2_perm_B_11_3, e poseidon2_perm_B_12_0, e poseidon2_perm_B_12_1, e poseidon2_perm_B_12_2, e poseidon2_perm_B_12_3, e poseidon2_perm_B_13_0, e poseidon2_perm_B_13_1, e poseidon2_perm_B_13_2, e poseidon2_perm_B_13_3, e poseidon2_perm_B_14_0, e poseidon2_perm_B_14_1, e poseidon2_perm_B_14_2, e poseidon2_perm_B_14_3, e poseidon2_perm_B_15_0, e poseidon2_perm_B_15_1, e poseidon2_perm_B_15_2, e poseidon2_perm_B_15_3, e poseidon2_perm_B_16_0, e poseidon2_perm_B_16_1, e poseidon2_perm_B_16_2, e poseidon2_perm_B_16_3, e poseidon2_perm_B_17_0, e poseidon2_perm_B_17_1, e poseidon2_perm_B_17_2, e poseidon2_perm_B_17_3, e poseidon2_perm_B_18_0, e poseidon2_perm_B_18_1, e poseidon2_perm_B_18_2, e poseidon2_perm_B_18_3, e poseidon2_perm_B_19_0, e poseidon2_perm_B_19_1, e poseidon2_perm_B_19_2, e poseidon2_perm_B_19_3, e poseidon2_perm_B_20_0, e poseidon2_perm_B_20_1, e poseidon2_perm_B_20_2, e poseidon2_perm_B_20_3, e poseidon2_perm_B_21_0, e poseidon2_perm_B_21_1, e poseidon2_perm_B_21_2, e poseidon2_perm_B_21_3, e poseidon2_perm_B_22_0, e poseidon2_perm_B_22_1, e poseidon2_perm_B_22_2, e poseidon2_perm_B_22_3, e poseidon2_perm_B_23_0, e poseidon2_perm_B_23_1, e poseidon2_perm_B_23_2, e poseidon2_perm_B_23_3, e poseidon2_perm_B_24_0, e poseidon2_perm_B_24_1, e poseidon2_perm_B_24_2, e poseidon2_perm_B_24_3, e poseidon2_perm_B_25_0, e poseidon2_perm_B_25_1, e poseidon2_perm_B_25_2, e poseidon2_perm_B_25_3, e poseidon2_perm_B_26_0, e poseidon2_perm_B_26_1, e poseidon2_perm_B_26_2, e poseidon2_perm_B_26_3, e poseidon2_perm_B_27_0, e poseidon2_perm_B_27_1, e poseidon2_perm_B_27_2, e poseidon2_perm_B_27_3, e poseidon2_perm_B_28_0, e poseidon2_perm_B_28_1, e poseidon2_perm_B_28_2, e poseidon2_perm_B_28_3, e poseidon2_perm_B_29_0, e poseidon2_perm_B_29_1, e poseidon2_perm_B_29_2, e poseidon2_perm_B_29_3, e poseidon2_perm_B_30_0, e poseidon2_perm_B_30_1, e poseidon2_perm_B_30_2, e poseidon2_perm_B_30_3, e poseidon2_perm_B_31_0, e poseidon2_perm_B_31_1, e poseidon2_perm_B_31_2, e poseidon2_perm_B_31_3, e poseidon2_perm_B_32_0, e poseidon2_perm_B_32_1, e poseidon2_perm_B_32_2, e poseidon2_perm_B_32_3, e poseidon2_perm_B_33_0, e poseidon2_perm_B_33_1, e poseidon2_perm_B_33_2, e poseidon2_perm_B_33_3, e poseidon2_perm_B_34_0, e poseidon2_perm_B_34_1, e poseidon2_perm_B_34_2, e poseidon2_perm_B_34_3, e poseidon2_perm_B_35_0, e poseidon2_perm_B_35_1, e poseidon2_perm_B_35_2, e poseidon2_perm_B_35_3, e poseidon2_perm_B_36_0, e poseidon2_perm_B_36_1, e poseidon2_perm_B_36_2, e poseidon2_perm_B_36_3, e poseidon2_perm_B_37_0, e poseidon2_perm_B_37_1, e poseidon2_perm_B_37_2, e poseidon2_perm_B_37_3, e poseidon2_perm_B_38_0, e poseidon2_perm_B_38_1, e poseidon2_perm_B_38_2, e poseidon2_perm_B_38_3, e poseidon2_perm_B_39_0, e poseidon2_perm_B_39_1, e poseidon2_perm_B_39_2, e poseidon2_perm_B_39_3, e poseidon2_perm_B_40_0, e poseidon2_perm_B_40_1, e poseidon2_perm_B_40_2, e poseidon2_perm_B_40_3, e poseidon2_perm_B_41_0, e poseidon2_perm_B_41_1, e poseidon2_perm_B_41_2, e poseidon2_perm_B_41_3, e poseidon2_perm_B_42_0, e poseidon2_perm_B_42_1, e poseidon2_perm_B_42_2, e poseidon2_perm_B_42_3, e poseidon2_perm_B_43_0, e poseidon2_perm_B_43_1, e poseidon2_perm_B_43_2, e poseidon2_perm_B_43_3, e poseidon2_perm_B_44_0, e poseidon2_perm_B_44_1, e poseidon2_perm_B_44_2, e poseidon2_perm_B_44_3, e poseidon2_perm_B_45_0, e poseidon2_perm_B_45_1, e poseidon2_perm_B_45_2, e poseidon2_perm_B_45_3, e poseidon2_perm_B_46_0, e poseidon2_perm_B_46_1, e poseidon2_perm_B_46_2, e poseidon2_perm_B_46_3, e poseidon2_perm_B_47_0, e poseidon2_perm_B_47_1, e poseidon2_perm_B_47_2, e poseidon2_perm_B_47_3, e poseidon2_perm_B_48_0, e poseidon2_perm_B_48_1, e poseidon2_perm_B_48_2, e poseidon2_perm_B_48_3, e poseidon2_perm_B_49_0, e poseidon2_perm_B_49_1, e poseidon2_perm_B_49_2, e poseidon2_perm_B_49_3, e poseidon2_perm_B_4_0, e poseidon2_perm_B_4_1, e poseidon2_perm_B_4_2, e poseidon2_perm_B_4_3, e poseidon2_perm_B_50_0, e poseidon2_perm_B_50_1, e poseidon2_perm_B_50_2, e poseidon2_perm_B_50_3, e poseidon2_perm_B_51_0, e poseidon2_perm_B_51_1, e poseidon2_perm_B_51_2, e poseidon2_perm_B_51_3, e poseidon2_perm_B_52_0, e poseidon2_perm_B_52_1, e poseidon2_perm_B_52_2, e poseidon2_perm_B_52_3, e poseidon2_perm_B_53_0, e poseidon2_perm_B_53_1, e poseidon2_perm_B_53_2, e poseidon2_perm_B_53_3, e poseidon2_perm_B_54_0, e poseidon2_perm_B_54_1, e poseidon2_perm_B_54_2, e poseidon2_perm_B_54_3, e poseidon2_perm_B_55_0, e poseidon2_perm_B_55_1, e poseidon2_perm_B_55_2, e poseidon2_perm_B_55_3, e poseidon2_perm_B_56_0, e poseidon2_perm_B_56_1, e poseidon2_perm_B_56_2, e poseidon2_perm_B_56_3, e poseidon2_perm_B_57_0, e poseidon2_perm_B_57_1, e poseidon2_perm_B_57_2, e poseidon2_perm_B_57_3, e poseidon2_perm_B_58_0, e poseidon2_perm_B_58_1, e poseidon2_perm_B_58_2, e poseidon2_perm_B_58_3, e poseidon2_perm_B_59_0, e poseidon2_perm_B_59_1, e poseidon2_perm_B_59_2, e poseidon2_perm_B_59_3, e poseidon2_perm_B_5_0, e poseidon2_perm_B_5_1, e poseidon2_perm_B_5_2, e poseidon2_perm_B_5_3, e poseidon2_perm_B_6_0, e poseidon2_perm_B_6_1, e poseidon2_perm_B_6_2, e poseidon2_perm_B_6_3, e poseidon2_perm_B_7_0, e poseidon2_perm_B_7_1, e poseidon2_perm_B_7_2, e poseidon2_perm_B_7_3, e poseidon2_perm_B_8_0, e poseidon2_perm_B_8_1, e poseidon2_perm_B_8_2, e poseidon2_perm_B_8_3, e poseidon2_perm_B_9_0, e poseidon2_perm_B_9_1, e poseidon2_perm_B_9_2, e poseidon2_perm_B_9_3, e poseidon2_perm_EXT_LAYER_4, e poseidon2_perm_EXT_LAYER_5, e poseidon2_perm_EXT_LAYER_6, e poseidon2_perm_EXT_LAYER_7, e poseidon2_perm_T_0_4, e poseidon2_perm_T_0_5, e poseidon2_perm_T_0_6, e poseidon2_perm_T_0_7, e poseidon2_perm_T_1_4, e poseidon2_perm_T_1_5, e poseidon2_perm_T_1_6, e poseidon2_perm_T_1_7, e poseidon2_perm_T_2_4, e poseidon2_perm_T_2_5, e poseidon2_perm_T_2_6, e poseidon2_perm_T_2_7, e poseidon2_perm_T_3_4, e poseidon2_perm_T_3_5, e poseidon2_perm_T_3_6, e poseidon2_perm_T_3_7, e poseidon2_perm_T_60_4, e poseidon2_perm_T_60_5, e poseidon2_perm_T_60_6, e poseidon2_perm_T_60_7, e poseidon2_perm_T_61_4, e poseidon2_perm_T_61_5, e poseidon2_perm_T_61_6, e poseidon2_perm_T_61_7, e poseidon2_perm_T_62_4, e poseidon2_perm_T_62_5, e poseidon2_perm_T_62_6, e poseidon2_perm_T_62_7, e poseidon2_perm_T_63_4, e poseidon2_perm_T_63_5, e poseidon2_perm_T_63_6, e poseidon2_perm_T_63_7, e poseidon2_perm_a_0, e poseidon2_perm_a_1, e poseidon2_perm_a_2, e poseidon2_perm_a_3, e poseidon2_perm_b_0, e poseidon2_perm_b_1, e poseidon2_perm_b_2, e poseidon2_perm_b_3, e poseidon2_perm_mem_batch_tag_inv, e poseidon2_perm_mem_err, e poseidon2_perm_mem_execution_clk, e poseidon2_perm_mem_input_0_, e poseidon2_perm_mem_input_1_, e poseidon2_perm_mem_input_2_, e poseidon2_perm_mem_input_3_, e poseidon2_perm_mem_input_tag_0_, e poseidon2_perm_mem_input_tag_1_, e poseidon2_perm_mem_input_tag_2_, e poseidon2_perm_mem_input_tag_3_, e poseidon2_perm_mem_max_mem_addr, e poseidon2_perm_mem_output_0_, e poseidon2_perm_mem_output_1_, e poseidon2_perm_mem_output_2_, e poseidon2_perm_mem_output_3_, e poseidon2_perm_mem_read_address_0_, e poseidon2_perm_mem_read_address_1_, e poseidon2_perm_mem_read_address_2_, e poseidon2_perm_mem_read_address_3_, e poseidon2_perm_mem_sel, e poseidon2_perm_mem_sel_dst_out_of_range_err, e poseidon2_perm_mem_sel_invalid_tag_err, e poseidon2_perm_mem_sel_should_exec, e poseidon2_perm_mem_sel_should_read_mem, e poseidon2_perm_mem_sel_src_out_of_range_err, e poseidon2_perm_mem_space_id, e poseidon2_perm_mem_write_address_0_, e poseidon2_perm_mem_write_address_1_, e poseidon2_perm_mem_write_address_2_, e poseidon2_perm_mem_write_address_3_, e poseidon2_perm_sel, e public_data_check_address, e public_data_check_clk_diff_hi, e public_data_check_clk_diff_lo, e public_data_check_const_four, e public_data_check_const_three, e public_data_check_discard, e public_data_check_end, e public_data_check_final_value, e public_data_check_intermediate_root, e public_data_check_leaf_not_exists, e public_data_check_leaf_slot, e public_data_check_leaf_slot_low_leaf_slot_diff_inv, e public_data_check_length_pi_idx, e public_data_check_low_leaf_hash, e public_data_check_low_leaf_index, e public_data_check_low_leaf_next_index, e public_data_check_low_leaf_next_slot, e public_data_check_low_leaf_slot, e public_data_check_low_leaf_value, e public_data_check_merkle_hash_separator, e public_data_check_new_leaf_hash, e public_data_check_next_slot_inv, e public_data_check_next_slot_is_nonzero, e public_data_check_non_discarded_write, e public_data_check_non_protocol_write, e public_data_check_not_end, e public_data_check_protocol_write, e public_data_check_public_data_writes_length, e public_data_check_root, e public_data_check_sel_write_to_public_inputs, e public_data_check_should_insert, e public_data_check_siloing_separator, e public_data_check_slot, e public_data_check_tree_height, e public_data_check_tree_size_after_write, e public_data_check_tree_size_before_write, e public_data_check_updated_low_leaf_hash, e public_data_check_updated_low_leaf_next_index, e public_data_check_updated_low_leaf_next_slot, e public_data_check_updated_low_leaf_value, e public_data_check_value, e public_data_check_write, e public_data_check_write_root, e public_data_squash_check_clock, e public_data_squash_clk_diff_hi, e public_data_squash_clk_diff_lo, e public_data_squash_leaf_slot_increase, e public_data_squash_value, e range_check_dyn_diff, e range_check_dyn_rng_chk_bits, e range_check_dyn_rng_chk_pow_2, e range_check_is_lte_u112, e range_check_is_lte_u128, e range_check_is_lte_u16, e range_check_is_lte_u32, e range_check_is_lte_u48, e range_check_is_lte_u64, e range_check_is_lte_u80, e range_check_is_lte_u96, e range_check_rng_chk_bits, e range_check_sel, e range_check_sel_alu, e range_check_sel_gt, e range_check_sel_keccak, e range_check_sel_memory, e range_check_sel_r0_16_bit_rng_lookup, e range_check_sel_r1_16_bit_rng_lookup, e range_check_sel_r2_16_bit_rng_lookup, e range_check_sel_r3_16_bit_rng_lookup, e range_check_sel_r4_16_bit_rng_lookup, e range_check_sel_r5_16_bit_rng_lookup, e range_check_sel_r6_16_bit_rng_lookup, e range_check_u16_r0, e range_check_u16_r1, e range_check_u16_r2, e range_check_u16_r3, e range_check_u16_r4, e range_check_u16_r5, e range_check_u16_r6, e range_check_u16_r7, e range_check_value, e scalar_mul_bit, e scalar_mul_const_two, e scalar_mul_end, e scalar_mul_sel_not_end, e scalar_mul_should_add, e sha256_a_and_b, e sha256_a_and_b_xor_a_and_c, e sha256_a_and_c, e sha256_a_rotr_13, e sha256_a_rotr_2, e sha256_a_rotr_22, e sha256_a_rotr_2_xor_a_rotr_13, e sha256_and_op_id, e sha256_b_and_c, e sha256_batch_tag_inv, e sha256_ch, e sha256_computed_w_lhs, e sha256_computed_w_rhs, e sha256_e_and_f, e sha256_e_rotr_11, e sha256_e_rotr_25, e sha256_e_rotr_6, e sha256_e_rotr_6_xor_e_rotr_11, e sha256_end, e sha256_err, e sha256_input, e sha256_input_rounds_rem_inv, e sha256_input_tag, e sha256_input_tag_diff_inv, e sha256_last, e sha256_lhs_w_10, e sha256_lhs_w_3, e sha256_maj, e sha256_max_input_addr, e sha256_max_mem_addr, e sha256_max_output_addr, e sha256_max_state_addr, e sha256_mem_out_of_range_err, e sha256_memory_address_0_, e sha256_memory_address_1_, e sha256_memory_address_2_, e sha256_memory_address_3_, e sha256_memory_address_4_, e sha256_memory_address_5_, e sha256_memory_address_6_, e sha256_memory_address_7_, e sha256_memory_register_0_, e sha256_memory_register_1_, e sha256_memory_register_2_, e sha256_memory_register_3_, e sha256_memory_register_4_, e sha256_memory_register_5_, e sha256_memory_register_6_, e sha256_memory_register_7_, e sha256_memory_tag_0_, e sha256_memory_tag_1_, e sha256_memory_tag_2_, e sha256_memory_tag_3_, e sha256_memory_tag_4_, e sha256_memory_tag_5_, e sha256_memory_tag_6_, e sha256_memory_tag_7_, e sha256_next_a_lhs, e sha256_next_a_rhs, e sha256_next_e_lhs, e sha256_next_e_rhs, e sha256_not_e, e sha256_not_e_and_g, e sha256_output_a_lhs, e sha256_output_a_rhs, e sha256_output_b_lhs, e sha256_output_b_rhs, e sha256_output_c_lhs, e sha256_output_c_rhs, e sha256_output_d_lhs, e sha256_output_d_rhs, e sha256_output_e_lhs, e sha256_output_e_rhs, e sha256_output_f_lhs, e sha256_output_f_rhs, e sha256_output_g_lhs, e sha256_output_g_rhs, e sha256_output_h_lhs, e sha256_output_h_rhs, e sha256_perform_round, e sha256_rhs_a_13, e sha256_rhs_a_2, e sha256_rhs_a_22, e sha256_rhs_e_11, e sha256_rhs_e_25, e sha256_rhs_e_6, e sha256_rhs_w_10, e sha256_rhs_w_17, e sha256_rhs_w_18, e sha256_rhs_w_19, e sha256_rhs_w_3, e sha256_rhs_w_7, e sha256_round_constant, e sha256_round_count, e sha256_rounds_remaining_inv, e sha256_rw, e sha256_s_0, e sha256_s_1, e sha256_sel_compute_w, e sha256_sel_input_out_of_range_err, e sha256_sel_invalid_input_row_tag_err, e sha256_sel_invalid_state_tag_err, e sha256_sel_is_input_round, e sha256_sel_mem_state_or_output, e sha256_sel_output_out_of_range_err, e sha256_sel_read_input_from_memory, e sha256_sel_state_out_of_range_err, e sha256_state_addr, e sha256_two_pow_10, e sha256_two_pow_11, e sha256_two_pow_13, e sha256_two_pow_17, e sha256_two_pow_18, e sha256_two_pow_19, e sha256_two_pow_2, e sha256_two_pow_22, e sha256_two_pow_25, e sha256_two_pow_3, e sha256_two_pow_32, e sha256_two_pow_6, e sha256_two_pow_7, e sha256_u32_tag, e sha256_w, e sha256_w_15_rotr_18, e sha256_w_15_rotr_7, e sha256_w_15_rotr_7_xor_w_15_rotr_18, e sha256_w_2_rotr_17, e sha256_w_2_rotr_17_xor_w_2_rotr_19, e sha256_w_2_rotr_19, e sha256_w_s_0, e sha256_w_s_1, e sha256_xor_op_id, e to_radix_end, e to_radix_found, e to_radix_is_unsafe_limb, e to_radix_limb_p_diff, e to_radix_limb_radix_diff, e to_radix_mem_err, e to_radix_mem_input_validation_error, e to_radix_mem_last, e to_radix_mem_limb_index_to_lookup, e to_radix_mem_limb_value, e to_radix_mem_max_mem_size, e to_radix_mem_num_limbs_inv, e to_radix_mem_num_limbs_minus_one_inv, e to_radix_mem_output_tag, e to_radix_mem_radix_min_two_inv, e to_radix_mem_sel_dst_out_of_range_err, e to_radix_mem_sel_invalid_bitwise_radix, e to_radix_mem_sel_num_limbs_is_zero, e to_radix_mem_sel_radix_eq_2, e to_radix_mem_sel_radix_gt_256_err, e to_radix_mem_sel_radix_lt_2_err, e to_radix_mem_sel_value_is_zero, e to_radix_mem_two, e to_radix_mem_two_five_six, e to_radix_mem_value_found, e to_radix_mem_value_inv, e to_radix_mem_write_addr_upper_bound, e to_radix_p_limb, e to_radix_rem_inverse, e to_radix_safety_diff_inverse, e tx_array_length_l2_to_l1_messages_pi_offset, e tx_array_length_note_hashes_pi_offset, e tx_array_length_nullifiers_pi_offset, e tx_calldata_hash, e tx_calldata_size, e tx_const_three, e tx_contract_addr, e tx_dom_sep_public_storage_map_slot, e tx_effective_fee_per_da_gas, e tx_effective_fee_per_l2_gas, e tx_end_phase, e tx_fee_juice_balance_slot, e tx_fee_juice_balances_slot_constant, e tx_fee_juice_contract_address, e tx_fee_payer, e tx_fee_payer_balance, e tx_fee_payer_new_balance, e tx_fee_payer_pi_offset, e tx_fields_length_public_logs_pi_offset, e tx_gas_limit_pi_offset, e tx_gas_used_pi_offset, e tx_is_cleanup, e tx_is_collect_fee, e tx_is_padded, e tx_is_public_call_request, e tx_is_static, e tx_is_tree_insert_phase, e tx_is_tree_padding, e tx_l1_l2_pi_offset, e tx_l2_l1_msg_content, e tx_l2_l1_msg_contract_address, e tx_l2_l1_msg_recipient, e tx_leaf_value, e tx_msg_sender, e tx_next_da_gas_used, e tx_next_da_gas_used_sent_to_enqueued_call, e tx_next_l2_gas_used, e tx_next_l2_gas_used_sent_to_enqueued_call, e tx_next_note_hash_tree_root, e tx_next_note_hash_tree_size, e tx_next_nullifier_tree_root, e tx_next_nullifier_tree_size, e tx_next_num_l2_to_l1_messages, e tx_next_num_note_hashes_emitted, e tx_next_num_nullifiers_emitted, e tx_next_num_public_log_fields, e tx_next_phase_on_revert, e tx_next_public_data_tree_root, e tx_next_public_data_tree_size, e tx_next_retrieved_bytecodes_tree_root, e tx_next_retrieved_bytecodes_tree_size, e tx_next_written_public_data_slots_tree_root, e tx_next_written_public_data_slots_tree_size, e tx_note_hash_pi_offset, e tx_nullifier_limit_error, e tx_nullifier_merkle_separator, e tx_nullifier_pi_offset, e tx_nullifier_tree_height, e tx_prev_da_gas_used_sent_to_enqueued_call, e tx_prev_l2_gas_used_sent_to_enqueued_call, e tx_public_data_pi_offset, e tx_read_pi_length_offset, e tx_read_pi_start_offset, e tx_remaining_phase_inv, e tx_remaining_phase_minus_one_inv, e tx_remaining_side_effects_inv, e tx_reverted_pi_offset, e tx_sel_append_l2_l1_msg, e tx_sel_append_note_hash, e tx_sel_append_nullifier, e tx_sel_l2_l1_msg_append, e tx_sel_note_hash_append, e tx_sel_nullifier_append, e tx_sel_process_call_request, e tx_sel_read_phase_length, e tx_sel_read_trees_and_gas_used, e tx_sel_try_l2_l1_msg_append, e tx_sel_try_note_hash_append, e tx_sel_try_nullifier_append, e tx_setup_phase_value, e tx_should_read_gas_limit, e tx_uint32_max, e tx_write_nullifier_pi_offset, e tx_write_pi_offset, e update_check_address, e update_check_const_three, e update_check_contract_instance_registry_address, e update_check_current_class_id, e update_check_delayed_public_mutable_hash_slot, e update_check_delayed_public_mutable_slot, e update_check_dom_sep_public_storage_map_slot, e update_check_hash_not_zero, e update_check_original_class_id, e update_check_public_data_tree_root, e update_check_sel, e update_check_timestamp, e update_check_timestamp_is_lt_timestamp_of_change, e update_check_timestamp_of_change, e update_check_timestamp_of_change_bit_size, e update_check_timestamp_pi_offset, e update_check_update_hash, e update_check_update_hash_inv, e update_check_update_hi_metadata, e update_check_update_hi_metadata_bit_size, e update_check_update_post_class_id_is_zero, e update_check_update_post_class_inv, e update_check_update_pre_class_id_is_zero, e update_check_update_pre_class_inv, e update_check_update_preimage_metadata, e update_check_update_preimage_post_class_id, e update_check_update_preimage_pre_class_id, e update_check_updated_class_ids_slot, e lookup_range_check_dyn_rng_chk_pow_2_counts, e lookup_range_check_dyn_diff_is_u16_counts, e lookup_range_check_r0_is_u16_counts, e lookup_range_check_r1_is_u16_counts, e lookup_range_check_r2_is_u16_counts, e lookup_range_check_r3_is_u16_counts, e lookup_range_check_r4_is_u16_counts, e lookup_range_check_r5_is_u16_counts, e lookup_range_check_r6_is_u16_counts, e lookup_range_check_r7_is_u16_counts, e lookup_ff_gt_a_lo_range_counts, e lookup_ff_gt_a_hi_range_counts, e lookup_gt_gt_range_counts, e lookup_alu_tag_max_bits_value_counts, e lookup_alu_range_check_decomposition_a_lo_counts, e lookup_alu_range_check_decomposition_a_hi_counts, e lookup_alu_range_check_decomposition_b_lo_counts, e lookup_alu_range_check_decomposition_b_hi_counts, e lookup_alu_range_check_mul_c_hi_counts, e lookup_alu_range_check_div_remainder_counts, e lookup_alu_ff_gt_counts, e lookup_alu_int_gt_counts, e lookup_alu_shifts_two_pow_counts, e lookup_alu_large_trunc_canonical_dec_counts, e lookup_alu_range_check_trunc_mid_counts, e lookup_bitwise_integral_tag_length_counts, e lookup_bitwise_byte_operations_counts, e lookup_memory_range_check_limb_0_counts, e lookup_memory_range_check_limb_1_counts, e lookup_memory_range_check_limb_2_counts, e lookup_memory_tag_max_bits_counts, e lookup_memory_range_check_write_tagged_value_counts, e lookup_data_copy_offset_plus_size_is_gt_data_size_counts, e lookup_data_copy_check_src_addr_in_range_counts, e lookup_data_copy_check_dst_addr_in_range_counts, e lookup_data_copy_sel_has_reads_counts, e lookup_data_copy_col_read_counts, e lookup_ecc_mem_check_dst_addr_in_range_counts, e lookup_ecc_mem_input_output_ecc_add_counts, e lookup_keccakf1600_theta_xor_01_counts, e lookup_keccakf1600_theta_xor_02_counts, e lookup_keccakf1600_theta_xor_03_counts, e lookup_keccakf1600_theta_xor_row_0_counts, e lookup_keccakf1600_theta_xor_11_counts, e lookup_keccakf1600_theta_xor_12_counts, e lookup_keccakf1600_theta_xor_13_counts, e lookup_keccakf1600_theta_xor_row_1_counts, e lookup_keccakf1600_theta_xor_21_counts, e lookup_keccakf1600_theta_xor_22_counts, e lookup_keccakf1600_theta_xor_23_counts, e lookup_keccakf1600_theta_xor_row_2_counts, e lookup_keccakf1600_theta_xor_31_counts, e lookup_keccakf1600_theta_xor_32_counts, e lookup_keccakf1600_theta_xor_33_counts, e lookup_keccakf1600_theta_xor_row_3_counts, e lookup_keccakf1600_theta_xor_41_counts, e lookup_keccakf1600_theta_xor_42_counts, e lookup_keccakf1600_theta_xor_43_counts, e lookup_keccakf1600_theta_xor_row_4_counts, e lookup_keccakf1600_theta_combined_xor_0_counts, e lookup_keccakf1600_theta_combined_xor_1_counts, e lookup_keccakf1600_theta_combined_xor_2_counts, e lookup_keccakf1600_theta_combined_xor_3_counts, e lookup_keccakf1600_theta_combined_xor_4_counts, e lookup_keccakf1600_state_theta_00_counts, e lookup_keccakf1600_state_theta_01_counts, e lookup_keccakf1600_state_theta_02_counts, e lookup_keccakf1600_state_theta_03_counts, e lookup_keccakf1600_state_theta_04_counts, e lookup_keccakf1600_state_theta_10_counts, e lookup_keccakf1600_state_theta_11_counts, e lookup_keccakf1600_state_theta_12_counts, e lookup_keccakf1600_state_theta_13_counts, e lookup_keccakf1600_state_theta_14_counts, e lookup_keccakf1600_state_theta_20_counts, e lookup_keccakf1600_state_theta_21_counts, e lookup_keccakf1600_state_theta_22_counts, e lookup_keccakf1600_state_theta_23_counts, e lookup_keccakf1600_state_theta_24_counts, e lookup_keccakf1600_state_theta_30_counts, e lookup_keccakf1600_state_theta_31_counts, e lookup_keccakf1600_state_theta_32_counts, e lookup_keccakf1600_state_theta_33_counts, e lookup_keccakf1600_state_theta_34_counts, e lookup_keccakf1600_state_theta_40_counts, e lookup_keccakf1600_state_theta_41_counts, e lookup_keccakf1600_state_theta_42_counts, e lookup_keccakf1600_state_theta_43_counts, e lookup_keccakf1600_state_theta_44_counts, e lookup_keccakf1600_theta_limb_02_range_counts, e lookup_keccakf1600_theta_limb_04_range_counts, e lookup_keccakf1600_theta_limb_10_range_counts, e lookup_keccakf1600_theta_limb_12_range_counts, e lookup_keccakf1600_theta_limb_14_range_counts, e lookup_keccakf1600_theta_limb_21_range_counts, e lookup_keccakf1600_theta_limb_23_range_counts, e lookup_keccakf1600_theta_limb_30_range_counts, e lookup_keccakf1600_theta_limb_32_range_counts, e lookup_keccakf1600_theta_limb_33_range_counts, e lookup_keccakf1600_theta_limb_40_range_counts, e lookup_keccakf1600_theta_limb_41_range_counts, e lookup_keccakf1600_theta_limb_43_range_counts, e lookup_keccakf1600_theta_limb_44_range_counts, e lookup_keccakf1600_theta_limb_01_range_counts, e lookup_keccakf1600_theta_limb_03_range_counts, e lookup_keccakf1600_theta_limb_11_range_counts, e lookup_keccakf1600_theta_limb_13_range_counts, e lookup_keccakf1600_theta_limb_20_range_counts, e lookup_keccakf1600_theta_limb_22_range_counts, e lookup_keccakf1600_theta_limb_24_range_counts, e lookup_keccakf1600_theta_limb_31_range_counts, e lookup_keccakf1600_theta_limb_34_range_counts, e lookup_keccakf1600_theta_limb_42_range_counts, e lookup_keccakf1600_state_pi_and_00_counts, e lookup_keccakf1600_state_pi_and_01_counts, e lookup_keccakf1600_state_pi_and_02_counts, e lookup_keccakf1600_state_pi_and_03_counts, e lookup_keccakf1600_state_pi_and_04_counts, e lookup_keccakf1600_state_pi_and_10_counts, e lookup_keccakf1600_state_pi_and_11_counts, e lookup_keccakf1600_state_pi_and_12_counts, e lookup_keccakf1600_state_pi_and_13_counts, e lookup_keccakf1600_state_pi_and_14_counts, e lookup_keccakf1600_state_pi_and_20_counts, e lookup_keccakf1600_state_pi_and_21_counts, e lookup_keccakf1600_state_pi_and_22_counts, e lookup_keccakf1600_state_pi_and_23_counts, e lookup_keccakf1600_state_pi_and_24_counts, e lookup_keccakf1600_state_pi_and_30_counts, e lookup_keccakf1600_state_pi_and_31_counts, e lookup_keccakf1600_state_pi_and_32_counts, e lookup_keccakf1600_state_pi_and_33_counts, e lookup_keccakf1600_state_pi_and_34_counts, e lookup_keccakf1600_state_pi_and_40_counts, e lookup_keccakf1600_state_pi_and_41_counts, e lookup_keccakf1600_state_pi_and_42_counts, e lookup_keccakf1600_state_pi_and_43_counts, e lookup_keccakf1600_state_pi_and_44_counts, e lookup_keccakf1600_state_chi_00_counts, e lookup_keccakf1600_state_chi_01_counts, e lookup_keccakf1600_state_chi_02_counts, e lookup_keccakf1600_state_chi_03_counts, e lookup_keccakf1600_state_chi_04_counts, e lookup_keccakf1600_state_chi_10_counts, e lookup_keccakf1600_state_chi_11_counts, e lookup_keccakf1600_state_chi_12_counts, e lookup_keccakf1600_state_chi_13_counts, e lookup_keccakf1600_state_chi_14_counts, e lookup_keccakf1600_state_chi_20_counts, e lookup_keccakf1600_state_chi_21_counts, e lookup_keccakf1600_state_chi_22_counts, e lookup_keccakf1600_state_chi_23_counts, e lookup_keccakf1600_state_chi_24_counts, e lookup_keccakf1600_state_chi_30_counts, e lookup_keccakf1600_state_chi_31_counts, e lookup_keccakf1600_state_chi_32_counts, e lookup_keccakf1600_state_chi_33_counts, e lookup_keccakf1600_state_chi_34_counts, e lookup_keccakf1600_state_chi_40_counts, e lookup_keccakf1600_state_chi_41_counts, e lookup_keccakf1600_state_chi_42_counts, e lookup_keccakf1600_state_chi_43_counts, e lookup_keccakf1600_state_chi_44_counts, e lookup_keccakf1600_round_cst_counts, e lookup_keccakf1600_state_iota_00_counts, e lookup_keccakf1600_src_out_of_range_toggle_counts, e lookup_keccakf1600_dst_out_of_range_toggle_counts, e lookup_poseidon2_mem_check_src_addr_in_range_counts, e lookup_poseidon2_mem_check_dst_addr_in_range_counts, e lookup_poseidon2_mem_input_output_poseidon2_perm_counts, e lookup_to_radix_limb_range_counts, e lookup_to_radix_limb_less_than_radix_range_counts, e lookup_to_radix_fetch_safe_limbs_counts, e lookup_to_radix_fetch_p_limb_counts, e lookup_to_radix_limb_p_diff_range_counts, e lookup_scalar_mul_to_radix_counts, e lookup_scalar_mul_double_counts, e lookup_scalar_mul_add_counts, e lookup_sha256_range_comp_w_lhs_counts, e lookup_sha256_range_comp_w_rhs_counts, e lookup_sha256_range_rhs_w_7_counts, e lookup_sha256_range_rhs_w_18_counts, e lookup_sha256_range_rhs_w_3_counts, e lookup_sha256_w_s_0_xor_0_counts, e lookup_sha256_w_s_0_xor_1_counts, e lookup_sha256_range_rhs_w_17_counts, e lookup_sha256_range_rhs_w_19_counts, e lookup_sha256_range_rhs_w_10_counts, e lookup_sha256_w_s_1_xor_0_counts, e lookup_sha256_w_s_1_xor_1_counts, e lookup_sha256_range_rhs_e_6_counts, e lookup_sha256_range_rhs_e_11_counts, e lookup_sha256_range_rhs_e_25_counts, e lookup_sha256_s_1_xor_0_counts, e lookup_sha256_s_1_xor_1_counts, e lookup_sha256_ch_and_0_counts, e lookup_sha256_ch_and_1_counts, e lookup_sha256_ch_xor_counts, e lookup_sha256_round_constant_counts, e lookup_sha256_range_rhs_a_2_counts, e lookup_sha256_range_rhs_a_13_counts, e lookup_sha256_range_rhs_a_22_counts, e lookup_sha256_s_0_xor_0_counts, e lookup_sha256_s_0_xor_1_counts, e lookup_sha256_maj_and_0_counts, e lookup_sha256_maj_and_1_counts, e lookup_sha256_maj_and_2_counts, e lookup_sha256_maj_xor_0_counts, e lookup_sha256_maj_xor_1_counts, e lookup_sha256_range_comp_next_a_lhs_counts, e lookup_sha256_range_comp_next_a_rhs_counts, e lookup_sha256_range_comp_next_e_lhs_counts, e lookup_sha256_range_comp_next_e_rhs_counts, e lookup_sha256_range_comp_a_rhs_counts, e lookup_sha256_range_comp_b_rhs_counts, e lookup_sha256_range_comp_c_rhs_counts, e lookup_sha256_range_comp_d_rhs_counts, e lookup_sha256_range_comp_e_rhs_counts, e lookup_sha256_range_comp_f_rhs_counts, e lookup_sha256_range_comp_g_rhs_counts, e lookup_sha256_range_comp_h_rhs_counts, e lookup_sha256_mem_check_state_addr_in_range_counts, e lookup_sha256_mem_check_input_addr_in_range_counts, e lookup_sha256_mem_check_output_addr_in_range_counts, e lookup_to_radix_mem_check_dst_addr_in_range_counts, e lookup_to_radix_mem_check_radix_lt_2_counts, e lookup_to_radix_mem_check_radix_gt_256_counts, e lookup_to_radix_mem_input_output_to_radix_counts, e lookup_poseidon2_hash_poseidon2_perm_counts, e lookup_address_derivation_salted_initialization_hash_poseidon2_0_counts, e lookup_address_derivation_salted_initialization_hash_poseidon2_1_counts, e lookup_address_derivation_partial_address_poseidon2_counts, e lookup_address_derivation_public_keys_hash_poseidon2_0_counts, e lookup_address_derivation_public_keys_hash_poseidon2_1_counts, e lookup_address_derivation_public_keys_hash_poseidon2_2_counts, e lookup_address_derivation_public_keys_hash_poseidon2_3_counts, e lookup_address_derivation_public_keys_hash_poseidon2_4_counts, e lookup_address_derivation_preaddress_poseidon2_counts, e lookup_address_derivation_preaddress_scalar_mul_counts, e lookup_address_derivation_address_ecadd_counts, e lookup_bc_decomposition_bytes_are_bytes_counts, e lookup_bc_hashing_poseidon2_hash_counts, e lookup_merkle_check_merkle_poseidon2_read_counts, e lookup_merkle_check_merkle_poseidon2_write_counts, e lookup_indexed_tree_check_silo_poseidon2_counts, e lookup_indexed_tree_check_low_leaf_value_validation_counts, e lookup_indexed_tree_check_low_leaf_next_value_validation_counts, e lookup_indexed_tree_check_low_leaf_poseidon2_counts, e lookup_indexed_tree_check_updated_low_leaf_poseidon2_counts, e lookup_indexed_tree_check_low_leaf_merkle_check_counts, e lookup_indexed_tree_check_new_leaf_poseidon2_counts, e lookup_indexed_tree_check_new_leaf_merkle_check_counts, e lookup_indexed_tree_check_write_value_to_public_inputs_counts, e lookup_public_data_squash_leaf_slot_increase_ff_gt_counts, e lookup_public_data_squash_clk_diff_range_lo_counts, e lookup_public_data_squash_clk_diff_range_hi_counts, e lookup_public_data_check_clk_diff_range_lo_counts, e lookup_public_data_check_clk_diff_range_hi_counts, e lookup_public_data_check_silo_poseidon2_counts, e lookup_public_data_check_low_leaf_slot_validation_counts, e lookup_public_data_check_low_leaf_next_slot_validation_counts, e lookup_public_data_check_low_leaf_poseidon2_0_counts, e lookup_public_data_check_low_leaf_poseidon2_1_counts, e lookup_public_data_check_updated_low_leaf_poseidon2_0_counts, e lookup_public_data_check_updated_low_leaf_poseidon2_1_counts, e lookup_public_data_check_low_leaf_merkle_check_counts, e lookup_public_data_check_new_leaf_poseidon2_0_counts, e lookup_public_data_check_new_leaf_poseidon2_1_counts, e lookup_public_data_check_new_leaf_merkle_check_counts, e lookup_public_data_check_write_public_data_to_public_inputs_counts, e lookup_public_data_check_write_writes_length_to_public_inputs_counts, e lookup_update_check_timestamp_from_public_inputs_counts, e lookup_update_check_delayed_public_mutable_slot_poseidon2_counts, e lookup_update_check_update_hash_public_data_read_counts, e lookup_update_check_update_hash_poseidon2_counts, e lookup_update_check_update_hi_metadata_range_counts, e lookup_update_check_update_lo_metadata_range_counts, e lookup_update_check_timestamp_is_lt_timestamp_of_change_counts, e lookup_contract_instance_retrieval_check_protocol_address_range_counts, e lookup_contract_instance_retrieval_read_derived_address_from_public_inputs_counts, e lookup_contract_instance_retrieval_deployment_nullifier_read_counts, e lookup_contract_instance_retrieval_address_derivation_counts, e lookup_contract_instance_retrieval_update_check_counts, e lookup_class_id_derivation_class_id_poseidon2_0_counts, e lookup_class_id_derivation_class_id_poseidon2_1_counts, e lookup_bc_retrieval_contract_instance_retrieval_counts, e lookup_bc_retrieval_class_id_derivation_counts, e lookup_bc_retrieval_is_new_class_check_counts, e lookup_bc_retrieval_retrieved_bytecodes_insertion_counts, e lookup_instr_fetching_pc_abs_diff_positive_counts, e lookup_instr_fetching_instr_abs_diff_positive_counts, e lookup_instr_fetching_tag_value_validation_counts, e lookup_instr_fetching_bytecode_size_from_bc_dec_counts, e lookup_instr_fetching_bytes_from_bc_dec_counts, e lookup_instr_fetching_wire_instruction_info_counts, e lookup_emit_public_log_check_memory_out_of_bounds_counts, e lookup_emit_public_log_check_log_fields_count_counts, e lookup_emit_public_log_write_data_to_public_inputs_counts, e lookup_get_contract_instance_precomputed_info_counts, e lookup_get_contract_instance_contract_instance_retrieval_counts, e lookup_l1_to_l2_message_tree_check_merkle_check_counts, e lookup_internal_call_unwind_call_stack_counts, e lookup_context_ctx_stack_rollback_counts, e lookup_context_ctx_stack_return_counts, e lookup_addressing_relative_overflow_result_0_counts, e lookup_addressing_relative_overflow_result_1_counts, e lookup_addressing_relative_overflow_result_2_counts, e lookup_addressing_relative_overflow_result_3_counts, e lookup_addressing_relative_overflow_result_4_counts, e lookup_addressing_relative_overflow_result_5_counts, e lookup_addressing_relative_overflow_result_6_counts, e lookup_gas_addressing_gas_read_counts, e lookup_gas_is_out_of_gas_l2_counts, e lookup_gas_is_out_of_gas_da_counts, e lookup_note_hash_tree_check_silo_poseidon2_counts, e lookup_note_hash_tree_check_read_first_nullifier_counts, e lookup_note_hash_tree_check_nonce_computation_poseidon2_counts, e lookup_note_hash_tree_check_unique_note_hash_poseidon2_counts, e lookup_note_hash_tree_check_merkle_check_counts, e lookup_note_hash_tree_check_write_note_hash_to_public_inputs_counts, e lookup_emit_notehash_notehash_tree_write_counts, e lookup_emit_nullifier_write_nullifier_counts, e lookup_external_call_is_l2_gas_left_gt_allocated_counts, e lookup_external_call_is_da_gas_left_gt_allocated_counts, e lookup_get_env_var_precomputed_info_counts, e lookup_get_env_var_read_from_public_inputs_col0_counts, e lookup_get_env_var_read_from_public_inputs_col1_counts, e lookup_l1_to_l2_message_exists_l1_to_l2_msg_leaf_index_in_range_counts, e lookup_l1_to_l2_message_exists_l1_to_l2_msg_read_counts, e lookup_notehash_exists_note_hash_leaf_index_in_range_counts, e lookup_notehash_exists_note_hash_read_counts, e lookup_nullifier_exists_nullifier_exists_check_counts, e lookup_send_l2_to_l1_msg_recipient_check_counts, e lookup_send_l2_to_l1_msg_write_l2_to_l1_msg_counts, e lookup_sload_storage_read_counts, e lookup_sstore_record_written_storage_slot_counts, e lookup_execution_bytecode_retrieval_result_counts, e lookup_execution_instruction_fetching_result_counts, e lookup_execution_instruction_fetching_body_counts, e lookup_execution_exec_spec_read_counts, e lookup_execution_dyn_l2_factor_bitwise_counts, e lookup_execution_check_radix_gt_256_counts, e lookup_execution_get_p_limbs_counts, e lookup_execution_get_max_limbs_counts, e lookup_execution_check_written_storage_slot_counts, e lookup_execution_dispatch_to_alu_counts, e lookup_execution_dispatch_to_bitwise_counts, e lookup_execution_dispatch_to_cast_counts, e lookup_execution_dispatch_to_set_counts, e lookup_calldata_hashing_get_calldata_field_0_counts, e lookup_calldata_hashing_get_calldata_field_1_counts, e lookup_calldata_hashing_get_calldata_field_2_counts, e lookup_calldata_hashing_poseidon2_hash_counts, e lookup_tx_context_public_inputs_note_hash_tree_counts, e lookup_tx_context_public_inputs_nullifier_tree_counts, e lookup_tx_context_public_inputs_public_data_tree_counts, e lookup_tx_context_public_inputs_l1_l2_tree_counts, e lookup_tx_context_public_inputs_gas_used_counts, e lookup_tx_context_public_inputs_read_gas_limit_counts, e lookup_tx_context_public_inputs_read_reverted_counts, e lookup_tx_context_restore_state_on_revert_counts, e lookup_tx_context_public_inputs_write_note_hash_count_counts, e lookup_tx_context_public_inputs_write_nullifier_count_counts, e lookup_tx_context_public_inputs_write_l2_to_l1_message_count_counts, e lookup_tx_context_public_inputs_write_public_log_count_counts, e lookup_tx_read_phase_spec_counts, e lookup_tx_read_phase_length_counts, e lookup_tx_read_public_call_request_phase_counts, e lookup_tx_read_tree_insert_value_counts, e lookup_tx_note_hash_append_counts, e lookup_tx_nullifier_append_counts, e lookup_tx_read_l2_l1_msg_counts, e lookup_tx_write_l2_l1_msg_counts, e lookup_tx_read_effective_fee_public_inputs_counts, e lookup_tx_read_fee_payer_public_inputs_counts, e lookup_tx_balance_slot_poseidon2_counts, e lookup_tx_balance_read_counts, e lookup_tx_balance_validation_counts, e lookup_tx_write_fee_public_inputs_counts, e bc_decomposition_bytes, e bc_decomposition_bytes_pc_plus_1, e bc_decomposition_bytes_pc_plus_10, e bc_decomposition_bytes_pc_plus_11, e bc_decomposition_bytes_pc_plus_12, e bc_decomposition_bytes_pc_plus_13, e bc_decomposition_bytes_pc_plus_14, e bc_decomposition_bytes_pc_plus_15, e bc_decomposition_bytes_pc_plus_16, e bc_decomposition_bytes_pc_plus_17, e bc_decomposition_bytes_pc_plus_18, e bc_decomposition_bytes_pc_plus_19, e bc_decomposition_bytes_pc_plus_2, e bc_decomposition_bytes_pc_plus_20, e bc_decomposition_bytes_pc_plus_21, e bc_decomposition_bytes_pc_plus_22, e bc_decomposition_bytes_pc_plus_23, e bc_decomposition_bytes_pc_plus_24, e bc_decomposition_bytes_pc_plus_25, e bc_decomposition_bytes_pc_plus_26, e bc_decomposition_bytes_pc_plus_27, e bc_decomposition_bytes_pc_plus_28, e bc_decomposition_bytes_pc_plus_29, e bc_decomposition_bytes_pc_plus_3, e bc_decomposition_bytes_pc_plus_30, e bc_decomposition_bytes_pc_plus_31, e bc_decomposition_bytes_pc_plus_32, e bc_decomposition_bytes_pc_plus_33, e bc_decomposition_bytes_pc_plus_34, e bc_decomposition_bytes_pc_plus_35, e bc_decomposition_bytes_pc_plus_4, e bc_decomposition_bytes_pc_plus_5, e bc_decomposition_bytes_pc_plus_6, e bc_decomposition_bytes_pc_plus_7, e bc_decomposition_bytes_pc_plus_8, e bc_decomposition_bytes_pc_plus_9, e bc_decomposition_bytes_remaining, e bc_decomposition_id, e bc_decomposition_next_packed_pc, e bc_decomposition_pc, e bc_decomposition_sel, e bc_decomposition_sel_windows_gt_remaining, e bc_decomposition_start, e bc_hashing_bytecode_id, e bc_hashing_padding, e bc_hashing_pc_index_1, e bc_hashing_rounds_rem, e bc_hashing_sel, e bc_hashing_sel_not_start, e bc_hashing_start, e bitwise_acc_ia, e bitwise_acc_ib, e bitwise_acc_ic, e bitwise_ctr, e bitwise_op_id, e bitwise_sel, e bitwise_start, e calldata_context_id, e calldata_hashing_calldata_size, e calldata_hashing_context_id, e calldata_hashing_index_0_, e calldata_hashing_output_hash, e calldata_hashing_rounds_rem, e calldata_hashing_sel, e calldata_hashing_start, e calldata_index, e calldata_sel, e data_copy_clk, e data_copy_copy_size, e data_copy_dst_addr, e data_copy_dst_context_id, e data_copy_padding, e data_copy_read_addr, e data_copy_reads_left, e data_copy_sel, e data_copy_sel_cd_copy, e data_copy_src_context_id, e data_copy_start, e emit_public_log_contract_address, e emit_public_log_correct_tag, e emit_public_log_error_out_of_bounds, e emit_public_log_error_tag_mismatch, e emit_public_log_execution_clk, e emit_public_log_is_write_contract_address, e emit_public_log_is_write_memory_value, e emit_public_log_log_address, e emit_public_log_public_inputs_index, e emit_public_log_remaining_rows, e emit_public_log_seen_wrong_tag, e emit_public_log_sel, e emit_public_log_sel_write_to_public_inputs, e emit_public_log_space_id, e emit_public_log_start, e execution_bytecode_id, e execution_clk, e execution_context_id, e execution_contract_address, e execution_da_gas_limit, e execution_discard, e execution_dying_context_id, e execution_enqueued_call_start, e execution_internal_call_id, e execution_internal_call_return_id, e execution_is_static, e execution_l1_l2_tree_root, e execution_l2_gas_limit, e execution_last_child_id, e execution_last_child_returndata_addr, e execution_last_child_returndata_size, e execution_last_child_success, e execution_msg_sender, e execution_next_context_id, e execution_next_internal_call_id, e execution_parent_calldata_addr, e execution_parent_calldata_size, e execution_parent_da_gas_limit, e execution_parent_da_gas_used, e execution_parent_id, e execution_parent_l2_gas_limit, e execution_parent_l2_gas_used, e execution_pc, e execution_prev_da_gas_used, e execution_prev_l2_gas_used, e execution_prev_note_hash_tree_root, e execution_prev_note_hash_tree_size, e execution_prev_nullifier_tree_root, e execution_prev_nullifier_tree_size, e execution_prev_num_l2_to_l1_messages, e execution_prev_num_note_hashes_emitted, e execution_prev_num_nullifiers_emitted, e execution_prev_num_public_log_fields, e execution_prev_public_data_tree_root, e execution_prev_public_data_tree_size, e execution_prev_retrieved_bytecodes_tree_root, e execution_prev_retrieved_bytecodes_tree_size, e execution_prev_written_public_data_slots_tree_root, e execution_prev_written_public_data_slots_tree_size, e execution_sel, e execution_sel_first_row_in_context, e execution_transaction_fee, e ff_gt_a_hi, e ff_gt_a_lo, e ff_gt_b_hi, e ff_gt_b_lo, e ff_gt_cmp_rng_ctr, e ff_gt_p_sub_a_hi, e ff_gt_p_sub_a_lo, e ff_gt_p_sub_b_hi, e ff_gt_p_sub_b_lo, e ff_gt_sel, e ff_gt_sel_dec, e ff_gt_sel_gt, e keccak_memory_addr, e keccak_memory_clk, e keccak_memory_ctr, e keccak_memory_rw, e keccak_memory_sel, e keccak_memory_space_id, e keccak_memory_start_read, e keccak_memory_start_write, e keccak_memory_tag_error, e keccak_memory_val_0_, e keccak_memory_val_10_, e keccak_memory_val_11_, e keccak_memory_val_12_, e keccak_memory_val_13_, e keccak_memory_val_14_, e keccak_memory_val_15_, e keccak_memory_val_16_, e keccak_memory_val_17_, e keccak_memory_val_18_, e keccak_memory_val_19_, e keccak_memory_val_1_, e keccak_memory_val_20_, e keccak_memory_val_21_, e keccak_memory_val_22_, e keccak_memory_val_23_, e keccak_memory_val_2_, e keccak_memory_val_3_, e keccak_memory_val_4_, e keccak_memory_val_5_, e keccak_memory_val_6_, e keccak_memory_val_7_, e keccak_memory_val_8_, e keccak_memory_val_9_, e keccakf1600_clk, e keccakf1600_dst_addr, e keccakf1600_round, e keccakf1600_sel, e keccakf1600_sel_no_error, e keccakf1600_space_id, e keccakf1600_start, e keccakf1600_state_in_00, e keccakf1600_state_in_01, e keccakf1600_state_in_02, e keccakf1600_state_in_03, e keccakf1600_state_in_04, e keccakf1600_state_in_10, e keccakf1600_state_in_11, e keccakf1600_state_in_12, e keccakf1600_state_in_13, e keccakf1600_state_in_14, e keccakf1600_state_in_20, e keccakf1600_state_in_21, e keccakf1600_state_in_22, e keccakf1600_state_in_23, e keccakf1600_state_in_24, e keccakf1600_state_in_30, e keccakf1600_state_in_31, e keccakf1600_state_in_32, e keccakf1600_state_in_33, e keccakf1600_state_in_34, e keccakf1600_state_in_40, e keccakf1600_state_in_41, e keccakf1600_state_in_42, e keccakf1600_state_in_43, e keccakf1600_state_in_44, e memory_address, e memory_clk, e memory_rw, e memory_sel, e memory_space_id, e memory_tag, e memory_value, e merkle_check_index, e merkle_check_merkle_hash_separator, e merkle_check_path_len, e merkle_check_read_node, e merkle_check_read_root, e merkle_check_sel, e merkle_check_start, e merkle_check_write, e merkle_check_write_node, e merkle_check_write_root, e poseidon2_hash_a_0, e poseidon2_hash_a_1, e poseidon2_hash_a_2, e poseidon2_hash_a_3, e poseidon2_hash_input_0, e poseidon2_hash_input_1, e poseidon2_hash_input_2, e poseidon2_hash_num_perm_rounds_rem, e poseidon2_hash_output, e poseidon2_hash_sel, e poseidon2_hash_start, e public_data_check_clk, e public_data_check_sel, e public_data_check_write_idx, e public_data_squash_clk, e public_data_squash_final_value, e public_data_squash_leaf_slot, e public_data_squash_sel, e public_data_squash_write_to_public_inputs, e scalar_mul_bit_idx, e scalar_mul_point_inf, e scalar_mul_point_x, e scalar_mul_point_y, e scalar_mul_res_inf, e scalar_mul_res_x, e scalar_mul_res_y, e scalar_mul_scalar, e scalar_mul_sel, e scalar_mul_start, e scalar_mul_temp_inf, e scalar_mul_temp_x, e scalar_mul_temp_y, e sha256_a, e sha256_b, e sha256_c, e sha256_d, e sha256_e, e sha256_execution_clk, e sha256_f, e sha256_g, e sha256_h, e sha256_helper_w0, e sha256_helper_w1, e sha256_helper_w10, e sha256_helper_w11, e sha256_helper_w12, e sha256_helper_w13, e sha256_helper_w14, e sha256_helper_w15, e sha256_helper_w2, e sha256_helper_w3, e sha256_helper_w4, e sha256_helper_w5, e sha256_helper_w6, e sha256_helper_w7, e sha256_helper_w8, e sha256_helper_w9, e sha256_init_a, e sha256_init_b, e sha256_init_c, e sha256_init_d, e sha256_init_e, e sha256_init_f, e sha256_init_g, e sha256_init_h, e sha256_input_addr, e sha256_input_rounds_rem, e sha256_output_addr, e sha256_rounds_remaining, e sha256_sel, e sha256_sel_invalid_input_tag_err, e sha256_space_id, e sha256_start, e to_radix_acc, e to_radix_acc_under_p, e to_radix_limb, e to_radix_limb_eq_p, e to_radix_limb_index, e to_radix_limb_lt_p, e to_radix_mem_dst_addr, e to_radix_mem_execution_clk, e to_radix_mem_is_output_bits, e to_radix_mem_num_limbs, e to_radix_mem_radix, e to_radix_mem_sel, e to_radix_mem_sel_should_decompose, e to_radix_mem_sel_should_write_mem, e to_radix_mem_space_id, e to_radix_mem_start, e to_radix_mem_value_to_decompose, e to_radix_not_padding_limb, e to_radix_power, e to_radix_radix, e to_radix_safe_limbs, e to_radix_sel, e to_radix_start, e to_radix_value, e tx_da_gas_limit, e tx_discard, e tx_fee, e tx_is_revertible, e tx_is_teardown, e tx_l1_l2_tree_root, e tx_l1_l2_tree_size, e tx_l2_gas_limit, e tx_next_context_id, e tx_phase_value, e tx_prev_da_gas_used, e tx_prev_l2_gas_used, e tx_prev_note_hash_tree_root, e tx_prev_note_hash_tree_size, e tx_prev_nullifier_tree_root, e tx_prev_nullifier_tree_size, e tx_prev_num_l2_to_l1_messages, e tx_prev_num_note_hashes_emitted, e tx_prev_num_nullifiers_emitted, e tx_prev_num_public_log_fields, e tx_prev_public_data_tree_root, e tx_prev_public_data_tree_size, e tx_prev_retrieved_bytecodes_tree_root, e tx_prev_retrieved_bytecodes_tree_size, e tx_prev_written_public_data_slots_tree_root, e tx_prev_written_public_data_slots_tree_size, e tx_read_pi_offset, e tx_remaining_phase_counter, e tx_reverted, e tx_sel, e tx_start_phase, e tx_start_tx, e tx_tx_reverted
 #define AVM2_DERIVED_WITNESS_ENTITIES_E(e) e perm_data_copy_mem_write_inv, e perm_data_copy_mem_read_inv, e perm_ecc_mem_write_mem_0_inv, e perm_ecc_mem_write_mem_1_inv, e perm_ecc_mem_write_mem_2_inv, e perm_keccak_memory_slice_to_mem_inv, e perm_keccakf1600_read_to_slice_inv, e perm_keccakf1600_write_to_slice_inv, e perm_poseidon2_mem_pos_read_mem_0_inv, e perm_poseidon2_mem_pos_read_mem_1_inv, e perm_poseidon2_mem_pos_read_mem_2_inv, e perm_poseidon2_mem_pos_read_mem_3_inv, e perm_poseidon2_mem_pos_write_mem_0_inv, e perm_poseidon2_mem_pos_write_mem_1_inv, e perm_poseidon2_mem_pos_write_mem_2_inv, e perm_poseidon2_mem_pos_write_mem_3_inv, e perm_sha256_mem_mem_op_0_inv, e perm_sha256_mem_mem_op_1_inv, e perm_sha256_mem_mem_op_2_inv, e perm_sha256_mem_mem_op_3_inv, e perm_sha256_mem_mem_op_4_inv, e perm_sha256_mem_mem_op_5_inv, e perm_sha256_mem_mem_op_6_inv, e perm_sha256_mem_mem_op_7_inv, e perm_sha256_mem_mem_input_read_inv, e perm_to_radix_mem_write_mem_inv, e perm_bc_hashing_bytecode_length_bytes_inv, e perm_bc_hashing_get_packed_field_0_inv, e perm_bc_hashing_get_packed_field_1_inv, e perm_bc_hashing_get_packed_field_2_inv, e perm_public_data_check_squashing_inv, e perm_emit_public_log_read_mem_inv, e perm_get_contract_instance_mem_write_contract_instance_exists_inv, e perm_get_contract_instance_mem_write_contract_instance_member_inv, e perm_internal_call_push_call_stack_inv, e perm_context_ctx_stack_call_inv, e perm_addressing_base_address_from_memory_inv, e perm_addressing_indirect_from_memory_0_inv, e perm_addressing_indirect_from_memory_1_inv, e perm_addressing_indirect_from_memory_2_inv, e perm_addressing_indirect_from_memory_3_inv, e perm_addressing_indirect_from_memory_4_inv, e perm_addressing_indirect_from_memory_5_inv, e perm_addressing_indirect_from_memory_6_inv, e perm_registers_mem_op_0_inv, e perm_registers_mem_op_1_inv, e perm_registers_mem_op_2_inv, e perm_registers_mem_op_3_inv, e perm_registers_mem_op_4_inv, e perm_registers_mem_op_5_inv, e perm_sstore_storage_write_inv, e perm_execution_dispatch_to_cd_copy_inv, e perm_execution_dispatch_to_rd_copy_inv, e perm_execution_dispatch_to_get_contract_instance_inv, e perm_execution_dispatch_to_emit_public_log_inv, e perm_execution_dispatch_to_poseidon2_perm_inv, e perm_execution_dispatch_to_sha256_compression_inv, e perm_execution_dispatch_to_keccakf1600_inv, e perm_execution_dispatch_to_ecc_add_inv, e perm_execution_dispatch_to_to_radix_inv, e perm_calldata_hashing_check_final_size_inv, e perm_tx_read_calldata_hash_inv, e perm_tx_dispatch_exec_start_inv, e perm_tx_dispatch_exec_end_inv, e perm_tx_balance_update_inv, e lookup_range_check_dyn_rng_chk_pow_2_inv, e lookup_range_check_dyn_diff_is_u16_inv, e lookup_range_check_r0_is_u16_inv, e lookup_range_check_r1_is_u16_inv, e lookup_range_check_r2_is_u16_inv, e lookup_range_check_r3_is_u16_inv, e lookup_range_check_r4_is_u16_inv, e lookup_range_check_r5_is_u16_inv, e lookup_range_check_r6_is_u16_inv, e lookup_range_check_r7_is_u16_inv, e lookup_ff_gt_a_lo_range_inv, e lookup_ff_gt_a_hi_range_inv, e lookup_gt_gt_range_inv, e lookup_alu_tag_max_bits_value_inv, e lookup_alu_range_check_decomposition_a_lo_inv, e lookup_alu_range_check_decomposition_a_hi_inv, e lookup_alu_range_check_decomposition_b_lo_inv, e lookup_alu_range_check_decomposition_b_hi_inv, e lookup_alu_range_check_mul_c_hi_inv, e lookup_alu_range_check_div_remainder_inv, e lookup_alu_ff_gt_inv, e lookup_alu_int_gt_inv, e lookup_alu_shifts_two_pow_inv, e lookup_alu_large_trunc_canonical_dec_inv, e lookup_alu_range_check_trunc_mid_inv, e lookup_bitwise_integral_tag_length_inv, e lookup_bitwise_byte_operations_inv, e lookup_memory_range_check_limb_0_inv, e lookup_memory_range_check_limb_1_inv, e lookup_memory_range_check_limb_2_inv, e lookup_memory_tag_max_bits_inv, e lookup_memory_range_check_write_tagged_value_inv, e lookup_data_copy_offset_plus_size_is_gt_data_size_inv, e lookup_data_copy_check_src_addr_in_range_inv, e lookup_data_copy_check_dst_addr_in_range_inv, e lookup_data_copy_sel_has_reads_inv, e lookup_data_copy_col_read_inv, e lookup_ecc_mem_check_dst_addr_in_range_inv, e lookup_ecc_mem_input_output_ecc_add_inv, e lookup_keccakf1600_theta_xor_01_inv, e lookup_keccakf1600_theta_xor_02_inv, e lookup_keccakf1600_theta_xor_03_inv, e lookup_keccakf1600_theta_xor_row_0_inv, e lookup_keccakf1600_theta_xor_11_inv, e lookup_keccakf1600_theta_xor_12_inv, e lookup_keccakf1600_theta_xor_13_inv, e lookup_keccakf1600_theta_xor_row_1_inv, e lookup_keccakf1600_theta_xor_21_inv, e lookup_keccakf1600_theta_xor_22_inv, e lookup_keccakf1600_theta_xor_23_inv, e lookup_keccakf1600_theta_xor_row_2_inv, e lookup_keccakf1600_theta_xor_31_inv, e lookup_keccakf1600_theta_xor_32_inv, e lookup_keccakf1600_theta_xor_33_inv, e lookup_keccakf1600_theta_xor_row_3_inv, e lookup_keccakf1600_theta_xor_41_inv, e lookup_keccakf1600_theta_xor_42_inv, e lookup_keccakf1600_theta_xor_43_inv, e lookup_keccakf1600_theta_xor_row_4_inv, e lookup_keccakf1600_theta_combined_xor_0_inv, e lookup_keccakf1600_theta_combined_xor_1_inv, e lookup_keccakf1600_theta_combined_xor_2_inv, e lookup_keccakf1600_theta_combined_xor_3_inv, e lookup_keccakf1600_theta_combined_xor_4_inv, e lookup_keccakf1600_state_theta_00_inv, e lookup_keccakf1600_state_theta_01_inv, e lookup_keccakf1600_state_theta_02_inv, e lookup_keccakf1600_state_theta_03_inv, e lookup_keccakf1600_state_theta_04_inv, e lookup_keccakf1600_state_theta_10_inv, e lookup_keccakf1600_state_theta_11_inv, e lookup_keccakf1600_state_theta_12_inv, e lookup_keccakf1600_state_theta_13_inv, e lookup_keccakf1600_state_theta_14_inv, e lookup_keccakf1600_state_theta_20_inv, e lookup_keccakf1600_state_theta_21_inv, e lookup_keccakf1600_state_theta_22_inv, e lookup_keccakf1600_state_theta_23_inv, e lookup_keccakf1600_state_theta_24_inv, e lookup_keccakf1600_state_theta_30_inv, e lookup_keccakf1600_state_theta_31_inv, e lookup_keccakf1600_state_theta_32_inv, e lookup_keccakf1600_state_theta_33_inv, e lookup_keccakf1600_state_theta_34_inv, e lookup_keccakf1600_state_theta_40_inv, e lookup_keccakf1600_state_theta_41_inv, e lookup_keccakf1600_state_theta_42_inv, e lookup_keccakf1600_state_theta_43_inv, e lookup_keccakf1600_state_theta_44_inv, e lookup_keccakf1600_theta_limb_02_range_inv, e lookup_keccakf1600_theta_limb_04_range_inv, e lookup_keccakf1600_theta_limb_10_range_inv, e lookup_keccakf1600_theta_limb_12_range_inv, e lookup_keccakf1600_theta_limb_14_range_inv, e lookup_keccakf1600_theta_limb_21_range_inv, e lookup_keccakf1600_theta_limb_23_range_inv, e lookup_keccakf1600_theta_limb_30_range_inv, e lookup_keccakf1600_theta_limb_32_range_inv, e lookup_keccakf1600_theta_limb_33_range_inv, e lookup_keccakf1600_theta_limb_40_range_inv, e lookup_keccakf1600_theta_limb_41_range_inv, e lookup_keccakf1600_theta_limb_43_range_inv, e lookup_keccakf1600_theta_limb_44_range_inv, e lookup_keccakf1600_theta_limb_01_range_inv, e lookup_keccakf1600_theta_limb_03_range_inv, e lookup_keccakf1600_theta_limb_11_range_inv, e lookup_keccakf1600_theta_limb_13_range_inv, e lookup_keccakf1600_theta_limb_20_range_inv, e lookup_keccakf1600_theta_limb_22_range_inv, e lookup_keccakf1600_theta_limb_24_range_inv, e lookup_keccakf1600_theta_limb_31_range_inv, e lookup_keccakf1600_theta_limb_34_range_inv, e lookup_keccakf1600_theta_limb_42_range_inv, e lookup_keccakf1600_state_pi_and_00_inv, e lookup_keccakf1600_state_pi_and_01_inv, e lookup_keccakf1600_state_pi_and_02_inv, e lookup_keccakf1600_state_pi_and_03_inv, e lookup_keccakf1600_state_pi_and_04_inv, e lookup_keccakf1600_state_pi_and_10_inv, e lookup_keccakf1600_state_pi_and_11_inv, e lookup_keccakf1600_state_pi_and_12_inv, e lookup_keccakf1600_state_pi_and_13_inv, e lookup_keccakf1600_state_pi_and_14_inv, e lookup_keccakf1600_state_pi_and_20_inv, e lookup_keccakf1600_state_pi_and_21_inv, e lookup_keccakf1600_state_pi_and_22_inv, e lookup_keccakf1600_state_pi_and_23_inv, e lookup_keccakf1600_state_pi_and_24_inv, e lookup_keccakf1600_state_pi_and_30_inv, e lookup_keccakf1600_state_pi_and_31_inv, e lookup_keccakf1600_state_pi_and_32_inv, e lookup_keccakf1600_state_pi_and_33_inv, e lookup_keccakf1600_state_pi_and_34_inv, e lookup_keccakf1600_state_pi_and_40_inv, e lookup_keccakf1600_state_pi_and_41_inv, e lookup_keccakf1600_state_pi_and_42_inv, e lookup_keccakf1600_state_pi_and_43_inv, e lookup_keccakf1600_state_pi_and_44_inv, e lookup_keccakf1600_state_chi_00_inv, e lookup_keccakf1600_state_chi_01_inv, e lookup_keccakf1600_state_chi_02_inv, e lookup_keccakf1600_state_chi_03_inv, e lookup_keccakf1600_state_chi_04_inv, e lookup_keccakf1600_state_chi_10_inv, e lookup_keccakf1600_state_chi_11_inv, e lookup_keccakf1600_state_chi_12_inv, e lookup_keccakf1600_state_chi_13_inv, e lookup_keccakf1600_state_chi_14_inv, e lookup_keccakf1600_state_chi_20_inv, e lookup_keccakf1600_state_chi_21_inv, e lookup_keccakf1600_state_chi_22_inv, e lookup_keccakf1600_state_chi_23_inv, e lookup_keccakf1600_state_chi_24_inv, e lookup_keccakf1600_state_chi_30_inv, e lookup_keccakf1600_state_chi_31_inv, e lookup_keccakf1600_state_chi_32_inv, e lookup_keccakf1600_state_chi_33_inv, e lookup_keccakf1600_state_chi_34_inv, e lookup_keccakf1600_state_chi_40_inv, e lookup_keccakf1600_state_chi_41_inv, e lookup_keccakf1600_state_chi_42_inv, e lookup_keccakf1600_state_chi_43_inv, e lookup_keccakf1600_state_chi_44_inv, e lookup_keccakf1600_round_cst_inv, e lookup_keccakf1600_state_iota_00_inv, e lookup_keccakf1600_src_out_of_range_toggle_inv, e lookup_keccakf1600_dst_out_of_range_toggle_inv, e lookup_poseidon2_mem_check_src_addr_in_range_inv, e lookup_poseidon2_mem_check_dst_addr_in_range_inv, e lookup_poseidon2_mem_input_output_poseidon2_perm_inv, e lookup_to_radix_limb_range_inv, e lookup_to_radix_limb_less_than_radix_range_inv, e lookup_to_radix_fetch_safe_limbs_inv, e lookup_to_radix_fetch_p_limb_inv, e lookup_to_radix_limb_p_diff_range_inv, e lookup_scalar_mul_to_radix_inv, e lookup_scalar_mul_double_inv, e lookup_scalar_mul_add_inv, e lookup_sha256_range_comp_w_lhs_inv, e lookup_sha256_range_comp_w_rhs_inv, e lookup_sha256_range_rhs_w_7_inv, e lookup_sha256_range_rhs_w_18_inv, e lookup_sha256_range_rhs_w_3_inv, e lookup_sha256_w_s_0_xor_0_inv, e lookup_sha256_w_s_0_xor_1_inv, e lookup_sha256_range_rhs_w_17_inv, e lookup_sha256_range_rhs_w_19_inv, e lookup_sha256_range_rhs_w_10_inv, e lookup_sha256_w_s_1_xor_0_inv, e lookup_sha256_w_s_1_xor_1_inv, e lookup_sha256_range_rhs_e_6_inv, e lookup_sha256_range_rhs_e_11_inv, e lookup_sha256_range_rhs_e_25_inv, e lookup_sha256_s_1_xor_0_inv, e lookup_sha256_s_1_xor_1_inv, e lookup_sha256_ch_and_0_inv, e lookup_sha256_ch_and_1_inv, e lookup_sha256_ch_xor_inv, e lookup_sha256_round_constant_inv, e lookup_sha256_range_rhs_a_2_inv, e lookup_sha256_range_rhs_a_13_inv, e lookup_sha256_range_rhs_a_22_inv, e lookup_sha256_s_0_xor_0_inv, e lookup_sha256_s_0_xor_1_inv, e lookup_sha256_maj_and_0_inv, e lookup_sha256_maj_and_1_inv, e lookup_sha256_maj_and_2_inv, e lookup_sha256_maj_xor_0_inv, e lookup_sha256_maj_xor_1_inv, e lookup_sha256_range_comp_next_a_lhs_inv, e lookup_sha256_range_comp_next_a_rhs_inv, e lookup_sha256_range_comp_next_e_lhs_inv, e lookup_sha256_range_comp_next_e_rhs_inv, e lookup_sha256_range_comp_a_rhs_inv, e lookup_sha256_range_comp_b_rhs_inv, e lookup_sha256_range_comp_c_rhs_inv, e lookup_sha256_range_comp_d_rhs_inv, e lookup_sha256_range_comp_e_rhs_inv, e lookup_sha256_range_comp_f_rhs_inv, e lookup_sha256_range_comp_g_rhs_inv, e lookup_sha256_range_comp_h_rhs_inv, e lookup_sha256_mem_check_state_addr_in_range_inv, e lookup_sha256_mem_check_input_addr_in_range_inv, e lookup_sha256_mem_check_output_addr_in_range_inv, e lookup_to_radix_mem_check_dst_addr_in_range_inv, e lookup_to_radix_mem_check_radix_lt_2_inv, e lookup_to_radix_mem_check_radix_gt_256_inv, e lookup_to_radix_mem_input_output_to_radix_inv, e lookup_poseidon2_hash_poseidon2_perm_inv, e lookup_address_derivation_salted_initialization_hash_poseidon2_0_inv, e lookup_address_derivation_salted_initialization_hash_poseidon2_1_inv, e lookup_address_derivation_partial_address_poseidon2_inv, e lookup_address_derivation_public_keys_hash_poseidon2_0_inv, e lookup_address_derivation_public_keys_hash_poseidon2_1_inv, e lookup_address_derivation_public_keys_hash_poseidon2_2_inv, e lookup_address_derivation_public_keys_hash_poseidon2_3_inv, e lookup_address_derivation_public_keys_hash_poseidon2_4_inv, e lookup_address_derivation_preaddress_poseidon2_inv, e lookup_address_derivation_preaddress_scalar_mul_inv, e lookup_address_derivation_address_ecadd_inv, e lookup_bc_decomposition_bytes_are_bytes_inv, e lookup_bc_hashing_poseidon2_hash_inv, e lookup_merkle_check_merkle_poseidon2_read_inv, e lookup_merkle_check_merkle_poseidon2_write_inv, e lookup_indexed_tree_check_silo_poseidon2_inv, e lookup_indexed_tree_check_low_leaf_value_validation_inv, e lookup_indexed_tree_check_low_leaf_next_value_validation_inv, e lookup_indexed_tree_check_low_leaf_poseidon2_inv, e lookup_indexed_tree_check_updated_low_leaf_poseidon2_inv, e lookup_indexed_tree_check_low_leaf_merkle_check_inv, e lookup_indexed_tree_check_new_leaf_poseidon2_inv, e lookup_indexed_tree_check_new_leaf_merkle_check_inv, e lookup_indexed_tree_check_write_value_to_public_inputs_inv, e lookup_public_data_squash_leaf_slot_increase_ff_gt_inv, e lookup_public_data_squash_clk_diff_range_lo_inv, e lookup_public_data_squash_clk_diff_range_hi_inv, e lookup_public_data_check_clk_diff_range_lo_inv, e lookup_public_data_check_clk_diff_range_hi_inv, e lookup_public_data_check_silo_poseidon2_inv, e lookup_public_data_check_low_leaf_slot_validation_inv, e lookup_public_data_check_low_leaf_next_slot_validation_inv, e lookup_public_data_check_low_leaf_poseidon2_0_inv, e lookup_public_data_check_low_leaf_poseidon2_1_inv, e lookup_public_data_check_updated_low_leaf_poseidon2_0_inv, e lookup_public_data_check_updated_low_leaf_poseidon2_1_inv, e lookup_public_data_check_low_leaf_merkle_check_inv, e lookup_public_data_check_new_leaf_poseidon2_0_inv, e lookup_public_data_check_new_leaf_poseidon2_1_inv, e lookup_public_data_check_new_leaf_merkle_check_inv, e lookup_public_data_check_write_public_data_to_public_inputs_inv, e lookup_public_data_check_write_writes_length_to_public_inputs_inv, e lookup_update_check_timestamp_from_public_inputs_inv, e lookup_update_check_delayed_public_mutable_slot_poseidon2_inv, e lookup_update_check_update_hash_public_data_read_inv, e lookup_update_check_update_hash_poseidon2_inv, e lookup_update_check_update_hi_metadata_range_inv, e lookup_update_check_update_lo_metadata_range_inv, e lookup_update_check_timestamp_is_lt_timestamp_of_change_inv, e lookup_contract_instance_retrieval_check_protocol_address_range_inv, e lookup_contract_instance_retrieval_read_derived_address_from_public_inputs_inv, e lookup_contract_instance_retrieval_deployment_nullifier_read_inv, e lookup_contract_instance_retrieval_address_derivation_inv, e lookup_contract_instance_retrieval_update_check_inv, e lookup_class_id_derivation_class_id_poseidon2_0_inv, e lookup_class_id_derivation_class_id_poseidon2_1_inv, e lookup_bc_retrieval_contract_instance_retrieval_inv, e lookup_bc_retrieval_class_id_derivation_inv, e lookup_bc_retrieval_is_new_class_check_inv, e lookup_bc_retrieval_retrieved_bytecodes_insertion_inv, e lookup_instr_fetching_pc_abs_diff_positive_inv, e lookup_instr_fetching_instr_abs_diff_positive_inv, e lookup_instr_fetching_tag_value_validation_inv, e lookup_instr_fetching_bytecode_size_from_bc_dec_inv, e lookup_instr_fetching_bytes_from_bc_dec_inv, e lookup_instr_fetching_wire_instruction_info_inv, e lookup_emit_public_log_check_memory_out_of_bounds_inv, e lookup_emit_public_log_check_log_fields_count_inv, e lookup_emit_public_log_write_data_to_public_inputs_inv, e lookup_get_contract_instance_precomputed_info_inv, e lookup_get_contract_instance_contract_instance_retrieval_inv, e lookup_l1_to_l2_message_tree_check_merkle_check_inv, e lookup_internal_call_unwind_call_stack_inv, e lookup_context_ctx_stack_rollback_inv, e lookup_context_ctx_stack_return_inv, e lookup_addressing_relative_overflow_result_0_inv, e lookup_addressing_relative_overflow_result_1_inv, e lookup_addressing_relative_overflow_result_2_inv, e lookup_addressing_relative_overflow_result_3_inv, e lookup_addressing_relative_overflow_result_4_inv, e lookup_addressing_relative_overflow_result_5_inv, e lookup_addressing_relative_overflow_result_6_inv, e lookup_gas_addressing_gas_read_inv, e lookup_gas_is_out_of_gas_l2_inv, e lookup_gas_is_out_of_gas_da_inv, e lookup_note_hash_tree_check_silo_poseidon2_inv, e lookup_note_hash_tree_check_read_first_nullifier_inv, e lookup_note_hash_tree_check_nonce_computation_poseidon2_inv, e lookup_note_hash_tree_check_unique_note_hash_poseidon2_inv, e lookup_note_hash_tree_check_merkle_check_inv, e lookup_note_hash_tree_check_write_note_hash_to_public_inputs_inv, e lookup_emit_notehash_notehash_tree_write_inv, e lookup_emit_nullifier_write_nullifier_inv, e lookup_external_call_is_l2_gas_left_gt_allocated_inv, e lookup_external_call_is_da_gas_left_gt_allocated_inv, e lookup_get_env_var_precomputed_info_inv, e lookup_get_env_var_read_from_public_inputs_col0_inv, e lookup_get_env_var_read_from_public_inputs_col1_inv, e lookup_l1_to_l2_message_exists_l1_to_l2_msg_leaf_index_in_range_inv, e lookup_l1_to_l2_message_exists_l1_to_l2_msg_read_inv, e lookup_notehash_exists_note_hash_leaf_index_in_range_inv, e lookup_notehash_exists_note_hash_read_inv, e lookup_nullifier_exists_nullifier_exists_check_inv, e lookup_send_l2_to_l1_msg_recipient_check_inv, e lookup_send_l2_to_l1_msg_write_l2_to_l1_msg_inv, e lookup_sload_storage_read_inv, e lookup_sstore_record_written_storage_slot_inv, e lookup_execution_bytecode_retrieval_result_inv, e lookup_execution_instruction_fetching_result_inv, e lookup_execution_instruction_fetching_body_inv, e lookup_execution_exec_spec_read_inv, e lookup_execution_dyn_l2_factor_bitwise_inv, e lookup_execution_check_radix_gt_256_inv, e lookup_execution_get_p_limbs_inv, e lookup_execution_get_max_limbs_inv, e lookup_execution_check_written_storage_slot_inv, e lookup_execution_dispatch_to_alu_inv, e lookup_execution_dispatch_to_bitwise_inv, e lookup_execution_dispatch_to_cast_inv, e lookup_execution_dispatch_to_set_inv, e lookup_calldata_hashing_get_calldata_field_0_inv, e lookup_calldata_hashing_get_calldata_field_1_inv, e lookup_calldata_hashing_get_calldata_field_2_inv, e lookup_calldata_hashing_poseidon2_hash_inv, e lookup_tx_context_public_inputs_note_hash_tree_inv, e lookup_tx_context_public_inputs_nullifier_tree_inv, e lookup_tx_context_public_inputs_public_data_tree_inv, e lookup_tx_context_public_inputs_l1_l2_tree_inv, e lookup_tx_context_public_inputs_gas_used_inv, e lookup_tx_context_public_inputs_read_gas_limit_inv, e lookup_tx_context_public_inputs_read_reverted_inv, e lookup_tx_context_restore_state_on_revert_inv, e lookup_tx_context_public_inputs_write_note_hash_count_inv, e lookup_tx_context_public_inputs_write_nullifier_count_inv, e lookup_tx_context_public_inputs_write_l2_to_l1_message_count_inv, e lookup_tx_context_public_inputs_write_public_log_count_inv, e lookup_tx_read_phase_spec_inv, e lookup_tx_read_phase_length_inv, e lookup_tx_read_public_call_request_phase_inv, e lookup_tx_read_tree_insert_value_inv, e lookup_tx_note_hash_append_inv, e lookup_tx_nullifier_append_inv, e lookup_tx_read_l2_l1_msg_inv, e lookup_tx_write_l2_l1_msg_inv, e lookup_tx_read_effective_fee_public_inputs_inv, e lookup_tx_read_fee_payer_public_inputs_inv, e lookup_tx_balance_slot_poseidon2_inv, e lookup_tx_balance_read_inv, e lookup_tx_balance_validation_inv, e lookup_tx_write_fee_public_inputs_inv
 #define AVM2_SHIFTED_ENTITIES_E(e) e bc_decomposition_bytes_shift, e bc_decomposition_bytes_pc_plus_1_shift, e bc_decomposition_bytes_pc_plus_10_shift, e bc_decomposition_bytes_pc_plus_11_shift, e bc_decomposition_bytes_pc_plus_12_shift, e bc_decomposition_bytes_pc_plus_13_shift, e bc_decomposition_bytes_pc_plus_14_shift, e bc_decomposition_bytes_pc_plus_15_shift, e bc_decomposition_bytes_pc_plus_16_shift, e bc_decomposition_bytes_pc_plus_17_shift, e bc_decomposition_bytes_pc_plus_18_shift, e bc_decomposition_bytes_pc_plus_19_shift, e bc_decomposition_bytes_pc_plus_2_shift, e bc_decomposition_bytes_pc_plus_20_shift, e bc_decomposition_bytes_pc_plus_21_shift, e bc_decomposition_bytes_pc_plus_22_shift, e bc_decomposition_bytes_pc_plus_23_shift, e bc_decomposition_bytes_pc_plus_24_shift, e bc_decomposition_bytes_pc_plus_25_shift, e bc_decomposition_bytes_pc_plus_26_shift, e bc_decomposition_bytes_pc_plus_27_shift, e bc_decomposition_bytes_pc_plus_28_shift, e bc_decomposition_bytes_pc_plus_29_shift, e bc_decomposition_bytes_pc_plus_3_shift, e bc_decomposition_bytes_pc_plus_30_shift, e bc_decomposition_bytes_pc_plus_31_shift, e bc_decomposition_bytes_pc_plus_32_shift, e bc_decomposition_bytes_pc_plus_33_shift, e bc_decomposition_bytes_pc_plus_34_shift, e bc_decomposition_bytes_pc_plus_35_shift, e bc_decomposition_bytes_pc_plus_4_shift, e bc_decomposition_bytes_pc_plus_5_shift, e bc_decomposition_bytes_pc_plus_6_shift, e bc_decomposition_bytes_pc_plus_7_shift, e bc_decomposition_bytes_pc_plus_8_shift, e bc_decomposition_bytes_pc_plus_9_shift, e bc_decomposition_bytes_remaining_shift, e bc_decomposition_id_shift, e bc_decomposition_next_packed_pc_shift, e bc_decomposition_pc_shift, e bc_decomposition_sel_shift, e bc_decomposition_sel_windows_gt_remaining_shift, e bc_decomposition_start_shift, e bc_hashing_bytecode_id_shift, e bc_hashing_padding_shift, e bc_hashing_pc_index_1_shift, e bc_hashing_rounds_rem_shift, e bc_hashing_sel_shift, e bc_hashing_sel_not_start_shift, e bc_hashing_start_shift, e bitwise_acc_ia_shift, e bitwise_acc_ib_shift, e bitwise_acc_ic_shift, e bitwise_ctr_shift, e bitwise_op_id_shift, e bitwise_sel_shift, e bitwise_start_shift, e calldata_context_id_shift, e calldata_hashing_calldata_size_shift, e calldata_hashing_context_id_shift, e calldata_hashing_index_0__shift, e calldata_hashing_output_hash_shift, e calldata_hashing_rounds_rem_shift, e calldata_hashing_sel_shift, e calldata_hashing_start_shift, e calldata_index_shift, e calldata_sel_shift, e data_copy_clk_shift, e data_copy_copy_size_shift, e data_copy_dst_addr_shift, e data_copy_dst_context_id_shift, e data_copy_padding_shift, e data_copy_read_addr_shift, e data_copy_reads_left_shift, e data_copy_sel_shift, e data_copy_sel_cd_copy_shift, e data_copy_src_context_id_shift, e data_copy_start_shift, e emit_public_log_contract_address_shift, e emit_public_log_correct_tag_shift, e emit_public_log_error_out_of_bounds_shift, e emit_public_log_error_tag_mismatch_shift, e emit_public_log_execution_clk_shift, e emit_public_log_is_write_contract_address_shift, e emit_public_log_is_write_memory_value_shift, e emit_public_log_log_address_shift, e emit_public_log_public_inputs_index_shift, e emit_public_log_remaining_rows_shift, e emit_public_log_seen_wrong_tag_shift, e emit_public_log_sel_shift, e emit_public_log_sel_write_to_public_inputs_shift, e emit_public_log_space_id_shift, e emit_public_log_start_shift, e execution_bytecode_id_shift, e execution_clk_shift, e execution_context_id_shift, e execution_contract_address_shift, e execution_da_gas_limit_shift, e execution_discard_shift, e execution_dying_context_id_shift, e execution_enqueued_call_start_shift, e execution_internal_call_id_shift, e execution_internal_call_return_id_shift, e execution_is_static_shift, e execution_l1_l2_tree_root_shift, e execution_l2_gas_limit_shift, e execution_last_child_id_shift, e execution_last_child_returndata_addr_shift, e execution_last_child_returndata_size_shift, e execution_last_child_success_shift, e execution_msg_sender_shift, e execution_next_context_id_shift, e execution_next_internal_call_id_shift, e execution_parent_calldata_addr_shift, e execution_parent_calldata_size_shift, e execution_parent_da_gas_limit_shift, e execution_parent_da_gas_used_shift, e execution_parent_id_shift, e execution_parent_l2_gas_limit_shift, e execution_parent_l2_gas_used_shift, e execution_pc_shift, e execution_prev_da_gas_used_shift, e execution_prev_l2_gas_used_shift, e execution_prev_note_hash_tree_root_shift, e execution_prev_note_hash_tree_size_shift, e execution_prev_nullifier_tree_root_shift, e execution_prev_nullifier_tree_size_shift, e execution_prev_num_l2_to_l1_messages_shift, e execution_prev_num_note_hashes_emitted_shift, e execution_prev_num_nullifiers_emitted_shift, e execution_prev_num_public_log_fields_shift, e execution_prev_public_data_tree_root_shift, e execution_prev_public_data_tree_size_shift, e execution_prev_retrieved_bytecodes_tree_root_shift, e execution_prev_retrieved_bytecodes_tree_size_shift, e execution_prev_written_public_data_slots_tree_root_shift, e execution_prev_written_public_data_slots_tree_size_shift, e execution_sel_shift, e execution_sel_first_row_in_context_shift, e execution_transaction_fee_shift, e ff_gt_a_hi_shift, e ff_gt_a_lo_shift, e ff_gt_b_hi_shift, e ff_gt_b_lo_shift, e ff_gt_cmp_rng_ctr_shift, e ff_gt_p_sub_a_hi_shift, e ff_gt_p_sub_a_lo_shift, e ff_gt_p_sub_b_hi_shift, e ff_gt_p_sub_b_lo_shift, e ff_gt_sel_shift, e ff_gt_sel_dec_shift, e ff_gt_sel_gt_shift, e keccak_memory_addr_shift, e keccak_memory_clk_shift, e keccak_memory_ctr_shift, e keccak_memory_rw_shift, e keccak_memory_sel_shift, e keccak_memory_space_id_shift, e keccak_memory_start_read_shift, e keccak_memory_start_write_shift, e keccak_memory_tag_error_shift, e keccak_memory_val_0__shift, e keccak_memory_val_10__shift, e keccak_memory_val_11__shift, e keccak_memory_val_12__shift, e keccak_memory_val_13__shift, e keccak_memory_val_14__shift, e keccak_memory_val_15__shift, e keccak_memory_val_16__shift, e keccak_memory_val_17__shift, e keccak_memory_val_18__shift, e keccak_memory_val_19__shift, e keccak_memory_val_1__shift, e keccak_memory_val_20__shift, e keccak_memory_val_21__shift, e keccak_memory_val_22__shift, e keccak_memory_val_23__shift, e keccak_memory_val_2__shift, e keccak_memory_val_3__shift, e keccak_memory_val_4__shift, e keccak_memory_val_5__shift, e keccak_memory_val_6__shift, e keccak_memory_val_7__shift, e keccak_memory_val_8__shift, e keccak_memory_val_9__shift, e keccakf1600_clk_shift, e keccakf1600_dst_addr_shift, e keccakf1600_round_shift, e keccakf1600_sel_shift, e keccakf1600_sel_no_error_shift, e keccakf1600_space_id_shift, e keccakf1600_start_shift, e keccakf1600_state_in_00_shift, e keccakf1600_state_in_01_shift, e keccakf1600_state_in_02_shift, e keccakf1600_state_in_03_shift, e keccakf1600_state_in_04_shift, e keccakf1600_state_in_10_shift, e keccakf1600_state_in_11_shift, e keccakf1600_state_in_12_shift, e keccakf1600_state_in_13_shift, e keccakf1600_state_in_14_shift, e keccakf1600_state_in_20_shift, e keccakf1600_state_in_21_shift, e keccakf1600_state_in_22_shift, e keccakf1600_state_in_23_shift, e keccakf1600_state_in_24_shift, e keccakf1600_state_in_30_shift, e keccakf1600_state_in_31_shift, e keccakf1600_state_in_32_shift, e keccakf1600_state_in_33_shift, e keccakf1600_state_in_34_shift, e keccakf1600_state_in_40_shift, e keccakf1600_state_in_41_shift, e keccakf1600_state_in_42_shift, e keccakf1600_state_in_43_shift, e keccakf1600_state_in_44_shift, e memory_address_shift, e memory_clk_shift, e memory_rw_shift, e memory_sel_shift, e memory_space_id_shift, e memory_tag_shift, e memory_value_shift, e merkle_check_index_shift, e merkle_check_merkle_hash_separator_shift, e merkle_check_path_len_shift, e merkle_check_read_node_shift, e merkle_check_read_root_shift, e merkle_check_sel_shift, e merkle_check_start_shift, e merkle_check_write_shift, e merkle_check_write_node_shift, e merkle_check_write_root_shift, e poseidon2_hash_a_0_shift, e poseidon2_hash_a_1_shift, e poseidon2_hash_a_2_shift, e poseidon2_hash_a_3_shift, e poseidon2_hash_input_0_shift, e poseidon2_hash_input_1_shift, e poseidon2_hash_input_2_shift, e poseidon2_hash_num_perm_rounds_rem_shift, e poseidon2_hash_output_shift, e poseidon2_hash_sel_shift, e poseidon2_hash_start_shift, e public_data_check_clk_shift, e public_data_check_sel_shift, e public_data_check_write_idx_shift, e public_data_squash_clk_shift, e public_data_squash_final_value_shift, e public_data_squash_leaf_slot_shift, e public_data_squash_sel_shift, e public_data_squash_write_to_public_inputs_shift, e scalar_mul_bit_idx_shift, e scalar_mul_point_inf_shift, e scalar_mul_point_x_shift, e scalar_mul_point_y_shift, e scalar_mul_res_inf_shift, e scalar_mul_res_x_shift, e scalar_mul_res_y_shift, e scalar_mul_scalar_shift, e scalar_mul_sel_shift, e scalar_mul_start_shift, e scalar_mul_temp_inf_shift, e scalar_mul_temp_x_shift, e scalar_mul_temp_y_shift, e sha256_a_shift, e sha256_b_shift, e sha256_c_shift, e sha256_d_shift, e sha256_e_shift, e sha256_execution_clk_shift, e sha256_f_shift, e sha256_g_shift, e sha256_h_shift, e sha256_helper_w0_shift, e sha256_helper_w1_shift, e sha256_helper_w10_shift, e sha256_helper_w11_shift, e sha256_helper_w12_shift, e sha256_helper_w13_shift, e sha256_helper_w14_shift, e sha256_helper_w15_shift, e sha256_helper_w2_shift, e sha256_helper_w3_shift, e sha256_helper_w4_shift, e sha256_helper_w5_shift, e sha256_helper_w6_shift, e sha256_helper_w7_shift, e sha256_helper_w8_shift, e sha256_helper_w9_shift, e sha256_init_a_shift, e sha256_init_b_shift, e sha256_init_c_shift, e sha256_init_d_shift, e sha256_init_e_shift, e sha256_init_f_shift, e sha256_init_g_shift, e sha256_init_h_shift, e sha256_input_addr_shift, e sha256_input_rounds_rem_shift, e sha256_output_addr_shift, e sha256_rounds_remaining_shift, e sha256_sel_shift, e sha256_sel_invalid_input_tag_err_shift, e sha256_space_id_shift, e sha256_start_shift, e to_radix_acc_shift, e to_radix_acc_under_p_shift, e to_radix_limb_shift, e to_radix_limb_eq_p_shift, e to_radix_limb_index_shift, e to_radix_limb_lt_p_shift, e to_radix_mem_dst_addr_shift, e to_radix_mem_execution_clk_shift, e to_radix_mem_is_output_bits_shift, e to_radix_mem_num_limbs_shift, e to_radix_mem_radix_shift, e to_radix_mem_sel_shift, e to_radix_mem_sel_should_decompose_shift, e to_radix_mem_sel_should_write_mem_shift, e to_radix_mem_space_id_shift, e to_radix_mem_start_shift, e to_radix_mem_value_to_decompose_shift, e to_radix_not_padding_limb_shift, e to_radix_power_shift, e to_radix_radix_shift, e to_radix_safe_limbs_shift, e to_radix_sel_shift, e to_radix_start_shift, e to_radix_value_shift, e tx_da_gas_limit_shift, e tx_discard_shift, e tx_fee_shift, e tx_is_revertible_shift, e tx_is_teardown_shift, e tx_l1_l2_tree_root_shift, e tx_l1_l2_tree_size_shift, e tx_l2_gas_limit_shift, e tx_next_context_id_shift, e tx_phase_value_shift, e tx_prev_da_gas_used_shift, e tx_prev_l2_gas_used_shift, e tx_prev_note_hash_tree_root_shift, e tx_prev_note_hash_tree_size_shift, e tx_prev_nullifier_tree_root_shift, e tx_prev_nullifier_tree_size_shift, e tx_prev_num_l2_to_l1_messages_shift, e tx_prev_num_note_hashes_emitted_shift, e tx_prev_num_nullifiers_emitted_shift, e tx_prev_num_public_log_fields_shift, e tx_prev_public_data_tree_root_shift, e tx_prev_public_data_tree_size_shift, e tx_prev_retrieved_bytecodes_tree_root_shift, e tx_prev_retrieved_bytecodes_tree_size_shift, e tx_prev_written_public_data_slots_tree_root_shift, e tx_prev_written_public_data_slots_tree_size_shift, e tx_read_pi_offset_shift, e tx_remaining_phase_counter_shift, e tx_reverted_shift, e tx_sel_shift, e tx_start_phase_shift, e tx_start_tx_shift, e tx_tx_reverted_shift
 #define AVM2_TO_BE_SHIFTED_E(e) e bc_decomposition_bytes, e bc_decomposition_bytes_pc_plus_1, e bc_decomposition_bytes_pc_plus_10, e bc_decomposition_bytes_pc_plus_11, e bc_decomposition_bytes_pc_plus_12, e bc_decomposition_bytes_pc_plus_13, e bc_decomposition_bytes_pc_plus_14, e bc_decomposition_bytes_pc_plus_15, e bc_decomposition_bytes_pc_plus_16, e bc_decomposition_bytes_pc_plus_17, e bc_decomposition_bytes_pc_plus_18, e bc_decomposition_bytes_pc_plus_19, e bc_decomposition_bytes_pc_plus_2, e bc_decomposition_bytes_pc_plus_20, e bc_decomposition_bytes_pc_plus_21, e bc_decomposition_bytes_pc_plus_22, e bc_decomposition_bytes_pc_plus_23, e bc_decomposition_bytes_pc_plus_24, e bc_decomposition_bytes_pc_plus_25, e bc_decomposition_bytes_pc_plus_26, e bc_decomposition_bytes_pc_plus_27, e bc_decomposition_bytes_pc_plus_28, e bc_decomposition_bytes_pc_plus_29, e bc_decomposition_bytes_pc_plus_3, e bc_decomposition_bytes_pc_plus_30, e bc_decomposition_bytes_pc_plus_31, e bc_decomposition_bytes_pc_plus_32, e bc_decomposition_bytes_pc_plus_33, e bc_decomposition_bytes_pc_plus_34, e bc_decomposition_bytes_pc_plus_35, e bc_decomposition_bytes_pc_plus_4, e bc_decomposition_bytes_pc_plus_5, e bc_decomposition_bytes_pc_plus_6, e bc_decomposition_bytes_pc_plus_7, e bc_decomposition_bytes_pc_plus_8, e bc_decomposition_bytes_pc_plus_9, e bc_decomposition_bytes_remaining, e bc_decomposition_id, e bc_decomposition_next_packed_pc, e bc_decomposition_pc, e bc_decomposition_sel, e bc_decomposition_sel_windows_gt_remaining, e bc_decomposition_start, e bc_hashing_bytecode_id, e bc_hashing_padding, e bc_hashing_pc_index_1, e bc_hashing_rounds_rem, e bc_hashing_sel, e bc_hashing_sel_not_start, e bc_hashing_start, e bitwise_acc_ia, e bitwise_acc_ib, e bitwise_acc_ic, e bitwise_ctr, e bitwise_op_id, e bitwise_sel, e bitwise_start, e calldata_context_id, e calldata_hashing_calldata_size, e calldata_hashing_context_id, e calldata_hashing_index_0_, e calldata_hashing_output_hash, e calldata_hashing_rounds_rem, e calldata_hashing_sel, e calldata_hashing_start, e calldata_index, e calldata_sel, e data_copy_clk, e data_copy_copy_size, e data_copy_dst_addr, e data_copy_dst_context_id, e data_copy_padding, e data_copy_read_addr, e data_copy_reads_left, e data_copy_sel, e data_copy_sel_cd_copy, e data_copy_src_context_id, e data_copy_start, e emit_public_log_contract_address, e emit_public_log_correct_tag, e emit_public_log_error_out_of_bounds, e emit_public_log_error_tag_mismatch, e emit_public_log_execution_clk, e emit_public_log_is_write_contract_address, e emit_public_log_is_write_memory_value, e emit_public_log_log_address, e emit_public_log_public_inputs_index, e emit_public_log_remaining_rows, e emit_public_log_seen_wrong_tag, e emit_public_log_sel, e emit_public_log_sel_write_to_public_inputs, e emit_public_log_space_id, e emit_public_log_start, e execution_bytecode_id, e execution_clk, e execution_context_id, e execution_contract_address, e execution_da_gas_limit, e execution_discard, e execution_dying_context_id, e execution_enqueued_call_start, e execution_internal_call_id, e execution_internal_call_return_id, e execution_is_static, e execution_l1_l2_tree_root, e execution_l2_gas_limit, e execution_last_child_id, e execution_last_child_returndata_addr, e execution_last_child_returndata_size, e execution_last_child_success, e execution_msg_sender, e execution_next_context_id, e execution_next_internal_call_id, e execution_parent_calldata_addr, e execution_parent_calldata_size, e execution_parent_da_gas_limit, e execution_parent_da_gas_used, e execution_parent_id, e execution_parent_l2_gas_limit, e execution_parent_l2_gas_used, e execution_pc, e execution_prev_da_gas_used, e execution_prev_l2_gas_used, e execution_prev_note_hash_tree_root, e execution_prev_note_hash_tree_size, e execution_prev_nullifier_tree_root, e execution_prev_nullifier_tree_size, e execution_prev_num_l2_to_l1_messages, e execution_prev_num_note_hashes_emitted, e execution_prev_num_nullifiers_emitted, e execution_prev_num_public_log_fields, e execution_prev_public_data_tree_root, e execution_prev_public_data_tree_size, e execution_prev_retrieved_bytecodes_tree_root, e execution_prev_retrieved_bytecodes_tree_size, e execution_prev_written_public_data_slots_tree_root, e execution_prev_written_public_data_slots_tree_size, e execution_sel, e execution_sel_first_row_in_context, e execution_transaction_fee, e ff_gt_a_hi, e ff_gt_a_lo, e ff_gt_b_hi, e ff_gt_b_lo, e ff_gt_cmp_rng_ctr, e ff_gt_p_sub_a_hi, e ff_gt_p_sub_a_lo, e ff_gt_p_sub_b_hi, e ff_gt_p_sub_b_lo, e ff_gt_sel, e ff_gt_sel_dec, e ff_gt_sel_gt, e keccak_memory_addr, e keccak_memory_clk, e keccak_memory_ctr, e keccak_memory_rw, e keccak_memory_sel, e keccak_memory_space_id, e keccak_memory_start_read, e keccak_memory_start_write, e keccak_memory_tag_error, e keccak_memory_val_0_, e keccak_memory_val_10_, e keccak_memory_val_11_, e keccak_memory_val_12_, e keccak_memory_val_13_, e keccak_memory_val_14_, e keccak_memory_val_15_, e keccak_memory_val_16_, e keccak_memory_val_17_, e keccak_memory_val_18_, e keccak_memory_val_19_, e keccak_memory_val_1_, e keccak_memory_val_20_, e keccak_memory_val_21_, e keccak_memory_val_22_, e keccak_memory_val_23_, e keccak_memory_val_2_, e keccak_memory_val_3_, e keccak_memory_val_4_, e keccak_memory_val_5_, e keccak_memory_val_6_, e keccak_memory_val_7_, e keccak_memory_val_8_, e keccak_memory_val_9_, e keccakf1600_clk, e keccakf1600_dst_addr, e keccakf1600_round, e keccakf1600_sel, e keccakf1600_sel_no_error, e keccakf1600_space_id, e keccakf1600_start, e keccakf1600_state_in_00, e keccakf1600_state_in_01, e keccakf1600_state_in_02, e keccakf1600_state_in_03, e keccakf1600_state_in_04, e keccakf1600_state_in_10, e keccakf1600_state_in_11, e keccakf1600_state_in_12, e keccakf1600_state_in_13, e keccakf1600_state_in_14, e keccakf1600_state_in_20, e keccakf1600_state_in_21, e keccakf1600_state_in_22, e keccakf1600_state_in_23, e keccakf1600_state_in_24, e keccakf1600_state_in_30, e keccakf1600_state_in_31, e keccakf1600_state_in_32, e keccakf1600_state_in_33, e keccakf1600_state_in_34, e keccakf1600_state_in_40, e keccakf1600_state_in_41, e keccakf1600_state_in_42, e keccakf1600_state_in_43, e keccakf1600_state_in_44, e memory_address, e memory_clk, e memory_rw, e memory_sel, e memory_space_id, e memory_tag, e memory_value, e merkle_check_index, e merkle_check_merkle_hash_separator, e merkle_check_path_len, e merkle_check_read_node, e merkle_check_read_root, e merkle_check_sel, e merkle_check_start, e merkle_check_write, e merkle_check_write_node, e merkle_check_write_root, e poseidon2_hash_a_0, e poseidon2_hash_a_1, e poseidon2_hash_a_2, e poseidon2_hash_a_3, e poseidon2_hash_input_0, e poseidon2_hash_input_1, e poseidon2_hash_input_2, e poseidon2_hash_num_perm_rounds_rem, e poseidon2_hash_output, e poseidon2_hash_sel, e poseidon2_hash_start, e public_data_check_clk, e public_data_check_sel, e public_data_check_write_idx, e public_data_squash_clk, e public_data_squash_final_value, e public_data_squash_leaf_slot, e public_data_squash_sel, e public_data_squash_write_to_public_inputs, e scalar_mul_bit_idx, e scalar_mul_point_inf, e scalar_mul_point_x, e scalar_mul_point_y, e scalar_mul_res_inf, e scalar_mul_res_x, e scalar_mul_res_y, e scalar_mul_scalar, e scalar_mul_sel, e scalar_mul_start, e scalar_mul_temp_inf, e scalar_mul_temp_x, e scalar_mul_temp_y, e sha256_a, e sha256_b, e sha256_c, e sha256_d, e sha256_e, e sha256_execution_clk, e sha256_f, e sha256_g, e sha256_h, e sha256_helper_w0, e sha256_helper_w1, e sha256_helper_w10, e sha256_helper_w11, e sha256_helper_w12, e sha256_helper_w13, e sha256_helper_w14, e sha256_helper_w15, e sha256_helper_w2, e sha256_helper_w3, e sha256_helper_w4, e sha256_helper_w5, e sha256_helper_w6, e sha256_helper_w7, e sha256_helper_w8, e sha256_helper_w9, e sha256_init_a, e sha256_init_b, e sha256_init_c, e sha256_init_d, e sha256_init_e, e sha256_init_f, e sha256_init_g, e sha256_init_h, e sha256_input_addr, e sha256_input_rounds_rem, e sha256_output_addr, e sha256_rounds_remaining, e sha256_sel, e sha256_sel_invalid_input_tag_err, e sha256_space_id, e sha256_start, e to_radix_acc, e to_radix_acc_under_p, e to_radix_limb, e to_radix_limb_eq_p, e to_radix_limb_index, e to_radix_limb_lt_p, e to_radix_mem_dst_addr, e to_radix_mem_execution_clk, e to_radix_mem_is_output_bits, e to_radix_mem_num_limbs, e to_radix_mem_radix, e to_radix_mem_sel, e to_radix_mem_sel_should_decompose, e to_radix_mem_sel_should_write_mem, e to_radix_mem_space_id, e to_radix_mem_start, e to_radix_mem_value_to_decompose, e to_radix_not_padding_limb, e to_radix_power, e to_radix_radix, e to_radix_safe_limbs, e to_radix_sel, e to_radix_start, e to_radix_value, e tx_da_gas_limit, e tx_discard, e tx_fee, e tx_is_revertible, e tx_is_teardown, e tx_l1_l2_tree_root, e tx_l1_l2_tree_size, e tx_l2_gas_limit, e tx_next_context_id, e tx_phase_value, e tx_prev_da_gas_used, e tx_prev_l2_gas_used, e tx_prev_note_hash_tree_root, e tx_prev_note_hash_tree_size, e tx_prev_nullifier_tree_root, e tx_prev_nullifier_tree_size, e tx_prev_num_l2_to_l1_messages, e tx_prev_num_note_hashes_emitted, e tx_prev_num_nullifiers_emitted, e tx_prev_num_public_log_fields, e tx_prev_public_data_tree_root, e tx_prev_public_data_tree_size, e tx_prev_retrieved_bytecodes_tree_root, e tx_prev_retrieved_bytecodes_tree_size, e tx_prev_written_public_data_slots_tree_root, e tx_prev_written_public_data_slots_tree_size, e tx_read_pi_offset, e tx_remaining_phase_counter, e tx_reverted, e tx_sel, e tx_start_phase, e tx_start_tx, e tx_tx_reverted
@@ -36,16 +36,16 @@ enum class ColumnAndShifts {
     SENTINEL_DO_NOT_USE,
 };
 
-constexpr auto NUM_COLUMNS_WITH_SHIFTS = 3444;
-constexpr auto NUM_COLUMNS_WITHOUT_SHIFTS = 3080;
-constexpr auto NUM_PRECOMPUTED_ENTITIES = 122;
-constexpr auto NUM_WIRE_ENTITIES = 2514;
+constexpr auto NUM_COLUMNS_WITH_SHIFTS = 3438;
+constexpr auto NUM_COLUMNS_WITHOUT_SHIFTS = 3074;
+constexpr auto NUM_PRECOMPUTED_ENTITIES = 119;
+constexpr auto NUM_WIRE_ENTITIES = 2511;
 constexpr auto NUM_DERIVED_ENTITIES = 444;
 constexpr auto NUM_WITNESS_ENTITIES = NUM_WIRE_ENTITIES + NUM_DERIVED_ENTITIES;
 constexpr auto NUM_WIRES_TO_BE_SHIFTED = 364;
 constexpr auto NUM_SHIFTED_ENTITIES = 364;
 constexpr auto NUM_UNSHIFTED_ENTITIES = NUM_COLUMNS_WITHOUT_SHIFTS;
-constexpr auto NUM_ALL_ENTITIES = 3444;
+constexpr auto NUM_ALL_ENTITIES = 3438;
 
 /*
  * Layout for all entities is:
diff --git a/barretenberg/cpp/src/barretenberg/vm2/generated/flavor_variables.hpp b/barretenberg/cpp/src/barretenberg/vm2/generated/flavor_variables.hpp
index 6f013f072dab..22c2e6bc3473 100644
--- a/barretenberg/cpp/src/barretenberg/vm2/generated/flavor_variables.hpp
+++ b/barretenberg/cpp/src/barretenberg/vm2/generated/flavor_variables.hpp
@@ -140,11 +140,11 @@
 namespace bb::avm2 {
 
 struct AvmFlavorVariables {
-    static constexpr size_t NUM_PRECOMPUTED_ENTITIES = 122;
-    static constexpr size_t NUM_WITNESS_ENTITIES = 2958;
+    static constexpr size_t NUM_PRECOMPUTED_ENTITIES = 119;
+    static constexpr size_t NUM_WITNESS_ENTITIES = 2955;
     static constexpr size_t NUM_SHIFTED_ENTITIES = 364;
-    static constexpr size_t NUM_WIRES = 2514;
-    static constexpr size_t NUM_ALL_ENTITIES = 3444;
+    static constexpr size_t NUM_WIRES = 2511;
+    static constexpr size_t NUM_ALL_ENTITIES = 3438;
 
     // Need to be templated for recursive verifier
     template <typename FF_>
diff --git a/barretenberg/cpp/src/barretenberg/vm2/generated/relations/lookups_tx.hpp b/barretenberg/cpp/src/barretenberg/vm2/generated/relations/lookups_tx.hpp
index 816e1ed908f6..8e91d55c8b49 100644
--- a/barretenberg/cpp/src/barretenberg/vm2/generated/relations/lookups_tx.hpp
+++ b/barretenberg/cpp/src/barretenberg/vm2/generated/relations/lookups_tx.hpp
@@ -16,27 +16,18 @@ namespace bb::avm2 {
 struct lookup_tx_read_phase_spec_settings_ {
     static constexpr std::string_view NAME = "LOOKUP_TX_READ_PHASE_SPEC";
     static constexpr std::string_view RELATION_NAME = "tx";
-    static constexpr size_t LOOKUP_TUPLE_SIZE = 16;
+    static constexpr size_t LOOKUP_TUPLE_SIZE = 13;
     static constexpr Column SRC_SELECTOR = Column::tx_sel;
     static constexpr Column DST_SELECTOR = Column::precomputed_sel_phase;
     static constexpr Column COUNTS = Column::lookup_tx_read_phase_spec_counts;
     static constexpr Column INVERSES = Column::lookup_tx_read_phase_spec_inv;
     static constexpr std::array<ColumnAndShifts, LOOKUP_TUPLE_SIZE> SRC_COLUMNS = {
-        ColumnAndShifts::tx_phase_value,
-        ColumnAndShifts::tx_is_public_call_request,
-        ColumnAndShifts::tx_is_teardown,
-        ColumnAndShifts::tx_is_collect_fee,
-        ColumnAndShifts::tx_is_tree_padding,
-        ColumnAndShifts::tx_is_cleanup,
-        ColumnAndShifts::tx_is_revertible,
-        ColumnAndShifts::tx_read_pi_start_offset,
-        ColumnAndShifts::tx_read_pi_length_offset,
-        ColumnAndShifts::tx_sel_non_revertible_append_note_hash,
-        ColumnAndShifts::tx_sel_non_revertible_append_nullifier,
-        ColumnAndShifts::tx_sel_non_revertible_append_l2_l1_msg,
-        ColumnAndShifts::tx_sel_revertible_append_note_hash,
-        ColumnAndShifts::tx_sel_revertible_append_nullifier,
-        ColumnAndShifts::tx_sel_revertible_append_l2_l1_msg,
+        ColumnAndShifts::tx_phase_value,           ColumnAndShifts::tx_is_public_call_request,
+        ColumnAndShifts::tx_is_teardown,           ColumnAndShifts::tx_is_collect_fee,
+        ColumnAndShifts::tx_is_tree_padding,       ColumnAndShifts::tx_is_cleanup,
+        ColumnAndShifts::tx_is_revertible,         ColumnAndShifts::tx_read_pi_start_offset,
+        ColumnAndShifts::tx_read_pi_length_offset, ColumnAndShifts::tx_sel_append_note_hash,
+        ColumnAndShifts::tx_sel_append_nullifier,  ColumnAndShifts::tx_sel_append_l2_l1_msg,
         ColumnAndShifts::tx_next_phase_on_revert
     };
     static constexpr std::array<ColumnAndShifts, LOOKUP_TUPLE_SIZE> DST_COLUMNS = {
@@ -49,12 +40,9 @@ struct lookup_tx_read_phase_spec_settings_ {
         ColumnAndShifts::precomputed_is_revertible,
         ColumnAndShifts::precomputed_read_pi_start_offset,
         ColumnAndShifts::precomputed_read_pi_length_offset,
-        ColumnAndShifts::precomputed_sel_non_revertible_append_note_hash,
-        ColumnAndShifts::precomputed_sel_non_revertible_append_nullifier,
-        ColumnAndShifts::precomputed_sel_non_revertible_append_l2_l1_msg,
-        ColumnAndShifts::precomputed_sel_revertible_append_note_hash,
-        ColumnAndShifts::precomputed_sel_revertible_append_nullifier,
-        ColumnAndShifts::precomputed_sel_revertible_append_l2_l1_msg,
+        ColumnAndShifts::precomputed_sel_append_note_hash,
+        ColumnAndShifts::precomputed_sel_append_nullifier,
+        ColumnAndShifts::precomputed_sel_append_l2_l1_msg,
         ColumnAndShifts::precomputed_next_phase_on_revert
     };
 };
@@ -151,7 +139,7 @@ struct lookup_tx_note_hash_append_settings_ {
         ColumnAndShifts::tx_prev_note_hash_tree_size,
         ColumnAndShifts::tx_prev_note_hash_tree_root,
         ColumnAndShifts::precomputed_zero,
-        ColumnAndShifts::tx_sel_revertible_append_note_hash,
+        ColumnAndShifts::tx_is_revertible,
         ColumnAndShifts::tx_prev_num_note_hashes_emitted,
         ColumnAndShifts::tx_discard,
         ColumnAndShifts::tx_next_note_hash_tree_root
diff --git a/barretenberg/cpp/src/barretenberg/vm2/generated/relations/tx_context_impl.hpp b/barretenberg/cpp/src/barretenberg/vm2/generated/relations/tx_context_impl.hpp
index e4163fab6215..528590e6c894 100644
--- a/barretenberg/cpp/src/barretenberg/vm2/generated/relations/tx_context_impl.hpp
+++ b/barretenberg/cpp/src/barretenberg/vm2/generated/relations/tx_context_impl.hpp
@@ -40,18 +40,12 @@ void tx_contextImpl<FF_>::accumulate(ContainerOverSubrelations& evals,
         FF(uint256_t{ 1521641569468562450UL, 665739211013355724UL, 15332520522532078145UL, 1150206617693738821UL });
     const auto constants_AVM_RETRIEVED_BYTECODES_TREE_INITIAL_SIZE = FF(1);
     const auto tx_NOT_LAST_ROW = in.get(C::tx_sel) * in.get(C::tx_sel_shift);
-    const auto tx_SEL_CAN_EMIT_NOTE_HASH = in.get(C::tx_is_public_call_request) +
-                                           in.get(C::tx_sel_non_revertible_append_note_hash) +
-                                           in.get(C::tx_sel_revertible_append_note_hash);
-    const auto tx_SEL_CAN_EMIT_NULLIFIER = in.get(C::tx_is_public_call_request) +
-                                           in.get(C::tx_sel_non_revertible_append_nullifier) +
-                                           in.get(C::tx_sel_revertible_append_nullifier);
+    const auto tx_SEL_CAN_EMIT_NOTE_HASH = in.get(C::tx_is_public_call_request) + in.get(C::tx_sel_append_note_hash);
+    const auto tx_SEL_CAN_EMIT_NULLIFIER = in.get(C::tx_is_public_call_request) + in.get(C::tx_sel_append_nullifier);
     const auto tx_SEL_CAN_WRITE_PUBLIC_DATA = in.get(C::tx_is_public_call_request) + in.get(C::tx_is_collect_fee);
     const auto tx_SEL_CAN_WRITE_WRITTEN_PUBLIC_DATA_SLOTS = in.get(C::tx_is_public_call_request);
     const auto tx_SEL_CAN_EMIT_PUBLIC_LOG = in.get(C::tx_is_public_call_request);
-    const auto tx_SEL_CAN_EMIT_L2_L1_MSG = in.get(C::tx_is_public_call_request) +
-                                           in.get(C::tx_sel_non_revertible_append_l2_l1_msg) +
-                                           in.get(C::tx_sel_revertible_append_l2_l1_msg);
+    const auto tx_SEL_CAN_EMIT_L2_L1_MSG = in.get(C::tx_is_public_call_request) + in.get(C::tx_sel_append_l2_l1_msg);
 
     {
         using View = typename std::tuple_element_t<0, ContainerOverSubrelations>::View;
diff --git a/barretenberg/cpp/src/barretenberg/vm2/generated/relations/tx_impl.hpp b/barretenberg/cpp/src/barretenberg/vm2/generated/relations/tx_impl.hpp
index f85ba389f749..5a6610f87be7 100644
--- a/barretenberg/cpp/src/barretenberg/vm2/generated/relations/tx_impl.hpp
+++ b/barretenberg/cpp/src/barretenberg/vm2/generated/relations/tx_impl.hpp
@@ -241,18 +241,15 @@ void txImpl<FF_>::accumulate(ContainerOverSubrelations& evals,
     {
         using View = typename std::tuple_element_t<29, ContainerOverSubrelations>::View;
         auto tmp = (static_cast<View>(in.get(C::tx_is_tree_insert_phase)) -
-                    (static_cast<View>(in.get(C::tx_sel_revertible_append_note_hash)) +
-                     static_cast<View>(in.get(C::tx_sel_non_revertible_append_note_hash)) +
-                     static_cast<View>(in.get(C::tx_sel_revertible_append_nullifier)) +
-                     static_cast<View>(in.get(C::tx_sel_non_revertible_append_nullifier))));
+                    (static_cast<View>(in.get(C::tx_sel_append_note_hash)) +
+                     static_cast<View>(in.get(C::tx_sel_append_nullifier))));
         std::get<29>(evals) += (tmp * scaling_factor);
     }
     {
         using View = typename std::tuple_element_t<30, ContainerOverSubrelations>::View;
         auto tmp = (static_cast<View>(in.get(C::tx_sel_try_note_hash_append)) -
                     (static_cast<View>(in.get(C::tx_sel)) - static_cast<View>(in.get(C::tx_is_padded))) *
-                        (static_cast<View>(in.get(C::tx_sel_revertible_append_note_hash)) +
-                         static_cast<View>(in.get(C::tx_sel_non_revertible_append_note_hash))));
+                        static_cast<View>(in.get(C::tx_sel_append_note_hash)));
         std::get<30>(evals) += (tmp * scaling_factor);
     }
     { // MAX_NOTE_HASH_WRITES_REACHED
@@ -291,8 +288,7 @@ void txImpl<FF_>::accumulate(ContainerOverSubrelations& evals,
         using View = typename std::tuple_element_t<35, ContainerOverSubrelations>::View;
         auto tmp = (static_cast<View>(in.get(C::tx_sel_try_nullifier_append)) -
                     (static_cast<View>(in.get(C::tx_sel)) - static_cast<View>(in.get(C::tx_is_padded))) *
-                        (static_cast<View>(in.get(C::tx_sel_revertible_append_nullifier)) +
-                         static_cast<View>(in.get(C::tx_sel_non_revertible_append_nullifier))));
+                        static_cast<View>(in.get(C::tx_sel_append_nullifier)));
         std::get<35>(evals) += (tmp * scaling_factor);
     }
     {
@@ -365,8 +361,7 @@ void txImpl<FF_>::accumulate(ContainerOverSubrelations& evals,
         using View = typename std::tuple_element_t<45, ContainerOverSubrelations>::View;
         auto tmp = (static_cast<View>(in.get(C::tx_sel_try_l2_l1_msg_append)) -
                     (static_cast<View>(in.get(C::tx_sel)) - static_cast<View>(in.get(C::tx_is_padded))) *
-                        (static_cast<View>(in.get(C::tx_sel_revertible_append_l2_l1_msg)) +
-                         static_cast<View>(in.get(C::tx_sel_non_revertible_append_l2_l1_msg))));
+                        static_cast<View>(in.get(C::tx_sel_append_l2_l1_msg)));
         std::get<45>(evals) += (tmp * scaling_factor);
     }
     { // MAX_L2_L1_MSG_WRITES_REACHED
diff --git a/barretenberg/cpp/src/barretenberg/vm2/simulation/events/bytecode_events.hpp b/barretenberg/cpp/src/barretenberg/vm2/simulation/events/bytecode_events.hpp
index c66ad74bf9fd..14e940e371cf 100644
--- a/barretenberg/cpp/src/barretenberg/vm2/simulation/events/bytecode_events.hpp
+++ b/barretenberg/cpp/src/barretenberg/vm2/simulation/events/bytecode_events.hpp
@@ -35,7 +35,7 @@ struct BytecodeRetrievalEvent {
     AztecAddress address = 0;
     ContractClassId current_class_id = 0;
     ContractClass contract_class{};
-    FF nullifier_root = 0;
+    FF nullifier_tree_root = 0;
     FF public_data_tree_root = 0;
     AppendOnlyTreeSnapshot retrieved_bytecodes_snapshot_before;
     AppendOnlyTreeSnapshot retrieved_bytecodes_snapshot_after;
diff --git a/barretenberg/cpp/src/barretenberg/vm2/simulation/gadgets/bytecode_manager.cpp b/barretenberg/cpp/src/barretenberg/vm2/simulation/gadgets/bytecode_manager.cpp
index 49ac03f86e85..dc2ba0f4ea73 100644
--- a/barretenberg/cpp/src/barretenberg/vm2/simulation/gadgets/bytecode_manager.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm2/simulation/gadgets/bytecode_manager.cpp
@@ -55,7 +55,7 @@ BytecodeId TxBytecodeManager::get_bytecode(const AztecAddress& address)
             .bytecode_id = FF(0), // Use default ID for error cases
             .address = address,
             .current_class_id = FF(0), // Use default ID for error cases
-            .nullifier_root = tree_states.nullifier_tree.tree.root,
+            .nullifier_tree_root = tree_states.nullifier_tree.tree.root,
             .public_data_tree_root = tree_states.public_data_tree.tree.root,
             .retrieved_bytecodes_snapshot_before = before_snapshot,
             .retrieved_bytecodes_snapshot_after = before_snapshot,
@@ -79,7 +79,7 @@ BytecodeId TxBytecodeManager::get_bytecode(const AztecAddress& address)
             .bytecode_id = FF(0), // Use default ID for error cases
             .address = address,
             .current_class_id = current_class_id,
-            .nullifier_root = tree_states.nullifier_tree.tree.root,
+            .nullifier_tree_root = tree_states.nullifier_tree.tree.root,
             .public_data_tree_root = tree_states.public_data_tree.tree.root,
             .retrieved_bytecodes_snapshot_before = before_snapshot,
             .retrieved_bytecodes_snapshot_after = before_snapshot,
@@ -119,7 +119,7 @@ BytecodeId TxBytecodeManager::get_bytecode(const AztecAddress& address)
         .address = address,
         .current_class_id = current_class_id,
         .contract_class = klass,
-        .nullifier_root = tree_states.nullifier_tree.tree.root,
+        .nullifier_tree_root = tree_states.nullifier_tree.tree.root,
         .public_data_tree_root = tree_states.public_data_tree.tree.root,
         .retrieved_bytecodes_snapshot_before = before_snapshot,
         .retrieved_bytecodes_snapshot_after = snapshot_after,
diff --git a/barretenberg/cpp/src/barretenberg/vm2/tooling/stats.cpp b/barretenberg/cpp/src/barretenberg/vm2/tooling/stats.cpp
index f0de3fc57af9..7f4113e93c77 100644
--- a/barretenberg/cpp/src/barretenberg/vm2/tooling/stats.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm2/tooling/stats.cpp
@@ -52,4 +52,10 @@ std::string Stats::to_string(int depth) const
     return joined;
 }
 
+std::vector<std::pair<std::string, uint64_t>> Stats::snapshot() const
+{
+    std::lock_guard lock(stats_mutex);
+    return { stats.begin(), stats.end() };
+}
+
 } // namespace bb::avm2
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/vm2/tooling/stats.hpp b/barretenberg/cpp/src/barretenberg/vm2/tooling/stats.hpp
index 1ea55eec0397..5f183814a3f9 100644
--- a/barretenberg/cpp/src/barretenberg/vm2/tooling/stats.hpp
+++ b/barretenberg/cpp/src/barretenberg/vm2/tooling/stats.hpp
@@ -5,6 +5,8 @@
 #include <mutex>
 #include <string>
 #include <unordered_map>
+#include <utility>
+#include <vector>
 
 // To enable stats tracking, compile in RelWithAssert mode.
 // cmake --preset $PRESET -DCMAKE_BUILD_TYPE=RelWithAssert
@@ -46,6 +48,9 @@ class Stats {
     // prove/logderiv/relation_ms will not be shown.
     std::string to_string(int depth = 2) const;
 
+    // Returns a copy of the stats as (key, value_ms) pairs. Keys retain the "_ms" suffix added by time().
+    std::vector<std::pair<std::string, uint64_t>> snapshot() const;
+
   private:
     Stats() = default;
 
diff --git a/barretenberg/cpp/src/barretenberg/vm2/tracegen/bytecode_trace.cpp b/barretenberg/cpp/src/barretenberg/vm2/tracegen/bytecode_trace.cpp
index 3d556334c677..b97411c7f7a8 100644
--- a/barretenberg/cpp/src/barretenberg/vm2/tracegen/bytecode_trace.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm2/tracegen/bytecode_trace.cpp
@@ -282,7 +282,7 @@ void BytecodeTraceBuilder::process_retrieval(
 
                 // Tree context (for lookup into contract_instance_retrieval)
                 { C::bc_retrieval_public_data_tree_root, event.public_data_tree_root },
-                { C::bc_retrieval_nullifier_tree_root, event.nullifier_root },
+                { C::bc_retrieval_nullifier_tree_root, event.nullifier_tree_root },
 
                 // Retrieved bytecodes tree context (for lookup into indexed_tree_check)
                 { C::bc_retrieval_retrieved_bytecodes_tree_height, AVM_RETRIEVED_BYTECODES_TREE_HEIGHT },
diff --git a/barretenberg/cpp/src/barretenberg/vm2/tracegen/bytecode_trace.test.cpp b/barretenberg/cpp/src/barretenberg/vm2/tracegen/bytecode_trace.test.cpp
index 39b6e19a128d..18a39f98773b 100644
--- a/barretenberg/cpp/src/barretenberg/vm2/tracegen/bytecode_trace.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm2/tracegen/bytecode_trace.test.cpp
@@ -42,7 +42,7 @@ TEST(BytecodeTraceGenTest, BasicRetrieval)
                                   .address = 0xc0ffee,
                                   .current_class_id = 34,
                                   .contract_class = { .artifact_hash = 100, .private_functions_root = 200 },
-                                  .nullifier_root = 300,
+                                  .nullifier_tree_root = 300,
                                   .public_data_tree_root = 400,
                                   .retrieved_bytecodes_snapshot_before = snapshot_before,
                                   .retrieved_bytecodes_snapshot_after = snapshot_after,
@@ -89,7 +89,7 @@ TEST(BytecodeTraceGenTest, RetrievalExistingClass)
                                   .address = 0xc0ffee,
                                   .current_class_id = 34,
                                   .contract_class = { .artifact_hash = 100, .private_functions_root = 200 },
-                                  .nullifier_root = 300,
+                                  .nullifier_tree_root = 300,
                                   .public_data_tree_root = 400,
                                   .retrieved_bytecodes_snapshot_before = snapshot,
                                   .retrieved_bytecodes_snapshot_after = snapshot,
@@ -141,7 +141,7 @@ TEST(BytecodeTraceGenTest, MultipleRetrievalEvents)
                 .address = 0xc0ffee,
                 .current_class_id = 34,
                 .contract_class = { .artifact_hash = 100, .private_functions_root = 200 },
-                .nullifier_root = 300,
+                .nullifier_tree_root = 300,
                 .public_data_tree_root = 400,
                 .retrieved_bytecodes_snapshot_before = snapshot_before,
                 .retrieved_bytecodes_snapshot_after = snapshot_after_0,
@@ -152,7 +152,7 @@ TEST(BytecodeTraceGenTest, MultipleRetrievalEvents)
                 .address = 0xdeadbeef,
                 .current_class_id = 56,
                 .contract_class = { .artifact_hash = 100, .private_functions_root = 200 },
-                .nullifier_root = 300,
+                .nullifier_tree_root = 300,
                 .public_data_tree_root = 400,
                 .retrieved_bytecodes_snapshot_before = snapshot_after_0,
                 .retrieved_bytecodes_snapshot_after = snapshot_after_1,
@@ -163,7 +163,7 @@ TEST(BytecodeTraceGenTest, MultipleRetrievalEvents)
                 .address = 0xdeadb33f,
                 .current_class_id = 56,
                 .contract_class = { .artifact_hash = 100, .private_functions_root = 200 },
-                .nullifier_root = 300,
+                .nullifier_tree_root = 300,
                 .public_data_tree_root = 400,
                 .retrieved_bytecodes_snapshot_before = snapshot_after_1,
                 .retrieved_bytecodes_snapshot_after = snapshot_after_1,
@@ -256,7 +256,7 @@ TEST(BytecodeTraceGenTest, RetrievalInstanceNotFoundError)
                                   .address = 0xc0ffee,
                                   .current_class_id = 0,
                                   .contract_class = {},
-                                  .nullifier_root = 300,
+                                  .nullifier_tree_root = 300,
                                   .public_data_tree_root = 400,
                                   .retrieved_bytecodes_snapshot_before = snapshot,
                                   .retrieved_bytecodes_snapshot_after = snapshot,
@@ -306,7 +306,7 @@ TEST(BytecodeTraceGenTest, RetrievalLimitError)
                                   .address = 0xc0ffee,
                                   .current_class_id = 34,
                                   .contract_class = {},
-                                  .nullifier_root = 300,
+                                  .nullifier_tree_root = 300,
                                   .public_data_tree_root = 400,
                                   .retrieved_bytecodes_snapshot_before = snapshot,
                                   .retrieved_bytecodes_snapshot_after = snapshot,
diff --git a/barretenberg/cpp/src/barretenberg/vm2/tracegen/lib/phase_spec.cpp b/barretenberg/cpp/src/barretenberg/vm2/tracegen/lib/phase_spec.cpp
index 637423b8db69..8a804ed18b89 100644
--- a/barretenberg/cpp/src/barretenberg/vm2/tracegen/lib/phase_spec.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm2/tracegen/lib/phase_spec.cpp
@@ -21,21 +21,21 @@ const std::unordered_map<TransactionPhase, TxPhaseSpec>& get_tx_phase_spec_map()
               .read_pi_start_offset = AVM_PUBLIC_INPUTS_PREVIOUS_NON_REVERTIBLE_ACCUMULATED_DATA_NULLIFIERS_ROW_IDX,
               .read_pi_length_offset =
                   AVM_PUBLIC_INPUTS_PREVIOUS_NON_REVERTIBLE_ACCUMULATED_DATA_ARRAY_LENGTHS_NULLIFIERS_ROW_IDX,
-              .non_revertible_append_nullifier = true,
+              .append_nullifier = true,
           } },
         { TransactionPhase::NR_NOTE_INSERTION,
           {
               .read_pi_start_offset = AVM_PUBLIC_INPUTS_PREVIOUS_NON_REVERTIBLE_ACCUMULATED_DATA_NOTE_HASHES_ROW_IDX,
               .read_pi_length_offset =
                   AVM_PUBLIC_INPUTS_PREVIOUS_NON_REVERTIBLE_ACCUMULATED_DATA_ARRAY_LENGTHS_NOTE_HASHES_ROW_IDX,
-              .non_revertible_append_note_hash = true,
+              .append_note_hash = true,
           } },
         { TransactionPhase::NR_L2_TO_L1_MESSAGE,
           {
               .read_pi_start_offset = AVM_PUBLIC_INPUTS_PREVIOUS_NON_REVERTIBLE_ACCUMULATED_DATA_L2_TO_L1_MSGS_ROW_IDX,
               .read_pi_length_offset =
                   AVM_PUBLIC_INPUTS_PREVIOUS_NON_REVERTIBLE_ACCUMULATED_DATA_ARRAY_LENGTHS_L2_TO_L1_MSGS_ROW_IDX,
-              .non_revertible_append_l2_l1_msg = true,
+              .append_l2_l1_msg = true,
           } },
         { TransactionPhase::SETUP,
           {
@@ -49,7 +49,7 @@ const std::unordered_map<TransactionPhase, TxPhaseSpec>& get_tx_phase_spec_map()
               .read_pi_start_offset = AVM_PUBLIC_INPUTS_PREVIOUS_REVERTIBLE_ACCUMULATED_DATA_NULLIFIERS_ROW_IDX,
               .read_pi_length_offset =
                   AVM_PUBLIC_INPUTS_PREVIOUS_REVERTIBLE_ACCUMULATED_DATA_ARRAY_LENGTHS_NULLIFIERS_ROW_IDX,
-              .revertible_append_nullifier = true,
+              .append_nullifier = true,
               .next_phase_on_revert = static_cast<uint8_t>(TransactionPhase::TEARDOWN),
           } },
         { TransactionPhase::R_NOTE_INSERTION,
@@ -58,7 +58,7 @@ const std::unordered_map<TransactionPhase, TxPhaseSpec>& get_tx_phase_spec_map()
               .read_pi_start_offset = AVM_PUBLIC_INPUTS_PREVIOUS_REVERTIBLE_ACCUMULATED_DATA_NOTE_HASHES_ROW_IDX,
               .read_pi_length_offset =
                   AVM_PUBLIC_INPUTS_PREVIOUS_REVERTIBLE_ACCUMULATED_DATA_ARRAY_LENGTHS_NOTE_HASHES_ROW_IDX,
-              .revertible_append_note_hash = true,
+              .append_note_hash = true,
               .next_phase_on_revert = static_cast<uint8_t>(TransactionPhase::TEARDOWN),
           } },
         { TransactionPhase::R_L2_TO_L1_MESSAGE,
@@ -67,7 +67,7 @@ const std::unordered_map<TransactionPhase, TxPhaseSpec>& get_tx_phase_spec_map()
               .read_pi_start_offset = AVM_PUBLIC_INPUTS_PREVIOUS_REVERTIBLE_ACCUMULATED_DATA_L2_TO_L1_MSGS_ROW_IDX,
               .read_pi_length_offset =
                   AVM_PUBLIC_INPUTS_PREVIOUS_REVERTIBLE_ACCUMULATED_DATA_ARRAY_LENGTHS_L2_TO_L1_MSGS_ROW_IDX,
-              .revertible_append_l2_l1_msg = true,
+              .append_l2_l1_msg = true,
               .next_phase_on_revert = static_cast<uint8_t>(TransactionPhase::TEARDOWN),
           } },
         { TransactionPhase::APP_LOGIC,
diff --git a/barretenberg/cpp/src/barretenberg/vm2/tracegen/lib/phase_spec.hpp b/barretenberg/cpp/src/barretenberg/vm2/tracegen/lib/phase_spec.hpp
index bfb373e26f33..8f7649f5b270 100644
--- a/barretenberg/cpp/src/barretenberg/vm2/tracegen/lib/phase_spec.hpp
+++ b/barretenberg/cpp/src/barretenberg/vm2/tracegen/lib/phase_spec.hpp
@@ -17,12 +17,9 @@ struct TxPhaseSpec {
     bool is_revertible = false;
     uint32_t read_pi_start_offset = 0;
     uint32_t read_pi_length_offset = 0;
-    bool non_revertible_append_note_hash = false;
-    bool non_revertible_append_nullifier = false;
-    bool non_revertible_append_l2_l1_msg = false;
-    bool revertible_append_note_hash = false;
-    bool revertible_append_nullifier = false;
-    bool revertible_append_l2_l1_msg = false;
+    bool append_note_hash = false;
+    bool append_nullifier = false;
+    bool append_l2_l1_msg = false;
     uint8_t next_phase_on_revert = 0;
 };
 
diff --git a/barretenberg/cpp/src/barretenberg/vm2/tracegen/precomputed_trace.cpp b/barretenberg/cpp/src/barretenberg/vm2/tracegen/precomputed_trace.cpp
index 2c0ab208227a..f39415ef39df 100644
--- a/barretenberg/cpp/src/barretenberg/vm2/tracegen/precomputed_trace.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm2/tracegen/precomputed_trace.cpp
@@ -400,12 +400,9 @@ void PrecomputedTraceBuilder::process_phase_table(TraceContainer& trace)
             { C::precomputed_is_revertible, spec.is_revertible ? 1 : 0 },
             { C::precomputed_read_pi_start_offset, spec.read_pi_start_offset },
             { C::precomputed_read_pi_length_offset, spec.read_pi_length_offset },
-            { C::precomputed_sel_non_revertible_append_note_hash, spec.non_revertible_append_note_hash ? 1 : 0 },
-            { C::precomputed_sel_non_revertible_append_nullifier, spec.non_revertible_append_nullifier ? 1 : 0 },
-            { C::precomputed_sel_non_revertible_append_l2_l1_msg, spec.non_revertible_append_l2_l1_msg ? 1 : 0 },
-            { C::precomputed_sel_revertible_append_note_hash, spec.revertible_append_note_hash ? 1 : 0 },
-            { C::precomputed_sel_revertible_append_nullifier, spec.revertible_append_nullifier ? 1 : 0 },
-            { C::precomputed_sel_revertible_append_l2_l1_msg, spec.revertible_append_l2_l1_msg ? 1 : 0 },
+            { C::precomputed_sel_append_note_hash, spec.append_note_hash ? 1 : 0 },
+            { C::precomputed_sel_append_nullifier, spec.append_nullifier ? 1 : 0 },
+            { C::precomputed_sel_append_l2_l1_msg, spec.append_l2_l1_msg ? 1 : 0 },
             { C::precomputed_next_phase_on_revert, spec.next_phase_on_revert },
         };
 
diff --git a/barretenberg/cpp/src/barretenberg/vm2/tracegen/trace_container.cpp b/barretenberg/cpp/src/barretenberg/vm2/tracegen/trace_container.cpp
index 6726b1b68714..f8fd90b31979 100644
--- a/barretenberg/cpp/src/barretenberg/vm2/tracegen/trace_container.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm2/tracegen/trace_container.cpp
@@ -132,7 +132,7 @@ void TraceContainer::clear_column(Column col)
     auto& column_data = (*trace)[static_cast<size_t>(col)];
     std::unique_lock lock(column_data.mutex);
     column_data.rows.clear();
-    column_data.max_row_number = 0;
+    column_data.max_row_number = -1;
     column_data.row_number_dirty = false;
 }
 
diff --git a/barretenberg/cpp/src/barretenberg/vm2/tracegen/tx_trace.cpp b/barretenberg/cpp/src/barretenberg/vm2/tracegen/tx_trace.cpp
index c765ab5df280..c041cc37b6fd 100644
--- a/barretenberg/cpp/src/barretenberg/vm2/tracegen/tx_trace.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm2/tracegen/tx_trace.cpp
@@ -79,30 +79,6 @@ bool is_revertible(TransactionPhase phase)
     return get_tx_phase_spec_map().at(phase).is_revertible;
 }
 
-/**
- * @brief Returns true if the given phase is a note hash insertion phase.
- *
- * @param phase
- * @return true if the given phase is a note hash insert phase, false otherwise.
- */
-bool is_note_hash_insert_phase(TransactionPhase phase)
-{
-    return get_tx_phase_spec_map().at(phase).non_revertible_append_note_hash ||
-           get_tx_phase_spec_map().at(phase).revertible_append_note_hash;
-}
-
-/**
- * @brief Returns true if the given phase is a nullifier insertion phase.
- *
- * @param phase
- * @return true if the given phase is a nullifier insertion phase, false otherwise.
- */
-bool is_nullifier_insert_phase(TransactionPhase phase)
-{
-    return get_tx_phase_spec_map().at(phase).non_revertible_append_nullifier ||
-           get_tx_phase_spec_map().at(phase).revertible_append_nullifier;
-}
-
 /**
  * @brief Returns true if the given phase is a one-shot phase, i.e., a phase with exactly one phase event/row.
  *        One-shot phases are COLLECT_GAS_FEES, TREE_PADDING and CLEANUP.
@@ -249,16 +225,13 @@ std::vector<std::pair<C, FF>> handle_phase_spec(TransactionPhase phase)
         { C::tx_is_revertible, phase_spec.is_revertible ? 1 : 0 },
         { C::tx_read_pi_start_offset, phase_spec.read_pi_start_offset },
         { C::tx_read_pi_length_offset, phase_spec.read_pi_length_offset },
-        { C::tx_sel_non_revertible_append_note_hash, phase_spec.non_revertible_append_note_hash ? 1 : 0 },
-        { C::tx_sel_non_revertible_append_nullifier, phase_spec.non_revertible_append_nullifier ? 1 : 0 },
-        { C::tx_sel_non_revertible_append_l2_l1_msg, phase_spec.non_revertible_append_l2_l1_msg ? 1 : 0 },
-        { C::tx_sel_revertible_append_note_hash, phase_spec.revertible_append_note_hash ? 1 : 0 },
-        { C::tx_sel_revertible_append_nullifier, phase_spec.revertible_append_nullifier ? 1 : 0 },
-        { C::tx_sel_revertible_append_l2_l1_msg, phase_spec.revertible_append_l2_l1_msg ? 1 : 0 },
+        { C::tx_sel_append_note_hash, phase_spec.append_note_hash ? 1 : 0 },
+        { C::tx_sel_append_nullifier, phase_spec.append_nullifier ? 1 : 0 },
+        { C::tx_sel_append_l2_l1_msg, phase_spec.append_l2_l1_msg ? 1 : 0 },
         { C::tx_next_phase_on_revert, phase_spec.next_phase_on_revert },
 
         // Directly derived from the phase spec but not part of the phase spec struct.
-        { C::tx_is_tree_insert_phase, (is_note_hash_insert_phase(phase) || is_nullifier_insert_phase(phase)) ? 1 : 0 },
+        { C::tx_is_tree_insert_phase, (phase_spec.append_note_hash || phase_spec.append_nullifier) ? 1 : 0 },
     };
 }
 
@@ -395,10 +368,12 @@ std::vector<std::pair<C, FF>> handle_append_tree_event(const PrivateAppendTreeEv
                                                        TransactionPhase phase,
                                                        const TxContextEvent& state_before)
 {
-    if (is_note_hash_insert_phase(phase)) {
+    const auto& phase_spec = get_tx_phase_spec_map().at(phase);
+
+    if (phase_spec.append_note_hash) {
         return handle_note_hash_append(event, state_before);
     }
-    if (is_nullifier_insert_phase(phase)) {
+    if (phase_spec.append_nullifier) {
         return handle_nullifier_append(event, state_before);
     }
 
diff --git a/barretenberg/cpp/src/barretenberg/vm2/tracegen/tx_trace.test.cpp b/barretenberg/cpp/src/barretenberg/vm2/tracegen/tx_trace.test.cpp
index 84bbc00260ca..4218a14892f9 100644
--- a/barretenberg/cpp/src/barretenberg/vm2/tracegen/tx_trace.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm2/tracegen/tx_trace.test.cpp
@@ -169,7 +169,7 @@ TEST(TxTraceGenTest, BasicFirstPaddedRow)
             ROW_FIELD_EQ(tx_phase_value, static_cast<uint8_t>(TransactionPhase::NR_NULLIFIER_INSERTION)),
             ROW_FIELD_EQ(tx_is_padded, 1),
             ROW_FIELD_EQ(tx_is_tree_insert_phase, 1),
-            ROW_FIELD_EQ(tx_sel_non_revertible_append_nullifier, 1),
+            ROW_FIELD_EQ(tx_sel_append_nullifier, 1),
             ROW_FIELD_EQ(tx_start_tx, 1),
             ROW_FIELD_EQ(tx_should_read_gas_limit, 1),
             ROW_FIELD_EQ(tx_gas_limit_pi_offset, AVM_PUBLIC_INPUTS_GAS_SETTINGS_GAS_LIMITS_ROW_IDX),
diff --git a/barretenberg/cpp/src/barretenberg/vm2_stub/api_avm.cpp b/barretenberg/cpp/src/barretenberg/vm2_stub/api_avm.cpp
index 5a3469d4ab5e..c73fc614b5eb 100644
--- a/barretenberg/cpp/src/barretenberg/vm2_stub/api_avm.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm2_stub/api_avm.cpp
@@ -1,4 +1,5 @@
 #include "api_avm.hpp"
+#include "barretenberg/api/api_avm.hpp"
 #include "barretenberg/common/throw_or_abort.hpp"
 #include <stdexcept>
 
@@ -34,4 +35,20 @@ void avm_write_verification_key([[maybe_unused]] const std::filesystem::path& ou
     throw_or_abort("AVM is not supported in this build. Use the 'bb-avm' binary with full AVM support.");
 }
 
+AvmProveResult avm_prove_from_bytes([[maybe_unused]] std::vector<uint8_t> inputs)
+{
+    throw_or_abort("AVM is not supported in this build. Use the 'bb-avm' binary with full AVM support.");
+}
+
+bool avm_verify_from_bytes([[maybe_unused]] std::vector<bb::fr> proof,
+                           [[maybe_unused]] std::vector<uint8_t> public_inputs)
+{
+    throw_or_abort("AVM is not supported in this build. Use the 'bb-avm' binary with full AVM support.");
+}
+
+bool avm_check_circuit_from_bytes([[maybe_unused]] std::vector<uint8_t> inputs)
+{
+    throw_or_abort("AVM is not supported in this build. Use the 'bb-avm' binary with full AVM support.");
+}
+
 } // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/vm2_stub/stats.cpp b/barretenberg/cpp/src/barretenberg/vm2_stub/stats.cpp
new file mode 100644
index 000000000000..bc3004edcc4b
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/vm2_stub/stats.cpp
@@ -0,0 +1,34 @@
+// Stub implementations of bb::avm2::Stats. Linked into binaries that don't pull in vm2_sim
+// (e.g. lightweight `bb` and WASM builds), so callers like bbapi_avm.cpp resolve symbols in
+// every build mode. The stub no-ops because AVM proving cannot run on these targets anyway.
+
+#include "barretenberg/vm2/tooling/stats.hpp"
+
+namespace bb::avm2 {
+
+Stats& Stats::get()
+{
+    static Stats stats;
+    return stats;
+}
+
+void Stats::reset() {}
+
+void Stats::increment(const std::string& /*key*/, uint64_t /*value*/) {}
+
+void Stats::time(const std::string& /*key*/, const std::function<void()>& f)
+{
+    f();
+}
+
+std::string Stats::to_string(int /*depth*/) const
+{
+    return {};
+}
+
+std::vector<std::pair<std::string, uint64_t>> Stats::snapshot() const
+{
+    return {};
+}
+
+} // namespace bb::avm2
diff --git a/barretenberg/sol/AGENTS.md b/barretenberg/sol/AGENTS.md
new file mode 120000
index 000000000000..681311eb9cf4
--- /dev/null
+++ b/barretenberg/sol/AGENTS.md
@@ -0,0 +1 @@
+CLAUDE.md
\ No newline at end of file
diff --git a/barretenberg/ts/src/index.ts b/barretenberg/ts/src/index.ts
index 8b1b40242fcf..b6705ff52134 100644
--- a/barretenberg/ts/src/index.ts
+++ b/barretenberg/ts/src/index.ts
@@ -21,6 +21,7 @@ export { BBApiException } from './bbapi_exception.js';
 
 // Export Point types for use in foundation and other packages
 export type {
+  AvmStat,
   Bn254G1Point,
   Bn254G2Point,
   ChonkProof,
diff --git a/bootstrap.sh b/bootstrap.sh
index b9bc7bacff0e..45d42f2ebdd8 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -785,7 +785,7 @@ case "$cmd" in
     ;;
   "ci-network-bench-10tps")
     # Args: <env_file> <namespace> [docker_image]
-    # Deploys bench-10tps and runs the 38-min sustained 10 TPS benchmark.
+    # Deploys bench-10tps and runs the 10-min sustained 10 TPS benchmark.
     # Cleanup is done separately via ci-network-teardown.
     export CI=1
     env_file="${1:?env_file is required}"
@@ -823,6 +823,17 @@ case "$cmd" in
   # RELEASES #
   ############
   "ci-release")
+    # Verification build for a release tag. Does NOT publish — publishing happens in
+    # ci-release-publish, gated on ci-compat-e2e so a compat regression blocks the release.
+    export CI=1
+    export USE_TEST_CACHE=1
+    if ! semver check $REF_NAME; then
+      exit 1
+    fi
+    build
+    ;;
+  "ci-release-publish")
+    # Actual publish step. `build` cache-hits against ci-release's build of the same commit.
     export CI=1
     export USE_TEST_CACHE=1
     if ! semver check $REF_NAME; then
@@ -902,6 +913,82 @@ case "$cmd" in
     build
     yarn-project/end-to-end/bootstrap.sh avm_check_circuit
     ;;
+  #############################################
+  # BACKWARDS COMPATIBILITY E2E TESTS         #
+  #############################################
+  "ci-compat-e2e")
+    # Runs e2e tests with contract artifacts from every prior stable release since 4.2.0 (version where we committed to
+    # backwards compatibility). This Validates that old contract artifacts work on current release.
+    export CI=1
+    export USE_TEST_CACHE=0
+    export CI_FULL=0
+    export NO_FAIL_FAST=1
+
+    build
+
+    # TODO: bump when v5 commits to backwards-compatible contract artifacts.
+    #   compat_major:       major version that has compat guarantees today.
+    #   compat_min_version: earliest stable tag of that major to test against
+    #                       (artifacts before this are incompatible due to oracle interface changes).
+    compat_major="4"
+    compat_min_version="4.2.0"
+
+    # Get current major version.
+    current_version=$(jq -r '."."' .release-please-manifest.json)
+    major=$(semver major "$current_version")
+    if [ "$major" != "$compat_major" ]; then
+      echo "Compat e2e tests only apply to v${compat_major}. Current major: v${major}. Skipping."
+      exit 0
+    fi
+    min_version="$compat_min_version"
+
+    # Fetch tags (EC2 clone may not have them). Fail loud: a silent fetch failure plus an empty
+    # tag list would publish a real release with zero compat coverage.
+    if ! git fetch origin 'refs/tags/v*:refs/tags/v*'; then
+      echo "ERROR: failed to fetch release tags." >&2
+      exit 1
+    fi
+
+    # Discover stable tags for this major version (no prerelease suffixes).
+    versions=()
+    while IFS= read -r tag; do
+      ver=${tag#v}
+      # Include only versions >= min_version (sort -V puts smaller first).
+      if [ "$(printf '%s\n%s' "$min_version" "$ver" | sort -V | head -1)" = "$min_version" ]; then
+        versions+=("$ver")
+      fi
+    done < <(git tag -l "v${major}.*" | grep -E "^v[0-9]+\.[0-9]+\.[0-9]+$" | sort -V)
+
+    # Exclude the current tag when running on a release tag push.
+    if [[ "${REF_NAME:-}" =~ ^v([0-9]+\.[0-9]+\.[0-9]+)$ ]]; then
+      current_tag="${BASH_REMATCH[1]}"
+      filtered=()
+      for v in "${versions[@]}"; do
+        [ "$v" != "$current_tag" ] && filtered+=("$v")
+      done
+      versions=("${filtered[@]}")
+    fi
+
+    if [ ${#versions[@]} -eq 0 ]; then
+      echo "No prior stable versions found for v${major}.x (>= $min_version). Skipping compat tests."
+      exit 0
+    fi
+
+    echo_header "Backwards compatibility e2e tests"
+    echo "Testing against ${#versions[@]} prior stable version(s): ${versions[*]}"
+
+    # Pre-populate the legacy contract cache on the host. Test containers run with --net=none, so the
+    # jest resolver's on-demand npm install would fail with EAI_AGAIN. Install here where we have network.
+    for ver in "${versions[@]}"; do
+      node yarn-project/end-to-end/src/install_legacy_contracts.cjs "$ver"
+    done
+
+    # Generate compat test commands for all versions and run them in parallel.
+    for ver in "${versions[@]}"; do
+      yarn-project/end-to-end/bootstrap.sh compat_test_cmds "$ver"
+    done | filter_test_cmds | parallelize
+    ;;
+
   ##########################################
   # ROLLUP UPGRADE DEPLOYMENT              #
   ##########################################
diff --git a/boxes/boxes/react/src/hooks/useContract.tsx b/boxes/boxes/react/src/hooks/useContract.tsx
index ff180dfa5b59..d74eb9ed9458 100644
--- a/boxes/boxes/react/src/hooks/useContract.tsx
+++ b/boxes/boxes/react/src/hooks/useContract.tsx
@@ -15,13 +15,11 @@ export function useContract() {
     setWait(true);
     const wallet = await deployerEnv.getWallet();
     const defaultAccountAddress = deployerEnv.getDefaultAccountAddress();
-    const salt = Fr.random();
 
     const { BoxReactContract } = await import('../../artifacts/BoxReact');
 
     const deploymentPromise = BoxReactContract.deploy(wallet, Fr.random(), defaultAccountAddress).send({
       from: defaultAccountAddress,
-      contractAddressSalt: salt,
     });
 
     const { contract } = await toast.promise(deploymentPromise, {
diff --git a/boxes/boxes/vanilla/scripts/deploy.ts b/boxes/boxes/vanilla/scripts/deploy.ts
index 83a24cc3f913..9699dd35bebf 100644
--- a/boxes/boxes/vanilla/scripts/deploy.ts
+++ b/boxes/boxes/vanilla/scripts/deploy.ts
@@ -72,12 +72,10 @@ async function deployContract(wallet: Wallet, deployer: AztecAddress) {
 
   const sponsoredPFCContract = await getSponsoredPFCContract();
 
-  const { contract } = await PrivateVotingContract.deploy(
-    wallet,
-    deployer
-  ).send({
+  const { contract } = await PrivateVotingContract.deploy(wallet, deployer, {
+    salt,
+  }).send({
     from: deployer,
-    contractAddressSalt: salt,
     fee: {
       paymentMethod: new SponsoredFeePaymentMethod(
         sponsoredPFCContract.address
diff --git a/boxes/boxes/vite/src/hooks/useContract.tsx b/boxes/boxes/vite/src/hooks/useContract.tsx
index ff180dfa5b59..d74eb9ed9458 100644
--- a/boxes/boxes/vite/src/hooks/useContract.tsx
+++ b/boxes/boxes/vite/src/hooks/useContract.tsx
@@ -15,13 +15,11 @@ export function useContract() {
     setWait(true);
     const wallet = await deployerEnv.getWallet();
     const defaultAccountAddress = deployerEnv.getDefaultAccountAddress();
-    const salt = Fr.random();
 
     const { BoxReactContract } = await import('../../artifacts/BoxReact');
 
     const deploymentPromise = BoxReactContract.deploy(wallet, Fr.random(), defaultAccountAddress).send({
       from: defaultAccountAddress,
-      contractAddressSalt: salt,
     });
 
     const { contract } = await toast.promise(deploymentPromise, {
diff --git a/ci.sh b/ci.sh
index ee31f6309d4a..68675e915327 100755
--- a/ci.sh
+++ b/ci.sh
@@ -35,6 +35,7 @@ function print_usage {
   echo_cmd "network-teardown"      "Spin up an EC2 instance to teardown a network deployment."
   echo_cmd "network-tests-kind"    "Spin up an EC2 instance to run a KIND-based spartan test."
   echo_cmd "deploy-rollup-upgrade" "Spin up an EC2 instance to deploy a rollup upgrade."
+  echo_cmd "compat-e2e"            "Spin up an EC2 instance and run backwards compat e2e tests."
   echo_cmd "release"               "Spin up an EC2 instance and run bootstrap release."
   echo_cmd "shell-new"             "Spin up an EC2 instance, clone the repo, and drop into a shell."
   echo_cmd "shell"                 "Drop into a shell in the current running build instance container."
@@ -268,9 +269,10 @@ case "$cmd" in
     ;;
   network-bench-10tps)
     # Args: <scenario> <namespace> [docker_image]
-    # Deploys the bench-10tps network and runs the 38-min 10 TPS benchmark.
+    # Deploys the bench-10tps network and runs the 10-min 10 TPS benchmark.
     export CI_DASHBOARD="network"
     export JOB_ID="x-${2:?namespace is required}-network-bench-10tps" CPUS=16
+    export AWS_SHUTDOWN_TIME=${AWS_SHUTDOWN_TIME:-180}
     export INSTANCE_POSTFIX="n-bench-10tps"
     bootstrap_ec2 "./bootstrap.sh ci-network-bench-10tps $*"
     ;;
@@ -301,16 +303,50 @@ case "$cmd" in
     bootstrap_ec2 "./bootstrap.sh ci-deploy-rollup-upgrade $*"
     ;;
 
+  ##############################
+  # BACKWARDS COMPATIBILITY   #
+  ##############################
+  compat-e2e)
+    # Spin up an EC2 instance and run backwards compatibility e2e tests
+    # against contract artifacts from prior stable releases.
+    export CI_DASHBOARD="releases"
+    export JOB_ID="x-compat-e2e"
+    export AWS_SHUTDOWN_TIME=300
+    rc=0
+    bootstrap_ec2 "./bootstrap.sh ci-compat-e2e" || rc=$?
+    # On nightly tags compat-e2e is non-blocking (continue-on-error in ci3.yml), so
+    # failures otherwise go unnoticed. Notify #team-fairies so they get picked up.
+    if [ "$rc" -ne 0 ] && [[ "${REF_NAME:-}" == *-nightly.* ]]; then
+      run_url="https://github.com/${GITHUB_REPOSITORY:-AztecProtocol/aztec-packages}/actions/runs/${GITHUB_RUN_ID:-unknown}"
+      "$ci3/slack_notify" "Backwards compatibility e2e tests FAILED on nightly tag <${run_url}|${REF_NAME}>" "#team-fairies"
+    fi
+    exit "$rc"
+    ;;
+
   ############
   # RELEASES #
   ############
   release)
-    # Spin up ec2 instance and run the release flow.
+    # Spin up ec2 instance and run the release-tag verification build (no publish).
     export CI_DASHBOARD="releases"
     multi_job_run \
       'x-release amd64 ci-release' \
       'a-release arm64 ci-release'
     ;;
+  release-publish)
+    # Spin up ec2 instance and run the actual publish flow. Gated in ci3.yml on ci + ci-compat-e2e.
+    export CI_DASHBOARD="releases"
+    export DENOISE=1
+    export DENOISE_WIDTH=32
+    run() {
+      PARENT_LOG_ID=$RUN_ID JOB_ID=$1 INSTANCE_POSTFIX=$1 ARCH=$2 exec denoise "bootstrap_ec2 './bootstrap.sh ci-release-publish'"
+    }
+    export -f run
+
+    parallel --termseq 'TERM,10000' --tagstring '{= $_=~s/run (\w+).*/$1/; =}' --line-buffered --halt now,fail=1 ::: \
+      'run x-release-publish amd64' \
+      'run a-release-publish arm64' | DUP=1 cache_log "Release Publish CI run" $RUN_ID
+    ;;
 
   ##################
   # SHELL SESSIONS #
diff --git a/ci3/cache_content_hash b/ci3/cache_content_hash
index 4190f1704142..89e49e0f60c1 100755
--- a/ci3/cache_content_hash
+++ b/ci3/cache_content_hash
@@ -53,9 +53,11 @@ diff="$({
 # Check for uncommitted files/changes.
 # Only use this check if AZTEC_CACHE_COMMIT is the default, otherwise the user is being explicit about using git history.
 if [ -n "$diff" ] && [ "$AZTEC_CACHE_COMMIT" == "HEAD" ]; then
-  # Fail. We shouldn't be changing files during the CI run.
+  # In CI we shouldn't be changing files during the run, so a 'disabled-cache' content hash here
+  # means something is wrong — fail loudly instead of silently disabling the cache.
   if [ "$CI" -eq 1 ]; then
-    echo_stderr "WARNING: Noticed changes to rebuild patterns: $diff"
+    echo_stderr "ERROR: Noticed changes to rebuild patterns during CI run: $diff"
+    exit 1
   fi
   # Signal to cache_upload and cache_download to not touch this file.
   echo "disabled-cache"
diff --git a/ci3/source_cache b/ci3/source_cache
index af14c3d4f6c9..f9d88c651601 100644
--- a/ci3/source_cache
+++ b/ci3/source_cache
@@ -14,7 +14,7 @@ function cache_s3_transfer {
   local bucket="${no_scheme%%/*}"
   local base_prefix="${no_scheme#*/}"
 
-  aws s3 ${S3_BUILD_CACHE_AWS_PARAMS} cp - "s3://${bucket}/${base_prefix}/${prefix}/${key}.log.gz" &>/dev/null
+  aws s3 ${S3_BUILD_CACHE_AWS_PARAMS:-} cp - "s3://${bucket}/${base_prefix}/${prefix}/${key}.log.gz" &>/dev/null
 }
 
 # Transfer to S3 with explicit subfolder (accepts gzipped data on stdin).
@@ -27,7 +27,7 @@ function cache_s3_transfer_to {
   local bucket="${no_scheme%%/*}"
   local base_prefix="${no_scheme#*/}"
 
-  aws s3 ${S3_BUILD_CACHE_AWS_PARAMS} cp - "s3://${bucket}/${base_prefix}/${subfolder}/${key}.log.gz" &>/dev/null
+  aws s3 ${S3_BUILD_CACHE_AWS_PARAMS:-} cp - "s3://${bucket}/${base_prefix}/${subfolder}/${key}.log.gz" &>/dev/null
 }
 
 # Transfer log to bastion via SSH (accepts gzipped data on stdin)
diff --git a/docs/AGENTS.md b/docs/AGENTS.md
new file mode 120000
index 000000000000..681311eb9cf4
--- /dev/null
+++ b/docs/AGENTS.md
@@ -0,0 +1 @@
+CLAUDE.md
\ No newline at end of file
diff --git a/docs/CLAUDE.md b/docs/CLAUDE.md
index 3f2d4498d367..14675526d0d2 100644
--- a/docs/CLAUDE.md
+++ b/docs/CLAUDE.md
@@ -29,6 +29,8 @@ This project uses Yarn 4.13.0 as specified in the `packageManager` field of pack
 - `yarn generate:typescript-api` - Generate TypeScript API docs (requires yarn-project to be built)
 - `yarn generate:typescript-api v3.0.0-devnet.6` - Generate for a specific version
 - `RELEASE_TYPE=mainnet yarn generate:typescript-api v4.2.0` - Generate with explicit release type
+- `yarn generate:node-api-reference` - Generate Node JSON-RPC API reference (requires yarn-project source files and yarn-project/node_modules; no build needed)
+- `yarn generate:node-api-reference --target-dir <dir>` - Generate into a specific versioned docs directory
 
 The `RELEASE_TYPE` env var overrides version string pattern matching for output folder selection. This is useful when the version string doesn't self-identify its release type.
 
diff --git a/docs/README.md b/docs/README.md
index 289b73a69000..158de3509dee 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -280,7 +280,7 @@ The Node JSON-RPC API reference is auto-generated from the TypeScript interface
 - `yarn-project/stdlib/src/interfaces/aztec-node-admin.ts` — `AztecNodeAdmin` interface (`nodeAdmin_` methods)
 - `yarn-project/stdlib/src/block/l2_block_source.ts` — `L2BlockSource` interface (JSDoc for inherited methods)
 
-**Prerequisites:** Only `typescript` is needed (no yarn-project build required — the generator parses source files, not compiled output).
+**Prerequisites:** `yarn-project` must have `node_modules/` installed so `npx tsx` can resolve `typescript`. Run `yarn install` from `yarn-project` if needed. No build is required — the generator parses source `.ts` files via the TypeScript Compiler API, not compiled output.
 
 **Generate the reference doc:**
 
diff --git a/docs/docs-developers/ai_tooling.md b/docs/docs-developers/ai_tooling.md
index 85c82d65033a..15521e3eec61 100644
--- a/docs/docs-developers/ai_tooling.md
+++ b/docs/docs-developers/ai_tooling.md
@@ -28,7 +28,7 @@ This is an Aztec smart contract project. Always use the `aztec` CLI wrapper inst
 
 - **Compile**: `aztec compile` (NOT `nargo compile`). Using `nargo compile` alone produces incomplete artifacts.
 - **Test**: `aztec test` (NOT `nargo test`).
-- **Other nargo commands** like `nargo fmt` and `nargo doc` are fine to use directly.
+- **Other nargo commands** like `aztec-nargo fmt` and `aztec-nargo doc` are fine to use directly. The Aztec installer exposes the bundled `nargo` as `aztec-nargo`; bare `nargo` resolves to your own install (if any), not the bundled one.
 
 ## Error Handling
 
diff --git a/docs/docs-developers/docs/aztec-js/how_to_test.md b/docs/docs-developers/docs/aztec-js/how_to_test.md
index d22443b724e2..1ae388802997 100644
--- a/docs/docs-developers/docs/aztec-js/how_to_test.md
+++ b/docs/docs-developers/docs/aztec-js/how_to_test.md
@@ -67,6 +67,22 @@ Test that invalid operations revert as expected:
 
 Use `.simulate()` to test reverts without spending gas. The simulation will throw if the transaction would fail onchain.
 
+## Simulating with overrides
+
+`.simulate()` accepts an `overrides` option that injects values into the simulator's (ephemeral) world-state fork and contract DB before the call runs. The override is scoped to that single simulation and thrown away afterwards.
+
+Override a public-storage slot:
+
+```typescript
+const result = await contract.methods.read_balance(account).simulate({
+  overrides: {
+    publicStorage: [{ contract: contract.address, slot: BALANCE_SLOT, value: new Fr(1_000_000n) }],
+  },
+});
+```
+
+Use this to set up state preconditions, reproduce production bugs against pinned storage, or exercise rare value branches without orchestrating the contract calls that produce them.
+
 ## Further reading
 
 - [How to read contract data](./how_to_read_data.md)
diff --git a/docs/docs-developers/docs/aztec-nr/debugging.md b/docs/docs-developers/docs/aztec-nr/debugging.md
index a3cd449bb554..720b2b6da3e3 100644
--- a/docs/docs-developers/docs/aztec-nr/debugging.md
+++ b/docs/docs-developers/docs/aztec-nr/debugging.md
@@ -35,6 +35,33 @@ LOG_LEVEL=verbose aztec start --local-network
 | `No public key registered for address`                   | Call `wallet.registerSender(...)`                                                                                                                               |
 | `Direct invocation of ... functions is not supported`    | Use `self.call()`, `self.view()`, or `self.enqueue()` to [call contract functions](framework-description/calling_contracts.md) |
 | `Failed to solve brillig function`                       | Check function parameters and note validity                                                                                                                     |
+| `Cross-contract utility call denied`                     | Configure an `authorizeUtilityCall` [execution hook](#cross-contract-utility-call-denied) on your PXE                                                           |
+
+#### Cross-contract utility call denied
+
+When a contract executes a utility function that calls into a different contract, PXE asks an **execution hook** whether the call should be allowed. If no hook is configured, or the hook denies the request, you will see:
+
+```
+Cross-contract utility call denied: <reason>. <caller> attempted to call <target>:<selector> (<name>).
+```
+
+To fix this, pass an `authorizeUtilityCall` hook when creating your PXE:
+
+```typescript
+import { PXE } from "@aztec/pxe/server";
+
+const pxe = await PXE.create({
+  // ...other options
+  hooks: {
+    authorizeUtilityCall: async (request) => {
+      // Inspect request.caller, request.target, request.functionSelector, etc.
+      return { authorized: true };
+    },
+  },
+});
+```
+
+The hook receives a `UtilityCallAuthorizationRequest` with the caller address, target address, function selector, function name, arguments, and caller context (`'private'` or `'utility'`). Return `{ authorized: true }` to allow or `{ authorized: false, reason: '...' }` to deny with a message.
 
 ### Circuit Errors
 
diff --git a/docs/docs-developers/docs/aztec-nr/framework-description/advanced/how_to_profile_transactions.md b/docs/docs-developers/docs/aztec-nr/framework-description/advanced/how_to_profile_transactions.md
index 8fa480a2bf70..1374771ef16d 100644
--- a/docs/docs-developers/docs/aztec-nr/framework-description/advanced/how_to_profile_transactions.md
+++ b/docs/docs-developers/docs/aztec-nr/framework-description/advanced/how_to_profile_transactions.md
@@ -63,6 +63,14 @@ BB=/path/to/bb aztec profile gates ./target
 ```
 :::
 
+:::tip Machine-readable output
+For build automation, use `--json` to emit gate counts as a JSON array. Each entry has `name`, `type` (`contract-function` or `program`), and `gates`:
+
+```bash
+aztec profile gates --json ./target
+```
+:::
+
 ### Flamegraphs
 
 To generate an interactive flamegraph SVG for a specific function:
diff --git a/docs/docs-developers/docs/aztec-nr/framework-description/functions/attributes.md b/docs/docs-developers/docs/aztec-nr/framework-description/functions/attributes.md
index 8e96cbc6f9e3..15581e997f04 100644
--- a/docs/docs-developers/docs/aztec-nr/framework-description/functions/attributes.md
+++ b/docs/docs-developers/docs/aztec-nr/framework-description/functions/attributes.md
@@ -42,10 +42,10 @@ A private function operates on private information, and is executed by the user
 
 `#[external("private")]` is just syntactic sugar. At compile time, the Aztec.nr framework inserts code that allows the function to interact with the [kernel](../../../foundational-topics/advanced/circuits/private_kernel.md).
 
-If you are interested in what exactly the macros are doing we encourage you to run `nargo expand` on your contract.
+If you are interested in what exactly the macros are doing we encourage you to run `aztec-nargo expand` on your contract.
 This will display your contract's code after the transformations are performed.
 
-(If you are using VSCode you can display the expanded code by pressing `CMD + Shift + P` and typing `nargo expand` and selecting `Noir: nargo expand on current package`.)
+(If you are using VSCode you can display the expanded code by pressing `CMD + Shift + P` and typing `nargo expand` and selecting `Noir: nargo expand on current package`. Make sure the Noir extension's `Nargo Path` is set to `aztec-nargo` — see the [Noir VSCode extension guide](../../installation.md) for setup.)
 
 Under the hood, the macro:
 
@@ -85,7 +85,7 @@ Under the hood, the macro:
 - Wraps the function body in a scope that handles context setup and return values
 - Marks the function as `pub` and `unconstrained`, meaning it doesn't generate proofs and is executed directly by the sequencer
 
-To see the exact generated code, run `nargo expand` on your contract.
+To see the exact generated code, run `aztec-nargo expand` on your contract.
 
 ## Constrained `view` Functions #[view]
 
@@ -213,7 +213,7 @@ struct CustomNote {
 
 The `owner` is passed as a runtime parameter to the `compute_note_hash` and `compute_nullifier` functions, not stored as a field on the note.
 
-To see the exact generated code, run `nargo expand` on your contract.
+To see the exact generated code, run `aztec-nargo expand` on your contract.
 
 Key things to keep in mind:
 
@@ -246,7 +246,7 @@ struct Storage {
 }
 ```
 
-To see the exact generated code, run `nargo expand` on your contract. Alternatively, use `#[storage_no_init]` if you need manual control over storage slot allocation.
+To see the exact generated code, run `aztec-nargo expand` on your contract. Alternatively, use `#[storage_no_init]` if you need manual control over storage slot allocation.
 
 Key things to keep in mind:
 
diff --git a/docs/docs-developers/docs/aztec-nr/installation.md b/docs/docs-developers/docs/aztec-nr/installation.md
index 7aa7a90b5a02..5eb244c3c715 100644
--- a/docs/docs-developers/docs/aztec-nr/installation.md
+++ b/docs/docs-developers/docs/aztec-nr/installation.md
@@ -7,22 +7,24 @@ description: Learn how to install and configure the Noir Language Server for a b
 
 Install the [Noir Language Support extension](https://marketplace.visualstudio.com/items?itemName=noir-lang.vscode-noir) to get syntax highlighting, syntax error detection, and go-to definitions for your Aztec contracts.
 
-The extension drives its language server with `nargo`. The Aztec installer installs its own version of `nargo` and adds that directory to your `PATH`, so in most cases you do not need to configure anything else. Verify the binary is on your `PATH`:
+The extension drives its language server with `nargo`. The Aztec installer ships a bundled `nargo` and exposes it as the `aztec-nargo` symlink on your `PATH`. Bare `nargo` is intentionally not provided so it does not shadow your own install (if any). Verify the symlink is on your `PATH`:
 
 ```bash
-which nargo
-# expected: $HOME/.aztec/<path to nargo binary>
+which aztec-nargo
+# expected: $HOME/.aztec/current/bin/aztec-nargo
 ```
 
 If you have not installed the Aztec toolchain yet, follow [Getting Started on Local Network](../../getting_started_on_local_network.md) first.
 
 ## Configure the extension
 
-Leave the extension's `Noir: Nargo Path` setting empty so it auto-discovers `nargo` from your `PATH`. To confirm, hover over **Nargo** in the VSCode status bar in the bottom right corner — it should show the path under the result from `which nargo`.
+Set the extension's `Noir: Nargo Path` setting to the absolute path printed by `which aztec-nargo` (for example `$HOME/.aztec/current/bin/aztec-nargo`), then reload the window. `aztec-nargo` is a symlink to the bundled `nargo`, so any tool that invokes it speaks plain `nargo` (LSP included).
 
-If auto-discovery fails, set `Noir: Nargo Path` to the absolute path printed by `which nargo`, then reload the window.
+To confirm the extension is using the bundled toolchain, hover over **Nargo** in the VSCode status bar in the bottom right corner: it should show the path you set.
+
+If you have your own `nargo` install and want the extension to use that instead, leave `Noir: Nargo Path` empty so the extension auto-discovers `nargo` from your `PATH`.
 
 ## Troubleshooting
 
-- **LSP reports `startFailed` after setting a custom path**: clear `Noir: Nargo Path`, reload the window, and let auto-discovery take over.
-- **`which nargo` points outside `$HOME/.aztec/current/bin`**: another `nargo` earlier on your `PATH` is shadowing the Aztec-provided one. Either remove it or set `Noir: Nargo Path` explicitly to the Aztec-provided `nargo`.
+- **LSP reports `startFailed` after setting a custom path**: confirm `aztec-nargo` is executable and that the path is correct, reload the window, and check the **Output** panel for the language server log.
+- **Extension picks up the wrong `nargo`**: the Aztec installer no longer puts bare `nargo` on `PATH`. Set `Noir: Nargo Path` explicitly to `aztec-nargo` (for the bundled version) or to your own install (for any other version).
diff --git a/docs/docs-developers/docs/cli/aztec_cli_reference.md b/docs/docs-developers/docs/cli/aztec_cli_reference.md
index 47b1da49b3e3..7da0e201c0e5 100644
--- a/docs/docs-developers/docs/cli/aztec_cli_reference.md
+++ b/docs/docs-developers/docs/cli/aztec_cli_reference.md
@@ -791,6 +791,7 @@ aztec profile gates [options] [target-dir]
 
 **Options:**
 
+- `--json` - output gate counts as JSON instead of a table (default: false)
 - `-h --help` - display help for command
 
 ### aztec propose-with-lock
diff --git a/docs/docs-developers/docs/resources/glossary.md b/docs/docs-developers/docs/resources/glossary.md
index eb3bae3f06d8..69c58b110e41 100644
--- a/docs/docs-developers/docs/resources/glossary.md
+++ b/docs/docs-developers/docs/resources/glossary.md
@@ -68,6 +68,8 @@ Merkle trees in Aztec are used to store cryptographic commitments. They are used
 
 With `nargo`, you can start new projects, compile, execute, and test your Noir programs.
 
+The Aztec installer ships its own pinned `nargo` and exposes it as the `aztec-nargo` wrapper on `PATH` (bare `nargo` is intentionally not provided so it does not shadow your own install). For Aztec contract work, prefer `aztec compile` and `aztec test`; for plain Noir commands, use `aztec-nargo` (or your own `nargo` install).
+
 You can find more information in the nargo installation docs [here](https://noir-lang.org/docs/getting_started/quick_start#installation) and the nargo command reference [here](https://noir-lang.org/docs/reference/nargo_commands).
 
 ### Noir
diff --git a/docs/docs-developers/docs/resources/migration_notes.md b/docs/docs-developers/docs/resources/migration_notes.md
index 21177ac51407..f1333f13d158 100644
--- a/docs/docs-developers/docs/resources/migration_notes.md
+++ b/docs/docs-developers/docs/resources/migration_notes.md
@@ -9,6 +9,182 @@ Aztec is in active development. Each version may introduce breaking changes that
 
 ## TBD
 
+### [Aztec.nr] TXE `call_public_incognito` no longer takes a `from` parameter
+
+`TestEnvironment::call_public_incognito` previously accepted a `from` address that was silently ignored (the function always uses a null `msg_sender`). The `from` parameter has been removed.
+
+```diff
+- env.call_public_incognito(sender, SampleContract::at(addr).some_function());
++ env.call_public_incognito(SampleContract::at(addr).some_function());
+```
+
+If you need to call a public function *with* a sender, use `call_public` instead.
+
+### [Aztec.nr] TXE `view_public_incognito` is deprecated
+
+`TestEnvironment::view_public_incognito` is now deprecated in favor of `view_public`, which has the same behavior (null `msg_sender`, static call).
+
+```diff
+- env.view_public_incognito(SampleContract::at(addr).some_view());
++ env.view_public(SampleContract::at(addr).some_view());
+```
+
+### [Aztec.js] `DeployMethod` address-affecting parameters move to construction time
+
+Salt, deployer, and public keys are now passed when the `DeployMethod` is constructed, not on every call to `send` / `simulate` / `request` / `getInstance`. This locks the contract address once it is determined and prevents the silent salt-cache poisoning bug where the address could change between calls.
+
+`contractAddressSalt`, `deployer`, and `universalDeploy` have been removed from `DeployOptions`, `RequestDeployOptions`, and `SimulateDeployOptions`. They now live on a new `DeployInstantiationOptions` argument passed at construction. `deployer` and `universalDeploy` are mutually exclusive; passing both throws. `Contract.deployWithPublicKeys` and the generated `MyContract.deployWithPublicKeys(...)` factories have been removed; pass `publicKeys` via the `instantiation` argument of `deploy(...)` instead. The buggy synchronous `address` and `partialAddress` getters have been removed and replaced with `getAddress()` and `getPartialAddress()` (both `async`).
+
+The compact form keeps working: `MyContract.deploy(wallet, ...args).send({ from: alice })` deploys with `deployer = alice` and `salt = random()`, exactly as before. The deployer is locked the first time `send` / `simulate` / `profile` is called (from `options.from`, with `NO_FROM` or undefined → universal) and cannot change after that:
+
+- Subsequent `send` / `simulate` / `profile` calls with a `from` that would imply a different deployer throw, instead of silently producing a different address.
+- A lock to universal (`AztecAddress.ZERO`) is the only one compatible with any sender, since the universal address does not depend on `from`.
+- A lock to a concrete address only accepts that exact `from` on subsequent calls.
+
+**Migration:**
+
+Universal deployment with a fixed salt:
+
+```diff
+- const deploy = MyContract.deploy(wallet, ...args);
+- await deploy.send({
+-   from: alice,
+-   contractAddressSalt: salt,
+-   universalDeploy: true,
+- });
++ const deploy = MyContract.deploy(wallet, ...args, { salt, universalDeploy: true });
++ await deploy.send({ from: alice });
+```
+
+Non-universal deploy where `from` doubles as the deployer:
+
+```diff
+- const deploy = MyContract.deploy(wallet, ...args);
+- await deploy.send({ from: alice, contractAddressSalt: salt });
++ const deploy = MyContract.deploy(wallet, ...args, { salt });
++ await deploy.send({ from: alice });
+```
+
+If you need to read the address before sending, lock the deployer at construction:
+
+```typescript
+const deploy = MyContract.deploy(wallet, ...args, { salt, deployer: alice });
+const address = await deploy.getAddress(); // resolves; deployer was locked at construction
+await deploy.send({ from: alice }); // deploys at the address `getAddress` returned
+```
+
+Universal deploys can be sent by any account, since the universal address does not depend on `from`:
+
+```typescript
+const deploy = MyContract.deploy(wallet, ...args, { universalDeploy: true });
+await deploy.send({ from: bob }); // OK, universal accepts any sender
+```
+
+A lock to a concrete deployer rejects sending from a different account, instead of silently deploying at a different address:
+
+```typescript
+const deploy = MyContract.deploy(wallet, ...args, { deployer: alice });
+await deploy.send({ from: bob }); // throws: deployer is locked to alice
+```
+
+`deployWithPublicKeys` is gone; pass `publicKeys` in the instantiation options instead:
+
+```diff
+- const deploy = MyContract.deployWithPublicKeys(publicKeys, wallet, ...args);
++ const deploy = MyContract.deploy(wallet, ...args, { publicKeys });
+```
+
+`ContractDeployer.deploy(...)` now takes the instantiation argument as its first parameter (pass `{}` to use defaults and rely on lazy locking from `from`):
+
+```diff
+- const cd = new ContractDeployer(artifact, wallet);
+- await cd.deploy(...ctorArgs).send({ from: alice, contractAddressSalt: salt });
++ const cd = new ContractDeployer(artifact, wallet);
++ await cd.deploy(ctorArgs, { salt }).send({ from: alice });
+```
+
+The synchronous `address` / `partialAddress` getters are gone:
+
+```diff
+- const address = deploy.address;                       // sync, possibly undefined
+- const partial = await deploy.partialAddress;          // sync getter wrapping async value
++ const address = await deploy.getAddress();            // requires the deployer to be locked
++ const partial = await deploy.getPartialAddress();     // requires the deployer to be locked
+```
+
+`getInstance()` no longer takes options; use the construction-time instantiation instead:
+
+```diff
+- const instance = await deploy.getInstance({ contractAddressSalt: salt });
++ const deploy = MyContract.deploy(wallet, ...args, { salt, deployer: alice });
++ const instance = await deploy.getInstance();
+```
+
+### [aztec-up] Bundled binaries are no longer exposed under bare names on `PATH`
+
+The Aztec installer previously placed bundled binaries directly into `$HOME/.aztec/current/bin` under bare names (`forge`, `nargo`, `bb`, `pxe`, ...). Anything with the same name in your own `PATH` was silently shadowed in unrelated projects.
+
+Every bundled binary is now exposed only under an `aztec-` prefixed name in `$HOME/.aztec/current/bin`. Bare names are not on `PATH` at all and resolve to your own install (if any).
+
+| Was on `PATH`      | Now                      |
+| ------------------ | ------------------------ |
+| `forge`            | `aztec-forge`            |
+| `cast`             | `aztec-cast`             |
+| `anvil`            | `aztec-anvil`            |
+| `chisel`           | `aztec-chisel`           |
+| `nargo`            | `aztec-nargo`            |
+| `noir-profiler`    | `aztec-noir-profiler`    |
+| `bb`               | `aztec-bb`               |
+| `bb-cli`           | `aztec-bb-cli`           |
+| `pxe`              | `aztec-pxe`              |
+| `txe`              | `aztec-txe`              |
+| `validator-client` | `aztec-validator-client` |
+| `blob-client`      | `aztec-blob-client`      |
+
+`aztec`, `aztec-wallet`, and `aztec-up` keep their existing names.
+
+If you relied on a bundled bare-name binary for general use:
+
+- For Aztec contract work, prefer `aztec compile` and `aztec test`.
+- For other Noir / Foundry commands, invoke the `aztec-*` symlink directly (e.g. `aztec-nargo fmt`, `aztec-forge build`).
+- Or install Foundry / nargo separately via `foundryup` / `noirup`.
+
+If you set `Noir: Nargo Path` in the VS Code Noir extension to `$HOME/.aztec/current/bin/nargo`, change it to `$HOME/.aztec/current/bin/aztec-nargo` (the symlink is a drop-in for `nargo`). See the [Noir VSCode Extension guide](../aztec-nr/installation.md) for details.
+
+### [Stdlib] `SimulationOverrides.contracts` entries no longer carry an artifact
+
+`ContractOverrides` entries are now `{ instance }` only. To override a contract's artifact, pre-register the target class via `pxe.registerContractClass(artifact)` and set the override instance's `currentContractClassId` to that class id:
+
+```diff
+- const instance = await getContractInstanceFromInstantiationParams(stubArtifact, { salt: Fr.random() });
++ const instance = await pxe.getContractInstance(addr);
++ await pxe.registerContractClass(stubArtifact);
++ const stubClassId = (await getContractClassFromArtifact(stubArtifact)).id;
+- overrides = { contracts: { [addr.toString()]: { instance, artifact: stubArtifact } } };
++ overrides = { contracts: { [addr.toString()]: { instance: { ...instance, currentContractClassId: stubClassId } } } };
+```
+
+### [Aztec.js] `simulate` accepts `overrides` for testing "what if storage value was X?"
+
+`Contract.methods.foo(...).simulate(...)` now accepts an `overrides` option that injects values into the simulator's (ephemeral) world-state fork and contract DB before the call runs. The supported field is `publicStorage`, which writes a `(contract, slot, value)` into the public-data tree as if a previous tx had set it. Overrides are thrown away after simulation completes.
+
+```typescript
+const result = await contract.methods.read_balance(account).simulate({
+  overrides: {
+    publicStorage: [{ contract: contract.address, slot: BALANCE_SLOT, value: new Fr(1_000_000n) }],
+  },
+});
+```
+
+The same option flows through `wallet.simulateTx` and eventually to `simulatePublicCalls` RPC on `AztecNode`.
+
+Direct callers of the `SimulationOverrides` constructor must switch from a positional `contracts` argument to an options bag:
+
+```diff
+- new SimulationOverrides(contracts);
++ new SimulationOverrides({ contracts });
+```
+
 ### [PXE] `proveTx` takes an options bag
 
 `PXE.proveTx` used to accept `scopes` as a positional argument; it now takes an options bag consistent with `simulateTx` and `profileTx`, and adds an optional `senderForTags` field. Update direct callers:
@@ -36,6 +212,58 @@ The wallet SDK now supplies the default sender-for-tags from the transaction's `
 
 The save/restore idiom previously used in account-contract constructors (`get` → `set(self.address)` → work → `set(prev)`) is also no longer needed and has been removed: the override never leaks out of the constructor, so there is nothing to restore.
 
+### [Aztec Node] Unified `getBlock` / `getCheckpoint` RPC API
+
+The Aztec Node JSON-RPC surface for fetching blocks and checkpoints has been consolidated. The unified `getBlock` and `getCheckpoint` methods return uniform `BlockResponse` / `CheckpointResponse` shapes. The extra fields a caller cares about (tx bodies, L1 publish info, committee attestations, nested blocks) are now controlled by an `options` argument rather than by picking the right method. `getBlocks` and `getCheckpoints` retain their names but now return the new response shapes.
+
+**Removed methods:**
+
+| Removed                            | Replacement                                  |
+| ---------------------------------- | -------------------------------------------- |
+| `getBlockByHash(hash)`             | `getBlock(hash)` or `getBlock({ hash })`     |
+| `getBlockByArchive(archive)`       | `getBlock({ archive })`                      |
+| `getBlockHeaderByArchive(archive)` | `getBlock({ archive }).then(r => r?.header)` |
+| `getProvenBlockNumber()`           | `getBlockNumber('proven')`                   |
+| `getCheckpointedBlockNumber()`     | `getBlockNumber('checkpointed')`             |
+
+**Deprecated but still present** (scheduled for removal once internal consumers of the archiver shape are rewired): `getL2Tips` (use `getChainTips`), `getBlockHeader` (use `getBlock(param).then(r => r?.header)`), `getCheckpointedBlocks` (use `getBlocks(from, limit, { includeL1PublishInfo: true, includeAttestations: true })`), `getCheckpointsDataForEpoch` (use `getCheckpoints(from, limit)` over the epoch's checkpoint range). Do not adopt these in new code.
+
+**New response shapes:** `BlockResponse` always carries `header`, `archive`, `hash`, `number`, `checkpointNumber`, and `indexWithinCheckpoint`. `body`, `l1` (an `L1PublishInfo` discriminated union), and `attestations` are present only when the matching include option is set. `CheckpointResponse` mirrors this for checkpoints, with `blocks` gated on `includeBlocks`, and always carries `feeAssetPriceModifier` as a base field. The response types are generic over the options object, so passing a literal `{ includeTransactions: true }` narrows the return type and `response.body` becomes non-optional.
+
+**Nested blocks on `getCheckpoint`:** only `includeTransactions` is forwarded to the blocks embedded by `includeBlocks: true`. `includeL1PublishInfo` and `includeAttestations` on a checkpoint request attach L1 / attestation data to the checkpoint itself, not to its nested blocks.
+
+**Return type changes for `getBlocks` / `getCheckpoints`:** the return type is now `BlockResponse[]` / `CheckpointResponse[]` instead of `L2Block[]` / `PublishedCheckpoint[]`. Callers that previously consumed fields of `L2Block` (e.g. `.body`) must now opt in via `{ includeTransactions: true }`; callers that consumed `PublishedCheckpoint.checkpoint.blocks` must opt in via `{ includeBlocks: true }`.
+
+**Migration for wallet/SDK consumers (`@aztec/aztec.js`, `@aztec/wallet-sdk`):**
+
+```diff
+- const block = await node.getBlockByHash(hash);
++ const block = await node.getBlock(hash, { includeTransactions: true });
+
+- const archiveBlock = await node.getBlockByArchive(archive);
++ const archiveBlock = await node.getBlock({ archive }, { includeTransactions: true });
+
+- const provenNumber = await node.getProvenBlockNumber();
++ const provenNumber = await node.getBlockNumber('proven');
+
+- const checkpointedNumber = await node.getCheckpointedBlockNumber();
++ const checkpointedNumber = await node.getBlockNumber('checkpointed');
+
+- const tips = await node.getL2Tips();
++ const tips = await node.getChainTips();
+```
+
+`getBlockHeader`, `getCheckpointedBlocks`, `getCheckpointsDataForEpoch`, and `getL2Tips` continue to work in this release but are deprecated; migrate to the replacements above.
+
+**Chain-tip selectors:** `getBlockNumber` and `getCheckpointNumber` now accept an optional `ChainTip` argument (`'proposed' | 'checkpointed' | 'proven' | 'finalized'`). Note the semantic difference: on the block side `'proposed'` means the latest proposed block (chain head), whereas on the checkpoint side `'proposed'` resolves to the latest L1-confirmed checkpoint. Pre-L1-confirmation checkpoints are not exposed over RPC.
+
+**Block parameter variants:** `BlockParameter` now also accepts a block hash, an archive root, and chain-tip names. The existing `number | 'latest'` forms continue to work — `'latest'` is an alias for `'proposed'`.
+
+**Impact**: Source changes are required anywhere the removed methods are called. Type changes are required anywhere `L2Block` / `BlockHeader` / `CheckpointedL2Block` were consumed from the RPC — those call sites now receive `BlockResponse` / `CheckpointResponse` and must request the fields they need via `options`. Production nodes will reject JSON-RPC calls to the removed method names.
+
+### [Aztec Node] `feeAssetPriceModifier` now correctly populated on confirmed checkpoints
+
+Confirmed checkpoints previously reported `feeAssetPriceModifier = 0n` regardless of the value observed on L1, because the archiver dropped the field on checkpoint confirmation. The field is now persisted and returned correctly on `CheckpointResponse`. Any wallet or indexer logic that special-cased `0n` as a sentinel for "no modifier" will need to be updated; it is now a valid value in its own right.
 
 ### [CLI] `aztec-up` no longer exposes transitive npm bins on PATH
 
@@ -92,6 +320,7 @@ Regenerate these values from a fresh build of this release — do not copy them
 `poseidon2HashWithSeparator` is exported from `@aztec/foundation/crypto/poseidon`; the `DomainSeparator` enum and the matching `DOM_SEP__*` constants are defined in `@aztec/constants`. The new entries listed above are additions — existing separator names are unchanged.
 
 For TypeScript consumers, `@aztec/stdlib/hash` exports ready-made helpers that wrap the right separator: `computeMerkleHash` (append-only), `computeNullifierMerkleHash`, and `computePublicDataMerkleHash`. Prefer these over calling `poseidon2HashWithSeparator` directly so the separator choice stays colocated with the tree.
+
 ### [Aztec.nr] `emit_private_log_unsafe` / `emit_raw_note_log_unsafe` are deprecated
 
 `emit_private_log_unsafe` and `emit_raw_note_log_unsafe` are deprecated and will be removed in a future release. Migrate to the new `emit_private_log_vec_unsafe` / `emit_raw_note_log_vec_unsafe` functions, which take a `BoundedVec<Field, PRIVATE_LOG_CIPHERTEXT_LEN>` instead of the `(log: [Field; PRIVATE_LOG_CIPHERTEXT_LEN], length: u32)` pair.
@@ -145,6 +374,7 @@ This has been done because this is the format expected by the functionality in p
 The empire slashing model has been removed. Only the tally-based slashing model remains, and it has been renamed from `TallySlashingProposer` to `SlashingProposer`.
 
 **L1 contract changes:**
+
 - `SlasherFlavor` enum removed from `ISlasher.sol`
 - `RollupConfigInput.slasherFlavor` (enum) replaced with `slasherEnabled` (bool)
 - `TallySlashingProposer` contract renamed to `SlashingProposer`
@@ -154,6 +384,7 @@ The empire slashing model has been removed. Only the tally-based slashing model
 - All `TallySlashingProposer__` error prefixes renamed to `SlashingProposer__`
 
 **Environment variable changes:**
+
 ```diff
 - AZTEC_SLASHER_FLAVOR=tally    # was: "tally" | "empire" | "none"
 + AZTEC_SLASHER_ENABLED=true    # now a boolean
@@ -166,6 +397,7 @@ The empire slashing model has been removed. Only the tally-based slashing model
 **Node admin API:** `getSlashPayloads()` method removed.
 
 **TypeScript config changes:**
+
 ```diff
 - slasherFlavor: 'tally' | 'none'
 + slasherEnabled: boolean
diff --git a/docs/docs-developers/docs/tutorials/contract_tutorials/recursive_verification.md b/docs/docs-developers/docs/tutorials/contract_tutorials/recursive_verification.md
index acc4aec289f2..dd2e4562854b 100644
--- a/docs/docs-developers/docs/tutorials/contract_tutorials/recursive_verification.md
+++ b/docs/docs-developers/docs/tutorials/contract_tutorials/recursive_verification.md
@@ -51,7 +51,7 @@ This pattern transforms arbitrarily large computations into fixed-size proof ver
 The recursive verification pattern follows this data flow:
 
 1. **Circuit Definition**: Write a Noir circuit that defines the computation you want to prove
-2. **Compilation**: Compile the circuit with `nargo compile` to produce bytecode
+2. **Compilation**: Compile the circuit with `aztec-nargo compile` (or your own `nargo compile` install) to produce bytecode
 3. **Proof Generation**: Execute the circuit offchain and generate an UltraHonk proof using [Barretenberg](https://github.com/AztecProtocol/barretenberg)
 4. **Onchain Verification**: Submit the proof to an Aztec contract that verifies it using the stored [verification key](../../resources/glossary.md#verification-key) hash
 
@@ -106,10 +106,10 @@ Start by writing a simple circuit that proves two field values are not equal. Th
 
 ### Create the Circuit Project
 
-Use `nargo new` to generate the project structure:
+Use `aztec-nargo new` to generate the project structure (the Aztec installer ships `nargo` as `aztec-nargo`; substitute your own `nargo` if its version matches `aztec-nargo --version`):
 
 ```bash
-nargo new circuit
+aztec-nargo new circuit
 ```
 
 This creates the following structure:
@@ -163,7 +163,7 @@ Update `circuit/Nargo.toml` (see [Noir crates and packages](https://noir-lang.or
 
 ```bash
 cd circuit
-nargo compile
+aztec-nargo compile
 ```
 
 This generates `target/hello_circuit.json` containing:
@@ -176,7 +176,7 @@ The TypeScript code uses the ABI to correctly format inputs during witness gener
 ### Test the Circuit
 
 ```bash
-nargo test
+aztec-nargo test
 ```
 
 Expected output:
@@ -669,7 +669,7 @@ If you want to run all commands at once, or if you're starting fresh, here's the
 yarn install
 
 # Compile the Noir circuit
-cd circuit && nargo compile && cd ..
+cd circuit && aztec-nargo compile && cd ..
 
 # Compile the Aztec contract and generate TypeScript bindings
 yarn ccc
diff --git a/docs/docs-developers/docs/tutorials/js_tutorials/aave_bridge.md b/docs/docs-developers/docs/tutorials/js_tutorials/aave_bridge.md
index 7ae089ed6e70..e4b4166768eb 100644
--- a/docs/docs-developers/docs/tutorials/js_tutorials/aave_bridge.md
+++ b/docs/docs-developers/docs/tutorials/js_tutorials/aave_bridge.md
@@ -270,7 +270,7 @@ For local testing, you'll use simplified mocks of Aave's lending pool. The mock
 
 :::tip Mock vs Real Aave
 
-In production, replace `MockAavePool` with Aave V3's `IPool` interface at `0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2` (Ethereum mainnet). The portal contract's `IAavePool` interface already matches Aave V3's function signatures. For realistic testing, fork mainnet with `anvil --fork-url <your-rpc-url>`.
+In production, replace `MockAavePool` with Aave V3's `IPool` interface at `0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2` (Ethereum mainnet). The portal contract's `IAavePool` interface already matches Aave V3's function signatures. For realistic testing, fork mainnet with `aztec-anvil --fork-url <your-rpc-url>` (the Aztec installer ships Foundry's `anvil` as `aztec-anvil`; substitute your own `anvil` if its version matches `aztec-anvil --version`).
 
 :::
 
@@ -504,7 +504,7 @@ L1-to-L2 messages need 2 L2 blocks after the L1 transaction before they become c
 
 ## Next Steps
 
-- **Test with a mainnet fork**: Use `anvil --fork-url` to test against real Aave
+- **Test with a mainnet fork**: Use `aztec-anvil --fork-url` (or your own `anvil` install) to test against real Aave
 - **Add private deposits**: Use the `claim_private` and `exit_to_l1_private` functions for privacy-preserving DeFi
 - **Build a frontend**: Add a web UI for easy depositing and claiming
 - **Compose with other protocols**: The same pattern works for Uniswap, Compound, or any L1 DeFi protocol
diff --git a/docs/docs-developers/docs/tutorials/testing_governance_rollup_upgrade.md b/docs/docs-developers/docs/tutorials/testing_governance_rollup_upgrade.md
index 9794f7af1f4c..d57fa538d4d6 100644
--- a/docs/docs-developers/docs/tutorials/testing_governance_rollup_upgrade.md
+++ b/docs/docs-developers/docs/tutorials/testing_governance_rollup_upgrade.md
@@ -70,8 +70,10 @@ git clone --depth 1 https://github.com/foundry-rs/forge-std forge-std
 git clone --depth 1 https://github.com/OpenZeppelin/openzeppelin-contracts openzeppelin-contracts
 cd ..
 
-# Install solc (uses forge's built-in svm)
-forge build --use 0.8.30 src/core/libraries/ConstantsGen.sol
+# Install solc (uses forge's built-in svm). The Aztec installer ships
+# Foundry as `aztec-forge`/`aztec-cast`/`aztec-anvil` -- substitute your
+# own `forge` install if you have one.
+aztec-forge build --use 0.8.30 src/core/libraries/ConstantsGen.sol
 cp ~/.svm/0.8.30/solc-0.8.30 ./solc-0.8.30
 
 # Copy the HonkVerifier to the generated directory (required for build)
@@ -130,7 +132,7 @@ export AZTEC_INITIAL_ETH_PER_FEE_ASSET=10000000
 ## Step 4: Deploy New Rollup
 
 ```bash
-forge script script/deploy/DeployRollupForUpgrade.s.sol:DeployRollupForUpgrade \
+aztec-forge script script/deploy/DeployRollupForUpgrade.s.sol:DeployRollupForUpgrade \
   --rpc-url $L1_RPC_URL \
   --broadcast \
   --private-key $PRIVATE_KEY
@@ -151,7 +153,7 @@ export NEW_ROLLUP_ADDRESS=0x...
 ```bash
 cd l1-contracts
 
-forge create \
+aztec-forge create \
   --rpc-url $L1_RPC_URL \
   --private-key $PRIVATE_KEY \
   --broadcast \
@@ -376,7 +378,7 @@ If you just want to test the governance flow without deploying a real rollup:
 cd l1-contracts
 
 # Deploy empty payload (no constructor args needed)
-forge create \
+aztec-forge create \
   --rpc-url $L1_RPC_URL \
   --private-key $PRIVATE_KEY \
   --broadcast \
diff --git a/docs/docs-developers/getting_started_on_local_network.md b/docs/docs-developers/getting_started_on_local_network.md
index b390b3f39838..3a4dbbdb0c55 100644
--- a/docs/docs-developers/getting_started_on_local_network.md
+++ b/docs/docs-developers/getting_started_on_local_network.md
@@ -39,17 +39,19 @@ import { General, Fees } from '@site/src/components/Snippets/general_snippets';
 Run:
 
 ```bash
-VERSION=#include_version_without_prefix bash -i <(curl -sL https://install.aztec.network/#include_version_without_prefix)
+VERSION=#include_version_without_prefix bash -i <(curl -sL https://install.aztec.network)
 ```
 
 This will install the following tools and add them to your `PATH`:
 
-- **nargo** - the Noir programming language compiler and simulator
-- **noir-profiler** - a profiler for analyzing and visualizing Noir programs
-- **bb** - the Barretenberg proving backend
 - **aztec** - compiles and tests Aztec contracts and launches various infrastructure subsystems (full local network, sequencer, prover, PXE, etc.) and provides utility commands to interact with the network
 - **aztec-up** - a version manager for the Aztec toolchain. Use `aztec-up install <version>` to install a new version, `aztec-up use <version>` to switch between installed versions, or `aztec-up list` to see installed versions.
 - **aztec-wallet** - a tool for interacting with the Aztec network
+- **aztec-bb** - the Barretenberg proving backend
+- **aztec-nargo** - the Noir compiler and simulator
+- **aztec-forge**, **aztec-cast**, **aztec-anvil**, **aztec-chisel** - the bundled Foundry tools
+
+Foundry, Noir, and Barretenberg are bundled at the versions `aztec` needs. Your own `forge` / `nargo` / `bb` installs still work under their bare names.
 
 For syntax highlighting and LSP support while editing contracts, see the [Noir VSCode Extension guide](./docs/aztec-nr/installation.md).
 
diff --git a/docs/docs-operate/operators/reference/node-api-reference.md b/docs/docs-operate/operators/reference/node-api-reference.md
index d68617cf4c4e..225b6321a493 100644
--- a/docs/docs-operate/operators/reference/node-api-reference.md
+++ b/docs/docs-operate/operators/reference/node-api-reference.md
@@ -109,9 +109,9 @@ Get a block specified by its block number or 'latest'.
 
 **Parameters**:
 
-1. `blockParameter` - `number | "latest"` - The block parameter (block number, block hash, or 'latest').
+1. `blockParameter` - `BlockHash | number | "latest"` - The block parameter (block number, block hash, or 'latest').
 
-**Returns**: `L2Block` - The requested block.
+**Returns**: `L2Block | undefined` - The requested block.
 
 **Example**:
 
@@ -129,7 +129,7 @@ Get a block specified by its hash.
 
 1. `blockHash` - `BlockHash` - The block hash being requested.
 
-**Returns**: `L2Block` - The requested block.
+**Returns**: `L2Block | undefined` - The requested block.
 
 **Example**:
 
@@ -147,7 +147,7 @@ Get a block specified by its archive root.
 
 1. `archive` - `Fr` - The archive root being requested.
 
-**Returns**: `L2Block` - The requested block.
+**Returns**: `L2Block | undefined` - The requested block.
 
 **Example**:
 
@@ -173,7 +173,7 @@ Method to request blocks. Will attempt to return all requested blocks but will r
 ```bash
 curl -X POST http://localhost:8080 \
   -H 'Content-Type: application/json' \
-  -d '{"jsonrpc":"2.0","method":"node_getBlocks","params":[12345,12345],"id":1}'
+  -d '{"jsonrpc":"2.0","method":"node_getBlocks","params":[1,100],"id":1}'
 ```
 
 ### node_getBlockHeader
@@ -182,9 +182,9 @@ Returns the block header for a given block number, block hash, or 'latest'.
 
 **Parameters**:
 
-1. `block` - `number | "latest" | undefined` - The block parameter (block number, block hash, or 'latest'). Defaults to 'latest'.
+1. `block` - `BlockHash | number | "latest" | undefined` - The block parameter (block number, block hash, or 'latest'). Defaults to 'latest'.
 
-**Returns**: `BlockHeader` - The requested block header.
+**Returns**: `BlockHeader | undefined` - The requested block header.
 
 **Example**:
 
@@ -202,7 +202,7 @@ Get a block header specified by its archive root.
 
 1. `archive` - `Fr` - The archive root being requested.
 
-**Returns**: `BlockHeader` - The requested block header.
+**Returns**: `BlockHeader | undefined` - The requested block header.
 
 **Example**:
 
@@ -228,7 +228,7 @@ Retrieves a collection of checkpoints.
 ```bash
 curl -X POST http://localhost:8080 \
   -H 'Content-Type: application/json' \
-  -d '{"jsonrpc":"2.0","method":"node_getCheckpoints","params":[12345,12345],"id":1}'
+  -d '{"jsonrpc":"2.0","method":"node_getCheckpoints","params":[1,100],"id":1}'
 ```
 
 ### node_getCheckpointedBlocks
@@ -245,7 +245,7 @@ curl -X POST http://localhost:8080 \
 ```bash
 curl -X POST http://localhost:8080 \
   -H 'Content-Type: application/json' \
-  -d '{"jsonrpc":"2.0","method":"node_getCheckpointedBlocks","params":[12345,12345],"id":1}'
+  -d '{"jsonrpc":"2.0","method":"node_getCheckpointedBlocks","params":[1,100],"id":1}'
 ```
 
 ### node_getCheckpointsDataForEpoch
@@ -332,7 +332,7 @@ Method to retrieve a single pending tx.
 
 1. `txHash` - `TxHash` - The transaction hash to return.
 
-**Returns**: `Tx` - The pending tx if it exists.
+**Returns**: `Tx | undefined` - The pending tx if it exists.
 
 **Example**:
 
@@ -376,7 +376,7 @@ Method to retrieve pending txs.
 ```bash
 curl -X POST http://localhost:8080 \
   -H 'Content-Type: application/json' \
-  -d '{"jsonrpc":"2.0","method":"node_getPendingTxs","params":[12345,"0x1234..."],"id":1}'
+  -d '{"jsonrpc":"2.0","method":"node_getPendingTxs","params":[100,"0x1234..."],"id":1}'
 ```
 
 ### node_getPendingTxCount
@@ -442,9 +442,12 @@ curl -X POST http://localhost:8080 \
 
 Gets the storage value at the given contract storage slot.
 
+**Remarks**: The storage slot here refers to the slot as it is defined in Noir not the index in the merkle tree.
+Aztec's version of `eth_getStorageAt`.
+
 **Parameters**:
 
-1. `referenceBlock` - `number | "latest"` - The block parameter (block number, block hash, or 'latest') at which to get the data.
+1. `referenceBlock` - `BlockHash | number | "latest"` - The block parameter (block number, block hash, or 'latest') at which to get the data.
 2. `contract` - `AztecAddress` - Address of the contract to query.
 3. `slot` - `Fr` - Slot to query.
 
@@ -483,11 +486,11 @@ the leaves were inserted.
 
 **Parameters**:
 
-1. `referenceBlock` - `number | "latest"` - The block parameter (block number, block hash, or 'latest') at which to get the data.
+1. `referenceBlock` - `BlockHash | number | "latest"` - The block parameter (block number, block hash, or 'latest') at which to get the data.
 2. `treeId` - `MerkleTreeId` - The tree to search in.
 3. `leafValues` - `Fr[]` - The values to search for.
 
-**Returns**: `DataInBlock<bigint> | undefined[]` - The indices of leaves and the block metadata of a block in which the leaves were inserted.
+**Returns**: `(DataInBlock<bigint> | undefined)[]` - The indices of leaves and the block metadata of a block in which the leaves were inserted.
 
 **Example**:
 
@@ -503,10 +506,10 @@ Returns a nullifier membership witness for a given nullifier at a given block.
 
 **Parameters**:
 
-1. `referenceBlock` - `number | "latest"` - The block parameter (block number, block hash, or 'latest') at which to get the data.
+1. `referenceBlock` - `BlockHash | number | "latest"` - The block parameter (block number, block hash, or 'latest') at which to get the data.
 2. `nullifier` - `Fr` - Nullifier we try to find witness for.
 
-**Returns**: `NullifierMembershipWitness` - The nullifier membership witness (if found).
+**Returns**: `NullifierMembershipWitness | undefined` - The nullifier membership witness (if found).
 
 **Example**:
 
@@ -520,12 +523,16 @@ curl -X POST http://localhost:8080 \
 
 Returns a low nullifier membership witness for a given nullifier at a given block.
 
+**Remarks**: Low nullifier witness can be used to perform a nullifier non-inclusion proof by leveraging the "linked
+list structure" of leaves and proving that a lower nullifier is pointing to a bigger next value than the nullifier
+we are trying to prove non-inclusion for.
+
 **Parameters**:
 
-1. `referenceBlock` - `number | "latest"` - The block parameter (block number, block hash, or 'latest') at which to get the data.
+1. `referenceBlock` - `BlockHash | number | "latest"` - The block parameter (block number, block hash, or 'latest') at which to get the data.
 2. `nullifier` - `Fr` - Nullifier we try to find the low nullifier witness for.
 
-**Returns**: `NullifierMembershipWitness` - The low nullifier membership witness (if found).
+**Returns**: `NullifierMembershipWitness | undefined` - The low nullifier membership witness (if found).
 
 **Example**:
 
@@ -539,12 +546,16 @@ curl -X POST http://localhost:8080 \
 
 Returns a public data tree witness for a given leaf slot at a given block.
 
+**Remarks**: The witness can be used to compute the current value of the public data tree leaf. If the low leaf preimage corresponds to an
+"in range" slot, means that the slot doesn't exist and the value is 0. If the low leaf preimage corresponds to the exact slot, the current value
+is contained in the leaf preimage.
+
 **Parameters**:
 
-1. `referenceBlock` - `number | "latest"` - The block parameter (block number, block hash, or 'latest') at which to get the data.
+1. `referenceBlock` - `BlockHash | number | "latest"` - The block parameter (block number, block hash, or 'latest') at which to get the data.
 2. `leafSlot` - `Fr` - The leaf slot we try to find the witness for.
 
-**Returns**: `PublicDataWitness` - The public data witness (if found).
+**Returns**: `PublicDataWitness | undefined` - The public data witness (if found).
 
 **Example**:
 
@@ -565,7 +576,7 @@ a specific block exists in the chain's history.
 
 **Parameters**:
 
-1. `referenceBlock` - `number | "latest"` - The block parameter (block number, block hash, or 'latest') at which to get the data
+1. `referenceBlock` - `BlockHash | number | "latest"` - The block parameter (block number, block hash, or 'latest') at which to get the data
 (which contains the root of the archive tree in which we are searching for the block hash).
 2. `blockHash` - `BlockHash` - The block hash to find in the archive tree.
 
@@ -585,7 +596,7 @@ Returns a membership witness for a given note hash at a given block.
 
 **Parameters**:
 
-1. `referenceBlock` - `number | "latest"` - The block parameter (block number, block hash, or 'latest') at which to get the data.
+1. `referenceBlock` - `BlockHash | number | "latest"` - The block parameter (block number, block hash, or 'latest') at which to get the data.
 2. `noteHash` - `Fr` - The note hash we try to find the witness for.
 
 **Returns**: `MembershipWitness | undefined`
@@ -606,7 +617,7 @@ Returns the index and a sibling path for a leaf in the committed l1 to l2 data t
 
 **Parameters**:
 
-1. `referenceBlock` - `number | "latest"` - The block parameter (block number, block hash, or 'latest') at which to get the data.
+1. `referenceBlock` - `BlockHash | number | "latest"` - The block parameter (block number, block hash, or 'latest') at which to get the data.
 2. `l1ToL2Message` - `Fr` - The l1ToL2Message to get the index / sibling path for.
 
 **Returns**: `[bigint, SiblingPath] | undefined` - A tuple of the index and the sibling path of the L1ToL2Message (undefined if not found).
@@ -736,7 +747,7 @@ for a tag, the caller should fetch the next page to check for more logs.
 ```bash
 curl -X POST http://localhost:8080 \
   -H 'Content-Type: application/json' \
-  -d '{"jsonrpc":"2.0","method":"node_getPrivateLogsByTags","params":[["0x1234..."],12345,"0x1234..."],"id":1}'
+  -d '{"jsonrpc":"2.0","method":"node_getPrivateLogsByTags","params":[["0x1234..."],0,"0x1234..."],"id":1}'
 ```
 
 ### node_getPublicLogsByTagsFromContract
@@ -762,7 +773,7 @@ for a tag, the caller should fetch the next page to check for more logs.
 ```bash
 curl -X POST http://localhost:8080 \
   -H 'Content-Type: application/json' \
-  -d '{"jsonrpc":"2.0","method":"node_getPublicLogsByTagsFromContract","params":["0x1234...",["0x1234..."],12345,"0x1234..."],"id":1}'
+  -d '{"jsonrpc":"2.0","method":"node_getPublicLogsByTagsFromContract","params":["0x1234...",["0x1234..."],0,"0x1234..."],"id":1}'
 ```
 
 ## Contract queries
@@ -821,6 +832,26 @@ curl -X POST http://localhost:8080 \
   -d '{"jsonrpc":"2.0","method":"node_getCurrentMinFees","params":[],"id":1}'
 ```
 
+### node_getPredictedMinFees
+
+Returns predicted min fees for the current slot and next N slots.
+Each entry accounts for the L1 gas oracle transition and congestion growth based on the
+given mana usage estimate. Defaults to target usage (steady state).
+
+**Parameters**:
+
+1. `manaUsage` - `ManaUsageEstimate | undefined` - Expected mana usage per checkpoint (none, target, or limit).
+
+**Returns**: `GasFees[]` - An array of GasFees, one per slot in the prediction window.
+
+**Example**:
+
+```bash
+curl -X POST http://localhost:8080 \
+  -H 'Content-Type: application/json' \
+  -d '{"jsonrpc":"2.0","method":"node_getPredictedMinFees","params":["target"],"id":1}'
+```
+
 ### node_getMaxPriorityFees
 
 Method to fetch the current max priority fee of txs in the mempool.
@@ -1169,6 +1200,8 @@ Pauses syncing and rolls back the database to the target L2 block number.
 **Parameters**:
 
 1. `targetBlockNumber` - `number` - The block number to roll back to.
+2. `force` - `boolean | undefined` - If true, clears the world state db and p2p dbs if rolling back to behind the finalized block.
+3. `resumeSync` - `boolean | undefined` - If true (default), resumes archiver and world state sync after rollback.
 
 **Returns**: `void`
 
@@ -1177,7 +1210,7 @@ Pauses syncing and rolls back the database to the target L2 block number.
 ```bash
 curl -X POST http://localhost:8880 \
   -H 'Content-Type: application/json' \
-  -d '{"jsonrpc":"2.0","method":"nodeAdmin_rollbackTo","params":[12345],"id":1}'
+  -d '{"jsonrpc":"2.0","method":"nodeAdmin_rollbackTo","params":[12345,true,true],"id":1}'
 ```
 
 **Example (Docker)**:
@@ -1185,7 +1218,7 @@ curl -X POST http://localhost:8880 \
 ```bash
 docker exec -it aztec-node curl -X POST http://localhost:8880 \
   -H 'Content-Type: application/json' \
-  -d '{"jsonrpc":"2.0","method":"nodeAdmin_rollbackTo","params":[12345],"id":1}'
+  -d '{"jsonrpc":"2.0","method":"nodeAdmin_rollbackTo","params":[12345,true,true],"id":1}'
 ```
 
 ### nodeAdmin_startSnapshotUpload
@@ -1214,30 +1247,6 @@ docker exec -it aztec-node curl -X POST http://localhost:8880 \
   -d '{"jsonrpc":"2.0","method":"nodeAdmin_startSnapshotUpload","params":["0x1234..."],"id":1}'
 ```
 
-### nodeAdmin_getSlashPayloads
-
-Returns all monitored payloads by the slasher for the current round.
-
-**Parameters**: None
-
-**Returns**: `SlashPayloadRound[]`
-
-**Example (CLI)**:
-
-```bash
-curl -X POST http://localhost:8880 \
-  -H 'Content-Type: application/json' \
-  -d '{"jsonrpc":"2.0","method":"nodeAdmin_getSlashPayloads","params":[],"id":1}'
-```
-
-**Example (Docker)**:
-
-```bash
-docker exec -it aztec-node curl -X POST http://localhost:8880 \
-  -H 'Content-Type: application/json' \
-  -d '{"jsonrpc":"2.0","method":"nodeAdmin_getSlashPayloads","params":[],"id":1}'
-```
-
 ### nodeAdmin_getSlashOffenses
 
 Returns all offenses applicable for the given round.
@@ -1253,7 +1262,7 @@ Returns all offenses applicable for the given round.
 ```bash
 curl -X POST http://localhost:8880 \
   -H 'Content-Type: application/json' \
-  -d '{"jsonrpc":"2.0","method":"nodeAdmin_getSlashOffenses","params":["0x1234..."],"id":1}'
+  -d '{"jsonrpc":"2.0","method":"nodeAdmin_getSlashOffenses","params":["current"],"id":1}'
 ```
 
 **Example (Docker)**:
@@ -1261,7 +1270,7 @@ curl -X POST http://localhost:8880 \
 ```bash
 docker exec -it aztec-node curl -X POST http://localhost:8880 \
   -H 'Content-Type: application/json' \
-  -d '{"jsonrpc":"2.0","method":"nodeAdmin_getSlashOffenses","params":["0x1234..."],"id":1}'
+  -d '{"jsonrpc":"2.0","method":"nodeAdmin_getSlashOffenses","params":["current"],"id":1}'
 ```
 
 ### nodeAdmin_reloadKeystore
diff --git a/docs/docusaurus.config.js b/docs/docusaurus.config.js
index 987e164bdcd9..4f30ccddd447 100644
--- a/docs/docusaurus.config.js
+++ b/docs/docusaurus.config.js
@@ -264,12 +264,16 @@ const config = {
       {
         generateLLMsTxt: true,
         generateLLMsFullTxt: true,
-        docsDir: `developer_versioned_docs/version-${mainnetDeveloperVersion || developerTestnetVersion}/`,
+        docsDir: `developer_versioned_docs/version-${mainnetDeveloperVersion || developerTestnetVersion}`,
         title: "Aztec Protocol Documentation",
         excludeImports: true,
         version: mainnetDeveloperVersion || developerTestnetVersion,
+        addMdExtension: false,
         pathTransformation: {
-          ignorePaths: ["docs"],
+          ignorePaths: [
+            `developer_versioned_docs/version-${mainnetDeveloperVersion || developerTestnetVersion}`,
+          ],
+          addPaths: ["developers"],
         },
       },
     ],
@@ -285,6 +289,9 @@ const config = {
     ],
     // ["./src/plugins/plugin-embed-code", {}],
   ],
+  clientModules: [
+    './src/clientModules/docsgpt.js',
+  ],
   customFields: {},
   themeConfig:
     /** @type {import('@docusaurus/preset-classic').ThemeConfig} */
diff --git a/docs/examples/ts/aave_bridge/index.ts b/docs/examples/ts/aave_bridge/index.ts
index 760d77cf58dc..01f618b05d67 100644
--- a/docs/examples/ts/aave_bridge/index.ts
+++ b/docs/examples/ts/aave_bridge/index.ts
@@ -24,11 +24,16 @@ import { AaveBridgeContract } from "./artifacts/AaveBridge.js";
 // docs:start:setup
 // Setup L1 client using anvil's default mnemonic
 const MNEMONIC = "test test test test test test test test test test test junk";
-const l1Client = createExtendedL1Client([process.env.ETHEREUM_HOST ?? "http://localhost:8545"], MNEMONIC);
+const l1Client = createExtendedL1Client(
+  [process.env.ETHEREUM_HOST ?? "http://localhost:8545"],
+  MNEMONIC,
+);
 
 // Setup L2 using Aztec's local network
 console.log("Setting up L2...\n");
-const node = createAztecNodeClient(process.env.AZTEC_NODE_URL ?? "http://localhost:8080");
+const node = createAztecNodeClient(
+  process.env.AZTEC_NODE_URL ?? "http://localhost:8080",
+);
 await waitForNode(node);
 const aztecWallet = await EmbeddedWallet.create(node, { ephemeral: true });
 const [accData] = await getInitialTestAccountsData();
@@ -174,7 +179,6 @@ async function mine2Blocks(
     EthAddress.ZERO,
   ).send({
     from: accountAddress,
-    contractAddressSalt: Fr.random(),
   });
   await AaveBridgeContract.deploy(
     aztecWallet,
@@ -182,7 +186,6 @@ async function mine2Blocks(
     EthAddress.ZERO,
   ).send({
     from: accountAddress,
-    contractAddressSalt: Fr.random(),
   });
 }
 // docs:end:mine_blocks
@@ -204,7 +207,11 @@ const burnAuthwit = await SetPublicAuthwitContractInteraction.create(
   account.address,
   {
     caller: l2Bridge.address,
-    action: l2Token.methods.burn_public(account.address, amountToDeposit, burnNonce),
+    action: l2Token.methods.burn_public(
+      account.address,
+      amountToDeposit,
+      burnNonce,
+    ),
   },
   true,
 );
@@ -231,7 +238,10 @@ console.log(`Exit sent (block: ${exitReceipt.blockNumber})`);
 // toFunctionSelector computes keccak256 of the signature and takes the first 4 bytes.
 const portalEthAddress = EthAddress.fromString(portalAddress.toString());
 const withdrawContent = sha256ToField([
-  Buffer.from(toFunctionSelector("withdraw(address,uint256,address)").substring(2), "hex"),
+  Buffer.from(
+    toFunctionSelector("withdraw(address,uint256,address)").substring(2),
+    "hex",
+  ),
   portalEthAddress.toBuffer32(),
   new Fr(amountToDeposit).toBuffer(),
   EthAddress.ZERO.toBuffer32(),
@@ -258,18 +268,22 @@ if (!exitReceipt.blockNumber) {
 }
 const exitBlockNumber = exitReceipt.blockNumber;
 console.log("Waiting for block to be proven...");
-let provenBlockNumber = await node.getProvenBlockNumber();
+let provenBlockNumber = await node.getBlockNumber("proven");
 while (provenBlockNumber < exitBlockNumber) {
   console.log(
     `   Waiting... (proven: ${provenBlockNumber}, needed: ${exitBlockNumber})`,
   );
   await new Promise((resolve) => setTimeout(resolve, 10000));
-  provenBlockNumber = await node.getProvenBlockNumber();
+  provenBlockNumber = await node.getBlockNumber("proven");
 }
 console.log("Block proven!\n");
 
 // Compute the membership witness using the message hash and the L2 tx hash
-const witness = await computeL2ToL1MembershipWitness(node, msgLeaf, exitReceipt.txHash);
+const witness = await computeL2ToL1MembershipWitness(
+  node,
+  msgLeaf,
+  exitReceipt.txHash,
+);
 const epoch = witness!.epochNumber;
 
 const siblingPathHex = witness!.siblingPath
@@ -369,7 +383,9 @@ await mine2Blocks(aztecWallet, account.address);
 
 // The mock Aave pool returns 10% yield, so 500 DAI becomes 550 DAI
 const expectedWithYield = amountToDeposit + (amountToDeposit * 1000n) / 10000n;
-console.log(`Expected amount with yield: ${expectedWithYield / 10n ** 18n} tokens`);
+console.log(
+  `Expected amount with yield: ${expectedWithYield / 10n ** 18n} tokens`,
+);
 
 // On L2: consume the L1->L2 message and mint tokens (with yield)
 console.log("Claiming tokens on L2...");
@@ -392,7 +408,9 @@ const expectedFinal = initialRemaining + expectedWithYield; // 500 + 550 = 1050
 
 console.log(`Initial deposit:     ${depositAmount / 10n ** 18n} tokens`);
 console.log(`Deposited to Aave:   ${amountToDeposit / 10n ** 18n} tokens`);
-console.log(`Yield earned (10%):  ${(expectedWithYield - amountToDeposit) / 10n ** 18n} tokens`);
+console.log(
+  `Yield earned (10%):  ${(expectedWithYield - amountToDeposit) / 10n ** 18n} tokens`,
+);
 console.log(`Expected balance:    ${expectedFinal / 10n ** 18n} tokens`);
 console.log(`Actual balance:      ${finalBalance / 10n ** 18n} tokens`);
 console.log(
diff --git a/docs/examples/ts/aztecjs_advanced/index.ts b/docs/examples/ts/aztecjs_advanced/index.ts
index 7d22adf120c4..90f60cc5c675 100644
--- a/docs/examples/ts/aztecjs_advanced/index.ts
+++ b/docs/examples/ts/aztecjs_advanced/index.ts
@@ -16,14 +16,22 @@ import { getPublicEvents } from "@aztec/aztec.js/events";
 import { GasSettings } from "@aztec/stdlib/gas";
 
 // Setup: connect to network
-const node = createAztecNodeClient(process.env.AZTEC_NODE_URL ?? "http://localhost:8080");
+const node = createAztecNodeClient(
+  process.env.AZTEC_NODE_URL ?? "http://localhost:8080",
+);
 await waitForNode(node);
 const wallet = await EmbeddedWallet.create(node, { ephemeral: true });
 
 const testAccounts = await getInitialTestAccountsData();
 const [aliceAddress, bobAddress] = await Promise.all(
   testAccounts.slice(0, 2).map(async (account) => {
-    return (await wallet.createSchnorrAccount(account.secret, account.salt, account.signingKey)).address;
+    return (
+      await wallet.createSchnorrAccount(
+        account.secret,
+        account.salt,
+        account.signingKey,
+      )
+    ).address;
   }),
 );
 
@@ -45,8 +53,13 @@ const sponsoredFPCInstance = await getContractInstanceFromInstantiationParams(
   SponsoredFPCContract.artifact,
   { salt: new Fr(0) },
 );
-await wallet.registerContract(sponsoredFPCInstance, SponsoredFPCContract.artifact);
-const sponsoredPaymentMethod = new SponsoredFeePaymentMethod(sponsoredFPCInstance.address);
+await wallet.registerContract(
+  sponsoredFPCInstance,
+  SponsoredFPCContract.artifact,
+);
+const sponsoredPaymentMethod = new SponsoredFeePaymentMethod(
+  sponsoredFPCInstance.address,
+);
 
 // wallet is from the connection guide; sponsoredPaymentMethod is from the fees guide
 const { contract: sponsoredContract } = await TokenContract.deploy(
@@ -68,9 +81,9 @@ const { contract: saltedContract } = await TokenContract.deploy(
   "SaltedToken",
   "SALT",
   18,
+  { salt: customSalt },
 ).send({
   from: aliceAddress,
-  contractAddressSalt: customSalt,
 });
 // docs:end:deploy_custom_salt
 
@@ -84,8 +97,9 @@ const deployMethod = TokenContract.deploy(
   "PredictedToken",
   "PRED",
   18,
+  { salt: deploymentSalt, deployer: aliceAddress },
 );
-const instance = await deployMethod.getInstance({ contractAddressSalt: deploymentSalt });
+const instance = await deployMethod.getInstance();
 const predictedAddress = instance.address;
 
 console.log(`Contract will deploy at: ${predictedAddress}`);
@@ -235,15 +249,21 @@ console.log(`Derived token at: ${derivedToken.address.toString()}`);
 // docs:start:parallel_deploy
 // Deploy contracts in parallel using Promise.all
 const contracts = await Promise.all([
-  TokenContract.deploy(wallet, aliceAddress, "Token1", "T1", 18).send({
-    from: aliceAddress,
-  }).then(({ contract }) => contract),
-  TokenContract.deploy(wallet, aliceAddress, "Token2", "T2", 18).send({
-    from: aliceAddress,
-  }).then(({ contract }) => contract),
-  TokenContract.deploy(wallet, aliceAddress, "Token3", "T3", 18).send({
-    from: aliceAddress,
-  }).then(({ contract }) => contract),
+  TokenContract.deploy(wallet, aliceAddress, "Token1", "T1", 18)
+    .send({
+      from: aliceAddress,
+    })
+    .then(({ contract }) => contract),
+  TokenContract.deploy(wallet, aliceAddress, "Token2", "T2", 18)
+    .send({
+      from: aliceAddress,
+    })
+    .then(({ contract }) => contract),
+  TokenContract.deploy(wallet, aliceAddress, "Token3", "T3", 18)
+    .send({
+      from: aliceAddress,
+    })
+    .then(({ contract }) => contract),
 ]);
 
 console.log(`Contract 1 at: ${contracts[0].address}`);
@@ -293,8 +313,12 @@ async function pollForTransferEvents() {
 
     for (const { event, metadata } of events) {
       // Process each transfer event
-      console.log(`Transfer: ${event.amount} from ${event.from} to ${event.to}`);
-      console.log(`  in block ${metadata.l2BlockNumber}, tx ${metadata.txHash}`);
+      console.log(
+        `Transfer: ${event.amount} from ${event.from} to ${event.to}`,
+      );
+      console.log(
+        `  in block ${metadata.l2BlockNumber}, tx ${metadata.txHash}`,
+      );
     }
 
     lastProcessedBlock = currentBlock;
@@ -307,7 +331,11 @@ await pollForTransferEvents();
 
 // docs:start:connect_to_contract
 // wallet is from the connection guide; token is the contract deployed in the deploy guide
-const contract = await Contract.at(token.address, TokenContract.artifact, wallet);
+const contract = await Contract.at(
+  token.address,
+  TokenContract.artifact,
+  wallet,
+);
 // docs:end:connect_to_contract
 
 // docs:start:basic_send_transaction
@@ -333,7 +361,10 @@ console.log("DA gas limit:", metaResult.estimatedGas.gasLimits.daGas);
 // docs:end:simulate_with_metadata
 
 // docs:start:read_public_logs
-const publicLogs = await node.getPublicLogs({ fromBlock: 1, toBlock: await node.getBlockNumber() + 1 });
+const publicLogs = await node.getPublicLogs({
+  fromBlock: 1,
+  toBlock: (await node.getBlockNumber()) + 1,
+});
 if (publicLogs.logs.length > 0) {
   const rawFields = publicLogs.logs[0].log.getEmittedFields(); // Fr[]
   console.log("Raw log fields:", rawFields.length);
@@ -385,16 +416,21 @@ const networkFees = await node.getCurrentMinFees();
 const gasSettings = GasSettings.from({
   gasLimits: { daGas: 100_000, l2Gas: 2_000_000 },
   teardownGasLimits: { daGas: 100_000, l2Gas: 2_000_000 },
-  maxFeesPerGas: { feePerDaGas: networkFees.feePerDaGas * 2n, feePerL2Gas: networkFees.feePerL2Gas * 2n },
+  maxFeesPerGas: {
+    feePerDaGas: networkFees.feePerDaGas * 2n,
+    feePerL2Gas: networkFees.feePerL2Gas * 2n,
+  },
   maxPriorityFeesPerGas: { feePerDaGas: 0n, feePerL2Gas: 0n },
 });
 // docs:end:custom_gas_settings
 
 // docs:start:send_with_gas_settings
-const { receipt: gsReceipt } = await token.methods.mint_to_public(aliceAddress, 1n).send({
-  from: aliceAddress,
-  fee: { gasSettings },
-});
+const { receipt: gsReceipt } = await token.methods
+  .mint_to_public(aliceAddress, 1n)
+  .send({
+    from: aliceAddress,
+    fee: { gasSettings },
+  });
 // docs:end:send_with_gas_settings
 
 // docs:start:read_logs_by_filter
@@ -402,7 +438,10 @@ const { receipt: gsReceipt } = await token.methods.mint_to_public(aliceAddress,
 const txLogs = await node.getPublicLogs({ txHash: gsReceipt.txHash });
 
 // Get logs for a block range
-const rangeLogs = await node.getPublicLogs({ fromBlock: 1, toBlock: await node.getBlockNumber() + 1 });
+const rangeLogs = await node.getPublicLogs({
+  fromBlock: 1,
+  toBlock: (await node.getBlockNumber()) + 1,
+});
 // docs:end:read_logs_by_filter
 
 // docs:start:auto_gas_estimation
@@ -435,5 +474,4 @@ const { result: privateBalance } = await token.methods
   .simulate({ from: aliceAddress });
 // docs:end:simulate_private_access
 
-
 console.log("All advanced examples completed successfully");
diff --git a/docs/examples/ts/example_swap/index.ts b/docs/examples/ts/example_swap/index.ts
index f8e30c7c9a1b..883c120c5bad 100644
--- a/docs/examples/ts/example_swap/index.ts
+++ b/docs/examples/ts/example_swap/index.ts
@@ -43,8 +43,7 @@ const account = await wallet.createSchnorrAccount(
 console.log(`Account: ${account.address.toString()}\n`);
 
 const nodeInfo = await node.getNodeInfo();
-const registryAddress =
-  nodeInfo.l1ContractAddresses.registryAddress.toString();
+const registryAddress = nodeInfo.l1ContractAddresses.registryAddress.toString();
 const inboxAddress = nodeInfo.l1ContractAddresses.inboxAddress.toString();
 // docs:end:setup
 
@@ -302,11 +301,9 @@ async function mine2Blocks(
 ) {
   await TokenContract.deploy(wallet, accountAddress, "T", "T", 18).send({
     from: accountAddress,
-    contractAddressSalt: Fr.random(),
   });
   await TokenContract.deploy(wallet, accountAddress, "T", "T", 18).send({
     from: accountAddress,
-    contractAddressSalt: Fr.random(),
   });
 }
 // docs:end:mine_blocks
@@ -325,7 +322,9 @@ const { result: wethBalanceBefore } = await l2Weth.methods
   .simulate({ from: account.address });
 console.log(`L2 WETH balance after claim: ${wethBalanceBefore}\n`);
 if (wethBalanceBefore !== SWAP_AMOUNT) {
-  throw new Error(`Expected WETH balance ${SWAP_AMOUNT}, got ${wethBalanceBefore}`);
+  throw new Error(
+    `Expected WETH balance ${SWAP_AMOUNT}, got ${wethBalanceBefore}`,
+  );
 }
 console.log("✓ WETH claimed successfully on L2\n");
 // docs:end:claim_on_l2
@@ -384,13 +383,13 @@ console.log("✓ WETH transferred to bridge for swap\n");
 // docs:start:wait_for_proof
 console.log("Waiting for block to be proven...\n");
 
-let provenBlockNumber = await node.getProvenBlockNumber();
+let provenBlockNumber = await node.getBlockNumber("proven");
 while (provenBlockNumber < swapReceipt.blockNumber!) {
   console.log(
     `   Waiting... (proven: ${provenBlockNumber}, needed: ${swapReceipt.blockNumber})`,
   );
   await new Promise((resolve) => setTimeout(resolve, 10000));
-  provenBlockNumber = await node.getProvenBlockNumber();
+  provenBlockNumber = await node.getBlockNumber("proven");
 }
 
 console.log("Block proven!\n");
@@ -488,7 +487,9 @@ const swapContentEncoded = encodeFunctionData({
   ],
 });
 
-const swapContentHash = sha256ToField([Buffer.from(swapContentEncoded.slice(2), "hex")]);
+const swapContentHash = sha256ToField([
+  Buffer.from(swapContentEncoded.slice(2), "hex"),
+]);
 
 const swapMsgLeaf = computeL2ToL1MessageHash({
   l2Sender: l2Uniswap.address,
diff --git a/docs/examples/ts/token_bridge/index.ts b/docs/examples/ts/token_bridge/index.ts
index 728f285164bc..ac0a1d5b6a29 100644
--- a/docs/examples/ts/token_bridge/index.ts
+++ b/docs/examples/ts/token_bridge/index.ts
@@ -63,7 +63,10 @@ console.log(`NFTPortal: ${portalAddress}\n`);
 // docs:start:deploy_l2_contracts
 console.log("Deploying L2 contracts...\n");
 
-const { contract: l2Nft } = await NFTPunkContract.deploy(aztecWallet, account.address).send({
+const { contract: l2Nft } = await NFTPunkContract.deploy(
+  aztecWallet,
+  account.address,
+).send({
   from: account.address,
 });
 
@@ -201,11 +204,9 @@ async function mine2Blocks(
 ) {
   await NFTPunkContract.deploy(aztecWallet, accountAddress).send({
     from: accountAddress,
-    contractAddressSalt: Fr.random(),
   });
   await NFTPunkContract.deploy(aztecWallet, accountAddress).send({
     from: accountAddress,
-    contractAddressSalt: Fr.random(),
   });
 }
 // docs:end:mine_blocks
@@ -289,7 +290,7 @@ const msgLeaf = computeL2ToL1MessageHash({
 console.log("Waiting for block to be proven...");
 console.log(`   Exit block number: ${exitReceipt.blockNumber}`);
 
-let provenBlockNumber = await node.getProvenBlockNumber();
+let provenBlockNumber = await node.getBlockNumber("proven");
 console.log(`   Current proven block: ${provenBlockNumber}`);
 
 while (provenBlockNumber < exitReceipt.blockNumber!) {
@@ -297,13 +298,17 @@ while (provenBlockNumber < exitReceipt.blockNumber!) {
     `   Waiting... (proven: ${provenBlockNumber}, needed: ${exitReceipt.blockNumber})`,
   );
   await new Promise((resolve) => setTimeout(resolve, 10000)); // Wait 10 seconds
-  provenBlockNumber = await node.getProvenBlockNumber();
+  provenBlockNumber = await node.getBlockNumber("proven");
 }
 
 console.log("Block proven!\n");
 
 // Compute the membership witness using the message hash and the L2 tx hash
-const witness = await computeL2ToL1MembershipWitness(node, msgLeaf, exitReceipt.txHash);
+const witness = await computeL2ToL1MembershipWitness(
+  node,
+  msgLeaf,
+  exitReceipt.txHash,
+);
 const epoch = witness!.epochNumber;
 console.log(`   Epoch for block ${exitReceipt.blockNumber}: ${epoch}`);
 
diff --git a/docs/examples/webapp-tutorial/test-extension/src/background.ts b/docs/examples/webapp-tutorial/test-extension/src/background.ts
index e3c1a3342aed..a0e66e61b939 100644
--- a/docs/examples/webapp-tutorial/test-extension/src/background.ts
+++ b/docs/examples/webapp-tutorial/test-extension/src/background.ts
@@ -15,12 +15,23 @@ import {
   type BackgroundTransport,
   type BackgroundConnectionCallbacks,
   type ActiveSession,
-} from '@aztec/wallet-sdk/extension/handlers';
+} from "@aztec/wallet-sdk/extension/handlers";
 
-import { WALLET_CONFIG, MessageTarget, MessageTypes, AUTO_LOCK_MINUTES, log } from './config';
-import { getErrorMessage } from './utils';
-import { STORAGE_KEYS } from './wallet/storage';
-import type { PendingTransaction, PendingSessionVerification, PendingCapabilities, BackgroundTask } from './shared-types';
+import {
+  WALLET_CONFIG,
+  MessageTarget,
+  MessageTypes,
+  AUTO_LOCK_MINUTES,
+  log,
+} from "./config";
+import { getErrorMessage } from "./utils";
+import { STORAGE_KEYS } from "./wallet/storage";
+import type {
+  PendingTransaction,
+  PendingSessionVerification,
+  PendingCapabilities,
+  BackgroundTask,
+} from "./shared-types";
 
 // docs:start:offscreen-management
 let offscreenCreating: Promise<void> | null = null;
@@ -43,18 +54,18 @@ async function ensureOffscreenDocument(): Promise<void> {
     return;
   }
 
-  const offscreenUrl = chrome.runtime.getURL('dist/offscreen.html');
-  log.debug('[background] Creating offscreen document:', offscreenUrl);
+  const offscreenUrl = chrome.runtime.getURL("dist/offscreen.html");
+  log.debug("[background] Creating offscreen document:", offscreenUrl);
 
   offscreenCreating = chrome.offscreen.createDocument({
     url: offscreenUrl,
     reasons: [chrome.offscreen.Reason.WORKERS],
-    justification: 'Aztec PXE requires long-running WASM operations',
+    justification: "Aztec PXE requires long-running WASM operations",
   });
 
   await offscreenCreating;
   offscreenCreating = null;
-  log.debug('[background] Offscreen document created');
+  log.debug("[background] Offscreen document created");
 }
 // docs:end:offscreen-management
 
@@ -67,26 +78,29 @@ async function ensureOffscreenDocument(): Promise<void> {
  * - No `return true`/`false` landmine for async responses
  */
 let offscreenPort: chrome.runtime.Port | null = null;
-const pendingOffscreenCalls = new Map<string, {
-  resolve: (value: any) => void;
-  reject: (error: Error) => void;
-  timer: ReturnType<typeof setTimeout>;
-}>();
+const pendingOffscreenCalls = new Map<
+  string,
+  {
+    resolve: (value: any) => void;
+    reject: (error: Error) => void;
+    timer: ReturnType<typeof setTimeout>;
+  }
+>();
 let offscreenMessageId = 0;
 
 const OFFSCREEN_TIMEOUT_MS = 5 * 60 * 1000; // 5 minutes
 
 function connectOffscreenPort() {
-  const port = chrome.runtime.connect({ name: 'offscreen' });
+  const port = chrome.runtime.connect({ name: "offscreen" });
   offscreenPort = port;
 
   port.onMessage.addListener((message: any) => {
     // Progress updates — relay to popup
-    if (message.type === 'task-progress') {
-      const runningTask = backgroundTasks.find((t) => t.status === 'running');
+    if (message.type === "task-progress") {
+      const runningTask = backgroundTasks.find((t) => t.status === "running");
       if (runningTask) {
         runningTask.progress = message.stage;
-        notifyPopup({ type: 'task-update', task: { ...runningTask } });
+        notifyPopup({ type: "task-update", task: { ...runningTask } });
       }
       return;
     }
@@ -100,17 +114,17 @@ function connectOffscreenPort() {
     if (message.success) {
       pending.resolve(message.result);
     } else {
-      pending.reject(new Error(message.error || 'Unknown error'));
+      pending.reject(new Error(message.error || "Unknown error"));
     }
   });
 
   port.onDisconnect.addListener(() => {
-    log.debug('[background] Offscreen port disconnected');
+    log.debug("[background] Offscreen port disconnected");
     offscreenPort = null;
     // Reject all pending calls — sendToOffscreen will retry
     for (const [id, pending] of pendingOffscreenCalls) {
       clearTimeout(pending.timer);
-      pending.reject(new Error('Offscreen port disconnected'));
+      pending.reject(new Error("Offscreen port disconnected"));
       pendingOffscreenCalls.delete(id);
     }
   });
@@ -140,7 +154,7 @@ async function sendToOffscreen(message: any, _retried = false): Promise<any> {
 
     try {
       if (!offscreenPort) {
-        throw new Error('Offscreen port not connected');
+        throw new Error("Offscreen port not connected");
       }
       offscreenPort.postMessage({ ...message, messageId });
     } catch (err: unknown) {
@@ -149,7 +163,7 @@ async function sendToOffscreen(message: any, _retried = false): Promise<any> {
 
       // Port may have disconnected — retry once
       if (!_retried) {
-        log.warn('[background] Offscreen port send failed, retrying...');
+        log.warn("[background] Offscreen port send failed, retrying...");
         offscreenPort = null;
         offscreenCreating = null;
         sendToOffscreen(message, true).then(resolve, reject);
@@ -176,7 +190,8 @@ const capabilitiesApprovedSessions = new Set<string>();
  * The extension must confirm the session before any wallet method calls are processed.
  * This prevents the dApp from bypassing verification by sending messages immediately.
  */
-const queuedMessages: Map<string, { session: ActiveSession; message: any }[]> = new Map();
+const queuedMessages: Map<string, { session: ActiveSession; message: any }[]> =
+  new Map();
 
 /**
  * Trusted origins persistence for auto-reconnect. (#30)
@@ -187,7 +202,7 @@ const queuedMessages: Map<string, { session: ActiveSession; message: any }[]> =
  * exchange still happens every time for security). Disconnecting a site
  * removes it from the trusted list.
  */
-const TRUSTED_ORIGINS_KEY = 'aztec_trusted_origins';
+const TRUSTED_ORIGINS_KEY = "aztec_trusted_origins";
 
 interface TrustedOrigin {
   origin: string;
@@ -203,26 +218,37 @@ async function getTrustedOrigins(): Promise<TrustedOrigin[]> {
 
 async function addTrustedOrigin(origin: string, appId: string): Promise<void> {
   const trusted = await getTrustedOrigins();
-  if (!trusted.some(t => t.origin === origin && t.appId === appId)) {
+  if (!trusted.some((t) => t.origin === origin && t.appId === appId)) {
     trusted.push({ origin, appId, trustedAt: Date.now() });
     await chrome.storage.local.set({ [TRUSTED_ORIGINS_KEY]: trusted });
   }
 }
 
-async function removeTrustedOrigin(origin: string, appId: string): Promise<void> {
+async function removeTrustedOrigin(
+  origin: string,
+  appId: string,
+): Promise<void> {
   const trusted = await getTrustedOrigins();
-  const filtered = trusted.filter(t => !(t.origin === origin && t.appId === appId));
+  const filtered = trusted.filter(
+    (t) => !(t.origin === origin && t.appId === appId),
+  );
   await chrome.storage.local.set({ [TRUSTED_ORIGINS_KEY]: filtered });
 }
 
-async function isTrustedOrigin(origin: string, appId: string): Promise<boolean> {
+async function isTrustedOrigin(
+  origin: string,
+  appId: string,
+): Promise<boolean> {
   const trusted = await getTrustedOrigins();
-  return trusted.some(t => t.origin === origin && t.appId === appId);
+  return trusted.some((t) => t.origin === origin && t.appId === appId);
 }
 
-async function getStoredCapabilities(origin: string, appId: string): Promise<Array<{ type: string; [key: string]: any }> | null> {
+async function getStoredCapabilities(
+  origin: string,
+  appId: string,
+): Promise<Array<{ type: string; [key: string]: any }> | null> {
   const trusted = await getTrustedOrigins();
-  const entry = trusted.find(t => t.origin === origin && t.appId === appId);
+  const entry = trusted.find((t) => t.origin === origin && t.appId === appId);
   return entry?.grantedCapabilities ?? null;
 }
 
@@ -245,19 +271,24 @@ async function persistState(): Promise<void> {
       sw_pendingTransactions: pendingTransactions,
     });
   } catch (err) {
-    log.warn('[background] Failed to persist state:', err);
+    log.warn("[background] Failed to persist state:", err);
   }
 }
 
 async function restoreState(): Promise<void> {
   try {
     const data = await chrome.storage.session.get([
-      'sw_walletUnlocked',
-      'sw_pendingTransactions',
+      "sw_walletUnlocked",
+      "sw_pendingTransactions",
     ]);
     walletUnlocked = data.sw_walletUnlocked ?? false;
     pendingTransactions = data.sw_pendingTransactions ?? [];
-    log.debug('[background] Restored state: unlocked =', walletUnlocked, ', pendingTx =', pendingTransactions.length);
+    log.debug(
+      "[background] Restored state: unlocked =",
+      walletUnlocked,
+      ", pendingTx =",
+      pendingTransactions.length,
+    );
 
     // Validate: if the offscreen document was torn down, the cached master key is gone.
     // Probe offscreen to confirm — if it fails, the wallet needs re-unlock.
@@ -265,13 +296,15 @@ async function restoreState(): Promise<void> {
       try {
         await sendToOffscreen({ type: MessageTypes.GET_ACCOUNTS });
       } catch {
-        log.warn('[background] Offscreen unreachable after restore — marking wallet as locked');
+        log.warn(
+          "[background] Offscreen unreachable after restore — marking wallet as locked",
+        );
         walletUnlocked = false;
         await persistState();
       }
     }
   } catch (err) {
-    log.warn('[background] Failed to restore state:', err);
+    log.warn("[background] Failed to restore state:", err);
   }
 }
 
@@ -284,22 +317,27 @@ let backgroundTasks: BackgroundTask[] = [];
 
 function startBackgroundTask(type: string, promise: Promise<any>): string {
   const id = `${type}-${Date.now()}`;
-  const task: BackgroundTask = { id, type, status: 'running', startedAt: Date.now() };
+  const task: BackgroundTask = {
+    id,
+    type,
+    status: "running",
+    startedAt: Date.now(),
+  };
   backgroundTasks.push(task);
 
   promise
     .then((result) => {
-      task.status = 'success';
+      task.status = "success";
       task.result = result;
-      notifyPopup({ type: 'task-update', task: { ...task } });
+      notifyPopup({ type: "task-update", task: { ...task } });
     })
     .catch((error) => {
-      task.status = 'error';
+      task.status = "error";
       task.error = getErrorMessage(error);
-      notifyPopup({ type: 'task-update', task: { ...task } });
+      notifyPopup({ type: "task-update", task: { ...task } });
     });
 
-  notifyPopup({ type: 'task-update', task: { ...task } });
+  notifyPopup({ type: "task-update", task: { ...task } });
   return id;
 }
 
@@ -311,7 +349,7 @@ function cleanupTasks() {
   const FIVE_MINUTES = 5 * 60 * 1000;
   const cutoff = Date.now() - FIVE_MINUTES;
   backgroundTasks = backgroundTasks.filter(
-    (t) => t.status === 'running' || t.startedAt > cutoff
+    (t) => t.status === "running" || t.startedAt > cutoff,
   );
 }
 
@@ -323,13 +361,13 @@ function cleanupTasks() {
 let popupPort: chrome.runtime.Port | null = null;
 
 chrome.runtime.onConnect.addListener((port) => {
-  if (port.name !== 'popup') return;
+  if (port.name !== "popup") return;
 
-  log.debug('[background] Popup connected');
+  log.debug("[background] Popup connected");
   popupPort = port;
 
   port.onDisconnect.addListener(() => {
-    log.debug('[background] Popup disconnected');
+    log.debug("[background] Popup disconnected");
     popupPort = null;
   });
 
@@ -348,7 +386,7 @@ function notifyPopup(message: any) {
 }
 
 function pushStateToPopup() {
-  notifyPopup({ type: 'state', data: getFullState() });
+  notifyPopup({ type: "state", data: getFullState() });
 }
 
 /**
@@ -361,15 +399,17 @@ function openPopupWindow() {
     pushStateToPopup();
     return;
   }
-  chrome.windows.create({
-    url: chrome.runtime.getURL('popup/popup.html'),
-    type: 'popup',
-    width: 400,
-    height: 600,
-    focused: true,
-  }).catch((err) => {
-    log.error('[background] Failed to create popup window:', err);
-  });
+  chrome.windows
+    .create({
+      url: chrome.runtime.getURL("popup/popup.html"),
+      type: "popup",
+      width: 400,
+      height: 600,
+      focused: true,
+    })
+    .catch((err) => {
+      log.error("[background] Failed to create popup window:", err);
+    });
 }
 
 /**
@@ -384,8 +424,8 @@ function openPopupWithFallback() {
   }
   chrome.action.openPopup().catch(() => {
     chrome.windows.create({
-      url: chrome.runtime.getURL('popup/popup.html'),
-      type: 'popup',
+      url: chrome.runtime.getURL("popup/popup.html"),
+      type: "popup",
       width: 400,
       height: 600,
       focused: true,
@@ -416,17 +456,19 @@ function getFullState() {
  * Auto-lock via chrome.alarms. (#28)
  * Resets the timer on every popup interaction.
  */
-const AUTO_LOCK_ALARM = 'aztec-auto-lock';
+const AUTO_LOCK_ALARM = "aztec-auto-lock";
 
 function resetAutoLockTimer() {
   if (walletUnlocked) {
-    chrome.alarms.create(AUTO_LOCK_ALARM, { delayInMinutes: AUTO_LOCK_MINUTES });
+    chrome.alarms.create(AUTO_LOCK_ALARM, {
+      delayInMinutes: AUTO_LOCK_MINUTES,
+    });
   }
 }
 
 chrome.alarms.onAlarm.addListener(async (alarm) => {
   if (alarm.name === AUTO_LOCK_ALARM) {
-    log.debug('[background] Auto-lock triggered');
+    log.debug("[background] Auto-lock triggered");
     walletUnlocked = false;
     await persistState();
     // Tell offscreen to clear the cached CryptoKey
@@ -443,9 +485,13 @@ chrome.alarms.onAlarm.addListener(async (alarm) => {
  * Updates the extension badge to show pending items count.
  */
 function updateBadge() {
-  const count = pendingTransactions.length + handler.getPendingDiscoveryCount() + pendingSessionVerifications.length + pendingCapabilities.length;
-  chrome.action.setBadgeText({ text: count > 0 ? count.toString() : '' });
-  chrome.action.setBadgeBackgroundColor({ color: '#FF6B00' });
+  const count =
+    pendingTransactions.length +
+    handler.getPendingDiscoveryCount() +
+    pendingSessionVerifications.length +
+    pendingCapabilities.length;
+  chrome.action.setBadgeText({ text: count > 0 ? count.toString() : "" });
+  chrome.action.setBadgeBackgroundColor({ color: "#FF6B00" });
   pushStateToPopup();
   persistState();
 }
@@ -453,18 +499,32 @@ function updateBadge() {
 // docs:start:transport
 const transport: BackgroundTransport = {
   sendToTab: (tabId, message) => {
-    log.debug('[background] sendToTab:', tabId, message.type, message.sessionId);
+    log.debug(
+      "[background] sendToTab:",
+      tabId,
+      message.type,
+      message.sessionId,
+    );
     chrome.tabs.sendMessage(tabId, message);
   },
   addContentListener: (handler) => {
     chrome.runtime.onMessage.addListener((message, sender) => {
       // Skip targeted messages (popup, offscreen), storage proxy, and progress updates
       if (message.target) return;
-      if (message.type === 'storage-get' || message.type === 'storage-set') return;
-
-      log.debug('[background] Content message received:', message.origin, message.type, 'from tab:', sender.tab?.id);
+      if (message.type === "storage-get" || message.type === "storage-set")
+        return;
+
+      log.debug(
+        "[background] Content message received:",
+        message.origin,
+        message.type,
+        "from tab:",
+        sender.tab?.id,
+      );
       handler(message, {
-        tab: sender.tab ? { id: sender.tab.id, url: sender.tab.url } : undefined,
+        tab: sender.tab
+          ? { id: sender.tab.id, url: sender.tab.url }
+          : undefined,
       });
     });
   },
@@ -476,18 +536,24 @@ const transport: BackgroundTransport = {
  * or the first account as fallback. Used by both processWalletMessage (for
  * getAccounts/getRegisteredAccounts filtering) and APPROVE_CAPABILITIES.
  */
-async function getGrantableAccounts(): Promise<Array<{ alias: string; item: string }>> {
+async function getGrantableAccounts(): Promise<
+  Array<{ alias: string; item: string }>
+> {
   const [accountsData, activeData] = await Promise.all([
     chrome.storage.local.get(STORAGE_KEYS.ACCOUNTS),
     chrome.storage.local.get(STORAGE_KEYS.ACTIVE_ACCOUNT),
   ]);
   const allAccounts = accountsData[STORAGE_KEYS.ACCOUNTS] || [];
   const activeAddress = activeData[STORAGE_KEYS.ACTIVE_ACCOUNT];
-  const activeAccount = allAccounts.find((a: any) => a.address === activeAddress);
+  const activeAccount = allAccounts.find(
+    (a: any) => a.address === activeAddress,
+  );
   if (activeAccount) {
     return [{ alias: activeAccount.alias, item: activeAccount.address }];
   }
-  return allAccounts.slice(0, 1).map((a: any) => ({ alias: a.alias, item: a.address }));
+  return allAccounts
+    .slice(0, 1)
+    .map((a: any) => ({ alias: a.alias, item: a.address }));
 }
 
 /**
@@ -497,11 +563,17 @@ async function getGrantableAccounts(): Promise<Array<{ alias: string; item: stri
 async function processWalletMessage(session: ActiveSession, message: any) {
   // Allow requestCapabilities to pass through (it's the mechanism for getting approved).
   // Block all other wallet methods until capabilities have been approved for this session.
-  if (message.type !== 'requestCapabilities' && !capabilitiesApprovedSessions.has(session.sessionId)) {
-    log.warn('[background] Rejecting wallet method before capabilities approved:', message.type);
+  if (
+    message.type !== "requestCapabilities" &&
+    !capabilitiesApprovedSessions.has(session.sessionId)
+  ) {
+    log.warn(
+      "[background] Rejecting wallet method before capabilities approved:",
+      message.type,
+    );
     await handler.sendResponse(session.sessionId, {
       messageId: message.messageId,
-      error: 'Capabilities not yet approved. Call requestCapabilities() first.',
+      error: "Capabilities not yet approved. Call requestCapabilities() first.",
       walletId: WALLET_CONFIG.walletId,
     });
     return;
@@ -512,21 +584,23 @@ async function processWalletMessage(session: ActiveSession, message: any) {
   // batch requires approval only if it contains a sendTx (e.g. BatchCall.send()).
   // Read-only batches (simulateTx, executeUtility, etc.) auto-execute.
   const needsApproval =
-    message.type === 'sendTx' ||
-    (message.type === 'batch' &&
+    message.type === "sendTx" ||
+    (message.type === "batch" &&
       Array.isArray(message.args?.[0]) &&
-      message.args[0].some((m: any) => m.name === 'sendTx'));
+      message.args[0].some((m: any) => m.name === "sendTx"));
 
   if (needsApproval) {
     // Extract `from` address from the method args:
     // - sendTx args: [executionPayload, sendOptions] → from is in sendOptions
     // - batch args: [methodsArray] → find the sendTx entry and get from from its opts
-    let from = '';
-    if (message.type === 'sendTx') {
-      from = message.args?.[1]?.from?.toString?.() || '';
-    } else if (message.type === 'batch') {
-      const sendTxMethod = message.args[0].find((m: any) => m.name === 'sendTx');
-      from = sendTxMethod?.args?.[1]?.from?.toString?.() || '';
+    let from = "";
+    if (message.type === "sendTx") {
+      from = message.args?.[1]?.from?.toString?.() || "";
+    } else if (message.type === "batch") {
+      const sendTxMethod = message.args[0].find(
+        (m: any) => m.name === "sendTx",
+      );
+      from = sendTxMethod?.args?.[1]?.from?.toString?.() || "";
     }
 
     const pending: PendingTransaction = {
@@ -541,7 +615,7 @@ async function processWalletMessage(session: ActiveSession, message: any) {
 
     pendingTransactions.push(pending);
     updateBadge();
-    log.debug('[background] Transaction pending approval:', pending.method);
+    log.debug("[background] Transaction pending approval:", pending.method);
 
     openPopupWithFallback();
     return;
@@ -549,23 +623,27 @@ async function processWalletMessage(session: ActiveSession, message: any) {
   // docs:end:approval-check
 
   // Capability requests require user approval — push to pending state.
-  if (message.type === 'requestCapabilities') {
+  if (message.type === "requestCapabilities") {
     // Auto-approve for trusted origins if the requested capabilities match what was previously granted
     const requestedManifest = message.args?.[0];
     const requestedCaps: any[] = requestedManifest?.capabilities || [];
     if (await isTrustedOrigin(session.origin, session.appId)) {
-      const savedCaps = await getStoredCapabilities(session.origin, session.appId);
+      const savedCaps = await getStoredCapabilities(
+        session.origin,
+        session.appId,
+      );
       if (savedCaps) {
         // Verify the requested capability types match the previously approved set
         const requestedTypes = requestedCaps.map((c: any) => c.type).sort();
         const savedTypes = savedCaps.map((c: any) => c.type).sort();
-        const capsMatch = requestedTypes.length === savedTypes.length &&
+        const capsMatch =
+          requestedTypes.length === savedTypes.length &&
           requestedTypes.every((t: string, i: number) => t === savedTypes[i]);
 
         if (capsMatch) {
           const grantedAccounts = await getGrantableAccounts();
           const granted = savedCaps.map((cap: any) => {
-            if (cap.type === 'accounts') {
+            if (cap.type === "accounts") {
               return { ...cap, accounts: grantedAccounts };
             }
             return { ...cap };
@@ -574,17 +652,25 @@ async function processWalletMessage(session: ActiveSession, message: any) {
           await handler.sendResponse(session.sessionId, {
             messageId: message.messageId,
             result: {
-              version: '1.0',
+              version: "1.0",
               granted,
-              wallet: { name: WALLET_CONFIG.walletName, version: WALLET_CONFIG.walletVersion },
+              wallet: {
+                name: WALLET_CONFIG.walletName,
+                version: WALLET_CONFIG.walletVersion,
+              },
             },
             walletId: WALLET_CONFIG.walletId,
           });
           capabilitiesApprovedSessions.add(session.sessionId);
-          log.debug('[background] Auto-approved capabilities for trusted origin:', session.origin);
+          log.debug(
+            "[background] Auto-approved capabilities for trusted origin:",
+            session.origin,
+          );
           return;
         }
-        log.debug('[background] Requested capabilities differ from saved — requiring approval');
+        log.debug(
+          "[background] Requested capabilities differ from saved — requiring approval",
+        );
       }
     }
 
@@ -594,7 +680,10 @@ async function processWalletMessage(session: ActiveSession, message: any) {
       sessionId: session.sessionId,
       messageId: message.messageId,
       origin: session.origin,
-      appMetadata: manifest?.metadata || { name: 'Unknown App', version: '0.0.0' },
+      appMetadata: manifest?.metadata || {
+        name: "Unknown App",
+        version: "0.0.0",
+      },
       capabilities: requestedCaps,
       timestamp: Date.now(),
     };
@@ -615,12 +704,19 @@ async function processWalletMessage(session: ActiveSession, message: any) {
     });
 
     // MetaMask-like behavior: return only the active account for getAccounts
-    if (message.type === 'getAccounts' || message.type === 'getRegisteredAccounts') {
-      const activeData = await chrome.storage.local.get(STORAGE_KEYS.ACTIVE_ACCOUNT);
+    if (
+      message.type === "getAccounts" ||
+      message.type === "getRegisteredAccounts"
+    ) {
+      const activeData = await chrome.storage.local.get(
+        STORAGE_KEYS.ACTIVE_ACCOUNT,
+      );
       const activeAddress = activeData[STORAGE_KEYS.ACTIVE_ACCOUNT];
       if (activeAddress && Array.isArray(result)) {
-        const activeAccount = result.find((acc: any) =>
-          acc.item === activeAddress || acc.item?.toString() === activeAddress
+        const activeAccount = result.find(
+          (acc: any) =>
+            acc.item === activeAddress ||
+            acc.item?.toString() === activeAddress,
         );
         result = activeAccount ? [activeAccount] : result;
       }
@@ -632,7 +728,11 @@ async function processWalletMessage(session: ActiveSession, message: any) {
       walletId: WALLET_CONFIG.walletId,
     });
   })().catch(async (error: any) => {
-    log.error('[background] Error handling wallet message:', message.type, error);
+    log.error(
+      "[background] Error handling wallet message:",
+      message.type,
+      error,
+    );
     await handler.sendResponse(session.sessionId, {
       messageId: message.messageId,
       error: error.message,
@@ -644,13 +744,22 @@ async function processWalletMessage(session: ActiveSession, message: any) {
 // docs:start:callbacks
 const callbacks: BackgroundConnectionCallbacks = {
   onPendingDiscovery: async (discovery) => {
-    log.debug('[background] Pending discovery:', discovery.requestId, 'from', discovery.origin);
+    log.debug(
+      "[background] Pending discovery:",
+      discovery.requestId,
+      "from",
+      discovery.origin,
+    );
 
     // Clean up stale sessions from this tab (e.g. page refresh creates a new
     // discovery while the old session is still in activeSessions).
     for (const session of handler.getActiveSessions()) {
       if (session.tabId === discovery.tabId) {
-        log.debug('[background] Terminating stale session for tab:', discovery.tabId, session.sessionId);
+        log.debug(
+          "[background] Terminating stale session for tab:",
+          discovery.tabId,
+          session.sessionId,
+        );
         capabilitiesApprovedSessions.delete(session.sessionId);
         queuedMessages.delete(session.sessionId);
         handler.terminateSession(session.sessionId);
@@ -658,16 +767,22 @@ const callbacks: BackgroundConnectionCallbacks = {
     }
 
     // Deduplicate: reject any existing discovery from the same tab
-    const existing = handler.getPendingDiscoveries().find(
-      (d) => d.tabId === discovery.tabId && d.requestId !== discovery.requestId
-    );
+    const existing = handler
+      .getPendingDiscoveries()
+      .find(
+        (d) =>
+          d.tabId === discovery.tabId && d.requestId !== discovery.requestId,
+      );
     if (existing) {
       handler.rejectDiscovery(existing.requestId);
     }
 
     // Auto-approve if origin is already trusted (reconnection after page refresh)
     if (await isTrustedOrigin(discovery.origin, discovery.appId)) {
-      log.debug('[background] Auto-approving trusted origin:', discovery.origin);
+      log.debug(
+        "[background] Auto-approving trusted origin:",
+        discovery.origin,
+      );
       handler.approveDiscovery(discovery.requestId);
       return;
     }
@@ -678,14 +793,20 @@ const callbacks: BackgroundConnectionCallbacks = {
   },
 
   onSessionEstablished: async (session: ActiveSession) => {
-    log.debug('[background] Session established:', session.sessionId);
+    log.debug("[background] Session established:", session.sessionId);
 
     // Auto-confirm if origin is already trusted (skip emoji verification)
     if (await isTrustedOrigin(session.origin, session.appId)) {
-      log.debug('[background] Auto-confirming trusted session:', session.sessionId);
+      log.debug(
+        "[background] Auto-confirming trusted session:",
+        session.sessionId,
+      );
 
       // Pre-approve capabilities if previously granted (enables seamless reconnect)
-      const savedCaps = await getStoredCapabilities(session.origin, session.appId);
+      const savedCaps = await getStoredCapabilities(
+        session.origin,
+        session.appId,
+      );
       if (savedCaps) {
         capabilitiesApprovedSessions.add(session.sessionId);
       }
@@ -701,7 +822,10 @@ const callbacks: BackgroundConnectionCallbacks = {
     }
 
     // New origin — require emoji verification
-    log.debug('[background] Awaiting emoji verification for:', session.sessionId);
+    log.debug(
+      "[background] Awaiting emoji verification for:",
+      session.sessionId,
+    );
     // SDK automatically removes the discovery when key exchange completes.
     // Show emojis in approvals so user can compare with the webapp
     pendingSessionVerifications.push({
@@ -730,15 +854,23 @@ const callbacks: BackgroundConnectionCallbacks = {
    * user must confirm before any dApp calls are processed.
    */
   onWalletMessage: async (session: ActiveSession, message: any) => {
-    log.debug('[background] Wallet message:', message.type, 'from session:', session.sessionId);
+    log.debug(
+      "[background] Wallet message:",
+      message.type,
+      "from session:",
+      session.sessionId,
+    );
 
     // Block wallet messages until the user confirms emoji verification in the extension.
     // The dApp's calls (e.g. getAccounts) will wait until the extension user approves.
     const awaitingVerification = pendingSessionVerifications.some(
-      (v) => v.sessionId === session.sessionId
+      (v) => v.sessionId === session.sessionId,
     );
     if (awaitingVerification) {
-      log.debug('[background] Session awaiting verification, queuing message:', message.type);
+      log.debug(
+        "[background] Session awaiting verification, queuing message:",
+        message.type,
+      );
       const queue = queuedMessages.get(session.sessionId) ?? [];
       queue.push({ session, message });
       queuedMessages.set(session.sessionId, queue);
@@ -751,7 +883,11 @@ const callbacks: BackgroundConnectionCallbacks = {
 };
 // docs:end:callbacks
 
-const handler = new BackgroundConnectionHandler(WALLET_CONFIG, transport, callbacks);
+const handler = new BackgroundConnectionHandler(
+  { ...WALLET_CONFIG, logger: log },
+  transport,
+  callbacks,
+);
 handler.initialize();
 
 // Clean up sessions when a tab is closed
@@ -774,27 +910,39 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
    * Storage proxy for the offscreen document. (#7)
    * Validates that the request comes from the extension itself (not content scripts or external).
    */
-  if (message.type === 'storage-get' || message.type === 'storage-set') {
+  if (message.type === "storage-get" || message.type === "storage-set") {
     // Security: only allow storage proxy from extension pages (offscreen, popup) (#7)
     // Content scripts have sender.tab set; extension pages (offscreen, popup) do not.
     if (sender.tab) {
-      log.warn('[background] Rejected storage proxy from content script, tab:', sender.tab.id);
-      sendResponse({ success: false, error: 'Storage proxy not allowed from content scripts' });
+      log.warn(
+        "[background] Rejected storage proxy from content script, tab:",
+        sender.tab.id,
+      );
+      sendResponse({
+        success: false,
+        error: "Storage proxy not allowed from content scripts",
+      });
       return false;
     }
 
-    if (message.type === 'storage-get') {
-      chrome.storage.local.get(message.key).then((result) => {
-        sendResponse({ success: true, result: result[message.key] });
-      }).catch((err) => {
-        sendResponse({ success: false, error: err.message });
-      });
+    if (message.type === "storage-get") {
+      chrome.storage.local
+        .get(message.key)
+        .then((result) => {
+          sendResponse({ success: true, result: result[message.key] });
+        })
+        .catch((err) => {
+          sendResponse({ success: false, error: err.message });
+        });
     } else {
-      chrome.storage.local.set(message.data).then(() => {
-        sendResponse({ success: true });
-      }).catch((err) => {
-        sendResponse({ success: false, error: err.message });
-      });
+      chrome.storage.local
+        .set(message.data)
+        .then(() => {
+          sendResponse({ success: true });
+        })
+        .catch((err) => {
+          sendResponse({ success: false, error: err.message });
+        });
     }
     return true; // async response (#23)
   }
@@ -803,7 +951,7 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
     return false;
   }
 
-  log.debug('[background] Popup message:', message.type);
+  log.debug("[background] Popup message:", message.type);
 
   // Reset auto-lock on any popup interaction (#28)
   resetAutoLockTimer();
@@ -825,37 +973,38 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
 
     case MessageTypes.APPROVE_TRANSACTION: {
       const pending = pendingTransactions.find(
-        (t) => t.messageId === message.messageId
+        (t) => t.messageId === message.messageId,
       );
       if (pending) {
         pendingTransactions = pendingTransactions.filter(
-          (t) => t.messageId !== message.messageId
+          (t) => t.messageId !== message.messageId,
         );
         updateBadge();
 
-        const taskId = startBackgroundTask(`tx:${pending.method}`,
-          handleTransactionApproval(pending)
+        const taskId = startBackgroundTask(
+          `tx:${pending.method}`,
+          handleTransactionApproval(pending),
         );
         sendResponse({ success: true, result: { taskId } });
       } else {
-        sendResponse({ success: false, error: 'Transaction not found' });
+        sendResponse({ success: false, error: "Transaction not found" });
       }
       return false;
     }
 
     case MessageTypes.REJECT_TRANSACTION: {
       const pending = pendingTransactions.find(
-        (t) => t.messageId === message.messageId
+        (t) => t.messageId === message.messageId,
       );
       if (pending) {
         handler.sendResponse(pending.sessionId, {
           messageId: pending.messageId,
-          error: 'Transaction rejected by user',
+          error: "Transaction rejected by user",
           walletId: WALLET_CONFIG.walletId,
         });
 
         pendingTransactions = pendingTransactions.filter(
-          (t) => t.messageId !== message.messageId
+          (t) => t.messageId !== message.messageId,
         );
         updateBadge();
       }
@@ -865,56 +1014,67 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
 
     case MessageTypes.APPROVE_CAPABILITIES: {
       const pending = pendingCapabilities.find(
-        (c) => c.messageId === message.messageId
+        (c) => c.messageId === message.messageId,
       );
       if (pending) {
         pendingCapabilities = pendingCapabilities.filter(
-          (c) => c.messageId !== message.messageId
+          (c) => c.messageId !== message.messageId,
         );
 
         // Build granted capabilities using the shared active-account helper
-        getGrantableAccounts().then((grantedAccounts) => {
-          const granted = pending.capabilities.map((cap: any) => {
-            if (cap.type === 'accounts') {
-              return { ...cap, accounts: grantedAccounts };
-            }
-            return { ...cap };
-          });
-
-          return handler.sendResponse(pending.sessionId, {
-            messageId: pending.messageId,
-            result: {
-              version: '1.0',
-              granted,
-              wallet: {
-                name: WALLET_CONFIG.walletName,
-                version: WALLET_CONFIG.walletVersion,
+        getGrantableAccounts()
+          .then((grantedAccounts) => {
+            const granted = pending.capabilities.map((cap: any) => {
+              if (cap.type === "accounts") {
+                return { ...cap, accounts: grantedAccounts };
+              }
+              return { ...cap };
+            });
+
+            return handler.sendResponse(pending.sessionId, {
+              messageId: pending.messageId,
+              result: {
+                version: "1.0",
+                granted,
+                wallet: {
+                  name: WALLET_CONFIG.walletName,
+                  version: WALLET_CONFIG.walletVersion,
+                },
               },
-            },
-            walletId: WALLET_CONFIG.walletId,
-          });
-        }).then(async () => {
-          capabilitiesApprovedSessions.add(pending.sessionId);
-
-          // Persist granted capabilities for auto-reconnect
-          const approvedSession = handler.getSession(pending.sessionId);
-          if (approvedSession) {
-            const trusted = await getTrustedOrigins();
-            const entry = trusted.find(t => t.origin === approvedSession.origin && t.appId === approvedSession.appId);
-            if (entry) {
-              entry.grantedCapabilities = pending.capabilities.map((cap: any) => ({ ...cap }));
-              await chrome.storage.local.set({ [TRUSTED_ORIGINS_KEY]: trusted });
+              walletId: WALLET_CONFIG.walletId,
+            });
+          })
+          .then(async () => {
+            capabilitiesApprovedSessions.add(pending.sessionId);
+
+            // Persist granted capabilities for auto-reconnect
+            const approvedSession = handler.getSession(pending.sessionId);
+            if (approvedSession) {
+              const trusted = await getTrustedOrigins();
+              const entry = trusted.find(
+                (t) =>
+                  t.origin === approvedSession.origin &&
+                  t.appId === approvedSession.appId,
+              );
+              if (entry) {
+                entry.grantedCapabilities = pending.capabilities.map(
+                  (cap: any) => ({ ...cap }),
+                );
+                await chrome.storage.local.set({
+                  [TRUSTED_ORIGINS_KEY]: trusted,
+                });
+              }
             }
-          }
 
-          updateBadge();
-          sendResponse({ success: true });
-        }).catch((err) => {
-          log.error('[background] Failed to approve capabilities:', err);
-          sendResponse({ success: false, error: getErrorMessage(err) });
-        });
+            updateBadge();
+            sendResponse({ success: true });
+          })
+          .catch((err) => {
+            log.error("[background] Failed to approve capabilities:", err);
+            sendResponse({ success: false, error: getErrorMessage(err) });
+          });
       } else {
-        sendResponse({ success: false, error: 'Capability request not found' });
+        sendResponse({ success: false, error: "Capability request not found" });
         return false;
       }
       return true;
@@ -922,17 +1082,17 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
 
     case MessageTypes.REJECT_CAPABILITIES: {
       const pending = pendingCapabilities.find(
-        (c) => c.messageId === message.messageId
+        (c) => c.messageId === message.messageId,
       );
       if (pending) {
         pendingCapabilities = pendingCapabilities.filter(
-          (c) => c.messageId !== message.messageId
+          (c) => c.messageId !== message.messageId,
         );
 
         handler.sendResponse(pending.sessionId, {
           messageId: pending.messageId,
           result: {
-            version: '1.0',
+            version: "1.0",
             granted: [],
             wallet: {
               name: WALLET_CONFIG.walletName,
@@ -952,12 +1112,12 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
       // User confirmed emojis match — session is now fully active.
       // Flush any wallet messages that were queued while awaiting verification.
       pendingSessionVerifications = pendingSessionVerifications.filter(
-        (v) => v.sessionId !== message.sessionId
+        (v) => v.sessionId !== message.sessionId,
       );
       const queued = queuedMessages.get(message.sessionId) ?? [];
       queuedMessages.delete(message.sessionId);
       for (const { session, message: msg } of queued) {
-        log.debug('[background] Flushing queued message:', msg.type);
+        log.debug("[background] Flushing queued message:", msg.type);
         processWalletMessage(session, msg);
       }
 
@@ -975,14 +1135,14 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
     case MessageTypes.REJECT_SESSION: {
       // User rejected emoji verification — reject queued messages and terminate the session.
       pendingSessionVerifications = pendingSessionVerifications.filter(
-        (v) => v.sessionId !== message.sessionId
+        (v) => v.sessionId !== message.sessionId,
       );
       const rejected = queuedMessages.get(message.sessionId) ?? [];
       queuedMessages.delete(message.sessionId);
       for (const { session, message: msg } of rejected) {
         handler.sendResponse(session.sessionId, {
           messageId: msg.messageId,
-          error: 'Session verification rejected by user',
+          error: "Session verification rejected by user",
           walletId: WALLET_CONFIG.walletId,
         });
       }
@@ -997,7 +1157,10 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
       // Remove from trusted origins so next connection requires full approval (#30)
       const disconnectedSession = handler.getSession(message.sessionId);
       if (disconnectedSession) {
-        removeTrustedOrigin(disconnectedSession.origin, disconnectedSession.appId);
+        removeTrustedOrigin(
+          disconnectedSession.origin,
+          disconnectedSession.appId,
+        );
       }
       capabilitiesApprovedSessions.delete(message.sessionId);
       handler.terminateSession(message.sessionId);
@@ -1006,7 +1169,7 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
       return false;
     }
 
-    case 'getPendingItems': {
+    case "getPendingItems": {
       sendResponse({
         success: true,
         result: getFullState(),
@@ -1015,37 +1178,52 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
     }
 
     case MessageTypes.GET_ACCOUNTS: {
-      chrome.storage.local.get(STORAGE_KEYS.ACCOUNTS)
+      chrome.storage.local
+        .get(STORAGE_KEYS.ACCOUNTS)
         .then((data) => {
-          const accounts = (data[STORAGE_KEYS.ACCOUNTS] || []).map((acc: any) => ({
-            address: acc.address,
-            alias: acc.alias,
-            isDeployed: acc.isDeployed,
-          }));
+          const accounts = (data[STORAGE_KEYS.ACCOUNTS] || []).map(
+            (acc: any) => ({
+              address: acc.address,
+              alias: acc.alias,
+              isDeployed: acc.isDeployed,
+            }),
+          );
           sendResponse({ success: true, result: accounts });
         })
-        .catch((error) => sendResponse({ success: false, error: error.message }));
+        .catch((error) =>
+          sendResponse({ success: false, error: error.message }),
+        );
       return true; // async (#23)
     }
 
     case MessageTypes.GET_ACTIVE_ACCOUNT: {
-      chrome.storage.local.get(STORAGE_KEYS.ACTIVE_ACCOUNT)
+      chrome.storage.local
+        .get(STORAGE_KEYS.ACTIVE_ACCOUNT)
         .then((data) => {
-          sendResponse({ success: true, result: data[STORAGE_KEYS.ACTIVE_ACCOUNT] || null });
+          sendResponse({
+            success: true,
+            result: data[STORAGE_KEYS.ACTIVE_ACCOUNT] || null,
+          });
         })
-        .catch((error) => sendResponse({ success: false, error: error.message }));
+        .catch((error) =>
+          sendResponse({ success: false, error: error.message }),
+        );
       return true;
     }
 
     case MessageTypes.SET_ACTIVE_ACCOUNT: {
-      chrome.storage.local.set({ [STORAGE_KEYS.ACTIVE_ACCOUNT]: message.address })
+      chrome.storage.local
+        .set({ [STORAGE_KEYS.ACTIVE_ACCOUNT]: message.address })
         .then(() => sendResponse({ success: true }))
-        .catch((error) => sendResponse({ success: false, error: error.message }));
+        .catch((error) =>
+          sendResponse({ success: false, error: error.message }),
+        );
       return true;
     }
 
     case MessageTypes.UNLOCK_WALLET: {
-      const taskId = startBackgroundTask('unlock',
+      const taskId = startBackgroundTask(
+        "unlock",
         sendToOffscreen({
           type: MessageTypes.UNLOCK_WALLET,
           password: message.password,
@@ -1054,14 +1232,15 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
           persistState();
           resetAutoLockTimer();
           return result;
-        })
+        }),
       );
       sendResponse({ success: true, result: { taskId } });
       return false;
     }
 
     case MessageTypes.GET_WALLET_STATUS: {
-      chrome.storage.local.get(STORAGE_KEYS.PASSWORD_DATA)
+      chrome.storage.local
+        .get(STORAGE_KEYS.PASSWORD_DATA)
         .then((data) => {
           sendResponse({
             success: true,
@@ -1071,12 +1250,15 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
             },
           });
         })
-        .catch((error) => sendResponse({ success: false, error: error.message }));
+        .catch((error) =>
+          sendResponse({ success: false, error: error.message }),
+        );
       return true;
     }
 
     case MessageTypes.SETUP_PASSWORD: {
-      const taskId = startBackgroundTask('setup-password',
+      const taskId = startBackgroundTask(
+        "setup-password",
         sendToOffscreen({
           type: MessageTypes.SETUP_PASSWORD,
           password: message.password,
@@ -1085,52 +1267,62 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
           persistState();
           resetAutoLockTimer();
           return result;
-        })
+        }),
       );
       sendResponse({ success: true, result: { taskId } });
       return false;
     }
 
     case MessageTypes.MARK_DEPLOYED: {
-      chrome.storage.local.get(STORAGE_KEYS.ACCOUNTS)
+      chrome.storage.local
+        .get(STORAGE_KEYS.ACCOUNTS)
         .then((data) => {
           const accounts = data[STORAGE_KEYS.ACCOUNTS] || [];
-          const account = accounts.find((a: any) => a.address === message.address);
+          const account = accounts.find(
+            (a: any) => a.address === message.address,
+          );
           if (account) {
             account.isDeployed = true;
-            return chrome.storage.local.set({ [STORAGE_KEYS.ACCOUNTS]: accounts });
+            return chrome.storage.local.set({
+              [STORAGE_KEYS.ACCOUNTS]: accounts,
+            });
           }
         })
         .then(() => sendResponse({ success: true, result: { success: true } }))
-        .catch((error) => sendResponse({ success: false, error: error.message }));
+        .catch((error) =>
+          sendResponse({ success: false, error: error.message }),
+        );
       return true;
     }
 
     case MessageTypes.CREATE_ACCOUNT: {
-      const taskId = startBackgroundTask('create-account',
+      const taskId = startBackgroundTask(
+        "create-account",
         sendToOffscreen({
           type: MessageTypes.CREATE_ACCOUNT,
           alias: message.alias,
-        })
+        }),
       );
       sendResponse({ success: true, result: { taskId } });
       return false;
     }
 
     case MessageTypes.DEPLOY_ACCOUNT: {
-      const taskId = startBackgroundTask('deploy-account',
+      const taskId = startBackgroundTask(
+        "deploy-account",
         sendToOffscreen({
           type: MessageTypes.DEPLOY_ACCOUNT,
           address: message.address,
-        })
+        }),
       );
       sendResponse({ success: true, result: { taskId } });
       return false;
     }
 
     case MessageTypes.EXPORT_WALLET: {
-      const taskId = startBackgroundTask('export-wallet',
-        sendToOffscreen({ type: MessageTypes.EXPORT_WALLET })
+      const taskId = startBackgroundTask(
+        "export-wallet",
+        sendToOffscreen({ type: MessageTypes.EXPORT_WALLET }),
       );
       sendResponse({ success: true, result: { taskId } });
       return false;
@@ -1138,7 +1330,11 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
 
     case MessageTypes.IMPORT_WALLET: {
       // Wipe wallet data from chrome.storage.local and lock the wallet
-      chrome.storage.local.remove([STORAGE_KEYS.ACCOUNTS, STORAGE_KEYS.PASSWORD_DATA, STORAGE_KEYS.ACTIVE_ACCOUNT]);
+      chrome.storage.local.remove([
+        STORAGE_KEYS.ACCOUNTS,
+        STORAGE_KEYS.PASSWORD_DATA,
+        STORAGE_KEYS.ACTIVE_ACCOUNT,
+      ]);
       walletUnlocked = false;
       persistState();
       // Tell offscreen to clear cached key
@@ -1148,7 +1344,8 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
     }
 
     case MessageTypes.IMPORT_WALLET_ACCOUNTS: {
-      const taskId = startBackgroundTask('import-wallet-accounts',
+      const taskId = startBackgroundTask(
+        "import-wallet-accounts",
         sendToOffscreen({
           type: MessageTypes.IMPORT_WALLET_ACCOUNTS,
           accounts: message.accounts,
@@ -1158,21 +1355,21 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
           persistState();
           resetAutoLockTimer();
           return result;
-        })
+        }),
       );
       sendResponse({ success: true, result: { taskId } });
       return false;
     }
 
     default: {
-      log.warn('[background] Unknown message type:', message.type);
+      log.warn("[background] Unknown message type:", message.type);
       return false;
     }
   }
 });
 
 async function handleTransactionApproval(
-  pending: PendingTransaction
+  pending: PendingTransaction,
 ): Promise<any> {
   try {
     const result = await sendToOffscreen({
@@ -1189,7 +1386,11 @@ async function handleTransactionApproval(
 
     return result;
   } catch (error: any) {
-    log.error('[background] Transaction approval failed:', pending.method, error);
+    log.error(
+      "[background] Transaction approval failed:",
+      pending.method,
+      error,
+    );
     await handler.sendResponse(pending.sessionId, {
       messageId: pending.messageId,
       error: error.message,
@@ -1204,7 +1405,7 @@ async function handleTransactionApproval(
  * Extension lifecycle handlers. (#17)
  */
 chrome.runtime.onInstalled.addListener((details) => {
-  log.debug('[background] Extension installed/updated:', details.reason);
+  log.debug("[background] Extension installed/updated:", details.reason);
 
   // Clear stale pending state — sessions don't survive extension reload
   pendingTransactions = [];
@@ -1214,23 +1415,28 @@ chrome.runtime.onInstalled.addListener((details) => {
   capabilitiesApprovedSessions.clear();
   persistState();
 
-  if (details.reason === 'install') {
+  if (details.reason === "install") {
     // First install — nothing to migrate
-    log.debug('[background] First install, no migration needed');
-  } else if (details.reason === 'update') {
+    log.debug("[background] First install, no migration needed");
+  } else if (details.reason === "update") {
     // Version update — could add migration logic here
-    log.debug('[background] Updated from', details.previousVersion);
+    log.debug("[background] Updated from", details.previousVersion);
   }
 });
 
 // Restore state on service worker startup (#8)
 restoreState().then(() => {
-  log.debug('[background] Service worker initialized');
+  log.debug("[background] Service worker initialized");
 });
 
 // Eagerly preload the offscreen document so WASM and PXE deps are warm
-ensureOffscreenDocument().then(() => {
-  log.debug('[background] Offscreen document preloaded');
-}).catch((err) => {
-  log.error('[background] Offscreen preload failed (will retry on demand):', err);
-});
+ensureOffscreenDocument()
+  .then(() => {
+    log.debug("[background] Offscreen document preloaded");
+  })
+  .catch((err) => {
+    log.error(
+      "[background] Offscreen preload failed (will retry on demand):",
+      err,
+    );
+  });
diff --git a/docs/netlify.toml b/docs/netlify.toml
index 995dc8eaf80a..a80bea176f71 100644
--- a/docs/netlify.toml
+++ b/docs/netlify.toml
@@ -813,3 +813,8 @@
     # PXE: capsule operation attempted with a scope not in the allowed scopes list
     from = "/errors/10"
     to = "/developers/docs/aztec-nr/framework-description/advanced/how_to_use_capsules"
+
+[[redirects]]
+    # PXE: cross-contract utility call denied by execution hook
+    from = "/errors/11"
+    to = "/developers/docs/aztec-nr/debugging#cross-contract-utility-call-denied"
diff --git a/docs/network_versioned_docs/version-v4.2.0/operators/reference/node-api-reference.md b/docs/network_versioned_docs/version-v4.2.0/operators/reference/node-api-reference.md
index d68617cf4c4e..225b6321a493 100644
--- a/docs/network_versioned_docs/version-v4.2.0/operators/reference/node-api-reference.md
+++ b/docs/network_versioned_docs/version-v4.2.0/operators/reference/node-api-reference.md
@@ -109,9 +109,9 @@ Get a block specified by its block number or 'latest'.
 
 **Parameters**:
 
-1. `blockParameter` - `number | "latest"` - The block parameter (block number, block hash, or 'latest').
+1. `blockParameter` - `BlockHash | number | "latest"` - The block parameter (block number, block hash, or 'latest').
 
-**Returns**: `L2Block` - The requested block.
+**Returns**: `L2Block | undefined` - The requested block.
 
 **Example**:
 
@@ -129,7 +129,7 @@ Get a block specified by its hash.
 
 1. `blockHash` - `BlockHash` - The block hash being requested.
 
-**Returns**: `L2Block` - The requested block.
+**Returns**: `L2Block | undefined` - The requested block.
 
 **Example**:
 
@@ -147,7 +147,7 @@ Get a block specified by its archive root.
 
 1. `archive` - `Fr` - The archive root being requested.
 
-**Returns**: `L2Block` - The requested block.
+**Returns**: `L2Block | undefined` - The requested block.
 
 **Example**:
 
@@ -173,7 +173,7 @@ Method to request blocks. Will attempt to return all requested blocks but will r
 ```bash
 curl -X POST http://localhost:8080 \
   -H 'Content-Type: application/json' \
-  -d '{"jsonrpc":"2.0","method":"node_getBlocks","params":[12345,12345],"id":1}'
+  -d '{"jsonrpc":"2.0","method":"node_getBlocks","params":[1,100],"id":1}'
 ```
 
 ### node_getBlockHeader
@@ -182,9 +182,9 @@ Returns the block header for a given block number, block hash, or 'latest'.
 
 **Parameters**:
 
-1. `block` - `number | "latest" | undefined` - The block parameter (block number, block hash, or 'latest'). Defaults to 'latest'.
+1. `block` - `BlockHash | number | "latest" | undefined` - The block parameter (block number, block hash, or 'latest'). Defaults to 'latest'.
 
-**Returns**: `BlockHeader` - The requested block header.
+**Returns**: `BlockHeader | undefined` - The requested block header.
 
 **Example**:
 
@@ -202,7 +202,7 @@ Get a block header specified by its archive root.
 
 1. `archive` - `Fr` - The archive root being requested.
 
-**Returns**: `BlockHeader` - The requested block header.
+**Returns**: `BlockHeader | undefined` - The requested block header.
 
 **Example**:
 
@@ -228,7 +228,7 @@ Retrieves a collection of checkpoints.
 ```bash
 curl -X POST http://localhost:8080 \
   -H 'Content-Type: application/json' \
-  -d '{"jsonrpc":"2.0","method":"node_getCheckpoints","params":[12345,12345],"id":1}'
+  -d '{"jsonrpc":"2.0","method":"node_getCheckpoints","params":[1,100],"id":1}'
 ```
 
 ### node_getCheckpointedBlocks
@@ -245,7 +245,7 @@ curl -X POST http://localhost:8080 \
 ```bash
 curl -X POST http://localhost:8080 \
   -H 'Content-Type: application/json' \
-  -d '{"jsonrpc":"2.0","method":"node_getCheckpointedBlocks","params":[12345,12345],"id":1}'
+  -d '{"jsonrpc":"2.0","method":"node_getCheckpointedBlocks","params":[1,100],"id":1}'
 ```
 
 ### node_getCheckpointsDataForEpoch
@@ -332,7 +332,7 @@ Method to retrieve a single pending tx.
 
 1. `txHash` - `TxHash` - The transaction hash to return.
 
-**Returns**: `Tx` - The pending tx if it exists.
+**Returns**: `Tx | undefined` - The pending tx if it exists.
 
 **Example**:
 
@@ -376,7 +376,7 @@ Method to retrieve pending txs.
 ```bash
 curl -X POST http://localhost:8080 \
   -H 'Content-Type: application/json' \
-  -d '{"jsonrpc":"2.0","method":"node_getPendingTxs","params":[12345,"0x1234..."],"id":1}'
+  -d '{"jsonrpc":"2.0","method":"node_getPendingTxs","params":[100,"0x1234..."],"id":1}'
 ```
 
 ### node_getPendingTxCount
@@ -442,9 +442,12 @@ curl -X POST http://localhost:8080 \
 
 Gets the storage value at the given contract storage slot.
 
+**Remarks**: The storage slot here refers to the slot as it is defined in Noir not the index in the merkle tree.
+Aztec's version of `eth_getStorageAt`.
+
 **Parameters**:
 
-1. `referenceBlock` - `number | "latest"` - The block parameter (block number, block hash, or 'latest') at which to get the data.
+1. `referenceBlock` - `BlockHash | number | "latest"` - The block parameter (block number, block hash, or 'latest') at which to get the data.
 2. `contract` - `AztecAddress` - Address of the contract to query.
 3. `slot` - `Fr` - Slot to query.
 
@@ -483,11 +486,11 @@ the leaves were inserted.
 
 **Parameters**:
 
-1. `referenceBlock` - `number | "latest"` - The block parameter (block number, block hash, or 'latest') at which to get the data.
+1. `referenceBlock` - `BlockHash | number | "latest"` - The block parameter (block number, block hash, or 'latest') at which to get the data.
 2. `treeId` - `MerkleTreeId` - The tree to search in.
 3. `leafValues` - `Fr[]` - The values to search for.
 
-**Returns**: `DataInBlock<bigint> | undefined[]` - The indices of leaves and the block metadata of a block in which the leaves were inserted.
+**Returns**: `(DataInBlock<bigint> | undefined)[]` - The indices of leaves and the block metadata of a block in which the leaves were inserted.
 
 **Example**:
 
@@ -503,10 +506,10 @@ Returns a nullifier membership witness for a given nullifier at a given block.
 
 **Parameters**:
 
-1. `referenceBlock` - `number | "latest"` - The block parameter (block number, block hash, or 'latest') at which to get the data.
+1. `referenceBlock` - `BlockHash | number | "latest"` - The block parameter (block number, block hash, or 'latest') at which to get the data.
 2. `nullifier` - `Fr` - Nullifier we try to find witness for.
 
-**Returns**: `NullifierMembershipWitness` - The nullifier membership witness (if found).
+**Returns**: `NullifierMembershipWitness | undefined` - The nullifier membership witness (if found).
 
 **Example**:
 
@@ -520,12 +523,16 @@ curl -X POST http://localhost:8080 \
 
 Returns a low nullifier membership witness for a given nullifier at a given block.
 
+**Remarks**: Low nullifier witness can be used to perform a nullifier non-inclusion proof by leveraging the "linked
+list structure" of leaves and proving that a lower nullifier is pointing to a bigger next value than the nullifier
+we are trying to prove non-inclusion for.
+
 **Parameters**:
 
-1. `referenceBlock` - `number | "latest"` - The block parameter (block number, block hash, or 'latest') at which to get the data.
+1. `referenceBlock` - `BlockHash | number | "latest"` - The block parameter (block number, block hash, or 'latest') at which to get the data.
 2. `nullifier` - `Fr` - Nullifier we try to find the low nullifier witness for.
 
-**Returns**: `NullifierMembershipWitness` - The low nullifier membership witness (if found).
+**Returns**: `NullifierMembershipWitness | undefined` - The low nullifier membership witness (if found).
 
 **Example**:
 
@@ -539,12 +546,16 @@ curl -X POST http://localhost:8080 \
 
 Returns a public data tree witness for a given leaf slot at a given block.
 
+**Remarks**: The witness can be used to compute the current value of the public data tree leaf. If the low leaf preimage corresponds to an
+"in range" slot, means that the slot doesn't exist and the value is 0. If the low leaf preimage corresponds to the exact slot, the current value
+is contained in the leaf preimage.
+
 **Parameters**:
 
-1. `referenceBlock` - `number | "latest"` - The block parameter (block number, block hash, or 'latest') at which to get the data.
+1. `referenceBlock` - `BlockHash | number | "latest"` - The block parameter (block number, block hash, or 'latest') at which to get the data.
 2. `leafSlot` - `Fr` - The leaf slot we try to find the witness for.
 
-**Returns**: `PublicDataWitness` - The public data witness (if found).
+**Returns**: `PublicDataWitness | undefined` - The public data witness (if found).
 
 **Example**:
 
@@ -565,7 +576,7 @@ a specific block exists in the chain's history.
 
 **Parameters**:
 
-1. `referenceBlock` - `number | "latest"` - The block parameter (block number, block hash, or 'latest') at which to get the data
+1. `referenceBlock` - `BlockHash | number | "latest"` - The block parameter (block number, block hash, or 'latest') at which to get the data
 (which contains the root of the archive tree in which we are searching for the block hash).
 2. `blockHash` - `BlockHash` - The block hash to find in the archive tree.
 
@@ -585,7 +596,7 @@ Returns a membership witness for a given note hash at a given block.
 
 **Parameters**:
 
-1. `referenceBlock` - `number | "latest"` - The block parameter (block number, block hash, or 'latest') at which to get the data.
+1. `referenceBlock` - `BlockHash | number | "latest"` - The block parameter (block number, block hash, or 'latest') at which to get the data.
 2. `noteHash` - `Fr` - The note hash we try to find the witness for.
 
 **Returns**: `MembershipWitness | undefined`
@@ -606,7 +617,7 @@ Returns the index and a sibling path for a leaf in the committed l1 to l2 data t
 
 **Parameters**:
 
-1. `referenceBlock` - `number | "latest"` - The block parameter (block number, block hash, or 'latest') at which to get the data.
+1. `referenceBlock` - `BlockHash | number | "latest"` - The block parameter (block number, block hash, or 'latest') at which to get the data.
 2. `l1ToL2Message` - `Fr` - The l1ToL2Message to get the index / sibling path for.
 
 **Returns**: `[bigint, SiblingPath] | undefined` - A tuple of the index and the sibling path of the L1ToL2Message (undefined if not found).
@@ -736,7 +747,7 @@ for a tag, the caller should fetch the next page to check for more logs.
 ```bash
 curl -X POST http://localhost:8080 \
   -H 'Content-Type: application/json' \
-  -d '{"jsonrpc":"2.0","method":"node_getPrivateLogsByTags","params":[["0x1234..."],12345,"0x1234..."],"id":1}'
+  -d '{"jsonrpc":"2.0","method":"node_getPrivateLogsByTags","params":[["0x1234..."],0,"0x1234..."],"id":1}'
 ```
 
 ### node_getPublicLogsByTagsFromContract
@@ -762,7 +773,7 @@ for a tag, the caller should fetch the next page to check for more logs.
 ```bash
 curl -X POST http://localhost:8080 \
   -H 'Content-Type: application/json' \
-  -d '{"jsonrpc":"2.0","method":"node_getPublicLogsByTagsFromContract","params":["0x1234...",["0x1234..."],12345,"0x1234..."],"id":1}'
+  -d '{"jsonrpc":"2.0","method":"node_getPublicLogsByTagsFromContract","params":["0x1234...",["0x1234..."],0,"0x1234..."],"id":1}'
 ```
 
 ## Contract queries
@@ -821,6 +832,26 @@ curl -X POST http://localhost:8080 \
   -d '{"jsonrpc":"2.0","method":"node_getCurrentMinFees","params":[],"id":1}'
 ```
 
+### node_getPredictedMinFees
+
+Returns predicted min fees for the current slot and next N slots.
+Each entry accounts for the L1 gas oracle transition and congestion growth based on the
+given mana usage estimate. Defaults to target usage (steady state).
+
+**Parameters**:
+
+1. `manaUsage` - `ManaUsageEstimate | undefined` - Expected mana usage per checkpoint (none, target, or limit).
+
+**Returns**: `GasFees[]` - An array of GasFees, one per slot in the prediction window.
+
+**Example**:
+
+```bash
+curl -X POST http://localhost:8080 \
+  -H 'Content-Type: application/json' \
+  -d '{"jsonrpc":"2.0","method":"node_getPredictedMinFees","params":["target"],"id":1}'
+```
+
 ### node_getMaxPriorityFees
 
 Method to fetch the current max priority fee of txs in the mempool.
@@ -1169,6 +1200,8 @@ Pauses syncing and rolls back the database to the target L2 block number.
 **Parameters**:
 
 1. `targetBlockNumber` - `number` - The block number to roll back to.
+2. `force` - `boolean | undefined` - If true, clears the world state db and p2p dbs if rolling back to behind the finalized block.
+3. `resumeSync` - `boolean | undefined` - If true (default), resumes archiver and world state sync after rollback.
 
 **Returns**: `void`
 
@@ -1177,7 +1210,7 @@ Pauses syncing and rolls back the database to the target L2 block number.
 ```bash
 curl -X POST http://localhost:8880 \
   -H 'Content-Type: application/json' \
-  -d '{"jsonrpc":"2.0","method":"nodeAdmin_rollbackTo","params":[12345],"id":1}'
+  -d '{"jsonrpc":"2.0","method":"nodeAdmin_rollbackTo","params":[12345,true,true],"id":1}'
 ```
 
 **Example (Docker)**:
@@ -1185,7 +1218,7 @@ curl -X POST http://localhost:8880 \
 ```bash
 docker exec -it aztec-node curl -X POST http://localhost:8880 \
   -H 'Content-Type: application/json' \
-  -d '{"jsonrpc":"2.0","method":"nodeAdmin_rollbackTo","params":[12345],"id":1}'
+  -d '{"jsonrpc":"2.0","method":"nodeAdmin_rollbackTo","params":[12345,true,true],"id":1}'
 ```
 
 ### nodeAdmin_startSnapshotUpload
@@ -1214,30 +1247,6 @@ docker exec -it aztec-node curl -X POST http://localhost:8880 \
   -d '{"jsonrpc":"2.0","method":"nodeAdmin_startSnapshotUpload","params":["0x1234..."],"id":1}'
 ```
 
-### nodeAdmin_getSlashPayloads
-
-Returns all monitored payloads by the slasher for the current round.
-
-**Parameters**: None
-
-**Returns**: `SlashPayloadRound[]`
-
-**Example (CLI)**:
-
-```bash
-curl -X POST http://localhost:8880 \
-  -H 'Content-Type: application/json' \
-  -d '{"jsonrpc":"2.0","method":"nodeAdmin_getSlashPayloads","params":[],"id":1}'
-```
-
-**Example (Docker)**:
-
-```bash
-docker exec -it aztec-node curl -X POST http://localhost:8880 \
-  -H 'Content-Type: application/json' \
-  -d '{"jsonrpc":"2.0","method":"nodeAdmin_getSlashPayloads","params":[],"id":1}'
-```
-
 ### nodeAdmin_getSlashOffenses
 
 Returns all offenses applicable for the given round.
@@ -1253,7 +1262,7 @@ Returns all offenses applicable for the given round.
 ```bash
 curl -X POST http://localhost:8880 \
   -H 'Content-Type: application/json' \
-  -d '{"jsonrpc":"2.0","method":"nodeAdmin_getSlashOffenses","params":["0x1234..."],"id":1}'
+  -d '{"jsonrpc":"2.0","method":"nodeAdmin_getSlashOffenses","params":["current"],"id":1}'
 ```
 
 **Example (Docker)**:
@@ -1261,7 +1270,7 @@ curl -X POST http://localhost:8880 \
 ```bash
 docker exec -it aztec-node curl -X POST http://localhost:8880 \
   -H 'Content-Type: application/json' \
-  -d '{"jsonrpc":"2.0","method":"nodeAdmin_getSlashOffenses","params":["0x1234..."],"id":1}'
+  -d '{"jsonrpc":"2.0","method":"nodeAdmin_getSlashOffenses","params":["current"],"id":1}'
 ```
 
 ### nodeAdmin_reloadKeystore
diff --git a/docs/package.json b/docs/package.json
index 5ce7a7181a8b..a6af133f4eae 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "scripts": {
-    "build": "yarn clean && yarn preprocess && yarn spellcheck && yarn preprocess:move && yarn validate:redirects && yarn validate:api-ref-links && docusaurus build && node scripts/append_api_docs_to_llms.js",
+    "build": "yarn clean && yarn preprocess && yarn spellcheck && yarn preprocess:move && yarn validate:redirects && yarn validate:api-ref-links && docusaurus build && node scripts/augment_sitemap.js && node scripts/append_api_docs_to_llms.js",
     "validate:redirects": "./scripts/validate_redirect_targets.sh",
     "validate:api-ref-links": "./scripts/validate_api_ref_links.sh",
     "clean": "./scripts/clean.sh",
@@ -21,7 +21,6 @@
     "test:preprocess": "node --test src/preprocess/__tests__/*.test.js"
   },
   "dependencies": {
-    "@cookbookdev/docsbot": "^4.25.15",
     "@docusaurus/core": "3.9.1",
     "@docusaurus/plugin-content-docs": "3.9.1",
     "@docusaurus/plugin-ideal-image": "3.9.1",
@@ -36,13 +35,14 @@
     "react-markdown": "6.0.3",
     "react-player": "^2.16.1",
     "rehype-katex": "7",
+    "remark-gfm": "^1.0.0",
     "remark-math": "6"
   },
   "devDependencies": {
     "@docusaurus/tsconfig": "3.9.1",
     "@tsconfig/docusaurus": "^1.0.7",
     "cspell": "^8.19.4",
-    "docusaurus-plugin-llms": "^0.2.0",
+    "docusaurus-plugin-llms": "^0.4.0",
     "dotenv": "^16.6.1",
     "netlify-cli": "^24.0.1"
   },
diff --git a/docs/scripts/append_api_docs_to_llms.js b/docs/scripts/append_api_docs_to_llms.js
index 79f4c40e8426..32aa9ce7b45e 100644
--- a/docs/scripts/append_api_docs_to_llms.js
+++ b/docs/scripts/append_api_docs_to_llms.js
@@ -38,10 +38,19 @@ if (defaultType && fs.existsSync(path.join(STATIC_DIR, `aztec-nr-api/${defaultTy
     name: "Aztec.nr API Reference",
     dir: `aztec-nr-api/${defaultType}`,
     description: `Auto-generated API documentation for Aztec.nr (${defaultVersion})`,
+    format: "html",
   });
 } else if (!defaultType) {
   console.warn("Warning: No default version found for API docs");
 }
+if (defaultType && fs.existsSync(path.join(STATIC_DIR, `typescript-api/${defaultType}`))) {
+  API_DIRS.push({
+    name: "TypeScript API Reference",
+    dir: `typescript-api/${defaultType}`,
+    description: `Auto-generated TypeScript API documentation for Aztec packages (${defaultVersion})`,
+    format: "markdown",
+  });
+}
 
 /**
  * Extract text content from HTML, stripping tags and normalizing whitespace.
@@ -94,9 +103,9 @@ function htmlToText(html) {
 }
 
 /**
- * Recursively find all HTML files in a directory.
+ * Recursively find all files with a given extension in a directory.
  */
-function findHtmlFiles(dir, files = []) {
+function findFiles(dir, ext, files = []) {
   if (!fs.existsSync(dir)) {
     return files;
   }
@@ -106,8 +115,8 @@ function findHtmlFiles(dir, files = []) {
   for (const entry of entries) {
     const fullPath = path.join(dir, entry.name);
     if (entry.isDirectory()) {
-      findHtmlFiles(fullPath, files);
-    } else if (entry.name.endsWith(".html")) {
+      findFiles(fullPath, ext, files);
+    } else if (entry.name.endsWith(ext)) {
       files.push(fullPath);
     }
   }
@@ -115,6 +124,21 @@ function findHtmlFiles(dir, files = []) {
   return files;
 }
 
+/**
+ * Recursively find all HTML files in a directory.
+ */
+function findHtmlFiles(dir) {
+  return findFiles(dir, ".html");
+}
+
+/**
+ * Recursively find all markdown files in a directory.
+ * Note: `llm-summary.txt` is naturally excluded since it does not end in `.md`.
+ */
+function findMarkdownFiles(dir) {
+  return findFiles(dir, ".md");
+}
+
 /**
  * Get the relative URL path for a file.
  */
@@ -171,6 +195,7 @@ function main() {
     : "";
 
   let totalFiles = 0;
+  let sectionsAdded = 0;
   let linksSection = "\n\n# API Reference Documentation\n\n";
   let fullContentSection = "\n\n---\n\n# API Reference Documentation\n\n";
 
@@ -182,43 +207,66 @@ function main() {
       continue;
     }
 
-    const htmlFiles = sortByImportance(findHtmlFiles(dirPath));
-    console.log(`Found ${htmlFiles.length} HTML files in ${apiDir.dir}`);
+    const isMarkdown = apiDir.format === "markdown";
+    const files = isMarkdown
+      ? findMarkdownFiles(dirPath).sort()
+      : sortByImportance(findHtmlFiles(dirPath));
+    const ext = isMarkdown ? ".md" : ".html";
+    console.log(`Found ${files.length} ${isMarkdown ? "markdown" : "HTML"} files in ${apiDir.dir}`);
 
-    if (htmlFiles.length === 0) {
+    if (files.length === 0) {
       continue;
     }
 
+    sectionsAdded++;
+
     // Add section header
     linksSection += `## ${apiDir.name}\n\n`;
     linksSection += `${apiDir.description}\n\n`;
     fullContentSection += `## ${apiDir.name}\n\n`;
     fullContentSection += `${apiDir.description}\n\n`;
 
-    // Process only index files for links to avoid overwhelming the llms.txt
-    const indexFiles = htmlFiles.filter(
-      (f) => f.endsWith("index.html") || f.includes("/fn.") || f.includes("/struct.") || f.includes("/trait.")
-    );
-
-    // Add links for key files
-    for (const file of indexFiles.slice(0, 100)) {
-      // Limit to 100 links per section
-      const urlPath = getUrlPath(file, STATIC_DIR);
-      const fileName = path.basename(file, ".html");
-      linksSection += `- [${fileName}](${urlPath})\n`;
-    }
+    if (isMarkdown) {
+      // For markdown API docs, add a link per file and include llm-summary.txt if present
+      const summaryPath = path.join(dirPath, "llm-summary.txt");
+      if (fs.existsSync(summaryPath)) {
+        linksSection += fs.readFileSync(summaryPath, "utf-8") + "\n\n";
+      }
+      // Cap link list at 100 entries to bound llms.txt size as the API surface grows.
+      for (const file of files.slice(0, 100)) {
+        const urlPath = getUrlPath(file, STATIC_DIR);
+        const fileName = path.basename(file, ext);
+        linksSection += `- [${fileName}](${urlPath})\n`;
+      }
+      if (files.length > 100) {
+        linksSection += `- ... and ${files.length - 100} more files\n`;
+      }
+    } else {
+      // For HTML API docs, process only index files for links
+      const indexFiles = files.filter(
+        (f) => f.endsWith("index.html") || f.includes("/fn.") || f.includes("/struct.") || f.includes("/trait.")
+      );
+
+      // Add links for key files
+      for (const file of indexFiles.slice(0, 100)) {
+        // Limit to 100 links per section
+        const urlPath = getUrlPath(file, STATIC_DIR);
+        const fileName = path.basename(file, ext);
+        linksSection += `- [${fileName}](${urlPath})\n`;
+      }
 
-    if (indexFiles.length > 100) {
-      linksSection += `- ... and ${indexFiles.length - 100} more files\n`;
+      if (indexFiles.length > 100) {
+        linksSection += `- ... and ${indexFiles.length - 100} more files\n`;
+      }
     }
 
     linksSection += "\n";
 
     // Add full content for all files
-    for (const file of htmlFiles) {
+    for (const file of files) {
       try {
-        const html = fs.readFileSync(file, "utf-8");
-        const text = htmlToText(html);
+        const raw = fs.readFileSync(file, "utf-8");
+        const text = isMarkdown ? raw.trim() : htmlToText(raw);
 
         if (text.length > 100) {
           // Only include if there's meaningful content
@@ -233,6 +281,11 @@ function main() {
     }
   }
 
+  if (sectionsAdded === 0) {
+    console.log("No API docs found on disk — leaving llms.txt and llms-full.txt unchanged");
+    return;
+  }
+
   // Append to llms.txt
   fs.writeFileSync(llmsTxtPath, llmsTxtContent + linksSection);
   console.log(`Updated llms.txt with API reference links`);
diff --git a/docs/scripts/augment_sitemap.js b/docs/scripts/augment_sitemap.js
new file mode 100644
index 000000000000..2f6998b16fb3
--- /dev/null
+++ b/docs/scripts/augment_sitemap.js
@@ -0,0 +1,103 @@
+#!/usr/bin/env node
+/**
+ * Post-build script to add static API documentation URLs to the sitemap.
+ *
+ * Docusaurus only includes its managed routes in sitemap.xml. This script
+ * appends entries for the auto-generated API docs in static/ that are
+ * copied to build/ but not indexed by the sitemap plugin.
+ */
+
+const fs = require("fs");
+const path = require("path");
+
+const BUILD_DIR = path.join(__dirname, "..", "build");
+// Override with SITE_URL env var if the canonical URL ever changes.
+// Kept in sync with `url` in docusaurus.config.js.
+// Trailing slash is stripped because <loc> entries below prepend "/".
+const SITE_URL = (process.env.SITE_URL || "https://docs.aztec.network").replace(/\/+$/, "");
+
+// Load version config to determine which version subdirectory to index.
+let developerVersionConfig;
+try {
+  developerVersionConfig = require("../developer_version_config.json");
+} catch {
+  developerVersionConfig = null;
+}
+
+const defaultType = developerVersionConfig?.mainnet
+  ? "mainnet"
+  : developerVersionConfig?.testnet
+    ? "testnet"
+    : null;
+
+if (!defaultType) {
+  console.warn("Warning: No default version found — skipping sitemap augmentation");
+  process.exit(0);
+}
+
+/**
+ * Recursively find all files with a given extension.
+ */
+function findFiles(dir, ext) {
+  const results = [];
+  if (!fs.existsSync(dir)) return results;
+
+  const entries = fs.readdirSync(dir, { withFileTypes: true });
+  for (const entry of entries) {
+    const fullPath = path.join(dir, entry.name);
+    if (entry.isDirectory()) {
+      results.push(...findFiles(fullPath, ext));
+    } else if (entry.name.endsWith(ext)) {
+      results.push(fullPath);
+    }
+  }
+  return results;
+}
+
+function main() {
+  const sitemapPath = path.join(BUILD_DIR, "sitemap.xml");
+
+  if (!fs.existsSync(sitemapPath)) {
+    console.error("Error: build/sitemap.xml not found. Run the build first.");
+    process.exit(1);
+  }
+
+  let sitemap = fs.readFileSync(sitemapPath, "utf-8");
+
+  // Aztec.nr API HTML files (skip raw markdown — those aren't browsable pages)
+  const nrApiDir = path.join(BUILD_DIR, `aztec-nr-api/${defaultType}`);
+  // Exclude Noir stdlib (duplicated at noir-lang.org), the all.html mega-index,
+  // and per-constant global.*.html pages. Keeps the sitemap aligned with the
+  // Typesense stop_urls list so both discovery paths surface the same content.
+  const EXCLUDE_RE = new RegExp(
+    `aztec-nr-api/${defaultType}/(std/|all\\.html$|.*/global\\.[^/]+\\.html$)`
+  );
+  const htmlFiles = findFiles(nrApiDir, ".html").filter(
+    (f) => !EXCLUDE_RE.test(f.replace(/\\/g, "/"))
+  );
+
+  if (htmlFiles.length === 0) {
+    console.log("No static API docs found to add to sitemap");
+    return;
+  }
+
+  // Build XML entries
+  const entries = htmlFiles
+    .map((file) => {
+      const relativePath = path.relative(BUILD_DIR, file).replace(/\\/g, "/");
+      return `<url><loc>${SITE_URL}/${relativePath}</loc><changefreq>monthly</changefreq><priority>0.3</priority></url>`;
+    })
+    .join("");
+
+  // Insert before closing </urlset>
+  if (!sitemap.includes("</urlset>")) {
+    console.error("Error: build/sitemap.xml missing </urlset> closing tag — aborting.");
+    process.exit(1);
+  }
+  sitemap = sitemap.replace("</urlset>", entries + "</urlset>");
+
+  fs.writeFileSync(sitemapPath, sitemap);
+  console.log(`Added ${htmlFiles.length} Aztec.nr API doc URLs to sitemap.xml`);
+}
+
+main();
diff --git a/docs/scripts/node_api_reference_generation/generate_node_api_reference.sh b/docs/scripts/node_api_reference_generation/generate_node_api_reference.sh
index 4a8810b18435..c9af35f766f8 100755
--- a/docs/scripts/node_api_reference_generation/generate_node_api_reference.sh
+++ b/docs/scripts/node_api_reference_generation/generate_node_api_reference.sh
@@ -48,9 +48,23 @@ done
 
 OUTPUT_PATH="$OUTPUT_DIR/$OUTPUT_FILE"
 
-# Verify yarn-project is built
-if [[ ! -d "$YARN_PROJECT_DIR/stdlib/dest" ]]; then
-    echo_error "yarn-project/stdlib/dest/ not found. Run 'yarn build' from yarn-project first."
+# Verify the source files the generator parses are present.
+# The generator reads .ts source via the TS Compiler API, so no build is required —
+# but yarn-project must have node_modules installed so that `npx tsx` can resolve typescript.
+REQUIRED_SOURCES=(
+    "$YARN_PROJECT_DIR/stdlib/src/interfaces/aztec-node.ts"
+    "$YARN_PROJECT_DIR/stdlib/src/interfaces/aztec-node-admin.ts"
+    "$YARN_PROJECT_DIR/stdlib/src/block/l2_block_source.ts"
+)
+for src in "${REQUIRED_SOURCES[@]}"; do
+    if [[ ! -f "$src" ]]; then
+        echo_error "Required source file not found: $src"
+        exit 1
+    fi
+done
+
+if [[ ! -d "$YARN_PROJECT_DIR/node_modules" ]]; then
+    echo_error "yarn-project/node_modules/ not found. Run 'yarn install' from yarn-project first."
     exit 1
 fi
 
diff --git a/docs/scripts/node_api_reference_generation/generate_node_api_reference.ts b/docs/scripts/node_api_reference_generation/generate_node_api_reference.ts
index 2138d6aebd18..df491aa20277 100644
--- a/docs/scripts/node_api_reference_generation/generate_node_api_reference.ts
+++ b/docs/scripts/node_api_reference_generation/generate_node_api_reference.ts
@@ -69,7 +69,7 @@ function extractJSDocFromNode(node: ts.Node): MethodJSDoc | undefined {
   const jsDocs = (node as any).jsDoc as ts.JSDoc[] | undefined;
   if (!jsDocs || jsDocs.length === 0) return undefined;
 
-  const jsDoc = jsDocs[jsDocs.length - 1];
+  const jsDoc = jsDocs[0];
   const description = extractJSDocComment(jsDoc);
 
   const params: { name: string; description: string }[] = [];
@@ -275,6 +275,15 @@ function splitTopLevelArgs(text: string): string[] {
 function simplifyZodType(expr: string): string {
   const e = expr.trim();
 
+  // Optional handling must run first so `.optional()` suffixes aren't swallowed by
+  // broader patterns below (e.g. `^(\w+)\.schema\b` would otherwise strip the optional
+  // from expressions like `L2Block.schema.optional()`).
+  if (e.endsWith('.optional()')) {
+    return simplifyZodType(e.replace(/\.optional\(\)$/, '')) + ' | undefined';
+  }
+  const optionalWrapperMatch = e.match(/^optional\(([\s\S]+)\)$/);
+  if (optionalWrapperMatch) return simplifyZodType(optionalWrapperMatch[1]) + ' | undefined';
+
   // Simple types
   if (e === 'z.string()') return 'string';
   if (e === 'z.number()') return 'number';
@@ -295,7 +304,7 @@ function simplifyZodType(expr: string): string {
   if (e === 'CheckpointNumberSchema') return 'number';
   if (e === 'CheckpointNumberPositiveSchema') return 'number';
   if (e === 'EpochNumberSchema') return 'number';
-  if (e === 'BlockParameterSchema') return 'number | "latest"';
+  if (e === 'BlockParameterSchema') return 'BlockHash | number | "latest"';
 
   // Known schema objects
   if (e === 'L2TipsSchema') return 'L2Tips';
@@ -322,21 +331,15 @@ function simplifyZodType(expr: string): string {
   const classSchemaMatch2 = e.match(/^(\w+)\.schema\b/);
   if (classSchemaMatch2) return classSchemaMatch2[1];
 
-  // z.string().optional() / z.number().optional()
-  if (e.endsWith('.optional()')) {
-    return simplifyZodType(e.replace(/\.optional\(\)$/, '')) + ' | undefined';
-  }
-
-  // optional(X)
-  const optionalMatch = e.match(/^optional\(([\s\S]+)\)$/);
-  if (optionalMatch) return simplifyZodType(optionalMatch[1]) + ' | undefined';
-
   // z.array(...) — use balanced paren matching to extract inner type
   if (e.startsWith('z.array(')) {
     const innerEnd = findMatchingParen(e, 8 - 1); // 8 = 'z.array('.length, -1 to point at '('
     if (innerEnd !== -1) {
-      const inner = e.substring(8, innerEnd);
-      return simplifyZodType(inner) + '[]';
+      const inner = simplifyZodType(e.substring(8, innerEnd));
+      // Parenthesize unions so `optional(Foo)` inside an array renders as `(Foo | undefined)[]`,
+      // not the (incorrectly parsed) `Foo | undefined[]`.
+      const wrapped = inner.includes('|') ? `(${inner})` : inner;
+      return wrapped + '[]';
     }
   }
 
@@ -397,16 +400,11 @@ function simplifyZodType(expr: string): string {
     return schemaRefMatch[1];
   }
 
-  // Chained expressions with .optional()
-  if (e.includes('.optional()')) {
-    const base = e.replace(/\.optional\(\)\s*$/, '');
-    return simplifyZodType(base) + ' | undefined';
-  }
-
   // Admin config schemas
   if (e.includes('ConfigSchema')) return 'object';
 
-  // Fallback
+  // Fallback — surface unrecognized expressions so they can be added to the mapping.
+  console.warn(`[simplifyZodType] unrecognized expression, falling back to 'object': ${e}`);
   return 'object';
 }
 
@@ -532,27 +530,39 @@ const METHOD_GROUPS: { heading: string; namespace: string; methods: string[] }[]
       'resumeSync',
       'rollbackTo',
       'startSnapshotUpload',
-      'getSlashPayloads',
       'getSlashOffenses',
       'reloadKeystore',
     ],
   },
 ];
 
-function generateExampleParam(paramType: string): string {
+function generateExampleParam(paramType: string, paramName?: string): string {
   const t = paramType.replace(/\s*\|\s*undefined$/, '').trim();
+
+  // Name-aware overrides for common parameter names so paired numeric args like
+  // (from, limit) and (page) render as more illustrative examples than `12345, 12345`.
+  // `from` defaults to 1 because some schemas (BlockNumberPositiveSchema) require >= 1
+  // and 1 is also valid for the relaxed BlockNumberSchema.
+  if (paramName && (t === 'number' || t === 'bigint')) {
+    const stringify = (n: number) => (t === 'bigint' ? `"${n}"` : String(n));
+    if (paramName === 'from' || paramName === 'fromBlock') return stringify(1);
+    if (paramName === 'limit') return stringify(100);
+    if (paramName === 'page') return stringify(0);
+    if (paramName === 'checkpointNumber') return stringify(1);
+  }
+
   if (t === 'number') return '12345';
   if (t === 'bigint') return '"100"';
   if (t === 'string') return '"0x1234..."';
   if (t === 'boolean') return 'true';
-  if (t === 'number | "latest"') return '"latest"';
-  if (t.includes('"all"') || t.includes('"current"')) return '"current"';
+  if (t === 'number | "latest"' || t === 'BlockHash | number | "latest"') return '"latest"';
+  if (/['"]all['"]|['"]current['"]/.test(t)) return '"current"';
   if (t === 'Fr' || t === 'AztecAddress' || t === 'BlockHash') return '"0x1234..."';
   if (t === 'EthAddress') return '"0x1234..."';
   if (t === 'SlotNumber') return '"100"';
   if (t === 'MerkleTreeId') return '1';
-  if (t === 'ManaUsageEstimate') return '1';
-  if (t.endsWith('[]')) return `[${generateExampleParam(t.slice(0, -2))}]`;
+  if (t === 'ManaUsageEstimate') return '"target"';
+  if (t.endsWith('[]')) return `[${generateExampleParam(t.slice(0, -2), paramName)}]`;
   if (t === 'Tx') return '{"data":"0x..."}';
   if (t === 'TxHash') return '"0x1234..."';
   if (t === 'SiloedTag') return '"0x1234..."';
@@ -580,6 +590,11 @@ function generateMethodMarkdown(method: MethodInfo, isAdmin: boolean): string {
     lines.push('');
   }
 
+  if (method.jsdoc.remarks) {
+    lines.push(`**Remarks**: ${method.jsdoc.remarks}`);
+    lines.push('');
+  }
+
   // Parameters
   if (method.paramTypes.length === 0) {
     lines.push('**Parameters**: None');
@@ -602,7 +617,9 @@ function generateMethodMarkdown(method: MethodInfo, isAdmin: boolean): string {
   lines.push('');
 
   // Example
-  const exampleParams = method.paramTypes.map(t => generateExampleParam(t)).join(',');
+  const exampleParams = method.paramTypes
+    .map((t, i) => generateExampleParam(t, method.paramNames[i]))
+    .join(',');
 
   if (isAdmin) {
     lines.push('**Example (CLI)**:');
@@ -790,6 +807,9 @@ function main() {
   for (const name of nodeMethodNames) {
     const schema = nodeSchemaInfo.get(name)!;
     const jsdoc = mergedJSDoc.get(name) || { description: '', params: [], returns: '' };
+    if (!mergedJSDoc.has(name)) {
+      console.warn(`WARNING: node_${name} is missing JSDoc — rendered without description`);
+    }
     const paramNames = mergedParamNames.get(name) || [];
 
     allMethods.set(`node:${name}`, {
@@ -805,6 +825,9 @@ function main() {
   for (const name of adminMethodNames) {
     const schema = adminSchemaInfo.get(name)!;
     const jsdoc = adminInterface.jsdoc.get(name) || { description: '', params: [], returns: '' };
+    if (!adminInterface.jsdoc.has(name)) {
+      console.warn(`WARNING: nodeAdmin_${name} is missing JSDoc — rendered without description`);
+    }
     const paramNames = adminInterface.paramNames.get(name) || [];
 
     allMethods.set(`nodeAdmin:${name}`, {
diff --git a/docs/src/clientModules/docsgpt.js b/docs/src/clientModules/docsgpt.js
new file mode 100644
index 000000000000..edfd106d1282
--- /dev/null
+++ b/docs/src/clientModules/docsgpt.js
@@ -0,0 +1,29 @@
+import ExecutionEnvironment from '@docusaurus/ExecutionEnvironment';
+
+if (ExecutionEnvironment.canUseDOM) {
+  const React = require('react');
+  const ReactDOM = require('react-dom/client');
+  const AztecDocsWidget = require('@site/src/components/AztecDocsWidget').default;
+
+  const container = document.createElement('div');
+  container.id = 'docsgpt-widget';
+  document.body.appendChild(container);
+
+  const root = ReactDOM.createRoot(container);
+  root.render(
+    React.createElement(AztecDocsWidget, {
+      apiHost: 'https://aztec.adjacentpossible.dev',
+      apiKey: '44420ab5-6be3-4b30-af35-559c38bfce6d',
+      title: 'Ask about Aztec',
+      heroTitle: 'Aztec Docs Assistant',
+      heroDescription:
+        'Searches Aztec v4.2.0 developer docs, Aztec.nr, aztec.js SDK, protocol circuits, and more.',
+      theme: 'ink',
+      accent: 'chartreuse',
+      buttonStyle: 'symbol',
+      size: 'roomy',
+      position: 'br',
+      motif: true,
+    }),
+  );
+}
diff --git a/docs/src/components/AztecDocsWidget/Hero.jsx b/docs/src/components/AztecDocsWidget/Hero.jsx
new file mode 100644
index 000000000000..13b09fda70d4
--- /dev/null
+++ b/docs/src/components/AztecDocsWidget/Hero.jsx
@@ -0,0 +1,147 @@
+import React from "react";
+import { AztecMark, Icons } from "./Icons";
+
+export default function Hero({
+  heroTitle,
+  heroDescription,
+  suggestedPrompts,
+  motif,
+  tokens,
+  onSuggest,
+}) {
+  const { isInk, accentColor, panelFg, panelFg2, panelSurface, panelSurface2 } =
+    tokens;
+  return (
+    <div
+      style={{
+        padding: "28px 24px 20px",
+        textAlign: "left",
+        position: "relative",
+      }}
+    >
+      {motif && (
+        <div
+          style={{
+            position: "absolute",
+            right: -10,
+            top: -30,
+            opacity: isInk ? 0.12 : 0.18,
+            pointerEvents: "none",
+          }}
+        >
+          <AztecMark size={180} color={accentColor} />
+        </div>
+      )}
+      <div style={{ position: "relative" }}>
+        <div
+          style={{
+            display: "inline-flex",
+            alignItems: "center",
+            gap: 8,
+            padding: "4px 10px",
+            border: `1px solid ${panelFg2}`,
+            color: panelFg2,
+            fontFamily: "var(--azw-font-mono)",
+            fontSize: 11,
+            letterSpacing: "0.1em",
+            textTransform: "uppercase",
+            marginBottom: 18,
+          }}
+        >
+          <span
+            style={{
+              width: 6,
+              height: 6,
+              borderRadius: 999,
+              background: accentColor,
+              boxShadow: `0 0 8px ${accentColor}`,
+            }}
+          />
+          Aztec Docs · AI
+        </div>
+        <h2
+          style={{
+            fontFamily: "var(--azw-font-display)",
+            fontWeight: 300,
+            fontSize: 32,
+            lineHeight: 1.0,
+            letterSpacing: "-0.03em",
+            color: panelFg,
+            margin: "0 0 10px",
+          }}
+        >
+          {heroTitle}
+        </h2>
+        <p
+          style={{
+            fontFamily: "var(--azw-font-sans)",
+            fontWeight: 400,
+            fontSize: 14,
+            lineHeight: 1.4,
+            color: panelFg2,
+            margin: "0 0 22px",
+            maxWidth: "92%",
+            letterSpacing: "-0.01em",
+          }}
+        >
+          {heroDescription}
+        </p>
+
+        {suggestedPrompts?.length > 0 && (
+          <>
+            <div
+              style={{
+                fontFamily: "var(--azw-font-mono)",
+                fontSize: 10,
+                letterSpacing: "0.12em",
+                textTransform: "uppercase",
+                color: panelFg2,
+                marginBottom: 10,
+              }}
+            >
+              Try asking —
+            </div>
+            <div style={{ display: "flex", flexDirection: "column", gap: 6 }}>
+              {suggestedPrompts.map((p) => (
+                <button
+                  key={p}
+                  onClick={() => onSuggest(p)}
+                  style={{
+                    display: "flex",
+                    alignItems: "center",
+                    justifyContent: "space-between",
+                    textAlign: "left",
+                    padding: "10px 12px",
+                    background: panelSurface,
+                    color: panelFg,
+                    border: `1px solid ${isInk ? "rgba(242,238,225,0.12)" : "var(--azw-ink-tint-1)"}`,
+                    fontFamily: "var(--azw-font-sans)",
+                    fontSize: 13,
+                    fontWeight: 500,
+                    cursor: "pointer",
+                    borderRadius: 0,
+                    transition:
+                      "background 120ms var(--azw-ease), border-color 120ms var(--azw-ease)",
+                  }}
+                  onMouseEnter={(e) => {
+                    e.currentTarget.style.background = panelSurface2;
+                    e.currentTarget.style.borderColor = accentColor;
+                  }}
+                  onMouseLeave={(e) => {
+                    e.currentTarget.style.background = panelSurface;
+                    e.currentTarget.style.borderColor = isInk
+                      ? "rgba(242,238,225,0.12)"
+                      : "var(--azw-ink-tint-1)";
+                  }}
+                >
+                  <span>{p}</span>
+                  <Icons.arrowUpRight size={12} />
+                </button>
+              ))}
+            </div>
+          </>
+        )}
+      </div>
+    </div>
+  );
+}
diff --git a/docs/src/components/AztecDocsWidget/Icons.jsx b/docs/src/components/AztecDocsWidget/Icons.jsx
new file mode 100644
index 000000000000..7bea8dbba69b
--- /dev/null
+++ b/docs/src/components/AztecDocsWidget/Icons.jsx
@@ -0,0 +1,157 @@
+import React from "react";
+
+export function AztecMark({ size = 24, color = "currentColor", stroke = 0 }) {
+  const c = size / 2;
+  const rings = [0.96, 0.7, 0.44, 0.2];
+  return (
+    <svg
+      width={size}
+      height={size}
+      viewBox={`0 0 ${size} ${size}`}
+      aria-hidden="true"
+      style={{ display: "block" }}
+    >
+      {rings.map((r, i) => {
+        const half = (size * r) / 2;
+        const d = `M ${c} ${c - half} L ${c + half} ${c} L ${c} ${c + half} L ${c - half} ${c} Z`;
+        return (
+          <path
+            key={i}
+            d={d}
+            fill={i % 2 === 0 ? color : "none"}
+            stroke={i % 2 === 0 ? "none" : color}
+            strokeWidth={stroke || Math.max(1, size * 0.04)}
+          />
+        );
+      })}
+    </svg>
+  );
+}
+
+export const Icons = {
+  close: (p) => (
+    <svg
+      viewBox="0 0 24 24"
+      width={p.size || 18}
+      height={p.size || 18}
+      fill="none"
+      stroke="currentColor"
+      strokeWidth="2"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+    >
+      <path d="M18 6L6 18" />
+      <path d="M6 6l12 12" />
+    </svg>
+  ),
+  send: (p) => (
+    <svg
+      viewBox="0 0 24 24"
+      width={p.size || 18}
+      height={p.size || 18}
+      fill="none"
+      stroke="currentColor"
+      strokeWidth="2"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+    >
+      <path d="M5 12h14" />
+      <path d="M13 6l6 6-6 6" />
+    </svg>
+  ),
+  chat: (p) => (
+    <svg
+      viewBox="0 0 24 24"
+      width={p.size || 22}
+      height={p.size || 22}
+      fill="none"
+      stroke="currentColor"
+      strokeWidth="2"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+    >
+      <path d="M21 12a8 8 0 0 1-11.5 7.2L3 20l1-4.8A8 8 0 1 1 21 12z" />
+    </svg>
+  ),
+  refresh: (p) => (
+    <svg
+      viewBox="0 0 24 24"
+      width={p.size || 14}
+      height={p.size || 14}
+      fill="none"
+      stroke="currentColor"
+      strokeWidth="2"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+    >
+      <path d="M3 12a9 9 0 0 1 15-6.7L21 8" />
+      <path d="M21 3v5h-5" />
+      <path d="M21 12a9 9 0 0 1-15 6.7L3 16" />
+      <path d="M3 21v-5h5" />
+    </svg>
+  ),
+  arrowUpRight: (p) => (
+    <svg
+      viewBox="0 0 24 24"
+      width={p.size || 12}
+      height={p.size || 12}
+      fill="none"
+      stroke="currentColor"
+      strokeWidth="2"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+    >
+      <path d="M7 17L17 7" />
+      <path d="M8 7h9v9" />
+    </svg>
+  ),
+  doc: (p) => (
+    <svg
+      viewBox="0 0 24 24"
+      width={p.size || 12}
+      height={p.size || 12}
+      fill="none"
+      stroke="currentColor"
+      strokeWidth="2"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+    >
+      <path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z" />
+      <path d="M14 2v6h6" />
+    </svg>
+  ),
+  expand: (p) => (
+    <svg
+      viewBox="0 0 24 24"
+      width={p.size || 14}
+      height={p.size || 14}
+      fill="none"
+      stroke="currentColor"
+      strokeWidth="2"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+    >
+      <path d="M15 3h6v6" />
+      <path d="M9 21H3v-6" />
+      <path d="M21 3l-7 7" />
+      <path d="M3 21l7-7" />
+    </svg>
+  ),
+  collapse: (p) => (
+    <svg
+      viewBox="0 0 24 24"
+      width={p.size || 14}
+      height={p.size || 14}
+      fill="none"
+      stroke="currentColor"
+      strokeWidth="2"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+    >
+      <path d="M4 14h6v6" />
+      <path d="M20 10h-6V4" />
+      <path d="M14 10l7-7" />
+      <path d="M3 21l7-7" />
+    </svg>
+  ),
+};
diff --git a/docs/src/components/AztecDocsWidget/LauncherButton.jsx b/docs/src/components/AztecDocsWidget/LauncherButton.jsx
new file mode 100644
index 000000000000..d8bd4ca47248
--- /dev/null
+++ b/docs/src/components/AztecDocsWidget/LauncherButton.jsx
@@ -0,0 +1,163 @@
+import React from "react";
+import { Icons } from "./Icons";
+
+export default function LauncherButton({ buttonStyle, position, onOpen }) {
+  const side = position === "br" ? { right: 32 } : { left: 32 };
+  const base = {
+    position: "fixed",
+    ...side,
+    bottom: 32,
+    cursor: "pointer",
+    border: "none",
+    zIndex: 2147483000,
+    transition:
+      "transform 200ms var(--azw-ease), box-shadow 200ms var(--azw-ease)",
+  };
+
+  if (buttonStyle === "label") {
+    return (
+      <button
+        onClick={onOpen}
+        aria-label="Open Aztec AI docs assistant"
+        style={{
+          ...base,
+          display: "flex",
+          alignItems: "center",
+          gap: 10,
+          padding: "12px 18px 12px 14px",
+          background: "var(--azw-ink)",
+          color: "var(--azw-chartreuse)",
+          border: "1.5px solid var(--azw-ink)",
+          boxShadow: "4px 4px 0 var(--azw-chartreuse)",
+          borderRadius: 0,
+          fontFamily: "var(--azw-font-mono)",
+          fontSize: 13,
+          letterSpacing: "0.08em",
+          textTransform: "uppercase",
+        }}
+      >
+        <img
+          src="/img/Aztec Symbol_Light.png"
+          alt=""
+          width={18}
+          height={18}
+          style={{ display: "block" }}
+        />
+        Ask Aztec
+      </button>
+    );
+  }
+
+  if (buttonStyle === "chat") {
+    return (
+      <button
+        onClick={onOpen}
+        aria-label="Open Aztec AI docs assistant"
+        style={{
+          ...base,
+          width: 56,
+          height: 56,
+          borderRadius: 999,
+          background: "var(--azw-chartreuse)",
+          color: "var(--azw-ink)",
+          border: "1.5px solid var(--azw-ink)",
+          display: "flex",
+          alignItems: "center",
+          justifyContent: "center",
+          boxShadow: "4px 4px 0 var(--azw-ink)",
+        }}
+      >
+        <Icons.chat size={24} />
+      </button>
+    );
+  }
+
+  return (
+    <button
+      onClick={onOpen}
+      aria-label="Open Aztec AI docs assistant"
+      style={{
+        ...base,
+        display: "flex",
+        alignItems: "center",
+        gap: 10,
+        padding: "11px 16px 11px 12px",
+        background: "var(--azw-ink)",
+        color: "var(--azw-parchment)",
+        border: "1.5px solid var(--azw-ink)",
+        boxShadow: "4px 4px 0 var(--azw-chartreuse)",
+        borderRadius: 0,
+      }}
+    >
+      <span
+        style={{
+          position: "relative",
+          width: 30,
+          height: 30,
+          display: "flex",
+          alignItems: "center",
+          justifyContent: "center",
+          background: "var(--azw-chartreuse)",
+        }}
+      >
+        <img
+          src="/img/Aztec_Symbol_Dark.png"
+          alt=""
+          width={18}
+          height={18}
+          style={{ display: "block" }}
+        />
+        <span
+          style={{
+            position: "absolute",
+            right: -6,
+            bottom: -6,
+            width: 16,
+            height: 16,
+            background: "var(--azw-ink)",
+            color: "var(--azw-chartreuse)",
+            border: "1.5px solid var(--azw-chartreuse)",
+            display: "flex",
+            alignItems: "center",
+            justifyContent: "center",
+            borderRadius: 999,
+          }}
+        >
+          <Icons.chat size={9} />
+        </span>
+      </span>
+      <span
+        style={{
+          display: "flex",
+          flexDirection: "column",
+          textAlign: "left",
+          lineHeight: 1,
+        }}
+      >
+        <span
+          style={{
+            fontFamily: "var(--azw-font-mono)",
+            fontSize: 10,
+            letterSpacing: "0.14em",
+            textTransform: "uppercase",
+            color: "var(--azw-chartreuse)",
+            marginBottom: 3,
+          }}
+        >
+          Ask AI
+        </span>
+        <span
+          style={{
+            fontFamily: "var(--azw-font-sans)",
+            fontSize: 13,
+            fontWeight: 500,
+            letterSpacing: "-0.01em",
+            color: "var(--azw-parchment)",
+          }}
+        >
+          Aztec Assistant
+        </span>
+      </span>
+    </button>
+  );
+}
diff --git a/docs/src/components/AztecDocsWidget/Message.jsx b/docs/src/components/AztecDocsWidget/Message.jsx
new file mode 100644
index 000000000000..8dc1de8750ea
--- /dev/null
+++ b/docs/src/components/AztecDocsWidget/Message.jsx
@@ -0,0 +1,159 @@
+import React from "react";
+import ReactMarkdown from "react-markdown";
+import { AztecMark, Icons } from "./Icons";
+import { REMARK_PLUGINS, repairInlineTables } from "./markdown";
+
+export function UserBubble({ text, tokens }) {
+  const { accentColor } = tokens;
+  return (
+    <div
+      style={{ display: "flex", justifyContent: "flex-end", marginBottom: 18 }}
+    >
+      <div
+        style={{
+          maxWidth: "82%",
+          padding: "9px 13px",
+          background: accentColor,
+          color: "var(--azw-ink)",
+          fontFamily: "var(--azw-font-sans)",
+          fontSize: 13.5,
+          lineHeight: 1.45,
+          letterSpacing: "-0.01em",
+          fontWeight: 500,
+          border: "1.5px solid var(--azw-ink)",
+        }}
+      >
+        {text}
+      </div>
+    </div>
+  );
+}
+
+export function AssistantBody({
+  text,
+  sources,
+  thinking,
+  tokens,
+  mdComponents,
+}) {
+  const { isInk, accentColor, panelFg, panelFg2 } = tokens;
+  return (
+    <div
+      style={{
+        display: "flex",
+        gap: 10,
+        marginBottom: 18,
+        alignItems: "flex-start",
+      }}
+    >
+      <div
+        style={{
+          width: 26,
+          height: 26,
+          flexShrink: 0,
+          background: "var(--azw-ink)",
+          border: `1px solid ${isInk ? "var(--azw-parchment)" : "var(--azw-ink)"}`,
+          display: "flex",
+          alignItems: "center",
+          justifyContent: "center",
+          marginTop: 2,
+        }}
+      >
+        <AztecMark size={14} color="var(--azw-chartreuse)" />
+      </div>
+      <div style={{ flex: 1, minWidth: 0 }}>
+        <div
+          style={{
+            fontFamily: "var(--azw-font-mono)",
+            fontSize: 10,
+            letterSpacing: "0.1em",
+            textTransform: "uppercase",
+            color: thinking ? accentColor : panelFg2,
+            marginBottom: 6,
+            display: "flex",
+            alignItems: "center",
+            gap: 6,
+          }}
+        >
+          {thinking ? (
+            <>
+              Thinking
+              <span className="azw-dots">
+                <span>·</span>
+                <span>·</span>
+                <span>·</span>
+              </span>
+            </>
+          ) : (
+            "Aztec Assistant"
+          )}
+        </div>
+        <div
+          style={{
+            fontFamily: "var(--azw-font-sans)",
+            fontWeight: 400,
+            fontSize: 13.5,
+            lineHeight: 1.5,
+            color: panelFg,
+            letterSpacing: "-0.01em",
+          }}
+        >
+          {text ? (
+            <ReactMarkdown
+              components={mdComponents}
+              remarkPlugins={REMARK_PLUGINS}
+            >
+              {repairInlineTables(text)}
+            </ReactMarkdown>
+          ) : null}
+        </div>
+        {sources?.length > 0 && (
+          <div style={{ marginTop: 10 }}>
+            <div
+              style={{
+                fontFamily: "var(--azw-font-mono)",
+                fontSize: 10,
+                letterSpacing: "0.1em",
+                textTransform: "uppercase",
+                color: panelFg2,
+                marginBottom: 6,
+              }}
+            >
+              Sources
+            </div>
+            <div style={{ display: "flex", flexWrap: "wrap", gap: 6 }}>
+              {sources.map((s, k) => {
+                const href = s.source || s.url || s.link || "#";
+                const label =
+                  s.title || s.filename || s.source || s.url || "Source";
+                return (
+                  <a
+                    key={k}
+                    href={href}
+                    target="_blank"
+                    rel="noreferrer"
+                    style={{
+                      display: "inline-flex",
+                      alignItems: "center",
+                      gap: 6,
+                      padding: "4px 8px",
+                      fontFamily: "var(--azw-font-mono)",
+                      fontSize: 11,
+                      color: panelFg,
+                      textDecoration: "none",
+                      border: `1px solid ${isInk ? "rgba(242,238,225,0.2)" : "var(--azw-ink-tint-1)"}`,
+                      background: "transparent",
+                    }}
+                  >
+                    <Icons.doc size={11} />
+                    {label}
+                  </a>
+                );
+              })}
+            </div>
+          </div>
+        )}
+      </div>
+    </div>
+  );
+}
diff --git a/docs/src/components/AztecDocsWidget/Panel.jsx b/docs/src/components/AztecDocsWidget/Panel.jsx
new file mode 100644
index 000000000000..2f1264efe7a4
--- /dev/null
+++ b/docs/src/components/AztecDocsWidget/Panel.jsx
@@ -0,0 +1,346 @@
+import React from "react";
+import { AztecMark, Icons } from "./Icons";
+import Hero from "./Hero";
+import { UserBubble, AssistantBody } from "./Message";
+
+export default function Panel({
+  title,
+  heroTitle,
+  heroDescription,
+  suggestedPrompts,
+  motif,
+  position,
+  size,
+  tokens,
+  mdComponents,
+  messages,
+  streaming,
+  streamText,
+  streamSources,
+  input,
+  onInputChange,
+  onSend,
+  onSuggest,
+  onReset,
+  onClose,
+  expanded,
+  onToggleExpanded,
+  scrollRef,
+}) {
+  const {
+    isInk,
+    accentColor,
+    panelBg,
+    panelFg,
+    panelFg2,
+    panelBorder,
+    inputBg,
+    softBorder,
+  } = tokens;
+
+  const side = position === "br" ? { right: 32 } : { left: 32 };
+  const panelWidth = size === "compact" ? 380 : 420;
+  const panelHeight = size === "compact" ? 540 : 620;
+  const showHero = messages.length === 0 && !streaming;
+
+  return (
+    <div
+      style={{
+        position: "fixed",
+        ...(expanded
+          ? { right: 32, left: 32, top: 32, bottom: 32 }
+          : { ...side, bottom: 32 }),
+        width: expanded ? "auto" : panelWidth,
+        height: expanded ? "auto" : panelHeight,
+        maxWidth: expanded ? undefined : "calc(100vw - 64px)",
+        maxHeight: expanded ? undefined : "calc(100vh - 64px)",
+        background: panelBg,
+        border: `1.5px solid ${panelBorder}`,
+        boxShadow: isInk
+          ? `4px 4px 0 ${accentColor}`
+          : "4px 4px 0 var(--azw-ink)",
+        display: "flex",
+        flexDirection: "column",
+        overflow: "hidden",
+        zIndex: 2147483000,
+      }}
+    >
+      {/* Header */}
+      <div
+        style={{
+          padding: "14px 16px",
+          borderBottom: `1px solid ${softBorder}`,
+          display: "flex",
+          alignItems: "center",
+          justifyContent: "space-between",
+          background: isInk ? "rgba(0,0,0,0.2)" : "var(--azw-parchment-tint-2)",
+        }}
+      >
+        <div style={{ display: "flex", alignItems: "center", gap: 10 }}>
+          <div
+            style={{
+              width: 28,
+              height: 28,
+              background: "var(--azw-ink)",
+              border: `1px solid ${isInk ? "var(--azw-parchment)" : "var(--azw-ink)"}`,
+              display: "flex",
+              alignItems: "center",
+              justifyContent: "center",
+            }}
+          >
+            <AztecMark size={15} color="var(--azw-chartreuse)" />
+          </div>
+          <div
+            style={{
+              display: "flex",
+              flexDirection: "column",
+              lineHeight: 1,
+            }}
+          >
+            <div
+              style={{
+                fontFamily: "var(--azw-font-mono)",
+                fontSize: 13,
+                fontWeight: 500,
+                color: panelFg,
+                letterSpacing: "-0.01em",
+              }}
+            >
+              {title}
+            </div>
+            <div
+              style={{
+                fontFamily: "var(--azw-font-mono)",
+                fontSize: 10,
+                color: panelFg2,
+                letterSpacing: "0.12em",
+                textTransform: "uppercase",
+                marginTop: 4,
+                display: "flex",
+                alignItems: "center",
+                gap: 5,
+              }}
+            >
+              <span
+                style={{
+                  width: 5,
+                  height: 5,
+                  background: accentColor,
+                  boxShadow: `0 0 6px ${accentColor}`,
+                }}
+              />
+              Online
+            </div>
+          </div>
+        </div>
+        <div style={{ display: "flex", gap: 4 }}>
+          {messages.length > 0 && (
+            <button
+              onClick={onReset}
+              title="New chat"
+              style={{
+                width: 28,
+                height: 28,
+                border: "none",
+                background: "transparent",
+                color: panelFg2,
+                cursor: "pointer",
+                display: "flex",
+                alignItems: "center",
+                justifyContent: "center",
+              }}
+            >
+              <Icons.refresh size={14} />
+            </button>
+          )}
+          <button
+            onClick={onToggleExpanded}
+            title={expanded ? "Collapse" : "Expand"}
+            aria-label={expanded ? "Collapse widget" : "Expand widget"}
+            style={{
+              width: 28,
+              height: 28,
+              border: "none",
+              background: "transparent",
+              color: panelFg2,
+              cursor: "pointer",
+              display: "flex",
+              alignItems: "center",
+              justifyContent: "center",
+            }}
+          >
+            {expanded ? (
+              <Icons.collapse size={14} />
+            ) : (
+              <Icons.expand size={14} />
+            )}
+          </button>
+          <button
+            onClick={onClose}
+            title="Close"
+            style={{
+              width: 28,
+              height: 28,
+              border: "none",
+              background: "transparent",
+              color: panelFg,
+              cursor: "pointer",
+              display: "flex",
+              alignItems: "center",
+              justifyContent: "center",
+            }}
+          >
+            <Icons.close size={16} />
+          </button>
+        </div>
+      </div>
+
+      {/* Body */}
+      <div
+        ref={scrollRef}
+        style={{
+          flex: 1,
+          overflowY: "auto",
+          overflowX: "hidden",
+          background: panelBg,
+          color: panelFg,
+        }}
+      >
+        <div style={{ maxWidth: expanded ? 760 : "100%", margin: "0 auto" }}>
+          {showHero && (
+            <Hero
+              heroTitle={heroTitle}
+              heroDescription={heroDescription}
+              suggestedPrompts={suggestedPrompts}
+              motif={motif}
+              tokens={tokens}
+              onSuggest={onSuggest}
+            />
+          )}
+          {messages.length > 0 && (
+            <div style={{ padding: "18px 18px 4px" }}>
+              {messages.map((m, i) => {
+                const isLast = i === messages.length - 1;
+                const text = isLast && streaming ? streamText : m.response;
+                const sources = isLast && streaming ? streamSources : m.sources;
+                const isStreamingLast = isLast && streaming;
+                return (
+                  <React.Fragment key={i}>
+                    <UserBubble text={m.prompt} tokens={tokens} />
+                    {(text || isStreamingLast) && (
+                      <AssistantBody
+                        text={text}
+                        sources={sources}
+                        thinking={isStreamingLast}
+                        tokens={tokens}
+                        mdComponents={mdComponents}
+                      />
+                    )}
+                  </React.Fragment>
+                );
+              })}
+            </div>
+          )}
+        </div>
+      </div>
+
+      {/* Composer */}
+      <div
+        style={{
+          padding: 12,
+          borderTop: `1px solid ${softBorder}`,
+          background: isInk
+            ? "rgba(0,0,0,0.15)"
+            : "var(--azw-parchment-tint-2)",
+        }}
+      >
+        <div style={{ maxWidth: expanded ? 760 : "100%", margin: "0 auto" }}>
+          <form
+            onSubmit={(e) => {
+              e.preventDefault();
+              onSend();
+            }}
+            style={{
+              display: "flex",
+              alignItems: "stretch",
+              gap: 0,
+              background: inputBg,
+              border: `1px solid ${isInk ? "rgba(242,238,225,0.25)" : "var(--azw-ink-tint-1)"}`,
+            }}
+          >
+            <input
+              value={input}
+              onChange={(e) => onInputChange(e.target.value)}
+              placeholder="Ask about Aztec —"
+              disabled={streaming}
+              style={{
+                flex: 1,
+                padding: "11px 12px",
+                background: "transparent",
+                border: "none",
+                outline: "none",
+                color: panelFg,
+                fontFamily: "var(--azw-font-sans)",
+                fontSize: 13.5,
+                letterSpacing: "-0.01em",
+              }}
+            />
+            <button
+              type="submit"
+              disabled={!input.trim() || streaming}
+              style={{
+                padding: "0 14px",
+                background:
+                  input.trim() && !streaming ? accentColor : "transparent",
+                color: input.trim() && !streaming ? "var(--azw-ink)" : panelFg2,
+                border: "none",
+                borderLeft: `1px solid ${isInk ? "rgba(242,238,225,0.25)" : "var(--azw-ink-tint-1)"}`,
+                cursor: input.trim() && !streaming ? "pointer" : "default",
+                display: "flex",
+                alignItems: "center",
+                justifyContent: "center",
+                transition: "background 120ms var(--azw-ease)",
+              }}
+            >
+              <Icons.send size={16} />
+            </button>
+          </form>
+          <div
+            style={{
+              marginTop: 8,
+              display: "flex",
+              flexDirection: "column",
+              gap: 2,
+              fontFamily: "var(--azw-font-mono)",
+              fontSize: 10,
+              color: panelFg2,
+              letterSpacing: "0.06em",
+            }}
+          >
+            <span>
+              AI-generated. Informational only. Not investment, tax, or legal
+              advice.
+              <a
+                href="https://aztec.network/privacy-policy"
+                target="_blank"
+                rel="noopener noreferrer"
+                style={{ color: "inherit", textDecoration: "underline" }}
+              >
+                Privacy
+              </a>
+              {" · "}
+              <a
+                href="https://aztec.network/terms-of-service"
+                target="_blank"
+                rel="noopener noreferrer"
+                style={{ color: "inherit", textDecoration: "underline" }}
+              >
+                Terms
+              </a>
+            </span>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/docs/src/components/AztecDocsWidget/index.jsx b/docs/src/components/AztecDocsWidget/index.jsx
new file mode 100644
index 000000000000..0ab41396af12
--- /dev/null
+++ b/docs/src/components/AztecDocsWidget/index.jsx
@@ -0,0 +1,155 @@
+import React, { useEffect, useRef, useState } from "react";
+import "./styles.css";
+import { DEFAULT_SUGGESTED, getTheme } from "./theme";
+import { makeMarkdownComponents } from "./markdown";
+import { streamAnswer } from "./streamAnswer";
+import LauncherButton from "./LauncherButton";
+import Panel from "./Panel";
+
+export default function AztecDocsWidget({
+  apiHost,
+  apiKey,
+  title = "Ask about Aztec",
+  heroTitle = "Aztec Docs Assistant",
+  heroDescription = "Ask me anything about building on the privacy network — Noir, rollups, nullifiers, testnet setup.",
+  suggestedPrompts = DEFAULT_SUGGESTED,
+  theme = "ink",
+  accent = "chartreuse",
+  buttonStyle = "symbol",
+  size = "roomy",
+  position = "br",
+  motif = true,
+}) {
+  const [open, setOpen] = useState(false);
+  const [expanded, setExpanded] = useState(false);
+  const [input, setInput] = useState("");
+  const [messages, setMessages] = useState([]);
+  const [streaming, setStreaming] = useState(false);
+  const [streamText, setStreamText] = useState("");
+  const [streamSources, setStreamSources] = useState([]);
+  const [conversationId, setConversationId] = useState(null);
+  const scrollRef = useRef(null);
+  const abortRef = useRef(null);
+
+  const tokens = React.useMemo(() => getTheme(theme, accent), [theme, accent]);
+  const mdComponents = React.useMemo(
+    () => makeMarkdownComponents(tokens.isInk, tokens.accentColor),
+    [tokens.isInk, tokens.accentColor],
+  );
+
+  // Only auto-scroll to the bottom when a new message is appended (user
+  // sends a question). Don't follow streaming tokens — the user should
+  // be free to scroll away while the response is generating.
+  useEffect(() => {
+    if (scrollRef.current)
+      scrollRef.current.scrollTop = scrollRef.current.scrollHeight;
+  }, [messages.length]);
+
+  useEffect(() => () => abortRef.current?.abort(), []);
+
+  async function handleSend(text) {
+    const question = (text ?? input).trim();
+    if (!question || streaming) return;
+    setInput("");
+    const nextHistory = messages.map((m) => ({
+      prompt: m.prompt,
+      response: m.response,
+    }));
+    const nextMessages = [
+      ...messages,
+      { prompt: question, response: "", sources: [] },
+    ];
+    setMessages(nextMessages);
+    setStreaming(true);
+    setStreamText("");
+    setStreamSources([]);
+
+    abortRef.current?.abort();
+    const controller = new AbortController();
+    abortRef.current = controller;
+
+    let acc = "";
+    let sources = [];
+    try {
+      await streamAnswer({
+        apiHost,
+        apiKey,
+        question,
+        history: nextHistory,
+        conversationId,
+        signal: controller.signal,
+        onToken: (chunk) => {
+          acc += chunk;
+          setStreamText(acc);
+        },
+        onSource: (src) => {
+          sources = sources.concat(src);
+          setStreamSources(sources);
+        },
+        onConversationId: (id) => setConversationId(id),
+        onDone: () => {},
+      });
+    } catch (err) {
+      if (err.name !== "AbortError") {
+        acc =
+          acc || "Something went wrong fetching an answer. Please try again.";
+      }
+    }
+
+    setMessages((prev) => {
+      const copy = [...prev];
+      copy[copy.length - 1] = { prompt: question, response: acc, sources };
+      return copy;
+    });
+    setStreaming(false);
+    setStreamText("");
+    setStreamSources([]);
+  }
+
+  function handleReset() {
+    abortRef.current?.abort();
+    setMessages([]);
+    setStreaming(false);
+    setStreamText("");
+    setStreamSources([]);
+    setConversationId(null);
+  }
+
+  return (
+    <div className="azw">
+      {!open && (
+        <LauncherButton
+          buttonStyle={buttonStyle}
+          position={position}
+          onOpen={() => setOpen(true)}
+        />
+      )}
+      {open && (
+        <Panel
+          title={title}
+          heroTitle={heroTitle}
+          heroDescription={heroDescription}
+          suggestedPrompts={suggestedPrompts}
+          motif={motif}
+          position={position}
+          size={size}
+          tokens={tokens}
+          mdComponents={mdComponents}
+          messages={messages}
+          streaming={streaming}
+          streamText={streamText}
+          streamSources={streamSources}
+          input={input}
+          onInputChange={setInput}
+          onSend={handleSend}
+          onSuggest={handleSend}
+          onReset={handleReset}
+          onClose={() => setOpen(false)}
+          expanded={expanded}
+          onToggleExpanded={() => setExpanded((v) => !v)}
+          scrollRef={scrollRef}
+        />
+      )}
+    </div>
+  );
+}
diff --git a/docs/src/components/AztecDocsWidget/markdown.jsx b/docs/src/components/AztecDocsWidget/markdown.jsx
new file mode 100644
index 000000000000..bf10efaa125d
--- /dev/null
+++ b/docs/src/components/AztecDocsWidget/markdown.jsx
@@ -0,0 +1,226 @@
+import React from "react";
+import remarkGfm from "remark-gfm";
+import { Highlight, themes as prismThemes } from "prism-react-renderer";
+
+export const REMARK_PLUGINS = [remarkGfm];
+
+const LANGUAGE_ALIASES = {
+  noir: "rust",
+  nr: "rust",
+};
+
+function CodeBlock({ code, language, isInk, codeBorder }) {
+  const theme = isInk ? prismThemes.vsDark : prismThemes.github;
+  const resolved = LANGUAGE_ALIASES[language] || language || "text";
+  return (
+    <Highlight code={code} language={resolved} theme={theme}>
+      {({ className, style, tokens, getLineProps, getTokenProps }) => (
+        <pre
+          className={className}
+          style={{
+            ...style,
+            margin: "0 0 10px",
+            padding: 10,
+            borderRadius: 4,
+            overflowX: "auto",
+            fontSize: 12,
+            lineHeight: 1.45,
+            fontFamily: "var(--azw-font-mono)",
+            border: `1px solid ${codeBorder}`,
+          }}
+        >
+          {tokens.map((line, i) => {
+            const { key: _lk, ...lineProps } = getLineProps({ line });
+            return (
+              <div key={i} {...lineProps}>
+                {line.map((token, j) => {
+                  const { key: _tk, ...tokenProps } = getTokenProps({ token });
+                  return <span key={j} {...tokenProps} />;
+                })}
+              </div>
+            );
+          })}
+        </pre>
+      )}
+    </Highlight>
+  );
+}
+
+// DocsGPT sometimes returns GFM tables as a single line with no
+// newlines between rows. Restore the structural newlines so remark-gfm
+// can parse the table.
+export function repairInlineTables(md) {
+  if (!md || !md.includes("|")) return md;
+  let out = md;
+  // Put the separator row (|---|---|---|) on its own line.
+  out = out.replace(/ +(\|(?:\s*:?-+:?\s*\|)+) +/g, "\n$1\n");
+  // Split " | |" boundary between rows whose first cell is empty.
+  out = out.replace(/ \| \|/g, " |\n|");
+  return out;
+}
+
+export function makeMarkdownComponents(isInk, accentColor) {
+  const codeBg = isInk
+    ? "rgba(212,255,40,0.12)"
+    : "var(--azw-chartreuse-tint-2)";
+  const codeFg = isInk ? "var(--azw-chartreuse)" : "var(--azw-ink)";
+  const codeBorder = isInk ? "rgba(212,255,40,0.25)" : "var(--azw-ink-tint-1)";
+  const linkColor = isInk ? accentColor : "var(--azw-ink)";
+  const dividerColor = isInk
+    ? "rgba(242,238,225,0.15)"
+    : "var(--azw-ink-tint-1)";
+  const quoteColor = isInk
+    ? "var(--azw-ink-tint-1)"
+    : "var(--azw-parchment-shade-1)";
+
+  const inlineCode = {
+    fontFamily: "var(--azw-font-mono)",
+    fontSize: 12,
+    background: codeBg,
+    color: codeFg,
+    padding: "1px 5px",
+    border: `1px solid ${codeBorder}`,
+  };
+
+  return {
+    p: ({ node, ...props }) => (
+      <p style={{ margin: "0 0 10px", lineHeight: 1.5 }} {...props} />
+    ),
+    a: ({ node, ...props }) => (
+      <a
+        target="_blank"
+        rel="noreferrer"
+        style={{
+          color: linkColor,
+          textDecoration: "underline",
+          textUnderlineOffset: 2,
+        }}
+        {...props}
+      />
+    ),
+    ul: ({ node, ordered, ...props }) => (
+      <ul style={{ margin: "0 0 10px", paddingLeft: 20 }} {...props} />
+    ),
+    ol: ({ node, ordered, ...props }) => (
+      <ol style={{ margin: "0 0 10px", paddingLeft: 20 }} {...props} />
+    ),
+    li: ({ node, ordered, checked, ...props }) => (
+      <li style={{ margin: "2px 0" }} {...props} />
+    ),
+    h1: ({ node, ...props }) => (
+      <h1
+        style={{
+          fontSize: 16,
+          fontWeight: 600,
+          margin: "8px 0 6px",
+          lineHeight: 1.25,
+        }}
+        {...props}
+      />
+    ),
+    h2: ({ node, ...props }) => (
+      <h2
+        style={{
+          fontSize: 15,
+          fontWeight: 600,
+          margin: "8px 0 6px",
+          lineHeight: 1.25,
+        }}
+        {...props}
+      />
+    ),
+    h3: ({ node, ...props }) => (
+      <h3
+        style={{
+          fontSize: 14,
+          fontWeight: 600,
+          margin: "8px 0 4px",
+          lineHeight: 1.25,
+          fontFamily: "var(--azw-font-sans)",
+          textTransform: "none",
+        }}
+        {...props}
+      />
+    ),
+    h4: ({ node, ...props }) => (
+      <h4
+        style={{
+          fontSize: 13.5,
+          fontWeight: 600,
+          margin: "6px 0 4px",
+          lineHeight: 1.25,
+        }}
+        {...props}
+      />
+    ),
+    blockquote: ({ node, ...props }) => (
+      <blockquote
+        style={{
+          margin: "0 0 10px",
+          padding: "2px 0 2px 10px",
+          borderLeft: `2px solid ${accentColor}`,
+          color: quoteColor,
+        }}
+        {...props}
+      />
+    ),
+    hr: () => (
+      <hr
+        style={{
+          border: 0,
+          borderTop: `1px solid ${dividerColor}`,
+          margin: "10px 0",
+        }}
+      />
+    ),
+    code: ({ node, inline, className, children, ...props }) => {
+      if (inline) {
+        return (
+          <code style={inlineCode} {...props}>
+            {children}
+          </code>
+        );
+      }
+      const match = /language-(\w+)/.exec(className || "");
+      const code = String(children).replace(/\n$/, "");
+      return (
+        <CodeBlock
+          code={code}
+          language={match ? match[1] : undefined}
+          isInk={isInk}
+          codeBorder={codeBorder}
+        />
+      );
+    },
+    // Passthrough: <CodeBlock> renders its own <pre>, so we unwrap
+    // react-markdown's default <pre> to avoid nesting.
+    pre: ({ children }) => <>{children}</>,
+    table: ({ node, ...props }) => (
+      <div style={{ overflowX: "auto", margin: "0 0 10px" }}>
+        <table
+          style={{ borderCollapse: "collapse", width: "100%", fontSize: 12 }}
+          {...props}
+        />
+      </div>
+    ),
+    th: ({ node, ...props }) => (
+      <th
+        style={{
+          textAlign: "left",
+          borderBottom: `1px solid ${dividerColor}`,
+          padding: "4px 8px",
+        }}
+        {...props}
+      />
+    ),
+    td: ({ node, ...props }) => (
+      <td
+        style={{
+          borderBottom: `1px solid ${dividerColor}`,
+          padding: "4px 8px",
+        }}
+        {...props}
+      />
+    ),
+  };
+}
diff --git a/docs/src/components/AztecDocsWidget/streamAnswer.js b/docs/src/components/AztecDocsWidget/streamAnswer.js
new file mode 100644
index 000000000000..26306c89fdbf
--- /dev/null
+++ b/docs/src/components/AztecDocsWidget/streamAnswer.js
@@ -0,0 +1,66 @@
+export async function streamAnswer({
+  apiHost,
+  apiKey,
+  question,
+  history,
+  conversationId,
+  onToken,
+  onSource,
+  onConversationId,
+  onDone,
+  signal,
+}) {
+  const res = await fetch(`${apiHost.replace(/\/$/, "")}/stream`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({
+      question,
+      api_key: apiKey,
+      history,
+      conversation_id: conversationId || null,
+      prompt_id: "default",
+    }),
+    signal,
+  });
+  if (!res.ok || !res.body) {
+    throw new Error(`DocsGPT stream failed: ${res.status}`);
+  }
+  const reader = res.body.getReader();
+  const decoder = new TextDecoder();
+  let buffer = "";
+  while (true) {
+    const { done, value } = await reader.read();
+    if (done) break;
+    buffer += decoder.decode(value, { stream: true });
+    const lines = buffer.split("\n");
+    buffer = lines.pop() || "";
+    for (const line of lines) {
+      const trimmed = line.trim();
+      if (!trimmed) continue;
+      const payload = trimmed.startsWith("data:")
+        ? trimmed.slice(5).trim()
+        : trimmed;
+      if (!payload || payload === "[DONE]") continue;
+      let parsed;
+      try {
+        parsed = JSON.parse(payload);
+      } catch {
+        continue;
+      }
+      if (parsed.type === "answer" && typeof parsed.answer === "string") {
+        onToken(parsed.answer);
+      } else if (parsed.type === "source" && parsed.source) {
+        const sources = Array.isArray(parsed.source)
+          ? parsed.source
+          : [parsed.source];
+        onSource(sources);
+      } else if (parsed.type === "id" && parsed.id) {
+        onConversationId(parsed.id);
+      } else if (parsed.type === "end") {
+        onDone();
+        return;
+      }
+    }
+  }
+  onDone();
+}
diff --git a/docs/src/components/AztecDocsWidget/styles.css b/docs/src/components/AztecDocsWidget/styles.css
new file mode 100644
index 000000000000..3ecd1471f575
--- /dev/null
+++ b/docs/src/components/AztecDocsWidget/styles.css
@@ -0,0 +1,48 @@
+/* ============================================================
+   Aztec Docs Widget — scoped tokens + component styles.
+   Ported from the design bundle's colors_and_type.css, narrowed
+   to the widget so site-wide tokens remain untouched.
+   ============================================================ */
+
+@import url('https://fonts.googleapis.com/css2?family=Martel:wght@300;400;700&family=Geist:wght@400;500;600;700&family=Geist+Mono:wght@400;500;700&display=swap');
+
+.azw {
+  /* Neutrals */
+  --azw-parchment: #F2EEE1;
+  --azw-parchment-tint-1: #FCFBFA;
+  --azw-parchment-tint-2: #F6F3EC;
+  --azw-parchment-shade-1: #564D3F;
+  --azw-ink: #1A1400;
+  --azw-ink-tint-1: #CCCABF;
+  --azw-ink-tint-2: #918B7F;
+
+  /* Brand accents */
+  --azw-chartreuse: #D4FF28;
+  --azw-chartreuse-shade-2: #A9CC1F;
+  --azw-chartreuse-tint-2: #E8FFBF;
+  --azw-orchid: #FF2DF4;
+  --azw-aqua: #2BFAE9;
+
+  /* Typography */
+  --azw-font-display: 'Martel', 'Arizona Serif', Georgia, serif;
+  --azw-font-sans: 'Geist', 'Oracle', 'Inter', system-ui, -apple-system, sans-serif;
+  --azw-font-mono: 'Geist Mono', 'MD Thermochrome', ui-monospace, monospace;
+
+  /* Motion */
+  --azw-ease: cubic-bezier(0.2, 0.0, 0.0, 1.0);
+
+  font-family: var(--azw-font-sans);
+  letter-spacing: -0.01em;
+}
+
+/* Streaming cursor blink + thinking dots */
+@keyframes azw-blink { 0%, 100% { opacity: 1; } 50% { opacity: 0; } }
+@keyframes azw-pulse { 0%, 80%, 100% { opacity: 0.3; } 40% { opacity: 1; } }
+.azw-dots span {
+  display: inline-block; opacity: 0.3; animation: azw-pulse 1.4s infinite;
+}
+.azw-dots span:nth-child(2) { animation-delay: 0.2s; }
+.azw-dots span:nth-child(3) { animation-delay: 0.4s; }
+
+.azw input::placeholder { color: inherit; opacity: 0.5; }
+.azw button { font-family: inherit; }
diff --git a/docs/src/components/AztecDocsWidget/theme.js b/docs/src/components/AztecDocsWidget/theme.js
new file mode 100644
index 000000000000..025deabcf64c
--- /dev/null
+++ b/docs/src/components/AztecDocsWidget/theme.js
@@ -0,0 +1,33 @@
+export const DEFAULT_SUGGESTED = [
+  "What is Noir?",
+  "How do nullifiers work?",
+  "Deploying to testnet",
+  "Private vs public state",
+];
+
+export const ACCENT_VARS = {
+  chartreuse: "var(--azw-chartreuse)",
+  orchid: "var(--azw-orchid)",
+  aqua: "var(--azw-aqua)",
+};
+
+export function getTheme(theme, accent) {
+  const isInk = theme === "ink";
+  const accentColor = ACCENT_VARS[accent] || ACCENT_VARS.chartreuse;
+  return {
+    isInk,
+    accentColor,
+    panelBg: isInk ? "var(--azw-ink)" : "var(--azw-parchment)",
+    panelFg: isInk ? "var(--azw-parchment)" : "var(--azw-ink)",
+    panelFg2: isInk ? "var(--azw-ink-tint-1)" : "var(--azw-parchment-shade-1)",
+    panelBorder: isInk ? "var(--azw-parchment)" : "var(--azw-ink)",
+    panelSurface: isInk
+      ? "rgba(242,238,225,0.05)"
+      : "var(--azw-parchment-tint-1)",
+    panelSurface2: isInk
+      ? "rgba(242,238,225,0.09)"
+      : "var(--azw-parchment-tint-2)",
+    inputBg: isInk ? "rgba(242,238,225,0.07)" : "#fff",
+    softBorder: isInk ? "rgba(242,238,225,0.15)" : "var(--azw-ink-tint-1)",
+  };
+}
diff --git a/docs/src/components/NPSWidget/styles.module.css b/docs/src/components/NPSWidget/styles.module.css
index d76ae892a833..d9a463de0e45 100644
--- a/docs/src/components/NPSWidget/styles.module.css
+++ b/docs/src/components/NPSWidget/styles.module.css
@@ -1,6 +1,6 @@
 .npsWidget {
   position: fixed;
-  bottom: 20px;
+  bottom: 110px;
   right: 20px;
   background: white;
   box-shadow: 0 2px 4px #0000000f;
@@ -270,7 +270,7 @@
 /* Mobile responsiveness */
 @media (max-width: 768px) {
   .npsWidget {
-    bottom: 16px;
+    bottom: 100px;
     right: 16px;
     left: 16px;
     max-width: none;
diff --git a/docs/src/css/custom.css b/docs/src/css/custom.css
index 809ec34453c3..d5df2c7f650d 100644
--- a/docs/src/css/custom.css
+++ b/docs/src/css/custom.css
@@ -534,6 +534,14 @@ html[data-theme="dark"] .sidebar-divider {
   box-shadow: 0 8px 16px rgba(169, 204, 31, 0.15);
 }
 
+/* Allow DocCard titles and descriptions to wrap instead of being clipped to a
+   single line by Docusaurus's default `text--truncate` utility. */
+.card .text--truncate {
+  overflow: visible;
+  text-overflow: clip;
+  white-space: normal;
+}
+
 /* ============================================
    Table Wrapping Styles for Long Content
    ============================================ */
diff --git a/docs/src/theme/Root.js b/docs/src/theme/Root.js
index 1d3d350d5e68..2cf622350b8c 100644
--- a/docs/src/theme/Root.js
+++ b/docs/src/theme/Root.js
@@ -3,7 +3,6 @@ import useMatomo from '@site/src/components/Matomo/matomo';
 import BrowserOnly from '@docusaurus/BrowserOnly';
 import useIsBrowser from '@docusaurus/useIsBrowser';
 import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
-import AskCookbook from '@cookbookdev/docsbot/react';
 import { AnalyticsManager } from '@site/src/utils/analytics';
 
 function OptOutForm() {
@@ -12,9 +11,6 @@ function OptOutForm() {
   return <>{banner}</>;
 }
 
-/** It's a public API key, so it's safe to expose it here. */
-const COOKBOOK_PUBLIC_API_KEY = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiI2NmIyOWRmZDM3ZWIwYzRiMTVlZGYzMDAiLCJpYXQiOjE3MjI5ODE4ODUsImV4cCI6MjAzODU1Nzg4NX0.19rsZIFNmgVEbpmDjEJ8oPnL7uHYePytf-Ex1pjm2_8';
-
 export default function Root({ children }) {
   const useIsBrowserValue = useIsBrowser();
   const { siteConfig } = useDocusaurusContext();
@@ -33,7 +29,6 @@ export default function Root({ children }) {
     <>
       {children}
       <BrowserOnly>{() => <OptOutForm />}</BrowserOnly>
-      <BrowserOnly>{() => <AskCookbook apiKey={COOKBOOK_PUBLIC_API_KEY} />}</BrowserOnly>
     </>
   );
 }
diff --git a/docs/typesense.config.json b/docs/typesense.config.json
index 7dccc1f3dc63..0e1e33a4e7c8 100644
--- a/docs/typesense.config.json
+++ b/docs/typesense.config.json
@@ -1,36 +1,57 @@
 {
   "index_name": "aztec-docs",
   "start_urls": [
-      "https://docs.aztec.network/"
-    ],
-    "sitemap_urls": [
-      "https://docs.aztec.network/sitemap.xml"
-    ],
-  "sitemap_alternate_links": true,
+    {
+      "url": "https://docs.aztec.network/aztec-nr-api/mainnet/",
+      "selectors_key": "api-nr",
+      "page_rank": 2,
+      "extra_attributes": {
+        "language": "en",
+        "docusaurus_tag": "default"
+      }
+    },
+    {
+      "url": "https://docs.aztec.network/",
+      "page_rank": 10
+    }
+  ],
+  "stop_urls": [
+    "https://docs.aztec.network/aztec-nr-api/mainnet/std/",
+    "https://docs.aztec.network/aztec-nr-api/mainnet/all.html",
+    "aztec-nr-api/.*/global\\.[^/]+\\.html$"
+  ],
   "selectors": {
-    "lvl0": {
-      "selector": "(//ul[contains(@class,'menu__list')]//a[contains(@class, 'menu__link menu__link--sublist menu__link--active')]/text() | //nav[contains(@class, 'navbar')]//a[contains(@class, 'navbar__link--active')]/text())[last()]",
-      "type": "xpath",
-      "global": true,
-      "default_value": "Documentation"
+    "default": {
+      "lvl0": {
+        "selector": "(//ul[contains(@class,'menu__list')]//a[contains(@class, 'menu__link menu__link--sublist menu__link--active')]/text() | //nav[contains(@class, 'navbar')]//a[contains(@class, 'navbar__link--active')]/text())[last()]",
+        "type": "xpath",
+        "global": true,
+        "default_value": "Documentation"
+      },
+      "lvl1": "header h1",
+      "lvl2": "header h2",
+      "lvl3": "header h3",
+      "lvl4": "header h4",
+      "lvl5": "header h5",
+      "lvl6": "header h6",
+      "text": "article p, article li, article td:last-child"
     },
-    "lvl1": "header h1",
-    "lvl2": "header h2",
-    "lvl3": "header h3",
-    "lvl4": "header h4",
-    "lvl5": "header h5",
-    "lvl6": "header h6",
-    "text": "article p, article li, article td:last-child"
+    "api-nr": {
+      "lvl0": {
+        "selector": "nav.sidebar h1 a",
+        "default_value": "Aztec.nr API Reference"
+      },
+      "lvl1": "main h1",
+      "lvl2": "main h2",
+      "lvl3": "main h3",
+      "lvl4": "main h4",
+      "text": "main .comments p, main .comments li, main .padded-description, main .item-description, main .struct-field, main li"
+    }
   },
   "strip_chars": " .,;:#",
   "custom_settings": {
     "separatorsToIndex": "_",
-    "attributesForFaceting": [
-      "language",
-      "version",
-      "type",
-      "docusaurus_tag"
-    ],
+    "attributesForFaceting": ["language", "version", "type", "docusaurus_tag"],
     "attributesToRetrieve": [
       "hierarchy",
       "content",
@@ -40,8 +61,6 @@
       "type"
     ]
   },
-  "conversation_id": [
-    "833762294"
-  ],
+  "conversation_id": ["833762294"],
   "nb_hits": 46250
-}
\ No newline at end of file
+}
diff --git a/docs/yarn.lock b/docs/yarn.lock
index bff395a7e6d6..bfe355745888 100644
--- a/docs/yarn.lock
+++ b/docs/yarn.lock
@@ -5,13 +5,6 @@ __metadata:
   version: 8
   cacheKey: 10c0
 
-"@adraffy/ens-normalize@npm:1.10.0":
-  version: 1.10.0
-  resolution: "@adraffy/ens-normalize@npm:1.10.0"
-  checksum: 10c0/78ae700847a2516d5a0ae12c4e23d09392a40c67e73b137eb7189f51afb1601c8d18784aeda2ed288a278997824dc924d1f398852c21d41ee2c4c564f2fb4d26
-  languageName: node
-  linkType: hard
-
 "@ai-sdk/gateway@npm:1.0.33":
   version: 1.0.33
   resolution: "@ai-sdk/gateway@npm:1.0.33"
@@ -353,7 +346,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/generator@npm:^7.14.5, @babel/generator@npm:^7.25.9, @babel/generator@npm:^7.26.0, @babel/generator@npm:^7.26.3":
+"@babel/generator@npm:^7.25.9, @babel/generator@npm:^7.26.0, @babel/generator@npm:^7.26.3":
   version: 7.28.3
   resolution: "@babel/generator@npm:7.28.3"
   dependencies:
@@ -1524,7 +1517,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.3, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.25.9, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7":
+"@babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.3, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.25.9, @babel/runtime@npm:^7.8.4":
   version: 7.28.3
   resolution: "@babel/runtime@npm:7.28.3"
   checksum: 10c0/b360f82c2c5114f2a062d4d143d7b4ec690094764853937110585a9497977aed66c102166d0e404766c274e02a50ffb8f6d77fef7251ecf3f607f0e03e6397bc
@@ -1557,7 +1550,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.14.5, @babel/types@npm:^7.20.7, @babel/types@npm:^7.21.3, @babel/types@npm:^7.25.9, @babel/types@npm:^7.26.0, @babel/types@npm:^7.26.3, @babel/types@npm:^7.28.2, @babel/types@npm:^7.28.4, @babel/types@npm:^7.4.4":
+"@babel/types@npm:^7.21.3, @babel/types@npm:^7.25.9, @babel/types@npm:^7.26.0, @babel/types@npm:^7.26.3, @babel/types@npm:^7.28.2, @babel/types@npm:^7.28.4, @babel/types@npm:^7.4.4":
   version: 7.28.4
   resolution: "@babel/types@npm:7.28.4"
   dependencies:
@@ -1700,90 +1693,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@cookbookdev/docsbot@npm:^4.25.15":
-  version: 4.25.15
-  resolution: "@cookbookdev/docsbot@npm:4.25.15"
-  dependencies:
-    "@cookbookdev/sonner": "npm:1.5.1"
-    "@floating-ui/devtools": "npm:^0.2.2"
-    "@floating-ui/react-dom": "npm:^2.1.2"
-    "@headlessui/react": "npm:^1.7.18"
-    "@headlessui/tailwindcss": "npm:^0.2.0"
-    "@lingui/detect-locale": "npm:^4.11.4"
-    "@lingui/macro": "npm:^4.11.4"
-    "@lingui/react": "npm:^4.11.4"
-    "@lingui/remote-loader": "npm:^3.11.0"
-    "@monaco-editor/react": "npm:^4.6.0"
-    "@radix-ui/react-avatar": "npm:^1.0.4"
-    "@radix-ui/react-checkbox": "npm:^1.0.4"
-    "@radix-ui/react-collapsible": "npm:^1.0.3"
-    "@radix-ui/react-dialog": "npm:^1.0.5"
-    "@radix-ui/react-dropdown-menu": "npm:^2.0.6"
-    "@radix-ui/react-hover-card": "npm:^1.0.7"
-    "@radix-ui/react-icons": "npm:^1.3.0"
-    "@radix-ui/react-label": "npm:^2.0.2"
-    "@radix-ui/react-popover": "npm:^1.0.7"
-    "@radix-ui/react-scroll-area": "npm:^1.0.5"
-    "@radix-ui/react-select": "npm:^2.0.0"
-    "@radix-ui/react-separator": "npm:^1.0.3"
-    "@radix-ui/react-slider": "npm:^1.1.2"
-    "@radix-ui/react-slot": "npm:^1.0.2"
-    "@radix-ui/react-tabs": "npm:^1.0.4"
-    "@radix-ui/react-toast": "npm:^1.1.5"
-    "@radix-ui/react-tooltip": "npm:^1.0.7"
-    "@shikijs/rehype": "npm:^1.12.1"
-    "@statsig/js-client": "npm:^3.1.0"
-    "@statsig/react-bindings": "npm:^3.1.0"
-    "@tailwindcss/line-clamp": "npm:^0.4.4"
-    "@tanstack/react-table": "npm:^8.11.7"
-    "@vercel/edge": "npm:^1.1.1"
-    bcp-47: "npm:^2.1.0"
-    can-dom-mutate: "npm:^2.0.9"
-    clsx: "npm:^2.1.0"
-    cmdk-react17: "npm:^1.0.0"
-    color2k: "npm:^2.0.3"
-    composed-offset-position: "npm:^0.0.6"
-    fflate: "npm:^0.8.2"
-    file-saver: "npm:^2.0.5"
-    framer-motion: "npm:^6.5.1"
-    idb: "npm:^8.0.0"
-    iso-639-1: "npm:^3.1.3"
-    jszip: "npm:^3.10.1"
-    nanoid: "npm:3.3.7"
-    posthog-js: "npm:^1.136.8"
-    prop-types: "npm:^15.8.1"
-    react-complex-tree: "npm:^2.3.7"
-    react-remark: "npm:^2.1.0"
-    react-resizable-panels: "npm:2.0.19"
-    recharts: "npm:^2.12.4"
-    rehype-react: "npm:^8.0.0"
-    remark-gfm: "npm:^4.0.0"
-    remark-parse: "npm:^11.0.0"
-    remark-rehype: "npm:^11.1.0"
-    solc: "npm:^0.8.25"
-    styled-components: "npm:^6.1.8"
-    swr: "npm:^2.2.5"
-    tailwind-merge: "npm:^2.2.1"
-    tailwindcss-animate: "npm:^1.0.7"
-    use-sync-external-store: "npm:^1.2.0"
-    viem: "npm:2.9.16"
-  peerDependencies:
-    react: ^16.8 || ^17.0 || ^18.0 || ^19.0
-    react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0
-  checksum: 10c0/2103f423daf3db1cb39deaf1fa2f7cb97bf90a95c2a3698a9dff28e881f0a38b1fc8d96b038f101b6b1982cf91c4945b2e3e6da639d1c688f4c7c95603bacdc6
-  languageName: node
-  linkType: hard
-
-"@cookbookdev/sonner@npm:1.5.1":
-  version: 1.5.1
-  resolution: "@cookbookdev/sonner@npm:1.5.1"
-  peerDependencies:
-    react: ^18.0.0
-    react-dom: ^18.0.0
-  checksum: 10c0/271ee9091b73f3a871d58477b73b8c839c84ec77e9154d68de0b07fa54f8e4b82e7f16220c502631ee7a9bc2c9081c3c6a60b97225a4cfdc029ca548357fb044
-  languageName: node
-  linkType: hard
-
 "@cspell/cspell-bundled-dicts@npm:8.19.4":
   version: 8.19.4
   resolution: "@cspell/cspell-bundled-dicts@npm:8.19.4"
@@ -3947,45 +3856,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@emotion/is-prop-valid@npm:1.2.2":
-  version: 1.2.2
-  resolution: "@emotion/is-prop-valid@npm:1.2.2"
-  dependencies:
-    "@emotion/memoize": "npm:^0.8.1"
-  checksum: 10c0/bb1530dcb4e0e5a4fabb219279f2d0bc35796baf66f6241f98b0d03db1985c890a8cafbea268e0edefd5eeda143dbd5c09a54b5fba74cee8c69b98b13194af50
-  languageName: node
-  linkType: hard
-
-"@emotion/is-prop-valid@npm:^0.8.2":
-  version: 0.8.8
-  resolution: "@emotion/is-prop-valid@npm:0.8.8"
-  dependencies:
-    "@emotion/memoize": "npm:0.7.4"
-  checksum: 10c0/f6be625f067c7fa56a12a4edaf090715616dc4fc7803c87212831f38c969350107b9709b1be54100e53153b18d9fa068eb4bf4f9ac66a37a8edf1bac9b64e279
-  languageName: node
-  linkType: hard
-
-"@emotion/memoize@npm:0.7.4":
-  version: 0.7.4
-  resolution: "@emotion/memoize@npm:0.7.4"
-  checksum: 10c0/b2376548fc147b43afd1ff005a80a1a025bd7eb4fb759fdb23e96e5ff290ee8ba16628a332848d600fb91c3cdc319eee5395fa33d8875e5d5a8c4ce18cddc18e
-  languageName: node
-  linkType: hard
-
-"@emotion/memoize@npm:^0.8.1":
-  version: 0.8.1
-  resolution: "@emotion/memoize@npm:0.8.1"
-  checksum: 10c0/dffed372fc3b9fa2ba411e76af22b6bb686fb0cb07694fdfaa6dd2baeb0d5e4968c1a7caa472bfcf06a5997d5e7c7d16b90e993f9a6ffae79a2c3dbdc76dfe78
-  languageName: node
-  linkType: hard
-
-"@emotion/unitless@npm:0.8.1":
-  version: 0.8.1
-  resolution: "@emotion/unitless@npm:0.8.1"
-  checksum: 10c0/a1ed508628288f40bfe6dd17d431ed899c067a899fa293a13afe3aed1d70fac0412b8a215fafab0b42829360db687fecd763e5f01a64ddc4a4b58ec3112ff548
-  languageName: node
-  linkType: hard
-
 "@envelop/instrumentation@npm:^1.0.0":
   version: 1.0.0
   resolution: "@envelop/instrumentation@npm:1.0.0"
@@ -4314,53 +4184,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@floating-ui/core@npm:^1.7.3":
-  version: 1.7.3
-  resolution: "@floating-ui/core@npm:1.7.3"
-  dependencies:
-    "@floating-ui/utils": "npm:^0.2.10"
-  checksum: 10c0/edfc23800122d81df0df0fb780b7328ae6c5f00efbb55bd48ea340f4af8c5b3b121ceb4bb81220966ab0f87b443204d37105abdd93d94846468be3243984144c
-  languageName: node
-  linkType: hard
-
-"@floating-ui/devtools@npm:^0.2.2":
-  version: 0.2.3
-  resolution: "@floating-ui/devtools@npm:0.2.3"
-  peerDependencies:
-    "@floating-ui/dom": ^1.0.0
-  checksum: 10c0/f4e1c830e1806ac4d20e02d3bc06255c24858a52c1b96516fc2d145c0ab8f016910667246be2b14bc63dab8e9c12bea46bc4757bf0c24416c612541f5822f7e5
-  languageName: node
-  linkType: hard
-
-"@floating-ui/dom@npm:^1.7.4":
-  version: 1.7.4
-  resolution: "@floating-ui/dom@npm:1.7.4"
-  dependencies:
-    "@floating-ui/core": "npm:^1.7.3"
-    "@floating-ui/utils": "npm:^0.2.10"
-  checksum: 10c0/da6166c25f9b0729caa9f498685a73a0e28251613b35d27db8de8014bc9d045158a23c092b405321a3d67c2064909b6e2a7e6c1c9cc0f62967dca5779f5aef30
-  languageName: node
-  linkType: hard
-
-"@floating-ui/react-dom@npm:^2.0.0, @floating-ui/react-dom@npm:^2.1.2":
-  version: 2.1.6
-  resolution: "@floating-ui/react-dom@npm:2.1.6"
-  dependencies:
-    "@floating-ui/dom": "npm:^1.7.4"
-  peerDependencies:
-    react: ">=16.8.0"
-    react-dom: ">=16.8.0"
-  checksum: 10c0/6654834a8e73ecbdbc6cad2ad8f7abc698ac7c1800ded4d61113525c591c03d2e3b59d3cf9205859221465ea38c87af4f9e6e204703c5b7a7e85332d1eef2e18
-  languageName: node
-  linkType: hard
-
-"@floating-ui/utils@npm:^0.2.10":
-  version: 0.2.10
-  resolution: "@floating-ui/utils@npm:0.2.10"
-  checksum: 10c0/e9bc2a1730ede1ee25843937e911ab6e846a733a4488623cd353f94721b05ec2c9ec6437613a2ac9379a94c2fd40c797a2ba6fa1df2716f5ce4aa6ddb1cf9ea4
-  languageName: node
-  linkType: hard
-
 "@gar/promise-retry@npm:^1.0.0":
   version: 1.0.2
   resolution: "@gar/promise-retry@npm:1.0.2"
@@ -4397,28 +4220,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@headlessui/react@npm:^1.7.18":
-  version: 1.7.19
-  resolution: "@headlessui/react@npm:1.7.19"
-  dependencies:
-    "@tanstack/react-virtual": "npm:^3.0.0-beta.60"
-    client-only: "npm:^0.0.1"
-  peerDependencies:
-    react: ^16 || ^17 || ^18
-    react-dom: ^16 || ^17 || ^18
-  checksum: 10c0/c0ece0db6ca15092439177a5322de50b60fa5fd90354ae0f999b3e56abab0065ed54fa7b4b69994ec1bdc23adc6ae9919d7dd57f97922d0b9bb6515d27e3a7e5
-  languageName: node
-  linkType: hard
-
-"@headlessui/tailwindcss@npm:^0.2.0":
-  version: 0.2.1
-  resolution: "@headlessui/tailwindcss@npm:0.2.1"
-  peerDependencies:
-    tailwindcss: ^3.0
-  checksum: 10c0/b5d4b840e621ea6b0978bb17e95c5ff6706274d1d49ecc7783ece28ff18b67104b427263dbf52deee74d94ed17bd912a8c9c3546a6982c9229374f26823f2877
-  languageName: node
-  linkType: hard
-
 "@humanwhocodes/config-array@npm:^0.13.0":
   version: 0.13.0
   resolution: "@humanwhocodes/config-array@npm:0.13.0"
@@ -4886,89 +4687,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@lingui/conf@npm:4.14.1":
-  version: 4.14.1
-  resolution: "@lingui/conf@npm:4.14.1"
-  dependencies:
-    "@babel/runtime": "npm:^7.20.13"
-    chalk: "npm:^4.1.0"
-    cosmiconfig: "npm:^8.0.0"
-    jest-validate: "npm:^29.4.3"
-    jiti: "npm:^1.17.1"
-    lodash.get: "npm:^4.4.2"
-  checksum: 10c0/b5818c34e1009b0f59f9cd662729127083dfad697a558de4aa10c1f99fafce6f7824a61da609517198a37f359631c030d0f9cc74be5c43b2b5c6faaa7b26c926
-  languageName: node
-  linkType: hard
-
-"@lingui/core@npm:4.14.1":
-  version: 4.14.1
-  resolution: "@lingui/core@npm:4.14.1"
-  dependencies:
-    "@babel/runtime": "npm:^7.20.13"
-    "@lingui/message-utils": "npm:4.14.1"
-    unraw: "npm:^3.0.0"
-  checksum: 10c0/9e8551ba1376eccc45c5e57740a22517263cd8dc26584ee02cb94e747d7875c5cc94582cae598d75c07dc0feb1b40f899b044723cd3bda8a50c2216488347f5c
-  languageName: node
-  linkType: hard
-
-"@lingui/detect-locale@npm:^4.11.4":
-  version: 4.14.1
-  resolution: "@lingui/detect-locale@npm:4.14.1"
-  checksum: 10c0/103c71fad2baf1f87cf5b094b51c6ad23af55fcc42d7c73e7241d57313684d778df0626231ae47701b60eb7201578e7e8a5057001cecb912ebf11025fdf9aa44
-  languageName: node
-  linkType: hard
-
-"@lingui/macro@npm:^4.11.4":
-  version: 4.14.1
-  resolution: "@lingui/macro@npm:4.14.1"
-  dependencies:
-    "@babel/runtime": "npm:^7.20.13"
-    "@babel/types": "npm:^7.20.7"
-    "@lingui/conf": "npm:4.14.1"
-    "@lingui/core": "npm:4.14.1"
-    "@lingui/message-utils": "npm:4.14.1"
-  peerDependencies:
-    "@lingui/react": ^4.0.0
-    babel-plugin-macros: 2 || 3
-  checksum: 10c0/c9b44a7983155d3adfc068aca7aa9f30c15b214f563cf7a4411b8180ebbae7bca364fe97d39bdf0bfd90e106c3a11f9f83fb212272838c08f89b83273966634b
-  languageName: node
-  linkType: hard
-
-"@lingui/message-utils@npm:4.14.1":
-  version: 4.14.1
-  resolution: "@lingui/message-utils@npm:4.14.1"
-  dependencies:
-    "@messageformat/parser": "npm:^5.0.0"
-    js-sha256: "npm:^0.10.1"
-  checksum: 10c0/9e437b677996bc3b04e922b244d11955fbcd4fc850b3fe1c46a5563a8b524b20e0daf22430b7d20a4e876cb8620d50c573ea20b5a1b2b90850d98b0c40d98d90
-  languageName: node
-  linkType: hard
-
-"@lingui/react@npm:^4.11.4":
-  version: 4.14.1
-  resolution: "@lingui/react@npm:4.14.1"
-  dependencies:
-    "@babel/runtime": "npm:^7.20.13"
-    "@lingui/core": "npm:4.14.1"
-  peerDependencies:
-    react: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 10c0/4c2299dc1fef6054ceafd7b5f9661177d1bb7d752a2b655887572865721a13160d3664526ee258ad6a1f5f2be339172323cdb3c8459b76a6f2efa727e14ba1b7
-  languageName: node
-  linkType: hard
-
-"@lingui/remote-loader@npm:^3.11.0":
-  version: 3.11.0
-  resolution: "@lingui/remote-loader@npm:3.11.0"
-  dependencies:
-    "@babel/generator": "npm:^7.14.5"
-    "@babel/types": "npm:^7.14.5"
-    json5: "npm:^2.2.0"
-    messageformat-parser: "npm:^4.1.3"
-    ramda: "npm:^0.27.1"
-  checksum: 10c0/167099e520787951de674740de05d91f22543e459bc72f4d2dd6bb093f081416b731b4d6d88dd9a1bd8c71e2f21a8c406944161e7cb65f6b5c69c37215b32944
-  languageName: node
-  linkType: hard
-
 "@lukeed/ms@npm:^2.0.2":
   version: 2.0.2
   resolution: "@lukeed/ms@npm:2.0.2"
@@ -4976,15 +4694,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@mapbox/hast-util-table-cell-style@npm:^0.2.0":
-  version: 0.2.1
-  resolution: "@mapbox/hast-util-table-cell-style@npm:0.2.1"
-  dependencies:
-    unist-util-visit: "npm:^1.4.1"
-  checksum: 10c0/9a73cdfbfe75b15b5a8c4ca619f6ef768735ac8a25c279c957ced34ddac48099b2d5e2d1d9dac30bcf35355234ba155d665c85b3c03e129cba4f745d2e280c6d
-  languageName: node
-  linkType: hard
-
 "@mapbox/node-pre-gyp@npm:^2.0.0":
   version: 2.0.0
   resolution: "@mapbox/node-pre-gyp@npm:2.0.0"
@@ -5054,104 +4763,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@messageformat/parser@npm:^5.0.0":
-  version: 5.1.1
-  resolution: "@messageformat/parser@npm:5.1.1"
-  dependencies:
-    moo: "npm:^0.5.1"
-  checksum: 10c0/fc24596d85a20fa9959a0a1c34f9bfd341e4f6eb235d0648e54296e0bed2ebe91d067c7b91036aea8cc2e4af4ddb0722257b0c04f3c610cd9c7ef4f7659d8668
-  languageName: node
-  linkType: hard
-
-"@monaco-editor/loader@npm:^1.4.0":
-  version: 1.4.0
-  resolution: "@monaco-editor/loader@npm:1.4.0"
-  dependencies:
-    state-local: "npm:^1.0.6"
-  peerDependencies:
-    monaco-editor: ">= 0.21.0 < 1"
-  checksum: 10c0/68938350adf2f42363a801d87f5d00c87d397d4cba7041141af10a9216bd35c85209b4723a26d56cb32e68eef61471deda2a450f8892891118fbdce7fa1d987d
-  languageName: node
-  linkType: hard
-
-"@monaco-editor/react@npm:^4.6.0":
-  version: 4.6.0
-  resolution: "@monaco-editor/react@npm:4.6.0"
-  dependencies:
-    "@monaco-editor/loader": "npm:^1.4.0"
-  peerDependencies:
-    monaco-editor: ">= 0.25.0 < 1"
-    react: ^16.8.0 || ^17.0.0 || ^18.0.0
-    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 10c0/231e9a9b66a530db326f6732de0ebffcce6b79dcfaf4948923d78b9a3d5e2a04b7a06e1f85bbbca45a5ae15c107a124e4c5c46cabadc20a498fb5f2d05f7f379
-  languageName: node
-  linkType: hard
-
-"@motionone/animation@npm:^10.12.0":
-  version: 10.18.0
-  resolution: "@motionone/animation@npm:10.18.0"
-  dependencies:
-    "@motionone/easing": "npm:^10.18.0"
-    "@motionone/types": "npm:^10.17.1"
-    "@motionone/utils": "npm:^10.18.0"
-    tslib: "npm:^2.3.1"
-  checksum: 10c0/83c01ab8ecf5fae221e5012116c4c49d4473ba88ba22197e1d8c1e39364c5c6b9c5271e57ae716fd21f92314d15c63788c48d0a30872ee8d72337e1d98b46834
-  languageName: node
-  linkType: hard
-
-"@motionone/dom@npm:10.12.0":
-  version: 10.12.0
-  resolution: "@motionone/dom@npm:10.12.0"
-  dependencies:
-    "@motionone/animation": "npm:^10.12.0"
-    "@motionone/generators": "npm:^10.12.0"
-    "@motionone/types": "npm:^10.12.0"
-    "@motionone/utils": "npm:^10.12.0"
-    hey-listen: "npm:^1.0.8"
-    tslib: "npm:^2.3.1"
-  checksum: 10c0/1af6cd8d8518ebbd90d74f15443ad94d7d03bf9e7e1455a5cb6768a53ba8dac6906ca121e9c1f42b8d53a8ab7c19d14e4731c10231b5dc7102628f32659faea2
-  languageName: node
-  linkType: hard
-
-"@motionone/easing@npm:^10.18.0":
-  version: 10.18.0
-  resolution: "@motionone/easing@npm:10.18.0"
-  dependencies:
-    "@motionone/utils": "npm:^10.18.0"
-    tslib: "npm:^2.3.1"
-  checksum: 10c0/0adf9b7086b0f569d28886890cc0725a489285f2debfcaf27c1c15dfef5736c9f4207cfda14c71b3275f8163777320cb7ff48ad263c7f4ccd31e12a5afc1a952
-  languageName: node
-  linkType: hard
-
-"@motionone/generators@npm:^10.12.0":
-  version: 10.18.0
-  resolution: "@motionone/generators@npm:10.18.0"
-  dependencies:
-    "@motionone/types": "npm:^10.17.1"
-    "@motionone/utils": "npm:^10.18.0"
-    tslib: "npm:^2.3.1"
-  checksum: 10c0/7ed7dda5ac58cd3e8dd347b5539d242d96e02ee16fef921c8d14295a806e6bc429a15291461ec078977bd5f6162677225addd707ca79f808e65bc3599c45c0e9
-  languageName: node
-  linkType: hard
-
-"@motionone/types@npm:^10.12.0, @motionone/types@npm:^10.17.1":
-  version: 10.17.1
-  resolution: "@motionone/types@npm:10.17.1"
-  checksum: 10c0/f7b16cd4f0feda0beac10173afa6de7384722f9f24767f78b7aa90f15b8a89d584073a64387b015a8e015a962fa4b47a8ce23621f47708a08676b12bb0d43bbb
-  languageName: node
-  linkType: hard
-
-"@motionone/utils@npm:^10.12.0, @motionone/utils@npm:^10.18.0":
-  version: 10.18.0
-  resolution: "@motionone/utils@npm:10.18.0"
-  dependencies:
-    "@motionone/types": "npm:^10.17.1"
-    hey-listen: "npm:^1.0.8"
-    tslib: "npm:^2.3.1"
-  checksum: 10c0/db57dbb6a131fab36dc1eb4e1f3a4575ca97563221663adce54c138de1e1a9eaf4a4a51ddf99fdab0341112159e0190b35cdeddfdbd08ba3ad1e35886a5324bb
-  languageName: node
-  linkType: hard
-
 "@netlify/ai@npm:0.3.8, @netlify/ai@npm:^0.3.8":
   version: 0.3.8
   resolution: "@netlify/ai@npm:0.3.8"
@@ -5989,29 +5600,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@noble/curves@npm:1.2.0, @noble/curves@npm:~1.2.0":
-  version: 1.2.0
-  resolution: "@noble/curves@npm:1.2.0"
-  dependencies:
-    "@noble/hashes": "npm:1.3.2"
-  checksum: 10c0/0bac7d1bbfb3c2286910b02598addd33243cb97c3f36f987ecc927a4be8d7d88e0fcb12b0f0ef8a044e7307d1844dd5c49bb724bfa0a79c8ec50ba60768c97f6
-  languageName: node
-  linkType: hard
-
-"@noble/hashes@npm:1.3.2":
-  version: 1.3.2
-  resolution: "@noble/hashes@npm:1.3.2"
-  checksum: 10c0/2482cce3bce6a596626f94ca296e21378e7a5d4c09597cbc46e65ffacc3d64c8df73111f2265444e36a3168208628258bbbaccba2ef24f65f58b2417638a20e7
-  languageName: node
-  linkType: hard
-
-"@noble/hashes@npm:~1.3.0, @noble/hashes@npm:~1.3.2":
-  version: 1.3.3
-  resolution: "@noble/hashes@npm:1.3.3"
-  checksum: 10c0/23c020b33da4172c988e44100e33cd9f8f6250b68b43c467d3551f82070ebd9716e0d9d2347427aa3774c85934a35fa9ee6f026fca2117e3fa12db7bedae7668
-  languageName: node
-  linkType: hard
-
 "@nodelib/fs.scandir@npm:2.1.5":
   version: 2.1.5
   resolution: "@nodelib/fs.scandir@npm:2.1.5"
@@ -6533,1300 +6121,77 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@radix-ui/number@npm:1.1.0":
-  version: 1.1.0
-  resolution: "@radix-ui/number@npm:1.1.0"
-  checksum: 10c0/a48e34d5ff1484de1b7cf5d7317fefc831d49e96a2229f300fd37b657bd8cfb59c922830c00ec02838ab21de3b299a523474592e4f30882153412ed47edce6a4
-  languageName: node
-  linkType: hard
-
-"@radix-ui/primitive@npm:1.0.1":
-  version: 1.0.1
-  resolution: "@radix-ui/primitive@npm:1.0.1"
+"@rollup/pluginutils@npm:^5.1.3":
+  version: 5.2.0
+  resolution: "@rollup/pluginutils@npm:5.2.0"
   dependencies:
-    "@babel/runtime": "npm:^7.13.10"
-  checksum: 10c0/912216455537db3ca77f3e7f70174fb2b454fbd4a37a0acb7cfadad9ab6131abdfb787472242574460a3c301edf45738340cc84f6717982710082840fde7d916
+    "@types/estree": "npm:^1.0.0"
+    estree-walker: "npm:^2.0.2"
+    picomatch: "npm:^4.0.2"
+  peerDependencies:
+    rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
+  peerDependenciesMeta:
+    rollup:
+      optional: true
+  checksum: 10c0/794890d512751451bcc06aa112366ef47ea8f9125dac49b1abf72ff8b079518b09359de9c60a013b33266541634e765ae61839c749fae0edb59a463418665c55
   languageName: node
   linkType: hard
 
-"@radix-ui/primitive@npm:1.1.0":
-  version: 1.1.0
-  resolution: "@radix-ui/primitive@npm:1.1.0"
-  checksum: 10c0/1dcc8b5401799416ff8bdb15c7189b4536c193220ad8fd348a48b88f804ee38cec7bd03e2b9641f7da24610e2f61f23a306911ce883af92c4e8c1abac634cb61
+"@sec-ant/readable-stream@npm:^0.4.1":
+  version: 0.4.1
+  resolution: "@sec-ant/readable-stream@npm:0.4.1"
+  checksum: 10c0/64e9e9cf161e848067a5bf60cdc04d18495dc28bb63a8d9f8993e4dd99b91ad34e4b563c85de17d91ffb177ec17a0664991d2e115f6543e73236a906068987af
   languageName: node
   linkType: hard
 
-"@radix-ui/react-arrow@npm:1.1.0":
-  version: 1.1.0
-  resolution: "@radix-ui/react-arrow@npm:1.1.0"
+"@sideway/address@npm:^4.1.5":
+  version: 4.1.5
+  resolution: "@sideway/address@npm:4.1.5"
   dependencies:
-    "@radix-ui/react-primitive": "npm:2.0.0"
-  peerDependencies:
-    "@types/react": "*"
-    "@types/react-dom": "*"
-    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-    "@types/react-dom":
-      optional: true
-  checksum: 10c0/cbe059dfa5a9c1677478d363bb5fd75b0c7a08221d0ac7f8e7b9aec9dbae9754f6a3518218cf63e4ed53df6c36d193c8d2618d03433a37aa0cb7ee77a60a591f
+    "@hapi/hoek": "npm:^9.0.0"
+  checksum: 10c0/638eb6f7e7dba209053dd6c8da74d7cc995e2b791b97644d0303a7dd3119263bcb7225a4f6804d4db2bc4f96e5a9d262975a014f58eae4d1753c27cbc96ef959
   languageName: node
   linkType: hard
 
-"@radix-ui/react-avatar@npm:^1.0.4":
-  version: 1.1.0
-  resolution: "@radix-ui/react-avatar@npm:1.1.0"
-  dependencies:
-    "@radix-ui/react-context": "npm:1.1.0"
-    "@radix-ui/react-primitive": "npm:2.0.0"
-    "@radix-ui/react-use-callback-ref": "npm:1.1.0"
-    "@radix-ui/react-use-layout-effect": "npm:1.1.0"
-  peerDependencies:
-    "@types/react": "*"
-    "@types/react-dom": "*"
-    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-    "@types/react-dom":
-      optional: true
-  checksum: 10c0/6358ae171c886aa66a4b381d847ef8c84b7020adceaea8676f4f434e5229ff06a13022ff611557f548dd4e8739eadf1b0d22111ae3d47e08b5dd1005edcf76a5
+"@sideway/formula@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "@sideway/formula@npm:3.0.1"
+  checksum: 10c0/3fe81fa9662efc076bf41612b060eb9b02e846ea4bea5bd114f1662b7f1541e9dedcf98aff0d24400bcb92f113964a50e0290b86e284edbdf6346fa9b7e2bf2c
   languageName: node
   linkType: hard
 
-"@radix-ui/react-checkbox@npm:^1.0.4":
-  version: 1.1.1
-  resolution: "@radix-ui/react-checkbox@npm:1.1.1"
-  dependencies:
-    "@radix-ui/primitive": "npm:1.1.0"
-    "@radix-ui/react-compose-refs": "npm:1.1.0"
-    "@radix-ui/react-context": "npm:1.1.0"
-    "@radix-ui/react-presence": "npm:1.1.0"
-    "@radix-ui/react-primitive": "npm:2.0.0"
-    "@radix-ui/react-use-controllable-state": "npm:1.1.0"
-    "@radix-ui/react-use-previous": "npm:1.1.0"
-    "@radix-ui/react-use-size": "npm:1.1.0"
-  peerDependencies:
-    "@types/react": "*"
-    "@types/react-dom": "*"
-    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-    "@types/react-dom":
-      optional: true
-  checksum: 10c0/2d7d35b8319298166905057e9f7fb1d4b51d73bdec6c7c2127d2266e0f053c39586e316ea0da9a24612dfa86b8fc1f5160d4c37f79ae567025b62616de95c2c7
+"@sideway/pinpoint@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@sideway/pinpoint@npm:2.0.0"
+  checksum: 10c0/d2ca75dacaf69b8fc0bb8916a204e01def3105ee44d8be16c355e5f58189eb94039e15ce831f3d544f229889ccfa35562a0ce2516179f3a7ee1bbe0b71e55b36
   languageName: node
   linkType: hard
 
-"@radix-ui/react-collapsible@npm:^1.0.3":
-  version: 1.1.0
-  resolution: "@radix-ui/react-collapsible@npm:1.1.0"
-  dependencies:
-    "@radix-ui/primitive": "npm:1.1.0"
-    "@radix-ui/react-compose-refs": "npm:1.1.0"
-    "@radix-ui/react-context": "npm:1.1.0"
-    "@radix-ui/react-id": "npm:1.1.0"
-    "@radix-ui/react-presence": "npm:1.1.0"
-    "@radix-ui/react-primitive": "npm:2.0.0"
-    "@radix-ui/react-use-controllable-state": "npm:1.1.0"
-    "@radix-ui/react-use-layout-effect": "npm:1.1.0"
-  peerDependencies:
-    "@types/react": "*"
-    "@types/react-dom": "*"
-    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-    "@types/react-dom":
-      optional: true
-  checksum: 10c0/07d6d0be153d0c56d533e820005caa13a8305ba34b55af74180180113074979bcfd1d7414ba2533272deb659275c0c38eb48004338fd542fdcbd1962925f199f
+"@sinclair/typebox@npm:^0.27.8":
+  version: 0.27.8
+  resolution: "@sinclair/typebox@npm:0.27.8"
+  checksum: 10c0/ef6351ae073c45c2ac89494dbb3e1f87cc60a93ce4cde797b782812b6f97da0d620ae81973f104b43c9b7eaa789ad20ba4f6a1359f1cc62f63729a55a7d22d4e
   languageName: node
   linkType: hard
 
-"@radix-ui/react-collection@npm:1.1.0":
-  version: 1.1.0
-  resolution: "@radix-ui/react-collection@npm:1.1.0"
-  dependencies:
-    "@radix-ui/react-compose-refs": "npm:1.1.0"
-    "@radix-ui/react-context": "npm:1.1.0"
-    "@radix-ui/react-primitive": "npm:2.0.0"
-    "@radix-ui/react-slot": "npm:1.1.0"
-  peerDependencies:
-    "@types/react": "*"
-    "@types/react-dom": "*"
-    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-    "@types/react-dom":
-      optional: true
-  checksum: 10c0/fecb9f0871c827070a8794b39c7379fdc7d0855c4b05804f0b395eef39c37b2c2b6779865d6cb35d3bc74b6b380107bd8b3754d1730a34ea88913e6cd0eb84d4
+"@sindresorhus/is@npm:^4.6.0":
+  version: 4.6.0
+  resolution: "@sindresorhus/is@npm:4.6.0"
+  checksum: 10c0/33b6fb1d0834ec8dd7689ddc0e2781c2bfd8b9c4e4bacbcb14111e0ae00621f2c264b8a7d36541799d74888b5dccdf422a891a5cb5a709ace26325eedc81e22e
   languageName: node
   linkType: hard
 
-"@radix-ui/react-compose-refs@npm:1.0.1":
-  version: 1.0.1
-  resolution: "@radix-ui/react-compose-refs@npm:1.0.1"
-  dependencies:
-    "@babel/runtime": "npm:^7.13.10"
-  peerDependencies:
-    "@types/react": "*"
-    react: ^16.8 || ^17.0 || ^18.0
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-  checksum: 10c0/be06f8dab35b5a1bffa7a5982fb26218ddade1acb751288333e3b89d7b4a7dfb5a6371be83876dac0ec2ebe0866d295e8618b778608e1965342986ea448040ec
+"@sindresorhus/is@npm:^5.2.0":
+  version: 5.6.0
+  resolution: "@sindresorhus/is@npm:5.6.0"
+  checksum: 10c0/66727344d0c92edde5760b5fd1f8092b717f2298a162a5f7f29e4953e001479927402d9d387e245fb9dc7d3b37c72e335e93ed5875edfc5203c53be8ecba1b52
   languageName: node
   linkType: hard
 
-"@radix-ui/react-compose-refs@npm:1.1.0":
-  version: 1.1.0
-  resolution: "@radix-ui/react-compose-refs@npm:1.1.0"
-  peerDependencies:
-    "@types/react": "*"
-    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-  checksum: 10c0/7e18706084397d9458ca3473d8565b10691da06f6499a78edbcc4bd72cde08f62e91120658d17d58c19fc39d6b1dffe0133cc4535c8f5fce470abd478f6107e5
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-context@npm:1.0.1":
-  version: 1.0.1
-  resolution: "@radix-ui/react-context@npm:1.0.1"
-  dependencies:
-    "@babel/runtime": "npm:^7.13.10"
-  peerDependencies:
-    "@types/react": "*"
-    react: ^16.8 || ^17.0 || ^18.0
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-  checksum: 10c0/3de5761b32cc70cd61715527f29d8c699c01ab28c195ced972ccbc7025763a373a68f18c9f948c7a7b922e469fd2df7fee5f7536e3f7bad44ffc06d959359333
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-context@npm:1.1.0":
-  version: 1.1.0
-  resolution: "@radix-ui/react-context@npm:1.1.0"
-  peerDependencies:
-    "@types/react": "*"
-    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-  checksum: 10c0/c843980f568cc61b512708863ec84c42a02e0f88359b22ad1c0e290cea3e6d7618eccbd2cd37bd974fadaa7636cbed5bda27553722e61197eb53852eaa34f1bb
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-dialog@npm:1.0.5":
-  version: 1.0.5
-  resolution: "@radix-ui/react-dialog@npm:1.0.5"
-  dependencies:
-    "@babel/runtime": "npm:^7.13.10"
-    "@radix-ui/primitive": "npm:1.0.1"
-    "@radix-ui/react-compose-refs": "npm:1.0.1"
-    "@radix-ui/react-context": "npm:1.0.1"
-    "@radix-ui/react-dismissable-layer": "npm:1.0.5"
-    "@radix-ui/react-focus-guards": "npm:1.0.1"
-    "@radix-ui/react-focus-scope": "npm:1.0.4"
-    "@radix-ui/react-id": "npm:1.0.1"
-    "@radix-ui/react-portal": "npm:1.0.4"
-    "@radix-ui/react-presence": "npm:1.0.1"
-    "@radix-ui/react-primitive": "npm:1.0.3"
-    "@radix-ui/react-slot": "npm:1.0.2"
-    "@radix-ui/react-use-controllable-state": "npm:1.0.1"
-    aria-hidden: "npm:^1.1.1"
-    react-remove-scroll: "npm:2.5.5"
-  peerDependencies:
-    "@types/react": "*"
-    "@types/react-dom": "*"
-    react: ^16.8 || ^17.0 || ^18.0
-    react-dom: ^16.8 || ^17.0 || ^18.0
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-    "@types/react-dom":
-      optional: true
-  checksum: 10c0/c5b3069397379e79857a3203f3ead4d12d87736b59899f02a63e620a07dd1e6704e15523926cdf8e39afe1c945a7ff0f2533c5ea5be1e17c3114820300a51133
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-dialog@npm:^1.0.5":
-  version: 1.1.1
-  resolution: "@radix-ui/react-dialog@npm:1.1.1"
-  dependencies:
-    "@radix-ui/primitive": "npm:1.1.0"
-    "@radix-ui/react-compose-refs": "npm:1.1.0"
-    "@radix-ui/react-context": "npm:1.1.0"
-    "@radix-ui/react-dismissable-layer": "npm:1.1.0"
-    "@radix-ui/react-focus-guards": "npm:1.1.0"
-    "@radix-ui/react-focus-scope": "npm:1.1.0"
-    "@radix-ui/react-id": "npm:1.1.0"
-    "@radix-ui/react-portal": "npm:1.1.1"
-    "@radix-ui/react-presence": "npm:1.1.0"
-    "@radix-ui/react-primitive": "npm:2.0.0"
-    "@radix-ui/react-slot": "npm:1.1.0"
-    "@radix-ui/react-use-controllable-state": "npm:1.1.0"
-    aria-hidden: "npm:^1.1.1"
-    react-remove-scroll: "npm:2.5.7"
-  peerDependencies:
-    "@types/react": "*"
-    "@types/react-dom": "*"
-    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-    "@types/react-dom":
-      optional: true
-  checksum: 10c0/a21e318e8d45bed22067880f66beb4ea91118a6c0d43aa20de495c0373b53c12dfe28f58196d5b33300573a5e24e064ec53648a576f02366fb5a297d887b0860
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-direction@npm:1.1.0":
-  version: 1.1.0
-  resolution: "@radix-ui/react-direction@npm:1.1.0"
-  peerDependencies:
-    "@types/react": "*"
-    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-  checksum: 10c0/eb07d8cc3ae2388b824e0a11ae0e3b71fb0c49972b506e249cec9f27a5b7ef4305ee668c98b674833c92e842163549a83beb0a197dec1ec65774bdeeb61f932c
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-dismissable-layer@npm:1.0.5":
-  version: 1.0.5
-  resolution: "@radix-ui/react-dismissable-layer@npm:1.0.5"
-  dependencies:
-    "@babel/runtime": "npm:^7.13.10"
-    "@radix-ui/primitive": "npm:1.0.1"
-    "@radix-ui/react-compose-refs": "npm:1.0.1"
-    "@radix-ui/react-primitive": "npm:1.0.3"
-    "@radix-ui/react-use-callback-ref": "npm:1.0.1"
-    "@radix-ui/react-use-escape-keydown": "npm:1.0.3"
-  peerDependencies:
-    "@types/react": "*"
-    "@types/react-dom": "*"
-    react: ^16.8 || ^17.0 || ^18.0
-    react-dom: ^16.8 || ^17.0 || ^18.0
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-    "@types/react-dom":
-      optional: true
-  checksum: 10c0/7e4308867aecfb07b506330c1964d94a52247ab9453725613cd326762aa13e483423c250f107219c131b0449600eb8d1576ce3159c2b96e8c978f75e46062cb2
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-dismissable-layer@npm:1.1.0":
-  version: 1.1.0
-  resolution: "@radix-ui/react-dismissable-layer@npm:1.1.0"
-  dependencies:
-    "@radix-ui/primitive": "npm:1.1.0"
-    "@radix-ui/react-compose-refs": "npm:1.1.0"
-    "@radix-ui/react-primitive": "npm:2.0.0"
-    "@radix-ui/react-use-callback-ref": "npm:1.1.0"
-    "@radix-ui/react-use-escape-keydown": "npm:1.1.0"
-  peerDependencies:
-    "@types/react": "*"
-    "@types/react-dom": "*"
-    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-    "@types/react-dom":
-      optional: true
-  checksum: 10c0/72967068ab02127b668ecfd0a1863149e2a42d9fd12d3247f51422a41f3d5faa82a147a5b0a8a6ec609eff8fe6baede6fb7d6111f76896656d13567e3ec29ba8
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-dropdown-menu@npm:^2.0.6":
-  version: 2.1.1
-  resolution: "@radix-ui/react-dropdown-menu@npm:2.1.1"
-  dependencies:
-    "@radix-ui/primitive": "npm:1.1.0"
-    "@radix-ui/react-compose-refs": "npm:1.1.0"
-    "@radix-ui/react-context": "npm:1.1.0"
-    "@radix-ui/react-id": "npm:1.1.0"
-    "@radix-ui/react-menu": "npm:2.1.1"
-    "@radix-ui/react-primitive": "npm:2.0.0"
-    "@radix-ui/react-use-controllable-state": "npm:1.1.0"
-  peerDependencies:
-    "@types/react": "*"
-    "@types/react-dom": "*"
-    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-    "@types/react-dom":
-      optional: true
-  checksum: 10c0/b54f1e41ddc8c3709ba2f8a59621138268d0380aca8399450a234997cc2214e4a6acf1a64ab387558ba39c0bd5839995a668bd71781762daac7618a2d71b4082
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-focus-guards@npm:1.0.1":
-  version: 1.0.1
-  resolution: "@radix-ui/react-focus-guards@npm:1.0.1"
-  dependencies:
-    "@babel/runtime": "npm:^7.13.10"
-  peerDependencies:
-    "@types/react": "*"
-    react: ^16.8 || ^17.0 || ^18.0
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-  checksum: 10c0/d5fd4e5aa9d9a87c8ad490b3b4992d6f1d9eddf18e56df2a2bcf8744c4332b275d73377fd193df3e6ba0ad9608dc497709beca5c64de2b834d5f5350b3c9a272
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-focus-guards@npm:1.1.0":
-  version: 1.1.0
-  resolution: "@radix-ui/react-focus-guards@npm:1.1.0"
-  peerDependencies:
-    "@types/react": "*"
-    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-  checksum: 10c0/23af9ff17244568db9b2e99ae6e5718747a4b656bf12b1b15b0d3adca407988641a930612eca35a61b7e15d1ce312b3db13ea95999fa31ae641aaaac1e325df8
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-focus-scope@npm:1.0.4":
-  version: 1.0.4
-  resolution: "@radix-ui/react-focus-scope@npm:1.0.4"
-  dependencies:
-    "@babel/runtime": "npm:^7.13.10"
-    "@radix-ui/react-compose-refs": "npm:1.0.1"
-    "@radix-ui/react-primitive": "npm:1.0.3"
-    "@radix-ui/react-use-callback-ref": "npm:1.0.1"
-  peerDependencies:
-    "@types/react": "*"
-    "@types/react-dom": "*"
-    react: ^16.8 || ^17.0 || ^18.0
-    react-dom: ^16.8 || ^17.0 || ^18.0
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-    "@types/react-dom":
-      optional: true
-  checksum: 10c0/2fce0bafcab4e16cf4ed7560bda40654223f3d0add6b231e1c607433030c14e6249818b444b7b58ee7a6ff6bbf8e192c9c81d22c3a5c88c2daade9d1f881b5be
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-focus-scope@npm:1.1.0":
-  version: 1.1.0
-  resolution: "@radix-ui/react-focus-scope@npm:1.1.0"
-  dependencies:
-    "@radix-ui/react-compose-refs": "npm:1.1.0"
-    "@radix-ui/react-primitive": "npm:2.0.0"
-    "@radix-ui/react-use-callback-ref": "npm:1.1.0"
-  peerDependencies:
-    "@types/react": "*"
-    "@types/react-dom": "*"
-    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-    "@types/react-dom":
-      optional: true
-  checksum: 10c0/2593d4bbd4a3525624675ec1d5a591a44f015f43f449b99a5a33228159b83f445e8f1c6bc6f9f2011387abaeadd3df406623c08d4e795b7ae509795652a1d069
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-hover-card@npm:^1.0.7":
-  version: 1.1.1
-  resolution: "@radix-ui/react-hover-card@npm:1.1.1"
-  dependencies:
-    "@radix-ui/primitive": "npm:1.1.0"
-    "@radix-ui/react-compose-refs": "npm:1.1.0"
-    "@radix-ui/react-context": "npm:1.1.0"
-    "@radix-ui/react-dismissable-layer": "npm:1.1.0"
-    "@radix-ui/react-popper": "npm:1.2.0"
-    "@radix-ui/react-portal": "npm:1.1.1"
-    "@radix-ui/react-presence": "npm:1.1.0"
-    "@radix-ui/react-primitive": "npm:2.0.0"
-    "@radix-ui/react-use-controllable-state": "npm:1.1.0"
-  peerDependencies:
-    "@types/react": "*"
-    "@types/react-dom": "*"
-    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-    "@types/react-dom":
-      optional: true
-  checksum: 10c0/d27f89258caec7660113f6bdfcffdd8999c8ac25761eb099b467cdb6c2cdea14c2953a100130e212cfb2621f9718b6291e292be915280698e0cfd4c1b3ed29af
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-icons@npm:^1.3.0":
-  version: 1.3.0
-  resolution: "@radix-ui/react-icons@npm:1.3.0"
-  peerDependencies:
-    react: ^16.x || ^17.x || ^18.x
-  checksum: 10c0/581657680e43fd13ff06e01f963e3afa94671d4ce6c3fb126e2c70c993ab8650faa55286974032dbccfecca4db57308fb66d53771d765887e03600cddee84ae5
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-id@npm:1.0.1":
-  version: 1.0.1
-  resolution: "@radix-ui/react-id@npm:1.0.1"
-  dependencies:
-    "@babel/runtime": "npm:^7.13.10"
-    "@radix-ui/react-use-layout-effect": "npm:1.0.1"
-  peerDependencies:
-    "@types/react": "*"
-    react: ^16.8 || ^17.0 || ^18.0
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-  checksum: 10c0/e2859ca58bea171c956098ace7ecf615cf9432f58a118b779a14720746b3adcf0351c36c75de131548672d3cd290ca238198acbd33b88dc4706f98312e9317ad
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-id@npm:1.1.0, @radix-ui/react-id@npm:^1.0.1":
-  version: 1.1.0
-  resolution: "@radix-ui/react-id@npm:1.1.0"
-  dependencies:
-    "@radix-ui/react-use-layout-effect": "npm:1.1.0"
-  peerDependencies:
-    "@types/react": "*"
-    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-  checksum: 10c0/acf13e29e51ee96336837fc0cfecc306328b20b0e0070f6f0f7aa7a621ded4a1ee5537cfad58456f64bae76caa7f8769231e88dc7dc106197347ee433c275a79
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-label@npm:^2.0.2":
-  version: 2.1.0
-  resolution: "@radix-ui/react-label@npm:2.1.0"
-  dependencies:
-    "@radix-ui/react-primitive": "npm:2.0.0"
-  peerDependencies:
-    "@types/react": "*"
-    "@types/react-dom": "*"
-    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-    "@types/react-dom":
-      optional: true
-  checksum: 10c0/282d3b1b72ff14b431b3bb427d66d14253bbd30fad2437d8f4e7d5c0b6a41f6f7ed157460e02fb91b67b1c8cebc65f2c6fe1d3a32f4459d41238fc0fd4719875
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-menu@npm:2.1.1":
-  version: 2.1.1
-  resolution: "@radix-ui/react-menu@npm:2.1.1"
-  dependencies:
-    "@radix-ui/primitive": "npm:1.1.0"
-    "@radix-ui/react-collection": "npm:1.1.0"
-    "@radix-ui/react-compose-refs": "npm:1.1.0"
-    "@radix-ui/react-context": "npm:1.1.0"
-    "@radix-ui/react-direction": "npm:1.1.0"
-    "@radix-ui/react-dismissable-layer": "npm:1.1.0"
-    "@radix-ui/react-focus-guards": "npm:1.1.0"
-    "@radix-ui/react-focus-scope": "npm:1.1.0"
-    "@radix-ui/react-id": "npm:1.1.0"
-    "@radix-ui/react-popper": "npm:1.2.0"
-    "@radix-ui/react-portal": "npm:1.1.1"
-    "@radix-ui/react-presence": "npm:1.1.0"
-    "@radix-ui/react-primitive": "npm:2.0.0"
-    "@radix-ui/react-roving-focus": "npm:1.1.0"
-    "@radix-ui/react-slot": "npm:1.1.0"
-    "@radix-ui/react-use-callback-ref": "npm:1.1.0"
-    aria-hidden: "npm:^1.1.1"
-    react-remove-scroll: "npm:2.5.7"
-  peerDependencies:
-    "@types/react": "*"
-    "@types/react-dom": "*"
-    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-    "@types/react-dom":
-      optional: true
-  checksum: 10c0/2cb11867430276d8db595886ae0e01e67a555676d37e108d5a6c386df23329482115a041b6a4057fad6b855aa423681805c20d1f290fd1502e521e8e55aafb54
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-popover@npm:^1.0.7":
-  version: 1.1.1
-  resolution: "@radix-ui/react-popover@npm:1.1.1"
-  dependencies:
-    "@radix-ui/primitive": "npm:1.1.0"
-    "@radix-ui/react-compose-refs": "npm:1.1.0"
-    "@radix-ui/react-context": "npm:1.1.0"
-    "@radix-ui/react-dismissable-layer": "npm:1.1.0"
-    "@radix-ui/react-focus-guards": "npm:1.1.0"
-    "@radix-ui/react-focus-scope": "npm:1.1.0"
-    "@radix-ui/react-id": "npm:1.1.0"
-    "@radix-ui/react-popper": "npm:1.2.0"
-    "@radix-ui/react-portal": "npm:1.1.1"
-    "@radix-ui/react-presence": "npm:1.1.0"
-    "@radix-ui/react-primitive": "npm:2.0.0"
-    "@radix-ui/react-slot": "npm:1.1.0"
-    "@radix-ui/react-use-controllable-state": "npm:1.1.0"
-    aria-hidden: "npm:^1.1.1"
-    react-remove-scroll: "npm:2.5.7"
-  peerDependencies:
-    "@types/react": "*"
-    "@types/react-dom": "*"
-    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-    "@types/react-dom":
-      optional: true
-  checksum: 10c0/4539082143c6c006727cf4a6300479f3dd912e85291d5ed7f084d8a7730acc3b5f6589925ab70eca025d3c78026f52f99c0155e11a35de37fe26b8078e6802b3
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-popper@npm:1.2.0":
-  version: 1.2.0
-  resolution: "@radix-ui/react-popper@npm:1.2.0"
-  dependencies:
-    "@floating-ui/react-dom": "npm:^2.0.0"
-    "@radix-ui/react-arrow": "npm:1.1.0"
-    "@radix-ui/react-compose-refs": "npm:1.1.0"
-    "@radix-ui/react-context": "npm:1.1.0"
-    "@radix-ui/react-primitive": "npm:2.0.0"
-    "@radix-ui/react-use-callback-ref": "npm:1.1.0"
-    "@radix-ui/react-use-layout-effect": "npm:1.1.0"
-    "@radix-ui/react-use-rect": "npm:1.1.0"
-    "@radix-ui/react-use-size": "npm:1.1.0"
-    "@radix-ui/rect": "npm:1.1.0"
-  peerDependencies:
-    "@types/react": "*"
-    "@types/react-dom": "*"
-    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-    "@types/react-dom":
-      optional: true
-  checksum: 10c0/a78ea534b9822d07153fff0895b6cdf742e7213782b140b3ab94a76df0ca70e6001925aea946e99ca680fc63a7fcca49c1d62e8dc5a2f651692fba3541e180c0
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-portal@npm:1.0.4":
-  version: 1.0.4
-  resolution: "@radix-ui/react-portal@npm:1.0.4"
-  dependencies:
-    "@babel/runtime": "npm:^7.13.10"
-    "@radix-ui/react-primitive": "npm:1.0.3"
-  peerDependencies:
-    "@types/react": "*"
-    "@types/react-dom": "*"
-    react: ^16.8 || ^17.0 || ^18.0
-    react-dom: ^16.8 || ^17.0 || ^18.0
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-    "@types/react-dom":
-      optional: true
-  checksum: 10c0/fed32f8148b833fe852fb5e2f859979ffdf2fb9a9ef46583b9b52915d764ad36ba5c958a64e61d23395628ccc09d678229ee94cd112941e8fe2575021f820c29
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-portal@npm:1.1.1":
-  version: 1.1.1
-  resolution: "@radix-ui/react-portal@npm:1.1.1"
-  dependencies:
-    "@radix-ui/react-primitive": "npm:2.0.0"
-    "@radix-ui/react-use-layout-effect": "npm:1.1.0"
-  peerDependencies:
-    "@types/react": "*"
-    "@types/react-dom": "*"
-    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-    "@types/react-dom":
-      optional: true
-  checksum: 10c0/7e7130fcb0d99197322cd97987e1d7279b6c264fb6be3d883cbfcd49267740d83ca17b431e0d98848afd6067a13ee823ca396a8b63ae68f18a728cf70398c830
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-presence@npm:1.0.1":
-  version: 1.0.1
-  resolution: "@radix-ui/react-presence@npm:1.0.1"
-  dependencies:
-    "@babel/runtime": "npm:^7.13.10"
-    "@radix-ui/react-compose-refs": "npm:1.0.1"
-    "@radix-ui/react-use-layout-effect": "npm:1.0.1"
-  peerDependencies:
-    "@types/react": "*"
-    "@types/react-dom": "*"
-    react: ^16.8 || ^17.0 || ^18.0
-    react-dom: ^16.8 || ^17.0 || ^18.0
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-    "@types/react-dom":
-      optional: true
-  checksum: 10c0/90780618b265fe794a8f1ddaa5bfd3c71a1127fa79330a14d32722e6265b44452a9dd36efe4e769129d33e57f979f6b8713e2cbf2e2755326aa3b0f337185b6e
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-presence@npm:1.1.0":
-  version: 1.1.0
-  resolution: "@radix-ui/react-presence@npm:1.1.0"
-  dependencies:
-    "@radix-ui/react-compose-refs": "npm:1.1.0"
-    "@radix-ui/react-use-layout-effect": "npm:1.1.0"
-  peerDependencies:
-    "@types/react": "*"
-    "@types/react-dom": "*"
-    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-    "@types/react-dom":
-      optional: true
-  checksum: 10c0/58acb658b15b72991ad7a234ea90995902c470b3a182aa90ad03145cbbeaa40f211700c444bfa14cf47537cbb6b732e1359bc5396182de839bd680843c11bf31
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-primitive@npm:1.0.3":
-  version: 1.0.3
-  resolution: "@radix-ui/react-primitive@npm:1.0.3"
-  dependencies:
-    "@babel/runtime": "npm:^7.13.10"
-    "@radix-ui/react-slot": "npm:1.0.2"
-  peerDependencies:
-    "@types/react": "*"
-    "@types/react-dom": "*"
-    react: ^16.8 || ^17.0 || ^18.0
-    react-dom: ^16.8 || ^17.0 || ^18.0
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-    "@types/react-dom":
-      optional: true
-  checksum: 10c0/67a66ff8898a5e7739eda228ab6f5ce808858da1dce967014138d87e72b6bbfc93dc1467c706d98d1a2b93bf0b6e09233d1a24d31c78227b078444c1a69c42be
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-primitive@npm:2.0.0":
-  version: 2.0.0
-  resolution: "@radix-ui/react-primitive@npm:2.0.0"
-  dependencies:
-    "@radix-ui/react-slot": "npm:1.1.0"
-  peerDependencies:
-    "@types/react": "*"
-    "@types/react-dom": "*"
-    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-    "@types/react-dom":
-      optional: true
-  checksum: 10c0/00cb6ca499252ca848c299212ba6976171cea7608b10b3f9a9639d6732dea2df1197ba0d97c001a4fdb29313c3e7fc2a490f6245dd3579617a0ffd85ae964fdd
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-roving-focus@npm:1.1.0":
-  version: 1.1.0
-  resolution: "@radix-ui/react-roving-focus@npm:1.1.0"
-  dependencies:
-    "@radix-ui/primitive": "npm:1.1.0"
-    "@radix-ui/react-collection": "npm:1.1.0"
-    "@radix-ui/react-compose-refs": "npm:1.1.0"
-    "@radix-ui/react-context": "npm:1.1.0"
-    "@radix-ui/react-direction": "npm:1.1.0"
-    "@radix-ui/react-id": "npm:1.1.0"
-    "@radix-ui/react-primitive": "npm:2.0.0"
-    "@radix-ui/react-use-callback-ref": "npm:1.1.0"
-    "@radix-ui/react-use-controllable-state": "npm:1.1.0"
-  peerDependencies:
-    "@types/react": "*"
-    "@types/react-dom": "*"
-    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-    "@types/react-dom":
-      optional: true
-  checksum: 10c0/ce367d3033a12d639a8d445d2efa090aa4bc5a78125be568f8c8e4e59f30afd51b585a90031ec18cdba19afbaf1974633dbc0c2c3d2a14d9eb1bfea2ddbe5369
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-scroll-area@npm:^1.0.5":
-  version: 1.1.0
-  resolution: "@radix-ui/react-scroll-area@npm:1.1.0"
-  dependencies:
-    "@radix-ui/number": "npm:1.1.0"
-    "@radix-ui/primitive": "npm:1.1.0"
-    "@radix-ui/react-compose-refs": "npm:1.1.0"
-    "@radix-ui/react-context": "npm:1.1.0"
-    "@radix-ui/react-direction": "npm:1.1.0"
-    "@radix-ui/react-presence": "npm:1.1.0"
-    "@radix-ui/react-primitive": "npm:2.0.0"
-    "@radix-ui/react-use-callback-ref": "npm:1.1.0"
-    "@radix-ui/react-use-layout-effect": "npm:1.1.0"
-  peerDependencies:
-    "@types/react": "*"
-    "@types/react-dom": "*"
-    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-    "@types/react-dom":
-      optional: true
-  checksum: 10c0/46063b17f06bd2fe20ceaceb2fb0c1cd1b2767045d6d721904bc3f5d6726704a77eaf63997a514ca8f43d973da0c6446d7ca04057d9983cb0d46f4be8c01c9f5
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-select@npm:^2.0.0":
-  version: 2.1.1
-  resolution: "@radix-ui/react-select@npm:2.1.1"
-  dependencies:
-    "@radix-ui/number": "npm:1.1.0"
-    "@radix-ui/primitive": "npm:1.1.0"
-    "@radix-ui/react-collection": "npm:1.1.0"
-    "@radix-ui/react-compose-refs": "npm:1.1.0"
-    "@radix-ui/react-context": "npm:1.1.0"
-    "@radix-ui/react-direction": "npm:1.1.0"
-    "@radix-ui/react-dismissable-layer": "npm:1.1.0"
-    "@radix-ui/react-focus-guards": "npm:1.1.0"
-    "@radix-ui/react-focus-scope": "npm:1.1.0"
-    "@radix-ui/react-id": "npm:1.1.0"
-    "@radix-ui/react-popper": "npm:1.2.0"
-    "@radix-ui/react-portal": "npm:1.1.1"
-    "@radix-ui/react-primitive": "npm:2.0.0"
-    "@radix-ui/react-slot": "npm:1.1.0"
-    "@radix-ui/react-use-callback-ref": "npm:1.1.0"
-    "@radix-ui/react-use-controllable-state": "npm:1.1.0"
-    "@radix-ui/react-use-layout-effect": "npm:1.1.0"
-    "@radix-ui/react-use-previous": "npm:1.1.0"
-    "@radix-ui/react-visually-hidden": "npm:1.1.0"
-    aria-hidden: "npm:^1.1.1"
-    react-remove-scroll: "npm:2.5.7"
-  peerDependencies:
-    "@types/react": "*"
-    "@types/react-dom": "*"
-    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-    "@types/react-dom":
-      optional: true
-  checksum: 10c0/f12bce67f49f82e44f04d109f53be195d7a415e89e29aa09ec704899d6a7198486f118f3d1e37aa7afd3e14524951752fc79170ac5bd4c831cdc4032ea1c0382
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-separator@npm:^1.0.3":
-  version: 1.1.0
-  resolution: "@radix-ui/react-separator@npm:1.1.0"
-  dependencies:
-    "@radix-ui/react-primitive": "npm:2.0.0"
-  peerDependencies:
-    "@types/react": "*"
-    "@types/react-dom": "*"
-    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-    "@types/react-dom":
-      optional: true
-  checksum: 10c0/0ca9e25db27b6b001f3c0c50b2df9d6cf070b949f183043e263115d694a25b7268fecd670572469a512e556deca25ebb08b3aec4a870f0309eed728eef19ab8a
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-slider@npm:^1.1.2":
-  version: 1.2.0
-  resolution: "@radix-ui/react-slider@npm:1.2.0"
-  dependencies:
-    "@radix-ui/number": "npm:1.1.0"
-    "@radix-ui/primitive": "npm:1.1.0"
-    "@radix-ui/react-collection": "npm:1.1.0"
-    "@radix-ui/react-compose-refs": "npm:1.1.0"
-    "@radix-ui/react-context": "npm:1.1.0"
-    "@radix-ui/react-direction": "npm:1.1.0"
-    "@radix-ui/react-primitive": "npm:2.0.0"
-    "@radix-ui/react-use-controllable-state": "npm:1.1.0"
-    "@radix-ui/react-use-layout-effect": "npm:1.1.0"
-    "@radix-ui/react-use-previous": "npm:1.1.0"
-    "@radix-ui/react-use-size": "npm:1.1.0"
-  peerDependencies:
-    "@types/react": "*"
-    "@types/react-dom": "*"
-    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-    "@types/react-dom":
-      optional: true
-  checksum: 10c0/46aea4fadf5d2bf8273f0d9189d88a8c4d5fbb304990a1235a0fdf1d463201bec9655785f8c62d60c4aff3e6ab63d8b37c0c7cb23153ebd190f33cf9fa8bc0ea
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-slot@npm:1.0.2":
-  version: 1.0.2
-  resolution: "@radix-ui/react-slot@npm:1.0.2"
-  dependencies:
-    "@babel/runtime": "npm:^7.13.10"
-    "@radix-ui/react-compose-refs": "npm:1.0.1"
-  peerDependencies:
-    "@types/react": "*"
-    react: ^16.8 || ^17.0 || ^18.0
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-  checksum: 10c0/3af6ea4891e6fa8091e666802adffe7718b3cd390a10fa9229a5f40f8efded9f3918ea01b046103d93923d41cc32119505ebb6bde76cad07a87b6cf4f2119347
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-slot@npm:1.1.0, @radix-ui/react-slot@npm:^1.0.2":
-  version: 1.1.0
-  resolution: "@radix-ui/react-slot@npm:1.1.0"
-  dependencies:
-    "@radix-ui/react-compose-refs": "npm:1.1.0"
-  peerDependencies:
-    "@types/react": "*"
-    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-  checksum: 10c0/a2e8bfb70c440506dd84a1a274f9a8bc433cca37ceae275e53552c9122612e3837744d7fc6f113d6ef1a11491aa914f4add71d76de41cb6d4db72547a8e261ae
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-tabs@npm:^1.0.4":
-  version: 1.1.0
-  resolution: "@radix-ui/react-tabs@npm:1.1.0"
-  dependencies:
-    "@radix-ui/primitive": "npm:1.1.0"
-    "@radix-ui/react-context": "npm:1.1.0"
-    "@radix-ui/react-direction": "npm:1.1.0"
-    "@radix-ui/react-id": "npm:1.1.0"
-    "@radix-ui/react-presence": "npm:1.1.0"
-    "@radix-ui/react-primitive": "npm:2.0.0"
-    "@radix-ui/react-roving-focus": "npm:1.1.0"
-    "@radix-ui/react-use-controllable-state": "npm:1.1.0"
-  peerDependencies:
-    "@types/react": "*"
-    "@types/react-dom": "*"
-    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-    "@types/react-dom":
-      optional: true
-  checksum: 10c0/d6cb742c36a6918dd37c6a3c531b1f6832916dde26855f6c94baf4a17d20bbb17ffd8ba9844539c568a4484a39bbdf5fc528d44534d1d46d094840836c9ff47d
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-toast@npm:^1.1.5":
-  version: 1.2.1
-  resolution: "@radix-ui/react-toast@npm:1.2.1"
-  dependencies:
-    "@radix-ui/primitive": "npm:1.1.0"
-    "@radix-ui/react-collection": "npm:1.1.0"
-    "@radix-ui/react-compose-refs": "npm:1.1.0"
-    "@radix-ui/react-context": "npm:1.1.0"
-    "@radix-ui/react-dismissable-layer": "npm:1.1.0"
-    "@radix-ui/react-portal": "npm:1.1.1"
-    "@radix-ui/react-presence": "npm:1.1.0"
-    "@radix-ui/react-primitive": "npm:2.0.0"
-    "@radix-ui/react-use-callback-ref": "npm:1.1.0"
-    "@radix-ui/react-use-controllable-state": "npm:1.1.0"
-    "@radix-ui/react-use-layout-effect": "npm:1.1.0"
-    "@radix-ui/react-visually-hidden": "npm:1.1.0"
-  peerDependencies:
-    "@types/react": "*"
-    "@types/react-dom": "*"
-    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-    "@types/react-dom":
-      optional: true
-  checksum: 10c0/49a4ddbfcabafa0a9f6a55e67afeb7c71b0369a25670f425626f4f08edea443a8f2c2008113996ce622168b3de85de1a7a21245acc2031e6454c12f504fd4f52
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-tooltip@npm:^1.0.7":
-  version: 1.1.2
-  resolution: "@radix-ui/react-tooltip@npm:1.1.2"
-  dependencies:
-    "@radix-ui/primitive": "npm:1.1.0"
-    "@radix-ui/react-compose-refs": "npm:1.1.0"
-    "@radix-ui/react-context": "npm:1.1.0"
-    "@radix-ui/react-dismissable-layer": "npm:1.1.0"
-    "@radix-ui/react-id": "npm:1.1.0"
-    "@radix-ui/react-popper": "npm:1.2.0"
-    "@radix-ui/react-portal": "npm:1.1.1"
-    "@radix-ui/react-presence": "npm:1.1.0"
-    "@radix-ui/react-primitive": "npm:2.0.0"
-    "@radix-ui/react-slot": "npm:1.1.0"
-    "@radix-ui/react-use-controllable-state": "npm:1.1.0"
-    "@radix-ui/react-visually-hidden": "npm:1.1.0"
-  peerDependencies:
-    "@types/react": "*"
-    "@types/react-dom": "*"
-    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-    "@types/react-dom":
-      optional: true
-  checksum: 10c0/76f3abcd27f7f673612631abc340a17e6ab0e5d20b901fe4828400de05d4d8a8711392417b028be86a3053a0881b80d0ed41c4e027eb64c1af9fe74db70d3786
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-use-callback-ref@npm:1.0.1":
-  version: 1.0.1
-  resolution: "@radix-ui/react-use-callback-ref@npm:1.0.1"
-  dependencies:
-    "@babel/runtime": "npm:^7.13.10"
-  peerDependencies:
-    "@types/react": "*"
-    react: ^16.8 || ^17.0 || ^18.0
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-  checksum: 10c0/331b432be1edc960ca148637ae6087220873ee828ceb13bd155926ef8f49e862812de5b379129f6aaefcd11be53715f3237e6caa9a33d9c0abfff43f3ba58938
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-use-callback-ref@npm:1.1.0":
-  version: 1.1.0
-  resolution: "@radix-ui/react-use-callback-ref@npm:1.1.0"
-  peerDependencies:
-    "@types/react": "*"
-    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-  checksum: 10c0/e954863f3baa151faf89ac052a5468b42650efca924417470efd1bd254b411a94c69c30de2fdbb90187b38cb984795978e12e30423dc41e4309d93d53b66d819
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-use-controllable-state@npm:1.0.1":
-  version: 1.0.1
-  resolution: "@radix-ui/react-use-controllable-state@npm:1.0.1"
-  dependencies:
-    "@babel/runtime": "npm:^7.13.10"
-    "@radix-ui/react-use-callback-ref": "npm:1.0.1"
-  peerDependencies:
-    "@types/react": "*"
-    react: ^16.8 || ^17.0 || ^18.0
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-  checksum: 10c0/29b069dbf09e48bca321af6272574ad0fc7283174e7d092731a10663fe00c0e6b4bde5e1b5ea67725fe48dcbe8026e7ff0d69d42891c62cbb9ca408498171fbe
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-use-controllable-state@npm:1.1.0":
-  version: 1.1.0
-  resolution: "@radix-ui/react-use-controllable-state@npm:1.1.0"
-  dependencies:
-    "@radix-ui/react-use-callback-ref": "npm:1.1.0"
-  peerDependencies:
-    "@types/react": "*"
-    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-  checksum: 10c0/2af883b5b25822ac226e60a6bfde647c0123a76345052a90219026059b3f7225844b2c13a9a16fba859c1cda5fb3d057f2a04503f71780e607516492db4eb3a1
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-use-escape-keydown@npm:1.0.3":
-  version: 1.0.3
-  resolution: "@radix-ui/react-use-escape-keydown@npm:1.0.3"
-  dependencies:
-    "@babel/runtime": "npm:^7.13.10"
-    "@radix-ui/react-use-callback-ref": "npm:1.0.1"
-  peerDependencies:
-    "@types/react": "*"
-    react: ^16.8 || ^17.0 || ^18.0
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-  checksum: 10c0/3c94c78902dcb40b60083ee2184614f45c95a189178f52d89323b467bd04bcf5fdb1bc4d43debecd7f0b572c3843c7e04edbcb56f40a4b4b43936fb2770fb8ad
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-use-escape-keydown@npm:1.1.0":
-  version: 1.1.0
-  resolution: "@radix-ui/react-use-escape-keydown@npm:1.1.0"
-  dependencies:
-    "@radix-ui/react-use-callback-ref": "npm:1.1.0"
-  peerDependencies:
-    "@types/react": "*"
-    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-  checksum: 10c0/910fd696e5a0994b0e06b9cb68def8a865f47951a013ec240c77db2a9e1e726105602700ef5e5f01af49f2f18fe0e73164f9a9651021f28538ef8a30d91f3fbb
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-use-layout-effect@npm:1.0.1":
-  version: 1.0.1
-  resolution: "@radix-ui/react-use-layout-effect@npm:1.0.1"
-  dependencies:
-    "@babel/runtime": "npm:^7.13.10"
-  peerDependencies:
-    "@types/react": "*"
-    react: ^16.8 || ^17.0 || ^18.0
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-  checksum: 10c0/13cd0c38395c5838bc9a18238020d3bcf67fb340039e6d1cbf438be1b91d64cf6900b78121f3dc9219faeb40dcc7b523ce0f17e4a41631655690e5a30a40886a
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-use-layout-effect@npm:1.1.0":
-  version: 1.1.0
-  resolution: "@radix-ui/react-use-layout-effect@npm:1.1.0"
-  peerDependencies:
-    "@types/react": "*"
-    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-  checksum: 10c0/9bf87ece1845c038ed95863cfccf9d75f557c2400d606343bab0ab3192b9806b9840e6aa0a0333fdf3e83cf9982632852192f3e68d7d8367bc8c788dfdf8e62b
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-use-previous@npm:1.1.0":
-  version: 1.1.0
-  resolution: "@radix-ui/react-use-previous@npm:1.1.0"
-  peerDependencies:
-    "@types/react": "*"
-    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-  checksum: 10c0/9787d24790d4e330715127f2f4db56c4cbed9b0a47f97e11a68582c08a356a53c1ec41c7537382f6fb8d0db25de152770f17430e8eaf0fa59705be97760acbad
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-use-rect@npm:1.1.0":
-  version: 1.1.0
-  resolution: "@radix-ui/react-use-rect@npm:1.1.0"
-  dependencies:
-    "@radix-ui/rect": "npm:1.1.0"
-  peerDependencies:
-    "@types/react": "*"
-    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-  checksum: 10c0/c2e30150ab49e2cec238cda306fd748c3d47fb96dcff69a3b08e1d19108d80bac239d48f1747a25dadca614e3e967267d43b91e60ea59db2befbc7bea913ff84
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-use-size@npm:1.1.0":
-  version: 1.1.0
-  resolution: "@radix-ui/react-use-size@npm:1.1.0"
-  dependencies:
-    "@radix-ui/react-use-layout-effect": "npm:1.1.0"
-  peerDependencies:
-    "@types/react": "*"
-    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-  checksum: 10c0/4c8b89037597fdc1824d009e0c941b510c7c6c30f83024cc02c934edd748886786e7d9f36f57323b02ad29833e7fa7e8974d81969b4ab33d8f41661afa4f30a6
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-visually-hidden@npm:1.1.0":
-  version: 1.1.0
-  resolution: "@radix-ui/react-visually-hidden@npm:1.1.0"
-  dependencies:
-    "@radix-ui/react-primitive": "npm:2.0.0"
-  peerDependencies:
-    "@types/react": "*"
-    "@types/react-dom": "*"
-    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-    "@types/react-dom":
-      optional: true
-  checksum: 10c0/db138dd5f3c94958a9f836740d4408c89c4a73e770eaba5ead921e69b3c0d196c5cd58323d82829a9bc05a74873c299195dfd8366b9808e53a9a3dbca5a1e5fe
-  languageName: node
-  linkType: hard
-
-"@radix-ui/rect@npm:1.1.0":
-  version: 1.1.0
-  resolution: "@radix-ui/rect@npm:1.1.0"
-  checksum: 10c0/a26ff7f8708fb5f2f7949baad70a6b2a597d761ee4dd4aadaf1c1a33ea82ea23dfef6ce6366a08310c5d008cdd60b2e626e4ee03fa342bd5f246ddd9d427f6be
-  languageName: node
-  linkType: hard
-
-"@rollup/pluginutils@npm:^5.1.3":
-  version: 5.2.0
-  resolution: "@rollup/pluginutils@npm:5.2.0"
-  dependencies:
-    "@types/estree": "npm:^1.0.0"
-    estree-walker: "npm:^2.0.2"
-    picomatch: "npm:^4.0.2"
-  peerDependencies:
-    rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
-  peerDependenciesMeta:
-    rollup:
-      optional: true
-  checksum: 10c0/794890d512751451bcc06aa112366ef47ea8f9125dac49b1abf72ff8b079518b09359de9c60a013b33266541634e765ae61839c749fae0edb59a463418665c55
-  languageName: node
-  linkType: hard
-
-"@scure/base@npm:~1.1.0, @scure/base@npm:~1.1.2":
-  version: 1.1.7
-  resolution: "@scure/base@npm:1.1.7"
-  checksum: 10c0/2d06aaf39e6de4b9640eb40d2e5419176ebfe911597856dcbf3bc6209277ddb83f4b4b02cb1fd1208f819654268ec083da68111d3530bbde07bae913e2fc2e5d
-  languageName: node
-  linkType: hard
-
-"@scure/bip32@npm:1.3.2":
-  version: 1.3.2
-  resolution: "@scure/bip32@npm:1.3.2"
-  dependencies:
-    "@noble/curves": "npm:~1.2.0"
-    "@noble/hashes": "npm:~1.3.2"
-    "@scure/base": "npm:~1.1.2"
-  checksum: 10c0/2e9c1ce67f72b6c3329483f5fd39fb43ba6dcf732ed7ac63b80fa96341d2bc4cad1ea4c75bfeb91e801968c00df48b577b015fd4591f581e93f0d91178e630ca
-  languageName: node
-  linkType: hard
-
-"@scure/bip39@npm:1.2.1":
-  version: 1.2.1
-  resolution: "@scure/bip39@npm:1.2.1"
-  dependencies:
-    "@noble/hashes": "npm:~1.3.0"
-    "@scure/base": "npm:~1.1.0"
-  checksum: 10c0/fe951f69dd5a7cdcefbe865bce1b160d6b59ba19bd01d09f0718e54fce37a7d8be158b32f5455f0e9c426a7fbbede3e019bf0baa99bacc88ef26a76a07e115d4
-  languageName: node
-  linkType: hard
-
-"@sec-ant/readable-stream@npm:^0.4.1":
-  version: 0.4.1
-  resolution: "@sec-ant/readable-stream@npm:0.4.1"
-  checksum: 10c0/64e9e9cf161e848067a5bf60cdc04d18495dc28bb63a8d9f8993e4dd99b91ad34e4b563c85de17d91ffb177ec17a0664991d2e115f6543e73236a906068987af
-  languageName: node
-  linkType: hard
-
-"@shikijs/core@npm:1.12.1":
-  version: 1.12.1
-  resolution: "@shikijs/core@npm:1.12.1"
-  dependencies:
-    "@types/hast": "npm:^3.0.4"
-  checksum: 10c0/196df410a63a7cee3539f7ea46ee2241f7d6876af622041330b9c2725e9efa2993a2f0e24938d1dd1c214222fa03e18e61b4c849d323b06505387d93acadb918
-  languageName: node
-  linkType: hard
-
-"@shikijs/rehype@npm:^1.12.1":
-  version: 1.12.1
-  resolution: "@shikijs/rehype@npm:1.12.1"
-  dependencies:
-    "@shikijs/transformers": "npm:1.12.1"
-    "@types/hast": "npm:^3.0.4"
-    hast-util-to-string: "npm:^3.0.0"
-    shiki: "npm:1.12.1"
-    unified: "npm:^11.0.5"
-    unist-util-visit: "npm:^5.0.0"
-  checksum: 10c0/697ab8c782f4d4fbf51f8d64f46651073441cf1fc300891f27ab0fc04e1f7777c3ec20c3c4a721ec2782de5ef1a9e5b6587031d47b32f19c3eba044c416d9782
-  languageName: node
-  linkType: hard
-
-"@shikijs/transformers@npm:1.12.1":
-  version: 1.12.1
-  resolution: "@shikijs/transformers@npm:1.12.1"
-  dependencies:
-    shiki: "npm:1.12.1"
-  checksum: 10c0/83fc607d31722d7a37e2c9fc40cfcdda2a86885d1b04f0006395eab88982e6c07ac4d1959668ad1213900b33901abf59b72a08e72af4eb3a4c3b699dbd343134
-  languageName: node
-  linkType: hard
-
-"@sideway/address@npm:^4.1.5":
-  version: 4.1.5
-  resolution: "@sideway/address@npm:4.1.5"
-  dependencies:
-    "@hapi/hoek": "npm:^9.0.0"
-  checksum: 10c0/638eb6f7e7dba209053dd6c8da74d7cc995e2b791b97644d0303a7dd3119263bcb7225a4f6804d4db2bc4f96e5a9d262975a014f58eae4d1753c27cbc96ef959
-  languageName: node
-  linkType: hard
-
-"@sideway/formula@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "@sideway/formula@npm:3.0.1"
-  checksum: 10c0/3fe81fa9662efc076bf41612b060eb9b02e846ea4bea5bd114f1662b7f1541e9dedcf98aff0d24400bcb92f113964a50e0290b86e284edbdf6346fa9b7e2bf2c
-  languageName: node
-  linkType: hard
-
-"@sideway/pinpoint@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@sideway/pinpoint@npm:2.0.0"
-  checksum: 10c0/d2ca75dacaf69b8fc0bb8916a204e01def3105ee44d8be16c355e5f58189eb94039e15ce831f3d544f229889ccfa35562a0ce2516179f3a7ee1bbe0b71e55b36
-  languageName: node
-  linkType: hard
-
-"@sinclair/typebox@npm:^0.27.8":
-  version: 0.27.8
-  resolution: "@sinclair/typebox@npm:0.27.8"
-  checksum: 10c0/ef6351ae073c45c2ac89494dbb3e1f87cc60a93ce4cde797b782812b6f97da0d620ae81973f104b43c9b7eaa789ad20ba4f6a1359f1cc62f63729a55a7d22d4e
-  languageName: node
-  linkType: hard
-
-"@sindresorhus/is@npm:^4.6.0":
-  version: 4.6.0
-  resolution: "@sindresorhus/is@npm:4.6.0"
-  checksum: 10c0/33b6fb1d0834ec8dd7689ddc0e2781c2bfd8b9c4e4bacbcb14111e0ae00621f2c264b8a7d36541799d74888b5dccdf422a891a5cb5a709ace26325eedc81e22e
-  languageName: node
-  linkType: hard
-
-"@sindresorhus/is@npm:^5.2.0":
-  version: 5.6.0
-  resolution: "@sindresorhus/is@npm:5.6.0"
-  checksum: 10c0/66727344d0c92edde5760b5fd1f8092b717f2298a162a5f7f29e4953e001479927402d9d387e245fb9dc7d3b37c72e335e93ed5875edfc5203c53be8ecba1b52
-  languageName: node
-  linkType: hard
-
-"@sindresorhus/merge-streams@npm:^2.1.0":
-  version: 2.3.0
-  resolution: "@sindresorhus/merge-streams@npm:2.3.0"
-  checksum: 10c0/69ee906f3125fb2c6bb6ec5cdd84e8827d93b49b3892bce8b62267116cc7e197b5cccf20c160a1d32c26014ecd14470a72a5e3ee37a58f1d6dadc0db1ccf3894
+"@sindresorhus/merge-streams@npm:^2.1.0":
+  version: 2.3.0
+  resolution: "@sindresorhus/merge-streams@npm:2.3.0"
+  checksum: 10c0/69ee906f3125fb2c6bb6ec5cdd84e8827d93b49b3892bce8b62267116cc7e197b5cccf20c160a1d32c26014ecd14470a72a5e3ee37a58f1d6dadc0db1ccf3894
   languageName: node
   linkType: hard
 
@@ -7867,34 +6232,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@statsig/client-core@npm:3.24.4":
-  version: 3.24.4
-  resolution: "@statsig/client-core@npm:3.24.4"
-  checksum: 10c0/df52d3821f7ee13c5f9d478b43a9919f036a7095c256e6612b7d8242016503d0a234a44389ae5d9117bec872e2c565824dc72f9c7193cd3c51538088b00e1bbc
-  languageName: node
-  linkType: hard
-
-"@statsig/js-client@npm:3.24.4, @statsig/js-client@npm:^3.1.0":
-  version: 3.24.4
-  resolution: "@statsig/js-client@npm:3.24.4"
-  dependencies:
-    "@statsig/client-core": "npm:3.24.4"
-  checksum: 10c0/d72458e1c0b8484137e0d27473ef2e9224d8680de602b7ebcf4637e74adf09a60cbe6a361cb35b4dc6f2edcd37a200b26bd4e560494c29d8df16b59be07a2e58
-  languageName: node
-  linkType: hard
-
-"@statsig/react-bindings@npm:^3.1.0":
-  version: 3.24.4
-  resolution: "@statsig/react-bindings@npm:3.24.4"
-  dependencies:
-    "@statsig/client-core": "npm:3.24.4"
-    "@statsig/js-client": "npm:3.24.4"
-  peerDependencies:
-    react: ^16.6.3 || ^17.0.0 || ^18.0.0 || ^19.0.0
-  checksum: 10c0/1306585eb068c38c093c4e170cc686575bfd78aa9a38162d0de80ec9c9aeb49bab67fb240937369752e7a0e9f6713eb241a4a3741c8ca923e1d3561146ba2913
-  languageName: node
-  linkType: hard
-
 "@sveltejs/acorn-typescript@npm:^1.0.9":
   version: 1.0.9
   resolution: "@sveltejs/acorn-typescript@npm:1.0.9"
@@ -8069,53 +6406,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tailwindcss/line-clamp@npm:^0.4.4":
-  version: 0.4.4
-  resolution: "@tailwindcss/line-clamp@npm:0.4.4"
-  peerDependencies:
-    tailwindcss: ">=2.0.0 || >=3.0.0 || >=3.0.0-alpha.1"
-  checksum: 10c0/53e74e75bff066469501b784ab70af444fa460d556a3adf95cb14ccf1a56b1e63c106f0c4bb94463ba0310f2ce1f71350f9b18a556048655cfd2a0ad308ccfb8
-  languageName: node
-  linkType: hard
-
-"@tanstack/react-table@npm:^8.11.7":
-  version: 8.20.1
-  resolution: "@tanstack/react-table@npm:8.20.1"
-  dependencies:
-    "@tanstack/table-core": "npm:8.20.1"
-  peerDependencies:
-    react: ">=16.8"
-    react-dom: ">=16.8"
-  checksum: 10c0/dc0bac56425de05bb51dca32d488a6ca4f2395375f8c02b1c0082ee0f654841efa1263b357c62864f7c44ed39c0be1fb547aa7350ee7e39be5c7dd19b4155260
-  languageName: node
-  linkType: hard
-
-"@tanstack/react-virtual@npm:^3.0.0-beta.60":
-  version: 3.8.4
-  resolution: "@tanstack/react-virtual@npm:3.8.4"
-  dependencies:
-    "@tanstack/virtual-core": "npm:3.8.4"
-  peerDependencies:
-    react: ^16.8.0 || ^17.0.0 || ^18.0.0
-    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 10c0/2c803a0fd9101c75666b894d455c0c793bc50df4b5039e2bc748c4c50b64ec4ebaf3de990ab711d396ad8cd0582ca1858c7d0132d7f72acb57dfd9721464186e
-  languageName: node
-  linkType: hard
-
-"@tanstack/table-core@npm:8.20.1":
-  version: 8.20.1
-  resolution: "@tanstack/table-core@npm:8.20.1"
-  checksum: 10c0/540a4df688cad9261f77ca454aab62720615569805b5396bd012b411bb65dbb3fdf38f2a0b91a60b2e0def139d1517ad9a3f28f2cede5317d70ad1ad0dd1c5a3
-  languageName: node
-  linkType: hard
-
-"@tanstack/virtual-core@npm:3.8.4":
-  version: 3.8.4
-  resolution: "@tanstack/virtual-core@npm:3.8.4"
-  checksum: 10c0/32b3d7c7d7c380992730f38efe171eddb4841a3f9bdac198ff6f6e7c00da0e22d2984d57dcb27895f234768accb5625fc04946aa8745c22a136b3f31941d42ac
-  languageName: node
-  linkType: hard
-
 "@tokenizer/token@npm:^0.3.0":
   version: 0.3.0
   resolution: "@tokenizer/token@npm:0.3.0"
@@ -8205,7 +6495,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/d3-array@npm:*, @types/d3-array@npm:^3.0.3":
+"@types/d3-array@npm:*":
   version: 3.2.1
   resolution: "@types/d3-array@npm:3.2.1"
   checksum: 10c0/38bf2c778451f4b79ec81a2288cb4312fe3d6449ecdf562970cc339b60f280f31c93a024c7ff512607795e79d3beb0cbda123bb07010167bce32927f71364bca
@@ -8284,7 +6574,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/d3-ease@npm:*, @types/d3-ease@npm:^3.0.0":
+"@types/d3-ease@npm:*":
   version: 3.0.2
   resolution: "@types/d3-ease@npm:3.0.2"
   checksum: 10c0/aff5a1e572a937ee9bff6465225d7ba27d5e0c976bd9eacdac2e6f10700a7cb0c9ea2597aff6b43a6ed850a3210030870238894a77ec73e309b4a9d0333f099c
@@ -8330,7 +6620,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/d3-interpolate@npm:*, @types/d3-interpolate@npm:^3.0.1":
+"@types/d3-interpolate@npm:*":
   version: 3.0.4
   resolution: "@types/d3-interpolate@npm:3.0.4"
   dependencies:
@@ -8374,7 +6664,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/d3-scale@npm:*, @types/d3-scale@npm:^4.0.2":
+"@types/d3-scale@npm:*":
   version: 4.0.8
   resolution: "@types/d3-scale@npm:4.0.8"
   dependencies:
@@ -8390,7 +6680,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/d3-shape@npm:*, @types/d3-shape@npm:^3.1.0":
+"@types/d3-shape@npm:*":
   version: 3.1.7
   resolution: "@types/d3-shape@npm:3.1.7"
   dependencies:
@@ -8406,14 +6696,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/d3-time@npm:*, @types/d3-time@npm:^3.0.0":
+"@types/d3-time@npm:*":
   version: 3.0.3
   resolution: "@types/d3-time@npm:3.0.3"
   checksum: 10c0/245a8aadca504df27edf730de502e47a68f16ae795c86b5ca35e7afa91c133aa9ef4d08778f8cf1ed2be732f89a4105ba4b437ce2afbdfd17d3d937b6ba5f568
   languageName: node
   linkType: hard
 
-"@types/d3-timer@npm:*, @types/d3-timer@npm:^3.0.0":
+"@types/d3-timer@npm:*":
   version: 3.0.2
   resolution: "@types/d3-timer@npm:3.0.2"
   checksum: 10c0/c644dd9571fcc62b1aa12c03bcad40571553020feeb5811f1d8a937ac1e65b8a04b759b4873aef610e28b8714ac71c9885a4d6c127a048d95118f7e5b506d9e1
@@ -8593,7 +6883,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/hast@npm:^3.0.0, @types/hast@npm:^3.0.4":
+"@types/hast@npm:^3.0.0":
   version: 3.0.4
   resolution: "@types/hast@npm:3.0.4"
   dependencies:
@@ -8911,13 +7201,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/stylis@npm:4.2.5":
-  version: 4.2.5
-  resolution: "@types/stylis@npm:4.2.5"
-  checksum: 10c0/23f5b35a3a04f6bb31a29d404fa1bc8e0035fcaff2356b4047743a057e0c37b2eba7efe14d57dd2b95b398cea3bac294d9c6cd93ed307d8c0b7f5d282224b469
-  languageName: node
-  linkType: hard
-
 "@types/triple-beam@npm:^1.3.2":
   version: 1.3.5
   resolution: "@types/triple-beam@npm:1.3.5"
@@ -9055,13 +7338,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vercel/edge@npm:^1.1.1":
-  version: 1.1.2
-  resolution: "@vercel/edge@npm:1.1.2"
-  checksum: 10c0/778b20862713d37ff09ea1603e6c7b2e378117026809fb2d795c279443c21a99ffba476bad937b37e72624ce7d8936070be6b16d0973ee6b2c3934de37cdbb91
-  languageName: node
-  linkType: hard
-
 "@vercel/nft@npm:0.29.4":
   version: 0.29.4
   resolution: "@vercel/nft@npm:0.29.4"
@@ -9469,21 +7745,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"abitype@npm:1.0.0":
-  version: 1.0.0
-  resolution: "abitype@npm:1.0.0"
-  peerDependencies:
-    typescript: ">=5.0.4"
-    zod: ^3 >=3.22.0
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-    zod:
-      optional: true
-  checksum: 10c0/d685351a725c49f81bdc588e2f3825c28ad96c59048d4f36bf5e4ef30935c31f7e60b5553c70177b77a9e4d8b04290eea43d3d9c1c2562cb130381c88b15d39f
-  languageName: node
-  linkType: hard
-
 "abort-controller@npm:^3.0.0":
   version: 3.0.0
   resolution: "abort-controller@npm:3.0.0"
@@ -9811,13 +8072,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ansi-styles@npm:^5.0.0":
-  version: 5.2.0
-  resolution: "ansi-styles@npm:5.2.0"
-  checksum: 10c0/9c4ca80eb3c2fb7b33841c210d2f20807f40865d27008d7c3f707b7f95cab7d67462a565e2388ac3285b71cb3d9bb2173de8da37c57692a362885ec34d6e27df
-  languageName: node
-  linkType: hard
-
 "ansi-styles@npm:^6.1.0, ansi-styles@npm:^6.2.1":
   version: 6.2.1
   resolution: "ansi-styles@npm:6.2.1"
@@ -9913,15 +8167,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"aria-hidden@npm:^1.1.1":
-  version: 1.2.4
-  resolution: "aria-hidden@npm:1.2.4"
-  dependencies:
-    tslib: "npm:^2.0.0"
-  checksum: 10c0/8abcab2e1432efc4db415e97cb3959649ddf52c8fc815d7384f43f3d3abf56f1c12852575d00df9a8927f421d7e0712652dd5f8db244ea57634344e29ecfc74a
-  languageName: node
-  linkType: hard
-
 "array-flatten@npm:1.1.1":
   version: 1.1.1
   resolution: "array-flatten@npm:1.1.1"
@@ -10061,7 +8306,6 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "aztec-docs@workspace:."
   dependencies:
-    "@cookbookdev/docsbot": "npm:^4.25.15"
     "@docusaurus/core": "npm:3.9.1"
     "@docusaurus/plugin-content-docs": "npm:3.9.1"
     "@docusaurus/plugin-ideal-image": "npm:3.9.1"
@@ -10072,7 +8316,7 @@ __metadata:
     "@tsconfig/docusaurus": "npm:^1.0.7"
     clsx: "npm:^2.1.1"
     cspell: "npm:^8.19.4"
-    docusaurus-plugin-llms: "npm:^0.2.0"
+    docusaurus-plugin-llms: "npm:^0.4.0"
     docusaurus-theme-search-typesense: "npm:0.25.0"
     dotenv: "npm:^16.6.1"
     netlify-cli: "npm:^24.0.1"
@@ -10082,6 +8326,7 @@ __metadata:
     react-markdown: "npm:6.0.3"
     react-player: "npm:^2.16.1"
     rehype-katex: "npm:7"
+    remark-gfm: "npm:^1.0.0"
     remark-math: "npm:6"
   languageName: unknown
   linkType: soft
@@ -10269,17 +8514,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"bcp-47@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "bcp-47@npm:2.1.0"
-  dependencies:
-    is-alphabetical: "npm:^2.0.0"
-    is-alphanumerical: "npm:^2.0.0"
-    is-decimal: "npm:^2.0.0"
-  checksum: 10c0/0b461b6d5bad215665e59bc57c4e1489312da541612558629e4f3d3538b16ce6c2709a4b62ec9ed6fca7a339740c27df6a454d5821a849b3df5ff7e697372885
-  languageName: node
-  linkType: hard
-
 "before-after-hook@npm:^4.0.0":
   version: 4.0.0
   resolution: "before-after-hook@npm:4.0.0"
@@ -10712,62 +8946,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"camelize@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "camelize@npm:1.0.1"
-  checksum: 10c0/4c9ac55efd356d37ac483bad3093758236ab686192751d1c9daa43188cc5a07b09bd431eb7458a4efd9ca22424bba23253e7b353feb35d7c749ba040de2385fb
-  languageName: node
-  linkType: hard
-
-"can-dom-mutate@npm:^2.0.9":
-  version: 2.0.9
-  resolution: "can-dom-mutate@npm:2.0.9"
-  dependencies:
-    can-globals: "npm:^1.0.0"
-    can-namespace: "npm:1.0.0"
-    can-reflect: "npm:^1.17.6"
-    can-symbol: "npm:^1.6.4"
-  checksum: 10c0/49db3eb6701c4480426bb0f4572fc24bf358ad0172cc6759e4f564d11f3598c8142976bca8b4e851e02f3ec9b3b438610a8b71d83b82f12c4dd4eded16f8cd47
-  languageName: node
-  linkType: hard
-
-"can-globals@npm:^1.0.0":
-  version: 1.2.2
-  resolution: "can-globals@npm:1.2.2"
-  dependencies:
-    can-namespace: "npm:^1.0.0"
-    can-reflect: "npm:^1.2.6"
-    can-symbol: "npm:^1.0.0"
-  checksum: 10c0/2af848f7931e51749c5d1e819010e977da70cfbf934820c076dde713e3e4dce32046279708b5113479d150d092673a0849edd710070c74c8b7789636d5a0b045
-  languageName: node
-  linkType: hard
-
-"can-namespace@npm:1.0.0, can-namespace@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "can-namespace@npm:1.0.0"
-  checksum: 10c0/416dd09332a66df495c5b1bde132beab9fd76adab872edaa97605542012817d5b28586ed30d729822cc89da5adfa614adb65471abd96dad1ebb34fea88e6c72f
-  languageName: node
-  linkType: hard
-
-"can-reflect@npm:^1.17.6, can-reflect@npm:^1.2.6":
-  version: 1.19.2
-  resolution: "can-reflect@npm:1.19.2"
-  dependencies:
-    can-namespace: "npm:^1.0.0"
-    can-symbol: "npm:^1.7.0"
-  checksum: 10c0/e33e201c59757ad0afcc675f147265f4c473ef9cee2209f3827890a80b6f9b095246f0e2588188d642012955c1a48907e79843cedeb5b48df2613984574d700d
-  languageName: node
-  linkType: hard
-
-"can-symbol@npm:^1.0.0, can-symbol@npm:^1.6.4, can-symbol@npm:^1.7.0":
-  version: 1.7.0
-  resolution: "can-symbol@npm:1.7.0"
-  dependencies:
-    can-namespace: "npm:^1.0.0"
-  checksum: 10c0/2b01e8792527a7976aaefc214dde7d461bfcb07be80715733c7b1d2e345f305ce33307db3be93a5f58fa6d80cf13f9b44abba9e6cd64f1585986be181decc66e
-  languageName: node
-  linkType: hard
-
 "caniuse-api@npm:^3.0.0":
   version: 3.0.0
   resolution: "caniuse-api@npm:3.0.0"
@@ -10787,6 +8965,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ccount@npm:^1.0.0":
+  version: 1.1.0
+  resolution: "ccount@npm:1.1.0"
+  checksum: 10c0/9ccfddfa45c8d6d01411b8e30d2ce03c55c33f32a69bdb84ee44d743427cdb01b03159954917023d0dac960c34973ba42626bb9fa883491ebb663a53a6713d43
+  languageName: node
+  linkType: hard
+
 "ccount@npm:^2.0.0":
   version: 2.0.1
   resolution: "ccount@npm:2.0.1"
@@ -11154,28 +9339,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"clsx@npm:^2.0.0, clsx@npm:^2.1.0, clsx@npm:^2.1.1":
+"clsx@npm:^2.0.0, clsx@npm:^2.1.1":
   version: 2.1.1
   resolution: "clsx@npm:2.1.1"
   checksum: 10c0/c4c8eb865f8c82baab07e71bfa8897c73454881c4f99d6bc81585aecd7c441746c1399d08363dc096c550cceaf97bd4ce1e8854e1771e9998d9f94c4fe075839
   languageName: node
   linkType: hard
 
-"cmdk-react17@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "cmdk-react17@npm:1.0.0"
-  dependencies:
-    "@radix-ui/react-dialog": "npm:1.0.5"
-    "@radix-ui/react-id": "npm:^1.0.1"
-    "@radix-ui/react-primitive": "npm:1.0.3"
-    use-sync-external-store: "npm:^1.2.0"
-  peerDependencies:
-    react: ^17.0.0
-    react-dom: ^17.0.0
-  checksum: 10c0/db5477a141eebb25f7c38ead2b6e7a031638ac7143f216f1016f0f5e0cf68da393450e136cb4487816c4bfa4b4e6c7761ef1426074d635666a0f694217651940
-  languageName: node
-  linkType: hard
-
 "collapse-white-space@npm:^2.0.0":
   version: 2.1.0
   resolution: "collapse-white-space@npm:2.1.0"
@@ -11225,13 +9395,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"color2k@npm:^2.0.3":
-  version: 2.0.3
-  resolution: "color2k@npm:2.0.3"
-  checksum: 10c0/e7c13d212c9d1abb1690e378bbc0a6fb1751e4b02e9a73ba3b2ade9d54da673834597d342791d577d1ce400ec486c7f92c5098f9fa85cd113bcfde57420a2bb9
-  languageName: node
-  linkType: hard
-
 "color@npm:^3.1.3":
   version: 3.2.1
   resolution: "color@npm:3.2.1"
@@ -11313,13 +9476,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"command-exists@npm:^1.2.8":
-  version: 1.2.9
-  resolution: "command-exists@npm:1.2.9"
-  checksum: 10c0/75040240062de46cd6cd43e6b3032a8b0494525c89d3962e280dde665103f8cc304a8b313a5aa541b91da2f5a9af75c5959dc3a77893a2726407a5e9a0234c16
-  languageName: node
-  linkType: hard
-
 "commander@npm:12.1.0, commander@npm:^12.1.0":
   version: 12.1.0
   resolution: "commander@npm:12.1.0"
@@ -11369,7 +9525,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"commander@npm:^8.1.0, commander@npm:^8.3.0":
+"commander@npm:^8.3.0":
   version: 8.3.0
   resolution: "commander@npm:8.3.0"
   checksum: 10c0/8b043bb8322ea1c39664a1598a95e0495bfe4ca2fad0d84a92d7d1d8d213e2a155b441d2470c8e08de7c4a28cf2bc6e169211c49e1b21d9f7edc6ae4d9356060
@@ -11400,19 +9556,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"common-path-prefix@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "common-path-prefix@npm:3.0.0"
-  checksum: 10c0/c4a74294e1b1570f4a8ab435285d185a03976c323caa16359053e749db4fde44e3e6586c29cd051100335e11895767cbbd27ea389108e327d62f38daf4548fdb
-  languageName: node
-  linkType: hard
-
-"composed-offset-position@npm:^0.0.6":
-  version: 0.0.6
-  resolution: "composed-offset-position@npm:0.0.6"
-  peerDependencies:
-    "@floating-ui/utils": ^0.2.5
-  checksum: 10c0/aa8f91a8744806855b8019537c40a6f6fc61a8054d9f46b0b0c1feafadfb07d62fb660bf68db5e7ac9a339780046526e6c64402b6cdd25f3d6a4e06880c2c9b4
+"common-path-prefix@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "common-path-prefix@npm:3.0.0"
+  checksum: 10c0/c4a74294e1b1570f4a8ab435285d185a03976c323caa16359053e749db4fde44e3e6586c29cd051100335e11895767cbbd27ea389108e327d62f38daf4548fdb
   languageName: node
   linkType: hard
 
@@ -11683,7 +9830,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cosmiconfig@npm:^8.0.0, cosmiconfig@npm:^8.1.3, cosmiconfig@npm:^8.3.5":
+"cosmiconfig@npm:^8.1.3, cosmiconfig@npm:^8.3.5":
   version: 8.3.6
   resolution: "cosmiconfig@npm:8.3.6"
   dependencies:
@@ -11928,13 +10075,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-color-keywords@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "css-color-keywords@npm:1.0.0"
-  checksum: 10c0/af205a86c68e0051846ed91eb3e30b4517e1904aac040013ff1d742019b3f9369ba5658ba40901dbbc121186fc4bf0e75a814321cc3e3182fbb2feb81c6d9cb7
-  languageName: node
-  linkType: hard
-
 "css-declaration-sorter@npm:^7.2.0":
   version: 7.2.0
   resolution: "css-declaration-sorter@npm:7.2.0"
@@ -12045,17 +10185,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-to-react-native@npm:3.2.0":
-  version: 3.2.0
-  resolution: "css-to-react-native@npm:3.2.0"
-  dependencies:
-    camelize: "npm:^1.0.0"
-    css-color-keywords: "npm:^1.0.0"
-    postcss-value-parser: "npm:^4.0.2"
-  checksum: 10c0/fde850a511d5d3d7c55a1e9b8ed26b69a8ad4868b3487e36ebfbfc0b96fc34bc977d9cd1d61a289d0c74d3f9a662d8cee297da53d4433bf2e27d6acdff8e1003
-  languageName: node
-  linkType: hard
-
 "css-tree@npm:^2.3.1":
   version: 2.3.1
   resolution: "css-tree@npm:2.3.1"
@@ -12203,7 +10332,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"csstype@npm:3.1.3, csstype@npm:^3.0.2":
+"csstype@npm:^3.0.2":
   version: 3.1.3
   resolution: "csstype@npm:3.1.3"
   checksum: 10c0/80c089d6f7e0c5b2bd83cf0539ab41474198579584fa10d86d0cafe0642202343cbc119e076a0b1aece191989477081415d66c9fefbf3c957fc2fc4b7009f248
@@ -12255,7 +10384,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"d3-array@npm:2 - 3, d3-array@npm:2.10.0 - 3, d3-array@npm:2.5.0 - 3, d3-array@npm:3, d3-array@npm:^3.1.6, d3-array@npm:^3.2.0":
+"d3-array@npm:2 - 3, d3-array@npm:2.10.0 - 3, d3-array@npm:2.5.0 - 3, d3-array@npm:3, d3-array@npm:^3.2.0":
   version: 3.2.4
   resolution: "d3-array@npm:3.2.4"
   dependencies:
@@ -12356,7 +10485,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"d3-ease@npm:1 - 3, d3-ease@npm:3, d3-ease@npm:^3.0.1":
+"d3-ease@npm:1 - 3, d3-ease@npm:3":
   version: 3.0.1
   resolution: "d3-ease@npm:3.0.1"
   checksum: 10c0/fec8ef826c0cc35cda3092c6841e07672868b1839fcaf556e19266a3a37e6bc7977d8298c0fcb9885e7799bfdcef7db1baaba9cd4dcf4bc5e952cf78574a88b0
@@ -12406,7 +10535,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"d3-interpolate@npm:1 - 3, d3-interpolate@npm:1.2.0 - 3, d3-interpolate@npm:3, d3-interpolate@npm:^3.0.1":
+"d3-interpolate@npm:1 - 3, d3-interpolate@npm:1.2.0 - 3, d3-interpolate@npm:3":
   version: 3.0.1
   resolution: "d3-interpolate@npm:3.0.1"
   dependencies:
@@ -12470,7 +10599,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"d3-scale@npm:4, d3-scale@npm:^4.0.2":
+"d3-scale@npm:4":
   version: 4.0.2
   resolution: "d3-scale@npm:4.0.2"
   dependencies:
@@ -12490,7 +10619,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"d3-shape@npm:3, d3-shape@npm:^3.1.0":
+"d3-shape@npm:3":
   version: 3.2.0
   resolution: "d3-shape@npm:3.2.0"
   dependencies:
@@ -12517,7 +10646,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"d3-time@npm:1 - 3, d3-time@npm:2.1.1 - 3, d3-time@npm:3, d3-time@npm:^3.0.0":
+"d3-time@npm:1 - 3, d3-time@npm:2.1.1 - 3, d3-time@npm:3":
   version: 3.1.0
   resolution: "d3-time@npm:3.1.0"
   dependencies:
@@ -12526,7 +10655,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"d3-timer@npm:1 - 3, d3-timer@npm:3, d3-timer@npm:^3.0.1":
+"d3-timer@npm:1 - 3, d3-timer@npm:3":
   version: 3.0.1
   resolution: "d3-timer@npm:3.0.1"
   checksum: 10c0/d4c63cb4bb5461d7038aac561b097cd1c5673969b27cbdd0e87fa48d9300a538b9e6f39b4a7f0e3592ef4f963d858c8a9f0e92754db73116770856f2fc04561a
@@ -12660,13 +10789,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"decimal.js-light@npm:^2.4.1":
-  version: 2.5.1
-  resolution: "decimal.js-light@npm:2.5.1"
-  checksum: 10c0/4fd33f535aac9e5bd832796831b65d9ec7914ad129c7437b3ab991b0c2eaaa5a57e654e6174c4a17f1b3895ea366f0c1ab4955cdcdf7cfdcf3ad5a58b456c020
-  languageName: node
-  linkType: hard
-
 "decode-named-character-reference@npm:^1.0.0":
   version: 1.0.2
   resolution: "decode-named-character-reference@npm:1.0.2"
@@ -12868,13 +10990,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"detect-node-es@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "detect-node-es@npm:1.1.0"
-  checksum: 10c0/e562f00de23f10c27d7119e1af0e7388407eb4b06596a25f6d79a360094a109ff285de317f02b090faae093d314cf6e73ac3214f8a5bb3a0def5bece94557fbe
-  languageName: node
-  linkType: hard
-
 "detect-node@npm:^2.0.4":
   version: 2.1.0
   resolution: "detect-node@npm:2.1.0"
@@ -13047,16 +11162,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"docusaurus-plugin-llms@npm:^0.2.0":
-  version: 0.2.2
-  resolution: "docusaurus-plugin-llms@npm:0.2.2"
+"docusaurus-plugin-llms@npm:^0.4.0":
+  version: 0.4.0
+  resolution: "docusaurus-plugin-llms@npm:0.4.0"
   dependencies:
     gray-matter: "npm:^4.0.3"
     minimatch: "npm:^9.0.3"
     yaml: "npm:^2.8.1"
   peerDependencies:
     "@docusaurus/core": ^3.0.0
-  checksum: 10c0/9fced1f053fce6ef7acc44a27837b2a44f7fc2635b4b32fc02f3980e65ec587a9d0b62ff83cdadbbad6be53bc161cd4baf904d07d1d6a15630b55592d15bf553
+  checksum: 10c0/bd47226c7b631a30af77d9693c6c2bb206487496932b3092b59f6e9e89c546188b397da05321aa33a7ca1def69366286fdd60ad4a5de6ff45e0d6212a34beb60
   languageName: node
   linkType: hard
 
@@ -13098,16 +11213,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dom-helpers@npm:^5.0.1":
-  version: 5.2.1
-  resolution: "dom-helpers@npm:5.2.1"
-  dependencies:
-    "@babel/runtime": "npm:^7.8.7"
-    csstype: "npm:^3.0.2"
-  checksum: 10c0/f735074d66dd759b36b158fa26e9d00c9388ee0e8c9b16af941c38f014a37fc80782de83afefd621681b19ac0501034b4f1c4a3bff5caa1b8667f0212b5e124c
-  languageName: node
-  linkType: hard
-
 "dom-serializer@npm:^1.0.1":
   version: 1.4.1
   resolution: "dom-serializer@npm:1.4.1"
@@ -13897,7 +12002,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eventemitter3@npm:^4.0.0, eventemitter3@npm:^4.0.1, eventemitter3@npm:^4.0.4":
+"eventemitter3@npm:^4.0.0, eventemitter3@npm:^4.0.4":
   version: 4.0.7
   resolution: "eventemitter3@npm:4.0.7"
   checksum: 10c0/5f6d97cbcbac47be798e6355e3a7639a84ee1f7d9b199a07017f1d2f1e2fe236004d14fa5dfaeba661f94ea57805385e326236a6debbc7145c8877fbc0297c6b
@@ -14139,7 +12244,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fast-equals@npm:^5.0.1, fast-equals@npm:^5.2.2":
+"fast-equals@npm:^5.2.2":
   version: 5.2.2
   resolution: "fast-equals@npm:5.2.2"
   checksum: 10c0/2bfeac6317a8959a00e2134749323557e5df6dea3af24e4457297733eace8ce4313fcbca2cf4532f3a6792607461e80442cd8d3af148d5c2e4e98ad996d6e5b5
@@ -14354,20 +12459,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fflate@npm:^0.4.8":
-  version: 0.4.8
-  resolution: "fflate@npm:0.4.8"
-  checksum: 10c0/29d1eddaaa5deab61b1c6b0d21282adacadbc4d2c01e94d8b1ee784398151673b9c563e53f97a801bc410a1ae55e8de5378114a743430e643e7a0644ba8e5a42
-  languageName: node
-  linkType: hard
-
-"fflate@npm:^0.8.2":
-  version: 0.8.2
-  resolution: "fflate@npm:0.8.2"
-  checksum: 10c0/03448d630c0a583abea594835a9fdb2aaf7d67787055a761515bf4ed862913cfd693b4c4ffd5c3f3b355a70cf1e19033e9ae5aedcca103188aaff91b8bd6e293
-  languageName: node
-  linkType: hard
-
 "figures@npm:^3.0.0, figures@npm:^3.2.0":
   version: 3.2.0
   resolution: "figures@npm:3.2.0"
@@ -14416,13 +12507,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"file-saver@npm:^2.0.5":
-  version: 2.0.5
-  resolution: "file-saver@npm:2.0.5"
-  checksum: 10c0/0a361f683786c34b2574aea53744cb70d0a6feb0fa5e3af00f2fcb6c9d40d3049cc1470e38c6c75df24219f247f6fb3076f86943958f580e62ee2ffe897af8b1
-  languageName: node
-  linkType: hard
-
 "file-type@npm:^18.5.0":
   version: 18.7.0
   resolution: "file-type@npm:18.7.0"
@@ -14633,7 +12717,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.12.1":
+"follow-redirects@npm:^1.0.0":
   version: 1.15.6
   resolution: "follow-redirects@npm:1.15.6"
   peerDependenciesMeta:
@@ -14713,36 +12797,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"framer-motion@npm:^6.5.1":
-  version: 6.5.1
-  resolution: "framer-motion@npm:6.5.1"
-  dependencies:
-    "@emotion/is-prop-valid": "npm:^0.8.2"
-    "@motionone/dom": "npm:10.12.0"
-    framesync: "npm:6.0.1"
-    hey-listen: "npm:^1.0.8"
-    popmotion: "npm:11.0.3"
-    style-value-types: "npm:5.0.0"
-    tslib: "npm:^2.1.0"
-  peerDependencies:
-    react: ">=16.8 || ^17.0.0 || ^18.0.0"
-    react-dom: ">=16.8 || ^17.0.0 || ^18.0.0"
-  dependenciesMeta:
-    "@emotion/is-prop-valid":
-      optional: true
-  checksum: 10c0/69d64f7ac878eb5a0d90f1ccbaaee76f7731b276c4369fdce7d283fa92cca35ea05c42ad2da0c6c0ab4bb180b7fa4f511b6928bdb43818f6feaf245531d3df5a
-  languageName: node
-  linkType: hard
-
-"framesync@npm:6.0.1":
-  version: 6.0.1
-  resolution: "framesync@npm:6.0.1"
-  dependencies:
-    tslib: "npm:^2.1.0"
-  checksum: 10c0/ce84ce548a8612be070204b9cf3ce7258acead2d51df05586995340e501d1439dfc1f9402ede921a9c0dde854d80fd46e97c699a3657f8d7abd5bc705553bf2b
-  languageName: node
-  linkType: hard
-
 "fresh@npm:0.5.2":
   version: 0.5.2
   resolution: "fresh@npm:0.5.2"
@@ -14918,13 +12972,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"get-nonce@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "get-nonce@npm:1.0.1"
-  checksum: 10c0/2d7df55279060bf0568549e1ffc9b84bc32a32b7541675ca092dce56317cdd1a59a98dcc4072c9f6a980779440139a3221d7486f52c488e69dc0fd27b1efb162
-  languageName: node
-  linkType: hard
-
 "get-own-enumerable-property-symbols@npm:^3.0.0":
   version: 3.0.2
   resolution: "get-own-enumerable-property-symbols@npm:3.0.2"
@@ -15366,21 +13413,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"hast-to-hyperscript@npm:^9.0.0":
-  version: 9.0.1
-  resolution: "hast-to-hyperscript@npm:9.0.1"
-  dependencies:
-    "@types/unist": "npm:^2.0.3"
-    comma-separated-tokens: "npm:^1.0.0"
-    property-information: "npm:^5.3.0"
-    space-separated-tokens: "npm:^1.0.0"
-    style-to-object: "npm:^0.3.0"
-    unist-util-is: "npm:^4.0.0"
-    web-namespaces: "npm:^1.0.0"
-  checksum: 10c0/630f0db8e1c78d8d6e4f8bd19dec4b6ff6c3048ba0b07b8e34bb812dfbbdc96f4c16abca16c3bfc64e7757921f42790a7bd4a693d6ce99375f99dead65a19a12
-  languageName: node
-  linkType: hard
-
 "hast-util-from-dom@npm:^5.0.0":
   version: 5.0.0
   resolution: "hast-util-from-dom@npm:5.0.0"
@@ -15535,15 +13567,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"hast-util-to-string@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "hast-util-to-string@npm:3.0.0"
-  dependencies:
-    "@types/hast": "npm:^3.0.0"
-  checksum: 10c0/649edd993cf244563ad86d861aa0863759a4fbec49c43b3d92240e42aa4b69f0c3332ddff9e80954bbd8756c86b0fddc20e97d281c6da59d00427f45da8dab68
-  languageName: node
-  linkType: hard
-
 "hast-util-to-text@npm:^4.0.0":
   version: 4.0.2
   resolution: "hast-util-to-text@npm:4.0.2"
@@ -15587,13 +13610,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"hey-listen@npm:^1.0.8":
-  version: 1.0.8
-  resolution: "hey-listen@npm:1.0.8"
-  checksum: 10c0/38db3028b4756f3d536c0f6a92da53bad577ab649b06dddfd0a4d953f9a46bbc6a7f693c8c5b466a538d6d23dbc469260c848427f0de14198a2bbecbac37b39e
-  languageName: node
-  linkType: hard
-
 "history@npm:^4.9.0":
   version: 4.10.1
   resolution: "history@npm:4.10.1"
@@ -15993,13 +14009,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"idb@npm:^8.0.0":
-  version: 8.0.0
-  resolution: "idb@npm:8.0.0"
-  checksum: 10c0/d27547e03939d3d269cea38c3d4528569621ec134c717ebfc1ff816dce18e4f77372dba1d930384a9949ac56dc600e3790f98f1812a4164004e71fec302ee491
-  languageName: node
-  linkType: hard
-
 "ieee754@npm:^1.1.13, ieee754@npm:^1.2.1":
   version: 1.2.1
   resolution: "ieee754@npm:1.2.1"
@@ -16037,13 +14046,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"immediate@npm:~3.0.5":
-  version: 3.0.6
-  resolution: "immediate@npm:3.0.6"
-  checksum: 10c0/f8ba7ede69bee9260241ad078d2d535848745ff5f6995c7c7cb41cfdc9ccc213f66e10fa5afb881f90298b24a3f7344b637b592beb4f54e582770cdce3f1f039
-  languageName: node
-  linkType: hard
-
 "import-fresh@npm:^3.2.1, import-fresh@npm:^3.3.0, import-fresh@npm:^3.3.1":
   version: 3.3.1
   resolution: "import-fresh@npm:3.3.1"
@@ -16802,13 +14804,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"iso-639-1@npm:^3.1.3":
-  version: 3.1.5
-  resolution: "iso-639-1@npm:3.1.5"
-  checksum: 10c0/04739478e55313f2badd4b1db80b3fb61a326cb9df639a05098ccbbac2b52e60458707d9c4834f5a0cddd133dc71f5f5554e99b16d8f26f86e359b3a0e91da0d
-  languageName: node
-  linkType: hard
-
 "isobject@npm:^3.0.1":
   version: 3.0.1
   resolution: "isobject@npm:3.0.1"
@@ -16816,15 +14811,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"isows@npm:1.0.3":
-  version: 1.0.3
-  resolution: "isows@npm:1.0.3"
-  peerDependencies:
-    ws: "*"
-  checksum: 10c0/adec15db704bb66615dd8ef33f889d41ae2a70866b21fa629855da98cc82a628ae072ee221fe9779a9a19866cad2a3e72593f2d161a0ce0e168b4484c7df9cd2
-  languageName: node
-  linkType: hard
-
 "jackspeak@npm:^3.1.2":
   version: 3.4.3
   resolution: "jackspeak@npm:3.4.3"
@@ -16838,13 +14824,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-get-type@npm:^29.6.3":
-  version: 29.6.3
-  resolution: "jest-get-type@npm:29.6.3"
-  checksum: 10c0/552e7a97a983d3c2d4e412a44eb7de0430ff773dd99f7500962c268d6dfbfa431d7d08f919c9d960530e5f7f78eb47f267ad9b318265e5092b3ff9ede0db7c2b
-  languageName: node
-  linkType: hard
-
 "jest-util@npm:^29.7.0":
   version: 29.7.0
   resolution: "jest-util@npm:29.7.0"
@@ -16859,20 +14838,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-validate@npm:^29.4.3":
-  version: 29.7.0
-  resolution: "jest-validate@npm:29.7.0"
-  dependencies:
-    "@jest/types": "npm:^29.6.3"
-    camelcase: "npm:^6.2.0"
-    chalk: "npm:^4.0.0"
-    jest-get-type: "npm:^29.6.3"
-    leven: "npm:^3.1.0"
-    pretty-format: "npm:^29.7.0"
-  checksum: 10c0/a20b930480c1ed68778c739f4739dce39423131bc070cd2505ddede762a5570a256212e9c2401b7ae9ba4d7b7c0803f03c5b8f1561c62348213aba18d9dbece2
-  languageName: node
-  linkType: hard
-
 "jest-worker@npm:^27.4.5":
   version: 27.5.1
   resolution: "jest-worker@npm:27.5.1"
@@ -16896,7 +14861,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jiti@npm:^1.17.1, jiti@npm:^1.20.0":
+"jiti@npm:^1.20.0":
   version: 1.21.7
   resolution: "jiti@npm:1.21.7"
   bin:
@@ -16943,20 +14908,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"js-sha256@npm:^0.10.1":
-  version: 0.10.1
-  resolution: "js-sha256@npm:0.10.1"
-  checksum: 10c0/c63119f7c7f8afc24bfa24c1a6b51147c3b562316b6341a375a1cef88569340ec0dbf2cda429ecf472cabfbae47a0b93a0cb82b8730883de066593c3f816c53b
-  languageName: node
-  linkType: hard
-
-"js-sha3@npm:0.8.0":
-  version: 0.8.0
-  resolution: "js-sha3@npm:0.8.0"
-  checksum: 10c0/43a21dc7967c871bd2c46cb1c2ae97441a97169f324e509f382d43330d8f75cf2c96dba7c806ab08a425765a9c847efdd4bffbac2d99c3a4f3de6c0218f40533
-  languageName: node
-  linkType: hard
-
 "js-tokens@npm:^3.0.0 || ^4.0.0, js-tokens@npm:^4.0.0":
   version: 4.0.0
   resolution: "js-tokens@npm:4.0.0"
@@ -17061,7 +15012,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"json5@npm:^2.1.2, json5@npm:^2.2.0, json5@npm:^2.2.3":
+"json5@npm:^2.1.2, json5@npm:^2.2.3":
   version: 2.2.3
   resolution: "json5@npm:2.2.3"
   bin:
@@ -17108,18 +15059,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jszip@npm:^3.10.1":
-  version: 3.10.1
-  resolution: "jszip@npm:3.10.1"
-  dependencies:
-    lie: "npm:~3.3.0"
-    pako: "npm:~1.0.2"
-    readable-stream: "npm:~2.3.6"
-    setimmediate: "npm:^1.0.5"
-  checksum: 10c0/58e01ec9c4960383fb8b38dd5f67b83ccc1ec215bf74c8a5b32f42b6e5fb79fada5176842a11409c4051b5b94275044851814a31076bf49e1be218d3ef57c863
-  languageName: node
-  linkType: hard
-
 "junk@npm:^4.0.0, junk@npm:^4.0.1":
   version: 4.0.1
   resolution: "junk@npm:4.0.1"
@@ -17330,15 +15269,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lie@npm:~3.3.0":
-  version: 3.3.0
-  resolution: "lie@npm:3.3.0"
-  dependencies:
-    immediate: "npm:~3.0.5"
-  checksum: 10c0/56dd113091978f82f9dc5081769c6f3b947852ecf9feccaf83e14a123bc630c2301439ce6182521e5fbafbde88e88ac38314327a4e0493a1bea7e0699a7af808
-  languageName: node
-  linkType: hard
-
 "light-my-request@npm:^6.0.0":
   version: 6.6.0
   resolution: "light-my-request@npm:6.6.0"
@@ -17470,13 +15400,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash.get@npm:^4.4.2":
-  version: 4.4.2
-  resolution: "lodash.get@npm:4.4.2"
-  checksum: 10c0/48f40d471a1654397ed41685495acb31498d5ed696185ac8973daef424a749ca0c7871bf7b665d5c14f5cc479394479e0307e781f61d5573831769593411be6e
-  languageName: node
-  linkType: hard
-
 "lodash.includes@npm:^4.3.0":
   version: 4.3.0
   resolution: "lodash.includes@npm:4.3.0"
@@ -17631,6 +15554,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"longest-streak@npm:^2.0.0":
+  version: 2.0.4
+  resolution: "longest-streak@npm:2.0.4"
+  checksum: 10c0/918fb5104cde537757f44431776d6d828bc091a63ca38a3b3e59a08b88498b4421bf5fd9823ef22b4d186f0234d9943087fa96bd6117d26dedcf6008480fd46a
+  languageName: node
+  linkType: hard
+
 "longest-streak@npm:^3.0.0":
   version: 3.1.0
   resolution: "longest-streak@npm:3.1.0"
@@ -17845,6 +15775,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"mdast-util-find-and-replace@npm:^1.1.0":
+  version: 1.1.1
+  resolution: "mdast-util-find-and-replace@npm:1.1.1"
+  dependencies:
+    escape-string-regexp: "npm:^4.0.0"
+    unist-util-is: "npm:^4.0.0"
+    unist-util-visit-parents: "npm:^3.0.0"
+  checksum: 10c0/4b9da583e858146a6553155795ef2f0d37b72b8d20487f75895e01fd240a483fbdb97f5aecd218e8ce598be24edb742c5bcbcba2896d172101529376ef390633
+  languageName: node
+  linkType: hard
+
 "mdast-util-find-and-replace@npm:^3.0.0, mdast-util-find-and-replace@npm:^3.0.1":
   version: 3.0.1
   resolution: "mdast-util-find-and-replace@npm:3.0.1"
@@ -17904,6 +15845,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"mdast-util-gfm-autolink-literal@npm:^0.1.0":
+  version: 0.1.3
+  resolution: "mdast-util-gfm-autolink-literal@npm:0.1.3"
+  dependencies:
+    ccount: "npm:^1.0.0"
+    mdast-util-find-and-replace: "npm:^1.1.0"
+    micromark: "npm:^2.11.3"
+  checksum: 10c0/155665a88a9b11fb5f8b6c5bff1a1e9d30f7381ff8c1864c7ede1eab4e312c51cef1e92e113cda174ebad40181350e555c303fa3293a1dc60b8945818d0af39a
+  languageName: node
+  linkType: hard
+
 "mdast-util-gfm-autolink-literal@npm:^2.0.0":
   version: 2.0.0
   resolution: "mdast-util-gfm-autolink-literal@npm:2.0.0"
@@ -17930,6 +15882,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"mdast-util-gfm-strikethrough@npm:^0.2.0":
+  version: 0.2.3
+  resolution: "mdast-util-gfm-strikethrough@npm:0.2.3"
+  dependencies:
+    mdast-util-to-markdown: "npm:^0.6.0"
+  checksum: 10c0/1de00913769c252add1f48fea547121d971ef7a8bfe6a89b775dea38aa319e6b10b6f514b492586aa7e660f8880b5c2390e411302a0b2386ed793f914b9eca71
+  languageName: node
+  linkType: hard
+
 "mdast-util-gfm-strikethrough@npm:^2.0.0":
   version: 2.0.0
   resolution: "mdast-util-gfm-strikethrough@npm:2.0.0"
@@ -17941,6 +15902,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"mdast-util-gfm-table@npm:^0.1.0":
+  version: 0.1.6
+  resolution: "mdast-util-gfm-table@npm:0.1.6"
+  dependencies:
+    markdown-table: "npm:^2.0.0"
+    mdast-util-to-markdown: "npm:~0.6.0"
+  checksum: 10c0/a3b3fa2f91a44054dbe7e8a4cba1bcaa35255633da7850ad2688c60d1e1825d5d668774f31689d018d9f04cadc68f6055349048192c89a0e6c2ccb91a7ae7d1f
+  languageName: node
+  linkType: hard
+
 "mdast-util-gfm-table@npm:^2.0.0":
   version: 2.0.0
   resolution: "mdast-util-gfm-table@npm:2.0.0"
@@ -17954,6 +15925,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"mdast-util-gfm-task-list-item@npm:^0.1.0":
+  version: 0.1.6
+  resolution: "mdast-util-gfm-task-list-item@npm:0.1.6"
+  dependencies:
+    mdast-util-to-markdown: "npm:~0.6.0"
+  checksum: 10c0/6b5b5239f031b630cd433cfd0bb30b7258dfac7d49c86a2c937127bc00fda186f798cf2a671507bcfad00f075d2d8779be9c109549052d98f1b4927e6e12d8be
+  languageName: node
+  linkType: hard
+
 "mdast-util-gfm-task-list-item@npm:^2.0.0":
   version: 2.0.0
   resolution: "mdast-util-gfm-task-list-item@npm:2.0.0"
@@ -17966,6 +15946,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"mdast-util-gfm@npm:^0.1.0":
+  version: 0.1.2
+  resolution: "mdast-util-gfm@npm:0.1.2"
+  dependencies:
+    mdast-util-gfm-autolink-literal: "npm:^0.1.0"
+    mdast-util-gfm-strikethrough: "npm:^0.2.0"
+    mdast-util-gfm-table: "npm:^0.1.0"
+    mdast-util-gfm-task-list-item: "npm:^0.1.0"
+    mdast-util-to-markdown: "npm:^0.6.1"
+  checksum: 10c0/109c5f3e3340c25ecec5fb0b9b1a4137fb0948ffbc38ed4b85d477f3da471c2a475a84f2cb2569663768d6967aedf0f3a18b936ea907d0e34374f4eeaed18c5a
+  languageName: node
+  linkType: hard
+
 "mdast-util-gfm@npm:^3.0.0":
   version: 3.0.0
   resolution: "mdast-util-gfm@npm:3.0.0"
@@ -18101,6 +16094,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"mdast-util-to-markdown@npm:^0.6.0, mdast-util-to-markdown@npm:^0.6.1, mdast-util-to-markdown@npm:~0.6.0":
+  version: 0.6.5
+  resolution: "mdast-util-to-markdown@npm:0.6.5"
+  dependencies:
+    "@types/unist": "npm:^2.0.0"
+    longest-streak: "npm:^2.0.0"
+    mdast-util-to-string: "npm:^2.0.0"
+    parse-entities: "npm:^2.0.0"
+    repeat-string: "npm:^1.0.0"
+    zwitch: "npm:^1.0.0"
+  checksum: 10c0/716035b75a50394298eb31acee60a20d06310c7ebf83a3009908714d8c4058d636344932c9c054f1a26e8c6c20e2aafda3b87e003c16037b3e16b2d260a87463
+  languageName: node
+  linkType: hard
+
 "mdast-util-to-markdown@npm:^2.0.0, mdast-util-to-markdown@npm:^2.1.0":
   version: 2.1.0
   resolution: "mdast-util-to-markdown@npm:2.1.0"
@@ -18212,13 +16219,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"memorystream@npm:^0.3.1":
-  version: 0.3.1
-  resolution: "memorystream@npm:0.3.1"
-  checksum: 10c0/4bd164657711d9747ff5edb0508b2944414da3464b7fe21ac5c67cf35bba975c4b446a0124bd0f9a8be54cfc18faf92e92bd77563a20328b1ccf2ff04e9f39b9
-  languageName: node
-  linkType: hard
-
 "merge-descriptors@npm:1.0.3":
   version: 1.0.3
   resolution: "merge-descriptors@npm:1.0.3"
@@ -18284,13 +16284,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"messageformat-parser@npm:^4.1.3":
-  version: 4.1.3
-  resolution: "messageformat-parser@npm:4.1.3"
-  checksum: 10c0/e930c299d1e201cf13767571f2d182f7e451d0c8fb8ffa6535e9d06757213713a337559511b1a2fe1b5ad5a8f5df939bab80dfc1d2c6982f0a46eb1da9ab0891
-  languageName: node
-  linkType: hard
-
 "methods@npm:~1.1.2":
   version: 1.1.2
   resolution: "methods@npm:1.1.2"
@@ -18371,6 +16364,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"micromark-extension-gfm-autolink-literal@npm:~0.5.0":
+  version: 0.5.7
+  resolution: "micromark-extension-gfm-autolink-literal@npm:0.5.7"
+  dependencies:
+    micromark: "npm:~2.11.3"
+  checksum: 10c0/4e56021641200cd88a9e05be531405bba007db9187554e06d0dfb5d8c49df67991322f2f952d6a25bbe3972ef0543a08d7ea00dff7b8577f8f3ca196c6544114
+  languageName: node
+  linkType: hard
+
 "micromark-extension-gfm-footnote@npm:^2.0.0":
   version: 2.0.0
   resolution: "micromark-extension-gfm-footnote@npm:2.0.0"
@@ -18401,6 +16403,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"micromark-extension-gfm-strikethrough@npm:~0.6.5":
+  version: 0.6.5
+  resolution: "micromark-extension-gfm-strikethrough@npm:0.6.5"
+  dependencies:
+    micromark: "npm:~2.11.0"
+  checksum: 10c0/c14e953b833718f56a71a650e9c2958fdb2b91093d7304043443eb64a8287cb8ff776d3cec0d40ca00ccd69357438f3dcac2cc40d3f16e47230cfbce72a1cf51
+  languageName: node
+  linkType: hard
+
 "micromark-extension-gfm-table@npm:^2.0.0":
   version: 2.0.0
   resolution: "micromark-extension-gfm-table@npm:2.0.0"
@@ -18414,6 +16425,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"micromark-extension-gfm-table@npm:~0.4.0":
+  version: 0.4.3
+  resolution: "micromark-extension-gfm-table@npm:0.4.3"
+  dependencies:
+    micromark: "npm:~2.11.0"
+  checksum: 10c0/0f4be3a1206024845bbc2495ea3b2a255bf5287af3747733d398adf962bfcf6f0c452dc66e268ab84f41b64a2f8113028887034045450bad43a48a8b5583bc14
+  languageName: node
+  linkType: hard
+
 "micromark-extension-gfm-tagfilter@npm:^2.0.0":
   version: 2.0.0
   resolution: "micromark-extension-gfm-tagfilter@npm:2.0.0"
@@ -18423,6 +16443,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"micromark-extension-gfm-tagfilter@npm:~0.3.0":
+  version: 0.3.0
+  resolution: "micromark-extension-gfm-tagfilter@npm:0.3.0"
+  checksum: 10c0/5a81cffbcad7f314ddb3b761c5e2db5a5286e231e68559861da821ee748838cc9323fd22af5cbbe68569e826fa8159f2f2b0d53dc8aecc458ef48b2503a071fb
+  languageName: node
+  linkType: hard
+
 "micromark-extension-gfm-task-list-item@npm:^2.0.0":
   version: 2.0.1
   resolution: "micromark-extension-gfm-task-list-item@npm:2.0.1"
@@ -18436,6 +16463,29 @@ __metadata:
   languageName: node
   linkType: hard
 
+"micromark-extension-gfm-task-list-item@npm:~0.3.0":
+  version: 0.3.3
+  resolution: "micromark-extension-gfm-task-list-item@npm:0.3.3"
+  dependencies:
+    micromark: "npm:~2.11.0"
+  checksum: 10c0/e94e02eb2509a6ced49a6b296a7c503068488da79b5d3a3e4dfe5dcd5abdb95a1f305c087abb4ca3f7c90112ae29d628b30edeadaf53d3eec9dfe338bb678650
+  languageName: node
+  linkType: hard
+
+"micromark-extension-gfm@npm:^0.3.0":
+  version: 0.3.3
+  resolution: "micromark-extension-gfm@npm:0.3.3"
+  dependencies:
+    micromark: "npm:~2.11.0"
+    micromark-extension-gfm-autolink-literal: "npm:~0.5.0"
+    micromark-extension-gfm-strikethrough: "npm:~0.6.5"
+    micromark-extension-gfm-table: "npm:~0.4.0"
+    micromark-extension-gfm-tagfilter: "npm:~0.3.0"
+    micromark-extension-gfm-task-list-item: "npm:~0.3.0"
+  checksum: 10c0/6ed94c6213687b84c7b2dbacf8a50b078c60fd960bc9ddb3ec742fc298b8f7d5dcd8e9ab2a73fb8b423a0b11bf0a1565bc24bf45b45009f2693690277a7675df
+  languageName: node
+  linkType: hard
+
 "micromark-extension-gfm@npm:^3.0.0":
   version: 3.0.0
   resolution: "micromark-extension-gfm@npm:3.0.0"
@@ -18796,6 +16846,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"micromark@npm:^2.11.3, micromark@npm:~2.11.0, micromark@npm:~2.11.3":
+  version: 2.11.4
+  resolution: "micromark@npm:2.11.4"
+  dependencies:
+    debug: "npm:^4.0.0"
+    parse-entities: "npm:^2.0.0"
+  checksum: 10c0/67307cbacae621ab1eb23e333a5addc7600cf97d3b40cad22fc1c2d03d734d6d9cbc3f5a7e5d655a8c0862a949abe590ab7cfa96be366bfe09e239a94e6eea55
+  languageName: node
+  linkType: hard
+
 "micromark@npm:^4.0.0":
   version: 4.0.0
   resolution: "micromark@npm:4.0.0"
@@ -18821,16 +16881,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"micromark@npm:~2.11.0":
-  version: 2.11.4
-  resolution: "micromark@npm:2.11.4"
-  dependencies:
-    debug: "npm:^4.0.0"
-    parse-entities: "npm:^2.0.0"
-  checksum: 10c0/67307cbacae621ab1eb23e333a5addc7600cf97d3b40cad22fc1c2d03d734d6d9cbc3f5a7e5d655a8c0862a949abe590ab7cfa96be366bfe09e239a94e6eea55
-  languageName: node
-  linkType: hard
-
 "micromatch@npm:^4.0.2, micromatch@npm:^4.0.5, micromatch@npm:^4.0.7, micromatch@npm:^4.0.8":
   version: 4.0.8
   resolution: "micromatch@npm:4.0.8"
@@ -19134,13 +17184,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"moo@npm:^0.5.1":
-  version: 0.5.2
-  resolution: "moo@npm:0.5.2"
-  checksum: 10c0/a9d9ad8198a51fe35d297f6e9fdd718298ca0b39a412e868a0ebd92286379ab4533cfc1f1f34516177f5129988ab25fe598f78e77c84e3bfe0d4a877b56525a8
-  languageName: node
-  linkType: hard
-
 "move-file@npm:^3.0.0":
   version: 3.1.0
   resolution: "move-file@npm:3.1.0"
@@ -19210,16 +17253,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nanoid@npm:3.3.7":
-  version: 3.3.7
-  resolution: "nanoid@npm:3.3.7"
-  bin:
-    nanoid: bin/nanoid.cjs
-  checksum: 10c0/e3fb661aa083454f40500473bb69eedb85dc160e763150b9a2c567c7e9ff560ce028a9f833123b618a6ea742e311138b591910e795614a629029e86e180660f3
-  languageName: node
-  linkType: hard
-
-"nanoid@npm:^3.3.11, nanoid@npm:^3.3.7":
+"nanoid@npm:^3.3.11":
   version: 3.3.11
   resolution: "nanoid@npm:3.3.11"
   bin:
@@ -19911,13 +17945,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"os-tmpdir@npm:~1.0.2":
-  version: 1.0.2
-  resolution: "os-tmpdir@npm:1.0.2"
-  checksum: 10c0/f438450224f8e2687605a8dd318f0db694b6293c5d835ae509a69e97c8de38b6994645337e5577f5001115470414638978cc49da1cdcc25106dad8738dc69990
-  languageName: node
-  linkType: hard
-
 "p-cancelable@npm:^3.0.0":
   version: 3.0.0
   resolution: "p-cancelable@npm:3.0.0"
@@ -20135,13 +18162,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pako@npm:~1.0.2":
-  version: 1.0.11
-  resolution: "pako@npm:1.0.11"
-  checksum: 10c0/86dd99d8b34c3930345b8bbeb5e1cd8a05f608eeb40967b293f72fe469d0e9c88b783a8777e4cc7dc7c91ce54c5e93d88ff4b4f060e6ff18408fd21030d9ffbe
-  languageName: node
-  linkType: hard
-
 "parallel-transform@npm:1.2.0":
   version: 1.2.0
   resolution: "parallel-transform@npm:1.2.0"
@@ -20600,18 +18620,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"popmotion@npm:11.0.3":
-  version: 11.0.3
-  resolution: "popmotion@npm:11.0.3"
-  dependencies:
-    framesync: "npm:6.0.1"
-    hey-listen: "npm:^1.0.8"
-    style-value-types: "npm:5.0.0"
-    tslib: "npm:^2.1.0"
-  checksum: 10c0/ed196cf034c199a2ab6095f047924b38e24f386c33a182970ad6e1769002b72adff34a72ba7ab2cf34ff5bbfd711ef4caf2e9843ebb7a5c9cafa27c50e525f70
-  languageName: node
-  linkType: hard
-
 "postcss-attribute-case-insensitive@npm:^7.0.1":
   version: 7.0.1
   resolution: "postcss-attribute-case-insensitive@npm:7.0.1"
@@ -21405,7 +19413,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-value-parser@npm:^4.0.2, postcss-value-parser@npm:^4.1.0, postcss-value-parser@npm:^4.2.0":
+"postcss-value-parser@npm:^4.1.0, postcss-value-parser@npm:^4.2.0":
   version: 4.2.0
   resolution: "postcss-value-parser@npm:4.2.0"
   checksum: 10c0/f4142a4f56565f77c1831168e04e3effd9ffcc5aebaf0f538eee4b2d465adfd4b85a44257bb48418202a63806a7da7fe9f56c330aebb3cac898e46b4cbf49161
@@ -21430,18 +19438,7 @@ __metadata:
   resolution: "postcss-zindex@npm:6.0.2"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/346291703e1f2dd954144d2bb251713dad6ae10e8aa05c3873dee2fc7a30d72da7866bec060abd932b9b839bc1495f73d813dde5312750a69d7ad33c435ce7ea
-  languageName: node
-  linkType: hard
-
-"postcss@npm:8.4.38":
-  version: 8.4.38
-  resolution: "postcss@npm:8.4.38"
-  dependencies:
-    nanoid: "npm:^3.3.7"
-    picocolors: "npm:^1.0.0"
-    source-map-js: "npm:^1.2.0"
-  checksum: 10c0/955407b8f70cf0c14acf35dab3615899a2a60a26718a63c848cf3c29f2467b0533991b985a2b994430d890bd7ec2b1963e36352b0774a19143b5f591540f7c06
+  checksum: 10c0/346291703e1f2dd954144d2bb251713dad6ae10e8aa05c3873dee2fc7a30d72da7866bec060abd932b9b839bc1495f73d813dde5312750a69d7ad33c435ce7ea
   languageName: node
   linkType: hard
 
@@ -21456,17 +19453,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"posthog-js@npm:^1.136.8":
-  version: 1.154.5
-  resolution: "posthog-js@npm:1.154.5"
-  dependencies:
-    fflate: "npm:^0.4.8"
-    preact: "npm:^10.19.3"
-    web-vitals: "npm:^4.0.1"
-  checksum: 10c0/4e51b3bebd37a2695ae8bda26ce9487b1f18369e299747f4bbe3e47dce9cb2f7c2fab3808f0554a9fe471602796824f8ce6dc4114be339549fc8711f934f4d22
-  languageName: node
-  linkType: hard
-
 "powershell-utils@npm:^0.1.0":
   version: 0.1.0
   resolution: "powershell-utils@npm:0.1.0"
@@ -21474,13 +19460,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"preact@npm:^10.19.3":
-  version: 10.23.1
-  resolution: "preact@npm:10.23.1"
-  checksum: 10c0/f0eb37999bfa9cbc725e57e189387c77919fa05d17cdc3c4ff41660298805159867689f1d974eb8e6496288c0212760490d0e6f1c12022e0f5a74d06cc618e85
-  languageName: node
-  linkType: hard
-
 "prebuild-install@npm:^7.1.1":
   version: 7.1.2
   resolution: "prebuild-install@npm:7.1.2"
@@ -21552,17 +19531,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pretty-format@npm:^29.7.0":
-  version: 29.7.0
-  resolution: "pretty-format@npm:29.7.0"
-  dependencies:
-    "@jest/schemas": "npm:^29.6.3"
-    ansi-styles: "npm:^5.0.0"
-    react-is: "npm:^18.0.0"
-  checksum: 10c0/edc5ff89f51916f036c62ed433506b55446ff739358de77207e63e88a28ca2894caac6e73dcb68166a606e51c8087d32d400473e6a9fdd2dbe743f46c9c0276f
-  languageName: node
-  linkType: hard
-
 "pretty-ms@npm:^9.0.0":
   version: 9.3.0
   resolution: "pretty-ms@npm:9.3.0"
@@ -21655,7 +19623,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prop-types@npm:^15.6.2, prop-types@npm:^15.7.2, prop-types@npm:^15.8.1":
+"prop-types@npm:^15.6.2, prop-types@npm:^15.7.2":
   version: 15.8.1
   resolution: "prop-types@npm:15.8.1"
   dependencies:
@@ -21809,13 +19777,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ramda@npm:^0.27.1":
-  version: 0.27.2
-  resolution: "ramda@npm:0.27.2"
-  checksum: 10c0/1bbcb5bcde33ab2669810644f920b8af4e228967ff800962100803dcdad57b09c5eeee50d9871c74aa20ce496a2d96ec48774e545d7943c8f742ccac5e0fa072
-  languageName: node
-  linkType: hard
-
 "random-bytes@npm:~1.0.0":
   version: 1.0.0
   resolution: "random-bytes@npm:1.0.0"
@@ -21887,15 +19848,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-complex-tree@npm:^2.3.7":
-  version: 2.4.5
-  resolution: "react-complex-tree@npm:2.4.5"
-  peerDependencies:
-    react: ">=16.0.0"
-  checksum: 10c0/08f12c6c08b3f70b56fccfccb5b440ba9ea78658c2cffcf00ddfa8d999776a0e0fcd00ccb74e89d20a57e7004334c16b537122d1866c959f7051d89f42d9759d
-  languageName: node
-  linkType: hard
-
 "react-dom@npm:^18.3.1":
   version: 18.3.1
   resolution: "react-dom@npm:18.3.1"
@@ -21931,7 +19883,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-is@npm:^16.10.2, react-is@npm:^16.13.1, react-is@npm:^16.6.0, react-is@npm:^16.7.0":
+"react-is@npm:^16.13.1, react-is@npm:^16.6.0, react-is@npm:^16.7.0":
   version: 16.13.1
   resolution: "react-is@npm:16.13.1"
   checksum: 10c0/33977da7a5f1a287936a0c85639fec6ca74f4f15ef1e59a6bc20338fc73dc69555381e211f7a3529b8150a1f71e4225525b41b60b52965bda53ce7d47377ada1
@@ -21945,13 +19897,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-is@npm:^18.0.0":
-  version: 18.3.1
-  resolution: "react-is@npm:18.3.1"
-  checksum: 10c0/f2f1e60010c683479e74c63f96b09fb41603527cd131a9959e2aee1e5a8b0caf270b365e5ca77d4a6b18aae659b60a86150bb3979073528877029b35aecd2072
-  languageName: node
-  linkType: hard
-
 "react-json-view-lite@npm:^2.3.0":
   version: 2.4.2
   resolution: "react-json-view-lite@npm:2.4.2"
@@ -22023,84 +19968,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-remark@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "react-remark@npm:2.1.0"
-  dependencies:
-    rehype-react: "npm:^6.0.0"
-    remark-parse: "npm:^9.0.0"
-    remark-rehype: "npm:^8.0.0"
-    unified: "npm:^9.0.0"
-  peerDependencies:
-    react: ">=16.8"
-  checksum: 10c0/d9b721c571c14ff2a9b4ec049f2f11cae98dd6bfdf72a452689aa185321320d0eda560340de914b4c3a1e600b54b578ebca7ed0e647779b945d2508c746648ae
-  languageName: node
-  linkType: hard
-
-"react-remove-scroll-bar@npm:^2.3.3, react-remove-scroll-bar@npm:^2.3.4":
-  version: 2.3.6
-  resolution: "react-remove-scroll-bar@npm:2.3.6"
-  dependencies:
-    react-style-singleton: "npm:^2.2.1"
-    tslib: "npm:^2.0.0"
-  peerDependencies:
-    "@types/react": ^16.8.0 || ^17.0.0 || ^18.0.0
-    react: ^16.8.0 || ^17.0.0 || ^18.0.0
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-  checksum: 10c0/4e32ee04bf655a8bd3b4aacf6ffc596ae9eb1b9ba27eef83f7002632ee75371f61516ae62250634a9eae4b2c8fc6f6982d9b182de260f6c11841841e6e2e7515
-  languageName: node
-  linkType: hard
-
-"react-remove-scroll@npm:2.5.5":
-  version: 2.5.5
-  resolution: "react-remove-scroll@npm:2.5.5"
-  dependencies:
-    react-remove-scroll-bar: "npm:^2.3.3"
-    react-style-singleton: "npm:^2.2.1"
-    tslib: "npm:^2.1.0"
-    use-callback-ref: "npm:^1.3.0"
-    use-sidecar: "npm:^1.1.2"
-  peerDependencies:
-    "@types/react": ^16.8.0 || ^17.0.0 || ^18.0.0
-    react: ^16.8.0 || ^17.0.0 || ^18.0.0
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-  checksum: 10c0/4952657e6a7b9d661d4ad4dfcef81b9c7fa493e35164abff99c35c0b27b3d172ef7ad70c09416dc44dd14ff2e6b38a5ec7da27e27e90a15cbad36b8fd2fd8054
-  languageName: node
-  linkType: hard
-
-"react-remove-scroll@npm:2.5.7":
-  version: 2.5.7
-  resolution: "react-remove-scroll@npm:2.5.7"
-  dependencies:
-    react-remove-scroll-bar: "npm:^2.3.4"
-    react-style-singleton: "npm:^2.2.1"
-    tslib: "npm:^2.1.0"
-    use-callback-ref: "npm:^1.3.0"
-    use-sidecar: "npm:^1.1.2"
-  peerDependencies:
-    "@types/react": ^16.8.0 || ^17.0.0 || ^18.0.0
-    react: ^16.8.0 || ^17.0.0 || ^18.0.0
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-  checksum: 10c0/dcd523ada602bd0a839c2032cadf0b3e4af55ee85acefee3760976a9cceaa4606927801b093bbb8bf3c2989c71e048f5428c2c6eb9e6681762e86356833d039b
-  languageName: node
-  linkType: hard
-
-"react-resizable-panels@npm:2.0.19":
-  version: 2.0.19
-  resolution: "react-resizable-panels@npm:2.0.19"
-  peerDependencies:
-    react: ^16.14.0 || ^17.0.0 || ^18.0.0
-    react-dom: ^16.14.0 || ^17.0.0 || ^18.0.0
-  checksum: 10c0/eb9cb511aec917895dba842cb933c9885ea510f752b4f3b8c358bf33be8b7b6bf2fc4a81db7a16977e6b09f614a14c6652f15232ff03bce68a8845dcf179abf7
-  languageName: node
-  linkType: hard
-
 "react-router-config@npm:^5.1.1":
   version: 5.1.1
   resolution: "react-router-config@npm:5.1.1"
@@ -22149,52 +20016,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-smooth@npm:^4.0.0":
-  version: 4.0.1
-  resolution: "react-smooth@npm:4.0.1"
-  dependencies:
-    fast-equals: "npm:^5.0.1"
-    prop-types: "npm:^15.8.1"
-    react-transition-group: "npm:^4.4.5"
-  peerDependencies:
-    react: ^16.8.0 || ^17.0.0 || ^18.0.0
-    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 10c0/5c19a2c147798c3de1329d442b1a371139c01113cc108c38c201b63502c329f943ede505c44089d26a6563eaa72a67b845d538d956f34a389b37fd3961308834
-  languageName: node
-  linkType: hard
-
-"react-style-singleton@npm:^2.2.1":
-  version: 2.2.1
-  resolution: "react-style-singleton@npm:2.2.1"
-  dependencies:
-    get-nonce: "npm:^1.0.0"
-    invariant: "npm:^2.2.4"
-    tslib: "npm:^2.0.0"
-  peerDependencies:
-    "@types/react": ^16.8.0 || ^17.0.0 || ^18.0.0
-    react: ^16.8.0 || ^17.0.0 || ^18.0.0
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-  checksum: 10c0/6d66f3bdb65e1ec79089f80314da97c9a005087a04ee034255a5de129a4c0d9fd0bf99fa7bf642781ac2dc745ca687aae3de082bd8afdd0d117bc953241e15ad
-  languageName: node
-  linkType: hard
-
-"react-transition-group@npm:^4.4.5":
-  version: 4.4.5
-  resolution: "react-transition-group@npm:4.4.5"
-  dependencies:
-    "@babel/runtime": "npm:^7.5.5"
-    dom-helpers: "npm:^5.0.1"
-    loose-envify: "npm:^1.4.0"
-    prop-types: "npm:^15.6.2"
-  peerDependencies:
-    react: ">=16.6.0"
-    react-dom: ">=16.6.0"
-  checksum: 10c0/2ba754ba748faefa15f87c96dfa700d5525054a0141de8c75763aae6734af0740e77e11261a1e8f4ffc08fd9ab78510122e05c21c2d79066c38bb6861a886c82
-  languageName: node
-  linkType: hard
-
 "react@npm:^18.3.1":
   version: 18.3.1
   resolution: "react@npm:18.3.1"
@@ -22332,34 +20153,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"recharts-scale@npm:^0.4.4":
-  version: 0.4.5
-  resolution: "recharts-scale@npm:0.4.5"
-  dependencies:
-    decimal.js-light: "npm:^2.4.1"
-  checksum: 10c0/64ce1fc4ebe62001787bf4dc4cbb779452d33831619309c71c50277c58e8968ffe98941562d9d0d5ffdb02588ebd62f4fe6548fa826110fd458db9c3cc6dadc1
-  languageName: node
-  linkType: hard
-
-"recharts@npm:^2.12.4":
-  version: 2.12.7
-  resolution: "recharts@npm:2.12.7"
-  dependencies:
-    clsx: "npm:^2.0.0"
-    eventemitter3: "npm:^4.0.1"
-    lodash: "npm:^4.17.21"
-    react-is: "npm:^16.10.2"
-    react-smooth: "npm:^4.0.0"
-    recharts-scale: "npm:^0.4.4"
-    tiny-invariant: "npm:^1.3.1"
-    victory-vendor: "npm:^36.6.8"
-  peerDependencies:
-    react: ^16.0.0 || ^17.0.0 || ^18.0.0
-    react-dom: ^16.0.0 || ^17.0.0 || ^18.0.0
-  checksum: 10c0/2522d841a1f4e4c0a37046ddb61fa958ac37a66df63dcd4c6cb9113e3f7a71892d74e44494a55bc40faa0afd74d9cf58fec3d2ce53a8ddf997e75367bdd033fc
-  languageName: node
-  linkType: hard
-
 "regenerate-unicode-properties@npm:^10.2.0":
   version: 10.2.0
   resolution: "regenerate-unicode-properties@npm:10.2.0"
@@ -22468,27 +20261,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rehype-react@npm:^6.0.0":
-  version: 6.2.1
-  resolution: "rehype-react@npm:6.2.1"
-  dependencies:
-    "@mapbox/hast-util-table-cell-style": "npm:^0.2.0"
-    hast-to-hyperscript: "npm:^9.0.0"
-  checksum: 10c0/8237f428cc2bc62c9a4dcb63a416e22d581eafa8d082de6b992b10d40e785acf81db83283c92e1edb04915ac25d350e0b584a70680c7b0e505438b7c20645e86
-  languageName: node
-  linkType: hard
-
-"rehype-react@npm:^8.0.0":
-  version: 8.0.0
-  resolution: "rehype-react@npm:8.0.0"
-  dependencies:
-    "@types/hast": "npm:^3.0.0"
-    hast-util-to-jsx-runtime: "npm:^2.0.0"
-    unified: "npm:^11.0.0"
-  checksum: 10c0/87578322bb25bc2599154210739fa581b7d15edb69b3bb2687ed164b7429fb07b5e38acb12155046d0d04b206b76bab3886ef45ab7120f4ec4fc82e9ea1eb90b
-  languageName: node
-  linkType: hard
-
 "relateurl@npm:^0.2.7":
   version: 0.2.7
   resolution: "relateurl@npm:0.2.7"
@@ -22533,6 +20305,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"remark-gfm@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "remark-gfm@npm:1.0.0"
+  dependencies:
+    mdast-util-gfm: "npm:^0.1.0"
+    micromark-extension-gfm: "npm:^0.3.0"
+  checksum: 10c0/929a2328b1a0c63c38cc1678a41089f75f594fb928c02bfcfe967702377ede245fec0ed45a258fe0af421dda547439911260b8621b2ea6819eaa5f6b47d2bb4c
+  languageName: node
+  linkType: hard
+
 "remark-gfm@npm:^4.0.0":
   version: 4.0.0
   resolution: "remark-gfm@npm:4.0.0"
@@ -22590,7 +20372,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"remark-rehype@npm:^11.0.0, remark-rehype@npm:^11.1.0":
+"remark-rehype@npm:^11.0.0":
   version: 11.1.0
   resolution: "remark-rehype@npm:11.1.0"
   dependencies:
@@ -23153,15 +20935,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:^5.5.0":
-  version: 5.7.2
-  resolution: "semver@npm:5.7.2"
-  bin:
-    semver: bin/semver
-  checksum: 10c0/e4cf10f86f168db772ae95d86ba65b3fd6c5967c94d97c708ccb463b778c2ee53b914cd7167620950fc07faf5a564e6efe903836639e512a1aa15fbc9667fa25
-  languageName: node
-  linkType: hard
-
 "semver@npm:^6.3.1":
   version: 6.3.1
   resolution: "semver@npm:6.3.1"
@@ -23311,13 +21084,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"setimmediate@npm:^1.0.5":
-  version: 1.0.5
-  resolution: "setimmediate@npm:1.0.5"
-  checksum: 10c0/5bae81bfdbfbd0ce992893286d49c9693c82b1bcc00dcaaf3a09c8f428fdeacf4190c013598b81875dfac2b08a572422db7df779a99332d0fce186d15a3e4d49
-  languageName: node
-  linkType: hard
-
 "setprototypeof@npm:1.1.0":
   version: 1.1.0
   resolution: "setprototypeof@npm:1.1.0"
@@ -23341,7 +21107,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"shallowequal@npm:1.1.0, shallowequal@npm:^1.1.0":
+"shallowequal@npm:^1.1.0":
   version: 1.1.0
   resolution: "shallowequal@npm:1.1.0"
   checksum: 10c0/b926efb51cd0f47aa9bc061add788a4a650550bbe50647962113a4579b60af2abe7b62f9b02314acc6f97151d4cf87033a2b15fc20852fae306d1a095215396c
@@ -23473,16 +21239,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"shiki@npm:1.12.1":
-  version: 1.12.1
-  resolution: "shiki@npm:1.12.1"
-  dependencies:
-    "@shikijs/core": "npm:1.12.1"
-    "@types/hast": "npm:^3.0.4"
-  checksum: 10c0/1afe9a0002a215fec6960e48284b207d4714de192f4a2223f748a640c0de17a45f2c76ebc4c4020c308bd441c6f7b913eecbd97d346ddd681db0a643c46190fc
-  languageName: node
-  linkType: hard
-
 "side-channel-list@npm:^1.0.0":
   version: 1.0.0
   resolution: "side-channel-list@npm:1.0.0"
@@ -23712,23 +21468,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"solc@npm:^0.8.25":
-  version: 0.8.26
-  resolution: "solc@npm:0.8.26"
-  dependencies:
-    command-exists: "npm:^1.2.8"
-    commander: "npm:^8.1.0"
-    follow-redirects: "npm:^1.12.1"
-    js-sha3: "npm:0.8.0"
-    memorystream: "npm:^0.3.1"
-    semver: "npm:^5.5.0"
-    tmp: "npm:0.0.33"
-  bin:
-    solcjs: solc.js
-  checksum: 10c0/1eea35da99c228d0dc1d831c29f7819e7921b67824c889a5e5f2e471a2ef5856a15fabc0b5de067f5ba994fa36fb5a563361963646fe98dad58a0e4fa17c8b2d
-  languageName: node
-  linkType: hard
-
 "sonic-boom@npm:^4.0.1":
   version: 4.2.0
   resolution: "sonic-boom@npm:4.2.0"
@@ -23763,7 +21502,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"source-map-js@npm:^1.0.1, source-map-js@npm:^1.2.0, source-map-js@npm:^1.2.1":
+"source-map-js@npm:^1.0.1, source-map-js@npm:^1.2.1":
   version: 1.2.1
   resolution: "source-map-js@npm:1.2.1"
   checksum: 10c0/7bda1fc4c197e3c6ff17de1b8b2c20e60af81b63a52cb32ec5a5d67a20a7d42651e2cb34ebe93833c5a2a084377e17455854fee3e21e7925c64a51b6a52b0faf
@@ -23794,7 +21533,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"space-separated-tokens@npm:^1.0.0, space-separated-tokens@npm:^1.1.0":
+"space-separated-tokens@npm:^1.1.0":
   version: 1.1.5
   resolution: "space-separated-tokens@npm:1.1.5"
   checksum: 10c0/3ee0a6905f89e1ffdfe474124b1ade9fe97276a377a0b01350bc079b6ec566eb5b219e26064cc5b7f3899c05bde51ffbc9154290b96eaf82916a1e2c2c13ead9
@@ -23938,13 +21677,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"state-local@npm:^1.0.6":
-  version: 1.0.7
-  resolution: "state-local@npm:1.0.7"
-  checksum: 10c0/8dc7daeac71844452fafb514a6d6b6f40d7e2b33df398309ea1c7b3948d6110c57f112b7196500a10c54fdde40291488c52c875575670fb5c819602deca48bd9
-  languageName: node
-  linkType: hard
-
 "statuses@npm:2.0.1":
   version: 2.0.1
   resolution: "statuses@npm:2.0.1"
@@ -24170,36 +21902,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"style-value-types@npm:5.0.0":
-  version: 5.0.0
-  resolution: "style-value-types@npm:5.0.0"
-  dependencies:
-    hey-listen: "npm:^1.0.8"
-    tslib: "npm:^2.1.0"
-  checksum: 10c0/a7b693269d48c0cab73da6c88eade845e71b5f330541a9ccb6a065468739d9bafdeb34f94fb89581931371275846da53e35989218cbc0c2d1a38f127e4d765fd
-  languageName: node
-  linkType: hard
-
-"styled-components@npm:^6.1.8":
-  version: 6.1.12
-  resolution: "styled-components@npm:6.1.12"
-  dependencies:
-    "@emotion/is-prop-valid": "npm:1.2.2"
-    "@emotion/unitless": "npm:0.8.1"
-    "@types/stylis": "npm:4.2.5"
-    css-to-react-native: "npm:3.2.0"
-    csstype: "npm:3.1.3"
-    postcss: "npm:8.4.38"
-    shallowequal: "npm:1.1.0"
-    stylis: "npm:4.3.2"
-    tslib: "npm:2.6.2"
-  peerDependencies:
-    react: ">= 16.8.0"
-    react-dom: ">= 16.8.0"
-  checksum: 10c0/1ad728aea763a26dbce5ede380ef54b0aacae177166d19346eed97eab8e46935b8797d3ba8e1db689605175d5f9c9892a60d91d2e797e2ea61901fb7f58ed1a5
-  languageName: node
-  linkType: hard
-
 "stylehacks@npm:^6.1.1":
   version: 6.1.1
   resolution: "stylehacks@npm:6.1.1"
@@ -24212,13 +21914,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stylis@npm:4.3.2":
-  version: 4.3.2
-  resolution: "stylis@npm:4.3.2"
-  checksum: 10c0/0410e1404cbeee3388a9e17587875211ce2f014c8379af0d1e24ca55878867c9f1ccc7b0ce9a156ca53f5d6e301391a82b0645522a604674a378b3189a4a1994
-  languageName: node
-  linkType: hard
-
 "stylis@npm:^4.3.6":
   version: 4.3.6
   resolution: "stylis@npm:4.3.6"
@@ -24345,22 +22040,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tailwind-merge@npm:^2.2.1":
-  version: 2.4.0
-  resolution: "tailwind-merge@npm:2.4.0"
-  checksum: 10c0/77bd20647d08db78a0bdf7b57d4b904479aee7727f44570f8834d62a1aa56f42d7ae68ac959e3d610c9f188aa164eeefb6c43df4f0c8bb7cfc3418e1575bfecb
-  languageName: node
-  linkType: hard
-
-"tailwindcss-animate@npm:^1.0.7":
-  version: 1.0.7
-  resolution: "tailwindcss-animate@npm:1.0.7"
-  peerDependencies:
-    tailwindcss: "*"
-  checksum: 10c0/ec7dbd1631076b97d66a1fbaaa06e0725fccfa63119221e8d87a997b02dcede98ad88bb1ef6665b968f5d260fcefb10592e0299ca70208d365b37761edf5e19a
-  languageName: node
-  linkType: hard
-
 "tapable@npm:^2.0.0, tapable@npm:^2.1.1, tapable@npm:^2.2.0, tapable@npm:^2.2.1":
   version: 2.2.1
   resolution: "tapable@npm:2.2.1"
@@ -24537,7 +22216,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tiny-invariant@npm:^1.0.2, tiny-invariant@npm:^1.3.1":
+"tiny-invariant@npm:^1.0.2":
   version: 1.3.3
   resolution: "tiny-invariant@npm:1.3.3"
   checksum: 10c0/65af4a07324b591a059b35269cd696aba21bef2107f29b9f5894d83cc143159a204b299553435b03874ebb5b94d019afa8b8eff241c8a4cfee95872c2e1c1c4a
@@ -24594,15 +22273,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tmp@npm:0.0.33":
-  version: 0.0.33
-  resolution: "tmp@npm:0.0.33"
-  dependencies:
-    os-tmpdir: "npm:~1.0.2"
-  checksum: 10c0/69863947b8c29cabad43fe0ce65cec5bb4b481d15d4b4b21e036b060b3edbf3bc7a5541de1bacb437bb3f7c4538f669752627fdf9b4aaf034cebd172ba373408
-  languageName: node
-  linkType: hard
-
 "tmp@npm:^0.2.0":
   version: 0.2.3
   resolution: "tmp@npm:0.2.3"
@@ -24771,13 +22441,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tslib@npm:2.6.2":
-  version: 2.6.2
-  resolution: "tslib@npm:2.6.2"
-  checksum: 10c0/e03a8a4271152c8b26604ed45535954c0a45296e32445b4b87f8a5abdb2421f40b59b4ca437c4346af0f28179780d604094eb64546bee2019d903d01c6c19bdb
-  languageName: node
-  linkType: hard
-
 "tslib@npm:^1.9.0":
   version: 1.14.1
   resolution: "tslib@npm:1.14.1"
@@ -24785,7 +22448,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tslib@npm:^2.0.0, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.3.1, tslib@npm:^2.4.0, tslib@npm:^2.5.0, tslib@npm:^2.6.0, tslib@npm:^2.6.3":
+"tslib@npm:^2.0.0, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.4.0, tslib@npm:^2.5.0, tslib@npm:^2.6.0, tslib@npm:^2.6.3":
   version: 2.8.1
   resolution: "tslib@npm:2.8.1"
   checksum: 10c0/9c4759110a19c53f992d9aae23aac5ced636e99887b51b9e61def52611732872ff7668757d4e4c61f19691e36f4da981cd9485e869b4a7408d689f6bf1f14e62
@@ -25093,7 +22756,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"unified@npm:^11.0.0, unified@npm:^11.0.3, unified@npm:^11.0.4, unified@npm:^11.0.5":
+"unified@npm:^11.0.0, unified@npm:^11.0.3, unified@npm:^11.0.4":
   version: 11.0.5
   resolution: "unified@npm:11.0.5"
   dependencies:
@@ -25173,13 +22836,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"unist-util-is@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "unist-util-is@npm:3.0.0"
-  checksum: 10c0/e46186214fabcef3c4947ab188ae272965465ec5c40652934025f6382c58dff6edca40860528f72718e42f858d1ce7db2754d5198beb96eff0379e4c3c34218f
-  languageName: node
-  linkType: hard
-
 "unist-util-is@npm:^4.0.0":
   version: 4.1.0
   resolution: "unist-util-is@npm:4.1.0"
@@ -25249,15 +22905,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"unist-util-visit-parents@npm:^2.0.0":
-  version: 2.1.2
-  resolution: "unist-util-visit-parents@npm:2.1.2"
-  dependencies:
-    unist-util-is: "npm:^3.0.0"
-  checksum: 10c0/ca88e2f88f3c4849f1bb4e90edb3f5fa66bf94656165dd74027971c393274d25b1b34974b18da336c4e2b45771495d5dac2f80571fa25f86c8cec859287c25f8
-  languageName: node
-  linkType: hard
-
 "unist-util-visit-parents@npm:^3.0.0":
   version: 3.1.1
   resolution: "unist-util-visit-parents@npm:3.1.1"
@@ -25278,15 +22925,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"unist-util-visit@npm:^1.4.1":
-  version: 1.4.1
-  resolution: "unist-util-visit@npm:1.4.1"
-  dependencies:
-    unist-util-visit-parents: "npm:^2.0.0"
-  checksum: 10c0/8fb61725270059034d987813816e6c2d6362f55d4d19936db9ce23a5ace0ae4d584064ceb94dee6618e3318aef087505607f7ccc8c4305fbb644c3b643ae0059
-  languageName: node
-  linkType: hard
-
 "unist-util-visit@npm:^2.0.0":
   version: 2.0.3
   resolution: "unist-util-visit@npm:2.0.3"
@@ -25350,13 +22988,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"unraw@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "unraw@npm:3.0.0"
-  checksum: 10c0/cd1e7a961c8dc075bdf07300bc046da6bc8c4f1b88c68191c392520f0c64914fa783d48f2431c668f79b1afbd4bab16e864c7aca3cc06ddc94567c1fec114b43
-  languageName: node
-  linkType: hard
-
 "unstorage@npm:^1.16.1":
   version: 1.17.1
   resolution: "unstorage@npm:1.17.1"
@@ -25553,37 +23184,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"use-callback-ref@npm:^1.3.0":
-  version: 1.3.2
-  resolution: "use-callback-ref@npm:1.3.2"
-  dependencies:
-    tslib: "npm:^2.0.0"
-  peerDependencies:
-    "@types/react": ^16.8.0 || ^17.0.0 || ^18.0.0
-    react: ^16.8.0 || ^17.0.0 || ^18.0.0
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-  checksum: 10c0/d232c37160fe3970c99255da19b5fb5299fb5926a5d6141d928a87feb47732c323d29be2f8137d3b1e5499c70d284cd1d9cfad703cc58179db8be24d7dd8f1f2
-  languageName: node
-  linkType: hard
-
-"use-sidecar@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "use-sidecar@npm:1.1.2"
-  dependencies:
-    detect-node-es: "npm:^1.1.0"
-    tslib: "npm:^2.0.0"
-  peerDependencies:
-    "@types/react": ^16.9.0 || ^17.0.0 || ^18.0.0
-    react: ^16.8.0 || ^17.0.0 || ^18.0.0
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-  checksum: 10c0/89f0018fd9aee1fc17c85ac18c4bf8944d460d453d0d0e04ddbc8eaddf3fa591e9c74a1f8a438a1bff368a7a2417fab380bdb3df899d2194c4375b0982736de0
-  languageName: node
-  linkType: hard
-
 "use-sync-external-store@npm:^1.2.0":
   version: 1.2.2
   resolution: "use-sync-external-store@npm:1.2.2"
@@ -25739,49 +23339,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"victory-vendor@npm:^36.6.8":
-  version: 36.9.2
-  resolution: "victory-vendor@npm:36.9.2"
-  dependencies:
-    "@types/d3-array": "npm:^3.0.3"
-    "@types/d3-ease": "npm:^3.0.0"
-    "@types/d3-interpolate": "npm:^3.0.1"
-    "@types/d3-scale": "npm:^4.0.2"
-    "@types/d3-shape": "npm:^3.1.0"
-    "@types/d3-time": "npm:^3.0.0"
-    "@types/d3-timer": "npm:^3.0.0"
-    d3-array: "npm:^3.1.6"
-    d3-ease: "npm:^3.0.1"
-    d3-interpolate: "npm:^3.0.1"
-    d3-scale: "npm:^4.0.2"
-    d3-shape: "npm:^3.1.0"
-    d3-time: "npm:^3.0.0"
-    d3-timer: "npm:^3.0.1"
-  checksum: 10c0/bad36de3bf4d406834743c2e99a8281d786af324d7e84b7f7a2fc02c27a3779034fb0c3c4707d4c8e68683334d924a67100cfa13985235565e83b9877f8e2ffd
-  languageName: node
-  linkType: hard
-
-"viem@npm:2.9.16":
-  version: 2.9.16
-  resolution: "viem@npm:2.9.16"
-  dependencies:
-    "@adraffy/ens-normalize": "npm:1.10.0"
-    "@noble/curves": "npm:1.2.0"
-    "@noble/hashes": "npm:1.3.2"
-    "@scure/bip32": "npm:1.3.2"
-    "@scure/bip39": "npm:1.2.1"
-    abitype: "npm:1.0.0"
-    isows: "npm:1.0.3"
-    ws: "npm:8.13.0"
-  peerDependencies:
-    typescript: ">=5.0.4"
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  checksum: 10c0/832ed60ea8de1eba70dc6bafc1196243836c9ccaa7284e37b35bedf9f8fcfe6e238c30f04408556d7cba7fff80def9ee2b807cff114e8fec885bca9b95b00586
-  languageName: node
-  linkType: hard
-
 "vscode-jsonrpc@npm:8.2.0":
   version: 8.2.0
   resolution: "vscode-jsonrpc@npm:8.2.0"
@@ -25866,13 +23423,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"web-namespaces@npm:^1.0.0":
-  version: 1.1.4
-  resolution: "web-namespaces@npm:1.1.4"
-  checksum: 10c0/05b5782c32a33ef94fa7a412afdebc9d0d3cc7b59db31d2cc7bd80de3e237d4b6309cb5f156d06e3a837b9826c9414448c25111ec1d4407d2025ffeb7bea4f62
-  languageName: node
-  linkType: hard
-
 "web-namespaces@npm:^2.0.0":
   version: 2.0.1
   resolution: "web-namespaces@npm:2.0.1"
@@ -25887,13 +23437,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"web-vitals@npm:^4.0.1":
-  version: 4.2.2
-  resolution: "web-vitals@npm:4.2.2"
-  checksum: 10c0/0e41d016a80d8f48e00c95f3d8405a4cb8c6a12a83ac6677ce49447c85ca6fb2325f40915ae5460bb59f07d1b7d65b66b8b42ea50135594ae7dc892453775004
-  languageName: node
-  linkType: hard
-
 "webidl-conversions@npm:^3.0.0":
   version: 3.0.1
   resolution: "webidl-conversions@npm:3.0.1"
@@ -26333,21 +23876,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ws@npm:8.17.1":
-  version: 8.17.1
-  resolution: "ws@npm:8.17.1"
-  peerDependencies:
-    bufferutil: ^4.0.1
-    utf-8-validate: ">=5.0.2"
-  peerDependenciesMeta:
-    bufferutil:
-      optional: true
-    utf-8-validate:
-      optional: true
-  checksum: 10c0/f4a49064afae4500be772abdc2211c8518f39e1c959640457dcee15d4488628620625c783902a52af2dd02f68558da2868fd06e6fd0e67ebcd09e6881b1b5bfe
-  languageName: node
-  linkType: hard
-
 "ws@npm:8.18.3, ws@npm:^8.13.0, ws@npm:^8.18.0":
   version: 8.18.3
   resolution: "ws@npm:8.18.3"
@@ -26558,6 +24086,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"zwitch@npm:^1.0.0":
+  version: 1.0.5
+  resolution: "zwitch@npm:1.0.5"
+  checksum: 10c0/26dc7d32e5596824b565db1da9650d00d32659c1211195bef50c25c60820f9c942aa7abefe678fc1ed0b97c1755036ac1bde5f97881d7d0e73e04e02aca56957
+  languageName: node
+  linkType: hard
+
 "zwitch@npm:^2.0.0":
   version: 2.0.4
   resolution: "zwitch@npm:2.0.4"
diff --git a/l1-contracts/gas_benchmark.md b/l1-contracts/gas_benchmark.md
index dc616c784d6b..6f68e4ff4503 100644
--- a/l1-contracts/gas_benchmark.md
+++ b/l1-contracts/gas_benchmark.md
@@ -14,21 +14,22 @@
 
 | Function             | Avg Gas | Max Gas | Calldata Size | Calldata Gas |
 |----------------------|---------|---------|---------------|--------------|
-| propose              | 195,201 | 221,411 |           932 |       14,912 |
-| submitEpochRootProof | 698,976 | 744,776 |         2,820 |       45,120 |
-| setupEpoch           |  31,965 | 113,616 |             - |            - |
+| propose              | 195,988 | 222,201 |           932 |       14,912 |
+| submitEpochRootProof | 697,655 | 743,529 |         2,820 |       45,120 |
+| setupEpoch           |  31,998 | 113,793 |             - |            - |
 
-**Avg Gas Cost per Second**: 3,331.7 gas/second
+**Avg Gas Cost per Second**: 3,341.5 gas/second
 *Epoch duration*: 0h 38m 24s
 
 ## Validators
 
 | Function             | Avg Gas | Max Gas | Calldata Size | Calldata Gas |
 |----------------------|---------|---------|---------------|--------------|
-| propose              | 322,945 | 350,085 |         4,452 |       71,232 |
-| submitEpochRootProof | 897,150 | 942,954 |         5,316 |       85,056 |
-| aggregate3           | 371,401 | 384,831 |             - |            - |
-| setupEpoch           |  46,426 | 547,449 |             - |            - |
+| propose              | 324,449 | 351,604 |         4,452 |       71,232 |
+| submitEpochRootProof | 896,101 | 941,944 |         5,316 |       85,056 |
+| aggregate3           | 373,118 | 386,457 |             - |            - |
+| setupEpoch           |  46,459 | 547,626 |             - |            - |
 
-**Avg Gas Cost per Second**: 5,284.3 gas/second
+**Avg Gas Cost per Second**: 5,304.3 gas/second
 *Epoch duration*: 0h 38m 24s
+
diff --git a/l1-contracts/gas_benchmark_results.json b/l1-contracts/gas_benchmark_results.json
index 48c9c1e86218..45c6a506461d 100644
--- a/l1-contracts/gas_benchmark_results.json
+++ b/l1-contracts/gas_benchmark_results.json
@@ -2,26 +2,26 @@
   "no_validators": {
     "propose": {
       "calls": 150,
-      "min": 181595,
-      "mean": 195201,
-      "median": 190979,
-      "max": 221411,
+      "min": 182373,
+      "mean": 195988,
+      "median": 191762,
+      "max": 222201,
       "calldata_size": 932,
       "calldata_gas": 14912
     },
     "setupEpoch": {
       "calls": 150,
-      "min": 29236,
-      "mean": 31965,
-      "median": 29236,
-      "max": 113616
+      "min": 29264,
+      "mean": 31998,
+      "median": 29264,
+      "max": 113793
     },
     "submitEpochRootProof": {
       "calls": 4,
-      "min": 677928,
-      "mean": 698976,
-      "median": 686601,
-      "max": 744776,
+      "min": 676491,
+      "mean": 697655,
+      "median": 685300,
+      "max": 743529,
       "calldata_size": 2820,
       "calldata_gas": 45120
     }
@@ -29,35 +29,35 @@
   "validators": {
     "propose": {
       "calls": 150,
-      "min": 300568,
-      "mean": 322945,
-      "median": 322454,
-      "max": 350085,
+      "min": 302105,
+      "mean": 324449,
+      "median": 323910,
+      "max": 351604,
       "calldata_size": 4452,
       "calldata_gas": 71232
     },
     "setupEpoch": {
       "calls": 150,
-      "min": 29236,
-      "mean": 46426,
-      "median": 29236,
-      "max": 547449
+      "min": 29264,
+      "mean": 46459,
+      "median": 29264,
+      "max": 547626
     },
     "submitEpochRootProof": {
       "calls": 4,
-      "min": 876112,
-      "mean": 897150,
-      "median": 884767,
-      "max": 942954,
+      "min": 874924,
+      "mean": 896101,
+      "median": 883769,
+      "max": 941944,
       "calldata_size": 5316,
       "calldata_gas": 85056
     },
     "aggregate3": {
       "calls": 55,
-      "min": 360298,
-      "mean": 371401,
-      "median": 371165,
-      "max": 384831
+      "min": 362015,
+      "mean": 373118,
+      "median": 372828,
+      "max": 386457
     }
   }
-}
+}
\ No newline at end of file
diff --git a/l1-contracts/src/core/Rollup.sol b/l1-contracts/src/core/Rollup.sol
index a04e1e3253f9..281e4badd070 100644
--- a/l1-contracts/src/core/Rollup.sol
+++ b/l1-contracts/src/core/Rollup.sol
@@ -550,6 +550,18 @@ contract Rollup is IStaking, IValidatorSelection, IRollup, RollupCore {
     return STFLib.getStorage().config.feeAssetPortal;
   }
 
+  function getVkTreeRoot() external view override(IRollup) returns (bytes32) {
+    return STFLib.getStorage().config.vkTreeRoot;
+  }
+
+  function getProtocolContractsHash() external view override(IRollup) returns (bytes32) {
+    return STFLib.getStorage().config.protocolContractsHash;
+  }
+
+  function getEpochProofVerifier() external view override(IRollup) returns (IVerifier) {
+    return STFLib.getStorage().config.epochProofVerifier;
+  }
+
   function getRewardDistributor() external view override(IRollup) returns (IRewardDistributor) {
     return RewardExtLib.getRewardDistributor();
   }
diff --git a/l1-contracts/src/core/interfaces/IRollup.sol b/l1-contracts/src/core/interfaces/IRollup.sol
index 448b3bcfff0c..f3e67ab100a5 100644
--- a/l1-contracts/src/core/interfaces/IRollup.sol
+++ b/l1-contracts/src/core/interfaces/IRollup.sol
@@ -232,6 +232,10 @@ interface IRollup is IRollupCore, IHaveVersion {
   function getInbox() external view returns (IInbox);
   function getOutbox() external view returns (IOutbox);
 
+  function getVkTreeRoot() external view returns (bytes32);
+  function getProtocolContractsHash() external view returns (bytes32);
+  function getEpochProofVerifier() external view returns (IVerifier);
+
   function getRewardConfig() external view returns (RewardConfig memory);
   function getCheckpointReward() external view returns (uint256);
 }
diff --git a/l1-contracts/src/core/libraries/rollup/AttestationLib.sol b/l1-contracts/src/core/libraries/rollup/AttestationLib.sol
index f9062c3b8c1b..210243d235fc 100644
--- a/l1-contracts/src/core/libraries/rollup/AttestationLib.sol
+++ b/l1-contracts/src/core/libraries/rollup/AttestationLib.sol
@@ -3,20 +3,12 @@
 pragma solidity ^0.8.27;
 
 import {Errors} from "@aztec/core/libraries/Errors.sol";
+import {CoordinationSignatureLib} from "@aztec/core/libraries/rollup/CoordinationSignatureLib.sol";
 import {Signature, SignatureLib} from "@aztec/shared/libraries/SignatureLib.sol";
 
 uint256 constant SIGNATURE_LENGTH = 65; // v (1) + r (32) + s (32)
 uint256 constant ADDRESS_LENGTH = 20;
 
-/**
- * @notice The domain separator for the signatures
- */
-enum SignatureDomainSeparator {
-  checkpointProposal,
-  checkpointAttestation,
-  attestationsAndSigners
-}
-
 // A committee attestation can be made up of a signature and an address.
 // Committee members that have attested will produce a signature, and if they have not attested, the signature will be
 // empty and an address provided.
@@ -35,6 +27,24 @@ struct CommitteeAttestations {
 library AttestationLib {
   using SignatureLib for Signature;
 
+  function getAttestationsAndSignersDigest(CommitteeAttestations memory _attestations, address[] memory _signers)
+    internal
+    view
+    returns (bytes32)
+  {
+    return getAttestationsAndSignersDigest(_attestations, _signers, address(this));
+  }
+
+  function getAttestationsAndSignersDigest(
+    CommitteeAttestations memory _attestations,
+    address[] memory _signers,
+    address _verifyingContract
+  ) internal view returns (bytes32) {
+    return CoordinationSignatureLib.attestationsAndSignersDigest(
+      keccak256(abi.encode(_attestations, _signers)), _verifyingContract
+    );
+  }
+
   /**
    * @notice Checks if the given CommitteeAttestations is empty
    *          Wll return true if either component is empty as they are needed together.
@@ -217,12 +227,4 @@ library AttestationLib {
 
     return addresses;
   }
-
-  function getAttestationsAndSignersDigest(CommitteeAttestations memory _attestations, address[] memory _signers)
-    internal
-    pure
-    returns (bytes32)
-  {
-    return keccak256(abi.encode(SignatureDomainSeparator.attestationsAndSigners, _attestations, _signers));
-  }
 }
diff --git a/l1-contracts/src/core/libraries/rollup/CoordinationSignatureLib.sol b/l1-contracts/src/core/libraries/rollup/CoordinationSignatureLib.sol
new file mode 100644
index 000000000000..6b5f44e7bd49
--- /dev/null
+++ b/l1-contracts/src/core/libraries/rollup/CoordinationSignatureLib.sol
@@ -0,0 +1,72 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2024 Aztec Labs.
+pragma solidity ^0.8.27;
+
+library CoordinationSignatureLib {
+  bytes32 internal constant DOMAIN_TYPEHASH =
+    keccak256("EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)");
+  bytes32 internal constant NAME_HASH = keccak256("Aztec Rollup");
+  bytes32 internal constant VERSION_HASH = keccak256("1");
+
+  bytes32 internal constant BLOCK_PROPOSAL_TYPEHASH = keccak256("BlockProposal(bytes32 payloadHash)");
+  bytes32 internal constant CHECKPOINT_PROPOSAL_TYPEHASH = keccak256("CheckpointProposal(bytes32 payloadHash)");
+  bytes32 internal constant CHECKPOINT_ATTESTATION_TYPEHASH = keccak256("CheckpointAttestation(bytes32 payloadHash)");
+  bytes32 internal constant ATTESTATIONS_AND_SIGNERS_TYPEHASH =
+    keccak256("AttestationsAndSigners(bytes32 payloadHash)");
+
+  function domainSeparator() internal view returns (bytes32) {
+    return domainSeparator(address(this));
+  }
+
+  function domainSeparator(address _verifyingContract) internal view returns (bytes32) {
+    return keccak256(abi.encode(DOMAIN_TYPEHASH, NAME_HASH, VERSION_HASH, block.chainid, _verifyingContract));
+  }
+
+  function toTypedDataHash(bytes32 _structHash) internal view returns (bytes32) {
+    return toTypedDataHash(_structHash, address(this));
+  }
+
+  function toTypedDataHash(bytes32 _structHash, address _verifyingContract) internal view returns (bytes32) {
+    return keccak256(abi.encodePacked(hex"1901", domainSeparator(_verifyingContract), _structHash));
+  }
+
+  function blockProposalDigest(bytes32 _payloadHash) internal view returns (bytes32) {
+    return blockProposalDigest(_payloadHash, address(this));
+  }
+
+  function blockProposalDigest(bytes32 _payloadHash, address _verifyingContract) internal view returns (bytes32) {
+    return toTypedDataHash(keccak256(abi.encode(BLOCK_PROPOSAL_TYPEHASH, _payloadHash)), _verifyingContract);
+  }
+
+  function checkpointProposalDigest(bytes32 _payloadHash) internal view returns (bytes32) {
+    return checkpointProposalDigest(_payloadHash, address(this));
+  }
+
+  function checkpointProposalDigest(bytes32 _payloadHash, address _verifyingContract) internal view returns (bytes32) {
+    return toTypedDataHash(keccak256(abi.encode(CHECKPOINT_PROPOSAL_TYPEHASH, _payloadHash)), _verifyingContract);
+  }
+
+  function checkpointAttestationDigest(bytes32 _payloadHash) internal view returns (bytes32) {
+    return checkpointAttestationDigest(_payloadHash, address(this));
+  }
+
+  function checkpointAttestationDigest(bytes32 _payloadHash, address _verifyingContract)
+    internal
+    view
+    returns (bytes32)
+  {
+    return toTypedDataHash(keccak256(abi.encode(CHECKPOINT_ATTESTATION_TYPEHASH, _payloadHash)), _verifyingContract);
+  }
+
+  function attestationsAndSignersDigest(bytes32 _payloadHash) internal view returns (bytes32) {
+    return attestationsAndSignersDigest(_payloadHash, address(this));
+  }
+
+  function attestationsAndSignersDigest(bytes32 _payloadHash, address _verifyingContract)
+    internal
+    view
+    returns (bytes32)
+  {
+    return toTypedDataHash(keccak256(abi.encode(ATTESTATIONS_AND_SIGNERS_TYPEHASH, _payloadHash)), _verifyingContract);
+  }
+}
diff --git a/l1-contracts/src/core/libraries/rollup/InvalidateLib.sol b/l1-contracts/src/core/libraries/rollup/InvalidateLib.sol
index f9efbd49d186..2db0ba807f5f 100644
--- a/l1-contracts/src/core/libraries/rollup/InvalidateLib.sol
+++ b/l1-contracts/src/core/libraries/rollup/InvalidateLib.sol
@@ -13,7 +13,6 @@ import {ValidatorSelectionLib} from "@aztec/core/libraries/rollup/ValidatorSelec
 import {Timestamp, Slot, Epoch, TimeLib} from "@aztec/core/libraries/TimeLib.sol";
 import {CompressedSlot, CompressedTimeMath} from "@aztec/shared/libraries/CompressedTimeMath.sol";
 import {ECDSA} from "@oz/utils/cryptography/ECDSA.sol";
-import {MessageHashUtils} from "@oz/utils/cryptography/MessageHashUtils.sol";
 
 /**
  * @title InvalidateLib
@@ -57,7 +56,6 @@ library InvalidateLib {
   using TimeLib for Epoch;
   using ChainTipsLib for CompressedChainTips;
   using AttestationLib for CommitteeAttestations;
-  using MessageHashUtils for bytes32;
   using CompressedTimeMath for CompressedSlot;
 
   /**
@@ -235,7 +233,7 @@ library InvalidateLib {
     );
 
     // Get the digest of the payload that was signed by the committee
-    bytes32 digest = checkpointLog.payloadDigest.toEthSignedMessageHash();
+    bytes32 digest = checkpointLog.payloadDigest;
 
     return (digest, committeeSize);
   }
diff --git a/l1-contracts/src/core/libraries/rollup/ProposeLib.sol b/l1-contracts/src/core/libraries/rollup/ProposeLib.sol
index 747bbf36dbdf..64f57a04f44a 100644
--- a/l1-contracts/src/core/libraries/rollup/ProposeLib.sol
+++ b/l1-contracts/src/core/libraries/rollup/ProposeLib.sol
@@ -9,7 +9,8 @@ import {TempCheckpointLog} from "@aztec/core/libraries/compressed-data/Checkpoin
 import {FeeHeader} from "@aztec/core/libraries/compressed-data/fees/FeeStructs.sol";
 import {ChainTipsLib, CompressedChainTips} from "@aztec/core/libraries/compressed-data/Tips.sol";
 import {Errors} from "@aztec/core/libraries/Errors.sol";
-import {SignatureDomainSeparator, CommitteeAttestations} from "@aztec/core/libraries/rollup/AttestationLib.sol";
+import {CommitteeAttestations} from "@aztec/core/libraries/rollup/AttestationLib.sol";
+import {CoordinationSignatureLib} from "@aztec/core/libraries/rollup/CoordinationSignatureLib.sol";
 import {OracleInput, FeeLib, ManaMinFeeComponents} from "@aztec/core/libraries/rollup/FeeLib.sol";
 import {ValidatorSelectionLib} from "@aztec/core/libraries/rollup/ValidatorSelectionLib.sol";
 import {Timestamp, Slot, Epoch, TimeLib} from "@aztec/core/libraries/TimeLib.sol";
@@ -375,7 +376,11 @@ library ProposeLib {
     return FeeLib.getManaMinFeeComponentsAt(checkpointOfInterest, _timestamp, _inFeeAsset);
   }
 
-  function digest(ProposePayload memory _args) internal pure returns (bytes32) {
-    return keccak256(abi.encode(SignatureDomainSeparator.checkpointAttestation, _args));
+  function digest(ProposePayload memory _args) internal view returns (bytes32) {
+    return digest(_args, address(this));
+  }
+
+  function digest(ProposePayload memory _args, address _verifyingContract) internal view returns (bytes32) {
+    return CoordinationSignatureLib.checkpointAttestationDigest(keccak256(abi.encode(_args)), _verifyingContract);
   }
 }
diff --git a/l1-contracts/src/core/libraries/rollup/ValidatorSelectionLib.sol b/l1-contracts/src/core/libraries/rollup/ValidatorSelectionLib.sol
index 41834351de54..5d1d8b0fad38 100644
--- a/l1-contracts/src/core/libraries/rollup/ValidatorSelectionLib.sol
+++ b/l1-contracts/src/core/libraries/rollup/ValidatorSelectionLib.sol
@@ -13,7 +13,6 @@ import {STFLib} from "@aztec/core/libraries/rollup/STFLib.sol";
 import {Timestamp, Slot, Epoch, TimeLib} from "@aztec/core/libraries/TimeLib.sol";
 import {SignatureLib, Signature} from "@aztec/shared/libraries/SignatureLib.sol";
 import {ECDSA} from "@oz/utils/cryptography/ECDSA.sol";
-import {MessageHashUtils} from "@oz/utils/cryptography/MessageHashUtils.sol";
 import {SafeCast} from "@oz/utils/math/SafeCast.sol";
 import {SlotDerivation} from "@oz/utils/SlotDerivation.sol";
 import {Checkpoints} from "@oz/utils/structs/Checkpoints.sol";
@@ -94,7 +93,6 @@ import {TransientSlot} from "@oz/utils/TransientSlot.sol";
  */
 library ValidatorSelectionLib {
   using EnumerableSet for EnumerableSet.AddressSet;
-  using MessageHashUtils for bytes32;
   using SignatureLib for Signature;
   using TimeLib for Timestamp;
   using TimeLib for Epoch;
@@ -273,14 +271,12 @@ library ValidatorSelectionLib {
     }
 
     // Check if the signature is correct
-    bytes32 digest = _digest.toEthSignedMessageHash();
     Signature memory signature = _attestations.getSignature(proposerIndex);
-    SignatureLib.verify(signature, proposer, digest);
+    SignatureLib.verify(signature, proposer, _digest);
 
     // Check that the proposer have signed the `_attestations|_signers` data such that invalid `_attestations|_signers`
     // data can be attributed to the `proposer` specifically.
-    bytes32 attestationsAndSignersDigest =
-      _attestations.getAttestationsAndSignersDigest(_signers).toEthSignedMessageHash();
+    bytes32 attestationsAndSignersDigest = _attestations.getAttestationsAndSignersDigest(_signers);
     SignatureLib.verify(_attestationsAndSignersSignature, proposer, attestationsAndSignersDigest);
 
     if (_updateCache) {
@@ -333,8 +329,6 @@ library ValidatorSelectionLib {
       reconstructedCommittee: new address[](targetCommitteeSize)
     });
 
-    bytes32 digest = _digest.toEthSignedMessageHash();
-
     bytes memory signaturesOrAddresses = _attestations.signaturesOrAddresses;
     uint256 dataPtr;
     assembly {
@@ -360,7 +354,7 @@ library ValidatorSelectionLib {
           }
 
           ++stack.signaturesRecovered;
-          stack.reconstructedCommittee[i] = ECDSA.recover(digest, v, r, s);
+          stack.reconstructedCommittee[i] = ECDSA.recover(_digest, v, r, s);
         } else {
           address addr;
           assembly {
diff --git a/l1-contracts/test/RollupGetters.t.sol b/l1-contracts/test/RollupGetters.t.sol
index 2bd89fb1525a..dff58c1374e6 100644
--- a/l1-contracts/test/RollupGetters.t.sol
+++ b/l1-contracts/test/RollupGetters.t.sol
@@ -7,6 +7,7 @@ pragma solidity >=0.8.27;
 
 import {IRollupCore, CheckpointLog} from "@aztec/core/interfaces/IRollup.sol";
 import {IStakingCore} from "@aztec/core/interfaces/IStaking.sol";
+import {IVerifier} from "@aztec/core/interfaces/IVerifier.sol";
 import {TestConstants} from "./harnesses/TestConstants.sol";
 import {Timestamp, Slot, Epoch} from "@aztec/shared/libraries/TimeMath.sol";
 import {RewardConfig, Bps} from "@aztec/core/libraries/rollup/RewardLib.sol";
@@ -292,6 +293,21 @@ contract RollupShouldBeGetters is ValidatorSelectionTestBase {
     assertEq(writes.length, 0, "No writes should be done");
   }
 
+  function test_getGenesisConfig() external setup(1, 1) {
+    vm.record();
+
+    bytes32 vkTreeRoot = rollup.getVkTreeRoot();
+    bytes32 protocolContractsHash = rollup.getProtocolContractsHash();
+    IVerifier epochProofVerifier = rollup.getEpochProofVerifier();
+
+    assertEq(vkTreeRoot, TestConstants.GENESIS_VK_TREE_ROOT, "invalid vkTreeRoot");
+    assertEq(protocolContractsHash, TestConstants.GENESIS_PROTOCOL_CONTRACTS_HASH, "invalid protocolContractsHash");
+    assertTrue(address(epochProofVerifier) != address(0), "epochProofVerifier not set");
+
+    (, bytes32[] memory writes) = vm.accesses(address(rollup));
+    assertEq(writes.length, 0, "No writes should be done");
+  }
+
   function test_getRewardConfig() external setup(1, 1) {
     // By default, we will be replacing the reward distributor and booster addresses
     RewardConfig memory defaultConfig = TestConstants.getRewardConfig();
diff --git a/l1-contracts/test/benchmark/happy.t.sol b/l1-contracts/test/benchmark/happy.t.sol
index 6dd152f38cff..80375cc6434f 100644
--- a/l1-contracts/test/benchmark/happy.t.sol
+++ b/l1-contracts/test/benchmark/happy.t.sol
@@ -56,7 +56,6 @@ import {
   FeeHeaderModel,
   ManaMinFeeComponentsModel
 } from "test/fees/FeeModelTestPoints.t.sol";
-import {MessageHashUtils} from "@oz/utils/cryptography/MessageHashUtils.sol";
 import {Timestamp, Slot, Epoch, TimeLib} from "@aztec/core/libraries/TimeLib.sol";
 import {MultiAdder, CheatDepositArgs} from "@aztec/mock/MultiAdder.sol";
 import {RollupBuilder} from "../builder/RollupBuilder.sol";
@@ -98,7 +97,6 @@ contract FakeCanonical is IRewardDistributor {
 }
 
 contract BenchmarkRollupTest is FeeModelTestPoints, DecoderBase {
-  using MessageHashUtils for bytes32;
   using stdStorage for StdStorage;
   using TimeLib for Slot;
   using TimeLib for Timestamp;
@@ -286,7 +284,7 @@ contract BenchmarkRollupTest is FeeModelTestPoints, DecoderBase {
       ProposePayload memory proposePayload =
         ProposePayload({archive: proposeArgs.archive, oracleInput: proposeArgs.oracleInput, headerHash: headerHash});
 
-      bytes32 digest = ProposeLib.digest(proposePayload);
+      bytes32 digest = ProposeLib.digest(proposePayload, address(rollup));
 
       // loop through to make sure we create an attestation for the proposer
       for (uint256 i = 0; i < validators.length; i++) {
@@ -318,7 +316,9 @@ contract BenchmarkRollupTest is FeeModelTestPoints, DecoderBase {
     if (proposer != address(0)) {
       attestationsAndSignersSignature = createAttestation(
         proposer,
-        AttestationLib.getAttestationsAndSignersDigest(AttestationLibHelper.packAttestations(attestations), signers)
+        AttestationLib.getAttestationsAndSignersDigest(
+          AttestationLibHelper.packAttestations(attestations), signers, address(rollup)
+        )
       ).signature;
     }
 
@@ -334,8 +334,7 @@ contract BenchmarkRollupTest is FeeModelTestPoints, DecoderBase {
   function createAttestation(address _signer, bytes32 _digest) internal view returns (CommitteeAttestation memory) {
     uint256 privateKey = attesterPrivateKeys[_signer];
 
-    bytes32 digest = _digest.toEthSignedMessageHash();
-    (uint8 v, bytes32 r, bytes32 s) = vm.sign(privateKey, digest);
+    (uint8 v, bytes32 r, bytes32 s) = vm.sign(privateKey, _digest);
 
     Signature memory signature = Signature({v: v, r: r, s: s});
     // Address can be zero for signed attestations
diff --git a/l1-contracts/test/compression/PreHeating.t.sol b/l1-contracts/test/compression/PreHeating.t.sol
index f2c2e24e8fa5..5c9ff87495d5 100644
--- a/l1-contracts/test/compression/PreHeating.t.sol
+++ b/l1-contracts/test/compression/PreHeating.t.sol
@@ -55,7 +55,6 @@ import {
   FeeHeaderModel,
   ManaMinFeeComponentsModel
 } from "test/fees/FeeModelTestPoints.t.sol";
-import {MessageHashUtils} from "@oz/utils/cryptography/MessageHashUtils.sol";
 import {Timestamp, Slot, Epoch, TimeLib} from "@aztec/core/libraries/TimeLib.sol";
 import {MultiAdder, CheatDepositArgs} from "@aztec/mock/MultiAdder.sol";
 import {RollupBuilder} from "../builder/RollupBuilder.sol";
@@ -99,7 +98,6 @@ contract FakeCanonical is IRewardDistributor {
  *          are testing some edges that will break if the `roundaboutSize` is wrong!
  */
 contract PreHeatingTest is FeeModelTestPoints, DecoderBase {
-  using MessageHashUtils for bytes32;
   using TimeLib for Slot;
   using FeeLib for uint256;
   using FeeLib for ManaMinFeeComponents;
@@ -343,7 +341,7 @@ contract PreHeatingTest is FeeModelTestPoints, DecoderBase {
       ProposePayload memory proposePayload =
         ProposePayload({archive: proposeArgs.archive, oracleInput: proposeArgs.oracleInput, headerHash: headerHash});
 
-      bytes32 digest = ProposeLib.digest(proposePayload);
+      bytes32 digest = ProposeLib.digest(proposePayload, address(rollup));
 
       // loop through to make sure we create an attestation for the proposer
       for (uint256 i = 0; i < validators.length; i++) {
@@ -375,7 +373,9 @@ contract PreHeatingTest is FeeModelTestPoints, DecoderBase {
     if (proposer != address(0)) {
       attestationsAndSignersSignature = createAttestation(
         proposer,
-        AttestationLib.getAttestationsAndSignersDigest(AttestationLibHelper.packAttestations(attestations), signers)
+        AttestationLib.getAttestationsAndSignersDigest(
+          AttestationLibHelper.packAttestations(attestations), signers, address(rollup)
+        )
       ).signature;
     }
 
@@ -391,8 +391,7 @@ contract PreHeatingTest is FeeModelTestPoints, DecoderBase {
   function createAttestation(address _signer, bytes32 _digest) internal view returns (CommitteeAttestation memory) {
     uint256 privateKey = attesterPrivateKeys[_signer];
 
-    bytes32 digest = _digest.toEthSignedMessageHash();
-    (uint8 v, bytes32 r, bytes32 s) = vm.sign(privateKey, digest);
+    (uint8 v, bytes32 r, bytes32 s) = vm.sign(privateKey, _digest);
 
     Signature memory signature = Signature({v: v, r: r, s: s});
     // Address can be zero for signed attestations
diff --git a/l1-contracts/test/escape-hatch/e2e/escapeHatchReplacement.t.sol b/l1-contracts/test/escape-hatch/e2e/escapeHatchReplacement.t.sol
index e76ded6a1a5f..2005c24fa70c 100644
--- a/l1-contracts/test/escape-hatch/e2e/escapeHatchReplacement.t.sol
+++ b/l1-contracts/test/escape-hatch/e2e/escapeHatchReplacement.t.sol
@@ -95,7 +95,7 @@ contract EscapeHatchReplacementTest is EscapeHatchIntegrationBase {
     uint256 committeeSize = data.committee.length;
     data.attestations = new CommitteeAttestation[](committeeSize);
     address[] memory signers = new address[](committeeSize);
-    bytes32 digest = ProposeLib.digest(proposePayload);
+    bytes32 digest = ProposeLib.digest(proposePayload, address(rollup));
 
     for (uint256 i = 0; i < committeeSize; i++) {
       data.attestations[i] = _createAttestation(data.committee[i], digest);
@@ -118,8 +118,9 @@ contract EscapeHatchReplacementTest is EscapeHatchIntegrationBase {
 
     // Proposer signs over attestations and signers
     Signature memory attestationsAndSignersSignature =
-    _createAttestation(proposer, AttestationLib.getAttestationsAndSignersDigest(data.packedAttestations, signers))
-    .signature;
+    _createAttestation(
+      proposer, AttestationLib.getAttestationsAndSignersDigest(data.packedAttestations, signers, address(rollup))
+    ).signature;
 
     vm.prank(proposer);
     rollup.propose(
diff --git a/l1-contracts/test/escape-hatch/integration/EscapeHatchIntegrationBase.sol b/l1-contracts/test/escape-hatch/integration/EscapeHatchIntegrationBase.sol
index 63fff8a63fb4..f578aa23dc9b 100644
--- a/l1-contracts/test/escape-hatch/integration/EscapeHatchIntegrationBase.sol
+++ b/l1-contracts/test/escape-hatch/integration/EscapeHatchIntegrationBase.sol
@@ -20,7 +20,6 @@ import {
 import {CheckpointLog, SubmitEpochRootProofArgs, PublicInputArgs} from "@aztec/core/interfaces/IRollup.sol";
 import {IValidatorSelectionCore} from "@aztec/core/interfaces/IValidatorSelection.sol";
 import {Strings} from "@oz/utils/Strings.sol";
-import {MessageHashUtils} from "@oz/utils/cryptography/MessageHashUtils.sol";
 import {SafeCast} from "@oz/utils/math/SafeCast.sol";
 import {AttestationLibHelper} from "@test/helper_libraries/AttestationLibHelper.sol";
 
@@ -30,7 +29,6 @@ import {AttestationLibHelper} from "@test/helper_libraries/AttestationLibHelper.
  * @dev Provides common setup, configuration, and helper functions for integration tests
  */
 abstract contract EscapeHatchIntegrationBase is ValidatorSelectionTestBase {
-  using MessageHashUtils for bytes32;
   // ============ Escape Hatch Configuration ============
   uint96 internal constant DEFAULT_BOND_SIZE = 100e18;
   uint96 internal constant DEFAULT_WITHDRAWAL_TAX = 1e18;
@@ -215,7 +213,7 @@ abstract contract EscapeHatchIntegrationBase is ValidatorSelectionTestBase {
     uint256 committeeSize = committee.length;
     attestations = new CommitteeAttestation[](committeeSize);
     address[] memory signers = new address[](committeeSize);
-    bytes32 digest = ProposeLib.digest(proposePayload);
+    bytes32 digest = ProposeLib.digest(proposePayload, address(rollup));
 
     for (uint256 i = 0; i < committeeSize; i++) {
       attestations[i] = _createAttestation(committee[i], digest);
@@ -226,7 +224,9 @@ abstract contract EscapeHatchIntegrationBase is ValidatorSelectionTestBase {
     Signature memory attestationsAndSignersSignature =
     _createAttestation(
       proposer,
-      AttestationLib.getAttestationsAndSignersDigest(AttestationLibHelper.packAttestations(attestations), signers)
+      AttestationLib.getAttestationsAndSignersDigest(
+        AttestationLibHelper.packAttestations(attestations), signers, address(rollup)
+      )
     ).signature;
 
     // Propose the checkpoint
@@ -248,8 +248,7 @@ abstract contract EscapeHatchIntegrationBase is ValidatorSelectionTestBase {
   function _createAttestation(address _signer, bytes32 _digest) internal view returns (CommitteeAttestation memory) {
     uint256 privateKey = attesterPrivateKeys[_signer];
 
-    bytes32 digest = _digest.toEthSignedMessageHash();
-    (uint8 v, bytes32 r, bytes32 s) = vm.sign(privateKey, digest);
+    (uint8 v, bytes32 r, bytes32 s) = vm.sign(privateKey, _digest);
 
     Signature memory signature = Signature({v: v, r: r, s: s});
     return CommitteeAttestation({addr: _signer, signature: signature});
diff --git a/l1-contracts/test/escape-hatch/integration/invalidate.t.sol b/l1-contracts/test/escape-hatch/integration/invalidate.t.sol
index 0cb06f20eb70..f4709a59eabf 100644
--- a/l1-contracts/test/escape-hatch/integration/invalidate.t.sol
+++ b/l1-contracts/test/escape-hatch/integration/invalidate.t.sol
@@ -153,7 +153,7 @@ contract invalidateTest is EscapeHatchIntegrationBase {
     uint256 committeeSize = data.committee.length;
     data.attestations = new CommitteeAttestation[](committeeSize);
     address[] memory signers = new address[](committeeSize);
-    bytes32 digest = ProposeLib.digest(proposePayload);
+    bytes32 digest = ProposeLib.digest(proposePayload, address(rollup));
 
     for (uint256 i = 0; i < committeeSize; i++) {
       data.attestations[i] = _createAttestation(data.committee[i], digest);
@@ -177,7 +177,9 @@ contract invalidateTest is EscapeHatchIntegrationBase {
     Signature memory attestationsAndSignersSignature =
     _createAttestation(
       proposer,
-      AttestationLib.getAttestationsAndSignersDigest(AttestationLibHelper.packAttestations(data.attestations), signers)
+      AttestationLib.getAttestationsAndSignersDigest(
+        AttestationLibHelper.packAttestations(data.attestations), signers, address(rollup)
+      )
     ).signature;
 
     // Propose the checkpoint
diff --git a/l1-contracts/test/validator-selection/ValidatorSelection.t.sol b/l1-contracts/test/validator-selection/ValidatorSelection.t.sol
index fe7240e16920..17112c7d3b21 100644
--- a/l1-contracts/test/validator-selection/ValidatorSelection.t.sol
+++ b/l1-contracts/test/validator-selection/ValidatorSelection.t.sol
@@ -16,7 +16,6 @@ import {Errors} from "@aztec/core/libraries/Errors.sol";
 import {Timestamp, Epoch} from "@aztec/core/libraries/TimeLib.sol";
 import {IPayload} from "@aztec/core/slashing/Slasher.sol";
 
-import {MessageHashUtils} from "@oz/utils/cryptography/MessageHashUtils.sol";
 import {SafeCast} from "@oz/utils/math/SafeCast.sol";
 
 import {ProposedHeaderLib} from "@aztec/core/libraries/rollup/ProposedHeaderLib.sol";
@@ -121,7 +120,6 @@ library TestFlagsLib {
  * The tests in this file is testing the sequencer selection
  */
 contract ValidatorSelectionTest is ValidatorSelectionTestBase {
-  using MessageHashUtils for bytes32;
   using TestFlagsLib for TestFlags;
 
   bytes4 NO_REVERT = bytes4(0);
@@ -565,7 +563,7 @@ contract ValidatorSelectionTest is ValidatorSelectionTestBase {
 
     ree.attestations = new CommitteeAttestation[](ree.attestationsCount);
     ree.signers = new address[](_signatureCount);
-    bytes32 digest = ProposeLib.digest(ree.proposePayload);
+    bytes32 digest = ProposeLib.digest(ree.proposePayload, address(rollup));
 
     {
       uint256 signersIndex = 0;
@@ -612,7 +610,7 @@ contract ValidatorSelectionTest is ValidatorSelectionTestBase {
         ree.attestationsAndSignersSignature = _createAttestation(
           ree.proposer,
           AttestationLib.getAttestationsAndSignersDigest(
-            AttestationLibHelper.packAttestations(ree.attestations), ree.signers
+            AttestationLibHelper.packAttestations(ree.attestations), ree.signers, address(rollup)
           )
         ).signature;
       }
@@ -665,7 +663,7 @@ contract ValidatorSelectionTest is ValidatorSelectionTestBase {
       ree.attestationsAndSignersSignature = _createAttestation(
         ree.proposer,
         AttestationLib.getAttestationsAndSignersDigest(
-          AttestationLibHelper.packAttestations(ree.attestations), ree.signers
+          AttestationLibHelper.packAttestations(ree.attestations), ree.signers, address(rollup)
         )
       ).signature;
     } else if (ree.proposer != address(0) && _flags.invalidAttestationAndSignersSignature) {
@@ -680,7 +678,7 @@ contract ValidatorSelectionTest is ValidatorSelectionTestBase {
       ree.attestationsAndSignersSignature = _createAttestation(
         invalidSigner,
         AttestationLib.getAttestationsAndSignersDigest(
-          AttestationLibHelper.packAttestations(ree.attestations), ree.signers
+          AttestationLibHelper.packAttestations(ree.attestations), ree.signers, address(rollup)
         )
       ).signature;
     }
@@ -767,8 +765,7 @@ contract ValidatorSelectionTest is ValidatorSelectionTestBase {
   function _createAttestation(address _signer, bytes32 _digest) internal view returns (CommitteeAttestation memory) {
     uint256 privateKey = attesterPrivateKeys[_signer];
 
-    bytes32 digest = _digest.toEthSignedMessageHash();
-    (uint8 v, bytes32 r, bytes32 s) = vm.sign(privateKey, digest);
+    (uint8 v, bytes32 r, bytes32 s) = vm.sign(privateKey, _digest);
 
     Signature memory signature = Signature({v: v, r: r, s: s});
     return CommitteeAttestation({addr: _signer, signature: signature});
diff --git a/l1-contracts/test/validator-selection/ValidatorSelectionBase.sol b/l1-contracts/test/validator-selection/ValidatorSelectionBase.sol
index 16dbae9d37b6..95f7cfb445b2 100644
--- a/l1-contracts/test/validator-selection/ValidatorSelectionBase.sol
+++ b/l1-contracts/test/validator-selection/ValidatorSelectionBase.sol
@@ -13,7 +13,6 @@ import {Registry} from "@aztec/governance/Registry.sol";
 import {Rollup} from "@aztec/core/Rollup.sol";
 import {MerkleTestUtil} from "../merkle/TestUtil.sol";
 import {TestERC20} from "@aztec/mock/TestERC20.sol";
-import {MessageHashUtils} from "@oz/utils/cryptography/MessageHashUtils.sol";
 import {TestConstants} from "../harnesses/TestConstants.sol";
 
 import {Epoch, Timestamp} from "@aztec/core/libraries/TimeLib.sol";
@@ -37,7 +36,6 @@ import {Math} from "@oz/utils/math/Math.sol";
  * The tests in this file is testing the sequencer selection
  */
 contract ValidatorSelectionTestBase is DecoderBase {
-  using MessageHashUtils for bytes32;
   using stdStorage for StdStorage;
 
   struct ProposeTestData {
diff --git a/l1-contracts/test/validator-selection/tmnt207.t.sol b/l1-contracts/test/validator-selection/tmnt207.t.sol
index 92dc377c1569..233bbb6581d0 100644
--- a/l1-contracts/test/validator-selection/tmnt207.t.sol
+++ b/l1-contracts/test/validator-selection/tmnt207.t.sol
@@ -36,7 +36,6 @@ import {CheatDepositArgs} from "@aztec/mock/MultiAdder.sol";
 import {BN254Lib, G1Point, G2Point} from "@aztec/shared/libraries/BN254Lib.sol";
 import {StakingQueueConfig} from "@aztec/core/libraries/compressed-data/StakingQueueConfig.sol";
 import {ProposedHeaderLib} from "@aztec/core/libraries/rollup/ProposedHeaderLib.sol";
-import {MessageHashUtils} from "@oz/utils/cryptography/MessageHashUtils.sol";
 import {
   IRollup,
   IRollupCore,
@@ -56,7 +55,6 @@ struct Checkpoint {
 }
 
 contract Tmnt207Test is RollupBase {
-  using MessageHashUtils for bytes32;
   using ProposeLib for ProposeArgs;
   using TimeLib for Timestamp;
   using TimeLib for Slot;
@@ -277,7 +275,7 @@ contract Tmnt207Test is RollupBase {
       ProposePayload memory proposePayload =
         ProposePayload({archive: proposeArgs.archive, oracleInput: proposeArgs.oracleInput, headerHash: headerHash});
 
-      bytes32 digest = ProposeLib.digest(proposePayload);
+      bytes32 digest = ProposeLib.digest(proposePayload, address(rollup));
 
       // loop through to make sure we create an attestation for the proposer
       for (uint256 i = 0; i < validators.length; i++) {
@@ -309,7 +307,9 @@ contract Tmnt207Test is RollupBase {
     if (proposer != address(0)) {
       attestationsAndSignersSignature = createAttestation(
         proposer,
-        AttestationLib.getAttestationsAndSignersDigest(AttestationLibHelper.packAttestations(attestations), signers)
+        AttestationLib.getAttestationsAndSignersDigest(
+          AttestationLibHelper.packAttestations(attestations), signers, address(rollup)
+        )
       ).signature;
     }
 
@@ -325,8 +325,7 @@ contract Tmnt207Test is RollupBase {
   function createAttestation(address _signer, bytes32 _digest) internal view returns (CommitteeAttestation memory) {
     uint256 privateKey = attesterPrivateKeys[_signer];
 
-    bytes32 digest = _digest.toEthSignedMessageHash();
-    (uint8 v, bytes32 r, bytes32 s) = vm.sign(privateKey, digest);
+    (uint8 v, bytes32 r, bytes32 s) = vm.sign(privateKey, _digest);
 
     Signature memory signature = Signature({v: v, r: r, s: s});
     // Address can be zero for signed attestations
diff --git a/noir-projects/aztec-nr/AGENTS.md b/noir-projects/aztec-nr/AGENTS.md
new file mode 120000
index 000000000000..681311eb9cf4
--- /dev/null
+++ b/noir-projects/aztec-nr/AGENTS.md
@@ -0,0 +1 @@
+CLAUDE.md
\ No newline at end of file
diff --git a/noir-projects/aztec-nr/aztec/src/authwit/entrypoint/app.nr b/noir-projects/aztec-nr/aztec/src/authwit/entrypoint/app.nr
index 9af791d5b148..20835a9c6dbd 100644
--- a/noir-projects/aztec-nr/aztec/src/authwit/entrypoint/app.nr
+++ b/noir-projects/aztec-nr/aztec/src/authwit/entrypoint/app.nr
@@ -2,7 +2,7 @@ use crate::{authwit::entrypoint::FunctionCall, context::PrivateContext};
 use crate::protocol::{
     constants::DOM_SEP__SIGNATURE_PAYLOAD,
     hash::poseidon2_hash_with_separator,
-    traits::{Hash, Serialize},
+    traits::{Deserialize, Hash, Serialize},
 };
 use std::meta::derive;
 
@@ -12,7 +12,7 @@ global ACCOUNT_MAX_CALLS: u32 = 5;
 // - default_entrypoint.ts
 // - account_entrypoint.ts (specifically `getEntrypointAbi()`)
 // - default_multi_call_entrypoint.ts (specifically `getEntrypointAbi()`)
-#[derive(Serialize)]
+#[derive(Deserialize, Serialize)]
 pub struct AppPayload {
     function_calls: [FunctionCall; ACCOUNT_MAX_CALLS],
     // A nonce that enables transaction cancellation. When the cancellable flag is enabled, this nonce is used to
diff --git a/noir-projects/aztec-nr/aztec/src/authwit/entrypoint/function_call.nr b/noir-projects/aztec-nr/aztec/src/authwit/entrypoint/function_call.nr
index 7bc365f5b3b4..6a79f9f67176 100644
--- a/noir-projects/aztec-nr/aztec/src/authwit/entrypoint/function_call.nr
+++ b/noir-projects/aztec-nr/aztec/src/authwit/entrypoint/function_call.nr
@@ -1,4 +1,8 @@
-use crate::protocol::{abis::function_selector::FunctionSelector, address::AztecAddress, traits::Serialize};
+use crate::protocol::{
+    abis::function_selector::FunctionSelector,
+    address::AztecAddress,
+    traits::{Deserialize, Serialize},
+};
 use std::meta::derive;
 
 // @dev: If you change the following struct you have to update:
@@ -6,7 +10,7 @@ use std::meta::derive;
 // - default_multi_call_entrypoint.ts (specifically `getEntrypointAbi()`)
 // - function_call.ts
 // - encoding.ts
-#[derive(Serialize)]
+#[derive(Deserialize, Serialize)]
 pub struct FunctionCall {
     // args_hash is calldata_hash if is_public is true
     pub args_hash: Field,
diff --git a/noir-projects/aztec-nr/aztec/src/context/calls.nr b/noir-projects/aztec-nr/aztec/src/context/calls.nr
index 182d25f021f7..fd4fe51c5779 100644
--- a/noir-projects/aztec-nr/aztec/src/context/calls.nr
+++ b/noir-projects/aztec-nr/aztec/src/context/calls.nr
@@ -250,18 +250,17 @@ impl<let M: u32, let N: u32, T> PublicStaticCall<M, N, T> {
 
 // UtilityCall
 
+#[must_use = "Your utility call needs to be passed into `self.call(...)` (utility context) or `self.utility.call(...)` (private context) to be executed"]
 pub struct UtilityCall<let M: u32, let N: u32, T> {
     pub target_contract: AztecAddress,
     pub selector: FunctionSelector,
     pub name: str<M>,
-    args_hash: Field,
     pub args: [Field; N],
     return_type: T,
 }
 
 impl<let M: u32, let N: u32, T> UtilityCall<M, N, T> {
     pub fn new(target_contract: AztecAddress, selector: FunctionSelector, name: str<M>, args: [Field; N]) -> Self {
-        let args_hash = hash_args(args);
-        Self { target_contract, selector, name, args_hash, args, return_type: std::mem::zeroed() }
+        Self { target_contract, selector, name, args, return_type: std::mem::zeroed() }
     }
 }
diff --git a/noir-projects/aztec-nr/aztec/src/contract_self/contract_self_private.nr b/noir-projects/aztec-nr/aztec/src/contract_self/contract_self_private.nr
index 6065428f97c1..73aff857495e 100644
--- a/noir-projects/aztec-nr/aztec/src/contract_self/contract_self_private.nr
+++ b/noir-projects/aztec-nr/aztec/src/contract_self/contract_self_private.nr
@@ -1,8 +1,9 @@
 //! The `self` contract value for private execution contexts.
 
 use crate::{
-    context::{calls::{PrivateCall, PrivateStaticCall, PublicCall, PublicStaticCall}, PrivateContext},
+    context::{calls::{PrivateCall, PrivateStaticCall, PublicCall, PublicStaticCall, UtilityCall}, PrivateContext},
     event::{event_emission::emit_event_in_private, event_interface::EventInterface, EventMessage},
+    oracle::call_utility_function::call_utility_function,
 };
 use crate::protocol::{address::AztecAddress, traits::{Deserialize, Serialize}};
 
@@ -47,7 +48,8 @@ use crate::protocol::{address::AztecAddress, traits::{Deserialize, Serialize}};
 /// - `CallSelfStatic`: Macro-generated type for calling contract's own view functions
 /// - `EnqueueSelfStatic`: Macro-generated type for enqueuing calls to the contract's own view functions
 /// - `CallInternal`: Macro-generated type for calling internal functions
-pub struct ContractSelfPrivate<Storage, CallSelf, EnqueueSelf, CallSelfStatic, EnqueueSelfStatic, CallInternal> {
+/// - `CallSelfUtility`: Macro-generated type for calling the contract's own utility functions
+pub struct ContractSelfPrivate<Storage, CallSelf, EnqueueSelf, CallSelfStatic, EnqueueSelfStatic, CallInternal, CallSelfUtility> {
     /// The address of this contract
     pub address: AztecAddress,
 
@@ -108,9 +110,18 @@ pub struct ContractSelfPrivate<Storage, CallSelf, EnqueueSelf, CallSelfStatic, E
     /// self.internal.some_internal_function(args)
     /// ```
     pub internal: CallInternal,
+
+    /// A struct that allows for ergonomic calling of utility functions from this private context.
+    ///
+    /// Example API:
+    /// ```noir
+    /// // Safety: result is unconstrained
+    /// unsafe { self.utility.call(MyContract::at(address).my_utility_function(args)) }
+    /// ```
+    pub utility: PrivateUtilityCalls<CallSelfUtility>,
 }
 
-impl<Storage, CallSelf, EnqueueSelf, CallSelfStatic, EnqueueSelfStatic, CallInternal> ContractSelfPrivate<Storage, CallSelf, EnqueueSelf, CallSelfStatic, EnqueueSelfStatic, CallInternal> {
+impl<Storage, CallSelf, EnqueueSelf, CallSelfStatic, EnqueueSelfStatic, CallInternal, CallSelfUtility> ContractSelfPrivate<Storage, CallSelf, EnqueueSelf, CallSelfStatic, EnqueueSelfStatic, CallInternal, CallSelfUtility> {
     /// Creates a new `ContractSelfPrivate` instance for a private function.
     ///
     /// This constructor is called automatically by the macro system and should not be called directly.
@@ -122,6 +133,7 @@ impl<Storage, CallSelf, EnqueueSelf, CallSelfStatic, EnqueueSelfStatic, CallInte
         call_self_static: CallSelfStatic,
         enqueue_self_static: EnqueueSelfStatic,
         internal: CallInternal,
+        utility: PrivateUtilityCalls<CallSelfUtility>,
     ) -> Self {
         Self {
             context,
@@ -132,6 +144,7 @@ impl<Storage, CallSelf, EnqueueSelf, CallSelfStatic, EnqueueSelfStatic, CallInte
             call_self_static,
             enqueue_self_static,
             internal,
+            utility,
         }
     }
 
@@ -395,3 +408,45 @@ impl<Storage, CallSelf, EnqueueSelf, CallSelfStatic, EnqueueSelfStatic, CallInte
         call.set_as_teardown_incognito(self.context)
     }
 }
+
+/// A struct that allows for ergonomic calling of utility functions from a private context.
+///
+/// Accessible via `self.utility` in private functions. Results are not part of any circuit
+/// proof; use them to inform logic, not as inputs to constrained assertions.
+///
+/// ## Type Parameters
+///
+/// - `CallSelf`: Macro-generated type for calling the contract's own utility functions (same type
+/// as `CallSelf` in \[`ContractSelfUtility`\])
+// Implemented as a separate struct (rather than inlined in ContractSelfPrivate) because Noir does
+// not allow passing `&mut PrivateContext` (held by `ContractSelfPrivate`) into unconstrained code.
+// This struct holds no mutable references, so it can be passed freely into `unconstrained`
+// functions.
+pub struct PrivateUtilityCalls<CallSelf> {
+    /// Provides type-safe methods for calling this contract's own utility functions.
+    ///
+    /// Example API:
+    /// ```noir
+    /// // Safety: result is unconstrained
+    /// unsafe { self.utility.call_self.some_utility_function(args) }
+    /// ```
+    pub call_self: CallSelf,
+}
+
+impl<CallSelf> PrivateUtilityCalls<CallSelf> {
+    /// Makes a utility contract call from a private function.
+    ///
+    /// Note: only same-contract utility calls are currently supported. See TODO(F-29).
+    ///
+    /// # Example
+    /// ```noir
+    /// unsafe { self.utility.call(Token::at(self.address).get_balance_of(owner)) }
+    /// ```
+    pub unconstrained fn call<let M: u32, let N: u32, T>(_self: Self, call: UtilityCall<M, N, T>) -> T
+    where
+        T: Deserialize,
+    {
+        let returns = call_utility_function(call.target_contract, call.selector, call.args);
+        Deserialize::deserialize(returns)
+    }
+}
diff --git a/noir-projects/aztec-nr/aztec/src/contract_self/contract_self_utility.nr b/noir-projects/aztec-nr/aztec/src/contract_self/contract_self_utility.nr
index 39cc1da0d3ac..15aa42e120de 100644
--- a/noir-projects/aztec-nr/aztec/src/contract_self/contract_self_utility.nr
+++ b/noir-projects/aztec-nr/aztec/src/contract_self/contract_self_utility.nr
@@ -1,7 +1,8 @@
 //! The `self` contract value for utility execution contexts.
 
-use crate::context::UtilityContext;
-use crate::protocol::address::AztecAddress;
+use crate::context::{calls::UtilityCall, UtilityContext};
+use crate::oracle::call_utility_function::call_utility_function;
+use crate::protocol::{address::AztecAddress, traits::Deserialize};
 
 /// Core interface for interacting with aztec-nr contract features in utility execution contexts.
 ///
@@ -12,7 +13,9 @@ use crate::protocol::address::AztecAddress;
 ///
 /// - `Storage`: The contract's storage struct (defined with [`storage`](crate::macros::storage::storage), or `()` if
 /// the contract has no storage
-pub struct ContractSelfUtility<Storage> {
+/// - `CallSelf`: Macro-generated type for calling the contract's own utility functions (same type
+/// as `CallSelf` in \[`PrivateUtilityCalls`\])
+pub struct ContractSelfUtility<Storage, CallSelf> {
     /// The address of this contract
     pub address: AztecAddress,
 
@@ -33,13 +36,37 @@ pub struct ContractSelfUtility<Storage> {
 
     /// The utility execution context.
     pub context: UtilityContext,
+
+    /// Provides type-safe methods for calling this contract's own utility functions.
+    ///
+    /// Example API:
+    /// ```noir
+    /// self.call_self.some_utility_function(args)
+    /// ```
+    pub call_self: CallSelf,
 }
 
-impl<Storage> ContractSelfUtility<Storage> {
+impl<Storage, CallSelf> ContractSelfUtility<Storage, CallSelf> {
     /// Creates a new `ContractSelfUtility` instance for a utility function.
     ///
     /// This constructor is called automatically by the macro system and should not be called directly.
-    pub fn new(context: UtilityContext, storage: Storage) -> Self {
-        Self { context, storage, address: context.this_address() }
+    pub fn new(context: UtilityContext, storage: Storage, call_self: CallSelf) -> Self {
+        Self { context, storage, address: context.this_address(), call_self }
+    }
+
+    /// Makes a utility contract call from another utility function.
+    ///
+    /// Note: only same-contract utility calls are currently supported. See TODO(F-29).
+    ///
+    /// # Example
+    /// ```noir
+    /// self.call(Token::at(address).get_balance_of(owner));
+    /// ```
+    pub unconstrained fn call<let M: u32, let N: u32, T>(_self: Self, call: UtilityCall<M, N, T>) -> T
+    where
+        T: Deserialize,
+    {
+        let returns = call_utility_function(call.target_contract, call.selector, call.args);
+        Deserialize::deserialize(returns)
     }
 }
diff --git a/noir-projects/aztec-nr/aztec/src/contract_self/mod.nr b/noir-projects/aztec-nr/aztec/src/contract_self/mod.nr
index e97c764a38e8..e880fb612c21 100644
--- a/noir-projects/aztec-nr/aztec/src/contract_self/mod.nr
+++ b/noir-projects/aztec-nr/aztec/src/contract_self/mod.nr
@@ -3,5 +3,6 @@ pub mod contract_self_public;
 pub mod contract_self_utility;
 
 pub use contract_self_private::ContractSelfPrivate;
+pub use contract_self_private::PrivateUtilityCalls;
 pub use contract_self_public::ContractSelfPublic;
 pub use contract_self_utility::ContractSelfUtility;
diff --git a/noir-projects/aztec-nr/aztec/src/macros/calls_generation/external_functions.nr b/noir-projects/aztec-nr/aztec/src/macros/calls_generation/external_functions.nr
index 6cf2c4e2a5db..4782e0d7bb35 100644
--- a/noir-projects/aztec-nr/aztec/src/macros/calls_generation/external_functions.nr
+++ b/noir-projects/aztec-nr/aztec/src/macros/calls_generation/external_functions.nr
@@ -2,8 +2,8 @@ use crate::macros::{
     calls_generation::external_functions_stubs::{
         create_private_self_call_stub, create_private_static_stub, create_private_stub,
         create_public_self_call_static_stub, create_public_self_call_stub, create_public_self_enqueue_static_stub,
-        create_public_self_enqueue_stub, create_public_static_stub, create_public_stub, create_utility_stub,
-        create_utility_stub_from_parts,
+        create_public_self_enqueue_stub, create_public_static_stub, create_public_stub, create_utility_self_call_stub,
+        create_utility_stub, create_utility_stub_from_parts,
     },
     internals_functions_generation::external_functions_registry,
     offchain_receive::{
@@ -77,6 +77,7 @@ comptime fn create_offchain_receive_stub() -> Quoted {
 pub(crate) comptime fn generate_external_function_self_calls_structs(m: Module) -> Quoted {
     let private_functions = external_functions_registry::get_private_functions(m);
     let public_functions = external_functions_registry::get_public_functions(m);
+    let utility_functions = external_functions_registry::get_utility_functions(m);
 
     let call_self_private_methods = private_functions
         .map(|function| {
@@ -138,6 +139,9 @@ pub(crate) comptime fn generate_external_function_self_calls_structs(m: Module)
         })
         .join(quote {});
 
+    let call_self_utility_methods =
+        utility_functions.map(|function| create_utility_self_call_stub(function)).join(quote {});
+
     quote {
         pub struct CallSelf<Context> {
             pub address: aztec::protocol::address::AztecAddress,
@@ -182,5 +186,13 @@ pub(crate) comptime fn generate_external_function_self_calls_structs(m: Module)
         impl EnqueueSelfStatic<&mut aztec::context::PrivateContext> {
             $enqueue_self_static_methods
         }
+
+        pub struct CallSelfUtility {
+            pub address: aztec::protocol::address::AztecAddress,
+        }
+
+        impl CallSelfUtility {
+            $call_self_utility_methods
+        }
     }
 }
diff --git a/noir-projects/aztec-nr/aztec/src/macros/calls_generation/external_functions_stubs.nr b/noir-projects/aztec-nr/aztec/src/macros/calls_generation/external_functions_stubs.nr
index d3d43ce6b38b..d0754176171f 100644
--- a/noir-projects/aztec-nr/aztec/src/macros/calls_generation/external_functions_stubs.nr
+++ b/noir-projects/aztec-nr/aztec/src/macros/calls_generation/external_functions_stubs.nr
@@ -259,6 +259,24 @@ pub comptime fn create_public_self_enqueue_static_stub(f: FunctionDefinition) ->
     }
 }
 
+/// Creates a stub for calling a utility function on the same contract (for CallSelfUtility).
+pub comptime fn create_utility_self_call_stub(f: FunctionDefinition) -> Quoted {
+    let (fn_name, fn_parameters_list, serialized_args_array_construction, serialized_args_array_name, _, _, _, fn_selector) =
+        create_stub_base(f);
+    let fn_return_type = f.return_type();
+
+    quote {
+        pub unconstrained fn $fn_name(self, $fn_parameters_list) -> $fn_return_type {
+            $serialized_args_array_construction
+            let selector = $FROM_FIELD($fn_selector);
+            let returns = aztec::oracle::call_utility_function::call_utility_function(
+                self.address, selector, $serialized_args_array_name,
+            );
+            aztec::protocol::traits::Deserialize::deserialize(returns)
+        }
+    }
+}
+
 /// Creates a stub for enqueuing a public function from private context (for EnqueueSelf<&mut PrivateContext>)
 pub comptime fn create_public_self_enqueue_stub(f: FunctionDefinition) -> Quoted {
     let (fn_name, fn_parameters_list, serialized_args_array_construction, serialized_args_array_name, _serialized_args_array_len, _fn_name_str, _fn_name_len, fn_selector) =
diff --git a/noir-projects/aztec-nr/aztec/src/macros/functions/initialization_utils.nr b/noir-projects/aztec-nr/aztec/src/macros/functions/initialization_utils.nr
index 524c6ec0ef69..a406af070329 100644
--- a/noir-projects/aztec-nr/aztec/src/macros/functions/initialization_utils.nr
+++ b/noir-projects/aztec-nr/aztec/src/macros/functions/initialization_utils.nr
@@ -95,7 +95,10 @@ pub fn mark_as_initialized_from_public_initializer(context: PublicContext) {
 /// Asserts that the contract has been initialized, from public's perspective.
 ///
 /// Checks that the public initialization nullifier exists.
-pub fn assert_is_initialized_public(context: PublicContext) {
+// All external public contract functions will call this function (except those marked as #[no_init]), so we
+// want to make sure that we don't include a copy of its body for each of them.
+#[inline_never]
+pub unconstrained fn assert_is_initialized_public(context: PublicContext) {
     let init_nullifier = compute_public_initialization_nullifier(context.this_address());
     // Safety: the public initialization nullifier is only ever emitted by public functions, and so the timing
     // concerns from nullifier_exists_unsafe do not apply. Additionally, it is emitted after all initializer
diff --git a/noir-projects/aztec-nr/aztec/src/macros/functions/mod.nr b/noir-projects/aztec-nr/aztec/src/macros/functions/mod.nr
index ab345e9c31e2..57639f879feb 100644
--- a/noir-projects/aztec-nr/aztec/src/macros/functions/mod.nr
+++ b/noir-projects/aztec-nr/aztec/src/macros/functions/mod.nr
@@ -5,7 +5,7 @@ pub(crate) mod auth_registry;
 
 use crate::macros::{
     internals_functions_generation::{external_functions_registry, internal_functions_registry},
-    utils::{is_fn_external, module_has_initializer},
+    utils::{assert_params_serializable, assert_return_type_serializable, is_fn_external, module_has_initializer},
 };
 use super::utils::{fn_has_allow_phase_change, fn_has_noinitcheck, is_fn_initializer, is_fn_only_self, is_fn_view};
 use auth_registry::AUTHORIZE_ONCE_REGISTRY;
@@ -342,6 +342,9 @@ pub comptime fn external(f: FunctionDefinition, f_type: CtString) {
     // In this function we perform basic checks on the function to ensure it is valid and then we add the function to
     // the external functions registry for later processing by the `#[aztec]` macro.
 
+    assert_return_type_serializable(f);
+    assert_params_serializable(f);
+
     if f_type.eq("private") {
         assert_valid_private(f);
         external_functions_registry::add_private(f);
diff --git a/noir-projects/aztec-nr/aztec/src/macros/internals_functions_generation/external/private.nr b/noir-projects/aztec-nr/aztec/src/macros/internals_functions_generation/external/private.nr
index 6f9d8d8592c1..94ea274ead3a 100644
--- a/noir-projects/aztec-nr/aztec/src/macros/internals_functions_generation/external/private.nr
+++ b/noir-projects/aztec-nr/aztec/src/macros/internals_functions_generation/external/private.nr
@@ -56,7 +56,9 @@ pub(crate) comptime fn generate_private_external(f: FunctionDefinition) -> Quote
             let call_self_static: CallSelfStatic<&mut aztec::context::PrivateContext> = CallSelfStatic { address: self_address, context: &mut context };
             let enqueue_self_static: EnqueueSelfStatic<&mut aztec::context::PrivateContext> = EnqueueSelfStatic { address: self_address, context: &mut context };
             let internal: CallInternal<&mut aztec::context::PrivateContext> = CallInternal { context: &mut context };
-            aztec::contract_self::ContractSelfPrivate::new(&mut context, storage, call_self, enqueue_self, call_self_static, enqueue_self_static, internal)
+            let call_self_utility = CallSelfUtility { address: self_address };
+            let utility: aztec::contract_self::PrivateUtilityCalls<CallSelfUtility> = aztec::contract_self::PrivateUtilityCalls { call_self: call_self_utility };
+            aztec::contract_self::ContractSelfPrivate::new(&mut context, storage, call_self, enqueue_self, call_self_static, enqueue_self_static, internal, utility)
         };
     };
 
diff --git a/noir-projects/aztec-nr/aztec/src/macros/internals_functions_generation/external/utility.nr b/noir-projects/aztec-nr/aztec/src/macros/internals_functions_generation/external/utility.nr
index 55b7ec2ee515..228ed0dde96f 100644
--- a/noir-projects/aztec-nr/aztec/src/macros/internals_functions_generation/external/utility.nr
+++ b/noir-projects/aztec-nr/aztec/src/macros/internals_functions_generation/external/utility.nr
@@ -24,7 +24,9 @@ pub(crate) comptime fn generate_utility_external(f: FunctionDefinition) -> Quote
         let mut self = {
             let context = aztec::context::UtilityContext::new();
             $storage_init
-            aztec::contract_self::ContractSelfUtility::new(context, storage)
+            let self_address = context.this_address();
+            let call_self = CallSelfUtility { address: self_address };
+            aztec::contract_self::ContractSelfUtility::new(context, storage, call_self)
         };
     };
 
diff --git a/noir-projects/aztec-nr/aztec/src/macros/internals_functions_generation/internal.nr b/noir-projects/aztec-nr/aztec/src/macros/internals_functions_generation/internal.nr
index 443daa28f564..a913ff63df26 100644
--- a/noir-projects/aztec-nr/aztec/src/macros/internals_functions_generation/internal.nr
+++ b/noir-projects/aztec-nr/aztec/src/macros/internals_functions_generation/internal.nr
@@ -42,7 +42,9 @@ pub(crate) comptime fn generate_private_internal(f: FunctionDefinition) -> Quote
                 let call_self_static: CallSelfStatic<&mut aztec::context::PrivateContext> = CallSelfStatic { address: self_address, context };
                 let enqueue_self_static: EnqueueSelfStatic<&mut aztec::context::PrivateContext> = EnqueueSelfStatic { address: self_address, context };
                 let internal: CallInternal<&mut aztec::context::PrivateContext> = CallInternal { context };
-                aztec::contract_self::ContractSelfPrivate::new(context, storage, call_self, enqueue_self, call_self_static, enqueue_self_static, internal)
+                let call_self_utility = CallSelfUtility { address: self_address };
+                let utility: aztec::contract_self::PrivateUtilityCalls<CallSelfUtility> = aztec::contract_self::PrivateUtilityCalls { call_self: call_self_utility };
+                aztec::contract_self::ContractSelfPrivate::new(context, storage, call_self, enqueue_self, call_self_static, enqueue_self_static, internal, utility)
             };
             
             $body
diff --git a/noir-projects/aztec-nr/aztec/src/macros/storage.nr b/noir-projects/aztec-nr/aztec/src/macros/storage.nr
index a7d9d114f22c..a84a818e9149 100644
--- a/noir-projects/aztec-nr/aztec/src/macros/storage.nr
+++ b/noir-projects/aztec-nr/aztec/src/macros/storage.nr
@@ -47,7 +47,7 @@ pub comptime fn storage(s: TypeDefinition) -> Quoted {
             if typ.implements(quote { crate::state_vars::OwnedStateVariable<$_maybe_owned_context> }
                 .as_trait_constraint()) {
                 panic(
-                    f"Type {typ} implements OwnedStateVariable and hence cannot be placed in Storage struct without being wrapped in Owned. Define the type in storage as Owned<{typ}<..., Context>>, Context>.",
+                    f"Type {typ} implements OwnedStateVariable and hence cannot be placed in Storage struct without being wrapped in Owned. Wrap the type in Owned<..., Context>.",
                 )
             }
 
diff --git a/noir-projects/aztec-nr/aztec/src/macros/utils.nr b/noir-projects/aztec-nr/aztec/src/macros/utils.nr
index e806693421ae..fcd2852853fb 100644
--- a/noir-projects/aztec-nr/aztec/src/macros/utils.nr
+++ b/noir-projects/aztec-nr/aztec/src/macros/utils.nr
@@ -1,5 +1,5 @@
 use crate::protocol::meta::derive_serialize;
-use std::meta::{ctstring::AsCtString, unquote};
+use std::meta::{ctstring::AsCtString, type_of, unquote};
 
 pub(crate) comptime fn is_fn_external(f: FunctionDefinition) -> bool {
     f.has_named_attribute("external")
@@ -153,6 +153,44 @@ pub(crate) comptime fn get_trait_impl_method(typ: Type, target_trait: Quoted, ta
         .as_typed_expr()
 }
 
+/// Asserts that the return type of a contract function implements both `Serialize` and `Deserialize`.
+/// Functions with a `()` return type are skipped since unit values are not serialized.
+pub(crate) comptime fn assert_return_type_serializable(f: FunctionDefinition) {
+    let return_type = f.return_type();
+    if return_type != type_of(()) {
+        let fn_name = f.name();
+        let serialize_constraint = quote { crate::protocol::traits::Serialize }.as_trait_constraint();
+        assert(
+            return_type.implements(serialize_constraint),
+            f"Contract function '{fn_name}' returns a value of type {return_type}, which does not implement the Serialize trait. Add #[derive(Serialize)] to {return_type}'s declaration.",
+        );
+        let deserialize_constraint = quote { crate::protocol::traits::Deserialize }.as_trait_constraint();
+        assert(
+            return_type.implements(deserialize_constraint),
+            f"Contract function '{fn_name}' returns a value of type {return_type}, which does not implement the Deserialize trait. Add #[derive(Deserialize)] to {return_type}'s declaration.",
+        );
+    }
+}
+
+/// Asserts that all parameters of a contract function implement both `Serialize` and `Deserialize`.
+pub(crate) comptime fn assert_params_serializable(f: FunctionDefinition) {
+    let fn_name = f.name();
+
+    for param in f.parameters() {
+        let (name, param_type) = param;
+        let serialize_constraint = quote { crate::protocol::traits::Serialize }.as_trait_constraint();
+        assert(
+            param_type.implements(serialize_constraint),
+            f"Parameter '{name}' of contract function '{fn_name}' has type {param_type}, which does not implement the Serialize trait. Add #[derive(Serialize)] to {param_type}'s declaration.",
+        );
+        let deserialize_constraint = quote { crate::protocol::traits::Deserialize }.as_trait_constraint();
+        assert(
+            param_type.implements(deserialize_constraint),
+            f"Parameter '{name}' of contract function '{fn_name}' has type {param_type}, which does not implement the Deserialize trait. Add #[derive(Deserialize)] to {param_type}'s declaration.",
+        );
+    }
+}
+
 /// Generates a quote that implements `Serialize` for a given struct `s`. If the struct already implements `Serialize`,
 /// we return an empty quote.
 pub comptime fn derive_serialize_if_not_implemented(s: TypeDefinition) -> Quoted {
diff --git a/noir-projects/aztec-nr/aztec/src/oracle/call_utility_function.nr b/noir-projects/aztec-nr/aztec/src/oracle/call_utility_function.nr
new file mode 100644
index 000000000000..32aa3bf15d1c
--- /dev/null
+++ b/noir-projects/aztec-nr/aztec/src/oracle/call_utility_function.nr
@@ -0,0 +1,16 @@
+use crate::protocol::{abis::function_selector::FunctionSelector, address::AztecAddress};
+
+#[oracle(aztec_utl_callUtilityFunction)]
+unconstrained fn call_utility_function_oracle<let M: u32, let N: u32>(
+    _contract_address: AztecAddress,
+    _function_selector: FunctionSelector,
+    _args: [Field; M],
+) -> [Field; N] {}
+
+pub unconstrained fn call_utility_function<let M: u32, let N: u32>(
+    contract_address: AztecAddress,
+    function_selector: FunctionSelector,
+    args: [Field; M],
+) -> [Field; N] {
+    call_utility_function_oracle(contract_address, function_selector, args)
+}
diff --git a/noir-projects/aztec-nr/aztec/src/oracle/mod.nr b/noir-projects/aztec-nr/aztec/src/oracle/mod.nr
index 926c10e256d8..9b5e0d101c33 100644
--- a/noir-projects/aztec-nr/aztec/src/oracle/mod.nr
+++ b/noir-projects/aztec-nr/aztec/src/oracle/mod.nr
@@ -5,6 +5,7 @@ pub mod aes128_decrypt;
 pub mod auth_witness;
 pub mod block_header;
 pub mod call_private_function;
+pub mod call_utility_function;
 pub mod capsules;
 pub mod ephemeral;
 pub mod contract_sync;
diff --git a/noir-projects/aztec-nr/aztec/src/oracle/version.nr b/noir-projects/aztec-nr/aztec/src/oracle/version.nr
index 2ffff93dab5f..df5086ccad04 100644
--- a/noir-projects/aztec-nr/aztec/src/oracle/version.nr
+++ b/noir-projects/aztec-nr/aztec/src/oracle/version.nr
@@ -11,7 +11,7 @@
 /// immediately if AZTEC_NR_MINOR > PXE_MINOR because if a contract is updated to use a newer Aztec.nr dependency
 /// without actually using any of the new oracles then there is no reason to throw.
 pub global ORACLE_VERSION_MAJOR: Field = 22;
-pub global ORACLE_VERSION_MINOR: Field = 1;
+pub global ORACLE_VERSION_MINOR: Field = 2;
 
 /// Asserts that the version of the oracle is compatible with the version expected by the contract.
 pub fn assert_compatible_oracle_version() {
diff --git a/noir-projects/aztec-nr/aztec/src/state_vars/map.nr b/noir-projects/aztec-nr/aztec/src/state_vars/map.nr
index 90d5b9164b09..0bfcc0d722ad 100644
--- a/noir-projects/aztec-nr/aztec/src/state_vars/map.nr
+++ b/noir-projects/aztec-nr/aztec/src/state_vars/map.nr
@@ -3,49 +3,88 @@ use crate::state_vars::StateVariable;
 
 /// A key-value container for state variables.
 ///
-/// A key-value storage container that maps keys to state variables, similar to Solidity mappings.
+/// A `Map` wraps another state variable type (the 'value') and creates independent instances of it for each key,
+/// resulting in effectively as many state variables as there are key values. This behavior is similar to a Solidity
+/// `mapping (K => V)`.
 ///
-/// `Map` enables you to associate keys (like addresses or other identifiers) with state variables in your Aztec smart
-/// contract. This is conceptually similar to Solidity's `mapping(K => V)` syntax, where you can store and retrieve
-/// values by their associated keys.
+/// ## Use Cases
 ///
-/// You can declare a state variable contained within a Map in your contract's
-/// [`storage`](crate::macros::storage::storage) struct.
+/// Any scenario in which a fixed number of variables is insufficient to represent contract state requires `Map` e.g.
+/// per-election configuration in a voting contract, per-user state, etc. `Map` also composes naturally into more
+/// complex containers: an array could be implemented as a `Map` with indices as keys.
 ///
-/// For example, you might use `Map<AztecAddress, PublicMutable<FieldNote, Context>, Context>` to track token balances
-/// for different users, similar to how you'd use `mapping(address => uint256)` in Solidity.
+/// Note that some private state variables, such as [`PrivateMutable`](crate::state_vars::PrivateMutable) and
+/// [`PrivateSet`](crate::state_vars::PrivateSet) cannot be wrapped in a `Map`. These types implement the
+/// [`OwnedStateVariable`](crate::state_vars::OwnedStateVariable) trait, and as such should instead be wrapped using the
+/// [`Owned`](crate::state_vars::Owned) container, which can be thought of as a specialization of `Map` for private
+/// state 'owned' by a single account.
 ///
-/// > Aside: the verbose `Context` in the declaration is a consequence of > leveraging Noir's regular syntax for
-/// generics to ensure that certain > state variable methods can only be called in some contexts (private, > public,
-/// utility).
+/// ## Examples
 ///
-/// The methods of Map are:
-/// - `at` (access state variable for a given key) (see the method's own doc comments for more info).
+/// Since `Map` is also a [`StateVariable`], it is declared in the contract's
+/// [`#[storage]`](crate::macros::storage::storage) struct along with all others:
 ///
-/// ## Generic Parameters
-/// - `K`: The key type (must implement `ToField` trait for hashing)
-/// - `V`: The value type:
-/// - any Aztec state variable (variable that implements the StateVariable trait):
-/// - `PublicMutable`
-/// - `PublicImmutable`
-/// - `DelayedPublicMutable`
-/// - `Map`
-/// - `Context`: The execution context (handles private/public function contexts)
+/// ```noir
+/// #[storage]
+/// struct Storage<C> {
+///     is_admin: Map<AztecAddress, PublicMutable<bool, C>, C>,
+///     vote_tallies: Map<ElectionId, PublicMutable<u128, C>, C>,
+/// }
+/// ```
 ///
-/// ## Usage Maps are typically declared in your contract's [`storage`](crate::macros::storage::storage) struct and accessed using the `at(key)` method to get the state variable for a specific key. The resulting state variable can then be read from or written to using its own methods.
+/// ### Multiple `Map`s
 ///
-/// Note that maps cannot be used with owned state variables (variables that implement the OwnedStateVariable trait) -
-/// those need to be wrapped in an `Owned` state variable instead.
+/// There is no limit to how many `Map` containers a contract can have, and `Map`s can themselves wrap other `Map`s,
+/// resulting in nested layouts.
 ///
-/// ## Advanced Internally, `Map` uses a single base storage slot to represent the mapping itself, similar to Solidity's approach. Individual key-value pairs are stored at derived storage slots computed by hashing the base storage slot with the key using Poseidon2. This ensures:
-/// - No storage slot collisions between different keys
-/// - Uniform distribution of storage slots across the storage space
-/// - Compatibility with Aztec's storage tree structure
-/// - Gas-efficient storage access patterns similar to Solidity mappings
+/// ```noir
+/// #[storage]
+/// struct Storage<C> {
+///     // A nested map where the first key is an address and the second a `Year` type, such that
+///     // self.storage.user_yearly_config.at(user).at(year) results in distinct `UserConfig` variables for each
+///     // `(user, year)` tuple.
+///     user_yearly_config: Map<AztecAddress, Map<Year, UserConfig<C>, C>, C>,
+/// }
+/// ```
 ///
-/// The storage slot derivation uses `derive_storage_slot_in_map(base_slot, key)` which computes
-/// `poseidon2_hash([base_slot, key.to_field()])`, ensuring cryptographically secure slot separation.
+/// ## Requirements
 ///
+/// The value type `V` must implement the [`StateVariable`] trait. The key type `K` must implement the [`ToField`] trait
+/// in such a way that the `Field` representation is unique for each key.
+///
+/// For key types that cannot be converted into a `Field`, consider wrapping them in a type that implements `ToField` as
+/// the hash of the key.
+///
+/// ```noir
+/// struct MyKey {
+///     a: Field,
+///     b: Field,
+/// }
+///
+/// struct MyKeyWrapper {
+///     inner: MyKey,
+/// }
+///
+/// impl ToField for MyKeyWrapper {
+///     fn to_field(self) -> Field {
+///         poseidon2_hash([self.inner.a, self.inner.b])
+///     }
+/// }
+///
+/// #[storage]
+/// struct Storage<C> {
+///     a: Map<MyKeyWrapper, PublicMutable<bool, C>, C>,
+/// }
+/// ```
+///
+/// ## Implementation Details
+///
+/// Like all other state variables, `Map` gets assigned a unique storage slot. It uses this value to derive unique
+/// storage slots for each key, resulting in independent state variables. Nothing gets stored at `Map`'s storage slot.
+/// This is equivalent to Solidity's implementation of `mapping`.
+///
+/// Because the storage slot derivation is done using a hash function, it is not possible to compute the key (preimage)
+/// used to obtain a given derived state variable slot.
 pub struct Map<K, V, Context> {
     pub context: Context,
     storage_slot: Field,
@@ -66,35 +105,20 @@ impl<K, V, Context> StateVariable<1, Context> for Map<K, V, Context> {
 }
 
 impl<K, V, Context> Map<K, V, Context> {
-    /// Returns the state variable associated with the given key.
+    /// Returns the state variable for a key.
     ///
-    /// This is equivalent to accessing `mapping[`key`]` in Solidity. It returns the state variable instance for the
-    /// specified key, which can then be used to read or write the value at that key.
+    /// This derives a unique storage slot for `key` and returns a state variable of type `V` at that slot. It is
+    /// equivalent to accessing a `mapping` via the `[]` operator in Solidity (e.g. `balances[user]` would be
+    /// `balances.at(user)`).
     ///
-    /// Unlike Solidity mappings which return the value directly, this returns the state variable wrapper (like
-    /// PublicMutable, nested Map etc.) that you then call methods on to interact with the actual value.
-    ///
-    /// # Arguments
-    ///
-    /// * `key` - The key to look up in the map. Must implement the ToField trait (which most basic Noir & Aztec types
-    /// do).
-    ///
-    /// # Returns
-    ///
-    /// * `V` - The state variable instance for this key. You can then call methods like `.read()`, `.write()`,
-    /// `.get_note()`, etc. on this depending on the specific state variable type.
-    ///
-    /// # Example
+    /// ## Example
     ///
     /// ```noir
-    /// // Get a user's balance (assuming PrivateMutable<FieldNote>)
-    /// let user_balance = self.storage.balances.at(user_address);
-    /// let current_note = user_balance.get_note();
-    ///
-    /// // Update the balance
-    /// user_balance.replace(new_note);
+    /// #[external("utility")]
+    /// fn get_election_vote_tallies(election: ElectionId) -> u128 {
+    ///     self.storage.vote_tallies.at(election).read()
+    /// }
     /// ```
-    ///
     pub fn at<let N: u32>(self, key: K) -> V
     where
         K: ToField,
diff --git a/noir-projects/aztec-nr/aztec/src/state_vars/mod.nr b/noir-projects/aztec-nr/aztec/src/state_vars/mod.nr
index 634f5822b8b9..362dc6125685 100644
--- a/noir-projects/aztec-nr/aztec/src/state_vars/mod.nr
+++ b/noir-projects/aztec-nr/aztec/src/state_vars/mod.nr
@@ -1,3 +1,4 @@
+// noir-fmt:ignore
 //! Storage for contract state.
 //!
 //! Contracts store their state in _state variables_. In Solidity, a state variable is simply any value declared inside
@@ -8,6 +9,81 @@
 //! state variables, each with their nuance and use cases. Understanding these is key to understanding how a contract
 //! works.
 //!
+//! ## Declaration
+//!
+//! All of a contract's state variables, both public and private, are declared in a single place: as members of a struct
+//! to which the [`#[storage]`](crate::macros::storage::storage) macro is applied.
+//!
+//! ```noir
+//! #[storage]
+//! struct Storage<C> {
+//!     a: PublicMutable<bool, C>,
+//!     b: Map<AztecAddress, DelayedPublicMutable<u128, C>, C>,
+//!     c: Owned<PrivateSet<UintNote, C>, C>,
+//! }
+//! ```
+//!
+//! ## Choosing a State Variable
+//!
+//! The very first question to answer is whether the contents of the variable should be _public_ (everyone in the
+//! network can see their contents, like Solidity state variables), or _private_ (only some people know what is stored
+//! in them).
+//!
+//! ### Public State Variables
+//!
+//! Public state variables typically store their contents in the public storage tree, and can therefore only be written
+//! to by public contract functions.
+//!
+//! | State Variable                                                    | Mutable?            | Readable in Private? | Writable in Private? | Example Use Case                                                                   |
+//! | ----------------------------------------------------------------- | ------------------- | -------------------- | -------------------- | ---------------------------------------------------------------------------------- |
+//! | [`PublicMutable`](crate::state_vars::PublicMutable)               | yes                 | no                   | no                   | Configuration of admins, global state (e.g. token total supply, total votes)       |
+//! | [`PublicImmutable`](crate::state_vars::PublicImmutable)           | no                  | yes                  | no                   | Fixed configuration, one-way actions (e.g. initialization settings for a proposal) |
+//! | [`DelayedPublicMutable`](crate::state_vars::DelayedPublicMutable) | yes (after a delay) | yes                  | no                   | Non time sensitive system configuration                                            |
+//!
+//! ### Private State Variables
+//!
+//! Private state variables typically store their contents in the note and nullifier trees, and are therefore mainly
+//! interacted with from private contract functions.
+//!
+//! | State Variable                                            | Mutable? | Cost to Read? | Writable by Third Parties? | Example Use Case                                                                                               |
+//! | --------------------------------------------------------- | -------- | ------------- | -------------------------- | -------------------------------------------------------------------------------------------------------------- |
+//! | [`PrivateMutable`](crate::state_vars::PrivateMutable)     | yes      | yes           | no                         | Mutable user state only accessible by them (e.g. user settings or keys)                                        |
+//! | [`PrivateImmutable`](crate::state_vars::PrivateImmutable) | no       | no            | no                         | Fixed configuration, one-way actions (e.g. initialization settings for a proposal)                             |
+//! | [`PrivateSet`](crate::state_vars::PrivateSet)             | yes      | yes           | yes                        | Aggregated state others can add to, e.g. token balance (set of amount notes), NFT collections (set of NFT ids) |
+//!
+//! ## Storage Slots
+//!
+//! Each state variable in a contract gets assigned a unique storage slot, which isolates the different variables so
+//! that reads and writes to one do not interfere with others.
+//!
+//! Storage slot allocation is automatic and cannot be overridden. A state variable's storage slot can be queried via
+//! [`crate::state_vars::StateVariable::get_storage_slot`].
+//!
+//! ```noir
+//! #[storage]
+//! struct Storage<C> {
+//!     a: PublicMutable<bool, C>,
+//! }
+//!
+//! #[external("utility")]
+//! fn get_a_storage_slot() -> Field {
+//!     self.storage.a.get_storage_slot()
+//! }
+//! ```
+//!
+//! ## The Context Parameter
+//!
+//! All state variables take a generic `Context` parameter, which will be set to one of
+//! [`PrivateContext`](crate::context::PrivateContext), [`PublicContext`](crate::context::PublicContext) or
+//! [`UtilityContext`](crate::context::UtilityContext) depending on the contract function type. This leads to some
+//! unfortunate boilerplate when declaring contract storage.
+//!
+//! Different methods are available depending on the context, reflecting that certain actions can only be performed in
+//! some or other context. For example, [`PublicMutable`](crate::state_vars::PublicMutable)'s
+//! [`read`](crate::state_vars::PublicMutable::read) function is available under both `PublicContext` and
+//! `UtilityContext`, but not `PrivateContext` since `PublicMutable` cannot be read from private functions. Similarly,
+//! [`write`](crate::state_vars::PublicMutable::write) is only available in `PublicContext`.
+//!
 //! ## Packing for Efficient Access
 //!
 //! Because all state variables are fully independent, when a contract reads or writes one of them all others are left
@@ -19,8 +95,7 @@
 //! manually implemented - see the [`Packable`](crate::protocol::traits::Packable)'s docs on how to do this.
 //!
 //! ```noir
-//! // Inefficient reads and writes - each bool is assigned a distinct storage slot, so reading or writing both
-//! requires
+//! // Inefficient reads and writes - each bool is assigned a distinct storage slot, so reading or writing both requires
 //! // executing `SLOAD` or `SSTORE` twice.
 //! #[storage]
 //! struct Storage<C> {
@@ -28,7 +103,7 @@
 //!     b: PublicMutable<bool, C>,
 //! }
 //!
-//! // By storing the booleans in a single struct and implementing the Packable trait with tight packing, we can now
+//! // By storing the booleans in a single struct and implementing the Packable trait with tight packing, we can instead
 //! // read and write both values in a single `SLOAD` or `SSTORE` opcode.
 //! struct TwoBooleans {
 //!     a: bool,
diff --git a/noir-projects/aztec-nr/aztec/src/state_vars/public_mutable.nr b/noir-projects/aztec-nr/aztec/src/state_vars/public_mutable.nr
index a1ea5468c434..51d010efa9ef 100644
--- a/noir-projects/aztec-nr/aztec/src/state_vars/public_mutable.nr
+++ b/noir-projects/aztec-nr/aztec/src/state_vars/public_mutable.nr
@@ -52,7 +52,7 @@ mod test;
 ///
 /// ## Examples
 ///
-/// Declaring a `PublicMutable` in the contract's [`storage`](crate::macros::storage::storage) struct requires
+/// Declaring a `PublicMutable` in the contract's [`#[storage]`](crate::macros::storage::storage) struct requires
 /// specifying the type `T` that is stored in the variable:
 ///
 /// ```noir
diff --git a/noir-projects/aztec-nr/aztec/src/state_vars/state_variable.nr b/noir-projects/aztec-nr/aztec/src/state_vars/state_variable.nr
index 3b6b872a8710..82adac93f9df 100644
--- a/noir-projects/aztec-nr/aztec/src/state_vars/state_variable.nr
+++ b/noir-projects/aztec-nr/aztec/src/state_vars/state_variable.nr
@@ -1,24 +1,15 @@
-/// A trait that defines the common interface for all Aztec state variables. State variables are variables that can be
-/// stored in the contract's storage. Examples of state variables are `Owned`, `PublicMutable`, `Map` or
-/// `DelayedPublicMutable`.
-///
-/// # Type Parameters
-///
-/// * `N` - A compile-time constant that determines how many storage slots need to be reserved for this state variable.
-/// * `Context` - The execution context type (e.g., `PublicContext`, `PrivateContext`, `UtilityContext`). The context
-/// determines which methods of the state variable are available and controls whether the variable can be accessed in
-/// public, private or utility functions.
+/// A container for contract state.
 ///
+/// All contract state is stored in state variables, and all state variables implement the `StateVariable` trait. For
+/// more information on the different types of state variables see the [`state_vars`](crate::state_vars) module.
 pub trait StateVariable<let N: u32, Context> {
-    /// Initializes a new state variable at a given storage slot.
-    ///
-    /// This function is automatically called within the [`storage`](crate::macros::storage::storage) macro and needs
-    /// to
-    /// be manually called only when [`storage_no_init`](crate::macros::storage::storage_no_init) is used.
+    /// Creates a state variable.
     ///
+    /// This function is automatically called by aztec-nr as the [`self`](crate::contract_self) object is created. Users
+    /// are expected to only ever need to invoke it when using the
+    /// [`#[storage_no_init]`](crate::macros::storage::storage_no_init) macro.
     fn new(context: Context, storage_slot: Field) -> Self;
 
-    /// Returns the storage slot at which the state variable is placed. Typically used only when testing the contract
-    /// or when using a lower-level API like `get_notes` function.
+    /// Returns the state variable's storage slot.
     fn get_storage_slot(self) -> Field;
 }
diff --git a/noir-projects/aztec-nr/aztec/src/test/helpers/test_environment.nr b/noir-projects/aztec-nr/aztec/src/test/helpers/test_environment.nr
index 3d45d9e4ae71..4eec04094f52 100644
--- a/noir-projects/aztec-nr/aztec/src/test/helpers/test_environment.nr
+++ b/noir-projects/aztec-nr/aztec/src/test/helpers/test_environment.nr
@@ -125,6 +125,80 @@ struct UtilityContextOptions {
     contract_address: Option<AztecAddress>,
 }
 
+/// Configuration for [`TestEnvironment::call_private_opts`].
+///
+/// Constructed by calling [`CallPrivateOptions::new`] and then chaining methods setting each value:
+///
+/// ```noir
+/// env.call_private_opts(from, CallPrivateOptions::new().with_additional_scopes([other]), call);
+/// ```
+pub struct CallPrivateOptions<let N: u32> {
+    additional_scopes: [AztecAddress; N],
+}
+
+impl CallPrivateOptions<0> {
+    /// Creates default `CallPrivateOptions`.
+    ///
+    /// The default values are the same as if using [`TestEnvironment::call_private`] instead of
+    /// [`TestEnvironment::call_private_opts`].
+    pub fn new() -> Self {
+        CallPrivateOptions { additional_scopes: [] }
+    }
+}
+
+impl<let N: u32> CallPrivateOptions<N> {
+    /// Grants access to secrets of additional accounts.
+    ///
+    /// By default only the secrets that belong to the `from` account can be accessed: this function lets contracts
+    /// retrieve private information from other accounts during execution.
+    ///
+    /// Example usage includes accounts withdrawing from an escrow, which may require accessing the escrow's own notes
+    /// and secrets.
+    pub fn with_additional_scopes<let N_2: u32>(
+        _self: Self,
+        additional_scopes: [AztecAddress; N_2],
+    ) -> CallPrivateOptions<N_2> {
+        CallPrivateOptions { additional_scopes }
+    }
+}
+
+/// Configuration for [`TestEnvironment::view_private_opts`].
+///
+/// Constructed by calling [`ViewPrivateOptions::new`] and then chaining methods setting each value:
+///
+/// ```noir
+/// env.view_private_opts(from, ViewPrivateOptions::new().with_additional_scopes([other]), call);
+/// ```
+pub struct ViewPrivateOptions<let S: u32> {
+    additional_scopes: [AztecAddress; S],
+}
+
+impl ViewPrivateOptions<0> {
+    /// Creates default `ViewPrivateOptions`.
+    ///
+    /// The default values are the same as if using [`TestEnvironment::view_private`] instead of
+    /// [`TestEnvironment::view_private_opts`].
+    pub fn new() -> Self {
+        ViewPrivateOptions { additional_scopes: [] }
+    }
+}
+
+impl<let S: u32> ViewPrivateOptions<S> {
+    /// Grants access to secrets of additional accounts.
+    ///
+    /// By default only the secrets that belong to the `from` account can be accessed: this function lets contracts
+    /// retrieve private information from other accounts during execution.
+    ///
+    /// Example usage includes accounts querying an escrow's balance, which may require accessing the escrow's own
+    /// notes.
+    pub fn with_additional_scopes<let S2: u32>(
+        _self: Self,
+        additional_scopes: [AztecAddress; S2],
+    ) -> ViewPrivateOptions<S2> {
+        ViewPrivateOptions { additional_scopes }
+    }
+}
+
 struct NoteDiscoveryOptions {
     contract_address: Option<AztecAddress>,
 }
@@ -544,20 +618,34 @@ impl TestEnvironment {
     /// let return_value = env.call_private(caller, SampleContract::at(contract_addr).sample_private_function());
     /// ```
     pub unconstrained fn call_private<let M: u32, let N: u32, T>(
+        self: Self,
+        from: AztecAddress,
+        call: PrivateCall<M, N, T>,
+    ) -> T
+    where
+        T: Deserialize,
+    {
+        self.call_private_opts(from, CallPrivateOptions::new(), call)
+    }
+
+    /// Variant of `call_private` which allows specifying multiple configuration values via `CallPrivateOptions`.
+    pub unconstrained fn call_private_opts<let M: u32, let N: u32, let S: u32, T>(
         _self: Self,
         from: AztecAddress,
+        opts: CallPrivateOptions<S>,
         call: PrivateCall<M, N, T>,
     ) -> T
     where
         T: Deserialize,
     {
         let serialized_return_values = txe_oracles::private_call_new_flow(
-            from,
+            Option::some(from),
             call.target_contract,
             call.selector,
             call.args,
             hash_args(call.args),
             /*is_static=*/ false,
+            opts.additional_scopes,
         );
 
         T::deserialize(serialized_return_values)
@@ -571,20 +659,34 @@ impl TestEnvironment {
     /// The `from` parameter specifies the account from whose perspective the view is executed. This affects
     /// scope isolation - only notes scoped to this account will be visible during execution.
     pub unconstrained fn view_private<let M: u32, let N: u32, T>(
+        self: Self,
+        from: AztecAddress,
+        call: PrivateStaticCall<M, N, T>,
+    ) -> T
+    where
+        T: Deserialize,
+    {
+        self.view_private_opts(from, ViewPrivateOptions::new(), call)
+    }
+
+    /// Variant of `view_private` which allows specifying multiple configuration values via `ViewPrivateOptions`.
+    pub unconstrained fn view_private_opts<let M: u32, let N: u32, let S: u32, T>(
         _self: Self,
         from: AztecAddress,
+        opts: ViewPrivateOptions<S>,
         call: PrivateStaticCall<M, N, T>,
     ) -> T
     where
         T: Deserialize,
     {
         let serialized_return_values = txe_oracles::private_call_new_flow(
-            from,
+            Option::some(from),
             call.target_contract,
             call.selector,
             call.args,
             hash_args(call.args),
             /*is_static=*/ true,
+            opts.additional_scopes,
         );
 
         T::deserialize(serialized_return_values)
@@ -705,16 +807,12 @@ impl TestEnvironment {
     /// Performs a public contract function call, including the processing of any nested public calls. Returns the
     /// result of the called function. Variant of `call_public`, but the `from` address (`msg_sender`) is set to
     /// "null".
-    pub unconstrained fn call_public_incognito<let M: u32, let N: u32, T>(
-        _self: Self,
-        from: AztecAddress,
-        call: PublicCall<M, N, T>,
-    ) -> T
+    pub unconstrained fn call_public_incognito<let M: u32, let N: u32, T>(_self: Self, call: PublicCall<M, N, T>) -> T
     where
         T: Deserialize,
     {
         let serialized_return_values = txe_oracles::public_call_new_flow(
-            Option::some(from),
+            Option::none(),
             call.target_contract,
             call.selector,
             call.args,
@@ -727,13 +825,14 @@ impl TestEnvironment {
     /// Variant of `call_public` for public `#[view]` functions.
     ///
     /// Unlike `call_public`, no transaction is created and no block is mined (since `#[view]` functions are only
-    /// executable in a static context, and these produce no side effects).
+    /// executable in a static context, and these produce no side effects). The `msg_sender` is set to "null", since
+    /// view calls have no real caller.
     pub unconstrained fn view_public<let M: u32, let N: u32, T>(_self: Self, call: PublicStaticCall<M, N, T>) -> T
     where
         T: Deserialize,
     {
         let serialized_return_values = txe_oracles::public_call_new_flow(
-            Option::some(AztecAddress::zero()),
+            Option::none(),
             call.target_contract,
             call.selector,
             call.args,
@@ -743,26 +842,15 @@ impl TestEnvironment {
         T::deserialize(serialized_return_values)
     }
 
-    /// Variant of `view_public`, but the `from` address (`msg_sender`) is set to "null"
-    ///
-    /// Unlike `call_public`, no transaction is created and no block is mined (since `#[view]` functions are only
-    /// executable in a static context, and these produce no side effects).
+    #[deprecated("use `TestEnvironment::view_public` instead")]
     pub unconstrained fn view_public_incognito<let M: u32, let N: u32, T>(
-        _self: Self,
+        self: Self,
         call: PublicStaticCall<M, N, T>,
     ) -> T
     where
         T: Deserialize,
     {
-        let serialized_return_values = txe_oracles::public_call_new_flow(
-            Option::none(),
-            call.target_contract,
-            call.selector,
-            call.args,
-            true,
-        );
-
-        T::deserialize(serialized_return_values)
+        self.view_public(call)
     }
 
     /// Discovers a note from a [`NoteMessage`], which is expected to have been created in the last transaction
@@ -919,6 +1007,7 @@ impl TestEnvironment {
     ///
     /// env.discover_event_at(contract_address, event_message);
     /// ```
+    #[allow(dead_code)]
     pub(crate) unconstrained fn discover_event_at<Event>(
         self: Self,
         addr: AztecAddress,
@@ -998,14 +1087,17 @@ impl TestEnvironment {
         // `MessageContext`, and might contain information about data (e.g. notes, events) contained in the message. In
         // a real contract this data would have either been supplied by the `process_message` caller, of retrieved
         // along with the message from a tagged log.
-        let (tx_hash, unique_note_hashes_in_tx, nullifiers_in_tx) = txe_oracles::get_last_tx_effects();
+        let effects = txe_oracles::get_last_tx_effects();
 
         // Real messages would also have a recipient, a concept which is currently half-supported in `TestEnvironment`
         // as events are properly scoped by recipient, but notes use a global scope instead. We therefore simply set
         // the zero address as the recipient if one is not supplied, which PXE accepts as a scope despite this not
         // being a registered account.
-        let message_context =
-            MessageContext { tx_hash, unique_note_hashes_in_tx, first_nullifier_in_tx: nullifiers_in_tx.get(0) };
+        let message_context = MessageContext {
+            tx_hash: effects.tx_hash,
+            unique_note_hashes_in_tx: effects.note_hashes,
+            first_nullifier_in_tx: effects.nullifiers.get(0),
+        };
 
         // The scope controls which PXE account can see discovered notes/events. We use the zero address as the
         // default scope if no recipient is supplied, which PXE accepts despite this not being a registered account.
diff --git a/noir-projects/aztec-nr/aztec/src/test/helpers/txe_oracles.nr b/noir-projects/aztec-nr/aztec/src/test/helpers/txe_oracles.nr
index b92a8dbadfb7..8ab6ecb42db4 100644
--- a/noir-projects/aztec-nr/aztec/src/test/helpers/txe_oracles.nr
+++ b/noir-projects/aztec-nr/aztec/src/test/helpers/txe_oracles.nr
@@ -7,7 +7,8 @@ use crate::protocol::{
     abis::function_selector::FunctionSelector,
     address::AztecAddress,
     constants::{
-        CONTRACT_INSTANCE_LENGTH, MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, NULL_MSG_SENDER_CONTRACT_ADDRESS,
+        CONTRACT_INSTANCE_LENGTH, MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, MAX_PRIVATE_LOGS_PER_TX,
+        PRIVATE_LOG_SIZE_IN_FIELDS,
     },
     contract_instance::ContractInstance,
     traits::{Deserialize, ToField},
@@ -35,13 +36,14 @@ pub unconstrained fn deploy<let M: u32, let N: u32, let P: u32>(
     ContractInstance::deserialize(instance_fields)
 }
 
-pub unconstrained fn private_call_new_flow<let M: u32, let N: u32>(
-    from: AztecAddress,
+pub unconstrained fn private_call_new_flow<let M: u32, let N: u32, let S: u32>(
+    from: Option<AztecAddress>,
     contract_address: AztecAddress,
     function_selector: FunctionSelector,
     args: [Field; M],
     args_hash: Field,
     is_static_call: bool,
+    additional_scopes: [AztecAddress; S],
 ) -> [Field; N] {
     private_call_new_flow_oracle(
         from,
@@ -50,6 +52,7 @@ pub unconstrained fn private_call_new_flow<let M: u32, let N: u32>(
         args,
         args_hash,
         is_static_call,
+        additional_scopes,
     )
 }
 
@@ -62,8 +65,6 @@ pub unconstrained fn public_call_new_flow<let M: u32, let N: u32>(
 ) -> [Field; N] {
     let calldata = [function_selector.to_field()].concat(args);
 
-    let from = from.unwrap_or(NULL_MSG_SENDER_CONTRACT_ADDRESS);
-
     public_call_new_flow_oracle(from, contract_address, calldata, is_static_call)
 }
 
@@ -84,8 +85,42 @@ pub unconstrained fn get_next_block_timestamp() -> u64 {}
 #[oracle(aztec_txe_getLastBlockTimestamp)]
 pub unconstrained fn get_last_block_timestamp() -> u64 {}
 
+/// Note hashes emitted by a single transaction, as surfaced by [`get_last_tx_effects`].
+pub type TxNoteHashes = BoundedVec<Field, MAX_NOTE_HASHES_PER_TX>;
+
+/// Nullifiers emitted by a single transaction, as surfaced by [`get_last_tx_effects`].
+pub type TxNullifiers = BoundedVec<Field, MAX_NULLIFIERS_PER_TX>;
+
+/// A single private log's `log_data` as surfaced by [`get_last_tx_effects`]: the first field is
+/// the kernel-siloed tag and the remainder is the ciphertext payload.
+pub type TxPrivateLog = BoundedVec<Field, PRIVATE_LOG_SIZE_IN_FIELDS>;
+
+/// Private logs emitted by a single transaction, in emission order, as surfaced by
+/// [`get_last_tx_effects`].
+pub type TxPrivateLogs = BoundedVec<TxPrivateLog, MAX_PRIVATE_LOGS_PER_TX>;
+
+/// The side effects of a single transaction, as surfaced by [`get_last_tx_effects`].
+pub struct TxEffects {
+    pub tx_hash: Field,
+    pub note_hashes: TxNoteHashes,
+    pub nullifiers: TxNullifiers,
+    pub private_logs: TxPrivateLogs,
+}
+
+/// Returns the effects of the last transaction included by the TXE.
+pub unconstrained fn get_last_tx_effects() -> TxEffects {
+    let (tx_hash, note_hashes, nullifiers, raw_log_storage, log_lengths, log_count) = get_last_tx_effects_oracle();
+
+    let mut private_logs = BoundedVec::new();
+    for i in 0..log_count {
+        private_logs.push(BoundedVec::from_parts(raw_log_storage[i], log_lengths[i]));
+    }
+
+    TxEffects { tx_hash, note_hashes, nullifiers, private_logs }
+}
+
 #[oracle(aztec_txe_getLastTxEffects)]
-pub unconstrained fn get_last_tx_effects() -> (Field, BoundedVec<Field, MAX_NOTE_HASHES_PER_TX>, BoundedVec<Field, MAX_NULLIFIERS_PER_TX>) {}
+unconstrained fn get_last_tx_effects_oracle() -> (Field, TxNoteHashes, TxNullifiers, [[Field; PRIVATE_LOG_SIZE_IN_FIELDS]; MAX_PRIVATE_LOGS_PER_TX], [u32; MAX_PRIVATE_LOGS_PER_TX], u32) {}
 
 /// Returns the raw offchain effect payloads emitted by the last top-level call into TXE.
 /// Each effect is a variable-length field array (e.g. offchain messages have a different size
@@ -174,18 +209,19 @@ pub unconstrained fn add_account(secret: Field) -> TestAccount {}
 pub unconstrained fn add_authwit(address: AztecAddress, message_hash: Field) {}
 
 #[oracle(aztec_txe_privateCallNewFlow)]
-unconstrained fn private_call_new_flow_oracle<let M: u32, let N: u32>(
-    _from: AztecAddress,
+unconstrained fn private_call_new_flow_oracle<let M: u32, let N: u32, let S: u32>(
+    _from: Option<AztecAddress>,
     _contract_address: AztecAddress,
     _function_selector: FunctionSelector,
     _args: [Field; M],
     _args_hash: Field,
     _is_static_call: bool,
+    _additional_scopes: [AztecAddress; S],
 ) -> [Field; N] {}
 
 #[oracle(aztec_txe_publicCallNewFlow)]
 unconstrained fn public_call_new_flow_oracle<let M: u32, let N: u32>(
-    from: AztecAddress,
+    from: Option<AztecAddress>,
     contract_address: AztecAddress,
     calldata: [Field; M],
     is_static_call: bool,
diff --git a/noir-projects/aztec-nr/aztec/src/test/mocks/mock_event.nr b/noir-projects/aztec-nr/aztec/src/test/mocks/mock_event.nr
index e8a46946acda..528bf2423cc1 100644
--- a/noir-projects/aztec-nr/aztec/src/test/mocks/mock_event.nr
+++ b/noir-projects/aztec-nr/aztec/src/test/mocks/mock_event.nr
@@ -26,6 +26,7 @@ impl MockEventBuilder {
         MockEventBuilder { value, randomness: Option::none() }
     }
 
+    #[allow(dead_code)]
     pub(crate) fn randomness(&mut self, randomness: Field) -> &mut Self {
         self.randomness = Option::some(randomness);
         self
@@ -35,6 +36,7 @@ impl MockEventBuilder {
         MockEvent { value: self.value }
     }
 
+    #[allow(dead_code)]
     pub(crate) fn build_new_event(self) -> NewEvent<MockEvent> {
         NewEvent {
             event: self.build_event(),
diff --git a/noir-projects/aztec-nr/uint-note/src/uint_note.nr b/noir-projects/aztec-nr/uint-note/src/uint_note.nr
index 2745a137d094..972eab12c24b 100644
--- a/noir-projects/aztec-nr/uint-note/src/uint_note.nr
+++ b/noir-projects/aztec-nr/uint-note/src/uint_note.nr
@@ -6,11 +6,14 @@ use aztec::{
         logs::partial_note::encode_partial_note_private_message,
         message_delivery::{do_private_message_delivery, MessageDelivery},
     },
-    note::{note_interface::{NoteHash, NoteType}, utils::compute_note_nullifier},
+    note::{note_interface::{NoteHash, NoteType}, utils::{compute_note_hash, compute_note_nullifier}},
     oracle::random::random,
     protocol::{
         address::AztecAddress,
-        constants::{DOM_SEP__NOTE_COMPLETION_LOG_TAG, DOM_SEP__NOTE_HASH, DOM_SEP__PARTIAL_NOTE_VALIDITY_COMMITMENT},
+        constants::{
+            DOM_SEP__NOTE_COMPLETION_LOG_TAG, DOM_SEP__PARTIAL_NOTE_COMMITMENT,
+            DOM_SEP__PARTIAL_NOTE_VALIDITY_COMMITMENT,
+        },
         hash::{compute_log_tag, compute_siloed_nullifier, poseidon2_hash_with_separator},
         traits::{Deserialize, FromField, Hash, Packable, Serialize, ToField},
     },
@@ -142,7 +145,10 @@ impl UintNote {
 /// other note fields will be made public.
 // docs:start:compute_partial_commitment
 fn compute_partial_commitment(owner: AztecAddress, randomness: Field) -> Field {
-    poseidon2_hash_with_separator([owner.to_field(), randomness], DOM_SEP__NOTE_HASH)
+    poseidon2_hash_with_separator(
+        [owner.to_field(), randomness],
+        DOM_SEP__PARTIAL_NOTE_COMMITMENT,
+    )
 }
 // docs:end:compute_partial_commitment
 
@@ -240,13 +246,7 @@ impl PartialUintNote {
 
     // docs:start:compute_complete_note_hash
     fn compute_complete_note_hash(self, storage_slot: Field, value: u128) -> Field {
-        // Here we finalize the note hash by including the (public) storage slot and value into the partial note
-        // commitment. Note that we use the same separator as we used for the first round of poseidon - this is not
-        // an issue.
-        poseidon2_hash_with_separator(
-            [self.commitment, storage_slot, value.to_field()],
-            DOM_SEP__NOTE_HASH,
-        )
+        compute_note_hash(storage_slot, [self.commitment, value.to_field()])
     }
     // docs:end:compute_complete_note_hash
 }
diff --git a/noir-projects/noir-contracts-comp-failures/contracts/non_deserializable/Nargo.toml b/noir-projects/noir-contracts-comp-failures/contracts/non_deserializable/Nargo.toml
new file mode 100644
index 000000000000..5914769cb4d6
--- /dev/null
+++ b/noir-projects/noir-contracts-comp-failures/contracts/non_deserializable/Nargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "non_deserializable"
+authors = [""]
+compiler_version = ">=0.25.0"
+type = "contract"
+
+[dependencies]
+aztec = { path = "../../../aztec-nr/aztec" }
diff --git a/noir-projects/noir-contracts-comp-failures/contracts/non_deserializable/expected_error b/noir-projects/noir-contracts-comp-failures/contracts/non_deserializable/expected_error
new file mode 100644
index 000000000000..0752e0c1a17f
--- /dev/null
+++ b/noir-projects/noir-contracts-comp-failures/contracts/non_deserializable/expected_error
@@ -0,0 +1,6 @@
+Contract function 'bad_private_return' returns a value of type NotDeserializable, which does not implement the Deserialize trait. Add #[derive(Deserialize)] to NotDeserializable's declaration.
+Parameter '_p' of contract function 'bad_private_param' has type NotDeserializable, which does not implement the Deserialize trait. Add #[derive(Deserialize)] to NotDeserializable's declaration.
+Contract function 'bad_public_return' returns a value of type NotDeserializable, which does not implement the Deserialize trait. Add #[derive(Deserialize)] to NotDeserializable's declaration.
+Parameter '_p' of contract function 'bad_public_param' has type NotDeserializable, which does not implement the Deserialize trait. Add #[derive(Deserialize)] to NotDeserializable's declaration.
+Contract function 'bad_utility_return' returns a value of type NotDeserializable, which does not implement the Deserialize trait. Add #[derive(Deserialize)] to NotDeserializable's declaration.
+Parameter '_p' of contract function 'bad_utility_param' has type NotDeserializable, which does not implement the Deserialize trait. Add #[derive(Deserialize)] to NotDeserializable's declaration.
diff --git a/noir-projects/noir-contracts-comp-failures/contracts/non_deserializable/src/main.nr b/noir-projects/noir-contracts-comp-failures/contracts/non_deserializable/src/main.nr
new file mode 100644
index 000000000000..87dd42cdd870
--- /dev/null
+++ b/noir-projects/noir-contracts-comp-failures/contracts/non_deserializable/src/main.nr
@@ -0,0 +1,38 @@
+// Tests that contract functions using a type that does not implement Deserialize fail to compile, for all function types
+// (private, public, utility) and both return types and parameters.
+use aztec::macros::aztec;
+
+#[aztec]
+pub contract NonDeserializable {
+    use aztec::macros::functions::external;
+    use aztec::protocol::traits::Serialize;
+
+    #[derive(Serialize)]
+    pub struct NotDeserializable {
+        x: Field,
+    }
+
+    #[external("private")]
+    fn bad_private_return() -> pub NotDeserializable {
+        NotDeserializable { x: 1 }
+    }
+
+    #[external("private")]
+    fn bad_private_param(_p: NotDeserializable) {}
+
+    #[external("public")]
+    fn bad_public_return() -> pub NotDeserializable {
+        NotDeserializable { x: 1 }
+    }
+
+    #[external("public")]
+    fn bad_public_param(_p: NotDeserializable) {}
+
+    #[external("utility")]
+    unconstrained fn bad_utility_return() -> pub NotDeserializable {
+        NotDeserializable { x: 1 }
+    }
+
+    #[external("utility")]
+    unconstrained fn bad_utility_param(_p: NotDeserializable) {}
+}
diff --git a/noir-projects/noir-contracts-comp-failures/contracts/non_serializable/Nargo.toml b/noir-projects/noir-contracts-comp-failures/contracts/non_serializable/Nargo.toml
new file mode 100644
index 000000000000..61dd673b2bd3
--- /dev/null
+++ b/noir-projects/noir-contracts-comp-failures/contracts/non_serializable/Nargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "non_serializable"
+authors = [""]
+compiler_version = ">=0.25.0"
+type = "contract"
+
+[dependencies]
+aztec = { path = "../../../aztec-nr/aztec" }
diff --git a/noir-projects/noir-contracts-comp-failures/contracts/non_serializable/expected_error b/noir-projects/noir-contracts-comp-failures/contracts/non_serializable/expected_error
new file mode 100644
index 000000000000..33a63c051f3a
--- /dev/null
+++ b/noir-projects/noir-contracts-comp-failures/contracts/non_serializable/expected_error
@@ -0,0 +1,6 @@
+Contract function 'bad_private_return' returns a value of type NotSerializable, which does not implement the Serialize trait. Add #[derive(Serialize)] to NotSerializable's declaration.
+Parameter '_p' of contract function 'bad_private_param' has type NotSerializable, which does not implement the Serialize trait. Add #[derive(Serialize)] to NotSerializable's declaration.
+Contract function 'bad_public_return' returns a value of type NotSerializable, which does not implement the Serialize trait. Add #[derive(Serialize)] to NotSerializable's declaration.
+Parameter '_p' of contract function 'bad_public_param' has type NotSerializable, which does not implement the Serialize trait. Add #[derive(Serialize)] to NotSerializable's declaration.
+Contract function 'bad_utility_return' returns a value of type NotSerializable, which does not implement the Serialize trait. Add #[derive(Serialize)] to NotSerializable's declaration.
+Parameter '_p' of contract function 'bad_utility_param' has type NotSerializable, which does not implement the Serialize trait. Add #[derive(Serialize)] to NotSerializable's declaration.
diff --git a/noir-projects/noir-contracts-comp-failures/contracts/non_serializable/src/main.nr b/noir-projects/noir-contracts-comp-failures/contracts/non_serializable/src/main.nr
new file mode 100644
index 000000000000..b59ba8578653
--- /dev/null
+++ b/noir-projects/noir-contracts-comp-failures/contracts/non_serializable/src/main.nr
@@ -0,0 +1,38 @@
+// Tests that contract functions using a type that does not implement Serialize fail to compile, for all function types
+// (private, public, utility) and both return types and parameters.
+use aztec::macros::aztec;
+
+#[aztec]
+pub contract NonSerializable {
+    use aztec::macros::functions::external;
+    use aztec::protocol::traits::Deserialize;
+
+    #[derive(Deserialize)]
+    pub struct NotSerializable {
+        x: Field,
+    }
+
+    #[external("private")]
+    fn bad_private_return() -> pub NotSerializable {
+        NotSerializable { x: 1 }
+    }
+
+    #[external("private")]
+    fn bad_private_param(_p: NotSerializable) {}
+
+    #[external("public")]
+    fn bad_public_return() -> pub NotSerializable {
+        NotSerializable { x: 1 }
+    }
+
+    #[external("public")]
+    fn bad_public_param(_p: NotSerializable) {}
+
+    #[external("utility")]
+    unconstrained fn bad_utility_return() -> pub NotSerializable {
+        NotSerializable { x: 1 }
+    }
+
+    #[external("utility")]
+    unconstrained fn bad_utility_param(_p: NotSerializable) {}
+}
diff --git a/noir-projects/noir-contracts-comp-failures/contracts/panic_on_owned_state_var_in_storage/expected_error b/noir-projects/noir-contracts-comp-failures/contracts/panic_on_owned_state_var_in_storage/expected_error
index 1e744c4f8bf6..912e28180292 100644
--- a/noir-projects/noir-contracts-comp-failures/contracts/panic_on_owned_state_var_in_storage/expected_error
+++ b/noir-projects/noir-contracts-comp-failures/contracts/panic_on_owned_state_var_in_storage/expected_error
@@ -1,3 +1,3 @@
-Type PrivateImmutable<Field, Context> implements OwnedStateVariable and hence cannot be placed in Storage struct without being wrapped in Owned. Define the type in storage as Owned<PrivateImmutable<Field, Context><..., Context>>, Context>.
+Type PrivateImmutable<Field, Context> implements OwnedStateVariable and hence cannot be placed in Storage struct without being wrapped in Owned. Wrap the type in Owned<..., Context>.
 Could not resolve 'init' in path
 Type annotation needed
diff --git a/noir-projects/noir-contracts/Nargo.toml b/noir-projects/noir-contracts/Nargo.toml
index 16d8358fca3a..c573739ed301 100644
--- a/noir-projects/noir-contracts/Nargo.toml
+++ b/noir-projects/noir-contracts/Nargo.toml
@@ -26,6 +26,7 @@ members = [
     "contracts/app/simple_token_contract",
     "contracts/fees/fpc_contract",
     "contracts/fees/sponsored_fpc_contract",
+    "contracts/message_discovery/handshake_registry_contract",
     "contracts/protocol/auth_registry_contract",
     "contracts/protocol/contract_class_registry_contract",
     "contracts/protocol/contract_instance_registry_contract",
@@ -52,6 +53,7 @@ members = [
     "contracts/test/import_test_contract",
     "contracts/test/init_test_contract",
     "contracts/test/invalid_account_contract",
+    "contracts/test/nested_utility_contract",
     "contracts/test/no_constructor_contract",
     "contracts/test/note_hash_and_nullifier/note_hash_and_nullifier_contract",
     "contracts/test/note_getter_contract",
@@ -76,6 +78,7 @@ members = [
     "contracts/test/storage_proof_test_contract",
     "contracts/test/test_contract",
     "contracts/test/test_log_contract",
+    "contracts/test/unit_return_type_contract",
     "contracts/test/updatable_contract",
     "contracts/test/updated_contract"
 ]
diff --git a/noir-projects/noir-contracts/bootstrap.sh b/noir-projects/noir-contracts/bootstrap.sh
index b88ea473f464..4aa985da55e0 100755
--- a/noir-projects/noir-contracts/bootstrap.sh
+++ b/noir-projects/noir-contracts/bootstrap.sh
@@ -93,6 +93,20 @@ function get_contract_path {
 }
 export -f get_contract_path
 
+# Stamps the aztec version into a contract artifact JSON in place. Mirrors stampAztecVersion in
+# yarn-project/aztec/src/cli/cmds/compile.ts so monorepo-built artifacts match those produced by `aztec compile`.
+# On release builds (REF_NAME is valid semver) the tag without the leading "v" is used; otherwise "dev".
+function stamp_aztec_version {
+  local json_path=$1
+  # "dev" here corresponds to DEV_VERSION in yarn-project/stdlib/src/update-checker/dev_version.ts.
+  local version="dev"
+  semver check "$REF_NAME" 2>/dev/null && version="${REF_NAME#v}"
+  local tmp=$(mktemp)
+  jq --arg v "$version" '.aztec_version = $v' "$json_path" > "$tmp"
+  mv "$tmp" "$json_path"
+}
+export -f stamp_aztec_version
+
 # This compiles a noir contract, transpiles public functions, strips internal prefixes,
 # and generates verification keys for private functions via 'bb aztec_process'.
 # $1 is the input package name, $2 is the folder name (e.g. "contracts" or "examples")
@@ -113,6 +127,9 @@ function compile {
     $BB aztec_process -i $json_path
     cache_upload contract-$contract_hash.tar.gz $json_path
   fi
+  # Stamp the current version after the cache block so the field always matches the build's version, whether
+  # the artifact came from a fresh compile or a cache hit.
+  stamp_aztec_version "$json_path"
 }
 export -f compile
 
diff --git a/noir-projects/noir-contracts/contracts/account/ecdsa_k_account_contract/src/main.nr b/noir-projects/noir-contracts/contracts/account/ecdsa_k_account_contract/src/main.nr
index fbc2f0d45f76..d4df63a887ac 100644
--- a/noir-projects/noir-contracts/contracts/account/ecdsa_k_account_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/account/ecdsa_k_account_contract/src/main.nr
@@ -7,10 +7,7 @@ pub contract EcdsaKAccount {
     use aztec::{
         authwit::{account::AccountActions, entrypoint::app::AppPayload},
         context::PrivateContext,
-        macros::{
-            functions::{allow_phase_change, external, initializer, noinitcheck, view},
-            storage::storage,
-        },
+        macros::{functions::{allow_phase_change, external, initializer, noinitcheck, view}, storage::storage},
         messages::message_delivery::MessageDelivery,
         oracle::{auth_witness::get_auth_witness_as_bytes, notes::set_sender_for_tags},
         state_vars::SinglePrivateImmutable,
@@ -37,12 +34,11 @@ pub contract EcdsaKAccount {
         unsafe { set_sender_for_tags(self.address) };
         // The note message gets delivered to the note owner which is set by the SinglePrivateImmutable to be this
         // contract.
-        self.storage.signing_public_key.initialize(pub_key_note).deliver(
-            MessageDelivery.ONCHAIN_CONSTRAINED,
-        );
+        self.storage.signing_public_key.initialize(pub_key_note).deliver(MessageDelivery.ONCHAIN_CONSTRAINED);
     }
 
-    // @dev: If you globally change the entrypoint signature don't forget to update account_entrypoint.ts file (specifically `getEntrypointAbi()`)
+    // @dev: If you globally change the entrypoint signature don't forget to update account_entrypoint.ts file
+    // (specifically `getEntrypointAbi()`)
     // using noinitcheck is an optimization, it reduces gates by omitting a check that the contract has been initialized
     #[external("private")]
     #[noinitcheck]
@@ -75,12 +71,7 @@ pub contract EcdsaKAccount {
         // Note that noir expects the hash of the message/challenge as input to the ECDSA verification.
         let outer_hash_bytes: [u8; 32] = outer_hash.to_be_bytes();
         let hashed_message: [u8; 32] = sha256::digest(outer_hash_bytes);
-        std::ecdsa_secp256k1::verify_signature(
-            public_key.x,
-            public_key.y,
-            signature,
-            hashed_message,
-        )
+        std::ecdsa_secp256k1::verify_signature(public_key.x, public_key.y, signature, hashed_message)
     }
     // docs:end:is_valid_impl
 }
diff --git a/noir-projects/noir-contracts/contracts/account/ecdsa_r_account_contract/src/main.nr b/noir-projects/noir-contracts/contracts/account/ecdsa_r_account_contract/src/main.nr
index 98a7274f3586..4a1c4519b525 100644
--- a/noir-projects/noir-contracts/contracts/account/ecdsa_r_account_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/account/ecdsa_r_account_contract/src/main.nr
@@ -1,4 +1,5 @@
-// Account contract that uses ECDSA signatures for authentication on random version of the p256 curve (to use with touchID).
+// Account contract that uses ECDSA signatures for authentication on random version of the p256 curve (to use with
+// touchID).
 use aztec::macros::aztec;
 
 #[aztec]
@@ -6,10 +7,7 @@ pub contract EcdsaRAccount {
     use aztec::{
         authwit::{account::AccountActions, entrypoint::app::AppPayload},
         context::PrivateContext,
-        macros::{
-            functions::{allow_phase_change, external, initializer, noinitcheck, view},
-            storage::storage,
-        },
+        macros::{functions::{allow_phase_change, external, initializer, noinitcheck, view}, storage::storage},
         messages::message_delivery::MessageDelivery,
         oracle::{auth_witness::get_auth_witness_as_bytes, notes::set_sender_for_tags},
         state_vars::SinglePrivateImmutable,
@@ -36,12 +34,11 @@ pub contract EcdsaRAccount {
         unsafe { set_sender_for_tags(self.address) };
         // The note message gets delivered to the note owner which is set by the SinglePrivateImmutable to be this
         // contract.
-        self.storage.signing_public_key.initialize(pub_key_note).deliver(
-            MessageDelivery.ONCHAIN_CONSTRAINED,
-        );
+        self.storage.signing_public_key.initialize(pub_key_note).deliver(MessageDelivery.ONCHAIN_CONSTRAINED);
     }
 
-    // @dev: If you globally change the entrypoint signature don't forget to update account_entrypoint.ts file (specifically `getEntrypointAbi()`)
+    // @dev: If you globally change the entrypoint signature don't forget to update account_entrypoint.ts file
+    // (specifically `getEntrypointAbi()`)
     // using noinitcheck is an optimization, it reduces gates by omitting a check that the contract has been initialized
     #[external("private")]
     #[noinitcheck]
@@ -73,11 +70,6 @@ pub contract EcdsaRAccount {
         // Note that noir expects the hash of the message/challenge as input to the ECDSA verification.
         let outer_hash_bytes: [u8; 32] = outer_hash.to_be_bytes();
         let hashed_message: [u8; 32] = sha256::digest(outer_hash_bytes);
-        std::ecdsa_secp256r1::verify_signature(
-            public_key.x,
-            public_key.y,
-            signature,
-            hashed_message,
-        )
+        std::ecdsa_secp256r1::verify_signature(public_key.x, public_key.y, signature, hashed_message)
     }
 }
diff --git a/noir-projects/noir-contracts/contracts/account/schnorr_account_contract/src/main.nr b/noir-projects/noir-contracts/contracts/account/schnorr_account_contract/src/main.nr
index 3396c6f1187b..e41ec43ee40f 100644
--- a/noir-projects/noir-contracts/contracts/account/schnorr_account_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/account/schnorr_account_contract/src/main.nr
@@ -14,15 +14,11 @@ pub contract SchnorrAccount {
         },
         context::PrivateContext,
         hash::compute_siloed_nullifier,
-        macros::{
-            functions::{allow_phase_change, external, initializer, noinitcheck, view},
-            storage::storage,
-        },
+        macros::{functions::{allow_phase_change, external, initializer, noinitcheck, view}, storage::storage},
         messages::message_delivery::MessageDelivery,
         oracle::{
             auth_witness::get_auth_witness_as_bytes,
-            get_nullifier_membership_witness::get_low_nullifier_membership_witness,
-            notes::set_sender_for_tags,
+            get_nullifier_membership_witness::get_low_nullifier_membership_witness, notes::set_sender_for_tags,
         },
         protocol::address::AztecAddress,
         state_vars::SinglePrivateImmutable,
@@ -49,12 +45,11 @@ pub contract SchnorrAccount {
         unsafe { set_sender_for_tags(self.address) };
         // The note message gets delivered to the note owner which is set by the SinglePrivateImmutable to be this
         // contract.
-        self.storage.signing_public_key.initialize(pub_key_note).deliver(
-            MessageDelivery.ONCHAIN_CONSTRAINED,
-        );
+        self.storage.signing_public_key.initialize(pub_key_note).deliver(MessageDelivery.ONCHAIN_CONSTRAINED);
     }
 
-    // @dev: If you globally change the entrypoint signature don't forget to update account_entrypoint.ts file (specifically `getEntrypointAbi()`).
+    // @dev: If you globally change the entrypoint signature don't forget to update account_entrypoint.ts file
+    // (specifically `getEntrypointAbi()`).
     // using noinitcheck is an optimization, it reduces gates by omitting a check that the contract has been initialized
     #[external("private")]
     #[noinitcheck]
@@ -83,19 +78,16 @@ pub contract SchnorrAccount {
         // Hence it's safe.
         let signature: [u8; 64] = unsafe { get_auth_witness_as_bytes(outer_hash) };
 
-        let pub_key =
-            std::embedded_curve_ops::EmbeddedCurvePoint { x: public_key.x, y: public_key.y };
+        let pub_key = std::embedded_curve_ops::EmbeddedCurvePoint { x: public_key.x, y: public_key.y };
         // Verify signature of the payload bytes
         schnorr::verify_signature(pub_key, signature, outer_hash.to_be_bytes::<32>())
         // docs:end:is_valid_impl
     }
 
-    /**
-    * @notice Helper function to check validity of private authwitnesses
-    * @param consumer The address of the consumer of the message
-    * @param message_hash The message hash of the message to check the validity
-    * @return True if the message_hash can be consumed, false otherwise
-    */
+    /// @notice Helper function to check validity of private authwitnesses
+    /// @param consumer The address of the consumer of the message
+    /// @param message_hash The message hash of the message to check the validity
+    /// @return True if the message_hash can be consumed, false otherwise
     #[external("utility")]
     unconstrained fn lookup_validity(consumer: AztecAddress, inner_hash: Field) -> bool {
         let public_key = self.storage.signing_public_key.view_note();
@@ -108,10 +100,8 @@ pub contract SchnorrAccount {
         );
 
         let signature: [u8; 64] = get_auth_witness_as_bytes(message_hash);
-        let pub_key =
-            std::embedded_curve_ops::EmbeddedCurvePoint { x: public_key.x, y: public_key.y };
-        let valid_in_private =
-            schnorr::verify_signature(pub_key, signature, message_hash.to_be_bytes::<32>());
+        let pub_key = std::embedded_curve_ops::EmbeddedCurvePoint { x: public_key.x, y: public_key.y };
+        let valid_in_private = schnorr::verify_signature(pub_key, signature, message_hash.to_be_bytes::<32>());
 
         // Compute the nullifier and check if it is spent
         // This will BLINDLY TRUST the oracle, but the oracle is us, and
diff --git a/noir-projects/noir-contracts/contracts/account/schnorr_hardcoded_account_contract/src/main.nr b/noir-projects/noir-contracts/contracts/account/schnorr_hardcoded_account_contract/src/main.nr
index 38e6b82a1017..489f87d7fb94 100644
--- a/noir-projects/noir-contracts/contracts/account/schnorr_hardcoded_account_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/account/schnorr_hardcoded_account_contract/src/main.nr
@@ -16,7 +16,8 @@ pub contract SchnorrHardcodedAccount {
         y: 0x208d44b36eb6e73b254921134d002da1a90b41131024e3b1d721259182106205,
     };
 
-    // @dev: If you globally change the entrypoint signature don't forget to update account_entrypoint.ts (specifically `getEntrypointAbi()`)
+    // @dev: If you globally change the entrypoint signature don't forget to update account_entrypoint.ts (specifically
+    // `getEntrypointAbi()`)
     #[external("private")]
     #[allow_phase_change]
     fn entrypoint(app_payload: AppPayload, fee_payment_method: u8, cancellable: bool) {
diff --git a/noir-projects/noir-contracts/contracts/account/simulated_ecdsa_account_contract/src/main.nr b/noir-projects/noir-contracts/contracts/account/simulated_ecdsa_account_contract/src/main.nr
index 5fb3a73eede5..ae48e7a9595f 100644
--- a/noir-projects/noir-contracts/contracts/account/simulated_ecdsa_account_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/account/simulated_ecdsa_account_contract/src/main.nr
@@ -28,11 +28,14 @@ pub contract SimulatedEcdsaAccount {
         // used for any security purpose.
         let seed = unsafe { random() };
 
-        // Emit the initialization nullifier for the signing_public_key SinglePrivateImmutable.
+        // Emit the initialization nullifier for the contract itself.
         self.context.push_nullifier(seed);
 
+        // Emit the initialization nullifier for the signing_public_key SinglePrivateImmutable.
+        self.context.push_nullifier(seed + 1);
+
         // Emit the note hash for the signing key note.
-        self.context.push_note_hash(seed + 1);
+        self.context.push_note_hash(seed + 2);
 
         // Emit a private log tied to the note hash, matching the length of a real note delivery
         // log (MESSAGE_CIPHERTEXT_LEN fields). The signing key note is a SinglePrivateImmutable
@@ -67,9 +70,6 @@ pub contract SimulatedEcdsaAccount {
 
     #[external("utility")]
     unconstrained fn sync_state() {
-        assert(
-            false,
-            "BUG ALERT: sync_state on a simulated account contract should never be triggered.",
-        );
+        assert(false, "BUG ALERT: sync_state on a simulated account contract should never be triggered.");
     }
 }
diff --git a/noir-projects/noir-contracts/contracts/account/simulated_schnorr_account_contract/src/main.nr b/noir-projects/noir-contracts/contracts/account/simulated_schnorr_account_contract/src/main.nr
index ecc742993305..9d570e78bc50 100644
--- a/noir-projects/noir-contracts/contracts/account/simulated_schnorr_account_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/account/simulated_schnorr_account_contract/src/main.nr
@@ -28,11 +28,14 @@ pub contract SimulatedSchnorrAccount {
         // security purpose.
         let seed = unsafe { random() };
 
-        // Emit the initialization nullifier for the signing_public_key SinglePrivateImmutable.
+        // Emit the initialization nullifier for the contract itself.
         self.context.push_nullifier(seed);
 
+        // Emit the initialization nullifier for the signing_public_key SinglePrivateImmutable.
+        self.context.push_nullifier(seed + 1);
+
         // Emit the note hash for the signing key note.
-        self.context.push_note_hash(seed + 1);
+        self.context.push_note_hash(seed + 2);
 
         // Emit a private log tied to the note hash, matching the length of a real note delivery
         // log (MESSAGE_CIPHERTEXT_LEN fields). The signing key note is a SinglePrivateImmutable
@@ -67,9 +70,6 @@ pub contract SimulatedSchnorrAccount {
 
     #[external("utility")]
     unconstrained fn sync_state() {
-        assert(
-            false,
-            "BUG ALERT: sync_state on a simulated account contract should never be triggered.",
-        );
+        assert(false, "BUG ALERT: sync_state on a simulated account contract should never be triggered.");
     }
 }
diff --git a/noir-projects/noir-contracts/contracts/app/amm_contract/src/lib.nr b/noir-projects/noir-contracts/contracts/app/amm_contract/src/lib.nr
index eb77f1773303..047108d886f2 100644
--- a/noir-projects/noir-contracts/contracts/app/amm_contract/src/lib.nr
+++ b/noir-projects/noir-contracts/contracts/app/amm_contract/src/lib.nr
@@ -32,7 +32,8 @@ pub fn get_amount_in(amount_out: u128, balance_in: u128, balance_out: u128) -> u
     (numerator / denominator) + 1 as u128
 }
 
-/// Given the desired amounts and balances of token0 and token1 returns the optimal amount of token0 and token1 to be added to the pool.
+/// Given the desired amounts and balances of token0 and token1 returns the optimal amount of token0 and token1 to be
+/// added to the pool.
 pub fn get_amounts_to_add(
     amount0_max: u128,
     amount1_max: u128,
@@ -74,12 +75,7 @@ pub fn get_amounts_to_add(
 }
 
 /// Returns the amount of tokens to return to a liquidity provider when they remove liquidity from the pool.
-pub fn get_amounts_on_remove(
-    to_burn: u128,
-    total_supply: u128,
-    balance0: u128,
-    balance1: u128,
-) -> (u128, u128) {
+pub fn get_amounts_on_remove(to_burn: u128, total_supply: u128, balance0: u128, balance1: u128) -> (u128, u128) {
     // Since the liquidity token tracks ownership of the pool, the liquidity provider gets a proportional share of each
     // token.
     (to_burn * balance0 / total_supply, to_burn * balance1 / total_supply)
diff --git a/noir-projects/noir-contracts/contracts/app/amm_contract/src/main.nr b/noir-projects/noir-contracts/contracts/app/amm_contract/src/main.nr
index 91a35dd56e87..7daae3319809 100644
--- a/noir-projects/noir-contracts/contracts/app/amm_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/app/amm_contract/src/main.nr
@@ -35,10 +35,7 @@ use aztec::macros::aztec;
 ///   `AMM.private_fn --> AMM.public_fn --> ExternalContract.fn --> AMM.public_fn`.
 #[aztec]
 pub contract AMM {
-    use crate::{
-        config::Config,
-        lib::{get_amount_in, get_amount_out, get_amounts_on_remove, get_amounts_to_add},
-    };
+    use crate::{config::Config, lib::{get_amount_in, get_amount_out, get_amounts_on_remove, get_amounts_to_add}};
     use aztec::{
         macros::{functions::{external, initializer, only_self}, storage::storage},
         protocol::address::AztecAddress,
@@ -76,21 +73,9 @@ pub contract AMM {
     ///
     /// The identity of the liquidity provider is not revealed, but the action and amounts are.
     #[external("private")]
-    fn add_liquidity(
-        amount0_max: u128,
-        amount1_max: u128,
-        amount0_min: u128,
-        amount1_min: u128,
-        authwit_nonce: Field,
-    ) {
-        assert(
-            (amount0_min < amount0_max) | (amount0_min == amount0_max),
-            "INCORRECT_TOKEN0_LIMITS",
-        );
-        assert(
-            (amount1_min < amount1_max) | (amount1_min == amount1_max),
-            "INCORRECT_TOKEN1_LIMITS",
-        );
+    fn add_liquidity(amount0_max: u128, amount1_max: u128, amount0_min: u128, amount1_min: u128, authwit_nonce: Field) {
+        assert((amount0_min < amount0_max) | (amount0_min == amount0_max), "INCORRECT_TOKEN0_LIMITS");
+        assert((amount1_min < amount1_max) | (amount1_min == amount1_max), "INCORRECT_TOKEN1_LIMITS");
         assert((0 as u128 < amount0_max) & (0 as u128 < amount1_max), "INSUFFICIENT_INPUT_AMOUNTS");
 
         let config = self.storage.config.read();
@@ -104,27 +89,24 @@ pub contract AMM {
         // We don't yet know how many tokens the sender will actually supply - that can only be computed during public
         // execution since the amounts supplied must have the same ratio as the live balances. We therefore transfer the
         // maximum amounts here, and prepare partial notes that return the change to the sender (if any).
-        let refund_token0_partial_note = self.call(token0
-            .transfer_to_public_and_prepare_private_balance_increase(
-                sender,
-                self.address,
-                amount0_max,
-                authwit_nonce,
-            ));
-
-        let refund_token1_partial_note = self.call(token1
-            .transfer_to_public_and_prepare_private_balance_increase(
-                sender,
-                self.address,
-                amount1_max,
-                authwit_nonce,
-            ));
+        let refund_token0_partial_note = self.call(token0.transfer_to_public_and_prepare_private_balance_increase(
+            sender,
+            self.address,
+            amount0_max,
+            authwit_nonce,
+        ));
+
+        let refund_token1_partial_note = self.call(token1.transfer_to_public_and_prepare_private_balance_increase(
+            sender,
+            self.address,
+            amount1_max,
+            authwit_nonce,
+        ));
 
         // The number of liquidity tokens to mint for the caller depends on both the live balances and the amount
         // supplied, both of which can only be known during public execution. We therefore prepare a partial note that
         // will get completed via minting.
-        let liquidity_partial_note =
-            self.call(liquidity_token.prepare_private_balance_increase(sender));
+        let liquidity_partial_note = self.call(liquidity_token.prepare_private_balance_increase(sender));
 
         // We then complete the flow in public. Note that the type of operation and amounts will all be publicly known,
         // but the identity of the caller is not revealed despite us being able to send tokens to them by completing the
@@ -184,16 +166,10 @@ pub contract AMM {
         // We can simply skip the refund if the amount to return is 0 in order to save gas: the partial note will
         // simply stay in public storage and not be completed, but this is not an issue.
         if (refund_amount_token0 > 0 as u128) {
-            self.call(token0.finalize_transfer_to_private(
-                refund_amount_token0,
-                refund_token0_partial_note,
-            ));
+            self.call(token0.finalize_transfer_to_private(refund_amount_token0, refund_token0_partial_note));
         }
         if (refund_amount_token1 > 0 as u128) {
-            self.call(token1.finalize_transfer_to_private(
-                refund_amount_token1,
-                refund_token1_partial_note,
-            ));
+            self.call(token1.finalize_transfer_to_private(refund_amount_token1, refund_token1_partial_note));
         }
 
         // With the deposit amounts known, we can compute the number of liquidity tokens to mint and finalize the
@@ -215,17 +191,13 @@ pub contract AMM {
 
             // As part of initialization, we mint some tokens to the zero address to 'lock' them (i.e. make them
             // impossible to redeem), guaranteeing total supply will never be zero again.
-            liquidity_token.mint_to_public(AztecAddress::zero(), MINIMUM_LIQUIDITY).call(
-                self.context,
-            );
+            liquidity_token.mint_to_public(AztecAddress::zero(), MINIMUM_LIQUIDITY).call(self.context);
 
             INITIAL_LIQUIDITY
         };
 
         assert(liquidity_amount > 0 as u128, "INSUFFICIENT_LIQUIDITY_MINTED");
-        liquidity_token.finalize_mint_to_private(liquidity_amount, liquidity_partial_note).call(
-            self.context,
-        );
+        liquidity_token.finalize_mint_to_private(liquidity_amount, liquidity_partial_note).call(self.context);
     }
 
     /// Privately removes liquidity from the pool. This function receives how many liquidity tokens to burn, and the
@@ -236,12 +208,7 @@ pub contract AMM {
     ///
     /// The identity of the liquidity provider is not revealed, but the action and amounts are.
     #[external("private")]
-    fn remove_liquidity(
-        liquidity: u128,
-        amount0_min: u128,
-        amount1_min: u128,
-        authwit_nonce: Field,
-    ) {
+    fn remove_liquidity(liquidity: u128, amount0_min: u128, amount1_min: u128, authwit_nonce: Field) {
         let config = self.storage.config.read();
 
         let liquidity_token = Token::at(config.liquidity_token);
@@ -331,14 +298,8 @@ pub contract AMM {
 
         // We transfer the full amount in, since it is an exact amount, and prepare a partial note for the amount out,
         // which will only be known during public execution as it depends on the live balances.
-        self.call(Token::at(token_in).transfer_to_public(
-            sender,
-            self.address,
-            amount_in,
-            authwit_nonce,
-        ));
-        let token_out_partial_note =
-            self.call(Token::at(token_out).prepare_private_balance_increase(sender));
+        self.call(Token::at(token_in).transfer_to_public(sender, self.address, amount_in, authwit_nonce));
+        let token_out_partial_note = self.call(Token::at(token_out).prepare_private_balance_increase(sender));
 
         self.enqueue_self._swap_exact_tokens_for_tokens(
             token_in,
@@ -361,8 +322,7 @@ pub contract AMM {
         // In order to compute the amount to swap we need the live token balances. Note that at this state the token in
         // transfer has already been completed as that function call was enqueued before this one. We therefore need to
         // subtract the amount in to get the pre-swap balances.
-        let balance_in_plus_amount_in =
-            self.view(Token::at(token_in).balance_of_public(self.address));
+        let balance_in_plus_amount_in = self.view(Token::at(token_in).balance_of_public(self.address));
         let balance_in = balance_in_plus_amount_in - amount_in;
 
         let balance_out = self.view(Token::at(token_out).balance_of_public(self.address));
@@ -371,9 +331,7 @@ pub contract AMM {
         let amount_out = get_amount_out(amount_in, balance_in, balance_out);
         assert(amount_out >= amount_out_min, "INSUFFICIENT_OUTPUT_AMOUNT");
 
-        Token::at(token_out).finalize_transfer_to_private(amount_out, token_out_partial_note).call(
-            self.context,
-        );
+        Token::at(token_out).finalize_transfer_to_private(amount_out, token_out_partial_note).call(self.context);
     }
 
     /// Privately swaps at most `amount_in_max` `token_in` tokens for `amount_out` `token_out` tokens with the pool.
@@ -405,15 +363,9 @@ pub contract AMM {
         // to wait until the swap has been completed before committing the note to the tree to avoid it being spent too
         // early.
         let change_token_in_partial_note = self.call(Token::at(token_in)
-            .transfer_to_public_and_prepare_private_balance_increase(
-                sender,
-                self.address,
-                amount_in_max,
-                authwit_nonce,
-            ));
+            .transfer_to_public_and_prepare_private_balance_increase(sender, self.address, amount_in_max, authwit_nonce));
 
-        let token_out_partial_note =
-            self.call(Token::at(token_out).prepare_private_balance_increase(sender));
+        let token_out_partial_note = self.call(Token::at(token_out).prepare_private_balance_increase(sender));
 
         self.enqueue_self._swap_tokens_for_exact_tokens(
             token_in,
@@ -438,8 +390,7 @@ pub contract AMM {
         // In order to compute the amount to swap we need the live token balances. Note that at this state the token in
         // transfer has already been completed as that function call was enqueued before this one. We therefore need to
         // subtract the amount in to get the pre-swap balances.
-        let balance_in_plus_amount_in_max =
-            self.view(Token::at(token_in).balance_of_public(self.address));
+        let balance_in_plus_amount_in_max = self.view(Token::at(token_in).balance_of_public(self.address));
         let balance_in = balance_in_plus_amount_in_max - amount_in_max;
 
         let balance_out = self.view(Token::at(token_out).balance_of_public(self.address));
@@ -450,35 +401,22 @@ pub contract AMM {
 
         let change = amount_in_max - amount_in;
         if (change > 0 as u128) {
-            self.call(Token::at(token_in).finalize_transfer_to_private(
-                change,
-                change_token_in_partial_note,
-            ));
+            self.call(Token::at(token_in).finalize_transfer_to_private(change, change_token_in_partial_note));
         }
 
         // Note again that we already knew the amount out, but for consistency we want to only commit this note once
         // all other steps have been performed.
-        Token::at(token_out).finalize_transfer_to_private(amount_out, token_out_partial_note).call(
-            self.context,
-        );
+        Token::at(token_out).finalize_transfer_to_private(amount_out, token_out_partial_note).call(self.context);
     }
 
     #[external("utility")]
-    unconstrained fn get_amount_out_for_exact_in(
-        balance_in: u128,
-        balance_out: u128,
-        amount_in: u128,
-    ) -> u128 {
+    unconstrained fn get_amount_out_for_exact_in(balance_in: u128, balance_out: u128, amount_in: u128) -> u128 {
         // Ideally we'd call the token contract in order to read the current balance, but we can't due to #7524.
         get_amount_out(amount_in, balance_in, balance_out)
     }
 
     #[external("utility")]
-    unconstrained fn get_amount_in_for_exact_out(
-        balance_in: u128,
-        balance_out: u128,
-        amount_out: u128,
-    ) -> u128 {
+    unconstrained fn get_amount_in_for_exact_out(balance_in: u128, balance_out: u128, amount_out: u128) -> u128 {
         // Ideally we'd call the token contract in order to read the current balance, but we can't due to #7524.
         get_amount_in(amount_out, balance_in, balance_out)
     }
diff --git a/noir-projects/noir-contracts/contracts/app/amm_contract/src/test/test.nr b/noir-projects/noir-contracts/contracts/app/amm_contract/src/test/test.nr
index e97677d73e3a..50764e632348 100644
--- a/noir-projects/noir-contracts/contracts/app/amm_contract/src/test/test.nr
+++ b/noir-projects/noir-contracts/contracts/app/amm_contract/src/test/test.nr
@@ -11,8 +11,7 @@ global DEFAULT_AMOUNT_1_MIN: u128 = 0;
 
 #[test]
 unconstrained fn add_liquidity_twice_and_remove_liquidity() {
-    let (mut env, amm_address, token0_address, token1_address, liquidity_token_address, minter) =
-        setup();
+    let (mut env, amm_address, token0_address, token1_address, liquidity_token_address, minter) = setup();
 
     let liquidity_provider_1 = env.create_contract_account();
     let liquidity_provider_2 = env.create_contract_account();
@@ -66,29 +65,16 @@ unconstrained fn add_liquidity_twice_and_remove_liquidity() {
 
     // Verify balances after adding liquidity
     // AMM should have received 500 token0 and 1000 token1 (not 1200, as excess is refunded)
-    assert_eq(
-        env.view_public(token0.balance_of_public(amm_address)),
-        initial_amount0 + expected_amount_0_in,
-    );
-    assert_eq(
-        env.view_public(token1.balance_of_public(amm_address)),
-        initial_amount1 + expected_amount_1_in,
-    );
+    assert_eq(env.view_public(token0.balance_of_public(amm_address)), initial_amount0 + expected_amount_0_in);
+    assert_eq(env.view_public(token1.balance_of_public(amm_address)), initial_amount1 + expected_amount_1_in);
 
     // Liquidity provider 2 should have 0 token0 and the refund amount of token1
     assert_eq(env.execute_utility(token0.balance_of_private(liquidity_provider_2)), 0);
-    assert_eq(
-        env.execute_utility(token1.balance_of_private(liquidity_provider_2)),
-        expected_refund_amount1,
-    );
+    assert_eq(env.execute_utility(token1.balance_of_private(liquidity_provider_2)), expected_refund_amount1);
 
     // Check liquidity provider 2 received liquidity tokens proportional to their contribution
-    let expected_liquidity_tokens =
-        (expected_amount_0_in * initial_liquidity_token_supply) / initial_amount0;
-    assert_eq(
-        env.execute_utility(liquidity_token.balance_of_private(liquidity_provider_2)),
-        expected_liquidity_tokens,
-    );
+    let expected_liquidity_tokens = (expected_amount_0_in * initial_liquidity_token_supply) / initial_amount0;
+    assert_eq(env.execute_utility(liquidity_token.balance_of_private(liquidity_provider_2)), expected_liquidity_tokens);
 
     // REMOVING LIQUIDITY
     let liquidity_to_remove = AMM::INITIAL_LIQUIDITY / 2;
@@ -106,18 +92,10 @@ unconstrained fn add_liquidity_twice_and_remove_liquidity() {
     );
 
     // Verify liquidity provider 1 got tokens back (proportional to liquidity burned)
-    let expected_token0_back =
-        (liquidity_to_remove * initial_amount0) / initial_liquidity_token_supply;
-    let expected_token1_back =
-        (liquidity_to_remove * initial_amount1) / initial_liquidity_token_supply;
-    assert_eq(
-        env.execute_utility(token0.balance_of_private(liquidity_provider_1)),
-        expected_token0_back,
-    );
-    assert_eq(
-        env.execute_utility(token1.balance_of_private(liquidity_provider_1)),
-        expected_token1_back,
-    );
+    let expected_token0_back = (liquidity_to_remove * initial_amount0) / initial_liquidity_token_supply;
+    let expected_token1_back = (liquidity_to_remove * initial_amount1) / initial_liquidity_token_supply;
+    assert_eq(env.execute_utility(token0.balance_of_private(liquidity_provider_1)), expected_token0_back);
+    assert_eq(env.execute_utility(token1.balance_of_private(liquidity_provider_1)), expected_token1_back);
 
     // Check remaining liquidity tokens
     assert_eq(
@@ -129,8 +107,7 @@ unconstrained fn add_liquidity_twice_and_remove_liquidity() {
 
 #[test]
 unconstrained fn swap_exact_tokens_for_tokens() {
-    let (mut env, amm_address, token0_address, token1_address, _liquidity_token_address, minter) =
-        setup();
+    let (mut env, amm_address, token0_address, token1_address, _liquidity_token_address, minter) = setup();
 
     let liquidity_provider = env.create_contract_account();
     let swapper = env.create_contract_account();
@@ -172,13 +149,7 @@ unconstrained fn swap_exact_tokens_for_tokens() {
 
     env.call_private(
         swapper,
-        amm.swap_exact_tokens_for_tokens(
-            token0_address,
-            token1_address,
-            amount_in,
-            amount_out_min,
-            AUTHWIT_NONCE,
-        ),
+        amm.swap_exact_tokens_for_tokens(token0_address, token1_address, amount_in, amount_out_min, AUTHWIT_NONCE),
     );
 
     // Verify swap occurred - all of input tokens should be spent and hence the swapper should have 0 token0 balance.
@@ -189,8 +160,7 @@ unconstrained fn swap_exact_tokens_for_tokens() {
 
 #[test]
 unconstrained fn swap_tokens_for_exact_tokens() {
-    let (mut env, amm_address, token0_address, token1_address, _liquidity_token_address, minter) =
-        setup();
+    let (mut env, amm_address, token0_address, token1_address, _liquidity_token_address, minter) = setup();
 
     let liquidity_provider = env.create_contract_account();
     let swapper = env.create_contract_account();
@@ -233,13 +203,7 @@ unconstrained fn swap_tokens_for_exact_tokens() {
 
     env.call_private(
         swapper,
-        amm.swap_tokens_for_exact_tokens(
-            token0_address,
-            token1_address,
-            amount_out,
-            amount_in_max,
-            AUTHWIT_NONCE,
-        ),
+        amm.swap_tokens_for_exact_tokens(token0_address, token1_address, amount_out, amount_in_max, AUTHWIT_NONCE),
     );
 
     // Verify swap occurred - should get exact amount out
@@ -252,8 +216,7 @@ unconstrained fn swap_tokens_for_exact_tokens() {
 
 #[test(should_fail_with = "INCORRECT_TOKEN0_LIMITS")]
 unconstrained fn add_liquidity_incorrect_token0_limits() {
-    let (mut env, amm_address, _token0_address, _token1_address, _liquidity_token_address, _minter)
-         = setup();
+    let (mut env, amm_address, _token0_address, _token1_address, _liquidity_token_address, _minter) = setup();
 
     let liquidity_provider = env.create_contract_account();
     let amm = AMM::at(amm_address);
@@ -272,8 +235,7 @@ unconstrained fn add_liquidity_incorrect_token0_limits() {
 
 #[test(should_fail_with = "INCORRECT_TOKEN1_LIMITS")]
 unconstrained fn add_liquidity_incorrect_token1_limits() {
-    let (mut env, amm_address, _token0_address, _token1_address, _liquidity_token_address, _minter)
-         = setup();
+    let (mut env, amm_address, _token0_address, _token1_address, _liquidity_token_address, _minter) = setup();
 
     let liquidity_provider = env.create_contract_account();
     let amm = AMM::at(amm_address);
@@ -292,8 +254,7 @@ unconstrained fn add_liquidity_incorrect_token1_limits() {
 
 #[test(should_fail_with = "INSUFFICIENT_INPUT_AMOUNTS")]
 unconstrained fn add_liquidity_zero_amount0_max() {
-    let (mut env, amm_address, _token0_address, _token1_address, _liquidity_token_address, _minter)
-         = setup();
+    let (mut env, amm_address, _token0_address, _token1_address, _liquidity_token_address, _minter) = setup();
 
     let liquidity_provider = env.create_contract_account();
     let amm = AMM::at(amm_address);
@@ -311,8 +272,7 @@ unconstrained fn add_liquidity_zero_amount0_max() {
 
 #[test(should_fail_with = "INSUFFICIENT_INPUT_AMOUNTS")]
 unconstrained fn add_liquidity_zero_amount1_max() {
-    let (mut env, amm_address, _token0_address, _token1_address, _liquidity_token_address, _minter)
-         = setup();
+    let (mut env, amm_address, _token0_address, _token1_address, _liquidity_token_address, _minter) = setup();
 
     let liquidity_provider = env.create_contract_account();
     let amm = AMM::at(amm_address);
@@ -330,8 +290,7 @@ unconstrained fn add_liquidity_zero_amount1_max() {
 
 #[test(should_fail_with = "TOKEN_IN_IS_INVALID")]
 unconstrained fn swap_exact_tokens_invalid_token_in() {
-    let (mut env, amm_address, _token0_address, token1_address, _liquidity_token_address, _minter)
-         = setup();
+    let (mut env, amm_address, _token0_address, token1_address, _liquidity_token_address, _minter) = setup();
 
     let swapper = env.create_contract_account();
     let amm = AMM::at(amm_address);
@@ -342,20 +301,13 @@ unconstrained fn swap_exact_tokens_invalid_token_in() {
 
     env.call_private(
         swapper,
-        amm.swap_exact_tokens_for_tokens(
-            invalid_token,
-            token1_address,
-            amount_in,
-            amount_out_min,
-            AUTHWIT_NONCE,
-        ),
+        amm.swap_exact_tokens_for_tokens(invalid_token, token1_address, amount_in, amount_out_min, AUTHWIT_NONCE),
     );
 }
 
 #[test(should_fail_with = "TOKEN_OUT_IS_INVALID")]
 unconstrained fn swap_exact_tokens_invalid_token_out() {
-    let (mut env, amm_address, token0_address, _token1_address, _liquidity_token_address, _minter)
-         = setup();
+    let (mut env, amm_address, token0_address, _token1_address, _liquidity_token_address, _minter) = setup();
 
     let swapper = env.create_contract_account();
     let amm = AMM::at(amm_address);
@@ -366,20 +318,13 @@ unconstrained fn swap_exact_tokens_invalid_token_out() {
 
     env.call_private(
         swapper,
-        amm.swap_exact_tokens_for_tokens(
-            token0_address,
-            invalid_token,
-            amount_in,
-            amount_out_min,
-            AUTHWIT_NONCE,
-        ),
+        amm.swap_exact_tokens_for_tokens(token0_address, invalid_token, amount_in, amount_out_min, AUTHWIT_NONCE),
     );
 }
 
 #[test(should_fail_with = "SAME_TOKEN_SWAP")]
 unconstrained fn swap_exact_tokens_same_tokens() {
-    let (mut env, amm_address, token0_address, _token1_address, _liquidity_token_address, _minter)
-         = setup();
+    let (mut env, amm_address, token0_address, _token1_address, _liquidity_token_address, _minter) = setup();
 
     let swapper = env.create_contract_account();
     let amm = AMM::at(amm_address);
@@ -401,8 +346,7 @@ unconstrained fn swap_exact_tokens_same_tokens() {
 
 #[test(should_fail_with = "TOKEN_IN_IS_INVALID")]
 unconstrained fn swap_tokens_for_exact_invalid_token_in() {
-    let (mut env, amm_address, _token0_address, token1_address, _liquidity_token_address, _minter)
-         = setup();
+    let (mut env, amm_address, _token0_address, token1_address, _liquidity_token_address, _minter) = setup();
 
     let swapper = env.create_contract_account();
     let amm = AMM::at(amm_address);
@@ -413,20 +357,13 @@ unconstrained fn swap_tokens_for_exact_invalid_token_in() {
 
     env.call_private(
         swapper,
-        amm.swap_tokens_for_exact_tokens(
-            invalid_token,
-            token1_address,
-            amount_out,
-            amount_in_max,
-            AUTHWIT_NONCE,
-        ),
+        amm.swap_tokens_for_exact_tokens(invalid_token, token1_address, amount_out, amount_in_max, AUTHWIT_NONCE),
     );
 }
 
 #[test(should_fail_with = "TOKEN_OUT_IS_INVALID")]
 unconstrained fn swap_tokens_for_exact_invalid_token_out() {
-    let (mut env, amm_address, token0_address, _token1_address, _liquidity_token_address, _minter)
-         = setup();
+    let (mut env, amm_address, token0_address, _token1_address, _liquidity_token_address, _minter) = setup();
 
     let swapper = env.create_contract_account();
     let amm = AMM::at(amm_address);
@@ -437,20 +374,13 @@ unconstrained fn swap_tokens_for_exact_invalid_token_out() {
 
     env.call_private(
         swapper,
-        amm.swap_tokens_for_exact_tokens(
-            token0_address,
-            invalid_token,
-            amount_out,
-            amount_in_max,
-            AUTHWIT_NONCE,
-        ),
+        amm.swap_tokens_for_exact_tokens(token0_address, invalid_token, amount_out, amount_in_max, AUTHWIT_NONCE),
     );
 }
 
 #[test(should_fail_with = "SAME_TOKEN_SWAP")]
 unconstrained fn swap_tokens_for_exact_same_tokens() {
-    let (mut env, amm_address, token0_address, _token1_address, _liquidity_token_address, _minter)
-         = setup();
+    let (mut env, amm_address, token0_address, _token1_address, _liquidity_token_address, _minter) = setup();
 
     let swapper = env.create_contract_account();
     let amm = AMM::at(amm_address);
@@ -472,8 +402,7 @@ unconstrained fn swap_tokens_for_exact_same_tokens() {
 
 #[test(should_fail_with = "INSUFFICIENT_LIQUIDITY_MINTED")]
 unconstrained fn add_liquidity_insufficient_liquidity_minted() {
-    let (mut env, amm_address, token0_address, token1_address, _liquidity_token_address, minter) =
-        setup();
+    let (mut env, amm_address, token0_address, token1_address, _liquidity_token_address, minter) = setup();
 
     let liquidity_provider_1 = env.create_contract_account();
     let liquidity_provider_2 = env.create_contract_account();
@@ -515,8 +444,7 @@ unconstrained fn add_liquidity_insufficient_liquidity_minted() {
 
 #[test(should_fail_with = "INSUFFICIENT_0_AMOUNT")]
 unconstrained fn remove_liquidity_insufficient_amount0() {
-    let (mut env, amm_address, token0_address, token1_address, liquidity_token_address, minter) =
-        setup();
+    let (mut env, amm_address, token0_address, token1_address, liquidity_token_address, minter) = setup();
 
     let liquidity_provider = env.create_contract_account();
 
@@ -555,8 +483,7 @@ unconstrained fn remove_liquidity_insufficient_amount0() {
 
 #[test(should_fail_with = "INSUFFICIENT_1_AMOUNT")]
 unconstrained fn remove_liquidity_insufficient_amount1() {
-    let (mut env, amm_address, token0_address, token1_address, liquidity_token_address, minter) =
-        setup();
+    let (mut env, amm_address, token0_address, token1_address, liquidity_token_address, minter) = setup();
 
     let liquidity_provider = env.create_contract_account();
 
diff --git a/noir-projects/noir-contracts/contracts/app/amm_contract/src/test/utils.nr b/noir-projects/noir-contracts/contracts/app/amm_contract/src/test/utils.nr
index a962c2ef1e1c..366de6b7e07e 100644
--- a/noir-projects/noir-contracts/contracts/app/amm_contract/src/test/utils.nr
+++ b/noir-projects/noir-contracts/contracts/app/amm_contract/src/test/utils.nr
@@ -16,38 +16,21 @@ pub(crate) unconstrained fn setup() -> (TestEnvironment, AztecAddress, AztecAddr
     let admin = env.create_contract_account();
 
     // Deploy tokens
-    let token0_initializer = Token::interface().constructor(
-        admin,
-        "Token00000000000000000000000000",
-        "TK00000000000000000000000000000",
-        18,
-    );
-    let token0_address =
-        env.deploy("@token_contract/Token").with_public_initializer(admin, token0_initializer);
-
-    let token1_initializer = Token::interface().constructor(
-        admin,
-        "Token11111111111111111111111111",
-        "TK11111111111111111111111111111",
-        18,
-    );
-    let token1_address =
-        env.deploy("@token_contract/Token").with_public_initializer(admin, token1_initializer);
-
-    let liquidity_token_initializer = Token::interface().constructor(
-        admin,
-        "LiquidityToken00000000000000000",
-        "LT00000000000000000000000000000",
-        18,
-    );
-    let liquidity_token_address = env.deploy("@token_contract/Token").with_public_initializer(
-        admin,
-        liquidity_token_initializer,
-    );
+    let token0_initializer =
+        Token::interface().constructor(admin, "Token00000000000000000000000000", "TK00000000000000000000000000000", 18);
+    let token0_address = env.deploy("@token_contract/Token").with_public_initializer(admin, token0_initializer);
+
+    let token1_initializer =
+        Token::interface().constructor(admin, "Token11111111111111111111111111", "TK11111111111111111111111111111", 18);
+    let token1_address = env.deploy("@token_contract/Token").with_public_initializer(admin, token1_initializer);
+
+    let liquidity_token_initializer =
+        Token::interface().constructor(admin, "LiquidityToken00000000000000000", "LT00000000000000000000000000000", 18);
+    let liquidity_token_address =
+        env.deploy("@token_contract/Token").with_public_initializer(admin, liquidity_token_initializer);
 
     // Deploy AMM contract
-    let amm_initializer =
-        AMM::interface().constructor(token0_address, token1_address, liquidity_token_address);
+    let amm_initializer = AMM::interface().constructor(token0_address, token1_address, liquidity_token_address);
     let amm_address = env.deploy("AMM").with_public_initializer(admin, amm_initializer);
 
     // Set AMM as minter for liquidity token
@@ -114,12 +97,8 @@ pub(crate) unconstrained fn remove_liquidity(
     let liquidity_token = Token::at(liquidity_token_address);
     let amm = AMM::at(amm_address);
 
-    let transfer_liquidity_call = liquidity_token.transfer_to_public(
-        liquidity_provider,
-        amm_address,
-        liquidity_amount,
-        AUTHWIT_NONCE,
-    );
+    let transfer_liquidity_call =
+        liquidity_token.transfer_to_public(liquidity_provider, amm_address, liquidity_amount, AUTHWIT_NONCE);
     add_private_authwit_from_call(
         env,
         liquidity_provider,
@@ -127,8 +106,5 @@ pub(crate) unconstrained fn remove_liquidity(
         transfer_liquidity_call,
     );
 
-    env.call_private(
-        liquidity_provider,
-        amm.remove_liquidity(liquidity_amount, amount0_min, amount1_min, AUTHWIT_NONCE),
-    );
+    env.call_private(liquidity_provider, amm.remove_liquidity(liquidity_amount, amount0_min, amount1_min, AUTHWIT_NONCE));
 }
diff --git a/noir-projects/noir-contracts/contracts/app/app_subscription_contract/src/dapp_payload.nr b/noir-projects/noir-contracts/contracts/app/app_subscription_contract/src/dapp_payload.nr
index 69d31c7a7dbf..ddfca613a786 100644
--- a/noir-projects/noir-contracts/contracts/app/app_subscription_contract/src/dapp_payload.nr
+++ b/noir-projects/noir-contracts/contracts/app/app_subscription_contract/src/dapp_payload.nr
@@ -5,7 +5,7 @@ use aztec::{
         address::AztecAddress,
         constants::DOM_SEP__SIGNATURE_PAYLOAD,
         hash::poseidon2_hash_with_separator,
-        traits::{Hash, Serialize},
+        traits::{Deserialize, Hash, Serialize},
     },
 };
 use std::meta::derive;
@@ -13,7 +13,7 @@ use std::meta::derive;
 global DAPP_MAX_CALLS: u32 = 1;
 
 // @dev: If you change the following struct you have to update default_entrypoint.ts
-#[derive(Serialize)]
+#[derive(Deserialize, Serialize)]
 pub struct DAppPayload {
     function_calls: [FunctionCall; DAPP_MAX_CALLS],
     // A nonce that enables transaction cancellation. When the cancellable flag is enabled, this nonce is used to
diff --git a/noir-projects/noir-contracts/contracts/app/app_subscription_contract/src/main.nr b/noir-projects/noir-contracts/contracts/app/app_subscription_contract/src/main.nr
index 2bf539b44498..af16e92c3dbd 100644
--- a/noir-projects/noir-contracts/contracts/app/app_subscription_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/app/app_subscription_contract/src/main.nr
@@ -32,7 +32,8 @@ use aztec::macros::aztec;
 ///
 /// ## Usage Pattern
 ///
-/// 1. **Contract Deployment**: Deploy with target contract address, recipient address, token address, price, and gas limits
+/// 1. **Contract Deployment**: Deploy with target contract address, recipient address, token address, price, and gas
+/// limits
 /// 2. **User Subscription**: Users call `subscribe()` with payment and subscription parameters
 /// 3. **DApp Interface**: Users interact with target contracts through `DefaultDappInterface`
 /// 4. **Entrypoint Validation**: Each call goes through `entrypoint()` which validates subscription status
@@ -133,12 +134,7 @@ pub contract AppSubscription {
     }
 
     #[external("private")]
-    fn subscribe(
-        subscriber: AztecAddress,
-        authwit_nonce: Field,
-        expiry_block_number: u32,
-        tx_count: u32,
-    ) {
+    fn subscribe(subscriber: AztecAddress, authwit_nonce: Field, expiry_block_number: u32, tx_count: u32) {
         assert(tx_count <= SUBSCRIPTION_TXS);
 
         let config = self.storage.config.read();
@@ -162,9 +158,7 @@ pub contract AppSubscription {
             .storage
             .subscriptions
             .at(subscriber)
-            .initialize_or_replace(|_| {
-                SubscriptionNote { expiry_block_number, remaining_txs: tx_count }
-            })
+            .initialize_or_replace(|_| SubscriptionNote { expiry_block_number, remaining_txs: tx_count })
             .deliver(MessageDelivery.ONCHAIN_CONSTRAINED);
         // docs:end:owned_private_mutable_initialize
     }
diff --git a/noir-projects/noir-contracts/contracts/app/auth_contract/src/main.nr b/noir-projects/noir-contracts/contracts/app/auth_contract/src/main.nr
index f741d1ca870f..b56848fd781d 100644
--- a/noir-projects/noir-contracts/contracts/app/auth_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/app/auth_contract/src/main.nr
@@ -1,6 +1,7 @@
 mod test;
 
-// Test contract showing basic public access control that can be used in private. It uses a DelayedPublicMutable state variable to
+// Test contract showing basic public access control that can be used in private. It uses a DelayedPublicMutable state
+// variable to
 // publicly store the address of an authorized account that can call private functions.
 use aztec::macros::aztec;
 
diff --git a/noir-projects/noir-contracts/contracts/app/auth_contract/src/test.nr b/noir-projects/noir-contracts/contracts/app/auth_contract/src/test.nr
index 4941ca024293..5f7e0a10975b 100644
--- a/noir-projects/noir-contracts/contracts/app/auth_contract/src/test.nr
+++ b/noir-projects/noir-contracts/contracts/app/auth_contract/src/test.nr
@@ -47,8 +47,7 @@ unconstrained fn admin_can_schedule_set_authorized() {
 
     env.call_public(admin, auth.set_authorized(to_authorize));
 
-    let (scheduled_authorized, timestamp_of_change) =
-        env.view_public(auth.get_scheduled_authorized());
+    let (scheduled_authorized, timestamp_of_change) = env.view_public(auth.get_scheduled_authorized());
     assert_eq(scheduled_authorized, to_authorize);
     assert_eq(timestamp_of_change, env.last_block_timestamp() + Auth::CHANGE_AUTHORIZED_DELAY);
 }
diff --git a/noir-projects/noir-contracts/contracts/app/card_game_contract/src/cards.nr b/noir-projects/noir-contracts/contracts/app/card_game_contract/src/cards.nr
index d7cb22c0edfe..1886bf121746 100644
--- a/noir-projects/noir-contracts/contracts/app/card_game_contract/src/cards.nr
+++ b/noir-projects/noir-contracts/contracts/app/card_game_contract/src/cards.nr
@@ -9,14 +9,14 @@ use aztec::{
     protocol::{
         address::AztecAddress,
         constants::MAX_NOTE_HASH_READ_REQUESTS_PER_CALL,
-        traits::{FromField, Hash, Packable, Serialize, ToField},
+        traits::{Deserialize, FromField, Hash, Packable, Serialize, ToField},
     },
     state_vars::{Owned, PrivateSet, StateVariable},
 };
 use field_note::FieldNote;
 use std::meta::derive;
 
-#[derive(Serialize)]
+#[derive(Serialize, Deserialize)]
 pub struct Card {
     // We use u32s since u16s are unsupported
     pub strength: u32,
@@ -93,11 +93,6 @@ pub struct CardNote {
 }
 
 impl CardNote {
-    fn new(strength: u32, points: u32) -> Self {
-        let card = Card { strength, points };
-        CardNote::from_card(card)
-    }
-
     pub fn from_card(card: Card) -> CardNote {
         CardNote { card, note: FieldNote { value: card.to_field() } }
     }
@@ -160,9 +155,7 @@ impl Deck<&mut PrivateContext> {
         let mut inserted_cards = @[];
         for card in cards {
             let card_note = CardNote::from_card(card);
-            self.owned_set.at(owner).insert(card_note.note).deliver(
-                MessageDelivery.ONCHAIN_CONSTRAINED,
-            );
+            self.owned_set.at(owner).insert(card_note.note).deliver(MessageDelivery.ONCHAIN_CONSTRAINED);
             inserted_cards = inserted_cards.push_back(card_note);
         }
 
@@ -177,11 +170,7 @@ impl Deck<&mut PrivateContext> {
 }
 
 impl Deck<UtilityContext> {
-    pub unconstrained fn view_cards(
-        self,
-        owner: AztecAddress,
-        offset: u32,
-    ) -> BoundedVec<Card, MAX_NOTES_PER_PAGE> {
+    pub unconstrained fn view_cards(self, owner: AztecAddress, offset: u32) -> BoundedVec<Card, MAX_NOTES_PER_PAGE> {
         let options = NoteViewerOptions::new().set_offset(offset);
         let notes = self.owned_set.at(owner).view_notes(options);
 
@@ -191,11 +180,7 @@ impl Deck<UtilityContext> {
 
 global PACK_CARDS: u32 = 3; // Limited by number of write requests (max 4)
 
-pub fn get_pack_cards(
-    seed: Field,
-    owner: AztecAddress,
-    context: &mut PrivateContext,
-) -> [Card; PACK_CARDS] {
+pub fn get_pack_cards(seed: Field, owner: AztecAddress, context: &mut PrivateContext) -> [Card; PACK_CARDS] {
     let owner_npk_m_hash = get_public_keys(owner).npk_m.hash();
 
     // generate pseudo randomness deterministically from 'seed' and user secret
diff --git a/noir-projects/noir-contracts/contracts/app/card_game_contract/src/game.nr b/noir-projects/noir-contracts/contracts/app/card_game_contract/src/game.nr
index ea1bbd90104d..c087dbf4e5ff 100644
--- a/noir-projects/noir-contracts/contracts/app/card_game_contract/src/game.nr
+++ b/noir-projects/noir-contracts/contracts/app/card_game_contract/src/game.nr
@@ -1,11 +1,11 @@
 use crate::cards::Card;
-use aztec::protocol::{address::AztecAddress, traits::{Deserialize, FromField, Packable, ToField}};
+use aztec::protocol::{address::AztecAddress, traits::{Deserialize, FromField, Packable, Serialize, ToField}};
 use std::meta::derive;
 
 global NUMBER_OF_PLAYERS: u32 = 2;
 global NUMBER_OF_CARDS_DECK: u32 = 2;
 
-#[derive(Deserialize, Eq)]
+#[derive(Serialize, Deserialize, Eq)]
 pub struct PlayerEntry {
     pub address: AztecAddress,
     pub deck_strength: u32,
@@ -16,10 +16,7 @@ impl Packable for PlayerEntry {
     let N: u32 = 2;
 
     fn pack(self) -> [Field; Self::N] {
-        [
-            self.address.to_field(),
-            (self.deck_strength as Field) * 2.pow_32(64) + (self.points as Field),
-        ]
+        [self.address.to_field(), (self.deck_strength as Field) * 2.pow_32(64) + (self.points as Field)]
     }
 
     fn unpack(packed: [Field; Self::N]) -> Self {
@@ -38,6 +35,7 @@ impl PlayerEntry {
 
 pub global PLAYABLE_CARDS: u32 = 4;
 
+#[derive(Serialize, Deserialize)]
 pub struct Game {
     players: [PlayerEntry; NUMBER_OF_PLAYERS],
     pub rounds_cards: [Card; PLAYABLE_CARDS],
@@ -130,9 +128,8 @@ impl Game {
             let entry = self.players[i];
             assert(entry.is_initialized(), "Game not full");
         }
-        let sorted_by_deck_strength = self.players.sort_via(|a: PlayerEntry, b: PlayerEntry| {
-            a.deck_strength < b.deck_strength
-        });
+        let sorted_by_deck_strength =
+            self.players.sort_via(|a: PlayerEntry, b: PlayerEntry| a.deck_strength < b.deck_strength);
         self.players = sorted_by_deck_strength;
         self.started = true;
     }
@@ -199,11 +196,7 @@ mod test {
 
     #[test]
     fn test_pack_unpack_player_entry() {
-        let entry = PlayerEntry {
-            address: AztecAddress::from_field(0xdeadbeef),
-            deck_strength: 999,
-            points: 12345678,
-        };
+        let entry = PlayerEntry { address: AztecAddress::from_field(0xdeadbeef), deck_strength: 999, points: 12345678 };
         let unpacked = PlayerEntry::unpack(entry.pack());
         assert(unpacked.address.eq(entry.address));
         assert_eq(unpacked.deck_strength, entry.deck_strength);
@@ -212,8 +205,7 @@ mod test {
 
     #[test]
     fn test_pack_unpack_player_entry_zeros() {
-        let entry =
-            PlayerEntry { address: AztecAddress::from_field(0), deck_strength: 0, points: 0 };
+        let entry = PlayerEntry { address: AztecAddress::from_field(0), deck_strength: 0, points: 0 };
         let unpacked = PlayerEntry::unpack(entry.pack());
         assert(unpacked.address.eq(entry.address));
         assert_eq(unpacked.deck_strength, 0);
@@ -224,16 +216,8 @@ mod test {
     fn test_pack_unpack_game() {
         let game = Game {
             players: [
-                PlayerEntry {
-                    address: AztecAddress::from_field(1),
-                    deck_strength: 100,
-                    points: 50,
-                },
-                PlayerEntry {
-                    address: AztecAddress::from_field(2),
-                    deck_strength: 200,
-                    points: 75,
-                },
+                PlayerEntry { address: AztecAddress::from_field(1), deck_strength: 100, points: 50 },
+                PlayerEntry { address: AztecAddress::from_field(2), deck_strength: 200, points: 75 },
             ],
             rounds_cards: [
                 Card { strength: 10, points: 5 },
diff --git a/noir-projects/noir-contracts/contracts/app/card_game_contract/src/main.nr b/noir-projects/noir-contracts/contracts/app/card_game_contract/src/main.nr
index bcb4fadca991..51d24164a2b4 100644
--- a/noir-projects/noir-contracts/contracts/app/card_game_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/app/card_game_contract/src/main.nr
@@ -55,10 +55,7 @@ pub contract CardGame {
         let game_storage = self.storage.games.at(game as Field);
 
         let mut game_data = game_storage.read();
-        assert(
-            game_data.add_player(PlayerEntry { address: player, deck_strength, points: 0 }),
-            "Game full",
-        );
+        assert(game_data.add_player(PlayerEntry { address: player, deck_strength, points: 0 }), "Game full");
 
         game_storage.write(game_data);
     }
@@ -116,10 +113,7 @@ pub contract CardGame {
         assert(!game_data.claimed, "Already claimed");
         game_data.claimed = true;
 
-        assert_eq(
-            cards_hash,
-            poseidon2_hash(game_data.rounds_cards.map(|card: Card| card.to_field())),
-        );
+        assert_eq(cards_hash, poseidon2_hash(game_data.rounds_cards.map(|card: Card| card.to_field())));
 
         let winner = game_data.winner();
         assert(player.eq(winner.address), "Not the winner");
@@ -128,10 +122,7 @@ pub contract CardGame {
     }
 
     #[external("utility")]
-    unconstrained fn view_collection_cards(
-        owner: AztecAddress,
-        offset: u32,
-    ) -> BoundedVec<Card, MAX_NOTES_PER_PAGE> {
+    unconstrained fn view_collection_cards(owner: AztecAddress, offset: u32) -> BoundedVec<Card, MAX_NOTES_PER_PAGE> {
         let collection = self.storage.collections;
         collection.view_cards(owner, offset)
     }
diff --git a/noir-projects/noir-contracts/contracts/app/claim_contract/src/main.nr b/noir-projects/noir-contracts/contracts/app/claim_contract/src/main.nr
index 4a54aac54faa..8ccefb25178f 100644
--- a/noir-projects/noir-contracts/contracts/app/claim_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/app/claim_contract/src/main.nr
@@ -65,19 +65,10 @@ pub contract Claim {
         // know the note is settled, and hence its note hash unique). This is not the same thing as nullifying the note
         // however, which can only be done from the contract that emitted the note. From the point of view of the
         // Crowdfunding contract, the note is still active.
-        let note_hash_for_nullification =
-            compute_confirmed_note_hash_for_nullification(confirmed_note);
-        self
-            .storage
-            .note_hash_claims
-            .at(note_hash_for_nullification)
-            .at(confirmed_note.owner)
-            .claim();
+        let note_hash_for_nullification = compute_confirmed_note_hash_for_nullification(confirmed_note);
+        self.storage.note_hash_claims.at(note_hash_for_nullification).at(confirmed_note.owner).claim();
 
         // 5) Finally we mint the reward token to the requested recipient
-        self.enqueue(Token::at(config.reward_token).mint_to_public(
-            recipient,
-            confirmed_note.note.value,
-        ));
+        self.enqueue(Token::at(config.reward_token).mint_to_public(recipient, confirmed_note.note.value));
     }
 }
diff --git a/noir-projects/noir-contracts/contracts/app/crowdfunding_contract/src/main.nr b/noir-projects/noir-contracts/contracts/app/crowdfunding_contract/src/main.nr
index b5642c9776bd..57a3f78bcad2 100644
--- a/noir-projects/noir-contracts/contracts/app/crowdfunding_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/app/crowdfunding_contract/src/main.nr
@@ -41,7 +41,8 @@ pub contract Crowdfunding {
     fn donate(amount: u128) {
         let config = self.storage.config.read();
 
-        // 1) Check that the deadline has not passed --> we do that via the public checks contract to conceal which contract
+        // 1) Check that the deadline has not passed --> we do that via the public checks contract to conceal which
+        // contract
         // is performing the check.
         // docs:start:call-check-deadline
         privately_check_timestamp(Comparator.LT, config.deadline, self.context);
@@ -49,9 +50,7 @@ pub contract Crowdfunding {
 
         // 2) Transfer the donation tokens from donor to this contract
         let donor = self.msg_sender();
-        Token::at(config.donation_token).transfer_in_private(donor, self.address, amount, 0).call(
-            self.context,
-        );
+        Token::at(config.donation_token).transfer_in_private(donor, self.address, amount, 0).call(self.context);
 
         // 3) Create a value note for the donor so that he can later on claim a rewards token in the Claim
         // contract by proving that the hash of this note exists in the note hash tree.
@@ -59,9 +58,7 @@ pub contract Crowdfunding {
 
         // We don't constrain encryption because the donor is sending the note to himself. And hence by performing
         // encryption incorrectly would harm himself only.
-        self.storage.donation_receipts.at(donor).insert(note).deliver(
-            MessageDelivery.ONCHAIN_UNCONSTRAINED,
-        );
+        self.storage.donation_receipts.at(donor).insert(note).deliver(MessageDelivery.ONCHAIN_UNCONSTRAINED);
     }
 
     // Withdraws balance to the operator. Requires that msg_sender() is the operator.
diff --git a/noir-projects/noir-contracts/contracts/app/lending_contract/src/asset.nr b/noir-projects/noir-contracts/contracts/app/lending_contract/src/asset.nr
index dbd2f752e62d..39fd17db8043 100644
--- a/noir-projects/noir-contracts/contracts/app/lending_contract/src/asset.nr
+++ b/noir-projects/noir-contracts/contracts/app/lending_contract/src/asset.nr
@@ -1,7 +1,4 @@
-use aztec::protocol::{
-    address::AztecAddress,
-    traits::{Deserialize, FromField, Packable, Serialize, ToField},
-};
+use aztec::protocol::{address::AztecAddress, traits::{Deserialize, FromField, Packable, Serialize, ToField}};
 use std::meta::derive;
 
 /// Struct to be used to represent "totals". Generally, there should be one per Asset.
diff --git a/noir-projects/noir-contracts/contracts/app/lending_contract/src/helpers.nr b/noir-projects/noir-contracts/contracts/app/lending_contract/src/helpers.nr
index f9f91925f938..e2d3ab41d8b3 100644
--- a/noir-projects/noir-contracts/contracts/app/lending_contract/src/helpers.nr
+++ b/noir-projects/noir-contracts/contracts/app/lending_contract/src/helpers.nr
@@ -46,12 +46,7 @@ fn div_up(a: u128, b: u128) -> u128 {
     }
 }
 
-pub fn debt_updates(
-    interest_accumulator: u128,
-    static_debt: u128,
-    increase: u128,
-    decrease: u128,
-) -> DebtReturn {
+pub fn debt_updates(interest_accumulator: u128, static_debt: u128, increase: u128, decrease: u128) -> DebtReturn {
     assert(interest_accumulator > (0 as u128));
     let accumulator_precision = 1000000000 as u128;
 
diff --git a/noir-projects/noir-contracts/contracts/app/lending_contract/src/main.nr b/noir-projects/noir-contracts/contracts/app/lending_contract/src/main.nr
index 6a6bb738c4b2..d1788b25d0d5 100644
--- a/noir-projects/noir-contracts/contracts/app/lending_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/app/lending_contract/src/main.nr
@@ -45,12 +45,7 @@ pub contract Lending {
     fn constructor() {}
 
     #[external("public")]
-    fn init(
-        oracle: AztecAddress,
-        loan_to_value: u128,
-        collateral_asset: AztecAddress,
-        stable_coin: AztecAddress,
-    ) {
+    fn init(oracle: AztecAddress, loan_to_value: u128, collateral_asset: AztecAddress, stable_coin: AztecAddress) {
         let asset_loc = self.storage.assets.at(0);
         let asset: Asset = asset_loc.read();
 
@@ -62,14 +57,7 @@ pub contract Lending {
 
         let last_updated_ts = self.context.timestamp();
 
-        asset_loc.write(
-            Asset {
-                interest_accumulator: 1000000000 as u128,
-                last_updated_ts,
-                loan_to_value,
-                oracle,
-            },
-        );
+        asset_loc.write(Asset { interest_accumulator: 1000000000 as u128, last_updated_ts, loan_to_value, oracle });
         // docs:start:public_mutable_write
         self.storage.collateral_asset.write(collateral_asset);
         // docs:end:public_mutable_write
@@ -112,35 +100,21 @@ pub contract Lending {
         collateral_asset: AztecAddress,
     ) {
         let on_behalf_of = compute_identifier(secret, on_behalf_of, self.msg_sender().to_field());
-        let _res = self.call(Token::at(collateral_asset).transfer_to_public(
-            from,
-            self.address,
-            amount,
-            authwit_nonce,
-        ));
+        let _res = self.call(Token::at(collateral_asset).transfer_to_public(from, self.address, amount, authwit_nonce));
         // docs:start:enqueue_public
         self.enqueue_self._deposit(AztecAddress::from_field(on_behalf_of), amount, collateral_asset);
         // docs:end:enqueue_public
     }
 
     #[external("public")]
-    fn deposit_public(
-        amount: u128,
-        authwit_nonce: Field,
-        on_behalf_of: Field,
-        collateral_asset: AztecAddress,
-    ) {
+    fn deposit_public(amount: u128, authwit_nonce: Field, on_behalf_of: Field, collateral_asset: AztecAddress) {
         let _ = self.call(Token::at(collateral_asset).transfer_in_public(
             self.msg_sender(),
             self.address,
             amount,
             authwit_nonce,
         ));
-        let _ = self.call_self._deposit(
-            AztecAddress::from_field(on_behalf_of),
-            amount,
-            collateral_asset,
-        );
+        let _ = self.call_self._deposit(AztecAddress::from_field(on_behalf_of), amount, collateral_asset);
     }
 
     #[external("public")]
@@ -181,8 +155,7 @@ pub contract Lending {
 
         // debt_covered will revert if decrease would leave insufficient collateral to cover debt.
         // or trying to remove more collateral than available
-        let debt_covered =
-            covered_by_collateral(price, asset.loan_to_value, collateral, 0 as u128, amount);
+        let debt_covered = covered_by_collateral(price, asset.loan_to_value, collateral, 0 as u128, amount);
         let debt_returns = debt_updates(
             asset.interest_accumulator,
             static_debt,
@@ -196,12 +169,7 @@ pub contract Lending {
 
         // @todo @LHerskind Support both shielding and transfers (for now just transfer)
         let collateral_asset = self.storage.collateral_asset.read();
-        let _ = self.call(Token::at(collateral_asset).transfer_in_public(
-            self.address,
-            recipient,
-            amount,
-            0,
-        ));
+        let _ = self.call(Token::at(collateral_asset).transfer_in_public(self.address, recipient, amount, 0));
     }
 
     #[external("private")]
@@ -225,8 +193,7 @@ pub contract Lending {
         let collateral = self.storage.collateral.at(owner).read();
         let static_debt = self.storage.static_debt.at(owner).read();
 
-        let debt_covered =
-            covered_by_collateral(price, asset.loan_to_value, collateral, 0 as u128, 0 as u128);
+        let debt_covered = covered_by_collateral(price, asset.loan_to_value, collateral, 0 as u128, 0 as u128);
         let debt_returns = debt_updates(asset.interest_accumulator, static_debt, amount, 0 as u128);
 
         assert(debt_returns.debt_value < debt_covered);
@@ -255,14 +222,8 @@ pub contract Lending {
     }
 
     #[external("public")]
-    fn repay_public(
-        amount: u128,
-        authwit_nonce: Field,
-        owner: AztecAddress,
-        stable_coin: AztecAddress,
-    ) {
-        let _ =
-            self.call(Token::at(stable_coin).burn_public(self.msg_sender(), amount, authwit_nonce));
+    fn repay_public(amount: u128, authwit_nonce: Field, owner: AztecAddress, stable_coin: AztecAddress) {
+        let _ = self.call(Token::at(stable_coin).burn_public(self.msg_sender(), amount, authwit_nonce));
         let _ = self.call_self._repay(owner, amount, stable_coin);
     }
 
diff --git a/noir-projects/noir-contracts/contracts/app/nft_contract/src/main.nr b/noir-projects/noir-contracts/contracts/app/nft_contract/src/main.nr
index 5ef30d0c3263..f8c5a2f4b816 100644
--- a/noir-projects/noir-contracts/contracts/app/nft_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/app/nft_contract/src/main.nr
@@ -10,14 +10,11 @@ pub contract NFT {
     use crate::types::nft_note::{NFTNote, PartialNFTNote};
     use aztec::{
         authwit::auth::compute_authwit_nullifier,
-        macros::{
-            functions::{authorize_once, external, initializer, internal, only_self, view},
-            storage::storage,
-        },
+        macros::{functions::{authorize_once, external, initializer, internal, only_self, view}, storage::storage},
         messages::message_delivery::MessageDelivery,
         note::{
-            constants::MAX_NOTES_PER_PAGE, note_getter_options::NoteGetterOptions,
-            note_interface::NoteProperties, note_viewer_options::NoteViewerOptions,
+            constants::MAX_NOTES_PER_PAGE, note_getter_options::NoteGetterOptions, note_interface::NoteProperties,
+            note_viewer_options::NoteViewerOptions,
         },
         protocol::{address::AztecAddress, traits::ToField},
         state_vars::{Map, Owned, PrivateSet, PublicImmutable, PublicMutable, StateVariable},
@@ -123,12 +120,7 @@ pub contract NFT {
 
     #[authorize_once("from", "authwit_nonce")]
     #[external("public")]
-    fn transfer_in_public(
-        from: AztecAddress,
-        to: AztecAddress,
-        token_id: Field,
-        authwit_nonce: Field,
-    ) {
+    fn transfer_in_public(from: AztecAddress, to: AztecAddress, token_id: Field, authwit_nonce: Field) {
         let public_owners_storage = self.storage.public_owners.at(token_id);
         assert(public_owners_storage.read().eq(from), "invalid owner");
 
@@ -195,11 +187,7 @@ pub contract NFT {
     // In all the flows in this contract, `from` (the account from which we're transferring the NFT) and `completer`
     // (the entity that can complete the partial note) are the same so we represent them with a single argument.
     #[internal("public")]
-    fn _finalize_transfer_to_private(
-        from_and_completer: AztecAddress,
-        token_id: Field,
-        partial_note: PartialNFTNote,
-    ) {
+    fn _finalize_transfer_to_private(from_and_completer: AztecAddress, token_id: Field, partial_note: PartialNFTNote) {
         let public_owners_storage = self.storage.public_owners.at(token_id);
         assert(public_owners_storage.read().eq(from_and_completer), "invalid NFT owner");
 
@@ -207,18 +195,11 @@ pub contract NFT {
         public_owners_storage.write(AztecAddress::zero());
 
         // We finalize the transfer by completing the partial note.
-        partial_note.complete(
-            self.context,
-            from_and_completer,
-            self.storage.private_nfts.get_storage_slot(),
-            token_id,
-        );
+        partial_note.complete(self.context, from_and_completer, self.storage.private_nfts.get_storage_slot(), token_id);
     }
 
-    /**
-     * Cancel a private authentication witness.
-     * @param inner_hash The inner hash of the authwit to cancel.
-     */
+    /// Cancel a private authentication witness.
+    /// @param inner_hash The inner hash of the authwit to cancel.
     #[external("private")]
     fn cancel_authwit(inner_hash: Field) {
         let on_behalf_of = self.msg_sender();
@@ -228,12 +209,7 @@ pub contract NFT {
 
     #[authorize_once("from", "authwit_nonce")]
     #[external("private")]
-    fn transfer_in_private(
-        from: AztecAddress,
-        to: AztecAddress,
-        token_id: Field,
-        authwit_nonce: Field,
-    ) {
+    fn transfer_in_private(from: AztecAddress, to: AztecAddress, token_id: Field, authwit_nonce: Field) {
         let nfts = self.storage.private_nfts;
 
         // docs:start:pop_notes
@@ -250,12 +226,7 @@ pub contract NFT {
 
     #[authorize_once("from", "authwit_nonce")]
     #[external("private")]
-    fn transfer_to_public(
-        from: AztecAddress,
-        to: AztecAddress,
-        token_id: Field,
-        authwit_nonce: Field,
-    ) {
+    fn transfer_to_public(from: AztecAddress, to: AztecAddress, token_id: Field, authwit_nonce: Field) {
         let notes = self.storage.private_nfts.at(from).pop_notes(NoteGetterOptions::new()
             .select(NFTNote::properties().token_id, Comparator.EQ, token_id)
             .set_limit(1));
@@ -283,10 +254,7 @@ pub contract NFT {
     /// values for non-existing notes.
     // docs:start:view_notes
     #[external("utility")]
-    unconstrained fn get_private_nfts(
-        owner: AztecAddress,
-        page_index: u32,
-    ) -> ([Field; MAX_NOTES_PER_PAGE], bool) {
+    unconstrained fn get_private_nfts(owner: AztecAddress, page_index: u32) -> ([Field; MAX_NOTES_PER_PAGE], bool) {
         let offset = page_index * MAX_NOTES_PER_PAGE;
         let options = NoteViewerOptions::new().set_offset(offset);
         let notes = self.storage.private_nfts.at(owner).view_notes(options);
diff --git a/noir-projects/noir-contracts/contracts/app/nft_contract/src/test/access_control.nr b/noir-projects/noir-contracts/contracts/app/nft_contract/src/test/access_control.nr
index 432f0c197e30..5536ebfb2a37 100644
--- a/noir-projects/noir-contracts/contracts/app/nft_contract/src/test/access_control.nr
+++ b/noir-projects/noir-contracts/contracts/app/nft_contract/src/test/access_control.nr
@@ -5,8 +5,7 @@ use aztec::protocol::traits::ToField;
 #[test]
 unconstrained fn access_control() {
     // Setup without account contracts. We are not using authwits here, so dummy accounts are enough
-    let (env, nft_contract_address, owner, new_admin) =
-        utils::setup(/* with_account_contracts */ false);
+    let (env, nft_contract_address, owner, new_admin) = utils::setup(/* with_account_contracts */ false);
 
     let nft = NFT::at(nft_contract_address);
 
diff --git a/noir-projects/noir-contracts/contracts/app/nft_contract/src/test/transfer_in_private.nr b/noir-projects/noir-contracts/contracts/app/nft_contract/src/test/transfer_in_private.nr
index bde1f756266b..4c6344583d9c 100644
--- a/noir-projects/noir-contracts/contracts/app/nft_contract/src/test/transfer_in_private.nr
+++ b/noir-projects/noir-contracts/contracts/app/nft_contract/src/test/transfer_in_private.nr
@@ -10,10 +10,7 @@ unconstrained fn transfer_in_private() {
         utils::setup_mint_and_transfer_to_private(/* with_account_contracts */ false);
 
     // Transfer the NFT to the recipient
-    env.call_private(
-        sender,
-        NFT::at(nft_contract_address).transfer_in_private(sender, recipient, token_id, 0),
-    );
+    env.call_private(sender, NFT::at(nft_contract_address).transfer_in_private(sender, recipient, token_id, 0));
 
     // Recipient should have the note in their private nfts
     utils::assert_owns_private_nft(env, nft_contract_address, recipient, token_id);
@@ -26,10 +23,7 @@ unconstrained fn transfer_in_private_to_self() {
         utils::setup_mint_and_transfer_to_private(/* with_account_contracts */ false);
 
     // Transfer the NFT back to the owner
-    env.call_private(
-        owner,
-        NFT::at(nft_contract_address).transfer_in_private(owner, owner, token_id, 0),
-    );
+    env.call_private(owner, NFT::at(nft_contract_address).transfer_in_private(owner, owner, token_id, 0));
 
     // NFT owner should stay the same
     utils::assert_owns_private_nft(env, nft_contract_address, owner, token_id);
@@ -43,10 +37,7 @@ unconstrained fn transfer_in_private_to_non_deployed_account() {
     let not_deployed = env.create_light_account();
 
     // Transfer the NFT to the recipient
-    env.call_private(
-        sender,
-        NFT::at(nft_contract_address).transfer_in_private(sender, not_deployed, token_id, 0),
-    );
+    env.call_private(sender, NFT::at(nft_contract_address).transfer_in_private(sender, not_deployed, token_id, 0));
 
     // Owner of the private NFT should be the not_deployed account
     utils::assert_owns_private_nft(env, nft_contract_address, not_deployed, token_id);
@@ -59,8 +50,7 @@ unconstrained fn transfer_in_private_on_behalf_of_other() {
         utils::setup_mint_and_transfer_to_private_with_proxy();
 
     // Transfer the NFT to the recipient
-    let transfer_in_private_call =
-        NFT::at(nft_contract_address).transfer_in_private(sender, recipient, token_id, 1);
+    let transfer_in_private_call = NFT::at(nft_contract_address).transfer_in_private(sender, recipient, token_id, 1);
     add_private_authwit_from_call(env, sender, proxy, transfer_in_private_call);
 
     // Transfer the NFT to the recipient
@@ -83,10 +73,7 @@ unconstrained fn transfer_in_private_failure_not_an_owner() {
     let (env, nft_contract_address, owner, not_owner, token_id) =
         utils::setup_mint_and_transfer_to_private(/* with_account_contracts */ false);
 
-    env.call_private(
-        not_owner,
-        NFT::at(nft_contract_address).transfer_in_private(not_owner, owner, token_id, 0),
-    );
+    env.call_private(not_owner, NFT::at(nft_contract_address).transfer_in_private(not_owner, owner, token_id, 0));
 }
 
 #[test(should_fail_with = "Assertion failed: Invalid authwit nonce. When 'from' and 'msg_sender' are the same, 'authwit_nonce' must be zero")]
@@ -94,17 +81,13 @@ unconstrained fn transfer_in_private_failure_on_behalf_of_self_non_zero_nonce()
     // Setup without account contracts. We are not using authwits here, so dummy accounts are enough.
     // The authwit nonce check is in the beginning so we don't need to waste time on minting the NFT and transferring
     // it to private.
-    let (env, nft_contract_address, sender, recipient) =
-        utils::setup(/* with_account_contracts */ false);
+    let (env, nft_contract_address, sender, recipient) = utils::setup(/* with_account_contracts */ false);
 
     // We set random value for the token_id as the authwit nonce check is before we use the value.
     let token_id = random();
 
     // Try transferring the NFT
-    env.call_private(
-        sender,
-        NFT::at(nft_contract_address).transfer_in_private(sender, recipient, token_id, 1),
-    );
+    env.call_private(sender, NFT::at(nft_contract_address).transfer_in_private(sender, recipient, token_id, 1));
 }
 
 #[test(should_fail_with = "Unknown auth witness for message hash")]
@@ -118,8 +101,7 @@ unconstrained fn transfer_in_private_failure_on_behalf_of_other_without_approval
     let token_id = random();
 
     // Try transferring the NFT
-    let transfer_in_private_call =
-        NFT::at(nft_contract_address).transfer_in_private(sender, recipient, token_id, 1);
+    let transfer_in_private_call = NFT::at(nft_contract_address).transfer_in_private(sender, recipient, token_id, 1);
     env.call_private(
         sender,
         GenericProxy::at(proxy).forward_private_4(
diff --git a/noir-projects/noir-contracts/contracts/app/nft_contract/src/test/transfer_in_public.nr b/noir-projects/noir-contracts/contracts/app/nft_contract/src/test/transfer_in_public.nr
index 762e8c2fca4f..9297652dfe3b 100644
--- a/noir-projects/noir-contracts/contracts/app/nft_contract/src/test/transfer_in_public.nr
+++ b/noir-projects/noir-contracts/contracts/app/nft_contract/src/test/transfer_in_public.nr
@@ -9,10 +9,7 @@ unconstrained fn transfer_in_public() {
         utils::setup_and_mint(/* with_account_contracts */ false);
 
     // Transfer the NFT
-    env.call_public(
-        sender,
-        NFT::at(nft_contract_address).transfer_in_public(sender, recipient, token_id, 0),
-    );
+    env.call_public(sender, NFT::at(nft_contract_address).transfer_in_public(sender, recipient, token_id, 0));
 
     utils::assert_owns_public_nft(env, nft_contract_address, recipient, token_id);
 }
@@ -20,8 +17,7 @@ unconstrained fn transfer_in_public() {
 #[test]
 unconstrained fn transfer_in_public_to_self() {
     // Setup without account contracts. We are not using authwits here, so dummy accounts are enough
-    let (env, nft_contract_address, user, _, token_id) =
-        utils::setup_and_mint(/* with_account_contracts */ false);
+    let (env, nft_contract_address, user, _, token_id) = utils::setup_and_mint(/* with_account_contracts */ false);
 
     // Transfer the NFT
     env.call_public(user, NFT::at(nft_contract_address).transfer_in_public(user, user, token_id, 0));
@@ -36,8 +32,7 @@ unconstrained fn transfer_in_public_on_behalf_of_other() {
     let (env, nft_contract_address, sender, recipient, token_id) =
         utils::setup_and_mint(/* with_account_contracts */ true);
 
-    let transfer_in_public_from_call =
-        NFT::at(nft_contract_address).transfer_in_public(sender, recipient, token_id, 1);
+    let transfer_in_public_from_call = NFT::at(nft_contract_address).transfer_in_public(sender, recipient, token_id, 1);
     add_public_authwit_from_call(env, sender, recipient, transfer_in_public_from_call);
 
     // Transfer the NFT
@@ -52,27 +47,19 @@ unconstrained fn transfer_in_public_failure_on_behalf_of_self_non_zero_nonce() {
     // Setup without account contracts. We are not using authwits here, so dummy accounts are enough.
     // The authwit check is in the beginning so we don't need to waste time on minting the NFT and transferring
     // it to private..
-    let (env, nft_contract_address, sender, recipient) =
-        utils::setup(/* with_account_contracts */ false);
+    let (env, nft_contract_address, sender, recipient) = utils::setup(/* with_account_contracts */ false);
 
     let token_id = 1;
-    env.call_public(
-        sender,
-        NFT::at(nft_contract_address).transfer_in_public(sender, recipient, token_id, 1),
-    );
+    env.call_public(sender, NFT::at(nft_contract_address).transfer_in_public(sender, recipient, token_id, 1));
 }
 
 #[test(should_fail_with = "invalid owner")]
 unconstrained fn transfer_in_public_non_existent_nft() {
     // Setup without account contracts. We are not using authwits here, so dummy accounts are enough
-    let (env, nft_contract_address, sender, recipient) =
-        utils::setup(/* with_account_contracts */ false);
+    let (env, nft_contract_address, sender, recipient) = utils::setup(/* with_account_contracts */ false);
 
     let token_id = 1;
-    env.call_public(
-        sender,
-        NFT::at(nft_contract_address).transfer_in_public(sender, recipient, token_id, 0),
-    );
+    env.call_public(sender, NFT::at(nft_contract_address).transfer_in_public(sender, recipient, token_id, 0));
 }
 
 #[test(should_fail_with = "unauthorized")]
@@ -81,10 +68,7 @@ unconstrained fn transfer_in_public_failure_on_behalf_of_other_without_approval(
     let (env, nft_contract_address, sender, recipient, token_id) =
         utils::setup_and_mint(/* with_account_contracts */ true);
 
-    env.call_public(
-        recipient,
-        NFT::at(nft_contract_address).transfer_in_public(sender, recipient, token_id, 0),
-    );
+    env.call_public(recipient, NFT::at(nft_contract_address).transfer_in_public(sender, recipient, token_id, 0));
 }
 
 #[test(should_fail_with = "unauthorized")]
@@ -92,8 +76,7 @@ unconstrained fn transfer_in_public_failure_on_behalf_of_other_wrong_caller() {
     // Setup with account contracts. Slower since we actually deploy them, but needed for authwits.
     let (env, nft_contract_address, sender, recipient, token_id) =
         utils::setup_and_mint(/* with_account_contracts */ true);
-    let transfer_in_public_from_call =
-        NFT::at(nft_contract_address).transfer_in_public(sender, recipient, token_id, 1);
+    let transfer_in_public_from_call = NFT::at(nft_contract_address).transfer_in_public(sender, recipient, token_id, 1);
     add_public_authwit_from_call(env, sender, sender, transfer_in_public_from_call);
 
     // Try to transfer tokens
diff --git a/noir-projects/noir-contracts/contracts/app/nft_contract/src/test/transfer_to_private.nr b/noir-projects/noir-contracts/contracts/app/nft_contract/src/test/transfer_to_private.nr
index a0fb470de83c..9f6119fbd61c 100644
--- a/noir-projects/noir-contracts/contracts/app/nft_contract/src/test/transfer_to_private.nr
+++ b/noir-projects/noir-contracts/contracts/app/nft_contract/src/test/transfer_to_private.nr
@@ -29,16 +29,11 @@ unconstrained fn transfer_to_private_external_orchestration() {
         utils::setup_and_mint(/* with_account_contracts */ false);
 
     // We prepare the transfer
-    let partial_note = env.call_private(
-        owner,
-        NFT::at(nft_contract_address).prepare_private_balance_increase(recipient),
-    );
+    let partial_note =
+        env.call_private(owner, NFT::at(nft_contract_address).prepare_private_balance_increase(recipient));
 
     // Finalize the transfer of the NFT (message sender owns the NFT in public)
-    env.call_public(
-        owner,
-        NFT::at(nft_contract_address).finalize_transfer_to_private(token_id, partial_note),
-    );
+    env.call_public(owner, NFT::at(nft_contract_address).finalize_transfer_to_private(token_id, partial_note));
 
     // Recipient should have the note in their private nfts
     utils::assert_owns_private_nft(env, nft_contract_address, recipient, token_id);
@@ -50,18 +45,14 @@ unconstrained fn transfer_to_private_external_orchestration() {
 #[test(should_fail_with = "Invalid partial note or completer")]
 unconstrained fn transfer_to_private_transfer_not_prepared() {
     // Setup without account contracts. We are not using authwits here, so dummy accounts are enough
-    let (env, nft_contract_address, owner, _, token_id) =
-        utils::setup_and_mint(/* with_account_contracts */ false);
+    let (env, nft_contract_address, owner, _, token_id) = utils::setup_and_mint(/* with_account_contracts */ false);
 
     // Transfer was not prepared so we can use random value for the partial note
     let commitment = random();
     let partial_note = PartialNFTNote::deserialize([commitment]);
 
     // Try finalizing the transfer without preparing it
-    env.call_public(
-        owner,
-        NFT::at(nft_contract_address).finalize_transfer_to_private(token_id, partial_note),
-    );
+    env.call_public(owner, NFT::at(nft_contract_address).finalize_transfer_to_private(token_id, partial_note));
 }
 
 #[test(should_fail_with = "invalid NFT owner")]
@@ -73,16 +64,11 @@ unconstrained fn transfer_to_private_failure_not_an_owner() {
     // (For this specific test we could set a random value for the commitment and not do the call to `prepare...`
     // as the NFT owner check is before we use the value but that would made the test less robust against changes
     // in the contract.)
-    let partial_note = env.call_private(
-        owner,
-        NFT::at(nft_contract_address).prepare_private_balance_increase(not_owner),
-    );
+    let partial_note =
+        env.call_private(owner, NFT::at(nft_contract_address).prepare_private_balance_increase(not_owner));
 
     // Try transferring someone else's public NFT
-    env.call_public(
-        not_owner,
-        NFT::at(nft_contract_address).finalize_transfer_to_private(token_id, partial_note),
-    );
+    env.call_public(not_owner, NFT::at(nft_contract_address).finalize_transfer_to_private(token_id, partial_note));
 }
 
 #[test(should_fail_with = "Invalid partial note or completer")]
@@ -95,15 +81,10 @@ unconstrained fn incorrect_completer_cannot_complete_partial_note() {
     let completer = env.create_light_account();
 
     // We prepare the partial note as a completer.
-    let partial_note = env.call_private(
-        completer,
-        NFT::at(nft_contract_address).prepare_private_balance_increase(recipient),
-    );
+    let partial_note =
+        env.call_private(completer, NFT::at(nft_contract_address).prepare_private_balance_increase(recipient));
 
     // Now we try to complete the partial note as another completer. Note that the caller here is the owner of the token
     // we're transferring - this is so that we pass the owner check and fail on the partial note completer check.
-    env.call_public(
-        owner,
-        NFT::at(nft_contract_address).finalize_transfer_to_private(token_id, partial_note),
-    );
+    env.call_public(owner, NFT::at(nft_contract_address).finalize_transfer_to_private(token_id, partial_note));
 }
diff --git a/noir-projects/noir-contracts/contracts/app/nft_contract/src/test/transfer_to_public.nr b/noir-projects/noir-contracts/contracts/app/nft_contract/src/test/transfer_to_public.nr
index eb386c247aad..1016bb26e22f 100644
--- a/noir-projects/noir-contracts/contracts/app/nft_contract/src/test/transfer_to_public.nr
+++ b/noir-projects/noir-contracts/contracts/app/nft_contract/src/test/transfer_to_public.nr
@@ -9,10 +9,7 @@ unconstrained fn transfer_to_public() {
     let (env, nft_contract_address, sender, recipient, token_id) =
         utils::setup_mint_and_transfer_to_private(/* with_account_contracts */ false);
 
-    env.call_private(
-        sender,
-        NFT::at(nft_contract_address).transfer_to_public(sender, recipient, token_id, 0),
-    );
+    env.call_private(sender, NFT::at(nft_contract_address).transfer_to_public(sender, recipient, token_id, 0));
 
     // Recipient should be the public owner
     utils::assert_owns_public_nft(env, nft_contract_address, recipient, token_id);
@@ -35,8 +32,7 @@ unconstrained fn transfer_to_public_on_behalf_of_other() {
     let (env, nft_contract_address, sender, recipient, token_id, proxy) =
         utils::setup_mint_and_transfer_to_private_with_proxy();
 
-    let transfer_to_public_call =
-        NFT::at(nft_contract_address).transfer_to_public(sender, recipient, token_id, 0);
+    let transfer_to_public_call = NFT::at(nft_contract_address).transfer_to_public(sender, recipient, token_id, 0);
     add_private_authwit_from_call(env, sender, proxy, transfer_to_public_call);
 
     // transfer_to_public the NFT
@@ -59,10 +55,7 @@ unconstrained fn transfer_to_public_failure_not_an_owner() {
     let (env, nft_contract_address, _, not_owner, token_id) =
         utils::setup_mint_and_transfer_to_private(/* with_account_contracts */ false);
 
-    env.call_private(
-        not_owner,
-        NFT::at(nft_contract_address).transfer_to_public(not_owner, not_owner, token_id, 0),
-    );
+    env.call_private(not_owner, NFT::at(nft_contract_address).transfer_to_public(not_owner, not_owner, token_id, 0));
 }
 
 #[test(should_fail_with = "Assertion failed: Invalid authwit nonce. When 'from' and 'msg_sender' are the same, 'authwit_nonce' must be zero")]
@@ -71,10 +64,7 @@ unconstrained fn transfer_to_public_failure_on_behalf_of_self_non_zero_nonce() {
     let (env, nft_contract_address, user, _, token_id) =
         utils::setup_mint_and_transfer_to_private(/* with_account_contracts */ false);
 
-    env.call_private(
-        user,
-        NFT::at(nft_contract_address).transfer_to_public(user, user, token_id, random()),
-    );
+    env.call_private(user, NFT::at(nft_contract_address).transfer_to_public(user, user, token_id, random()));
 }
 
 #[test(should_fail_with = "Unknown auth witness for message hash")]
@@ -82,8 +72,7 @@ unconstrained fn transfer_to_public_failure_on_behalf_of_other_invalid_designate
     let (env, nft_contract_address, sender, recipient, token_id, proxy) =
         utils::setup_mint_and_transfer_to_private_with_proxy();
 
-    let transfer_to_public_call =
-        NFT::at(nft_contract_address).transfer_to_public(sender, recipient, token_id, 0);
+    let transfer_to_public_call = NFT::at(nft_contract_address).transfer_to_public(sender, recipient, token_id, 0);
     add_private_authwit_from_call(env, sender, sender, transfer_to_public_call);
 
     // transfer_to_public the NFT
@@ -102,8 +91,7 @@ unconstrained fn transfer_to_public_failure_on_behalf_of_other_no_approval() {
     let (env, nft_contract_address, sender, recipient, token_id, proxy) =
         utils::setup_mint_and_transfer_to_private_with_proxy();
 
-    let transfer_to_public_call =
-        NFT::at(nft_contract_address).transfer_to_public(sender, recipient, token_id, 0);
+    let transfer_to_public_call = NFT::at(nft_contract_address).transfer_to_public(sender, recipient, token_id, 0);
 
     // transfer_to_public the NFT
     env.call_private(
diff --git a/noir-projects/noir-contracts/contracts/app/nft_contract/src/test/utils.nr b/noir-projects/noir-contracts/contracts/app/nft_contract/src/test/utils.nr
index 0d2ef11d9077..7ce98753e89e 100644
--- a/noir-projects/noir-contracts/contracts/app/nft_contract/src/test/utils.nr
+++ b/noir-projects/noir-contracts/contracts/app/nft_contract/src/test/utils.nr
@@ -18,11 +18,8 @@ pub unconstrained fn setup(
     };
 
     // Deploy token contract
-    let initializer_call = NFT::interface().constructor(
-        owner,
-        "TestNFT000000000000000000000000",
-        "TN00000000000000000000000000000",
-    );
+    let initializer_call =
+        NFT::interface().constructor(owner, "TestNFT000000000000000000000000", "TN00000000000000000000000000000");
     let nft_contract_address = env.deploy("NFT").with_public_initializer(owner, initializer_call);
 
     (env, nft_contract_address, owner, recipient)
@@ -43,14 +40,10 @@ pub unconstrained fn setup_and_mint(
 pub unconstrained fn setup_mint_and_transfer_to_private(
     with_account_contracts: bool,
 ) -> (TestEnvironment, AztecAddress, AztecAddress, AztecAddress, Field) {
-    let (env, nft_contract_address, owner, recipient, minted_token_id) =
-        setup_and_mint(with_account_contracts);
+    let (env, nft_contract_address, owner, recipient, minted_token_id) = setup_and_mint(with_account_contracts);
 
     // We transfer the public NFT to private.
-    env.call_private(
-        owner,
-        NFT::at(nft_contract_address).transfer_to_private(owner, minted_token_id),
-    );
+    env.call_private(owner, NFT::at(nft_contract_address).transfer_to_private(owner, minted_token_id));
 
     (env, nft_contract_address, owner, recipient, minted_token_id)
 }
@@ -71,8 +64,7 @@ pub unconstrained fn assert_owns_private_nft(
     owner: AztecAddress,
     token_id: Field,
 ) {
-    let (private_nfts, _) =
-        env.execute_utility(NFT::at(nft_contract_address).get_private_nfts(owner, 0));
+    let (private_nfts, _) = env.execute_utility(NFT::at(nft_contract_address).get_private_nfts(owner, 0));
 
     let mut nft_found = false;
     for obtained_token_id in private_nfts {
diff --git a/noir-projects/noir-contracts/contracts/app/nft_contract/src/types/nft_note.nr b/noir-projects/noir-contracts/contracts/app/nft_contract/src/types/nft_note.nr
index 0542cdf24f09..4b52fc52d803 100644
--- a/noir-projects/noir-contracts/contracts/app/nft_contract/src/types/nft_note.nr
+++ b/noir-projects/noir-contracts/contracts/app/nft_contract/src/types/nft_note.nr
@@ -6,12 +6,12 @@ use aztec::{
         logs::partial_note::encode_partial_note_private_message,
         message_delivery::{do_private_message_delivery, MessageDelivery},
     },
-    note::{note_interface::{NoteHash, NoteType}, utils::compute_note_nullifier},
+    note::{note_interface::{NoteHash, NoteType}, utils::{compute_note_hash, compute_note_nullifier}},
     oracle::random::random,
     protocol::{
         address::AztecAddress,
         constants::{
-            DOM_SEP__NOTE_COMPLETION_LOG_TAG, DOM_SEP__NOTE_HASH,
+            DOM_SEP__NOTE_COMPLETION_LOG_TAG, DOM_SEP__PARTIAL_NOTE_COMMITMENT,
             DOM_SEP__PARTIAL_NOTE_VALIDITY_COMMITMENT,
         },
         hash::{compute_log_tag, poseidon2_hash_with_separator},
@@ -34,12 +34,7 @@ pub struct NFTNote {
 }
 
 impl NoteHash for NFTNote {
-    fn compute_note_hash(
-        self,
-        owner: AztecAddress,
-        storage_slot: Field,
-        randomness: Field,
-    ) -> Field {
+    fn compute_note_hash(self, owner: AztecAddress, storage_slot: Field, randomness: Field) -> Field {
         // Partial notes can be implemented by having the note hash be either the result of multiscalar multiplication
         // (MSM), or two rounds of poseidon. MSM results in more constraints and is only required when multiple variants
         // of partial notes are supported. Because NFTNote has just one variant (where the token id is public), we use
@@ -50,8 +45,7 @@ impl NoteHash for NFTNote {
         // perform both steps of the partial note computation.
 
         // First we create the partial note from a commitment to the private content.
-        let partial_note =
-            PartialNFTNote { commitment: compute_partial_commitment(owner, randomness) };
+        let partial_note = PartialNFTNote { commitment: compute_partial_commitment(owner, randomness) };
 
         // Then compute the completion note hash. In a real partial note this step would be performed in public.
         partial_note.compute_complete_note_hash(storage_slot, self.token_id)
@@ -125,14 +119,7 @@ impl NFTNote {
 
         do_private_message_delivery(
             context,
-            || {
-                encode_partial_note_private_message(
-                    private_log_content,
-                    owner,
-                    randomness,
-                    commitment,
-                )
-            },
+            || encode_partial_note_private_message(private_log_content, owner, randomness, commitment),
             Option::none(),
             recipient,
             MessageDelivery.ONCHAIN_UNCONSTRAINED,
@@ -153,7 +140,10 @@ impl NFTNote {
 /// Computes a commitment to the private content of a partial NFTNote, i.e. the fields that will remain private. All
 /// other note fields will be made public.
 fn compute_partial_commitment(owner: AztecAddress, randomness: Field) -> Field {
-    poseidon2_hash_with_separator([owner.to_field(), randomness], DOM_SEP__NOTE_HASH)
+    poseidon2_hash_with_separator(
+        [owner.to_field(), randomness],
+        DOM_SEP__PARTIAL_NOTE_COMMITMENT,
+    )
 }
 
 #[derive(Packable)]
@@ -178,13 +168,7 @@ pub struct PartialNFTNote {
 
 impl PartialNFTNote {
     /// Completes the partial note, creating a new note that can be used like any other NFTNote.
-    pub fn complete(
-        self,
-        context: PublicContext,
-        completer: AztecAddress,
-        storage_slot: Field,
-        token_id: Field,
-    ) {
+    pub fn complete(self, context: PublicContext, completer: AztecAddress, storage_slot: Field, token_id: Field) {
         // A note with a value of zero is valid, but we cannot currently complete a partial note with such a value
         // because this will result in the completion log having its last field set to 0. Public logs currently do not
         // track their length, and so trailing zeros are simply trimmed. This results in the completion log missing its
@@ -226,22 +210,13 @@ impl PartialNFTNote {
     }
 
     fn compute_complete_note_hash(self, storage_slot: Field, token_id: Field) -> Field {
-        // Here we finalize the note hash by including the (public) storage slot and token id into the partial note
-        // commitment. Note that we use the same separator as we used for the first round of poseidon - this is not
-        // an issue.
-        poseidon2_hash_with_separator(
-            [self.commitment, storage_slot, token_id],
-            DOM_SEP__NOTE_HASH,
-        )
+        compute_note_hash(storage_slot, [self.commitment, token_id])
     }
 }
 
 mod test {
     use super::{compute_partial_commitment, NFTNote, PartialNFTNote};
-    use aztec::{
-        note::note_interface::NoteHash,
-        protocol::{address::AztecAddress, traits::FromField},
-    };
+    use aztec::{note::note_interface::NoteHash, protocol::{address::AztecAddress, traits::FromField}};
 
     global token_id: Field = 17;
     global randomness: Field = 42;
@@ -257,10 +232,8 @@ mod test {
         let note = NFTNote { token_id };
         let note_hash = note.compute_note_hash(owner, storage_slot, randomness);
 
-        let partial_note =
-            PartialNFTNote { commitment: compute_partial_commitment(owner, randomness) };
-        let completed_partial_note_hash =
-            partial_note.compute_complete_note_hash(storage_slot, token_id);
+        let partial_note = PartialNFTNote { commitment: compute_partial_commitment(owner, randomness) };
+        let completed_partial_note_hash = partial_note.compute_complete_note_hash(storage_slot, token_id);
 
         assert_eq(note_hash, completed_partial_note_hash);
     }
diff --git a/noir-projects/noir-contracts/contracts/app/orderbook_contract/src/config.nr b/noir-projects/noir-contracts/contracts/app/orderbook_contract/src/config.nr
index 206ff586af81..c0034cf2dfcc 100644
--- a/noir-projects/noir-contracts/contracts/app/orderbook_contract/src/config.nr
+++ b/noir-projects/noir-contracts/contracts/app/orderbook_contract/src/config.nr
@@ -15,11 +15,7 @@ impl Config {
         Self { token0, token1 }
     }
 
-    pub fn validate_input_tokens_and_get_direction(
-        self,
-        bid_token: AztecAddress,
-        ask_token: AztecAddress,
-    ) -> bool {
+    pub fn validate_input_tokens_and_get_direction(self, bid_token: AztecAddress, ask_token: AztecAddress) -> bool {
         assert((bid_token == self.token0) | (bid_token == self.token1), "BID_TOKEN_IS_INVALID");
         assert((ask_token == self.token0) | (ask_token == self.token1), "ASK_TOKEN_IS_INVALID");
         assert(bid_token != ask_token, "SAME_TOKEN_TRADE");
diff --git a/noir-projects/noir-contracts/contracts/app/orderbook_contract/src/main.nr b/noir-projects/noir-contracts/contracts/app/orderbook_contract/src/main.nr
index 201954b1c4af..9da0106f0064 100644
--- a/noir-projects/noir-contracts/contracts/app/orderbook_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/app/orderbook_contract/src/main.nr
@@ -84,17 +84,11 @@ pub contract Orderbook {
         let maker = self.msg_sender();
 
         // Transfer tokens from maker to the public balance of this contract.
-        self.call(Token::at(bid_token).transfer_to_public(
-            maker,
-            self.address,
-            bid_amount,
-            authwit_nonce,
-        ));
+        self.call(Token::at(bid_token).transfer_to_public(maker, self.address, bid_amount, authwit_nonce));
 
         // Prepare a partial note that will get completed once the order is fulfilled. Note that only the Orderbook
         // contract can complete the partial note.
-        let maker_partial_note =
-            self.call(Token::at(ask_token).prepare_private_balance_increase(maker));
+        let maker_partial_note = self.call(Token::at(ask_token).prepare_private_balance_increase(maker));
 
         // We use the partial note as the order ID. Because partial notes emit a nullifier when created they are
         // unique, and so this guarantees that our order IDs are also unique without having to keep track of past
@@ -140,8 +134,7 @@ pub contract Orderbook {
         ));
 
         // Prepare partial note for taker to receive bid_token
-        let taker_partial_note =
-            self.call(Token::at(bid_token).prepare_private_balance_increase(taker));
+        let taker_partial_note = self.call(Token::at(bid_token).prepare_private_balance_increase(taker));
 
         // Nullify the order such that it cannot be fulfilled again. We emit a nullifier instead of deleting the order
         // from public storage because we get no refund for resetting public storage to zero and just emitting
@@ -156,16 +149,9 @@ pub contract Orderbook {
 
     #[external("public")]
     #[only_self]
-    fn _fulfill_order(
-        order_id: Field,
-        taker_partial_note: PartialUintNote,
-        bid_token: AztecAddress,
-        bid_amount: u128,
-    ) {
+    fn _fulfill_order(order_id: Field, taker_partial_note: PartialUintNote, bid_token: AztecAddress, bid_amount: u128) {
         // Finalize transfer of bid_amount of bid_token to taker
-        Token::at(bid_token).finalize_transfer_to_private(bid_amount, taker_partial_note).call(
-            self.context,
-        );
+        Token::at(bid_token).finalize_transfer_to_private(bid_amount, taker_partial_note).call(self.context);
 
         self.emit(OrderFulfilled { order_id });
     }
diff --git a/noir-projects/noir-contracts/contracts/app/orderbook_contract/src/order.nr b/noir-projects/noir-contracts/contracts/app/orderbook_contract/src/order.nr
index 2565b6a4aa9d..092f7c20e3f2 100644
--- a/noir-projects/noir-contracts/contracts/app/orderbook_contract/src/order.nr
+++ b/noir-projects/noir-contracts/contracts/app/orderbook_contract/src/order.nr
@@ -17,10 +17,7 @@ impl Packable for Order {
     let N: u32 = 2;
 
     fn pack(self) -> [Field; Self::N] {
-        [
-            (self.bid_amount as Field) * 2.pow_32(1) + (self.bid_token_is_zero as Field),
-            self.ask_amount as Field,
-        ]
+        [(self.bid_amount as Field) * 2.pow_32(1) + (self.bid_token_is_zero as Field), self.ask_amount as Field]
     }
 
     fn unpack(packed: [Field; Self::N]) -> Self {
@@ -42,8 +39,7 @@ impl Order {
         assert(bid_amount > 0 as u128, "ZERO_BID_AMOUNT");
         assert(ask_amount > 0 as u128, "ZERO_ASK_AMOUNT");
 
-        let bid_token_is_zero =
-            config.validate_input_tokens_and_get_direction(bid_token, ask_token);
+        let bid_token_is_zero = config.validate_input_tokens_and_get_direction(bid_token, ask_token);
 
         Self { bid_amount, ask_amount, bid_token_is_zero }
     }
@@ -114,8 +110,7 @@ mod test {
 
     #[test]
     fn test_pack_unpack_order_false() {
-        let order =
-            Order { bid_amount: 123456789, ask_amount: 987654321, bid_token_is_zero: false };
+        let order = Order { bid_amount: 123456789, ask_amount: 987654321, bid_token_is_zero: false };
         let unpacked = Order::unpack(order.pack());
         assert_eq(unpacked.bid_amount, order.bid_amount);
         assert_eq(unpacked.ask_amount, order.ask_amount);
diff --git a/noir-projects/noir-contracts/contracts/app/orderbook_contract/src/test/test.nr b/noir-projects/noir-contracts/contracts/app/orderbook_contract/src/test/test.nr
index b3786a5bd95b..29a4c63f4661 100644
--- a/noir-projects/noir-contracts/contracts/app/orderbook_contract/src/test/test.nr
+++ b/noir-projects/noir-contracts/contracts/app/orderbook_contract/src/test/test.nr
@@ -29,19 +29,12 @@ unconstrained fn full_flow() {
     env.call_private(minter, token1.mint_to_private(taker, ASK_AMOUNT));
 
     // ORDER CREATION
-    let transfer_call =
-        token0.transfer_to_public(maker, orderbook_address, BID_AMOUNT, CREATE_ORDER_AUTHWIT_NONCE);
+    let transfer_call = token0.transfer_to_public(maker, orderbook_address, BID_AMOUNT, CREATE_ORDER_AUTHWIT_NONCE);
     add_private_authwit_from_call(env, maker, orderbook_address, transfer_call);
 
     let order_id = env.call_private(
         maker,
-        orderbook.create_order(
-            token0_address,
-            token1_address,
-            BID_AMOUNT,
-            ASK_AMOUNT,
-            CREATE_ORDER_AUTHWIT_NONCE,
-        ),
+        orderbook.create_order(token0_address, token1_address, BID_AMOUNT, ASK_AMOUNT, CREATE_ORDER_AUTHWIT_NONCE),
     );
 
     // Get order and verify it's active
@@ -95,13 +88,7 @@ unconstrained fn create_order_zero_bid_amount() {
 
     let _ = env.call_private(
         maker,
-        orderbook.create_order(
-            token0_address,
-            token1_address,
-            0,
-            ASK_AMOUNT,
-            CREATE_ORDER_AUTHWIT_NONCE,
-        ),
+        orderbook.create_order(token0_address, token1_address, 0, ASK_AMOUNT, CREATE_ORDER_AUTHWIT_NONCE),
     );
 }
 
@@ -114,13 +101,7 @@ unconstrained fn create_order_zero_ask_amount() {
 
     let _ = env.call_private(
         maker,
-        orderbook.create_order(
-            token0_address,
-            token1_address,
-            BID_AMOUNT,
-            0,
-            CREATE_ORDER_AUTHWIT_NONCE,
-        ),
+        orderbook.create_order(token0_address, token1_address, BID_AMOUNT, 0, CREATE_ORDER_AUTHWIT_NONCE),
     );
 }
 
@@ -135,13 +116,7 @@ unconstrained fn create_order_invalid_bid_token() {
 
     let _ = env.call_private(
         maker,
-        orderbook.create_order(
-            invalid_token,
-            token1_address,
-            BID_AMOUNT,
-            ASK_AMOUNT,
-            CREATE_ORDER_AUTHWIT_NONCE,
-        ),
+        orderbook.create_order(invalid_token, token1_address, BID_AMOUNT, ASK_AMOUNT, CREATE_ORDER_AUTHWIT_NONCE),
     );
 }
 
@@ -156,13 +131,7 @@ unconstrained fn create_order_invalid_ask_token() {
 
     let _ = env.call_private(
         maker,
-        orderbook.create_order(
-            token0_address,
-            invalid_token,
-            BID_AMOUNT,
-            ASK_AMOUNT,
-            CREATE_ORDER_AUTHWIT_NONCE,
-        ),
+        orderbook.create_order(token0_address, invalid_token, BID_AMOUNT, ASK_AMOUNT, CREATE_ORDER_AUTHWIT_NONCE),
     );
 }
 
@@ -175,12 +144,6 @@ unconstrained fn create_order_same_tokens() {
 
     let _ = env.call_private(
         maker,
-        orderbook.create_order(
-            token0_address,
-            token0_address,
-            BID_AMOUNT,
-            ASK_AMOUNT,
-            CREATE_ORDER_AUTHWIT_NONCE,
-        ),
+        orderbook.create_order(token0_address, token0_address, BID_AMOUNT, ASK_AMOUNT, CREATE_ORDER_AUTHWIT_NONCE),
     );
 }
diff --git a/noir-projects/noir-contracts/contracts/app/orderbook_contract/src/test/utils.nr b/noir-projects/noir-contracts/contracts/app/orderbook_contract/src/test/utils.nr
index 17a235b917fa..3694f35e791e 100644
--- a/noir-projects/noir-contracts/contracts/app/orderbook_contract/src/test/utils.nr
+++ b/noir-projects/noir-contracts/contracts/app/orderbook_contract/src/test/utils.nr
@@ -11,28 +11,17 @@ pub(crate) unconstrained fn setup() -> (TestEnvironment, AztecAddress, AztecAddr
     let admin = env.create_light_account();
 
     // Deploy tokens
-    let token0_initializer = Token::interface().constructor(
-        admin,
-        "Token00000000000000000000000000",
-        "TK00000000000000000000000000000",
-        18,
-    );
-    let token0_address =
-        env.deploy("@token_contract/Token").with_public_initializer(admin, token0_initializer);
+    let token0_initializer =
+        Token::interface().constructor(admin, "Token00000000000000000000000000", "TK00000000000000000000000000000", 18);
+    let token0_address = env.deploy("@token_contract/Token").with_public_initializer(admin, token0_initializer);
 
-    let token1_initializer = Token::interface().constructor(
-        admin,
-        "Token11111111111111111111111111",
-        "TK11111111111111111111111111111",
-        18,
-    );
-    let token1_address =
-        env.deploy("@token_contract/Token").with_public_initializer(admin, token1_initializer);
+    let token1_initializer =
+        Token::interface().constructor(admin, "Token11111111111111111111111111", "TK11111111111111111111111111111", 18);
+    let token1_address = env.deploy("@token_contract/Token").with_public_initializer(admin, token1_initializer);
 
     // Deploy orderbook contract
     let orderbook_initializer = Orderbook::interface().constructor(token0_address, token1_address);
-    let orderbook_address =
-        env.deploy("Orderbook").with_public_initializer(admin, orderbook_initializer);
+    let orderbook_address = env.deploy("Orderbook").with_public_initializer(admin, orderbook_initializer);
 
     // The admin has the minter role. Since we only care about the minting capability in the tests, we return the admin
     // address as 'minter' rather than 'admin'.
diff --git a/noir-projects/noir-contracts/contracts/app/private_token_contract/src/main.nr b/noir-projects/noir-contracts/contracts/app/private_token_contract/src/main.nr
index 1e9d2a7fb333..9c2eed4d5971 100644
--- a/noir-projects/noir-contracts/contracts/app/private_token_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/app/private_token_contract/src/main.nr
@@ -27,28 +27,19 @@ pub contract PrivateToken {
     }
     // docs:end_single_private_mutable
 
-    /**
-     * initialize the contract's initial state variables.
-     */
     #[external("private")]
     #[initializer]
     fn constructor(initial_admin_balance: u128, admin: AztecAddress) {
         // Admin itself is the owner of the underlying note because we want admin to be able to transfer the admin
         // privileges to someone else which requires being able to nullify the note. We use constrained onchain message
         // delivery because we don't know if the party deploying this contract is incentivized to deliver the note.
-        self.storage.admin.initialize(AddressNote { address: admin }, admin).deliver(
-            MessageDelivery.ONCHAIN_CONSTRAINED,
-        );
+        self.storage.admin.initialize(AddressNote { address: admin }, admin).deliver(MessageDelivery.ONCHAIN_CONSTRAINED);
 
         // Mint the initial admin balance to the admin.
-        self.storage.balances.at(admin).add(initial_admin_balance).deliver(
+        self.storage.balances.at(admin).add(initial_admin_balance).deliver(MessageDelivery.ONCHAIN_CONSTRAINED);
+        self.storage.total_supply.initialize(UintNote { value: initial_admin_balance }, admin).deliver(
             MessageDelivery.ONCHAIN_CONSTRAINED,
         );
-        self
-            .storage
-            .total_supply
-            .initialize(UintNote { value: initial_admin_balance }, admin)
-            .deliver(MessageDelivery.ONCHAIN_CONSTRAINED);
     }
 
     // Mints `amount` of tokens to `owner`.
@@ -64,11 +55,9 @@ pub contract PrivateToken {
         replacement_note_message.deliver(MessageDelivery.ONCHAIN_UNCONSTRAINED);
         // We increase the total supply and once again use unconstrained delivery, since the admin is motivated to
         // deliver the message (he's the owner of the new note as well).
-        self
-            .storage
-            .total_supply
-            .replace(|current| UintNote { value: current.value + amount }, admin)
-            .deliver(MessageDelivery.ONCHAIN_UNCONSTRAINED);
+        self.storage.total_supply.replace(|current| UintNote { value: current.value + amount }, admin).deliver(
+            MessageDelivery.ONCHAIN_UNCONSTRAINED,
+        );
 
         // At last we mint the tokens to the recipient.
         self.storage.balances.at(recipient).add(amount).deliver(MessageDelivery.ONCHAIN_CONSTRAINED);
@@ -84,10 +73,7 @@ pub contract PrivateToken {
             .admin
             .replace(
                 |old| {
-                    assert(
-                        old.address == self.msg_sender(),
-                        "Only admin can transfer admin privileges",
-                    );
+                    assert(old.address == self.msg_sender(), "Only admin can transfer admin privileges");
                     AddressNote { address: new_admin }
                 },
                 new_admin,
diff --git a/noir-projects/noir-contracts/contracts/app/private_voting_contract/src/main.nr b/noir-projects/noir-contracts/contracts/app/private_voting_contract/src/main.nr
index 5112d2109516..73d8769ad032 100644
--- a/noir-projects/noir-contracts/contracts/app/private_voting_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/app/private_voting_contract/src/main.nr
@@ -54,21 +54,24 @@ pub contract PrivateVoting {
     #[only_self]
     fn add_to_tally_public(election_id: ElectionId, candidate: Field) {
         assert(self.storage.active_at_block.at(election_id).read() <= self.context.block_number());
-        assert(self.storage.vote_ended.at(election_id).read() == false, "Vote has ended"); // assert that vote has not ended
+        assert(self.storage.vote_ended.at(election_id).read() == false, "Vote has ended"); // assert that vote has not
+        // ended
         let new_tally = self.storage.tally.at(election_id).at(candidate).read() + 1;
         self.storage.tally.at(election_id).at(candidate).write(new_tally);
     }
 
     #[external("public")]
     fn start_vote(election_id: ElectionId) {
-        assert(self.storage.admin.read().eq(self.msg_sender()), "Only admin can start votes"); // assert that caller is admin
+        assert(self.storage.admin.read().eq(self.msg_sender()), "Only admin can start votes"); // assert that caller is
+        // admin
         self.storage.vote_ended.at(election_id).write(false);
         self.storage.active_at_block.at(election_id).initialize(self.context.block_number());
     }
 
     #[external("public")]
     fn end_vote(election_id: ElectionId) {
-        assert(self.storage.admin.read().eq(self.msg_sender()), "Only admin can end votes"); // assert that caller is admin
+        assert(self.storage.admin.read().eq(self.msg_sender()), "Only admin can end votes"); // assert that caller is
+        // admin
         self.storage.vote_ended.at(election_id).write(true);
     }
 
diff --git a/noir-projects/noir-contracts/contracts/app/private_voting_contract/src/test/first.nr b/noir-projects/noir-contracts/contracts/app/private_voting_contract/src/test/first.nr
index d4200123d7d7..d1c8b617ddab 100644
--- a/noir-projects/noir-contracts/contracts/app/private_voting_contract/src/test/first.nr
+++ b/noir-projects/noir-contracts/contracts/app/private_voting_contract/src/test/first.nr
@@ -58,15 +58,9 @@ unconstrained fn test_cast_vote() {
     env.call_public(admin, PrivateVoting::at(voting_contract_address).start_vote(election_id));
 
     let candidate = 1;
-    env.call_private(
-        alice,
-        PrivateVoting::at(voting_contract_address).cast_vote(election_id, candidate),
-    );
-
-    let tally = env.view_public(PrivateVoting::at(voting_contract_address).get_tally(
-        election_id,
-        candidate,
-    ));
+    env.call_private(alice, PrivateVoting::at(voting_contract_address).cast_vote(election_id, candidate));
+
+    let tally = env.view_public(PrivateVoting::at(voting_contract_address).get_tally(election_id, candidate));
     assert_eq(tally, 1);
 }
 
@@ -80,20 +74,11 @@ unconstrained fn test_cast_vote_with_separate_accounts() {
     env.call_public(admin, PrivateVoting::at(voting_contract_address).start_vote(election_id));
 
     let candidate = 101;
-    env.call_private(
-        alice,
-        PrivateVoting::at(voting_contract_address).cast_vote(election_id, candidate),
-    );
-
-    let _ = env.call_private(
-        bob,
-        PrivateVoting::at(voting_contract_address).cast_vote(election_id, candidate),
-    );
-
-    let tally = env.view_public(PrivateVoting::at(voting_contract_address).get_tally(
-        election_id,
-        candidate,
-    ));
+    env.call_private(alice, PrivateVoting::at(voting_contract_address).cast_vote(election_id, candidate));
+
+    let _ = env.call_private(bob, PrivateVoting::at(voting_contract_address).cast_vote(election_id, candidate));
+
+    let tally = env.view_public(PrivateVoting::at(voting_contract_address).get_tally(election_id, candidate));
     assert_eq(tally, 2);
 }
 
@@ -107,14 +92,8 @@ unconstrained fn test_fail_vote_twice() {
 
     let candidate = 101;
 
-    env.call_private(
-        alice,
-        PrivateVoting::at(voting_contract_address).cast_vote(election_id, candidate),
-    );
-    env.call_private(
-        alice,
-        PrivateVoting::at(voting_contract_address).cast_vote(election_id, candidate),
-    );
+    env.call_private(alice, PrivateVoting::at(voting_contract_address).cast_vote(election_id, candidate));
+    env.call_private(alice, PrivateVoting::at(voting_contract_address).cast_vote(election_id, candidate));
 }
 
 #[test]
@@ -130,23 +109,13 @@ unconstrained fn test_vote_in_two_different_elections() {
 
     let candidate = 101;
 
-    env.call_private(
-        alice,
-        PrivateVoting::at(voting_contract_address).cast_vote(election_id_42, candidate),
-    );
-    env.call_private(
-        alice,
-        PrivateVoting::at(voting_contract_address).cast_vote(election_id_54, candidate),
-    );
-
-    let vote_count_42 = env.view_public(PrivateVoting::at(voting_contract_address).get_tally(
-        election_id_42,
-        candidate,
-    ));
-    let vote_count_54 = env.view_public(PrivateVoting::at(voting_contract_address).get_tally(
-        election_id_54,
-        candidate,
-    ));
+    env.call_private(alice, PrivateVoting::at(voting_contract_address).cast_vote(election_id_42, candidate));
+    env.call_private(alice, PrivateVoting::at(voting_contract_address).cast_vote(election_id_54, candidate));
+
+    let vote_count_42 =
+        env.view_public(PrivateVoting::at(voting_contract_address).get_tally(election_id_42, candidate));
+    let vote_count_54 =
+        env.view_public(PrivateVoting::at(voting_contract_address).get_tally(election_id_54, candidate));
 
     assert_eq(vote_count_42, 1);
     assert_eq(vote_count_54, 1);
diff --git a/noir-projects/noir-contracts/contracts/app/private_voting_contract/src/test/utils.nr b/noir-projects/noir-contracts/contracts/app/private_voting_contract/src/test/utils.nr
index bb36d53c94e1..97cfecc2a4a9 100644
--- a/noir-projects/noir-contracts/contracts/app/private_voting_contract/src/test/utils.nr
+++ b/noir-projects/noir-contracts/contracts/app/private_voting_contract/src/test/utils.nr
@@ -8,8 +8,7 @@ pub unconstrained fn setup() -> (TestEnvironment, AztecAddress, AztecAddress) {
     let admin = env.create_light_account();
 
     let initializer_call = PrivateVoting::interface().constructor(admin);
-    let voting_contract_address =
-        env.deploy("PrivateVoting").with_public_initializer(admin, initializer_call);
+    let voting_contract_address = env.deploy("PrivateVoting").with_public_initializer(admin, initializer_call);
 
     (env, voting_contract_address, admin)
 }
diff --git a/noir-projects/noir-contracts/contracts/app/simple_token_contract/src/main.nr b/noir-projects/noir-contracts/contracts/app/simple_token_contract/src/main.nr
index 4ffcdfcd6dcf..bb2da32153ad 100644
--- a/noir-projects/noir-contracts/contracts/app/simple_token_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/app/simple_token_contract/src/main.nr
@@ -124,12 +124,7 @@ pub contract SimpleToken {
 
     #[authorize_once("from", "authwit_nonce")]
     #[external("private")]
-    fn transfer_from_private_to_public(
-        from: AztecAddress,
-        to: AztecAddress,
-        amount: u128,
-        authwit_nonce: Field,
-    ) {
+    fn transfer_from_private_to_public(from: AztecAddress, to: AztecAddress, amount: u128, authwit_nonce: Field) {
         self.storage.balances.at(from).sub(amount).deliver(MessageDelivery.ONCHAIN_CONSTRAINED);
         self.enqueue_self._increase_public_balance(to, amount);
     }
@@ -142,10 +137,7 @@ pub contract SimpleToken {
         self.storage.balances.at(from).add(change).deliver(MessageDelivery.ONCHAIN_UNCONSTRAINED);
         self.storage.balances.at(to).add(amount).deliver(MessageDelivery.ONCHAIN_UNCONSTRAINED);
 
-        self.emit(Transfer { from, to, amount }).deliver_to(
-            to,
-            MessageDelivery.ONCHAIN_UNCONSTRAINED,
-        );
+        self.emit(Transfer { from, to, amount }).deliver_to(to, MessageDelivery.ONCHAIN_UNCONSTRAINED);
     }
 
     #[authorize_once("from", "authwit_nonce")]
@@ -192,22 +184,13 @@ pub contract SimpleToken {
     }
 
     #[internal("public")]
-    fn _finalize_transfer_to_private(
-        from_and_completer: AztecAddress,
-        amount: u128,
-        partial_note: PartialUintNote,
-    ) {
+    fn _finalize_transfer_to_private(from_and_completer: AztecAddress, amount: u128, partial_note: PartialUintNote) {
         let balance_storage = self.storage.public_balances.at(from_and_completer);
 
         let from_balance = balance_storage.read().sub(amount);
         balance_storage.write(from_balance);
 
-        partial_note.complete(
-            self.context,
-            from_and_completer,
-            self.storage.balances.get_storage_slot(),
-            amount,
-        );
+        partial_note.complete(self.context, from_and_completer, self.storage.balances.get_storage_slot(), amount);
     }
 
     #[external("private")]
@@ -232,20 +215,11 @@ pub contract SimpleToken {
     }
 
     #[internal("public")]
-    fn _finalize_mint_to_private(
-        completer: AztecAddress,
-        amount: u128,
-        partial_note: PartialUintNote,
-    ) {
+    fn _finalize_mint_to_private(completer: AztecAddress, amount: u128, partial_note: PartialUintNote) {
         let supply = self.storage.total_supply.read().add(amount);
         self.storage.total_supply.write(supply);
 
-        partial_note.complete(
-            self.context,
-            completer,
-            self.storage.balances.get_storage_slot(),
-            amount,
-        );
+        partial_note.complete(self.context, completer, self.storage.balances.get_storage_slot(), amount);
     }
 
     #[external("public")]
@@ -284,9 +258,7 @@ pub contract SimpleToken {
             subtracted - amount
         } else {
             let remaining = amount - subtracted;
-            compute_recurse_subtract_balance_call(*self.context, account, remaining).call(
-                self.context,
-            )
+            compute_recurse_subtract_balance_call(*self.context, account, remaining).call(self.context)
         }
     }
 
diff --git a/noir-projects/noir-contracts/contracts/app/token_blacklist_contract/src/main.nr b/noir-projects/noir-contracts/contracts/app/token_blacklist_contract/src/main.nr
index a9bee6b0b4a6..4cf688bdcd47 100644
--- a/noir-projects/noir-contracts/contracts/app/token_blacklist_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/app/token_blacklist_contract/src/main.nr
@@ -19,18 +19,12 @@ pub contract TokenBlacklist {
     // Libs
     use aztec::{
         hash::compute_secret_hash,
-        macros::{
-            functions::{authorize_once, external, initializer, only_self, view},
-            storage::storage,
-        },
+        macros::{functions::{authorize_once, external, initializer, only_self, view}, storage::storage},
         messages::{
             discovery::private_notes::attempt_note_discovery, message_delivery::MessageDelivery,
             processing::validate_and_store_enqueued_notes_and_events,
         },
-        note::{
-            note_getter_options::NoteGetterOptions,
-            note_interface::{NoteHash, NoteProperties, NoteType},
-        },
+        note::{note_getter_options::NoteGetterOptions, note_interface::{NoteHash, NoteProperties, NoteType}},
         protocol::traits::ToField,
         state_vars::{DelayedPublicMutable, Map, Owned, PrivateSet, PublicMutable, StateVariable},
         utils::comparison::Comparator,
@@ -39,9 +33,7 @@ pub contract TokenBlacklist {
     use std::ops::{Add, Sub};
 
     use crate::types::{roles::UserFlags, transparent_note::TransparentNote};
-    use aztec::protocol::{
-        address::AztecAddress, constants::MAX_NOTE_HASHES_PER_TX, traits::Packable,
-    };
+    use aztec::protocol::{address::AztecAddress, constants::MAX_NOTE_HASHES_PER_TX, traits::Packable};
     use balance_set::BalanceSet;
 
     // Changing an address' roles has a certain delay before it goes into effect. Here set to 1 day.
@@ -198,7 +190,8 @@ pub contract TokenBlacklist {
             .select(TransparentNote::properties().secret_hash, Comparator.EQ, secret_hash)
             .set_limit(1);
 
-        // We use AztecAddress::zero() as the owner since TransparentNote is not owned by a specific address but instead by
+        // We use AztecAddress::zero() as the owner since TransparentNote is not owned by a specific address but instead
+        // by
         // anyone who has the secret (preimage of the secret_hash stored in the note).
         let notes = self.storage.pending_shields.at(AztecAddress::zero()).pop_notes(options);
         assert(notes.len() == 1, "note not popped");
diff --git a/noir-projects/noir-contracts/contracts/app/token_blacklist_contract/src/types/transparent_note.nr b/noir-projects/noir-contracts/contracts/app/token_blacklist_contract/src/types/transparent_note.nr
index 85f941e9fcdb..7991b4d12878 100644
--- a/noir-projects/noir-contracts/contracts/app/token_blacklist_contract/src/types/transparent_note.nr
+++ b/noir-projects/noir-contracts/contracts/app/token_blacklist_contract/src/types/transparent_note.nr
@@ -18,12 +18,7 @@ pub struct TransparentNote {
 }
 
 impl NoteHash for TransparentNote {
-    fn compute_note_hash(
-        self,
-        _owner: AztecAddress,
-        storage_slot: Field,
-        randomness: Field,
-    ) -> Field {
+    fn compute_note_hash(self, _owner: AztecAddress, storage_slot: Field, randomness: Field) -> Field {
         let data = self.pack().concat([randomness]);
         compute_note_hash(storage_slot, data)
     }
diff --git a/noir-projects/noir-contracts/contracts/app/token_bridge_contract/src/config.nr b/noir-projects/noir-contracts/contracts/app/token_bridge_contract/src/config.nr
index 221a7aef1d49..fc7c24e46f90 100644
--- a/noir-projects/noir-contracts/contracts/app/token_bridge_contract/src/config.nr
+++ b/noir-projects/noir-contracts/contracts/app/token_bridge_contract/src/config.nr
@@ -1,7 +1,4 @@
-use aztec::protocol::{
-    address::{AztecAddress, EthAddress},
-    traits::{Deserialize, Packable, Serialize},
-};
+use aztec::protocol::{address::{AztecAddress, EthAddress}, traits::{Deserialize, Packable, Serialize}};
 use std::meta::derive;
 
 // PublicImmutable has constant read cost in private regardless of the size of what it stores, so we put all immutable
diff --git a/noir-projects/noir-contracts/contracts/app/token_bridge_contract/src/main.nr b/noir-projects/noir-contracts/contracts/app/token_bridge_contract/src/main.nr
index eb63074d7848..63b1911ce41e 100644
--- a/noir-projects/noir-contracts/contracts/app/token_bridge_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/app/token_bridge_contract/src/main.nr
@@ -14,8 +14,7 @@ pub contract TokenBridge {
     use aztec::{protocol::address::{AztecAddress, EthAddress}, state_vars::PublicImmutable};
 
     use token_portal_content_hash_lib::{
-        get_mint_to_private_content_hash, get_mint_to_public_content_hash,
-        get_withdraw_content_hash,
+        get_mint_to_private_content_hash, get_mint_to_public_content_hash, get_withdraw_content_hash,
     };
 
     use token::Token;
@@ -56,12 +55,7 @@ pub contract TokenBridge {
         let config = self.storage.config.read();
 
         // Consume message and emit nullifier
-        self.context.consume_l1_to_l2_message(
-            content_hash,
-            secret,
-            config.portal,
-            message_leaf_index,
-        );
+        self.context.consume_l1_to_l2_message(content_hash, secret, config.portal, message_leaf_index);
 
         // Mint tokens
         self.call(Token::at(config.token).mint_to_public(to, amount));
@@ -75,8 +69,10 @@ pub contract TokenBridge {
     fn exit_to_l1_public(
         recipient: EthAddress, // ethereum address to withdraw to
         amount: u128,
-        caller_on_l1: EthAddress, // ethereum address that can call this function on the L1 portal (0x0 if anyone can call)
-        authwit_nonce: Field, // nonce used in the approval message by `msg.sender` to let bridge burn their tokens on L2
+        caller_on_l1: EthAddress, // ethereum address that can call this function on the L1 portal (0x0 if anyone can
+        // call)
+        authwit_nonce: Field, // nonce used in the approval message by `msg.sender` to let bridge burn their tokens on
+        // L2
     ) {
         let config = self.storage.config.read();
 
@@ -115,14 +111,17 @@ pub contract TokenBridge {
     }
 
     // Burns the appropriate amount of tokens and creates a L2 to L1 withdraw message privately
-    // Requires `msg.sender` (caller of the method) to give approval to the bridge to burn tokens on their behalf using witness signatures
+    // Requires `msg.sender` (caller of the method) to give approval to the bridge to burn tokens on their behalf using
+    // witness signatures
     #[external("private")]
     fn exit_to_l1_private(
         token: AztecAddress,
         recipient: EthAddress, // ethereum address to withdraw to
         amount: u128,
-        caller_on_l1: EthAddress, // ethereum address that can call this function on the L1 portal (0x0 if anyone can call)
-        authwit_nonce: Field, // nonce used in the approval message by `msg.sender` to let bridge burn their tokens on L2
+        caller_on_l1: EthAddress, // ethereum address that can call this function on the L1 portal (0x0 if anyone can
+        // call)
+        authwit_nonce: Field, // nonce used in the approval message by `msg.sender` to let bridge burn their tokens on
+        // L2
     ) {
         let config = self.storage.config.read();
 
diff --git a/noir-projects/noir-contracts/contracts/app/token_contract/src/main.nr b/noir-projects/noir-contracts/contracts/app/token_contract/src/main.nr
index f68bc1fc0e3a..9805be627732 100644
--- a/noir-projects/noir-contracts/contracts/app/token_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/app/token_contract/src/main.nr
@@ -157,12 +157,7 @@ pub contract Token {
     // docs:start:transfer_in_public
     #[authorize_once("from", "authwit_nonce")]
     #[external("public")]
-    fn transfer_in_public(
-        from: AztecAddress,
-        to: AztecAddress,
-        amount: u128,
-        authwit_nonce: Field,
-    ) {
+    fn transfer_in_public(from: AztecAddress, to: AztecAddress, amount: u128, authwit_nonce: Field) {
         let from_balance = self.storage.public_balances.at(from).read().sub(amount);
         self.storage.public_balances.at(from).write(from_balance);
         let to_balance = self.storage.public_balances.at(to).read().add(amount);
@@ -181,12 +176,7 @@ pub contract Token {
 
     #[authorize_once("from", "authwit_nonce")]
     #[external("private")]
-    fn transfer_to_public(
-        from: AztecAddress,
-        to: AztecAddress,
-        amount: u128,
-        authwit_nonce: Field,
-    ) {
+    fn transfer_to_public(from: AztecAddress, to: AztecAddress, amount: u128, authwit_nonce: Field) {
         self.storage.balances.at(from).sub(amount).deliver(MessageDelivery.ONCHAIN_CONSTRAINED);
         self.enqueue_self._increase_public_balance(to, amount);
     }
@@ -234,14 +224,12 @@ pub contract Token {
         self.storage.balances.at(from).add(change).deliver(MessageDelivery.ONCHAIN_UNCONSTRAINED);
         self.storage.balances.at(to).add(amount).deliver(MessageDelivery.ONCHAIN_UNCONSTRAINED);
 
-        // We don't constrain encryption of the note log in `transfer` (unlike in `transfer_in_private`) because the transfer
+        // We don't constrain encryption of the note log in `transfer` (unlike in `transfer_in_private`) because the
+        // transfer
         // function is only designed to be used in situations where the event is not strictly necessary (e.g. payment to
         // another person where the payment is considered to be successful when the other party successfully decrypts a
         // note).
-        self.emit(Transfer { from, to, amount }).deliver_to(
-            to,
-            MessageDelivery.ONCHAIN_UNCONSTRAINED,
-        );
+        self.emit(Transfer { from, to, amount }).deliver_to(to, MessageDelivery.ONCHAIN_UNCONSTRAINED);
     }
 
     #[internal("private")]
@@ -281,10 +269,8 @@ pub contract Token {
         self.internal.subtract_balance(account, amount, RECURSIVE_TRANSFER_CALL_MAX_NOTES)
     }
 
-    /**
-     * Cancel a private authentication witness.
-     * @param inner_hash The inner hash of the authwit to cancel.
-     */
+    /// Cancel a private authentication witness.
+    /// @param inner_hash The inner hash of the authwit to cancel.
     // docs:start:cancel_authwit
     #[external("private")]
     fn cancel_authwit(inner_hash: Field) {
@@ -297,12 +283,7 @@ pub contract Token {
     // docs:start:transfer_in_private
     #[authorize_once("from", "authwit_nonce")]
     #[external("private")]
-    fn transfer_in_private(
-        from: AztecAddress,
-        to: AztecAddress,
-        amount: u128,
-        authwit_nonce: Field,
-    ) {
+    fn transfer_in_private(from: AztecAddress, to: AztecAddress, amount: u128, authwit_nonce: Field) {
         self.storage.balances.at(from).sub(amount).deliver(MessageDelivery.ONCHAIN_CONSTRAINED);
         self.storage.balances.at(to).add(amount).deliver(MessageDelivery.ONCHAIN_CONSTRAINED);
     }
@@ -431,11 +412,7 @@ pub contract Token {
     // `completer` (the entity that can complete the partial note) are the same so we represent them with a single
     // argument.
     #[internal("public")]
-    fn _finalize_transfer_to_private(
-        from_and_completer: AztecAddress,
-        amount: u128,
-        partial_note: PartialUintNote,
-    ) {
+    fn _finalize_transfer_to_private(from_and_completer: AztecAddress, amount: u128, partial_note: PartialUintNote) {
         // First we subtract the `amount` from the public balance of `from_and_completer`
         let balance_storage = self.storage.public_balances.at(from_and_completer);
 
@@ -443,12 +420,7 @@ pub contract Token {
         balance_storage.write(from_balance);
 
         // We finalize the transfer by completing the partial note.
-        partial_note.complete(
-            self.context,
-            from_and_completer,
-            self.storage.balances.get_storage_slot(),
-            amount,
-        );
+        partial_note.complete(self.context, from_and_completer, self.storage.balances.get_storage_slot(), amount);
     }
 
     /// Mints token `amount` to a private balance of `to`. Message sender has to have minter permissions (checked
@@ -507,12 +479,7 @@ pub contract Token {
         self.storage.total_supply.write(supply);
 
         // We finalize the transfer by completing the partial note.
-        partial_note.complete(
-            self.context,
-            completer,
-            self.storage.balances.get_storage_slot(),
-            amount,
-        );
+        partial_note.complete(self.context, completer, self.storage.balances.get_storage_slot(), amount);
     }
 
     #[external("public")]
diff --git a/noir-projects/noir-contracts/contracts/app/token_contract/src/test/access_control.nr b/noir-projects/noir-contracts/contracts/app/token_contract/src/test/access_control.nr
index c0960de33f29..c3f834ac39ac 100644
--- a/noir-projects/noir-contracts/contracts/app/token_contract/src/test/access_control.nr
+++ b/noir-projects/noir-contracts/contracts/app/token_contract/src/test/access_control.nr
@@ -5,8 +5,7 @@ use aztec::protocol::traits::ToField;
 #[test]
 unconstrained fn access_control() {
     // Setup without account contracts. We are not using authwits here, so dummy accounts are enough
-    let (env, token_contract_address, owner, new_admin) =
-        utils::setup(/* with_account_contracts */ false);
+    let (env, token_contract_address, owner, new_admin) = utils::setup(/* with_account_contracts */ false);
 
     let token = Token::at(token_contract_address);
 
diff --git a/noir-projects/noir-contracts/contracts/app/token_contract/src/test/burn_private.nr b/noir-projects/noir-contracts/contracts/app/token_contract/src/test/burn_private.nr
index 78e9c8c05210..b2dc36ed4d04 100644
--- a/noir-projects/noir-contracts/contracts/app/token_contract/src/test/burn_private.nr
+++ b/noir-projects/noir-contracts/contracts/app/token_contract/src/test/burn_private.nr
@@ -23,22 +23,16 @@ unconstrained fn burn_private_on_behalf_of_self() {
 
 #[test]
 unconstrained fn burn_private_on_behalf_of_other() {
-    let (env, token_contract_address, owner, _, mint_amount, proxy) =
-        utils::setup_and_mint_to_private_with_proxy();
+    let (env, token_contract_address, owner, _, mint_amount, proxy) = utils::setup_and_mint_to_private_with_proxy();
     let burn_amount = mint_amount / (10 as u128);
 
     // Burn on behalf of other
-    let burn_call =
-        Token::at(token_contract_address).burn_private(owner, burn_amount, AUTHWIT_NONCE);
+    let burn_call = Token::at(token_contract_address).burn_private(owner, burn_amount, AUTHWIT_NONCE);
     add_private_authwit_from_call(env, owner, proxy, burn_call);
     // Burn tokens
     env.call_private(
         owner,
-        GenericProxy::at(proxy).forward_private_3(
-            burn_call.target_contract,
-            burn_call.selector,
-            burn_call.args,
-        ),
+        GenericProxy::at(proxy).forward_private_3(burn_call.target_contract, burn_call.selector, burn_call.args),
     );
     utils::check_private_balance(
         env,
@@ -69,65 +63,47 @@ unconstrained fn burn_private_failure_on_behalf_of_self_non_zero_nonce() {
 
 #[test(should_fail_with = "Balance too low")]
 unconstrained fn burn_private_failure_on_behalf_of_other_more_than_balance() {
-    let (env, token_contract_address, owner, _, mint_amount, proxy) =
-        utils::setup_and_mint_to_public_with_proxy();
+    let (env, token_contract_address, owner, _, mint_amount, proxy) = utils::setup_and_mint_to_public_with_proxy();
 
     // Burn more than balance
     let burn_amount = mint_amount * (10 as u128);
     // Burn on behalf of other
-    let burn_call =
-        Token::at(token_contract_address).burn_private(owner, burn_amount, AUTHWIT_NONCE);
+    let burn_call = Token::at(token_contract_address).burn_private(owner, burn_amount, AUTHWIT_NONCE);
     add_private_authwit_from_call(env, owner, proxy, burn_call);
 
     env.call_private(
         owner,
-        GenericProxy::at(proxy).forward_private_3(
-            burn_call.target_contract,
-            burn_call.selector,
-            burn_call.args,
-        ),
+        GenericProxy::at(proxy).forward_private_3(burn_call.target_contract, burn_call.selector, burn_call.args),
     );
 }
 
 #[test(should_fail_with = "Unknown auth witness for message hash")]
 unconstrained fn burn_private_failure_on_behalf_of_other_without_approval() {
-    let (env, token_contract_address, owner, _, mint_amount, proxy) =
-        utils::setup_and_mint_to_public_with_proxy();
+    let (env, token_contract_address, owner, _, mint_amount, proxy) = utils::setup_and_mint_to_public_with_proxy();
 
     // Burn more than balance
     let burn_amount = mint_amount / (10 as u128);
     // Burn on behalf of other
-    let burn_call =
-        Token::at(token_contract_address).burn_private(owner, burn_amount, AUTHWIT_NONCE);
+    let burn_call = Token::at(token_contract_address).burn_private(owner, burn_amount, AUTHWIT_NONCE);
 
     env.call_private(
         owner,
-        GenericProxy::at(proxy).forward_private_3(
-            burn_call.target_contract,
-            burn_call.selector,
-            burn_call.args,
-        ),
+        GenericProxy::at(proxy).forward_private_3(burn_call.target_contract, burn_call.selector, burn_call.args),
     );
 }
 
 #[test(should_fail_with = "Unknown auth witness for message hash")]
 unconstrained fn burn_private_failure_on_behalf_of_other_wrong_designated_caller() {
-    let (env, token_contract_address, owner, _, mint_amount, proxy) =
-        utils::setup_and_mint_to_public_with_proxy();
+    let (env, token_contract_address, owner, _, mint_amount, proxy) = utils::setup_and_mint_to_public_with_proxy();
 
     // Burn more than balance
     let burn_amount = mint_amount / (10 as u128);
     // Burn on behalf of other
-    let burn_call =
-        Token::at(token_contract_address).burn_private(owner, burn_amount, AUTHWIT_NONCE);
+    let burn_call = Token::at(token_contract_address).burn_private(owner, burn_amount, AUTHWIT_NONCE);
     add_private_authwit_from_call(env, owner, owner, burn_call);
 
     env.call_private(
         owner,
-        GenericProxy::at(proxy).forward_private_3(
-            burn_call.target_contract,
-            burn_call.selector,
-            burn_call.args,
-        ),
+        GenericProxy::at(proxy).forward_private_3(burn_call.target_contract, burn_call.selector, burn_call.args),
     );
 }
diff --git a/noir-projects/noir-contracts/contracts/app/token_contract/src/test/burn_public.nr b/noir-projects/noir-contracts/contracts/app/token_contract/src/test/burn_public.nr
index 14229774c609..e64cd8d90e6c 100644
--- a/noir-projects/noir-contracts/contracts/app/token_contract/src/test/burn_public.nr
+++ b/noir-projects/noir-contracts/contracts/app/token_contract/src/test/burn_public.nr
@@ -58,10 +58,7 @@ unconstrained fn burn_public_failure_on_behalf_of_self_non_zero_nonce() {
     // Burn on behalf of self with non-zero nonce
     let burn_amount = mint_amount / (10 as u128);
     // Try to burn
-    env.call_public(
-        owner,
-        Token::at(token_contract_address).burn_public(owner, burn_amount, random()),
-    );
+    env.call_public(owner, Token::at(token_contract_address).burn_public(owner, burn_amount, random()));
 }
 
 #[test(should_fail_with = "unauthorized")]
diff --git a/noir-projects/noir-contracts/contracts/app/token_contract/src/test/mint_to_public.nr b/noir-projects/noir-contracts/contracts/app/token_contract/src/test/mint_to_public.nr
index 73eb2f2cfb18..92c5f384e2a4 100644
--- a/noir-projects/noir-contracts/contracts/app/token_contract/src/test/mint_to_public.nr
+++ b/noir-projects/noir-contracts/contracts/app/token_contract/src/test/mint_to_public.nr
@@ -17,30 +17,22 @@ unconstrained fn mint_to_public_success() {
 #[test(should_fail_with = "caller is not minter")]
 unconstrained fn mint_as_non_minter() {
     // Setup without account contracts. We are not using authwits here, so dummy accounts are enough
-    let (env, token_contract_address, _, recipient) =
-        utils::setup(/* with_account_contracts */ false);
+    let (env, token_contract_address, _, recipient) = utils::setup(/* with_account_contracts */ false);
 
     // As non-minter
     let mint_amount = 10_000 as u128;
-    env.call_public(
-        recipient,
-        Token::at(token_contract_address).mint_to_public(recipient, mint_amount),
-    );
+    env.call_public(recipient, Token::at(token_contract_address).mint_to_public(recipient, mint_amount));
 }
 
 #[test(should_fail)]
 unconstrained fn mint_overflow() {
     // Setup without account contracts. We are not using authwits here, so dummy accounts are enough
-    let (env, token_contract_address, owner, recipient) =
-        utils::setup(/* with_account_contracts */ false);
+    let (env, token_contract_address, owner, recipient) = utils::setup(/* with_account_contracts */ false);
 
     // We mint twice because each mint amount must be a valid u128
     let amount_until_overflow = 1000 as u128;
     let mint_amount = (2.pow_32(128) - amount_until_overflow as Field) as u128;
 
     env.call_public(owner, Token::at(token_contract_address).mint_to_public(recipient, mint_amount));
-    env.call_public(
-        owner,
-        Token::at(token_contract_address).mint_to_public(recipient, amount_until_overflow),
-    );
+    env.call_public(owner, Token::at(token_contract_address).mint_to_public(recipient, amount_until_overflow));
 }
diff --git a/noir-projects/noir-contracts/contracts/app/token_contract/src/test/transfer.nr b/noir-projects/noir-contracts/contracts/app/token_contract/src/test/transfer.nr
index 2d5007c97bf0..51cd5a8a3cb0 100644
--- a/noir-projects/noir-contracts/contracts/app/token_contract/src/test/transfer.nr
+++ b/noir-projects/noir-contracts/contracts/app/token_contract/src/test/transfer.nr
@@ -27,8 +27,7 @@ unconstrained fn transfer_private_to_self() {
         utils::setup_and_mint_to_private(/* with_account_contracts */ false);
     // Transfer tokens
     let transfer_amount = 1000 as u128;
-    let _ =
-        env.call_private(owner, Token::at(token_contract_address).transfer(owner, transfer_amount));
+    let _ = env.call_private(owner, Token::at(token_contract_address).transfer(owner, transfer_amount));
 
     // Check balances
     utils::check_private_balance(env, token_contract_address, owner, mint_amount);
@@ -43,10 +42,7 @@ unconstrained fn transfer_private_to_non_deployed_account() {
 
     // Transfer tokens
     let transfer_amount = 1000 as u128;
-    env.call_private(
-        owner,
-        Token::at(token_contract_address).transfer(not_deployed, transfer_amount),
-    );
+    env.call_private(owner, Token::at(token_contract_address).transfer(not_deployed, transfer_amount));
 
     // Check balances
     utils::check_private_balance(
diff --git a/noir-projects/noir-contracts/contracts/app/token_contract/src/test/transfer_in_private.nr b/noir-projects/noir-contracts/contracts/app/token_contract/src/test/transfer_in_private.nr
index 419b020e053d..a9d91c51bd4b 100644
--- a/noir-projects/noir-contracts/contracts/app/token_contract/src/test/transfer_in_private.nr
+++ b/noir-projects/noir-contracts/contracts/app/token_contract/src/test/transfer_in_private.nr
@@ -70,8 +70,7 @@ unconstrained fn transfer_private_failure_on_behalf_of_more_than_balance() {
 #[test(should_fail_with = "Unknown auth witness for message hash")]
 unconstrained fn transfer_private_failure_on_behalf_of_other_without_approval() {
     // Setup with account contracts. Slower since we actually deploy them, but needed for authwits.
-    let (env, token_contract_address, owner, recipient, _, proxy) =
-        utils::setup_and_mint_to_private_with_proxy();
+    let (env, token_contract_address, owner, recipient, _, proxy) = utils::setup_and_mint_to_private_with_proxy();
     // Add authwit
     let transfer_amount = 1000 as u128;
     let transfer_private_from_call =
@@ -90,8 +89,7 @@ unconstrained fn transfer_private_failure_on_behalf_of_other_without_approval()
 #[test(should_fail_with = "Unknown auth witness for message hash")]
 unconstrained fn transfer_private_failure_on_behalf_of_other_wrong_caller() {
     // Setup with account contracts. Slower since we actually deploy them, but needed for authwits.
-    let (env, token_contract_address, owner, recipient, _, proxy) =
-        utils::setup_and_mint_to_private_with_proxy();
+    let (env, token_contract_address, owner, recipient, _, proxy) = utils::setup_and_mint_to_private_with_proxy();
     // Add authwit
     let transfer_amount = 1000 as u128;
     let transfer_private_from_call =
diff --git a/noir-projects/noir-contracts/contracts/app/token_contract/src/test/transfer_in_private_with_offchain_delivery.nr b/noir-projects/noir-contracts/contracts/app/token_contract/src/test/transfer_in_private_with_offchain_delivery.nr
index ca28a5de4178..6d497b7e0f65 100644
--- a/noir-projects/noir-contracts/contracts/app/token_contract/src/test/transfer_in_private_with_offchain_delivery.nr
+++ b/noir-projects/noir-contracts/contracts/app/token_contract/src/test/transfer_in_private_with_offchain_delivery.nr
@@ -9,8 +9,12 @@ unconstrained fn transfer_in_private_with_offchain_delivery_updates_both_balance
         utils::setup_and_mint_to_private(/* with_account_contracts */ false);
 
     let transfer_amount = 1000 as u128;
-    let transfer_call = Token::at(token_contract_address)
-        .transfer_in_private_with_offchain_delivery(owner, recipient, transfer_amount, 0);
+    let transfer_call = Token::at(token_contract_address).transfer_in_private_with_offchain_delivery(
+        owner,
+        recipient,
+        transfer_amount,
+        0,
+    );
 
     // Transfer tokens. The offchain-delivered notes (change note for the sender, balance note for the recipient,
     // Transfer event) end up in TXE's offchain effect buffer.
@@ -20,8 +24,7 @@ unconstrained fn transfer_in_private_with_offchain_delivery_updates_both_balance
     // most `MAX_OFFCHAIN_MESSAGES_PER_RECEIVE_CALL` (16). This test only produces a handful of messages, so a single
     // batch suffices.
     let messages = env.offchain_messages();
-    let mut batch
-        : BoundedVec<_, aztec::messages::processing::offchain::MAX_OFFCHAIN_MESSAGES_PER_RECEIVE_CALL> =
+    let mut batch: BoundedVec<_, aztec::messages::processing::offchain::MAX_OFFCHAIN_MESSAGES_PER_RECEIVE_CALL> =
         BoundedVec::new();
     for i in 0..messages.len() {
         batch.push(messages.get(i));
@@ -42,8 +45,12 @@ unconstrained fn transfer_in_private_with_offchain_delivery_failure_on_behalf_of
     let (env, token_contract_address, owner, recipient, _) =
         utils::setup_and_mint_to_private(/* with_account_contracts */ false);
     let transfer_amount = 1000 as u128;
-    let transfer_call = Token::at(token_contract_address)
-        .transfer_in_private_with_offchain_delivery(owner, recipient, transfer_amount, 1);
+    let transfer_call = Token::at(token_contract_address).transfer_in_private_with_offchain_delivery(
+        owner,
+        recipient,
+        transfer_amount,
+        1,
+    );
     add_private_authwit_from_call(env, owner, recipient, transfer_call);
     env.call_private(owner, transfer_call);
 }
@@ -53,8 +60,12 @@ unconstrained fn transfer_in_private_with_offchain_delivery_failure_on_behalf_of
     let (env, token_contract_address, owner, recipient, mint_amount, proxy) =
         utils::setup_and_mint_to_private_with_proxy();
     let transfer_amount = mint_amount + (1 as u128);
-    let transfer_call = Token::at(token_contract_address)
-        .transfer_in_private_with_offchain_delivery(owner, recipient, transfer_amount, 1);
+    let transfer_call = Token::at(token_contract_address).transfer_in_private_with_offchain_delivery(
+        owner,
+        recipient,
+        transfer_amount,
+        1,
+    );
     add_private_authwit_from_call(env, owner, proxy, transfer_call);
     env.call_private(
         owner,
@@ -68,11 +79,14 @@ unconstrained fn transfer_in_private_with_offchain_delivery_failure_on_behalf_of
 
 #[test(should_fail_with = "Unknown auth witness for message hash")]
 unconstrained fn transfer_in_private_with_offchain_delivery_failure_on_behalf_of_other_without_approval() {
-    let (env, token_contract_address, owner, recipient, _, proxy) =
-        utils::setup_and_mint_to_private_with_proxy();
+    let (env, token_contract_address, owner, recipient, _, proxy) = utils::setup_and_mint_to_private_with_proxy();
     let transfer_amount = 1000 as u128;
-    let transfer_call = Token::at(token_contract_address)
-        .transfer_in_private_with_offchain_delivery(owner, recipient, transfer_amount, 1);
+    let transfer_call = Token::at(token_contract_address).transfer_in_private_with_offchain_delivery(
+        owner,
+        recipient,
+        transfer_amount,
+        1,
+    );
     env.call_private(
         owner,
         GenericProxy::at(proxy).forward_private_4(
@@ -85,11 +99,14 @@ unconstrained fn transfer_in_private_with_offchain_delivery_failure_on_behalf_of
 
 #[test(should_fail_with = "Unknown auth witness for message hash")]
 unconstrained fn transfer_in_private_with_offchain_delivery_failure_on_behalf_of_other_wrong_caller() {
-    let (env, token_contract_address, owner, recipient, _, proxy) =
-        utils::setup_and_mint_to_private_with_proxy();
+    let (env, token_contract_address, owner, recipient, _, proxy) = utils::setup_and_mint_to_private_with_proxy();
     let transfer_amount = 1000 as u128;
-    let transfer_call = Token::at(token_contract_address)
-        .transfer_in_private_with_offchain_delivery(owner, recipient, transfer_amount, 1);
+    let transfer_call = Token::at(token_contract_address).transfer_in_private_with_offchain_delivery(
+        owner,
+        recipient,
+        transfer_amount,
+        1,
+    );
     add_private_authwit_from_call(env, owner, owner, transfer_call);
     env.call_private(
         owner,
diff --git a/noir-projects/noir-contracts/contracts/app/token_contract/src/test/transfer_in_public.nr b/noir-projects/noir-contracts/contracts/app/token_contract/src/test/transfer_in_public.nr
index 7a3cd23f34c3..d8ffcab60b53 100644
--- a/noir-projects/noir-contracts/contracts/app/token_contract/src/test/transfer_in_public.nr
+++ b/noir-projects/noir-contracts/contracts/app/token_contract/src/test/transfer_in_public.nr
@@ -9,10 +9,7 @@ unconstrained fn public_transfer() {
         utils::setup_and_mint_to_public(/* with_account_contracts */ false);
     // Transfer tokens
     let transfer_amount = mint_amount / (10 as u128);
-    env.call_public(
-        owner,
-        Token::at(token_contract_address).transfer_in_public(owner, recipient, transfer_amount, 0),
-    );
+    env.call_public(owner, Token::at(token_contract_address).transfer_in_public(owner, recipient, transfer_amount, 0));
 
     // Check balances
     utils::check_public_balance(
@@ -31,10 +28,7 @@ unconstrained fn public_transfer_to_self() {
         utils::setup_and_mint_to_public(/* with_account_contracts */ false);
     // Transfer tokens
     let transfer_amount = mint_amount / (10 as u128);
-    env.call_public(
-        owner,
-        Token::at(token_contract_address).transfer_in_public(owner, owner, transfer_amount, 0),
-    );
+    env.call_public(owner, Token::at(token_contract_address).transfer_in_public(owner, owner, transfer_amount, 0));
     // Check balances
     utils::check_public_balance(env, token_contract_address, owner, mint_amount);
 }
diff --git a/noir-projects/noir-contracts/contracts/app/token_contract/src/test/transfer_to_private.nr b/noir-projects/noir-contracts/contracts/app/token_contract/src/test/transfer_to_private.nr
index 3c7714ecf348..217abbbe8ba0 100644
--- a/noir-projects/noir-contracts/contracts/app/token_contract/src/test/transfer_to_private.nr
+++ b/noir-projects/noir-contracts/contracts/app/token_contract/src/test/transfer_to_private.nr
@@ -27,16 +27,11 @@ unconstrained fn transfer_to_private_external_orchestration() {
         utils::setup_and_mint_to_public(/* with_account_contracts */ false);
 
     // We prepare the transfer
-    let partial_uint_note = env.call_private(
-        owner,
-        Token::at(token_contract_address).prepare_private_balance_increase(recipient),
-    );
+    let partial_uint_note =
+        env.call_private(owner, Token::at(token_contract_address).prepare_private_balance_increase(recipient));
 
     // Finalize the transfer of the tokens (message sender owns the tokens in public)
-    env.call_public(
-        owner,
-        Token::at(token_contract_address).finalize_transfer_to_private(amount, partial_uint_note),
-    );
+    env.call_public(owner, Token::at(token_contract_address).finalize_transfer_to_private(amount, partial_uint_note));
 
     // Recipient's private balance should be equal to the amount
     utils::check_private_balance(env, token_contract_address, recipient, amount);
@@ -51,19 +46,12 @@ unconstrained fn transfer_to_private_from_private_external_orchestration() {
         utils::setup_and_mint_to_private(/* with_account_contracts */ false);
 
     // We prepare the transfer
-    let partial_uint_note = env.call_private(
-        owner,
-        Token::at(token_contract_address).prepare_private_balance_increase(recipient),
-    );
+    let partial_uint_note =
+        env.call_private(owner, Token::at(token_contract_address).prepare_private_balance_increase(recipient));
     // Finalize the transfer of the tokens (message sender owns the tokens in public)
     env.call_private(
         owner,
-        Token::at(token_contract_address).finalize_transfer_to_private_from_private(
-            owner,
-            partial_uint_note,
-            amount,
-            0,
-        ),
+        Token::at(token_contract_address).finalize_transfer_to_private_from_private(owner, partial_uint_note, amount, 0),
     );
 
     // Recipient's private balance should be equal to the amount
@@ -84,10 +72,7 @@ unconstrained fn transfer_to_private_transfer_not_prepared() {
     let partial_uint_note = PartialUintNote::deserialize([commitment]);
 
     // Try finalizing the transfer without preparing it
-    env.call_public(
-        owner,
-        Token::at(token_contract_address).finalize_transfer_to_private(amount, partial_uint_note),
-    );
+    env.call_public(owner, Token::at(token_contract_address).finalize_transfer_to_private(amount, partial_uint_note));
 }
 
 #[test(should_fail_with = "Assertion failed: attempt to subtract with overflow")]
@@ -99,16 +84,11 @@ unconstrained fn transfer_to_private_failure_not_an_owner() {
     // (For this specific test we could set a random value for the commitment and not do the call to `prepare...`
     // as the token balance check is before we use the value but that would made the test less robust against changes
     // in the contract.)
-    let partial_uint_note = env.call_private(
-        owner,
-        Token::at(token_contract_address).prepare_private_balance_increase(not_owner),
-    );
+    let partial_uint_note =
+        env.call_private(owner, Token::at(token_contract_address).prepare_private_balance_increase(not_owner));
 
     // Try transferring someone else's token balance
-    env.call_public(
-        not_owner,
-        Token::at(token_contract_address).finalize_transfer_to_private(amount, partial_uint_note),
-    );
+    env.call_public(not_owner, Token::at(token_contract_address).finalize_transfer_to_private(amount, partial_uint_note));
 }
 
 #[test(should_fail_with = "Invalid partial note or completer")]
@@ -121,15 +101,10 @@ unconstrained fn incorrect_completer_cannot_complete_partial_note() {
     let completer = env.create_light_account();
 
     // We prepare the partial note as a completer
-    let partial_uint_note = env.call_private(
-        completer,
-        Token::at(token_contract_address).prepare_private_balance_increase(recipient),
-    );
+    let partial_uint_note =
+        env.call_private(completer, Token::at(token_contract_address).prepare_private_balance_increase(recipient));
 
     // Now we try to complete the partial note as another completer. Note that the caller here owns the tokens - this is
     // so that we pass the balance check and fail on the partial note completer check.
-    env.call_public(
-        owner,
-        Token::at(token_contract_address).finalize_transfer_to_private(amount, partial_uint_note),
-    );
+    env.call_public(owner, Token::at(token_contract_address).finalize_transfer_to_private(amount, partial_uint_note));
 }
diff --git a/noir-projects/noir-contracts/contracts/app/token_contract/src/test/transfer_to_public.nr b/noir-projects/noir-contracts/contracts/app/token_contract/src/test/transfer_to_public.nr
index 7df45b22e9d9..da1a3338e574 100644
--- a/noir-projects/noir-contracts/contracts/app/token_contract/src/test/transfer_to_public.nr
+++ b/noir-projects/noir-contracts/contracts/app/token_contract/src/test/transfer_to_public.nr
@@ -12,12 +12,7 @@ unconstrained fn transfer_to_public_on_behalf_of_self() {
     let transfer_to_public_amount = mint_amount / (10 as u128);
     env.call_private(
         owner,
-        Token::at(token_contract_address).transfer_to_public(
-            owner,
-            owner,
-            transfer_to_public_amount,
-            0,
-        ),
+        Token::at(token_contract_address).transfer_to_public(owner, owner, transfer_to_public_amount, 0),
     );
     utils::check_private_balance(
         env,
@@ -39,12 +34,8 @@ unconstrained fn transfer_to_public_on_behalf_of_other() {
         utils::setup_and_mint_to_private_with_proxy();
 
     let transfer_to_public_amount = mint_amount / (10 as u128);
-    let transfer_to_public_call = Token::at(token_contract_address).transfer_to_public(
-        owner,
-        recipient,
-        transfer_to_public_amount,
-        0,
-    );
+    let transfer_to_public_call =
+        Token::at(token_contract_address).transfer_to_public(owner, recipient, transfer_to_public_amount, 0);
     add_private_authwit_from_call(env, owner, proxy, transfer_to_public_call);
     // transfer_to_public tokens
     env.call_private(
@@ -78,12 +69,7 @@ unconstrained fn transfer_to_public_failure_more_than_balance() {
     let transfer_to_public_amount = mint_amount + (1 as u128);
     env.call_private(
         owner,
-        Token::at(token_contract_address).transfer_to_public(
-            owner,
-            owner,
-            transfer_to_public_amount,
-            0,
-        ),
+        Token::at(token_contract_address).transfer_to_public(owner, owner, transfer_to_public_amount, 0),
     );
 }
 
@@ -96,12 +82,7 @@ unconstrained fn transfer_to_public_failure_on_behalf_of_self_non_zero_nonce() {
     let transfer_to_public_amount = mint_amount + (1 as u128);
     env.call_private(
         owner,
-        Token::at(token_contract_address).transfer_to_public(
-            owner,
-            owner,
-            transfer_to_public_amount,
-            random(),
-        ),
+        Token::at(token_contract_address).transfer_to_public(owner, owner, transfer_to_public_amount, random()),
     );
 }
 
@@ -111,12 +92,8 @@ unconstrained fn transfer_to_public_failure_on_behalf_of_other_more_than_balance
         utils::setup_and_mint_to_private_with_proxy();
 
     let transfer_to_public_amount = mint_amount + (1 as u128);
-    let transfer_to_public_call = Token::at(token_contract_address).transfer_to_public(
-        owner,
-        recipient,
-        transfer_to_public_amount,
-        0,
-    );
+    let transfer_to_public_call =
+        Token::at(token_contract_address).transfer_to_public(owner, recipient, transfer_to_public_amount, 0);
     add_private_authwit_from_call(env, owner, proxy, transfer_to_public_call);
 
     // transfer_to_public tokens
@@ -136,12 +113,8 @@ unconstrained fn transfer_to_public_failure_on_behalf_of_other_invalid_designate
         utils::setup_and_mint_to_private_with_proxy();
 
     let transfer_to_public_amount = mint_amount + (1 as u128);
-    let transfer_to_public_call = Token::at(token_contract_address).transfer_to_public(
-        owner,
-        recipient,
-        transfer_to_public_amount,
-        0,
-    );
+    let transfer_to_public_call =
+        Token::at(token_contract_address).transfer_to_public(owner, recipient, transfer_to_public_amount, 0);
     add_private_authwit_from_call(env, owner, owner, transfer_to_public_call);
 
     // transfer_to_public tokens
@@ -161,12 +134,8 @@ unconstrained fn transfer_to_public_failure_on_behalf_of_other_no_approval() {
         utils::setup_and_mint_to_private_with_proxy();
 
     let transfer_to_public_amount = mint_amount + (1 as u128);
-    let transfer_to_public_call = Token::at(token_contract_address).transfer_to_public(
-        owner,
-        recipient,
-        transfer_to_public_amount,
-        0,
-    );
+    let transfer_to_public_call =
+        Token::at(token_contract_address).transfer_to_public(owner, recipient, transfer_to_public_amount, 0);
 
     // transfer_to_public tokens
     env.call_private(
diff --git a/noir-projects/noir-contracts/contracts/app/token_contract/src/test/transfer_to_public_and_prepare_private_balance_increase.nr b/noir-projects/noir-contracts/contracts/app/token_contract/src/test/transfer_to_public_and_prepare_private_balance_increase.nr
index c6a654234f1c..16439f79ed0f 100644
--- a/noir-projects/noir-contracts/contracts/app/token_contract/src/test/transfer_to_public_and_prepare_private_balance_increase.nr
+++ b/noir-projects/noir-contracts/contracts/app/token_contract/src/test/transfer_to_public_and_prepare_private_balance_increase.nr
@@ -1,8 +1,7 @@
 use crate::test::utils;
 use crate::Token;
 use aztec::{
-    oracle::random::random, protocol::traits::Deserialize,
-    test::helpers::authwit::add_private_authwit_from_call,
+    oracle::random::random, protocol::traits::Deserialize, test::helpers::authwit::add_private_authwit_from_call,
 };
 use generic_proxy_contract::GenericProxy;
 use uint_note::PartialUintNote;
@@ -21,13 +20,12 @@ unconstrained fn transfer_to_public_and_prepare_private_balance_increase_and_fin
         utils::setup_and_mint_to_private_with_proxy();
 
     let deposit_amount: u128 = mint_amount / (10 as u128);
-    let transfer_call = Token::at(token_contract_address)
-        .transfer_to_public_and_prepare_private_balance_increase(
-            liquidity_provider,
-            proxy,
-            deposit_amount,
-            1,
-        );
+    let transfer_call = Token::at(token_contract_address).transfer_to_public_and_prepare_private_balance_increase(
+        liquidity_provider,
+        proxy,
+        deposit_amount,
+        1,
+    );
 
     // Add authwit such that the proxy can transfer the deposit amount of the liquidity provider to the public balance
     // of itself.
@@ -57,10 +55,7 @@ unconstrained fn transfer_to_public_and_prepare_private_balance_increase_and_fin
     // --> this should send the `change_amount` from proxy's public balance to liquidity provider's private balance
     let change_amount = deposit_amount / (2 as u128);
 
-    env.call_public(
-        proxy,
-        Token::at(token_contract_address).finalize_transfer_to_private(change_amount, partial_note),
-    );
+    env.call_public(proxy, Token::at(token_contract_address).finalize_transfer_to_private(change_amount, partial_note));
 
     // Check balances after the partial note is finalized
     utils::check_private_balance(
@@ -121,13 +116,12 @@ unconstrained fn transfer_to_public_and_prepare_private_balance_increase_failure
     let transfer_amount = mint_amount / (10 as u128);
 
     // Try executing transfer without approval
-    let transfer_call = Token::at(token_contract_address)
-        .transfer_to_public_and_prepare_private_balance_increase(
-            sender,
-            recipient,
-            transfer_amount,
-            1,
-        );
+    let transfer_call = Token::at(token_contract_address).transfer_to_public_and_prepare_private_balance_increase(
+        sender,
+        recipient,
+        transfer_amount,
+        1,
+    );
     env.call_private(
         sender,
         GenericProxy::at(proxy).forward_private_4(
diff --git a/noir-projects/noir-contracts/contracts/app/token_contract/src/test/utils.nr b/noir-projects/noir-contracts/contracts/app/token_contract/src/test/utils.nr
index 67edae1007d3..a11f72f9bfca 100644
--- a/noir-projects/noir-contracts/contracts/app/token_contract/src/test/utils.nr
+++ b/noir-projects/noir-contracts/contracts/app/token_contract/src/test/utils.nr
@@ -18,14 +18,9 @@ pub unconstrained fn setup(
     };
 
     // Deploy token contract
-    let initializer_call = Token::interface().constructor(
-        owner,
-        "TestToken0000000000000000000000",
-        "TT00000000000000000000000000000",
-        18,
-    );
-    let token_contract_address =
-        env.deploy("Token").with_public_initializer(owner, initializer_call);
+    let initializer_call =
+        Token::interface().constructor(owner, "TestToken0000000000000000000000", "TT00000000000000000000000000000", 18);
+    let token_contract_address = env.deploy("Token").with_public_initializer(owner, initializer_call);
     (env, token_contract_address, owner, recipient)
 }
 
@@ -68,10 +63,7 @@ pub unconstrained fn check_public_balance(
     address: AztecAddress,
     address_amount: u128,
 ) {
-    assert_eq(
-        env.view_public(Token::at(token_contract_address).balance_of_public(address)),
-        address_amount,
-    );
+    assert_eq(env.view_public(Token::at(token_contract_address).balance_of_public(address)), address_amount);
 }
 
 pub unconstrained fn check_private_balance(
@@ -80,10 +72,7 @@ pub unconstrained fn check_private_balance(
     address: AztecAddress,
     address_amount: u128,
 ) {
-    assert_eq(
-        env.execute_utility(Token::at(token_contract_address).balance_of_private(address)),
-        address_amount,
-    );
+    assert_eq(env.execute_utility(Token::at(token_contract_address).balance_of_private(address)), address_amount);
 }
 
 // While authwits authorize a contract to perform an action, spending private notes still requires
diff --git a/noir-projects/noir-contracts/contracts/app/uniswap_contract/src/main.nr b/noir-projects/noir-contracts/contracts/app/uniswap_contract/src/main.nr
index dd0fe64eea4a..9ff9dbb511da 100644
--- a/noir-projects/noir-contracts/contracts/app/uniswap_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/app/uniswap_contract/src/main.nr
@@ -9,15 +9,10 @@ use aztec::macros::aztec;
 pub contract Uniswap {
     use aztec::{
         authwit::auth::{
-            assert_current_call_valid_authwit_public, compute_authwit_message_hash_from_call,
-            set_authorized,
+            assert_current_call_valid_authwit_public, compute_authwit_message_hash_from_call, set_authorized,
         },
         macros::{functions::{external, initializer, only_self}, storage::storage},
-        protocol::{
-            abis::function_selector::FunctionSelector,
-            address::{AztecAddress, EthAddress},
-            traits::ToField,
-        },
+        protocol::{abis::function_selector::FunctionSelector, address::{AztecAddress, EthAddress}, traits::ToField},
         state_vars::PublicImmutable,
     };
 
@@ -58,8 +53,7 @@ pub contract Uniswap {
             assert_current_call_valid_authwit_public(self.context, sender);
         }
 
-        let input_asset_bridge_config =
-            self.view(TokenBridge::at(input_asset_bridge).get_config_public());
+        let input_asset_bridge_config = self.view(TokenBridge::at(input_asset_bridge).get_config_public());
 
         let input_asset = input_asset_bridge_config.token;
         let input_asset_bridge_portal_address = input_asset_bridge_config.portal;
@@ -73,24 +67,15 @@ pub contract Uniswap {
         ));
 
         // Approve bridge to burn this contract's funds and exit to L1 Uniswap Portal
-        let _ = self.call_self._approve_bridge_and_exit_input_asset_to_L1(
-            input_asset,
-            input_asset_bridge,
-            input_amount,
-        );
+        let _ =
+            self.call_self._approve_bridge_and_exit_input_asset_to_L1(input_asset, input_asset_bridge, input_amount);
         // Create swap message and send to Outbox for Uniswap Portal
         // this ensures the integrity of what the user originally intends to do on L1.
         let output_asset_bridge_portal_address =
             self.view(TokenBridge::at(output_asset_bridge).get_config_public()).portal;
         // ensure portal exists - else funds might be lost
-        assert(
-            !input_asset_bridge_portal_address.is_zero(),
-            "L1 portal address of input_asset's bridge is 0",
-        );
-        assert(
-            !output_asset_bridge_portal_address.is_zero(),
-            "L1 portal address of output_asset's bridge is 0",
-        );
+        assert(!input_asset_bridge_portal_address.is_zero(), "L1 portal address of input_asset's bridge is 0");
+        assert(!output_asset_bridge_portal_address.is_zero(), "L1 portal address of output_asset's bridge is 0");
 
         let content_hash = compute_swap_public_content_hash(
             input_asset_bridge_portal_address,
@@ -107,7 +92,8 @@ pub contract Uniswap {
 
     #[external("private")]
     fn swap_private(
-        input_asset: AztecAddress, // since private, we pass here and later assert that this is as expected by input_bridge
+        input_asset: AztecAddress, // since private, we pass here and later assert that this is as expected by
+        // input_bridge
         input_asset_bridge: AztecAddress,
         input_amount: u128,
         output_asset_bridge: AztecAddress,
@@ -117,15 +103,17 @@ pub contract Uniswap {
         uniswap_fee_tier: Field, // which uniswap tier to use (eg 3000 for 0.3% fee)
         minimum_output_amount: u128, // minimum output amount to receive (slippage protection for the swap)
         // params for the depositing output_asset back to Aztec
-        secret_hash_for_L1_to_l2_message: Field, // for when l1 uniswap portal inserts the message to consume output assets on L2
-        caller_on_L1: EthAddress, // ethereum address that can call this function on the L1 portal (0x0 if anyone can call)
+        secret_hash_for_L1_to_l2_message: Field, // for when l1 uniswap portal inserts the message to consume output
+        // assets on L2
+        caller_on_L1: EthAddress, // ethereum address that can call this function on the L1 portal (0x0 if anyone can
+        // call)
     ) {
         let input_asset_bridge_config = self.view(TokenBridge::at(input_asset_bridge).get_config());
-        let output_asset_bridge_config =
-            self.view(TokenBridge::at(output_asset_bridge).get_config());
+        let output_asset_bridge_config = self.view(TokenBridge::at(output_asset_bridge).get_config());
 
         // Assert that user provided token address is same as expected by token bridge.
-        // we can't directly use `input_asset_bridge.token` because that is a public method and public can't return data to private
+        // we can't directly use `input_asset_bridge.token` because that is a public method and public can't return data
+        // to private
         assert(
             input_asset.eq(input_asset_bridge_config.token),
             "input_asset address is not the same as seen in the bridge contract",
@@ -140,24 +128,14 @@ pub contract Uniswap {
         ));
 
         // Approve bridge to burn this contract's funds and exit to L1 Uniswap Portal
-        self.enqueue_self._approve_bridge_and_exit_input_asset_to_L1(
-            input_asset,
-            input_asset_bridge,
-            input_amount,
-        );
+        self.enqueue_self._approve_bridge_and_exit_input_asset_to_L1(input_asset, input_asset_bridge, input_amount);
 
         // Create swap message and send to Outbox for Uniswap Portal
         // this ensures the integrity of what the user originally intends to do on L1.
 
         // ensure portal exists - else funds might be lost
-        assert(
-            !input_asset_bridge_config.portal.is_zero(),
-            "L1 portal address of input_asset's bridge is 0",
-        );
-        assert(
-            !output_asset_bridge_config.portal.is_zero(),
-            "L1 portal address of output_asset's bridge is 0",
-        );
+        assert(!input_asset_bridge_config.portal.is_zero(), "L1 portal address of input_asset's bridge is 0");
+        assert(!output_asset_bridge_config.portal.is_zero(), "L1 portal address of output_asset's bridge is 0");
 
         let content_hash = compute_swap_private_content_hash(
             input_asset_bridge_config.portal,
@@ -179,11 +157,7 @@ pub contract Uniswap {
     // this method is used for both private and public swaps.
     #[external("public")]
     #[only_self]
-    fn _approve_bridge_and_exit_input_asset_to_L1(
-        token: AztecAddress,
-        token_bridge: AztecAddress,
-        amount: u128,
-    ) {
+    fn _approve_bridge_and_exit_input_asset_to_L1(token: AztecAddress, token_bridge: AztecAddress, amount: u128) {
         // Since we will authorize and instantly spend the funds, all in public, we can use the same nonce
         // every interaction. In practice, the authwit should be squashed, so this is also cheap!
         let authwit_nonce = 0xdeadbeef;
diff --git a/noir-projects/noir-contracts/contracts/app/uniswap_contract/src/util.nr b/noir-projects/noir-contracts/contracts/app/uniswap_contract/src/util.nr
index 0398530870d4..4afee0912870 100644
--- a/noir-projects/noir-contracts/contracts/app/uniswap_contract/src/util.nr
+++ b/noir-projects/noir-contracts/contracts/app/uniswap_contract/src/util.nr
@@ -13,16 +13,13 @@ pub fn compute_swap_public_content_hash(
     caller_on_L1: EthAddress,
 ) -> Field {
     let mut hash_bytes = [0; 260]; // 8 fields of 32 bytes each + 4 bytes fn selector
-    let input_token_portal_bytes: [u8; 32] =
-        input_asset_bridge_portal_address.to_field().to_be_bytes();
+    let input_token_portal_bytes: [u8; 32] = input_asset_bridge_portal_address.to_field().to_be_bytes();
     let in_amount_bytes: [u8; 32] = input_amount.to_field().to_be_bytes();
     let uniswap_fee_tier_bytes: [u8; 32] = uniswap_fee_tier.to_be_bytes();
-    let output_token_portal_bytes: [u8; 32] =
-        output_asset_bridge_portal_address.to_field().to_be_bytes();
+    let output_token_portal_bytes: [u8; 32] = output_asset_bridge_portal_address.to_field().to_be_bytes();
     let amount_out_min_bytes: [u8; 32] = minimum_output_amount.to_field().to_be_bytes();
     let aztec_recipient_bytes: [u8; 32] = aztec_recipient.to_field().to_be_bytes();
-    let secret_hash_for_L1_to_l2_message_bytes: [u8; 32] =
-        secret_hash_for_L1_to_l2_message.to_be_bytes();
+    let secret_hash_for_L1_to_l2_message_bytes: [u8; 32] = secret_hash_for_L1_to_l2_message.to_be_bytes();
     let caller_on_L1_bytes: [u8; 32] = caller_on_L1.to_field().to_be_bytes();
 
     // The purpose of including the following selector is to make the message unique to that specific call. Note that
@@ -66,15 +63,12 @@ pub fn compute_swap_private_content_hash(
     caller_on_L1: EthAddress,
 ) -> Field {
     let mut hash_bytes = [0; 228]; // 7 fields of 32 bytes each + 4 bytes fn selector
-    let input_token_portal_bytes: [u8; 32] =
-        input_asset_bridge_portal_address.to_field().to_be_bytes();
+    let input_token_portal_bytes: [u8; 32] = input_asset_bridge_portal_address.to_field().to_be_bytes();
     let in_amount_bytes: [u8; 32] = input_amount.to_field().to_be_bytes();
     let uniswap_fee_tier_bytes: [u8; 32] = uniswap_fee_tier.to_be_bytes();
-    let output_token_portal_bytes: [u8; 32] =
-        output_asset_bridge_portal_address.to_field().to_be_bytes();
+    let output_token_portal_bytes: [u8; 32] = output_asset_bridge_portal_address.to_field().to_be_bytes();
     let amount_out_min_bytes: [u8; 32] = minimum_output_amount.to_field().to_be_bytes();
-    let secret_hash_for_L1_to_l2_message_bytes: [u8; 32] =
-        secret_hash_for_L1_to_l2_message.to_be_bytes();
+    let secret_hash_for_L1_to_l2_message_bytes: [u8; 32] = secret_hash_for_L1_to_l2_message.to_be_bytes();
     let caller_on_L1_bytes: [u8; 32] = caller_on_L1.to_field().to_be_bytes();
 
     // The purpose of including the following selector is to make the message unique to that specific call. Note that
diff --git a/noir-projects/noir-contracts/contracts/fees/fpc_contract/src/main.nr b/noir-projects/noir-contracts/contracts/fees/fpc_contract/src/main.nr
index a5e4647a0f57..fa592f473c5c 100644
--- a/noir-projects/noir-contracts/contracts/fees/fpc_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/fees/fpc_contract/src/main.nr
@@ -17,10 +17,7 @@ use aztec::macros::aztec;
 pub contract FPC {
     use crate::{config::Config, utils::safe_cast_to_u128};
     use aztec::{
-        macros::{
-            functions::{allow_phase_change, external, initializer, only_self},
-            storage::storage,
-        },
+        macros::{functions::{allow_phase_change, external, initializer, only_self}, storage::storage},
         protocol::address::AztecAddress,
         state_vars::PublicImmutable,
     };
@@ -99,12 +96,9 @@ pub contract FPC {
         // Prepare a partial note for the refund for the user.
         let partial_note = self.call(token.prepare_private_balance_increase(user));
 
-        // Set a public teardown function in which the refund will be paid back to the user by finalizing the partial note.
-        self.set_as_teardown(FPC::at(self.address)._complete_refund(
-            accepted_asset,
-            partial_note,
-            max_fee,
-        ));
+        // Set a public teardown function in which the refund will be paid back to the user by finalizing the partial
+        // note.
+        self.set_as_teardown(FPC::at(self.address)._complete_refund(accepted_asset, partial_note, max_fee));
 
         // Set the FPC as the fee payer of the tx.
         self.context.set_as_fee_payer();
@@ -116,11 +110,7 @@ pub contract FPC {
     /// flow.
     #[external("public")]
     #[only_self]
-    fn _complete_refund(
-        accepted_asset: AztecAddress,
-        partial_note: PartialUintNote,
-        max_fee: u128,
-    ) {
+    fn _complete_refund(accepted_asset: AztecAddress, partial_note: PartialUintNote, max_fee: u128) {
         let tx_fee = safe_cast_to_u128(self.context.transaction_fee());
 
         // 1. Check that user funded the fee payer contract with at least the transaction fee.
@@ -131,9 +121,7 @@ pub contract FPC {
         // TODO(#10805): Introduce a real exchange rate
         let refund_amount = max_fee - tx_fee;
 
-        Token::at(accepted_asset).finalize_transfer_to_private(refund_amount, partial_note).call(
-            self.context,
-        );
+        Token::at(accepted_asset).finalize_transfer_to_private(refund_amount, partial_note).call(self.context);
     }
 
     /// Pays for the tx fee with msg_sender's public balance of accepted asset (AA). The maximum fee a user is willing
@@ -171,11 +159,7 @@ pub contract FPC {
         ));
         // docs:end:public_call
 
-        self.set_as_teardown(FPC::at(self.address)._pay_refund(
-            self.msg_sender(),
-            max_fee,
-            config.accepted_asset,
-        ));
+        self.set_as_teardown(FPC::at(self.address)._pay_refund(self.msg_sender(), max_fee, config.accepted_asset));
 
         // Set the FPC as the fee payer of the tx.
         self.context.set_as_fee_payer();
@@ -195,12 +179,7 @@ pub contract FPC {
         // TODO(#10805): Introduce a real exchange rate
         let refund = max_fee - actual_fee;
 
-        self.call(Token::at(accepted_asset).transfer_in_public(
-            self.address,
-            refund_recipient,
-            refund,
-            0,
-        ));
+        self.call(Token::at(accepted_asset).transfer_in_public(self.address, refund_recipient, refund, 0));
     }
 
     /// Pulls all the accepted asset funds from this contract to the `to` address. Only the admin can call
diff --git a/noir-projects/noir-contracts/contracts/message_discovery/handshake_registry_contract/Nargo.toml b/noir-projects/noir-contracts/contracts/message_discovery/handshake_registry_contract/Nargo.toml
new file mode 100644
index 000000000000..9ce353b45066
--- /dev/null
+++ b/noir-projects/noir-contracts/contracts/message_discovery/handshake_registry_contract/Nargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "handshake_registry_contract"
+authors = [""]
+compiler_version = ">=0.25.0"
+type = "contract"
+
+[dependencies]
+aztec = { path = "../../../../aztec-nr/aztec" }
diff --git a/noir-projects/noir-contracts/contracts/message_discovery/handshake_registry_contract/src/handshake_note.nr b/noir-projects/noir-contracts/contracts/message_discovery/handshake_registry_contract/src/handshake_note.nr
new file mode 100644
index 000000000000..1dcab11ae235
--- /dev/null
+++ b/noir-projects/noir-contracts/contracts/message_discovery/handshake_registry_contract/src/handshake_note.nr
@@ -0,0 +1,43 @@
+use aztec::{
+    macros::notes::note,
+    protocol::{
+        address::AztecAddress,
+        constants::DOM_SEP__HANDSHAKE_SECRET_HASH,
+        hash::poseidon2_hash_with_separator,
+        point::Point,
+        traits::{Deserialize, Packable, Serialize},
+    },
+};
+
+/// A record of a handshake established by the note's owner (the sender).
+///
+/// Stored in [`crate::HandshakeRegistry`]'s `handshakes` set. Holds the **hash** of the master shared secret.
+/// A contract that wants to use this handshake will later prove the note's existence and
+/// use the kernel key-validation mechanism to derive its own app-siloed secret from the master, so
+/// the master is never exposed to dependent contracts.
+#[derive(Deserialize, Eq, Packable, Serialize)]
+#[note]
+pub struct HandshakeNote {
+    /// Hash of the master shared secret: `poseidon2_hash_with_separator([S.x, S.y], DOM_SEP__HANDSHAKE_SECRET_HASH)`
+    /// over the raw ECDH point `S = eph_sk * recipient_address_point`.
+    pub secret_hash: Field,
+    /// Stored so contracts can constrain the kind of handshake they accept (e.g. an app may want to require interactive
+    /// handshakes only).
+    pub handshake_type: u8,
+    /// The recipient this handshake authorizes. Part of the note preimage so a contract proving note
+    /// existence can bind the proof to the intended recipient.
+    pub recipient: AztecAddress,
+}
+
+impl HandshakeNote {
+    pub fn new(shared_secret: Point, handshake_type: u8, recipient: AztecAddress) -> Self {
+        Self {
+            secret_hash: poseidon2_hash_with_separator(
+                [shared_secret.x, shared_secret.y],
+                DOM_SEP__HANDSHAKE_SECRET_HASH,
+            ),
+            handshake_type,
+            recipient,
+        }
+    }
+}
diff --git a/noir-projects/noir-contracts/contracts/message_discovery/handshake_registry_contract/src/main.nr b/noir-projects/noir-contracts/contracts/message_discovery/handshake_registry_contract/src/main.nr
new file mode 100644
index 000000000000..08523cf279ec
--- /dev/null
+++ b/noir-projects/noir-contracts/contracts/message_discovery/handshake_registry_contract/src/main.nr
@@ -0,0 +1,111 @@
+use aztec::macros::aztec;
+mod handshake_note;
+mod test;
+
+/// Handshake type identifier for non-interactive handshakes (sender-generated random shared secret, no recipient
+/// signature). See [`HandshakeRegistry::non_interactive_handshake`].
+pub(crate) global NON_INTERACTIVE_HANDSHAKE: u8 = 1;
+
+/// Registry for the constrained-delivery shared-secret handshake protocol.
+///
+/// The registry's job is to establish a master shared secret between a sender and a recipient, and to store a
+/// per-sender note recording that the handshake happened. A contract that later wants to use this
+/// handshake retrieves the note via the [`HandshakeRegistry::get_handshake`] utility, asserts it exists in the
+/// registry,
+/// and uses the kernel key-validation mechanism to derive its own app-siloed shared secret from the master hash stored
+/// in the note.
+///
+/// Currently only implements the non-interactive flow (see [`HandshakeRegistry::non_interactive_handshake`]).
+#[aztec]
+pub contract HandshakeRegistry {
+    use crate::handshake_note::HandshakeNote;
+    use crate::NON_INTERACTIVE_HANDSHAKE;
+    use aztec::{
+        keys::{ecdh_shared_secret::derive_ecdh_shared_secret, ephemeral::generate_positive_ephemeral_key_pair},
+        macros::{functions::external, storage::storage},
+        messages::message_delivery::MessageDelivery,
+        note::note_viewer_options::NoteViewerOptions,
+        oracle::notes::set_sender_for_tags,
+        protocol::{
+            address::AztecAddress, constants::DOM_SEP__NON_INTERACTIVE_HANDSHAKE_LOG_TAG, hash::compute_log_tag,
+            traits::ToField,
+        },
+        state_vars::{Owned, PrivateSet},
+    };
+
+    #[storage]
+    struct Storage<Context> {
+        /// Per-sender set of [`HandshakeNote`]s. The sender is chosen by the caller and is unconstrained throughout the
+        /// constrained-delivery protocol.
+        handshakes: Owned<PrivateSet<HandshakeNote, Context>, Context>,
+    }
+
+    /// Performs a non-interactive handshake from `sender` to `recipient`.
+    ///
+    /// Generates a fresh ephemeral key pair `(eph_sk, eph_pk)`, computes the raw ECDH shared secret point
+    /// `S = eph_sk * recipient_address_point`, and produces two effects:
+    ///
+    /// 1. Inserts a [`HandshakeNote`] owned by `sender`.
+    /// 2. Emits a 1-field private log under a recipient-keyed tag with payload `[eph_pk.x]`. The recipient
+    ///    discovers handshakes addressed to them by scanning their tag and recovers the master shared secret
+    ///    from `eph_pk` via their own ECDH (`recipient_isk * eph_pk`). `eph_pk.y` is fixed positive by the
+    ///    [`generate_positive_ephemeral_key_pair`] convention, so only `eph_pk.x` is transmitted.
+    ///
+    /// # Panics
+    /// If `recipient` is not a valid curve point. There are no upstream side effects in this call frame to
+    /// protect, and a fallback would insert a permanent note recording a handshake with an invalid recipient,
+    /// polluting registry state.
+    #[external("private")]
+    fn non_interactive_handshake(sender: AztecAddress, recipient: AztecAddress) {
+        let recipient_point = recipient.to_address_point().expect(f"recipient address is not on the curve");
+
+        let (eph_sk, eph_pk) = generate_positive_ephemeral_key_pair();
+        let s_raw = derive_ecdh_shared_secret(eph_sk, recipient_point.inner);
+
+        let note = HandshakeNote::new(s_raw, NON_INTERACTIVE_HANDSHAKE, recipient);
+
+        // Safety: The sender for tags is only used to compute unconstrained shared secrets for emitting logs, so it
+        // is safe to set from a constrained context.
+        unsafe { set_sender_for_tags(sender) };
+        // Delivery is `ONCHAIN_UNCONSTRAINED`. The recipient is not involved in this note's delivery. They
+        // discover the handshake via the recipient-keyed log emitted below, not via the sender's note.
+        // We use onchain unconstrained delivery rather than `OFFCHAIN` so the note is
+        // discoverable via normal PXE sync.
+        self.storage.handshakes.at(sender).insert(note).deliver(MessageDelivery.ONCHAIN_UNCONSTRAINED);
+
+        let log_tag = compute_log_tag(
+            recipient.to_field(),
+            DOM_SEP__NON_INTERACTIVE_HANDSHAKE_LOG_TAG,
+        );
+        self.context.emit_private_log_vec_unsafe(log_tag, BoundedVec::from_array([eph_pk.x]));
+    }
+
+    /// Returns the most recently inserted [`HandshakeNote`] held for `sender` matching
+    /// `(recipient, handshake_type)`, or `None` if no such note exists.
+    ///
+    /// Returning the latest (rather than the first) lets a sender re-initiate by issuing a fresh handshake; e.g.
+    /// if the previous secret was leaked.
+    ///
+    /// This is the discovery surface a contract uses to obtain a note hint before asserting existence
+    /// of the note at this registry's address.
+    #[external("utility")]
+    unconstrained fn get_handshake(
+        sender: AztecAddress,
+        recipient: AztecAddress,
+        handshake_type: u8,
+    ) -> Option<HandshakeNote> {
+        // We pull all notes for `sender` and filter (recipient, handshake_type) below, walking from the end so the
+        // first hit is the most recently inserted match.
+        let notes = self.storage.handshakes.at(sender).view_notes(NoteViewerOptions::new());
+        let mut found = Option::none();
+        let len = notes.len();
+        for i in 0..len {
+            let note = notes.get(len - 1 - i);
+            if (note.recipient == recipient) & (note.handshake_type == handshake_type) {
+                found = Option::some(note);
+                break;
+            }
+        }
+        found
+    }
+}
diff --git a/noir-projects/noir-contracts/contracts/message_discovery/handshake_registry_contract/src/test.nr b/noir-projects/noir-contracts/contracts/message_discovery/handshake_registry_contract/src/test.nr
new file mode 100644
index 000000000000..53ce5d2731cc
--- /dev/null
+++ b/noir-projects/noir-contracts/contracts/message_discovery/handshake_registry_contract/src/test.nr
@@ -0,0 +1,247 @@
+use crate::{HandshakeRegistry, NON_INTERACTIVE_HANDSHAKE};
+
+use aztec::{
+    protocol::{
+        address::AztecAddress,
+        constants::DOM_SEP__NON_INTERACTIVE_HANDSHAKE_LOG_TAG,
+        hash::{compute_log_tag, compute_siloed_private_log_first_field},
+        traits::{FromField, ToField},
+    },
+    test::helpers::{test_environment::TestEnvironment, txe_oracles},
+};
+
+unconstrained fn setup() -> (TestEnvironment, AztecAddress, AztecAddress, AztecAddress, AztecAddress) {
+    let mut env = TestEnvironment::new();
+
+    let sender = env.create_light_account();
+    let other_sender = env.create_light_account();
+    let recipient = env.create_light_account();
+
+    let registry_address = env.deploy("HandshakeRegistry").without_initializer();
+
+    (env, registry_address, sender, other_sender, recipient)
+}
+
+unconstrained fn setup_with_two_recipients() -> (TestEnvironment, AztecAddress, AztecAddress, AztecAddress, AztecAddress) {
+    let mut env = TestEnvironment::new();
+
+    let sender = env.create_light_account();
+    let recipient_a = env.create_light_account();
+    let recipient_b = env.create_light_account();
+
+    let registry_address = env.deploy("HandshakeRegistry").without_initializer();
+
+    (env, registry_address, sender, recipient_a, recipient_b)
+}
+
+#[test]
+unconstrained fn non_interactive_handshake_stores_recipient_bound_note_at_sender() {
+    let (env, registry_address, sender, _, recipient) = setup();
+    let registry = HandshakeRegistry::at(registry_address);
+
+    env.call_private(sender, registry.non_interactive_handshake(sender, recipient));
+
+    let note = env.execute_utility(registry.get_handshake(sender, recipient, NON_INTERACTIVE_HANDSHAKE)).expect(
+        f"handshake note should be present",
+    );
+    assert_eq(note.handshake_type, NON_INTERACTIVE_HANDSHAKE);
+    assert_eq(note.recipient, recipient);
+    // TODO: `secret_hash` is the hash of the raw ECDH point components. Without an storing the raw point in an oracle
+    // we
+    // can't reconstruct it from the recipient's side here, so we just check that something non-zero was stored.
+    assert(note.secret_hash != 0, "secret_hash should be set");
+}
+
+#[test]
+unconstrained fn handshakes_are_isolated_per_sender() {
+    let (env, registry_address, sender, other_sender, recipient) = setup();
+    let registry = HandshakeRegistry::at(registry_address);
+
+    env.call_private(sender, registry.non_interactive_handshake(sender, recipient));
+    assert(
+        env.execute_utility(registry.get_handshake(other_sender, recipient, NON_INTERACTIVE_HANDSHAKE)).is_none(),
+        "other sender should not see primary sender's handshake",
+    );
+
+    env.call_private(other_sender, registry.non_interactive_handshake(other_sender, recipient));
+
+    let sender_note = env.execute_utility(registry.get_handshake(sender, recipient, NON_INTERACTIVE_HANDSHAKE)).expect(
+        f"primary sender should see its handshake",
+    );
+    let other_sender_note = env
+        .execute_utility(registry.get_handshake(other_sender, recipient, NON_INTERACTIVE_HANDSHAKE))
+        .expect(f"other sender should see its handshake");
+
+    assert(
+        sender_note.secret_hash != other_sender_note.secret_hash,
+        "senders should not resolve to the same handshake",
+    );
+}
+
+// The DH-direct flow lifts `recipient` to a curve point and fails loud if the address has no
+// corresponding point. We deliberately do not replicate AES128's "king of the hill" fallback here; see
+// the doc comment on [`HandshakeRegistry::non_interactive_handshake`] for the rationale.
+#[test(should_fail_with = "recipient address is not on the curve")]
+unconstrained fn handshake_to_invalid_recipient_panics() {
+    let (env, registry_address, sender, _, _) = setup();
+    let registry = HandshakeRegistry::at(registry_address);
+
+    // x = 3 is a non-residue for the curve, so this address has no corresponding address point.
+    let invalid_recipient = AztecAddress::from_field(3);
+    assert(!invalid_recipient.is_valid());
+
+    env.call_private(sender, registry.non_interactive_handshake(sender, invalid_recipient));
+}
+
+// A recipient who knows only their own address can compute the
+// expected tag, find the log under it, and recover `eph_pk.x` from the payload.
+#[test]
+unconstrained fn non_interactive_handshake_emits_recipient_discoverable_log() {
+    let (env, registry_address, sender, _, recipient) = setup();
+    let registry = HandshakeRegistry::at(registry_address);
+
+    env.call_private(sender, registry.non_interactive_handshake(sender, recipient));
+
+    // The function emits two private logs in order: log 0 is the encrypted note delivered via
+    // `MessageDelivery.ONCHAIN_UNCONSTRAINED`, log 1 is the recipient-keyed announcement carrying
+    // `eph_pk.x` under a recipient-derivable tag.
+    let logs = txe_oracles::get_last_tx_effects().private_logs;
+    assert_eq(logs.len(), 2);
+
+    let raw_tag = compute_log_tag(
+        recipient.to_field(),
+        DOM_SEP__NON_INTERACTIVE_HANDSHAKE_LOG_TAG,
+    );
+    let expected_siloed_tag = compute_siloed_private_log_first_field(registry_address, raw_tag);
+
+    // siloed tag (1) + eph_pk.x (1) = 2 fields.
+    let log_data = logs.get(1);
+    assert_eq(log_data.len(), 2);
+    assert_eq(log_data.get(0), expected_siloed_tag);
+    let eph_pk_x = log_data.get(1);
+    assert(eph_pk_x != 0, "eph_pk.x should be non-zero");
+}
+
+// The handshake tag depends only on the recipient, so multiple senders posting to the same recipient
+// land under one key. Each emitted log carries its own ephemeral key.
+#[test]
+unconstrained fn two_senders_to_same_recipient_share_tag_with_distinct_payloads() {
+    let (env, registry_address, sender, other_sender, recipient) = setup();
+    let registry = HandshakeRegistry::at(registry_address);
+
+    env.call_private(sender, registry.non_interactive_handshake(sender, recipient));
+    let logs_first = txe_oracles::get_last_tx_effects().private_logs;
+    assert_eq(logs_first.len(), 2);
+
+    env.call_private(other_sender, registry.non_interactive_handshake(other_sender, recipient));
+    let logs_second = txe_oracles::get_last_tx_effects().private_logs;
+    assert_eq(logs_second.len(), 2);
+
+    let raw_tag = compute_log_tag(
+        recipient.to_field(),
+        DOM_SEP__NON_INTERACTIVE_HANDSHAKE_LOG_TAG,
+    );
+    let expected_siloed_tag = compute_siloed_private_log_first_field(registry_address, raw_tag);
+    assert_eq(logs_first.get(1).get(0), expected_siloed_tag);
+    assert_eq(logs_second.get(1).get(0), expected_siloed_tag);
+
+    let eph_pk_x_0 = logs_first.get(1).get(1);
+    let eph_pk_x_1 = logs_second.get(1).get(1);
+    assert(eph_pk_x_0 != eph_pk_x_1, "ephemeral keys should differ in handshakes from different senders");
+}
+
+// Two handshakes from the same sender to the same `(recipient, type)` are not deduplicated.
+// Each call generates a fresh ephemeral key, so the registry accumulates distinct notes and emits
+// distinct logs under the recipient's tag.
+#[test]
+unconstrained fn duplicate_handshake_accumulates_distinct_secrets_and_returns_latest() {
+    let (env, registry_address, sender, _, recipient) = setup();
+    let registry = HandshakeRegistry::at(registry_address);
+
+    env.call_private(sender, registry.non_interactive_handshake(sender, recipient));
+    let logs_first = txe_oracles::get_last_tx_effects().private_logs;
+    assert_eq(logs_first.len(), 2);
+    let first = env.execute_utility(registry.get_handshake(sender, recipient, NON_INTERACTIVE_HANDSHAKE)).expect(
+        f"first handshake note should be present",
+    );
+
+    env.call_private(sender, registry.non_interactive_handshake(sender, recipient));
+    let logs_second = txe_oracles::get_last_tx_effects().private_logs;
+    assert_eq(logs_second.len(), 2);
+    let latest = env.execute_utility(registry.get_handshake(sender, recipient, NON_INTERACTIVE_HANDSHAKE)).expect(
+        f"second handshake note should be present",
+    );
+
+    let raw_tag = compute_log_tag(
+        recipient.to_field(),
+        DOM_SEP__NON_INTERACTIVE_HANDSHAKE_LOG_TAG,
+    );
+    let expected_siloed_tag = compute_siloed_private_log_first_field(registry_address, raw_tag);
+    assert_eq(logs_first.get(1).get(0), expected_siloed_tag);
+    assert_eq(logs_second.get(1).get(0), expected_siloed_tag);
+
+    assert(
+        logs_first.get(1).get(1) != logs_second.get(1).get(1),
+        "ephemeral keys should differ across repeated handshakes",
+    );
+
+    assert(first.secret_hash != latest.secret_hash, "should return the most recent note, not the first");
+}
+
+#[test]
+unconstrained fn different_recipients_have_different_tags() {
+    let (env, registry_address, sender, recipient_a, recipient_b) = setup_with_two_recipients();
+    let registry = HandshakeRegistry::at(registry_address);
+
+    env.call_private(sender, registry.non_interactive_handshake(sender, recipient_a));
+    let logs_a = txe_oracles::get_last_tx_effects().private_logs;
+    assert_eq(logs_a.len(), 2);
+
+    env.call_private(sender, registry.non_interactive_handshake(sender, recipient_b));
+    let logs_b = txe_oracles::get_last_tx_effects().private_logs;
+    assert_eq(logs_b.len(), 2);
+
+    let tag_a = compute_log_tag(
+        recipient_a.to_field(),
+        DOM_SEP__NON_INTERACTIVE_HANDSHAKE_LOG_TAG,
+    );
+    let tag_b = compute_log_tag(
+        recipient_b.to_field(),
+        DOM_SEP__NON_INTERACTIVE_HANDSHAKE_LOG_TAG,
+    );
+    assert(tag_a != tag_b, "recipient-keyed tags must differ");
+
+    assert(logs_a.get(1).get(0) != logs_b.get(1).get(0), "tags in logs differ");
+}
+
+#[test]
+unconstrained fn get_handshake_returns_none_for_wrong_sender() {
+    let (env, registry_address, sender, other_sender, recipient) = setup();
+    let registry = HandshakeRegistry::at(registry_address);
+
+    env.call_private(sender, registry.non_interactive_handshake(sender, recipient));
+
+    assert(env.execute_utility(registry.get_handshake(other_sender, recipient, NON_INTERACTIVE_HANDSHAKE)).is_none());
+}
+
+#[test]
+unconstrained fn get_handshake_returns_none_for_wrong_recipient() {
+    let (env, registry_address, sender, recipient_a, recipient_b) = setup_with_two_recipients();
+    let registry = HandshakeRegistry::at(registry_address);
+
+    env.call_private(sender, registry.non_interactive_handshake(sender, recipient_a));
+
+    assert(env.execute_utility(registry.get_handshake(sender, recipient_b, NON_INTERACTIVE_HANDSHAKE)).is_none());
+}
+
+#[test]
+unconstrained fn get_handshake_returns_none_for_wrong_handshake_type() {
+    let (env, registry_address, sender, _, recipient) = setup();
+    let registry = HandshakeRegistry::at(registry_address);
+
+    env.call_private(sender, registry.non_interactive_handshake(sender, recipient));
+
+    // Claim it was something other than the only currently-defined handshake type.
+    let unknown_handshake_type: u8 = NON_INTERACTIVE_HANDSHAKE + 1;
+    assert(env.execute_utility(registry.get_handshake(sender, recipient, unknown_handshake_type)).is_none());
+}
diff --git a/noir-projects/noir-contracts/contracts/protocol/auth_registry_contract/src/main.nr b/noir-projects/noir-contracts/contracts/protocol/auth_registry_contract/src/main.nr
index 8b1af31ac0b0..9b7e9f7ffad8 100644
--- a/noir-projects/noir-contracts/contracts/protocol/auth_registry_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/protocol/auth_registry_contract/src/main.nr
@@ -17,9 +17,7 @@ use aztec::macros::aztec;
 #[aztec]
 pub contract AuthRegistry {
     use aztec::{
-        authwit::auth::{
-            assert_current_call_valid_authwit, compute_authwit_message_hash, IS_VALID_SELECTOR,
-        },
+        authwit::auth::{assert_current_call_valid_authwit, compute_authwit_message_hash, IS_VALID_SELECTOR},
         macros::{functions::{external, only_self, view}, storage::storage},
         protocol::address::AztecAddress,
         state_vars::{Map, PublicMutable},
@@ -115,10 +113,7 @@ pub contract AuthRegistry {
 
     /// Utility version of `is_consumable`
     #[external("utility")]
-    unconstrained fn utility_is_consumable(
-        on_behalf_of: AztecAddress,
-        message_hash: Field,
-    ) -> bool {
+    unconstrained fn utility_is_consumable(on_behalf_of: AztecAddress, message_hash: Field) -> bool {
         !self.storage.reject_all.at(on_behalf_of).read()
             & self.storage.approved_actions.at(on_behalf_of).at(message_hash).read()
     }
diff --git a/noir-projects/noir-contracts/contracts/protocol/contract_class_registry_contract/src/events/class_published.nr b/noir-projects/noir-contracts/contracts/protocol/contract_class_registry_contract/src/events/class_published.nr
index 8c4f64874b8e..b940885d0070 100644
--- a/noir-projects/noir-contracts/contracts/protocol/contract_class_registry_contract/src/events/class_published.nr
+++ b/noir-projects/noir-contracts/contracts/protocol/contract_class_registry_contract/src/events/class_published.nr
@@ -13,11 +13,10 @@ pub struct ContractClassPublished {
 }
 
 impl ContractClassPublished {
-    pub fn serialize_non_standard(
-        self: Self,
-    ) -> [Field; MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS + 5] {
+    pub fn serialize_non_standard(self: Self) -> [Field; MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS + 5] {
         let mut packed = [0; MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS + 5];
-        // Since we are not yet emitting selectors we'll use this magic value to identify events emitted by the ClassRegistry.
+        // Since we are not yet emitting selectors we'll use this magic value to identify events emitted by the
+        // ClassRegistry.
         packed[0] = CONTRACT_CLASS_PUBLISHED_MAGIC_VALUE;
         packed[1] = self.contract_class_id.to_field();
         packed[2] = self.version;
diff --git a/noir-projects/noir-contracts/contracts/protocol/contract_class_registry_contract/src/main.nr b/noir-projects/noir-contracts/contracts/protocol/contract_class_registry_contract/src/main.nr
index a8989c57e0cc..b7fa9af9348a 100644
--- a/noir-projects/noir-contracts/contracts/protocol/contract_class_registry_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/protocol/contract_class_registry_contract/src/main.nr
@@ -26,10 +26,7 @@ pub contract ContractClassRegistry {
         oracle::capsules,
         protocol::{
             address::AztecAddress,
-            constants::{
-                CONTRACT_CLASS_REGISTRY_BYTECODE_CAPSULE_SLOT,
-                MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS,
-            },
+            constants::{CONTRACT_CLASS_REGISTRY_BYTECODE_CAPSULE_SLOT, MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS},
             contract_class_id::ContractClassId,
             traits::ToField,
         },
@@ -65,12 +62,10 @@ pub contract ContractClassRegistry {
         // body, I have removed that check.
         aztec::oracle::version::assert_compatible_oracle_version();
 
-        let serialized_params: [Field; 3] =
-            [artifact_hash, private_functions_root, public_bytecode_commitment];
+        let serialized_params: [Field; 3] = [artifact_hash, private_functions_root, public_bytecode_commitment];
 
         let args_hash: Field = aztec::hash::hash_args(serialized_params);
-        let mut context: aztec::context::PrivateContext =
-            aztec::context::PrivateContext::new(inputs, args_hash);
+        let mut context: aztec::context::PrivateContext = aztec::context::PrivateContext::new(inputs, args_hash);
         // MACRO CODE END
 
         // Safety: We load the bytecode via a capsule, which is unconstrained. In order to ensure the loaded bytecode
@@ -102,12 +97,7 @@ pub contract ContractClassRegistry {
         // Broadcast class info including public bytecode
         aztec::oracle::logging::debug_log_format(
             "ContractClassPublished: {}",
-            [
-                contract_class_id.to_field(),
-                artifact_hash,
-                private_functions_root,
-                public_bytecode_commitment,
-            ],
+            [contract_class_id.to_field(), artifact_hash, private_functions_root, public_bytecode_commitment],
         );
 
         let event = ContractClassPublished {
diff --git a/noir-projects/noir-contracts/contracts/protocol/contract_class_registry_contract/src/validate_bytecode.nr b/noir-projects/noir-contracts/contracts/protocol/contract_class_registry_contract/src/validate_bytecode.nr
index 74100ce75f0f..c122845a9b08 100644
--- a/noir-projects/noir-contracts/contracts/protocol/contract_class_registry_contract/src/validate_bytecode.nr
+++ b/noir-projects/noir-contracts/contracts/protocol/contract_class_registry_contract/src/validate_bytecode.nr
@@ -1,7 +1,4 @@
-use aztec::{
-    hash::compute_public_bytecode_commitment,
-    protocol::constants::MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS,
-};
+use aztec::{hash::compute_public_bytecode_commitment, protocol::constants::MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS};
 
 pub(crate) fn validate_packed_public_bytecode(
     packed_public_bytecode: [Field; MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS],
@@ -9,15 +6,10 @@ pub(crate) fn validate_packed_public_bytecode(
 ) {
     validate_bytes_encoding(packed_public_bytecode);
 
-    assert_eq(
-        compute_public_bytecode_commitment(packed_public_bytecode),
-        public_bytecode_commitment,
-    );
+    assert_eq(compute_public_bytecode_commitment(packed_public_bytecode), public_bytecode_commitment);
 }
 
-fn validate_bytes_encoding(
-    packed_public_bytecode: [Field; MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS],
-) {
+fn validate_bytes_encoding(packed_public_bytecode: [Field; MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS]) {
     // Field 0 stores the bytecode length (in bytes).
     // It must fit within 32 bits.
     packed_public_bytecode[0].assert_max_bit_size::<32>();
@@ -32,8 +24,7 @@ fn validate_bytes_encoding(
     let not_aligned_bytes = bytecode_length_in_bytes % 31;
 
     // Number of fields needed to store the bytecode payload (excluding field 0).
-    let bytecode_length_in_fields =
-        (bytecode_length_in_bytes / 31) + (not_aligned_bytes != 0) as u32;
+    let bytecode_length_in_fields = (bytecode_length_in_bytes / 31) + (not_aligned_bytes != 0) as u32;
 
     // We don't -1 because the first field is the bytes length
     let decomposition: [u8; 32] = packed_public_bytecode[bytecode_length_in_fields].to_be_bytes();
@@ -67,9 +58,8 @@ fn test_validate_bytes_encoding_one_field_not_aligned() {
     packed_public_bytecode[0] = 30;
     // Upper bits clean, no extra trailing bytes
     let bytes = [
-        0x0, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e,
-        0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d,
-        0x1e, 0x00,
+        0x0, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12,
+        0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x00,
     ];
     packed_public_bytecode[1] = Field::from_be_bytes(bytes);
 
@@ -83,9 +73,8 @@ fn test_validate_bytes_encoding_one_field_aligned() {
 
     // A field with 31 bytes
     let bytes = [
-        0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-        0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e,
-        0x1f,
+        0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12,
+        0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
     ];
     packed_public_bytecode[1] = Field::from_be_bytes(bytes);
 
@@ -99,9 +88,8 @@ fn test_validate_bytes_encoding_two_fields_not_aligned() {
 
     // First field: 31 bytes
     let field_1_bytes = [
-        0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-        0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e,
-        0x1f,
+        0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12,
+        0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
     ];
     packed_public_bytecode[1] = Field::from_be_bytes(field_1_bytes);
 
@@ -120,9 +108,8 @@ fn test_validate_bytes_encoding_two_fields_aligned() {
 
     // Both fields have 31 bytes
     let bytes = [
-        0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-        0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e,
-        0x1f,
+        0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12,
+        0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
     ];
     packed_public_bytecode[1] = Field::from_be_bytes(bytes);
     packed_public_bytecode[2] = Field::from_be_bytes(bytes);
@@ -151,9 +138,8 @@ fn test_should_fail_populated_upper_bits() {
     packed_public_bytecode[0] = 30;
     // one upper bit populated
     let bytes = [
-        0x01, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e,
-        0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d,
-        0x1e, 0x00,
+        0x01, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11,
+        0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x00,
     ];
     packed_public_bytecode[1] = Field::from_be_bytes(bytes);
 
@@ -166,9 +152,8 @@ fn test_should_fail_extra_bytes_in_last_field() {
     packed_public_bytecode[0] = 30;
     // Last one should be zero
     let bytes = [
-        0x0, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e,
-        0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d,
-        0x1e, 0x01,
+        0x0, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12,
+        0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x01,
     ];
     packed_public_bytecode[1] = Field::from_be_bytes(bytes);
 
diff --git a/noir-projects/noir-contracts/contracts/protocol/contract_instance_registry_contract/src/main.nr b/noir-projects/noir-contracts/contracts/protocol/contract_instance_registry_contract/src/main.nr
index e9d390e60d1f..e8f1e8c0bb4a 100644
--- a/noir-projects/noir-contracts/contracts/protocol/contract_instance_registry_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/protocol/contract_instance_registry_contract/src/main.nr
@@ -103,11 +103,7 @@ pub contract ContractInstanceRegistry {
         // body, I have removed that check.
         assert_compatible_oracle_version();
 
-        let serialized_params: [Field; 16] = [
-            salt,
-            contract_class_id.to_field(),
-            initialization_hash,
-        ]
+        let serialized_params: [Field; 16] = [salt, contract_class_id.to_field(), initialization_hash]
             .concat(public_keys.serialize())
             .concat([universal_deploy.to_field()]);
 
@@ -130,8 +126,7 @@ pub contract ContractInstanceRegistry {
             context.maybe_msg_sender().unwrap()
         };
 
-        let partial_address =
-            PartialAddress::compute(contract_class_id, salt, initialization_hash, deployer);
+        let partial_address = PartialAddress::compute(contract_class_id, salt, initialization_hash, deployer);
 
         // Validate public key points lie on the Grumpkin curve and are non-0 to prevent AVM DoS attacks.
         public_keys.validate_on_curve();
@@ -182,8 +177,7 @@ pub contract ContractInstanceRegistry {
         // MACRO CODE START
         let context: PublicContext = PublicContext::new(
             || -> Field {
-                let serialized_args: [Field; 1] =
-                    avm::calldata_copy(1, <ContractClassId as Serialize>::N);
+                let serialized_args: [Field; 1] = avm::calldata_copy(1, <ContractClassId as Serialize>::N);
                 hash_args(serialized_args)
             },
         );
@@ -202,17 +196,12 @@ pub contract ContractInstanceRegistry {
         // Safety: we're using the nullifier's existence as a guarantee of the availability of the new contract class'
         // information through registration, which is safe - we just need this information to be _eventually_ available.
         assert(
-            context.nullifier_exists_unsafe(
-                new_contract_class_id.to_field(),
-                CONTRACT_CLASS_REGISTRY_CONTRACT_ADDRESS,
-            ),
+            context.nullifier_exists_unsafe(new_contract_class_id.to_field(), CONTRACT_CLASS_REGISTRY_CONTRACT_ADDRESS),
             "New contract class is not registered",
         );
 
-        let scheduled_value_update = storage
-            .updated_class_ids
-            .at(address)
-            .schedule_and_get_value_change(new_contract_class_id);
+        let scheduled_value_update =
+            storage.updated_class_ids.at(address).schedule_and_get_value_change(new_contract_class_id);
         let (prev_contract_class_id, timestamp_of_change) = scheduled_value_update.get_previous();
 
         let event = ContractInstanceUpdated {
@@ -274,8 +263,7 @@ pub contract ContractInstanceRegistry {
 
     // THE REST OF THE CODE IN THIS CONTRACT WAS ORIGINALLY INJECTED BY THE #[aztec] MACRO.
 
-    global UPDATE_SELECTOR: Field =
-        comptime { FunctionSelector::from_signature("update((Field))").to_field() };
+    global UPDATE_SELECTOR: Field = comptime { FunctionSelector::from_signature("update((Field))").to_field() };
     global SET_UPDATE_DELAY_SELECTOR: Field =
         comptime { FunctionSelector::from_signature("set_update_delay(u64)").to_field() };
     global GET_UPDATE_DELAY_SELECTOR: Field =
@@ -284,11 +272,9 @@ pub contract ContractInstanceRegistry {
     #[aztec::macros::internals_functions_generation::abi_attributes::abi_public]
     pub unconstrained fn public_dispatch(selector: Field) {
         if selector == UPDATE_SELECTOR {
-            let input_calldata: [Field; 1] =
-                avm::calldata_copy(1, <ContractClassId as Serialize>::N);
+            let input_calldata: [Field; 1] = avm::calldata_copy(1, <ContractClassId as Serialize>::N);
             let mut reader: Reader<1> = Reader::new(input_calldata);
-            let arg0: ContractClassId =
-                <ContractClassId as Deserialize>::stream_deserialize(&mut reader);
+            let arg0: ContractClassId = <ContractClassId as Deserialize>::stream_deserialize(&mut reader);
             update(arg0);
             avm::avm_return([].as_vector());
         };
diff --git a/noir-projects/noir-contracts/contracts/protocol/fee_juice_contract/src/lib.nr b/noir-projects/noir-contracts/contracts/protocol/fee_juice_contract/src/lib.nr
index bb882afdba9b..6c58e3fce78d 100644
--- a/noir-projects/noir-contracts/contracts/protocol/fee_juice_contract/src/lib.nr
+++ b/noir-projects/noir-contracts/contracts/protocol/fee_juice_contract/src/lib.nr
@@ -8,7 +8,8 @@ pub fn calculate_fee<TPublicContext>(context: PublicContext) -> Field {
 }
 
 /// Computes the content hash for an L1-to-L2 "bridge gas" message, matching the hash produced on L1 by
-/// `FeeJuicePortal.depositToAztecPublic`: `sha256ToField(abi.encodeWithSignature("claim(bytes32,uint256)", to, amount))`.
+/// `FeeJuicePortal.depositToAztecPublic`: `sha256ToField(abi.encodeWithSignature("claim(bytes32,uint256)", to,
+/// amount))`.
 ///
 /// The 68-byte buffer is: [4-byte selector of "claim(bytes32,uint256)"][32-byte recipient][32-byte amount], hashed
 /// with `sha256_to_field` to produce a single Field.
diff --git a/noir-projects/noir-contracts/contracts/protocol/fee_juice_contract/src/main.nr b/noir-projects/noir-contracts/contracts/protocol/fee_juice_contract/src/main.nr
index 58624b2a6215..afa1cfb7d04d 100644
--- a/noir-projects/noir-contracts/contracts/protocol/fee_juice_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/protocol/fee_juice_contract/src/main.nr
@@ -31,9 +31,8 @@ pub contract FeeJuice {
         balances: Map<AztecAddress, PublicMutable<u128, Context>, Context>,
     }
 
-    global INCREASE_PUBLIC_BALANCE_SELECTOR: Field = comptime {
-        FunctionSelector::from_signature("_increase_public_balance((Field),u128)").to_field()
-    };
+    global INCREASE_PUBLIC_BALANCE_SELECTOR: Field =
+        comptime { FunctionSelector::from_signature("_increase_public_balance((Field),u128)").to_field() };
 
     global CHECK_BALANCE_SELECTOR: Field =
         comptime { FunctionSelector::from_signature("check_balance(u128)").to_field() };
@@ -66,12 +65,7 @@ pub contract FeeJuice {
         let calldata: [Field; 1 + 2] = [INCREASE_PUBLIC_BALANCE_SELECTOR].concat(serialized_params);
         let calldata_hash: Field = aztec::hash::hash_calldata_array(calldata);
         aztec::oracle::execution_cache::store(calldata, calldata_hash);
-        context.call_public_function_with_calldata_hash(
-            context.this_address(),
-            calldata_hash,
-            false,
-            false,
-        );
+        context.call_public_function_with_calldata_hash(context.this_address(), calldata_hash, false, false);
     }
 
     /// Claims Fee Juice by consuming an L1-to-L2 message from the FeeJuicePortal.
@@ -90,11 +84,9 @@ pub contract FeeJuice {
         // Note: The macros initially inserted a phase check here, but since there is no phase change in this function
         // nor in the claim helper function or the enqueued public function call, I have removed that check.
         aztec::oracle::version::assert_compatible_oracle_version();
-        let serialized_params: [Field; 4] =
-            [to.to_field(), amount.to_field(), secret, message_leaf_index];
+        let serialized_params: [Field; 4] = [to.to_field(), amount.to_field(), secret, message_leaf_index];
         let args_hash: Field = aztec::hash::hash_args(serialized_params);
-        let mut context: aztec::context::PrivateContext =
-            aztec::context::PrivateContext::new(inputs, args_hash);
+        let mut context: aztec::context::PrivateContext = aztec::context::PrivateContext::new(inputs, args_hash);
         // MACRO CODE END
 
         claim_helper(&mut context, to, amount, secret, message_leaf_index);
@@ -120,11 +112,9 @@ pub contract FeeJuice {
     ) -> return_data aztec::protocol::abis::private_circuit_public_inputs::PrivateCircuitPublicInputs {
         // MACRO CODE START
         aztec::oracle::version::assert_compatible_oracle_version();
-        let serialized_params: [Field; 4] =
-            [to.to_field(), amount.to_field(), secret, message_leaf_index];
+        let serialized_params: [Field; 4] = [to.to_field(), amount.to_field(), secret, message_leaf_index];
         let args_hash: Field = aztec::hash::hash_args(serialized_params);
-        let mut context: aztec::context::PrivateContext =
-            aztec::context::PrivateContext::new(inputs, args_hash);
+        let mut context: aztec::context::PrivateContext = aztec::context::PrivateContext::new(inputs, args_hash);
         // MACRO CODE END
 
         claim_helper(&mut context, to, amount, secret, message_leaf_index);
@@ -153,8 +143,7 @@ pub contract FeeJuice {
                 aztec::hash::hash_args(serialized_args)
             },
         );
-        let storage: Storage<aztec::context::PublicContext> =
-            Storage::<aztec::context::PublicContext>::init(context);
+        let storage: Storage<aztec::context::PublicContext> = Storage::<aztec::context::PublicContext>::init(context);
 
         assert(
             context.maybe_msg_sender().unwrap() == context.this_address(),
@@ -174,23 +163,17 @@ pub contract FeeJuice {
         // MACRO CODE START
         let context: aztec::context::PublicContext = aztec::context::PublicContext::new(
             || -> Field {
-                let serialized_args: [Field; 1] = aztec::oracle::avm::calldata_copy(
-                    1,
-                    <u128 as aztec::protocol::traits::Serialize>::N,
-                );
+                let serialized_args: [Field; 1] =
+                    aztec::oracle::avm::calldata_copy(1, <u128 as aztec::protocol::traits::Serialize>::N);
                 aztec::hash::hash_args(serialized_args)
             },
         );
-        let storage: Storage<aztec::context::PublicContext> =
-            Storage::<aztec::context::PublicContext>::init(context);
+        let storage: Storage<aztec::context::PublicContext> = Storage::<aztec::context::PublicContext>::init(context);
 
         assert(context.is_static_call(), "Function check_balance can only be called statically");
         // MACRO CODE END
 
-        assert(
-            storage.balances.at(context.maybe_msg_sender().unwrap()).read() >= fee_limit,
-            "Balance too low",
-        );
+        assert(storage.balances.at(context.maybe_msg_sender().unwrap()).read() >= fee_limit, "Balance too low");
     }
 
     /// Returns the Fee Juice balance of the given address.
@@ -200,20 +183,14 @@ pub contract FeeJuice {
         // MACRO CODE START
         let context: aztec::context::PublicContext = aztec::context::PublicContext::new(
             || -> Field {
-                let serialized_args: [Field; 1] = aztec::oracle::avm::calldata_copy(
-                    1,
-                    <AztecAddress as aztec::protocol::traits::Serialize>::N,
-                );
+                let serialized_args: [Field; 1] =
+                    aztec::oracle::avm::calldata_copy(1, <AztecAddress as aztec::protocol::traits::Serialize>::N);
                 aztec::hash::hash_args(serialized_args)
             },
         );
-        let storage: Storage<aztec::context::PublicContext> =
-            Storage::<aztec::context::PublicContext>::init(context);
+        let storage: Storage<aztec::context::PublicContext> = Storage::<aztec::context::PublicContext>::init(context);
 
-        assert(
-            context.is_static_call(),
-            "Function balance_of_public can only be called statically",
-        );
+        assert(context.is_static_call(), "Function balance_of_public can only be called statically");
         // MACRO CODE END
 
         storage.balances.at(owner).read()
@@ -237,10 +214,8 @@ pub contract FeeJuice {
             aztec::oracle::avm::avm_return([].as_vector());
         };
         if selector == CHECK_BALANCE_SELECTOR {
-            let input_calldata: [Field; 1] = aztec::oracle::avm::calldata_copy(
-                1,
-                <u128 as aztec::protocol::traits::Serialize>::N,
-            );
+            let input_calldata: [Field; 1] =
+                aztec::oracle::avm::calldata_copy(1, <u128 as aztec::protocol::traits::Serialize>::N);
             let mut reader: aztec::protocol::utils::reader::Reader<1> =
                 aztec::protocol::utils::reader::Reader::<1>::new(input_calldata);
             let arg0: u128 = <u128 as Deserialize>::stream_deserialize(&mut reader);
@@ -248,10 +223,8 @@ pub contract FeeJuice {
             aztec::oracle::avm::avm_return([].as_vector());
         };
         if selector == BALANCE_OF_PUBLIC_SELECTOR {
-            let input_calldata: [Field; 1] = aztec::oracle::avm::calldata_copy(
-                1,
-                <AztecAddress as aztec::protocol::traits::Serialize>::N,
-            );
+            let input_calldata: [Field; 1] =
+                aztec::oracle::avm::calldata_copy(1, <AztecAddress as aztec::protocol::traits::Serialize>::N);
             let mut reader: aztec::protocol::utils::reader::Reader<1> =
                 aztec::protocol::utils::reader::Reader::<1>::new(input_calldata);
             let arg0: AztecAddress = <AztecAddress as Deserialize>::stream_deserialize(&mut reader);
diff --git a/noir-projects/noir-contracts/contracts/protocol/multi_call_entrypoint_contract/src/main.nr b/noir-projects/noir-contracts/contracts/protocol/multi_call_entrypoint_contract/src/main.nr
index a9defbbac2bb..2e1ed6f69ac2 100644
--- a/noir-projects/noir-contracts/contracts/protocol/multi_call_entrypoint_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/protocol/multi_call_entrypoint_contract/src/main.nr
@@ -12,10 +12,7 @@ use aztec::macros::aztec;
 
 #[aztec]
 pub contract MultiCallEntrypoint {
-    use aztec::{
-        authwit::entrypoint::app::AppPayload,
-        macros::functions::{allow_phase_change, external},
-    };
+    use aztec::{authwit::entrypoint::app::AppPayload, macros::functions::{allow_phase_change, external}};
 
     #[external("private")]
     #[allow_phase_change]
diff --git a/noir-projects/noir-contracts/contracts/protocol/public_checks_contract/src/test.nr b/noir-projects/noir-contracts/contracts/protocol/public_checks_contract/src/test.nr
index f90259831250..84eb48b08f3f 100644
--- a/noir-projects/noir-contracts/contracts/protocol/public_checks_contract/src/test.nr
+++ b/noir-projects/noir-contracts/contracts/protocol/public_checks_contract/src/test.nr
@@ -13,7 +13,7 @@ unconstrained fn check_block_number() {
     let public_checks = PublicChecks::at(public_checks_contract_address);
 
     let expected_next_block_number = env.next_block_number();
-    env.view_public_incognito(public_checks.check_block_number(
+    env.view_public(public_checks.check_block_number(
         Comparator.LT,
         expected_next_block_number + 1,
     ));
@@ -27,7 +27,7 @@ unconstrained fn check_block_number_fail() {
     let public_checks = PublicChecks::at(public_checks_contract_address);
 
     let expected_next_block_number = env.next_block_number();
-    env.view_public_incognito(public_checks.check_block_number(
+    env.view_public(public_checks.check_block_number(
         Comparator.LT,
         expected_next_block_number,
     ));
@@ -42,7 +42,7 @@ unconstrained fn check_timestamp() {
 
     let expected_next_block_timestamp = env.last_block_timestamp() + 100;
     env.set_next_block_timestamp(expected_next_block_timestamp);
-    env.view_public_incognito(public_checks.check_timestamp(
+    env.view_public(public_checks.check_timestamp(
         Comparator.LT,
         expected_next_block_timestamp + 1,
     ));
@@ -57,7 +57,7 @@ unconstrained fn check_timestamp_fail() {
 
     let expected_next_block_timestamp = env.last_block_timestamp() + 100;
     env.set_next_block_timestamp(expected_next_block_timestamp);
-    env.view_public_incognito(public_checks.check_timestamp(
+    env.view_public(public_checks.check_timestamp(
         Comparator.LT,
         expected_next_block_timestamp,
     ));
diff --git a/noir-projects/noir-contracts/contracts/protocol/public_checks_contract/src/utils.nr b/noir-projects/noir-contracts/contracts/protocol/public_checks_contract/src/utils.nr
index dae43db36f0f..c37b70cf801e 100644
--- a/noir-projects/noir-contracts/contracts/protocol/public_checks_contract/src/utils.nr
+++ b/noir-projects/noir-contracts/contracts/protocol/public_checks_contract/src/utils.nr
@@ -4,22 +4,22 @@ use aztec::protocol::constants::PUBLIC_CHECKS_ADDRESS;
 
 // docs:start:helper_public_checks_functions
 /// Asserts that the current timestamp in the enqueued public call enqueued by `check_timestamp` satisfies
-/// the `operation` with respect to the `value. Preserves privacy by performing the check via the public checks contract.
-/// This conceals an address of the calling contract by setting `context.msg_sender` to the public checks contract address.
+/// the `operation` with respect to the `value. Preserves privacy by performing the check via the public checks
+/// contract.
+/// This conceals an address of the calling contract by setting `context.msg_sender` to the public checks contract
+/// address.
 pub fn privately_check_timestamp(operation: u8, value: u64, context: &mut PrivateContext) {
-    PublicChecks::at(PUBLIC_CHECKS_ADDRESS)
-        .check_timestamp(operation, value)
-        .enqueue_view_incognito(context);
+    PublicChecks::at(PUBLIC_CHECKS_ADDRESS).check_timestamp(operation, value).enqueue_view_incognito(context);
 }
 
 /// Asserts that the current block number in the enqueued public call enqueued by `check_block_number` satisfies
-/// the `operation` with respect to the `value. Preserves privacy by performing the check via the public checks contract.
-/// This conceals an address of the calling contract by setting `context.msg_sender` to the public checks contract address.
+/// the `operation` with respect to the `value. Preserves privacy by performing the check via the public checks
+/// contract.
+/// This conceals an address of the calling contract by setting `context.msg_sender` to the public checks contract
+/// address.
 pub fn privately_check_block_number(operation: u8, value: u32, context: &mut PrivateContext) {
     // docs:start:enqueueing
-    PublicChecks::at(PUBLIC_CHECKS_ADDRESS)
-        .check_block_number(operation, value)
-        .enqueue_view_incognito(context);
+    PublicChecks::at(PUBLIC_CHECKS_ADDRESS).check_block_number(operation, value).enqueue_view_incognito(context);
     // docs:end:enqueueing
 }
 // docs:end:helper_public_checks_functions
diff --git a/noir-projects/noir-contracts/contracts/protocol_interface/contract_instance_registry_interface/src/main.nr b/noir-projects/noir-contracts/contracts/protocol_interface/contract_instance_registry_interface/src/main.nr
index 9e67848d4d72..d672c3b7bf5b 100644
--- a/noir-projects/noir-contracts/contracts/protocol_interface/contract_instance_registry_interface/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/protocol_interface/contract_instance_registry_interface/src/main.nr
@@ -9,7 +9,8 @@ use aztec::macros::aztec;
 //
 // For context, this is the interface I am talking about:
 // ```noir
-// let update_delay = self.view(ContractInstanceRegistry::at(CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS).get_update_delay());
+// let update_delay =
+// self.view(ContractInstanceRegistry::at(CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS).get_update_delay());
 // ```
 // where the macros generate the `ContractInstanceRegistry` struct.
 #[aztec]
diff --git a/noir-projects/noir-contracts/contracts/protocol_interface/fee_juice_interface/src/main.nr b/noir-projects/noir-contracts/contracts/protocol_interface/fee_juice_interface/src/main.nr
index a61a565dd216..c83e597f0e7c 100644
--- a/noir-projects/noir-contracts/contracts/protocol_interface/fee_juice_interface/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/protocol_interface/fee_juice_interface/src/main.nr
@@ -14,22 +14,14 @@ use aztec::macros::aztec;
 // where the macros generate the `FeeJuice` struct.
 #[aztec]
 pub contract FeeJuice {
-    use aztec::{
-        macros::functions::{allow_phase_change, external, only_self, view},
-        protocol::address::AztecAddress,
-    };
+    use aztec::{macros::functions::{allow_phase_change, external, only_self, view}, protocol::address::AztecAddress};
 
     #[external("private")]
     fn claim(to: AztecAddress, amount: u128, secret: Field, message_leaf_index: Field) {}
 
     #[external("private")]
     #[allow_phase_change]
-    fn claim_and_end_setup(
-        to: AztecAddress,
-        amount: u128,
-        secret: Field,
-        message_leaf_index: Field,
-    ) {}
+    fn claim_and_end_setup(to: AztecAddress, amount: u128, secret: Field, message_leaf_index: Field) {}
 
     #[external("public")]
     #[only_self]
diff --git a/noir-projects/noir-contracts/contracts/test/abi_types_contract/src/main.nr b/noir-projects/noir-contracts/contracts/test/abi_types_contract/src/main.nr
index df9a4145a001..2bd71ca7534c 100644
--- a/noir-projects/noir-contracts/contracts/test/abi_types_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/test/abi_types_contract/src/main.nr
@@ -9,11 +9,7 @@ use aztec::macros::aztec;
 pub contract AbiTypes {
     use aztec::{
         macros::functions::external,
-        protocol::{
-            abis::function_selector::FunctionSelector,
-            address::EthAddress,
-            traits::{Deserialize, Serialize},
-        },
+        protocol::{abis::function_selector::FunctionSelector, address::EthAddress, traits::{Deserialize, Serialize}},
     };
 
     #[derive(Serialize, Deserialize, Eq)]
diff --git a/noir-projects/noir-contracts/contracts/test/abi_types_contract/src/test.nr b/noir-projects/noir-contracts/contracts/test/abi_types_contract/src/test.nr
index 2e725716aae7..576604912e50 100644
--- a/noir-projects/noir-contracts/contracts/test/abi_types_contract/src/test.nr
+++ b/noir-projects/noir-contracts/contracts/test/abi_types_contract/src/test.nr
@@ -16,18 +16,9 @@ unconstrained fn pass_public_parameters() {
 
     let min_range_return_values = env.call_public(
         sender,
-        abi_types.return_public_parameters(
-            false,
-            0,
-            0,
-            I64_MIN,
-            CustomStruct { w: 0, x: false, y: 0, z: I64_MIN },
-        ),
-    );
-    assert_eq(
-        min_range_return_values,
-        (false, 0, 0, I64_MIN, CustomStruct { w: 0, x: false, y: 0, z: I64_MIN }),
+        abi_types.return_public_parameters(false, 0, 0, I64_MIN, CustomStruct { w: 0, x: false, y: 0, z: I64_MIN }),
     );
+    assert_eq(min_range_return_values, (false, 0, 0, I64_MIN, CustomStruct { w: 0, x: false, y: 0, z: I64_MIN }));
 
     let max_range_return_values = env.call_public(
         sender,
@@ -41,10 +32,7 @@ unconstrained fn pass_public_parameters() {
     );
     assert_eq(
         max_range_return_values,
-        (
-            true, MAX_FIELD_VALUE, U64_MAX, I64_MAX,
-            CustomStruct { w: MAX_FIELD_VALUE, x: true, y: U64_MAX, z: I64_MAX },
-        ),
+        (true, MAX_FIELD_VALUE, U64_MAX, I64_MAX, CustomStruct { w: MAX_FIELD_VALUE, x: true, y: U64_MAX, z: I64_MAX }),
     );
 }
 
@@ -57,18 +45,9 @@ unconstrained fn pass_private_parameters() {
 
     let min_range_return_values = env.call_private(
         sender,
-        abi_types.return_private_parameters(
-            false,
-            0,
-            0,
-            I64_MIN,
-            CustomStruct { w: 0, x: false, y: 0, z: I64_MIN },
-        ),
-    );
-    assert_eq(
-        min_range_return_values,
-        (false, 0, 0, I64_MIN, CustomStruct { w: 0, x: false, y: 0, z: I64_MIN }),
+        abi_types.return_private_parameters(false, 0, 0, I64_MIN, CustomStruct { w: 0, x: false, y: 0, z: I64_MIN }),
     );
+    assert_eq(min_range_return_values, (false, 0, 0, I64_MIN, CustomStruct { w: 0, x: false, y: 0, z: I64_MIN }));
 
     let max_range_return_values = env.call_private(
         sender,
@@ -82,10 +61,7 @@ unconstrained fn pass_private_parameters() {
     );
     assert_eq(
         max_range_return_values,
-        (
-            true, MAX_FIELD_VALUE, U64_MAX, I64_MAX,
-            CustomStruct { w: MAX_FIELD_VALUE, x: true, y: U64_MAX, z: I64_MAX },
-        ),
+        (true, MAX_FIELD_VALUE, U64_MAX, I64_MAX, CustomStruct { w: MAX_FIELD_VALUE, x: true, y: U64_MAX, z: I64_MAX }),
     );
 }
 
@@ -102,10 +78,7 @@ unconstrained fn pass_utility_parameters() {
         I64_MIN,
         CustomStruct { w: 0, x: false, y: 0, z: I64_MIN },
     ));
-    assert_eq(
-        min_range_return_values,
-        (false, 0, 0, I64_MIN, CustomStruct { w: 0, x: false, y: 0, z: I64_MIN }),
-    );
+    assert_eq(min_range_return_values, (false, 0, 0, I64_MIN, CustomStruct { w: 0, x: false, y: 0, z: I64_MIN }));
 
     let max_range_return_values = env.execute_utility(abi_types.return_utility_parameters(
         true,
@@ -116,9 +89,6 @@ unconstrained fn pass_utility_parameters() {
     ));
     assert_eq(
         max_range_return_values,
-        (
-            true, MAX_FIELD_VALUE, U64_MAX, I64_MAX,
-            CustomStruct { w: MAX_FIELD_VALUE, x: true, y: U64_MAX, z: I64_MAX },
-        ),
+        (true, MAX_FIELD_VALUE, U64_MAX, I64_MAX, CustomStruct { w: MAX_FIELD_VALUE, x: true, y: U64_MAX, z: I64_MAX }),
     );
 }
diff --git a/noir-projects/noir-contracts/contracts/test/auth_wit_test_contract/src/main.nr b/noir-projects/noir-contracts/contracts/test/auth_wit_test_contract/src/main.nr
index 6f78d6b58c3a..96a12efde57b 100644
--- a/noir-projects/noir-contracts/contracts/test/auth_wit_test_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/test/auth_wit_test_contract/src/main.nr
@@ -30,10 +30,5 @@ pub contract AuthWitTest {
     /// (from:1 + data:3 + amount:1 + nonce:1), not ::<4> (parameter count).
     #[authorize_once("from", "authwit_nonce")]
     #[external("private")]
-    fn auth_with_struct(
-        from: AztecAddress,
-        _data: MultiFieldStruct,
-        _amount: Field,
-        authwit_nonce: Field,
-    ) {}
+    fn auth_with_struct(from: AztecAddress, _data: MultiFieldStruct, _amount: Field, authwit_nonce: Field) {}
 }
diff --git a/noir-projects/noir-contracts/contracts/test/avm_initializer_test_contract/src/main.nr b/noir-projects/noir-contracts/contracts/test/avm_initializer_test_contract/src/main.nr
index 6da48003f3fa..5bd192166650 100644
--- a/noir-projects/noir-contracts/contracts/test/avm_initializer_test_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/test/avm_initializer_test_contract/src/main.nr
@@ -3,19 +3,13 @@ use aztec::macros::aztec;
 #[aztec]
 pub contract AvmInitializerTest {
     // Libs
-    use aztec::{
-        macros::{functions::{external, initializer}, storage::storage},
-        state_vars::PublicImmutable,
-    };
+    use aztec::{macros::{functions::{external, initializer}, storage::storage}, state_vars::PublicImmutable};
 
     #[storage]
     struct Storage<Context> {
         immutable: PublicImmutable<Field, Context>,
     }
 
-    /************************************************************************
-     * Storage
-     ************************************************************************/
     #[external("public")]
     #[initializer]
     fn constructor() {
diff --git a/noir-projects/noir-contracts/contracts/test/avm_test_contract/src/main.nr b/noir-projects/noir-contracts/contracts/test/avm_test_contract/src/main.nr
index 720cd22ab4d4..6ae17f9c7354 100644
--- a/noir-projects/noir-contracts/contracts/test/avm_test_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/test/avm_test_contract/src/main.nr
@@ -8,13 +8,10 @@ pub contract AvmTest {
 
     global big_field_128_bits: Field = 0x001234567890abcdef1234567890abcdef;
     global big_field_136_bits: Field = 0x991234567890abcdef1234567890abcdef;
-    global big_field_254_bits: Field =
-        0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef;
+    global big_field_254_bits: Field = 0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef;
 
     // Libs
-    use crate::fake_avm_oracle::{
-        avm_return, call, returndata_copy, returndata_size, revert, success_copy,
-    };
+    use crate::fake_avm_oracle::{avm_return, call, returndata_copy, returndata_size, revert, success_copy};
     use aztec::context::gas::GasOpts;
     use aztec::macros::{functions::{external, view}, storage::storage};
     use aztec::oracle::get_contract_instance::{
@@ -25,9 +22,8 @@ pub contract AvmTest {
     use aztec::protocol::{address::{AztecAddress, EthAddress}, point::Point, scalar::Scalar};
     use aztec::protocol::{
         constants::{
-            CANONICAL_AUTH_REGISTRY_ADDRESS, CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS,
-            FEE_JUICE_ADDRESS, GRUMPKIN_ONE_X, GRUMPKIN_ONE_Y,
-            MAX_PUBLIC_CALLS_TO_UNIQUE_CONTRACT_CLASS_IDS,
+            CANONICAL_AUTH_REGISTRY_ADDRESS, CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS, FEE_JUICE_ADDRESS,
+            GRUMPKIN_ONE_X, GRUMPKIN_ONE_Y, MAX_PUBLIC_CALLS_TO_UNIQUE_CONTRACT_CLASS_IDS,
         },
         contract_class_id::ContractClassId,
         storage::map::derive_storage_slot_in_map,
@@ -53,9 +49,6 @@ pub contract AvmTest {
         map: Map<AztecAddress, PublicMutable<u32, Context>, Context>,
     }
 
-    /************************************************************************
-     * Storage
-     ************************************************************************/
     #[external("public")]
     fn set_storage_single(a: Field) {
         _set_storage_single(self.storage, a);
@@ -155,9 +148,6 @@ pub contract AvmTest {
         lhs + rhs
     }
 
-    /************************************************************************
-     * General Opcodes
-     ************************************************************************/
     #[external("public")]
     fn set_opcode_u8() -> u8 {
         8
@@ -219,12 +209,7 @@ pub contract AvmTest {
     }
 
     #[external("public")]
-    fn variable_base_msm(
-        scalar_lo: Field,
-        scalar_hi: Field,
-        scalar2_lo: Field,
-        scalar2_hi: Field,
-    ) -> Point {
+    fn variable_base_msm(scalar_lo: Field, scalar_hi: Field, scalar2_lo: Field, scalar2_hi: Field) -> Point {
         let g = Point { x: GRUMPKIN_ONE_X, y: GRUMPKIN_ONE_Y, is_infinite: false };
 
         let triple_g = multi_scalar_mul(
@@ -258,10 +243,6 @@ pub contract AvmTest {
         result ^ y
     }
 
-    /************************************************************************
-     * Misc
-     ************************************************************************/
-
     #[external("public")]
     fn u128_addition_overflow() -> u128 {
         let max_u128: u128 = 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF;
@@ -355,10 +336,7 @@ pub contract AvmTest {
         let success = success_copy();
 
         assert(!success, "Nested CALL instruction should return failure on exceptional halt");
-        assert(
-            returndata_size() == 0,
-            "Returndata should be empty when nested call exceptionally halts",
-        );
+        assert(returndata_size() == 0, "Returndata should be empty when nested call exceptionally halts");
     }
 
     #[external("public")]
@@ -411,9 +389,6 @@ pub contract AvmTest {
         [4, 5, 6] // Should not get here.
     }
 
-    /************************************************************************
-     * Contract instance
-     ************************************************************************/
     #[external("public")]
     fn test_get_contract_instance(address: AztecAddress) {
         let deployer = get_contract_instance_deployer_avm(address);
@@ -422,10 +397,7 @@ pub contract AvmTest {
 
         assert(deployer.is_some(), "Contract instance not found when getting DEPLOYER!");
         assert(class_id.is_some(), "Contract instance not found when getting CLASS_ID!");
-        assert(
-            initialization_hash.is_some(),
-            "Contract instance not found when getting INIT_HASH!",
-        );
+        assert(initialization_hash.is_some(), "Contract instance not found when getting INIT_HASH!");
 
         // The values here should match those in `avm_simulator.test.ts`
         assert(deployer.unwrap().eq(AztecAddress::from_field(0x456)));
@@ -461,10 +433,7 @@ pub contract AvmTest {
 
         assert(deployer.is_some(), "Contract instance not found when getting DEPLOYER!");
         assert(class_id.is_some(), "Contract instance not found when getting CLASS_ID!");
-        assert(
-            initialization_hash.is_some(),
-            "Contract instance not found when getting INIT_HASH!",
-        );
+        assert(initialization_hash.is_some(), "Contract instance not found when getting INIT_HASH!");
 
         // The values here should match those in `avm_simulator.test.ts`
         assert(deployer.unwrap().eq(expected_deployer));
@@ -474,15 +443,9 @@ pub contract AvmTest {
         // Get a Protocol Contract and it should exist
         aztec::oracle::logging::debug_log("Get Contract Instance Protocol Contract Instance");
         let fee_juice_class_id = get_contract_instance_class_id_avm(FEE_JUICE_ADDRESS);
-        assert(
-            fee_juice_class_id.is_some(),
-            "Protocol Contract instance not found when getting CLASS_ID!",
-        );
+        assert(fee_juice_class_id.is_some(), "Protocol Contract instance not found when getting CLASS_ID!");
     }
 
-    /************************************************************************
-     * AvmContext functions
-     ************************************************************************/
     #[external("public")]
     fn get_address() -> AztecAddress {
         _get_address(self.address)
@@ -607,14 +570,13 @@ pub contract AvmTest {
     fn _emit_public_log(context: PublicContext) {
         context.emit_public_log_unsafe(0, /*message=*/ [10, 20, 30]);
         context.emit_public_log_unsafe(0, /*message=*/ "Hello, world!");
-        let s: CompressedString<2, 44> =
-            CompressedString::from_string("A long time ago, in a galaxy far far away...");
+        let s: CompressedString<2, 44> = CompressedString::from_string("A long time ago, in a galaxy far far away...");
         context.emit_public_log_unsafe(0, /*message=*/ s);
         context.emit_public_log_unsafe(
             0,
             /*message=*/ [
-                1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
-                24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
+                1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
+                29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
             ],
         ); // Large log
     }
@@ -704,10 +666,7 @@ pub contract AvmTest {
 
     #[external("public")]
     fn assert_nullifier_exists(nullifier: Field) {
-        assert(
-            self.context.nullifier_exists_unsafe(nullifier, self.address),
-            "Nullifier doesn't exist!",
-        );
+        assert(self.context.nullifier_exists_unsafe(nullifier, self.address), "Nullifier doesn't exist!");
     }
 
     // Use the standard context interface to emit a new nullifier
@@ -732,11 +691,7 @@ pub contract AvmTest {
     }
 
     #[contract_library_method]
-    fn _l1_to_l2_msg_exists(
-        context: PublicContext,
-        msg_hash: Field,
-        msg_leaf_index: Field,
-    ) -> bool {
+    fn _l1_to_l2_msg_exists(context: PublicContext, msg_hash: Field, msg_leaf_index: Field) -> bool {
         context.l1_to_l2_msg_exists(msg_hash, msg_leaf_index)
     }
 
@@ -750,9 +705,6 @@ pub contract AvmTest {
         context.message_portal(recipient, content)
     }
 
-    /************************************************************************
-     * Nested calls
-     ************************************************************************/
     #[external("public")]
     fn nested_call_to_nothing() {
         let garbageAddress = AztecAddress::from_field(42);
@@ -764,24 +716,13 @@ pub contract AvmTest {
         let garbageAddress = AztecAddress::from_field(42);
         call(1, 1, garbageAddress, []);
         let success = success_copy();
-        assert(
-            !success,
-            "Nested CALL instruction should return failure if target contract does not exist",
-        );
+        assert(!success, "Nested CALL instruction should return failure if target contract does not exist");
     }
 
     #[external("public")]
-    fn nested_call_to_add_with_gas(
-        arg_a: Field,
-        arg_b: Field,
-        l2_gas: u32,
-        da_gas: u32,
-    ) -> pub Field {
+    fn nested_call_to_add_with_gas(arg_a: Field, arg_b: Field, l2_gas: u32, da_gas: u32) -> pub Field {
         // Note: can't use self.call_self here because we need .with_gas() chaining
-        self.call(AvmTest::at(self.address).add_args_return(arg_a, arg_b).with_gas(GasOpts::new(
-            l2_gas,
-            da_gas,
-        )))
+        self.call(AvmTest::at(self.address).add_args_return(arg_a, arg_b).with_gas(GasOpts::new(l2_gas, da_gas)))
     }
 
     // Use the `call_public_function` wrapper to initiate a nested call to the add function
@@ -825,10 +766,8 @@ pub contract AvmTest {
         arg_a: Field,
         arg_b: Field,
     ) -> Field {
-        let selector =
-            comptime { FunctionSelector::from_signature("add_args_return(Field,Field)") };
-        context.static_call_public_function(address, selector, [arg_a, arg_b], GasOpts::default())
-            [0]
+        let selector = comptime { FunctionSelector::from_signature("add_args_return(Field,Field)") };
+        context.static_call_public_function(address, selector, [arg_a, arg_b], GasOpts::default())[0]
     }
 
     // Indirectly call_static `set_storage_single`. Should revert since it's accessing self.storage.
@@ -836,12 +775,7 @@ pub contract AvmTest {
     fn nested_static_call_to_set_storage() {
         let selector = comptime { FunctionSelector::from_signature("set_storage_single(Field)") };
         let args = [20 as Field];
-        let _ = self.context.static_call_public_function(
-            self.address,
-            selector,
-            args,
-            GasOpts::default(),
-        );
+        let _ = self.context.static_call_public_function(self.address, selector, args, GasOpts::default());
     }
 
     #[external("public")]
@@ -872,18 +806,12 @@ pub contract AvmTest {
         self.call_self.fn_w_large_calldata(arr)
     }
 
-    /**
-     * Enqueue a public call from private
-     */
     #[external("private")]
     fn enqueue_public_from_private() {
         self.enqueue_self_static.set_opcode_u8_view();
         self.enqueue_self.set_read_storage_single(5);
     }
 
-    /************************************************************************
-     * Protocol Contract Calls
-     ************************************************************************/
     #[external("public")]
     fn call_fee_juice() {
         _call_fee_juice(self.context, self.address);
@@ -896,23 +824,16 @@ pub contract AvmTest {
 
     #[external("public")]
     fn call_auth_registry() {
-        let _ = AuthRegistry::at(CANONICAL_AUTH_REGISTRY_ADDRESS).is_reject_all(self.address).view(
-            self.context,
-        );
+        let _ = AuthRegistry::at(CANONICAL_AUTH_REGISTRY_ADDRESS).is_reject_all(self.address).view(self.context);
     }
 
     #[external("public")]
     fn call_instance_registry() {
-        let _ = self.view(ContractInstanceRegistry::at(CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS)
-            .get_update_delay());
+        let _ = self.view(ContractInstanceRegistry::at(CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS).get_update_delay());
     }
 
-    /************************************************************************
-     * Bulk testing: exercise many functions in a single call.
-     * It only makes sense to call functions with side effects (or oracle
-     * calls - but not blackboxes!), since otherwise the whole call will
-     * be optimized away.
-     ************************************************************************/
+    // Exercises many functions in a single call. Only calls functions with side effects (or oracle calls - but not
+    // blackboxes), otherwise the whole call would be optimized away.
     #[external("public")]
     fn bulk_testing(
         args_field: [Field; 10],
diff --git a/noir-projects/noir-contracts/contracts/test/benchmarking_contract/src/main.nr b/noir-projects/noir-contracts/contracts/test/benchmarking_contract/src/main.nr
index fd79a97d926b..2628291c248f 100644
--- a/noir-projects/noir-contracts/contracts/test/benchmarking_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/test/benchmarking_contract/src/main.nr
@@ -15,9 +15,8 @@ pub contract Benchmarking {
         protocol::{
             address::{AztecAddress, EthAddress},
             constants::{
-                CONTRACT_CLASS_LOG_SIZE_IN_FIELDS, MAX_L2_TO_L1_MSGS_PER_CALL,
-                MAX_NOTE_HASHES_PER_CALL, MAX_NULLIFIERS_PER_CALL, MAX_PRIVATE_LOGS_PER_CALL,
-                PRIVATE_LOG_CIPHERTEXT_LEN,
+                CONTRACT_CLASS_LOG_SIZE_IN_FIELDS, MAX_L2_TO_L1_MSGS_PER_CALL, MAX_NOTE_HASHES_PER_CALL,
+                MAX_NULLIFIERS_PER_CALL, MAX_PRIVATE_LOGS_PER_CALL, PRIVATE_LOG_CIPHERTEXT_LEN,
             },
         },
         state_vars::{Map, Owned, PrivateSet, PublicMutable},
diff --git a/noir-projects/noir-contracts/contracts/test/calldata_limit_test_contract/src/main.nr b/noir-projects/noir-contracts/contracts/test/calldata_limit_test_contract/src/main.nr
index 026005b35137..64043124f117 100644
--- a/noir-projects/noir-contracts/contracts/test/calldata_limit_test_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/test/calldata_limit_test_contract/src/main.nr
@@ -9,9 +9,7 @@ pub contract CalldataLimitTest {
     // Each call contributes MAX/3 args + 1 function-selector field. Three such calls total MAX + 3, over the limit.
     #[external("public")]
     #[only_self]
-    fn public_call_with_third_of_max_args(
-        _args: [Field; MAX_FR_CALLDATA_TO_ALL_ENQUEUED_CALLS / 3],
-    ) {}
+    fn public_call_with_third_of_max_args(_args: [Field; MAX_FR_CALLDATA_TO_ALL_ENQUEUED_CALLS / 3]) {}
 
     // Enqueues three public calls split across a parent/nested-private-call boundary: one from the parent, one from
     // the nested call, and one more from the parent after the nested call returns. Expected to fail during private
diff --git a/noir-projects/noir-contracts/contracts/test/child_contract/src/main.nr b/noir-projects/noir-contracts/contracts/test/child_contract/src/main.nr
index d8ed6010ae59..5a61e3058d0b 100644
--- a/noir-projects/noir-contracts/contracts/test/child_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/test/child_contract/src/main.nr
@@ -20,7 +20,8 @@ pub contract Child {
         private_values: Owned<PrivateSet<FieldNote, Context>, Context>,
     }
 
-    // Returns a sum of the input and the chain id and version of the contract in private circuit public input's return_values.
+    // Returns a sum of the input and the chain id and version of the contract in private circuit public input's
+    // return_values.
     #[external("private")]
     fn value(input: Field) -> Field {
         input + self.context.chain_id() + self.context.version()
@@ -51,17 +52,14 @@ pub contract Child {
     fn private_set_value(new_value: Field, owner: AztecAddress) -> Field {
         let note = FieldNote { value: new_value };
 
-        self.storage.private_values.at(owner).insert(note).deliver(
-            MessageDelivery.ONCHAIN_CONSTRAINED,
-        );
+        self.storage.private_values.at(owner).insert(note).deliver(MessageDelivery.ONCHAIN_CONSTRAINED);
         new_value
     }
 
     #[external("private")]
     fn private_get_value(amount: Field, owner: AztecAddress) -> Field {
-        let options = NoteGetterOptions::new()
-            .select(FieldNote::properties().value, Comparator.EQ, amount)
-            .set_limit(1);
+        let options =
+            NoteGetterOptions::new().select(FieldNote::properties().value, Comparator.EQ, amount).set_limit(1);
         let hinted_notes = self.storage.private_values.at(owner).get_notes(options);
         hinted_notes.get(0).note.value
     }
diff --git a/noir-projects/noir-contracts/contracts/test/counter/counter_contract/src/main.nr b/noir-projects/noir-contracts/contracts/test/counter/counter_contract/src/main.nr
index 623b46b8c919..05604beb931f 100644
--- a/noir-projects/noir-contracts/contracts/test/counter/counter_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/test/counter/counter_contract/src/main.nr
@@ -20,9 +20,7 @@ pub contract Counter {
     #[external("private")]
     // We can name our initializer anything we want as long as it's marked as aztec(initializer)
     fn initialize(headstart: u64, owner: AztecAddress) {
-        self.storage.counters.at(owner).add(headstart as u128).deliver(
-            MessageDelivery.ONCHAIN_CONSTRAINED,
-        );
+        self.storage.counters.at(owner).add(headstart as u128).deliver(MessageDelivery.ONCHAIN_CONSTRAINED);
     }
 
     #[external("private")]
diff --git a/noir-projects/noir-contracts/contracts/test/custom_message_contract/src/main.nr b/noir-projects/noir-contracts/contracts/test/custom_message_contract/src/main.nr
index c984fddc3e75..31305cf716f8 100644
--- a/noir-projects/noir-contracts/contracts/test/custom_message_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/test/custom_message_contract/src/main.nr
@@ -42,12 +42,9 @@ unconstrained fn handle_multi_log_message(
         let slot = poseidon2_hash([MULTI_LOG_PARTS_SEPARATOR, message_id]);
 
         // Load (or initialize) the pending event and place this part at its index.
-        let mut multi_log: MultiLog<NUM_MULTI_LOG_PARTS> = capsules::load(
-            contract_address,
-            slot,
-            scope,
-        )
-            .unwrap_or(MultiLog { parts: [BoundedVec::new(); NUM_MULTI_LOG_PARTS] });
+        let mut multi_log: MultiLog<NUM_MULTI_LOG_PARTS> = capsules::load(contract_address, slot, scope).unwrap_or(
+            MultiLog { parts: [BoundedVec::new(); NUM_MULTI_LOG_PARTS] },
+        );
         multi_log.parts[part_number] = msg_content;
 
         if multi_log.is_complete() {
@@ -56,8 +53,7 @@ unconstrained fn handle_multi_log_message(
             // Part N content: [randomness, ...event_fields]
             let randomness = message_id;
             let mut event_type_id_field: Field = 0;
-            let mut serialized_event: BoundedVec<Field, MAX_EVENT_SERIALIZED_LEN> =
-                BoundedVec::new();
+            let mut serialized_event: BoundedVec<Field, MAX_EVENT_SERIALIZED_LEN> = BoundedVec::new();
 
             for part_index in 0..NUM_MULTI_LOG_PARTS {
                 let content = multi_log.parts[part_index];
@@ -78,11 +74,8 @@ unconstrained fn handle_multi_log_message(
             capsules::delete(contract_address, slot, scope);
 
             let event_type_id = EventSelector::from_field(event_type_id_field);
-            let event_commitment = compute_private_serialized_event_commitment(
-                serialized_event,
-                randomness,
-                event_type_id_field,
-            );
+            let event_commitment =
+                compute_private_serialized_event_commitment(serialized_event, randomness, event_type_id_field);
 
             enqueue_event_for_validation(
                 contract_address,
@@ -111,10 +104,7 @@ contract CustomMessage {
     use aztec::{
         event::event_interface::{compute_private_event_commitment, EventInterface},
         macros::{events::event, functions::external},
-        messages::{
-            encoding::encode_message,
-            message_delivery::{do_private_message_delivery, MessageDelivery},
-        },
+        messages::{encoding::encode_message, message_delivery::{do_private_message_delivery, MessageDelivery}},
         oracle::random::random,
         protocol::{address::AztecAddress, traits::ToField},
     };
@@ -149,13 +139,7 @@ contract CustomMessage {
     ///   Part 0 (metadata=pack(0,2)): content = [randomness, event_type_id, value0, value1]
     ///   Part 1 (metadata=pack(1,2)): content = [randomness, value2, value3]
     #[external("private")]
-    fn emit_multi_log_event(
-        value0: Field,
-        value1: Field,
-        value2: Field,
-        value3: Field,
-        recipient: AztecAddress,
-    ) {
+    fn emit_multi_log_event(value0: Field, value1: Field, value2: Field, value3: Field, recipient: AztecAddress) {
         let event = MultiLogEvent { value0, value1, value2, value3 };
 
         // Safety: randomness produced by the sender, same trust model as standard events.
diff --git a/noir-projects/noir-contracts/contracts/test/ephemeral_parent_contract/src/main.nr b/noir-projects/noir-contracts/contracts/test/ephemeral_parent_contract/src/main.nr
index 3854dcb8aaf8..750cc3a80459 100644
--- a/noir-projects/noir-contracts/contracts/test/ephemeral_parent_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/test/ephemeral_parent_contract/src/main.nr
@@ -23,8 +23,7 @@ pub contract EphemeralParent {
         }
 
         // Call the child's private function, which pushes to the same slot in its own frame.
-        let child_selector =
-            comptime { FunctionSelector::from_signature("use_ephemeral_at_slot(Field)") };
+        let child_selector = comptime { FunctionSelector::from_signature("use_ephemeral_at_slot(Field)") };
         let _ = self.context.call_private_function(child_address, child_selector, [EPHEMERAL_SLOT]);
 
         // Safety: reading back from the parent's ephemeral array to verify isolation.
@@ -45,13 +44,10 @@ mod test {
         let caller = env.create_light_account();
 
         let parent_address = env.deploy("EphemeralParent").without_initializer();
-        let child_address =
-            env.deploy("@ephemeral_child_contract/EphemeralChild").without_initializer();
+        let child_address = env.deploy("@ephemeral_child_contract/EphemeralChild").without_initializer();
 
-        let result: [Field; 3] = env.call_private(
-            caller,
-            EphemeralParent::at(parent_address).test_isolation(child_address),
-        );
+        let result: [Field; 3] =
+            env.call_private(caller, EphemeralParent::at(parent_address).test_isolation(child_address));
 
         // The parent should still see its own data: length 2, values [100, 200].
         assert_eq(result[0], 2, "parent ephemeral array length should be 2");
diff --git a/noir-projects/noir-contracts/contracts/test/event_only_contract/src/main.nr b/noir-projects/noir-contracts/contracts/test/event_only_contract/src/main.nr
index 1a0f3581ceb3..22b602c6a769 100644
--- a/noir-projects/noir-contracts/contracts/test/event_only_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/test/event_only_contract/src/main.nr
@@ -4,10 +4,7 @@ use aztec::macros::aztec;
 /// doesn't use notes.
 #[aztec]
 contract EventOnly {
-    use aztec::{
-        macros::{events::event, functions::external},
-        messages::message_delivery::MessageDelivery,
-    };
+    use aztec::{macros::{events::event, functions::external}, messages::message_delivery::MessageDelivery};
 
     #[event]
     struct TestEvent {
diff --git a/noir-projects/noir-contracts/contracts/test/generic_proxy_contract/src/main.nr b/noir-projects/noir-contracts/contracts/test/generic_proxy_contract/src/main.nr
index 53aa98b2fe8f..f1caf02ebf7a 100644
--- a/noir-projects/noir-contracts/contracts/test/generic_proxy_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/test/generic_proxy_contract/src/main.nr
@@ -33,13 +33,8 @@ pub contract GenericProxy {
     }
 
     #[external("private")]
-    fn forward_private_4_and_return(
-        target: AztecAddress,
-        selector: FunctionSelector,
-        args: [Field; 4],
-    ) -> Field {
-        let returns: Field =
-            self.context.call_private_function(target, selector, args).get_preimage();
+    fn forward_private_4_and_return(target: AztecAddress, selector: FunctionSelector, args: [Field; 4]) -> Field {
+        let returns: Field = self.context.call_private_function(target, selector, args).get_preimage();
         returns
     }
 
diff --git a/noir-projects/noir-contracts/contracts/test/large_public_event_contract/src/main.nr b/noir-projects/noir-contracts/contracts/test/large_public_event_contract/src/main.nr
index 2f99c9103b45..c73bdfcd2660 100644
--- a/noir-projects/noir-contracts/contracts/test/large_public_event_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/test/large_public_event_contract/src/main.nr
@@ -4,10 +4,7 @@ use aztec::macros::aztec;
 /// The private emission size limit does not apply to public logs.
 #[aztec]
 contract LargePublicEvent {
-    use aztec::{
-        macros::{events::event, functions::external},
-        messages::logs::event::MAX_EVENT_SERIALIZED_LEN,
-    };
+    use aztec::{macros::{events::event, functions::external}, messages::logs::event::MAX_EVENT_SERIALIZED_LEN};
 
     #[event]
     pub struct LargeEvent {
diff --git a/noir-projects/noir-contracts/contracts/test/nested_utility_contract/Nargo.toml b/noir-projects/noir-contracts/contracts/test/nested_utility_contract/Nargo.toml
new file mode 100644
index 000000000000..6bdcf1176440
--- /dev/null
+++ b/noir-projects/noir-contracts/contracts/test/nested_utility_contract/Nargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "nested_utility_contract"
+authors = [""]
+compiler_version = ">=0.25.0"
+type = "contract"
+
+[dependencies]
+aztec = { path = "../../../../aztec-nr/aztec" }
diff --git a/noir-projects/noir-contracts/contracts/test/nested_utility_contract/src/main.nr b/noir-projects/noir-contracts/contracts/test/nested_utility_contract/src/main.nr
new file mode 100644
index 000000000000..c5a5810d10de
--- /dev/null
+++ b/noir-projects/noir-contracts/contracts/test/nested_utility_contract/src/main.nr
@@ -0,0 +1,42 @@
+// Demonstrates nested utility calls by implementing pow_utility(x, n) = x^n recursively,
+// and calling it from a private function via pow_private.
+
+use aztec::macros::aztec;
+
+#[aztec]
+pub contract NestedUtility {
+    use aztec::macros::functions::external;
+    use aztec::protocol::address::AztecAddress;
+
+    #[external("utility")]
+    unconstrained fn pow_utility(x: Field, n: u32) -> Field {
+        if n == 0 {
+            1
+        } else {
+            x * self.call_self.pow_utility(x, n - 1)
+        }
+    }
+
+    #[external("utility")]
+    unconstrained fn delegate_pow_utility(target: AztecAddress, x: Field, n: u32) -> Field {
+        self.call(NestedUtility::at(target).pow_utility(x, n))
+    }
+
+    #[external("private")]
+    fn pow_private(x: Field, n: u32) -> Field {
+        // Safety: this is a test contract; the unconstrained result is returned directly
+        // and never used as input to a constrained assertion
+        unsafe {
+            self.utility.call_self.pow_utility(x, n)
+        }
+    }
+
+    #[external("private")]
+    fn delegate_pow_private(target: AztecAddress, x: Field, n: u32) -> Field {
+        // Safety: this is a test contract; the unconstrained result is returned directly
+        // and never used as input to a constrained assertion
+        unsafe {
+            self.utility.call(NestedUtility::at(target).pow_utility(x, n))
+        }
+    }
+}
diff --git a/noir-projects/noir-contracts/contracts/test/no_constructor_contract/src/main.nr b/noir-projects/noir-contracts/contracts/test/no_constructor_contract/src/main.nr
index b62c2c8ab851..58fc240d69c6 100644
--- a/noir-projects/noir-contracts/contracts/test/no_constructor_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/test/no_constructor_contract/src/main.nr
@@ -18,7 +18,8 @@ pub contract NoConstructor {
         private_mutable: Owned<PrivateMutable<FieldNote, Context>, Context>,
     }
 
-    /// Arbitrary public method used to test that publishing for public execution works for a contract with no constructor.
+    /// Arbitrary public method used to test that publishing for public execution works for a contract with no
+    /// constructor.
     #[external("public")]
     fn emit_public(tag: Field, value: Field) {
         self.context.emit_public_log_unsafe(tag, /*message=*/ value);
@@ -31,9 +32,7 @@ pub contract NoConstructor {
         let owner = self.msg_sender();
         let note = FieldNote { value };
 
-        self.storage.private_mutable.at(owner).initialize(note).deliver(
-            MessageDelivery.ONCHAIN_CONSTRAINED,
-        );
+        self.storage.private_mutable.at(owner).initialize(note).deliver(MessageDelivery.ONCHAIN_CONSTRAINED);
     }
 
     /// Helper function used to test that call to `initialize_private_mutable` was successful or not yet performed.
diff --git a/noir-projects/noir-contracts/contracts/test/note_getter_contract/src/main.nr b/noir-projects/noir-contracts/contracts/test/note_getter_contract/src/main.nr
index a228d67bc354..284231238cd7 100644
--- a/noir-projects/noir-contracts/contracts/test/note_getter_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/test/note_getter_contract/src/main.nr
@@ -34,11 +34,7 @@ pub contract NoteGetter {
     }
 
     #[external("utility")]
-    unconstrained fn read_note_values(
-        owner: AztecAddress,
-        comparator: u8,
-        value: Field,
-    ) -> BoundedVec<Field, 10> {
+    unconstrained fn read_note_values(owner: AztecAddress, comparator: u8, value: Field) -> BoundedVec<Field, 10> {
         let notes = self.storage.set.at(owner).view_notes(NoteViewerOptions::new().select(
             FieldNote::properties().value,
             comparator,
@@ -62,11 +58,8 @@ pub contract NoteGetter {
         value: Field,
     ) -> BoundedVec<[u8; 2], 10> {
         let selector = PackedNote::high_selector();
-        let notes = self.storage.packed_set.at(owner).view_notes(NoteViewerOptions::new().select(
-            selector,
-            comparator,
-            value,
-        ));
+        let notes =
+            self.storage.packed_set.at(owner).view_notes(NoteViewerOptions::new().select(selector, comparator, value));
         notes.map(|note: PackedNote| [note.high, note.low])
     }
 
@@ -77,11 +70,8 @@ pub contract NoteGetter {
         value: Field,
     ) -> BoundedVec<[u8; 2], 10> {
         let selector = PackedNote::low_selector();
-        let notes = self.storage.packed_set.at(owner).view_notes(NoteViewerOptions::new().select(
-            selector,
-            comparator,
-            value,
-        ));
+        let notes =
+            self.storage.packed_set.at(owner).view_notes(NoteViewerOptions::new().select(selector, comparator, value));
         notes.map(|note: PackedNote| [note.high, note.low])
     }
 }
diff --git a/noir-projects/noir-contracts/contracts/test/note_hash_and_nullifier/note_hash_and_nullifier_contract/src/main.nr b/noir-projects/noir-contracts/contracts/test/note_hash_and_nullifier/note_hash_and_nullifier_contract/src/main.nr
index abb31baf8d26..a5d8c5a2dc23 100644
--- a/noir-projects/noir-contracts/contracts/test/note_hash_and_nullifier/note_hash_and_nullifier_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/test/note_hash_and_nullifier/note_hash_and_nullifier_contract/src/main.nr
@@ -8,10 +8,7 @@ use aztec::macros::aztec;
 #[aztec]
 pub contract NoteHashAndNullifier {
     use aztec::{
-        messages::{
-            discovery::NoteHashAndNullifier as NoteHashAndNullifierResult,
-            logs::note::MAX_NOTE_PACKED_LEN,
-        },
+        messages::{discovery::NoteHashAndNullifier as NoteHashAndNullifierResult, logs::note::MAX_NOTE_PACKED_LEN},
         protocol::address::AztecAddress,
     };
 
diff --git a/noir-projects/noir-contracts/contracts/test/note_hash_and_nullifier/note_hash_and_nullifier_contract/src/test_note.nr b/noir-projects/noir-contracts/contracts/test/note_hash_and_nullifier/note_hash_and_nullifier_contract/src/test_note.nr
index 5ca3704ceab7..22f3a0c32f40 100644
--- a/noir-projects/noir-contracts/contracts/test/note_hash_and_nullifier/note_hash_and_nullifier_contract/src/test_note.nr
+++ b/noir-projects/noir-contracts/contracts/test/note_hash_and_nullifier/note_hash_and_nullifier_contract/src/test_note.nr
@@ -1,11 +1,8 @@
 use aztec::{
     context::PrivateContext,
     macros::notes::custom_note,
-    note::note_interface::NoteHash,
-    protocol::{
-        address::AztecAddress, constants::DOM_SEP__NOTE_HASH, hash::poseidon2_hash_with_separator,
-        traits::Packable,
-    },
+    note::{note_interface::NoteHash, utils::compute_note_hash},
+    protocol::{address::AztecAddress, traits::Packable},
 };
 
 #[derive(Eq, Packable)]
@@ -17,14 +14,8 @@ pub struct TestNote {
 pub global TEST_NOTE_NULLIFIER: Field = 2;
 
 impl NoteHash for TestNote {
-    fn compute_note_hash(
-        self,
-        _owner: AztecAddress,
-        storage_slot: Field,
-        randomness: Field,
-    ) -> Field {
-        let inputs = self.pack().concat([storage_slot, randomness]);
-        poseidon2_hash_with_separator(inputs, DOM_SEP__NOTE_HASH)
+    fn compute_note_hash(self, _owner: AztecAddress, storage_slot: Field, randomness: Field) -> Field {
+        compute_note_hash(storage_slot, self.pack().concat([randomness]))
     }
 
     fn compute_nullifier(
diff --git a/noir-projects/noir-contracts/contracts/test/offchain_effect_contract/src/main.nr b/noir-projects/noir-contracts/contracts/test/offchain_effect_contract/src/main.nr
index f244eba56c97..409a7d673cd3 100644
--- a/noir-projects/noir-contracts/contracts/test/offchain_effect_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/test/offchain_effect_contract/src/main.nr
@@ -13,7 +13,7 @@ contract OffchainEffect {
         },
         note::note_viewer_options::NoteViewerOptions,
         oracle::offchain_effect::emit_offchain_effect,
-        protocol::{address::AztecAddress, traits::Serialize},
+        protocol::{address::AztecAddress, traits::{Deserialize, Serialize}},
         state_vars::{Owned, PrivateSet},
     };
     use uint_note::UintNote;
@@ -25,7 +25,7 @@ contract OffchainEffect {
         pub c: u64,
     }
 
-    #[derive(Serialize)]
+    #[derive(Deserialize, Serialize)]
     pub struct EffectPayload {
         pub data: [Field; 5],
         pub next_contract: AztecAddress,
@@ -46,9 +46,7 @@ contract OffchainEffect {
             unsafe { emit_offchain_effect(payload.data) };
 
             if effects.len() > 0 {
-                OffchainEffect::at(payload.next_contract).emit_offchain_effects(effects).call(
-                    self.context,
-                );
+                OffchainEffect::at(payload.next_contract).emit_offchain_effects(effects).call(self.context);
             }
         }
     }
@@ -62,30 +60,22 @@ contract OffchainEffect {
     fn emit_note_as_offchain_message(value: u128, owner: AztecAddress) {
         let note = UintNote { value };
 
-        self.storage.balances.at(owner).insert(note).deliver_to(
-            self.msg_sender(),
-            MessageDelivery.OFFCHAIN,
-        );
+        self.storage.balances.at(owner).insert(note).deliver_to(self.msg_sender(), MessageDelivery.OFFCHAIN);
     }
 
     /// Emits a single offchain message in a regular (non-static) private call. The matching
     /// view function below lets tests contrast the two call shapes.
     #[external("private")]
-    fn call_deliver_offchain_message(
-        ciphertext: [Field; MESSAGE_CIPHERTEXT_LEN],
-        recipient: AztecAddress,
-    ) {
+    fn call_deliver_offchain_message(ciphertext: [Field; MESSAGE_CIPHERTEXT_LEN], recipient: AztecAddress) {
         deliver_offchain_message(ciphertext, recipient);
     }
 
-    /// Static variant of `call_deliver_offchain_message`. Used to verify that TXE correctly captures and exposes the call context
+    /// Static variant of `call_deliver_offchain_message`. Used to verify that TXE correctly captures and exposes the
+    /// call context
     /// of offchain effects emitted during a static call.
     #[external("private")]
     #[view]
-    fn view_deliver_offchain_message(
-        ciphertext: [Field; MESSAGE_CIPHERTEXT_LEN],
-        recipient: AztecAddress,
-    ) {
+    fn view_deliver_offchain_message(ciphertext: [Field; MESSAGE_CIPHERTEXT_LEN], recipient: AztecAddress) {
         deliver_offchain_message(ciphertext, recipient);
     }
 
diff --git a/noir-projects/noir-contracts/contracts/test/offchain_effect_contract/src/test.nr b/noir-projects/noir-contracts/contracts/test/offchain_effect_contract/src/test.nr
index 4ed4b4d4ac53..f140757b286a 100644
--- a/noir-projects/noir-contracts/contracts/test/offchain_effect_contract/src/test.nr
+++ b/noir-projects/noir-contracts/contracts/test/offchain_effect_contract/src/test.nr
@@ -27,18 +27,12 @@ unconstrained fn static_call_offchain_message_has_no_tx_hash() {
     let ciphertext = dummy_ciphertext();
 
     // Baseline: a non-static call that mines a block. This ensures TXE world state captures a real tx hash.
-    env.call_private(
-        caller,
-        OffchainEffect::at(contract_address).call_deliver_offchain_message(ciphertext, caller),
-    );
+    env.call_private(caller, OffchainEffect::at(contract_address).call_deliver_offchain_message(ciphertext, caller));
     let baseline = env.offchain_messages();
     assert(baseline.len() == 1);
     assert(baseline.get(0).tx_hash.is_some());
 
-    env.view_private(
-        caller,
-        OffchainEffect::at(contract_address).view_deliver_offchain_message(ciphertext, caller),
-    );
+    env.view_private(caller, OffchainEffect::at(contract_address).view_deliver_offchain_message(ciphertext, caller));
     let view_messages = env.offchain_messages();
     assert(view_messages.len() == 1);
 
@@ -64,10 +58,9 @@ unconstrained fn private_context_offchain_message_uses_anchor_block_timestamp()
     let latest_timestamp = env.last_block_timestamp();
     assert(latest_timestamp != anchor_timestamp);
 
-    env.private_context_opts(
-        PrivateContextOptions::new().at_anchor_block_number(anchor_block_number),
-        |_context| deliver_offchain_message(dummy_ciphertext(), caller),
-    );
+    env.private_context_opts(PrivateContextOptions::new().at_anchor_block_number(anchor_block_number), |_context| {
+        deliver_offchain_message(dummy_ciphertext(), caller)
+    });
 
     let messages = env.offchain_messages();
     assert(messages.len() == 1);
diff --git a/noir-projects/noir-contracts/contracts/test/option_param_contract/src/main.nr b/noir-projects/noir-contracts/contracts/test/option_param_contract/src/main.nr
index a30e26bbed67..c170c7a8f09d 100644
--- a/noir-projects/noir-contracts/contracts/test/option_param_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/test/option_param_contract/src/main.nr
@@ -25,9 +25,7 @@ pub contract OptionParam {
     }
 
     #[external("utility")]
-    unconstrained fn return_utility_optional_struct(
-        value: Option<SomeStruct>,
-    ) -> Option<SomeStruct> {
+    unconstrained fn return_utility_optional_struct(value: Option<SomeStruct>) -> Option<SomeStruct> {
         value
     }
 }
diff --git a/noir-projects/noir-contracts/contracts/test/option_param_contract/src/test.nr b/noir-projects/noir-contracts/contracts/test/option_param_contract/src/test.nr
index 816f461b1448..a1e38c8a01da 100644
--- a/noir-projects/noir-contracts/contracts/test/option_param_contract/src/test.nr
+++ b/noir-projects/noir-contracts/contracts/test/option_param_contract/src/test.nr
@@ -12,8 +12,7 @@ unconstrained fn passes_public_optional_struct_parameter() {
 
     let option_param = OptionParam::at(env.deploy("OptionParam").without_initializer());
 
-    let none_value =
-        env.call_public(sender, option_param.return_public_optional_struct(Option::none()));
+    let none_value = env.call_public(sender, option_param.return_public_optional_struct(Option::none()));
     assert_eq(none_value, Option::none());
 
     let some_value = env.call_public(
@@ -36,8 +35,7 @@ unconstrained fn passes_utility_optional_struct_parameter() {
 
     let option_param = OptionParam::at(env.deploy("OptionParam").without_initializer());
 
-    let none_value =
-        env.execute_utility(option_param.return_utility_optional_struct(Option::none()));
+    let none_value = env.execute_utility(option_param.return_utility_optional_struct(Option::none()));
     assert_eq(none_value, Option::none());
 
     let some_value = env.execute_utility(option_param.return_utility_optional_struct(Option::some(
@@ -58,8 +56,7 @@ unconstrained fn passes_private_optional_struct_parameter() {
 
     let option_param = OptionParam::at(env.deploy("OptionParam").without_initializer());
 
-    let none_value =
-        env.call_private(sender, option_param.return_private_optional_struct(Option::none()));
+    let none_value = env.call_private(sender, option_param.return_private_optional_struct(Option::none()));
     assert_eq(none_value, Option::none());
 
     let some_value = env.call_private(
diff --git a/noir-projects/noir-contracts/contracts/test/parent_contract/src/main.nr b/noir-projects/noir-contracts/contracts/test/parent_contract/src/main.nr
index c363920ab7ba..e34a7a7d0021 100644
--- a/noir-projects/noir-contracts/contracts/test/parent_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/test/parent_contract/src/main.nr
@@ -4,9 +4,7 @@ use aztec::macros::aztec;
 #[aztec]
 pub contract Parent {
     use aztec::{context::gas::GasOpts, macros::functions::external};
-    use aztec::protocol::{
-        abis::function_selector::FunctionSelector, address::AztecAddress, traits::ToField,
-    };
+    use aztec::protocol::{abis::function_selector::FunctionSelector, address::AztecAddress, traits::ToField};
     use aztec::protocol::constants::MAX_FR_CALLDATA_TO_ALL_ENQUEUED_CALLS;
     // Private function to call another private function in the target_contract using the provided selector
     #[external("private")]
@@ -14,54 +12,32 @@ pub contract Parent {
         // Call the target private function
         self.context.call_private_function(target_contract, target_selector, [0]).get_preimage()
     }
-    // Public function to directly call another public function to the target_contract using the selector and value provided
+    // Public function to directly call another public function to the target_contract using the selector and value
+    // provided
     #[external("public")]
-    fn pub_entry_point(
-        target_contract: AztecAddress,
-        target_selector: FunctionSelector,
-        init_value: Field,
-    ) -> Field {
-        self.context.call_public_function(
-            target_contract,
-            target_selector,
-            [init_value],
-            GasOpts::default(),
-        )[0]
+    fn pub_entry_point(target_contract: AztecAddress, target_selector: FunctionSelector, init_value: Field) -> Field {
+        self.context.call_public_function(target_contract, target_selector, [init_value], GasOpts::default())[0]
     }
-    // Same as pub_entry_point, but calls the target contract twice, using the return value from the first invocation as the argument for the second.
+    // Same as pub_entry_point, but calls the target contract twice, using the return value from the first invocation as
+    // the argument for the second.
     #[external("public")]
     fn pub_entry_point_twice(
         target_contract: AztecAddress,
         target_selector: FunctionSelector,
         init_value: Field,
     ) -> Field {
-        let return_value: Field = self.context.call_public_function(
-            target_contract,
-            target_selector,
-            [init_value],
-            GasOpts::default(),
-        )[0];
-        self.context.call_public_function(
-            target_contract,
-            target_selector,
-            [return_value],
-            GasOpts::default(),
-        )[0]
+        let return_value: Field =
+            self.context.call_public_function(target_contract, target_selector, [init_value], GasOpts::default())[0];
+        self.context.call_public_function(target_contract, target_selector, [return_value], GasOpts::default())[0]
     }
     // Private function to enqueue a call to the target_contract address using the selector and argument provided
     #[external("private")]
-    fn enqueue_call_to_child(
-        target_contract: AztecAddress,
-        target_selector: FunctionSelector,
-        target_value: Field,
-    ) {
+    fn enqueue_call_to_child(target_contract: AztecAddress, target_selector: FunctionSelector, target_value: Field) {
         self.context.call_public_function(target_contract, target_selector, [target_value], false);
     }
 
     #[external("public")]
-    fn public_call_with_max_over_n_args(
-        _args: [Field; MAX_FR_CALLDATA_TO_ALL_ENQUEUED_CALLS / 10],
-    ) {}
+    fn public_call_with_max_over_n_args(_args: [Field; MAX_FR_CALLDATA_TO_ALL_ENQUEUED_CALLS / 10]) {}
 
     #[external("private")]
     fn enqueue_call_to_child_with_many_args_and_recurse(remaining_recursions: u32) {
@@ -69,9 +45,7 @@ pub contract Parent {
         // +1 for function selector brings us to max
         self.enqueue_self.public_call_with_max_over_n_args(args);
         if remaining_recursions > 0 {
-            self.call_self.enqueue_call_to_child_with_many_args_and_recurse(
-                remaining_recursions - 1,
-            );
+            self.call_self.enqueue_call_to_child_with_many_args_and_recurse(remaining_recursions - 1);
         }
     }
 
@@ -79,13 +53,9 @@ pub contract Parent {
     // - one through a nested call to enqueue_call_to_child with value 10,
     // - followed by one issued directly from this function with value 20.
     #[external("private")]
-    fn enqueue_calls_to_child_with_nested_first(
-        target_contract: AztecAddress,
-        target_selector: FunctionSelector,
-    ) {
-        let enqueue_call_to_child_selector = comptime {
-            FunctionSelector::from_signature("enqueue_call_to_child((Field),(u32),Field)")
-        };
+    fn enqueue_calls_to_child_with_nested_first(target_contract: AztecAddress, target_selector: FunctionSelector) {
+        let enqueue_call_to_child_selector =
+            comptime { FunctionSelector::from_signature("enqueue_call_to_child((Field),(u32),Field)") };
         let _ret = self.context.call_private_function(
             self.address,
             enqueue_call_to_child_selector,
@@ -97,14 +67,10 @@ pub contract Parent {
     // - one issued directly from this function with value 20,
     // - followed by one through a nested call to enqueue_call_to_child with value 10.
     #[external("private")]
-    fn enqueue_calls_to_child_with_nested_last(
-        target_contract: AztecAddress,
-        target_selector: FunctionSelector,
-    ) {
+    fn enqueue_calls_to_child_with_nested_last(target_contract: AztecAddress, target_selector: FunctionSelector) {
         self.context.call_public_function(target_contract, target_selector, [20], false);
-        let enqueue_call_to_child_selector = comptime {
-            FunctionSelector::from_signature("enqueue_call_to_child((Field),(u32),Field)")
-        };
+        let enqueue_call_to_child_selector =
+            comptime { FunctionSelector::from_signature("enqueue_call_to_child((Field),(u32),Field)") };
         let _ret = self.context.call_private_function(
             self.address,
             enqueue_call_to_child_selector,
@@ -121,14 +87,10 @@ pub contract Parent {
         // Enqueue the first public call
         self.context.call_public_function(target_contract, target_selector, [target_value], false);
         // Enqueue the second public call
-        self.context.call_public_function(
-            target_contract,
-            target_selector,
-            [target_value + 1],
-            false,
-        );
+        self.context.call_public_function(target_contract, target_selector, [target_value + 1], false);
     }
-    // Private function to enqueue a call to the pub_entry_point function of this same contract, passing the target arguments provided
+    // Private function to enqueue a call to the pub_entry_point function of this same contract, passing the target
+    // arguments provided
     #[external("private")]
     fn enqueue_call_to_pub_entry_point(
         target_contract: AztecAddress,
@@ -144,7 +106,8 @@ pub contract Parent {
             false,
         );
     }
-    // Private function to enqueue two calls to the pub_entry_point function of this same contract, passing the target arguments provided
+    // Private function to enqueue two calls to the pub_entry_point function of this same contract, passing the target
+    // arguments provided
     #[external("private")]
     fn enqueue_calls_to_pub_entry_point(
         target_contract: AztecAddress,
@@ -173,17 +136,10 @@ pub contract Parent {
         args: [Field; 2],
     ) -> Field {
         // Call the target private function
-        self
-            .context
-            .static_call_private_function(target_contract, target_selector, args)
-            .get_preimage()
+        self.context.static_call_private_function(target_contract, target_selector, args).get_preimage()
     }
     #[external("private")]
-    fn private_call(
-        target_contract: AztecAddress,
-        target_selector: FunctionSelector,
-        args: [Field; 2],
-    ) -> Field {
+    fn private_call(target_contract: AztecAddress, target_selector: FunctionSelector, args: [Field; 2]) -> Field {
         // Call the target private function
         self.context.call_private_function(target_contract, target_selector, args).get_preimage()
     }
@@ -195,8 +151,7 @@ pub contract Parent {
         args: [Field; 2],
     ) -> Field {
         // Call the target private function statically
-        let private_call_selector =
-            FunctionSelector::from_signature("private_call((Field),(u32),[Field;2])");
+        let private_call_selector = FunctionSelector::from_signature("private_call((Field),(u32),[Field;2])");
         let return_value: Field = self
             .context
             .static_call_private_function(
@@ -208,19 +163,11 @@ pub contract Parent {
         // Copy the return value from the call to this function's return values
         return_value
     }
-    // Public function to directly call another public function to the target_contract using the selector and value provided
+    // Public function to directly call another public function to the target_contract using the selector and value
+    // provided
     #[external("public")]
-    fn public_static_call(
-        target_contract: AztecAddress,
-        target_selector: FunctionSelector,
-        args: [Field; 1],
-    ) -> Field {
-        self.context.static_call_public_function(
-            target_contract,
-            target_selector,
-            args,
-            GasOpts::default(),
-        )[0]
+    fn public_static_call(target_contract: AztecAddress, target_selector: FunctionSelector, args: [Field; 1]) -> Field {
+        self.context.static_call_public_function(target_contract, target_selector, args, GasOpts::default())[0]
     }
     // Public function to set a static context and verify correct propagation for nested public calls
     #[external("public")]
@@ -230,8 +177,7 @@ pub contract Parent {
         args: [Field; 1],
     ) -> Field {
         // Call the target public function through the pub entrypoint statically
-        let pub_entry_point_selector =
-            FunctionSelector::from_signature("pub_entry_point((Field),(u32),Field)");
+        let pub_entry_point_selector = FunctionSelector::from_signature("pub_entry_point((Field),(u32),Field)");
         self.context.static_call_public_function(
             self.address,
             pub_entry_point_selector,
@@ -239,7 +185,8 @@ pub contract Parent {
             GasOpts::default(),
         )[0]
     }
-    // Private function to enqueue a static call to the pub_entry_point function of another contract, passing the target arguments provided
+    // Private function to enqueue a static call to the pub_entry_point function of another contract, passing the target
+    // arguments provided
     #[external("private")]
     fn enqueue_static_nested_call_to_pub_function(
         target_contract: AztecAddress,
@@ -247,8 +194,7 @@ pub contract Parent {
         args: [Field; 1],
     ) {
         // Call the target public function through the pub entrypoint statically
-        let pub_entry_point_selector =
-            FunctionSelector::from_signature("pub_entry_point((Field),(u32),Field)");
+        let pub_entry_point_selector = FunctionSelector::from_signature("pub_entry_point((Field),(u32),Field)");
         self.context.static_call_public_function(
             self.address,
             pub_entry_point_selector,
@@ -256,7 +202,8 @@ pub contract Parent {
             false,
         );
     }
-    // Private function to enqueue a static call to the pub_entry_point function of another contract, passing the target arguments provided
+    // Private function to enqueue a static call to the pub_entry_point function of another contract, passing the target
+    // arguments provided
     #[external("private")]
     fn enqueue_static_call_to_pub_function(
         target_contract: AztecAddress,
@@ -296,10 +243,8 @@ pub contract Parent {
         assert(result == value_to_set);
 
         // Read the stored value in the note.
-        let note_value = env.call_private(
-            from,
-            Child::at(child_contract_address).private_get_value(value_to_set, owner),
-        );
+        let note_value =
+            env.call_private(from, Child::at(child_contract_address).private_get_value(value_to_set, owner));
         assert(note_value == value_to_set);
 
         // Get value from child through parent
diff --git a/noir-projects/noir-contracts/contracts/test/pending_note_hashes_contract/src/main.nr b/noir-projects/noir-contracts/contracts/test/pending_note_hashes_contract/src/main.nr
index 821aeaf1c1c0..3af4565e73ff 100644
--- a/noir-projects/noir-contracts/contracts/test/pending_note_hashes_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/test/pending_note_hashes_contract/src/main.nr
@@ -38,11 +38,7 @@ pub contract PendingNoteHashes {
     // getting / reading that note all in the same contract function
     // Realistic way to describe this test is "Mint note A, then burn note A in the same transaction"
     #[external("private")]
-    fn test_insert_then_get_then_nullify_flat(
-        amount: Field,
-        owner: AztecAddress,
-        sender: AztecAddress,
-    ) -> Field {
+    fn test_insert_then_get_then_nullify_flat(amount: Field, owner: AztecAddress, sender: AztecAddress) -> Field {
         let owner_balance = self.storage.balances.at(owner);
 
         let note = FieldNote { value: amount };
@@ -192,16 +188,10 @@ pub contract PendingNoteHashes {
         let getNullifyArgs = [amount, owner.to_field()];
 
         // nested call to create/insert note
-        let _callStackItem1 = self.context.call_private_function(
-            inputs.call_context.contract_address,
-            insert_fn_selector,
-            insertArgs,
-        );
-        let _callStackItem2 = self.context.call_private_function(
-            inputs.call_context.contract_address,
-            insert_fn_selector,
-            insertArgs,
-        );
+        let _callStackItem1 =
+            self.context.call_private_function(inputs.call_context.contract_address, insert_fn_selector, insertArgs);
+        let _callStackItem2 =
+            self.context.call_private_function(inputs.call_context.contract_address, insert_fn_selector, insertArgs);
         // nested call to read and nullify that note
         let _callStackItem3 = self.context.call_private_function(
             inputs.call_context.contract_address,
@@ -215,7 +205,8 @@ pub contract PendingNoteHashes {
         );
         // nested call to confirm that balance is zero
         // TODO(dbanks12): once > 4 nested calls is supported, can confirm 0 balance:
-        //let _callStackItem5 = self.context.call_private_function(inputs.call_context.contract_address, get_note_zero_fn_selector, [owner]);
+        //let _callStackItem5 = self.context.call_private_function(inputs.call_context.contract_address,
+        // get_note_zero_fn_selector, [owner]);
     }
 
     // same test as above, but insert 2, get 1, nullify 1
@@ -232,16 +223,10 @@ pub contract PendingNoteHashes {
         let getNullifyArgs = [amount, owner.to_field()];
 
         // nested call to create/insert note
-        let _callStackItem1 = self.context.call_private_function(
-            inputs.call_context.contract_address,
-            insert_fn_selector,
-            insertArgs,
-        );
-        let _callStackItem2 = self.context.call_private_function(
-            inputs.call_context.contract_address,
-            insert_fn_selector,
-            insertArgs,
-        );
+        let _callStackItem1 =
+            self.context.call_private_function(inputs.call_context.contract_address, insert_fn_selector, insertArgs);
+        let _callStackItem2 =
+            self.context.call_private_function(inputs.call_context.contract_address, insert_fn_selector, insertArgs);
         // nested call to read and nullify that note
         let _callStackItem3 = self.context.call_private_function(
             inputs.call_context.contract_address,
@@ -266,11 +251,8 @@ pub contract PendingNoteHashes {
         let getNullifyArgs = [amount, owner.to_field()];
 
         // nested call to create/insert note
-        let _callStackItem1 = self.context.call_private_function(
-            inputs.call_context.contract_address,
-            insert_fn_selector,
-            insertArgs,
-        );
+        let _callStackItem1 =
+            self.context.call_private_function(inputs.call_context.contract_address, insert_fn_selector, insertArgs);
         // nested call to read and nullify that note
         let _callStackItem2 = self.context.call_private_function(
             inputs.call_context.contract_address,
@@ -304,19 +286,11 @@ pub contract PendingNoteHashes {
         self.internal.create_max_notes(recipients, initial_offset);
 
         let max_notes = self.internal.max_notes_per_call() as u64;
-        self.call_self.recursively_destroy_and_create_notes(
-            recipients,
-            how_many_recursions,
-            max_notes,
-        );
+        self.call_self.recursively_destroy_and_create_notes(recipients, how_many_recursions, max_notes);
     }
 
     #[external("private")]
-    fn recursively_destroy_and_create_notes(
-        recipients: [AztecAddress; 10],
-        executions_left: u64,
-        current_offset: u64,
-    ) {
+    fn recursively_destroy_and_create_notes(recipients: [AztecAddress; 10], executions_left: u64, current_offset: u64) {
         assert(executions_left > 0);
 
         self.internal.destroy_max_notes(recipients);
@@ -326,11 +300,7 @@ pub contract PendingNoteHashes {
 
         if executions_left > 0 {
             let max_notes = self.internal.max_notes_per_call() as u64;
-            self.call_self.recursively_destroy_and_create_notes(
-                recipients,
-                executions_left,
-                current_offset + max_notes,
-            );
+            self.call_self.recursively_destroy_and_create_notes(recipients, executions_left, current_offset + max_notes);
         }
     }
 
diff --git a/noir-projects/noir-contracts/contracts/test/public_immutable_contract/src/main.nr b/noir-projects/noir-contracts/contracts/test/public_immutable_contract/src/main.nr
index a655d5fd7bdd..c560c2e6fdd8 100644
--- a/noir-projects/noir-contracts/contracts/test/public_immutable_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/test/public_immutable_contract/src/main.nr
@@ -58,10 +58,7 @@ mod tests {
         let (env, contract_address) = setup();
 
         // Try to read uninitialized value - this should fail
-        let _ = env.call_public(
-            contract_address,
-            PublicImmutableContract::at(contract_address).read_value(),
-        );
+        let _ = env.call_public(contract_address, PublicImmutableContract::at(contract_address).read_value());
     }
 
     #[test]
@@ -70,10 +67,7 @@ mod tests {
 
         // Try to read uninitialized value - this should return 0 as it is the default public storage value
         assert_eq(
-            env.call_public(
-                contract_address,
-                PublicImmutableContract::at(contract_address).read_value_unsafe(),
-            ),
+            env.call_public(contract_address, PublicImmutableContract::at(contract_address).read_value_unsafe()),
             0,
         );
     }
diff --git a/noir-projects/noir-contracts/contracts/test/scope_test_contract/src/main.nr b/noir-projects/noir-contracts/contracts/test/scope_test_contract/src/main.nr
index fa13f81dd6d3..e3f447a5c30d 100644
--- a/noir-projects/noir-contracts/contracts/test/scope_test_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/test/scope_test_contract/src/main.nr
@@ -74,7 +74,8 @@ pub contract ScopeTest {
     mod test {
         use crate::ScopeTest;
         use aztec::{
-            protocol::address::AztecAddress, test::helpers::test_environment::TestEnvironment,
+            protocol::address::AztecAddress,
+            test::helpers::test_environment::{CallPrivateOptions, TestEnvironment, ViewPrivateOptions},
         };
 
         unconstrained fn setup() -> (TestEnvironment, AztecAddress) {
@@ -82,15 +83,12 @@ pub contract ScopeTest {
             let deployer = env.create_light_account();
 
             // Deploy the contract
-            let contract_address = env.deploy("ScopeTest").with_private_initializer(
-                deployer,
-                ScopeTest::interface().constructor(),
-            );
+            let contract_address =
+                env.deploy("ScopeTest").with_private_initializer(deployer, ScopeTest::interface().constructor());
 
             (env, contract_address)
         }
 
-        /// Test that the owner can read their own notes
         #[test]
         unconstrained fn owner_can_read_own_notes() {
             let (mut env, contract_address) = setup();
@@ -102,12 +100,10 @@ pub contract ScopeTest {
             env.call_private(alice, ScopeTest::at(contract_address).create_note(alice, value));
 
             // Alice can read her own note
-            let read_value =
-                env.call_private(alice, ScopeTest::at(contract_address).read_note(alice));
+            let read_value = env.call_private(alice, ScopeTest::at(contract_address).read_note(alice));
             assert_eq(read_value, value);
         }
 
-        /// Bob cannot access Alice's nullifier hiding key because scope isolation is enforced.
         #[test(should_fail_with = "Key validation request denied")]
         unconstrained fn bob_cannot_access_alice_nullifier_hiding_key() {
             let (mut env, contract_address) = setup();
@@ -118,9 +114,6 @@ pub contract ScopeTest {
             let _ = env.call_private(bob, ScopeTest::at(contract_address).get_nhk(alice));
         }
 
-        /// Bob cannot read Alice's notes because scope isolation is enforced.
-        /// When Bob calls read_note(alice), he can only access notes where he is in scope.
-        /// Alice's notes are not visible to Bob's execution context.
         #[test(should_fail_with = "Failed to get a note")]
         unconstrained fn bob_cannot_read_alice_notes() {
             let (mut env, contract_address) = setup();
@@ -131,11 +124,28 @@ pub contract ScopeTest {
 
             env.call_private(alice, ScopeTest::at(contract_address).create_note(alice, value));
 
-            let _read_value =
-                env.call_private(bob, ScopeTest::at(contract_address).read_note(alice));
+            let _read_value = env.call_private(bob, ScopeTest::at(contract_address).read_note(alice));
+        }
+
+        #[test]
+        unconstrained fn bob_can_read_alice_notes_with_additional_scopes() {
+            let (mut env, contract_address) = setup();
+
+            let alice = env.create_light_account();
+            let bob = env.create_light_account();
+            let value: Field = 42;
+
+            env.call_private(alice, ScopeTest::at(contract_address).create_note(alice, value));
+
+            let read_value = env.call_private_opts(
+                bob,
+                CallPrivateOptions::new().with_additional_scopes([alice]),
+                ScopeTest::at(contract_address).read_note(alice),
+            );
+            assert_eq(read_value, value);
         }
 
-        /// Owner can view their own notes using view_private
+
         #[test]
         unconstrained fn owner_can_view_own_notes() {
             let (mut env, contract_address) = setup();
@@ -145,12 +155,10 @@ pub contract ScopeTest {
 
             env.call_private(alice, ScopeTest::at(contract_address).create_note(alice, value));
 
-            let read_value =
-                env.view_private(alice, ScopeTest::at(contract_address).view_note(alice));
+            let read_value = env.view_private(alice, ScopeTest::at(contract_address).view_note(alice));
             assert_eq(read_value, value);
         }
 
-        /// Bob cannot view Alice's notes using view_private because scope isolation is enforced.
         #[test(should_fail_with = "Failed to get a note")]
         unconstrained fn bob_cannot_view_alice_notes() {
             let (mut env, contract_address) = setup();
@@ -161,8 +169,25 @@ pub contract ScopeTest {
 
             env.call_private(alice, ScopeTest::at(contract_address).create_note(alice, value));
 
-            let _read_value =
-                env.view_private(bob, ScopeTest::at(contract_address).view_note(alice));
+            let _read_value = env.view_private(bob, ScopeTest::at(contract_address).view_note(alice));
+        }
+
+        #[test]
+        unconstrained fn bob_can_view_alice_notes_with_additional_scopes() {
+            let (mut env, contract_address) = setup();
+
+            let alice = env.create_light_account();
+            let bob = env.create_light_account();
+            let value: Field = 42;
+
+            env.call_private(alice, ScopeTest::at(contract_address).create_note(alice, value));
+
+            let read_value = env.view_private_opts(
+                bob,
+                ViewPrivateOptions::new().with_additional_scopes([alice]),
+                ScopeTest::at(contract_address).view_note(alice),
+            );
+            assert_eq(read_value, value);
         }
     }
 }
diff --git a/noir-projects/noir-contracts/contracts/test/sender_for_tags_test_contract/src/main.nr b/noir-projects/noir-contracts/contracts/test/sender_for_tags_test_contract/src/main.nr
index d69b4326f91d..62c6ead84900 100644
--- a/noir-projects/noir-contracts/contracts/test/sender_for_tags_test_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/test/sender_for_tags_test_contract/src/main.nr
@@ -15,15 +15,9 @@ pub contract SenderForTagsTest {
     #[external("private")]
     fn parent(default_sender_for_tags: AztecAddress) {
         let before = self.internal.current_sender();
-        assert(
-            before == default_sender_for_tags,
-            "parent did not receive the expected sender_for_tags from PXE",
-        );
+        assert(before == default_sender_for_tags, "parent did not receive the expected sender_for_tags from PXE");
         self.call_self.middle(default_sender_for_tags);
-        assert(
-            self.internal.current_sender() == before,
-            "parent sender_for_tags changed after middle returned",
-        );
+        assert(self.internal.current_sender() == before, "parent sender_for_tags changed after middle returned");
     }
 
     #[external("private")]
@@ -36,15 +30,9 @@ pub contract SenderForTagsTest {
         // Safety: we set a value we chose and immediately assert it took effect, so we are not trusting the oracle
         // blindly.
         unsafe { set_sender_for_tags(override_addr) };
-        assert(
-            self.internal.current_sender() == override_addr,
-            "middle set_sender_for_tags did not take effect",
-        );
+        assert(self.internal.current_sender() == override_addr, "middle set_sender_for_tags did not take effect");
         self.call_self.leaf(default_sender_for_tags);
-        assert(
-            self.internal.current_sender() == override_addr,
-            "middle sender_for_tags was mutated by leaf",
-        );
+        assert(self.internal.current_sender() == override_addr, "middle sender_for_tags was mutated by leaf");
     }
 
     #[external("private")]
diff --git a/noir-projects/noir-contracts/contracts/test/spam_contract/src/main.nr b/noir-projects/noir-contracts/contracts/test/spam_contract/src/main.nr
index 7519a67fd2f2..7610fa0180b6 100644
--- a/noir-projects/noir-contracts/contracts/test/spam_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/test/spam_contract/src/main.nr
@@ -8,8 +8,7 @@ pub contract Spam {
         messages::message_delivery::MessageDelivery,
         note::utils::compute_note_nullifier,
         protocol::constants::{
-            MAX_NOTE_HASHES_PER_CALL, MAX_NULLIFIERS_PER_CALL,
-            MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
+            MAX_NOTE_HASHES_PER_CALL, MAX_NULLIFIERS_PER_CALL, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
         },
         state_vars::{Map, Owned, PublicMutable},
     };
diff --git a/noir-projects/noir-contracts/contracts/test/state_vars_contract/src/main.nr b/noir-projects/noir-contracts/contracts/test/state_vars_contract/src/main.nr
index f993d4312453..5d7d15081a88 100644
--- a/noir-projects/noir-contracts/contracts/test/state_vars_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/test/state_vars_contract/src/main.nr
@@ -7,9 +7,7 @@ pub contract StateVars {
         macros::{functions::{external, view}, storage::{storage, storage_no_init}},
         messages::message_delivery::MessageDelivery,
         protocol::{address::AztecAddress, traits::{Deserialize, Packable, Serialize}},
-        state_vars::{
-            Owned, PrivateImmutable, PrivateMutable, PublicImmutable, PublicMutable, StateVariable,
-        },
+        state_vars::{Owned, PrivateImmutable, PrivateMutable, PublicImmutable, PublicMutable, StateVariable},
     };
 
     use field_note::FieldNote;
@@ -100,9 +98,7 @@ pub contract StateVars {
         let owner = self.msg_sender();
         let new_note = FieldNote { value };
 
-        self.storage.private_immutable.at(owner).initialize(new_note).deliver(
-            MessageDelivery.ONCHAIN_CONSTRAINED,
-        );
+        self.storage.private_immutable.at(owner).initialize(new_note).deliver(MessageDelivery.ONCHAIN_CONSTRAINED);
     }
 
     #[external("private")]
@@ -110,9 +106,7 @@ pub contract StateVars {
         let owner = self.msg_sender();
         let private_mutable = FieldNote { value };
 
-        self.storage.private_mutable.at(owner).initialize(private_mutable).deliver(
-            MessageDelivery.ONCHAIN_CONSTRAINED,
-        );
+        self.storage.private_mutable.at(owner).initialize(private_mutable).deliver(MessageDelivery.ONCHAIN_CONSTRAINED);
     }
 
     #[external("private")]
diff --git a/noir-projects/noir-contracts/contracts/test/stateful_test_contract/src/main.nr b/noir-projects/noir-contracts/contracts/test/stateful_test_contract/src/main.nr
index 6f0d7ba3a87e..51ccd1cd095c 100644
--- a/noir-projects/noir-contracts/contracts/test/stateful_test_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/test/stateful_test_contract/src/main.nr
@@ -61,9 +61,7 @@ pub contract StatefulTest {
 
         let _ = self.storage.notes.at(sender).pop_notes(NoteGetterOptions::new().set_limit(2));
 
-        self.storage.notes.at(recipient).insert(FieldNote { value: 92 }).deliver(
-            MessageDelivery.ONCHAIN_CONSTRAINED,
-        );
+        self.storage.notes.at(recipient).insert(FieldNote { value: 92 }).deliver(MessageDelivery.ONCHAIN_CONSTRAINED);
     }
 
     #[external("public")]
diff --git a/noir-projects/noir-contracts/contracts/test/static_child_contract/src/main.nr b/noir-projects/noir-contracts/contracts/test/static_child_contract/src/main.nr
index aea7f59909d1..310b07212f2b 100644
--- a/noir-projects/noir-contracts/contracts/test/static_child_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/test/static_child_contract/src/main.nr
@@ -46,9 +46,7 @@ pub contract StaticChild {
     #[view]
     fn private_illegal_set_value(new_value: Field, owner: AztecAddress) -> Field {
         let note = FieldNote { value: new_value };
-        self.storage.a_private_value.at(owner).insert(note).deliver(
-            MessageDelivery.ONCHAIN_CONSTRAINED,
-        );
+        self.storage.a_private_value.at(owner).insert(note).deliver(MessageDelivery.ONCHAIN_CONSTRAINED);
         new_value
     }
 
@@ -57,9 +55,7 @@ pub contract StaticChild {
     fn private_set_value(new_value: Field, owner: AztecAddress, sender: AztecAddress) -> Field {
         let note = FieldNote { value: new_value };
 
-        self.storage.a_private_value.at(owner).insert(note).deliver(
-            MessageDelivery.ONCHAIN_CONSTRAINED,
-        );
+        self.storage.a_private_value.at(owner).insert(note).deliver(MessageDelivery.ONCHAIN_CONSTRAINED);
         new_value
     }
 
@@ -67,9 +63,8 @@ pub contract StaticChild {
     #[external("private")]
     #[view]
     fn private_get_value(amount: Field, owner: AztecAddress) -> Field {
-        let options = NoteGetterOptions::new()
-            .select(FieldNote::properties().value, Comparator.EQ, amount)
-            .set_limit(1);
+        let options =
+            NoteGetterOptions::new().select(FieldNote::properties().value, Comparator.EQ, amount).set_limit(1);
         let hinted_notes = self.storage.a_private_value.at(owner).get_notes(options);
         hinted_notes.get(0).note.value
     }
diff --git a/noir-projects/noir-contracts/contracts/test/static_parent_contract/src/main.nr b/noir-projects/noir-contracts/contracts/test/static_parent_contract/src/main.nr
index 66d65d0c5170..a117c6506b02 100644
--- a/noir-projects/noir-contracts/contracts/test/static_parent_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/test/static_parent_contract/src/main.nr
@@ -4,34 +4,21 @@ use aztec::macros::aztec;
 #[aztec]
 pub contract StaticParent {
     use aztec::{context::gas::GasOpts, macros::functions::{external, view}};
-    use aztec::protocol::{
-        abis::function_selector::FunctionSelector, address::AztecAddress, traits::ToField,
-    };
+    use aztec::protocol::{abis::function_selector::FunctionSelector, address::AztecAddress, traits::ToField};
     use static_child_contract::StaticChild;
 
-    // Public function to directly call another public function to the target_contract using the selector and value provided
+    // Public function to directly call another public function to the target_contract using the selector and value
+    // provided
     #[external("public")]
     #[view]
-    fn public_call(
-        target_contract: AztecAddress,
-        target_selector: FunctionSelector,
-        arg: Field,
-    ) -> Field {
-        self.context.call_public_function(
-            target_contract,
-            target_selector,
-            [arg],
-            GasOpts::default(),
-        )[0]
+    fn public_call(target_contract: AztecAddress, target_selector: FunctionSelector, arg: Field) -> Field {
+        self.context.call_public_function(target_contract, target_selector, [arg], GasOpts::default())[0]
     }
 
-    // Private function to directly call another private function to the target_contract using the selector and args provided
+    // Private function to directly call another private function to the target_contract using the selector and args
+    // provided
     #[external("private")]
-    fn private_call(
-        target_contract: AztecAddress,
-        target_selector: FunctionSelector,
-        args: [Field; 2],
-    ) -> Field {
+    fn private_call(target_contract: AztecAddress, target_selector: FunctionSelector, args: [Field; 2]) -> Field {
         self.context.call_private_function(target_contract, target_selector, args).get_preimage()
     }
 
@@ -46,13 +33,10 @@ pub contract StaticParent {
         self.context.call_private_function(target_contract, target_selector, args).get_preimage()
     }
 
-    // Private function to enqueue a call to a public function of another contract, passing the target arguments provided
+    // Private function to enqueue a call to a public function of another contract, passing the target arguments
+    // provided
     #[external("private")]
-    fn enqueue_call(
-        target_contract: AztecAddress,
-        target_selector: FunctionSelector,
-        args: [Field; 1],
-    ) {
+    fn enqueue_call(target_contract: AztecAddress, target_selector: FunctionSelector, args: [Field; 1]) {
         self.context.call_public_function(target_contract, target_selector, args, false);
     }
 
@@ -62,32 +46,23 @@ pub contract StaticParent {
         target_selector: FunctionSelector,
         args: [Field; 2],
     ) -> Field {
-        self
-            .context
-            .static_call_private_function(target_contract, target_selector, args)
-            .get_preimage()
+        self.context.static_call_private_function(target_contract, target_selector, args).get_preimage()
     }
 
-    // Private function to statically call another private function to the target_contract using the selector and values provided
+    // Private function to statically call another private function to the target_contract using the selector and values
+    // provided
     #[external("private")]
     fn private_static_call_3_args(
         target_contract: AztecAddress,
         target_selector: FunctionSelector,
         args: [Field; 3],
     ) -> Field {
-        self
-            .context
-            .static_call_private_function(target_contract, target_selector, args)
-            .get_preimage()
+        self.context.static_call_private_function(target_contract, target_selector, args).get_preimage()
     }
 
     // Same as above but using a specific function from the interface
     #[external("private")]
-    fn private_get_value_from_child(
-        target_contract: AztecAddress,
-        value: Field,
-        owner: AztecAddress,
-    ) -> Field {
+    fn private_get_value_from_child(target_contract: AztecAddress, value: Field, owner: AztecAddress) -> Field {
         self.view(StaticChild::at(target_contract).private_get_value(value, owner))
     }
 
@@ -100,8 +75,7 @@ pub contract StaticParent {
     ) -> Field {
         // Not using the high-level self.view(...) API because that doesn't allow for static calls to non-static
         // functions which this test seems to relies on.
-        let private_call_selector =
-            FunctionSelector::from_signature("private_call((Field),(u32),[Field;2])");
+        let private_call_selector = FunctionSelector::from_signature("private_call((Field),(u32),[Field;2])");
         self
             .context
             .static_call_private_function(
@@ -119,26 +93,14 @@ pub contract StaticParent {
         target_selector: FunctionSelector,
         args: [Field; 3],
     ) -> Field {
-        self.view(StaticParent::at(self.address).private_call_3_args(
-            target_contract,
-            target_selector,
-            args,
-        ))
+        self.view(StaticParent::at(self.address).private_call_3_args(target_contract, target_selector, args))
     }
 
-    // Public function to statically call another public function to the target_contract using the selector and value provided
+    // Public function to statically call another public function to the target_contract using the selector and value
+    // provided
     #[external("public")]
-    fn public_static_call(
-        target_contract: AztecAddress,
-        target_selector: FunctionSelector,
-        args: [Field; 1],
-    ) -> Field {
-        self.context.static_call_public_function(
-            target_contract,
-            target_selector,
-            args,
-            GasOpts::default(),
-        )[0]
+    fn public_static_call(target_contract: AztecAddress, target_selector: FunctionSelector, args: [Field; 1]) -> Field {
+        self.context.static_call_public_function(target_contract, target_selector, args, GasOpts::default())[0]
     }
 
     // Same as above but using a specific function from the interface
@@ -155,12 +117,11 @@ pub contract StaticParent {
         args: [Field; 1],
     ) -> Field {
         // Call the target public function through the pub entrypoint statically
-        StaticParent::at(self.address).public_call(target_contract, target_selector, args[0]).view(
-            self.context,
-        )
+        StaticParent::at(self.address).public_call(target_contract, target_selector, args[0]).view(self.context)
     }
 
-    // Private function to enqueue a static call to a public function of another contract, passing the target arguments provided
+    // Private function to enqueue a static call to a public function of another contract, passing the target arguments
+    // provided
     #[external("private")]
     fn enqueue_static_call_to_pub_function(
         target_contract: AztecAddress,
@@ -184,10 +145,6 @@ pub contract StaticParent {
         args: [Field; 1],
     ) {
         // Call the target public function through the pub entrypoint statically
-        self.enqueue_view(StaticParent::at(self.address).public_call(
-            target_contract,
-            target_selector,
-            args[0],
-        ))
+        self.enqueue_view(StaticParent::at(self.address).public_call(target_contract, target_selector, args[0]))
     }
 }
diff --git a/noir-projects/noir-contracts/contracts/test/storage_proof_test_contract/src/main.nr b/noir-projects/noir-contracts/contracts/test/storage_proof_test_contract/src/main.nr
index 437294dc7a2d..f74bb7546cc8 100644
--- a/noir-projects/noir-contracts/contracts/test/storage_proof_test_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/test/storage_proof_test_contract/src/main.nr
@@ -32,37 +32,23 @@ contract StorageProofTest {
 
     #[external("public")]
     #[view]
-    fn account_proof(
-        account: Account,
-        root: [u64; 4],
-        nodes: [Node; MAX_ACCOUNT_PROOF_LENGTH],
-        node_length: u32,
-    ) {
+    fn account_proof(account: Account, root: [u64; 4], nodes: [Node; MAX_ACCOUNT_PROOF_LENGTH], node_length: u32) {
         let trie_key = KeccakHasher::hash_bytes(account.address, 20);
 
-        let (leaf_hash, new_index) =
-            verify_path_section(nodes, node_length, 0, root, to_nibbles(trie_key));
+        let (leaf_hash, new_index) = verify_path_section(nodes, node_length, 0, root, to_nibbles(trie_key));
 
         assert_eq(leaf_hash, compute_account_hash(account, new_index, trie_key));
     }
 
     #[external("private")]
-    fn storage_proof(
-        address: EthAddress,
-        slot_key: [u8; 32],
-        slot_contents: StorageSlot,
-        eth_storage_root: [u64; 4],
-    ) {
+    fn storage_proof(address: EthAddress, slot_key: [u8; 32], slot_contents: StorageSlot, eth_storage_root: [u64; 4]) {
         // Get the address preimage hint
         let address_capsule_key = compute_address_capsule_key(eth_storage_root, address);
         // Safety: We'll check that the address inside the hint matches.
         let hinted_account = unsafe {
-            Account::deserialize(capsules::load(
-                self.address,
-                address_capsule_key,
-                AztecAddress::zero(),
+            Account::deserialize(
+                capsules::load(self.address, address_capsule_key, AztecAddress::zero()).unwrap(),
             )
-                .unwrap())
         };
         assert_eq(hinted_account.address, address.to_field().to_be_bytes::<20>());
 
@@ -87,17 +73,18 @@ contract StorageProofTest {
         );
 
         // Now, let's do the storage proof verification privately.
-        let storage_proof_capsule_key =
-            compute_storage_proof_capsule_key(address_capsule_key, slot_key);
+        let storage_proof_capsule_key = compute_storage_proof_capsule_key(address_capsule_key, slot_key);
 
         // Safety: This is a hint for path verification.
         let hinted_storage_proof_length = unsafe {
-            u32::deserialize(capsules::load(
-                self.address,
-                storage_proof_capsule_key,
-                AztecAddress::zero(),
+            u32::deserialize(
+                capsules::load(
+                    self.address,
+                    storage_proof_capsule_key,
+                    AztecAddress::zero(),
+                )
+                    .unwrap(),
             )
-                .unwrap())
         };
         assert(hinted_storage_proof_length > 0, "Storage proof length must be greater than 0");
 
@@ -114,10 +101,7 @@ contract StorageProofTest {
         )
             .call(self.context);
 
-        assert_eq(
-            slot_leaf_hash,
-            compute_slot_hash(slot_contents, slot_nibble_index, storage_trie_key),
-        );
+        assert_eq(slot_leaf_hash, compute_slot_hash(slot_contents, slot_nibble_index, storage_trie_key));
     }
 
     #[only_self]
@@ -138,17 +122,13 @@ contract StorageProofTest {
             num_nodes_remaining
         };
         for i in 0..NUM_NODES_VERIFIED_PER_CALL {
-            let node_capsule_key =
-                compute_node_capsule_key(storage_proof_capsule_key, num_processed_nodes + i);
+            let node_capsule_key = compute_node_capsule_key(storage_proof_capsule_key, num_processed_nodes + i);
             if i < num_nodes_to_process {
                 // Safety: This is a hint for the path verification.
                 hinted_nodes[i] = unsafe {
-                    Node::deserialize(capsules::load(
-                        self.address,
-                        node_capsule_key,
-                        AztecAddress::zero(),
+                    Node::deserialize(
+                        capsules::load(self.address, node_capsule_key, AztecAddress::zero()).unwrap(),
                     )
-                        .unwrap())
                 };
             }
         }
@@ -218,14 +198,16 @@ contract StorageProofTest {
 
     #[contract_library_method]
     fn compute_storage_proof_capsule_key(address_capsule_key: Field, slot_key: [u8; 32]) -> Field {
-        poseidon2_hash((STORAGE_PROOF_CAPSULE_KEY_SEPARATOR, address_capsule_key, slot_key)
-            .serialize())
+        poseidon2_hash(
+            (STORAGE_PROOF_CAPSULE_KEY_SEPARATOR, address_capsule_key, slot_key).serialize(),
+        )
     }
 
     #[contract_library_method]
     fn compute_node_capsule_key(storage_proof_capsule_key: Field, index: u32) -> Field {
-        poseidon2_hash((STORAGE_PROOF_NODE_CAPSULE_KEY_SEPARATOR, storage_proof_capsule_key, index)
-            .serialize())
+        poseidon2_hash(
+            (STORAGE_PROOF_NODE_CAPSULE_KEY_SEPARATOR, storage_proof_capsule_key, index).serialize(),
+        )
     }
 
 }
diff --git a/noir-projects/noir-contracts/contracts/test/storage_proof_test_contract/src/storage_proofs/account_hash.nr b/noir-projects/noir-contracts/contracts/test/storage_proof_test_contract/src/storage_proofs/account_hash.nr
index e49b8fbb0ef1..7e24696244b8 100644
--- a/noir-projects/noir-contracts/contracts/test/storage_proof_test_contract/src/storage_proofs/account_hash.nr
+++ b/noir-projects/noir-contracts/contracts/test/storage_proof_test_contract/src/storage_proofs/account_hash.nr
@@ -8,12 +8,7 @@ use super::{
 global ACCOUNT_RLP_MAX_LENGTH: u32 = 147;
 
 #[inline_always]
-fn rlp_encode_to_sink<S: BytesSink>(
-    account: Account,
-    start_nibble_idx: u32,
-    trie_key: [u8; 32],
-    sink: &mut S,
-) {
+fn rlp_encode_to_sink<S: BytesSink>(account: Account, start_nibble_idx: u32, trie_key: [u8; 32], sink: &mut S) {
     let mut current_nibble_idx = start_nibble_idx;
 
     let first_key_byte = if current_nibble_idx % 2 == 0 {
@@ -135,19 +130,14 @@ unconstrained fn rlp_encode_unconstrained(
     writer.finish()
 }
 
-pub fn compute_account_hash(
-    account: Account,
-    start_nibble_idx: u32,
-    trie_key: [u8; 32],
-) -> [u64; 4] {
+pub fn compute_account_hash(account: Account, start_nibble_idx: u32, trie_key: [u8; 32]) -> [u64; 4] {
     if std::runtime::is_unconstrained() {
         let mut hasher: KeccakHasher = KeccakHasher::new();
         rlp_encode_to_sink(account, start_nibble_idx, trie_key, &mut hasher);
         hasher.finish_to_limbs()
     } else {
         // Safety: Constrained below
-        let (bytes, length) =
-            unsafe { rlp_encode_unconstrained(account, start_nibble_idx, trie_key) };
+        let (bytes, length) = unsafe { rlp_encode_unconstrained(account, start_nibble_idx, trie_key) };
 
         let mut checker = BytesChecker::new(bytes, length);
         rlp_encode_to_sink(account, start_nibble_idx, trie_key, &mut checker);
diff --git a/noir-projects/noir-contracts/contracts/test/storage_proof_test_contract/src/storage_proofs/keccak.nr b/noir-projects/noir-contracts/contracts/test/storage_proof_test_contract/src/storage_proofs/keccak.nr
index 6c24425aca4f..0e5c6fcacd61 100644
--- a/noir-projects/noir-contracts/contracts/test/storage_proof_test_contract/src/storage_proofs/keccak.nr
+++ b/noir-projects/noir-contracts/contracts/test/storage_proof_test_contract/src/storage_proofs/keccak.nr
@@ -16,12 +16,7 @@ pub struct KeccakHasher {
 
 impl KeccakHasher {
     pub fn new() -> Self {
-        Self {
-            state: [0; NUM_KECCAK_LANES],
-            limb_index_to_write: 0,
-            current_limb: 0,
-            current_limb_shift: 0,
-        }
+        Self { state: [0; NUM_KECCAK_LANES], limb_index_to_write: 0, current_limb: 0, current_limb_shift: 0 }
     }
 
     pub fn hash_bytes<let N: u32>(bytes: [u8; N], length: u32) -> [u8; 32] {
@@ -69,8 +64,7 @@ impl KeccakHasher {
 
     #[inline_always]
     fn finish_limb(&mut self) {
-        self.state[self.limb_index_to_write] =
-            self.state[self.limb_index_to_write] ^ self.current_limb;
+        self.state[self.limb_index_to_write] = self.state[self.limb_index_to_write] ^ self.current_limb;
         self.current_limb_shift = 0;
         self.current_limb = 0;
         if self.limb_index_to_write == (LIMBS_PER_BLOCK - 1) {
@@ -88,8 +82,8 @@ impl KeccakHasher {
 
     #[inline_always]
     fn apply_padding(&mut self) {
-        self.state[self.limb_index_to_write] = self.state[self.limb_index_to_write]
-            ^ (self.current_limb + (0x01 << self.current_limb_shift));
+        self.state[self.limb_index_to_write] =
+            self.state[self.limb_index_to_write] ^ (self.current_limb + (0x01 << self.current_limb_shift));
         self.state[LIMBS_PER_BLOCK - 1] = self.state[LIMBS_PER_BLOCK - 1] ^ (0x80 << 56);
     }
 
diff --git a/noir-projects/noir-contracts/contracts/test/storage_proof_test_contract/src/storage_proofs/slot_hash.nr b/noir-projects/noir-contracts/contracts/test/storage_proof_test_contract/src/storage_proofs/slot_hash.nr
index 5981e9eab239..edb8d06d7629 100644
--- a/noir-projects/noir-contracts/contracts/test/storage_proof_test_contract/src/storage_proofs/slot_hash.nr
+++ b/noir-projects/noir-contracts/contracts/test/storage_proof_test_contract/src/storage_proofs/slot_hash.nr
@@ -8,12 +8,7 @@ use super::{
 global SLOT_RLP_MAX_LENGTH: u32 = 69;
 
 #[inline_always]
-fn rlp_encode_to_sink<S: BytesSink>(
-    slot: StorageSlot,
-    start_nibble_idx: u32,
-    trie_key: [u8; 32],
-    sink: &mut S,
-) {
+fn rlp_encode_to_sink<S: BytesSink>(slot: StorageSlot, start_nibble_idx: u32, trie_key: [u8; 32], sink: &mut S) {
     let mut current_nibble_idx = start_nibble_idx;
 
     let first_key_byte = if current_nibble_idx % 2 == 0 {
diff --git a/noir-projects/noir-contracts/contracts/test/test_contract/src/main.nr b/noir-projects/noir-contracts/contracts/test/test_contract/src/main.nr
index f230a400ec57..6c21ed6ad667 100644
--- a/noir-projects/noir-contracts/contracts/test/test_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/test/test_contract/src/main.nr
@@ -23,10 +23,7 @@ pub contract Test {
             HintedNote,
         },
         // State variable types
-        state_vars::{
-            DelayedPublicMutable, Map, Owned, PrivateImmutable, PrivateMutable, PrivateSet,
-            PublicImmutable,
-        },
+        state_vars::{DelayedPublicMutable, Map, Owned, PrivateImmutable, PrivateMutable, PrivateSet, PublicImmutable},
         // Protocol types and constants
         protocol::{
             abis::function_selector::FunctionSelector,
@@ -49,7 +46,6 @@ pub contract Test {
         // Contract instance management
         publish_contract_instance::publish_contract_instance_for_public_execution,
     };
-    use std::hash::pedersen_hash_with_separator;
     use std::meta::derive;
     use token_portal_content_hash_lib::get_mint_to_private_content_hash;
 
@@ -134,16 +130,9 @@ pub contract Test {
     fn dummy_public_call() {}
 
     #[external("private")]
-    fn call_create_note(
-        value: u128,
-        owner: AztecAddress,
-        storage_slot: Field,
-        make_tx_hybrid: bool,
-    ) {
+    fn call_create_note(value: u128, owner: AztecAddress, storage_slot: Field, make_tx_hybrid: bool) {
         let note = UintNote { value };
-        create_note(self.context, owner, storage_slot, note).deliver(
-            MessageDelivery.ONCHAIN_CONSTRAINED,
-        );
+        create_note(self.context, owner, storage_slot, note).deliver(MessageDelivery.ONCHAIN_CONSTRAINED);
 
         if make_tx_hybrid {
             self.enqueue_self.dummy_public_call();
@@ -161,11 +150,7 @@ pub contract Test {
     }
 
     #[external("private")]
-    fn call_create_and_complete_partial_note(
-        owner: AztecAddress,
-        storage_slot: Field,
-        value: u128,
-    ) {
+    fn call_create_and_complete_partial_note(owner: AztecAddress, storage_slot: Field, value: u128) {
         let partial_note = UintNote::partial(owner, self.context, owner, self.address);
 
         self.enqueue_self.call_complete_partial_note(partial_note, storage_slot, value);
@@ -178,35 +163,25 @@ pub contract Test {
             options = options.set_status(NoteStatus.ACTIVE_OR_NULLIFIED);
         }
 
-        let confirmed_notes: BoundedVec<ConfirmedNote<UintNote>, _> =
-            get_notes(self.context, storage_slot, options);
+        let confirmed_notes: BoundedVec<ConfirmedNote<UintNote>, _> = get_notes(self.context, storage_slot, options);
 
         confirmed_notes.get(0).note.value
     }
 
     #[external("private")]
-    fn call_get_notes_many(
-        owner: AztecAddress,
-        storage_slot: Field,
-        active_or_nullified: bool,
-    ) -> [u128; 2] {
+    fn call_get_notes_many(owner: AztecAddress, storage_slot: Field, active_or_nullified: bool) -> [u128; 2] {
         let mut options = NoteGetterOptions::new().set_owner(owner);
         if (active_or_nullified) {
             options = options.set_status(NoteStatus.ACTIVE_OR_NULLIFIED);
         }
 
-        let confirmed_notes: BoundedVec<ConfirmedNote<UintNote>, _> =
-            get_notes(self.context, storage_slot, options);
+        let confirmed_notes: BoundedVec<ConfirmedNote<UintNote>, _> = get_notes(self.context, storage_slot, options);
 
         [confirmed_notes.get(0).note.value, confirmed_notes.get(1).note.value]
     }
 
     #[external("utility")]
-    unconstrained fn call_view_notes(
-        owner: AztecAddress,
-        storage_slot: Field,
-        active_or_nullified: bool,
-    ) -> u128 {
+    unconstrained fn call_view_notes(owner: AztecAddress, storage_slot: Field, active_or_nullified: bool) -> u128 {
         let mut options = NoteViewerOptions::new().set_owner(owner);
         if (active_or_nullified) {
             options = options.set_status(NoteStatus.ACTIVE_OR_NULLIFIED);
@@ -236,8 +211,7 @@ pub contract Test {
     #[external("private")]
     fn call_destroy_note(owner: AztecAddress, storage_slot: Field) {
         let options = NoteGetterOptions::new().set_owner(owner);
-        let confirmed_notes: BoundedVec<ConfirmedNote<UintNote>, _> =
-            get_notes(self.context, storage_slot, options);
+        let confirmed_notes: BoundedVec<ConfirmedNote<UintNote>, _> = get_notes(self.context, storage_slot, options);
 
         destroy_note(self.context, confirmed_notes.get(0));
     }
@@ -250,8 +224,7 @@ pub contract Test {
         // instead manually construct the value from a `ConfirmedNote` (which doesn't make sense, since `get_note`
         // already proves note inclusion).
         // TODO(F-255).
-        let confirmed_note: ConfirmedNote<UintNote> =
-            get_notes(self.context, storage_slot, options).get(0);
+        let confirmed_note: ConfirmedNote<UintNote> = get_notes(self.context, storage_slot, options).get(0);
         let hinted_note = HintedNote {
             note: confirmed_note.note,
             contract_address: confirmed_note.contract_address,
@@ -325,12 +298,7 @@ pub contract Test {
 
     // For testing non-note encrypted logs
     #[external("private")]
-    fn emit_array_as_encrypted_log(
-        tag: Field,
-        fields: [Field; 5],
-        owner: AztecAddress,
-        nest: bool,
-    ) {
+    fn emit_array_as_encrypted_log(tag: Field, fields: [Field; 5], owner: AztecAddress, nest: bool) {
         let event = ExampleEvent {
             value0: fields[0],
             value1: fields[1],
@@ -362,8 +330,7 @@ pub contract Test {
     #[external("public")]
     fn emit_full_size_public_log(value_offset: Field) {
         // -1 because emit_public_log_unsafe prepends the tag, so the emitted log is N + 1 fields.
-        let log_fields =
-            [0; MAX_PUBLIC_LOG_SIZE_IN_FIELDS - 1].mapi(|i, _| value_offset + i as Field);
+        let log_fields = [0; MAX_PUBLIC_LOG_SIZE_IN_FIELDS - 1].mapi(|i, _| value_offset + i as Field);
         self.context.emit_public_log_unsafe(0, log_fields);
     }
 
@@ -434,16 +401,6 @@ pub contract Test {
         pub secret_hash: Field,
     }
 
-    impl DummyNote {
-        fn new(amount: Field, secret_hash: Field) -> Self {
-            Self { amount, secret_hash }
-        }
-
-        fn get_commitment(self) -> Field {
-            pedersen_hash_with_separator([self.amount, self.secret_hash], 0)
-        }
-    }
-
     #[derive(Serialize)]
     pub struct DeepStruct {
         pub a_field: Field,
diff --git a/noir-projects/noir-contracts/contracts/test/test_contract/src/test/deployment_proofs.nr b/noir-projects/noir-contracts/contracts/test/test_contract/src/test/deployment_proofs.nr
index 926ccdc1129a..e35a9d7369ca 100644
--- a/noir-projects/noir-contracts/contracts/test/test_contract/src/test/deployment_proofs.nr
+++ b/noir-projects/noir-contracts/contracts/test/test_contract/src/test/deployment_proofs.nr
@@ -42,79 +42,44 @@ pub unconstrained fn setup() -> (TestEnvironment, AztecAddress, AztecAddress, Fi
 unconstrained fn contract_historical_proofs_happy_path() {
     let (env, contract_address, _owner, init_hash) = setup();
 
-    env.private_context_opts(
-        PrivateContextOptions::new().at_anchor_block_number(CONTRACT_DEPLOYED_AT - 1),
-        |context| {
-            assert_contract_bytecode_was_not_published_by(
-                context.anchor_block_header,
-                contract_address,
-            );
-        },
-    );
+    env.private_context_opts(PrivateContextOptions::new().at_anchor_block_number(CONTRACT_DEPLOYED_AT - 1), |context| {
+        assert_contract_bytecode_was_not_published_by(context.anchor_block_header, contract_address);
+    });
 
-    env.private_context_opts(
-        PrivateContextOptions::new().at_anchor_block_number(CONTRACT_DEPLOYED_AT),
-        |context| {
-            assert_contract_bytecode_was_published_by(
-                context.anchor_block_header,
-                contract_address,
-            );
-        },
-    );
+    env.private_context_opts(PrivateContextOptions::new().at_anchor_block_number(CONTRACT_DEPLOYED_AT), |context| {
+        assert_contract_bytecode_was_published_by(context.anchor_block_header, contract_address);
+    });
 
     env.private_context_opts(
         PrivateContextOptions::new().at_anchor_block_number(CONTRACT_INITIALIZED_AT - 1),
-        |context| {
-            assert_contract_was_not_initialized_by(
-                context.anchor_block_header,
-                contract_address,
-                init_hash,
-            );
-        },
+        |context| { assert_contract_was_not_initialized_by(context.anchor_block_header, contract_address, init_hash); },
     );
 
-    env.private_context_opts(
-        PrivateContextOptions::new().at_anchor_block_number(CONTRACT_INITIALIZED_AT),
-        |context| {
-            assert_contract_was_initialized_by(
-                context.anchor_block_header,
-                contract_address,
-                init_hash,
-            );
-        },
-    );
+    env.private_context_opts(PrivateContextOptions::new().at_anchor_block_number(CONTRACT_INITIALIZED_AT), |context| {
+        assert_contract_was_initialized_by(context.anchor_block_header, contract_address, init_hash);
+    });
 }
 
 #[test(should_fail_with = "Nullifier membership witness not found at block")]
 unconstrained fn assert_contract_bytecode_was_published_by_before_deployment_fails() {
     let (env, contract_address, _owner, _init_hash) = setup();
 
-    // Note that we're only testing that the function fails, but not that it would correct reject bad hints from an oracle
-    env.private_context_opts(
-        PrivateContextOptions::new().at_anchor_block_number(CONTRACT_DEPLOYED_AT - 1),
-        |context| {
-            assert_contract_bytecode_was_published_by(
-                context.anchor_block_header,
-                contract_address,
-            );
-        },
-    );
+    // Note that we're only testing that the function fails, but not that it would correct reject bad hints from an
+    // oracle
+    env.private_context_opts(PrivateContextOptions::new().at_anchor_block_number(CONTRACT_DEPLOYED_AT - 1), |context| {
+        assert_contract_bytecode_was_published_by(context.anchor_block_header, contract_address);
+    });
 }
 
 #[test(should_fail_with = "Nullifier membership witness not found at block")]
 unconstrained fn assert_contract_was_initialized_by_before_initialization_fails() {
     let (env, contract_address, _owner, init_hash) = setup();
 
-    // Note that we're only testing that the function fails, but not that it would correct reject bad hints from an oracle
+    // Note that we're only testing that the function fails, but not that it would correct reject bad hints from an
+    // oracle
     env.private_context_opts(
         PrivateContextOptions::new().at_anchor_block_number(CONTRACT_INITIALIZED_AT - 1),
-        |context| {
-            assert_contract_was_initialized_by(
-                context.anchor_block_header,
-                contract_address,
-                init_hash,
-            );
-        },
+        |context| { assert_contract_was_initialized_by(context.anchor_block_header, contract_address, init_hash); },
     );
 }
 
@@ -122,47 +87,29 @@ unconstrained fn assert_contract_was_initialized_by_before_initialization_fails(
 unconstrained fn assert_contract_bytecode_was_not_published_by_of_deployed_fails() {
     let (env, contract_address, _owner, _init_hash) = setup();
 
-    // Note that we're only testing that the function fails, but not that it would correct reject bad hints from an oracle
-    env.private_context_opts(
-        PrivateContextOptions::new().at_anchor_block_number(CONTRACT_DEPLOYED_AT),
-        |context| {
-            assert_contract_bytecode_was_not_published_by(
-                context.anchor_block_header,
-                contract_address,
-            );
-        },
-    );
+    // Note that we're only testing that the function fails, but not that it would correct reject bad hints from an
+    // oracle
+    env.private_context_opts(PrivateContextOptions::new().at_anchor_block_number(CONTRACT_DEPLOYED_AT), |context| {
+        assert_contract_bytecode_was_not_published_by(context.anchor_block_header, contract_address);
+    });
 }
 
 #[test(should_fail_with = "Nullifier membership witness not found at block")]
 unconstrained fn assert_contract_was_initialized_by_with_wrong_init_hash_fails() {
     let (env, contract_address, _owner, _init_hash) = setup();
 
-    env.private_context_opts(
-        PrivateContextOptions::new().at_anchor_block_number(CONTRACT_INITIALIZED_AT),
-        |context| {
-            assert_contract_was_initialized_by(
-                context.anchor_block_header,
-                contract_address,
-                0xdeadbeef,
-            );
-        },
-    );
+    env.private_context_opts(PrivateContextOptions::new().at_anchor_block_number(CONTRACT_INITIALIZED_AT), |context| {
+        assert_contract_was_initialized_by(context.anchor_block_header, contract_address, 0xdeadbeef);
+    });
 }
 
 #[test(should_fail_with = "Cannot prove nullifier non-inclusion")]
 unconstrained fn assert_contract_was_not_initialized_by_of_initialized_fails() {
     let (env, contract_address, _owner, init_hash) = setup();
 
-    // Note that we're only testing that the function fails, but not that it would correct reject bad hints from an oracle
-    env.private_context_opts(
-        PrivateContextOptions::new().at_anchor_block_number(CONTRACT_INITIALIZED_AT),
-        |context| {
-            assert_contract_was_not_initialized_by(
-                context.anchor_block_header,
-                contract_address,
-                init_hash,
-            );
-        },
-    );
+    // Note that we're only testing that the function fails, but not that it would correct reject bad hints from an
+    // oracle
+    env.private_context_opts(PrivateContextOptions::new().at_anchor_block_number(CONTRACT_INITIALIZED_AT), |context| {
+        assert_contract_was_not_initialized_by(context.anchor_block_header, contract_address, init_hash);
+    });
 }
diff --git a/noir-projects/noir-contracts/contracts/test/test_contract/src/test/macro_id_allocation.nr b/noir-projects/noir-contracts/contracts/test/test_contract/src/test/macro_id_allocation.nr
index 27dd2a9761bf..a97b7a173022 100644
--- a/noir-projects/noir-contracts/contracts/test/test_contract/src/test/macro_id_allocation.nr
+++ b/noir-projects/noir-contracts/contracts/test/test_contract/src/test/macro_id_allocation.nr
@@ -32,7 +32,8 @@ unconstrained fn storage_slot_allocation() {
     //   note_in_public_immutable: PublicImmutable<TestNote, Context>,
     //   struct_in_public_immutable: PublicImmutable<ExampleStruct, Context>,
     //   struct_in_map: Map<AztecAddress, PrivateImmutable<ExampleStruct, Context>, Context>,
-    //   struct_in_delayed_public_mutable: DelayedPublicMutable<ExampleStruct, DELAYED_PUBLIC_MUTABLE_INITIAL_DELAY, Context>,
+    //   struct_in_delayed_public_mutable: DelayedPublicMutable<ExampleStruct, DELAYED_PUBLIC_MUTABLE_INITIAL_DELAY,
+    // Context>,
     //   dummy_variable: PrivateImmutable<TestNote, Context>,
     // }
 
@@ -88,7 +89,8 @@ unconstrained fn storage_slot_allocation() {
     expected_slot += 1;
 
     assert_eq(Test::storage_layout().struct_in_delayed_public_mutable.slot, expected_slot);
-    // struct_in_delayed_public_mutable should allocate 12 slots because ExampleStruct occupies 5 slots. DelayedPublicMutable stores
+    // struct_in_delayed_public_mutable should allocate 12 slots because ExampleStruct occupies 5 slots.
+    // DelayedPublicMutable stores
     // the value two times (10 slots), and it also stores the time values (one slot) and the hash (another slot).
     expected_slot += 12;
 
diff --git a/noir-projects/noir-contracts/contracts/test/test_contract/src/test/note_delivery.nr b/noir-projects/noir-contracts/contracts/test/test_contract/src/test/note_delivery.nr
index dc3eb139591c..b3a4a8318f15 100644
--- a/noir-projects/noir-contracts/contracts/test/test_contract/src/test/note_delivery.nr
+++ b/noir-projects/noir-contracts/contracts/test/test_contract/src/test/note_delivery.nr
@@ -11,8 +11,7 @@ pub unconstrained fn setup() -> (TestEnvironment, AztecAddress, AztecAddress, Az
     let sender = env.create_light_account();
     let recipient = env.create_light_account();
 
-    let contract_address =
-        env.deploy("Test").with_private_initializer(sender, Test::interface().initialize());
+    let contract_address = env.deploy("Test").with_private_initializer(sender, Test::interface().initialize());
 
     (env, contract_address, sender, recipient)
 }
@@ -23,16 +22,11 @@ unconstrained fn create_note_private_only_tx_and_read_in_private() {
     let test_contract = Test::at(contract_address);
 
     let make_tx_hybrid = false;
-    env.call_private(
-        sender,
-        test_contract.call_create_note(VALUE, recipient, STORAGE_SLOT, make_tx_hybrid),
-    );
+    env.call_private(sender, test_contract.call_create_note(VALUE, recipient, STORAGE_SLOT, make_tx_hybrid));
 
     // The 'from' param is irrelevant in this case
-    let retrieved = env.call_private(
-        recipient,
-        test_contract.call_get_notes(recipient, STORAGE_SLOT, ACTIVE_OR_NULLIFIED),
-    );
+    let retrieved =
+        env.call_private(recipient, test_contract.call_get_notes(recipient, STORAGE_SLOT, ACTIVE_OR_NULLIFIED));
     assert_eq(retrieved, VALUE);
 }
 
@@ -42,16 +36,9 @@ unconstrained fn create_note_private_only_tx_and_read_in_utility() {
     let test_contract = Test::at(contract_address);
 
     let make_tx_hybrid = false;
-    env.call_private(
-        sender,
-        test_contract.call_create_note(VALUE, recipient, STORAGE_SLOT, make_tx_hybrid),
-    );
-
-    let retrieved = env.execute_utility(test_contract.call_view_notes(
-        recipient,
-        STORAGE_SLOT,
-        ACTIVE_OR_NULLIFIED,
-    ));
+    env.call_private(sender, test_contract.call_create_note(VALUE, recipient, STORAGE_SLOT, make_tx_hybrid));
+
+    let retrieved = env.execute_utility(test_contract.call_view_notes(recipient, STORAGE_SLOT, ACTIVE_OR_NULLIFIED));
     assert_eq(retrieved, VALUE);
 }
 
@@ -61,16 +48,11 @@ unconstrained fn create_note_hybrid_tx_and_read_in_private() {
     let test_contract = Test::at(contract_address);
 
     let make_tx_hybrid = true;
-    env.call_private(
-        sender,
-        test_contract.call_create_note(VALUE, recipient, STORAGE_SLOT, make_tx_hybrid),
-    );
+    env.call_private(sender, test_contract.call_create_note(VALUE, recipient, STORAGE_SLOT, make_tx_hybrid));
 
     // The 'from' param is irrelevant in this case
-    let retrieved = env.call_private(
-        recipient,
-        test_contract.call_get_notes(recipient, STORAGE_SLOT, ACTIVE_OR_NULLIFIED),
-    );
+    let retrieved =
+        env.call_private(recipient, test_contract.call_get_notes(recipient, STORAGE_SLOT, ACTIVE_OR_NULLIFIED));
     assert_eq(retrieved, VALUE);
 }
 
@@ -80,16 +62,9 @@ unconstrained fn create_note_hybrid_tx_and_read_in_utility() {
     let test_contract = Test::at(contract_address);
 
     let make_tx_hybrid = true;
-    env.call_private(
-        sender,
-        test_contract.call_create_note(VALUE, recipient, STORAGE_SLOT, make_tx_hybrid),
-    );
-
-    let retrieved = env.execute_utility(test_contract.call_view_notes(
-        recipient,
-        STORAGE_SLOT,
-        ACTIVE_OR_NULLIFIED,
-    ));
+    env.call_private(sender, test_contract.call_create_note(VALUE, recipient, STORAGE_SLOT, make_tx_hybrid));
+
+    let retrieved = env.execute_utility(test_contract.call_view_notes(recipient, STORAGE_SLOT, ACTIVE_OR_NULLIFIED));
     assert_eq(retrieved, VALUE);
 }
 
@@ -98,16 +73,11 @@ unconstrained fn create_partial_note_in_one_tx_and_read_in_private() {
     let (env, contract_address, sender, recipient) = setup();
     let test_contract = Test::at(contract_address);
 
-    env.call_private(
-        sender,
-        test_contract.call_create_and_complete_partial_note(recipient, STORAGE_SLOT, VALUE),
-    );
+    env.call_private(sender, test_contract.call_create_and_complete_partial_note(recipient, STORAGE_SLOT, VALUE));
 
     // The 'from' param is irrelevant in this case
-    let retrieved = env.call_private(
-        recipient,
-        test_contract.call_get_notes(recipient, STORAGE_SLOT, ACTIVE_OR_NULLIFIED),
-    );
+    let retrieved =
+        env.call_private(recipient, test_contract.call_get_notes(recipient, STORAGE_SLOT, ACTIVE_OR_NULLIFIED));
     assert_eq(retrieved, VALUE);
 }
 
@@ -116,16 +86,9 @@ unconstrained fn create_partial_note_in_one_tx_and_read_in_utility() {
     let (env, contract_address, sender, recipient) = setup();
     let test_contract = Test::at(contract_address);
 
-    env.call_private(
-        sender,
-        test_contract.call_create_and_complete_partial_note(recipient, STORAGE_SLOT, VALUE),
-    );
+    env.call_private(sender, test_contract.call_create_and_complete_partial_note(recipient, STORAGE_SLOT, VALUE));
 
-    let retrieved = env.execute_utility(test_contract.call_view_notes(
-        recipient,
-        STORAGE_SLOT,
-        ACTIVE_OR_NULLIFIED,
-    ));
+    let retrieved = env.execute_utility(test_contract.call_view_notes(recipient, STORAGE_SLOT, ACTIVE_OR_NULLIFIED));
     assert_eq(retrieved, VALUE);
 }
 
@@ -136,16 +99,11 @@ unconstrained fn create_partial_note_in_two_txs_and_read_in_private() {
 
     let partial_note = env.call_private(sender, test_contract.call_create_partial_note(recipient));
 
-    env.call_public(
-        sender,
-        test_contract.call_complete_partial_note(partial_note, STORAGE_SLOT, VALUE),
-    );
+    env.call_public(sender, test_contract.call_complete_partial_note(partial_note, STORAGE_SLOT, VALUE));
 
     // The 'from' param is irrelevant in this case
-    let retrieved = env.call_private(
-        recipient,
-        test_contract.call_get_notes(recipient, STORAGE_SLOT, ACTIVE_OR_NULLIFIED),
-    );
+    let retrieved =
+        env.call_private(recipient, test_contract.call_get_notes(recipient, STORAGE_SLOT, ACTIVE_OR_NULLIFIED));
     assert_eq(retrieved, VALUE);
 }
 
@@ -156,15 +114,8 @@ unconstrained fn create_partial_note_in_two_txs_and_read_in_utility() {
 
     let partial_note = env.call_private(sender, test_contract.call_create_partial_note(recipient));
 
-    env.call_public(
-        sender,
-        test_contract.call_complete_partial_note(partial_note, STORAGE_SLOT, VALUE),
-    );
+    env.call_public(sender, test_contract.call_complete_partial_note(partial_note, STORAGE_SLOT, VALUE));
 
-    let retrieved = env.execute_utility(test_contract.call_view_notes(
-        recipient,
-        STORAGE_SLOT,
-        ACTIVE_OR_NULLIFIED,
-    ));
+    let retrieved = env.execute_utility(test_contract.call_view_notes(recipient, STORAGE_SLOT, ACTIVE_OR_NULLIFIED));
     assert_eq(retrieved, VALUE);
 }
diff --git a/noir-projects/noir-contracts/contracts/test/test_contract/src/test_note.nr b/noir-projects/noir-contracts/contracts/test/test_contract/src/test_note.nr
index a7a7a6260547..a6262aca5441 100644
--- a/noir-projects/noir-contracts/contracts/test/test_contract/src/test_note.nr
+++ b/noir-projects/noir-contracts/contracts/test/test_contract/src/test_note.nr
@@ -13,12 +13,7 @@ pub struct TestNote {
 }
 
 impl NoteHash for TestNote {
-    fn compute_note_hash(
-        self,
-        _owner: AztecAddress,
-        storage_slot: Field,
-        randomness: Field,
-    ) -> Field {
+    fn compute_note_hash(self, _owner: AztecAddress, storage_slot: Field, randomness: Field) -> Field {
         // The note is inserted into the state in the Test contract so we provide a real compute_note_hash
         // implementation.
         let data = self.pack().concat([randomness]);
diff --git a/noir-projects/noir-contracts/contracts/test/test_log_contract/src/main.nr b/noir-projects/noir-contracts/contracts/test/test_log_contract/src/main.nr
index 8e3ce0555304..e972fccf77b1 100644
--- a/noir-projects/noir-contracts/contracts/test/test_log_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/test/test_log_contract/src/main.nr
@@ -1,3 +1,5 @@
+mod test;
+
 use aztec::macros::aztec;
 
 #[aztec]
@@ -41,6 +43,28 @@ pub contract TestLog {
         example_set: Owned<PrivateSet<FieldNote, Context>, Context>,
     }
 
+    /// Emits a single private log with the given raw tag and a one-field payload.
+    #[external("private")]
+    fn emit_raw_private_log(tag: Field, payload: Field) {
+        self.context.emit_private_log_vec_unsafe(tag, BoundedVec::from_array([payload]));
+    }
+
+    /// Emits three private logs with payloads of different lengths (1, 3, and 5 fields). Used to
+    /// exercise the nested `BoundedVec<BoundedVec<Field, _>, _>` serialization between TXE and Noir.
+    #[external("private")]
+    fn emit_three_raw_private_logs_diff_lengths(
+        tag1: Field,
+        payload1: Field,
+        tag2: Field,
+        payload2: [Field; 3],
+        tag3: Field,
+        payload3: [Field; 5],
+    ) {
+        self.context.emit_private_log_vec_unsafe(tag1, BoundedVec::from_array([payload1]));
+        self.context.emit_private_log_vec_unsafe(tag2, BoundedVec::from_array(payload2));
+        self.context.emit_private_log_vec_unsafe(tag3, BoundedVec::from_array(payload3));
+    }
+
     #[external("private")]
     fn emit_encrypted_events(other: AztecAddress, preimages: [Field; 4]) {
         let event0 = ExampleEvent0 { value0: preimages[0], value1: preimages[1] };
@@ -50,10 +74,7 @@ pub contract TestLog {
         // We duplicate the emission, but swapping the sender and recipient:
         self.emit(event0).deliver_to(other, MessageDelivery.ONCHAIN_CONSTRAINED);
 
-        let event1 = ExampleEvent1 {
-            value2: AztecAddress::from_field(preimages[2]),
-            value3: preimages[3] as u8,
-        };
+        let event1 = ExampleEvent1 { value2: AztecAddress::from_field(preimages[2]), value3: preimages[3] as u8 };
 
         self.emit(event1).deliver_to(self.msg_sender(), MessageDelivery.ONCHAIN_CONSTRAINED);
     }
@@ -62,12 +83,7 @@ pub contract TestLog {
     fn emit_unencrypted_events(preimages: [Field; 4]) {
         self.emit(ExampleEvent0 { value0: preimages[0], value1: preimages[1] });
 
-        self.emit(
-            ExampleEvent1 {
-                value2: AztecAddress::from_field(preimages[2]),
-                value3: preimages[3] as u8,
-            },
-        );
+        self.emit(ExampleEvent1 { value2: AztecAddress::from_field(preimages[2]), value3: preimages[3] as u8 });
     }
 
     // Emits an event with a nested struct to test that decoding works correctly
diff --git a/noir-projects/noir-contracts/contracts/test/test_log_contract/src/test.nr b/noir-projects/noir-contracts/contracts/test/test_log_contract/src/test.nr
new file mode 100644
index 000000000000..c1a43ec2086f
--- /dev/null
+++ b/noir-projects/noir-contracts/contracts/test/test_log_contract/src/test.nr
@@ -0,0 +1 @@
+mod tx_effects;
diff --git a/noir-projects/noir-contracts/contracts/test/test_log_contract/src/test/tx_effects.nr b/noir-projects/noir-contracts/contracts/test/test_log_contract/src/test/tx_effects.nr
new file mode 100644
index 000000000000..a652f538a64b
--- /dev/null
+++ b/noir-projects/noir-contracts/contracts/test/test_log_contract/src/test/tx_effects.nr
@@ -0,0 +1,89 @@
+use crate::TestLog;
+use aztec::protocol::{address::AztecAddress, hash::compute_siloed_private_log_first_field};
+use aztec::test::helpers::{test_environment::TestEnvironment, txe_oracles};
+
+global RAW_TAG: Field = 42;
+global PAYLOAD: Field = 1234;
+
+unconstrained fn setup() -> (TestEnvironment, AztecAddress, AztecAddress) {
+    let mut env = TestEnvironment::new();
+    let sender = env.create_light_account();
+    let contract_address = env.deploy("TestLog").without_initializer();
+    (env, contract_address, sender)
+}
+
+#[test]
+unconstrained fn no_private_logs_when_none_emitted() {
+    let (env, contract_address, sender) = setup();
+    let test_log = TestLog::at(contract_address);
+
+    env.call_public(sender, test_log.emit_unencrypted_events([1, 2, 3, 4]));
+
+    let private_logs = txe_oracles::get_last_tx_effects().private_logs;
+
+    assert_eq(private_logs.len(), 0);
+}
+
+#[test]
+unconstrained fn private_log() {
+    let (env, contract_address, sender) = setup();
+    let test_log = TestLog::at(contract_address);
+
+    env.call_private(sender, test_log.emit_raw_private_log(RAW_TAG, PAYLOAD));
+
+    let private_logs = txe_oracles::get_last_tx_effects().private_logs;
+
+    assert_eq(private_logs.len(), 1);
+
+    let log = private_logs.get(0);
+    // The log carries the kernel-siloed tag (first field) followed by the emitted payload.
+    assert_eq(log.len(), 2);
+
+    let expected_siloed_tag = compute_siloed_private_log_first_field(contract_address, RAW_TAG);
+    assert_eq(log.get(0), expected_siloed_tag);
+    assert_eq(log.get(1), PAYLOAD);
+}
+
+/// Exercises the nested `BoundedVec<BoundedVec<T>` serialization in `aztec_txe_getLastTxEffects`.
+#[test]
+unconstrained fn multiple_private_logs_with_varying_lengths() {
+    let (env, contract_address, sender) = setup();
+    let test_log = TestLog::at(contract_address);
+
+    let tag1: Field = 1;
+    let payload1: Field = 100;
+    let tag2: Field = 2;
+    let payload2: [Field; 3] = [200, 201, 202];
+    let tag3: Field = 3;
+    let payload3: [Field; 5] = [300, 301, 302, 303, 304];
+
+    env.call_private(
+        sender,
+        test_log.emit_three_raw_private_logs_diff_lengths(tag1, payload1, tag2, payload2, tag3, payload3),
+    );
+
+    let private_logs = txe_oracles::get_last_tx_effects().private_logs;
+
+    assert_eq(private_logs.len(), 3);
+
+    let log1 = private_logs.get(0);
+    assert_eq(log1.len(), 2); // 1 tag + 1 payload field
+    assert_eq(log1.get(0), compute_siloed_private_log_first_field(contract_address, tag1));
+    assert_eq(log1.get(1), payload1);
+
+    let log2 = private_logs.get(1);
+    assert_eq(log2.len(), 4); // 1 tag + 3 payload fields
+    assert_eq(log2.get(0), compute_siloed_private_log_first_field(contract_address, tag2));
+    assert_eq(log2.get(1), payload2[0]);
+    assert_eq(log2.get(2), payload2[1]);
+    assert_eq(log2.get(3), payload2[2]);
+
+    let log3 = private_logs.get(2);
+    assert_eq(log3.len(), 6); // 1 tag + 5 payload fields
+    assert_eq(log3.get(0), compute_siloed_private_log_first_field(contract_address, tag3));
+    assert_eq(log3.get(1), payload3[0]);
+    assert_eq(log3.get(2), payload3[1]);
+    assert_eq(log3.get(3), payload3[2]);
+    assert_eq(log3.get(4), payload3[3]);
+    assert_eq(log3.get(5), payload3[4]);
+}
diff --git a/noir-projects/noir-contracts/contracts/test/unit_return_type_contract/Nargo.toml b/noir-projects/noir-contracts/contracts/test/unit_return_type_contract/Nargo.toml
new file mode 100644
index 000000000000..c6d3024c414c
--- /dev/null
+++ b/noir-projects/noir-contracts/contracts/test/unit_return_type_contract/Nargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "unit_return_type_contract"
+authors = [""]
+compiler_version = ">=0.25.0"
+type = "contract"
+
+[dependencies]
+aztec = { path = "../../../../aztec-nr/aztec" }
diff --git a/noir-projects/noir-contracts/contracts/test/unit_return_type_contract/src/main.nr b/noir-projects/noir-contracts/contracts/test/unit_return_type_contract/src/main.nr
new file mode 100644
index 000000000000..7ebeb4d06e00
--- /dev/null
+++ b/noir-projects/noir-contracts/contracts/test/unit_return_type_contract/src/main.nr
@@ -0,0 +1,16 @@
+// Verifies that contract functions with a unit return type `()` compile without requiring Serialize or Deserialize.
+use aztec::macros::aztec;
+
+#[aztec]
+pub contract UnitReturnType {
+    use aztec::macros::functions::external;
+
+    #[external("private")]
+    fn private_unit_return(_x: Field) {}
+
+    #[external("public")]
+    fn public_unit_return(_x: Field) {}
+
+    #[external("utility")]
+    unconstrained fn utility_unit_return(_x: Field) {}
+}
diff --git a/noir-projects/noir-contracts/contracts/test/updatable_contract/src/main.nr b/noir-projects/noir-contracts/contracts/test/updatable_contract/src/main.nr
index 08ed569b0d7a..32b02fe244ff 100644
--- a/noir-projects/noir-contracts/contracts/test/updatable_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/test/updatable_contract/src/main.nr
@@ -27,9 +27,7 @@ contract Updatable {
     fn initialize(initial_value: Field) {
         let owner = self.msg_sender();
         let note = FieldNote { value: initial_value };
-        self.storage.private_value.at(owner).initialize(note).deliver(
-            MessageDelivery.ONCHAIN_CONSTRAINED,
-        );
+        self.storage.private_value.at(owner).initialize(note).deliver(MessageDelivery.ONCHAIN_CONSTRAINED);
         self.enqueue_self._initialize_public_value(initial_value);
     }
 
@@ -46,20 +44,19 @@ contract Updatable {
 
     #[external("private")]
     fn update_to(new_class_id: ContractClassId) {
-        self.enqueue(ContractInstanceRegistry::at(CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS)
-            .update(new_class_id));
+        self.enqueue(ContractInstanceRegistry::at(CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS).update(new_class_id));
     }
 
     #[external("private")]
     fn set_update_delay(new_delay: u64) {
-        self.enqueue(ContractInstanceRegistry::at(CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS)
-            .set_update_delay(new_delay));
+        self.enqueue(ContractInstanceRegistry::at(CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS).set_update_delay(
+            new_delay,
+        ));
     }
 
     #[external("public")]
     fn get_update_delay() -> u64 {
-        self.view(ContractInstanceRegistry::at(CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS)
-            .get_update_delay())
+        self.view(ContractInstanceRegistry::at(CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS).get_update_delay())
     }
 
     #[internal("public")]
diff --git a/noir-projects/noir-contracts/contracts/test/updated_contract/src/main.nr b/noir-projects/noir-contracts/contracts/test/updated_contract/src/main.nr
index 762eafb20f02..8be8f3e34667 100644
--- a/noir-projects/noir-contracts/contracts/test/updated_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/test/updated_contract/src/main.nr
@@ -34,8 +34,7 @@ contract Updated {
 
     #[external("public")]
     fn get_update_delay() -> u64 {
-        self.view(ContractInstanceRegistry::at(CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS)
-            .get_update_delay())
+        self.view(ContractInstanceRegistry::at(CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS).get_update_delay())
     }
 
     #[external("utility")]
diff --git a/noir-projects/noir-contracts/noirfmt.toml b/noir-projects/noir-contracts/noirfmt.toml
new file mode 100644
index 000000000000..759c4ea97f87
--- /dev/null
+++ b/noir-projects/noir-contracts/noirfmt.toml
@@ -0,0 +1,3 @@
+max_width=120
+wrap_comments=true
+comment_width=120
diff --git a/noir-projects/noir-protocol-circuits/Nargo.template.toml b/noir-projects/noir-protocol-circuits/Nargo.template.toml
index 7b8c5179424a..7cde97b4f0ff 100644
--- a/noir-projects/noir-protocol-circuits/Nargo.template.toml
+++ b/noir-projects/noir-protocol-circuits/Nargo.template.toml
@@ -12,8 +12,10 @@ members = [
     "crates/parity-root",
     "crates/private-kernel-lib",
     "crates/private-kernel-init",
+    "crates/private-kernel-init-3",
     "crates/private-kernel-init-simulated",
     "crates/private-kernel-inner",
+    "crates/private-kernel-inner-3",
     "crates/private-kernel-inner-simulated",
     "crates/private-kernel-reset",
     "crates/private-kernel-reset-simulated",
diff --git a/noir-projects/noir-protocol-circuits/crates/private-kernel-init-3/Nargo.toml b/noir-projects/noir-protocol-circuits/crates/private-kernel-init-3/Nargo.toml
new file mode 100644
index 000000000000..a9d7d87ee1ad
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/private-kernel-init-3/Nargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "private_kernel_init_3"
+type = "bin"
+authors = [""]
+compiler_version = ">=0.18.0"
+
+[dependencies]
+private_kernel_lib = { path = "../private-kernel-lib" }
+types = { path = "../types" }
diff --git a/noir-projects/noir-protocol-circuits/crates/private-kernel-init-3/src/main.nr b/noir-projects/noir-protocol-circuits/crates/private-kernel-init-3/src/main.nr
new file mode 100644
index 000000000000..fd224678e8e3
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/private-kernel-init-3/src/main.nr
@@ -0,0 +1,39 @@
+use private_kernel_lib::{private_kernel_init_n, PrivateKernelInitNCircuitPrivateInputs};
+use types::{
+    abis::{
+        private_circuit_public_inputs::PrivateCircuitPublicInputs,
+        private_kernel::private_call_data::PrivateCallDataWithoutPublicInputs,
+        protocol_contracts::ProtocolContracts, transaction::tx_request::TxRequest,
+    },
+    PrivateKernelCircuitPublicInputs,
+};
+
+fn main(
+    tx_request: TxRequest,
+    vk_tree_root: Field,
+    protocol_contracts: ProtocolContracts,
+    private_call_0: PrivateCallDataWithoutPublicInputs,
+    private_call_1: PrivateCallDataWithoutPublicInputs,
+    private_call_2: PrivateCallDataWithoutPublicInputs,
+    is_private_only: bool,
+    first_nullifier_hint: Field,
+    revertible_counter_hint: u32,
+    app_public_inputs_0: call_data(1) PrivateCircuitPublicInputs,
+    app_public_inputs_1: call_data(2) PrivateCircuitPublicInputs,
+    app_public_inputs_2: call_data(3) PrivateCircuitPublicInputs,
+) -> return_data PrivateKernelCircuitPublicInputs {
+    let private_inputs = PrivateKernelInitNCircuitPrivateInputs {
+        tx_request,
+        vk_tree_root,
+        protocol_contracts,
+        private_calls: [
+            private_call_0.to_private_call_data(app_public_inputs_0),
+            private_call_1.to_private_call_data(app_public_inputs_1),
+            private_call_2.to_private_call_data(app_public_inputs_2),
+        ],
+        is_private_only,
+        first_nullifier_hint,
+        revertible_counter_hint,
+    };
+    private_kernel_init_n::execute::<3>(private_inputs)
+}
diff --git a/noir-projects/noir-protocol-circuits/crates/private-kernel-init/Prover.toml b/noir-projects/noir-protocol-circuits/crates/private-kernel-init/Prover.toml
index 1206c5bf149f..11d2e8ee0b13 100644
--- a/noir-projects/noir-protocol-circuits/crates/private-kernel-init/Prover.toml
+++ b/noir-projects/noir-protocol-circuits/crates/private-kernel-init/Prover.toml
@@ -1,18 +1,18 @@
-vk_tree_root = "0x0141caf6779674bc31225636c4cc4259a731835c52fc462f2dcbfabf7de01a1d"
+vk_tree_root = "0x0c16448b65c4b3f83f9db3bebf635bd38957c74c9c1ea36036cbda16432cf558"
 is_private_only = false
-first_nullifier_hint = "0x20eb99e263b0f2ec651bdd337102a4a86b68039cc5cfccd3e7d2c09e3d2646dd"
+first_nullifier_hint = "0x09fac458f9e079d0117ef63746c55ce66b3e5d95c8420974d9c69f369b0d77ef"
 revertible_counter_hint = "0x0000000000000000000000000000000000000000000000000000000000000005"
 
 [tx_request]
-args_hash = "0x0d2ee627eece0d652d4129c2f5628311502d9b19f63ba7f0ea3d3b76230c4db6"
-salt = "0x05415cf91ad14a45d75c5605cec7ada385af436fe612fda2f2ff275c22101279"
+args_hash = "0x2237e42a84e35fc9371ec568e04d6db13130f02f527e0cce6f78ebf038f70f5f"
+salt = "0x0dcc552c9a204fa5c60481076f34e420fdd64d81a8c273ad1c336f00b6912f8c"
 
   [tx_request.origin]
-  inner = "0x0c6be08a5e070b343e733716e4ad76ea05de25e2b7fc6e6f50f0ec549f7c0bfa"
+  inner = "0x0635e757a5f05ba5322db37d6930525b43c2e055ed7c4600559a07fc38ab09ec"
 
   [tx_request.tx_context]
   chain_id = "0x0000000000000000000000000000000000000000000000000000000000007a69"
-  version = "0x000000000000000000000000000000000000000000000000000000007b6d50be"
+  version = "0x00000000000000000000000000000000000000000000000000000000ad49d7cd"
 
 [tx_request.tx_context.gas_settings.gas_limits]
 da_gas = "0x0000000000000000000000000000000000000000000000000000000000030000"
@@ -24,7 +24,7 @@ l2_gas = "0x00000000000000000000000000000000000000000000000000000000000c795c"
 
 [tx_request.tx_context.gas_settings.max_fees_per_gas]
 fee_per_da_gas = "0x0000000000000000000000000000000000000000000000000000000000000000"
-fee_per_l2_gas = "0x0000000000000000000000000000000000000000000000000000000cd98ff1cb"
+fee_per_l2_gas = "0x000000000000000000000000000000000000000000000000000000336bfe2ba6"
 
 [tx_request.tx_context.gas_settings.max_priority_fees_per_gas]
 fee_per_da_gas = "0x0000000000000000000000000000000000000000000000000000000000000000"
@@ -37,22 +37,22 @@ fee_per_l2_gas = "0x000000000000000000000000000000000000000000000000000000000000
     inner = "0x000000000000000000000000000000000000000000000000000000009d57a239"
 
 [[protocol_contracts.derived_addresses]]
-inner = "0x0f8addbb176a80288379af1fe3f6e128881df1ab13f9a4dbf25de12287e61b95"
+inner = "0x1520f4bb11a3a1d2248a03d8472e9af4bb8324eb1d2d8c83bce61894383464b9"
 
 [[protocol_contracts.derived_addresses]]
-inner = "0x0b0006ff0bbf70a2ec9171c2301b65f66536e0c36cc70177a1ffadbb3f69189f"
+inner = "0x26a43bf066852a7b1ec3c5b454f41735fea12e2ffbefed471058124b91d94018"
 
 [[protocol_contracts.derived_addresses]]
-inner = "0x0ffdc845a84050f056157a1c1d52abe18da16b961c9a9a881043c2c02ad2aded"
+inner = "0x1bd26c6831ebc53674b13ac69a0c534563c37e46c2cbb36f2deca107a26515fa"
 
 [[protocol_contracts.derived_addresses]]
-inner = "0x1612f27832228b08a6ee80c5a5fb54e123ce6bddf7a6501de4fb8f426c4d8070"
+inner = "0x06870c63132d2a4e3356a76d773240efe729e7d9b9380a7a3cf1798fc9031aed"
 
 [[protocol_contracts.derived_addresses]]
-inner = "0x0d53da6d9ad9ce42a1ecd9f80a437151035951677b72d7d0af06b6221d0bf913"
+inner = "0x0083c4dfb922796f1086d399f8f3d021159d1a87ba3b833dcdf9863c630ba643"
 
 [[protocol_contracts.derived_addresses]]
-inner = "0x0758bfa195d8fd7782a5e27ef55ad8655afc8d23e57a73cc0331ab1075547146"
+inner = "0x0b4d3a9a7a3caf83f9c2060347e48cc28c7f04d2560d1cbf5bf08d4832128a97"
 
 [[protocol_contracts.derived_addresses]]
 inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
@@ -73,136 +73,152 @@ inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
 key = [
   "0x0000000000000000000000000000000000000000000000000000000000000010",
   "0x0000000000000000000000000000000000000000000000000000000000000008",
-  "0x0000000000000000000000000000000000000000000000000000000000000b86",
-  "0x000000000000000000000000000000e436a61f0a8323bc631e92e08c770737ed",
-  "0x00000000000000000000000000000000000073c184815c8e59dca7c39395723d",
-  "0x000000000000000000000000000000425cd1ebff6b1dacbf7c4a866794afbef8",
-  "0x000000000000000000000000000000000026991c34e3995821de1a3bba230521",
-  "0x00000000000000000000000000000095ebbd08cc9c4d234800b3bfae9224e831",
-  "0x0000000000000000000000000000000000051b373df95da8c909bda5d0154f14",
-  "0x000000000000000000000000000000c1cceaad53951899c4cb2524f0894e90ce",
-  "0x000000000000000000000000000000000008c18ed013df42d01e5b57ad53b907",
-  "0x00000000000000000000000000000000e045349cba87797842103f43f62bc7c3",
-  "0x000000000000000000000000000000000008b7800bdbeaa372e179ff77c6d9d1",
-  "0x00000000000000000000000000000017943b650c4c82786409527bb67b29d8d6",
-  "0x00000000000000000000000000000000001a3cdce2b81e27a356fa1b382900b9",
-  "0x000000000000000000000000000000d0858727a7d89fb36f1938304ee1071bc5",
-  "0x00000000000000000000000000000000002be3af7940fa53e5a558ecd78c4099",
-  "0x000000000000000000000000000000e681c92779812e5fbcfb864f0466de9c89",
-  "0x00000000000000000000000000000000001fb9c4b8c9ec6b8b44946b039a8594",
-  "0x000000000000000000000000000000e2609335d64f28c8d29f12648cbb867a56",
-  "0x0000000000000000000000000000000000244b86bebe481e2a97675c6ac3c678",
-  "0x000000000000000000000000000000b844414a9483ec93ba0612b0ab1a2dd6a6",
-  "0x00000000000000000000000000000000003004823b2e7e94118c4dc103025ec3",
-  "0x000000000000000000000000000000721556aed62b40ab9a173d6fb24cb84439",
-  "0x000000000000000000000000000000000029a472c14c5b4fa1065440794588e7",
-  "0x0000000000000000000000000000005eb23b8d0227f61a174fd7669010a1f5ac",
-  "0x00000000000000000000000000000000000df92c2e8d464a8fe70f586898f260",
-  "0x000000000000000000000000000000d24785817b7914e25ad45446800c585525",
-  "0x00000000000000000000000000000000002291b4be6d23a50f26e8497714a199",
-  "0x0000000000000000000000000000009fedaab644b4ec235698994d383bda2c0f",
-  "0x000000000000000000000000000000000019c67abad33193f6dabff0cccb8778",
-  "0x000000000000000000000000000000a4a46c8b457f77fdc562ac74e6ebdbee18",
-  "0x0000000000000000000000000000000000189a881bf40794427e2ab47eb2bb50",
-  "0x0000000000000000000000000000005a4eebf84a45c23b629371dabfb166f5bb",
-  "0x00000000000000000000000000000000001224103d385cbe0eb0394b25af28cd",
-  "0x00000000000000000000000000000077237376cc9193cd2c64be8077d96d3286",
-  "0x00000000000000000000000000000000000e6dc8721eedf728ef7ed38fe7dbde",
-  "0x0000000000000000000000000000009f8d4fbd18815e621f19d763001c3a453a",
-  "0x000000000000000000000000000000000016f5e1af3a91673f28a93d7daf85ae",
-  "0x0000000000000000000000000000006499adaeb5d0f7d032c2afe11dd7b83470",
-  "0x000000000000000000000000000000000003af56ace74d3379e5b06fc25d0f72",
-  "0x000000000000000000000000000000388e1861f79ec7982e05b2b452e59bf53a",
-  "0x00000000000000000000000000000000000aab30ed6fe7927d8247d84682b613",
-  "0x000000000000000000000000000000e1a24f095a430e4fe2ca187173e83d72f8",
-  "0x0000000000000000000000000000000000181c679eb5d3bd1bcf5edb50fe0362",
-  "0x000000000000000000000000000000720e67152f5d38ea4ff2b462a96e010715",
-  "0x0000000000000000000000000000000000160e3012999fc4d93076e9fdde6a35",
-  "0x000000000000000000000000000000ee5db0d29ff785fe5e7826ff4c8edc0441",
-  "0x000000000000000000000000000000000029053b08403f1f91c89f262180dd17",
-  "0x000000000000000000000000000000e5d97b179014d5c8973178b0ba78fc4493",
-  "0x00000000000000000000000000000000002cda6c97bf864543ae95ef09625121",
-  "0x0000000000000000000000000000009db577aa51c0a71894024ff7c83c9e8061",
-  "0x0000000000000000000000000000000000257da78b220cc90d37ef1b5bc4f070",
-  "0x000000000000000000000000000000941d8a17ade6677bb870b97e0222baa578",
-  "0x00000000000000000000000000000000000c74d59cb19cda416fb271a02bc020",
-  "0x0000000000000000000000000000003ba7f4df90b32d294611d583431996166c",
-  "0x000000000000000000000000000000000020ca7543a96f7adb78fdebe962aed7",
-  "0x0000000000000000000000000000003e67d753f66bd3db1c26a0c95f1185f303",
-  "0x00000000000000000000000000000000000968a98b90859c211ff6de8c9bb508",
-  "0x0000000000000000000000000000000b61cd9916f2bc78c5d3bcba7b5d03cf6a",
-  "0x00000000000000000000000000000000001e137b83d2c462082b9a825bc6547a",
-  "0x000000000000000000000000000000baf57f99fe7a090047566653fc322d4fd4",
-  "0x00000000000000000000000000000000002a653df281cd178180bae9d4b116c7",
-  "0x00000000000000000000000000000093420ecf8f2e65220f7ed869429d90c70c",
-  "0x000000000000000000000000000000000011e5f02240f765758a19b0ef8d0876",
-  "0x0000000000000000000000000000001d45cdff0a7f12a1e039b6120321fbbf3d",
-  "0x00000000000000000000000000000000000dede1ade3c13ca9595bb3061b8267",
-  "0x0000000000000000000000000000005e86226f6449f24dba42e9ff89d17d0872",
-  "0x000000000000000000000000000000000001944528e1c88d4e80890379bfffdc",
-  "0x0000000000000000000000000000000bffd5eb4879dc08aaf63801c10e5cedcb",
-  "0x00000000000000000000000000000000001eb759b03015c2b931a432645c2073",
-  "0x000000000000000000000000000000712ccb3b51cf7bb228e3bff0b1c1e1c974",
-  "0x000000000000000000000000000000000010a395b83f9a63db3fc9cafdee3cfb",
-  "0x000000000000000000000000000000796845fd4e260337073f4418ac227c192c",
-  "0x0000000000000000000000000000000000089574e34a351d1dc26b8bdc371f0c",
-  "0x0000000000000000000000000000006e4d3c0d4b96653ea814445e3b035aed12",
-  "0x00000000000000000000000000000000000586083adee385779d9f038860074b",
-  "0x000000000000000000000000000000c72d904894d2966db7c048c1681c662b22",
-  "0x000000000000000000000000000000000022ceb17fbef3d9ffd440d416631fba",
-  "0x000000000000000000000000000000b431c47baf300dba913c2dc0b6eadfeb9e",
-  "0x000000000000000000000000000000000015f8d676f1d7f69d62efd09e160cd0",
-  "0x000000000000000000000000000000bb453a0c915247a17308fb6ac572eb00f6",
-  "0x000000000000000000000000000000000004cd1d59fc3f4c692a2de677204051",
-  "0x000000000000000000000000000000e5f48aa366cfb7020e4d12e7c8a90ac369",
-  "0x00000000000000000000000000000000001f465f9c82c421c3bb905ce48ae9c5",
-  "0x000000000000000000000000000000065179a8e1abe6c2b99b072306b724b679",
-  "0x00000000000000000000000000000000002333f486e22c6e4b039a2f8bad0a3a",
-  "0x000000000000000000000000000000411efaf53943a84ba6a0d807380e14f7a9",
-  "0x00000000000000000000000000000000001929076322bf9818aabc97752fa527",
-  "0x00000000000000000000000000000051e564137e738fe9fb90fa19ab83e16af4",
-  "0x0000000000000000000000000000000000105391258fffc027dae9a8add603a9",
-  "0x000000000000000000000000000000bb4a9aa9d4ca3f18bb917936495f9a1144",
-  "0x00000000000000000000000000000000000c2065507ab9d5ab5b5c58b0bad8d2",
-  "0x0000000000000000000000000000006403874d4b3ff05d48b0180ea04dcd7a5d",
-  "0x00000000000000000000000000000000002df21c1b7376de211693fbba3f3d4b",
-  "0x000000000000000000000000000000ec0ec1564ae58b39c0edd2867f215fe5da",
-  "0x00000000000000000000000000000000001477c98ac05ee5578e5297f4998989",
-  "0x000000000000000000000000000000d19bbdf9ea0b6565b3ee75add4fef0c180",
-  "0x00000000000000000000000000000000002276b95cfa9a242259f5634abfa1c9",
-  "0x0000000000000000000000000000000f673b6de00283dbe42bde405872a74a74",
-  "0x00000000000000000000000000000000000fc5b11f89a9a520272fdbd5ec2c45",
-  "0x0000000000000000000000000000004285fd7de70e4498b1c89ba917ac58acf2",
-  "0x0000000000000000000000000000000000226b5e95b00b7315613d6fd782551e",
-  "0x000000000000000000000000000000a739fbbe55a06c60c07ae422886f8fd999",
-  "0x000000000000000000000000000000000017167db1cad3101f616c7a1b099a8c",
-  "0x00000000000000000000000000000021701b34bf3d2cb250bdf13caeb153a289",
-  "0x000000000000000000000000000000000008f36412a5da107d4846ca6e9f4e42",
-  "0x0000000000000000000000000000002aac6c2700b67d8c02bc531ecb725519a5",
-  "0x000000000000000000000000000000000012399027713fa0297cde5cece45a95",
-  "0x0000000000000000000000000000001a51559c9ee0e5cdc67268ff107712dcc1",
-  "0x00000000000000000000000000000000001e41d7dddab1f0a9887bef7246cec0",
+  "0x0000000000000000000000000000000000000000000000000000000000000b81",
+  "0x000000000000000000000000000000323d5a3bacf46ff720167bfa82f1d3a470",
+  "0x00000000000000000000000000000000000109869e9ff89595121baa1badc56f",
+  "0x00000000000000000000000000000028564096270cb8849cc3552446a7787f44",
+  "0x00000000000000000000000000000000002c0182a1646ff1fe580199388a6e67",
+  "0x000000000000000000000000000000e207084f39d03f0b9d49d65a831a476bdc",
+  "0x00000000000000000000000000000000002aac72303765a3fadee7fa1db1be05",
+  "0x0000000000000000000000000000005e8598ff5e2c6cd7dc473187b18a60e56e",
+  "0x00000000000000000000000000000000002a412cc07438f09a0dd6201ad2c845",
+  "0x0000000000000000000000000000005946521ae9065d5a2f1e7016a837d41720",
+  "0x00000000000000000000000000000000000ea66d443ec8deb6a04dc4f974a8e0",
+  "0x0000000000000000000000000000006d72fbabcf2fb19129b47b1cea05b6fbea",
+  "0x0000000000000000000000000000000000093da4177e03b9ceffde6bfcba715b",
+  "0x00000000000000000000000000000073b9e515320060a26b76a2585026e35095",
+  "0x00000000000000000000000000000000001d0acd33c22a462a2f19a01731d7d1",
+  "0x000000000000000000000000000000ddce5c2135081e4f770a66abb583c2d173",
+  "0x0000000000000000000000000000000000157776c2b29efb55f9a8431e76ae1c",
+  "0x0000000000000000000000000000001bca989328d1c9116bb16813323cecba31",
+  "0x00000000000000000000000000000000001b5dc4ef90e0723fdc7945ef4c54ce",
+  "0x0000000000000000000000000000004e18c66149c3b7ac47179461f6e195cc80",
+  "0x00000000000000000000000000000000001281bbcfe7ef0f2fccf4cd92272414",
+  "0x0000000000000000000000000000003c8e508f2ffeb91e6f3f83c3f6c86d56ba",
+  "0x0000000000000000000000000000000000064d022b5e2c394f45dcd33af07326",
+  "0x00000000000000000000000000000002cafc1f9a92a5ee32f170622efede1b43",
+  "0x00000000000000000000000000000000000aceb2867aa9d36e777e91c8af94e4",
+  "0x0000000000000000000000000000009de7a9cc413e4291453c88d92591e15064",
+  "0x00000000000000000000000000000000002a99adc4aea9cf55b7adb21dc2d7b5",
+  "0x000000000000000000000000000000c5c063499d6beb3c15a568f0eb3b9accfb",
+  "0x0000000000000000000000000000000000085343e51f8e54f7e4b3bca5b8ccdb",
+  "0x0000000000000000000000000000004df9e2c11487e96cde4a354328c2322b7e",
+  "0x00000000000000000000000000000000001e71380507bf8f7a65f542a668967e",
+  "0x000000000000000000000000000000387a87e1fd5a4d755a72bf4223e72cf175",
+  "0x0000000000000000000000000000000000140d1d6145c78a4cd60b85534d174f",
+  "0x00000000000000000000000000000009dd5aa20682fbbc7e632f8a1db534e9b3",
+  "0x00000000000000000000000000000000000634427a3afc7faeb13b2d9dfb819f",
+  "0x000000000000000000000000000000b4197b6332dcded183750122f25b0a2519",
+  "0x000000000000000000000000000000000027607abc7388bbdbd2d7f96188fbb4",
+  "0x00000000000000000000000000000003d113f92b1cd5b3ff63420794e03ef685",
+  "0x0000000000000000000000000000000000207b2aef1ef8b28ace8c83aecf7e28",
+  "0x000000000000000000000000000000450f7e6b497cd2a96ae6b92be64fae5c6b",
+  "0x00000000000000000000000000000000002120f64101472951f06f632de5145f",
+  "0x000000000000000000000000000000debece59d8788da9e5f8d8dc220168c1d2",
+  "0x000000000000000000000000000000000015786f0aad65395b2bc4b537336ede",
+  "0x00000000000000000000000000000060a0d6c54c73c3690cecc86bddbfbcc42b",
+  "0x000000000000000000000000000000000000e01e5f4b5f9c61b6b572d6a489a8",
+  "0x00000000000000000000000000000051925bb85f77dc843e87768cad13898c66",
+  "0x00000000000000000000000000000000001d2e8c943486f2d8077ca3a545e58e",
+  "0x0000000000000000000000000000001eae3f40b556ff78fd87a9f0bf9835f121",
+  "0x000000000000000000000000000000000001a9ddb01e083df4fa7944b38b1d66",
+  "0x0000000000000000000000000000000a71144260f9510eea1b6b164635f58a85",
+  "0x00000000000000000000000000000000002450da73f6d16c22bbfee6979c1aa5",
+  "0x000000000000000000000000000000a05fce07c3de8206138c6fff56b0384a77",
+  "0x00000000000000000000000000000000001413ce1460c3807fa23afc23048488",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x000000000000000000000000000000fa598d6d181474b0f0bc69f2183b523e80",
+  "0x00000000000000000000000000000000000d8c40ab9e154226f73e321ea0aadd",
+  "0x000000000000000000000000000000d279bcf5f49b4e581e307f708085120acc",
+  "0x00000000000000000000000000000000000b7a923678250450f635555bd4cd46",
+  "0x000000000000000000000000000000cc727ba574f665e0eb1b68de979a694028",
+  "0x00000000000000000000000000000000000a6f019b23bb4dc91aa9fa1c549e8f",
+  "0x00000000000000000000000000000048e4410bd774618ebb93dddc7ad9cb3ea4",
+  "0x000000000000000000000000000000000023dd18195483e82d97eb518a8c3ba4",
+  "0x000000000000000000000000000000bb65ab115ceeb8fb08e90f292f09d0cef2",
+  "0x00000000000000000000000000000000000eb1879efc776a7cac9ccb88550a4f",
+  "0x0000000000000000000000000000001d331e0112dd2d8cd8ce94e7b32843751b",
+  "0x000000000000000000000000000000000011e69febc35e19e3d67d16f534ec53",
+  "0x000000000000000000000000000000919614fa3ba8ef2dacf8ea9a6805df8e9f",
+  "0x000000000000000000000000000000000021f21cdf5a4aa72e8ff57923e8543b",
+  "0x000000000000000000000000000000708a9164194ce14fac9d0386a3adcb4bc0",
+  "0x000000000000000000000000000000000028d7bc88df3ad73259787bf5d7d01a",
+  "0x0000000000000000000000000000002964cf46a5183cb04145d9a8b439a32df1",
+  "0x00000000000000000000000000000000001539ee0fec0781bc1760b30e479b1e",
+  "0x000000000000000000000000000000ba5f4a89c83775cb92fcc3ff4c358a7553",
+  "0x00000000000000000000000000000000002640734ef86775f76d689e95814fc3",
+  "0x0000000000000000000000000000009c2f263653c7e2af7401216151678eade5",
+  "0x000000000000000000000000000000000022cac24cb9b9c0bd20263c02178a74",
+  "0x0000000000000000000000000000009b91b2b9cd766ab9d54d4e0ce5b31b2df9",
+  "0x000000000000000000000000000000000021feeed9c2bbeaf1b31b97bd475898",
+  "0x000000000000000000000000000000b167db6919d49e56465b96227e40c83b61",
+  "0x00000000000000000000000000000000001382f4cd681ca5a3b409cc27c9622f",
+  "0x0000000000000000000000000000004459ed40f5cbfa7d6a37b8ea44d6cbd6dc",
+  "0x00000000000000000000000000000000001bd5f7d5688bb20ed13a7d6c96ef7a",
+  "0x000000000000000000000000000000ca992efecefafda29e202a7a347d81367e",
+  "0x00000000000000000000000000000000001db9c5d73ac26232863ae012269306",
+  "0x0000000000000000000000000000008ee5b3d7b16d5fe16702aa8885d4b96219",
+  "0x00000000000000000000000000000000000e59f4b3fd78b0fb4ac7e9c2172cb4",
+  "0x000000000000000000000000000000ae1a100ea1870b38b32d117cfddb7963f6",
+  "0x00000000000000000000000000000000002e373869e16038a011dcbd14cd4f01",
+  "0x0000000000000000000000000000005a5fe1304e6aeac934bddd72a03ebc626b",
+  "0x00000000000000000000000000000000002a21976f3e8487fb635ad21e9ffe2c",
+  "0x000000000000000000000000000000217dfe935e944ba7075acde9faa6cb5173",
+  "0x00000000000000000000000000000000000e5ad22ef54fc104806cd546d25b9a",
+  "0x000000000000000000000000000000d0760a836a218a69ae33c7172912f1d331",
+  "0x0000000000000000000000000000000000248701194b3dad90a302030dd3ed4c",
+  "0x00000000000000000000000000000015771863f13527395472cdbefc01ce7d50",
+  "0x000000000000000000000000000000000025b39680b4a83bfcbb03bbef9286d9",
+  "0x00000000000000000000000000000015172ac2d95099e3de8feae18d349ed077",
+  "0x00000000000000000000000000000000002f0e6eb33c7a8589eb4aa0a58e4948",
+  "0x000000000000000000000000000000bc4ffdb2d7a1280fc2ce31024a5f4028f8",
+  "0x00000000000000000000000000000000000f8b150ff8204297433768c07af62b",
+  "0x0000000000000000000000000000003b337a09da46d718fdbb452d16e1c3355f",
+  "0x0000000000000000000000000000000000209451e38476922aff2f5e89d9050c",
+  "0x0000000000000000000000000000003204c8b80470419acd48ab8cfc4ee4edcd",
+  "0x00000000000000000000000000000000000e6382ea5ec96629b90c530219c3cb",
+  "0x000000000000000000000000000000573110e5e30f83f2b1cdbf6021589f56d4",
+  "0x00000000000000000000000000000000002153342158e09047429d5ff0cf2814",
+  "0x0000000000000000000000000000000c87cc7ea9f19d895b531f173f10e1fb7a",
+  "0x000000000000000000000000000000000028ce104aa04c8883606e30145396ca",
+  "0x000000000000000000000000000000091bf18675b31c2ca35cd6d9c4c61980f6",
+  "0x00000000000000000000000000000000001e4a1ac80c95b28bd73997aa8be018",
+  "0x00000000000000000000000000000027ac5003261c40666193e97d00708290e6",
+  "0x0000000000000000000000000000000000155026062b8202477e26ea5692a700",
+  "0x000000000000000000000000000000cf95c483603fd34a07e7e0aaa6ddedf5aa",
+  "0x00000000000000000000000000000000001ed0d7dc69f72e8055cbe26bc2ce26",
+  "0x000000000000000000000000000000bd27f2a517da170087251aface1dbc9172",
+  "0x0000000000000000000000000000000000201a01367b862c45ba57aabe90a276",
+  "0x0000000000000000000000000000006242c06ca6844877f622da669895d8081a",
+  "0x000000000000000000000000000000000007e008d692476d4eb814fb8f610fba",
+  "0x00000000000000000000000000000013de6e7df5135ff688efa9d436ed802342",
+  "0x0000000000000000000000000000000000291c207e9ad4c322aa0711d30bde2f",
+  "0x000000000000000000000000000000dd165b3f058369e880294dc2d3f1548ffc",
+  "0x000000000000000000000000000000000017829ab7f82e60e0e4da95135e6e84",
   "0x0000000000000000000000000000000000000000000000000000000000000001",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000002",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "0x000000000000000000000000000000df8a547335ba462d1a06f2d09c14ff34b8",
-  "0x000000000000000000000000000000000002abaebee024deaefa609b0d3a16cf",
-  "0x0000000000000000000000000000000cbcf653d771f852791494e181f24a8bb8",
-  "0x00000000000000000000000000000000001669b437367487ea698104ec5611c9",
+  "0x000000000000000000000000000000c5c5fddc6d03b2bb9af543e73695863c77",
+  "0x00000000000000000000000000000000002b03df11145d0fa2c23bdd7fb7066b",
+  "0x000000000000000000000000000000211136d196e61c110edd7e581be8645373",
+  "0x00000000000000000000000000000000000a2fb7ada300644cbf7b7d7f36de36",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "0x00000000000000000000000000000017a53214f33b1ad009e461b269927219be",
-  "0x000000000000000000000000000000000014107d4be453c804a8e29186919b3e",
-  "0x00000000000000000000000000000092879f61a828269302561bb57f3b1557cf",
-  "0x0000000000000000000000000000000000284505094e35d3b558a43402cadae2"
+  "0x0000000000000000000000000000000585fcdfa31b424adfe685b43435cdc567",
+  "0x00000000000000000000000000000000002717439949acf883c385bc7c246dc6",
+  "0x000000000000000000000000000000b97f0f863a1005a5c88ba628c1d8bb1740",
+  "0x000000000000000000000000000000000001f73676f90fa92e0bd9ce8716cfb9"
 ]
-hash = "0x1bb34f546762aebac13c3b9c07c08de0b0e48d2a0cb67cf13b292bc7cce3a8ea"
+hash = "0x103023eab6f953f6b7b9525f412e0bc1655bd72d5e4b46ded148c6137deb9006"
 
 [private_call.verification_key_hints]
-contract_class_artifact_hash = "0x079d79f5379ed234b1ab5b92f07f6a87f5482da6945239d0ecb0b597c65889a9"
+contract_class_artifact_hash = "0x1d8791271c09cabf2ac9aaa6bd8095b473d90e367f72c6df771aa7a4ec960f9e"
 contract_class_public_bytecode_commitment = "0x0ce4c618c3ed7f3a20410e618c06bb701e150af7fe28a3e92f68e7733809f33e"
 updated_class_id_delayed_public_mutable_values = [
   "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -213,8 +229,8 @@ updated_class_id_delayed_public_mutable_values = [
   [private_call.verification_key_hints.function_leaf_membership_witness]
   leaf_index = "0"
   sibling_path = [
-  "0x301014a3a40c2f4bd14ffc1df73d8a9f9bc775bdf90e19318cfba28fd85bc66f",
-  "0x0a83c1add27bb7feee83688c11c96f1dde058216d3972964015399b37a10add7",
+  "0x238e2af83a65aa19075bf14aa7aeb0f681204a09f3756757b334f3061e238757",
+  "0x25ce89a823f16f35f08b6081a3ea3197c468941e46b7400ac6b33280b19cf251",
   "0x2974d8999d00928aa1378118756d6a4ba1368b1da89b2b1059c17fbb88ad21a8",
   "0x2e6127fb2bcf542677ed9dfc6cd90a61a075142999aebccf345c816aff3a1d92",
   "0x267a9c24e849f51869c93086ded207858dfb130344e1879a9d15d35096464824",
@@ -223,39 +239,39 @@ updated_class_id_delayed_public_mutable_values = [
 ]
 
 [private_call.verification_key_hints.public_keys.npk_m.inner]
-x = "0x09c3389c892454109fa5d2a618c1b1afaca13bb463a046ed40718e1b3b462371"
-y = "0x1178e89a2d07a50b76a157169dd560ccf81b43b63424eb3af92ece9d9a171205"
+x = "0x025f9f657095ad240d89a28336e0f7be994c9f270d62c6a3228aa8bada12d01d"
+y = "0x1a7e0782cbdd3ebc39b0bd4a33b5894cb3451bc52c2fadd70371ed8d81db479f"
 is_infinite = false
 
 [private_call.verification_key_hints.public_keys.ivpk_m.inner]
-x = "0x231306c620873551aa2f1c0cd82f15430f00e43b9a12335871e11ab35b388e1a"
-y = "0x2fa5ac5f36215c6115b0a7040bd0662375abd960d011695707b1bb9e97c25df5"
+x = "0x22f40cddddbd77c2aa6fead1b876909111a45ab1b5f69a48df1440764a7dcd90"
+y = "0x1a6c5d7af83395c1e6c82ef8cb26ec6674f65cfb52521dae0b54130764bdf10d"
 is_infinite = false
 
 [private_call.verification_key_hints.public_keys.ovpk_m.inner]
-x = "0x03b579ab04bdaf7d0ad53197db2f860aafcc28c6a2fbe45925c93f4421a7b26d"
-y = "0x219ef36b40e3d8002ed0f4ffa6b05d89aaf3b5dffd4e2c1e35811bcd068964c4"
+x = "0x2d41c74462094b1d13ed19ce294c4a39cdc7635080f32399494e5e796b663933"
+y = "0x19944298156083d73fc78b3e628123fccead0fec542f0a55cfd319f2b77047ca"
 is_infinite = false
 
 [private_call.verification_key_hints.public_keys.tpk_m.inner]
-x = "0x0ee6fdae88e6a817c0d1922e847d844b05a72925e22213172e2a5e34833b2d74"
-y = "0x14de62bd78a4c15b0a54391b33048497d49f65ccafbb5dddc7ab3f5d0e615a10"
+x = "0x2b8dc3a19be872d7c3b215f6b1716e586cdc99c79320ec3f5989233e0957fc39"
+y = "0x13eec92e41aeeec0598539fbf7d94629cc58515f87507cb2638264f68be7c432"
 is_infinite = false
 
   [private_call.verification_key_hints.salted_initialization_hash]
-  inner = "0x28e927d6c7ed483decb215f98b43d959c814fecb62ec77a4fd28d5e57908ffbb"
+  inner = "0x26ec6a326bed489e479823ab0ea1152729bcec7cbe15048c3e02a1e4309d4a68"
 
   [private_call.verification_key_hints.updated_class_id_witness]
-  leaf_index = "134"
+  leaf_index = "132"
   sibling_path = [
-  "0x0a1e5bc6056b741c7a96c84d752acc719365c5dc040004320c73910381fb63b0",
-  "0x0f49760e97e9e54c58826d962175385789593263e2c63dc5a0f9cfd217324217",
-  "0x2cdab465df8a335c76f248881dd9feac1d5680ac49b08ff10d99167449fb217c",
-  "0x0d9021d322aa472e97d1866fc60bdde9facfe38f3dcddf6126143a0e7e8f5c97",
+  "0x10a274cd78b609bb9ff5960dfac7a0add8ccae279c81ec05441bbb8165d517dd",
+  "0x27047bd2479bc929cd5250e32e3b3e05f8cef863f7c8a349df77a9b2bf85588d",
+  "0x1d36a7e02b793d41e28f57b4480fe48b3f169b794f73d57683c7bfc4253da367",
+  "0x25c533089637cf9ecd3633dfcb0ee03be91faff3e02f51778cd5738264514c88",
   "0x1d52af9cd9f69c1286e9a96fd498e736789a5bc463fceb1c176a4f9292f7cbe3",
   "0x1ff1d5db01572c915915a22173c73d8073df9af4e4c57f6af29df5315da44419",
   "0x070dcbac794fa663bc71b42d80775c0cea8c3ed7580207cfd30fd1285813ce07",
-  "0x137eba03a00e1fcb6be9bf7557223a298bcc5652e248db17f098d97a0117c09b",
+  "0x2027713f7323f965c6751ce6c41f7759c9501fe781928b9507814d749cb86f25",
   "0x16c8aff52f0422f4bfc502620fe15dd6a4de67637563b7a8175f2d5727d268a4",
   "0x1c76b6744bc3d6b1cd4b53459a08b4959643c0768fde657299fcc82e2732f744",
   "0x12a6fac0fdfbd7897d8fe955f454cdb309ce8597d647ebfd0ba614c4eb215581",
@@ -291,13 +307,13 @@ is_infinite = false
 ]
 
   [private_call.verification_key_hints.updated_class_id_leaf]
-  slot = "0x0b1e2be1fbd6903952a5197bdf52341929eefa73cbf68359b665e134595bc0cc"
-  value = "0x0000000000000000000000000000000000000000000000000000000000000012"
-  next_slot = "0x0b9ae8ac04ecda623423c04d5c02c4d72a9ae4a2e9cfc579b58094612d45db54"
-  next_index = "0x0000000000000000000000000000000000000000000000000000000000000080"
+  slot = "0x1dbe81fde1f18bf3e8828a3595c65a1ee32397477e23d9c5c9e4c0386bbb4a2b"
+  value = "0x0055534400000000000000000000000000000000000000000000000000000000"
+  next_slot = "0x213a03911d28297ad85626532672b56d721f6e4af4e78d6f156cf1cb98482089"
+  next_index = "0x0000000000000000000000000000000000000000000000000000000000000086"
 
 [app_public_inputs]
-args_hash = "0x0d2ee627eece0d652d4129c2f5628311502d9b19f63ba7f0ea3d3b76230c4db6"
+args_hash = "0x2237e42a84e35fc9371ec568e04d6db13130f02f527e0cce6f78ebf038f70f5f"
 returns_hash = "0x0000000000000000000000000000000000000000000000000000000000000000"
 start_side_effect_counter = "0x0000000000000000000000000000000000000000000000000000000000000002"
 end_side_effect_counter = "0x0000000000000000000000000000000000000000000000000000000000000007"
@@ -305,7 +321,7 @@ expected_non_revertible_side_effect_counter = "0x0000000000000000000000000000000
 expected_revertible_side_effect_counter = "0x0000000000000000000000000000000000000000000000000000000000000000"
 min_revertible_side_effect_counter = "0x0000000000000000000000000000000000000000000000000000000000000005"
 is_fee_payer = true
-expiration_timestamp = "0x0000000000000000000000000000000000000000000000000000000069e55d82"
+expiration_timestamp = "0x0000000000000000000000000000000000000000000000000000000069ff2940"
 
   [app_public_inputs.call_context]
   is_static_call = false
@@ -314,7 +330,7 @@ expiration_timestamp = "0x000000000000000000000000000000000000000000000000000000
     inner = "0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000"
 
     [app_public_inputs.call_context.contract_address]
-    inner = "0x0c6be08a5e070b343e733716e4ad76ea05de25e2b7fc6e6f50f0ec549f7c0bfa"
+    inner = "0x0635e757a5f05ba5322db37d6930525b43c2e055ed7c4600559a07fc38ab09ec"
 
     [app_public_inputs.call_context.function_selector]
     inner = "0x000000000000000000000000000000000000000000000000000000009d57a239"
@@ -324,7 +340,7 @@ expiration_timestamp = "0x000000000000000000000000000000000000000000000000000000
 
     [[app_public_inputs.note_hash_read_requests.array]]
 [app_public_inputs.note_hash_read_requests.array.inner]
-inner = "0x1e9901d75ca2844cadc15c9299576114cbfd77651631f65a8b02de758c70d833"
+inner = "0x29ecb485abf1e4a9963bb4dada6e8b67bda9c6bb09527ecb8d0c64a0d119e0fd"
 counter = "0x0000000000000000000000000000000000000000000000000000000000000003"
 
 [app_public_inputs.note_hash_read_requests.array.contract_address]
@@ -1097,13 +1113,13 @@ inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
       [app_public_inputs.public_call_requests.array.inner]
       is_static_call = false
-      calldata_hash = "0x0d2bc686e2f086c296f74f726ee51724dbb68b591ae44a8b79c980e3ee17bd8b"
+      calldata_hash = "0x16acf8ee72d77f214e5286307ed2710fda25445374c38debbef546a746b679ce"
 
         [app_public_inputs.public_call_requests.array.inner.msg_sender]
-        inner = "0x0c6be08a5e070b343e733716e4ad76ea05de25e2b7fc6e6f50f0ec549f7c0bfa"
+        inner = "0x0635e757a5f05ba5322db37d6930525b43c2e055ed7c4600559a07fc38ab09ec"
 
         [app_public_inputs.public_call_requests.array.inner.contract_address]
-        inner = "0x1e0d825a84ebc33bf160363bca7a6855c0bfc677043e7dd77205004c861ff880"
+        inner = "0x16fc6ad8c94527d45832bb8631b0c1dedf3218fe7c3ca04e01850a3eff6a511a"
 
     [[app_public_inputs.public_call_requests.array]]
     counter = "0x0000000000000000000000000000000000000000000000000000000000000000"
@@ -2039,12 +2055,12 @@ inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
       length = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
   [app_public_inputs.anchor_block_header]
-  sponge_blob_hash = "0x2f6cbc1e2991d249f92b52eab711b5b69653f27dc615f8548486ee4f905db9d1"
-  total_fees = "0x00000000000000000000000000000000000000000000000002b226a71e115940"
-  total_mana_used = "0x00000000000000000000000000000000000000000000000000000000000a3919"
+  sponge_blob_hash = "0x13a1bf44c19e7c2eb7fc1a96527d072cf424bc99c760e392f4abcecc1fc597f8"
+  total_fees = "0x00000000000000000000000000000000000000000000000002b26ec5db7a7140"
+  total_mana_used = "0x00000000000000000000000000000000000000000000000000000000000a3979"
 
     [app_public_inputs.anchor_block_header.last_archive]
-    root = "0x1658130986216f2f0ffc888c65e948a57a28c64721e664f522cfbb7d01492231"
+    root = "0x0d18996e508e8c1e51f6a56652cc5d71169450ff16c25de9af7f79af5385e334"
     next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000008"
 
 [app_public_inputs.anchor_block_header.state.l1_to_l2_message_tree]
@@ -2052,37 +2068,37 @@ root = "0x0fef6d80d31109ddb56d6b3f607cbc9c0af0bff3ea0d43e8f278983c64c11f7a"
 next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000002000"
 
 [app_public_inputs.anchor_block_header.state.partial.note_hash_tree]
-root = "0x101e57ba43504cd90f08cd61ed589b9367d33eed30ccd7a2e8333cf633f2fb6f"
+root = "0x1c223e428d6faa36822890e3b99417ddf73ffb069bf4c44b6ae9d7fc741733f6"
 next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000200"
 
 [app_public_inputs.anchor_block_header.state.partial.nullifier_tree]
-root = "0x0ec61562d933c8948a789b996a4057b5ef647965d854a7d6e36d28c2d2aea06e"
+root = "0x01c778a6b3dcb1245bb0aee174252dd95256e67309f952e5d2f8cbafffe20d0f"
 next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000280"
 
 [app_public_inputs.anchor_block_header.state.partial.public_data_tree]
-root = "0x021204d873082156522eb6603c9c7f7acb21fa936d470764f1fda90cf504891c"
+root = "0x134e44df49ddb89525046d19bcfc2734c78e419994de9d6f7467eb84d02d1060"
 next_available_leaf_index = "0x000000000000000000000000000000000000000000000000000000000000008b"
 
     [app_public_inputs.anchor_block_header.global_variables]
     chain_id = "0x0000000000000000000000000000000000000000000000000000000000007a69"
-    version = "0x000000000000000000000000000000000000000000000000000000007b6d50be"
+    version = "0x00000000000000000000000000000000000000000000000000000000ad49d7cd"
     block_number = "0x0000000000000000000000000000000000000000000000000000000000000008"
     slot_number = "0x0000000000000000000000000000000000000000000000000000000000000022"
-    timestamp = "0x0000000000000000000000000000000000000000000000000000000069e40c02"
+    timestamp = "0x0000000000000000000000000000000000000000000000000000000069fdd7c0"
 
       [app_public_inputs.anchor_block_header.global_variables.coinbase]
-      inner = "0x000000000000000000000000080c5a37d2d3dade855a034bac3548a8b2dfd887"
+      inner = "0x000000000000000000000000fde0805eba75f23cd30a3bb4f0e567a356075904"
 
       [app_public_inputs.anchor_block_header.global_variables.fee_recipient]
       inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
       [app_public_inputs.anchor_block_header.global_variables.gas_fees]
       fee_per_da_gas = "0x0000000000000000000000000000000000000000000000000000000000000000"
-      fee_per_l2_gas = "0x0000000000000000000000000000000000000000000000000000004382670b40"
+      fee_per_l2_gas = "0x0000000000000000000000000000000000000000000000000000004386faeb40"
 
   [app_public_inputs.tx_context]
   chain_id = "0x0000000000000000000000000000000000000000000000000000000000007a69"
-  version = "0x000000000000000000000000000000000000000000000000000000007b6d50be"
+  version = "0x00000000000000000000000000000000000000000000000000000000ad49d7cd"
 
 [app_public_inputs.tx_context.gas_settings.gas_limits]
 da_gas = "0x0000000000000000000000000000000000000000000000000000000000030000"
@@ -2094,7 +2110,7 @@ l2_gas = "0x00000000000000000000000000000000000000000000000000000000000c795c"
 
 [app_public_inputs.tx_context.gas_settings.max_fees_per_gas]
 fee_per_da_gas = "0x0000000000000000000000000000000000000000000000000000000000000000"
-fee_per_l2_gas = "0x0000000000000000000000000000000000000000000000000000000cd98ff1cb"
+fee_per_l2_gas = "0x000000000000000000000000000000000000000000000000000000336bfe2ba6"
 
 [app_public_inputs.tx_context.gas_settings.max_priority_fees_per_gas]
 fee_per_da_gas = "0x0000000000000000000000000000000000000000000000000000000000000000"
diff --git a/noir-projects/noir-protocol-circuits/crates/private-kernel-inner-3/Nargo.toml b/noir-projects/noir-protocol-circuits/crates/private-kernel-inner-3/Nargo.toml
new file mode 100644
index 000000000000..7f70ba73336b
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/private-kernel-inner-3/Nargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "private_kernel_inner_3"
+type = "bin"
+authors = [""]
+compiler_version = ">=0.18.0"
+
+[dependencies]
+private_kernel_lib = { path = "../private-kernel-lib" }
+types = { path = "../types" }
diff --git a/noir-projects/noir-protocol-circuits/crates/private-kernel-inner-3/src/main.nr b/noir-projects/noir-protocol-circuits/crates/private-kernel-inner-3/src/main.nr
new file mode 100644
index 000000000000..02c088d17c89
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/private-kernel-inner-3/src/main.nr
@@ -0,0 +1,30 @@
+use private_kernel_lib::{private_kernel_inner_n, PrivateKernelInnerNCircuitPrivateInputs};
+use types::{
+    abis::{
+        private_circuit_public_inputs::PrivateCircuitPublicInputs,
+        private_kernel::private_call_data::PrivateCallDataWithoutPublicInputs,
+        private_kernel_data::PrivateKernelDataWithoutPublicInputs,
+    },
+    PrivateKernelCircuitPublicInputs,
+};
+
+fn main(
+    previous_kernel: PrivateKernelDataWithoutPublicInputs,
+    previous_kernel_public_inputs: call_data(0) PrivateKernelCircuitPublicInputs,
+    private_call_0: PrivateCallDataWithoutPublicInputs,
+    private_call_1: PrivateCallDataWithoutPublicInputs,
+    private_call_2: PrivateCallDataWithoutPublicInputs,
+    app_public_inputs_0: call_data(1) PrivateCircuitPublicInputs,
+    app_public_inputs_1: call_data(2) PrivateCircuitPublicInputs,
+    app_public_inputs_2: call_data(3) PrivateCircuitPublicInputs,
+) -> return_data PrivateKernelCircuitPublicInputs {
+    let private_inputs = PrivateKernelInnerNCircuitPrivateInputs {
+        previous_kernel: previous_kernel.to_private_kernel_data(previous_kernel_public_inputs),
+        private_calls: [
+            private_call_0.to_private_call_data(app_public_inputs_0),
+            private_call_1.to_private_call_data(app_public_inputs_1),
+            private_call_2.to_private_call_data(app_public_inputs_2),
+        ],
+    };
+    private_kernel_inner_n::execute::<3>(private_inputs)
+}
diff --git a/noir-projects/noir-protocol-circuits/crates/private-kernel-inner/Prover.toml b/noir-projects/noir-protocol-circuits/crates/private-kernel-inner/Prover.toml
index c0a309e8ab25..91f33eeac7c0 100644
--- a/noir-projects/noir-protocol-circuits/crates/private-kernel-inner/Prover.toml
+++ b/noir-projects/noir-protocol-circuits/crates/private-kernel-inner/Prover.toml
@@ -1,164 +1,180 @@
 [previous_kernel.vk_data]
 leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000000"
 sibling_path = [
-  "0x10196189a6cc21aea4e1b8a5d5e89674d1094afdfe16996b242078a4a966241f",
-  "0x198fd2e414f45156d98b823638dbe6f7db26ad20fa72532bc8ad0ae1a6693f46",
-  "0x14f708c74d727cf1094f7cca9ccfc55332eeb473af4ff213d27bca81bb8a969f",
-  "0x17bd0d0c2b0bd623b7d30132f5ef171136ca83b2d51821c45763a2b1bb503f0a",
-  "0x15313312ac8ca4825afd3891479fbb14626ca65499d939e23b1f653cd7d018ea",
-  "0x19de2a32662702dd872e529ad89836e16b013012f910daf2bc7c2a67356dd107",
-  "0x1f07bca7a14f9a969539c0afd388affa18926689f431fc541841a2a7604d388c"
+  "0x0ddc610a21615b2984181082c3de07058b9f7d4be62806c4fd475161f8bd2be3",
+  "0x0f92d54d29bddf6ec768db2c0b4685fb325d248b3ad9a3c6adda76c6c5004224",
+  "0x0656bbf5e3f4cc4fa5e2fa46e7fd370db0bee05586a1849c37c77d05abe2d8a5",
+  "0x166399703d23a5c22febc6185f8eb93c72b65906eefef226e643c35fa0022adb",
+  "0x25f6f5fc25ee815cef59a1889f1e39db3d431d01b01ee1554f9492afec9d41d6",
+  "0x28650667b92be48b116289119fa4794a5fe8fe5792a49d89b9977feae7f685a6",
+  "0x2aa74c20807e8cbb3e32a86ad29472c42a3fb7021dcfaad112a6b68eb0eca98e"
 ]
 
   [previous_kernel.vk_data.vk]
   key = [
   "0x0000000000000000000000000000000000000000000000000000000000000010",
-  "0x0000000000000000000000000000000000000000000000000000000000000021",
-  "0x0000000000000000000000000000000000000000000000000000000000000c3c",
-  "0x000000000000000000000000000000e27c64755070b4ac1795c4ccb3e343ff1e",
-  "0x000000000000000000000000000000000013dc513d9760c5120658df23571d20",
-  "0x0000000000000000000000000000003270fde3073463b4307ce8560796a5ee35",
-  "0x00000000000000000000000000000000002bb862a6c035afcc3e124db14875b2",
-  "0x00000000000000000000000000000058f307b485e191e730e84f7d8bb6c138f3",
-  "0x00000000000000000000000000000000001557d5c221746f0e9fdf6767f5216c",
-  "0x000000000000000000000000000000d0cbd2d7ea9e11d41e5586876f79e4c963",
-  "0x0000000000000000000000000000000000266827783ae7376ff3c6326ca3a056",
-  "0x000000000000000000000000000000f29621b36170d22f645e61eebd2755577a",
-  "0x000000000000000000000000000000000008743a527ed053827b802998cd1240",
-  "0x0000000000000000000000000000008f49107363e65ebed8f221ccd91fabf803",
-  "0x0000000000000000000000000000000000113f0d64e4f6a3aad0c9a26b3b92e9",
-  "0x000000000000000000000000000000e44b8070eedd20ca38bcd2b541f9fd0573",
-  "0x0000000000000000000000000000000000087ce2c79626736f3abddd17a70026",
-  "0x00000000000000000000000000000097ce25ca64c6e95e26af7f3b65ceee9a84",
-  "0x0000000000000000000000000000000000280b9047e0845e2ed599a26491f40f",
-  "0x0000000000000000000000000000002188779b297bda00b16ea9a145b4265e46",
-  "0x000000000000000000000000000000000016dfeb53c98243360770caa0ffcde0",
-  "0x000000000000000000000000000000bbf842d54c88486e06d61dd772a43336dd",
-  "0x00000000000000000000000000000000000fded7e25a1e7a74a7eee97befb476",
-  "0x0000000000000000000000000000005e5ef797d945185054fc58315821af2f86",
-  "0x00000000000000000000000000000000000538008ae96953370175c72c550beb",
-  "0x0000000000000000000000000000004b188afe4183b2b7f2d9a47c62129eac2a",
-  "0x00000000000000000000000000000000000291bed95bbe5f261c7bbe8c980111",
-  "0x000000000000000000000000000000e90f95f63c2ea0811a6179d2067963ee2a",
-  "0x000000000000000000000000000000000026906572d22b1686e9110d22bb134b",
-  "0x000000000000000000000000000000d363f9aa66af0e0f8a9767a5207311d782",
-  "0x00000000000000000000000000000000001cc5838c757efa799e8f1538c1ceeb",
-  "0x00000000000000000000000000000020cc633772d79d10288e1524820d5d26fe",
-  "0x0000000000000000000000000000000000248fd555f916c8daef37da4996dde9",
-  "0x000000000000000000000000000000504b12d512be8bcc40b0059d970358d8cc",
-  "0x00000000000000000000000000000000001bb0ee83aa8d32bd0709019494e278",
-  "0x000000000000000000000000000000c479a5572108d83dd880881be83aae167c",
-  "0x00000000000000000000000000000000001c61e178ef6753935adfa87317568b",
-  "0x000000000000000000000000000000aea8735d4afe8820e5cead434980c619e5",
-  "0x000000000000000000000000000000000005bdab914375cf464af4d3764488c3",
-  "0x00000000000000000000000000000029d2230f52bc5e77da898165e840fdc14e",
-  "0x000000000000000000000000000000000003b501c6bb11affaa09904ac95c383",
-  "0x00000000000000000000000000000068de17a3d7b84c21e9280bb7cbcd268474",
-  "0x000000000000000000000000000000000004adcacb9e8b332e903d5235bd44a8",
-  "0x0000000000000000000000000000009fcba752a804666417b6695e65b9e7bf42",
-  "0x00000000000000000000000000000000000b00f7dd36433631d57a132c375503",
-  "0x0000000000000000000000000000000a747e43b67540724f4c015e281e780e21",
-  "0x000000000000000000000000000000000019d5fd485df8be82825d157e7d1934",
-  "0x000000000000000000000000000000a2ca8ef7e5d64f8bacf9eeb3ca7261a8ca",
-  "0x00000000000000000000000000000000000f753c24e61b76a42abc0accef144e",
-  "0x00000000000000000000000000000007ef5cc7c6f99d07eea73bccd387d05c3e",
-  "0x000000000000000000000000000000000017bac046f7d63441f93b9ea24b7973",
-  "0x000000000000000000000000000000c8ca0e3fc44519be129dcd957b30568051",
-  "0x000000000000000000000000000000000029d53c9ac2f77fb4b19f5af0136c1e",
-  "0x000000000000000000000000000000018cc671e1a5e2612c90c2c12cbe462482",
-  "0x00000000000000000000000000000000002b7fa023dd61539cb7d56a1f10c913",
-  "0x0000000000000000000000000000002c94d08ab5ee89a5851086055b5622944f",
-  "0x00000000000000000000000000000000001cadaa0fc653c81bd60237cfbda56c",
-  "0x000000000000000000000000000000e1212460cc42b17fc4f26f703ec29a7d4a",
-  "0x0000000000000000000000000000000000257fc5e1f8dbb2df07327e3acadc72",
-  "0x000000000000000000000000000000cb97930a336f2a07874ed9a58bd381afce",
-  "0x0000000000000000000000000000000000053841ebeffbdcc33098e2c21f4881",
-  "0x0000000000000000000000000000007086502ff78c4d46c31f7a056666adfe11",
-  "0x00000000000000000000000000000000002e4444fdd42cb989237e879b4e9c1b",
-  "0x00000000000000000000000000000042a8d076924f7d7ee640e4321ed166c3e9",
-  "0x0000000000000000000000000000000000116876746b86764f7120467b0254cd",
-  "0x000000000000000000000000000000229b3816d257e5e66608b2f99fe5db0ae6",
-  "0x000000000000000000000000000000000007cce721d7b6dbd8766ab142e55f27",
-  "0x000000000000000000000000000000354819d4e1ab266e7f1b8701c365e731c1",
-  "0x000000000000000000000000000000000022470b72e5c2d6aa39aba5e6265788",
-  "0x0000000000000000000000000000001a2f8095dd981f1303b3a2d7e87c68ff8c",
-  "0x0000000000000000000000000000000000202a81a5dac8ba0d26f3965e9516f0",
-  "0x00000000000000000000000000000087cb2963e3772fde467435f530e234efcc",
-  "0x00000000000000000000000000000000002c284c0d5d10df03ec7d52f39e52b5",
-  "0x000000000000000000000000000000daa4f34966cc7303704f56b70b3db3eb44",
-  "0x00000000000000000000000000000000001fed850905c0d7ff27b95de430beb3",
-  "0x000000000000000000000000000000b4d3312087e7c8ab7b4687581b6e41b426",
-  "0x000000000000000000000000000000000014f30f5ce01654991cf0bea39e6635",
-  "0x000000000000000000000000000000ea7d9fcfddf65860ddd24eb36cc3793407",
-  "0x000000000000000000000000000000000012a284e8e92b8143302936b5e4c631",
-  "0x0000000000000000000000000000001b6534fb5a80d3e4c252a3a1afa71f08ac",
-  "0x000000000000000000000000000000000021a505d30ebed851c3ed430e11175a",
-  "0x00000000000000000000000000000019ad2695b94985ab3a2f2c6d08ece1578d",
-  "0x00000000000000000000000000000000000be8385dfe4bc95a9b460147c4dffe",
-  "0x000000000000000000000000000000e93e5e3523408bb30446ae091fc9fa0f22",
-  "0x00000000000000000000000000000000002f2c8d1fdccde8e954dd71559c0079",
-  "0x000000000000000000000000000000344f94dabaf3fd0995a66595d253be78c8",
-  "0x00000000000000000000000000000000001541349676bcb72e6c14e6379c1039",
-  "0x00000000000000000000000000000069f8bd703a3cc9e285657d42fc34ec5bec",
-  "0x0000000000000000000000000000000000058e53c3923808b36aaae4c77d5ffa",
-  "0x0000000000000000000000000000007e6ee32a8b38844eb0c1a492209fa9e785",
-  "0x0000000000000000000000000000000000297fb6426d252f40b2be37cf05e934",
-  "0x00000000000000000000000000000066bb138e32b95004dc50d155956024f9dc",
-  "0x00000000000000000000000000000000000c0fe3676dad967d242f98fa01ad45",
-  "0x000000000000000000000000000000adcbf09ccd6755ebb5cd0e4f50c569d585",
-  "0x000000000000000000000000000000000013e9bb90a5355958d85ecaa5fac912",
-  "0x00000000000000000000000000000095b5d8b7b4a63b05df652b0d10ef146d26",
-  "0x0000000000000000000000000000000000099e3bd5a0a00ab7fe18040105b9b3",
-  "0x0000000000000000000000000000002129af3a637f5a622a32440f860d1e2a7f",
-  "0x00000000000000000000000000000000000015b8d2515d76e2ccec99dcd19459",
-  "0x000000000000000000000000000000222b888108dc25d1aa450e0b4bc212c37e",
-  "0x00000000000000000000000000000000001b917517920bad3d8bc01c9595092a",
-  "0x000000000000000000000000000000482141c7ebe42000a1d58ccb74381f6d19",
-  "0x0000000000000000000000000000000000305e8992b148eedb22e6e992077a84",
-  "0x0000000000000000000000000000007c86847618681dc29d8a9363ab7c40e1c3",
-  "0x000000000000000000000000000000000016465a5ccbb550cd2c63bd58116fe4",
-  "0x000000000000000000000000000000439973ac12d7ca796d6fe98ca40e6ca6b7",
-  "0x00000000000000000000000000000000002e24d420fbf9508ed31de692db477b",
-  "0x00000000000000000000000000000028edd1a7e46c840d9c943fdf45521c64ce",
-  "0x0000000000000000000000000000000000043d063b130adfb37342af45d0155a",
-  "0x0000000000000000000000000000009330952ae74c573d1686d9cb4a00733854",
-  "0x0000000000000000000000000000000000261522c4089330646aff9673619494",
+  "0x000000000000000000000000000000000000000000000000000000000000001a",
+  "0x0000000000000000000000000000000000000000000000000000000000000c11",
+  "0x000000000000000000000000000000b56b478d39fe1ea8636ca1c5f7efe26465",
+  "0x00000000000000000000000000000000002ce8a9b4b8b40012f631f6a39b6121",
+  "0x000000000000000000000000000000e90605e79e3b491b4e35bed971ffe40f20",
+  "0x000000000000000000000000000000000014aac08af29b80ea5e82169bde9f1b",
+  "0x000000000000000000000000000000f23100dd9e774faa9da6adabb0a5e868d1",
+  "0x00000000000000000000000000000000000675d3fb2db13df5feb7837a996202",
+  "0x0000000000000000000000000000002d41a263946c21172989f16b6c3eabd14b",
+  "0x00000000000000000000000000000000002f76f5733e8a0b6e45ad715c844fa3",
+  "0x0000000000000000000000000000009906b77efd02f89dd64543cb41b2ee7dc0",
+  "0x000000000000000000000000000000000011990c3a05d603a15abfdd104b7f45",
+  "0x000000000000000000000000000000b68418cb6eb350097b81ceebf7216de49f",
+  "0x0000000000000000000000000000000000193b041e80721ea6304e3edc45a55a",
+  "0x0000000000000000000000000000007f41793e8f1a2fbe4047a8c9b3ea8a7eba",
+  "0x000000000000000000000000000000000004ad79eb6e09a672b49359e429d4b2",
+  "0x00000000000000000000000000000084b9e57a26da81e52f9d96f484a3d8a6ae",
+  "0x00000000000000000000000000000000001b4cff12b3ca2c242b1cb101ca1f62",
+  "0x00000000000000000000000000000051285e317a9d17f2180bf8ec1f3e31c266",
+  "0x00000000000000000000000000000000002f79f4597dc1cbdfe8060d1d92c7fc",
+  "0x000000000000000000000000000000bfdd478df770ff0d6a9f5d30c6380e3bb2",
+  "0x00000000000000000000000000000000000f6c52e2949dd6fa7eff016e2e5bb6",
+  "0x0000000000000000000000000000001cba707dc36043107ad882453ae5d8b129",
+  "0x0000000000000000000000000000000000059cc841348db66a31d2dfa33b89a0",
+  "0x0000000000000000000000000000000e2b2caaf1a1eda41d509cc5221c984b51",
+  "0x0000000000000000000000000000000000037cc127472715a44cac19993d448a",
+  "0x0000000000000000000000000000003cc6bfe8250e54d57ce7daedc9a7095bc8",
+  "0x00000000000000000000000000000000001c95108bb4f2494bfef842093c3b36",
+  "0x0000000000000000000000000000008313e6a820b2f5c2a7de8028cd31798633",
+  "0x000000000000000000000000000000000027be294c15550f339b0839d5860142",
+  "0x00000000000000000000000000000060338657a29bcf8c13a4b50294e337ef11",
+  "0x00000000000000000000000000000000001569de523f46c6226a398155490417",
+  "0x000000000000000000000000000000163a5d9281ca7ac774da33d1bd5e32dd54",
+  "0x00000000000000000000000000000000001cea3677784e36b40d3084060d7486",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000008a36ca53543c7bd871dd8974dda60ec04e",
+  "0x000000000000000000000000000000000028fcc75fb20c13fa73b0b5dd1a9df0",
+  "0x000000000000000000000000000000646eccdb4bcb213d9d9867f291bc4cc715",
+  "0x0000000000000000000000000000000000239e0bfd2fe8666da2541d2b7e9242",
+  "0x00000000000000000000000000000057b0434a909bdd123f328dd722f50de441",
+  "0x0000000000000000000000000000000000056e909ead4cc889ca4ae259618b9e",
+  "0x000000000000000000000000000000cce3583f4dbdf7f0ea96b8413114530b7f",
+  "0x0000000000000000000000000000000000029d93569d5fb4eccfe54516bbfc2c",
+  "0x0000000000000000000000000000000202259bdd735f5d0996b36a14296dd956",
+  "0x00000000000000000000000000000000001c9a81340c0ef1a3f8ab9378b45228",
+  "0x000000000000000000000000000000bb9541231ccc05d3210933db9b2cfd662a",
+  "0x00000000000000000000000000000000002e90121d7079020ef60bf83a167d82",
+  "0x0000000000000000000000000000008e531da6a57f645193723255cc3949f2a6",
+  "0x000000000000000000000000000000000023d3bfa481c11731a958ae003b7049",
+  "0x0000000000000000000000000000005d505cd2a7715559ab2fb8ffa94fac158b",
+  "0x0000000000000000000000000000000000283299e0b6841cadaef68c90af63b3",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x000000000000000000000000000000a50e32219d22dc5bc0a2a3afa8d1c963bf",
+  "0x00000000000000000000000000000000001b05579d422ec3526b639fa813b3db",
+  "0x000000000000000000000000000000931e9ee47cc6828d015bfd807445f50921",
+  "0x000000000000000000000000000000000005283cabb6b55f9baa597d00d3f46f",
+  "0x000000000000000000000000000000f14ecdef3987001b29e5574b25db85e726",
+  "0x00000000000000000000000000000000002b26e84ba3e9db90b9b761fbd5ba48",
+  "0x00000000000000000000000000000054401c158e8bfa1eac201ac628df1458d3",
+  "0x000000000000000000000000000000000028b61261027652e8ca3b29fb567872",
+  "0x0000000000000000000000000000005ddf21ec29f762249f79a86d986723b259",
+  "0x000000000000000000000000000000000020d889a78eaaeeced668f7a5e6a155",
+  "0x000000000000000000000000000000fbf31736f1c118ed779b00b56effa82f84",
+  "0x00000000000000000000000000000000001c10198fa65839280c9a4df0d48c69",
+  "0x000000000000000000000000000000ae45bd31909c920cd302c1833dc9dac27c",
+  "0x00000000000000000000000000000000000b5e828a1794bb52b1ef28384f36c3",
+  "0x000000000000000000000000000000623a32eccef6d3f192c9090e2c8d211339",
+  "0x000000000000000000000000000000000017dbcb62b1ef67a30ab74432100e03",
+  "0x0000000000000000000000000000008e75c04775713fe2b95076a7a5e1036c46",
+  "0x0000000000000000000000000000000000070ea9b40827062280d6e3cc9609a6",
+  "0x000000000000000000000000000000c70577cdcada107c62a7732ef0d2bbc15f",
+  "0x00000000000000000000000000000000002e57c64ac76e0a1e1c5980782cb606",
+  "0x000000000000000000000000000000902c14297534b09b2a8072cd93a9489887",
+  "0x00000000000000000000000000000000000cb983d7cc09d74a951dbf12ad432b",
+  "0x00000000000000000000000000000012bff816b24bc7a97ad6b1549515d6b28e",
+  "0x00000000000000000000000000000000000467570dff77ca3a342e4fc4d1a66b",
+  "0x00000000000000000000000000000080a63925457f739d70103395ccb7dcd29d",
+  "0x00000000000000000000000000000000000249558e7e5b5d6473ec5a9a980688",
+  "0x0000000000000000000000000000006cd74958767b5d51a95549a316e285ab74",
+  "0x0000000000000000000000000000000000091261933d2e12b6818f72bdc3e0c2",
+  "0x000000000000000000000000000000f97e56f24f292a230cf6c8350df6989d74",
+  "0x0000000000000000000000000000000000191f5e720c5ae2ded820c5e22cf23f",
+  "0x000000000000000000000000000000d3659c79160cc300c1726cdfe0a093bc08",
+  "0x000000000000000000000000000000000028e8e8952512f8006336791f90f01d",
+  "0x0000000000000000000000000000007ee7b8782f98bb5d90cbdc6fe174a42009",
+  "0x00000000000000000000000000000000000ae0ee6c55535140057064aa3fc5f0",
+  "0x000000000000000000000000000000d2bb98513b84e1e6f4e0b606bc025f9c48",
+  "0x00000000000000000000000000000000000b21f9d209054956c0524fababf1e9",
+  "0x000000000000000000000000000000d81d8ac019f7fed05a6b57f7845f56e44f",
+  "0x00000000000000000000000000000000002971c35ad470594c9a15abfc0e25a6",
+  "0x000000000000000000000000000000415d3a9385f247cc4092e3aad3382acd35",
+  "0x000000000000000000000000000000000025f0852ecc99395598d1e68d0ca89f",
+  "0x0000000000000000000000000000004f32605fa17fb311a06f7fb843c15d558a",
+  "0x000000000000000000000000000000000005071f43d210d49c73d5f25a18a596",
+  "0x0000000000000000000000000000000a679653df2810b4ec4c7adcd1cd7c97c8",
+  "0x000000000000000000000000000000000013c145ee6755ca17c398dafb88a569",
+  "0x00000000000000000000000000000083bace0537b2947643af96ab4b4aa8c478",
+  "0x000000000000000000000000000000000011ae383aeafc332a329462493ac315",
+  "0x000000000000000000000000000000a18bcfba0739bc5f71bd74ec53b6837fea",
+  "0x00000000000000000000000000000000001c2a9a991c7dbcd75129f92ff372b1",
+  "0x0000000000000000000000000000002c80b406fa46ad088b2e8d4f5a5701d47c",
+  "0x00000000000000000000000000000000001879ed897e504955597f01336b1d86",
+  "0x000000000000000000000000000000655b7a8802d367044c042458a17a0aeab4",
+  "0x000000000000000000000000000000000021be3e235af1a949dbf105cbe725d0",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000001",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000002",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "0x0000000000000000000000000000003569425f279a7bb08b8c18377333fcdf7b",
-  "0x0000000000000000000000000000000000004cf3f1c55c6bdc4b52aa2089d0f3",
-  "0x000000000000000000000000000000a057d0219f1ef32870762f852058661821",
-  "0x00000000000000000000000000000000002e9edf5fe31a87f30b26b915530a59",
-  "0x000000000000000000000000000000001dbb619e6e929e76a6efd1e4385c88f3",
-  "0x000000000000000000000000000000000005f8a1641d13b243a02a3f02b2ee28",
-  "0x0000000000000000000000000000002d82538a2445a88d2075c85f73a52fa00d",
-  "0x00000000000000000000000000000000000765b47bcde9aab139f5be476581ad",
-  "0x000000000000000000000000000000655eafd26d4cf4bd0951ae00ae66a0a5a4",
-  "0x00000000000000000000000000000000000d677eb93347add0618d75fb9ee5fe",
-  "0x000000000000000000000000000000ffda1f6b46c23f296036b683b84c761a4b",
-  "0x00000000000000000000000000000000000fae9f9a690b4e18091eaef9fe2bdb"
+  "0x0000000000000000000000000000006ab4e9fba1bb0c45d30796e0c19546192e",
+  "0x00000000000000000000000000000000000b1447f3413f687009608e1c55b192",
+  "0x000000000000000000000000000000567498365d293b6c0532b94c33d0e937a5",
+  "0x000000000000000000000000000000000006c4fabfa5194704563bcc508d234e",
+  "0x00000000000000000000000000000009835f11bc7b963372a60d92370980b183",
+  "0x00000000000000000000000000000000000d898f5e8487e3ed90a10fc50db186",
+  "0x000000000000000000000000000000b66ee3d15932d652c3b54801748e89da9f",
+  "0x000000000000000000000000000000000024899f4b6ba56af0e1128c4a431ba7",
+  "0x00000000000000000000000000000064dd7da7637cf2116a18531edc7fea829a",
+  "0x0000000000000000000000000000000000162e867465b02e01bbabb15c59b84d",
+  "0x00000000000000000000000000000071f09c1d3d2c8f9499c838fc966b04ada9",
+  "0x00000000000000000000000000000000000f4504ac6f302739e9f2c7aa824d12"
 ]
-  hash = "0x1ae15de87bc87f81fc020f3350450267fcd1748b55fd5cea379de031913540dd"
+  hash = "0x051d17b4a7efa4af82e7c6b71f2a5cf71ee015e6d9edbcd39d326a5463aac1e6"
 
 [previous_kernel_public_inputs]
 min_revertible_side_effect_counter = "0x0000000000000000000000000000000000000000000000000000000000000005"
-expiration_timestamp = "0x0000000000000000000000000000000000000000000000000000000069e55d81"
+expiration_timestamp = "0x0000000000000000000000000000000000000000000000000000000069ff293f"
 is_private_only = true
-claimed_first_nullifier = "0x26f58ea4e59caccca23fd7342a9dbd649426e1ba431becfcd84536bc804136da"
+claimed_first_nullifier = "0x282b555a2f009837bd02f744ae119250934c991464481b5613f7f2112a615f7c"
 claimed_revertible_counter = "0x0000000000000000000000000000000000000000000000000000000000000005"
 
   [previous_kernel_public_inputs.constants]
-  vk_tree_root = "0x0141caf6779674bc31225636c4cc4259a731835c52fc462f2dcbfabf7de01a1d"
+  vk_tree_root = "0x0c16448b65c4b3f83f9db3bebf635bd38957c74c9c1ea36036cbda16432cf558"
 
     [previous_kernel_public_inputs.constants.anchor_block_header]
-    sponge_blob_hash = "0x2f6cbc1e2991d249f92b52eab711b5b69653f27dc615f8548486ee4f905db9d1"
-    total_fees = "0x00000000000000000000000000000000000000000000000002b226a71e115940"
-    total_mana_used = "0x00000000000000000000000000000000000000000000000000000000000a3919"
+    sponge_blob_hash = "0x13a1bf44c19e7c2eb7fc1a96527d072cf424bc99c760e392f4abcecc1fc597f8"
+    total_fees = "0x00000000000000000000000000000000000000000000000002b26ec5db7a7140"
+    total_mana_used = "0x00000000000000000000000000000000000000000000000000000000000a3979"
 
       [previous_kernel_public_inputs.constants.anchor_block_header.last_archive]
-      root = "0x1658130986216f2f0ffc888c65e948a57a28c64721e664f522cfbb7d01492231"
+      root = "0x0d18996e508e8c1e51f6a56652cc5d71169450ff16c25de9af7f79af5385e334"
       next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000008"
 
 [previous_kernel_public_inputs.constants.anchor_block_header.state.l1_to_l2_message_tree]
@@ -166,37 +182,37 @@ root = "0x0fef6d80d31109ddb56d6b3f607cbc9c0af0bff3ea0d43e8f278983c64c11f7a"
 next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000002000"
 
 [previous_kernel_public_inputs.constants.anchor_block_header.state.partial.note_hash_tree]
-root = "0x101e57ba43504cd90f08cd61ed589b9367d33eed30ccd7a2e8333cf633f2fb6f"
+root = "0x1c223e428d6faa36822890e3b99417ddf73ffb069bf4c44b6ae9d7fc741733f6"
 next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000200"
 
 [previous_kernel_public_inputs.constants.anchor_block_header.state.partial.nullifier_tree]
-root = "0x0ec61562d933c8948a789b996a4057b5ef647965d854a7d6e36d28c2d2aea06e"
+root = "0x01c778a6b3dcb1245bb0aee174252dd95256e67309f952e5d2f8cbafffe20d0f"
 next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000280"
 
 [previous_kernel_public_inputs.constants.anchor_block_header.state.partial.public_data_tree]
-root = "0x021204d873082156522eb6603c9c7f7acb21fa936d470764f1fda90cf504891c"
+root = "0x134e44df49ddb89525046d19bcfc2734c78e419994de9d6f7467eb84d02d1060"
 next_available_leaf_index = "0x000000000000000000000000000000000000000000000000000000000000008b"
 
       [previous_kernel_public_inputs.constants.anchor_block_header.global_variables]
       chain_id = "0x0000000000000000000000000000000000000000000000000000000000007a69"
-      version = "0x000000000000000000000000000000000000000000000000000000007b6d50be"
+      version = "0x00000000000000000000000000000000000000000000000000000000ad49d7cd"
       block_number = "0x0000000000000000000000000000000000000000000000000000000000000008"
       slot_number = "0x0000000000000000000000000000000000000000000000000000000000000022"
-      timestamp = "0x0000000000000000000000000000000000000000000000000000000069e40c02"
+      timestamp = "0x0000000000000000000000000000000000000000000000000000000069fdd7c0"
 
         [previous_kernel_public_inputs.constants.anchor_block_header.global_variables.coinbase]
-        inner = "0x000000000000000000000000080c5a37d2d3dade855a034bac3548a8b2dfd887"
+        inner = "0x000000000000000000000000fde0805eba75f23cd30a3bb4f0e567a356075904"
 
         [previous_kernel_public_inputs.constants.anchor_block_header.global_variables.fee_recipient]
         inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
         [previous_kernel_public_inputs.constants.anchor_block_header.global_variables.gas_fees]
         fee_per_da_gas = "0x0000000000000000000000000000000000000000000000000000000000000000"
-        fee_per_l2_gas = "0x0000000000000000000000000000000000000000000000000000004382670b40"
+        fee_per_l2_gas = "0x0000000000000000000000000000000000000000000000000000004386faeb40"
 
     [previous_kernel_public_inputs.constants.tx_context]
     chain_id = "0x0000000000000000000000000000000000000000000000000000000000007a69"
-    version = "0x000000000000000000000000000000000000000000000000000000007b6d50be"
+    version = "0x00000000000000000000000000000000000000000000000000000000ad49d7cd"
 
 [previous_kernel_public_inputs.constants.tx_context.gas_settings.gas_limits]
 da_gas = "0x0000000000000000000000000000000000000000000000000000000000030000"
@@ -208,29 +224,29 @@ l2_gas = "0x00000000000000000000000000000000000000000000000000000000000c795c"
 
 [previous_kernel_public_inputs.constants.tx_context.gas_settings.max_fees_per_gas]
 fee_per_da_gas = "0x0000000000000000000000000000000000000000000000000000000000000000"
-fee_per_l2_gas = "0x0000000000000000000000000000000000000000000000000000000cd98ff1cb"
+fee_per_l2_gas = "0x000000000000000000000000000000000000000000000000000000336bfe2ba6"
 
 [previous_kernel_public_inputs.constants.tx_context.gas_settings.max_priority_fees_per_gas]
 fee_per_da_gas = "0x0000000000000000000000000000000000000000000000000000000000000000"
 fee_per_l2_gas = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
 [[previous_kernel_public_inputs.constants.protocol_contracts.derived_addresses]]
-inner = "0x0f8addbb176a80288379af1fe3f6e128881df1ab13f9a4dbf25de12287e61b95"
+inner = "0x1520f4bb11a3a1d2248a03d8472e9af4bb8324eb1d2d8c83bce61894383464b9"
 
 [[previous_kernel_public_inputs.constants.protocol_contracts.derived_addresses]]
-inner = "0x0b0006ff0bbf70a2ec9171c2301b65f66536e0c36cc70177a1ffadbb3f69189f"
+inner = "0x26a43bf066852a7b1ec3c5b454f41735fea12e2ffbefed471058124b91d94018"
 
 [[previous_kernel_public_inputs.constants.protocol_contracts.derived_addresses]]
-inner = "0x0ffdc845a84050f056157a1c1d52abe18da16b961c9a9a881043c2c02ad2aded"
+inner = "0x1bd26c6831ebc53674b13ac69a0c534563c37e46c2cbb36f2deca107a26515fa"
 
 [[previous_kernel_public_inputs.constants.protocol_contracts.derived_addresses]]
-inner = "0x1612f27832228b08a6ee80c5a5fb54e123ce6bddf7a6501de4fb8f426c4d8070"
+inner = "0x06870c63132d2a4e3356a76d773240efe729e7d9b9380a7a3cf1798fc9031aed"
 
 [[previous_kernel_public_inputs.constants.protocol_contracts.derived_addresses]]
-inner = "0x0d53da6d9ad9ce42a1ecd9f80a437151035951677b72d7d0af06b6221d0bf913"
+inner = "0x0083c4dfb922796f1086d399f8f3d021159d1a87ba3b833dcdf9863c630ba643"
 
 [[previous_kernel_public_inputs.constants.protocol_contracts.derived_addresses]]
-inner = "0x0758bfa195d8fd7782a5e27ef55ad8655afc8d23e57a73cc0331ab1075547146"
+inner = "0x0b4d3a9a7a3caf83f9c2060347e48cc28c7f04d2560d1cbf5bf08d4832128a97"
 
 [[previous_kernel_public_inputs.constants.protocol_contracts.derived_addresses]]
 inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
@@ -252,7 +268,7 @@ length = "0x0000000000000000000000000000000000000000000000000000000000000001"
 
   [[previous_kernel_public_inputs.validation_requests.note_hash_read_requests.array]]
 [previous_kernel_public_inputs.validation_requests.note_hash_read_requests.array.inner]
-inner = "0x1e9901d75ca2844cadc15c9299576114cbfd77651631f65a8b02de758c70d833"
+inner = "0x29ecb485abf1e4a9963bb4dada6e8b67bda9c6bb09527ecb8d0c64a0d119e0fd"
 counter = "0x0000000000000000000000000000000000000000000000000000000000000003"
 
 [previous_kernel_public_inputs.validation_requests.note_hash_read_requests.array.contract_address]
@@ -2763,7 +2779,7 @@ length = "0x0000000000000000000000000000000000000000000000000000000000000001"
 counter = "0x0000000000000000000000000000000000000000000000000000000000000001"
 
   [previous_kernel_public_inputs.end.nullifiers.array.inner.inner]
-  value = "0x05fc95f30352290091cd721d67c6b305bed068751f319549534de936a1877f21"
+  value = "0x1f9942757ace032bb97eaa996ab3756544b55ccf805fdbf6f5093a5b8037e138"
   note_hash = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
 [previous_kernel_public_inputs.end.nullifiers.array.contract_address]
@@ -5993,7 +6009,7 @@ length = "0x0000000000000000000000000000000000000000000000000000000000000000"
 length = "0x0000000000000000000000000000000000000000000000000000000000000001"
 
   [[previous_kernel_public_inputs.end.private_call_stack.array]]
-  args_hash = "0x23b9d61877546fb90775ac5e86d652fe34b363bfb86fcdc9fdd60abe8803c1b9"
+  args_hash = "0x00fdacb86277b5caac1f0395131955d3d7ddd5988f117d742d59ecdeef9db7a5"
   returns_hash = "0x0000000000000000000000000000000000000000000000000000000000000000"
   start_side_effect_counter = "0x0000000000000000000000000000000000000000000000000000000000000006"
   end_side_effect_counter = "0x0000000000000000000000000000000000000000000000000000000000000010"
@@ -6002,10 +6018,10 @@ length = "0x0000000000000000000000000000000000000000000000000000000000000001"
     is_static_call = false
 
       [previous_kernel_public_inputs.end.private_call_stack.array.call_context.msg_sender]
-      inner = "0x0c6be08a5e070b343e733716e4ad76ea05de25e2b7fc6e6f50f0ec549f7c0bfa"
+      inner = "0x0635e757a5f05ba5322db37d6930525b43c2e055ed7c4600559a07fc38ab09ec"
 
       [previous_kernel_public_inputs.end.private_call_stack.array.call_context.contract_address]
-      inner = "0x1e0d825a84ebc33bf160363bca7a6855c0bfc677043e7dd77205004c861ff880"
+      inner = "0x16fc6ad8c94527d45832bb8631b0c1dedf3218fe7c3ca04e01850a3eff6a511a"
 
       [previous_kernel_public_inputs.end.private_call_stack.array.call_context.function_selector]
       inner = "0x00000000000000000000000000000000000000000000000000000000754fb767"
@@ -6291,143 +6307,159 @@ length = "0x0000000000000000000000000000000000000000000000000000000000000001"
     inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
   [previous_kernel_public_inputs.fee_payer]
-  inner = "0x0c6be08a5e070b343e733716e4ad76ea05de25e2b7fc6e6f50f0ec549f7c0bfa"
+  inner = "0x0635e757a5f05ba5322db37d6930525b43c2e055ed7c4600559a07fc38ab09ec"
 
 [private_call.vk]
 key = [
-  "0x0000000000000000000000000000000000000000000000000000000000000010",
+  "0x000000000000000000000000000000000000000000000000000000000000000f",
   "0x0000000000000000000000000000000000000000000000000000000000000008",
-  "0x000000000000000000000000000000000000000000000000000000000000036c",
-  "0x000000000000000000000000000000396bf459ff8b95a31c2c22bc7996b3e9c1",
-  "0x000000000000000000000000000000000022baf7e92b3af5d4192f2560f0ac41",
-  "0x000000000000000000000000000000588140d5aa8b2c6bbfaeb2fd4eda2c3336",
-  "0x000000000000000000000000000000000012a1b2127f5560c5a7f0ab4abad0d6",
-  "0x000000000000000000000000000000eb4ab0f64bd3a76d5969be40b4b793f2df",
-  "0x00000000000000000000000000000000000e54740d59c457cc5bb0faec574ee9",
-  "0x0000000000000000000000000000001d5e19bd076d5268aaacac6af9bf931227",
-  "0x00000000000000000000000000000000000c34f046b6494450fa9fbf1750194d",
-  "0x000000000000000000000000000000c881588501b703e761988d8a89aec19938",
-  "0x0000000000000000000000000000000000000e5cb7d21e2988ab79a8afb6c775",
-  "0x0000000000000000000000000000008fb41c1c62e97f334e3d8edef9c3a67f6e",
-  "0x00000000000000000000000000000000001d34e3a161e5651419c2ec91a74d5b",
-  "0x00000000000000000000000000000092e234db27acca44f1f4d550651d679279",
-  "0x00000000000000000000000000000000000f0ce97eff23d0bc78adadf4cab9c4",
-  "0x00000000000000000000000000000088d382bae0a9863af478f0477ca3c3f9b4",
-  "0x00000000000000000000000000000000000756999a90f4a02e5dca81928d8fe3",
-  "0x00000000000000000000000000000020bd1fabf1fc1bf2569876ea88fbc34eb4",
-  "0x00000000000000000000000000000000001c2283c6289fb261dc85682396b951",
-  "0x000000000000000000000000000000e599ed00e9e7d1251a8e6d94867b5b28ae",
-  "0x000000000000000000000000000000000010f0f030c5ffe0dde62d8b86fd8b33",
-  "0x0000000000000000000000000000006f48597fef823e1a0e4ef6fd36235dc4ee",
-  "0x00000000000000000000000000000000003044b1f26a0076206419694b5682e0",
-  "0x000000000000000000000000000000bcbab00da5482630f6032e65dd07b69729",
-  "0x00000000000000000000000000000000000e400e0937bb60e3017c62b60930b2",
-  "0x000000000000000000000000000000d24785817b7914e25ad45446800c585525",
-  "0x00000000000000000000000000000000002291b4be6d23a50f26e8497714a199",
-  "0x0000000000000000000000000000009fedaab644b4ec235698994d383bda2c0f",
-  "0x000000000000000000000000000000000019c67abad33193f6dabff0cccb8778",
-  "0x0000000000000000000000000000000aaa43f2e3f3a97a30accce990cfc5b9f5",
-  "0x000000000000000000000000000000000003d8be93b9d93c57b56bde4c21ffc5",
-  "0x000000000000000000000000000000d47953f74943d1e7e5cafad7fcca0d2dab",
-  "0x00000000000000000000000000000000002e9e5adcfcea113936e04279c29e52",
-  "0x0000000000000000000000000000004acc2eb3d1167733dcaf49de9c3af56e57",
-  "0x00000000000000000000000000000000001ee92cee4ce1e34fc528305c4b2083",
-  "0x000000000000000000000000000000deec3f8c5e436f92892cb85ca3d74048a3",
-  "0x00000000000000000000000000000000002f0c1f111f1ee458447e99adf311bf",
-  "0x0000000000000000000000000000006207ed9dbf0d3d8f451367f4fbeca67e2e",
-  "0x0000000000000000000000000000000000203c3ad3b8175a46fe1d6b60bfc760",
-  "0x000000000000000000000000000000f64425bf5d52f388549fb4fae178c8b74c",
-  "0x00000000000000000000000000000000001fb1f4e0f1f2b72f8d1a276e63ca88",
-  "0x000000000000000000000000000000357e41954db629dee287386455326a79a4",
-  "0x000000000000000000000000000000000027aa1902f0b30d604003fac1714df1",
-  "0x000000000000000000000000000000b55b0f39332ab5fa5863364ea902730364",
-  "0x00000000000000000000000000000000002d4a1331ecd3e33d881257c310e156",
-  "0x0000000000000000000000000000003187741276439fc727f0a11d0d73e04903",
-  "0x00000000000000000000000000000000001d14e84fbddf167a664e5127799a23",
-  "0x000000000000000000000000000000432e2d44766fd658802231b2d45425f745",
-  "0x000000000000000000000000000000000005fb5e3bbda9f772cca447641abd85",
-  "0x000000000000000000000000000000e48c3e51d92d308ffdafa82562d53612f3",
-  "0x00000000000000000000000000000000000d5f9c52b49a91e81b6f7fec8ad48c",
-  "0x000000000000000000000000000000b8d0831c9a78d63575fd63e832ca2916fc",
-  "0x000000000000000000000000000000000027cda03814327672efe3e9bfc7dfc9",
-  "0x0000000000000000000000000000005d6f60732a12a266fcab4dcffe69049b16",
-  "0x00000000000000000000000000000000002e14973f6f088e3b4c35d7c9954993",
-  "0x0000000000000000000000000000005d8dd06b7f775c386a3cff001bb90c20b3",
-  "0x00000000000000000000000000000000001717762dc5664394332671fb2d8e09",
-  "0x000000000000000000000000000000edb4a916e7e21d6a23700ba6be647ba3ff",
-  "0x00000000000000000000000000000000001271d37f4b9b505b750a02cff26d85",
-  "0x000000000000000000000000000000d2df236e8a73391c282b8e7afa60126932",
-  "0x00000000000000000000000000000000000e188f109a006fedf4a6ee0fcf0976",
-  "0x000000000000000000000000000000bd06eb6650c63328e8ad0b41634cb871d8",
-  "0x000000000000000000000000000000000005e884a319174ba1e2905b0c5af14b",
-  "0x00000000000000000000000000000030adc1acdc65c4b113dbd53c18c09140ce",
-  "0x000000000000000000000000000000000002340dbf45d13a00a74c8b16ff4a53",
-  "0x000000000000000000000000000000fd9c272970fe0f36e1ace0e18d3f788435",
-  "0x00000000000000000000000000000000001e1ef33f12c38ee3cee56f94aa6b35",
-  "0x0000000000000000000000000000002a629ee406448d96928c14cba597f46b6f",
-  "0x000000000000000000000000000000000002ca2a92dad55d09de456ba20d0cf6",
-  "0x00000000000000000000000000000007a66769e5db3650bf13e8645c7192297e",
-  "0x00000000000000000000000000000000002e8edb0a081fd6dcf16ac295025ef7",
-  "0x000000000000000000000000000000d8ace89ecee1ff4f845c0d629898368c83",
-  "0x000000000000000000000000000000000025accc9e334c11002d46bff3fcd910",
-  "0x000000000000000000000000000000bb22309fec101ccd0fa9de2033c57256e0",
-  "0x00000000000000000000000000000000002e7fb727183eb1e88b77f385761b8d",
-  "0x000000000000000000000000000000458b6f3553f91078d71beca5e617ec950f",
-  "0x0000000000000000000000000000000000282c0a6705ecb6efb3e4b649289158",
-  "0x0000000000000000000000000000004e60123f82784f01d34c38427f13d21765",
-  "0x00000000000000000000000000000000000ae537ef28ad66ed3ad2727c30801b",
-  "0x000000000000000000000000000000ef2112ec3ae91ce932867f5b7b486dfed0",
-  "0x0000000000000000000000000000000000128a9d81915687366043122a51fe42",
-  "0x0000000000000000000000000000008afb613cf89856d6b008c7e01250b42e05",
-  "0x000000000000000000000000000000000027b67a31c50b00a6cc55f8ca5374ac",
-  "0x00000000000000000000000000000016b21b919d5e2098f15da00b98c400d71e",
-  "0x0000000000000000000000000000000000014a02c3e0763e0d35421e3f0c3df1",
-  "0x000000000000000000000000000000bb4413cef37fac9538baf543b44f9f3a11",
-  "0x0000000000000000000000000000000000258f9a5b64a30fa9d4a814d264e13a",
-  "0x000000000000000000000000000000c1400cabcb886729c7c8140572a1d678b3",
-  "0x0000000000000000000000000000000000298795ba3af85d9dd5ddc86e6f7feb",
-  "0x000000000000000000000000000000c403517e68376fd33a4ce96bc78bb56aca",
-  "0x00000000000000000000000000000000001cdb5b1d562e94640d4cbabe4ab6ad",
-  "0x000000000000000000000000000000da04064c3377b89eea5011d4e9c2675711",
-  "0x00000000000000000000000000000000002882fb0ab08472b52899169024ba10",
-  "0x00000000000000000000000000000095b5d8b7b4a63b05df652b0d10ef146d26",
-  "0x0000000000000000000000000000000000099e3bd5a0a00ab7fe18040105b9b3",
-  "0x0000000000000000000000000000002129af3a637f5a622a32440f860d1e2a7f",
-  "0x00000000000000000000000000000000000015b8d2515d76e2ccec99dcd19459",
-  "0x000000000000000000000000000000222b888108dc25d1aa450e0b4bc212c37e",
-  "0x00000000000000000000000000000000001b917517920bad3d8bc01c9595092a",
-  "0x000000000000000000000000000000482141c7ebe42000a1d58ccb74381f6d19",
-  "0x0000000000000000000000000000000000305e8992b148eedb22e6e992077a84",
-  "0x0000000000000000000000000000007c86847618681dc29d8a9363ab7c40e1c3",
-  "0x000000000000000000000000000000000016465a5ccbb550cd2c63bd58116fe4",
-  "0x000000000000000000000000000000439973ac12d7ca796d6fe98ca40e6ca6b7",
-  "0x00000000000000000000000000000000002e24d420fbf9508ed31de692db477b",
-  "0x00000000000000000000000000000028edd1a7e46c840d9c943fdf45521c64ce",
-  "0x0000000000000000000000000000000000043d063b130adfb37342af45d0155a",
-  "0x0000000000000000000000000000009330952ae74c573d1686d9cb4a00733854",
-  "0x0000000000000000000000000000000000261522c4089330646aff9673619494",
+  "0x0000000000000000000000000000000000000000000000000000000000000367",
+  "0x00000000000000000000000000000077c298f63acd57d13cd760f1b09e733bc3",
+  "0x000000000000000000000000000000000026a287c4760845db19abbc695ff36a",
+  "0x00000000000000000000000000000069e321196774777d330d8c47b62018ee30",
+  "0x0000000000000000000000000000000000295262e94218827820d221f1a676f2",
+  "0x000000000000000000000000000000257dbf8aaa5e15520c24e9f783198f1cfe",
+  "0x0000000000000000000000000000000000190713b989ee2b0ecde498ce10b549",
+  "0x0000000000000000000000000000002295cabfb39afdc4509c3dd66e4c75da5e",
+  "0x000000000000000000000000000000000027507b50fee92f2d43690c874e86a2",
+  "0x000000000000000000000000000000aa13c08a3a7c1467715828adcb937c2043",
+  "0x00000000000000000000000000000000000f8a1543c6677019dc01eb2ce85dc8",
+  "0x0000000000000000000000000000001675deda7e3dafff4e33979da4ebd705c4",
+  "0x0000000000000000000000000000000000289905e8a6dc218db585b427eb056e",
+  "0x0000000000000000000000000000005ca36b42f5d503af3510645776a182509a",
+  "0x00000000000000000000000000000000002dd8eef985765f468fae90d96ba6fc",
+  "0x000000000000000000000000000000cea81c59bacc58df526b5e5f65fef5b74d",
+  "0x00000000000000000000000000000000001c6fb7347dc56d363c90b8d4488579",
+  "0x00000000000000000000000000000031fde8e713e9e8fc77842379f6745e401e",
+  "0x00000000000000000000000000000000002a4395c65a14e549b33900648d7960",
+  "0x0000000000000000000000000000005c83438275fadd9a66b48380362607b9ec",
+  "0x00000000000000000000000000000000001b2c0ed48bd9ac3b17f36ced09b85a",
+  "0x0000000000000000000000000000005a3fbe86fc074463d664ec1028991daf15",
+  "0x00000000000000000000000000000000001c2bca0518d0dc405eecc6c9b66511",
+  "0x00000000000000000000000000000058fb55a413b7865807590827cbb9007644",
+  "0x000000000000000000000000000000000009d6fc59acc8a61214589672dcea3d",
+  "0x00000000000000000000000000000006e868544e82268dc595a57ee6d88aaa33",
+  "0x00000000000000000000000000000000002de9cde4733c1f06fdb8ac10fda985",
+  "0x00000000000000000000000000000061bad33649e2767633ba30e687da7b70ac",
+  "0x00000000000000000000000000000000002c0b0343148e6beab80557d74f318e",
+  "0x0000000000000000000000000000004df9e2c11487e96cde4a354328c2322b7e",
+  "0x00000000000000000000000000000000001e71380507bf8f7a65f542a668967e",
+  "0x000000000000000000000000000000387a87e1fd5a4d755a72bf4223e72cf175",
+  "0x0000000000000000000000000000000000140d1d6145c78a4cd60b85534d174f",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000009ebab60fa5dc47e1914fda39298f7e6ac7",
+  "0x0000000000000000000000000000000000110e8c462632d85486fb2b573bb0ff",
+  "0x0000000000000000000000000000007d5067869e4f6c37bf78d104a880ad37e8",
+  "0x00000000000000000000000000000000001b8a3f8dbb8f2a3ecdd71594aca606",
+  "0x000000000000000000000000000000780fb7de9447ebdaf30ee24fbe3cba1300",
+  "0x0000000000000000000000000000000000084d032f1ae838a33a86164a6541df",
+  "0x000000000000000000000000000000c359ee0159370b1406940ba9db56dc4ff2",
+  "0x00000000000000000000000000000000001cfb12b15f63bd6b2c321b0a84f51f",
+  "0x00000000000000000000000000000073f32650074f87a7b77470996beeacdfe4",
+  "0x000000000000000000000000000000000005647aa1addd19b3136ec411e71431",
+  "0x000000000000000000000000000000258e47dcc86acc1d400247381ab87d4725",
+  "0x0000000000000000000000000000000000295e68d808cf3b272d91be2fd2ae37",
+  "0x0000000000000000000000000000003ba26fee14fb99c3515f5bbf524129e34f",
+  "0x00000000000000000000000000000000000466b9f8edd37c3fa3c7d06d1a7986",
+  "0x0000000000000000000000000000008318efe19eaaca4d497ad4912aa208ecee",
+  "0x0000000000000000000000000000000000013e5dc7040c7f8b74cec4df5572bd",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000708a99a1df6e2f08c37655b04da1516fb",
+  "0x0000000000000000000000000000000000200f93be3bb23204915ddf19a6102b",
+  "0x0000000000000000000000000000003ff62e27b5552bbe8742ef48a1ce956a38",
+  "0x00000000000000000000000000000000002eb0dfb213e5244c19612993acc338",
+  "0x0000000000000000000000000000000c97bab3896ad5ed1bdbc6811f35b52088",
+  "0x000000000000000000000000000000000024ed3a2bfaf9b9620f0cf2c2210117",
+  "0x00000000000000000000000000000010515c3eda29482356a09bc84a2f1455b6",
+  "0x00000000000000000000000000000000000a473218b2415232276d99ee32b8ee",
+  "0x000000000000000000000000000000caed4590a347c4d3079e1d47713f5b83e1",
+  "0x000000000000000000000000000000000017405dec66fa4028a4f662a5b3bc5e",
+  "0x0000000000000000000000000000000c1444e30937299c89f8208ffe290cc18c",
+  "0x00000000000000000000000000000000001ebb18f648670cdd53f595444360e2",
+  "0x00000000000000000000000000000080b476643287925a5f4195f56b06fdd3ed",
+  "0x00000000000000000000000000000000001ca4ac04e44de10be2048a9bebcc62",
+  "0x000000000000000000000000000000cc5c01a1dc52e751c01dd9ba1cb9b49cb7",
+  "0x000000000000000000000000000000000022a62f4ddacd5cff46b90a535daa0a",
+  "0x000000000000000000000000000000dad72ff673733fba291f0d57a41d942e0a",
+  "0x000000000000000000000000000000000021a56ad22274e1b58118768b538104",
+  "0x0000000000000000000000000000005a34af8d8c8aa47da41eb1e75a0dfb8fd0",
+  "0x000000000000000000000000000000000026707f18815730d1a64214fcbfcc1f",
+  "0x000000000000000000000000000000d646a8a65170a6b78d80190d8a21ea1dff",
+  "0x000000000000000000000000000000000014bb9f8b9321b456fd18feafe1e161",
+  "0x0000000000000000000000000000001d878bb4be89e69a6688949dcaf0ce7ea4",
+  "0x00000000000000000000000000000000000f536993bd0cba9f0585f1df277c57",
+  "0x000000000000000000000000000000748b419096289f75352c8d5d112f7fdae2",
+  "0x0000000000000000000000000000000000022790c5c22cbd4366b0ad6e2b4519",
+  "0x000000000000000000000000000000fbaaa9a8b489397bc3e4d7f1056574b2e2",
+  "0x00000000000000000000000000000000000fae47872873bb913289047ed5610c",
+  "0x000000000000000000000000000000d9609f0d20812e6577cf8f21f2625e3172",
+  "0x00000000000000000000000000000000001b995278cd324d1fb4ec16ad835993",
+  "0x00000000000000000000000000000048894f6e04feabafb53f7a7b67c9e4c0e5",
+  "0x000000000000000000000000000000000027ec0d2be1c42a0a90b0ea2af01861",
+  "0x00000000000000000000000000000003e5fa4bc70fe52643ca6985c073c70dc3",
+  "0x0000000000000000000000000000000000038e1e0276e2e6dfe9a9d8aa596b76",
+  "0x00000000000000000000000000000065526bfbb668d3f936d18df508e43bccb3",
+  "0x00000000000000000000000000000000001f65337846109ac55e93e42a9fa3cc",
+  "0x000000000000000000000000000000585161baf0203d961615740c9ba7c9e707",
+  "0x000000000000000000000000000000000005728984358785c066c4cd63845858",
+  "0x0000000000000000000000000000002ff9899e736c45e4f04a866d93f57c116b",
+  "0x00000000000000000000000000000000002c4d422fd03c9a5b2e329d93362757",
+  "0x0000000000000000000000000000002cf70e3a6f9fe963cc77d1520d5d4edee6",
+  "0x000000000000000000000000000000000005f00e31445a7a9cd4219d268a06d4",
+  "0x00000000000000000000000000000025a2bc22bef7d083c5f847e80f943c189d",
+  "0x00000000000000000000000000000000001239130781e0d914daca12578a2b41",
+  "0x000000000000000000000000000000f3696d80095221316a91e185aec90d4607",
+  "0x00000000000000000000000000000000001469812dd8efeca285ecc964c4e02c",
+  "0x000000000000000000000000000000b9583e757e383f8ac91620436cfd8b488b",
+  "0x0000000000000000000000000000000000086edbc84ee73808efb9a82a2f806e",
+  "0x000000000000000000000000000000d8b0ecd6e3cddb9c693c8bf1d32795968e",
+  "0x00000000000000000000000000000000002757dfd7d21719de99dd25b8fc095a",
+  "0x000000000000000000000000000000684a589b8e853856d7cffbbf4293bf3571",
+  "0x00000000000000000000000000000000001c280b47d50b66bc53b6b635dc9827",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000001",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000002",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "0x0000000000000000000000000000006c36ccb454c18d51dd1c880ca690398dc2",
-  "0x000000000000000000000000000000000000bb8052a5e6879066848deb20ed7f",
-  "0x000000000000000000000000000000056d5ae59009313e97a87276e53886bef4",
-  "0x00000000000000000000000000000000000f9d657141902aaf4beaff83d79f14",
+  "0x0000000000000000000000000000000b91c3664d3270a60931c471928222bf6b",
+  "0x00000000000000000000000000000000001a702fa77522ea7356d9d6ed1c9b9e",
+  "0x00000000000000000000000000000032f9984b982de6753a3668f46872fee3db",
+  "0x00000000000000000000000000000000003036d9814a9753be22125d50c268e7",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "0x00000000000000000000000000000017a53214f33b1ad009e461b269927219be",
-  "0x000000000000000000000000000000000014107d4be453c804a8e29186919b3e",
-  "0x00000000000000000000000000000092879f61a828269302561bb57f3b1557cf",
-  "0x0000000000000000000000000000000000284505094e35d3b558a43402cadae2"
+  "0x0000000000000000000000000000000585fcdfa31b424adfe685b43435cdc567",
+  "0x00000000000000000000000000000000002717439949acf883c385bc7c246dc6",
+  "0x000000000000000000000000000000b97f0f863a1005a5c88ba628c1d8bb1740",
+  "0x000000000000000000000000000000000001f73676f90fa92e0bd9ce8716cfb9"
 ]
-hash = "0x07f901b7288856d57bffe59f6fb42af423232d284c7bd64f5c7a422858ee89cf"
+hash = "0x147ef2802ee4a878790fc89ab3a742a3f9e794df4ba16a3c013856118e5e54d7"
 
 [private_call.verification_key_hints]
-contract_class_artifact_hash = "0x2c189ff12a5697e3f85c0a3c9c8c6219babcbff83c5cd38022f7d12fb9e66d57"
-contract_class_public_bytecode_commitment = "0x28f193229a06c4d755350b4b0ef06df6dd1c11d9c206746b7b21b241e533f9bf"
+contract_class_artifact_hash = "0x17936c22a18e1310c8a71802414ad55bbea4d490023a55358f249edace43f2fb"
+contract_class_public_bytecode_commitment = "0x1e88df4d0fb9c20b21bce0f5067f3f4c9a9da39101d2936741eb5b0cfcfc9a40"
 updated_class_id_delayed_public_mutable_values = [
   "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -6437,10 +6469,10 @@ updated_class_id_delayed_public_mutable_values = [
   [private_call.verification_key_hints.function_leaf_membership_witness]
   leaf_index = "3"
   sibling_path = [
-  "0x152af5f293fee1cb0a2e5a945a1af51610e443ae6e7d4f5ed777b51ef69f3e7b",
-  "0x198bd39ade372f43cb8322a391d27e8589edad01a64cde0cfc405e4b38aa06b6",
-  "0x021694eada730e98176de440b460f852a945b899c0000514e09143bd2da6dde7",
-  "0x126e07bbae911cb6feae6c7b469d46f5b3cfda20c2484d32bea89542563c75fb",
+  "0x1768f4ffe236f2d0d6f6e42ad30d7c9ace25c145ede7b699e3a551e0f90f65de",
+  "0x0a83a13c3704cbec2a1c8aeab69534367d70b291243f955cf1aea1caa6092382",
+  "0x04f1d72b0df1c0b8759643e6ae23442a5cdfe090978072dd559a8319c0811952",
+  "0x29e60d7288e9b28c0d1e6f4c7244c3b92efdd2de4e7042b85a1291c2ec910b1f",
   "0x267a9c24e849f51869c93086ded207858dfb130344e1879a9d15d35096464824",
   "0x1eb5f748aca7413c8875abf2789be0a1aec323884a365d9a59a1859aa2bce94e",
   "0x2402a100768c2e339831cdb0b63e5c272a6f3318323a37642bea76ab5ea1ed0c"
@@ -6467,19 +6499,19 @@ y = "0x2039907fe37f08d10739255141bb066c506a12f7d1e8dfec21abc58494705b6f"
 is_infinite = false
 
   [private_call.verification_key_hints.salted_initialization_hash]
-  inner = "0x16403244a3a82f86ec1bf40a523ed30b9c10956c71bd7c0063cf302d3e84a9ac"
+  inner = "0x283b87e95914a45f14ba1dbc2445f080d54b98ca600ca9c8a09bf4e6059b8e4b"
 
   [private_call.verification_key_hints.updated_class_id_witness]
-  leaf_index = "124"
+  leaf_index = "117"
   sibling_path = [
-  "0x00c9c8fb3606cfb7d2fb36bd511cf9cdbd26525ccc8128fb9779889469bcabca",
-  "0x2edd51c644ef6263e1cdbda205a43daac325667ae6b9caad4d10eb6d0892a16f",
-  "0x27a73e789e4d571ae3f74a3d031a0054936fa02af3d7f9613e6b6d98905130e0",
-  "0x303a520710efca26f4fb4264b749c493e851056c83315b622d83215ea2eabc93",
+  "0x0371d4f7e5e7a3a1bc6eb35796ae80686c69151d345a495f9a6b43b11f13120c",
+  "0x015f1e689c2e78468161bdc9d10fabf2ce528bc217db9dc422ba929a70b5e860",
+  "0x2523970382de270c1acd87f98b4ed454353257f9c689dc608f7dc1b6ca23741a",
+  "0x2fa84a2c6fb5f1b544d9acb5620c87e8930bcc2f6411312fcc5d580ab4883a92",
   "0x2edd4e68944dac758244213037fbe9d622c7c28d6070f16862b3e8986090bee4",
   "0x1d5ea1a288ff1ff4cabceaaa2f93eda378a5fb0a2a55423f4d4d205969181931",
   "0x23b80d0ef13d744a52faabf5651164d28f7faf902653e41a35472eea87936e6e",
-  "0x1b6dbdaf3892ffd984063d39358e03c5ac80444f5bbce713f431ccb4dff30b04",
+  "0x27c696ad87d2ae17e4005225c67d015eaca8a9c6e97dec181f97f15e2c1ff894",
   "0x16c8aff52f0422f4bfc502620fe15dd6a4de67637563b7a8175f2d5727d268a4",
   "0x1c76b6744bc3d6b1cd4b53459a08b4959643c0768fde657299fcc82e2732f744",
   "0x12a6fac0fdfbd7897d8fe955f454cdb309ce8597d647ebfd0ba614c4eb215581",
@@ -6515,13 +6547,13 @@ is_infinite = false
 ]
 
   [private_call.verification_key_hints.updated_class_id_leaf]
-  slot = "0x1ac0daa4faffebf199dd32a05f49f96b53041f7889b59453883558cbb1e4b5b4"
+  slot = "0x00d9d7e98b29d1f3eadd6bcce14809b2ca27ba47b772ef0401455915ab91d062"
   value = "0x00000000000000000000000000000000000000000000021e19e0c9bab2400000"
-  next_slot = "0x201df5374a73313a5021d5fa6ea9a4d5a103ce78480b1a9b3b785996fe5d2efe"
-  next_index = "0x0000000000000000000000000000000000000000000000000000000000000087"
+  next_slot = "0x09667a49b892551e41d7ace7350264dab6567641a5096948a522f8e57069a8c0"
+  next_index = "0x0000000000000000000000000000000000000000000000000000000000000076"
 
 [app_public_inputs]
-args_hash = "0x23b9d61877546fb90775ac5e86d652fe34b363bfb86fcdc9fdd60abe8803c1b9"
+args_hash = "0x00fdacb86277b5caac1f0395131955d3d7ddd5988f117d742d59ecdeef9db7a5"
 returns_hash = "0x0000000000000000000000000000000000000000000000000000000000000000"
 start_side_effect_counter = "0x0000000000000000000000000000000000000000000000000000000000000006"
 end_side_effect_counter = "0x0000000000000000000000000000000000000000000000000000000000000010"
@@ -6529,16 +6561,16 @@ expected_non_revertible_side_effect_counter = "0x0000000000000000000000000000000
 expected_revertible_side_effect_counter = "0x0000000000000000000000000000000000000000000000000000000000000007"
 min_revertible_side_effect_counter = "0x0000000000000000000000000000000000000000000000000000000000000000"
 is_fee_payer = false
-expiration_timestamp = "0x0000000000000000000000000000000000000000000000000000000069e55d82"
+expiration_timestamp = "0x0000000000000000000000000000000000000000000000000000000069ff2940"
 
   [app_public_inputs.call_context]
   is_static_call = false
 
     [app_public_inputs.call_context.msg_sender]
-    inner = "0x0c6be08a5e070b343e733716e4ad76ea05de25e2b7fc6e6f50f0ec549f7c0bfa"
+    inner = "0x0635e757a5f05ba5322db37d6930525b43c2e055ed7c4600559a07fc38ab09ec"
 
     [app_public_inputs.call_context.contract_address]
-    inner = "0x1e0d825a84ebc33bf160363bca7a6855c0bfc677043e7dd77205004c861ff880"
+    inner = "0x16fc6ad8c94527d45832bb8631b0c1dedf3218fe7c3ca04e01850a3eff6a511a"
 
     [app_public_inputs.call_context.function_selector]
     inner = "0x00000000000000000000000000000000000000000000000000000000754fb767"
@@ -6548,7 +6580,7 @@ expiration_timestamp = "0x000000000000000000000000000000000000000000000000000000
 
     [[app_public_inputs.note_hash_read_requests.array]]
 [app_public_inputs.note_hash_read_requests.array.inner]
-inner = "0x25ec240212173c8f3d225150be31855a3161f63147d58a2ce451288fa1345f8a"
+inner = "0x14d24541deb5dd2fb77037cada005cc9755e7cdde176fafaa83d4038e6ffe551"
 counter = "0x0000000000000000000000000000000000000000000000000000000000000008"
 
 [app_public_inputs.note_hash_read_requests.array.contract_address]
@@ -6679,7 +6711,7 @@ inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
     [[app_public_inputs.nullifier_read_requests.array]]
 [app_public_inputs.nullifier_read_requests.array.inner]
-inner = "0x1a922db7d8ef70ba00b7bcf8732a9fe9ca758386b3ce8b9b126c568dc9c1b306"
+inner = "0x16c07a80d3d164d5d8082a5dda9fb5d5f0de35fc2bc4ac2fa36182ed91ce381f"
 counter = "0x0000000000000000000000000000000000000000000000000000000000000007"
 
 [app_public_inputs.nullifier_read_requests.array.contract_address]
@@ -6812,11 +6844,11 @@ inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
     key_type_domain_separator = "0x000000000000000000000000000000000000000000000000000000000e6ebabc"
 
       [app_public_inputs.key_validation_requests_and_separators.array.request]
-      sk_app = "0x0d31e2c7e09ef448a93efedd8b579d97f3dd4da57e38828565c02248c7a843cb"
+      sk_app = "0x06676b93f3cec2a77597fadc4704afee9dc237873051a7e2638df02f77e35be9"
 
         [app_public_inputs.key_validation_requests_and_separators.array.request.pk_m]
-        x = "0x09c3389c892454109fa5d2a618c1b1afaca13bb463a046ed40718e1b3b462371"
-        y = "0x1178e89a2d07a50b76a157169dd560ccf81b43b63424eb3af92ece9d9a171205"
+        x = "0x025f9f657095ad240d89a28336e0f7be994c9f270d62c6a3228aa8bada12d01d"
+        y = "0x1a7e0782cbdd3ebc39b0bd4a33b5894cb3451bc52c2fadd70371ed8d81db479f"
         is_infinite = false
 
     [[app_public_inputs.key_validation_requests_and_separators.array]]
@@ -6988,11 +7020,11 @@ inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
   length = "0x0000000000000000000000000000000000000000000000000000000000000002"
 
     [[app_public_inputs.note_hashes.array]]
-    inner = "0x3058415653eebf6c79af700e928051239531baa57cb33d42af13b093c0f66ce6"
+    inner = "0x00def7bf22ad78b9b414af8c6b920730b29275a17b6c869a3e9ad3929c416c6f"
     counter = "0x000000000000000000000000000000000000000000000000000000000000000a"
 
     [[app_public_inputs.note_hashes.array]]
-    inner = "0x257ce83e70cf82f8052a84f25531ab5baa87cd05e36d8789838b98e5fd8ede64"
+    inner = "0x1552be33f460bfea48702663acfd93ed46d02df9080308666dccf3eec187faa8"
     counter = "0x000000000000000000000000000000000000000000000000000000000000000c"
 
     [[app_public_inputs.note_hashes.array]]
@@ -7058,14 +7090,14 @@ inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
     counter = "0x0000000000000000000000000000000000000000000000000000000000000009"
 
       [app_public_inputs.nullifiers.array.inner]
-      value = "0x27d50d9bd2a72a6b85bedd8e7d513a11b592bcf6aecb79b2e855e1828b657c03"
+      value = "0x0c3f7479d44d8ec07d6aa92e715150ec4366e314b2fca5b309e6cb9e9948f56a"
       note_hash = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
     [[app_public_inputs.nullifiers.array]]
     counter = "0x000000000000000000000000000000000000000000000000000000000000000e"
 
       [app_public_inputs.nullifiers.array.inner]
-      value = "0x213dc6a7cc400314103fcf60754fbafd092eb16a46fc61806b55c0358ada4dae"
+      value = "0x265ec541731007783d79c1154c1bf3c5a3a11617bf2d3bf679d939f52d140b8c"
       note_hash = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
     [[app_public_inputs.nullifiers.array]]
@@ -7828,22 +7860,22 @@ inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
         [app_public_inputs.private_logs.array.inner.log]
         fields = [
-  "0x06af83822a4fa8cc94753d0ddc0f6e7d7186bd4b8cede79e88e8eae6728bd0cf",
-  "0x2c73615d9ab6464cbe0c8d451648e96d492e73823467a98efa21f1ea1eb33784",
-  "0x0c584a6e7f5e450f52d1b8d67c73502ecaf1b76e92a3b0ea7ade566c8cae75a3",
-  "0x12eb5caaced046c5e1735a2acccda53139a97359d3c20584a333da0017c1580d",
-  "0x26c7951ef3dcd7d15932be1c034d76eb980cebe77a3abece23d09c23abd992b0",
-  "0x05f8a3597c63ed8a979d0fd278fb5a544959bd9d68f871f7ec79a32e28db3ad4",
-  "0x022d67bc4435543e4c2b6d43b836438058c35a38ee62a27cfbadaa70257b9d7f",
-  "0x17b7cb589d82b5265591d1f6ba68534ecf4dbb2343c54dd755315f22f83c028b",
-  "0x0d1f61abac8fbc8607d199a8d0803b2f98b3ee8d39a2258622fc48b4c4c9fe60",
-  "0x2f3fe27da81ee8e09d1e17cbc275ac75dc5e04d474eb158f2e7306a8dfdecbef",
-  "0x1e2e5d1037c7355ebd297bbf511116120babcb6f2b0f8d4d2a7e1447993c0917",
-  "0x158df03558cf71dd85b122c058a95fe931ec81ed88989d157f6fe35c8a2918fe",
-  "0x0f6ec8c84a85d474160be346e29ccdf2814b15db4c6f85dcc764037c62b76ded",
-  "0x27fe1c1dfc2202c61f7f956ba23c3b0355364e68bb86b443f0667d47173019f0",
-  "0x093896965f941424a522c0a323106574653321df79a8080af2eab1e3754824b9",
-  "0x0c216771dc7929abf732fc00ece83dc11e7d9fd77daece5021650ffbee67af71"
+  "0x0a19e21c4ab1897aa638eb354bb44aaccdb24a11525f3186595e2d2271248d15",
+  "0x10433733db106ed8336b9b799ec2debee9fe2da75f114f567eefde5abf9f74d3",
+  "0x17440c522b009a136c2207db86790b05464774690523c7fbf949ad381664d0ea",
+  "0x0a5e8928a4d74ad3256e8a697cfdf84b7baae32abad67b2de7c36ffd67acb665",
+  "0x0b1200621e156c6d79f463e17e81b96f11d18d716ca5222e7276e07d45845a26",
+  "0x04b2b64d09e487d10d557106046a94a97f2c40f4316e6667a2c2d9a99db05385",
+  "0x193da3d713c24b85e1c8f22dd8ef575e88d19c6732f8fd17e370cf64e65b3e04",
+  "0x08569203e8f3d028234ed200df77bca848c9b4b015ad8797c37669a5e5d1ee0c",
+  "0x13a9b2003409ad3d4f38caba797acc77092ddd431af25a955a83dc6f5b92cc93",
+  "0x16fece01bc0b0205bcbaca2904d5674d10573bfef038f94d3e5d526596da2ae9",
+  "0x0a438177a05071eaeb1862f154b187315de4dc804e275b0f2258baf4700c6d64",
+  "0x0959244a76e5e861ce5b8833101b91e19d758109d68cc174a6f9eec9c7afa008",
+  "0x03533d18a1c3ebcf22f820a243be161c9798ea59a506572e32e125c53b7aee7e",
+  "0x1e2b22ea302597bfcbcfdefcda48b60e35fce9c70f46c6cb90fa6db6e8d4dc6d",
+  "0x28fab93b8cd28d8d2a993badc3d1a080902feecfab019dc7c00af0ea9f6f403d",
+  "0x104c4c81c135af94af35a1eeb49b1262e5c53e25ee513731ddeb9f6496eea2ab"
 ]
         length = "0x0000000000000000000000000000000000000000000000000000000000000010"
 
@@ -7855,22 +7887,22 @@ inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
         [app_public_inputs.private_logs.array.inner.log]
         fields = [
-  "0x2a8ec6047a803690c10e07a7871f66f91a23f66d86058356c23516d6d2437d81",
-  "0x16375b8398a42fdbd75bc47c454a3a41f3009588892a70dfe8d4c9066a45221a",
-  "0x2c9e87de46c5866d54ec78e7e3193006609a69f064b0c320493e5a86323a8cb3",
-  "0x02ca56efa5503d808e0d4670f4298c1c35cb2eecd6dfa8212265771ab28383e7",
-  "0x1e4e46136a23c4fcd8a6e3f55f2dbf4bfb643b534013b5e30916e265acef1396",
-  "0x0f76dd665fe04db360190f74bb067692674265e012e8b9c035e58682874c8ad2",
-  "0x1b7af81c24df129a494d2046ea533680d34c3cf59a705b0b7eb6dbe950c93a3b",
-  "0x1023283665d7538cb0b4ceb1757ffe5496ae3b04e38c92a3d88543262acadf4c",
-  "0x1d9f1615f8f1c5d01787846d36608039073bddd52b931363f2ad25066198590c",
-  "0x0ccba93943db048cee4e8cac6386a38fb3411dec41c5727512f5452626db9005",
-  "0x2fed61053470e8726452339f2dddf7aa2a681013fdf09dda3cee503b856e98a6",
-  "0x168608b1f3246093f423c22552c3e2b73d9940806fb6a206f2894f0aec8d9804",
-  "0x1ad0396979cb210c427797f7e9cd130a943a116ffc89191c7dde426f9815f5f3",
-  "0x0e26f9632a1ceb6b3529d1f3e646c5e2635ac7282f771ed015867e5608ac492b",
-  "0x0c8a6181168c14779084d69bd94d619c3bc9b461db844fb179f8fc21c6b667d5",
-  "0x043191aa5f94c3eff6c189762723c296abd3a7c10303b65129622630b7ab6fd4"
+  "0x009ca00e8f7d20a40d1266a37a186cd96c78b285a2506210cabc2fa353489be2",
+  "0x2320e89fb76918e7dc48b13861302dbf78af5ba8d5a20da77d19781ac32b9bc2",
+  "0x2a99619c0d4d380dbc3d53d03ed35011aa9c296a507fabcf712f43a0e5a10850",
+  "0x02e5d98e7dfbe7653dafb14afddd7e00f403b5a60816d7ab961823bd3cc4b628",
+  "0x223b37d6caffe87e91cddafdf65c4f641a609ff13350d02654b0fed1443088ab",
+  "0x2846b9aa4544f8f8851554f5d0c189c188756d734112e1eedd6840c8aeb0e66f",
+  "0x21cda3f228d55fb1b37f2b7c7a5d42066007143db17645669521ff58956fa7bf",
+  "0x1d8d79951d7389e5f9dfa963f93e399aebaa346e9ce3b3a5da1b45e4600a1553",
+  "0x15eabc8ed921f60621fa4fa35214748a7593f1c06a1e66b76092f789b4960bc5",
+  "0x16babb28d68725cb64d6d7558d49fb921c480359488fcdfb5292019239a50563",
+  "0x015e561b49da425d081b87bac01336defa1e29ee50d01b7be798ac28e05b24d6",
+  "0x04bf1a23807cb0711511a6140caf195df55fcf029842652243034ae2ca740648",
+  "0x2789cc422a86395739004c513cf6a15024e3adf5f2e238b18e1b4f1211a9383a",
+  "0x00c4e950cfe804e8a3623fe768c82b7340b0216f93c00351c53e2144364cfb51",
+  "0x2fd9827b4118b7ef401dff1727785e46fdd31947d2e733f4b39076f43652c18a",
+  "0x158ca7fba6e7fa7b3eb7c062751182d93b4e36b5c77d2e609e246b810650e59e"
 ]
         length = "0x0000000000000000000000000000000000000000000000000000000000000010"
 
@@ -7882,22 +7914,22 @@ inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
         [app_public_inputs.private_logs.array.inner.log]
         fields = [
-  "0x1f82c90130aedd60b86bfa5050e04fe0e82dd31f6703828d568bc5adf7698bab",
-  "0x2c93c0e720639d650652f8a3207389e68bbddc23a5c77bac86cf76d18d2d4c6e",
-  "0x13886d46429598c222d060b3f1310ab08426f52591a0048ba69c5f8c9fc878e5",
-  "0x06f84323865ae16fba50254f50d6644da0fdd4f7858abeac8e490d6b8e582ff1",
-  "0x2e13bd8098fc2c84136b36e7c8ac6ad91a956851a53414e598bc965a53bd7d56",
-  "0x12606d99ba16253e396904e04ffc666608dd862755887cfa059f5598564398f0",
-  "0x125d17e65b7d789efd50049851d0dab0275777066fc335731e91a10f59a754c1",
-  "0x00fa47821eb005815aff3fdf498f4304a253ea5d6623477b779c6f24dac3f7a2",
-  "0x1d4e2a1c53da9e892c281a869cc68d6012380b64bfb6482fc5a8df6582889d88",
-  "0x2bc1b3d6d18a4fa9c9a6de522ec66e330d0452b89ea54621eddfe6d2a922ef69",
-  "0x150ed27ceffc6f923f89e1e841238eb3fa47c938baf201ab5c75795c039ba436",
-  "0x030e3ebccab9056b7ef14ee89ccfe595bdb050938199811b291615b356220271",
-  "0x255b84fbc5cca3c3dedcec7002347f53f608cb6528f12b1143280307a1c46e14",
-  "0x0c10873c5dd54ec52fd5402af0c75916b2b4df23a9a9aa643896fb956d60ba50",
-  "0x0bc0aa29990bcf3c275323fd20c2871e45f6c31921fc50c9bcad51ad9aa41553",
-  "0x0d2d7cb49928f91e000fd2f08e702b96621a24d92a3dd31a3062abed3b550c96"
+  "0x145c6a232e670e3f0babf2a60ced437e3b543087bb24e9d398e05add3513dfa4",
+  "0x127157561e774918ba656738fb61ad37f92086431bd4f1e4842ab11928b0f8d2",
+  "0x2e5cf59c8f2eee7a06d14cdedb8fe58945357cb16f4c792094325909a12924b2",
+  "0x0e29376c31f2aa7a156c6ce6d1fc9529998251d8500604658f173ff86adffa98",
+  "0x20761b8be9a186cf6a1730b8a1e99049a07e45c005e66d27b6e0ef15a2833e2f",
+  "0x1adf679b2441cf3535241924a35164cf8309256721e3f9fcb860bc2acc462b46",
+  "0x06a613741497b7b7ee978a495bfed7d19bbf76c462d268cee17a3920b1b1abe0",
+  "0x10ade06e253c1cfd65f24246211fb703c157fd9b563ffaf6ab01b6fba4635155",
+  "0x2311c6b104555d4d9afc7d66be6b47a41f8aa96eb77f613a75fc952da5975ccf",
+  "0x08431c3838d7ad6198c1d33ff138953ace3520551bd95b69692609ee11ded216",
+  "0x1822c33cf8097138c896bb9f7aad7def909a6859d5e640919fd16ebcf153a0db",
+  "0x11203b31ef49d39fb85a5ea474116c334c156091ab468493a480f13ad1ec1849",
+  "0x207a4712bacadd2f631fe253cb62932a7acb586dd6dd1b10e0fbe733f61a8f11",
+  "0x2c862b0eb14b1325a0ca63dda4570f718541d998fb4aba96339b7913b80757c9",
+  "0x1bf17ee7d3cf2487dcf1eb7a3647b0920c9e68aacc0a33c9a424d4ee6601ded3",
+  "0x2c70c9b7da7d7df78fcae182d124d7041209070f76d920e5d5c2d7590c385ea1"
 ]
         length = "0x0000000000000000000000000000000000000000000000000000000000000010"
 
@@ -8263,12 +8295,12 @@ inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
       length = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
   [app_public_inputs.anchor_block_header]
-  sponge_blob_hash = "0x2f6cbc1e2991d249f92b52eab711b5b69653f27dc615f8548486ee4f905db9d1"
-  total_fees = "0x00000000000000000000000000000000000000000000000002b226a71e115940"
-  total_mana_used = "0x00000000000000000000000000000000000000000000000000000000000a3919"
+  sponge_blob_hash = "0x13a1bf44c19e7c2eb7fc1a96527d072cf424bc99c760e392f4abcecc1fc597f8"
+  total_fees = "0x00000000000000000000000000000000000000000000000002b26ec5db7a7140"
+  total_mana_used = "0x00000000000000000000000000000000000000000000000000000000000a3979"
 
     [app_public_inputs.anchor_block_header.last_archive]
-    root = "0x1658130986216f2f0ffc888c65e948a57a28c64721e664f522cfbb7d01492231"
+    root = "0x0d18996e508e8c1e51f6a56652cc5d71169450ff16c25de9af7f79af5385e334"
     next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000008"
 
 [app_public_inputs.anchor_block_header.state.l1_to_l2_message_tree]
@@ -8276,37 +8308,37 @@ root = "0x0fef6d80d31109ddb56d6b3f607cbc9c0af0bff3ea0d43e8f278983c64c11f7a"
 next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000002000"
 
 [app_public_inputs.anchor_block_header.state.partial.note_hash_tree]
-root = "0x101e57ba43504cd90f08cd61ed589b9367d33eed30ccd7a2e8333cf633f2fb6f"
+root = "0x1c223e428d6faa36822890e3b99417ddf73ffb069bf4c44b6ae9d7fc741733f6"
 next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000200"
 
 [app_public_inputs.anchor_block_header.state.partial.nullifier_tree]
-root = "0x0ec61562d933c8948a789b996a4057b5ef647965d854a7d6e36d28c2d2aea06e"
+root = "0x01c778a6b3dcb1245bb0aee174252dd95256e67309f952e5d2f8cbafffe20d0f"
 next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000280"
 
 [app_public_inputs.anchor_block_header.state.partial.public_data_tree]
-root = "0x021204d873082156522eb6603c9c7f7acb21fa936d470764f1fda90cf504891c"
+root = "0x134e44df49ddb89525046d19bcfc2734c78e419994de9d6f7467eb84d02d1060"
 next_available_leaf_index = "0x000000000000000000000000000000000000000000000000000000000000008b"
 
     [app_public_inputs.anchor_block_header.global_variables]
     chain_id = "0x0000000000000000000000000000000000000000000000000000000000007a69"
-    version = "0x000000000000000000000000000000000000000000000000000000007b6d50be"
+    version = "0x00000000000000000000000000000000000000000000000000000000ad49d7cd"
     block_number = "0x0000000000000000000000000000000000000000000000000000000000000008"
     slot_number = "0x0000000000000000000000000000000000000000000000000000000000000022"
-    timestamp = "0x0000000000000000000000000000000000000000000000000000000069e40c02"
+    timestamp = "0x0000000000000000000000000000000000000000000000000000000069fdd7c0"
 
       [app_public_inputs.anchor_block_header.global_variables.coinbase]
-      inner = "0x000000000000000000000000080c5a37d2d3dade855a034bac3548a8b2dfd887"
+      inner = "0x000000000000000000000000fde0805eba75f23cd30a3bb4f0e567a356075904"
 
       [app_public_inputs.anchor_block_header.global_variables.fee_recipient]
       inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
       [app_public_inputs.anchor_block_header.global_variables.gas_fees]
       fee_per_da_gas = "0x0000000000000000000000000000000000000000000000000000000000000000"
-      fee_per_l2_gas = "0x0000000000000000000000000000000000000000000000000000004382670b40"
+      fee_per_l2_gas = "0x0000000000000000000000000000000000000000000000000000004386faeb40"
 
   [app_public_inputs.tx_context]
   chain_id = "0x0000000000000000000000000000000000000000000000000000000000007a69"
-  version = "0x000000000000000000000000000000000000000000000000000000007b6d50be"
+  version = "0x00000000000000000000000000000000000000000000000000000000ad49d7cd"
 
 [app_public_inputs.tx_context.gas_settings.gas_limits]
 da_gas = "0x0000000000000000000000000000000000000000000000000000000000030000"
@@ -8318,7 +8350,7 @@ l2_gas = "0x00000000000000000000000000000000000000000000000000000000000c795c"
 
 [app_public_inputs.tx_context.gas_settings.max_fees_per_gas]
 fee_per_da_gas = "0x0000000000000000000000000000000000000000000000000000000000000000"
-fee_per_l2_gas = "0x0000000000000000000000000000000000000000000000000000000cd98ff1cb"
+fee_per_l2_gas = "0x000000000000000000000000000000000000000000000000000000336bfe2ba6"
 
 [app_public_inputs.tx_context.gas_settings.max_priority_fees_per_gas]
 fee_per_da_gas = "0x0000000000000000000000000000000000000000000000000000000000000000"
diff --git a/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/lib.nr b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/lib.nr
index 9eb56b0661b6..4ca2af21cfe8 100644
--- a/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/lib.nr
+++ b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/lib.nr
@@ -3,7 +3,10 @@ mod abis;
 mod accumulated_data;
 mod components;
 pub mod private_kernel_init;
+pub mod private_kernel_init_n;
+pub(crate) mod private_kernel_batch;
 pub mod private_kernel_inner;
+pub mod private_kernel_inner_n;
 pub mod private_kernel_tail;
 pub mod private_kernel_tail_to_public;
 pub mod private_kernel_reset;
@@ -15,7 +18,9 @@ pub use abis::{PaddedSideEffectAmounts, PaddedSideEffects, PrivateKernelResetHin
 pub use hiding_kernel_to_public::HidingKernelToPublicPrivateInputs;
 pub use hiding_kernel_to_rollup::HidingKernelToRollupPrivateInputs;
 pub use private_kernel_init::PrivateKernelInitCircuitPrivateInputs;
+pub use private_kernel_init_n::PrivateKernelInitNCircuitPrivateInputs;
 pub use private_kernel_inner::PrivateKernelInnerCircuitPrivateInputs;
+pub use private_kernel_inner_n::PrivateKernelInnerNCircuitPrivateInputs;
 pub use private_kernel_reset::PrivateKernelResetCircuitPrivateInputs;
 pub use private_kernel_tail::PrivateKernelTailCircuitPrivateInputs;
 pub use private_kernel_tail_to_public::PrivateKernelTailToPublicCircuitPrivateInputs;
diff --git a/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/private_kernel_batch.nr b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/private_kernel_batch.nr
new file mode 100644
index 000000000000..7ecd05baf5da
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/private_kernel_batch.nr
@@ -0,0 +1,39 @@
+use crate::components::{
+    private_call_data_validator::PrivateCallDataValidator,
+    private_kernel_circuit_output_composer::PrivateKernelCircuitOutputComposer,
+    private_kernel_circuit_output_validator::PrivateKernelCircuitOutputValidator,
+};
+use types::abis::{
+    kernel_circuit_public_inputs::PrivateKernelCircuitPublicInputs,
+    private_kernel::private_call_data::PrivateCallData,
+};
+
+unconstrained fn generate_next_output(
+    previous_kernel_public_inputs: PrivateKernelCircuitPublicInputs,
+    private_call: PrivateCallData,
+) -> PrivateKernelCircuitPublicInputs {
+    PrivateKernelCircuitOutputComposer::new_from_previous_kernel(previous_kernel_public_inputs)
+        .pop_top_call_request()
+        .with_private_call(private_call)
+        .finish()
+}
+
+pub fn execute_next_private_call(
+    previous_kernel_public_inputs: PrivateKernelCircuitPublicInputs,
+    private_call: PrivateCallData,
+) -> PrivateKernelCircuitPublicInputs {
+    PrivateCallDataValidator::new(private_call).validate_as_inner_call(
+        previous_kernel_public_inputs,
+    );
+
+    // Safety: the constrained validator below proves the unconstrained composer output matches this transition.
+    let output = unsafe { generate_next_output(previous_kernel_public_inputs, private_call) };
+
+    if ::types::validate::should_validate_output() {
+        PrivateKernelCircuitOutputValidator::new(output).validate_as_inner_call(
+            previous_kernel_public_inputs,
+            private_call,
+        );
+    }
+    output
+}
diff --git a/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/private_kernel_init_n.nr b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/private_kernel_init_n.nr
new file mode 100644
index 000000000000..e80ac964bb6c
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/private_kernel_init_n.nr
@@ -0,0 +1,41 @@
+use crate::{
+    private_kernel_batch::execute_next_private_call,
+    private_kernel_init::{self, PrivateKernelInitCircuitPrivateInputs},
+};
+use types::abis::{
+    kernel_circuit_public_inputs::PrivateKernelCircuitPublicInputs,
+    private_kernel::private_call_data::PrivateCallData, protocol_contracts::ProtocolContracts,
+    transaction::tx_request::TxRequest,
+};
+
+pub struct PrivateKernelInitNCircuitPrivateInputs<let N: u32> {
+    pub tx_request: TxRequest,
+    pub private_calls: [PrivateCallData; N],
+    pub vk_tree_root: Field,
+    pub protocol_contracts: ProtocolContracts,
+    pub is_private_only: bool,
+    pub first_nullifier_hint: Field,
+    pub revertible_counter_hint: u32,
+}
+
+pub fn execute<let N: u32>(
+    inputs: PrivateKernelInitNCircuitPrivateInputs<N>,
+) -> PrivateKernelCircuitPublicInputs {
+    let mut output = private_kernel_init::execute(
+        PrivateKernelInitCircuitPrivateInputs {
+            tx_request: inputs.tx_request,
+            private_call: inputs.private_calls[0],
+            vk_tree_root: inputs.vk_tree_root,
+            protocol_contracts: inputs.protocol_contracts,
+            is_private_only: inputs.is_private_only,
+            first_nullifier_hint: inputs.first_nullifier_hint,
+            revertible_counter_hint: inputs.revertible_counter_hint,
+        },
+    );
+
+    for i in 1..N {
+        output = execute_next_private_call(output, inputs.private_calls[i]);
+    }
+
+    output
+}
diff --git a/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/private_kernel_inner_n.nr b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/private_kernel_inner_n.nr
new file mode 100644
index 000000000000..4a73da36614b
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/private_kernel_inner_n.nr
@@ -0,0 +1,29 @@
+use crate::{
+    private_kernel_batch::execute_next_private_call,
+    private_kernel_inner::ALLOWED_PREVIOUS_CIRCUITS,
+};
+use types::abis::{
+    kernel_circuit_public_inputs::PrivateKernelCircuitPublicInputs,
+    private_kernel::private_call_data::PrivateCallData, private_kernel_data::PrivateKernelData,
+};
+
+pub struct PrivateKernelInnerNCircuitPrivateInputs<let N: u32> {
+    pub previous_kernel: PrivateKernelData,
+    pub private_calls: [PrivateCallData; N],
+}
+
+pub fn execute<let N: u32>(
+    inputs: PrivateKernelInnerNCircuitPrivateInputs<N>,
+) -> PrivateKernelCircuitPublicInputs {
+    if !::std::runtime::is_unconstrained() {
+        inputs.previous_kernel.verify(false);
+    }
+    inputs.previous_kernel.validate_vk_in_vk_tree(ALLOWED_PREVIOUS_CIRCUITS);
+
+    let mut output = inputs.previous_kernel.public_inputs;
+    for i in 0..N {
+        output = execute_next_private_call(output, inputs.private_calls[i]);
+    }
+
+    output
+}
diff --git a/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/tests/mod.nr b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/tests/mod.nr
index d44179715831..5c1cf4b90278 100644
--- a/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/tests/mod.nr
+++ b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/tests/mod.nr
@@ -1,4 +1,5 @@
 mod private_kernel_circuit_output_validator_builder;
+mod private_kernel_batch;
 mod private_kernel_init;
 mod private_kernel_inner;
 mod private_kernel_reset;
diff --git a/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/tests/private_kernel_batch/mod.nr b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/tests/private_kernel_batch/mod.nr
new file mode 100644
index 000000000000..371bf1107694
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/tests/private_kernel_batch/mod.nr
@@ -0,0 +1,742 @@
+use crate::{
+    private_kernel_init::{self, PrivateKernelInitCircuitPrivateInputs},
+    private_kernel_init_n::{self, PrivateKernelInitNCircuitPrivateInputs},
+    private_kernel_inner::{self, PrivateKernelInnerCircuitPrivateInputs},
+    private_kernel_inner_n::{self, PrivateKernelInnerNCircuitPrivateInputs},
+};
+use protocol_test_utils::FixtureBuilder;
+use types::{
+    abis::{
+        kernel_circuit_public_inputs::PrivateKernelCircuitPublicInputs,
+        private_kernel_data::PrivateKernelData, transaction::tx_request::TxRequest,
+    },
+    constants::{
+        MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, PRIVATE_KERNEL_INIT_VK_INDEX,
+        PRIVATE_KERNEL_INNER_VK_INDEX,
+    },
+};
+
+fn private_kernel_data_with_vk_index(
+    public_inputs: PrivateKernelCircuitPublicInputs,
+    vk_index: u32,
+) -> PrivateKernelData {
+    let kernel_data = FixtureBuilder::new().in_vk_tree(vk_index).to_private_kernel_data();
+    PrivateKernelData { public_inputs, vk_data: kernel_data.vk_data }
+}
+
+fn assert_private_kernel_public_inputs_eq(
+    actual: PrivateKernelCircuitPublicInputs,
+    expected: PrivateKernelCircuitPublicInputs,
+) {
+    assert_eq(actual.constants, expected.constants);
+    assert_eq(
+        actual.min_revertible_side_effect_counter,
+        expected.min_revertible_side_effect_counter,
+    );
+    assert_eq(actual.end, expected.end);
+    assert_eq(actual.validation_requests, expected.validation_requests);
+    assert_eq(actual.public_teardown_call_request, expected.public_teardown_call_request);
+    assert_eq(actual.fee_payer, expected.fee_payer);
+    assert_eq(actual.expiration_timestamp, expected.expiration_timestamp);
+    assert_eq(actual.is_private_only, expected.is_private_only);
+    assert_eq(actual.claimed_first_nullifier, expected.claimed_first_nullifier);
+    assert_eq(actual.claimed_revertible_counter, expected.claimed_revertible_counter);
+}
+
+fn execute_init_n_sequential<let N: u32>(
+    inputs: PrivateKernelInitNCircuitPrivateInputs<N>,
+) -> PrivateKernelCircuitPublicInputs {
+    let mut output = private_kernel_init::execute(
+        PrivateKernelInitCircuitPrivateInputs {
+            tx_request: inputs.tx_request,
+            private_call: inputs.private_calls[0],
+            vk_tree_root: inputs.vk_tree_root,
+            protocol_contracts: inputs.protocol_contracts,
+            is_private_only: inputs.is_private_only,
+            first_nullifier_hint: inputs.first_nullifier_hint,
+            revertible_counter_hint: inputs.revertible_counter_hint,
+        },
+    );
+
+    for i in 1..N {
+        let vk_index = if i == 1 {
+            PRIVATE_KERNEL_INIT_VK_INDEX
+        } else {
+            PRIVATE_KERNEL_INNER_VK_INDEX
+        };
+        output = private_kernel_inner::execute(
+            PrivateKernelInnerCircuitPrivateInputs {
+                previous_kernel: private_kernel_data_with_vk_index(output, vk_index),
+                private_call: inputs.private_calls[i],
+            },
+        );
+    }
+
+    output
+}
+
+fn execute_inner_n_sequential<let N: u32>(
+    inputs: PrivateKernelInnerNCircuitPrivateInputs<N>,
+) -> PrivateKernelCircuitPublicInputs {
+    let mut output = private_kernel_inner::execute(
+        PrivateKernelInnerCircuitPrivateInputs {
+            previous_kernel: inputs.previous_kernel,
+            private_call: inputs.private_calls[0],
+        },
+    );
+
+    for i in 1..N {
+        output = private_kernel_inner::execute(
+            PrivateKernelInnerCircuitPrivateInputs {
+                previous_kernel: private_kernel_data_with_vk_index(
+                    output,
+                    PRIVATE_KERNEL_INNER_VK_INDEX,
+                ),
+                private_call: inputs.private_calls[i],
+            },
+        );
+    }
+
+    output
+}
+
+struct BatchNTestBuilder<let N: u32> {
+    tx_request: TxRequest,
+    private_calls: [FixtureBuilder; N],
+    is_private_only: bool,
+    first_nullifier_hint: Field,
+    revertible_counter_hint: u32,
+}
+
+impl<let N: u32> BatchNTestBuilder<N> {
+    fn new() -> Self {
+        let mut private_calls = [FixtureBuilder::new(); N];
+
+        private_calls[0] = FixtureBuilder::new_from_counter(2).is_first_call();
+        let mut first_private_call = private_calls[0];
+        first_private_call.compute_update_tree_and_hints();
+        private_calls[0] = first_private_call;
+
+        for i in 1..N {
+            let mut private_call = FixtureBuilder::new_from_counter(i * 1000);
+            private_call.anchor_block_header = private_calls[0].anchor_block_header;
+            private_call.tx_context = private_calls[0].tx_context;
+            private_call.compute_update_tree_and_hints();
+            private_calls[i] = private_call;
+        }
+
+        let tx_request = private_calls[0].to_tx_request();
+
+        BatchNTestBuilder {
+            tx_request,
+            private_calls,
+            is_private_only: false,
+            first_nullifier_hint: 123,
+            revertible_counter_hint: 0,
+        }
+    }
+
+    fn execute_linear_chain(self) -> PrivateKernelCircuitPublicInputs {
+        self.execute_with_shape(false, true)
+    }
+
+    fn execute_linear_chain_without_second_to_third_sync(self) -> PrivateKernelCircuitPublicInputs {
+        self.execute_with_shape(false, false)
+    }
+
+    fn execute_linear_chain_without_first_to_second_sync(self) -> PrivateKernelCircuitPublicInputs {
+        let mut inputs = self.inputs_with_shape(false, true);
+        inputs.private_calls[0].public_inputs.private_call_requests.array[0].args_hash += 1;
+
+        private_kernel_init_n::execute::<N>(inputs)
+    }
+
+    fn execute_depth_first_with_sibling(self) -> PrivateKernelCircuitPublicInputs {
+        self.execute_with_shape(true, true)
+    }
+
+    fn execute_with_shape(
+        self,
+        include_sibling: bool,
+        sync_second_to_third: bool,
+    ) -> PrivateKernelCircuitPublicInputs {
+        private_kernel_init_n::execute::<N>(self.inputs_with_shape(
+            include_sibling,
+            sync_second_to_third,
+        ))
+    }
+
+    fn execute_sequential_with_shape(
+        self,
+        include_sibling: bool,
+        sync_second_to_third: bool,
+    ) -> PrivateKernelCircuitPublicInputs {
+        execute_init_n_sequential(
+            self.inputs_with_shape(include_sibling, sync_second_to_third),
+        )
+    }
+
+    fn inputs_with_shape(
+        self,
+        include_sibling: bool,
+        sync_second_to_third: bool,
+    ) -> PrivateKernelInitNCircuitPrivateInputs<N> {
+        let mut private_calls = self.private_calls;
+
+        if include_sibling {
+            let mut first_private_call = private_calls[0];
+            first_private_call.append_private_call_requests(2);
+            private_calls[0] = first_private_call;
+        } else {
+            let mut first_private_call = private_calls[0];
+            first_private_call.add_private_call_request();
+            private_calls[0] = first_private_call;
+        }
+
+        for i in 1..N {
+            let previous_request = private_calls[i - 1].private_call_requests.get(0);
+            private_calls[i].msg_sender = private_calls[i - 1].contract_address;
+            private_calls[i].counter_start = previous_request.start_side_effect_counter;
+            if private_calls[i].counter <= previous_request.start_side_effect_counter {
+                private_calls[i].counter = previous_request.start_side_effect_counter + 1;
+            }
+
+            if i < N - 1 {
+                let mut private_call = private_calls[i];
+                private_call.add_private_call_request();
+                private_calls[i] = private_call;
+            }
+        }
+
+        for i in 1..N {
+            let reverse_index = N - i - 1;
+            let next_call_request = private_calls[reverse_index + 1].to_private_call_request();
+            let next_counter = private_calls[reverse_index + 1].counter;
+            let mut current_call = private_calls[reverse_index];
+            if (reverse_index < N - 2) | sync_second_to_third {
+                current_call.private_call_requests.set(0, next_call_request);
+            }
+            if current_call.counter <= next_counter {
+                current_call.counter = next_counter + 1;
+            }
+            private_calls[reverse_index] = current_call;
+        }
+
+        if include_sibling {
+            let mut first_private_call = private_calls[0];
+            let mut sibling_request = private_calls[0].private_call_requests.get(1);
+            sibling_request.start_side_effect_counter = private_calls[1].counter + 1;
+            sibling_request.end_side_effect_counter = sibling_request.start_side_effect_counter + 1;
+            first_private_call.private_call_requests.set(1, sibling_request);
+            private_calls[0] = first_private_call;
+        }
+
+        if include_sibling {
+            let sibling_request = private_calls[0].private_call_requests.get(1);
+            if private_calls[0].counter <= sibling_request.end_side_effect_counter {
+                private_calls[0].counter = sibling_request.end_side_effect_counter + 1;
+            }
+        }
+
+        let mut private_call_data = [private_calls[0].to_private_call_data(); N];
+        for i in 1..N {
+            private_call_data[i] = private_calls[i].to_private_call_data();
+        }
+
+        PrivateKernelInitNCircuitPrivateInputs {
+            tx_request: self.tx_request,
+            private_calls: private_call_data,
+            vk_tree_root: private_calls[0].vk_tree_root,
+            protocol_contracts: private_calls[0].protocol_contracts,
+            is_private_only: self.is_private_only,
+            first_nullifier_hint: self.first_nullifier_hint,
+            revertible_counter_hint: self.revertible_counter_hint,
+        }
+    }
+
+    fn append_note_hashes(&mut self, index: u32, amount: u32) {
+        let mut private_call = self.private_calls[index];
+        private_call.append_note_hashes(amount);
+        self.private_calls[index] = private_call;
+    }
+
+    fn append_nullifiers(&mut self, index: u32, amount: u32) {
+        let mut private_call = self.private_calls[index];
+        private_call.append_nullifiers(amount);
+        self.private_calls[index] = private_call;
+    }
+
+    fn append_l2_to_l1_msgs(&mut self, index: u32, amount: u32) {
+        let mut private_call = self.private_calls[index];
+        private_call.append_l2_to_l1_msgs(amount);
+        self.private_calls[index] = private_call;
+    }
+
+    fn append_private_logs(&mut self, index: u32, amount: u32) {
+        let mut private_call = self.private_calls[index];
+        private_call.append_private_logs(amount);
+        self.private_calls[index] = private_call;
+    }
+
+    fn append_contract_class_logs(&mut self, index: u32, amount: u32) {
+        let mut private_call = self.private_calls[index];
+        private_call.append_contract_class_logs(amount);
+        self.private_calls[index] = private_call;
+    }
+
+    fn append_public_call_requests(&mut self, index: u32, amount: u32) {
+        let mut private_call = self.private_calls[index];
+        private_call.append_public_call_requests(amount);
+        self.private_calls[index] = private_call;
+    }
+
+    fn append_note_hash_read_requests(&mut self, index: u32, amount: u32) {
+        let mut private_call = self.private_calls[index];
+        private_call.append_note_hash_read_requests(amount);
+        self.private_calls[index] = private_call;
+    }
+
+    fn append_nullifier_read_requests(&mut self, index: u32, amount: u32) {
+        let mut private_call = self.private_calls[index];
+        private_call.append_nullifier_read_requests(amount);
+        self.private_calls[index] = private_call;
+    }
+
+    fn append_key_validation_requests(&mut self, index: u32, amount: u32) {
+        let mut private_call = self.private_calls[index];
+        private_call.append_key_validation_requests(amount);
+        self.private_calls[index] = private_call;
+    }
+
+    fn set_fee_payer(&mut self, index: u32) {
+        let mut private_call = self.private_calls[index];
+        private_call.is_fee_payer = true;
+        self.private_calls[index] = private_call;
+    }
+
+    fn set_public_teardown_call_request(&mut self, index: u32) {
+        let mut private_call = self.private_calls[index];
+        private_call.set_public_teardown_call_request();
+        self.private_calls[index] = private_call;
+    }
+
+    fn end_setup(&mut self, index: u32) {
+        let mut private_call = self.private_calls[index];
+        private_call.end_setup();
+        self.private_calls[index] = private_call;
+    }
+
+    fn set_static_call(&mut self, index: u32) {
+        let mut private_call = self.private_calls[index];
+        let _ = private_call.is_static_call();
+        self.private_calls[index] = private_call;
+    }
+
+    fn increment_anchor_block_header_version(&mut self, index: u32) {
+        let mut private_call = self.private_calls[index];
+        private_call.anchor_block_header.global_variables.version += 1;
+        self.private_calls[index] = private_call;
+    }
+}
+
+struct InnerNTestBuilder<let N: u32> {
+    previous_kernel: FixtureBuilder,
+    private_calls: [FixtureBuilder; N],
+}
+
+impl<let N: u32> InnerNTestBuilder<N> {
+    fn new() -> Self {
+        let mut previous_kernel = FixtureBuilder::new_from_counter(135)
+            .in_vk_tree(PRIVATE_KERNEL_INIT_VK_INDEX)
+            .as_parent_contract();
+        previous_kernel.compute_update_tree_and_hints();
+
+        let mut private_calls = [FixtureBuilder::new(); N];
+        for i in 0..N {
+            let mut private_call = FixtureBuilder::new_from_counter((i + 1) * 1000);
+            private_call.anchor_block_header = previous_kernel.anchor_block_header;
+            private_call.tx_context = previous_kernel.tx_context;
+            private_call.compute_update_tree_and_hints();
+            private_calls[i] = private_call;
+        }
+
+        InnerNTestBuilder { previous_kernel, private_calls }
+    }
+
+    fn execute_linear_chain(self) -> PrivateKernelCircuitPublicInputs {
+        private_kernel_inner_n::execute::<N>(self.linear_chain_inputs())
+    }
+
+    fn execute_linear_chain_sequential(self) -> PrivateKernelCircuitPublicInputs {
+        execute_inner_n_sequential(self.linear_chain_inputs())
+    }
+
+    fn linear_chain_inputs(self) -> PrivateKernelInnerNCircuitPrivateInputs<N> {
+        let mut previous_kernel = self.previous_kernel;
+        let mut private_calls = self.private_calls;
+
+        for i in 0..N - 1 {
+            let mut private_call = private_calls[i];
+            private_call.add_private_call_request();
+            private_calls[i] = private_call;
+            let next_request = private_calls[i].private_call_requests.get(0);
+            private_calls[i + 1].msg_sender = private_calls[i].contract_address;
+            private_calls[i + 1].counter_start = next_request.start_side_effect_counter;
+            if private_calls[i + 1].counter <= next_request.start_side_effect_counter {
+                private_calls[i + 1].counter = next_request.start_side_effect_counter + 1;
+            }
+        }
+
+        for i in 1..N {
+            let reverse_index = N - i - 1;
+            let next_call_request = private_calls[reverse_index + 1].to_private_call_request();
+            let next_counter = private_calls[reverse_index + 1].counter;
+            let mut current_call = private_calls[reverse_index];
+            current_call.private_call_requests.set(0, next_call_request);
+            if current_call.counter <= next_counter {
+                current_call.counter = next_counter + 1;
+            }
+            private_calls[reverse_index] = current_call;
+        }
+
+        previous_kernel.private_call_requests.push(private_calls[0].to_private_call_request());
+
+        let mut private_call_data = [private_calls[0].to_private_call_data(); N];
+        for i in 1..N {
+            private_call_data[i] = private_calls[i].to_private_call_data();
+        }
+
+        PrivateKernelInnerNCircuitPrivateInputs {
+            previous_kernel: previous_kernel.to_private_kernel_data(),
+            private_calls: private_call_data,
+        }
+    }
+
+    fn append_note_hashes(&mut self, index: u32, amount: u32) {
+        let mut private_call = self.private_calls[index];
+        private_call.append_note_hashes(amount);
+        self.private_calls[index] = private_call;
+    }
+}
+
+fn add_one_of_each_per_call_with_tx_bounded_logs<let N: u32>(builder: &mut BatchNTestBuilder<N>) {
+    for i in 0..N {
+        builder.append_note_hashes(i, 1);
+        builder.append_nullifiers(i, 1);
+        builder.append_l2_to_l1_msgs(i, 1);
+        builder.append_private_logs(i, 1);
+        builder.append_public_call_requests(i, 1);
+        builder.append_note_hash_read_requests(i, 1);
+        builder.append_nullifier_read_requests(i, 1);
+        builder.append_key_validation_requests(i, 1);
+    }
+
+    builder.append_contract_class_logs(0, 1);
+}
+
+fn assert_batch_n_linear_chain_consumes_all_calls<let N: u32>() {
+    let builder = BatchNTestBuilder::<N>::new();
+
+    let output = builder.execute_linear_chain();
+
+    assert_eq(output.end.private_call_stack.length, 0);
+}
+
+fn assert_batch_n_linear_chain_matches_sequential_kernels<let N: u32>() {
+    let builder = BatchNTestBuilder::<N>::new();
+
+    let batched = builder.execute_linear_chain();
+    let sequential = builder.execute_sequential_with_shape(false, true);
+
+    assert_private_kernel_public_inputs_eq(batched, sequential);
+}
+
+fn assert_batch_n_with_everything_non_empty_matches_sequential_kernels<let N: u32>() {
+    let mut builder = BatchNTestBuilder::<N>::new();
+    add_one_of_each_per_call_with_tx_bounded_logs(&mut builder);
+
+    let batched = builder.execute_linear_chain();
+    let sequential = builder.execute_sequential_with_shape(false, true);
+
+    assert_private_kernel_public_inputs_eq(batched, sequential);
+}
+
+fn assert_batch_n_accumulates_side_effects_across_slots<let N: u32>() {
+    let mut builder = BatchNTestBuilder::<N>::new();
+
+    for i in 0..N {
+        builder.append_note_hashes(i, 1);
+        builder.append_l2_to_l1_msgs(i, 1);
+    }
+
+    let note_hashes = builder.private_calls.map(|call| call.note_hashes.storage()[0]);
+    let l2_to_l1_msgs = builder.private_calls.map(|call| call.l2_to_l1_msgs.storage()[0]);
+    let contract_addresses = builder.private_calls.map(|call| call.contract_address);
+
+    let output = builder.execute_linear_chain();
+
+    assert_eq(output.end.note_hashes.length, N, "incorrect note hash length");
+    assert_eq(output.end.l2_to_l1_msgs.length, N, "incorrect l2 to l1 message length");
+    for i in 0..N {
+        assert_eq(output.end.note_hashes.array[i], note_hashes[i]);
+        assert_eq(output.end.note_hashes.array[i].contract_address, contract_addresses[i]);
+        assert_eq(output.end.l2_to_l1_msgs.array[i], l2_to_l1_msgs[i]);
+    }
+}
+
+fn assert_batch_n_depth_first_child_keeps_sibling_on_stack<let N: u32>() {
+    let builder = BatchNTestBuilder::<N>::new();
+
+    let output = builder.execute_depth_first_with_sibling();
+
+    assert_eq(output.end.private_call_stack.length, 1);
+}
+
+fn assert_batch_n_depth_first_with_sibling_matches_sequential_kernels<let N: u32>() {
+    let builder = BatchNTestBuilder::<N>::new();
+
+    let batched = builder.execute_depth_first_with_sibling();
+    let sequential = builder.execute_sequential_with_shape(true, true);
+
+    assert_private_kernel_public_inputs_eq(batched, sequential);
+}
+
+fn assert_batch_n_last_call_must_match_previous_call_stack_fails<let N: u32>() {
+    let builder = BatchNTestBuilder::<N>::new();
+
+    let _ = builder.execute_linear_chain_without_second_to_third_sync();
+}
+
+fn assert_batch_n_second_call_must_match_first_call_stack_fails<let N: u32>() {
+    let builder = BatchNTestBuilder::<N>::new();
+
+    let _ = builder.execute_linear_chain_without_first_to_second_sync();
+}
+
+fn assert_batch_n_second_call_claimed_lengths_are_validated<let N: u32>() {
+    let mut builder = BatchNTestBuilder::<N>::new();
+
+    builder.append_note_hash_read_requests(1, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL + 1);
+
+    let _ = builder.execute_linear_chain();
+}
+
+fn assert_batch_n_last_call_side_effect_counters_are_validated<let N: u32>() {
+    let mut builder = BatchNTestBuilder::<N>::new();
+    let last_index = N - 1;
+
+    builder.append_note_hashes(last_index, 1);
+    let mut inputs = builder.inputs_with_shape(false, true);
+    let mut note_hash = inputs.private_calls[last_index].public_inputs.note_hashes.array[0];
+    note_hash.counter = inputs.private_calls[last_index].public_inputs.start_side_effect_counter;
+    inputs.private_calls[last_index].public_inputs.note_hashes.array[0] = note_hash;
+
+    let _ = private_kernel_init_n::execute::<N>(inputs);
+}
+
+fn assert_batch_n_second_call_must_match_previous_kernel_header<let N: u32>() {
+    let mut builder = BatchNTestBuilder::<N>::new();
+
+    builder.increment_anchor_block_header_version(1);
+
+    let _ = builder.execute_linear_chain();
+}
+
+fn assert_batch_n_fee_payer_conflict_fails<let N: u32>() {
+    let mut builder = BatchNTestBuilder::<N>::new();
+
+    builder.set_fee_payer(0);
+    builder.set_fee_payer(1);
+
+    let _ = builder.execute_linear_chain();
+}
+
+fn assert_batch_n_public_teardown_conflict_fails<let N: u32>() {
+    let mut builder = BatchNTestBuilder::<N>::new();
+
+    builder.set_public_teardown_call_request(0);
+    builder.set_public_teardown_call_request(1);
+
+    let _ = builder.execute_linear_chain();
+}
+
+fn assert_batch_n_min_revertible_side_effect_counter_conflict_fails<let N: u32>() {
+    let mut builder = BatchNTestBuilder::<N>::new();
+
+    builder.end_setup(0);
+    builder.end_setup(1);
+    builder.revertible_counter_hint = builder.private_calls[0].min_revertible_side_effect_counter;
+
+    let _ = builder.execute_linear_chain();
+}
+
+fn assert_batch_n_static_call_requires_static_nested_private_call_fails<let N: u32>() {
+    let mut builder = BatchNTestBuilder::<N>::new();
+
+    builder.set_static_call(1);
+
+    let _ = builder.execute_linear_chain();
+}
+
+fn assert_batch_n_static_call_restrictions_apply_to_next_slot_fails<let N: u32>() {
+    let mut builder = BatchNTestBuilder::<N>::new();
+    let last_index = N - 1;
+
+    for i in 1..N {
+        builder.set_static_call(i);
+    }
+    builder.append_note_hashes(last_index, 1);
+
+    let _ = builder.execute_linear_chain();
+}
+
+fn assert_inner_n_linear_chain_consumes_all_calls<let N: u32>() {
+    let builder = InnerNTestBuilder::<N>::new();
+
+    let output = builder.execute_linear_chain();
+
+    assert_eq(output.end.private_call_stack.length, 0);
+}
+
+fn assert_inner_n_linear_chain_matches_sequential_kernels<let N: u32>() {
+    let builder = InnerNTestBuilder::<N>::new();
+
+    let batched = builder.execute_linear_chain();
+    let sequential = builder.execute_linear_chain_sequential();
+
+    assert_private_kernel_public_inputs_eq(batched, sequential);
+}
+
+fn assert_inner_n_accumulates_side_effects_after_previous_kernel<let N: u32>() {
+    let mut builder = InnerNTestBuilder::<N>::new();
+
+    builder.previous_kernel.append_note_hashes(1);
+    for i in 0..N {
+        builder.append_note_hashes(i, 1);
+    }
+
+    let previous_note_hash = builder.previous_kernel.note_hashes.storage()[0];
+    let note_hashes = builder.private_calls.map(|call| call.note_hashes.storage()[0]);
+
+    let output = builder.execute_linear_chain();
+
+    assert_eq(output.end.note_hashes.length, N + 1, "incorrect note hash length");
+    assert_eq(output.end.note_hashes.array[0], previous_note_hash);
+    for i in 0..N {
+        assert_eq(output.end.note_hashes.array[i + 1], note_hashes[i]);
+    }
+}
+
+fn assert_inner_n_with_previous_side_effects_matches_sequential_kernels<let N: u32>() {
+    let mut builder = InnerNTestBuilder::<N>::new();
+
+    builder.previous_kernel.append_note_hashes(1);
+    for i in 0..N {
+        builder.append_note_hashes(i, 1);
+    }
+
+    let batched = builder.execute_linear_chain();
+    let sequential = builder.execute_linear_chain_sequential();
+
+    assert_private_kernel_public_inputs_eq(batched, sequential);
+}
+
+#[test]
+fn batch_3_accumulates_side_effects_across_slots() {
+    assert_batch_n_accumulates_side_effects_across_slots::<3>();
+}
+
+#[test]
+fn batch_3_linear_chain_consumes_all_calls() {
+    assert_batch_n_linear_chain_consumes_all_calls::<3>();
+}
+
+#[test]
+fn batch_3_linear_chain_matches_sequential_kernels() {
+    assert_batch_n_linear_chain_matches_sequential_kernels::<3>();
+}
+
+#[test]
+fn batch_3_depth_first_child_keeps_sibling_on_stack() {
+    assert_batch_n_depth_first_child_keeps_sibling_on_stack::<3>();
+}
+
+#[test]
+fn batch_3_depth_first_with_sibling_matches_sequential_kernels() {
+    assert_batch_n_depth_first_with_sibling_matches_sequential_kernels::<3>();
+}
+
+#[test]
+fn batch_3_with_everything_non_empty_matches_sequential_kernels() {
+    assert_batch_n_with_everything_non_empty_matches_sequential_kernels::<3>();
+}
+
+#[test(should_fail_with = "call_context does not match call request")]
+fn batch_3_third_call_must_match_second_call_stack_fails() {
+    assert_batch_n_last_call_must_match_previous_call_stack_fails::<3>();
+}
+
+#[test(should_fail_with = "args_hash does not match call request")]
+fn batch_3_second_call_must_match_first_call_stack_fails() {
+    assert_batch_n_second_call_must_match_first_call_stack_fails::<3>();
+}
+
+#[test(should_fail_with = "note_hash_read_requests length out of bounds")]
+fn batch_3_second_call_claimed_lengths_are_validated() {
+    assert_batch_n_second_call_claimed_lengths_are_validated::<3>();
+}
+
+#[test(should_fail_with = "Counter must be greater than previous counter")]
+fn batch_3_third_call_side_effect_counters_are_validated() {
+    assert_batch_n_last_call_side_effect_counters_are_validated::<3>();
+}
+
+#[test(should_fail_with = "anchor block header mismatch")]
+fn batch_3_second_call_must_match_previous_kernel_header() {
+    assert_batch_n_second_call_must_match_previous_kernel_header::<3>();
+}
+
+#[test(should_fail_with = "Cannot overwrite non-empty fee_payer")]
+fn batch_3_fee_payer_conflict_fails() {
+    assert_batch_n_fee_payer_conflict_fails::<3>();
+}
+
+#[test(should_fail_with = "Public teardown call request already set")]
+fn batch_3_public_teardown_conflict_fails() {
+    assert_batch_n_public_teardown_conflict_fails::<3>();
+}
+
+#[test(should_fail_with = "cannot overwrite non-zero min_revertible_side_effect_counter")]
+fn batch_3_min_revertible_side_effect_counter_conflict_fails() {
+    assert_batch_n_min_revertible_side_effect_counter_conflict_fails::<3>();
+}
+
+#[test(should_fail_with = "nested private call of a static call must be static")]
+fn batch_3_static_call_requires_static_nested_private_call_fails() {
+    assert_batch_n_static_call_requires_static_nested_private_call_fails::<3>();
+}
+
+#[test(should_fail_with = "note_hashes must be empty for static calls")]
+fn batch_3_static_call_restrictions_apply_to_next_slot_fails() {
+    assert_batch_n_static_call_restrictions_apply_to_next_slot_fails::<3>();
+}
+
+#[test]
+fn inner_3_accumulates_side_effects_after_previous_kernel() {
+    assert_inner_n_accumulates_side_effects_after_previous_kernel::<3>();
+}
+
+#[test]
+fn inner_3_with_previous_side_effects_matches_sequential_kernels() {
+    assert_inner_n_with_previous_side_effects_matches_sequential_kernels::<3>();
+}
+
+#[test]
+fn inner_3_linear_chain_consumes_all_calls() {
+    assert_inner_n_linear_chain_consumes_all_calls::<3>();
+}
+
+#[test]
+fn inner_3_linear_chain_matches_sequential_kernels() {
+    assert_inner_n_linear_chain_matches_sequential_kernels::<3>();
+}
diff --git a/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/tests/private_kernel_inner/output_composition_tests.nr b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/tests/private_kernel_inner/output_composition_tests.nr
index d35a85356126..672ad79dbd3e 100644
--- a/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/tests/private_kernel_inner/output_composition_tests.nr
+++ b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/tests/private_kernel_inner/output_composition_tests.nr
@@ -3,7 +3,7 @@ use protocol_test_utils::assert_claimed_length_array_eq;
 use types::{
     address::{AztecAddress, EthAddress},
     constants::{
-        MAX_CONTRACT_CLASS_LOGS_PER_CALL, MAX_CONTRACT_CLASS_LOGS_PER_TX,
+        DEFAULT_UPDATE_DELAY, MAX_CONTRACT_CLASS_LOGS_PER_CALL, MAX_CONTRACT_CLASS_LOGS_PER_TX,
         MAX_ENQUEUED_CALLS_PER_CALL, MAX_ENQUEUED_CALLS_PER_TX,
         MAX_KEY_VALIDATION_REQUESTS_PER_CALL, MAX_KEY_VALIDATION_REQUESTS_PER_TX,
         MAX_L2_TO_L1_MSGS_PER_CALL, MAX_L2_TO_L1_MSGS_PER_TX, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL,
@@ -273,6 +273,26 @@ fn expiration_timestamp_pick_private_call() {
     assert_eq(pi.expiration_timestamp, 78);
 }
 
+#[test]
+fn expiration_timestamp_pick_contract_update_horizon() {
+    let mut builder = TestBuilder::new();
+
+    let contract_update_horizon = builder
+        .private_call
+        .anchor_block_header
+        .global_variables
+        .timestamp
+        + DEFAULT_UPDATE_DELAY
+        - 1;
+
+    builder.previous_kernel.expiration_timestamp = contract_update_horizon + 1000;
+    builder.private_call.expiration_timestamp = contract_update_horizon + 1000;
+
+    let pi = builder.execute();
+
+    assert_eq(pi.expiration_timestamp, contract_update_horizon);
+}
+
 #[test]
 fn with_everything_non_empty() {
     let mut builder = TestBuilder::new();
diff --git a/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/tests/private_kernel_reset/reset_output_validator/propagated_note_hashes_tests.nr b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/tests/private_kernel_reset/reset_output_validator/propagated_note_hashes_tests.nr
index 3da4221cbcda..aa660b514116 100644
--- a/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/tests/private_kernel_reset/reset_output_validator/propagated_note_hashes_tests.nr
+++ b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/tests/private_kernel_reset/reset_output_validator/propagated_note_hashes_tests.nr
@@ -1,6 +1,6 @@
 use crate::tests::private_kernel_reset::{NOTE_HASH_SILOING_AMOUNT, TestBuilder};
-use protocol_test_utils::swap_items;
 use super::rebuild_bounded_vec;
+use protocol_test_utils::swap_items;
 
 #[test]
 fn previous_note_hashes_sorted() {
diff --git a/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/tests/private_kernel_reset/reset_output_validator/propagated_nullifiers_tests.nr b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/tests/private_kernel_reset/reset_output_validator/propagated_nullifiers_tests.nr
index dafaf5f48d46..b6729378fccc 100644
--- a/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/tests/private_kernel_reset/reset_output_validator/propagated_nullifiers_tests.nr
+++ b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/tests/private_kernel_reset/reset_output_validator/propagated_nullifiers_tests.nr
@@ -1,6 +1,6 @@
 use crate::tests::private_kernel_reset::{NULLIFIER_SILOING_AMOUNT, TestBuilder};
-use protocol_test_utils::swap_items;
 use super::rebuild_bounded_vec;
+use protocol_test_utils::swap_items;
 
 #[test]
 fn previous_nullifiers_sorted() {
diff --git a/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/tests/private_kernel_reset/reset_output_validator/propagated_private_logs_tests.nr b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/tests/private_kernel_reset/reset_output_validator/propagated_private_logs_tests.nr
index 10e2760aeeea..f6f657c91491 100644
--- a/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/tests/private_kernel_reset/reset_output_validator/propagated_private_logs_tests.nr
+++ b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/tests/private_kernel_reset/reset_output_validator/propagated_private_logs_tests.nr
@@ -1,6 +1,6 @@
 use crate::tests::private_kernel_reset::{PRIVATE_LOG_SILOING_AMOUNT, TestBuilder};
-use protocol_test_utils::swap_items;
 use super::rebuild_bounded_vec;
+use protocol_test_utils::swap_items;
 
 #[test]
 fn previous_private_logs_sorted() {
@@ -158,7 +158,8 @@ fn with_padded_private_logs() {
         builder.previous_kernel.private_logs.pop().innermost().log;
 
     // BoundedVec.pop() no longer zeroes vacated slots; rebuild with clean storage.
-    builder.previous_kernel.private_logs = rebuild_bounded_vec(builder.previous_kernel.private_logs);
+    builder.previous_kernel.private_logs =
+        rebuild_bounded_vec(builder.previous_kernel.private_logs);
 
     builder.output.append_siloed_private_logs(1);
     builder.output.append_padded_private_logs(2);
@@ -189,7 +190,8 @@ fn total_private_logs_more_than_capped_size() {
         builder.previous_kernel.private_logs.pop().innermost().log;
 
     // BoundedVec.pop() no longer zeroes vacated slots; rebuild with clean storage.
-    builder.previous_kernel.private_logs = rebuild_bounded_vec(builder.previous_kernel.private_logs);
+    builder.previous_kernel.private_logs =
+        rebuild_bounded_vec(builder.previous_kernel.private_logs);
 
     builder.output.append_siloed_private_logs(PRIVATE_LOG_SILOING_AMOUNT);
     builder.output.append_padded_private_logs(1);
diff --git a/noir-projects/noir-protocol-circuits/crates/private-kernel-reset/Prover.toml b/noir-projects/noir-protocol-circuits/crates/private-kernel-reset/Prover.toml
index c44b6d7e61c1..2743b35323d1 100644
--- a/noir-projects/noir-protocol-circuits/crates/private-kernel-reset/Prover.toml
+++ b/noir-projects/noir-protocol-circuits/crates/private-kernel-reset/Prover.toml
@@ -1,164 +1,180 @@
 [previous_kernel.vk_data]
 leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000000"
 sibling_path = [
-  "0x10196189a6cc21aea4e1b8a5d5e89674d1094afdfe16996b242078a4a966241f",
-  "0x198fd2e414f45156d98b823638dbe6f7db26ad20fa72532bc8ad0ae1a6693f46",
-  "0x14f708c74d727cf1094f7cca9ccfc55332eeb473af4ff213d27bca81bb8a969f",
-  "0x17bd0d0c2b0bd623b7d30132f5ef171136ca83b2d51821c45763a2b1bb503f0a",
-  "0x15313312ac8ca4825afd3891479fbb14626ca65499d939e23b1f653cd7d018ea",
-  "0x19de2a32662702dd872e529ad89836e16b013012f910daf2bc7c2a67356dd107",
-  "0x1f07bca7a14f9a969539c0afd388affa18926689f431fc541841a2a7604d388c"
+  "0x0ddc610a21615b2984181082c3de07058b9f7d4be62806c4fd475161f8bd2be3",
+  "0x0f92d54d29bddf6ec768db2c0b4685fb325d248b3ad9a3c6adda76c6c5004224",
+  "0x0656bbf5e3f4cc4fa5e2fa46e7fd370db0bee05586a1849c37c77d05abe2d8a5",
+  "0x166399703d23a5c22febc6185f8eb93c72b65906eefef226e643c35fa0022adb",
+  "0x25f6f5fc25ee815cef59a1889f1e39db3d431d01b01ee1554f9492afec9d41d6",
+  "0x28650667b92be48b116289119fa4794a5fe8fe5792a49d89b9977feae7f685a6",
+  "0x2aa74c20807e8cbb3e32a86ad29472c42a3fb7021dcfaad112a6b68eb0eca98e"
 ]
 
   [previous_kernel.vk_data.vk]
   key = [
   "0x0000000000000000000000000000000000000000000000000000000000000010",
-  "0x0000000000000000000000000000000000000000000000000000000000000021",
-  "0x0000000000000000000000000000000000000000000000000000000000000c3c",
-  "0x000000000000000000000000000000e27c64755070b4ac1795c4ccb3e343ff1e",
-  "0x000000000000000000000000000000000013dc513d9760c5120658df23571d20",
-  "0x0000000000000000000000000000003270fde3073463b4307ce8560796a5ee35",
-  "0x00000000000000000000000000000000002bb862a6c035afcc3e124db14875b2",
-  "0x00000000000000000000000000000058f307b485e191e730e84f7d8bb6c138f3",
-  "0x00000000000000000000000000000000001557d5c221746f0e9fdf6767f5216c",
-  "0x000000000000000000000000000000d0cbd2d7ea9e11d41e5586876f79e4c963",
-  "0x0000000000000000000000000000000000266827783ae7376ff3c6326ca3a056",
-  "0x000000000000000000000000000000f29621b36170d22f645e61eebd2755577a",
-  "0x000000000000000000000000000000000008743a527ed053827b802998cd1240",
-  "0x0000000000000000000000000000008f49107363e65ebed8f221ccd91fabf803",
-  "0x0000000000000000000000000000000000113f0d64e4f6a3aad0c9a26b3b92e9",
-  "0x000000000000000000000000000000e44b8070eedd20ca38bcd2b541f9fd0573",
-  "0x0000000000000000000000000000000000087ce2c79626736f3abddd17a70026",
-  "0x00000000000000000000000000000097ce25ca64c6e95e26af7f3b65ceee9a84",
-  "0x0000000000000000000000000000000000280b9047e0845e2ed599a26491f40f",
-  "0x0000000000000000000000000000002188779b297bda00b16ea9a145b4265e46",
-  "0x000000000000000000000000000000000016dfeb53c98243360770caa0ffcde0",
-  "0x000000000000000000000000000000bbf842d54c88486e06d61dd772a43336dd",
-  "0x00000000000000000000000000000000000fded7e25a1e7a74a7eee97befb476",
-  "0x0000000000000000000000000000005e5ef797d945185054fc58315821af2f86",
-  "0x00000000000000000000000000000000000538008ae96953370175c72c550beb",
-  "0x0000000000000000000000000000004b188afe4183b2b7f2d9a47c62129eac2a",
-  "0x00000000000000000000000000000000000291bed95bbe5f261c7bbe8c980111",
-  "0x000000000000000000000000000000e90f95f63c2ea0811a6179d2067963ee2a",
-  "0x000000000000000000000000000000000026906572d22b1686e9110d22bb134b",
-  "0x000000000000000000000000000000d363f9aa66af0e0f8a9767a5207311d782",
-  "0x00000000000000000000000000000000001cc5838c757efa799e8f1538c1ceeb",
-  "0x00000000000000000000000000000020cc633772d79d10288e1524820d5d26fe",
-  "0x0000000000000000000000000000000000248fd555f916c8daef37da4996dde9",
-  "0x000000000000000000000000000000504b12d512be8bcc40b0059d970358d8cc",
-  "0x00000000000000000000000000000000001bb0ee83aa8d32bd0709019494e278",
-  "0x000000000000000000000000000000c479a5572108d83dd880881be83aae167c",
-  "0x00000000000000000000000000000000001c61e178ef6753935adfa87317568b",
-  "0x000000000000000000000000000000aea8735d4afe8820e5cead434980c619e5",
-  "0x000000000000000000000000000000000005bdab914375cf464af4d3764488c3",
-  "0x00000000000000000000000000000029d2230f52bc5e77da898165e840fdc14e",
-  "0x000000000000000000000000000000000003b501c6bb11affaa09904ac95c383",
-  "0x00000000000000000000000000000068de17a3d7b84c21e9280bb7cbcd268474",
-  "0x000000000000000000000000000000000004adcacb9e8b332e903d5235bd44a8",
-  "0x0000000000000000000000000000009fcba752a804666417b6695e65b9e7bf42",
-  "0x00000000000000000000000000000000000b00f7dd36433631d57a132c375503",
-  "0x0000000000000000000000000000000a747e43b67540724f4c015e281e780e21",
-  "0x000000000000000000000000000000000019d5fd485df8be82825d157e7d1934",
-  "0x000000000000000000000000000000a2ca8ef7e5d64f8bacf9eeb3ca7261a8ca",
-  "0x00000000000000000000000000000000000f753c24e61b76a42abc0accef144e",
-  "0x00000000000000000000000000000007ef5cc7c6f99d07eea73bccd387d05c3e",
-  "0x000000000000000000000000000000000017bac046f7d63441f93b9ea24b7973",
-  "0x000000000000000000000000000000c8ca0e3fc44519be129dcd957b30568051",
-  "0x000000000000000000000000000000000029d53c9ac2f77fb4b19f5af0136c1e",
-  "0x000000000000000000000000000000018cc671e1a5e2612c90c2c12cbe462482",
-  "0x00000000000000000000000000000000002b7fa023dd61539cb7d56a1f10c913",
-  "0x0000000000000000000000000000002c94d08ab5ee89a5851086055b5622944f",
-  "0x00000000000000000000000000000000001cadaa0fc653c81bd60237cfbda56c",
-  "0x000000000000000000000000000000e1212460cc42b17fc4f26f703ec29a7d4a",
-  "0x0000000000000000000000000000000000257fc5e1f8dbb2df07327e3acadc72",
-  "0x000000000000000000000000000000cb97930a336f2a07874ed9a58bd381afce",
-  "0x0000000000000000000000000000000000053841ebeffbdcc33098e2c21f4881",
-  "0x0000000000000000000000000000007086502ff78c4d46c31f7a056666adfe11",
-  "0x00000000000000000000000000000000002e4444fdd42cb989237e879b4e9c1b",
-  "0x00000000000000000000000000000042a8d076924f7d7ee640e4321ed166c3e9",
-  "0x0000000000000000000000000000000000116876746b86764f7120467b0254cd",
-  "0x000000000000000000000000000000229b3816d257e5e66608b2f99fe5db0ae6",
-  "0x000000000000000000000000000000000007cce721d7b6dbd8766ab142e55f27",
-  "0x000000000000000000000000000000354819d4e1ab266e7f1b8701c365e731c1",
-  "0x000000000000000000000000000000000022470b72e5c2d6aa39aba5e6265788",
-  "0x0000000000000000000000000000001a2f8095dd981f1303b3a2d7e87c68ff8c",
-  "0x0000000000000000000000000000000000202a81a5dac8ba0d26f3965e9516f0",
-  "0x00000000000000000000000000000087cb2963e3772fde467435f530e234efcc",
-  "0x00000000000000000000000000000000002c284c0d5d10df03ec7d52f39e52b5",
-  "0x000000000000000000000000000000daa4f34966cc7303704f56b70b3db3eb44",
-  "0x00000000000000000000000000000000001fed850905c0d7ff27b95de430beb3",
-  "0x000000000000000000000000000000b4d3312087e7c8ab7b4687581b6e41b426",
-  "0x000000000000000000000000000000000014f30f5ce01654991cf0bea39e6635",
-  "0x000000000000000000000000000000ea7d9fcfddf65860ddd24eb36cc3793407",
-  "0x000000000000000000000000000000000012a284e8e92b8143302936b5e4c631",
-  "0x0000000000000000000000000000001b6534fb5a80d3e4c252a3a1afa71f08ac",
-  "0x000000000000000000000000000000000021a505d30ebed851c3ed430e11175a",
-  "0x00000000000000000000000000000019ad2695b94985ab3a2f2c6d08ece1578d",
-  "0x00000000000000000000000000000000000be8385dfe4bc95a9b460147c4dffe",
-  "0x000000000000000000000000000000e93e5e3523408bb30446ae091fc9fa0f22",
-  "0x00000000000000000000000000000000002f2c8d1fdccde8e954dd71559c0079",
-  "0x000000000000000000000000000000344f94dabaf3fd0995a66595d253be78c8",
-  "0x00000000000000000000000000000000001541349676bcb72e6c14e6379c1039",
-  "0x00000000000000000000000000000069f8bd703a3cc9e285657d42fc34ec5bec",
-  "0x0000000000000000000000000000000000058e53c3923808b36aaae4c77d5ffa",
-  "0x0000000000000000000000000000007e6ee32a8b38844eb0c1a492209fa9e785",
-  "0x0000000000000000000000000000000000297fb6426d252f40b2be37cf05e934",
-  "0x00000000000000000000000000000066bb138e32b95004dc50d155956024f9dc",
-  "0x00000000000000000000000000000000000c0fe3676dad967d242f98fa01ad45",
-  "0x000000000000000000000000000000adcbf09ccd6755ebb5cd0e4f50c569d585",
-  "0x000000000000000000000000000000000013e9bb90a5355958d85ecaa5fac912",
-  "0x00000000000000000000000000000095b5d8b7b4a63b05df652b0d10ef146d26",
-  "0x0000000000000000000000000000000000099e3bd5a0a00ab7fe18040105b9b3",
-  "0x0000000000000000000000000000002129af3a637f5a622a32440f860d1e2a7f",
-  "0x00000000000000000000000000000000000015b8d2515d76e2ccec99dcd19459",
-  "0x000000000000000000000000000000222b888108dc25d1aa450e0b4bc212c37e",
-  "0x00000000000000000000000000000000001b917517920bad3d8bc01c9595092a",
-  "0x000000000000000000000000000000482141c7ebe42000a1d58ccb74381f6d19",
-  "0x0000000000000000000000000000000000305e8992b148eedb22e6e992077a84",
-  "0x0000000000000000000000000000007c86847618681dc29d8a9363ab7c40e1c3",
-  "0x000000000000000000000000000000000016465a5ccbb550cd2c63bd58116fe4",
-  "0x000000000000000000000000000000439973ac12d7ca796d6fe98ca40e6ca6b7",
-  "0x00000000000000000000000000000000002e24d420fbf9508ed31de692db477b",
-  "0x00000000000000000000000000000028edd1a7e46c840d9c943fdf45521c64ce",
-  "0x0000000000000000000000000000000000043d063b130adfb37342af45d0155a",
-  "0x0000000000000000000000000000009330952ae74c573d1686d9cb4a00733854",
-  "0x0000000000000000000000000000000000261522c4089330646aff9673619494",
+  "0x000000000000000000000000000000000000000000000000000000000000001a",
+  "0x0000000000000000000000000000000000000000000000000000000000000c11",
+  "0x000000000000000000000000000000b56b478d39fe1ea8636ca1c5f7efe26465",
+  "0x00000000000000000000000000000000002ce8a9b4b8b40012f631f6a39b6121",
+  "0x000000000000000000000000000000e90605e79e3b491b4e35bed971ffe40f20",
+  "0x000000000000000000000000000000000014aac08af29b80ea5e82169bde9f1b",
+  "0x000000000000000000000000000000f23100dd9e774faa9da6adabb0a5e868d1",
+  "0x00000000000000000000000000000000000675d3fb2db13df5feb7837a996202",
+  "0x0000000000000000000000000000002d41a263946c21172989f16b6c3eabd14b",
+  "0x00000000000000000000000000000000002f76f5733e8a0b6e45ad715c844fa3",
+  "0x0000000000000000000000000000009906b77efd02f89dd64543cb41b2ee7dc0",
+  "0x000000000000000000000000000000000011990c3a05d603a15abfdd104b7f45",
+  "0x000000000000000000000000000000b68418cb6eb350097b81ceebf7216de49f",
+  "0x0000000000000000000000000000000000193b041e80721ea6304e3edc45a55a",
+  "0x0000000000000000000000000000007f41793e8f1a2fbe4047a8c9b3ea8a7eba",
+  "0x000000000000000000000000000000000004ad79eb6e09a672b49359e429d4b2",
+  "0x00000000000000000000000000000084b9e57a26da81e52f9d96f484a3d8a6ae",
+  "0x00000000000000000000000000000000001b4cff12b3ca2c242b1cb101ca1f62",
+  "0x00000000000000000000000000000051285e317a9d17f2180bf8ec1f3e31c266",
+  "0x00000000000000000000000000000000002f79f4597dc1cbdfe8060d1d92c7fc",
+  "0x000000000000000000000000000000bfdd478df770ff0d6a9f5d30c6380e3bb2",
+  "0x00000000000000000000000000000000000f6c52e2949dd6fa7eff016e2e5bb6",
+  "0x0000000000000000000000000000001cba707dc36043107ad882453ae5d8b129",
+  "0x0000000000000000000000000000000000059cc841348db66a31d2dfa33b89a0",
+  "0x0000000000000000000000000000000e2b2caaf1a1eda41d509cc5221c984b51",
+  "0x0000000000000000000000000000000000037cc127472715a44cac19993d448a",
+  "0x0000000000000000000000000000003cc6bfe8250e54d57ce7daedc9a7095bc8",
+  "0x00000000000000000000000000000000001c95108bb4f2494bfef842093c3b36",
+  "0x0000000000000000000000000000008313e6a820b2f5c2a7de8028cd31798633",
+  "0x000000000000000000000000000000000027be294c15550f339b0839d5860142",
+  "0x00000000000000000000000000000060338657a29bcf8c13a4b50294e337ef11",
+  "0x00000000000000000000000000000000001569de523f46c6226a398155490417",
+  "0x000000000000000000000000000000163a5d9281ca7ac774da33d1bd5e32dd54",
+  "0x00000000000000000000000000000000001cea3677784e36b40d3084060d7486",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000008a36ca53543c7bd871dd8974dda60ec04e",
+  "0x000000000000000000000000000000000028fcc75fb20c13fa73b0b5dd1a9df0",
+  "0x000000000000000000000000000000646eccdb4bcb213d9d9867f291bc4cc715",
+  "0x0000000000000000000000000000000000239e0bfd2fe8666da2541d2b7e9242",
+  "0x00000000000000000000000000000057b0434a909bdd123f328dd722f50de441",
+  "0x0000000000000000000000000000000000056e909ead4cc889ca4ae259618b9e",
+  "0x000000000000000000000000000000cce3583f4dbdf7f0ea96b8413114530b7f",
+  "0x0000000000000000000000000000000000029d93569d5fb4eccfe54516bbfc2c",
+  "0x0000000000000000000000000000000202259bdd735f5d0996b36a14296dd956",
+  "0x00000000000000000000000000000000001c9a81340c0ef1a3f8ab9378b45228",
+  "0x000000000000000000000000000000bb9541231ccc05d3210933db9b2cfd662a",
+  "0x00000000000000000000000000000000002e90121d7079020ef60bf83a167d82",
+  "0x0000000000000000000000000000008e531da6a57f645193723255cc3949f2a6",
+  "0x000000000000000000000000000000000023d3bfa481c11731a958ae003b7049",
+  "0x0000000000000000000000000000005d505cd2a7715559ab2fb8ffa94fac158b",
+  "0x0000000000000000000000000000000000283299e0b6841cadaef68c90af63b3",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x000000000000000000000000000000a50e32219d22dc5bc0a2a3afa8d1c963bf",
+  "0x00000000000000000000000000000000001b05579d422ec3526b639fa813b3db",
+  "0x000000000000000000000000000000931e9ee47cc6828d015bfd807445f50921",
+  "0x000000000000000000000000000000000005283cabb6b55f9baa597d00d3f46f",
+  "0x000000000000000000000000000000f14ecdef3987001b29e5574b25db85e726",
+  "0x00000000000000000000000000000000002b26e84ba3e9db90b9b761fbd5ba48",
+  "0x00000000000000000000000000000054401c158e8bfa1eac201ac628df1458d3",
+  "0x000000000000000000000000000000000028b61261027652e8ca3b29fb567872",
+  "0x0000000000000000000000000000005ddf21ec29f762249f79a86d986723b259",
+  "0x000000000000000000000000000000000020d889a78eaaeeced668f7a5e6a155",
+  "0x000000000000000000000000000000fbf31736f1c118ed779b00b56effa82f84",
+  "0x00000000000000000000000000000000001c10198fa65839280c9a4df0d48c69",
+  "0x000000000000000000000000000000ae45bd31909c920cd302c1833dc9dac27c",
+  "0x00000000000000000000000000000000000b5e828a1794bb52b1ef28384f36c3",
+  "0x000000000000000000000000000000623a32eccef6d3f192c9090e2c8d211339",
+  "0x000000000000000000000000000000000017dbcb62b1ef67a30ab74432100e03",
+  "0x0000000000000000000000000000008e75c04775713fe2b95076a7a5e1036c46",
+  "0x0000000000000000000000000000000000070ea9b40827062280d6e3cc9609a6",
+  "0x000000000000000000000000000000c70577cdcada107c62a7732ef0d2bbc15f",
+  "0x00000000000000000000000000000000002e57c64ac76e0a1e1c5980782cb606",
+  "0x000000000000000000000000000000902c14297534b09b2a8072cd93a9489887",
+  "0x00000000000000000000000000000000000cb983d7cc09d74a951dbf12ad432b",
+  "0x00000000000000000000000000000012bff816b24bc7a97ad6b1549515d6b28e",
+  "0x00000000000000000000000000000000000467570dff77ca3a342e4fc4d1a66b",
+  "0x00000000000000000000000000000080a63925457f739d70103395ccb7dcd29d",
+  "0x00000000000000000000000000000000000249558e7e5b5d6473ec5a9a980688",
+  "0x0000000000000000000000000000006cd74958767b5d51a95549a316e285ab74",
+  "0x0000000000000000000000000000000000091261933d2e12b6818f72bdc3e0c2",
+  "0x000000000000000000000000000000f97e56f24f292a230cf6c8350df6989d74",
+  "0x0000000000000000000000000000000000191f5e720c5ae2ded820c5e22cf23f",
+  "0x000000000000000000000000000000d3659c79160cc300c1726cdfe0a093bc08",
+  "0x000000000000000000000000000000000028e8e8952512f8006336791f90f01d",
+  "0x0000000000000000000000000000007ee7b8782f98bb5d90cbdc6fe174a42009",
+  "0x00000000000000000000000000000000000ae0ee6c55535140057064aa3fc5f0",
+  "0x000000000000000000000000000000d2bb98513b84e1e6f4e0b606bc025f9c48",
+  "0x00000000000000000000000000000000000b21f9d209054956c0524fababf1e9",
+  "0x000000000000000000000000000000d81d8ac019f7fed05a6b57f7845f56e44f",
+  "0x00000000000000000000000000000000002971c35ad470594c9a15abfc0e25a6",
+  "0x000000000000000000000000000000415d3a9385f247cc4092e3aad3382acd35",
+  "0x000000000000000000000000000000000025f0852ecc99395598d1e68d0ca89f",
+  "0x0000000000000000000000000000004f32605fa17fb311a06f7fb843c15d558a",
+  "0x000000000000000000000000000000000005071f43d210d49c73d5f25a18a596",
+  "0x0000000000000000000000000000000a679653df2810b4ec4c7adcd1cd7c97c8",
+  "0x000000000000000000000000000000000013c145ee6755ca17c398dafb88a569",
+  "0x00000000000000000000000000000083bace0537b2947643af96ab4b4aa8c478",
+  "0x000000000000000000000000000000000011ae383aeafc332a329462493ac315",
+  "0x000000000000000000000000000000a18bcfba0739bc5f71bd74ec53b6837fea",
+  "0x00000000000000000000000000000000001c2a9a991c7dbcd75129f92ff372b1",
+  "0x0000000000000000000000000000002c80b406fa46ad088b2e8d4f5a5701d47c",
+  "0x00000000000000000000000000000000001879ed897e504955597f01336b1d86",
+  "0x000000000000000000000000000000655b7a8802d367044c042458a17a0aeab4",
+  "0x000000000000000000000000000000000021be3e235af1a949dbf105cbe725d0",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000001",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000002",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "0x0000000000000000000000000000003569425f279a7bb08b8c18377333fcdf7b",
-  "0x0000000000000000000000000000000000004cf3f1c55c6bdc4b52aa2089d0f3",
-  "0x000000000000000000000000000000a057d0219f1ef32870762f852058661821",
-  "0x00000000000000000000000000000000002e9edf5fe31a87f30b26b915530a59",
-  "0x000000000000000000000000000000001dbb619e6e929e76a6efd1e4385c88f3",
-  "0x000000000000000000000000000000000005f8a1641d13b243a02a3f02b2ee28",
-  "0x0000000000000000000000000000002d82538a2445a88d2075c85f73a52fa00d",
-  "0x00000000000000000000000000000000000765b47bcde9aab139f5be476581ad",
-  "0x000000000000000000000000000000655eafd26d4cf4bd0951ae00ae66a0a5a4",
-  "0x00000000000000000000000000000000000d677eb93347add0618d75fb9ee5fe",
-  "0x000000000000000000000000000000ffda1f6b46c23f296036b683b84c761a4b",
-  "0x00000000000000000000000000000000000fae9f9a690b4e18091eaef9fe2bdb"
-]
-  hash = "0x1ae15de87bc87f81fc020f3350450267fcd1748b55fd5cea379de031913540dd"
+  "0x0000000000000000000000000000006ab4e9fba1bb0c45d30796e0c19546192e",
+  "0x00000000000000000000000000000000000b1447f3413f687009608e1c55b192",
+  "0x000000000000000000000000000000567498365d293b6c0532b94c33d0e937a5",
+  "0x000000000000000000000000000000000006c4fabfa5194704563bcc508d234e",
+  "0x00000000000000000000000000000009835f11bc7b963372a60d92370980b183",
+  "0x00000000000000000000000000000000000d898f5e8487e3ed90a10fc50db186",
+  "0x000000000000000000000000000000b66ee3d15932d652c3b54801748e89da9f",
+  "0x000000000000000000000000000000000024899f4b6ba56af0e1128c4a431ba7",
+  "0x00000000000000000000000000000064dd7da7637cf2116a18531edc7fea829a",
+  "0x0000000000000000000000000000000000162e867465b02e01bbabb15c59b84d",
+  "0x00000000000000000000000000000071f09c1d3d2c8f9499c838fc966b04ada9",
+  "0x00000000000000000000000000000000000f4504ac6f302739e9f2c7aa824d12"
+]
+  hash = "0x051d17b4a7efa4af82e7c6b71f2a5cf71ee015e6d9edbcd39d326a5463aac1e6"
 
 [previous_kernel_public_inputs]
 min_revertible_side_effect_counter = "0x0000000000000000000000000000000000000000000000000000000000000005"
-expiration_timestamp = "0x0000000000000000000000000000000000000000000000000000000069e55d81"
+expiration_timestamp = "0x0000000000000000000000000000000000000000000000000000000069ff293f"
 is_private_only = false
-claimed_first_nullifier = "0x20eb99e263b0f2ec651bdd337102a4a86b68039cc5cfccd3e7d2c09e3d2646dd"
+claimed_first_nullifier = "0x09fac458f9e079d0117ef63746c55ce66b3e5d95c8420974d9c69f369b0d77ef"
 claimed_revertible_counter = "0x0000000000000000000000000000000000000000000000000000000000000005"
 
   [previous_kernel_public_inputs.constants]
-  vk_tree_root = "0x0141caf6779674bc31225636c4cc4259a731835c52fc462f2dcbfabf7de01a1d"
+  vk_tree_root = "0x0c16448b65c4b3f83f9db3bebf635bd38957c74c9c1ea36036cbda16432cf558"
 
     [previous_kernel_public_inputs.constants.anchor_block_header]
-    sponge_blob_hash = "0x2f6cbc1e2991d249f92b52eab711b5b69653f27dc615f8548486ee4f905db9d1"
-    total_fees = "0x00000000000000000000000000000000000000000000000002b226a71e115940"
-    total_mana_used = "0x00000000000000000000000000000000000000000000000000000000000a3919"
+    sponge_blob_hash = "0x13a1bf44c19e7c2eb7fc1a96527d072cf424bc99c760e392f4abcecc1fc597f8"
+    total_fees = "0x00000000000000000000000000000000000000000000000002b26ec5db7a7140"
+    total_mana_used = "0x00000000000000000000000000000000000000000000000000000000000a3979"
 
       [previous_kernel_public_inputs.constants.anchor_block_header.last_archive]
-      root = "0x1658130986216f2f0ffc888c65e948a57a28c64721e664f522cfbb7d01492231"
+      root = "0x0d18996e508e8c1e51f6a56652cc5d71169450ff16c25de9af7f79af5385e334"
       next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000008"
 
 [previous_kernel_public_inputs.constants.anchor_block_header.state.l1_to_l2_message_tree]
@@ -166,37 +182,37 @@ root = "0x0fef6d80d31109ddb56d6b3f607cbc9c0af0bff3ea0d43e8f278983c64c11f7a"
 next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000002000"
 
 [previous_kernel_public_inputs.constants.anchor_block_header.state.partial.note_hash_tree]
-root = "0x101e57ba43504cd90f08cd61ed589b9367d33eed30ccd7a2e8333cf633f2fb6f"
+root = "0x1c223e428d6faa36822890e3b99417ddf73ffb069bf4c44b6ae9d7fc741733f6"
 next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000200"
 
 [previous_kernel_public_inputs.constants.anchor_block_header.state.partial.nullifier_tree]
-root = "0x0ec61562d933c8948a789b996a4057b5ef647965d854a7d6e36d28c2d2aea06e"
+root = "0x01c778a6b3dcb1245bb0aee174252dd95256e67309f952e5d2f8cbafffe20d0f"
 next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000280"
 
 [previous_kernel_public_inputs.constants.anchor_block_header.state.partial.public_data_tree]
-root = "0x021204d873082156522eb6603c9c7f7acb21fa936d470764f1fda90cf504891c"
+root = "0x134e44df49ddb89525046d19bcfc2734c78e419994de9d6f7467eb84d02d1060"
 next_available_leaf_index = "0x000000000000000000000000000000000000000000000000000000000000008b"
 
       [previous_kernel_public_inputs.constants.anchor_block_header.global_variables]
       chain_id = "0x0000000000000000000000000000000000000000000000000000000000007a69"
-      version = "0x000000000000000000000000000000000000000000000000000000007b6d50be"
+      version = "0x00000000000000000000000000000000000000000000000000000000ad49d7cd"
       block_number = "0x0000000000000000000000000000000000000000000000000000000000000008"
       slot_number = "0x0000000000000000000000000000000000000000000000000000000000000022"
-      timestamp = "0x0000000000000000000000000000000000000000000000000000000069e40c02"
+      timestamp = "0x0000000000000000000000000000000000000000000000000000000069fdd7c0"
 
         [previous_kernel_public_inputs.constants.anchor_block_header.global_variables.coinbase]
-        inner = "0x000000000000000000000000080c5a37d2d3dade855a034bac3548a8b2dfd887"
+        inner = "0x000000000000000000000000fde0805eba75f23cd30a3bb4f0e567a356075904"
 
         [previous_kernel_public_inputs.constants.anchor_block_header.global_variables.fee_recipient]
         inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
         [previous_kernel_public_inputs.constants.anchor_block_header.global_variables.gas_fees]
         fee_per_da_gas = "0x0000000000000000000000000000000000000000000000000000000000000000"
-        fee_per_l2_gas = "0x0000000000000000000000000000000000000000000000000000004382670b40"
+        fee_per_l2_gas = "0x0000000000000000000000000000000000000000000000000000004386faeb40"
 
     [previous_kernel_public_inputs.constants.tx_context]
     chain_id = "0x0000000000000000000000000000000000000000000000000000000000007a69"
-    version = "0x000000000000000000000000000000000000000000000000000000007b6d50be"
+    version = "0x00000000000000000000000000000000000000000000000000000000ad49d7cd"
 
 [previous_kernel_public_inputs.constants.tx_context.gas_settings.gas_limits]
 da_gas = "0x0000000000000000000000000000000000000000000000000000000000030000"
@@ -208,29 +224,29 @@ l2_gas = "0x00000000000000000000000000000000000000000000000000000000000c795c"
 
 [previous_kernel_public_inputs.constants.tx_context.gas_settings.max_fees_per_gas]
 fee_per_da_gas = "0x0000000000000000000000000000000000000000000000000000000000000000"
-fee_per_l2_gas = "0x0000000000000000000000000000000000000000000000000000000cd98ff1cb"
+fee_per_l2_gas = "0x000000000000000000000000000000000000000000000000000000336bfe2ba6"
 
 [previous_kernel_public_inputs.constants.tx_context.gas_settings.max_priority_fees_per_gas]
 fee_per_da_gas = "0x0000000000000000000000000000000000000000000000000000000000000000"
 fee_per_l2_gas = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
 [[previous_kernel_public_inputs.constants.protocol_contracts.derived_addresses]]
-inner = "0x0f8addbb176a80288379af1fe3f6e128881df1ab13f9a4dbf25de12287e61b95"
+inner = "0x1520f4bb11a3a1d2248a03d8472e9af4bb8324eb1d2d8c83bce61894383464b9"
 
 [[previous_kernel_public_inputs.constants.protocol_contracts.derived_addresses]]
-inner = "0x0b0006ff0bbf70a2ec9171c2301b65f66536e0c36cc70177a1ffadbb3f69189f"
+inner = "0x26a43bf066852a7b1ec3c5b454f41735fea12e2ffbefed471058124b91d94018"
 
 [[previous_kernel_public_inputs.constants.protocol_contracts.derived_addresses]]
-inner = "0x0ffdc845a84050f056157a1c1d52abe18da16b961c9a9a881043c2c02ad2aded"
+inner = "0x1bd26c6831ebc53674b13ac69a0c534563c37e46c2cbb36f2deca107a26515fa"
 
 [[previous_kernel_public_inputs.constants.protocol_contracts.derived_addresses]]
-inner = "0x1612f27832228b08a6ee80c5a5fb54e123ce6bddf7a6501de4fb8f426c4d8070"
+inner = "0x06870c63132d2a4e3356a76d773240efe729e7d9b9380a7a3cf1798fc9031aed"
 
 [[previous_kernel_public_inputs.constants.protocol_contracts.derived_addresses]]
-inner = "0x0d53da6d9ad9ce42a1ecd9f80a437151035951677b72d7d0af06b6221d0bf913"
+inner = "0x0083c4dfb922796f1086d399f8f3d021159d1a87ba3b833dcdf9863c630ba643"
 
 [[previous_kernel_public_inputs.constants.protocol_contracts.derived_addresses]]
-inner = "0x0758bfa195d8fd7782a5e27ef55ad8655afc8d23e57a73cc0331ab1075547146"
+inner = "0x0b4d3a9a7a3caf83f9c2060347e48cc28c7f04d2560d1cbf5bf08d4832128a97"
 
 [[previous_kernel_public_inputs.constants.protocol_contracts.derived_addresses]]
 inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
@@ -252,7 +268,7 @@ length = "0x0000000000000000000000000000000000000000000000000000000000000001"
 
   [[previous_kernel_public_inputs.validation_requests.note_hash_read_requests.array]]
 [previous_kernel_public_inputs.validation_requests.note_hash_read_requests.array.inner]
-inner = "0x1e9901d75ca2844cadc15c9299576114cbfd77651631f65a8b02de758c70d833"
+inner = "0x29ecb485abf1e4a9963bb4dada6e8b67bda9c6bb09527ecb8d0c64a0d119e0fd"
 counter = "0x0000000000000000000000000000000000000000000000000000000000000003"
 
 [previous_kernel_public_inputs.validation_requests.note_hash_read_requests.array.contract_address]
@@ -2763,7 +2779,7 @@ length = "0x0000000000000000000000000000000000000000000000000000000000000001"
 counter = "0x0000000000000000000000000000000000000000000000000000000000000001"
 
   [previous_kernel_public_inputs.end.nullifiers.array.inner.inner]
-  value = "0x0460a050d75aaf2ce27cc2b3473c004f2d71d7c1830b2b990c1b2fdc68787c3a"
+  value = "0x023cfeab2c97a4c457a539c4b7c7c9d1fefa40027aacd687b5282ff01a46f27b"
   note_hash = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
 [previous_kernel_public_inputs.end.nullifiers.array.contract_address]
@@ -5578,13 +5594,13 @@ length = "0x0000000000000000000000000000000000000000000000000000000000000001"
 
     [previous_kernel_public_inputs.end.public_call_requests.array.inner]
     is_static_call = false
-    calldata_hash = "0x0d2bc686e2f086c296f74f726ee51724dbb68b591ae44a8b79c980e3ee17bd8b"
+    calldata_hash = "0x16acf8ee72d77f214e5286307ed2710fda25445374c38debbef546a746b679ce"
 
       [previous_kernel_public_inputs.end.public_call_requests.array.inner.msg_sender]
-      inner = "0x0c6be08a5e070b343e733716e4ad76ea05de25e2b7fc6e6f50f0ec549f7c0bfa"
+      inner = "0x0635e757a5f05ba5322db37d6930525b43c2e055ed7c4600559a07fc38ab09ec"
 
       [previous_kernel_public_inputs.end.public_call_requests.array.inner.contract_address]
-      inner = "0x1e0d825a84ebc33bf160363bca7a6855c0bfc677043e7dd77205004c861ff880"
+      inner = "0x16fc6ad8c94527d45832bb8631b0c1dedf3218fe7c3ca04e01850a3eff6a511a"
 
   [[previous_kernel_public_inputs.end.public_call_requests.array]]
   counter = "0x0000000000000000000000000000000000000000000000000000000000000000"
@@ -6291,7 +6307,7 @@ length = "0x0000000000000000000000000000000000000000000000000000000000000000"
     inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
   [previous_kernel_public_inputs.fee_payer]
-  inner = "0x0c6be08a5e070b343e733716e4ad76ea05de25e2b7fc6e6f50f0ec549f7c0bfa"
+  inner = "0x0635e757a5f05ba5322db37d6930525b43c2e055ed7c4600559a07fc38ab09ec"
 
 [padded_side_effects]
 note_hashes = [
@@ -8295,9 +8311,9 @@ read_request_index = "0x00000000000000000000000000000000000000000000000000000000
   "0x30105bad22ddcc508b739b7c9ad87a561c569ff5cb0098a853c1c4ac21b7a037",
   "0x1e20ad4181460cbfdc74ca773502c59b890f184efe300ebad895956d318422da",
   "0x1434e6e2d5db1053ab8a3be58704509c799ee17e109c77f441f7bf1755400249",
-  "0x2ce8ec409dc2658cf9bd1d98d038b856842aeb16c1df0a57123e449fe6e623af",
+  "0x0951be8128e49814029387ac6bfbe43a1e43dadd05a6e50f78ef8265cd09b5a1",
   "0x221cf368938c74e4fced9dfb2a8e37cd8a6c57d21385c249f0b5c2412341287f",
-  "0x16bbf52f6929728a1ae86cc845eff26450c5679126690cdaea4297f9f184b85f",
+  "0x15f254a15d2db357812a7044082d84639b7c8adc2a909034fb01d4a6879296ab",
   "0x13abc9bba431e6930c169f5daeb60aedbb27d7618c7ff88b3b4ec1c6de1d6bb8",
   "0x0d04c63f36bd168215c9b09a227c7e8d3ad48e2f11b8202fd07c524bd30ee88f",
   "0x042c72d0ca208f0631ed947050258333518c26059f0a2ef041e933b1b2a6d8ad",
@@ -8334,7 +8350,7 @@ read_request_index = "0x00000000000000000000000000000000000000000000000000000000
 ]
 
   [hints.note_hash_read_request_hints.settled_read_hints.leaf_preimage]
-  value = "0x1e9901d75ca2844cadc15c9299576114cbfd77651631f65a8b02de758c70d833"
+  value = "0x29ecb485abf1e4a9963bb4dada6e8b67bda9c6bb09527ecb8d0c64a0d119e0fd"
 
 [[hints.note_hash_read_request_hints.settled_read_hints]]
 read_request_index = "0x0000000000000000000000000000000000000000000000000000000000000040"
diff --git a/noir-projects/noir-protocol-circuits/crates/private-kernel-tail-to-public/Prover.toml b/noir-projects/noir-protocol-circuits/crates/private-kernel-tail-to-public/Prover.toml
index 5746ac84da84..4a9ed54ae711 100644
--- a/noir-projects/noir-protocol-circuits/crates/private-kernel-tail-to-public/Prover.toml
+++ b/noir-projects/noir-protocol-circuits/crates/private-kernel-tail-to-public/Prover.toml
@@ -1,166 +1,182 @@
-expiration_timestamp_upper_bound = "0x0000000000000000000000000000000000000000000000000000000069e54f72"
+expiration_timestamp_upper_bound = "0x0000000000000000000000000000000000000000000000000000000069ff1b30"
 
 [previous_kernel.vk_data]
 leaf_index = "0x000000000000000000000000000000000000000000000000000000000000003d"
 sibling_path = [
-  "0x0b8ed9c20fc447a664c974c7d5d3fa22e0486cd889bdd28e05140f21e40a35a6",
-  "0x1816603a28e89f16559a15a5982edea9f4edb95fef242f1c4df9c87b805b1359",
-  "0x2d5f71efef142cc28dec5df8915658b9ae282f5896b3506e980f722ce87a0820",
-  "0x0edeac4fa5da5fac1d5396f7578a9ffed587263d12b56701fe8e0b8fd445a47a",
-  "0x2ff7976fd64dfc2968899c2f2946024aafc822ad2a823d2e431df997ec5fa092",
-  "0x2411df7012f256d03cefe470ffa810e9ecf03838aa5336f87a05b441a926585a",
-  "0x1f07bca7a14f9a969539c0afd388affa18926689f431fc541841a2a7604d388c"
+  "0x1836f64afd38c3a05416bbcee658f4acce2576bbe554a445b33b8936297034e1",
+  "0x2c05a8ec2045319ea62b81134a53d4e0c1b021fed7877a3a8acc676cf26794f7",
+  "0x280ae800476659efd90f7ae6a3a2ae3958c1261ca9ae8ba3b2b8320fc9ef662d",
+  "0x1afa13b72352bab63bfdb391bbadee67783679a9b5ce7fbbcde44387ba5b0eae",
+  "0x2a99cb07c31aa5ee3a8af2c6db61485892e126a5eac56720fcbbbb002b19d015",
+  "0x0384c341c7892982bb9f5581098584a00bc572787bf4153d0a52532652ace783",
+  "0x2aa74c20807e8cbb3e32a86ad29472c42a3fb7021dcfaad112a6b68eb0eca98e"
 ]
 
   [previous_kernel.vk_data.vk]
   key = [
   "0x0000000000000000000000000000000000000000000000000000000000000011",
-  "0x0000000000000000000000000000000000000000000000000000000000000021",
-  "0x0000000000000000000000000000000000000000000000000000000000000cd8",
-  "0x000000000000000000000000000000d9cce6dea23f6b4d6d301f3a36aff24317",
-  "0x00000000000000000000000000000000002c69abca0a7c3a2fb9471e98a22c20",
-  "0x000000000000000000000000000000fdb33bd9ab008ad0f031a38ccb9aa54d14",
-  "0x0000000000000000000000000000000000060a8628c7d439b74d52f3248314e3",
-  "0x0000000000000000000000000000004614cc6fd15a583e081fc338610ab048da",
-  "0x00000000000000000000000000000000002cf610ec50da4e0e24c1c3f0dd71c1",
-  "0x0000000000000000000000000000000decc131900f2d20890eb07b890bf060c0",
-  "0x000000000000000000000000000000000016ca3ae571fb7bbfd6fb2cf11b1e3c",
-  "0x00000000000000000000000000000099dd76f1bbcd167e65f5a4375857b757fc",
-  "0x0000000000000000000000000000000000228852d34442ebe7f83dc2b0aa87f2",
-  "0x00000000000000000000000000000048b0a0455af8b4b44fba7f4852734e0ea7",
-  "0x000000000000000000000000000000000013bf6f0dc6399df8b4b4955b0eb544",
-  "0x000000000000000000000000000000bfdfde77dbe94422620afba2d15f846333",
-  "0x000000000000000000000000000000000008f527ec9f4c4d8d1c0eb8475169c9",
-  "0x0000000000000000000000000000001cc97443c8220e715a4354e3f61e6f815c",
-  "0x00000000000000000000000000000000000a17f4f313d33f4ded6a35591bea37",
-  "0x000000000000000000000000000000c8534840c64246c373a8178d098cdfe711",
-  "0x00000000000000000000000000000000002477deae04d5f7d492ca6c9d24c353",
-  "0x0000000000000000000000000000009d845f2fb1eece9b9a45182ba8b4051e9e",
-  "0x000000000000000000000000000000000013a2626ca047b162fa72a3c554e96a",
-  "0x000000000000000000000000000000f378dc8d975abb0d616eea489cc324d6c0",
-  "0x00000000000000000000000000000000000bf7a3d2011daf8a6d176c7601f4f2",
-  "0x0000000000000000000000000000000ca6aa2648d53e97fbafd35353c37b10e2",
-  "0x000000000000000000000000000000000011f90d1730dd9ee1e97f889b9c6b16",
-  "0x000000000000000000000000000000bfc5bc50cf67600c65f07646972436bdd4",
-  "0x00000000000000000000000000000000002cf952346ce50ca50d88e2f6a321be",
-  "0x000000000000000000000000000000d393f2a1523030c8384d036db4ccd9310d",
-  "0x000000000000000000000000000000000007430b3a24b77e0fb413690306d5f8",
-  "0x0000000000000000000000000000009214200af69e1247fda4b19a46b988d326",
-  "0x00000000000000000000000000000000001d36a0b00a50e533eb4c82b2826ea0",
-  "0x0000000000000000000000000000004de1a4fe270f388639b28df73039227c21",
-  "0x000000000000000000000000000000000027ebf5e21e5b9be88e13dffe8f4e7d",
-  "0x0000000000000000000000000000002d6b094fbfe7087e8a3845a943d8a42bd7",
-  "0x000000000000000000000000000000000024d62661aea423b4175d2f6d4a8b6f",
-  "0x000000000000000000000000000000bb71e2b6b4540fa421ef022f596eeab68a",
-  "0x00000000000000000000000000000000000fdf9d9db633760283925adf356dba",
-  "0x000000000000000000000000000000b28dcbbb40c5044912990e638a1435641d",
-  "0x0000000000000000000000000000000000119e6aa961568bdd5eab2f6240f7b3",
-  "0x000000000000000000000000000000a71ab24a720d9e34be05e5af6cf959b48b",
-  "0x000000000000000000000000000000000005ab054816df980cd5379bedd75f7f",
-  "0x00000000000000000000000000000065e61918e57799d9e10b6906ec3ccabb1c",
-  "0x00000000000000000000000000000000000c15b25c666cac8d136af86b9d3094",
-  "0x0000000000000000000000000000003163c716d8e7000c028325658635603e9d",
-  "0x00000000000000000000000000000000002e7594e9903e01264fa171ca77292f",
-  "0x0000000000000000000000000000007b846a1dd3cd70981741468a2621bc98f8",
-  "0x00000000000000000000000000000000001c7e9ba0e7cf554149e6fa67646576",
-  "0x0000000000000000000000000000006475c8cae2f4a1d048ae07c54045509a2a",
-  "0x00000000000000000000000000000000000411a0bdfa1d813edc1772762d9154",
-  "0x00000000000000000000000000000016b7e2d00efbbd2aad2748d1583e291265",
-  "0x0000000000000000000000000000000000000cd3342819fe0ffd86b7bc528291",
-  "0x000000000000000000000000000000c541ce087bb87d8bb410aa1a069e193d20",
-  "0x000000000000000000000000000000000027c7de3848f5172d0e4763e4f15b4d",
-  "0x000000000000000000000000000000395708add57e3218cb79da57a3f930b460",
-  "0x000000000000000000000000000000000023194c7e3211819a43cb405ea9435c",
-  "0x0000000000000000000000000000008f7edfa3aaa89eddc74f63926511f32cbd",
-  "0x00000000000000000000000000000000001420076063e4c6ae5ef96da081c833",
-  "0x000000000000000000000000000000c67e895be1d12e77e9f8d8b8285f8d2a4c",
-  "0x000000000000000000000000000000000029fe66365a7ceae2d6e42a72862eeb",
-  "0x000000000000000000000000000000cdbaf7f91b7eb5c042a579c1f0435b7c24",
-  "0x00000000000000000000000000000000002625210775b91fee828035ac222313",
-  "0x00000000000000000000000000000003312b70572e7707e9b8873453e396d090",
-  "0x000000000000000000000000000000000007105015f85374144063ce020f1aec",
-  "0x000000000000000000000000000000355e5480f81e8fa4bc4b5aa34bafd4488e",
-  "0x000000000000000000000000000000000028d89ec73010c59c69133f6c7646fe",
-  "0x0000000000000000000000000000000805e3b528b3238eda23e4c67c61ef7c3c",
-  "0x0000000000000000000000000000000000072171ada573385005ae8611d1a155",
-  "0x00000000000000000000000000000012986e0a702b3757313d4f80bbcfc183b5",
-  "0x000000000000000000000000000000000028844a204a66ecb478030f8b05fe2d",
-  "0x000000000000000000000000000000b014a5c65cc8665fc2929bbd41b0e2edfc",
-  "0x00000000000000000000000000000000000dad308253564b8179302436ecaf7d",
-  "0x0000000000000000000000000000004f03c3712f9cd0aa64e4c6d3a1e44a6c31",
-  "0x000000000000000000000000000000000002b12918bfb86c7fae45fa57bd5a11",
-  "0x00000000000000000000000000000056af2064085d8087dff285b73447be008f",
-  "0x000000000000000000000000000000000005d1e09d5f37da3bd8d98737247484",
-  "0x0000000000000000000000000000000dda493999c976786b4c2977785290f863",
-  "0x000000000000000000000000000000000002e493b3731b71230c903a6abd5ae4",
-  "0x000000000000000000000000000000c5ecf373be0733f537516c0d04b9283541",
-  "0x00000000000000000000000000000000002bc5dd3dbcf5cab96e85a979044a15",
-  "0x000000000000000000000000000000fd06602c65182a346cf0fafdec8f092439",
-  "0x00000000000000000000000000000000002ffbae13c2c2acc4ec75332417b558",
-  "0x0000000000000000000000000000009cdfd0d979da15d8332234c39783004ec7",
-  "0x000000000000000000000000000000000019f810dc460417175daa8210726298",
-  "0x000000000000000000000000000000e38cac87c23aff3f93698140aface4512e",
-  "0x000000000000000000000000000000000013af9dc8229a869126395a85e5436f",
-  "0x0000000000000000000000000000009a8131e874883fc46707a46767451dc430",
-  "0x0000000000000000000000000000000000204052a8e5e27b05964682c9c8e03b",
-  "0x000000000000000000000000000000bbe2e86f9a9075fdcd07a1596e9bac3b85",
-  "0x0000000000000000000000000000000000175890a1515f59f0834c6f417d2bd9",
-  "0x0000000000000000000000000000001c69fb343ef5e5ce2eaf1380725fe8c03a",
-  "0x00000000000000000000000000000000001b818ee3befb0a6c910a8fcbb87be7",
-  "0x000000000000000000000000000000f10fe876b62a73a403691e6f43f82bc7f0",
-  "0x00000000000000000000000000000000002d2673d49eb2edc0ed26f432f215cb",
-  "0x00000000000000000000000000000095b5d8b7b4a63b05df652b0d10ef146d26",
-  "0x0000000000000000000000000000000000099e3bd5a0a00ab7fe18040105b9b3",
-  "0x0000000000000000000000000000002129af3a637f5a622a32440f860d1e2a7f",
-  "0x00000000000000000000000000000000000015b8d2515d76e2ccec99dcd19459",
-  "0x000000000000000000000000000000222b888108dc25d1aa450e0b4bc212c37e",
-  "0x00000000000000000000000000000000001b917517920bad3d8bc01c9595092a",
-  "0x000000000000000000000000000000482141c7ebe42000a1d58ccb74381f6d19",
-  "0x0000000000000000000000000000000000305e8992b148eedb22e6e992077a84",
-  "0x0000000000000000000000000000007c86847618681dc29d8a9363ab7c40e1c3",
-  "0x000000000000000000000000000000000016465a5ccbb550cd2c63bd58116fe4",
-  "0x000000000000000000000000000000439973ac12d7ca796d6fe98ca40e6ca6b7",
-  "0x00000000000000000000000000000000002e24d420fbf9508ed31de692db477b",
-  "0x00000000000000000000000000000028edd1a7e46c840d9c943fdf45521c64ce",
-  "0x0000000000000000000000000000000000043d063b130adfb37342af45d0155a",
-  "0x0000000000000000000000000000009330952ae74c573d1686d9cb4a00733854",
-  "0x0000000000000000000000000000000000261522c4089330646aff9673619494",
+  "0x000000000000000000000000000000000000000000000000000000000000001a",
+  "0x0000000000000000000000000000000000000000000000000000000000000cad",
+  "0x0000000000000000000000000000002b2468b5f8f13bd482d710d25b291a02d4",
+  "0x000000000000000000000000000000000028799bf367c0778599b2b948882163",
+  "0x000000000000000000000000000000fe9b706fe16bc87d35001fd66356a746bc",
+  "0x000000000000000000000000000000000001ca485164bddf169d3fe6c29f62e7",
+  "0x00000000000000000000000000000075e09707371f536b6282e95e95cb185f37",
+  "0x000000000000000000000000000000000024009d9583c43b01bfe49bd946bf15",
+  "0x000000000000000000000000000000881a9c651f0a2aae2de99f5557fa22023f",
+  "0x00000000000000000000000000000000000068e5a5ca58bc35138b3847beeed4",
+  "0x000000000000000000000000000000f223a8c39d330da2a41cef98b4e091c9b7",
+  "0x0000000000000000000000000000000000211f7059c97618280acecd75745235",
+  "0x000000000000000000000000000000044e4a5f8a66993f61ec86dfb978efde9c",
+  "0x0000000000000000000000000000000000090682734b33c06cd65ba8824167f6",
+  "0x0000000000000000000000000000007add80ab4d0d02238831551a2844a9f730",
+  "0x00000000000000000000000000000000000bb45a300640a05ece5fe1ad9b9ee5",
+  "0x0000000000000000000000000000007da2be4190c8f0f38b37f33d411b427a1b",
+  "0x000000000000000000000000000000000026098dd8b73e82d335f5e784cbf652",
+  "0x0000000000000000000000000000007ab032555b3b13f26ed0788c300e54c30a",
+  "0x00000000000000000000000000000000002a8c9e9e15de7b8b11220f4055bf04",
+  "0x000000000000000000000000000000f4ce25385f14112552f1512e2f4e99d0e8",
+  "0x000000000000000000000000000000000015873846a6e7648a844f037a03f737",
+  "0x00000000000000000000000000000076dbac5187affde31d2adfb3b5064f5a77",
+  "0x000000000000000000000000000000000020ef23c172d94df80288571d7e3ca3",
+  "0x000000000000000000000000000000e69eb7802e5d99aa20bc39dee1f6b84b8f",
+  "0x00000000000000000000000000000000002b2c9af00759a128112ed819b8b1b0",
+  "0x000000000000000000000000000000f74bd0fb26a604548c9068fef410612fb9",
+  "0x00000000000000000000000000000000002ca283b09804c9b7d8ca32dc3a2c75",
+  "0x000000000000000000000000000000c90052c50c0497cddef7e3a71872d14596",
+  "0x0000000000000000000000000000000000231d65742b933d5aef1ad67db52143",
+  "0x000000000000000000000000000000b86b4223f0ebb39a8741b6ebba3a313095",
+  "0x00000000000000000000000000000000001f853f71eaa7368db93d05eefb5256",
+  "0x000000000000000000000000000000467ff45666661562c57d52de8c4f8f193c",
+  "0x00000000000000000000000000000000001fdb031a99c29b571b0a66a4140e8e",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x00000000000000000000000000000089d2777774ad5c33906740b3656fda53a0",
+  "0x0000000000000000000000000000000000133bedccd128dc4587817ae09af71b",
+  "0x000000000000000000000000000000641918e54723a119562889c1ff6239d13d",
+  "0x00000000000000000000000000000000002c14c2e4f17070e269f9903a383793",
+  "0x00000000000000000000000000000026c43cff4875a95471fe2c2008292fff78",
+  "0x00000000000000000000000000000000001224540abfac9c15d64e21d816b9dd",
+  "0x000000000000000000000000000000beb481b4d5d4eef75c1b133ca9b7efa690",
+  "0x000000000000000000000000000000000019b490637210bf2280a86ae0a1d7f7",
+  "0x000000000000000000000000000000e0b4e0795a8b1375e34eab2397b735ef03",
+  "0x00000000000000000000000000000000000effe6364fc31714fde11efcbe733c",
+  "0x0000000000000000000000000000005a1907824e164fc0fdd0f0e7c61f4d7398",
+  "0x00000000000000000000000000000000001cd6403b37da0361f243a3606ac383",
+  "0x0000000000000000000000000000006a48458b17770a4ad91f725dd01a8c486b",
+  "0x00000000000000000000000000000000000c395fd0e57de7d52c706e13918651",
+  "0x000000000000000000000000000000cde7b67f0a01ba051f06746ff7b56f59de",
+  "0x000000000000000000000000000000000020e0ab3fa354e260e0ac1855e128ca",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x000000000000000000000000000000654fe84b50aced8eb7212098af0880ed53",
+  "0x00000000000000000000000000000000002b2fcb6b0ee568a71f92d2a9bbfad3",
+  "0x0000000000000000000000000000005d9f4f1e59fac32314c435fb51e2a25ff0",
+  "0x000000000000000000000000000000000009734092d4e035b968ae8ee337464c",
+  "0x000000000000000000000000000000a28867ea56c5fbf4aca51fdbbf965e5dae",
+  "0x00000000000000000000000000000000002feaf04057ed002c072833048ce9e0",
+  "0x000000000000000000000000000000f9b70bdcd41a1c0bade216b9d5284af115",
+  "0x00000000000000000000000000000000001ece78d726aaf44e37d9053ebd1534",
+  "0x000000000000000000000000000000c4e55b000805b017402a109a6b29805245",
+  "0x00000000000000000000000000000000001d999b7c6ca8df0cca3c57ee4c8be8",
+  "0x0000000000000000000000000000008820aa820991933af75b5d02d44d0bf685",
+  "0x0000000000000000000000000000000000039880d1fbfc627ab3421788858e66",
+  "0x000000000000000000000000000000514dfa671906947f5f640255bfc583eedc",
+  "0x00000000000000000000000000000000000b0e0c990016a1fdf37d3d6daea7ae",
+  "0x00000000000000000000000000000040dbbc0f6d52ba0ce246acf816373fbbc1",
+  "0x0000000000000000000000000000000000035ba8d570a6b7efa251b206e85c82",
+  "0x0000000000000000000000000000003ebdd6ba8db24c72ad85e8d10fb1346027",
+  "0x0000000000000000000000000000000000035c795b4ad27e20c934ac5ae517b8",
+  "0x0000000000000000000000000000005369721308b3dda5dbbab39f83bffcf79a",
+  "0x0000000000000000000000000000000000241a6ba1547bf3c8eb2ded3454d897",
+  "0x0000000000000000000000000000009f97bcbba8db2f8bda79a78c0eaefacc5a",
+  "0x00000000000000000000000000000000002c960a56441f3a00b2f8b48f3b3563",
+  "0x000000000000000000000000000000ffe2ad855d3522d6b3f8b544681949c713",
+  "0x00000000000000000000000000000000000002f9753e605a6cbf6dbc604046a6",
+  "0x0000000000000000000000000000008cfee82227443d00335c9ef376137f6217",
+  "0x00000000000000000000000000000000001708d8cb04ad71f327107dd3e73cfb",
+  "0x0000000000000000000000000000007872392082ec4533c6b70f690660ee498f",
+  "0x0000000000000000000000000000000000122a83a98d1d526cb57355616bb850",
+  "0x0000000000000000000000000000000a95a3eeae99b98360d61166e89954845a",
+  "0x0000000000000000000000000000000000202c82d7bd85e9243e7ed0801ebe64",
+  "0x00000000000000000000000000000027acbc73301fe1b0c21888c2722dd75b7a",
+  "0x00000000000000000000000000000000002ae7d3ca125bd531826422c7d1acf7",
+  "0x000000000000000000000000000000d761bb670a9ff734cc38f0d30238a2b28c",
+  "0x000000000000000000000000000000000005aa3fab8a429258028c4a4287a0e6",
+  "0x0000000000000000000000000000007a80c32a515f441ce80a5d6cdb53d50866",
+  "0x000000000000000000000000000000000017f409fea3a1680e6df2a07e9eb3af",
+  "0x0000000000000000000000000000001a93444f40b0bc09418c7894fe797e2736",
+  "0x0000000000000000000000000000000000171474b32205fc141e14cfb847a8d3",
+  "0x000000000000000000000000000000081188cb41c2b23f91bef3a8237fb5fa5d",
+  "0x00000000000000000000000000000000001ed9b478e77d9f60e9614dfd6014ba",
+  "0x00000000000000000000000000000042f9a2c111e62ef204c3851affea6af0ef",
+  "0x0000000000000000000000000000000000108601bd973a835e50fc521d6ec1d9",
+  "0x000000000000000000000000000000f92be9d44c6688723f37065c3af9521bd6",
+  "0x000000000000000000000000000000000022ed90948b7d0f29ee1ed4349cab5a",
+  "0x000000000000000000000000000000bf6e68585d4cb32aeb39412d4a3e6cd968",
+  "0x00000000000000000000000000000000000c8df79002571c9aef12bb6d7f3bca",
+  "0x000000000000000000000000000000046577d9d6782e8214d846d3a16aa8ceb7",
+  "0x0000000000000000000000000000000000249e158a2e56acae4de64894bb2366",
+  "0x0000000000000000000000000000004b4ecd7a5a335425433b11e098157c3557",
+  "0x0000000000000000000000000000000000152c2ebca43c64a74ea10b830e9f62",
+  "0x0000000000000000000000000000006e65e30a946db2c5e16462e3a487d614eb",
+  "0x0000000000000000000000000000000000294d7279cdf2f3a5a0f47d5d830d40",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000001",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000002",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "0x000000000000000000000000000000eb58e659dba16eaaaeb8b648445e65fc6a",
-  "0x000000000000000000000000000000000000293f6750ad4c91cf3a5cf8d1943a",
-  "0x0000000000000000000000000000005ebcb57c71588a0edf9e20a6583d8d5b8c",
-  "0x0000000000000000000000000000000000201fc4116e914dd4b9556243e754e1",
-  "0x0000000000000000000000000000008519b4ba8a7d7609e6b54fd7e3d79162e5",
-  "0x00000000000000000000000000000000001da56d97f04c29bf4d1c7540ddb3a0",
-  "0x0000000000000000000000000000006cb90f64909b3613bc087ae15699df2931",
-  "0x000000000000000000000000000000000015753d6987cef0bb82b29c42ed8504",
-  "0x000000000000000000000000000000655eafd26d4cf4bd0951ae00ae66a0a5a4",
-  "0x00000000000000000000000000000000000d677eb93347add0618d75fb9ee5fe",
-  "0x000000000000000000000000000000ffda1f6b46c23f296036b683b84c761a4b",
-  "0x00000000000000000000000000000000000fae9f9a690b4e18091eaef9fe2bdb"
+  "0x00000000000000000000000000000034620fc4f5dc2f120b5673912cf04226e9",
+  "0x000000000000000000000000000000000025a6078d74c0fd7d4dd9e328ad4c94",
+  "0x00000000000000000000000000000019d834f9bb59a8e973ed867f0477fc8121",
+  "0x00000000000000000000000000000000001fdeb0dc3db761477a1a9feb00c906",
+  "0x00000000000000000000000000000076959cf0870e0ae93bb69edc64b0cacdac",
+  "0x0000000000000000000000000000000000269679f8c1a1ad2aadccaf8ba3100e",
+  "0x000000000000000000000000000000bb028a742987d54246ffc933f8240d70ef",
+  "0x0000000000000000000000000000000000295f79977c6ae0d15cc2b68b7f0837",
+  "0x00000000000000000000000000000064dd7da7637cf2116a18531edc7fea829a",
+  "0x0000000000000000000000000000000000162e867465b02e01bbabb15c59b84d",
+  "0x00000000000000000000000000000071f09c1d3d2c8f9499c838fc966b04ada9",
+  "0x00000000000000000000000000000000000f4504ac6f302739e9f2c7aa824d12"
 ]
-  hash = "0x1c89194a889bf66f79a9f0b3730e00ed9dc6154b247576659a835d73d5171ae8"
+  hash = "0x297f9ac45dd6c9f333314227aacca93023e72710232e7120328d7e7c209ebc8f"
 
 [previous_kernel_public_inputs]
 min_revertible_side_effect_counter = "0x0000000000000000000000000000000000000000000000000000000000000005"
-expiration_timestamp = "0x0000000000000000000000000000000000000000000000000000000069e55d81"
+expiration_timestamp = "0x0000000000000000000000000000000000000000000000000000000069ff293f"
 is_private_only = false
-claimed_first_nullifier = "0x20eb99e263b0f2ec651bdd337102a4a86b68039cc5cfccd3e7d2c09e3d2646dd"
+claimed_first_nullifier = "0x09fac458f9e079d0117ef63746c55ce66b3e5d95c8420974d9c69f369b0d77ef"
 claimed_revertible_counter = "0x0000000000000000000000000000000000000000000000000000000000000005"
 
   [previous_kernel_public_inputs.constants]
-  vk_tree_root = "0x0141caf6779674bc31225636c4cc4259a731835c52fc462f2dcbfabf7de01a1d"
+  vk_tree_root = "0x0c16448b65c4b3f83f9db3bebf635bd38957c74c9c1ea36036cbda16432cf558"
 
     [previous_kernel_public_inputs.constants.anchor_block_header]
-    sponge_blob_hash = "0x2f6cbc1e2991d249f92b52eab711b5b69653f27dc615f8548486ee4f905db9d1"
-    total_fees = "0x00000000000000000000000000000000000000000000000002b226a71e115940"
-    total_mana_used = "0x00000000000000000000000000000000000000000000000000000000000a3919"
+    sponge_blob_hash = "0x13a1bf44c19e7c2eb7fc1a96527d072cf424bc99c760e392f4abcecc1fc597f8"
+    total_fees = "0x00000000000000000000000000000000000000000000000002b26ec5db7a7140"
+    total_mana_used = "0x00000000000000000000000000000000000000000000000000000000000a3979"
 
       [previous_kernel_public_inputs.constants.anchor_block_header.last_archive]
-      root = "0x1658130986216f2f0ffc888c65e948a57a28c64721e664f522cfbb7d01492231"
+      root = "0x0d18996e508e8c1e51f6a56652cc5d71169450ff16c25de9af7f79af5385e334"
       next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000008"
 
 [previous_kernel_public_inputs.constants.anchor_block_header.state.l1_to_l2_message_tree]
@@ -168,37 +184,37 @@ root = "0x0fef6d80d31109ddb56d6b3f607cbc9c0af0bff3ea0d43e8f278983c64c11f7a"
 next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000002000"
 
 [previous_kernel_public_inputs.constants.anchor_block_header.state.partial.note_hash_tree]
-root = "0x101e57ba43504cd90f08cd61ed589b9367d33eed30ccd7a2e8333cf633f2fb6f"
+root = "0x1c223e428d6faa36822890e3b99417ddf73ffb069bf4c44b6ae9d7fc741733f6"
 next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000200"
 
 [previous_kernel_public_inputs.constants.anchor_block_header.state.partial.nullifier_tree]
-root = "0x0ec61562d933c8948a789b996a4057b5ef647965d854a7d6e36d28c2d2aea06e"
+root = "0x01c778a6b3dcb1245bb0aee174252dd95256e67309f952e5d2f8cbafffe20d0f"
 next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000280"
 
 [previous_kernel_public_inputs.constants.anchor_block_header.state.partial.public_data_tree]
-root = "0x021204d873082156522eb6603c9c7f7acb21fa936d470764f1fda90cf504891c"
+root = "0x134e44df49ddb89525046d19bcfc2734c78e419994de9d6f7467eb84d02d1060"
 next_available_leaf_index = "0x000000000000000000000000000000000000000000000000000000000000008b"
 
       [previous_kernel_public_inputs.constants.anchor_block_header.global_variables]
       chain_id = "0x0000000000000000000000000000000000000000000000000000000000007a69"
-      version = "0x000000000000000000000000000000000000000000000000000000007b6d50be"
+      version = "0x00000000000000000000000000000000000000000000000000000000ad49d7cd"
       block_number = "0x0000000000000000000000000000000000000000000000000000000000000008"
       slot_number = "0x0000000000000000000000000000000000000000000000000000000000000022"
-      timestamp = "0x0000000000000000000000000000000000000000000000000000000069e40c02"
+      timestamp = "0x0000000000000000000000000000000000000000000000000000000069fdd7c0"
 
         [previous_kernel_public_inputs.constants.anchor_block_header.global_variables.coinbase]
-        inner = "0x000000000000000000000000080c5a37d2d3dade855a034bac3548a8b2dfd887"
+        inner = "0x000000000000000000000000fde0805eba75f23cd30a3bb4f0e567a356075904"
 
         [previous_kernel_public_inputs.constants.anchor_block_header.global_variables.fee_recipient]
         inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
         [previous_kernel_public_inputs.constants.anchor_block_header.global_variables.gas_fees]
         fee_per_da_gas = "0x0000000000000000000000000000000000000000000000000000000000000000"
-        fee_per_l2_gas = "0x0000000000000000000000000000000000000000000000000000004382670b40"
+        fee_per_l2_gas = "0x0000000000000000000000000000000000000000000000000000004386faeb40"
 
     [previous_kernel_public_inputs.constants.tx_context]
     chain_id = "0x0000000000000000000000000000000000000000000000000000000000007a69"
-    version = "0x000000000000000000000000000000000000000000000000000000007b6d50be"
+    version = "0x00000000000000000000000000000000000000000000000000000000ad49d7cd"
 
 [previous_kernel_public_inputs.constants.tx_context.gas_settings.gas_limits]
 da_gas = "0x0000000000000000000000000000000000000000000000000000000000030000"
@@ -210,29 +226,29 @@ l2_gas = "0x00000000000000000000000000000000000000000000000000000000000c795c"
 
 [previous_kernel_public_inputs.constants.tx_context.gas_settings.max_fees_per_gas]
 fee_per_da_gas = "0x0000000000000000000000000000000000000000000000000000000000000000"
-fee_per_l2_gas = "0x0000000000000000000000000000000000000000000000000000000cd98ff1cb"
+fee_per_l2_gas = "0x000000000000000000000000000000000000000000000000000000336bfe2ba6"
 
 [previous_kernel_public_inputs.constants.tx_context.gas_settings.max_priority_fees_per_gas]
 fee_per_da_gas = "0x0000000000000000000000000000000000000000000000000000000000000000"
 fee_per_l2_gas = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
 [[previous_kernel_public_inputs.constants.protocol_contracts.derived_addresses]]
-inner = "0x0f8addbb176a80288379af1fe3f6e128881df1ab13f9a4dbf25de12287e61b95"
+inner = "0x1520f4bb11a3a1d2248a03d8472e9af4bb8324eb1d2d8c83bce61894383464b9"
 
 [[previous_kernel_public_inputs.constants.protocol_contracts.derived_addresses]]
-inner = "0x0b0006ff0bbf70a2ec9171c2301b65f66536e0c36cc70177a1ffadbb3f69189f"
+inner = "0x26a43bf066852a7b1ec3c5b454f41735fea12e2ffbefed471058124b91d94018"
 
 [[previous_kernel_public_inputs.constants.protocol_contracts.derived_addresses]]
-inner = "0x0ffdc845a84050f056157a1c1d52abe18da16b961c9a9a881043c2c02ad2aded"
+inner = "0x1bd26c6831ebc53674b13ac69a0c534563c37e46c2cbb36f2deca107a26515fa"
 
 [[previous_kernel_public_inputs.constants.protocol_contracts.derived_addresses]]
-inner = "0x1612f27832228b08a6ee80c5a5fb54e123ce6bddf7a6501de4fb8f426c4d8070"
+inner = "0x06870c63132d2a4e3356a76d773240efe729e7d9b9380a7a3cf1798fc9031aed"
 
 [[previous_kernel_public_inputs.constants.protocol_contracts.derived_addresses]]
-inner = "0x0d53da6d9ad9ce42a1ecd9f80a437151035951677b72d7d0af06b6221d0bf913"
+inner = "0x0083c4dfb922796f1086d399f8f3d021159d1a87ba3b833dcdf9863c630ba643"
 
 [[previous_kernel_public_inputs.constants.protocol_contracts.derived_addresses]]
-inner = "0x0758bfa195d8fd7782a5e27ef55ad8655afc8d23e57a73cc0331ab1075547146"
+inner = "0x0b4d3a9a7a3caf83f9c2060347e48cc28c7f04d2560d1cbf5bf08d4832128a97"
 
 [[previous_kernel_public_inputs.constants.protocol_contracts.derived_addresses]]
 inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
@@ -2765,7 +2781,7 @@ length = "0x0000000000000000000000000000000000000000000000000000000000000001"
 counter = "0x0000000000000000000000000000000000000000000000000000000000000001"
 
   [previous_kernel_public_inputs.end.nullifiers.array.inner.inner]
-  value = "0x20eb99e263b0f2ec651bdd337102a4a86b68039cc5cfccd3e7d2c09e3d2646dd"
+  value = "0x09fac458f9e079d0117ef63746c55ce66b3e5d95c8420974d9c69f369b0d77ef"
   note_hash = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
 [previous_kernel_public_inputs.end.nullifiers.array.contract_address]
@@ -5580,13 +5596,13 @@ length = "0x0000000000000000000000000000000000000000000000000000000000000001"
 
     [previous_kernel_public_inputs.end.public_call_requests.array.inner]
     is_static_call = false
-    calldata_hash = "0x0d2bc686e2f086c296f74f726ee51724dbb68b591ae44a8b79c980e3ee17bd8b"
+    calldata_hash = "0x16acf8ee72d77f214e5286307ed2710fda25445374c38debbef546a746b679ce"
 
       [previous_kernel_public_inputs.end.public_call_requests.array.inner.msg_sender]
-      inner = "0x0c6be08a5e070b343e733716e4ad76ea05de25e2b7fc6e6f50f0ec549f7c0bfa"
+      inner = "0x0635e757a5f05ba5322db37d6930525b43c2e055ed7c4600559a07fc38ab09ec"
 
       [previous_kernel_public_inputs.end.public_call_requests.array.inner.contract_address]
-      inner = "0x1e0d825a84ebc33bf160363bca7a6855c0bfc677043e7dd77205004c861ff880"
+      inner = "0x16fc6ad8c94527d45832bb8631b0c1dedf3218fe7c3ca04e01850a3eff6a511a"
 
   [[previous_kernel_public_inputs.end.public_call_requests.array]]
   counter = "0x0000000000000000000000000000000000000000000000000000000000000000"
@@ -6293,7 +6309,7 @@ length = "0x0000000000000000000000000000000000000000000000000000000000000000"
     inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
   [previous_kernel_public_inputs.fee_payer]
-  inner = "0x0c6be08a5e070b343e733716e4ad76ea05de25e2b7fc6e6f50f0ec549f7c0bfa"
+  inner = "0x0635e757a5f05ba5322db37d6930525b43c2e055ed7c4600559a07fc38ab09ec"
 
 [padded_side_effect_amounts]
 non_revertible_note_hashes = "0x0000000000000000000000000000000000000000000000000000000000000000"
diff --git a/noir-projects/noir-protocol-circuits/crates/private-kernel-tail/Prover.toml b/noir-projects/noir-protocol-circuits/crates/private-kernel-tail/Prover.toml
index 0a219dbf390d..e85826cf5411 100644
--- a/noir-projects/noir-protocol-circuits/crates/private-kernel-tail/Prover.toml
+++ b/noir-projects/noir-protocol-circuits/crates/private-kernel-tail/Prover.toml
@@ -1,166 +1,182 @@
-expiration_timestamp_upper_bound = "0x0000000000000000000000000000000000000000000000000000000069e54f72"
+expiration_timestamp_upper_bound = "0x0000000000000000000000000000000000000000000000000000000069ff1b30"
 
 [previous_kernel.vk_data]
 leaf_index = "0x000000000000000000000000000000000000000000000000000000000000003d"
 sibling_path = [
-  "0x0b8ed9c20fc447a664c974c7d5d3fa22e0486cd889bdd28e05140f21e40a35a6",
-  "0x1816603a28e89f16559a15a5982edea9f4edb95fef242f1c4df9c87b805b1359",
-  "0x2d5f71efef142cc28dec5df8915658b9ae282f5896b3506e980f722ce87a0820",
-  "0x0edeac4fa5da5fac1d5396f7578a9ffed587263d12b56701fe8e0b8fd445a47a",
-  "0x2ff7976fd64dfc2968899c2f2946024aafc822ad2a823d2e431df997ec5fa092",
-  "0x2411df7012f256d03cefe470ffa810e9ecf03838aa5336f87a05b441a926585a",
-  "0x1f07bca7a14f9a969539c0afd388affa18926689f431fc541841a2a7604d388c"
+  "0x1836f64afd38c3a05416bbcee658f4acce2576bbe554a445b33b8936297034e1",
+  "0x2c05a8ec2045319ea62b81134a53d4e0c1b021fed7877a3a8acc676cf26794f7",
+  "0x280ae800476659efd90f7ae6a3a2ae3958c1261ca9ae8ba3b2b8320fc9ef662d",
+  "0x1afa13b72352bab63bfdb391bbadee67783679a9b5ce7fbbcde44387ba5b0eae",
+  "0x2a99cb07c31aa5ee3a8af2c6db61485892e126a5eac56720fcbbbb002b19d015",
+  "0x0384c341c7892982bb9f5581098584a00bc572787bf4153d0a52532652ace783",
+  "0x2aa74c20807e8cbb3e32a86ad29472c42a3fb7021dcfaad112a6b68eb0eca98e"
 ]
 
   [previous_kernel.vk_data.vk]
   key = [
   "0x0000000000000000000000000000000000000000000000000000000000000011",
-  "0x0000000000000000000000000000000000000000000000000000000000000021",
-  "0x0000000000000000000000000000000000000000000000000000000000000cd8",
-  "0x000000000000000000000000000000d9cce6dea23f6b4d6d301f3a36aff24317",
-  "0x00000000000000000000000000000000002c69abca0a7c3a2fb9471e98a22c20",
-  "0x000000000000000000000000000000fdb33bd9ab008ad0f031a38ccb9aa54d14",
-  "0x0000000000000000000000000000000000060a8628c7d439b74d52f3248314e3",
-  "0x0000000000000000000000000000004614cc6fd15a583e081fc338610ab048da",
-  "0x00000000000000000000000000000000002cf610ec50da4e0e24c1c3f0dd71c1",
-  "0x0000000000000000000000000000000decc131900f2d20890eb07b890bf060c0",
-  "0x000000000000000000000000000000000016ca3ae571fb7bbfd6fb2cf11b1e3c",
-  "0x00000000000000000000000000000099dd76f1bbcd167e65f5a4375857b757fc",
-  "0x0000000000000000000000000000000000228852d34442ebe7f83dc2b0aa87f2",
-  "0x00000000000000000000000000000048b0a0455af8b4b44fba7f4852734e0ea7",
-  "0x000000000000000000000000000000000013bf6f0dc6399df8b4b4955b0eb544",
-  "0x000000000000000000000000000000bfdfde77dbe94422620afba2d15f846333",
-  "0x000000000000000000000000000000000008f527ec9f4c4d8d1c0eb8475169c9",
-  "0x0000000000000000000000000000001cc97443c8220e715a4354e3f61e6f815c",
-  "0x00000000000000000000000000000000000a17f4f313d33f4ded6a35591bea37",
-  "0x000000000000000000000000000000c8534840c64246c373a8178d098cdfe711",
-  "0x00000000000000000000000000000000002477deae04d5f7d492ca6c9d24c353",
-  "0x0000000000000000000000000000009d845f2fb1eece9b9a45182ba8b4051e9e",
-  "0x000000000000000000000000000000000013a2626ca047b162fa72a3c554e96a",
-  "0x000000000000000000000000000000f378dc8d975abb0d616eea489cc324d6c0",
-  "0x00000000000000000000000000000000000bf7a3d2011daf8a6d176c7601f4f2",
-  "0x0000000000000000000000000000000ca6aa2648d53e97fbafd35353c37b10e2",
-  "0x000000000000000000000000000000000011f90d1730dd9ee1e97f889b9c6b16",
-  "0x000000000000000000000000000000bfc5bc50cf67600c65f07646972436bdd4",
-  "0x00000000000000000000000000000000002cf952346ce50ca50d88e2f6a321be",
-  "0x000000000000000000000000000000d393f2a1523030c8384d036db4ccd9310d",
-  "0x000000000000000000000000000000000007430b3a24b77e0fb413690306d5f8",
-  "0x0000000000000000000000000000009214200af69e1247fda4b19a46b988d326",
-  "0x00000000000000000000000000000000001d36a0b00a50e533eb4c82b2826ea0",
-  "0x0000000000000000000000000000004de1a4fe270f388639b28df73039227c21",
-  "0x000000000000000000000000000000000027ebf5e21e5b9be88e13dffe8f4e7d",
-  "0x0000000000000000000000000000002d6b094fbfe7087e8a3845a943d8a42bd7",
-  "0x000000000000000000000000000000000024d62661aea423b4175d2f6d4a8b6f",
-  "0x000000000000000000000000000000bb71e2b6b4540fa421ef022f596eeab68a",
-  "0x00000000000000000000000000000000000fdf9d9db633760283925adf356dba",
-  "0x000000000000000000000000000000b28dcbbb40c5044912990e638a1435641d",
-  "0x0000000000000000000000000000000000119e6aa961568bdd5eab2f6240f7b3",
-  "0x000000000000000000000000000000a71ab24a720d9e34be05e5af6cf959b48b",
-  "0x000000000000000000000000000000000005ab054816df980cd5379bedd75f7f",
-  "0x00000000000000000000000000000065e61918e57799d9e10b6906ec3ccabb1c",
-  "0x00000000000000000000000000000000000c15b25c666cac8d136af86b9d3094",
-  "0x0000000000000000000000000000003163c716d8e7000c028325658635603e9d",
-  "0x00000000000000000000000000000000002e7594e9903e01264fa171ca77292f",
-  "0x0000000000000000000000000000007b846a1dd3cd70981741468a2621bc98f8",
-  "0x00000000000000000000000000000000001c7e9ba0e7cf554149e6fa67646576",
-  "0x0000000000000000000000000000006475c8cae2f4a1d048ae07c54045509a2a",
-  "0x00000000000000000000000000000000000411a0bdfa1d813edc1772762d9154",
-  "0x00000000000000000000000000000016b7e2d00efbbd2aad2748d1583e291265",
-  "0x0000000000000000000000000000000000000cd3342819fe0ffd86b7bc528291",
-  "0x000000000000000000000000000000c541ce087bb87d8bb410aa1a069e193d20",
-  "0x000000000000000000000000000000000027c7de3848f5172d0e4763e4f15b4d",
-  "0x000000000000000000000000000000395708add57e3218cb79da57a3f930b460",
-  "0x000000000000000000000000000000000023194c7e3211819a43cb405ea9435c",
-  "0x0000000000000000000000000000008f7edfa3aaa89eddc74f63926511f32cbd",
-  "0x00000000000000000000000000000000001420076063e4c6ae5ef96da081c833",
-  "0x000000000000000000000000000000c67e895be1d12e77e9f8d8b8285f8d2a4c",
-  "0x000000000000000000000000000000000029fe66365a7ceae2d6e42a72862eeb",
-  "0x000000000000000000000000000000cdbaf7f91b7eb5c042a579c1f0435b7c24",
-  "0x00000000000000000000000000000000002625210775b91fee828035ac222313",
-  "0x00000000000000000000000000000003312b70572e7707e9b8873453e396d090",
-  "0x000000000000000000000000000000000007105015f85374144063ce020f1aec",
-  "0x000000000000000000000000000000355e5480f81e8fa4bc4b5aa34bafd4488e",
-  "0x000000000000000000000000000000000028d89ec73010c59c69133f6c7646fe",
-  "0x0000000000000000000000000000000805e3b528b3238eda23e4c67c61ef7c3c",
-  "0x0000000000000000000000000000000000072171ada573385005ae8611d1a155",
-  "0x00000000000000000000000000000012986e0a702b3757313d4f80bbcfc183b5",
-  "0x000000000000000000000000000000000028844a204a66ecb478030f8b05fe2d",
-  "0x000000000000000000000000000000b014a5c65cc8665fc2929bbd41b0e2edfc",
-  "0x00000000000000000000000000000000000dad308253564b8179302436ecaf7d",
-  "0x0000000000000000000000000000004f03c3712f9cd0aa64e4c6d3a1e44a6c31",
-  "0x000000000000000000000000000000000002b12918bfb86c7fae45fa57bd5a11",
-  "0x00000000000000000000000000000056af2064085d8087dff285b73447be008f",
-  "0x000000000000000000000000000000000005d1e09d5f37da3bd8d98737247484",
-  "0x0000000000000000000000000000000dda493999c976786b4c2977785290f863",
-  "0x000000000000000000000000000000000002e493b3731b71230c903a6abd5ae4",
-  "0x000000000000000000000000000000c5ecf373be0733f537516c0d04b9283541",
-  "0x00000000000000000000000000000000002bc5dd3dbcf5cab96e85a979044a15",
-  "0x000000000000000000000000000000fd06602c65182a346cf0fafdec8f092439",
-  "0x00000000000000000000000000000000002ffbae13c2c2acc4ec75332417b558",
-  "0x0000000000000000000000000000009cdfd0d979da15d8332234c39783004ec7",
-  "0x000000000000000000000000000000000019f810dc460417175daa8210726298",
-  "0x000000000000000000000000000000e38cac87c23aff3f93698140aface4512e",
-  "0x000000000000000000000000000000000013af9dc8229a869126395a85e5436f",
-  "0x0000000000000000000000000000009a8131e874883fc46707a46767451dc430",
-  "0x0000000000000000000000000000000000204052a8e5e27b05964682c9c8e03b",
-  "0x000000000000000000000000000000bbe2e86f9a9075fdcd07a1596e9bac3b85",
-  "0x0000000000000000000000000000000000175890a1515f59f0834c6f417d2bd9",
-  "0x0000000000000000000000000000001c69fb343ef5e5ce2eaf1380725fe8c03a",
-  "0x00000000000000000000000000000000001b818ee3befb0a6c910a8fcbb87be7",
-  "0x000000000000000000000000000000f10fe876b62a73a403691e6f43f82bc7f0",
-  "0x00000000000000000000000000000000002d2673d49eb2edc0ed26f432f215cb",
-  "0x00000000000000000000000000000095b5d8b7b4a63b05df652b0d10ef146d26",
-  "0x0000000000000000000000000000000000099e3bd5a0a00ab7fe18040105b9b3",
-  "0x0000000000000000000000000000002129af3a637f5a622a32440f860d1e2a7f",
-  "0x00000000000000000000000000000000000015b8d2515d76e2ccec99dcd19459",
-  "0x000000000000000000000000000000222b888108dc25d1aa450e0b4bc212c37e",
-  "0x00000000000000000000000000000000001b917517920bad3d8bc01c9595092a",
-  "0x000000000000000000000000000000482141c7ebe42000a1d58ccb74381f6d19",
-  "0x0000000000000000000000000000000000305e8992b148eedb22e6e992077a84",
-  "0x0000000000000000000000000000007c86847618681dc29d8a9363ab7c40e1c3",
-  "0x000000000000000000000000000000000016465a5ccbb550cd2c63bd58116fe4",
-  "0x000000000000000000000000000000439973ac12d7ca796d6fe98ca40e6ca6b7",
-  "0x00000000000000000000000000000000002e24d420fbf9508ed31de692db477b",
-  "0x00000000000000000000000000000028edd1a7e46c840d9c943fdf45521c64ce",
-  "0x0000000000000000000000000000000000043d063b130adfb37342af45d0155a",
-  "0x0000000000000000000000000000009330952ae74c573d1686d9cb4a00733854",
-  "0x0000000000000000000000000000000000261522c4089330646aff9673619494",
+  "0x000000000000000000000000000000000000000000000000000000000000001a",
+  "0x0000000000000000000000000000000000000000000000000000000000000cad",
+  "0x0000000000000000000000000000002b2468b5f8f13bd482d710d25b291a02d4",
+  "0x000000000000000000000000000000000028799bf367c0778599b2b948882163",
+  "0x000000000000000000000000000000fe9b706fe16bc87d35001fd66356a746bc",
+  "0x000000000000000000000000000000000001ca485164bddf169d3fe6c29f62e7",
+  "0x00000000000000000000000000000075e09707371f536b6282e95e95cb185f37",
+  "0x000000000000000000000000000000000024009d9583c43b01bfe49bd946bf15",
+  "0x000000000000000000000000000000881a9c651f0a2aae2de99f5557fa22023f",
+  "0x00000000000000000000000000000000000068e5a5ca58bc35138b3847beeed4",
+  "0x000000000000000000000000000000f223a8c39d330da2a41cef98b4e091c9b7",
+  "0x0000000000000000000000000000000000211f7059c97618280acecd75745235",
+  "0x000000000000000000000000000000044e4a5f8a66993f61ec86dfb978efde9c",
+  "0x0000000000000000000000000000000000090682734b33c06cd65ba8824167f6",
+  "0x0000000000000000000000000000007add80ab4d0d02238831551a2844a9f730",
+  "0x00000000000000000000000000000000000bb45a300640a05ece5fe1ad9b9ee5",
+  "0x0000000000000000000000000000007da2be4190c8f0f38b37f33d411b427a1b",
+  "0x000000000000000000000000000000000026098dd8b73e82d335f5e784cbf652",
+  "0x0000000000000000000000000000007ab032555b3b13f26ed0788c300e54c30a",
+  "0x00000000000000000000000000000000002a8c9e9e15de7b8b11220f4055bf04",
+  "0x000000000000000000000000000000f4ce25385f14112552f1512e2f4e99d0e8",
+  "0x000000000000000000000000000000000015873846a6e7648a844f037a03f737",
+  "0x00000000000000000000000000000076dbac5187affde31d2adfb3b5064f5a77",
+  "0x000000000000000000000000000000000020ef23c172d94df80288571d7e3ca3",
+  "0x000000000000000000000000000000e69eb7802e5d99aa20bc39dee1f6b84b8f",
+  "0x00000000000000000000000000000000002b2c9af00759a128112ed819b8b1b0",
+  "0x000000000000000000000000000000f74bd0fb26a604548c9068fef410612fb9",
+  "0x00000000000000000000000000000000002ca283b09804c9b7d8ca32dc3a2c75",
+  "0x000000000000000000000000000000c90052c50c0497cddef7e3a71872d14596",
+  "0x0000000000000000000000000000000000231d65742b933d5aef1ad67db52143",
+  "0x000000000000000000000000000000b86b4223f0ebb39a8741b6ebba3a313095",
+  "0x00000000000000000000000000000000001f853f71eaa7368db93d05eefb5256",
+  "0x000000000000000000000000000000467ff45666661562c57d52de8c4f8f193c",
+  "0x00000000000000000000000000000000001fdb031a99c29b571b0a66a4140e8e",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x00000000000000000000000000000089d2777774ad5c33906740b3656fda53a0",
+  "0x0000000000000000000000000000000000133bedccd128dc4587817ae09af71b",
+  "0x000000000000000000000000000000641918e54723a119562889c1ff6239d13d",
+  "0x00000000000000000000000000000000002c14c2e4f17070e269f9903a383793",
+  "0x00000000000000000000000000000026c43cff4875a95471fe2c2008292fff78",
+  "0x00000000000000000000000000000000001224540abfac9c15d64e21d816b9dd",
+  "0x000000000000000000000000000000beb481b4d5d4eef75c1b133ca9b7efa690",
+  "0x000000000000000000000000000000000019b490637210bf2280a86ae0a1d7f7",
+  "0x000000000000000000000000000000e0b4e0795a8b1375e34eab2397b735ef03",
+  "0x00000000000000000000000000000000000effe6364fc31714fde11efcbe733c",
+  "0x0000000000000000000000000000005a1907824e164fc0fdd0f0e7c61f4d7398",
+  "0x00000000000000000000000000000000001cd6403b37da0361f243a3606ac383",
+  "0x0000000000000000000000000000006a48458b17770a4ad91f725dd01a8c486b",
+  "0x00000000000000000000000000000000000c395fd0e57de7d52c706e13918651",
+  "0x000000000000000000000000000000cde7b67f0a01ba051f06746ff7b56f59de",
+  "0x000000000000000000000000000000000020e0ab3fa354e260e0ac1855e128ca",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x000000000000000000000000000000654fe84b50aced8eb7212098af0880ed53",
+  "0x00000000000000000000000000000000002b2fcb6b0ee568a71f92d2a9bbfad3",
+  "0x0000000000000000000000000000005d9f4f1e59fac32314c435fb51e2a25ff0",
+  "0x000000000000000000000000000000000009734092d4e035b968ae8ee337464c",
+  "0x000000000000000000000000000000a28867ea56c5fbf4aca51fdbbf965e5dae",
+  "0x00000000000000000000000000000000002feaf04057ed002c072833048ce9e0",
+  "0x000000000000000000000000000000f9b70bdcd41a1c0bade216b9d5284af115",
+  "0x00000000000000000000000000000000001ece78d726aaf44e37d9053ebd1534",
+  "0x000000000000000000000000000000c4e55b000805b017402a109a6b29805245",
+  "0x00000000000000000000000000000000001d999b7c6ca8df0cca3c57ee4c8be8",
+  "0x0000000000000000000000000000008820aa820991933af75b5d02d44d0bf685",
+  "0x0000000000000000000000000000000000039880d1fbfc627ab3421788858e66",
+  "0x000000000000000000000000000000514dfa671906947f5f640255bfc583eedc",
+  "0x00000000000000000000000000000000000b0e0c990016a1fdf37d3d6daea7ae",
+  "0x00000000000000000000000000000040dbbc0f6d52ba0ce246acf816373fbbc1",
+  "0x0000000000000000000000000000000000035ba8d570a6b7efa251b206e85c82",
+  "0x0000000000000000000000000000003ebdd6ba8db24c72ad85e8d10fb1346027",
+  "0x0000000000000000000000000000000000035c795b4ad27e20c934ac5ae517b8",
+  "0x0000000000000000000000000000005369721308b3dda5dbbab39f83bffcf79a",
+  "0x0000000000000000000000000000000000241a6ba1547bf3c8eb2ded3454d897",
+  "0x0000000000000000000000000000009f97bcbba8db2f8bda79a78c0eaefacc5a",
+  "0x00000000000000000000000000000000002c960a56441f3a00b2f8b48f3b3563",
+  "0x000000000000000000000000000000ffe2ad855d3522d6b3f8b544681949c713",
+  "0x00000000000000000000000000000000000002f9753e605a6cbf6dbc604046a6",
+  "0x0000000000000000000000000000008cfee82227443d00335c9ef376137f6217",
+  "0x00000000000000000000000000000000001708d8cb04ad71f327107dd3e73cfb",
+  "0x0000000000000000000000000000007872392082ec4533c6b70f690660ee498f",
+  "0x0000000000000000000000000000000000122a83a98d1d526cb57355616bb850",
+  "0x0000000000000000000000000000000a95a3eeae99b98360d61166e89954845a",
+  "0x0000000000000000000000000000000000202c82d7bd85e9243e7ed0801ebe64",
+  "0x00000000000000000000000000000027acbc73301fe1b0c21888c2722dd75b7a",
+  "0x00000000000000000000000000000000002ae7d3ca125bd531826422c7d1acf7",
+  "0x000000000000000000000000000000d761bb670a9ff734cc38f0d30238a2b28c",
+  "0x000000000000000000000000000000000005aa3fab8a429258028c4a4287a0e6",
+  "0x0000000000000000000000000000007a80c32a515f441ce80a5d6cdb53d50866",
+  "0x000000000000000000000000000000000017f409fea3a1680e6df2a07e9eb3af",
+  "0x0000000000000000000000000000001a93444f40b0bc09418c7894fe797e2736",
+  "0x0000000000000000000000000000000000171474b32205fc141e14cfb847a8d3",
+  "0x000000000000000000000000000000081188cb41c2b23f91bef3a8237fb5fa5d",
+  "0x00000000000000000000000000000000001ed9b478e77d9f60e9614dfd6014ba",
+  "0x00000000000000000000000000000042f9a2c111e62ef204c3851affea6af0ef",
+  "0x0000000000000000000000000000000000108601bd973a835e50fc521d6ec1d9",
+  "0x000000000000000000000000000000f92be9d44c6688723f37065c3af9521bd6",
+  "0x000000000000000000000000000000000022ed90948b7d0f29ee1ed4349cab5a",
+  "0x000000000000000000000000000000bf6e68585d4cb32aeb39412d4a3e6cd968",
+  "0x00000000000000000000000000000000000c8df79002571c9aef12bb6d7f3bca",
+  "0x000000000000000000000000000000046577d9d6782e8214d846d3a16aa8ceb7",
+  "0x0000000000000000000000000000000000249e158a2e56acae4de64894bb2366",
+  "0x0000000000000000000000000000004b4ecd7a5a335425433b11e098157c3557",
+  "0x0000000000000000000000000000000000152c2ebca43c64a74ea10b830e9f62",
+  "0x0000000000000000000000000000006e65e30a946db2c5e16462e3a487d614eb",
+  "0x0000000000000000000000000000000000294d7279cdf2f3a5a0f47d5d830d40",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000001",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000002",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "0x000000000000000000000000000000eb58e659dba16eaaaeb8b648445e65fc6a",
-  "0x000000000000000000000000000000000000293f6750ad4c91cf3a5cf8d1943a",
-  "0x0000000000000000000000000000005ebcb57c71588a0edf9e20a6583d8d5b8c",
-  "0x0000000000000000000000000000000000201fc4116e914dd4b9556243e754e1",
-  "0x0000000000000000000000000000008519b4ba8a7d7609e6b54fd7e3d79162e5",
-  "0x00000000000000000000000000000000001da56d97f04c29bf4d1c7540ddb3a0",
-  "0x0000000000000000000000000000006cb90f64909b3613bc087ae15699df2931",
-  "0x000000000000000000000000000000000015753d6987cef0bb82b29c42ed8504",
-  "0x000000000000000000000000000000655eafd26d4cf4bd0951ae00ae66a0a5a4",
-  "0x00000000000000000000000000000000000d677eb93347add0618d75fb9ee5fe",
-  "0x000000000000000000000000000000ffda1f6b46c23f296036b683b84c761a4b",
-  "0x00000000000000000000000000000000000fae9f9a690b4e18091eaef9fe2bdb"
+  "0x00000000000000000000000000000034620fc4f5dc2f120b5673912cf04226e9",
+  "0x000000000000000000000000000000000025a6078d74c0fd7d4dd9e328ad4c94",
+  "0x00000000000000000000000000000019d834f9bb59a8e973ed867f0477fc8121",
+  "0x00000000000000000000000000000000001fdeb0dc3db761477a1a9feb00c906",
+  "0x00000000000000000000000000000076959cf0870e0ae93bb69edc64b0cacdac",
+  "0x0000000000000000000000000000000000269679f8c1a1ad2aadccaf8ba3100e",
+  "0x000000000000000000000000000000bb028a742987d54246ffc933f8240d70ef",
+  "0x0000000000000000000000000000000000295f79977c6ae0d15cc2b68b7f0837",
+  "0x00000000000000000000000000000064dd7da7637cf2116a18531edc7fea829a",
+  "0x0000000000000000000000000000000000162e867465b02e01bbabb15c59b84d",
+  "0x00000000000000000000000000000071f09c1d3d2c8f9499c838fc966b04ada9",
+  "0x00000000000000000000000000000000000f4504ac6f302739e9f2c7aa824d12"
 ]
-  hash = "0x1c89194a889bf66f79a9f0b3730e00ed9dc6154b247576659a835d73d5171ae8"
+  hash = "0x297f9ac45dd6c9f333314227aacca93023e72710232e7120328d7e7c209ebc8f"
 
 [previous_kernel_public_inputs]
 min_revertible_side_effect_counter = "0x0000000000000000000000000000000000000000000000000000000000000005"
-expiration_timestamp = "0x0000000000000000000000000000000000000000000000000000000069e55d81"
+expiration_timestamp = "0x0000000000000000000000000000000000000000000000000000000069ff293f"
 is_private_only = true
-claimed_first_nullifier = "0x26f58ea4e59caccca23fd7342a9dbd649426e1ba431becfcd84536bc804136da"
+claimed_first_nullifier = "0x282b555a2f009837bd02f744ae119250934c991464481b5613f7f2112a615f7c"
 claimed_revertible_counter = "0x0000000000000000000000000000000000000000000000000000000000000005"
 
   [previous_kernel_public_inputs.constants]
-  vk_tree_root = "0x0141caf6779674bc31225636c4cc4259a731835c52fc462f2dcbfabf7de01a1d"
+  vk_tree_root = "0x0c16448b65c4b3f83f9db3bebf635bd38957c74c9c1ea36036cbda16432cf558"
 
     [previous_kernel_public_inputs.constants.anchor_block_header]
-    sponge_blob_hash = "0x2f6cbc1e2991d249f92b52eab711b5b69653f27dc615f8548486ee4f905db9d1"
-    total_fees = "0x00000000000000000000000000000000000000000000000002b226a71e115940"
-    total_mana_used = "0x00000000000000000000000000000000000000000000000000000000000a3919"
+    sponge_blob_hash = "0x13a1bf44c19e7c2eb7fc1a96527d072cf424bc99c760e392f4abcecc1fc597f8"
+    total_fees = "0x00000000000000000000000000000000000000000000000002b26ec5db7a7140"
+    total_mana_used = "0x00000000000000000000000000000000000000000000000000000000000a3979"
 
       [previous_kernel_public_inputs.constants.anchor_block_header.last_archive]
-      root = "0x1658130986216f2f0ffc888c65e948a57a28c64721e664f522cfbb7d01492231"
+      root = "0x0d18996e508e8c1e51f6a56652cc5d71169450ff16c25de9af7f79af5385e334"
       next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000008"
 
 [previous_kernel_public_inputs.constants.anchor_block_header.state.l1_to_l2_message_tree]
@@ -168,37 +184,37 @@ root = "0x0fef6d80d31109ddb56d6b3f607cbc9c0af0bff3ea0d43e8f278983c64c11f7a"
 next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000002000"
 
 [previous_kernel_public_inputs.constants.anchor_block_header.state.partial.note_hash_tree]
-root = "0x101e57ba43504cd90f08cd61ed589b9367d33eed30ccd7a2e8333cf633f2fb6f"
+root = "0x1c223e428d6faa36822890e3b99417ddf73ffb069bf4c44b6ae9d7fc741733f6"
 next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000200"
 
 [previous_kernel_public_inputs.constants.anchor_block_header.state.partial.nullifier_tree]
-root = "0x0ec61562d933c8948a789b996a4057b5ef647965d854a7d6e36d28c2d2aea06e"
+root = "0x01c778a6b3dcb1245bb0aee174252dd95256e67309f952e5d2f8cbafffe20d0f"
 next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000280"
 
 [previous_kernel_public_inputs.constants.anchor_block_header.state.partial.public_data_tree]
-root = "0x021204d873082156522eb6603c9c7f7acb21fa936d470764f1fda90cf504891c"
+root = "0x134e44df49ddb89525046d19bcfc2734c78e419994de9d6f7467eb84d02d1060"
 next_available_leaf_index = "0x000000000000000000000000000000000000000000000000000000000000008b"
 
       [previous_kernel_public_inputs.constants.anchor_block_header.global_variables]
       chain_id = "0x0000000000000000000000000000000000000000000000000000000000007a69"
-      version = "0x000000000000000000000000000000000000000000000000000000007b6d50be"
+      version = "0x00000000000000000000000000000000000000000000000000000000ad49d7cd"
       block_number = "0x0000000000000000000000000000000000000000000000000000000000000008"
       slot_number = "0x0000000000000000000000000000000000000000000000000000000000000022"
-      timestamp = "0x0000000000000000000000000000000000000000000000000000000069e40c02"
+      timestamp = "0x0000000000000000000000000000000000000000000000000000000069fdd7c0"
 
         [previous_kernel_public_inputs.constants.anchor_block_header.global_variables.coinbase]
-        inner = "0x000000000000000000000000080c5a37d2d3dade855a034bac3548a8b2dfd887"
+        inner = "0x000000000000000000000000fde0805eba75f23cd30a3bb4f0e567a356075904"
 
         [previous_kernel_public_inputs.constants.anchor_block_header.global_variables.fee_recipient]
         inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
         [previous_kernel_public_inputs.constants.anchor_block_header.global_variables.gas_fees]
         fee_per_da_gas = "0x0000000000000000000000000000000000000000000000000000000000000000"
-        fee_per_l2_gas = "0x0000000000000000000000000000000000000000000000000000004382670b40"
+        fee_per_l2_gas = "0x0000000000000000000000000000000000000000000000000000004386faeb40"
 
     [previous_kernel_public_inputs.constants.tx_context]
     chain_id = "0x0000000000000000000000000000000000000000000000000000000000007a69"
-    version = "0x000000000000000000000000000000000000000000000000000000007b6d50be"
+    version = "0x00000000000000000000000000000000000000000000000000000000ad49d7cd"
 
 [previous_kernel_public_inputs.constants.tx_context.gas_settings.gas_limits]
 da_gas = "0x0000000000000000000000000000000000000000000000000000000000030000"
@@ -210,29 +226,29 @@ l2_gas = "0x00000000000000000000000000000000000000000000000000000000000c795c"
 
 [previous_kernel_public_inputs.constants.tx_context.gas_settings.max_fees_per_gas]
 fee_per_da_gas = "0x0000000000000000000000000000000000000000000000000000000000000000"
-fee_per_l2_gas = "0x0000000000000000000000000000000000000000000000000000000cd98ff1cb"
+fee_per_l2_gas = "0x000000000000000000000000000000000000000000000000000000336bfe2ba6"
 
 [previous_kernel_public_inputs.constants.tx_context.gas_settings.max_priority_fees_per_gas]
 fee_per_da_gas = "0x0000000000000000000000000000000000000000000000000000000000000000"
 fee_per_l2_gas = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
 [[previous_kernel_public_inputs.constants.protocol_contracts.derived_addresses]]
-inner = "0x0f8addbb176a80288379af1fe3f6e128881df1ab13f9a4dbf25de12287e61b95"
+inner = "0x1520f4bb11a3a1d2248a03d8472e9af4bb8324eb1d2d8c83bce61894383464b9"
 
 [[previous_kernel_public_inputs.constants.protocol_contracts.derived_addresses]]
-inner = "0x0b0006ff0bbf70a2ec9171c2301b65f66536e0c36cc70177a1ffadbb3f69189f"
+inner = "0x26a43bf066852a7b1ec3c5b454f41735fea12e2ffbefed471058124b91d94018"
 
 [[previous_kernel_public_inputs.constants.protocol_contracts.derived_addresses]]
-inner = "0x0ffdc845a84050f056157a1c1d52abe18da16b961c9a9a881043c2c02ad2aded"
+inner = "0x1bd26c6831ebc53674b13ac69a0c534563c37e46c2cbb36f2deca107a26515fa"
 
 [[previous_kernel_public_inputs.constants.protocol_contracts.derived_addresses]]
-inner = "0x1612f27832228b08a6ee80c5a5fb54e123ce6bddf7a6501de4fb8f426c4d8070"
+inner = "0x06870c63132d2a4e3356a76d773240efe729e7d9b9380a7a3cf1798fc9031aed"
 
 [[previous_kernel_public_inputs.constants.protocol_contracts.derived_addresses]]
-inner = "0x0d53da6d9ad9ce42a1ecd9f80a437151035951677b72d7d0af06b6221d0bf913"
+inner = "0x0083c4dfb922796f1086d399f8f3d021159d1a87ba3b833dcdf9863c630ba643"
 
 [[previous_kernel_public_inputs.constants.protocol_contracts.derived_addresses]]
-inner = "0x0758bfa195d8fd7782a5e27ef55ad8655afc8d23e57a73cc0331ab1075547146"
+inner = "0x0b4d3a9a7a3caf83f9c2060347e48cc28c7f04d2560d1cbf5bf08d4832128a97"
 
 [[previous_kernel_public_inputs.constants.protocol_contracts.derived_addresses]]
 inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
@@ -2247,7 +2263,7 @@ length = "0x0000000000000000000000000000000000000000000000000000000000000002"
 
   [[previous_kernel_public_inputs.end.note_hashes.array]]
 [previous_kernel_public_inputs.end.note_hashes.array.inner]
-inner = "0x06140f88666c88412ea6f88ad31d11fdc1078c9842da15f244171ef3dd58692a"
+inner = "0x2295fa9f079bf362a4f01c3b07d9f912f9b484e5ee527ad7a528025a165b9352"
 counter = "0x000000000000000000000000000000000000000000000000000000000000000a"
 
 [previous_kernel_public_inputs.end.note_hashes.array.contract_address]
@@ -2255,7 +2271,7 @@ inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
   [[previous_kernel_public_inputs.end.note_hashes.array]]
 [previous_kernel_public_inputs.end.note_hashes.array.inner]
-inner = "0x21153e1db328edfbc5ab37b822c8aa9def09c2333ae5f63806505f3cfc5c037b"
+inner = "0x27f0738f58cf7f88e6845175913245e6f82475f464578de70619eceaff66402e"
 counter = "0x000000000000000000000000000000000000000000000000000000000000000c"
 
 [previous_kernel_public_inputs.end.note_hashes.array.contract_address]
@@ -2765,7 +2781,7 @@ length = "0x0000000000000000000000000000000000000000000000000000000000000003"
 counter = "0x0000000000000000000000000000000000000000000000000000000000000001"
 
   [previous_kernel_public_inputs.end.nullifiers.array.inner.inner]
-  value = "0x26f58ea4e59caccca23fd7342a9dbd649426e1ba431becfcd84536bc804136da"
+  value = "0x282b555a2f009837bd02f744ae119250934c991464481b5613f7f2112a615f7c"
   note_hash = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
 [previous_kernel_public_inputs.end.nullifiers.array.contract_address]
@@ -2776,7 +2792,7 @@ inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
 counter = "0x0000000000000000000000000000000000000000000000000000000000000009"
 
   [previous_kernel_public_inputs.end.nullifiers.array.inner.inner]
-  value = "0x0514b0458fed053da93ce988061dcd5ec8fcedf9b907635a1596d5efc27a3e4c"
+  value = "0x1567c8c1ff81dda9727361df23c92849c46772567aa0bf3723db03c3751e9d2e"
   note_hash = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
 [previous_kernel_public_inputs.end.nullifiers.array.contract_address]
@@ -2787,7 +2803,7 @@ inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
 counter = "0x000000000000000000000000000000000000000000000000000000000000000e"
 
   [previous_kernel_public_inputs.end.nullifiers.array.inner.inner]
-  value = "0x2de5d04c4bfcd53864eced485ffaa5b7d0bff9098fc7916955f7b3d43b535d76"
+  value = "0x1cb96ed0bfe97ed05e23f013062425e5ce6599fb6430b162e69edfc317d5bf82"
   note_hash = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
 [previous_kernel_public_inputs.end.nullifiers.array.contract_address]
@@ -3583,22 +3599,22 @@ counter = "0x000000000000000000000000000000000000000000000000000000000000000b"
 
     [previous_kernel_public_inputs.end.private_logs.array.inner.inner.log]
     fields = [
-  "0x2f6eddcfe22dbb45718bf6098096aac7ad1d1a8fc660c9d5242144b9edd6c0dc",
-  "0x2c73615d9ab6464cbe0c8d451648e96d492e73823467a98efa21f1ea1eb33784",
-  "0x0c584a6e7f5e450f52d1b8d67c73502ecaf1b76e92a3b0ea7ade566c8cae75a3",
-  "0x12eb5caaced046c5e1735a2acccda53139a97359d3c20584a333da0017c1580d",
-  "0x26c7951ef3dcd7d15932be1c034d76eb980cebe77a3abece23d09c23abd992b0",
-  "0x05f8a3597c63ed8a979d0fd278fb5a544959bd9d68f871f7ec79a32e28db3ad4",
-  "0x022d67bc4435543e4c2b6d43b836438058c35a38ee62a27cfbadaa70257b9d7f",
-  "0x17b7cb589d82b5265591d1f6ba68534ecf4dbb2343c54dd755315f22f83c028b",
-  "0x0d1f61abac8fbc8607d199a8d0803b2f98b3ee8d39a2258622fc48b4c4c9fe60",
-  "0x2f3fe27da81ee8e09d1e17cbc275ac75dc5e04d474eb158f2e7306a8dfdecbef",
-  "0x1e2e5d1037c7355ebd297bbf511116120babcb6f2b0f8d4d2a7e1447993c0917",
-  "0x158df03558cf71dd85b122c058a95fe931ec81ed88989d157f6fe35c8a2918fe",
-  "0x0f6ec8c84a85d474160be346e29ccdf2814b15db4c6f85dcc764037c62b76ded",
-  "0x27fe1c1dfc2202c61f7f956ba23c3b0355364e68bb86b443f0667d47173019f0",
-  "0x093896965f941424a522c0a323106574653321df79a8080af2eab1e3754824b9",
-  "0x0c216771dc7929abf732fc00ece83dc11e7d9fd77daece5021650ffbee67af71"
+  "0x2c3715409dc4762ec9a9a602d199ea9932d61edd3fd32c9891fe5ea5a722acde",
+  "0x10433733db106ed8336b9b799ec2debee9fe2da75f114f567eefde5abf9f74d3",
+  "0x17440c522b009a136c2207db86790b05464774690523c7fbf949ad381664d0ea",
+  "0x0a5e8928a4d74ad3256e8a697cfdf84b7baae32abad67b2de7c36ffd67acb665",
+  "0x0b1200621e156c6d79f463e17e81b96f11d18d716ca5222e7276e07d45845a26",
+  "0x04b2b64d09e487d10d557106046a94a97f2c40f4316e6667a2c2d9a99db05385",
+  "0x193da3d713c24b85e1c8f22dd8ef575e88d19c6732f8fd17e370cf64e65b3e04",
+  "0x08569203e8f3d028234ed200df77bca848c9b4b015ad8797c37669a5e5d1ee0c",
+  "0x13a9b2003409ad3d4f38caba797acc77092ddd431af25a955a83dc6f5b92cc93",
+  "0x16fece01bc0b0205bcbaca2904d5674d10573bfef038f94d3e5d526596da2ae9",
+  "0x0a438177a05071eaeb1862f154b187315de4dc804e275b0f2258baf4700c6d64",
+  "0x0959244a76e5e861ce5b8833101b91e19d758109d68cc174a6f9eec9c7afa008",
+  "0x03533d18a1c3ebcf22f820a243be161c9798ea59a506572e32e125c53b7aee7e",
+  "0x1e2b22ea302597bfcbcfdefcda48b60e35fce9c70f46c6cb90fa6db6e8d4dc6d",
+  "0x28fab93b8cd28d8d2a993badc3d1a080902feecfab019dc7c00af0ea9f6f403d",
+  "0x104c4c81c135af94af35a1eeb49b1262e5c53e25ee513731ddeb9f6496eea2ab"
 ]
     length = "0x0000000000000000000000000000000000000000000000000000000000000010"
 
@@ -3614,22 +3630,22 @@ counter = "0x000000000000000000000000000000000000000000000000000000000000000d"
 
     [previous_kernel_public_inputs.end.private_logs.array.inner.inner.log]
     fields = [
-  "0x10a55334a44a21d1a1d26f480597450ec953371a435a1c6c13481c61c75af9c8",
-  "0x16375b8398a42fdbd75bc47c454a3a41f3009588892a70dfe8d4c9066a45221a",
-  "0x2c9e87de46c5866d54ec78e7e3193006609a69f064b0c320493e5a86323a8cb3",
-  "0x02ca56efa5503d808e0d4670f4298c1c35cb2eecd6dfa8212265771ab28383e7",
-  "0x1e4e46136a23c4fcd8a6e3f55f2dbf4bfb643b534013b5e30916e265acef1396",
-  "0x0f76dd665fe04db360190f74bb067692674265e012e8b9c035e58682874c8ad2",
-  "0x1b7af81c24df129a494d2046ea533680d34c3cf59a705b0b7eb6dbe950c93a3b",
-  "0x1023283665d7538cb0b4ceb1757ffe5496ae3b04e38c92a3d88543262acadf4c",
-  "0x1d9f1615f8f1c5d01787846d36608039073bddd52b931363f2ad25066198590c",
-  "0x0ccba93943db048cee4e8cac6386a38fb3411dec41c5727512f5452626db9005",
-  "0x2fed61053470e8726452339f2dddf7aa2a681013fdf09dda3cee503b856e98a6",
-  "0x168608b1f3246093f423c22552c3e2b73d9940806fb6a206f2894f0aec8d9804",
-  "0x1ad0396979cb210c427797f7e9cd130a943a116ffc89191c7dde426f9815f5f3",
-  "0x0e26f9632a1ceb6b3529d1f3e646c5e2635ac7282f771ed015867e5608ac492b",
-  "0x0c8a6181168c14779084d69bd94d619c3bc9b461db844fb179f8fc21c6b667d5",
-  "0x043191aa5f94c3eff6c189762723c296abd3a7c10303b65129622630b7ab6fd4"
+  "0x1b7f52b7a346b47077bab6835a0810e5d75e977fc3f3fbb0436055bcdaa167ee",
+  "0x2320e89fb76918e7dc48b13861302dbf78af5ba8d5a20da77d19781ac32b9bc2",
+  "0x2a99619c0d4d380dbc3d53d03ed35011aa9c296a507fabcf712f43a0e5a10850",
+  "0x02e5d98e7dfbe7653dafb14afddd7e00f403b5a60816d7ab961823bd3cc4b628",
+  "0x223b37d6caffe87e91cddafdf65c4f641a609ff13350d02654b0fed1443088ab",
+  "0x2846b9aa4544f8f8851554f5d0c189c188756d734112e1eedd6840c8aeb0e66f",
+  "0x21cda3f228d55fb1b37f2b7c7a5d42066007143db17645669521ff58956fa7bf",
+  "0x1d8d79951d7389e5f9dfa963f93e399aebaa346e9ce3b3a5da1b45e4600a1553",
+  "0x15eabc8ed921f60621fa4fa35214748a7593f1c06a1e66b76092f789b4960bc5",
+  "0x16babb28d68725cb64d6d7558d49fb921c480359488fcdfb5292019239a50563",
+  "0x015e561b49da425d081b87bac01336defa1e29ee50d01b7be798ac28e05b24d6",
+  "0x04bf1a23807cb0711511a6140caf195df55fcf029842652243034ae2ca740648",
+  "0x2789cc422a86395739004c513cf6a15024e3adf5f2e238b18e1b4f1211a9383a",
+  "0x00c4e950cfe804e8a3623fe768c82b7340b0216f93c00351c53e2144364cfb51",
+  "0x2fd9827b4118b7ef401dff1727785e46fdd31947d2e733f4b39076f43652c18a",
+  "0x158ca7fba6e7fa7b3eb7c062751182d93b4e36b5c77d2e609e246b810650e59e"
 ]
     length = "0x0000000000000000000000000000000000000000000000000000000000000010"
 
@@ -3645,22 +3661,22 @@ counter = "0x000000000000000000000000000000000000000000000000000000000000000f"
 
     [previous_kernel_public_inputs.end.private_logs.array.inner.inner.log]
     fields = [
-  "0x0fada7f16aa7f639db005263ee03b5d94e549187f0f77f92cf4df66e40f35077",
-  "0x2c93c0e720639d650652f8a3207389e68bbddc23a5c77bac86cf76d18d2d4c6e",
-  "0x13886d46429598c222d060b3f1310ab08426f52591a0048ba69c5f8c9fc878e5",
-  "0x06f84323865ae16fba50254f50d6644da0fdd4f7858abeac8e490d6b8e582ff1",
-  "0x2e13bd8098fc2c84136b36e7c8ac6ad91a956851a53414e598bc965a53bd7d56",
-  "0x12606d99ba16253e396904e04ffc666608dd862755887cfa059f5598564398f0",
-  "0x125d17e65b7d789efd50049851d0dab0275777066fc335731e91a10f59a754c1",
-  "0x00fa47821eb005815aff3fdf498f4304a253ea5d6623477b779c6f24dac3f7a2",
-  "0x1d4e2a1c53da9e892c281a869cc68d6012380b64bfb6482fc5a8df6582889d88",
-  "0x2bc1b3d6d18a4fa9c9a6de522ec66e330d0452b89ea54621eddfe6d2a922ef69",
-  "0x150ed27ceffc6f923f89e1e841238eb3fa47c938baf201ab5c75795c039ba436",
-  "0x030e3ebccab9056b7ef14ee89ccfe595bdb050938199811b291615b356220271",
-  "0x255b84fbc5cca3c3dedcec7002347f53f608cb6528f12b1143280307a1c46e14",
-  "0x0c10873c5dd54ec52fd5402af0c75916b2b4df23a9a9aa643896fb956d60ba50",
-  "0x0bc0aa29990bcf3c275323fd20c2871e45f6c31921fc50c9bcad51ad9aa41553",
-  "0x0d2d7cb49928f91e000fd2f08e702b96621a24d92a3dd31a3062abed3b550c96"
+  "0x07d20bd951900d3094f2894e3c76c117114e3150dc3197e9e325e42b4487c6e2",
+  "0x127157561e774918ba656738fb61ad37f92086431bd4f1e4842ab11928b0f8d2",
+  "0x2e5cf59c8f2eee7a06d14cdedb8fe58945357cb16f4c792094325909a12924b2",
+  "0x0e29376c31f2aa7a156c6ce6d1fc9529998251d8500604658f173ff86adffa98",
+  "0x20761b8be9a186cf6a1730b8a1e99049a07e45c005e66d27b6e0ef15a2833e2f",
+  "0x1adf679b2441cf3535241924a35164cf8309256721e3f9fcb860bc2acc462b46",
+  "0x06a613741497b7b7ee978a495bfed7d19bbf76c462d268cee17a3920b1b1abe0",
+  "0x10ade06e253c1cfd65f24246211fb703c157fd9b563ffaf6ab01b6fba4635155",
+  "0x2311c6b104555d4d9afc7d66be6b47a41f8aa96eb77f613a75fc952da5975ccf",
+  "0x08431c3838d7ad6198c1d33ff138953ace3520551bd95b69692609ee11ded216",
+  "0x1822c33cf8097138c896bb9f7aad7def909a6859d5e640919fd16ebcf153a0db",
+  "0x11203b31ef49d39fb85a5ea474116c334c156091ab468493a480f13ad1ec1849",
+  "0x207a4712bacadd2f631fe253cb62932a7acb586dd6dd1b10e0fbe733f61a8f11",
+  "0x2c862b0eb14b1325a0ca63dda4570f718541d998fb4aba96339b7913b80757c9",
+  "0x1bf17ee7d3cf2487dcf1eb7a3647b0920c9e68aacc0a33c9a424d4ee6601ded3",
+  "0x2c70c9b7da7d7df78fcae182d124d7041209070f76d920e5d5c2d7590c385ea1"
 ]
     length = "0x0000000000000000000000000000000000000000000000000000000000000010"
 
@@ -6293,4 +6309,4 @@ length = "0x0000000000000000000000000000000000000000000000000000000000000000"
     inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
   [previous_kernel_public_inputs.fee_payer]
-  inner = "0x0c6be08a5e070b343e733716e4ad76ea05de25e2b7fc6e6f50f0ec549f7c0bfa"
+  inner = "0x0635e757a5f05ba5322db37d6930525b43c2e055ed7c4600559a07fc38ab09ec"
diff --git a/noir-projects/noir-protocol-circuits/crates/rollup-block-root-first-single-tx/Prover.toml b/noir-projects/noir-protocol-circuits/crates/rollup-block-root-first-single-tx/Prover.toml
index ee1f6695ee38..b60a27ba98d5 100644
--- a/noir-projects/noir-protocol-circuits/crates/rollup-block-root-first-single-tx/Prover.toml
+++ b/noir-projects/noir-protocol-circuits/crates/rollup-block-root-first-single-tx/Prover.toml
@@ -28,10 +28,10 @@ new_l1_to_l2_message_subtree_root_sibling_path = [
   "0x0aced6fe68143f4c7acd16345a8c1bb50c51a0692b760eb48728feb923d90757"
 ]
 new_archive_sibling_path = [
-  "0x29817ed2cd0626d9d386df0f85c886e467f3fd96ca7b2149222ac53690302871",
-  "0x169d81ad4a9064f775431bccba280de29114c9832ade937b94308c9f54e5af78",
+  "0x08c303b52910eab1e07d04de401bcbe8d8f36ca377c5168e795f7f5f4156bcd5",
+  "0x1cfdc3f191fd4278971f73de8ee4302bd29051bb0c93c1ba7a8a7feaa4e59846",
   "0x14e4b977b2203b70e6ee1c2456eb7114d090fe4b907f631eecd0919fed432e7d",
-  "0x05b046ac3626d2e59e73bb24881c4cb66c24684566860e077cd096137bfc4857",
+  "0x2b3b2f80ea4227dfe7ab4edec33942ff08b95b023d6d15efb0abde90594c993b",
   "0x1e20ad4181460cbfdc74ca773502c59b890f184efe300ebad895956d318422da",
   "0x1434e6e2d5db1053ab8a3be58704509c799ee17e109c77f441f7bf1755400249",
   "0x119f56a2e8423a7feaab49b9b5dcbadec0648dfa4096b61b6774ea33ae29dc7f",
@@ -477,140 +477,140 @@ new_archive_sibling_path = [
     [inputs.parity_root.public_inputs]
     sha_root = "0x00de7b349d2306334734e4f58b1302a6ed5a6c796a706f6597a5641b6d468223"
     converted_root = "0x0d04c63f36bd168215c9b09a227c7e8d3ad48e2f11b8202fd07c524bd30ee88f"
-    vk_tree_root = "0x0141caf6779674bc31225636c4cc4259a731835c52fc462f2dcbfabf7de01a1d"
+    vk_tree_root = "0x0c16448b65c4b3f83f9db3bebf635bd38957c74c9c1ea36036cbda16432cf558"
     prover_id = "0x0000000000000000000000003c44cdddb6a900fa2b585dd299e03d12fa4293bc"
 
     [inputs.parity_root.vk_data]
     leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000016"
     sibling_path = [
-  "0x259832d81ade32c589e6ab56f6c2bc4acf0b711b10e539b4ee38d8bacefbdcc3",
-  "0x00a28019e6ca588777548cd5e154dbf4f567f886cc8a01a812b4d3122f308cb7",
-  "0x03762ae9136a49df4624f45517c27d99c8b81a305e36011a211dda34608a3daa",
-  "0x2740690820f0df46bcbf149ccb51f228fb81a46173ad1793687319f77d32d49f",
-  "0x026fbe21cffb22c458f7e07b206bdaf767d39af34024eefe88e3d8b56eb9f695",
-  "0x19de2a32662702dd872e529ad89836e16b013012f910daf2bc7c2a67356dd107",
-  "0x1f07bca7a14f9a969539c0afd388affa18926689f431fc541841a2a7604d388c"
+  "0x03c2794698e7be6401d02011dc2296136a6aeb5a9ea3e6d244ece148cf45e1d0",
+  "0x2ba2de2d2cb820a66a273f2ba930d43a4469119ad58fe01eaed0e0d615ffb426",
+  "0x18f1abfe1a07005f35a20c06b468f7a4d3b68ecc2c025c88271b6550a827d41b",
+  "0x268f759e38c9ff705a78c055b44e19f7d2b0227f3c4f2e31d6874550d498abec",
+  "0x09f661abe743a7c8125aa0498ca1d01914fdac9cadadb415e0d1a05934997b99",
+  "0x28650667b92be48b116289119fa4794a5fe8fe5792a49d89b9977feae7f685a6",
+  "0x2aa74c20807e8cbb3e32a86ad29472c42a3fb7021dcfaad112a6b68eb0eca98e"
 ]
 
       [inputs.parity_root.vk_data.vk]
       key = [
   "0x0000000000000000000000000000000000000000000000000000000000000016",
-  "0x000000000000000000000000000000000000000000000000000000000000000b",
-  "0x0000000000000000000000000000000000000000000000000000000000000001",
-  "0x00000000000000000000000000000078b17daee7ce0a5fb9f5a84a2842c3b468",
-  "0x00000000000000000000000000000000001e4a85b98d71b0d69292687e2c5e94",
-  "0x00000000000000000000000000000000c3c7c53f8d6f387d02cbd30b373f624a",
-  "0x0000000000000000000000000000000000027492d891507b7fb721f827ec2125",
-  "0x000000000000000000000000000000448da0795e65c2acddb6a180b618ca4500",
-  "0x000000000000000000000000000000000026376b31e8ce3bb070bfed46801c3c",
-  "0x000000000000000000000000000000a8b4423143eb061d06dcf70a9b88d96cc0",
-  "0x0000000000000000000000000000000000140986c98f877b30ce48cb90461312",
-  "0x000000000000000000000000000000dc3228da5397acec91842e0564247a3281",
-  "0x00000000000000000000000000000000002c26f116c4120584e7c05868b9e034",
-  "0x000000000000000000000000000000f5ebf083289c311ee2d289dc034b0031b5",
-  "0x000000000000000000000000000000000027e5ca168fcf7984917277bd63aeb3",
-  "0x000000000000000000000000000000087667ff676cfafa2db57dd50364cfe79c",
-  "0x00000000000000000000000000000000002bb973ea83e8487c41459600a6ef16",
-  "0x00000000000000000000000000000000a38ca13acac1410f3d7ca6db34fa63f0",
-  "0x00000000000000000000000000000000002068ffd126a125d99af872b91155ff",
-  "0x000000000000000000000000000000fdc1eeb335429c34b4488e1ce565edd0be",
-  "0x00000000000000000000000000000000001279bb6460b4bdefc838d4cb235155",
-  "0x0000000000000000000000000000005ef93e2a85a22e47a3b3eabb4e229dfb95",
-  "0x000000000000000000000000000000000002085147ee68b313f39acde522a5b1",
-  "0x0000000000000000000000000000003601a6e8eaee36ae589e4f3efd39aacdd0",
-  "0x000000000000000000000000000000000015b26c9be4890cbf333c9d18e023f8",
-  "0x0000000000000000000000000000002597739e1725777058acf8c41ece5bc230",
-  "0x0000000000000000000000000000000000127f2d8950de2d351261de15ad3692",
-  "0x000000000000000000000000000000f0707fa498b915bb84481f22c68f82f852",
-  "0x0000000000000000000000000000000000026e1e4979e0d760c48aba45674641",
-  "0x000000000000000000000000000000ea45d31bd10dd18ccc02388e6f8b291dcc",
-  "0x000000000000000000000000000000000023e937480766000ba36ae295ec1e48",
-  "0x00000000000000000000000000000031baaf67d48e00f988f210e567ddd2b45d",
-  "0x00000000000000000000000000000000002715a3d431eafcba537d10c3033057",
-  "0x000000000000000000000000000000bbb3120089d0de7b11c4a1f29199f88181",
-  "0x00000000000000000000000000000000000367ef60efb55665d6d840fa949717",
-  "0x000000000000000000000000000000ed04c2879b84b210376953f58ce48eba0e",
-  "0x00000000000000000000000000000000000b092c857d4a2e5520dfaafb203c03",
-  "0x0000000000000000000000000000005da6cf732c008d8d037ca34a818312a024",
-  "0x000000000000000000000000000000000029f868f7234099b8361cb3510e7d8a",
-  "0x000000000000000000000000000000a0843902e624f3adccde6cf44e08311d4b",
-  "0x00000000000000000000000000000000000373ffc7fce598489f487b9c8c0ebd",
-  "0x000000000000000000000000000000a7314c6ed61312feaff048ba4b49842b7e",
-  "0x000000000000000000000000000000000028ef66d9ba57db55d9037eee6292af",
-  "0x000000000000000000000000000000d6a3a1c9a17835658d11e6a5d0fe9cf907",
-  "0x00000000000000000000000000000000001716bd0d35f792b5b5d1b3d57bceeb",
-  "0x0000000000000000000000000000008997c4ec5fabfd7e709a9e39a9ade4f7bf",
-  "0x00000000000000000000000000000000000f0a6f177b950ddd7b7eb33d04db21",
-  "0x00000000000000000000000000000039501b07dae9c6fb88b4c42448be3cb384",
-  "0x00000000000000000000000000000000001eaf14768ccbf9c57b217dec1e31d8",
-  "0x000000000000000000000000000000dc531c7d21f7b45ffbca2717ec44b041e8",
-  "0x0000000000000000000000000000000000279bdd1d3a8e15802c608c6b4708e1",
-  "0x000000000000000000000000000000b37783542b31dce0d8c31c0852e1d763c3",
-  "0x00000000000000000000000000000000002f467244c882fabc33838b10b7eb2a",
-  "0x000000000000000000000000000000ca408d8763a614b172e9b946a7dbb2e74b",
-  "0x0000000000000000000000000000000000262b64694fd389afba33f2989accea",
-  "0x000000000000000000000000000000b61193261fec588db146c2170e4d2b0a0e",
-  "0x00000000000000000000000000000000002f32c65a1fe400d17787690e55d2c8",
-  "0x00000000000000000000000000000007fbc70d900496b6366e965b79a2113b36",
-  "0x00000000000000000000000000000000002be977d4f13c3e45b8aa682458f534",
-  "0x00000000000000000000000000000019ec1befb0c5f1cddfebc885efc6265f95",
-  "0x000000000000000000000000000000000005d3ab687eed8f108bc3a75ec3b8e1",
-  "0x00000000000000000000000000000051bb7f4b08721f57f545ebc0e07d3eebf6",
-  "0x00000000000000000000000000000000000d9503879b9bd744448b6eb9fb2f7a",
-  "0x0000000000000000000000000000005a02ba394e9d2d3e77bcccd895c10694fc",
-  "0x000000000000000000000000000000000027e25fdc49dc55b63ef3d1ca90b5b2",
-  "0x00000000000000000000000000000091db8035e2aaa8610742df1503300087f9",
-  "0x0000000000000000000000000000000000021dc3eaf7990b12e4468c2e28bab0",
-  "0x000000000000000000000000000000e846d69b700fdd8b078052da8b91c352d7",
-  "0x00000000000000000000000000000000000c951fe8e7eb4a6298b14be6382f93",
-  "0x000000000000000000000000000000ec89072912c27066e932cf77f821994c90",
-  "0x0000000000000000000000000000000000182e68039cceed32fdac710403b7da",
-  "0x0000000000000000000000000000008debe6230106974006084e7308b4b5feca",
-  "0x00000000000000000000000000000000001ebd658ddc30d75e5e721359395120",
-  "0x0000000000000000000000000000006d3b5839b70a5b60de45166b9c2a4be3f5",
-  "0x00000000000000000000000000000000002ecf96badf1253c40c1486fabbfcad",
-  "0x00000000000000000000000000000098213252fb5d3b6c5a9747469ebcf0dcd9",
-  "0x00000000000000000000000000000000002d869db2f87c96d3e31e66aa911dda",
-  "0x000000000000000000000000000000555c7af1975654730348730a11775c9759",
-  "0x00000000000000000000000000000000002b8d102334de6b8cbc22090f9dda68",
-  "0x000000000000000000000000000000d34433dab85ff5064014d6b58f60d67c25",
-  "0x0000000000000000000000000000000000139da62905bcf796f7101bbc76122c",
-  "0x0000000000000000000000000000003840706e6d07460c44d74cba5c2b34358d",
-  "0x00000000000000000000000000000000000aa2f8b6291279bea275b7c9913258",
-  "0x000000000000000000000000000000019eaa3b842224650e76c5cb0e94484c6d",
-  "0x000000000000000000000000000000000006c9f637fbb6502a38f91b85ace5f5",
-  "0x000000000000000000000000000000efc01f95fe550a9a9f1476758824a74301",
-  "0x000000000000000000000000000000000003eaa2fbce3122916d12c78b219b9b",
-  "0x000000000000000000000000000000a6eda6357e83ebf12fcf13845427e4a057",
-  "0x0000000000000000000000000000000000255208b91373b2dede462b7e8b0b52",
-  "0x0000000000000000000000000000006d2aecad4cd09ada8fea8abb2ebbf070f5",
-  "0x000000000000000000000000000000000012bfb11d7a805c6e591f874ae3637a",
-  "0x000000000000000000000000000000f4a6c6ffdf80a72db78762e237d58cd5f6",
-  "0x000000000000000000000000000000000026814a59803555635a3b6dfd056d19",
-  "0x000000000000000000000000000000f45b8d96069231f48e0d0c34d57593a6a6",
-  "0x00000000000000000000000000000000000b9dc32399025796005b2f68c15991",
-  "0x000000000000000000000000000000750e1b5cb997a3adf8540bf55bb9264ec4",
-  "0x00000000000000000000000000000000001f6cd5b6d43f67798ae4655c016f37",
-  "0x000000000000000000000000000000596cc6183848f32c60ec74fe2bcd76b20f",
-  "0x00000000000000000000000000000000000ed62d10b019355f008b46412d0e2d",
-  "0x0000000000000000000000000000002020dfdab8c9db8335bca3c8284b1585b2",
-  "0x000000000000000000000000000000000023a2906d03204aa4f79b5b80b92eaa",
-  "0x0000000000000000000000000000009116c4d15f7c9a51f17c3830fe7c1e3b42",
-  "0x000000000000000000000000000000000024aecae332db48e03b97fc645a7f05",
-  "0x000000000000000000000000000000834c5e938cf9e8bd4bd5847e2408407276",
-  "0x000000000000000000000000000000000008524b40cf87b668119022f691cfac",
-  "0x000000000000000000000000000000e699df860731437ec57f9890fe4b3a4205",
-  "0x00000000000000000000000000000000000e1e9d4327e635f547da67aef57e86",
-  "0x0000000000000000000000000000000000000000000000000000000000000001",
+  "0x000000000000000000000000000000000000000000000000000000000000000c",
+  "0x0000000000000000000000000000000000000000000000000000000000000005",
+  "0x0000000000000000000000000000004f85c893bf8b1e843f2dffc48dc074f196",
+  "0x0000000000000000000000000000000000215339c99786f23abf06aa628e2bb5",
+  "0x00000000000000000000000000000021f56f1fd166b444f6945fef45a4260c98",
+  "0x000000000000000000000000000000000029832f088b0a8c0ed5fb1876da60ee",
+  "0x000000000000000000000000000000683bd852b0d5317d3104e00d57a7ff12fe",
+  "0x00000000000000000000000000000000000d2eb234e163af0321005edbadf074",
+  "0x00000000000000000000000000000043d1d78f4556dca95ed3ae27b1bb967956",
+  "0x00000000000000000000000000000000002406ce5529e27d341a34d8c9a819d2",
+  "0x000000000000000000000000000000d2bb936edd0bcb9cf33e24855aa3095d1e",
+  "0x000000000000000000000000000000000016629d2674b560633c3db0a21598ea",
+  "0x00000000000000000000000000000092c8bd15ab345a54468aba584a6f16e2b5",
+  "0x00000000000000000000000000000000001fbbe74a5bb8bad495a22f4a0384dd",
+  "0x000000000000000000000000000000d7dbc1eca647580a4a952821d02d282259",
+  "0x00000000000000000000000000000000002d68b4713f14d3be50ddb099e2b736",
+  "0x000000000000000000000000000000d4dfc475729d110ffc01eac27a1bb07187",
+  "0x000000000000000000000000000000000015026e1e1768366175d180725092cd",
+  "0x000000000000000000000000000000d799d0753526bf23193f9ab8f73c1c7307",
+  "0x0000000000000000000000000000000000052dcf1d1d89071ecfbfe34de96dff",
+  "0x0000000000000000000000000000008a7f1c8955fef499a04d57fa057c30e66a",
+  "0x00000000000000000000000000000000001fedcb5a5fb32238adaca91e2be32f",
+  "0x00000000000000000000000000000047c5bb126a6e6c788dec340b858f577f7d",
+  "0x000000000000000000000000000000000013e3b742ca471a245262fb2ecee07a",
+  "0x000000000000000000000000000000b6284febc7d58cc5491fee7334064865ef",
+  "0x00000000000000000000000000000000000038ae53da7215a286ebd0649136a1",
+  "0x0000000000000000000000000000006eed465622852dce8a0702c5327cff0583",
+  "0x000000000000000000000000000000000022b0941f412859d1cc37a757ca4375",
+  "0x0000000000000000000000000000008bef872c634b8c03bfe7ff37c00a727192",
+  "0x000000000000000000000000000000000004906c8767a040a562b166a360c43b",
+  "0x0000000000000000000000000000001770bcd5e95d6ed8c6299af5208e594351",
+  "0x00000000000000000000000000000000001170f991d5a8c2cece25a2eec45ac2",
+  "0x000000000000000000000000000000dd2567c65087f4413c4a68442f7838d361",
+  "0x00000000000000000000000000000000002b2e2b9fa7017ed5b534b950976cfb",
+  "0x00000000000000000000000000000060445810cd95870d181367a860937116e0",
+  "0x00000000000000000000000000000000000171fcd0debd9f9966aa439dafa69c",
+  "0x00000000000000000000000000000036d276aef0f30fea87630c34381ff63a36",
+  "0x000000000000000000000000000000000029a01a7f04aa1c5fc36c458ab5f806",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "0x0000000000000000000000000000000000000000000000000000000000000002",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "0x000000000000000000000000000000e402279945a076c945901fca356628c525",
-  "0x000000000000000000000000000000000012fedcb7313f77c3006a35e9fb9f8d",
-  "0x00000000000000000000000000000084a3a7ab7d80d65ae1cf14ed89c99c143a",
-  "0x00000000000000000000000000000000002ece2d07ef9c9b1afa02b75b16e861"
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x000000000000000000000000000000441c338c655b7e22f91724c986ec2a7d0a",
+  "0x00000000000000000000000000000000000988f7c276931907f533dfa99ae0ad",
+  "0x000000000000000000000000000000555d1bf8e49259a2b77c8e0caae5b13feb",
+  "0x00000000000000000000000000000000000716aa5a6148a8455d44f8759f22f5",
+  "0x0000000000000000000000000000006400f037f61c707f2729c70c5d912ce9d3",
+  "0x0000000000000000000000000000000000116682196031717f5d1cc4d903aafe",
+  "0x0000000000000000000000000000006459e7ac42c142260295108e744e33a0c1",
+  "0x000000000000000000000000000000000009228de1a4fbd3de4d757390f162da",
+  "0x00000000000000000000000000000067656846b7e2309e7c18c1cce38675bb00",
+  "0x000000000000000000000000000000000029e7406191ce46a9babc6ac5ff12cf",
+  "0x00000000000000000000000000000032e79eca379410f7ec358f9da21bac9fa9",
+  "0x00000000000000000000000000000000002c817548c195702d46fafe6ccd4faf",
+  "0x0000000000000000000000000000004fbb48b68f274f27d30cdcb82ee7cac9b2",
+  "0x0000000000000000000000000000000000068f9a71089873a24f8351d1e70d97",
+  "0x000000000000000000000000000000795c4af1416754d9625f084be947a93c64",
+  "0x000000000000000000000000000000000024e4ffd72d451203c5bc7d04a27116",
+  "0x0000000000000000000000000000008ca18e089457f9cceb58c823a944b03f26",
+  "0x00000000000000000000000000000000000422b4f22af36e628698a6865ddecd",
+  "0x000000000000000000000000000000fb52c4f612125db4012ed8a2e84e1d2c6c",
+  "0x000000000000000000000000000000000019dc534f8dd81d19f72590c6e1fb8e",
+  "0x000000000000000000000000000000fa01f84fdc11a5d03b14bee3a99a680c37",
+  "0x000000000000000000000000000000000022dad727328995272891d530216d61",
+  "0x000000000000000000000000000000b5f4bf23591d8b2447d60d61737c2c36bf",
+  "0x000000000000000000000000000000000002e2a075eaa9f4dd89c257af6cbab0",
+  "0x0000000000000000000000000000003561668a93cb72e95a340771ddc66e9c1a",
+  "0x00000000000000000000000000000000000026940a62997474ab260b2841eafb",
+  "0x00000000000000000000000000000075c66b2eeb9c27b8611335bafd53ed5e6b",
+  "0x000000000000000000000000000000000020720351df147e866486a5db6e8bf9",
+  "0x000000000000000000000000000000fa65c2574867f702f76ee91bf9721891f4",
+  "0x00000000000000000000000000000000000550d2b73072fe8ebb458db32bc272",
+  "0x0000000000000000000000000000005e45bf32b04d43d7d9e082552a7c6e3aab",
+  "0x0000000000000000000000000000000000156b9320b1c02a5ae4d5245079ef93",
+  "0x0000000000000000000000000000007dd31f38bd2d2529ea3d3537bddc4c2d8d",
+  "0x00000000000000000000000000000000001460b51e2428e23b3d5f0e0623a2a5",
+  "0x0000000000000000000000000000009973429339ccb353bf51ed2d258ab0c734",
+  "0x00000000000000000000000000000000002675f20f2783781dae8b8ceee4b947",
+  "0x000000000000000000000000000000f19f97ae0fa6b47d95ce8c99deff02825f",
+  "0x000000000000000000000000000000000008ac106283f7faa2a9523d6d3b6a65",
+  "0x000000000000000000000000000000ece35a6af0338418a01080dc9e20d76e8c",
+  "0x0000000000000000000000000000000000223186953dd9de4ffdf175c62fe17b",
+  "0x0000000000000000000000000000002cdb64ca6e6e3ae04f48e894d029463405",
+  "0x00000000000000000000000000000000002934e04d3c42257882836e1cd3c909",
+  "0x00000000000000000000000000000010928865f0c2b283d43e700debac484ce4",
+  "0x00000000000000000000000000000000001267fc086b1485e85ea3a8d0cd75de",
+  "0x000000000000000000000000000000f9cdf1ac824371f6761a75f1208a9ddfad",
+  "0x00000000000000000000000000000000000e0fdaaebe67864d0d5e9eadb9efc5",
+  "0x00000000000000000000000000000017a6567e4f95497a889a7d72f19789b322",
+  "0x0000000000000000000000000000000000288f112dfaacee642430e19b6959db",
+  "0x000000000000000000000000000000a16e293e7727181d85a1c007ac038f36fb",
+  "0x00000000000000000000000000000000000dd700294b3714e9f7b0e14b5d532b",
+  "0x0000000000000000000000000000008ac20e1e987aa4c40027fd4f9efd59fa05",
+  "0x0000000000000000000000000000000000154ef731c875ef2164785e8ff31c30",
+  "0x0000000000000000000000000000001911ff084795513c823a4fda7a38335e8c",
+  "0x0000000000000000000000000000000000302c54e62b85bc435230433f081725",
+  "0x000000000000000000000000000000c4779e7986fcf2ef065416576329f1c47c",
+  "0x00000000000000000000000000000000001ebeffb4dbaac41852670eeb9ede9d",
+  "0x000000000000000000000000000000f030e0b5c911d86aef1ef86fff6c540d91",
+  "0x00000000000000000000000000000000000bae7a5c23fa083c7231387cf8d78a",
+  "0x0000000000000000000000000000001942fc1702b7a2afec85c9a8473d44c487",
+  "0x000000000000000000000000000000000000210966c79a864b7f987cf31ab127",
+  "0x000000000000000000000000000000f77fcafc38ec30e711c06c5755d04144d6",
+  "0x00000000000000000000000000000000002db7460ea7c5e17383e5d1b8affeb4",
+  "0x0000000000000000000000000000007f430ccebae1fa38c07b989cb9ac4ccb2d",
+  "0x00000000000000000000000000000000001d815d190889cb37cacc2ccf4cfc96",
+  "0x0000000000000000000000000000001eee81b23a887f299049b14c11e98460d6",
+  "0x00000000000000000000000000000000002a56ce41f6b0be13b9c26747621b82",
+  "0x000000000000000000000000000000d5827d6338c78656c0d12ca1aea6ef2c7c",
+  "0x00000000000000000000000000000000001aa98f2de3ddda547d8f6de4e725de",
+  "0x0000000000000000000000000000003ef880305f8c4beb28f1f80f7cc0e7d3f2",
+  "0x00000000000000000000000000000000000483fb33808b70b4a034dca390e659",
+  "0x0000000000000000000000000000003d66a145da1b03e8dc9914efd105dac5e6",
+  "0x00000000000000000000000000000000002a25301cc6f9e024e87f0b58047b1e"
 ]
-      hash = "0x260bc49f0702223b7f21b3aa27a20c75348991d78be9041f06bde5d2b51a3fc3"
+      hash = "0x17df297aed2208dd702c20c31bd85e54e0984ff5f2e4c2032f507c647b261849"
 
   [inputs.previous_rollup]
   proof = [
@@ -1099,16 +1099,16 @@ new_archive_sibling_path = [
     [inputs.previous_rollup.public_inputs]
     num_txs = "0x0000000000000000000000000000000000000000000000000000000000000001"
     out_hash = "0x0000000000000000000000000000000000000000000000000000000000000000"
-    accumulated_fees = "0x0000000000000000000000000000000000000000000000000022df0587214f60"
-    accumulated_mana_used = "0x00000000000000000000000000000000000000000000000000000000000a3919"
+    accumulated_fees = "0x0000000000000000000000000000000000000000000000000022e452ad469ea0"
+    accumulated_mana_used = "0x00000000000000000000000000000000000000000000000000000000000a3979"
 
       [inputs.previous_rollup.public_inputs.constants]
-      vk_tree_root = "0x0141caf6779674bc31225636c4cc4259a731835c52fc462f2dcbfabf7de01a1d"
-      protocol_contracts_hash = "0x01af64239167dcc8333e25456aab71348f66d9f6de731a8b62181d16cf0818c1"
+      vk_tree_root = "0x0c16448b65c4b3f83f9db3bebf635bd38957c74c9c1ea36036cbda16432cf558"
+      protocol_contracts_hash = "0x0333160f082dfc02e255c756febac14dc42c4c88b882e0403d44710c1f0bb80f"
       prover_id = "0x0000000000000000000000003c44cdddb6a900fa2b585dd299e03d12fa4293bc"
 
         [inputs.previous_rollup.public_inputs.constants.last_archive]
-        root = "0x03d275a8edc90d3f952ec8f054b23256a99c78afb49333ede28977b2e085639d"
+        root = "0x24f3d6261780561e8ede638edf15d34d9f93372572631856307c57a08dfb9cb1"
         next_available_leaf_index = "0x000000000000000000000000000000000000000000000000000000000000000b"
 
         [inputs.previous_rollup.public_inputs.constants.l1_to_l2_tree_snapshot]
@@ -1117,43 +1117,43 @@ new_archive_sibling_path = [
 
         [inputs.previous_rollup.public_inputs.constants.global_variables]
         chain_id = "0x0000000000000000000000000000000000000000000000000000000000007a69"
-        version = "0x000000000000000000000000000000000000000000000000000000007b6d50be"
+        version = "0x00000000000000000000000000000000000000000000000000000000ad49d7cd"
         block_number = "0x000000000000000000000000000000000000000000000000000000000000000b"
         slot_number = "0x0000000000000000000000000000000000000000000000000000000000000043"
-        timestamp = "0x0000000000000000000000000000000000000000000000000000000069e4154a"
+        timestamp = "0x0000000000000000000000000000000000000000000000000000000069fde108"
 
           [inputs.previous_rollup.public_inputs.constants.global_variables.coinbase]
-          inner = "0x000000000000000000000000080c5a37d2d3dade855a034bac3548a8b2dfd887"
+          inner = "0x000000000000000000000000fde0805eba75f23cd30a3bb4f0e567a356075904"
 
           [inputs.previous_rollup.public_inputs.constants.global_variables.fee_recipient]
           inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
           [inputs.previous_rollup.public_inputs.constants.global_variables.gas_fees]
           fee_per_da_gas = "0x0000000000000000000000000000000000000000000000000000000000000000"
-          fee_per_l2_gas = "0x000000000000000000000000000000000000000000000000000000036939d660"
+          fee_per_l2_gas = "0x00000000000000000000000000000000000000000000000000000003699e8ba0"
 
 [inputs.previous_rollup.public_inputs.start_tree_snapshots.note_hash_tree]
-root = "0x1a39796064aa1aeebaebaca37917db6423d8d5131ce212ca6d3c2be5bbd30ad7"
+root = "0x2126a6e400b3fae90b44b74482d5b59dc707ba8f044c90a5f0e06ff48029f19f"
 next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000300"
 
 [inputs.previous_rollup.public_inputs.start_tree_snapshots.nullifier_tree]
-root = "0x2cc15ff664224a4d4d337795275531782515bd07a1c1955ee8c660c47cdde71e"
+root = "0x0e8d32952999631ff527d706426177bdb3208db1d3b8dd4e74ba883610dc37e5"
 next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000380"
 
 [inputs.previous_rollup.public_inputs.start_tree_snapshots.public_data_tree]
-root = "0x190440c1bb70c1406315a413d336eecf1ef4c5e69b192d80ef041401a0ae97da"
+root = "0x0d21d4944ca04ad548057c7362ba76b7370e29929fe9cdd32ec1d04c07e21179"
 next_available_leaf_index = "0x000000000000000000000000000000000000000000000000000000000000008b"
 
 [inputs.previous_rollup.public_inputs.end_tree_snapshots.note_hash_tree]
-root = "0x1a39796064aa1aeebaebaca37917db6423d8d5131ce212ca6d3c2be5bbd30ad7"
+root = "0x2126a6e400b3fae90b44b74482d5b59dc707ba8f044c90a5f0e06ff48029f19f"
 next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000340"
 
 [inputs.previous_rollup.public_inputs.end_tree_snapshots.nullifier_tree]
-root = "0x138b48bd6b432bec319631005483ee02da41be447b0880b96f538531276eca80"
+root = "0x28f8d2b1f0315d8539c1e4ff651e2eaac034de0a2271cd6f198f557ecf449cb1"
 next_available_leaf_index = "0x00000000000000000000000000000000000000000000000000000000000003c0"
 
 [inputs.previous_rollup.public_inputs.end_tree_snapshots.public_data_tree]
-root = "0x1b373d273e8879bde4a68984ceb57f9b7b09f161d34e0e7ce4ef0ae1c36442ec"
+root = "0x1a010e7a4312757d9349e0058c907064764c9836de016199dbd957ca46fefc3b"
 next_available_leaf_index = "0x000000000000000000000000000000000000000000000000000000000000008b"
 
       [inputs.previous_rollup.public_inputs.start_sponge_blob]
@@ -1179,15 +1179,15 @@ next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000
 
         [inputs.previous_rollup.public_inputs.end_sponge_blob.sponge]
         cache = [
-  "0x00000000000000000000000000000000000000000000021e00b0b6d17ee4df40",
+  "0x00000000000000000000000000000000000000000000021e00afaeb15ed67ca0",
   "0x0000000000000000000000000000000000000000000000000000000000000af0",
-  "0x15cecc56c070afe91aacccc6d3b165ad1f791b7644f606f6f60eaa2f87826abc"
+  "0x12d1296a2643b832fbd1d6d3ed3678833fce770084efd75adfd517de8214ccf3"
 ]
         state = [
-  "0x1457f84238b2daca3ab35b82dbc9e3133cde33a1f23080943c3740425fa2896c",
-  "0x0986f6b11b9191a84803e8ff8e2b6725067ad369b290ecc273afec1d53e00ba4",
-  "0x1a262707c802338f6a94894cc21a3cea6b1a524ef91131b1d76bde6c9dc9c0cd",
-  "0x2f7f060bc8b5ff7dcb270a4c939ee02ebab67500485b6b99916415f7f690459c"
+  "0x11cc4dd8716179a3121aa6820cf8805b0e65d61d2b958fe317a1ec807c461a21",
+  "0x0027ae2792755b030071ea296ff933c1fbc939538b5565420ed3e94832815961",
+  "0x20fa0000aefa41fd803dab187b732d999bc74c8fbd1093faea082ec34b9a2976",
+  "0x15a69510721f899245edece9d54fb2ab846e01ef0c7480c8a80c649d69839cbd"
 ]
         cache_size = "0x0000000000000000000000000000000000000000000000000000000000000001"
         squeeze_mode = false
@@ -1195,134 +1195,134 @@ next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000
     [inputs.previous_rollup.vk_data]
     leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000008"
     sibling_path = [
-  "0x0f8f726e833df2994b5e4f7236bb20b770b92eeddaa5e11c229e396b784aac56",
-  "0x24d3d34d155de7ba76e941299ef9b12edeb7de094e758c30ab32f54a32954ae5",
-  "0x234d319aa3526e9e00d76d9b5b9b18b435756035ad00d8d716e1be50ac82ead3",
-  "0x2648004ca39ab2f7f01e8733c2de2d035675568a1c98d1410ce90ac2512e72e2",
-  "0x15313312ac8ca4825afd3891479fbb14626ca65499d939e23b1f653cd7d018ea",
-  "0x19de2a32662702dd872e529ad89836e16b013012f910daf2bc7c2a67356dd107",
-  "0x1f07bca7a14f9a969539c0afd388affa18926689f431fc541841a2a7604d388c"
+  "0x09b4bb0061881fc354c5fadf8dc55f36b0c67dc3b2f58a18406363dfa0b079fa",
+  "0x2136af42d41c58f3fd528f4e88c2de5152c2bb251a3c4d8950d4401a0c8ae6ff",
+  "0x02d4017a1d1c142d1fdf34bf701748bd9db29906e0114ac657648a51d10b6799",
+  "0x099ef6a9a40aaf85e056bda90684adf858addbb90af303d82f8157b86b705b92",
+  "0x25f6f5fc25ee815cef59a1889f1e39db3d431d01b01ee1554f9492afec9d41d6",
+  "0x28650667b92be48b116289119fa4794a5fe8fe5792a49d89b9977feae7f685a6",
+  "0x2aa74c20807e8cbb3e32a86ad29472c42a3fb7021dcfaad112a6b68eb0eca98e"
 ]
 
       [inputs.previous_rollup.vk_data.vk]
       key = [
   "0x0000000000000000000000000000000000000000000000000000000000000017",
   "0x0000000000000000000000000000000000000000000000000000000000000042",
-  "0x0000000000000000000000000000000000000000000000000000000000000001",
-  "0x0000000000000000000000000000008580b9a8c85e4a3c1e7b1089bd79f3bc28",
-  "0x000000000000000000000000000000000022dc01e3ed0e1b10bdcff9d093431a",
-  "0x00000000000000000000000000000054f9950035e8ffae852707e9d1a9032e59",
-  "0x0000000000000000000000000000000000276c56cb94e0545b3bfd85919a8ce8",
-  "0x0000000000000000000000000000009352ff9d82645804416a2b338260fa235d",
-  "0x000000000000000000000000000000000010a253776d2bdcb7129acfa2e91ac5",
-  "0x00000000000000000000000000000095babbbc4a6d5a9b68707c3a8e1e9508e2",
-  "0x000000000000000000000000000000000030157ca77e90f7ee9155c1009b06a1",
-  "0x000000000000000000000000000000068047e82e283284235befaa9cc7a1838d",
-  "0x00000000000000000000000000000000000bcd70cc5042e81e440b1ea5ef3c3f",
-  "0x0000000000000000000000000000007702a95c1bf5e2923ca69f26cc2d7efe0f",
-  "0x00000000000000000000000000000000000adeb0e8b1074c68de2b2172f21c5e",
-  "0x000000000000000000000000000000520354133ccbbccfc69be0c01b92abdf0f",
-  "0x00000000000000000000000000000000002dea248e3c2fe054c698a861bf4c27",
-  "0x000000000000000000000000000000f93b6112b7de5c27298a81c68d502b7beb",
-  "0x00000000000000000000000000000000002be3a33fc9502b0cc8b9427fcfe50f",
-  "0x000000000000000000000000000000168f01ff83f4a014a90db19e5d882a0a0a",
-  "0x000000000000000000000000000000000008876edc3cc7e3825dc194e21cb011",
-  "0x0000000000000000000000000000006d1df389f06e514e1829af3744dc64294a",
-  "0x000000000000000000000000000000000022e86ef68622bd107e5080cc062a4f",
-  "0x000000000000000000000000000000d137fc89e86049cb1b141b67b3361b6298",
-  "0x00000000000000000000000000000000001d7ad7d0634dc08d7d9816b5b6814c",
-  "0x000000000000000000000000000000defd2454e2c3a75ec8e0730bd3640b9408",
-  "0x00000000000000000000000000000000000b189f6ee9395b1ca5771c361501d7",
-  "0x00000000000000000000000000000001fccf755f5b30a7d544b2f78ce075cb5d",
-  "0x000000000000000000000000000000000026f5423942948047e155a519b195e8",
-  "0x000000000000000000000000000000a9efc76daffb8dfe2a39570b2d5d046767",
-  "0x000000000000000000000000000000000026e7dd89fe96952a4603c2b5555538",
-  "0x00000000000000000000000000000008262b430328dcaab242dd8acc504e8ac9",
-  "0x000000000000000000000000000000000015f3ab1410f0e5dd3e00f03b9f563b",
-  "0x0000000000000000000000000000008fca5ff8ed9a5d41fe9b451f02502dd1c9",
-  "0x0000000000000000000000000000000000266aa6e4947434ef18adeba3700713",
-  "0x000000000000000000000000000000d93cecd04341f5da304f3c92f0670afc43",
-  "0x000000000000000000000000000000000020165b3fd2bfb72a4de3dc68f66eed",
-  "0x000000000000000000000000000000094a6d376eb3cc1ba94b4da00dea583eac",
-  "0x00000000000000000000000000000000001caf7742d251b04f3517f0f1e5a625",
-  "0x0000000000000000000000000000003be5647cd472ad0b06a48f632997e3eea2",
-  "0x000000000000000000000000000000000015fb4d9ecb8125b3243cee37698c48",
-  "0x0000000000000000000000000000000854a3ab5bcbca1e86d4949b1b7c5f4b0e",
-  "0x000000000000000000000000000000000015450314fbf315448dc3379dc82214",
-  "0x0000000000000000000000000000009c2c55d2ea5bdf5fc5e28f1a78b1d29625",
-  "0x000000000000000000000000000000000020b36a8406ec64352600587cf04194",
-  "0x000000000000000000000000000000f14d08d9dab6a54412d741166146188ae6",
-  "0x00000000000000000000000000000000001b5a34ccd7eaf5cd09ab920011552f",
-  "0x00000000000000000000000000000074b7827a59faf701f7f41df26e5476c40c",
-  "0x00000000000000000000000000000000002decbab1c87b933da1625951860793",
-  "0x000000000000000000000000000000751aab48a0e01094128242ea0aaab63ff7",
-  "0x00000000000000000000000000000000001a2a334289adf8d23d4d52caf4cfe6",
-  "0x000000000000000000000000000000f6a41261290460b25e1e7d7bf69b564ae6",
-  "0x00000000000000000000000000000000000296925feaed4585bb03319f126d96",
-  "0x00000000000000000000000000000055b70d653ebd7df04f720951e76a27369b",
-  "0x000000000000000000000000000000000019744937a687edc9f46fb8323a46d9",
-  "0x00000000000000000000000000000047978fda5b64d8fc4571f09da3e8ccc7de",
-  "0x0000000000000000000000000000000000139de6a387109f47ecbacc74e03742",
-  "0x0000000000000000000000000000007f5afdfcb7bcd85aa293676e18e899a03e",
-  "0x000000000000000000000000000000000006a2971c1c947f4cadb07ebc9bc980",
-  "0x0000000000000000000000000000006cdb69a57b7f7a25b99e18fc0f83c1bc70",
-  "0x000000000000000000000000000000000028f2a76a01dc3cc927cdba29383e9b",
-  "0x0000000000000000000000000000001bbc4d6033de44907975ce473bc0f4f148",
-  "0x00000000000000000000000000000000002642f26fc1850c4b9b7fc4cd860ab9",
-  "0x000000000000000000000000000000ac996074e35eb268f6ebbe99e9c7d26c47",
-  "0x00000000000000000000000000000000002262620617978a01f75646f1909969",
-  "0x000000000000000000000000000000e63aa32bcc098428f407b5e07d9cb26118",
-  "0x000000000000000000000000000000000022b294b6a7dc4c17319f9a91a1b443",
-  "0x000000000000000000000000000000649d9ce9147431632893f55d3c6bbc158e",
-  "0x000000000000000000000000000000000020698c9b0787f14aa66a57bc232ec1",
-  "0x000000000000000000000000000000b4fde29f9bde909609d70bf9862dd65cf1",
-  "0x000000000000000000000000000000000005fcac9b75cac50d87ca827678c070",
-  "0x00000000000000000000000000000071e27b0a0dd0e2180985072f4a949f0c1d",
-  "0x000000000000000000000000000000000025d2d1388eddcf016213f1cadc763f",
-  "0x000000000000000000000000000000b216bad715cdfa7c382d30d7a368cc1346",
-  "0x0000000000000000000000000000000000302dbbf78b13a6d71d1978b5607145",
-  "0x00000000000000000000000000000002ebdec49969d2ff9220240bbcb8730617",
-  "0x000000000000000000000000000000000027f41cad8540e47008c1da90340ef6",
-  "0x000000000000000000000000000000e8259148321315cc34166a206fe910c6cb",
-  "0x000000000000000000000000000000000013444efc30c7688d961f36de252af6",
-  "0x0000000000000000000000000000005b7c7ad432291e9dff1dfad51159e50dbf",
-  "0x0000000000000000000000000000000000205ec973a0d1c898c1def7852353b3",
-  "0x0000000000000000000000000000007940a7e88fe5ce47af688975c92be1b62a",
-  "0x000000000000000000000000000000000015bdab44fe41eec6ee62ed58f55ff5",
-  "0x0000000000000000000000000000003693b90aedcd664eede665df6f376cf526",
-  "0x0000000000000000000000000000000000207c38fd6851d1568fe18a83585f31",
-  "0x000000000000000000000000000000f1a8a60975b9b092aab1421166be08c2f5",
-  "0x000000000000000000000000000000000015450d2e8ea17db209302582b886f1",
-  "0x000000000000000000000000000000526e857040a344bd434bfdbf94d3a49196",
-  "0x00000000000000000000000000000000000d0112b922a852c4754ab3929d6d02",
-  "0x000000000000000000000000000000d88041fa28c8118a58ceacbcc8780844b5",
-  "0x00000000000000000000000000000000002584170ebef150b71c5e6aa93e2fbb",
-  "0x0000000000000000000000000000006363c23486d6a7a313beac4e2d9611968a",
-  "0x0000000000000000000000000000000000085acee4523161ab1e268a4f0c1b0f",
-  "0x000000000000000000000000000000b250d5a528a555d96d498fc9af4f8cc5c2",
-  "0x000000000000000000000000000000000017080f8d1d21b541de1c64d8b794df",
-  "0x000000000000000000000000000000621557759a0775ea5575adc9c6fbd96d56",
-  "0x00000000000000000000000000000000001cd60c23a37c42d7e46e1e19e966ae",
-  "0x0000000000000000000000000000000d52081b2311a7e9bf52407cf3d2c336b3",
-  "0x0000000000000000000000000000000000003b2312f2f2f419434a1440d40c69",
-  "0x000000000000000000000000000000d26082083660d6ac8bffb639994e4500e7",
-  "0x000000000000000000000000000000000019d6ef8ce569e7fa55b8aab7f5eea6",
-  "0x00000000000000000000000000000078d8a04f7b6c536d3a8a35c790b4dc7ddc",
-  "0x00000000000000000000000000000000001111470a41156a530334d2c08511a5",
-  "0x0000000000000000000000000000008ab4119a5478448b7ec3573de2cdfd8e56",
-  "0x0000000000000000000000000000000000263c7bd4cde5591308156c458d2989",
-  "0x0000000000000000000000000000004a676142c9eca140ac96ab9ca49633e141",
-  "0x00000000000000000000000000000000001de62520faa095ad7513f753e0a73e",
-  "0x0000000000000000000000000000000000000000000000000000000000000001",
-  "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "0x0000000000000000000000000000000000000000000000000000000000000002",
-  "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "0x000000000000000000000000000000a2c4fbcbebac01e208127093cbf44780d4",
-  "0x00000000000000000000000000000000001ca34545a074b1cb689aa0b343402d",
-  "0x000000000000000000000000000000a58c28598055d8818a6dbadd0018904386",
-  "0x0000000000000000000000000000000000152154cbc213630f5c7ec1ee37751b"
+  "0x0000000000000000000000000000000000000000000000000000000000000005",
+  "0x0000000000000000000000000000008a8843c678d444ced3a35d87626e56ed9f",
+  "0x0000000000000000000000000000000000060403e4feb303ebae0081cbad4e96",
+  "0x000000000000000000000000000000f0fe138760bd40aadc43c77ad160555212",
+  "0x0000000000000000000000000000000000154e802ee66f7a511a469adb8153e5",
+  "0x00000000000000000000000000000012b75e2667d243bc4bb7b0cde3bdc5eefc",
+  "0x000000000000000000000000000000000013e94fa83017e580a2e280e4f8c376",
+  "0x000000000000000000000000000000fb8b3161040e7a5502bf277aec7b82cb6b",
+  "0x000000000000000000000000000000000014e7113349a6d4f2b0d3c9bde42075",
+  "0x0000000000000000000000000000006bc15064df220ad5d2fea722296bf72c99",
+  "0x00000000000000000000000000000000002039216ff43d16e0a63e542794decf",
+  "0x000000000000000000000000000000f0d3e00b510ae4272fbba83d787c7e6b6e",
+  "0x000000000000000000000000000000000022f73b00c62c39fc49fbffa96081da",
+  "0x0000000000000000000000000000000ff9f67bc7c9b90987dbed3fadf40bacc4",
+  "0x00000000000000000000000000000000001dc87bb292ea49bdb5bb87509c9781",
+  "0x00000000000000000000000000000025239c23a65572724acdd6663984afc224",
+  "0x000000000000000000000000000000000005e345da6870bd306f04558f601b45",
+  "0x000000000000000000000000000000cb380ac3dc3f8788bab24fcb5d9eedc949",
+  "0x000000000000000000000000000000000017714c1fab296b76d2f78ed675c1ce",
+  "0x00000000000000000000000000000095bca1a9f9a186f7ec34e43c479e5d1b2f",
+  "0x000000000000000000000000000000000018d292be64529b7e9ec24c76e561d9",
+  "0x0000000000000000000000000000006f1bd711730ae2aaf83227b9d9f46daa43",
+  "0x00000000000000000000000000000000002df0b894f5971084c0a65839178a66",
+  "0x000000000000000000000000000000909f2efe0bffa95e984d456089f568f59b",
+  "0x00000000000000000000000000000000002908f2c7ddf9573df347d6c9f22fde",
+  "0x0000000000000000000000000000006f206a04895661d3bd004222a1f8a7fc73",
+  "0x00000000000000000000000000000000001b12a59a820d3aa543a594a1b9d92f",
+  "0x0000000000000000000000000000002103559842aca1e08af33bb1f714ebc02a",
+  "0x00000000000000000000000000000000001b8936a0be628b58af9859c2a851d1",
+  "0x000000000000000000000000000000d2c67f3c526e05aa6d25558ae65cf0e3ac",
+  "0x000000000000000000000000000000000006cc97b785475ed3429d939fa00e96",
+  "0x000000000000000000000000000000c5240a725c016a35037b37f73c37b68de9",
+  "0x000000000000000000000000000000000015e6206f121de2aafe259c32889a4b",
+  "0x0000000000000000000000000000004cba3ce39736c272ff963bdbdfcb67c2ef",
+  "0x0000000000000000000000000000000000243b3786310485c3234295957c5222",
+  "0x0000000000000000000000000000002c3672eaf01e849995fc3f6dc99dcd1d60",
+  "0x00000000000000000000000000000000001449e8673b109f980a1542f1ddd670",
+  "0x000000000000000000000000000000f077af86375782052dfc713a0c67f9a08b",
+  "0x0000000000000000000000000000000000124108d868884e76f5ceeb60b2bdae",
+  "0x00000000000000000000000000000029c3fd985c5dd5867bd8fed36ad940e02d",
+  "0x0000000000000000000000000000000000146fedc34ca9246ab0df070f31ee14",
+  "0x000000000000000000000000000000706a32f5a8f5fa44205bb08662e0ef1396",
+  "0x000000000000000000000000000000000016ded7f7f0b72d3ecf256f5c2ee613",
+  "0x0000000000000000000000000000002eaf856304cdbbb4d0b926d9c9211028c0",
+  "0x000000000000000000000000000000000004696250db37878179b548105ff54e",
+  "0x000000000000000000000000000000047767298e4177562ddcbcae03c7ec6ccc",
+  "0x00000000000000000000000000000000001f29f52f5f45f28e462390b0f914f9",
+  "0x00000000000000000000000000000004e950f9459bf160429275bc6a733319ea",
+  "0x0000000000000000000000000000000000175f23657f8f899b10b84c1ffe432c",
+  "0x0000000000000000000000000000006e522620788963bd42d9ab48810f89afe4",
+  "0x00000000000000000000000000000000002243c76dbde36a37e42b92bae3eb16",
+  "0x0000000000000000000000000000005641fbcbddd5abb62d653fd7f1ed10ed7e",
+  "0x000000000000000000000000000000000007d25e6a46da918fdb902e1a78efb4",
+  "0x00000000000000000000000000000065f7509bb551cb061c5fd1e92bc85a4974",
+  "0x00000000000000000000000000000000002efbc0dd9b88baa9675d95ae595e68",
+  "0x00000000000000000000000000000046bdd1d7603fdb2ee53f8966b3069082a5",
+  "0x0000000000000000000000000000000000161d3346daa3f83e4416d59e8135b6",
+  "0x000000000000000000000000000000ec124a53466d06b5e0df3e77f9f6a6ae15",
+  "0x0000000000000000000000000000000000128b36a77e814ffa503da6fd061fc3",
+  "0x0000000000000000000000000000002cfa5f8d00fe2bbdd85db6b0179a4c7346",
+  "0x00000000000000000000000000000000002b7ce5f45710c4b113f7ca6b3291b0",
+  "0x00000000000000000000000000000054409cb824bb2028eb6a501f9585b13eda",
+  "0x000000000000000000000000000000000026412333aa334f56e0761374f0c38b",
+  "0x0000000000000000000000000000002a23ae58cbd13760028a699488d5a4300f",
+  "0x0000000000000000000000000000000000225067a42bdcd7d9eec23d250acc92",
+  "0x0000000000000000000000000000006e28e63b7d6bc65c15c009f5dd9304f8fd",
+  "0x00000000000000000000000000000000002648ab0c9cfefbb147853e364bef8d",
+  "0x000000000000000000000000000000f00a9e6c1594965b7c14b2310b489b52f9",
+  "0x00000000000000000000000000000000000a03f4283d5d64b7245827349741ee",
+  "0x00000000000000000000000000000073f3c5531dc194b7332ef4e765192e3962",
+  "0x0000000000000000000000000000000000088b01c6cab84d827c1d8eae1ebbbd",
+  "0x000000000000000000000000000000e197f3a024045bec491c28fc4b7594347b",
+  "0x000000000000000000000000000000000025bf29aee6c0dd8976574600dfacea",
+  "0x00000000000000000000000000000023cebfa19e1e206b1d71359821037c31b7",
+  "0x00000000000000000000000000000000000c2354b63a0bcd72350e606c3fa0e7",
+  "0x000000000000000000000000000000fcf564b220543fd0aea7b28c05df85fe3a",
+  "0x00000000000000000000000000000000000c2f035d78985f2c0e4ab138790e69",
+  "0x0000000000000000000000000000005129d16313e897118223bd963067e22700",
+  "0x000000000000000000000000000000000004c87b337be4b82e809af637daef82",
+  "0x000000000000000000000000000000279941b3633c9a8e9fc6e68ef4be5633f4",
+  "0x00000000000000000000000000000000002a9334f2cfa791a9bbc88cc234a5d2",
+  "0x000000000000000000000000000000ab1a8db808cb2b1b90ba26085c23154102",
+  "0x00000000000000000000000000000000002c04e8fdbd1f2154a1b42961e3b6b5",
+  "0x0000000000000000000000000000005729f9b6dcfc45fa934c44ad8800e2b7c6",
+  "0x00000000000000000000000000000000002c584d4df5aaa602e46e5033408d64",
+  "0x0000000000000000000000000000004daf206a533411e7b39ab99acaf3287ca2",
+  "0x000000000000000000000000000000000020d85db8daa0dd9c83ceda296cbe73",
+  "0x000000000000000000000000000000ab6d868729c089d55819b59b1df10e26ce",
+  "0x000000000000000000000000000000000004b5421430befd61f014813d315ade",
+  "0x0000000000000000000000000000005eefcb3c6f69064ed55425945fcc74c2bc",
+  "0x00000000000000000000000000000000001613278bd29c20c182e6f3b5e367ce",
+  "0x0000000000000000000000000000006c39d4dd8c65752b9bc2628fcc3dbf415c",
+  "0x00000000000000000000000000000000000d4b721e385647b57de3efbc9952db",
+  "0x000000000000000000000000000000e26e87fb5ad793c153110c1e55129d9ee7",
+  "0x00000000000000000000000000000000001986fe851f46fd25818f580f9d55f1",
+  "0x0000000000000000000000000000007a7eb895f6f2419aafb58de3f81b3f6739",
+  "0x00000000000000000000000000000000000d1289085013119c588fbcdbb11f5e",
+  "0x00000000000000000000000000000061358ce9820bc7ced39ca91d017f767cfa",
+  "0x000000000000000000000000000000000018a26c04d92048605adf6b40fbe696",
+  "0x000000000000000000000000000000924ee754d49e43f0991a540ece79958ad1",
+  "0x00000000000000000000000000000000001faa0f64d400addf955b2f4a8181ec",
+  "0x0000000000000000000000000000000c13651a87f101a4d0bf32619d4326c45b",
+  "0x000000000000000000000000000000000002809feb719732fbf341dd249e671d",
+  "0x0000000000000000000000000000003523e8c751d17a4dcd30540a4f9261403b",
+  "0x00000000000000000000000000000000001466cc1bd7c1743fca0477c4ea4481",
+  "0x0000000000000000000000000000001eee81b23a887f299049b14c11e98460d6",
+  "0x00000000000000000000000000000000002a56ce41f6b0be13b9c26747621b82",
+  "0x000000000000000000000000000000d5827d6338c78656c0d12ca1aea6ef2c7c",
+  "0x00000000000000000000000000000000001aa98f2de3ddda547d8f6de4e725de",
+  "0x000000000000000000000000000000bd9c096acdaa162e6c7ee9b718f7fbf759",
+  "0x00000000000000000000000000000000002c70947eefbeb3fcbc1953b2ccb88f",
+  "0x00000000000000000000000000000045e09e50b539ce6228369e4b4cb8530ce0",
+  "0x0000000000000000000000000000000000062cf2c7d023a38df32e6c8c04a8c1"
 ]
-      hash = "0x0c9b0fab06de495eb1835dc184eb51d6584a970a90bb9c9dba17ab97e9b6dee6"
+      hash = "0x208d8b1ad2d688325416c8a23881e8b14753352851d7740b339ea2ebd455cdcc"
 
   [inputs.previous_l1_to_l2]
   root = "0x0fef6d80d31109ddb56d6b3f607cbc9c0af0bff3ea0d43e8f278983c64c11f7a"
diff --git a/noir-projects/noir-protocol-circuits/crates/rollup-block-root-first/Prover.toml b/noir-projects/noir-protocol-circuits/crates/rollup-block-root-first/Prover.toml
index 3de7404edac2..969d8532627b 100644
--- a/noir-projects/noir-protocol-circuits/crates/rollup-block-root-first/Prover.toml
+++ b/noir-projects/noir-protocol-circuits/crates/rollup-block-root-first/Prover.toml
@@ -29,9 +29,9 @@ new_l1_to_l2_message_subtree_root_sibling_path = [
 ]
 new_archive_sibling_path = [
   "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "0x169d81ad4a9064f775431bccba280de29114c9832ade937b94308c9f54e5af78",
+  "0x1cfdc3f191fd4278971f73de8ee4302bd29051bb0c93c1ba7a8a7feaa4e59846",
   "0x14e4b977b2203b70e6ee1c2456eb7114d090fe4b907f631eecd0919fed432e7d",
-  "0x05b046ac3626d2e59e73bb24881c4cb66c24684566860e077cd096137bfc4857",
+  "0x2b3b2f80ea4227dfe7ab4edec33942ff08b95b023d6d15efb0abde90594c993b",
   "0x1e20ad4181460cbfdc74ca773502c59b890f184efe300ebad895956d318422da",
   "0x1434e6e2d5db1053ab8a3be58704509c799ee17e109c77f441f7bf1755400249",
   "0x119f56a2e8423a7feaab49b9b5dcbadec0648dfa4096b61b6774ea33ae29dc7f",
@@ -477,140 +477,140 @@ new_archive_sibling_path = [
     [inputs.parity_root.public_inputs]
     sha_root = "0x00de7b349d2306334734e4f58b1302a6ed5a6c796a706f6597a5641b6d468223"
     converted_root = "0x0d04c63f36bd168215c9b09a227c7e8d3ad48e2f11b8202fd07c524bd30ee88f"
-    vk_tree_root = "0x0141caf6779674bc31225636c4cc4259a731835c52fc462f2dcbfabf7de01a1d"
+    vk_tree_root = "0x0c16448b65c4b3f83f9db3bebf635bd38957c74c9c1ea36036cbda16432cf558"
     prover_id = "0x0000000000000000000000003c44cdddb6a900fa2b585dd299e03d12fa4293bc"
 
     [inputs.parity_root.vk_data]
     leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000016"
     sibling_path = [
-  "0x259832d81ade32c589e6ab56f6c2bc4acf0b711b10e539b4ee38d8bacefbdcc3",
-  "0x00a28019e6ca588777548cd5e154dbf4f567f886cc8a01a812b4d3122f308cb7",
-  "0x03762ae9136a49df4624f45517c27d99c8b81a305e36011a211dda34608a3daa",
-  "0x2740690820f0df46bcbf149ccb51f228fb81a46173ad1793687319f77d32d49f",
-  "0x026fbe21cffb22c458f7e07b206bdaf767d39af34024eefe88e3d8b56eb9f695",
-  "0x19de2a32662702dd872e529ad89836e16b013012f910daf2bc7c2a67356dd107",
-  "0x1f07bca7a14f9a969539c0afd388affa18926689f431fc541841a2a7604d388c"
+  "0x03c2794698e7be6401d02011dc2296136a6aeb5a9ea3e6d244ece148cf45e1d0",
+  "0x2ba2de2d2cb820a66a273f2ba930d43a4469119ad58fe01eaed0e0d615ffb426",
+  "0x18f1abfe1a07005f35a20c06b468f7a4d3b68ecc2c025c88271b6550a827d41b",
+  "0x268f759e38c9ff705a78c055b44e19f7d2b0227f3c4f2e31d6874550d498abec",
+  "0x09f661abe743a7c8125aa0498ca1d01914fdac9cadadb415e0d1a05934997b99",
+  "0x28650667b92be48b116289119fa4794a5fe8fe5792a49d89b9977feae7f685a6",
+  "0x2aa74c20807e8cbb3e32a86ad29472c42a3fb7021dcfaad112a6b68eb0eca98e"
 ]
 
       [inputs.parity_root.vk_data.vk]
       key = [
   "0x0000000000000000000000000000000000000000000000000000000000000016",
-  "0x000000000000000000000000000000000000000000000000000000000000000b",
-  "0x0000000000000000000000000000000000000000000000000000000000000001",
-  "0x00000000000000000000000000000078b17daee7ce0a5fb9f5a84a2842c3b468",
-  "0x00000000000000000000000000000000001e4a85b98d71b0d69292687e2c5e94",
-  "0x00000000000000000000000000000000c3c7c53f8d6f387d02cbd30b373f624a",
-  "0x0000000000000000000000000000000000027492d891507b7fb721f827ec2125",
-  "0x000000000000000000000000000000448da0795e65c2acddb6a180b618ca4500",
-  "0x000000000000000000000000000000000026376b31e8ce3bb070bfed46801c3c",
-  "0x000000000000000000000000000000a8b4423143eb061d06dcf70a9b88d96cc0",
-  "0x0000000000000000000000000000000000140986c98f877b30ce48cb90461312",
-  "0x000000000000000000000000000000dc3228da5397acec91842e0564247a3281",
-  "0x00000000000000000000000000000000002c26f116c4120584e7c05868b9e034",
-  "0x000000000000000000000000000000f5ebf083289c311ee2d289dc034b0031b5",
-  "0x000000000000000000000000000000000027e5ca168fcf7984917277bd63aeb3",
-  "0x000000000000000000000000000000087667ff676cfafa2db57dd50364cfe79c",
-  "0x00000000000000000000000000000000002bb973ea83e8487c41459600a6ef16",
-  "0x00000000000000000000000000000000a38ca13acac1410f3d7ca6db34fa63f0",
-  "0x00000000000000000000000000000000002068ffd126a125d99af872b91155ff",
-  "0x000000000000000000000000000000fdc1eeb335429c34b4488e1ce565edd0be",
-  "0x00000000000000000000000000000000001279bb6460b4bdefc838d4cb235155",
-  "0x0000000000000000000000000000005ef93e2a85a22e47a3b3eabb4e229dfb95",
-  "0x000000000000000000000000000000000002085147ee68b313f39acde522a5b1",
-  "0x0000000000000000000000000000003601a6e8eaee36ae589e4f3efd39aacdd0",
-  "0x000000000000000000000000000000000015b26c9be4890cbf333c9d18e023f8",
-  "0x0000000000000000000000000000002597739e1725777058acf8c41ece5bc230",
-  "0x0000000000000000000000000000000000127f2d8950de2d351261de15ad3692",
-  "0x000000000000000000000000000000f0707fa498b915bb84481f22c68f82f852",
-  "0x0000000000000000000000000000000000026e1e4979e0d760c48aba45674641",
-  "0x000000000000000000000000000000ea45d31bd10dd18ccc02388e6f8b291dcc",
-  "0x000000000000000000000000000000000023e937480766000ba36ae295ec1e48",
-  "0x00000000000000000000000000000031baaf67d48e00f988f210e567ddd2b45d",
-  "0x00000000000000000000000000000000002715a3d431eafcba537d10c3033057",
-  "0x000000000000000000000000000000bbb3120089d0de7b11c4a1f29199f88181",
-  "0x00000000000000000000000000000000000367ef60efb55665d6d840fa949717",
-  "0x000000000000000000000000000000ed04c2879b84b210376953f58ce48eba0e",
-  "0x00000000000000000000000000000000000b092c857d4a2e5520dfaafb203c03",
-  "0x0000000000000000000000000000005da6cf732c008d8d037ca34a818312a024",
-  "0x000000000000000000000000000000000029f868f7234099b8361cb3510e7d8a",
-  "0x000000000000000000000000000000a0843902e624f3adccde6cf44e08311d4b",
-  "0x00000000000000000000000000000000000373ffc7fce598489f487b9c8c0ebd",
-  "0x000000000000000000000000000000a7314c6ed61312feaff048ba4b49842b7e",
-  "0x000000000000000000000000000000000028ef66d9ba57db55d9037eee6292af",
-  "0x000000000000000000000000000000d6a3a1c9a17835658d11e6a5d0fe9cf907",
-  "0x00000000000000000000000000000000001716bd0d35f792b5b5d1b3d57bceeb",
-  "0x0000000000000000000000000000008997c4ec5fabfd7e709a9e39a9ade4f7bf",
-  "0x00000000000000000000000000000000000f0a6f177b950ddd7b7eb33d04db21",
-  "0x00000000000000000000000000000039501b07dae9c6fb88b4c42448be3cb384",
-  "0x00000000000000000000000000000000001eaf14768ccbf9c57b217dec1e31d8",
-  "0x000000000000000000000000000000dc531c7d21f7b45ffbca2717ec44b041e8",
-  "0x0000000000000000000000000000000000279bdd1d3a8e15802c608c6b4708e1",
-  "0x000000000000000000000000000000b37783542b31dce0d8c31c0852e1d763c3",
-  "0x00000000000000000000000000000000002f467244c882fabc33838b10b7eb2a",
-  "0x000000000000000000000000000000ca408d8763a614b172e9b946a7dbb2e74b",
-  "0x0000000000000000000000000000000000262b64694fd389afba33f2989accea",
-  "0x000000000000000000000000000000b61193261fec588db146c2170e4d2b0a0e",
-  "0x00000000000000000000000000000000002f32c65a1fe400d17787690e55d2c8",
-  "0x00000000000000000000000000000007fbc70d900496b6366e965b79a2113b36",
-  "0x00000000000000000000000000000000002be977d4f13c3e45b8aa682458f534",
-  "0x00000000000000000000000000000019ec1befb0c5f1cddfebc885efc6265f95",
-  "0x000000000000000000000000000000000005d3ab687eed8f108bc3a75ec3b8e1",
-  "0x00000000000000000000000000000051bb7f4b08721f57f545ebc0e07d3eebf6",
-  "0x00000000000000000000000000000000000d9503879b9bd744448b6eb9fb2f7a",
-  "0x0000000000000000000000000000005a02ba394e9d2d3e77bcccd895c10694fc",
-  "0x000000000000000000000000000000000027e25fdc49dc55b63ef3d1ca90b5b2",
-  "0x00000000000000000000000000000091db8035e2aaa8610742df1503300087f9",
-  "0x0000000000000000000000000000000000021dc3eaf7990b12e4468c2e28bab0",
-  "0x000000000000000000000000000000e846d69b700fdd8b078052da8b91c352d7",
-  "0x00000000000000000000000000000000000c951fe8e7eb4a6298b14be6382f93",
-  "0x000000000000000000000000000000ec89072912c27066e932cf77f821994c90",
-  "0x0000000000000000000000000000000000182e68039cceed32fdac710403b7da",
-  "0x0000000000000000000000000000008debe6230106974006084e7308b4b5feca",
-  "0x00000000000000000000000000000000001ebd658ddc30d75e5e721359395120",
-  "0x0000000000000000000000000000006d3b5839b70a5b60de45166b9c2a4be3f5",
-  "0x00000000000000000000000000000000002ecf96badf1253c40c1486fabbfcad",
-  "0x00000000000000000000000000000098213252fb5d3b6c5a9747469ebcf0dcd9",
-  "0x00000000000000000000000000000000002d869db2f87c96d3e31e66aa911dda",
-  "0x000000000000000000000000000000555c7af1975654730348730a11775c9759",
-  "0x00000000000000000000000000000000002b8d102334de6b8cbc22090f9dda68",
-  "0x000000000000000000000000000000d34433dab85ff5064014d6b58f60d67c25",
-  "0x0000000000000000000000000000000000139da62905bcf796f7101bbc76122c",
-  "0x0000000000000000000000000000003840706e6d07460c44d74cba5c2b34358d",
-  "0x00000000000000000000000000000000000aa2f8b6291279bea275b7c9913258",
-  "0x000000000000000000000000000000019eaa3b842224650e76c5cb0e94484c6d",
-  "0x000000000000000000000000000000000006c9f637fbb6502a38f91b85ace5f5",
-  "0x000000000000000000000000000000efc01f95fe550a9a9f1476758824a74301",
-  "0x000000000000000000000000000000000003eaa2fbce3122916d12c78b219b9b",
-  "0x000000000000000000000000000000a6eda6357e83ebf12fcf13845427e4a057",
-  "0x0000000000000000000000000000000000255208b91373b2dede462b7e8b0b52",
-  "0x0000000000000000000000000000006d2aecad4cd09ada8fea8abb2ebbf070f5",
-  "0x000000000000000000000000000000000012bfb11d7a805c6e591f874ae3637a",
-  "0x000000000000000000000000000000f4a6c6ffdf80a72db78762e237d58cd5f6",
-  "0x000000000000000000000000000000000026814a59803555635a3b6dfd056d19",
-  "0x000000000000000000000000000000f45b8d96069231f48e0d0c34d57593a6a6",
-  "0x00000000000000000000000000000000000b9dc32399025796005b2f68c15991",
-  "0x000000000000000000000000000000750e1b5cb997a3adf8540bf55bb9264ec4",
-  "0x00000000000000000000000000000000001f6cd5b6d43f67798ae4655c016f37",
-  "0x000000000000000000000000000000596cc6183848f32c60ec74fe2bcd76b20f",
-  "0x00000000000000000000000000000000000ed62d10b019355f008b46412d0e2d",
-  "0x0000000000000000000000000000002020dfdab8c9db8335bca3c8284b1585b2",
-  "0x000000000000000000000000000000000023a2906d03204aa4f79b5b80b92eaa",
-  "0x0000000000000000000000000000009116c4d15f7c9a51f17c3830fe7c1e3b42",
-  "0x000000000000000000000000000000000024aecae332db48e03b97fc645a7f05",
-  "0x000000000000000000000000000000834c5e938cf9e8bd4bd5847e2408407276",
-  "0x000000000000000000000000000000000008524b40cf87b668119022f691cfac",
-  "0x000000000000000000000000000000e699df860731437ec57f9890fe4b3a4205",
-  "0x00000000000000000000000000000000000e1e9d4327e635f547da67aef57e86",
-  "0x0000000000000000000000000000000000000000000000000000000000000001",
+  "0x000000000000000000000000000000000000000000000000000000000000000c",
+  "0x0000000000000000000000000000000000000000000000000000000000000005",
+  "0x0000000000000000000000000000004f85c893bf8b1e843f2dffc48dc074f196",
+  "0x0000000000000000000000000000000000215339c99786f23abf06aa628e2bb5",
+  "0x00000000000000000000000000000021f56f1fd166b444f6945fef45a4260c98",
+  "0x000000000000000000000000000000000029832f088b0a8c0ed5fb1876da60ee",
+  "0x000000000000000000000000000000683bd852b0d5317d3104e00d57a7ff12fe",
+  "0x00000000000000000000000000000000000d2eb234e163af0321005edbadf074",
+  "0x00000000000000000000000000000043d1d78f4556dca95ed3ae27b1bb967956",
+  "0x00000000000000000000000000000000002406ce5529e27d341a34d8c9a819d2",
+  "0x000000000000000000000000000000d2bb936edd0bcb9cf33e24855aa3095d1e",
+  "0x000000000000000000000000000000000016629d2674b560633c3db0a21598ea",
+  "0x00000000000000000000000000000092c8bd15ab345a54468aba584a6f16e2b5",
+  "0x00000000000000000000000000000000001fbbe74a5bb8bad495a22f4a0384dd",
+  "0x000000000000000000000000000000d7dbc1eca647580a4a952821d02d282259",
+  "0x00000000000000000000000000000000002d68b4713f14d3be50ddb099e2b736",
+  "0x000000000000000000000000000000d4dfc475729d110ffc01eac27a1bb07187",
+  "0x000000000000000000000000000000000015026e1e1768366175d180725092cd",
+  "0x000000000000000000000000000000d799d0753526bf23193f9ab8f73c1c7307",
+  "0x0000000000000000000000000000000000052dcf1d1d89071ecfbfe34de96dff",
+  "0x0000000000000000000000000000008a7f1c8955fef499a04d57fa057c30e66a",
+  "0x00000000000000000000000000000000001fedcb5a5fb32238adaca91e2be32f",
+  "0x00000000000000000000000000000047c5bb126a6e6c788dec340b858f577f7d",
+  "0x000000000000000000000000000000000013e3b742ca471a245262fb2ecee07a",
+  "0x000000000000000000000000000000b6284febc7d58cc5491fee7334064865ef",
+  "0x00000000000000000000000000000000000038ae53da7215a286ebd0649136a1",
+  "0x0000000000000000000000000000006eed465622852dce8a0702c5327cff0583",
+  "0x000000000000000000000000000000000022b0941f412859d1cc37a757ca4375",
+  "0x0000000000000000000000000000008bef872c634b8c03bfe7ff37c00a727192",
+  "0x000000000000000000000000000000000004906c8767a040a562b166a360c43b",
+  "0x0000000000000000000000000000001770bcd5e95d6ed8c6299af5208e594351",
+  "0x00000000000000000000000000000000001170f991d5a8c2cece25a2eec45ac2",
+  "0x000000000000000000000000000000dd2567c65087f4413c4a68442f7838d361",
+  "0x00000000000000000000000000000000002b2e2b9fa7017ed5b534b950976cfb",
+  "0x00000000000000000000000000000060445810cd95870d181367a860937116e0",
+  "0x00000000000000000000000000000000000171fcd0debd9f9966aa439dafa69c",
+  "0x00000000000000000000000000000036d276aef0f30fea87630c34381ff63a36",
+  "0x000000000000000000000000000000000029a01a7f04aa1c5fc36c458ab5f806",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "0x0000000000000000000000000000000000000000000000000000000000000002",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "0x000000000000000000000000000000e402279945a076c945901fca356628c525",
-  "0x000000000000000000000000000000000012fedcb7313f77c3006a35e9fb9f8d",
-  "0x00000000000000000000000000000084a3a7ab7d80d65ae1cf14ed89c99c143a",
-  "0x00000000000000000000000000000000002ece2d07ef9c9b1afa02b75b16e861"
+  "0x000000000000000000000000000000441c338c655b7e22f91724c986ec2a7d0a",
+  "0x00000000000000000000000000000000000988f7c276931907f533dfa99ae0ad",
+  "0x000000000000000000000000000000555d1bf8e49259a2b77c8e0caae5b13feb",
+  "0x00000000000000000000000000000000000716aa5a6148a8455d44f8759f22f5",
+  "0x0000000000000000000000000000006400f037f61c707f2729c70c5d912ce9d3",
+  "0x0000000000000000000000000000000000116682196031717f5d1cc4d903aafe",
+  "0x0000000000000000000000000000006459e7ac42c142260295108e744e33a0c1",
+  "0x000000000000000000000000000000000009228de1a4fbd3de4d757390f162da",
+  "0x00000000000000000000000000000067656846b7e2309e7c18c1cce38675bb00",
+  "0x000000000000000000000000000000000029e7406191ce46a9babc6ac5ff12cf",
+  "0x00000000000000000000000000000032e79eca379410f7ec358f9da21bac9fa9",
+  "0x00000000000000000000000000000000002c817548c195702d46fafe6ccd4faf",
+  "0x0000000000000000000000000000004fbb48b68f274f27d30cdcb82ee7cac9b2",
+  "0x0000000000000000000000000000000000068f9a71089873a24f8351d1e70d97",
+  "0x000000000000000000000000000000795c4af1416754d9625f084be947a93c64",
+  "0x000000000000000000000000000000000024e4ffd72d451203c5bc7d04a27116",
+  "0x0000000000000000000000000000008ca18e089457f9cceb58c823a944b03f26",
+  "0x00000000000000000000000000000000000422b4f22af36e628698a6865ddecd",
+  "0x000000000000000000000000000000fb52c4f612125db4012ed8a2e84e1d2c6c",
+  "0x000000000000000000000000000000000019dc534f8dd81d19f72590c6e1fb8e",
+  "0x000000000000000000000000000000fa01f84fdc11a5d03b14bee3a99a680c37",
+  "0x000000000000000000000000000000000022dad727328995272891d530216d61",
+  "0x000000000000000000000000000000b5f4bf23591d8b2447d60d61737c2c36bf",
+  "0x000000000000000000000000000000000002e2a075eaa9f4dd89c257af6cbab0",
+  "0x0000000000000000000000000000003561668a93cb72e95a340771ddc66e9c1a",
+  "0x00000000000000000000000000000000000026940a62997474ab260b2841eafb",
+  "0x00000000000000000000000000000075c66b2eeb9c27b8611335bafd53ed5e6b",
+  "0x000000000000000000000000000000000020720351df147e866486a5db6e8bf9",
+  "0x000000000000000000000000000000fa65c2574867f702f76ee91bf9721891f4",
+  "0x00000000000000000000000000000000000550d2b73072fe8ebb458db32bc272",
+  "0x0000000000000000000000000000005e45bf32b04d43d7d9e082552a7c6e3aab",
+  "0x0000000000000000000000000000000000156b9320b1c02a5ae4d5245079ef93",
+  "0x0000000000000000000000000000007dd31f38bd2d2529ea3d3537bddc4c2d8d",
+  "0x00000000000000000000000000000000001460b51e2428e23b3d5f0e0623a2a5",
+  "0x0000000000000000000000000000009973429339ccb353bf51ed2d258ab0c734",
+  "0x00000000000000000000000000000000002675f20f2783781dae8b8ceee4b947",
+  "0x000000000000000000000000000000f19f97ae0fa6b47d95ce8c99deff02825f",
+  "0x000000000000000000000000000000000008ac106283f7faa2a9523d6d3b6a65",
+  "0x000000000000000000000000000000ece35a6af0338418a01080dc9e20d76e8c",
+  "0x0000000000000000000000000000000000223186953dd9de4ffdf175c62fe17b",
+  "0x0000000000000000000000000000002cdb64ca6e6e3ae04f48e894d029463405",
+  "0x00000000000000000000000000000000002934e04d3c42257882836e1cd3c909",
+  "0x00000000000000000000000000000010928865f0c2b283d43e700debac484ce4",
+  "0x00000000000000000000000000000000001267fc086b1485e85ea3a8d0cd75de",
+  "0x000000000000000000000000000000f9cdf1ac824371f6761a75f1208a9ddfad",
+  "0x00000000000000000000000000000000000e0fdaaebe67864d0d5e9eadb9efc5",
+  "0x00000000000000000000000000000017a6567e4f95497a889a7d72f19789b322",
+  "0x0000000000000000000000000000000000288f112dfaacee642430e19b6959db",
+  "0x000000000000000000000000000000a16e293e7727181d85a1c007ac038f36fb",
+  "0x00000000000000000000000000000000000dd700294b3714e9f7b0e14b5d532b",
+  "0x0000000000000000000000000000008ac20e1e987aa4c40027fd4f9efd59fa05",
+  "0x0000000000000000000000000000000000154ef731c875ef2164785e8ff31c30",
+  "0x0000000000000000000000000000001911ff084795513c823a4fda7a38335e8c",
+  "0x0000000000000000000000000000000000302c54e62b85bc435230433f081725",
+  "0x000000000000000000000000000000c4779e7986fcf2ef065416576329f1c47c",
+  "0x00000000000000000000000000000000001ebeffb4dbaac41852670eeb9ede9d",
+  "0x000000000000000000000000000000f030e0b5c911d86aef1ef86fff6c540d91",
+  "0x00000000000000000000000000000000000bae7a5c23fa083c7231387cf8d78a",
+  "0x0000000000000000000000000000001942fc1702b7a2afec85c9a8473d44c487",
+  "0x000000000000000000000000000000000000210966c79a864b7f987cf31ab127",
+  "0x000000000000000000000000000000f77fcafc38ec30e711c06c5755d04144d6",
+  "0x00000000000000000000000000000000002db7460ea7c5e17383e5d1b8affeb4",
+  "0x0000000000000000000000000000007f430ccebae1fa38c07b989cb9ac4ccb2d",
+  "0x00000000000000000000000000000000001d815d190889cb37cacc2ccf4cfc96",
+  "0x0000000000000000000000000000001eee81b23a887f299049b14c11e98460d6",
+  "0x00000000000000000000000000000000002a56ce41f6b0be13b9c26747621b82",
+  "0x000000000000000000000000000000d5827d6338c78656c0d12ca1aea6ef2c7c",
+  "0x00000000000000000000000000000000001aa98f2de3ddda547d8f6de4e725de",
+  "0x0000000000000000000000000000003ef880305f8c4beb28f1f80f7cc0e7d3f2",
+  "0x00000000000000000000000000000000000483fb33808b70b4a034dca390e659",
+  "0x0000000000000000000000000000003d66a145da1b03e8dc9914efd105dac5e6",
+  "0x00000000000000000000000000000000002a25301cc6f9e024e87f0b58047b1e"
 ]
-      hash = "0x260bc49f0702223b7f21b3aa27a20c75348991d78be9041f06bde5d2b51a3fc3"
+      hash = "0x17df297aed2208dd702c20c31bd85e54e0984ff5f2e4c2032f507c647b261849"
 
   [[inputs.previous_rollups]]
   proof = [
@@ -1099,16 +1099,16 @@ new_archive_sibling_path = [
     [inputs.previous_rollups.public_inputs]
     num_txs = "0x0000000000000000000000000000000000000000000000000000000000000002"
     out_hash = "0x0000000000000000000000000000000000000000000000000000000000000000"
-    accumulated_fees = "0x0000000000000000000000000000000000000000000000000083b2d41cf009c0"
-    accumulated_mana_used = "0x00000000000000000000000000000000000000000000000000000000001174cb"
+    accumulated_fees = "0x00000000000000000000000000000000000000000000000000885bb87af2ece0"
+    accumulated_mana_used = "0x00000000000000000000000000000000000000000000000000000000001210e5"
 
       [inputs.previous_rollups.public_inputs.constants]
-      vk_tree_root = "0x0141caf6779674bc31225636c4cc4259a731835c52fc462f2dcbfabf7de01a1d"
-      protocol_contracts_hash = "0x01af64239167dcc8333e25456aab71348f66d9f6de731a8b62181d16cf0818c1"
+      vk_tree_root = "0x0c16448b65c4b3f83f9db3bebf635bd38957c74c9c1ea36036cbda16432cf558"
+      protocol_contracts_hash = "0x0333160f082dfc02e255c756febac14dc42c4c88b882e0403d44710c1f0bb80f"
       prover_id = "0x0000000000000000000000003c44cdddb6a900fa2b585dd299e03d12fa4293bc"
 
         [inputs.previous_rollups.public_inputs.constants.last_archive]
-        root = "0x280a1dc0fc66f05e5627b85e7375854013fa767efae0e792cc4c77e6e7641135"
+        root = "0x25dd04dc7f0a4299651ea908c014de487c4be771db4d68b458d16aa041af02ba"
         next_available_leaf_index = "0x000000000000000000000000000000000000000000000000000000000000000a"
 
         [inputs.previous_rollups.public_inputs.constants.l1_to_l2_tree_snapshot]
@@ -1117,43 +1117,43 @@ new_archive_sibling_path = [
 
         [inputs.previous_rollups.public_inputs.constants.global_variables]
         chain_id = "0x0000000000000000000000000000000000000000000000000000000000007a69"
-        version = "0x000000000000000000000000000000000000000000000000000000007b6d50be"
+        version = "0x00000000000000000000000000000000000000000000000000000000ad49d7cd"
         block_number = "0x000000000000000000000000000000000000000000000000000000000000000a"
         slot_number = "0x0000000000000000000000000000000000000000000000000000000000000042"
-        timestamp = "0x0000000000000000000000000000000000000000000000000000000069e41502"
+        timestamp = "0x0000000000000000000000000000000000000000000000000000000069fde0c0"
 
           [inputs.previous_rollups.public_inputs.constants.global_variables.coinbase]
-          inner = "0x000000000000000000000000080c5a37d2d3dade855a034bac3548a8b2dfd887"
+          inner = "0x000000000000000000000000fde0805eba75f23cd30a3bb4f0e567a356075904"
 
           [inputs.previous_rollups.public_inputs.constants.global_variables.fee_recipient]
           inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
           [inputs.previous_rollups.public_inputs.constants.global_variables.gas_fees]
           fee_per_da_gas = "0x0000000000000000000000000000000000000000000000000000000000000000"
-          fee_per_l2_gas = "0x000000000000000000000000000000000000000000000000000000078b64a540"
+          fee_per_l2_gas = "0x000000000000000000000000000000000000000000000000000000078c3bcb60"
 
 [inputs.previous_rollups.public_inputs.start_tree_snapshots.note_hash_tree]
-root = "0x0d1486d20ab1e8b2c0f5b20bdfbdec68221df15c627ed08998dd5c8588ffa837"
+root = "0x11ea69a14ea9c12bed3f481dd61addfb2d90d96aa40b626c4d2e47b3466e7b88"
 next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000240"
 
 [inputs.previous_rollups.public_inputs.start_tree_snapshots.nullifier_tree]
-root = "0x110826504b33839e51da855c449decce4ebdd54e25d7d7e367d227f35af255d8"
+root = "0x10e14d1e03084d8016d8018077d4e629cb58cbf3139897cdd78db40c002a04d7"
 next_available_leaf_index = "0x00000000000000000000000000000000000000000000000000000000000002c0"
 
 [inputs.previous_rollups.public_inputs.start_tree_snapshots.public_data_tree]
-root = "0x1f541006a73deacce38c68df69605ef338d187ead8474a3af66d0b6b81fe01bc"
+root = "0x1410b6658243b878037c23a953c69c3a138fdf38373efa0662a549111364b310"
 next_available_leaf_index = "0x000000000000000000000000000000000000000000000000000000000000008b"
 
 [inputs.previous_rollups.public_inputs.end_tree_snapshots.note_hash_tree]
-root = "0x1a39796064aa1aeebaebaca37917db6423d8d5131ce212ca6d3c2be5bbd30ad7"
+root = "0x2126a6e400b3fae90b44b74482d5b59dc707ba8f044c90a5f0e06ff48029f19f"
 next_available_leaf_index = "0x00000000000000000000000000000000000000000000000000000000000002c0"
 
 [inputs.previous_rollups.public_inputs.end_tree_snapshots.nullifier_tree]
-root = "0x2ff802c018eb6ff4a0f01bf75f893a8577412eaaf1177dcb1405a471ff10dfa2"
+root = "0x26fd6ffebb711b7b1d916a895bb8bf3c6b5fc915b1e5a22db0fb801072027d80"
 next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000340"
 
 [inputs.previous_rollups.public_inputs.end_tree_snapshots.public_data_tree]
-root = "0x0eafdbd9b305ae3ce36b50d95fbef3964305a3b88ea486377a3e750467e7bde6"
+root = "0x2cef7e5e25fb54c99feb0d6fbc5bb44eb98d00d3022f4baf5e3f6025a7320293"
 next_available_leaf_index = "0x000000000000000000000000000000000000000000000000000000000000008b"
 
       [inputs.previous_rollups.public_inputs.start_sponge_blob]
@@ -1175,154 +1175,154 @@ next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000
         squeeze_mode = false
 
       [inputs.previous_rollups.public_inputs.end_sponge_blob]
-      num_absorbed_fields = "0x0000000000000000000000000000000000000000000000000000000000000045"
+      num_absorbed_fields = "0x0000000000000000000000000000000000000000000000000000000000000047"
 
         [inputs.previous_rollups.public_inputs.end_sponge_blob.sponge]
         cache = [
-  "0x0c6be08a5e070b343e733716e4ad76ea05de25e2b7fc6e6f50f0ec549f7c0bfa",
-  "0x15cecc56c070afe91aacccc6d3b165ad1f791b7644f606f6f60eaa2f87826abc",
-  "0x00000000000000000000000000000000000000000000021e0120b68b802591e0"
+  "0x2a44787960631c708a6c54319236e2733f5bf18956a780d4f076e06d46e8c52f",
+  "0x21c2f9acd4cfd49d3570c4429b45c6dcf5658ac7592091682403c9468c8fbfc5",
+  "0x089c49b97c1e121fc3d9c0d7f3793cdd886de1fb26e735edbdae3790abaedd66"
 ]
         state = [
-  "0x0332eec470d3972a85ff0dddc44ef6063df6f488519823bf2e0f9da246eaeafd",
-  "0x20b98375503881041a8605f643fc3af297557bbb4d1981e26b18a8c04c79a9f3",
-  "0x1b2590790e1e2b7299ad64e4938d576495cf6d23e9a8471dd76258e144b85c23",
-  "0x1976328f4255b4ce7a9526f786512ea56b9eccc8be0447ca960d15559af86cf5"
+  "0x0b196378726e6d2cbd4d793963bdda8cc494c766409365f6a0f3b9f8e2e2c277",
+  "0x29906675cd547621ba2ccf000d609acec4b304b7b4d929f9e586687d92c311a9",
+  "0x17ecd8ac459a19c262c431de5d01f6726a3b03485399398d69165cc195454006",
+  "0x254280886c6baee6bfedb4dae9055f680574d4b1bb6a4245fb1f24c70eedaa76"
 ]
-        cache_size = "0x0000000000000000000000000000000000000000000000000000000000000003"
+        cache_size = "0x0000000000000000000000000000000000000000000000000000000000000002"
         squeeze_mode = false
 
     [inputs.previous_rollups.vk_data]
     leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000009"
     sibling_path = [
-  "0x0c9b0fab06de495eb1835dc184eb51d6584a970a90bb9c9dba17ab97e9b6dee6",
-  "0x24d3d34d155de7ba76e941299ef9b12edeb7de094e758c30ab32f54a32954ae5",
-  "0x234d319aa3526e9e00d76d9b5b9b18b435756035ad00d8d716e1be50ac82ead3",
-  "0x2648004ca39ab2f7f01e8733c2de2d035675568a1c98d1410ce90ac2512e72e2",
-  "0x15313312ac8ca4825afd3891479fbb14626ca65499d939e23b1f653cd7d018ea",
-  "0x19de2a32662702dd872e529ad89836e16b013012f910daf2bc7c2a67356dd107",
-  "0x1f07bca7a14f9a969539c0afd388affa18926689f431fc541841a2a7604d388c"
+  "0x208d8b1ad2d688325416c8a23881e8b14753352851d7740b339ea2ebd455cdcc",
+  "0x2136af42d41c58f3fd528f4e88c2de5152c2bb251a3c4d8950d4401a0c8ae6ff",
+  "0x02d4017a1d1c142d1fdf34bf701748bd9db29906e0114ac657648a51d10b6799",
+  "0x099ef6a9a40aaf85e056bda90684adf858addbb90af303d82f8157b86b705b92",
+  "0x25f6f5fc25ee815cef59a1889f1e39db3d431d01b01ee1554f9492afec9d41d6",
+  "0x28650667b92be48b116289119fa4794a5fe8fe5792a49d89b9977feae7f685a6",
+  "0x2aa74c20807e8cbb3e32a86ad29472c42a3fb7021dcfaad112a6b68eb0eca98e"
 ]
 
       [inputs.previous_rollups.vk_data.vk]
       key = [
   "0x0000000000000000000000000000000000000000000000000000000000000015",
   "0x0000000000000000000000000000000000000000000000000000000000000042",
-  "0x0000000000000000000000000000000000000000000000000000000000000001",
-  "0x000000000000000000000000000000cd83c7ffbb8a401156e168f37116ffb187",
-  "0x000000000000000000000000000000000004c9803d25f3aa3d87971ec69e9a09",
-  "0x0000000000000000000000000000002b8e3b59ff58ee5825f04add8396938ab7",
-  "0x00000000000000000000000000000000000ca92b3e71dca284819687b09058a5",
-  "0x000000000000000000000000000000f13a4c94014267f0fb20df8d4745321157",
-  "0x0000000000000000000000000000000000228ccf8e5e66edf617fe9cdffaa9f3",
-  "0x0000000000000000000000000000008bedbc082dc889634e668f035d885cb110",
-  "0x000000000000000000000000000000000000d1506f1dee82696f1132266cd876",
-  "0x000000000000000000000000000000eed1511734ae738d49eddd8c477030de23",
-  "0x0000000000000000000000000000000000185f94db8b977ecb674f578da3d454",
-  "0x00000000000000000000000000000052efb8157e56280d78c004328b104e22ee",
-  "0x00000000000000000000000000000000001e61e2eda64fdcef0aa3f7086d25ae",
-  "0x000000000000000000000000000000a7ba8e154b7cb9b052f03b722d1fada3ab",
-  "0x00000000000000000000000000000000001b74f30f877fcb688c4d7942a512ea",
-  "0x000000000000000000000000000000a64cc9925a82d55b5c8ed69024e76a1002",
-  "0x0000000000000000000000000000000000051a307beab7624f895eac2d7b107e",
-  "0x000000000000000000000000000000b71a10e4cb199c53f8ab26f4b5750e6ff1",
-  "0x000000000000000000000000000000000026ae3964368b4d1a78b494281305a6",
-  "0x00000000000000000000000000000070e6d26eeb2ae247b554ade309575fc966",
-  "0x00000000000000000000000000000000001b72f55e4403556e86319b26bac156",
-  "0x0000000000000000000000000000008d27b4ec306af3043276b465679e8bd42f",
-  "0x0000000000000000000000000000000000235c5f58ac9d6dca390a516970b4b2",
-  "0x000000000000000000000000000000f9cc90e3b5b8897ba1b69b74148d74cfc5",
-  "0x00000000000000000000000000000000002b2e95de9addf042a25f2539a53d1e",
-  "0x0000000000000000000000000000004288fb745aa3b78da694bc2f3c28178b53",
-  "0x0000000000000000000000000000000000029292ff399aa7b20eb1f743696c46",
-  "0x0000000000000000000000000000003582186b8e684671a476f80b8d0e114d5d",
-  "0x00000000000000000000000000000000001b3109c18b36e49b5ef30578b4bc60",
-  "0x00000000000000000000000000000083d976f2c2c90d81da35771e3f1822b38f",
-  "0x000000000000000000000000000000000004e8a3defd811d412647bd93ce9086",
-  "0x000000000000000000000000000000c2c94de698986ec3786d6f5b13b0a476b4",
-  "0x000000000000000000000000000000000004d6d12b482b85c51eb055c92d5560",
-  "0x000000000000000000000000000000d9fb425aa4b440ae16c1b17731a6529ec7",
-  "0x0000000000000000000000000000000000009388e6b80710c3afdbff80db6e84",
-  "0x0000000000000000000000000000002775ccd14fc93fee7d75f048054b1cbcd7",
-  "0x000000000000000000000000000000000000142a9e45b6b4b0b28a54737e0901",
-  "0x000000000000000000000000000000d88146894fb0088baf74ad347a6fa92dde",
-  "0x0000000000000000000000000000000000019df6a3b49d4de18dbe387aac8372",
-  "0x0000000000000000000000000000001775a3327c99e192a79ee17db4e2c514e2",
-  "0x0000000000000000000000000000000000062b76de133a235165e878faa5619f",
-  "0x000000000000000000000000000000c8383897bcdda98939560cf15dfefd9c0b",
-  "0x00000000000000000000000000000000001b84d621bc2ee73d81ad2bd595f2a8",
-  "0x00000000000000000000000000000093ec3803f444457ef388287856eaccad0b",
-  "0x0000000000000000000000000000000000103b731d15612e1b8ac234c501b92d",
-  "0x000000000000000000000000000000d83455ed5536ab998435ffd929486967f5",
-  "0x00000000000000000000000000000000000870e19f1fc3e0921179828f3dd48b",
-  "0x0000000000000000000000000000008a0b19fe136076435faa22c077837f88bb",
-  "0x00000000000000000000000000000000000039184f52378de1cbba4a757335f4",
-  "0x00000000000000000000000000000019bba41ff000f1c9a2800dff26a0ba56ce",
-  "0x000000000000000000000000000000000012a445925f8b47a193556076199e49",
-  "0x0000000000000000000000000000005ba24d7fb287fc15134264f129609a2bd8",
-  "0x000000000000000000000000000000000007076816a94acb232f9ce3c1ae86f4",
-  "0x000000000000000000000000000000f85d9c960786d5542ee7fb2b2413a6d377",
-  "0x00000000000000000000000000000000001501ca79d9e60002f03f2b2b7b650a",
-  "0x000000000000000000000000000000af9fa7ef32ca1cb5f5abfbcc106009b7d9",
-  "0x00000000000000000000000000000000000a3631ac245c1bcbc41500fbe90c39",
-  "0x000000000000000000000000000000c20fa79072822cd75c97c5b81e20ca8378",
-  "0x00000000000000000000000000000000001c6e3d83b0c29f88cf55cb349764c7",
-  "0x00000000000000000000000000000094269c5b70a400d545ff6927eb4ff34d94",
-  "0x0000000000000000000000000000000000179a075c118abe5e19ec509b92c329",
-  "0x000000000000000000000000000000f7bf1c1f7d4dd3e707966c05f1d2cf0efa",
-  "0x00000000000000000000000000000000002dfb152b58a74c48565f0dba30108d",
-  "0x000000000000000000000000000000cc8f8c54c07a2909a5e4dd79a7fee3e9f9",
-  "0x0000000000000000000000000000000000111875cd09b6d83b8c85d81902de1d",
-  "0x00000000000000000000000000000067879f62b49d4ec18a05fc15c67e61c1f0",
-  "0x000000000000000000000000000000000007d113480afafd29d13ea18ad95bc2",
-  "0x000000000000000000000000000000ff6cd4cc6b0f04ecadac8b0370831197bc",
-  "0x00000000000000000000000000000000002cf71926c179ee1544ddcdef962d3b",
-  "0x00000000000000000000000000000011dac3e4f0a624a359d0577b6ad0c6a9ea",
-  "0x0000000000000000000000000000000000021c6d473c1f38d00361a916aa5c57",
-  "0x00000000000000000000000000000003b3480a0434d1d1f33e1c9f1a7d0cb25d",
-  "0x00000000000000000000000000000000002c5c8e4157e553f3188d193d1b9569",
-  "0x00000000000000000000000000000019b738d9ea76f9cb03a4bcdb7533944a36",
-  "0x00000000000000000000000000000000001c8f2968fe3967d675bdc3dd95ae45",
-  "0x00000000000000000000000000000081ead652a5562e48d2271eb63e0b53f517",
-  "0x00000000000000000000000000000000000252e44fb0d2cd6daafe79b8a7ce1f",
-  "0x0000000000000000000000000000008fa4d0b6af4adecb0c882b3550bf708e3a",
-  "0x0000000000000000000000000000000000026f63ebffc62201b820a594862e6c",
-  "0x000000000000000000000000000000a9e22eecb21492cfdd0820eddc2392ecad",
-  "0x0000000000000000000000000000000000100eff1372735728c7d857bbe751cd",
-  "0x00000000000000000000000000000098c24dca66ff39798ffef0819d63447c2b",
-  "0x0000000000000000000000000000000000117ee5d863045ed0f1f8a3268a44cd",
-  "0x000000000000000000000000000000c42efe335044bad810e4db5ca3a9a90b33",
-  "0x00000000000000000000000000000000001eea6c61e4ba0267d212d7d6a01fde",
-  "0x000000000000000000000000000000278bf3b77e15b280c8d91851ef86e22130",
-  "0x000000000000000000000000000000000007d1cb6e175db110b93183dc69610a",
-  "0x000000000000000000000000000000d7d26293651d377457c5f70fc897df4d02",
-  "0x00000000000000000000000000000000000ee609268fa9ca425545724809dec0",
-  "0x0000000000000000000000000000006363c23486d6a7a313beac4e2d9611968a",
-  "0x0000000000000000000000000000000000085acee4523161ab1e268a4f0c1b0f",
-  "0x000000000000000000000000000000b250d5a528a555d96d498fc9af4f8cc5c2",
-  "0x000000000000000000000000000000000017080f8d1d21b541de1c64d8b794df",
-  "0x000000000000000000000000000000621557759a0775ea5575adc9c6fbd96d56",
-  "0x00000000000000000000000000000000001cd60c23a37c42d7e46e1e19e966ae",
-  "0x0000000000000000000000000000000d52081b2311a7e9bf52407cf3d2c336b3",
-  "0x0000000000000000000000000000000000003b2312f2f2f419434a1440d40c69",
-  "0x000000000000000000000000000000d26082083660d6ac8bffb639994e4500e7",
-  "0x000000000000000000000000000000000019d6ef8ce569e7fa55b8aab7f5eea6",
-  "0x00000000000000000000000000000078d8a04f7b6c536d3a8a35c790b4dc7ddc",
-  "0x00000000000000000000000000000000001111470a41156a530334d2c08511a5",
-  "0x0000000000000000000000000000008ab4119a5478448b7ec3573de2cdfd8e56",
-  "0x0000000000000000000000000000000000263c7bd4cde5591308156c458d2989",
-  "0x0000000000000000000000000000004a676142c9eca140ac96ab9ca49633e141",
-  "0x00000000000000000000000000000000001de62520faa095ad7513f753e0a73e",
-  "0x0000000000000000000000000000000000000000000000000000000000000001",
-  "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "0x0000000000000000000000000000000000000000000000000000000000000002",
-  "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "0x00000000000000000000000000000059f7a0ea97f63ad48cd0ace39569e0e2cf",
-  "0x0000000000000000000000000000000000104032af6f298e3ac85696d4973026",
-  "0x000000000000000000000000000000a4c46e1adb8515fa5ddcd4296d689f8e51",
-  "0x0000000000000000000000000000000000172a0575991ea836ef0e3040f33e6e"
+  "0x0000000000000000000000000000000000000000000000000000000000000005",
+  "0x0000000000000000000000000000004a89413217aa26a02d1673611c718e3f40",
+  "0x00000000000000000000000000000000002a74011d7b1576ee63e514f36d2ca7",
+  "0x000000000000000000000000000000fc6ccc829e509138e5ecaf67c0a21ae3ea",
+  "0x000000000000000000000000000000000025ff9c29534f6fc12896ca920730a7",
+  "0x0000000000000000000000000000002709461b8a6badd93121132b357506ad42",
+  "0x000000000000000000000000000000000018979b97518955d80ea51e8795dd65",
+  "0x0000000000000000000000000000002086ceef11774f164dc1826039e29a08b2",
+  "0x000000000000000000000000000000000002706e4d78635695a83b8ee7fe2852",
+  "0x000000000000000000000000000000f48fa484144b68aabb48f3c67447f619c4",
+  "0x00000000000000000000000000000000002c00e7b78d2dbb440843c2b8bb9d5c",
+  "0x000000000000000000000000000000de8ddbcaefce22d2dd0f1a9cf8505ad74c",
+  "0x00000000000000000000000000000000001d75f1ae876350f117464d47581ea3",
+  "0x0000000000000000000000000000004bbb761087bee09db612cd1683c9991da0",
+  "0x00000000000000000000000000000000000a1f0b2bc8f3940a7767ca70f869dc",
+  "0x000000000000000000000000000000e4d6e66fe44086d4e95043082d7660511d",
+  "0x00000000000000000000000000000000002857e0d300379ee0a5657b0628ac68",
+  "0x000000000000000000000000000000377899dd24559db542bb2da421c7aa5b2e",
+  "0x00000000000000000000000000000000000f954842d0809f870031c014244349",
+  "0x0000000000000000000000000000004500fe7e27caadb3185ec74d1d8c9c23c6",
+  "0x000000000000000000000000000000000011e0156211bae38b72e70774aad837",
+  "0x000000000000000000000000000000d64abf570d80329272f3ac73e763a56074",
+  "0x00000000000000000000000000000000002221eb3028e13e02824a2cdbebb343",
+  "0x000000000000000000000000000000e6ac6ff13cde0a60ccaefe09ee9f6e4951",
+  "0x000000000000000000000000000000000000042f684a98fd028e51ed457fb6d2",
+  "0x000000000000000000000000000000b1795305b34f2f47e00fefef8e3ff03117",
+  "0x0000000000000000000000000000000000219d203b492d7debf5d8e7df9d2059",
+  "0x000000000000000000000000000000bfa96395c8478bacb512c36590c5b7b901",
+  "0x00000000000000000000000000000000001088537efb9ccd4bbaf4c519fb15ef",
+  "0x000000000000000000000000000000a63a7e103f77ddd62d4a2aca5a18595bc2",
+  "0x00000000000000000000000000000000000ffe27c096d9d37613d28524ee24bb",
+  "0x0000000000000000000000000000008b2aa8f75dabd90ee7f9d45da83109530f",
+  "0x000000000000000000000000000000000029197cfde9aa521758643b088ca6d9",
+  "0x0000000000000000000000000000000c60bc3c5493f56066aeaf379eff701730",
+  "0x0000000000000000000000000000000000045592a6815997cad253c4d4360857",
+  "0x000000000000000000000000000000fe9bb200d66804b00fe6af2cbd06b90be1",
+  "0x00000000000000000000000000000000002dfca6770dcd191d2cdcd25959b927",
+  "0x000000000000000000000000000000d638a6a9b28e4cda3be3200ca416f090a6",
+  "0x00000000000000000000000000000000002912073cf985c4e403f2e81c78f0c4",
+  "0x00000000000000000000000000000017b813b81461e0af074adb3ee3a06a2dbd",
+  "0x0000000000000000000000000000000000193d82b9851cb7b79be69631dbed9d",
+  "0x000000000000000000000000000000585192fdba2a34dfe3cf05bc74f14aa04b",
+  "0x000000000000000000000000000000000019c364971252aebd3f848754f68cc0",
+  "0x000000000000000000000000000000d6c225cba31833473b544e439b76525948",
+  "0x0000000000000000000000000000000000172a802a4ccf4f87a056c01096e603",
+  "0x0000000000000000000000000000008a86fac91395708a05f2bf567c42624355",
+  "0x00000000000000000000000000000000001c5122e5aa5acc0563a65f2fadb548",
+  "0x000000000000000000000000000000c7ba316af264f3d0c9ffdfa37abe8449af",
+  "0x00000000000000000000000000000000001e4e1e04112cc99e43eaa819700377",
+  "0x000000000000000000000000000000171f9151f102c97ebaf8155f92f2818ad4",
+  "0x00000000000000000000000000000000002b9c517d5a5ca458d9a42ae50a21e3",
+  "0x000000000000000000000000000000a9ab641f6b11aa7b449f9d162ee4b41c4a",
+  "0x0000000000000000000000000000000000083f917d6f05453ad4449a07cb2db9",
+  "0x0000000000000000000000000000000fd8ba5a6cbe569669fa504b146a11e1c2",
+  "0x00000000000000000000000000000000002d96c1b0fb6b92bbdf9028c918ab12",
+  "0x00000000000000000000000000000001b66bc49279fdcee016dc50f445385e2b",
+  "0x00000000000000000000000000000000002b27073221dc103e65d22ef60f7565",
+  "0x000000000000000000000000000000d9f07543a10843697cb26aeb1e0fa41864",
+  "0x00000000000000000000000000000000001af76ea4d294fd82e82426b2247091",
+  "0x000000000000000000000000000000c95c82ccbed1535404379be4d37b661a7b",
+  "0x000000000000000000000000000000000004c2eb0e09fa417808cf776e09d9bd",
+  "0x000000000000000000000000000000f7ecd4caac36af30f57c88f8aa8758994f",
+  "0x000000000000000000000000000000000007a8712e54abef6a5800fb6c9f797d",
+  "0x00000000000000000000000000000032261b0e19195842c9e13efbf6677d3e7b",
+  "0x00000000000000000000000000000000001a77dd002f088f48be1c495240a4f4",
+  "0x0000000000000000000000000000007a9784569003accf3b18631652c41efd9c",
+  "0x00000000000000000000000000000000001a3bc8c8561c039ee8dd33dcf97bfb",
+  "0x0000000000000000000000000000008a638165173e41c0baef2a580cca67198a",
+  "0x00000000000000000000000000000000000ecceac0ea7acc23801d0b99315ed8",
+  "0x0000000000000000000000000000009c864dd9c99b9871c3cfb939d4197834ef",
+  "0x0000000000000000000000000000000000131aac5ec5b228a425c6a1d954f41a",
+  "0x00000000000000000000000000000011cae94a9b789855cde56a72734268be61",
+  "0x000000000000000000000000000000000015c8120597f6b5302046b58b445198",
+  "0x00000000000000000000000000000058f4333384b72ecdfc0a66a3b34a9870b9",
+  "0x000000000000000000000000000000000013db543b79ebed9f63c95904240a6e",
+  "0x000000000000000000000000000000c71b7fdef4cdc241adcddb23c473ad222c",
+  "0x00000000000000000000000000000000001823079555cf386247dbe609c2fd06",
+  "0x000000000000000000000000000000e46930d371eafddab0c6053b1ae159c463",
+  "0x00000000000000000000000000000000000c0bc40e324750ba1c752c09daed25",
+  "0x000000000000000000000000000000137e3a04a63f70a2f6971ca99b7844dc67",
+  "0x000000000000000000000000000000000014c957a738079d071b3d181b99c0e7",
+  "0x000000000000000000000000000000815544c36c3b22a89d3a78b3553bec6f68",
+  "0x000000000000000000000000000000000009c2204fe3bd67f8872d6e75792d19",
+  "0x000000000000000000000000000000d3e085f947f7511f7d7f87a504e99f5546",
+  "0x00000000000000000000000000000000001d1e1a783d6fde70d844bc2c83c3ae",
+  "0x000000000000000000000000000000109b3d637fe0d1d5013b3710fc1cddf89f",
+  "0x000000000000000000000000000000000006101682027f56bffe9486a672801a",
+  "0x000000000000000000000000000000797993b995dba1e0e98de672a76a776c3f",
+  "0x00000000000000000000000000000000002765c3ceee9f9d0f11bd159621fa1e",
+  "0x0000000000000000000000000000005eefcb3c6f69064ed55425945fcc74c2bc",
+  "0x00000000000000000000000000000000001613278bd29c20c182e6f3b5e367ce",
+  "0x0000000000000000000000000000006c39d4dd8c65752b9bc2628fcc3dbf415c",
+  "0x00000000000000000000000000000000000d4b721e385647b57de3efbc9952db",
+  "0x000000000000000000000000000000e26e87fb5ad793c153110c1e55129d9ee7",
+  "0x00000000000000000000000000000000001986fe851f46fd25818f580f9d55f1",
+  "0x0000000000000000000000000000007a7eb895f6f2419aafb58de3f81b3f6739",
+  "0x00000000000000000000000000000000000d1289085013119c588fbcdbb11f5e",
+  "0x00000000000000000000000000000061358ce9820bc7ced39ca91d017f767cfa",
+  "0x000000000000000000000000000000000018a26c04d92048605adf6b40fbe696",
+  "0x000000000000000000000000000000924ee754d49e43f0991a540ece79958ad1",
+  "0x00000000000000000000000000000000001faa0f64d400addf955b2f4a8181ec",
+  "0x0000000000000000000000000000000c13651a87f101a4d0bf32619d4326c45b",
+  "0x000000000000000000000000000000000002809feb719732fbf341dd249e671d",
+  "0x0000000000000000000000000000003523e8c751d17a4dcd30540a4f9261403b",
+  "0x00000000000000000000000000000000001466cc1bd7c1743fca0477c4ea4481",
+  "0x0000000000000000000000000000001eee81b23a887f299049b14c11e98460d6",
+  "0x00000000000000000000000000000000002a56ce41f6b0be13b9c26747621b82",
+  "0x000000000000000000000000000000d5827d6338c78656c0d12ca1aea6ef2c7c",
+  "0x00000000000000000000000000000000001aa98f2de3ddda547d8f6de4e725de",
+  "0x0000000000000000000000000000003ac18237da8d96caddaa1c49a178b8b47d",
+  "0x0000000000000000000000000000000000174dfd5c124039dc6e2a38f0f99775",
+  "0x0000000000000000000000000000005790969811e28ed4e16d2729036649f344",
+  "0x00000000000000000000000000000000000f9c6e462a5b03759c42538b9b7c36"
 ]
-      hash = "0x0f8f726e833df2994b5e4f7236bb20b770b92eeddaa5e11c229e396b784aac56"
+      hash = "0x09b4bb0061881fc354c5fadf8dc55f36b0c67dc3b2f58a18406363dfa0b079fa"
 
   [[inputs.previous_rollups]]
   proof = [
@@ -1811,16 +1811,16 @@ next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000
     [inputs.previous_rollups.public_inputs]
     num_txs = "0x0000000000000000000000000000000000000000000000000000000000000001"
     out_hash = "0x0000000000000000000000000000000000000000000000000000000000000000"
-    accumulated_fees = "0x000000000000000000000000000000000000000000000000004d20b47a1f6340"
-    accumulated_mana_used = "0x00000000000000000000000000000000000000000000000000000000000a3919"
+    accumulated_fees = "0x000000000000000000000000000000000000000000000000004894bc72b69ca0"
+    accumulated_mana_used = "0x0000000000000000000000000000000000000000000000000000000000099dbf"
 
       [inputs.previous_rollups.public_inputs.constants]
-      vk_tree_root = "0x0141caf6779674bc31225636c4cc4259a731835c52fc462f2dcbfabf7de01a1d"
-      protocol_contracts_hash = "0x01af64239167dcc8333e25456aab71348f66d9f6de731a8b62181d16cf0818c1"
+      vk_tree_root = "0x0c16448b65c4b3f83f9db3bebf635bd38957c74c9c1ea36036cbda16432cf558"
+      protocol_contracts_hash = "0x0333160f082dfc02e255c756febac14dc42c4c88b882e0403d44710c1f0bb80f"
       prover_id = "0x0000000000000000000000003c44cdddb6a900fa2b585dd299e03d12fa4293bc"
 
         [inputs.previous_rollups.public_inputs.constants.last_archive]
-        root = "0x280a1dc0fc66f05e5627b85e7375854013fa767efae0e792cc4c77e6e7641135"
+        root = "0x25dd04dc7f0a4299651ea908c014de487c4be771db4d68b458d16aa041af02ba"
         next_available_leaf_index = "0x000000000000000000000000000000000000000000000000000000000000000a"
 
         [inputs.previous_rollups.public_inputs.constants.l1_to_l2_tree_snapshot]
@@ -1829,61 +1829,61 @@ next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000
 
         [inputs.previous_rollups.public_inputs.constants.global_variables]
         chain_id = "0x0000000000000000000000000000000000000000000000000000000000007a69"
-        version = "0x000000000000000000000000000000000000000000000000000000007b6d50be"
+        version = "0x00000000000000000000000000000000000000000000000000000000ad49d7cd"
         block_number = "0x000000000000000000000000000000000000000000000000000000000000000a"
         slot_number = "0x0000000000000000000000000000000000000000000000000000000000000042"
-        timestamp = "0x0000000000000000000000000000000000000000000000000000000069e41502"
+        timestamp = "0x0000000000000000000000000000000000000000000000000000000069fde0c0"
 
           [inputs.previous_rollups.public_inputs.constants.global_variables.coinbase]
-          inner = "0x000000000000000000000000080c5a37d2d3dade855a034bac3548a8b2dfd887"
+          inner = "0x000000000000000000000000fde0805eba75f23cd30a3bb4f0e567a356075904"
 
           [inputs.previous_rollups.public_inputs.constants.global_variables.fee_recipient]
           inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
           [inputs.previous_rollups.public_inputs.constants.global_variables.gas_fees]
           fee_per_da_gas = "0x0000000000000000000000000000000000000000000000000000000000000000"
-          fee_per_l2_gas = "0x000000000000000000000000000000000000000000000000000000078b64a540"
+          fee_per_l2_gas = "0x000000000000000000000000000000000000000000000000000000078c3bcb60"
 
 [inputs.previous_rollups.public_inputs.start_tree_snapshots.note_hash_tree]
-root = "0x1a39796064aa1aeebaebaca37917db6423d8d5131ce212ca6d3c2be5bbd30ad7"
+root = "0x2126a6e400b3fae90b44b74482d5b59dc707ba8f044c90a5f0e06ff48029f19f"
 next_available_leaf_index = "0x00000000000000000000000000000000000000000000000000000000000002c0"
 
 [inputs.previous_rollups.public_inputs.start_tree_snapshots.nullifier_tree]
-root = "0x2ff802c018eb6ff4a0f01bf75f893a8577412eaaf1177dcb1405a471ff10dfa2"
+root = "0x26fd6ffebb711b7b1d916a895bb8bf3c6b5fc915b1e5a22db0fb801072027d80"
 next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000340"
 
 [inputs.previous_rollups.public_inputs.start_tree_snapshots.public_data_tree]
-root = "0x0eafdbd9b305ae3ce36b50d95fbef3964305a3b88ea486377a3e750467e7bde6"
+root = "0x2cef7e5e25fb54c99feb0d6fbc5bb44eb98d00d3022f4baf5e3f6025a7320293"
 next_available_leaf_index = "0x000000000000000000000000000000000000000000000000000000000000008b"
 
 [inputs.previous_rollups.public_inputs.end_tree_snapshots.note_hash_tree]
-root = "0x1a39796064aa1aeebaebaca37917db6423d8d5131ce212ca6d3c2be5bbd30ad7"
+root = "0x2126a6e400b3fae90b44b74482d5b59dc707ba8f044c90a5f0e06ff48029f19f"
 next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000300"
 
 [inputs.previous_rollups.public_inputs.end_tree_snapshots.nullifier_tree]
-root = "0x2cc15ff664224a4d4d337795275531782515bd07a1c1955ee8c660c47cdde71e"
+root = "0x0e8d32952999631ff527d706426177bdb3208db1d3b8dd4e74ba883610dc37e5"
 next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000380"
 
 [inputs.previous_rollups.public_inputs.end_tree_snapshots.public_data_tree]
-root = "0x190440c1bb70c1406315a413d336eecf1ef4c5e69b192d80ef041401a0ae97da"
+root = "0x0d21d4944ca04ad548057c7362ba76b7370e29929fe9cdd32ec1d04c07e21179"
 next_available_leaf_index = "0x000000000000000000000000000000000000000000000000000000000000008b"
 
       [inputs.previous_rollups.public_inputs.start_sponge_blob]
-      num_absorbed_fields = "0x0000000000000000000000000000000000000000000000000000000000000045"
+      num_absorbed_fields = "0x0000000000000000000000000000000000000000000000000000000000000047"
 
         [inputs.previous_rollups.public_inputs.start_sponge_blob.sponge]
         cache = [
-  "0x0c6be08a5e070b343e733716e4ad76ea05de25e2b7fc6e6f50f0ec549f7c0bfa",
-  "0x15cecc56c070afe91aacccc6d3b165ad1f791b7644f606f6f60eaa2f87826abc",
-  "0x00000000000000000000000000000000000000000000021e0120b68b802591e0"
+  "0x2a44787960631c708a6c54319236e2733f5bf18956a780d4f076e06d46e8c52f",
+  "0x21c2f9acd4cfd49d3570c4429b45c6dcf5658ac7592091682403c9468c8fbfc5",
+  "0x089c49b97c1e121fc3d9c0d7f3793cdd886de1fb26e735edbdae3790abaedd66"
 ]
         state = [
-  "0x0332eec470d3972a85ff0dddc44ef6063df6f488519823bf2e0f9da246eaeafd",
-  "0x20b98375503881041a8605f643fc3af297557bbb4d1981e26b18a8c04c79a9f3",
-  "0x1b2590790e1e2b7299ad64e4938d576495cf6d23e9a8471dd76258e144b85c23",
-  "0x1976328f4255b4ce7a9526f786512ea56b9eccc8be0447ca960d15559af86cf5"
+  "0x0b196378726e6d2cbd4d793963bdda8cc494c766409365f6a0f3b9f8e2e2c277",
+  "0x29906675cd547621ba2ccf000d609acec4b304b7b4d929f9e586687d92c311a9",
+  "0x17ecd8ac459a19c262c431de5d01f6726a3b03485399398d69165cc195454006",
+  "0x254280886c6baee6bfedb4dae9055f680574d4b1bb6a4245fb1f24c70eedaa76"
 ]
-        cache_size = "0x0000000000000000000000000000000000000000000000000000000000000003"
+        cache_size = "0x0000000000000000000000000000000000000000000000000000000000000002"
         squeeze_mode = false
 
       [inputs.previous_rollups.public_inputs.end_sponge_blob]
@@ -1891,15 +1891,15 @@ next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000
 
         [inputs.previous_rollups.public_inputs.end_sponge_blob.sponge]
         cache = [
-  "0x00000000000000000000000000000000000000000000021e00d395d706062ea0",
-  "0x000000000000000000000000000000000000000000000000000000000000076c",
-  "0x15cecc56c070afe91aacccc6d3b165ad1f791b7644f606f6f60eaa2f87826abc"
+  "0x00000000000000000000000000000000000000000000021e00d293040c1d1b40",
+  "0x0635e757a5f05ba5322db37d6930525b43c2e055ed7c4600559a07fc38ab09ec",
+  "0x12d1296a2643b832fbd1d6d3ed3678833fce770084efd75adfd517de8214ccf3"
 ]
         state = [
-  "0x290b84e9ef643b862d526e2afacd8ce92aeea3247a66e813b5dd18790861acf5",
-  "0x222f307884c80e258eba0ead1bd50b9f6b23d169cc89bb14c0c2e77ea0c6288f",
-  "0x2ca24ce27ff303c9d7540708c9ec17422a6d7b5eef03e0bec053b4abd5834697",
-  "0x2e8fc961c2e575b0146b89a143e6d670f3ae1cb8f1583e748b0f15bb9fe141f8"
+  "0x046ca01947e306f5aad217a20c357e8720e466bf48af683e5dc034abe73721f0",
+  "0x14686ac6e82fd9bd26ab09d349ce45506d9c0d1dee28a4967817015ea73b887b",
+  "0x0b7d5bc95988dfda6650240e060e449c0ec3d312f8da80bd59a897a3ce57c1ee",
+  "0x1ea8a35effe09689490c7037df5f38ebfc4f6641047f2e4bcab5542979b4667c"
 ]
         cache_size = "0x0000000000000000000000000000000000000000000000000000000000000001"
         squeeze_mode = false
@@ -1907,134 +1907,134 @@ next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000
     [inputs.previous_rollups.vk_data]
     leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000008"
     sibling_path = [
-  "0x0f8f726e833df2994b5e4f7236bb20b770b92eeddaa5e11c229e396b784aac56",
-  "0x24d3d34d155de7ba76e941299ef9b12edeb7de094e758c30ab32f54a32954ae5",
-  "0x234d319aa3526e9e00d76d9b5b9b18b435756035ad00d8d716e1be50ac82ead3",
-  "0x2648004ca39ab2f7f01e8733c2de2d035675568a1c98d1410ce90ac2512e72e2",
-  "0x15313312ac8ca4825afd3891479fbb14626ca65499d939e23b1f653cd7d018ea",
-  "0x19de2a32662702dd872e529ad89836e16b013012f910daf2bc7c2a67356dd107",
-  "0x1f07bca7a14f9a969539c0afd388affa18926689f431fc541841a2a7604d388c"
+  "0x09b4bb0061881fc354c5fadf8dc55f36b0c67dc3b2f58a18406363dfa0b079fa",
+  "0x2136af42d41c58f3fd528f4e88c2de5152c2bb251a3c4d8950d4401a0c8ae6ff",
+  "0x02d4017a1d1c142d1fdf34bf701748bd9db29906e0114ac657648a51d10b6799",
+  "0x099ef6a9a40aaf85e056bda90684adf858addbb90af303d82f8157b86b705b92",
+  "0x25f6f5fc25ee815cef59a1889f1e39db3d431d01b01ee1554f9492afec9d41d6",
+  "0x28650667b92be48b116289119fa4794a5fe8fe5792a49d89b9977feae7f685a6",
+  "0x2aa74c20807e8cbb3e32a86ad29472c42a3fb7021dcfaad112a6b68eb0eca98e"
 ]
 
       [inputs.previous_rollups.vk_data.vk]
       key = [
   "0x0000000000000000000000000000000000000000000000000000000000000017",
   "0x0000000000000000000000000000000000000000000000000000000000000042",
-  "0x0000000000000000000000000000000000000000000000000000000000000001",
-  "0x0000000000000000000000000000008580b9a8c85e4a3c1e7b1089bd79f3bc28",
-  "0x000000000000000000000000000000000022dc01e3ed0e1b10bdcff9d093431a",
-  "0x00000000000000000000000000000054f9950035e8ffae852707e9d1a9032e59",
-  "0x0000000000000000000000000000000000276c56cb94e0545b3bfd85919a8ce8",
-  "0x0000000000000000000000000000009352ff9d82645804416a2b338260fa235d",
-  "0x000000000000000000000000000000000010a253776d2bdcb7129acfa2e91ac5",
-  "0x00000000000000000000000000000095babbbc4a6d5a9b68707c3a8e1e9508e2",
-  "0x000000000000000000000000000000000030157ca77e90f7ee9155c1009b06a1",
-  "0x000000000000000000000000000000068047e82e283284235befaa9cc7a1838d",
-  "0x00000000000000000000000000000000000bcd70cc5042e81e440b1ea5ef3c3f",
-  "0x0000000000000000000000000000007702a95c1bf5e2923ca69f26cc2d7efe0f",
-  "0x00000000000000000000000000000000000adeb0e8b1074c68de2b2172f21c5e",
-  "0x000000000000000000000000000000520354133ccbbccfc69be0c01b92abdf0f",
-  "0x00000000000000000000000000000000002dea248e3c2fe054c698a861bf4c27",
-  "0x000000000000000000000000000000f93b6112b7de5c27298a81c68d502b7beb",
-  "0x00000000000000000000000000000000002be3a33fc9502b0cc8b9427fcfe50f",
-  "0x000000000000000000000000000000168f01ff83f4a014a90db19e5d882a0a0a",
-  "0x000000000000000000000000000000000008876edc3cc7e3825dc194e21cb011",
-  "0x0000000000000000000000000000006d1df389f06e514e1829af3744dc64294a",
-  "0x000000000000000000000000000000000022e86ef68622bd107e5080cc062a4f",
-  "0x000000000000000000000000000000d137fc89e86049cb1b141b67b3361b6298",
-  "0x00000000000000000000000000000000001d7ad7d0634dc08d7d9816b5b6814c",
-  "0x000000000000000000000000000000defd2454e2c3a75ec8e0730bd3640b9408",
-  "0x00000000000000000000000000000000000b189f6ee9395b1ca5771c361501d7",
-  "0x00000000000000000000000000000001fccf755f5b30a7d544b2f78ce075cb5d",
-  "0x000000000000000000000000000000000026f5423942948047e155a519b195e8",
-  "0x000000000000000000000000000000a9efc76daffb8dfe2a39570b2d5d046767",
-  "0x000000000000000000000000000000000026e7dd89fe96952a4603c2b5555538",
-  "0x00000000000000000000000000000008262b430328dcaab242dd8acc504e8ac9",
-  "0x000000000000000000000000000000000015f3ab1410f0e5dd3e00f03b9f563b",
-  "0x0000000000000000000000000000008fca5ff8ed9a5d41fe9b451f02502dd1c9",
-  "0x0000000000000000000000000000000000266aa6e4947434ef18adeba3700713",
-  "0x000000000000000000000000000000d93cecd04341f5da304f3c92f0670afc43",
-  "0x000000000000000000000000000000000020165b3fd2bfb72a4de3dc68f66eed",
-  "0x000000000000000000000000000000094a6d376eb3cc1ba94b4da00dea583eac",
-  "0x00000000000000000000000000000000001caf7742d251b04f3517f0f1e5a625",
-  "0x0000000000000000000000000000003be5647cd472ad0b06a48f632997e3eea2",
-  "0x000000000000000000000000000000000015fb4d9ecb8125b3243cee37698c48",
-  "0x0000000000000000000000000000000854a3ab5bcbca1e86d4949b1b7c5f4b0e",
-  "0x000000000000000000000000000000000015450314fbf315448dc3379dc82214",
-  "0x0000000000000000000000000000009c2c55d2ea5bdf5fc5e28f1a78b1d29625",
-  "0x000000000000000000000000000000000020b36a8406ec64352600587cf04194",
-  "0x000000000000000000000000000000f14d08d9dab6a54412d741166146188ae6",
-  "0x00000000000000000000000000000000001b5a34ccd7eaf5cd09ab920011552f",
-  "0x00000000000000000000000000000074b7827a59faf701f7f41df26e5476c40c",
-  "0x00000000000000000000000000000000002decbab1c87b933da1625951860793",
-  "0x000000000000000000000000000000751aab48a0e01094128242ea0aaab63ff7",
-  "0x00000000000000000000000000000000001a2a334289adf8d23d4d52caf4cfe6",
-  "0x000000000000000000000000000000f6a41261290460b25e1e7d7bf69b564ae6",
-  "0x00000000000000000000000000000000000296925feaed4585bb03319f126d96",
-  "0x00000000000000000000000000000055b70d653ebd7df04f720951e76a27369b",
-  "0x000000000000000000000000000000000019744937a687edc9f46fb8323a46d9",
-  "0x00000000000000000000000000000047978fda5b64d8fc4571f09da3e8ccc7de",
-  "0x0000000000000000000000000000000000139de6a387109f47ecbacc74e03742",
-  "0x0000000000000000000000000000007f5afdfcb7bcd85aa293676e18e899a03e",
-  "0x000000000000000000000000000000000006a2971c1c947f4cadb07ebc9bc980",
-  "0x0000000000000000000000000000006cdb69a57b7f7a25b99e18fc0f83c1bc70",
-  "0x000000000000000000000000000000000028f2a76a01dc3cc927cdba29383e9b",
-  "0x0000000000000000000000000000001bbc4d6033de44907975ce473bc0f4f148",
-  "0x00000000000000000000000000000000002642f26fc1850c4b9b7fc4cd860ab9",
-  "0x000000000000000000000000000000ac996074e35eb268f6ebbe99e9c7d26c47",
-  "0x00000000000000000000000000000000002262620617978a01f75646f1909969",
-  "0x000000000000000000000000000000e63aa32bcc098428f407b5e07d9cb26118",
-  "0x000000000000000000000000000000000022b294b6a7dc4c17319f9a91a1b443",
-  "0x000000000000000000000000000000649d9ce9147431632893f55d3c6bbc158e",
-  "0x000000000000000000000000000000000020698c9b0787f14aa66a57bc232ec1",
-  "0x000000000000000000000000000000b4fde29f9bde909609d70bf9862dd65cf1",
-  "0x000000000000000000000000000000000005fcac9b75cac50d87ca827678c070",
-  "0x00000000000000000000000000000071e27b0a0dd0e2180985072f4a949f0c1d",
-  "0x000000000000000000000000000000000025d2d1388eddcf016213f1cadc763f",
-  "0x000000000000000000000000000000b216bad715cdfa7c382d30d7a368cc1346",
-  "0x0000000000000000000000000000000000302dbbf78b13a6d71d1978b5607145",
-  "0x00000000000000000000000000000002ebdec49969d2ff9220240bbcb8730617",
-  "0x000000000000000000000000000000000027f41cad8540e47008c1da90340ef6",
-  "0x000000000000000000000000000000e8259148321315cc34166a206fe910c6cb",
-  "0x000000000000000000000000000000000013444efc30c7688d961f36de252af6",
-  "0x0000000000000000000000000000005b7c7ad432291e9dff1dfad51159e50dbf",
-  "0x0000000000000000000000000000000000205ec973a0d1c898c1def7852353b3",
-  "0x0000000000000000000000000000007940a7e88fe5ce47af688975c92be1b62a",
-  "0x000000000000000000000000000000000015bdab44fe41eec6ee62ed58f55ff5",
-  "0x0000000000000000000000000000003693b90aedcd664eede665df6f376cf526",
-  "0x0000000000000000000000000000000000207c38fd6851d1568fe18a83585f31",
-  "0x000000000000000000000000000000f1a8a60975b9b092aab1421166be08c2f5",
-  "0x000000000000000000000000000000000015450d2e8ea17db209302582b886f1",
-  "0x000000000000000000000000000000526e857040a344bd434bfdbf94d3a49196",
-  "0x00000000000000000000000000000000000d0112b922a852c4754ab3929d6d02",
-  "0x000000000000000000000000000000d88041fa28c8118a58ceacbcc8780844b5",
-  "0x00000000000000000000000000000000002584170ebef150b71c5e6aa93e2fbb",
-  "0x0000000000000000000000000000006363c23486d6a7a313beac4e2d9611968a",
-  "0x0000000000000000000000000000000000085acee4523161ab1e268a4f0c1b0f",
-  "0x000000000000000000000000000000b250d5a528a555d96d498fc9af4f8cc5c2",
-  "0x000000000000000000000000000000000017080f8d1d21b541de1c64d8b794df",
-  "0x000000000000000000000000000000621557759a0775ea5575adc9c6fbd96d56",
-  "0x00000000000000000000000000000000001cd60c23a37c42d7e46e1e19e966ae",
-  "0x0000000000000000000000000000000d52081b2311a7e9bf52407cf3d2c336b3",
-  "0x0000000000000000000000000000000000003b2312f2f2f419434a1440d40c69",
-  "0x000000000000000000000000000000d26082083660d6ac8bffb639994e4500e7",
-  "0x000000000000000000000000000000000019d6ef8ce569e7fa55b8aab7f5eea6",
-  "0x00000000000000000000000000000078d8a04f7b6c536d3a8a35c790b4dc7ddc",
-  "0x00000000000000000000000000000000001111470a41156a530334d2c08511a5",
-  "0x0000000000000000000000000000008ab4119a5478448b7ec3573de2cdfd8e56",
-  "0x0000000000000000000000000000000000263c7bd4cde5591308156c458d2989",
-  "0x0000000000000000000000000000004a676142c9eca140ac96ab9ca49633e141",
-  "0x00000000000000000000000000000000001de62520faa095ad7513f753e0a73e",
-  "0x0000000000000000000000000000000000000000000000000000000000000001",
-  "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "0x0000000000000000000000000000000000000000000000000000000000000002",
-  "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "0x000000000000000000000000000000a2c4fbcbebac01e208127093cbf44780d4",
-  "0x00000000000000000000000000000000001ca34545a074b1cb689aa0b343402d",
-  "0x000000000000000000000000000000a58c28598055d8818a6dbadd0018904386",
-  "0x0000000000000000000000000000000000152154cbc213630f5c7ec1ee37751b"
+  "0x0000000000000000000000000000000000000000000000000000000000000005",
+  "0x0000000000000000000000000000008a8843c678d444ced3a35d87626e56ed9f",
+  "0x0000000000000000000000000000000000060403e4feb303ebae0081cbad4e96",
+  "0x000000000000000000000000000000f0fe138760bd40aadc43c77ad160555212",
+  "0x0000000000000000000000000000000000154e802ee66f7a511a469adb8153e5",
+  "0x00000000000000000000000000000012b75e2667d243bc4bb7b0cde3bdc5eefc",
+  "0x000000000000000000000000000000000013e94fa83017e580a2e280e4f8c376",
+  "0x000000000000000000000000000000fb8b3161040e7a5502bf277aec7b82cb6b",
+  "0x000000000000000000000000000000000014e7113349a6d4f2b0d3c9bde42075",
+  "0x0000000000000000000000000000006bc15064df220ad5d2fea722296bf72c99",
+  "0x00000000000000000000000000000000002039216ff43d16e0a63e542794decf",
+  "0x000000000000000000000000000000f0d3e00b510ae4272fbba83d787c7e6b6e",
+  "0x000000000000000000000000000000000022f73b00c62c39fc49fbffa96081da",
+  "0x0000000000000000000000000000000ff9f67bc7c9b90987dbed3fadf40bacc4",
+  "0x00000000000000000000000000000000001dc87bb292ea49bdb5bb87509c9781",
+  "0x00000000000000000000000000000025239c23a65572724acdd6663984afc224",
+  "0x000000000000000000000000000000000005e345da6870bd306f04558f601b45",
+  "0x000000000000000000000000000000cb380ac3dc3f8788bab24fcb5d9eedc949",
+  "0x000000000000000000000000000000000017714c1fab296b76d2f78ed675c1ce",
+  "0x00000000000000000000000000000095bca1a9f9a186f7ec34e43c479e5d1b2f",
+  "0x000000000000000000000000000000000018d292be64529b7e9ec24c76e561d9",
+  "0x0000000000000000000000000000006f1bd711730ae2aaf83227b9d9f46daa43",
+  "0x00000000000000000000000000000000002df0b894f5971084c0a65839178a66",
+  "0x000000000000000000000000000000909f2efe0bffa95e984d456089f568f59b",
+  "0x00000000000000000000000000000000002908f2c7ddf9573df347d6c9f22fde",
+  "0x0000000000000000000000000000006f206a04895661d3bd004222a1f8a7fc73",
+  "0x00000000000000000000000000000000001b12a59a820d3aa543a594a1b9d92f",
+  "0x0000000000000000000000000000002103559842aca1e08af33bb1f714ebc02a",
+  "0x00000000000000000000000000000000001b8936a0be628b58af9859c2a851d1",
+  "0x000000000000000000000000000000d2c67f3c526e05aa6d25558ae65cf0e3ac",
+  "0x000000000000000000000000000000000006cc97b785475ed3429d939fa00e96",
+  "0x000000000000000000000000000000c5240a725c016a35037b37f73c37b68de9",
+  "0x000000000000000000000000000000000015e6206f121de2aafe259c32889a4b",
+  "0x0000000000000000000000000000004cba3ce39736c272ff963bdbdfcb67c2ef",
+  "0x0000000000000000000000000000000000243b3786310485c3234295957c5222",
+  "0x0000000000000000000000000000002c3672eaf01e849995fc3f6dc99dcd1d60",
+  "0x00000000000000000000000000000000001449e8673b109f980a1542f1ddd670",
+  "0x000000000000000000000000000000f077af86375782052dfc713a0c67f9a08b",
+  "0x0000000000000000000000000000000000124108d868884e76f5ceeb60b2bdae",
+  "0x00000000000000000000000000000029c3fd985c5dd5867bd8fed36ad940e02d",
+  "0x0000000000000000000000000000000000146fedc34ca9246ab0df070f31ee14",
+  "0x000000000000000000000000000000706a32f5a8f5fa44205bb08662e0ef1396",
+  "0x000000000000000000000000000000000016ded7f7f0b72d3ecf256f5c2ee613",
+  "0x0000000000000000000000000000002eaf856304cdbbb4d0b926d9c9211028c0",
+  "0x000000000000000000000000000000000004696250db37878179b548105ff54e",
+  "0x000000000000000000000000000000047767298e4177562ddcbcae03c7ec6ccc",
+  "0x00000000000000000000000000000000001f29f52f5f45f28e462390b0f914f9",
+  "0x00000000000000000000000000000004e950f9459bf160429275bc6a733319ea",
+  "0x0000000000000000000000000000000000175f23657f8f899b10b84c1ffe432c",
+  "0x0000000000000000000000000000006e522620788963bd42d9ab48810f89afe4",
+  "0x00000000000000000000000000000000002243c76dbde36a37e42b92bae3eb16",
+  "0x0000000000000000000000000000005641fbcbddd5abb62d653fd7f1ed10ed7e",
+  "0x000000000000000000000000000000000007d25e6a46da918fdb902e1a78efb4",
+  "0x00000000000000000000000000000065f7509bb551cb061c5fd1e92bc85a4974",
+  "0x00000000000000000000000000000000002efbc0dd9b88baa9675d95ae595e68",
+  "0x00000000000000000000000000000046bdd1d7603fdb2ee53f8966b3069082a5",
+  "0x0000000000000000000000000000000000161d3346daa3f83e4416d59e8135b6",
+  "0x000000000000000000000000000000ec124a53466d06b5e0df3e77f9f6a6ae15",
+  "0x0000000000000000000000000000000000128b36a77e814ffa503da6fd061fc3",
+  "0x0000000000000000000000000000002cfa5f8d00fe2bbdd85db6b0179a4c7346",
+  "0x00000000000000000000000000000000002b7ce5f45710c4b113f7ca6b3291b0",
+  "0x00000000000000000000000000000054409cb824bb2028eb6a501f9585b13eda",
+  "0x000000000000000000000000000000000026412333aa334f56e0761374f0c38b",
+  "0x0000000000000000000000000000002a23ae58cbd13760028a699488d5a4300f",
+  "0x0000000000000000000000000000000000225067a42bdcd7d9eec23d250acc92",
+  "0x0000000000000000000000000000006e28e63b7d6bc65c15c009f5dd9304f8fd",
+  "0x00000000000000000000000000000000002648ab0c9cfefbb147853e364bef8d",
+  "0x000000000000000000000000000000f00a9e6c1594965b7c14b2310b489b52f9",
+  "0x00000000000000000000000000000000000a03f4283d5d64b7245827349741ee",
+  "0x00000000000000000000000000000073f3c5531dc194b7332ef4e765192e3962",
+  "0x0000000000000000000000000000000000088b01c6cab84d827c1d8eae1ebbbd",
+  "0x000000000000000000000000000000e197f3a024045bec491c28fc4b7594347b",
+  "0x000000000000000000000000000000000025bf29aee6c0dd8976574600dfacea",
+  "0x00000000000000000000000000000023cebfa19e1e206b1d71359821037c31b7",
+  "0x00000000000000000000000000000000000c2354b63a0bcd72350e606c3fa0e7",
+  "0x000000000000000000000000000000fcf564b220543fd0aea7b28c05df85fe3a",
+  "0x00000000000000000000000000000000000c2f035d78985f2c0e4ab138790e69",
+  "0x0000000000000000000000000000005129d16313e897118223bd963067e22700",
+  "0x000000000000000000000000000000000004c87b337be4b82e809af637daef82",
+  "0x000000000000000000000000000000279941b3633c9a8e9fc6e68ef4be5633f4",
+  "0x00000000000000000000000000000000002a9334f2cfa791a9bbc88cc234a5d2",
+  "0x000000000000000000000000000000ab1a8db808cb2b1b90ba26085c23154102",
+  "0x00000000000000000000000000000000002c04e8fdbd1f2154a1b42961e3b6b5",
+  "0x0000000000000000000000000000005729f9b6dcfc45fa934c44ad8800e2b7c6",
+  "0x00000000000000000000000000000000002c584d4df5aaa602e46e5033408d64",
+  "0x0000000000000000000000000000004daf206a533411e7b39ab99acaf3287ca2",
+  "0x000000000000000000000000000000000020d85db8daa0dd9c83ceda296cbe73",
+  "0x000000000000000000000000000000ab6d868729c089d55819b59b1df10e26ce",
+  "0x000000000000000000000000000000000004b5421430befd61f014813d315ade",
+  "0x0000000000000000000000000000005eefcb3c6f69064ed55425945fcc74c2bc",
+  "0x00000000000000000000000000000000001613278bd29c20c182e6f3b5e367ce",
+  "0x0000000000000000000000000000006c39d4dd8c65752b9bc2628fcc3dbf415c",
+  "0x00000000000000000000000000000000000d4b721e385647b57de3efbc9952db",
+  "0x000000000000000000000000000000e26e87fb5ad793c153110c1e55129d9ee7",
+  "0x00000000000000000000000000000000001986fe851f46fd25818f580f9d55f1",
+  "0x0000000000000000000000000000007a7eb895f6f2419aafb58de3f81b3f6739",
+  "0x00000000000000000000000000000000000d1289085013119c588fbcdbb11f5e",
+  "0x00000000000000000000000000000061358ce9820bc7ced39ca91d017f767cfa",
+  "0x000000000000000000000000000000000018a26c04d92048605adf6b40fbe696",
+  "0x000000000000000000000000000000924ee754d49e43f0991a540ece79958ad1",
+  "0x00000000000000000000000000000000001faa0f64d400addf955b2f4a8181ec",
+  "0x0000000000000000000000000000000c13651a87f101a4d0bf32619d4326c45b",
+  "0x000000000000000000000000000000000002809feb719732fbf341dd249e671d",
+  "0x0000000000000000000000000000003523e8c751d17a4dcd30540a4f9261403b",
+  "0x00000000000000000000000000000000001466cc1bd7c1743fca0477c4ea4481",
+  "0x0000000000000000000000000000001eee81b23a887f299049b14c11e98460d6",
+  "0x00000000000000000000000000000000002a56ce41f6b0be13b9c26747621b82",
+  "0x000000000000000000000000000000d5827d6338c78656c0d12ca1aea6ef2c7c",
+  "0x00000000000000000000000000000000001aa98f2de3ddda547d8f6de4e725de",
+  "0x000000000000000000000000000000bd9c096acdaa162e6c7ee9b718f7fbf759",
+  "0x00000000000000000000000000000000002c70947eefbeb3fcbc1953b2ccb88f",
+  "0x00000000000000000000000000000045e09e50b539ce6228369e4b4cb8530ce0",
+  "0x0000000000000000000000000000000000062cf2c7d023a38df32e6c8c04a8c1"
 ]
-      hash = "0x0c9b0fab06de495eb1835dc184eb51d6584a970a90bb9c9dba17ab97e9b6dee6"
+      hash = "0x208d8b1ad2d688325416c8a23881e8b14753352851d7740b339ea2ebd455cdcc"
 
   [inputs.previous_l1_to_l2]
   root = "0x0fef6d80d31109ddb56d6b3f607cbc9c0af0bff3ea0d43e8f278983c64c11f7a"
diff --git a/noir-projects/noir-protocol-circuits/crates/rollup-checkpoint-merge/Prover.toml b/noir-projects/noir-protocol-circuits/crates/rollup-checkpoint-merge/Prover.toml
index 0509263d42c7..28d9ad79f9c8 100644
--- a/noir-projects/noir-protocol-circuits/crates/rollup-checkpoint-merge/Prover.toml
+++ b/noir-projects/noir-protocol-circuits/crates/rollup-checkpoint-merge/Prover.toml
@@ -484,7 +484,7 @@ proof = [
 
   [inputs.previous_rollups.public_inputs]
   checkpoint_header_hashes = [
-  "0x006b39d4ea31f018975f0cbc0cb76b67358a66a508877e61d7c5c2c89eeb64a7",
+  "0x004d16fb29611dba53004101a433c88fddade0ec60446fddec1589851839a774",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -520,17 +520,17 @@ proof = [
 
     [inputs.previous_rollups.public_inputs.constants]
     chain_id = "0x0000000000000000000000000000000000000000000000000000000000007a69"
-    version = "0x000000000000000000000000000000000000000000000000000000007b6d50be"
-    vk_tree_root = "0x0141caf6779674bc31225636c4cc4259a731835c52fc462f2dcbfabf7de01a1d"
-    protocol_contracts_hash = "0x01af64239167dcc8333e25456aab71348f66d9f6de731a8b62181d16cf0818c1"
+    version = "0x00000000000000000000000000000000000000000000000000000000ad49d7cd"
+    vk_tree_root = "0x0c16448b65c4b3f83f9db3bebf635bd38957c74c9c1ea36036cbda16432cf558"
+    protocol_contracts_hash = "0x0333160f082dfc02e255c756febac14dc42c4c88b882e0403d44710c1f0bb80f"
     prover_id = "0x0000000000000000000000003c44cdddb6a900fa2b585dd299e03d12fa4293bc"
 
     [inputs.previous_rollups.public_inputs.previous_archive]
-    root = "0x2a7e736656c2f8342e2e096500493f5acd825b2fb9ef2017b5ec23d029d5783a"
+    root = "0x00f30d99838de8d9e0b40bb5f19c53ebd2cea2e4e324a6b48a4db2655906ad63"
     next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000009"
 
     [inputs.previous_rollups.public_inputs.new_archive]
-    root = "0x280a1dc0fc66f05e5627b85e7375854013fa767efae0e792cc4c77e6e7641135"
+    root = "0x25dd04dc7f0a4299651ea908c014de487c4be771db4d68b458d16aa041af02ba"
     next_available_leaf_index = "0x000000000000000000000000000000000000000000000000000000000000000a"
 
     [inputs.previous_rollups.public_inputs.previous_out_hash]
@@ -542,10 +542,10 @@ proof = [
     next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000001"
 
     [[inputs.previous_rollups.public_inputs.fees]]
-    value = "0x000000000000000000000000000000000000000000000000003b2900d9fe7700"
+    value = "0x000000000000000000000000000000000000000000000000003b2f97f0a76c80"
 
       [inputs.previous_rollups.public_inputs.fees.recipient]
-      inner = "0x000000000000000000000000080c5a37d2d3dade855a034bac3548a8b2dfd887"
+      inner = "0x000000000000000000000000fde0805eba75f23cd30a3bb4f0e567a356075904"
 
     [[inputs.previous_rollups.public_inputs.fees]]
     value = "0x0000000000000000000000000000000000000000000000000000000000000000"
@@ -772,15 +772,15 @@ proof = [
 ]
 
     [inputs.previous_rollups.public_inputs.end_blob_accumulator]
-    blob_commitments_hash_acc = "0x0041dc7a3cdf96c85885b370a183f602f91594236564f04801996f18654b97ab"
-    z_acc = "0x2e32a235e3b646549d8967f97e1ad89de56127e5d14556ddaa1bfe85788b319f"
-    gamma_acc = "0x08cddb394c5ea50193f47ed5d9c0140e366c11a13981fa44625bcfaa4d5bcd04"
+    blob_commitments_hash_acc = "0x00c6080f82da97cd32a6e6f96167937982d1b1d102f2670358d457217207a2a5"
+    z_acc = "0x1ff8cc937c58f2d72966f69b2e490b6dc7f6704680430ac91ea6c0e6207d4d96"
+    gamma_acc = "0x1684547681775fced98c96d09e82919f729d14549da6323b669a8512c9b3802e"
 
       [inputs.previous_rollups.public_inputs.end_blob_accumulator.y_acc]
       limbs = [
-  "0xdce32988140b7e26b68d7017365987",
-  "0x9ab3824a901f0be5ccaa3e63255ca4",
-  "0x32cc"
+  "0xd2054ab1639ea442bd23a5b1c57cf5",
+  "0x4b6135801975f6ab44b107b0a1e000",
+  "0x677b"
 ]
 
       [inputs.previous_rollups.public_inputs.end_blob_accumulator.c_acc]
@@ -788,168 +788,168 @@ proof = [
 
         [inputs.previous_rollups.public_inputs.end_blob_accumulator.c_acc.x]
         limbs = [
-  "0x1c0822a9da9bfe81f8126c3fd5fa84",
-  "0xa26ed20205f7613c99d17c4daad51a",
-  "0x19696da9cbadde1522cb8f6496298b",
-  "0x12a793"
+  "0xca945aeef9c954013ca54795553295",
+  "0x9c13e59f13d27ea1d0bbfde41965a9",
+  "0xf7f9f09f06a5e9f04fb45ab0edb363",
+  "0x18f7d5"
 ]
 
         [inputs.previous_rollups.public_inputs.end_blob_accumulator.c_acc.y]
         limbs = [
-  "0x4a83aa3ca5c06e6069a27bef5b13ff",
-  "0xc356c919a0654be57e16094198a812",
-  "0x733aaae7bf2ef47ae16edae9ec2f9e",
-  "0x025eb5"
+  "0xb04ef08577b05403570538b51898a0",
+  "0x2797dcc9fb92375446462d46b4ccbb",
+  "0x39156e19c6155c4ef0f97030dc5d90",
+  "0x0ad01d"
 ]
 
       [inputs.previous_rollups.public_inputs.end_blob_accumulator.gamma_pow_acc]
       limbs = [
-  "0x6804d65282d302d4ddda70f6f2abd7",
-  "0x2279c9033cd2fad6be7d59214f2631",
-  "0x0cf8"
+  "0x551bcc798b08297e8823944cd61ccd",
+  "0xa11af380fa73225d8ac70a4862f1cc",
+  "0x24db"
 ]
 
     [inputs.previous_rollups.public_inputs.final_blob_challenges]
-    z = "0x258fe952c7f4b5c99fef8430b0b5180c25de80ba57d2e8ccae86424640029cff"
+    z = "0x0f20024c268f33a3baa0f8f38bddd3d70a7fe791632d4914d95c44e2099fa150"
 
       [inputs.previous_rollups.public_inputs.final_blob_challenges.gamma]
       limbs = [
-  "0x6804d65282d302d4ddda70f6f2abd7",
-  "0x2279c9033cd2fad6be7d59214f2631",
-  "0x0cf8"
+  "0x551bcc798b08297e8823944cd61ccd",
+  "0xa11af380fa73225d8ac70a4862f1cc",
+  "0x24db"
 ]
 
   [inputs.previous_rollups.vk_data]
   leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000011"
   sibling_path = [
-  "0x23f1411ea3da26878e97937a733d7a9c893fa3f2160137de61cb6a102a2050f2",
-  "0x23027ebf247908b2602031ac11b76cb579049a954fd43087f04356f50add7714",
-  "0x08cf1d3a672e65daf5990d04b351209fd0479b24b7a6c25fa2d381f89df08156",
-  "0x2740690820f0df46bcbf149ccb51f228fb81a46173ad1793687319f77d32d49f",
-  "0x026fbe21cffb22c458f7e07b206bdaf767d39af34024eefe88e3d8b56eb9f695",
-  "0x19de2a32662702dd872e529ad89836e16b013012f910daf2bc7c2a67356dd107",
-  "0x1f07bca7a14f9a969539c0afd388affa18926689f431fc541841a2a7604d388c"
+  "0x1edc2329182e13c58f5ced1e4ca120ba845e074e81d59ee64d0bbd583ecdd429",
+  "0x1f502972a4bdd0353e082932afca85331d93e89c99ab3a78511939c18eb14641",
+  "0x1f0a3ab28f16510e4f9a5682a8b5f2826f55082cd639c6b76e6e970d8bb4224d",
+  "0x268f759e38c9ff705a78c055b44e19f7d2b0227f3c4f2e31d6874550d498abec",
+  "0x09f661abe743a7c8125aa0498ca1d01914fdac9cadadb415e0d1a05934997b99",
+  "0x28650667b92be48b116289119fa4794a5fe8fe5792a49d89b9977feae7f685a6",
+  "0x2aa74c20807e8cbb3e32a86ad29472c42a3fb7021dcfaad112a6b68eb0eca98e"
 ]
 
     [inputs.previous_rollups.vk_data.vk]
     key = [
   "0x0000000000000000000000000000000000000000000000000000000000000017",
   "0x00000000000000000000000000000000000000000000000000000000000000a3",
-  "0x0000000000000000000000000000000000000000000000000000000000000001",
-  "0x00000000000000000000000000000070169ffa51c4d2f6a4b31749016e3a4f98",
-  "0x00000000000000000000000000000000002d0c90567eaf8a25186e95a9a44b59",
-  "0x0000000000000000000000000000001a26c6be8f50a1836e09be831aa8373e62",
-  "0x00000000000000000000000000000000001b4cbfb0b81cf7b259a64939877eee",
-  "0x00000000000000000000000000000004342c3be32ac53d6b6b8064b71c936959",
-  "0x00000000000000000000000000000000000458d82db1cd79ce2fd9c141099eb8",
-  "0x000000000000000000000000000000624fac7feb19d29c2c010c5922526f4ed8",
-  "0x0000000000000000000000000000000000282ea2c74e4875c1e94a1dabd70cce",
-  "0x0000000000000000000000000000008ad38d292572ae034aa7d85fc5c015f271",
-  "0x000000000000000000000000000000000021e45922b40b48651c7932a6e13611",
-  "0x000000000000000000000000000000a73dab9ddc3b54090c50ca93622227f3c2",
-  "0x00000000000000000000000000000000002d70204a5b85deb214313dbeb32bc3",
-  "0x00000000000000000000000000000048688558b56d3c6032e622e0132bea8bc9",
-  "0x000000000000000000000000000000000029b1cb58dcbb9d06f234917950e034",
-  "0x000000000000000000000000000000e4989a9bb1675d5be2af2e4f131e74140b",
-  "0x000000000000000000000000000000000012b4ab9c56ee16508e8d613328b39e",
-  "0x000000000000000000000000000000e52ca2027b19bc7b6e8f00eaba7d43784b",
-  "0x00000000000000000000000000000000002484c6c3932251115c1db94dcfae6b",
-  "0x000000000000000000000000000000db8fe96a61cdfb97df5f9712f9f1939d9f",
-  "0x000000000000000000000000000000000010c87f7386b0390d36282c2bfa4f83",
-  "0x000000000000000000000000000000028b9750326c7e469e009cf8faf6e6f560",
-  "0x000000000000000000000000000000000010e070864c12c087107aa7039bdd87",
-  "0x000000000000000000000000000000838e696c0a48c139516ea4a3431cf9b1cb",
-  "0x000000000000000000000000000000000018bcb06a170f1760a6c2e4b39aa8d4",
-  "0x0000000000000000000000000000004b9cd87af8615fd21a50f9d2d6f5bac356",
-  "0x00000000000000000000000000000000002fea96f32103760ddbb66d2b64dc5c",
-  "0x000000000000000000000000000000cf57cca060c094a74ad685146e8fdb5c3e",
-  "0x00000000000000000000000000000000000a71f47258b8aa04fa23f39812abf3",
-  "0x000000000000000000000000000000469895c891c199afe0d76eea89cae9846e",
-  "0x00000000000000000000000000000000001676f0631134f615c932f1c151f348",
-  "0x000000000000000000000000000000b596e3645318b680a53db60a2e38465678",
-  "0x00000000000000000000000000000000001c4d7f6576654db4c031af7135b301",
-  "0x000000000000000000000000000000cbf0b2db7f422f69ed21d0a1272c4ffa1f",
-  "0x00000000000000000000000000000000000d4bb7ebd1692fff8fde678f1666bc",
-  "0x000000000000000000000000000000830bd527115207292ac568d95c51b5ec4c",
-  "0x00000000000000000000000000000000000c0e98421c91f517f07d72e3afdad2",
-  "0x000000000000000000000000000000def2948a821aedbfaf5b664e9d3d9b3307",
-  "0x000000000000000000000000000000000014660a8bd3b487191c55f4a711e3ef",
-  "0x0000000000000000000000000000007012ec37b63072053f2552bd1d35013cd5",
-  "0x00000000000000000000000000000000002831783f3fb1f7de5b60063fad00f1",
-  "0x00000000000000000000000000000070f36b84d9e8e12f09a892bad379f761f9",
-  "0x0000000000000000000000000000000000126c141e95058e97930cf1e7f99600",
-  "0x0000000000000000000000000000003c31e1c42e20f6f5417229688b0b09bbfe",
-  "0x000000000000000000000000000000000005f7d883985d683811dbb2850cab4f",
-  "0x00000000000000000000000000000014f4261f09cc69d650eb56314da23ee49b",
-  "0x00000000000000000000000000000000002001d6d7fd1e16a440145ff99c5d8d",
-  "0x000000000000000000000000000000fa173f280d8ff466caf838817e8f6587c1",
-  "0x00000000000000000000000000000000002570309b6a1ae7576b2014b4f6893f",
-  "0x00000000000000000000000000000000bd26a605385f8ba19afab17ff63bb846",
-  "0x0000000000000000000000000000000000130b34f1a2b25274765a033d5fff7d",
-  "0x000000000000000000000000000000202dd6f740ad4d3b1f7ef7e255458970bb",
-  "0x00000000000000000000000000000000002204b14b88424f24025b906e965059",
-  "0x00000000000000000000000000000095d82554bf97c5f581cd30a7f3f6029764",
-  "0x000000000000000000000000000000000024e67a3d998142806998569e271c5a",
-  "0x000000000000000000000000000000d4fb3a2e99fe55d1f4969c2c097da18c24",
-  "0x00000000000000000000000000000000001bb297c8c97bbfbda82f0121df9327",
-  "0x000000000000000000000000000000c4327ecd5484d207e212c4a30be2558a0f",
-  "0x00000000000000000000000000000000001816a1b18c8ca9c94e56fea226913c",
-  "0x0000000000000000000000000000000df0828b01de7f11dcf45561e418a4815b",
-  "0x000000000000000000000000000000000010f9f17ce276bc31fcb61a54c52dab",
-  "0x000000000000000000000000000000d3f6b007f27ef6d39aff4469e50cbdd4ff",
-  "0x00000000000000000000000000000000001839054a3513ee69897085f6a1b292",
-  "0x000000000000000000000000000000d8eed1000ac8c4ad1a1d0ab540feef9c27",
-  "0x000000000000000000000000000000000010cf586bf3e1a6fc265ff661a90815",
-  "0x0000000000000000000000000000001bed8c9e2703ec607c6e75759b0e462188",
-  "0x000000000000000000000000000000000030296eabb61d14925bbfeec9afd884",
-  "0x0000000000000000000000000000005e578cedcd3c12ee7a1b9a0d8e1df85a9e",
-  "0x0000000000000000000000000000000000218014003ddafaee6b9a79a1e8f899",
-  "0x00000000000000000000000000000061cf01ef83d2dfa3e28080f9eeb6a79ee4",
-  "0x00000000000000000000000000000000000871218befd52f350f8a6e6ed1f3a4",
-  "0x0000000000000000000000000000003612b63ce1ba2913e8d9847414ac278e90",
-  "0x0000000000000000000000000000000000183d6943070362752ddfc4a87dcd5f",
-  "0x000000000000000000000000000000ce800005a71f12cc1923e80fec787721ad",
-  "0x00000000000000000000000000000000002bbc6db5784ee86a77a24b6692d4ca",
-  "0x000000000000000000000000000000c083bdd068a157e96ba8657b50ecb0cdbc",
-  "0x00000000000000000000000000000000000646105917a33eec246c470f8e5ff3",
-  "0x000000000000000000000000000000dd55fb0bb5efd5fe51251932307d0e42e1",
-  "0x000000000000000000000000000000000027b35fe7aeb94e5427d028db387e1a",
-  "0x0000000000000000000000000000004af9bc2d92ff8015353c874b1554d27c9c",
-  "0x00000000000000000000000000000000001e631edb990c73393facf22014c670",
-  "0x0000000000000000000000000000002420dbf4fa6f0b7241118959c109fc2de9",
-  "0x00000000000000000000000000000000000c0af01d73d6d3364d9670c66af10b",
-  "0x000000000000000000000000000000450b2bd095730122fd2baf0e77bbf65ecf",
-  "0x000000000000000000000000000000000021b0e000990c155a18bc000022ca76",
-  "0x0000000000000000000000000000004e7f91ea5dae855be68d91b2e08c2cfd42",
-  "0x0000000000000000000000000000000000282c0fc1c220c4b64554a123e2f470",
-  "0x000000000000000000000000000000e22de2967bdd4ee88f5e6d9c354312d09e",
-  "0x000000000000000000000000000000000023b226d5bc37add149d05ecd66b5a5",
-  "0x000000000000000000000000000000f4a6c6ffdf80a72db78762e237d58cd5f6",
-  "0x000000000000000000000000000000000026814a59803555635a3b6dfd056d19",
-  "0x000000000000000000000000000000f45b8d96069231f48e0d0c34d57593a6a6",
-  "0x00000000000000000000000000000000000b9dc32399025796005b2f68c15991",
-  "0x000000000000000000000000000000750e1b5cb997a3adf8540bf55bb9264ec4",
-  "0x00000000000000000000000000000000001f6cd5b6d43f67798ae4655c016f37",
-  "0x000000000000000000000000000000596cc6183848f32c60ec74fe2bcd76b20f",
-  "0x00000000000000000000000000000000000ed62d10b019355f008b46412d0e2d",
-  "0x0000000000000000000000000000002020dfdab8c9db8335bca3c8284b1585b2",
-  "0x000000000000000000000000000000000023a2906d03204aa4f79b5b80b92eaa",
-  "0x0000000000000000000000000000009116c4d15f7c9a51f17c3830fe7c1e3b42",
-  "0x000000000000000000000000000000000024aecae332db48e03b97fc645a7f05",
-  "0x000000000000000000000000000000834c5e938cf9e8bd4bd5847e2408407276",
-  "0x000000000000000000000000000000000008524b40cf87b668119022f691cfac",
-  "0x000000000000000000000000000000e699df860731437ec57f9890fe4b3a4205",
-  "0x00000000000000000000000000000000000e1e9d4327e635f547da67aef57e86",
-  "0x0000000000000000000000000000000000000000000000000000000000000001",
-  "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "0x0000000000000000000000000000000000000000000000000000000000000002",
-  "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "0x000000000000000000000000000000a0c3d77ea30a89e9b9728507193050881b",
-  "0x00000000000000000000000000000000002358eed771d49c0e15036cccc5dc13",
-  "0x000000000000000000000000000000842ffbd2b370afe31af503c8be68b5ec63",
-  "0x0000000000000000000000000000000000296578e21bbf276e8916716a0c2208"
+  "0x0000000000000000000000000000000000000000000000000000000000000005",
+  "0x000000000000000000000000000000302787373675614b5065e413ff7cb47635",
+  "0x000000000000000000000000000000000030223bf53e330987976984cbc8b777",
+  "0x0000000000000000000000000000005d7e3c622753bc9765188b58278de58e2b",
+  "0x0000000000000000000000000000000000155d33c8914989120390dd1f1b565a",
+  "0x000000000000000000000000000000ee6a96b509792fe4cb08ba5b690a829260",
+  "0x00000000000000000000000000000000002334a82c7c45a013fd6565043b3e34",
+  "0x000000000000000000000000000000b64df10cafd4414f4ca1cfcc9df1104b83",
+  "0x0000000000000000000000000000000000146a7f5eacb3170bc6517966b91c32",
+  "0x0000000000000000000000000000009d478f8685010a03b0c7e082a0bc36f004",
+  "0x000000000000000000000000000000000000ba76040d675cb33d320e90572c0b",
+  "0x0000000000000000000000000000003be6828a9dfcbeaf8f85587eb0e140f22c",
+  "0x00000000000000000000000000000000002be8cad756fc14e20e65bcdac55d84",
+  "0x00000000000000000000000000000060d5a42641ead1f373092743119aa3af8c",
+  "0x0000000000000000000000000000000000164fde87f47eecf92ee4516ec82322",
+  "0x000000000000000000000000000000a8a3b797a6fe3470f8e4f7869dd43c2bc7",
+  "0x000000000000000000000000000000000017ec5446085f31ee161d9b3aeb1dc4",
+  "0x00000000000000000000000000000058cb2aac262dfffdaf058bcc776cd9a491",
+  "0x00000000000000000000000000000000000c3392013d42001efe4b51a9f9839d",
+  "0x000000000000000000000000000000eccc64c49eb40425e8fe5224ccdc43c1e4",
+  "0x00000000000000000000000000000000001f6506bedb6d949f1f86098e65a72d",
+  "0x0000000000000000000000000000002dd78f1fd00370a8383fbc3ba9753685ec",
+  "0x00000000000000000000000000000000002162b403b60b934527df3cdf67eaeb",
+  "0x000000000000000000000000000000d68ea8aebfb824365dabd01f6423c18a43",
+  "0x00000000000000000000000000000000000e1416c2f366756eb6713a61c29e0e",
+  "0x000000000000000000000000000000577c33d5c10b485d8c213d16ac4664dd62",
+  "0x00000000000000000000000000000000001dbb32af825db919015b2f62ac527a",
+  "0x0000000000000000000000000000004089798ec9503f6d851e3f36c8134fffca",
+  "0x0000000000000000000000000000000000258c2a8625473699411a82c908b205",
+  "0x000000000000000000000000000000900e70ab0eb295b2339744f30290816695",
+  "0x00000000000000000000000000000000002b8710de153dbcb980c871c8641455",
+  "0x00000000000000000000000000000064c8a69e30c314b2c9f307b9859388b725",
+  "0x00000000000000000000000000000000000274811b6c58c4854427d143980169",
+  "0x000000000000000000000000000000bd95ab45995e60444bcbcf2f650df95bfb",
+  "0x00000000000000000000000000000000001f24b2f347e01bcdbd025ac0559c85",
+  "0x000000000000000000000000000000ee494e93426c721d97ae5aa62c90310e73",
+  "0x000000000000000000000000000000000015237248ed9e657735f540e8c7756d",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x00000000000000000000000000000013c3bccc5388da92f5d871dfc5798c6f7d",
+  "0x00000000000000000000000000000000001ed1d4ff8584dd1dd72fa169b590d1",
+  "0x0000000000000000000000000000003de967fe48c15d8973f84a210a95dd64de",
+  "0x0000000000000000000000000000000000127264f024fdb1905c1b9311a69989",
+  "0x00000000000000000000000000000067ab29550dc70b79125476307dde9d4eb1",
+  "0x00000000000000000000000000000000002dc480e42e6eea643f7ceb8de96baf",
+  "0x000000000000000000000000000000b78c2d92f2d7d849bac283fd66764341fb",
+  "0x0000000000000000000000000000000000230044dfbb796950437c31b1813440",
+  "0x0000000000000000000000000000002864afee535c3f2025e8d4270039646e66",
+  "0x00000000000000000000000000000000000dc28f5cecb40979171218dd29e4fe",
+  "0x0000000000000000000000000000009a0ffd05fb01bef000cc4c463054f3c151",
+  "0x000000000000000000000000000000000021d43883eb57a05047400f4a96ef19",
+  "0x000000000000000000000000000000acf8cee1de7f48c4f06266c8cfbad2151e",
+  "0x000000000000000000000000000000000006cd8fd38f0b7cd6f9151b5ac5337e",
+  "0x0000000000000000000000000000005654df5102eb796e74c9de073e107a39ac",
+  "0x0000000000000000000000000000000000028174128b65de0f5263c0e175b23b",
+  "0x0000000000000000000000000000008ca702a32d860f9280e625c387f3521f13",
+  "0x000000000000000000000000000000000019d792292ea80445492b5514e0dddc",
+  "0x00000000000000000000000000000050bbf69e0ae3345cd601a80f62379ab9b2",
+  "0x000000000000000000000000000000000023cc9e9fb3e9cb8b7c8e06200a279b",
+  "0x000000000000000000000000000000c3b8f00f6e9bd29ac661c44ce1a18528a2",
+  "0x000000000000000000000000000000000014a93c6f48de42b23c9ac1f7dbe811",
+  "0x000000000000000000000000000000f5328aed500abdc6320165cddcaca4fffa",
+  "0x0000000000000000000000000000000000232b23c95bd3a3df804c4a93de6472",
+  "0x0000000000000000000000000000006676bec8a1892b306e941dcc5d4011100c",
+  "0x00000000000000000000000000000000001df5186ae0a33ea8836ed671a892b4",
+  "0x0000000000000000000000000000004bad445ac665f80bc6acf512e07e85bc38",
+  "0x00000000000000000000000000000000001d2cdff266585d4078e18118fa9092",
+  "0x0000000000000000000000000000002c610edad308e27919b035922986bc8bff",
+  "0x0000000000000000000000000000000000088752e898b6a27f557963cf76e0c0",
+  "0x0000000000000000000000000000004f28478251fd7e453b7baa9f3020a953c6",
+  "0x0000000000000000000000000000000000169c31849094fa7939daae18f3c5bb",
+  "0x0000000000000000000000000000005dc0a499195b7457c28e8736067f4aded8",
+  "0x000000000000000000000000000000000025d7847b139148f3fc3f063fb052f1",
+  "0x000000000000000000000000000000789ab89aaf1ab942d695d28b895ed5b26a",
+  "0x000000000000000000000000000000000001b405d8ca6f44a8937d1becbe4681",
+  "0x0000000000000000000000000000005d3e2c6adda13104da28bd3d0d40726903",
+  "0x000000000000000000000000000000000006657556bced744fca4baebc7a7a08",
+  "0x0000000000000000000000000000001f1e42fe306d2ed7e063bc7dcaae2d30b3",
+  "0x000000000000000000000000000000000029f36b235f098995d51d6825cea708",
+  "0x00000000000000000000000000000011de9fe4ab7736b1c511efcb2eef509918",
+  "0x00000000000000000000000000000000002b60e192da925f3d135e6641d4ea6e",
+  "0x000000000000000000000000000000f088858045a80449ef186d814d04b39f9d",
+  "0x0000000000000000000000000000000000153d832bdd7a9f6463622c3507f239",
+  "0x000000000000000000000000000000d8a9eebdce988c3fd2f0999930a15138b2",
+  "0x0000000000000000000000000000000000075f1ac6bf2a6b487ae46aa505d3fa",
+  "0x00000000000000000000000000000087ee2dbbf2a048bad137c4db1b8ebff300",
+  "0x000000000000000000000000000000000011cbf2a4f1f11c63d8eb9513ee53e5",
+  "0x000000000000000000000000000000f5e4c418c7383a63f7237510cbcbb73c14",
+  "0x000000000000000000000000000000000028199b65e442cc03e751b5deb448e4",
+  "0x000000000000000000000000000000a702cc20da20448c18d688e550e57c745c",
+  "0x00000000000000000000000000000000001f309a205e7f82854e940ece89372c",
+  "0x0000000000000000000000000000007aac52d4113e4e71f28eb47905e925a389",
+  "0x000000000000000000000000000000000020e9e49e102536e6956c9bae558653",
+  "0x00000000000000000000000000000001ba2d9676f12016903f2696eba0098b47",
+  "0x00000000000000000000000000000000002f61c08a9c545fd795f8433ca00c12",
+  "0x0000000000000000000000000000001edfe50b3721a067770f9499a6083d4c77",
+  "0x0000000000000000000000000000000000248065a6e53c3f8b8d3db47272f7b0",
+  "0x000000000000000000000000000000ae34cb14f3eb595d76a2dd9402b1b23d64",
+  "0x000000000000000000000000000000000017ec2c75eec02d3be50d530b2b11fa",
+  "0x000000000000000000000000000000b0c14b05eabc7a7ad842ef1166b9fbdd8b",
+  "0x00000000000000000000000000000000002e2832206b3d1167b6287b5eb53374",
+  "0x0000000000000000000000000000002bf99439219158d7f65fa75dea73dc9a15",
+  "0x00000000000000000000000000000000002149e5cd921f23b5d7de4650b9daa0",
+  "0x0000000000000000000000000000001eee81b23a887f299049b14c11e98460d6",
+  "0x00000000000000000000000000000000002a56ce41f6b0be13b9c26747621b82",
+  "0x000000000000000000000000000000d5827d6338c78656c0d12ca1aea6ef2c7c",
+  "0x00000000000000000000000000000000001aa98f2de3ddda547d8f6de4e725de",
+  "0x000000000000000000000000000000f6e131d6ce506eb0d3892b0c27cfe0f4a8",
+  "0x00000000000000000000000000000000001668301c6c961e364526eb8abf9792",
+  "0x0000000000000000000000000000001ace35f485f93f441c7e0a6df02303688a",
+  "0x000000000000000000000000000000000010adb5f7e278a58893faf2b4b3ed80"
 ]
-    hash = "0x025ae2725b39a7dd723fcae620d38287cb1a08da745efb08d4eca9eede9c87b3"
+    hash = "0x16e2d4dba2d1561651bffffca7396ffbb146c6eea7b127f67a4b056c70bc7da3"
 
 [[inputs.previous_rollups]]
 proof = [
@@ -1437,7 +1437,7 @@ proof = [
 
   [inputs.previous_rollups.public_inputs]
   checkpoint_header_hashes = [
-  "0x003fccd13f5410d42213728b16b19b51ff7ab8ebe6267522484e88fea66cdd7b",
+  "0x00db58820ef17b4cb952c006ed78296097c3fcf7fd0fc3e3cec1f8260fc64045",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -1473,17 +1473,17 @@ proof = [
 
     [inputs.previous_rollups.public_inputs.constants]
     chain_id = "0x0000000000000000000000000000000000000000000000000000000000007a69"
-    version = "0x000000000000000000000000000000000000000000000000000000007b6d50be"
-    vk_tree_root = "0x0141caf6779674bc31225636c4cc4259a731835c52fc462f2dcbfabf7de01a1d"
-    protocol_contracts_hash = "0x01af64239167dcc8333e25456aab71348f66d9f6de731a8b62181d16cf0818c1"
+    version = "0x00000000000000000000000000000000000000000000000000000000ad49d7cd"
+    vk_tree_root = "0x0c16448b65c4b3f83f9db3bebf635bd38957c74c9c1ea36036cbda16432cf558"
+    protocol_contracts_hash = "0x0333160f082dfc02e255c756febac14dc42c4c88b882e0403d44710c1f0bb80f"
     prover_id = "0x0000000000000000000000003c44cdddb6a900fa2b585dd299e03d12fa4293bc"
 
     [inputs.previous_rollups.public_inputs.previous_archive]
-    root = "0x280a1dc0fc66f05e5627b85e7375854013fa767efae0e792cc4c77e6e7641135"
+    root = "0x25dd04dc7f0a4299651ea908c014de487c4be771db4d68b458d16aa041af02ba"
     next_available_leaf_index = "0x000000000000000000000000000000000000000000000000000000000000000a"
 
     [inputs.previous_rollups.public_inputs.new_archive]
-    root = "0x03d275a8edc90d3f952ec8f054b23256a99c78afb49333ede28977b2e085639d"
+    root = "0x24f3d6261780561e8ede638edf15d34d9f93372572631856307c57a08dfb9cb1"
     next_available_leaf_index = "0x000000000000000000000000000000000000000000000000000000000000000b"
 
     [inputs.previous_rollups.public_inputs.previous_out_hash]
@@ -1495,10 +1495,10 @@ proof = [
     next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000002"
 
     [[inputs.previous_rollups.public_inputs.fees]]
-    value = "0x00000000000000000000000000000000000000000000000000d0d388970f6d00"
+    value = "0x00000000000000000000000000000000000000000000000000d0f074eda98980"
 
       [inputs.previous_rollups.public_inputs.fees.recipient]
-      inner = "0x000000000000000000000000080c5a37d2d3dade855a034bac3548a8b2dfd887"
+      inner = "0x000000000000000000000000fde0805eba75f23cd30a3bb4f0e567a356075904"
 
     [[inputs.previous_rollups.public_inputs.fees]]
     value = "0x0000000000000000000000000000000000000000000000000000000000000000"
@@ -1687,15 +1687,15 @@ proof = [
       inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
     [inputs.previous_rollups.public_inputs.start_blob_accumulator]
-    blob_commitments_hash_acc = "0x0041dc7a3cdf96c85885b370a183f602f91594236564f04801996f18654b97ab"
-    z_acc = "0x2e32a235e3b646549d8967f97e1ad89de56127e5d14556ddaa1bfe85788b319f"
-    gamma_acc = "0x08cddb394c5ea50193f47ed5d9c0140e366c11a13981fa44625bcfaa4d5bcd04"
+    blob_commitments_hash_acc = "0x00c6080f82da97cd32a6e6f96167937982d1b1d102f2670358d457217207a2a5"
+    z_acc = "0x1ff8cc937c58f2d72966f69b2e490b6dc7f6704680430ac91ea6c0e6207d4d96"
+    gamma_acc = "0x1684547681775fced98c96d09e82919f729d14549da6323b669a8512c9b3802e"
 
       [inputs.previous_rollups.public_inputs.start_blob_accumulator.y_acc]
       limbs = [
-  "0xdce32988140b7e26b68d7017365987",
-  "0x9ab3824a901f0be5ccaa3e63255ca4",
-  "0x32cc"
+  "0xd2054ab1639ea442bd23a5b1c57cf5",
+  "0x4b6135801975f6ab44b107b0a1e000",
+  "0x677b"
 ]
 
       [inputs.previous_rollups.public_inputs.start_blob_accumulator.c_acc]
@@ -1703,37 +1703,37 @@ proof = [
 
         [inputs.previous_rollups.public_inputs.start_blob_accumulator.c_acc.x]
         limbs = [
-  "0x1c0822a9da9bfe81f8126c3fd5fa84",
-  "0xa26ed20205f7613c99d17c4daad51a",
-  "0x19696da9cbadde1522cb8f6496298b",
-  "0x12a793"
+  "0xca945aeef9c954013ca54795553295",
+  "0x9c13e59f13d27ea1d0bbfde41965a9",
+  "0xf7f9f09f06a5e9f04fb45ab0edb363",
+  "0x18f7d5"
 ]
 
         [inputs.previous_rollups.public_inputs.start_blob_accumulator.c_acc.y]
         limbs = [
-  "0x4a83aa3ca5c06e6069a27bef5b13ff",
-  "0xc356c919a0654be57e16094198a812",
-  "0x733aaae7bf2ef47ae16edae9ec2f9e",
-  "0x025eb5"
+  "0xb04ef08577b05403570538b51898a0",
+  "0x2797dcc9fb92375446462d46b4ccbb",
+  "0x39156e19c6155c4ef0f97030dc5d90",
+  "0x0ad01d"
 ]
 
       [inputs.previous_rollups.public_inputs.start_blob_accumulator.gamma_pow_acc]
       limbs = [
-  "0x6804d65282d302d4ddda70f6f2abd7",
-  "0x2279c9033cd2fad6be7d59214f2631",
-  "0x0cf8"
+  "0x551bcc798b08297e8823944cd61ccd",
+  "0xa11af380fa73225d8ac70a4862f1cc",
+  "0x24db"
 ]
 
     [inputs.previous_rollups.public_inputs.end_blob_accumulator]
-    blob_commitments_hash_acc = "0x004df6223debf77e31be5b29dfef6ab8022ea36ba2cd0e1201a7d8a84cf26343"
-    z_acc = "0x01c74e79390675dc49881cb7b3356c8815f132ac3cee6605f9f0b215b426e2cd"
-    gamma_acc = "0x02689220c4b655544c208dbd0a82214fe5bbfc46ea3135f61bc5b31b6602b296"
+    blob_commitments_hash_acc = "0x00ff28bea8c07e7b060d248cb2071f813aa6e39e07e3a527c1739e6a7793c093"
+    z_acc = "0x11b2ee0dde26d315a246f5bdc01db8abe8200c6581201debd1cffc51ad26f95d"
+    gamma_acc = "0x152f389c138d41dde799d4f4fc748753332ddcd5bcd19fe35e4fbe60581534c2"
 
       [inputs.previous_rollups.public_inputs.end_blob_accumulator.y_acc]
       limbs = [
-  "0x65fbe85b7eef2cbdf54ca087b6676a",
-  "0x8241f712fee8f38b2c5c0cc8b471c7",
-  "0x2279"
+  "0x4183756e36181f92164c36776c2ba3",
+  "0xaff710205b13b83794ee63e35bb424",
+  "0x411e"
 ]
 
       [inputs.previous_rollups.public_inputs.end_blob_accumulator.c_acc]
@@ -1741,165 +1741,165 @@ proof = [
 
         [inputs.previous_rollups.public_inputs.end_blob_accumulator.c_acc.x]
         limbs = [
-  "0xa16abd45ebff1813acbfc25da087b9",
-  "0x84f45c949bfbce8fa1f1e50096f575",
-  "0xdf9de55e4446e5ca9cafa4dfbf2f47",
-  "0x027f73"
+  "0x6e2f87b978f4bca529d7ad90a41cd8",
+  "0x734aa1582c8aee32f8334cfc594ab0",
+  "0x21aa57d7e1012415e25e37ee62bbcb",
+  "0x015e58"
 ]
 
         [inputs.previous_rollups.public_inputs.end_blob_accumulator.c_acc.y]
         limbs = [
-  "0x5672b1d9055179cb8686047904fd2a",
-  "0x4914cf7a67c03c183b5fe6b16763a2",
-  "0x9cc8dd9c161d67e107dbc539a4a111",
-  "0x055528"
+  "0xd8e530734ccb89f49a545e13ead68c",
+  "0x914523b3ef75387e032ac9fef36157",
+  "0x5342c94a6ba1df16b871173b323290",
+  "0x1604f8"
 ]
 
       [inputs.previous_rollups.public_inputs.end_blob_accumulator.gamma_pow_acc]
       limbs = [
-  "0xe90665c98626a131374681a1fb6149",
-  "0x41f4d95a0a5d2c98473574d582345a",
-  "0x3d23"
+  "0xc0250cc6b8725b2b00687dab94d327",
+  "0xd7f65a721538376d885811c9aafe6f",
+  "0x297f"
 ]
 
     [inputs.previous_rollups.public_inputs.final_blob_challenges]
-    z = "0x258fe952c7f4b5c99fef8430b0b5180c25de80ba57d2e8ccae86424640029cff"
+    z = "0x0f20024c268f33a3baa0f8f38bddd3d70a7fe791632d4914d95c44e2099fa150"
 
       [inputs.previous_rollups.public_inputs.final_blob_challenges.gamma]
       limbs = [
-  "0x6804d65282d302d4ddda70f6f2abd7",
-  "0x2279c9033cd2fad6be7d59214f2631",
-  "0x0cf8"
+  "0x551bcc798b08297e8823944cd61ccd",
+  "0xa11af380fa73225d8ac70a4862f1cc",
+  "0x24db"
 ]
 
   [inputs.previous_rollups.vk_data]
   leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000011"
   sibling_path = [
-  "0x23f1411ea3da26878e97937a733d7a9c893fa3f2160137de61cb6a102a2050f2",
-  "0x23027ebf247908b2602031ac11b76cb579049a954fd43087f04356f50add7714",
-  "0x08cf1d3a672e65daf5990d04b351209fd0479b24b7a6c25fa2d381f89df08156",
-  "0x2740690820f0df46bcbf149ccb51f228fb81a46173ad1793687319f77d32d49f",
-  "0x026fbe21cffb22c458f7e07b206bdaf767d39af34024eefe88e3d8b56eb9f695",
-  "0x19de2a32662702dd872e529ad89836e16b013012f910daf2bc7c2a67356dd107",
-  "0x1f07bca7a14f9a969539c0afd388affa18926689f431fc541841a2a7604d388c"
+  "0x1edc2329182e13c58f5ced1e4ca120ba845e074e81d59ee64d0bbd583ecdd429",
+  "0x1f502972a4bdd0353e082932afca85331d93e89c99ab3a78511939c18eb14641",
+  "0x1f0a3ab28f16510e4f9a5682a8b5f2826f55082cd639c6b76e6e970d8bb4224d",
+  "0x268f759e38c9ff705a78c055b44e19f7d2b0227f3c4f2e31d6874550d498abec",
+  "0x09f661abe743a7c8125aa0498ca1d01914fdac9cadadb415e0d1a05934997b99",
+  "0x28650667b92be48b116289119fa4794a5fe8fe5792a49d89b9977feae7f685a6",
+  "0x2aa74c20807e8cbb3e32a86ad29472c42a3fb7021dcfaad112a6b68eb0eca98e"
 ]
 
     [inputs.previous_rollups.vk_data.vk]
     key = [
   "0x0000000000000000000000000000000000000000000000000000000000000017",
   "0x00000000000000000000000000000000000000000000000000000000000000a3",
-  "0x0000000000000000000000000000000000000000000000000000000000000001",
-  "0x00000000000000000000000000000070169ffa51c4d2f6a4b31749016e3a4f98",
-  "0x00000000000000000000000000000000002d0c90567eaf8a25186e95a9a44b59",
-  "0x0000000000000000000000000000001a26c6be8f50a1836e09be831aa8373e62",
-  "0x00000000000000000000000000000000001b4cbfb0b81cf7b259a64939877eee",
-  "0x00000000000000000000000000000004342c3be32ac53d6b6b8064b71c936959",
-  "0x00000000000000000000000000000000000458d82db1cd79ce2fd9c141099eb8",
-  "0x000000000000000000000000000000624fac7feb19d29c2c010c5922526f4ed8",
-  "0x0000000000000000000000000000000000282ea2c74e4875c1e94a1dabd70cce",
-  "0x0000000000000000000000000000008ad38d292572ae034aa7d85fc5c015f271",
-  "0x000000000000000000000000000000000021e45922b40b48651c7932a6e13611",
-  "0x000000000000000000000000000000a73dab9ddc3b54090c50ca93622227f3c2",
-  "0x00000000000000000000000000000000002d70204a5b85deb214313dbeb32bc3",
-  "0x00000000000000000000000000000048688558b56d3c6032e622e0132bea8bc9",
-  "0x000000000000000000000000000000000029b1cb58dcbb9d06f234917950e034",
-  "0x000000000000000000000000000000e4989a9bb1675d5be2af2e4f131e74140b",
-  "0x000000000000000000000000000000000012b4ab9c56ee16508e8d613328b39e",
-  "0x000000000000000000000000000000e52ca2027b19bc7b6e8f00eaba7d43784b",
-  "0x00000000000000000000000000000000002484c6c3932251115c1db94dcfae6b",
-  "0x000000000000000000000000000000db8fe96a61cdfb97df5f9712f9f1939d9f",
-  "0x000000000000000000000000000000000010c87f7386b0390d36282c2bfa4f83",
-  "0x000000000000000000000000000000028b9750326c7e469e009cf8faf6e6f560",
-  "0x000000000000000000000000000000000010e070864c12c087107aa7039bdd87",
-  "0x000000000000000000000000000000838e696c0a48c139516ea4a3431cf9b1cb",
-  "0x000000000000000000000000000000000018bcb06a170f1760a6c2e4b39aa8d4",
-  "0x0000000000000000000000000000004b9cd87af8615fd21a50f9d2d6f5bac356",
-  "0x00000000000000000000000000000000002fea96f32103760ddbb66d2b64dc5c",
-  "0x000000000000000000000000000000cf57cca060c094a74ad685146e8fdb5c3e",
-  "0x00000000000000000000000000000000000a71f47258b8aa04fa23f39812abf3",
-  "0x000000000000000000000000000000469895c891c199afe0d76eea89cae9846e",
-  "0x00000000000000000000000000000000001676f0631134f615c932f1c151f348",
-  "0x000000000000000000000000000000b596e3645318b680a53db60a2e38465678",
-  "0x00000000000000000000000000000000001c4d7f6576654db4c031af7135b301",
-  "0x000000000000000000000000000000cbf0b2db7f422f69ed21d0a1272c4ffa1f",
-  "0x00000000000000000000000000000000000d4bb7ebd1692fff8fde678f1666bc",
-  "0x000000000000000000000000000000830bd527115207292ac568d95c51b5ec4c",
-  "0x00000000000000000000000000000000000c0e98421c91f517f07d72e3afdad2",
-  "0x000000000000000000000000000000def2948a821aedbfaf5b664e9d3d9b3307",
-  "0x000000000000000000000000000000000014660a8bd3b487191c55f4a711e3ef",
-  "0x0000000000000000000000000000007012ec37b63072053f2552bd1d35013cd5",
-  "0x00000000000000000000000000000000002831783f3fb1f7de5b60063fad00f1",
-  "0x00000000000000000000000000000070f36b84d9e8e12f09a892bad379f761f9",
-  "0x0000000000000000000000000000000000126c141e95058e97930cf1e7f99600",
-  "0x0000000000000000000000000000003c31e1c42e20f6f5417229688b0b09bbfe",
-  "0x000000000000000000000000000000000005f7d883985d683811dbb2850cab4f",
-  "0x00000000000000000000000000000014f4261f09cc69d650eb56314da23ee49b",
-  "0x00000000000000000000000000000000002001d6d7fd1e16a440145ff99c5d8d",
-  "0x000000000000000000000000000000fa173f280d8ff466caf838817e8f6587c1",
-  "0x00000000000000000000000000000000002570309b6a1ae7576b2014b4f6893f",
-  "0x00000000000000000000000000000000bd26a605385f8ba19afab17ff63bb846",
-  "0x0000000000000000000000000000000000130b34f1a2b25274765a033d5fff7d",
-  "0x000000000000000000000000000000202dd6f740ad4d3b1f7ef7e255458970bb",
-  "0x00000000000000000000000000000000002204b14b88424f24025b906e965059",
-  "0x00000000000000000000000000000095d82554bf97c5f581cd30a7f3f6029764",
-  "0x000000000000000000000000000000000024e67a3d998142806998569e271c5a",
-  "0x000000000000000000000000000000d4fb3a2e99fe55d1f4969c2c097da18c24",
-  "0x00000000000000000000000000000000001bb297c8c97bbfbda82f0121df9327",
-  "0x000000000000000000000000000000c4327ecd5484d207e212c4a30be2558a0f",
-  "0x00000000000000000000000000000000001816a1b18c8ca9c94e56fea226913c",
-  "0x0000000000000000000000000000000df0828b01de7f11dcf45561e418a4815b",
-  "0x000000000000000000000000000000000010f9f17ce276bc31fcb61a54c52dab",
-  "0x000000000000000000000000000000d3f6b007f27ef6d39aff4469e50cbdd4ff",
-  "0x00000000000000000000000000000000001839054a3513ee69897085f6a1b292",
-  "0x000000000000000000000000000000d8eed1000ac8c4ad1a1d0ab540feef9c27",
-  "0x000000000000000000000000000000000010cf586bf3e1a6fc265ff661a90815",
-  "0x0000000000000000000000000000001bed8c9e2703ec607c6e75759b0e462188",
-  "0x000000000000000000000000000000000030296eabb61d14925bbfeec9afd884",
-  "0x0000000000000000000000000000005e578cedcd3c12ee7a1b9a0d8e1df85a9e",
-  "0x0000000000000000000000000000000000218014003ddafaee6b9a79a1e8f899",
-  "0x00000000000000000000000000000061cf01ef83d2dfa3e28080f9eeb6a79ee4",
-  "0x00000000000000000000000000000000000871218befd52f350f8a6e6ed1f3a4",
-  "0x0000000000000000000000000000003612b63ce1ba2913e8d9847414ac278e90",
-  "0x0000000000000000000000000000000000183d6943070362752ddfc4a87dcd5f",
-  "0x000000000000000000000000000000ce800005a71f12cc1923e80fec787721ad",
-  "0x00000000000000000000000000000000002bbc6db5784ee86a77a24b6692d4ca",
-  "0x000000000000000000000000000000c083bdd068a157e96ba8657b50ecb0cdbc",
-  "0x00000000000000000000000000000000000646105917a33eec246c470f8e5ff3",
-  "0x000000000000000000000000000000dd55fb0bb5efd5fe51251932307d0e42e1",
-  "0x000000000000000000000000000000000027b35fe7aeb94e5427d028db387e1a",
-  "0x0000000000000000000000000000004af9bc2d92ff8015353c874b1554d27c9c",
-  "0x00000000000000000000000000000000001e631edb990c73393facf22014c670",
-  "0x0000000000000000000000000000002420dbf4fa6f0b7241118959c109fc2de9",
-  "0x00000000000000000000000000000000000c0af01d73d6d3364d9670c66af10b",
-  "0x000000000000000000000000000000450b2bd095730122fd2baf0e77bbf65ecf",
-  "0x000000000000000000000000000000000021b0e000990c155a18bc000022ca76",
-  "0x0000000000000000000000000000004e7f91ea5dae855be68d91b2e08c2cfd42",
-  "0x0000000000000000000000000000000000282c0fc1c220c4b64554a123e2f470",
-  "0x000000000000000000000000000000e22de2967bdd4ee88f5e6d9c354312d09e",
-  "0x000000000000000000000000000000000023b226d5bc37add149d05ecd66b5a5",
-  "0x000000000000000000000000000000f4a6c6ffdf80a72db78762e237d58cd5f6",
-  "0x000000000000000000000000000000000026814a59803555635a3b6dfd056d19",
-  "0x000000000000000000000000000000f45b8d96069231f48e0d0c34d57593a6a6",
-  "0x00000000000000000000000000000000000b9dc32399025796005b2f68c15991",
-  "0x000000000000000000000000000000750e1b5cb997a3adf8540bf55bb9264ec4",
-  "0x00000000000000000000000000000000001f6cd5b6d43f67798ae4655c016f37",
-  "0x000000000000000000000000000000596cc6183848f32c60ec74fe2bcd76b20f",
-  "0x00000000000000000000000000000000000ed62d10b019355f008b46412d0e2d",
-  "0x0000000000000000000000000000002020dfdab8c9db8335bca3c8284b1585b2",
-  "0x000000000000000000000000000000000023a2906d03204aa4f79b5b80b92eaa",
-  "0x0000000000000000000000000000009116c4d15f7c9a51f17c3830fe7c1e3b42",
-  "0x000000000000000000000000000000000024aecae332db48e03b97fc645a7f05",
-  "0x000000000000000000000000000000834c5e938cf9e8bd4bd5847e2408407276",
-  "0x000000000000000000000000000000000008524b40cf87b668119022f691cfac",
-  "0x000000000000000000000000000000e699df860731437ec57f9890fe4b3a4205",
-  "0x00000000000000000000000000000000000e1e9d4327e635f547da67aef57e86",
-  "0x0000000000000000000000000000000000000000000000000000000000000001",
-  "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "0x0000000000000000000000000000000000000000000000000000000000000002",
-  "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "0x000000000000000000000000000000a0c3d77ea30a89e9b9728507193050881b",
-  "0x00000000000000000000000000000000002358eed771d49c0e15036cccc5dc13",
-  "0x000000000000000000000000000000842ffbd2b370afe31af503c8be68b5ec63",
-  "0x0000000000000000000000000000000000296578e21bbf276e8916716a0c2208"
+  "0x0000000000000000000000000000000000000000000000000000000000000005",
+  "0x000000000000000000000000000000302787373675614b5065e413ff7cb47635",
+  "0x000000000000000000000000000000000030223bf53e330987976984cbc8b777",
+  "0x0000000000000000000000000000005d7e3c622753bc9765188b58278de58e2b",
+  "0x0000000000000000000000000000000000155d33c8914989120390dd1f1b565a",
+  "0x000000000000000000000000000000ee6a96b509792fe4cb08ba5b690a829260",
+  "0x00000000000000000000000000000000002334a82c7c45a013fd6565043b3e34",
+  "0x000000000000000000000000000000b64df10cafd4414f4ca1cfcc9df1104b83",
+  "0x0000000000000000000000000000000000146a7f5eacb3170bc6517966b91c32",
+  "0x0000000000000000000000000000009d478f8685010a03b0c7e082a0bc36f004",
+  "0x000000000000000000000000000000000000ba76040d675cb33d320e90572c0b",
+  "0x0000000000000000000000000000003be6828a9dfcbeaf8f85587eb0e140f22c",
+  "0x00000000000000000000000000000000002be8cad756fc14e20e65bcdac55d84",
+  "0x00000000000000000000000000000060d5a42641ead1f373092743119aa3af8c",
+  "0x0000000000000000000000000000000000164fde87f47eecf92ee4516ec82322",
+  "0x000000000000000000000000000000a8a3b797a6fe3470f8e4f7869dd43c2bc7",
+  "0x000000000000000000000000000000000017ec5446085f31ee161d9b3aeb1dc4",
+  "0x00000000000000000000000000000058cb2aac262dfffdaf058bcc776cd9a491",
+  "0x00000000000000000000000000000000000c3392013d42001efe4b51a9f9839d",
+  "0x000000000000000000000000000000eccc64c49eb40425e8fe5224ccdc43c1e4",
+  "0x00000000000000000000000000000000001f6506bedb6d949f1f86098e65a72d",
+  "0x0000000000000000000000000000002dd78f1fd00370a8383fbc3ba9753685ec",
+  "0x00000000000000000000000000000000002162b403b60b934527df3cdf67eaeb",
+  "0x000000000000000000000000000000d68ea8aebfb824365dabd01f6423c18a43",
+  "0x00000000000000000000000000000000000e1416c2f366756eb6713a61c29e0e",
+  "0x000000000000000000000000000000577c33d5c10b485d8c213d16ac4664dd62",
+  "0x00000000000000000000000000000000001dbb32af825db919015b2f62ac527a",
+  "0x0000000000000000000000000000004089798ec9503f6d851e3f36c8134fffca",
+  "0x0000000000000000000000000000000000258c2a8625473699411a82c908b205",
+  "0x000000000000000000000000000000900e70ab0eb295b2339744f30290816695",
+  "0x00000000000000000000000000000000002b8710de153dbcb980c871c8641455",
+  "0x00000000000000000000000000000064c8a69e30c314b2c9f307b9859388b725",
+  "0x00000000000000000000000000000000000274811b6c58c4854427d143980169",
+  "0x000000000000000000000000000000bd95ab45995e60444bcbcf2f650df95bfb",
+  "0x00000000000000000000000000000000001f24b2f347e01bcdbd025ac0559c85",
+  "0x000000000000000000000000000000ee494e93426c721d97ae5aa62c90310e73",
+  "0x000000000000000000000000000000000015237248ed9e657735f540e8c7756d",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x00000000000000000000000000000013c3bccc5388da92f5d871dfc5798c6f7d",
+  "0x00000000000000000000000000000000001ed1d4ff8584dd1dd72fa169b590d1",
+  "0x0000000000000000000000000000003de967fe48c15d8973f84a210a95dd64de",
+  "0x0000000000000000000000000000000000127264f024fdb1905c1b9311a69989",
+  "0x00000000000000000000000000000067ab29550dc70b79125476307dde9d4eb1",
+  "0x00000000000000000000000000000000002dc480e42e6eea643f7ceb8de96baf",
+  "0x000000000000000000000000000000b78c2d92f2d7d849bac283fd66764341fb",
+  "0x0000000000000000000000000000000000230044dfbb796950437c31b1813440",
+  "0x0000000000000000000000000000002864afee535c3f2025e8d4270039646e66",
+  "0x00000000000000000000000000000000000dc28f5cecb40979171218dd29e4fe",
+  "0x0000000000000000000000000000009a0ffd05fb01bef000cc4c463054f3c151",
+  "0x000000000000000000000000000000000021d43883eb57a05047400f4a96ef19",
+  "0x000000000000000000000000000000acf8cee1de7f48c4f06266c8cfbad2151e",
+  "0x000000000000000000000000000000000006cd8fd38f0b7cd6f9151b5ac5337e",
+  "0x0000000000000000000000000000005654df5102eb796e74c9de073e107a39ac",
+  "0x0000000000000000000000000000000000028174128b65de0f5263c0e175b23b",
+  "0x0000000000000000000000000000008ca702a32d860f9280e625c387f3521f13",
+  "0x000000000000000000000000000000000019d792292ea80445492b5514e0dddc",
+  "0x00000000000000000000000000000050bbf69e0ae3345cd601a80f62379ab9b2",
+  "0x000000000000000000000000000000000023cc9e9fb3e9cb8b7c8e06200a279b",
+  "0x000000000000000000000000000000c3b8f00f6e9bd29ac661c44ce1a18528a2",
+  "0x000000000000000000000000000000000014a93c6f48de42b23c9ac1f7dbe811",
+  "0x000000000000000000000000000000f5328aed500abdc6320165cddcaca4fffa",
+  "0x0000000000000000000000000000000000232b23c95bd3a3df804c4a93de6472",
+  "0x0000000000000000000000000000006676bec8a1892b306e941dcc5d4011100c",
+  "0x00000000000000000000000000000000001df5186ae0a33ea8836ed671a892b4",
+  "0x0000000000000000000000000000004bad445ac665f80bc6acf512e07e85bc38",
+  "0x00000000000000000000000000000000001d2cdff266585d4078e18118fa9092",
+  "0x0000000000000000000000000000002c610edad308e27919b035922986bc8bff",
+  "0x0000000000000000000000000000000000088752e898b6a27f557963cf76e0c0",
+  "0x0000000000000000000000000000004f28478251fd7e453b7baa9f3020a953c6",
+  "0x0000000000000000000000000000000000169c31849094fa7939daae18f3c5bb",
+  "0x0000000000000000000000000000005dc0a499195b7457c28e8736067f4aded8",
+  "0x000000000000000000000000000000000025d7847b139148f3fc3f063fb052f1",
+  "0x000000000000000000000000000000789ab89aaf1ab942d695d28b895ed5b26a",
+  "0x000000000000000000000000000000000001b405d8ca6f44a8937d1becbe4681",
+  "0x0000000000000000000000000000005d3e2c6adda13104da28bd3d0d40726903",
+  "0x000000000000000000000000000000000006657556bced744fca4baebc7a7a08",
+  "0x0000000000000000000000000000001f1e42fe306d2ed7e063bc7dcaae2d30b3",
+  "0x000000000000000000000000000000000029f36b235f098995d51d6825cea708",
+  "0x00000000000000000000000000000011de9fe4ab7736b1c511efcb2eef509918",
+  "0x00000000000000000000000000000000002b60e192da925f3d135e6641d4ea6e",
+  "0x000000000000000000000000000000f088858045a80449ef186d814d04b39f9d",
+  "0x0000000000000000000000000000000000153d832bdd7a9f6463622c3507f239",
+  "0x000000000000000000000000000000d8a9eebdce988c3fd2f0999930a15138b2",
+  "0x0000000000000000000000000000000000075f1ac6bf2a6b487ae46aa505d3fa",
+  "0x00000000000000000000000000000087ee2dbbf2a048bad137c4db1b8ebff300",
+  "0x000000000000000000000000000000000011cbf2a4f1f11c63d8eb9513ee53e5",
+  "0x000000000000000000000000000000f5e4c418c7383a63f7237510cbcbb73c14",
+  "0x000000000000000000000000000000000028199b65e442cc03e751b5deb448e4",
+  "0x000000000000000000000000000000a702cc20da20448c18d688e550e57c745c",
+  "0x00000000000000000000000000000000001f309a205e7f82854e940ece89372c",
+  "0x0000000000000000000000000000007aac52d4113e4e71f28eb47905e925a389",
+  "0x000000000000000000000000000000000020e9e49e102536e6956c9bae558653",
+  "0x00000000000000000000000000000001ba2d9676f12016903f2696eba0098b47",
+  "0x00000000000000000000000000000000002f61c08a9c545fd795f8433ca00c12",
+  "0x0000000000000000000000000000001edfe50b3721a067770f9499a6083d4c77",
+  "0x0000000000000000000000000000000000248065a6e53c3f8b8d3db47272f7b0",
+  "0x000000000000000000000000000000ae34cb14f3eb595d76a2dd9402b1b23d64",
+  "0x000000000000000000000000000000000017ec2c75eec02d3be50d530b2b11fa",
+  "0x000000000000000000000000000000b0c14b05eabc7a7ad842ef1166b9fbdd8b",
+  "0x00000000000000000000000000000000002e2832206b3d1167b6287b5eb53374",
+  "0x0000000000000000000000000000002bf99439219158d7f65fa75dea73dc9a15",
+  "0x00000000000000000000000000000000002149e5cd921f23b5d7de4650b9daa0",
+  "0x0000000000000000000000000000001eee81b23a887f299049b14c11e98460d6",
+  "0x00000000000000000000000000000000002a56ce41f6b0be13b9c26747621b82",
+  "0x000000000000000000000000000000d5827d6338c78656c0d12ca1aea6ef2c7c",
+  "0x00000000000000000000000000000000001aa98f2de3ddda547d8f6de4e725de",
+  "0x000000000000000000000000000000f6e131d6ce506eb0d3892b0c27cfe0f4a8",
+  "0x00000000000000000000000000000000001668301c6c961e364526eb8abf9792",
+  "0x0000000000000000000000000000001ace35f485f93f441c7e0a6df02303688a",
+  "0x000000000000000000000000000000000010adb5f7e278a58893faf2b4b3ed80"
 ]
-    hash = "0x025ae2725b39a7dd723fcae620d38287cb1a08da745efb08d4eca9eede9c87b3"
+    hash = "0x16e2d4dba2d1561651bffffca7396ffbb146c6eea7b127f67a4b056c70bc7da3"
diff --git a/noir-projects/noir-protocol-circuits/crates/rollup-checkpoint-root-single-block/Prover.toml b/noir-projects/noir-protocol-circuits/crates/rollup-checkpoint-root-single-block/Prover.toml
index 590ff4cb5e35..d140961b168f 100644
--- a/noir-projects/noir-protocol-circuits/crates/rollup-checkpoint-root-single-block/Prover.toml
+++ b/noir-projects/noir-protocol-circuits/crates/rollup-checkpoint-root-single-block/Prover.toml
@@ -483,37 +483,37 @@ proof = [
 ]
 
   [inputs.previous_rollup.public_inputs]
-  timestamp = "0x0000000000000000000000000000000000000000000000000000000069e4154a"
-  block_headers_hash = "0x1805b2e36a058f1e1b962ee14af3b1ddf25a745eac3ff3b5d39c772c0ecaa051"
+  timestamp = "0x0000000000000000000000000000000000000000000000000000000069fde108"
+  block_headers_hash = "0x04c025c44ceb642aa54659bf652c91b00ccb432f9837ec84c1c282e567c223fc"
   in_hash = "0x00de7b349d2306334734e4f58b1302a6ed5a6c796a706f6597a5641b6d468223"
   out_hash = "0x0000000000000000000000000000000000000000000000000000000000000000"
-  accumulated_fees = "0x0000000000000000000000000000000000000000000000000022df0587214f60"
-  accumulated_mana_used = "0x00000000000000000000000000000000000000000000000000000000000a3919"
+  accumulated_fees = "0x0000000000000000000000000000000000000000000000000022e452ad469ea0"
+  accumulated_mana_used = "0x00000000000000000000000000000000000000000000000000000000000a3979"
 
     [inputs.previous_rollup.public_inputs.constants]
     chain_id = "0x0000000000000000000000000000000000000000000000000000000000007a69"
-    version = "0x000000000000000000000000000000000000000000000000000000007b6d50be"
-    vk_tree_root = "0x0141caf6779674bc31225636c4cc4259a731835c52fc462f2dcbfabf7de01a1d"
-    protocol_contracts_hash = "0x01af64239167dcc8333e25456aab71348f66d9f6de731a8b62181d16cf0818c1"
+    version = "0x00000000000000000000000000000000000000000000000000000000ad49d7cd"
+    vk_tree_root = "0x0c16448b65c4b3f83f9db3bebf635bd38957c74c9c1ea36036cbda16432cf558"
+    protocol_contracts_hash = "0x0333160f082dfc02e255c756febac14dc42c4c88b882e0403d44710c1f0bb80f"
     prover_id = "0x0000000000000000000000003c44cdddb6a900fa2b585dd299e03d12fa4293bc"
     slot_number = "0x0000000000000000000000000000000000000000000000000000000000000043"
 
       [inputs.previous_rollup.public_inputs.constants.coinbase]
-      inner = "0x000000000000000000000000080c5a37d2d3dade855a034bac3548a8b2dfd887"
+      inner = "0x000000000000000000000000fde0805eba75f23cd30a3bb4f0e567a356075904"
 
       [inputs.previous_rollup.public_inputs.constants.fee_recipient]
       inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
       [inputs.previous_rollup.public_inputs.constants.gas_fees]
       fee_per_da_gas = "0x0000000000000000000000000000000000000000000000000000000000000000"
-      fee_per_l2_gas = "0x000000000000000000000000000000000000000000000000000000036939d660"
+      fee_per_l2_gas = "0x00000000000000000000000000000000000000000000000000000003699e8ba0"
 
     [inputs.previous_rollup.public_inputs.previous_archive]
-    root = "0x03d275a8edc90d3f952ec8f054b23256a99c78afb49333ede28977b2e085639d"
+    root = "0x24f3d6261780561e8ede638edf15d34d9f93372572631856307c57a08dfb9cb1"
     next_available_leaf_index = "0x000000000000000000000000000000000000000000000000000000000000000b"
 
     [inputs.previous_rollup.public_inputs.new_archive]
-    root = "0x18a653206829c9bfb1bfa0994925abfbb7215706ace18078845397b87bf94da4"
+    root = "0x0f84849714aa969caef587fe17273c9fae12f846c68db0f1ab092faf93a29145"
     next_available_leaf_index = "0x000000000000000000000000000000000000000000000000000000000000000c"
 
 [inputs.previous_rollup.public_inputs.start_state.l1_to_l2_message_tree]
@@ -521,15 +521,15 @@ root = "0x0fef6d80d31109ddb56d6b3f607cbc9c0af0bff3ea0d43e8f278983c64c11f7a"
 next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000002800"
 
 [inputs.previous_rollup.public_inputs.start_state.partial.note_hash_tree]
-root = "0x1a39796064aa1aeebaebaca37917db6423d8d5131ce212ca6d3c2be5bbd30ad7"
+root = "0x2126a6e400b3fae90b44b74482d5b59dc707ba8f044c90a5f0e06ff48029f19f"
 next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000300"
 
 [inputs.previous_rollup.public_inputs.start_state.partial.nullifier_tree]
-root = "0x2cc15ff664224a4d4d337795275531782515bd07a1c1955ee8c660c47cdde71e"
+root = "0x0e8d32952999631ff527d706426177bdb3208db1d3b8dd4e74ba883610dc37e5"
 next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000380"
 
 [inputs.previous_rollup.public_inputs.start_state.partial.public_data_tree]
-root = "0x190440c1bb70c1406315a413d336eecf1ef4c5e69b192d80ef041401a0ae97da"
+root = "0x0d21d4944ca04ad548057c7362ba76b7370e29929fe9cdd32ec1d04c07e21179"
 next_available_leaf_index = "0x000000000000000000000000000000000000000000000000000000000000008b"
 
 [inputs.previous_rollup.public_inputs.end_state.l1_to_l2_message_tree]
@@ -537,15 +537,15 @@ root = "0x0fef6d80d31109ddb56d6b3f607cbc9c0af0bff3ea0d43e8f278983c64c11f7a"
 next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000002c00"
 
 [inputs.previous_rollup.public_inputs.end_state.partial.note_hash_tree]
-root = "0x1a39796064aa1aeebaebaca37917db6423d8d5131ce212ca6d3c2be5bbd30ad7"
+root = "0x2126a6e400b3fae90b44b74482d5b59dc707ba8f044c90a5f0e06ff48029f19f"
 next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000340"
 
 [inputs.previous_rollup.public_inputs.end_state.partial.nullifier_tree]
-root = "0x138b48bd6b432bec319631005483ee02da41be447b0880b96f538531276eca80"
+root = "0x28f8d2b1f0315d8539c1e4ff651e2eaac034de0a2271cd6f198f557ecf449cb1"
 next_available_leaf_index = "0x00000000000000000000000000000000000000000000000000000000000003c0"
 
 [inputs.previous_rollup.public_inputs.end_state.partial.public_data_tree]
-root = "0x1b373d273e8879bde4a68984ceb57f9b7b09f161d34e0e7ce4ef0ae1c36442ec"
+root = "0x1a010e7a4312757d9349e0058c907064764c9836de016199dbd957ca46fefc3b"
 next_available_leaf_index = "0x000000000000000000000000000000000000000000000000000000000000008b"
 
     [inputs.previous_rollup.public_inputs.start_sponge_blob]
@@ -571,15 +571,15 @@ next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000
 
       [inputs.previous_rollup.public_inputs.end_sponge_blob.sponge]
       cache = [
-  "0x1b373d273e8879bde4a68984ceb57f9b7b09f161d34e0e7ce4ef0ae1c36442ec",
+  "0x1a010e7a4312757d9349e0058c907064764c9836de016199dbd957ca46fefc3b",
   "0x0fef6d80d31109ddb56d6b3f607cbc9c0af0bff3ea0d43e8f278983c64c11f7a",
-  "0x138b48bd6b432bec319631005483ee02da41be447b0880b96f538531276eca80"
+  "0x28f8d2b1f0315d8539c1e4ff651e2eaac034de0a2271cd6f198f557ecf449cb1"
 ]
       state = [
-  "0x2c7bf66a27f01806a35596d8fa1389ddc9ba0c421458f22529aebc74d45d9544",
-  "0x11e23a2a01eb5b57334e540dd9ba43b99ab374bc88c25a22770e34a8ce9d1ea3",
-  "0x29d837074b8ecc09d1ed31e817b7ba69f6760bddc527f849c5c15be743efde9d",
-  "0x141f2ab5d546bcbd83271cf0637bd700ddc442595026a36ad65fbb110947bb68"
+  "0x0e1dd9cced5f0826c6e4058004b9cb3a696b39c148c0354124d03d9ed9b4ef46",
+  "0x0e88efccb1b5effd0110855538123edbbdb2e94b791607a00b954bece2a9bfc9",
+  "0x1957ffd20204e64443fb09410f7b76cfb098ff3becc10b9e08208fad4d4b03cb",
+  "0x0c822003a2f7fd4b344c8b039a0d20ff579eed35b7d7e49c8d2fbda1d2e1560c"
 ]
       cache_size = "0x0000000000000000000000000000000000000000000000000000000000000002"
       squeeze_mode = false
@@ -587,141 +587,141 @@ next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000
   [inputs.previous_rollup.vk_data]
   leaf_index = "0x000000000000000000000000000000000000000000000000000000000000000b"
   sibling_path = [
-  "0x23d78e0b464510ddf15e00aafb3d9a34c4300cb431a0343efa8acc7ac7174e1f",
-  "0x24ebbcfd36a0a9ea7467ed78450dd4914d8c54a1434a5dfd9757f4f88c51b867",
-  "0x234d319aa3526e9e00d76d9b5b9b18b435756035ad00d8d716e1be50ac82ead3",
-  "0x2648004ca39ab2f7f01e8733c2de2d035675568a1c98d1410ce90ac2512e72e2",
-  "0x15313312ac8ca4825afd3891479fbb14626ca65499d939e23b1f653cd7d018ea",
-  "0x19de2a32662702dd872e529ad89836e16b013012f910daf2bc7c2a67356dd107",
-  "0x1f07bca7a14f9a969539c0afd388affa18926689f431fc541841a2a7604d388c"
+  "0x1276688c1c8f1024c963d35957328b73153c55580532254f0676c26e2ad55993",
+  "0x1025a6a71839d2ab10e9652312547fd6944d80234a52379f6a944c2500ebc294",
+  "0x02d4017a1d1c142d1fdf34bf701748bd9db29906e0114ac657648a51d10b6799",
+  "0x099ef6a9a40aaf85e056bda90684adf858addbb90af303d82f8157b86b705b92",
+  "0x25f6f5fc25ee815cef59a1889f1e39db3d431d01b01ee1554f9492afec9d41d6",
+  "0x28650667b92be48b116289119fa4794a5fe8fe5792a49d89b9977feae7f685a6",
+  "0x2aa74c20807e8cbb3e32a86ad29472c42a3fb7021dcfaad112a6b68eb0eca98e"
 ]
 
     [inputs.previous_rollup.vk_data.vk]
     key = [
   "0x0000000000000000000000000000000000000000000000000000000000000015",
   "0x0000000000000000000000000000000000000000000000000000000000000046",
-  "0x0000000000000000000000000000000000000000000000000000000000000001",
-  "0x000000000000000000000000000000e4ecee2341c2499228c4d2c83a9520cae8",
-  "0x000000000000000000000000000000000028d32ba99192667c15e398069c3240",
-  "0x0000000000000000000000000000006fb00058cacfb1b276d32fa36447360c8c",
-  "0x000000000000000000000000000000000001a8699458060a98552c6907a085e7",
-  "0x00000000000000000000000000000035e6b6b068c96f12086377d88703f3e07e",
-  "0x000000000000000000000000000000000015477ce75a652da3c7317382f97441",
-  "0x0000000000000000000000000000006b648f1adda6e61b44e9867b5f8e3b4f79",
-  "0x0000000000000000000000000000000000284a9d333412f98641932adc241a55",
-  "0x000000000000000000000000000000e4a1e119917387b63453afe2152f923081",
-  "0x000000000000000000000000000000000016f3a12e54e2b76aa8a0c2350c5b03",
-  "0x000000000000000000000000000000e6a6952f1b80d571443fb3a9782f7ba03a",
-  "0x0000000000000000000000000000000000115314dec35ce22a37e5e08838dd90",
-  "0x000000000000000000000000000000608fa42518b2ed1d41d26a56c4e7fd1cd0",
-  "0x00000000000000000000000000000000000e864b9635bc3ab6a2e8a63311af9a",
-  "0x000000000000000000000000000000089e6633599c12307e5d2315b0559fa3ff",
-  "0x0000000000000000000000000000000000188c6476388f9b0875dea7de1bc491",
-  "0x000000000000000000000000000000abca067961d5609684ecd2136ba688b8d5",
-  "0x000000000000000000000000000000000003650b02580ae03fa6c488d150619a",
-  "0x000000000000000000000000000000a7a66d3882208ec15d795f73ff135448cb",
-  "0x00000000000000000000000000000000000eda3b802a8c57b6007532ac4d3c73",
-  "0x0000000000000000000000000000001a0f5ebabaa07f627ed7025287560ef87d",
-  "0x0000000000000000000000000000000000081f627ebc9b282e50d5101f2fdc0b",
-  "0x000000000000000000000000000000af44c7ddc6ed98861741ef7d79b45171ab",
-  "0x0000000000000000000000000000000000189091a7b840d8a84827cc8270560e",
-  "0x000000000000000000000000000000c10049e49d4cd16c33bbc1e8eb3238ea26",
-  "0x00000000000000000000000000000000002578443465dd684c74b9c635f2c33e",
-  "0x000000000000000000000000000000770092209b5122c863dacecd7406bb2d48",
-  "0x00000000000000000000000000000000000f3fee6266059403a65308d4c5d7eb",
-  "0x000000000000000000000000000000533f8b9f4c4a0d43ef35dab7d27c1ea8da",
-  "0x00000000000000000000000000000000001adf8c6f547a4381844323d92940ac",
-  "0x0000000000000000000000000000003c366da2e86813e08788a4a283cff05948",
-  "0x000000000000000000000000000000000009d343f03cc09faee9ca1d918d51aa",
-  "0x0000000000000000000000000000004eff2a8415f5ebcbbb774b024c7cca829a",
-  "0x00000000000000000000000000000000001bdd73863935251e91860c886a55b1",
-  "0x0000000000000000000000000000003df888a4b79151f5f34eed566c6d247e55",
-  "0x00000000000000000000000000000000002d996ddc7dcf55af0fecfbe916441d",
-  "0x00000000000000000000000000000035a1c8de7d282962a240a6704a18d9aa9d",
-  "0x000000000000000000000000000000000022c5a65fc79d84f800459e76bd6ddc",
-  "0x000000000000000000000000000000f694c211bf5e8247c2ed4c9772d66b5320",
-  "0x00000000000000000000000000000000002254e08116deb9d889a0143317b65f",
-  "0x00000000000000000000000000000048358b74356aff020c99bcfffc97f02b91",
-  "0x00000000000000000000000000000000001d9bb0f7098bb21c970677fb97a3de",
-  "0x0000000000000000000000000000003fd980235a24687982d5bc1e10572d41bc",
-  "0x00000000000000000000000000000000002ad88fe0270c96dbf63278dd32b0eb",
-  "0x0000000000000000000000000000002aa721427068275b015588487a6dd9da77",
-  "0x000000000000000000000000000000000010ed5178cf97b67466833bb3e294fc",
-  "0x000000000000000000000000000000fc9b469311b99d851b65fb621b17172be3",
-  "0x0000000000000000000000000000000000058b714d3d803f8cea308e60246a25",
-  "0x000000000000000000000000000000ab189fd5ba15e2bc3843c70e4b6ccc5874",
-  "0x00000000000000000000000000000000001f0042de0aeed97be6e8b8e93e5484",
-  "0x000000000000000000000000000000990cfdb6f4a3699f168f757c1a663e2792",
-  "0x000000000000000000000000000000000029d9940fe4dfdae5c2cc1ebfdba6d8",
-  "0x00000000000000000000000000000006147c05564229442b8f35ada3f0f58754",
-  "0x00000000000000000000000000000000001ea24fc9d78495240f0fc072c3d6e9",
-  "0x0000000000000000000000000000008333bf707667d3ac3960826883a0d26107",
-  "0x00000000000000000000000000000000000e7f2da7e4a8b4ee0bca717b98686d",
-  "0x000000000000000000000000000000f80529b50987783f12df2e1ee9f91fdccc",
-  "0x00000000000000000000000000000000002fbee99a2fa069d2da029ad5a86c40",
-  "0x000000000000000000000000000000ea3704a764aeda63475f07b984b2297f60",
-  "0x00000000000000000000000000000000002cf75af466282247648425172dd45b",
-  "0x00000000000000000000000000000068754ac413cc462e8a87396033bafe80fc",
-  "0x0000000000000000000000000000000000138b5a95236c3755c228128437cb81",
-  "0x0000000000000000000000000000007c551a7f9f585f152f2899cd5c73cdf658",
-  "0x00000000000000000000000000000000001601277332a9e90e2af9bb57340356",
-  "0x0000000000000000000000000000007543dc89bcca355d7e34573dff53f933e2",
-  "0x0000000000000000000000000000000000170cb4ff2fe573d8a4f20d7e7b64ef",
-  "0x000000000000000000000000000000a32270e25bda22ff0b953eb2ccdd937551",
-  "0x00000000000000000000000000000000000b5603a198907b41d522094f42cad2",
-  "0x000000000000000000000000000000d0ff37f21975e21ddcaafdd3dd783ad7d6",
-  "0x00000000000000000000000000000000002d0a2f4c7e56c0c56b889f47c622c6",
-  "0x0000000000000000000000000000009472ecb153285dccdc60cf91dde517845e",
-  "0x000000000000000000000000000000000015e573aca14b7c5fd370bcfc540b27",
-  "0x000000000000000000000000000000c303cfdc251b35fff418176773aa2776e4",
-  "0x000000000000000000000000000000000026e160cb0be92aa253d24a3ef4762e",
-  "0x000000000000000000000000000000caa9c67bcb76b860aeb9f0f4b012671fbb",
-  "0x00000000000000000000000000000000001386aeb173c2f13bc20ed2b78147c1",
-  "0x0000000000000000000000000000002b385a5dfd8c9a7ffc125cfd6fa7f8fd45",
-  "0x00000000000000000000000000000000001597a3dd423660dbd9daa02d14e187",
-  "0x000000000000000000000000000000d563bdfaa101f554e342f7fe227dc29f16",
-  "0x0000000000000000000000000000000000090a2f765e614082aa702ded80dffe",
-  "0x0000000000000000000000000000002c13af1d7029f509b59a9d7902023a0783",
-  "0x000000000000000000000000000000000015f5fbf1568f18d113c76d8125b4c9",
-  "0x000000000000000000000000000000832350cc0d3066c6a9d8d4e59c38966d94",
-  "0x00000000000000000000000000000000002c0a8c5e6b3ad7b65677d02e3af4ca",
-  "0x0000000000000000000000000000004581bf4848fb500439bee9e9db80d8dce2",
-  "0x00000000000000000000000000000000001a7ae19bf5ba02728391e18925e760",
-  "0x000000000000000000000000000000d9b2acde6149cf8e6f308444a49c333a30",
-  "0x0000000000000000000000000000000000192e53bff5334c0fd6d7f110fc3552",
-  "0x00000000000000000000000000000095b5d8b7b4a63b05df652b0d10ef146d26",
-  "0x0000000000000000000000000000000000099e3bd5a0a00ab7fe18040105b9b3",
-  "0x0000000000000000000000000000002129af3a637f5a622a32440f860d1e2a7f",
-  "0x00000000000000000000000000000000000015b8d2515d76e2ccec99dcd19459",
-  "0x000000000000000000000000000000222b888108dc25d1aa450e0b4bc212c37e",
-  "0x00000000000000000000000000000000001b917517920bad3d8bc01c9595092a",
-  "0x000000000000000000000000000000482141c7ebe42000a1d58ccb74381f6d19",
-  "0x0000000000000000000000000000000000305e8992b148eedb22e6e992077a84",
-  "0x0000000000000000000000000000007c86847618681dc29d8a9363ab7c40e1c3",
-  "0x000000000000000000000000000000000016465a5ccbb550cd2c63bd58116fe4",
-  "0x000000000000000000000000000000439973ac12d7ca796d6fe98ca40e6ca6b7",
-  "0x00000000000000000000000000000000002e24d420fbf9508ed31de692db477b",
-  "0x00000000000000000000000000000028edd1a7e46c840d9c943fdf45521c64ce",
-  "0x0000000000000000000000000000000000043d063b130adfb37342af45d0155a",
-  "0x0000000000000000000000000000009330952ae74c573d1686d9cb4a00733854",
-  "0x0000000000000000000000000000000000261522c4089330646aff9673619494",
-  "0x0000000000000000000000000000000000000000000000000000000000000001",
-  "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "0x0000000000000000000000000000000000000000000000000000000000000002",
-  "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "0x00000000000000000000000000000019988ebb1316d375d71e97a8545a3c71a1",
-  "0x0000000000000000000000000000000000223ffc44e0e98747d5be232098b76c",
-  "0x00000000000000000000000000000039f06fcc03eb0ffcc95a6e4ffb19181791",
-  "0x00000000000000000000000000000000000d49dfcd43c5d2f7fd6edd6a818e5c"
+  "0x0000000000000000000000000000000000000000000000000000000000000005",
+  "0x000000000000000000000000000000ea6e74a6fa43b4810edc310e2d2b66dab4",
+  "0x000000000000000000000000000000000015c12f6f69bff32654e403b8e9a2b8",
+  "0x00000000000000000000000000000010f1d77dfb1e9178bab79124490d92915a",
+  "0x00000000000000000000000000000000000a9b89b1676b31989664a34260314d",
+  "0x000000000000000000000000000000a2d8941fda778834590a006f995557ff4c",
+  "0x00000000000000000000000000000000002dadd9e8063bfbee06194004949394",
+  "0x0000000000000000000000000000002036fe67ff22643d06461e1c8edcbc2dc9",
+  "0x000000000000000000000000000000000021c85b69f65f83d6cf1854a9563213",
+  "0x000000000000000000000000000000b19756d6156d0300b3ecb9be77605be1a8",
+  "0x0000000000000000000000000000000000014a4064a3b551e9b75fa13659629b",
+  "0x0000000000000000000000000000003491c66acf5693a16ec1f7241609c18f45",
+  "0x000000000000000000000000000000000023b0ed5030538c865d72cb8908352a",
+  "0x000000000000000000000000000000efedf593c1cfc28146ff68d9dcb1070ca7",
+  "0x00000000000000000000000000000000002a8174a5153b946abe57e2ed06d454",
+  "0x0000000000000000000000000000009c3212d084550b683558797af1477ceb8f",
+  "0x00000000000000000000000000000000002c32c65b02e59d9aae5b8a57ec27e4",
+  "0x0000000000000000000000000000007b88e113308893f906561837b9edc3baa5",
+  "0x00000000000000000000000000000000001a45b642b5e649f033eca82a810b8b",
+  "0x00000000000000000000000000000068591e612a0127878f63e7923f17854d2a",
+  "0x00000000000000000000000000000000001d50690ef0dd775e7f4fc0f17281bf",
+  "0x000000000000000000000000000000eece658386d09783fcc2d61a622eb6b121",
+  "0x00000000000000000000000000000000001d5b3af11c73d93414e18accc31071",
+  "0x0000000000000000000000000000007b1ee7fea7dfabee7dad1a5e3e816c2a2e",
+  "0x00000000000000000000000000000000000a5f02160bfa014a46b329f3618dc8",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x00000000000000000000000000000043bda12a99877a984942e29d821cd37870",
+  "0x000000000000000000000000000000000020b1906b429f07ca51070221399472",
+  "0x000000000000000000000000000000c185af02499653794e9d4c7fa1a6c5751c",
+  "0x00000000000000000000000000000000002927f8b050e657021afb2f572e0f84",
+  "0x000000000000000000000000000000ceda688bdd2aea1e5253ea0d86743abebd",
+  "0x00000000000000000000000000000000000072f93e3607e4ac8c369fb92fe33a",
+  "0x000000000000000000000000000000eaff91f9cc05f03c6d8546358d580ef17a",
+  "0x0000000000000000000000000000000000225d5df5771e53084f6e364ad8e3da",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000002218617f23e467fecd2e3c938179a2b578",
+  "0x00000000000000000000000000000000002497b7dd7eec4e260f8ca521f1109e",
+  "0x000000000000000000000000000000914e208f9621734ce56985cdd29d01a78b",
+  "0x00000000000000000000000000000000001092e497a21b124b279b86e029a993",
+  "0x0000000000000000000000000000002ef4ddf310bee1f74f655cbb0ceb9315d0",
+  "0x0000000000000000000000000000000000270b81bec5e6b0f455065b02f68a0f",
+  "0x000000000000000000000000000000ef21188ec62b59040e4f1b89dfa23be48e",
+  "0x000000000000000000000000000000000009ced6e0108e8e67b299d9e3bad9a9",
+  "0x000000000000000000000000000000f61d5b8425740d0df669b875491e615449",
+  "0x0000000000000000000000000000000000064a6a9bbcefc6ad4b2d4e1e03985f",
+  "0x000000000000000000000000000000d004ad7846785bcb0db2672f6e5292f7c2",
+  "0x00000000000000000000000000000000002114c1fc4a3c39cbc96baf3ba693af",
+  "0x0000000000000000000000000000005cc5465cd9391ce8e7799e91bf9aac8039",
+  "0x00000000000000000000000000000000001c59b40d18b5d06d88617f2ed5c568",
+  "0x0000000000000000000000000000008134581657d125ca542477d684313ad999",
+  "0x0000000000000000000000000000000000259435f2950ead4bad62f0635944d8",
+  "0x0000000000000000000000000000008e3beb4333afb6a1db12c0889130b8f7f7",
+  "0x00000000000000000000000000000000002d022d695e566dd0ddfd15b59ad6f6",
+  "0x00000000000000000000000000000019ac6e38521a0144c3d1abe706030d643e",
+  "0x00000000000000000000000000000000000961e2643f9317a4d6144abb77cae4",
+  "0x000000000000000000000000000000827e5482f658cec2661f8cf88c4558800d",
+  "0x00000000000000000000000000000000002bcc1992b1410cdd05f32c2148a800",
+  "0x000000000000000000000000000000049c1604c9e61fe1eb1a4e6c0044a88607",
+  "0x00000000000000000000000000000000001a50aafae1419fae00770a64d75a52",
+  "0x0000000000000000000000000000003a404091304c1a4935267fb66a90af706f",
+  "0x0000000000000000000000000000000000175f69e34efe02635c0450ff14d814",
+  "0x00000000000000000000000000000056a7488e33d23f5a7e31e8c24c4d32feb9",
+  "0x0000000000000000000000000000000000152b125831f20c0046084a92a3a01d",
+  "0x0000000000000000000000000000001bd75185387ebcf04a2d1541b418c93962",
+  "0x000000000000000000000000000000000007d44e382095a4ddb6c84d676f975b",
+  "0x000000000000000000000000000000e37e00ccdd16f0cfb118365311a964e475",
+  "0x00000000000000000000000000000000001c3ba17a670cdeca7019e1d2c17e93",
+  "0x000000000000000000000000000000ef2f893fc357863e53675b8dfdace77275",
+  "0x000000000000000000000000000000000013a4df076b371985ff93656b8e4483",
+  "0x0000000000000000000000000000007adddc444f0c602af7efaa9c977e9ab80f",
+  "0x0000000000000000000000000000000000138e76ae51938924778a06f02de461",
+  "0x000000000000000000000000000000f63ec082d951768fe05e6d3bc9d50bc72d",
+  "0x00000000000000000000000000000000002ac3a11527579ccbe6c1966976f6ad",
+  "0x00000000000000000000000000000066d0ea63d8dd4511ec55e666f7bf6d6c3d",
+  "0x00000000000000000000000000000000001fe7a9cb68d795240eaec0b6efe451",
+  "0x0000000000000000000000000000005309c6e2db27d4be273a758a178e1af682",
+  "0x00000000000000000000000000000000000962316a08cadc097d50603d1606c4",
+  "0x000000000000000000000000000000ab5c17e93d31a1c79c62d8597447920f36",
+  "0x000000000000000000000000000000000019ede1992f131cdd105f8afcde56a5",
+  "0x000000000000000000000000000000b03aa7f0563671be6a98678d8dac3ed963",
+  "0x00000000000000000000000000000000002c9acda51c7b3e6e04e82aaf0bbe35",
+  "0x000000000000000000000000000000b7eceb60b962a8108199e7506d967bf042",
+  "0x00000000000000000000000000000000000ab8ec69e3b26d13207351e2be7d7d",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000001eee81b23a887f299049b14c11e98460d6",
+  "0x00000000000000000000000000000000002a56ce41f6b0be13b9c26747621b82",
+  "0x000000000000000000000000000000d5827d6338c78656c0d12ca1aea6ef2c7c",
+  "0x00000000000000000000000000000000001aa98f2de3ddda547d8f6de4e725de",
+  "0x000000000000000000000000000000ab626198b0ffe754ee7a00134867d6524b",
+  "0x0000000000000000000000000000000000016d89d36083b0f55dba4523be0aff",
+  "0x00000000000000000000000000000081d7c7a641b523d79569cb352fd7652081",
+  "0x000000000000000000000000000000000023fdf5ec3df2b078ebe39feac15b55"
 ]
-    hash = "0x05ce98498d8e3590661695e0243b58df2e19f9b0e7229b9ef88ee6fb20c40442"
+    hash = "0x1cd81d6249bfece0299cdfaff8344081684997c787276db4fb5cdb25a0d6822d"
 
 [inputs.hints]
 previous_archive_sibling_path = [
   "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "0x169d81ad4a9064f775431bccba280de29114c9832ade937b94308c9f54e5af78",
+  "0x1cfdc3f191fd4278971f73de8ee4302bd29051bb0c93c1ba7a8a7feaa4e59846",
   "0x14e4b977b2203b70e6ee1c2456eb7114d090fe4b907f631eecd0919fed432e7d",
-  "0x05b046ac3626d2e59e73bb24881c4cb66c24684566860e077cd096137bfc4857",
+  "0x2b3b2f80ea4227dfe7ab4edec33942ff08b95b023d6d15efb0abde90594c993b",
   "0x1e20ad4181460cbfdc74ca773502c59b890f184efe300ebad895956d318422da",
   "0x1434e6e2d5db1053ab8a3be58704509c799ee17e109c77f441f7bf1755400249",
   "0x119f56a2e8423a7feaab49b9b5dcbadec0648dfa4096b61b6774ea33ae29dc7f",
@@ -758,21 +758,21 @@ new_out_hash_sibling_path = [
 ]
 blobs_fields = [
   "0x00000000009c707518000000010000000300000000000000000000000000000a",
-  "0x10e5f0bbfeff37d5708264d23d4a5ce70b6d282e5ee4e6e280156e110a0c1dc3",
-  "0x0000000000000000000000000000000000000000000000000022df0587214f60",
-  "0x20eb99e263b0f2ec651bdd337102a4a86b68039cc5cfccd3e7d2c09e3d2646dd",
-  "0x15a2905177846920d7f22ebd5f6b23b7be9a8372a194fea645e80018e2c0125e",
+  "0x2ca391890a7afa0a4098cceb64d9aa356e84a1055e6e2b3df10e2a5033f0b691",
+  "0x0000000000000000000000000000000000000000000000000022e452ad469ea0",
+  "0x09fac458f9e079d0117ef63746c55ce66b3e5d95c8420974d9c69f369b0d77ef",
+  "0x2935995b8343928a25acdb09654bdc27aeef345ec185caa48fb0048bd475fbcb",
   "0x0000000000000000000000000000000000000000000000000000000000001c20",
-  "0x225a3cc5a51d659dea2518db3a38acba269009c7e490d1c3cc72f32129e2884b",
+  "0x0dc02e099550676b3dcfd522010d4db9d2c47a4556dfa28aa20a4a0eb35c54a4",
   "0x0000000000000000000000000000000000000000000000000000000000000af0",
-  "0x15cecc56c070afe91aacccc6d3b165ad1f791b7644f606f6f60eaa2f87826abc",
-  "0x00000000000000000000000000000000000000000000021e00b0b6d17ee4df40",
-  "0x0000000000000000000000000000eb8dcdbf0000000069e4154a0000000b0001",
-  "0x000000000000000002c0000000000d0000000003c0000000008b0000000a3919",
-  "0x03d275a8edc90d3f952ec8f054b23256a99c78afb49333ede28977b2e085639d",
-  "0x1a39796064aa1aeebaebaca37917db6423d8d5131ce212ca6d3c2be5bbd30ad7",
-  "0x138b48bd6b432bec319631005483ee02da41be447b0880b96f538531276eca80",
-  "0x1b373d273e8879bde4a68984ceb57f9b7b09f161d34e0e7ce4ef0ae1c36442ec",
+  "0x12d1296a2643b832fbd1d6d3ed3678833fce770084efd75adfd517de8214ccf3",
+  "0x00000000000000000000000000000000000000000000021e00afaeb15ed67ca0",
+  "0x0000000000000000000000000000eb8dcdbf0000000069fde1080000000b0001",
+  "0x000000000000000002c0000000000d0000000003c0000000008b0000000a3979",
+  "0x24f3d6261780561e8ede638edf15d34d9f93372572631856307c57a08dfb9cb1",
+  "0x2126a6e400b3fae90b44b74482d5b59dc707ba8f044c90a5f0e06ff48029f19f",
+  "0x28f8d2b1f0315d8539c1e4ff651e2eaac034de0a2271cd6f198f557ecf449cb1",
+  "0x1a010e7a4312757d9349e0058c907064764c9836de016199dbd957ca46fefc3b",
   "0x0fef6d80d31109ddb56d6b3f607cbc9c0af0bff3ea0d43e8f278983c64c11f7a",
   "0x0000000000000000000000000000000000000000000000008c63744300000012",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -25334,15 +25334,15 @@ blobs_fields = [
   "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000000"
 ]
-blobs_hash = "0x00961296bd2f3d3b7b406ea37e645f3a52449813ebd7506d16baac774fed404e"
+blobs_hash = "0x0098dfcc50238facc959eceef09a4ed661501b8a94815f8d69ad5b265956d2f1"
 
   [inputs.hints.previous_block_header]
-  sponge_blob_hash = "0x2b3aac894daa1c42cd6449b4a16445a89a111c5dad8cf695261f7a23fa611e66"
-  total_fees = "0x00000000000000000000000000000000000000000000000000d0d388970f6d00"
-  total_mana_used = "0x00000000000000000000000000000000000000000000000000000000001bade4"
+  sponge_blob_hash = "0x208b2bb1ace451b93e09ef0119c861c986fb26bb867456eb5c93661b83befc33"
+  total_fees = "0x00000000000000000000000000000000000000000000000000d0f074eda98980"
+  total_mana_used = "0x00000000000000000000000000000000000000000000000000000000001baea4"
 
     [inputs.hints.previous_block_header.last_archive]
-    root = "0x280a1dc0fc66f05e5627b85e7375854013fa767efae0e792cc4c77e6e7641135"
+    root = "0x25dd04dc7f0a4299651ea908c014de487c4be771db4d68b458d16aa041af02ba"
     next_available_leaf_index = "0x000000000000000000000000000000000000000000000000000000000000000a"
 
 [inputs.hints.previous_block_header.state.l1_to_l2_message_tree]
@@ -25350,48 +25350,48 @@ root = "0x0fef6d80d31109ddb56d6b3f607cbc9c0af0bff3ea0d43e8f278983c64c11f7a"
 next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000002800"
 
 [inputs.hints.previous_block_header.state.partial.note_hash_tree]
-root = "0x1a39796064aa1aeebaebaca37917db6423d8d5131ce212ca6d3c2be5bbd30ad7"
+root = "0x2126a6e400b3fae90b44b74482d5b59dc707ba8f044c90a5f0e06ff48029f19f"
 next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000300"
 
 [inputs.hints.previous_block_header.state.partial.nullifier_tree]
-root = "0x2cc15ff664224a4d4d337795275531782515bd07a1c1955ee8c660c47cdde71e"
+root = "0x0e8d32952999631ff527d706426177bdb3208db1d3b8dd4e74ba883610dc37e5"
 next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000380"
 
 [inputs.hints.previous_block_header.state.partial.public_data_tree]
-root = "0x190440c1bb70c1406315a413d336eecf1ef4c5e69b192d80ef041401a0ae97da"
+root = "0x0d21d4944ca04ad548057c7362ba76b7370e29929fe9cdd32ec1d04c07e21179"
 next_available_leaf_index = "0x000000000000000000000000000000000000000000000000000000000000008b"
 
     [inputs.hints.previous_block_header.global_variables]
     chain_id = "0x0000000000000000000000000000000000000000000000000000000000007a69"
-    version = "0x000000000000000000000000000000000000000000000000000000007b6d50be"
+    version = "0x00000000000000000000000000000000000000000000000000000000ad49d7cd"
     block_number = "0x000000000000000000000000000000000000000000000000000000000000000a"
     slot_number = "0x0000000000000000000000000000000000000000000000000000000000000042"
-    timestamp = "0x0000000000000000000000000000000000000000000000000000000069e41502"
+    timestamp = "0x0000000000000000000000000000000000000000000000000000000069fde0c0"
 
       [inputs.hints.previous_block_header.global_variables.coinbase]
-      inner = "0x000000000000000000000000080c5a37d2d3dade855a034bac3548a8b2dfd887"
+      inner = "0x000000000000000000000000fde0805eba75f23cd30a3bb4f0e567a356075904"
 
       [inputs.hints.previous_block_header.global_variables.fee_recipient]
       inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
       [inputs.hints.previous_block_header.global_variables.gas_fees]
       fee_per_da_gas = "0x0000000000000000000000000000000000000000000000000000000000000000"
-      fee_per_l2_gas = "0x000000000000000000000000000000000000000000000000000000078b64a540"
+      fee_per_l2_gas = "0x000000000000000000000000000000000000000000000000000000078c3bcb60"
 
   [inputs.hints.previous_out_hash]
   root = "0x00c95e0ceb41951039e1592745ec2faea9866f6eaf01bf189a4463b4143af093"
   next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000002"
 
   [inputs.hints.start_blob_accumulator]
-  blob_commitments_hash_acc = "0x004df6223debf77e31be5b29dfef6ab8022ea36ba2cd0e1201a7d8a84cf26343"
-  z_acc = "0x01c74e79390675dc49881cb7b3356c8815f132ac3cee6605f9f0b215b426e2cd"
-  gamma_acc = "0x02689220c4b655544c208dbd0a82214fe5bbfc46ea3135f61bc5b31b6602b296"
+  blob_commitments_hash_acc = "0x00ff28bea8c07e7b060d248cb2071f813aa6e39e07e3a527c1739e6a7793c093"
+  z_acc = "0x11b2ee0dde26d315a246f5bdc01db8abe8200c6581201debd1cffc51ad26f95d"
+  gamma_acc = "0x152f389c138d41dde799d4f4fc748753332ddcd5bcd19fe35e4fbe60581534c2"
 
     [inputs.hints.start_blob_accumulator.y_acc]
     limbs = [
-  "0x65fbe85b7eef2cbdf54ca087b6676a",
-  "0x8241f712fee8f38b2c5c0cc8b471c7",
-  "0x2279"
+  "0x4183756e36181f92164c36776c2ba3",
+  "0xaff710205b13b83794ee63e35bb424",
+  "0x411e"
 ]
 
     [inputs.hints.start_blob_accumulator.c_acc]
@@ -25399,35 +25399,35 @@ next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000
 
       [inputs.hints.start_blob_accumulator.c_acc.x]
       limbs = [
-  "0xa16abd45ebff1813acbfc25da087b9",
-  "0x84f45c949bfbce8fa1f1e50096f575",
-  "0xdf9de55e4446e5ca9cafa4dfbf2f47",
-  "0x027f73"
+  "0x6e2f87b978f4bca529d7ad90a41cd8",
+  "0x734aa1582c8aee32f8334cfc594ab0",
+  "0x21aa57d7e1012415e25e37ee62bbcb",
+  "0x015e58"
 ]
 
       [inputs.hints.start_blob_accumulator.c_acc.y]
       limbs = [
-  "0x5672b1d9055179cb8686047904fd2a",
-  "0x4914cf7a67c03c183b5fe6b16763a2",
-  "0x9cc8dd9c161d67e107dbc539a4a111",
-  "0x055528"
+  "0xd8e530734ccb89f49a545e13ead68c",
+  "0x914523b3ef75387e032ac9fef36157",
+  "0x5342c94a6ba1df16b871173b323290",
+  "0x1604f8"
 ]
 
     [inputs.hints.start_blob_accumulator.gamma_pow_acc]
     limbs = [
-  "0xe90665c98626a131374681a1fb6149",
-  "0x41f4d95a0a5d2c98473574d582345a",
-  "0x3d23"
+  "0xc0250cc6b8725b2b00687dab94d327",
+  "0xd7f65a721538376d885811c9aafe6f",
+  "0x297f"
 ]
 
   [inputs.hints.final_blob_challenges]
-  z = "0x258fe952c7f4b5c99fef8430b0b5180c25de80ba57d2e8ccae86424640029cff"
+  z = "0x0f20024c268f33a3baa0f8f38bddd3d70a7fe791632d4914d95c44e2099fa150"
 
     [inputs.hints.final_blob_challenges.gamma]
     limbs = [
-  "0x6804d65282d302d4ddda70f6f2abd7",
-  "0x2279c9033cd2fad6be7d59214f2631",
-  "0x0cf8"
+  "0x551bcc798b08297e8823944cd61ccd",
+  "0xa11af380fa73225d8ac70a4862f1cc",
+  "0x24db"
 ]
 
   [[inputs.hints.blob_commitments]]
@@ -25435,18 +25435,18 @@ next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000
 
     [inputs.hints.blob_commitments.x]
     limbs = [
-  "0xef6b9154c131b91ed18b9881b34587",
-  "0x7f37be1a92e77431516803419c83d8",
-  "0xfddf85b0605cf40b6a257fca19def3",
-  "0x08859f"
+  "0x1f41ee1ce165ab1325a3d58dcce4b0",
+  "0x8cc2d9c146e110aecfd6e1d0a88478",
+  "0x5f035ed6b113a1d400984d75519e9c",
+  "0x0c2ecb"
 ]
 
     [inputs.hints.blob_commitments.y]
     limbs = [
-  "0xb3e3bf3a46c3f50b5bd8575d2abd63",
-  "0xfc14bdf290e8efbb0ccffe8ecd023c",
-  "0x7a57e12b4be70dffd5252b4d8d41e5",
-  "0x0985bc"
+  "0x6e4b336ccd13490195783945cd06c4",
+  "0x87ab466617f89f75e1b4e5cc2de3cf",
+  "0x5c00c3065f22ed5a6511f4ef9144d8",
+  "0x0290b1"
 ]
 
   [[inputs.hints.blob_commitments]]
diff --git a/noir-projects/noir-protocol-circuits/crates/rollup-root/Prover.toml b/noir-projects/noir-protocol-circuits/crates/rollup-root/Prover.toml
index 5da9001473a4..64ff802314a0 100644
--- a/noir-projects/noir-protocol-circuits/crates/rollup-root/Prover.toml
+++ b/noir-projects/noir-protocol-circuits/crates/rollup-root/Prover.toml
@@ -484,8 +484,8 @@ proof = [
 
   [inputs.previous_rollups.public_inputs]
   checkpoint_header_hashes = [
-  "0x006b39d4ea31f018975f0cbc0cb76b67358a66a508877e61d7c5c2c89eeb64a7",
-  "0x003fccd13f5410d42213728b16b19b51ff7ab8ebe6267522484e88fea66cdd7b",
+  "0x004d16fb29611dba53004101a433c88fddade0ec60446fddec1589851839a774",
+  "0x00db58820ef17b4cb952c006ed78296097c3fcf7fd0fc3e3cec1f8260fc64045",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -520,17 +520,17 @@ proof = [
 
     [inputs.previous_rollups.public_inputs.constants]
     chain_id = "0x0000000000000000000000000000000000000000000000000000000000007a69"
-    version = "0x000000000000000000000000000000000000000000000000000000007b6d50be"
-    vk_tree_root = "0x0141caf6779674bc31225636c4cc4259a731835c52fc462f2dcbfabf7de01a1d"
-    protocol_contracts_hash = "0x01af64239167dcc8333e25456aab71348f66d9f6de731a8b62181d16cf0818c1"
+    version = "0x00000000000000000000000000000000000000000000000000000000ad49d7cd"
+    vk_tree_root = "0x0c16448b65c4b3f83f9db3bebf635bd38957c74c9c1ea36036cbda16432cf558"
+    protocol_contracts_hash = "0x0333160f082dfc02e255c756febac14dc42c4c88b882e0403d44710c1f0bb80f"
     prover_id = "0x0000000000000000000000003c44cdddb6a900fa2b585dd299e03d12fa4293bc"
 
     [inputs.previous_rollups.public_inputs.previous_archive]
-    root = "0x2a7e736656c2f8342e2e096500493f5acd825b2fb9ef2017b5ec23d029d5783a"
+    root = "0x00f30d99838de8d9e0b40bb5f19c53ebd2cea2e4e324a6b48a4db2655906ad63"
     next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000009"
 
     [inputs.previous_rollups.public_inputs.new_archive]
-    root = "0x03d275a8edc90d3f952ec8f054b23256a99c78afb49333ede28977b2e085639d"
+    root = "0x24f3d6261780561e8ede638edf15d34d9f93372572631856307c57a08dfb9cb1"
     next_available_leaf_index = "0x000000000000000000000000000000000000000000000000000000000000000b"
 
     [inputs.previous_rollups.public_inputs.previous_out_hash]
@@ -542,16 +542,16 @@ proof = [
     next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000002"
 
     [[inputs.previous_rollups.public_inputs.fees]]
-    value = "0x000000000000000000000000000000000000000000000000003b2900d9fe7700"
+    value = "0x000000000000000000000000000000000000000000000000003b2f97f0a76c80"
 
       [inputs.previous_rollups.public_inputs.fees.recipient]
-      inner = "0x000000000000000000000000080c5a37d2d3dade855a034bac3548a8b2dfd887"
+      inner = "0x000000000000000000000000fde0805eba75f23cd30a3bb4f0e567a356075904"
 
     [[inputs.previous_rollups.public_inputs.fees]]
-    value = "0x00000000000000000000000000000000000000000000000000d0d388970f6d00"
+    value = "0x00000000000000000000000000000000000000000000000000d0f074eda98980"
 
       [inputs.previous_rollups.public_inputs.fees.recipient]
-      inner = "0x000000000000000000000000080c5a37d2d3dade855a034bac3548a8b2dfd887"
+      inner = "0x000000000000000000000000fde0805eba75f23cd30a3bb4f0e567a356075904"
 
     [[inputs.previous_rollups.public_inputs.fees]]
     value = "0x0000000000000000000000000000000000000000000000000000000000000000"
@@ -772,15 +772,15 @@ proof = [
 ]
 
     [inputs.previous_rollups.public_inputs.end_blob_accumulator]
-    blob_commitments_hash_acc = "0x004df6223debf77e31be5b29dfef6ab8022ea36ba2cd0e1201a7d8a84cf26343"
-    z_acc = "0x01c74e79390675dc49881cb7b3356c8815f132ac3cee6605f9f0b215b426e2cd"
-    gamma_acc = "0x02689220c4b655544c208dbd0a82214fe5bbfc46ea3135f61bc5b31b6602b296"
+    blob_commitments_hash_acc = "0x00ff28bea8c07e7b060d248cb2071f813aa6e39e07e3a527c1739e6a7793c093"
+    z_acc = "0x11b2ee0dde26d315a246f5bdc01db8abe8200c6581201debd1cffc51ad26f95d"
+    gamma_acc = "0x152f389c138d41dde799d4f4fc748753332ddcd5bcd19fe35e4fbe60581534c2"
 
       [inputs.previous_rollups.public_inputs.end_blob_accumulator.y_acc]
       limbs = [
-  "0x65fbe85b7eef2cbdf54ca087b6676a",
-  "0x8241f712fee8f38b2c5c0cc8b471c7",
-  "0x2279"
+  "0x4183756e36181f92164c36776c2ba3",
+  "0xaff710205b13b83794ee63e35bb424",
+  "0x411e"
 ]
 
       [inputs.previous_rollups.public_inputs.end_blob_accumulator.c_acc]
@@ -788,168 +788,168 @@ proof = [
 
         [inputs.previous_rollups.public_inputs.end_blob_accumulator.c_acc.x]
         limbs = [
-  "0xa16abd45ebff1813acbfc25da087b9",
-  "0x84f45c949bfbce8fa1f1e50096f575",
-  "0xdf9de55e4446e5ca9cafa4dfbf2f47",
-  "0x027f73"
+  "0x6e2f87b978f4bca529d7ad90a41cd8",
+  "0x734aa1582c8aee32f8334cfc594ab0",
+  "0x21aa57d7e1012415e25e37ee62bbcb",
+  "0x015e58"
 ]
 
         [inputs.previous_rollups.public_inputs.end_blob_accumulator.c_acc.y]
         limbs = [
-  "0x5672b1d9055179cb8686047904fd2a",
-  "0x4914cf7a67c03c183b5fe6b16763a2",
-  "0x9cc8dd9c161d67e107dbc539a4a111",
-  "0x055528"
+  "0xd8e530734ccb89f49a545e13ead68c",
+  "0x914523b3ef75387e032ac9fef36157",
+  "0x5342c94a6ba1df16b871173b323290",
+  "0x1604f8"
 ]
 
       [inputs.previous_rollups.public_inputs.end_blob_accumulator.gamma_pow_acc]
       limbs = [
-  "0xe90665c98626a131374681a1fb6149",
-  "0x41f4d95a0a5d2c98473574d582345a",
-  "0x3d23"
+  "0xc0250cc6b8725b2b00687dab94d327",
+  "0xd7f65a721538376d885811c9aafe6f",
+  "0x297f"
 ]
 
     [inputs.previous_rollups.public_inputs.final_blob_challenges]
-    z = "0x258fe952c7f4b5c99fef8430b0b5180c25de80ba57d2e8ccae86424640029cff"
+    z = "0x0f20024c268f33a3baa0f8f38bddd3d70a7fe791632d4914d95c44e2099fa150"
 
       [inputs.previous_rollups.public_inputs.final_blob_challenges.gamma]
       limbs = [
-  "0x6804d65282d302d4ddda70f6f2abd7",
-  "0x2279c9033cd2fad6be7d59214f2631",
-  "0x0cf8"
+  "0x551bcc798b08297e8823944cd61ccd",
+  "0xa11af380fa73225d8ac70a4862f1cc",
+  "0x24db"
 ]
 
   [inputs.previous_rollups.vk_data]
   leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000013"
   sibling_path = [
-  "0x1081b48e10711fce02229ea90880f0e5f804953f119310b7fd7e683919a3dcc9",
-  "0x2bc8578d03c8e4e40b8be66456c2711a1f0f284142899258efd4451303bd44bc",
-  "0x08cf1d3a672e65daf5990d04b351209fd0479b24b7a6c25fa2d381f89df08156",
-  "0x2740690820f0df46bcbf149ccb51f228fb81a46173ad1793687319f77d32d49f",
-  "0x026fbe21cffb22c458f7e07b206bdaf767d39af34024eefe88e3d8b56eb9f695",
-  "0x19de2a32662702dd872e529ad89836e16b013012f910daf2bc7c2a67356dd107",
-  "0x1f07bca7a14f9a969539c0afd388affa18926689f431fc541841a2a7604d388c"
+  "0x1be72f1f471a29db247f7c4f19c03e11631575edec0695c29deba92770cce437",
+  "0x0c0e71d61b37e5093a79987574f6a04cf58c7a6b47f650ec04b30cb9c9b3ccec",
+  "0x1f0a3ab28f16510e4f9a5682a8b5f2826f55082cd639c6b76e6e970d8bb4224d",
+  "0x268f759e38c9ff705a78c055b44e19f7d2b0227f3c4f2e31d6874550d498abec",
+  "0x09f661abe743a7c8125aa0498ca1d01914fdac9cadadb415e0d1a05934997b99",
+  "0x28650667b92be48b116289119fa4794a5fe8fe5792a49d89b9977feae7f685a6",
+  "0x2aa74c20807e8cbb3e32a86ad29472c42a3fb7021dcfaad112a6b68eb0eca98e"
 ]
 
     [inputs.previous_rollups.vk_data.vk]
     key = [
   "0x0000000000000000000000000000000000000000000000000000000000000015",
   "0x00000000000000000000000000000000000000000000000000000000000000a3",
-  "0x0000000000000000000000000000000000000000000000000000000000000001",
-  "0x00000000000000000000000000000081ef912f74b7757bf1383f0cd8a98398ec",
-  "0x000000000000000000000000000000000008c608384ca501e2266896b362ad9e",
-  "0x00000000000000000000000000000038d0f520c8e17866b61923c41ad34c8582",
-  "0x000000000000000000000000000000000004a0893a415daeba9085f47e6c8704",
-  "0x000000000000000000000000000000a2768ba334110c89457563556ffb1cda41",
-  "0x00000000000000000000000000000000001cbc0916138d20608232f47709a1c4",
-  "0x00000000000000000000000000000001360ca98ed96cca0c5800d1ae867ae889",
-  "0x00000000000000000000000000000000000a5de53f5b3121f4213b1911781c45",
-  "0x0000000000000000000000000000005dc53606419e998192f0747a187e449ff4",
-  "0x0000000000000000000000000000000000238f56545051513e7d295ef9d43eea",
-  "0x0000000000000000000000000000006a092d2426e0475f4ca900e0cbe3e5a3ac",
-  "0x000000000000000000000000000000000022ab99c302b05de9ece51cee683321",
-  "0x00000000000000000000000000000090846e80ce607933987accaf06e74c267d",
-  "0x00000000000000000000000000000000002741e8a02058eb727caa0cda33ef2f",
-  "0x000000000000000000000000000000e2d5d4199846f6a59a51f028eb2d0e6000",
-  "0x0000000000000000000000000000000000122e4df2b72f2be5e2d63b585447ea",
-  "0x000000000000000000000000000000250c9b0771210c9244bec8b24871fa3f00",
-  "0x00000000000000000000000000000000002c74f0a9e529f907a8b53eb9d91c6b",
-  "0x000000000000000000000000000000120f9bcbced17771131b718dd86dc21f0d",
-  "0x00000000000000000000000000000000001ce96730950cecf8de1715cf99274f",
-  "0x00000000000000000000000000000006a3db63edea7908c5e7fdc41aad79ef53",
-  "0x0000000000000000000000000000000000223c9d40cc91a5067a92b150ac61c3",
-  "0x000000000000000000000000000000a9e37b5ba3da39e435c704e89dc92ad2d7",
-  "0x00000000000000000000000000000000000cdfb682786528170a7d53e96df929",
-  "0x000000000000000000000000000000554c51afe430bf7cd9882249a7013f906b",
-  "0x000000000000000000000000000000000005d9de93f6af5074a2a6ca20892a6c",
-  "0x000000000000000000000000000000402a4686b749034cb15f79b98cdd2250d1",
-  "0x00000000000000000000000000000000002e54b9c82afac2f99da1f2b855af17",
-  "0x000000000000000000000000000000fc5b3a26633de9853ad139168df045a7a8",
-  "0x00000000000000000000000000000000002496c5f66b46d88fea6ba466e98b3f",
-  "0x000000000000000000000000000000f83ba649c6fe5706eda46f423811e2dd1d",
-  "0x000000000000000000000000000000000004485b0e7b866f8346caa6f720117e",
-  "0x0000000000000000000000000000009e71f78b92fb4ca79ee56385d7806a4263",
-  "0x000000000000000000000000000000000022b40fe602358d20104972b4bc0602",
-  "0x0000000000000000000000000000008b89b953375d1a481971b8f42d44ea4084",
-  "0x00000000000000000000000000000000001339c7fb488f1ab74bd94756f2ae0f",
-  "0x0000000000000000000000000000007799e618ccd7b6f67b143d384463ff8dfd",
-  "0x000000000000000000000000000000000000aaf3d83c8a8bb18dab0d43c3bd24",
-  "0x0000000000000000000000000000006701328bbeaf48fd72ce1fc36a3757f1db",
-  "0x00000000000000000000000000000000000a81b9e873bad5701135319d9250a7",
-  "0x0000000000000000000000000000003bc1e561e1edfdef8db38e5d0aedec4e6c",
-  "0x00000000000000000000000000000000000b1186950e771ebad4865cdef562cf",
-  "0x0000000000000000000000000000000c5bee425786c86c4369d118f6027f0e0d",
-  "0x00000000000000000000000000000000002908c6afd190384d9e1d0992fe29ff",
-  "0x000000000000000000000000000000c9bc815f10bd7b84b27123517eb12d6bcf",
-  "0x00000000000000000000000000000000000418bf466cc71b1ecf0588514c410f",
-  "0x00000000000000000000000000000090ac6c0e098d12dad65016e05816886496",
-  "0x0000000000000000000000000000000000159c91e3a578bc138bdfa719a37507",
-  "0x0000000000000000000000000000007ba5028c6143e7041adaed639113492d3f",
-  "0x000000000000000000000000000000000013dd0c6879b675f181957321726280",
-  "0x000000000000000000000000000000e30a068c0078c8ea18791c0ae518561832",
-  "0x00000000000000000000000000000000000865c879420fc4527133337e060656",
-  "0x000000000000000000000000000000a2bba8c0d7fe2385f15647658096173bd1",
-  "0x0000000000000000000000000000000000206abf2edc1287fe75520910e3d3f5",
-  "0x000000000000000000000000000000c710431c64bdea3fa0d28f3d17398eaaa8",
-  "0x000000000000000000000000000000000026ba80ca0bcf49f82b20d139acffac",
-  "0x000000000000000000000000000000066c1f713804556995c9f564a15e4e7e7a",
-  "0x000000000000000000000000000000000020ced7fa347fdb1b07ff724eda751a",
-  "0x0000000000000000000000000000007152bdc7fd59eb357324aad0e0051ce525",
-  "0x00000000000000000000000000000000002e8e2c41d50cb591f1005ae9bc9291",
-  "0x0000000000000000000000000000007efbb108cee703a83be91386ac328a5a4e",
-  "0x00000000000000000000000000000000002cbb43a8bfbd072e9be5c3448107a3",
-  "0x000000000000000000000000000000469ca7d3d5eabeed684adfaffa62af2b4b",
-  "0x000000000000000000000000000000000010193145c35731414656fcb289d14d",
-  "0x0000000000000000000000000000007c3abce64ca5f8e35f10c2ed6c5adf66d5",
-  "0x00000000000000000000000000000000001971c54a3828d72ddb12e159eaf83f",
-  "0x000000000000000000000000000000626c59997e1a902198f5979f3b7d6d6ea7",
-  "0x000000000000000000000000000000000027e51edf5943f4e2a587178b690819",
-  "0x0000000000000000000000000000001c1e38c3edb2ccf7ed70e0bb28c8000801",
-  "0x000000000000000000000000000000000025fe848b05e1637b527743210b0d8b",
-  "0x000000000000000000000000000000ccf1a465ef1370595aa081c63ea2e691c1",
-  "0x000000000000000000000000000000000000d76e0621277b8abee17a493acff5",
-  "0x000000000000000000000000000000aba133472be671f8c76fc40b4d5d56a6bb",
-  "0x00000000000000000000000000000000001e693d2f9091cc12a40152e682fcbf",
-  "0x00000000000000000000000000000095d36cc785cc6c102b3e68a3a63aebab5e",
-  "0x00000000000000000000000000000000000164e3770e1bc5e82bd524bcab5744",
-  "0x000000000000000000000000000000c86e21090409c8099c8918e7b198e0fb7f",
-  "0x0000000000000000000000000000000000243f5ca41ba9f47aa5dd938c9b0e71",
-  "0x000000000000000000000000000000573a6d09ee383d2bdde3ae586b1f90c166",
-  "0x00000000000000000000000000000000001a90d51c582baa9cf8233bd4fd3a7d",
-  "0x00000000000000000000000000000008db99ce3831e5a882c92dca684dd9f0e4",
-  "0x00000000000000000000000000000000002dd68da6e7918c3c4280e1b44235cb",
-  "0x000000000000000000000000000000ffafa50b614a68278feca6259b67e1ed29",
-  "0x0000000000000000000000000000000000178711998ad302d8243b883cf39e2e",
-  "0x000000000000000000000000000000adc4d679b0cb6d1a679318886e4b9ecaca",
-  "0x0000000000000000000000000000000000243efd9bd2f04bf724549aa7e6c623",
-  "0x00000000000000000000000000000064a38ff4a59b2585d87f3387028a1a4113",
-  "0x0000000000000000000000000000000000017776068e17691e7d9094aec3cd37",
-  "0x0000000000000000000000000000007c6fc5ae0c56f06e0a35747f24625e5763",
-  "0x00000000000000000000000000000000002194d92617bbb3ba3d9e53f4f13c5c",
-  "0x00000000000000000000000000000002eb63f6e2fc21862f6fefead2978de7e0",
-  "0x000000000000000000000000000000000011ca88979a66ada092bb26e2b64b86",
-  "0x000000000000000000000000000000c6ced8daf349335d74908736241f5f3328",
-  "0x00000000000000000000000000000000001d346dd159688f85b77717f8197777",
-  "0x0000000000000000000000000000001d06ddfeea51240c79980d4daac8144443",
-  "0x000000000000000000000000000000000010e952d77959f4aa6fe9cb7222d990",
-  "0x0000000000000000000000000000007e666acd5804af5ff4a54f8dfbea8d2572",
-  "0x000000000000000000000000000000000020b8784b739f9968d269d3db4e7e7e",
-  "0x00000000000000000000000000000046067ddaae2aa2345c15a755074d932f95",
-  "0x000000000000000000000000000000000021ad5edf078583d5e29052c50b4e8d",
-  "0x000000000000000000000000000000556e43d9f4f122ba79d3484e023fb4da7d",
-  "0x0000000000000000000000000000000000062b31b3719d79c253d59707efcc41",
-  "0x000000000000000000000000000000a840d8e4c75295a90dc312b4d2571c52c3",
-  "0x0000000000000000000000000000000000283eb52c07506637e09fb73d7875ad",
-  "0x0000000000000000000000000000000000000000000000000000000000000001",
-  "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "0x0000000000000000000000000000000000000000000000000000000000000002",
-  "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "0x0000000000000000000000000000002fac571aa2be2fdb995ba407c7139f262a",
-  "0x0000000000000000000000000000000000285fbc9e81b0681051f6f12473cafb",
-  "0x00000000000000000000000000000021f2cbe05a6adafb83f8974c90a8c594c5",
-  "0x00000000000000000000000000000000001ce0cbae2b39785941ceb4e748227e"
+  "0x0000000000000000000000000000000000000000000000000000000000000005",
+  "0x0000000000000000000000000000009a433e100615459dfb183f916b2062d61d",
+  "0x00000000000000000000000000000000002442616e2b0dbfa98b7ecbf193290e",
+  "0x000000000000000000000000000000c01f6dba139585c4cad33c1af1fc441f89",
+  "0x0000000000000000000000000000000000171aa053d4084079a830588b22ba81",
+  "0x0000000000000000000000000000003f6b7aea43a81106f616f3e575cee60863",
+  "0x000000000000000000000000000000000023f454864d42eb2c5024c72da2c08c",
+  "0x00000000000000000000000000000005987b401231fb970567be0badf86d7514",
+  "0x00000000000000000000000000000000002fdd84af6261fa6ee0f99f6bc1c881",
+  "0x0000000000000000000000000000001a6fbc62493ef0dc2c39bd5488af0fda32",
+  "0x000000000000000000000000000000000019f368e2c0dd3ae06755c7d83e1381",
+  "0x0000000000000000000000000000003800b8f4c83ccda2d5cff8bc18913d60e5",
+  "0x000000000000000000000000000000000014f1a75a1c0ce95480335398dbf82e",
+  "0x000000000000000000000000000000061722135564a0c33a56affa3ee1eb0c3c",
+  "0x000000000000000000000000000000000028fc5b4ae27c4be3b68af426e5cc25",
+  "0x000000000000000000000000000000094a72c62cd7f643f998a774a3c1692a9c",
+  "0x000000000000000000000000000000000002e23f17ec6396bd3bf8497546c82b",
+  "0x000000000000000000000000000000d7775db81e7c0c37e6940e97c3026fc49b",
+  "0x00000000000000000000000000000000001a76225c5d8d4a24eac9b6060483a5",
+  "0x000000000000000000000000000000d1322466b768603245adbfbe707afc9aee",
+  "0x00000000000000000000000000000000000c423cffb03800ad0f6f0b5bcb0a1e",
+  "0x0000000000000000000000000000001ade4e785ba270672b708c1cb93ca2fdd5",
+  "0x00000000000000000000000000000000000b468b6e311689fa6ec4503d2d1b5d",
+  "0x0000000000000000000000000000003a8473fa13716d7c47fb0a41d10f538fa6",
+  "0x000000000000000000000000000000000013151dfa49a54d259a8c4fec4736bc",
+  "0x000000000000000000000000000000f09823147b5a2f1315af76f84626faacc5",
+  "0x00000000000000000000000000000000002cfa957d32526624e97ec08d0763b4",
+  "0x00000000000000000000000000000095f75874399828c93364b7d272bdd91ad8",
+  "0x0000000000000000000000000000000000169d8b404b534c0a246767dc1b6cc2",
+  "0x000000000000000000000000000000579241f2e3236abb3e318f1a4266ba0431",
+  "0x000000000000000000000000000000000015c834520f6ae2df99028826545250",
+  "0x000000000000000000000000000000f31db19daed1017929ae88f4f3f8521a77",
+  "0x00000000000000000000000000000000002e3e6fa8fc5c271d95c32504342c96",
+  "0x000000000000000000000000000000156ccc48324606bba2a81e44d3033965f3",
+  "0x00000000000000000000000000000000001bbd1a661b55e4cf8c0bde338d994b",
+  "0x0000000000000000000000000000002e67e823cf8228948ae5c34f71a8347851",
+  "0x000000000000000000000000000000000006afe3e3e1b881c6df566f4532e8f0",
+  "0x000000000000000000000000000000b2f235dc16b84add85650d924582ec7dce",
+  "0x000000000000000000000000000000000013ec9ae6dbfc2a7310ee57e4cf96fb",
+  "0x00000000000000000000000000000043c924cd03d3652d1c7a1fa38eee85b013",
+  "0x00000000000000000000000000000000000b9e9493e39b71b0126548ef5f3890",
+  "0x000000000000000000000000000000fb37e6795aba9baa1a7c554c6614ab1276",
+  "0x00000000000000000000000000000000002bfa7eb130ab19d31141f4bd1a790d",
+  "0x000000000000000000000000000000aa4fa8ab5e1111f572bc0be8c5648dda2a",
+  "0x00000000000000000000000000000000000d1a47317b27c288eadb2a2fcec2e9",
+  "0x000000000000000000000000000000148d3def2091cffc18e7a99af26b32c426",
+  "0x00000000000000000000000000000000002978869bbda368adea3c9c670bfebe",
+  "0x000000000000000000000000000000f29b693ede78010c05b1ea2f98e6287d5c",
+  "0x0000000000000000000000000000000000285f6de42d2f63b6e09f638916be31",
+  "0x000000000000000000000000000000c529156a781367b9b39ccdb6f714cac912",
+  "0x000000000000000000000000000000000012afdcb744cd9b85dcf16b7e4794fa",
+  "0x0000000000000000000000000000003f0ee19f812e23c3e0c17d24cecf19ea9c",
+  "0x00000000000000000000000000000000002f68f3fb589c01cd8aa6215c944590",
+  "0x000000000000000000000000000000035e524c6948e5b34c206582bf43bf55ed",
+  "0x000000000000000000000000000000000024755c3619d8c89bb48b9d266ac87c",
+  "0x0000000000000000000000000000009a82ca92daff9b5992759a94953b8f8628",
+  "0x00000000000000000000000000000000003038a4b10faec561f34c2ea32bc713",
+  "0x000000000000000000000000000000633018b6c00a2169cef96b4073117721c0",
+  "0x00000000000000000000000000000000002f17430771a2fc7344dd1c104fd00b",
+  "0x00000000000000000000000000000069085f0ce834cf4d649d802da99138a95b",
+  "0x000000000000000000000000000000000006947eb82654ee05b374bb416cf04b",
+  "0x000000000000000000000000000000bbe898ab38ac7a24524eef7b79d2639f76",
+  "0x000000000000000000000000000000000002c40b232a07d9d11f3dac35b85dd3",
+  "0x000000000000000000000000000000047258f098b82fad4617620d0189f879e0",
+  "0x000000000000000000000000000000000026c6c071c1d3ad9e14eb001be27125",
+  "0x0000000000000000000000000000000c49a35af28b7e551244d77b56d59b5512",
+  "0x0000000000000000000000000000000000189085667c613410461cbd17b30c56",
+  "0x000000000000000000000000000000ca38ed6144991e99907f522e28860f0de8",
+  "0x000000000000000000000000000000000007c40e2ecae3ebea24bd3ec55ac484",
+  "0x000000000000000000000000000000bfffcabb70a790bc545c4ee3bfce18a260",
+  "0x000000000000000000000000000000000010e55bdeb1092f2a6444bc396cb56f",
+  "0x0000000000000000000000000000009c4e20b003ed4f70b4a62cfc57204f24c6",
+  "0x00000000000000000000000000000000001e00b7ff0421bfe32f28205fd0df4e",
+  "0x000000000000000000000000000000cf5869f07bfb05fa6a7b3482f3331f9d8e",
+  "0x000000000000000000000000000000000022c6e62a5e3445a01fbe8fb277eae1",
+  "0x000000000000000000000000000000b5dced535f594636ae43aa82db9c0a562a",
+  "0x000000000000000000000000000000000015b098ffbfd590c9db9622f8456377",
+  "0x00000000000000000000000000000069eea6cb45c453c7458f7a14981f8a4639",
+  "0x00000000000000000000000000000000001e577951336e913442cfa05d0e9a0d",
+  "0x0000000000000000000000000000009ef7b985877ffb4041cea6f6912eb32a8c",
+  "0x000000000000000000000000000000000020521a7cfd616db7e549b3c64d777e",
+  "0x000000000000000000000000000000e9f0722fce51e4bf5e31b757228e9ccbf1",
+  "0x00000000000000000000000000000000000fa84f6bb49d001a7506c96419e7ce",
+  "0x000000000000000000000000000000a761f66f198a2c14c07c32f6604cf578d2",
+  "0x000000000000000000000000000000000019635c073e9a560147b7295882e765",
+  "0x00000000000000000000000000000033deb909e8f26ca9aa0417a0172f02690f",
+  "0x00000000000000000000000000000000000880fc020fc451935fb66e22daa7c1",
+  "0x0000000000000000000000000000006367288f16161fa5df3f49cedd8a8e34b2",
+  "0x0000000000000000000000000000000000304e31fe6eba575d1b3f3ebef0066e",
+  "0x000000000000000000000000000000c5cafa7e75b7c69af15b1a1e1bc905d603",
+  "0x00000000000000000000000000000000000056634d879eaebb861aab7f6f754f",
+  "0x00000000000000000000000000000075b6c4cb8ee2d596e52fe1b3d9405cb208",
+  "0x00000000000000000000000000000000002bf855c3a58ee0e60041a921be728b",
+  "0x000000000000000000000000000000a4e608225e21e96a15388fd855afcb8bd9",
+  "0x000000000000000000000000000000000001eb45674390c99d0df7b66959f3a6",
+  "0x000000000000000000000000000000da7a7c3519858b8c78980a95a3c0ace91c",
+  "0x000000000000000000000000000000000004b30cecdd534cbfb3c9ffdf2ef2c3",
+  "0x0000000000000000000000000000003a35ed1dc0d1ff7aae4209529a34930921",
+  "0x0000000000000000000000000000000000210c99ed727129a1d40e9f9a7adcaf",
+  "0x000000000000000000000000000000fd35d6cbde8ca6b8e64652a47a495d4eac",
+  "0x000000000000000000000000000000000019c18ce002d04e602c1607ffe9a256",
+  "0x000000000000000000000000000000a3a317653f93cb7e27ab835d087169be62",
+  "0x00000000000000000000000000000000002f16044c7d21455e2e0af21446869d",
+  "0x00000000000000000000000000000052868428cacab9195b92aaa5470ecc2279",
+  "0x0000000000000000000000000000000000008866d791a72df4357df8031c5f7b",
+  "0x0000000000000000000000000000001eee81b23a887f299049b14c11e98460d6",
+  "0x00000000000000000000000000000000002a56ce41f6b0be13b9c26747621b82",
+  "0x000000000000000000000000000000d5827d6338c78656c0d12ca1aea6ef2c7c",
+  "0x00000000000000000000000000000000001aa98f2de3ddda547d8f6de4e725de",
+  "0x000000000000000000000000000000009fc2164d514381cbd046643639eb0897",
+  "0x00000000000000000000000000000000002f78c031ec3c08a5ab5a89a1d10683",
+  "0x0000000000000000000000000000007152fc85b72cc8621b05374d34058fd1dc",
+  "0x0000000000000000000000000000000000045f49a06cc7dca8937f78ab17e851"
 ]
-    hash = "0x0090d34574a72220423e98a39245e37ea3d69f2e03cc34640b00ea2e96b4a5fb"
+    hash = "0x1dfa2952af644c59aa9d8ddec361d72059e139e64ce4790c4d3599963ba40244"
 
 [[inputs.previous_rollups]]
 proof = [
@@ -1437,7 +1437,7 @@ proof = [
 
   [inputs.previous_rollups.public_inputs]
   checkpoint_header_hashes = [
-  "0x00dab2fca5adcf39812a7aab71f390bd195ba9fd5dc773a417f08f91f5309249",
+  "0x009751d5fc5ec4f92e16f7b70c3b084aced0c7e9416fae20ebc6fcbca6b9501c",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -1473,17 +1473,17 @@ proof = [
 
     [inputs.previous_rollups.public_inputs.constants]
     chain_id = "0x0000000000000000000000000000000000000000000000000000000000007a69"
-    version = "0x000000000000000000000000000000000000000000000000000000007b6d50be"
-    vk_tree_root = "0x0141caf6779674bc31225636c4cc4259a731835c52fc462f2dcbfabf7de01a1d"
-    protocol_contracts_hash = "0x01af64239167dcc8333e25456aab71348f66d9f6de731a8b62181d16cf0818c1"
+    version = "0x00000000000000000000000000000000000000000000000000000000ad49d7cd"
+    vk_tree_root = "0x0c16448b65c4b3f83f9db3bebf635bd38957c74c9c1ea36036cbda16432cf558"
+    protocol_contracts_hash = "0x0333160f082dfc02e255c756febac14dc42c4c88b882e0403d44710c1f0bb80f"
     prover_id = "0x0000000000000000000000003c44cdddb6a900fa2b585dd299e03d12fa4293bc"
 
     [inputs.previous_rollups.public_inputs.previous_archive]
-    root = "0x03d275a8edc90d3f952ec8f054b23256a99c78afb49333ede28977b2e085639d"
+    root = "0x24f3d6261780561e8ede638edf15d34d9f93372572631856307c57a08dfb9cb1"
     next_available_leaf_index = "0x000000000000000000000000000000000000000000000000000000000000000b"
 
     [inputs.previous_rollups.public_inputs.new_archive]
-    root = "0x18a653206829c9bfb1bfa0994925abfbb7215706ace18078845397b87bf94da4"
+    root = "0x0f84849714aa969caef587fe17273c9fae12f846c68db0f1ab092faf93a29145"
     next_available_leaf_index = "0x000000000000000000000000000000000000000000000000000000000000000c"
 
     [inputs.previous_rollups.public_inputs.previous_out_hash]
@@ -1495,10 +1495,10 @@ proof = [
     next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000003"
 
     [[inputs.previous_rollups.public_inputs.fees]]
-    value = "0x0000000000000000000000000000000000000000000000000022df0587214f60"
+    value = "0x0000000000000000000000000000000000000000000000000022e452ad469ea0"
 
       [inputs.previous_rollups.public_inputs.fees.recipient]
-      inner = "0x000000000000000000000000080c5a37d2d3dade855a034bac3548a8b2dfd887"
+      inner = "0x000000000000000000000000fde0805eba75f23cd30a3bb4f0e567a356075904"
 
     [[inputs.previous_rollups.public_inputs.fees]]
     value = "0x0000000000000000000000000000000000000000000000000000000000000000"
@@ -1687,15 +1687,15 @@ proof = [
       inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
     [inputs.previous_rollups.public_inputs.start_blob_accumulator]
-    blob_commitments_hash_acc = "0x004df6223debf77e31be5b29dfef6ab8022ea36ba2cd0e1201a7d8a84cf26343"
-    z_acc = "0x01c74e79390675dc49881cb7b3356c8815f132ac3cee6605f9f0b215b426e2cd"
-    gamma_acc = "0x02689220c4b655544c208dbd0a82214fe5bbfc46ea3135f61bc5b31b6602b296"
+    blob_commitments_hash_acc = "0x00ff28bea8c07e7b060d248cb2071f813aa6e39e07e3a527c1739e6a7793c093"
+    z_acc = "0x11b2ee0dde26d315a246f5bdc01db8abe8200c6581201debd1cffc51ad26f95d"
+    gamma_acc = "0x152f389c138d41dde799d4f4fc748753332ddcd5bcd19fe35e4fbe60581534c2"
 
       [inputs.previous_rollups.public_inputs.start_blob_accumulator.y_acc]
       limbs = [
-  "0x65fbe85b7eef2cbdf54ca087b6676a",
-  "0x8241f712fee8f38b2c5c0cc8b471c7",
-  "0x2279"
+  "0x4183756e36181f92164c36776c2ba3",
+  "0xaff710205b13b83794ee63e35bb424",
+  "0x411e"
 ]
 
       [inputs.previous_rollups.public_inputs.start_blob_accumulator.c_acc]
@@ -1703,37 +1703,37 @@ proof = [
 
         [inputs.previous_rollups.public_inputs.start_blob_accumulator.c_acc.x]
         limbs = [
-  "0xa16abd45ebff1813acbfc25da087b9",
-  "0x84f45c949bfbce8fa1f1e50096f575",
-  "0xdf9de55e4446e5ca9cafa4dfbf2f47",
-  "0x027f73"
+  "0x6e2f87b978f4bca529d7ad90a41cd8",
+  "0x734aa1582c8aee32f8334cfc594ab0",
+  "0x21aa57d7e1012415e25e37ee62bbcb",
+  "0x015e58"
 ]
 
         [inputs.previous_rollups.public_inputs.start_blob_accumulator.c_acc.y]
         limbs = [
-  "0x5672b1d9055179cb8686047904fd2a",
-  "0x4914cf7a67c03c183b5fe6b16763a2",
-  "0x9cc8dd9c161d67e107dbc539a4a111",
-  "0x055528"
+  "0xd8e530734ccb89f49a545e13ead68c",
+  "0x914523b3ef75387e032ac9fef36157",
+  "0x5342c94a6ba1df16b871173b323290",
+  "0x1604f8"
 ]
 
       [inputs.previous_rollups.public_inputs.start_blob_accumulator.gamma_pow_acc]
       limbs = [
-  "0xe90665c98626a131374681a1fb6149",
-  "0x41f4d95a0a5d2c98473574d582345a",
-  "0x3d23"
+  "0xc0250cc6b8725b2b00687dab94d327",
+  "0xd7f65a721538376d885811c9aafe6f",
+  "0x297f"
 ]
 
     [inputs.previous_rollups.public_inputs.end_blob_accumulator]
-    blob_commitments_hash_acc = "0x001fd6e929814b35903715f1c5ea316c892ea7f939ab9ee30b07679c51cbccbd"
-    z_acc = "0x258fe952c7f4b5c99fef8430b0b5180c25de80ba57d2e8ccae86424640029cff"
-    gamma_acc = "0x0a255caa3616e21ac409e088ea3f4df39f726cc14c9a448d0bdde634571dc208"
+    blob_commitments_hash_acc = "0x00e314212187820bcccc75acc041531f0e6f2139db72f9962951480b5eb309b4"
+    z_acc = "0x0f20024c268f33a3baa0f8f38bddd3d70a7fe791632d4914d95c44e2099fa150"
+    gamma_acc = "0x28a8c47b24266cbe95e6e5df4d8f583081a6e7d873a03dfabcf3fad3204acc2f"
 
       [inputs.previous_rollups.public_inputs.end_blob_accumulator.y_acc]
       limbs = [
-  "0x1982414c4271739d1b6e5de64ee0b3",
-  "0xe7221620f435d204fbd31e7ec6ade9",
-  "0x69bb"
+  "0xca8704c4fce27431f9bc6cf6bc5ee8",
+  "0x2e59181e0640e995e15724147eea98",
+  "0x5a08"
 ]
 
       [inputs.previous_rollups.public_inputs.end_blob_accumulator.c_acc]
@@ -1741,165 +1741,165 @@ proof = [
 
         [inputs.previous_rollups.public_inputs.end_blob_accumulator.c_acc.x]
         limbs = [
-  "0xd04f93eb025f957c41b189a11c053d",
-  "0xaec4021764d0e7b4f28c4811fe4259",
-  "0x03e23c6610add1b26234b49d366274",
-  "0x118035"
+  "0x1fc2db53f95236761d435a3d7a82eb",
+  "0x4f0266217c841c706ff759bcd9619a",
+  "0x6b2dfe9b2403f250a44b3a4a85c7a7",
+  "0x09f649"
 ]
 
         [inputs.previous_rollups.public_inputs.end_blob_accumulator.c_acc.y]
         limbs = [
-  "0xa832e70cbaebd89884d3cc1223b2f3",
-  "0x928a4a6765dc43ac266112ec8474a7",
-  "0x08cf57961db9e023bb15210a771a2b",
-  "0x075622"
+  "0xdf0f6a879571ea5e99241f6a774cc6",
+  "0x962be4a71909fb2b0c13c6d8aa4780",
+  "0xd7e987a1f4d2937f67abc39e2ce5d4",
+  "0x042b58"
 ]
 
       [inputs.previous_rollups.public_inputs.end_blob_accumulator.gamma_pow_acc]
       limbs = [
-  "0xb71ac314df488a4bb966c4a019071e",
-  "0x73fddc1ca7d3465d3bed1815dfeca6",
-  "0x2e79"
+  "0xed650727d9732d1fc427beb2dcf581",
+  "0xdcd9e8dc02a33765f813f467a095de",
+  "0x0e9c"
 ]
 
     [inputs.previous_rollups.public_inputs.final_blob_challenges]
-    z = "0x258fe952c7f4b5c99fef8430b0b5180c25de80ba57d2e8ccae86424640029cff"
+    z = "0x0f20024c268f33a3baa0f8f38bddd3d70a7fe791632d4914d95c44e2099fa150"
 
       [inputs.previous_rollups.public_inputs.final_blob_challenges.gamma]
       limbs = [
-  "0x6804d65282d302d4ddda70f6f2abd7",
-  "0x2279c9033cd2fad6be7d59214f2631",
-  "0x0cf8"
+  "0x551bcc798b08297e8823944cd61ccd",
+  "0xa11af380fa73225d8ac70a4862f1cc",
+  "0x24db"
 ]
 
   [inputs.previous_rollups.vk_data]
   leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000011"
   sibling_path = [
-  "0x23f1411ea3da26878e97937a733d7a9c893fa3f2160137de61cb6a102a2050f2",
-  "0x23027ebf247908b2602031ac11b76cb579049a954fd43087f04356f50add7714",
-  "0x08cf1d3a672e65daf5990d04b351209fd0479b24b7a6c25fa2d381f89df08156",
-  "0x2740690820f0df46bcbf149ccb51f228fb81a46173ad1793687319f77d32d49f",
-  "0x026fbe21cffb22c458f7e07b206bdaf767d39af34024eefe88e3d8b56eb9f695",
-  "0x19de2a32662702dd872e529ad89836e16b013012f910daf2bc7c2a67356dd107",
-  "0x1f07bca7a14f9a969539c0afd388affa18926689f431fc541841a2a7604d388c"
+  "0x1edc2329182e13c58f5ced1e4ca120ba845e074e81d59ee64d0bbd583ecdd429",
+  "0x1f502972a4bdd0353e082932afca85331d93e89c99ab3a78511939c18eb14641",
+  "0x1f0a3ab28f16510e4f9a5682a8b5f2826f55082cd639c6b76e6e970d8bb4224d",
+  "0x268f759e38c9ff705a78c055b44e19f7d2b0227f3c4f2e31d6874550d498abec",
+  "0x09f661abe743a7c8125aa0498ca1d01914fdac9cadadb415e0d1a05934997b99",
+  "0x28650667b92be48b116289119fa4794a5fe8fe5792a49d89b9977feae7f685a6",
+  "0x2aa74c20807e8cbb3e32a86ad29472c42a3fb7021dcfaad112a6b68eb0eca98e"
 ]
 
     [inputs.previous_rollups.vk_data.vk]
     key = [
   "0x0000000000000000000000000000000000000000000000000000000000000017",
   "0x00000000000000000000000000000000000000000000000000000000000000a3",
-  "0x0000000000000000000000000000000000000000000000000000000000000001",
-  "0x00000000000000000000000000000070169ffa51c4d2f6a4b31749016e3a4f98",
-  "0x00000000000000000000000000000000002d0c90567eaf8a25186e95a9a44b59",
-  "0x0000000000000000000000000000001a26c6be8f50a1836e09be831aa8373e62",
-  "0x00000000000000000000000000000000001b4cbfb0b81cf7b259a64939877eee",
-  "0x00000000000000000000000000000004342c3be32ac53d6b6b8064b71c936959",
-  "0x00000000000000000000000000000000000458d82db1cd79ce2fd9c141099eb8",
-  "0x000000000000000000000000000000624fac7feb19d29c2c010c5922526f4ed8",
-  "0x0000000000000000000000000000000000282ea2c74e4875c1e94a1dabd70cce",
-  "0x0000000000000000000000000000008ad38d292572ae034aa7d85fc5c015f271",
-  "0x000000000000000000000000000000000021e45922b40b48651c7932a6e13611",
-  "0x000000000000000000000000000000a73dab9ddc3b54090c50ca93622227f3c2",
-  "0x00000000000000000000000000000000002d70204a5b85deb214313dbeb32bc3",
-  "0x00000000000000000000000000000048688558b56d3c6032e622e0132bea8bc9",
-  "0x000000000000000000000000000000000029b1cb58dcbb9d06f234917950e034",
-  "0x000000000000000000000000000000e4989a9bb1675d5be2af2e4f131e74140b",
-  "0x000000000000000000000000000000000012b4ab9c56ee16508e8d613328b39e",
-  "0x000000000000000000000000000000e52ca2027b19bc7b6e8f00eaba7d43784b",
-  "0x00000000000000000000000000000000002484c6c3932251115c1db94dcfae6b",
-  "0x000000000000000000000000000000db8fe96a61cdfb97df5f9712f9f1939d9f",
-  "0x000000000000000000000000000000000010c87f7386b0390d36282c2bfa4f83",
-  "0x000000000000000000000000000000028b9750326c7e469e009cf8faf6e6f560",
-  "0x000000000000000000000000000000000010e070864c12c087107aa7039bdd87",
-  "0x000000000000000000000000000000838e696c0a48c139516ea4a3431cf9b1cb",
-  "0x000000000000000000000000000000000018bcb06a170f1760a6c2e4b39aa8d4",
-  "0x0000000000000000000000000000004b9cd87af8615fd21a50f9d2d6f5bac356",
-  "0x00000000000000000000000000000000002fea96f32103760ddbb66d2b64dc5c",
-  "0x000000000000000000000000000000cf57cca060c094a74ad685146e8fdb5c3e",
-  "0x00000000000000000000000000000000000a71f47258b8aa04fa23f39812abf3",
-  "0x000000000000000000000000000000469895c891c199afe0d76eea89cae9846e",
-  "0x00000000000000000000000000000000001676f0631134f615c932f1c151f348",
-  "0x000000000000000000000000000000b596e3645318b680a53db60a2e38465678",
-  "0x00000000000000000000000000000000001c4d7f6576654db4c031af7135b301",
-  "0x000000000000000000000000000000cbf0b2db7f422f69ed21d0a1272c4ffa1f",
-  "0x00000000000000000000000000000000000d4bb7ebd1692fff8fde678f1666bc",
-  "0x000000000000000000000000000000830bd527115207292ac568d95c51b5ec4c",
-  "0x00000000000000000000000000000000000c0e98421c91f517f07d72e3afdad2",
-  "0x000000000000000000000000000000def2948a821aedbfaf5b664e9d3d9b3307",
-  "0x000000000000000000000000000000000014660a8bd3b487191c55f4a711e3ef",
-  "0x0000000000000000000000000000007012ec37b63072053f2552bd1d35013cd5",
-  "0x00000000000000000000000000000000002831783f3fb1f7de5b60063fad00f1",
-  "0x00000000000000000000000000000070f36b84d9e8e12f09a892bad379f761f9",
-  "0x0000000000000000000000000000000000126c141e95058e97930cf1e7f99600",
-  "0x0000000000000000000000000000003c31e1c42e20f6f5417229688b0b09bbfe",
-  "0x000000000000000000000000000000000005f7d883985d683811dbb2850cab4f",
-  "0x00000000000000000000000000000014f4261f09cc69d650eb56314da23ee49b",
-  "0x00000000000000000000000000000000002001d6d7fd1e16a440145ff99c5d8d",
-  "0x000000000000000000000000000000fa173f280d8ff466caf838817e8f6587c1",
-  "0x00000000000000000000000000000000002570309b6a1ae7576b2014b4f6893f",
-  "0x00000000000000000000000000000000bd26a605385f8ba19afab17ff63bb846",
-  "0x0000000000000000000000000000000000130b34f1a2b25274765a033d5fff7d",
-  "0x000000000000000000000000000000202dd6f740ad4d3b1f7ef7e255458970bb",
-  "0x00000000000000000000000000000000002204b14b88424f24025b906e965059",
-  "0x00000000000000000000000000000095d82554bf97c5f581cd30a7f3f6029764",
-  "0x000000000000000000000000000000000024e67a3d998142806998569e271c5a",
-  "0x000000000000000000000000000000d4fb3a2e99fe55d1f4969c2c097da18c24",
-  "0x00000000000000000000000000000000001bb297c8c97bbfbda82f0121df9327",
-  "0x000000000000000000000000000000c4327ecd5484d207e212c4a30be2558a0f",
-  "0x00000000000000000000000000000000001816a1b18c8ca9c94e56fea226913c",
-  "0x0000000000000000000000000000000df0828b01de7f11dcf45561e418a4815b",
-  "0x000000000000000000000000000000000010f9f17ce276bc31fcb61a54c52dab",
-  "0x000000000000000000000000000000d3f6b007f27ef6d39aff4469e50cbdd4ff",
-  "0x00000000000000000000000000000000001839054a3513ee69897085f6a1b292",
-  "0x000000000000000000000000000000d8eed1000ac8c4ad1a1d0ab540feef9c27",
-  "0x000000000000000000000000000000000010cf586bf3e1a6fc265ff661a90815",
-  "0x0000000000000000000000000000001bed8c9e2703ec607c6e75759b0e462188",
-  "0x000000000000000000000000000000000030296eabb61d14925bbfeec9afd884",
-  "0x0000000000000000000000000000005e578cedcd3c12ee7a1b9a0d8e1df85a9e",
-  "0x0000000000000000000000000000000000218014003ddafaee6b9a79a1e8f899",
-  "0x00000000000000000000000000000061cf01ef83d2dfa3e28080f9eeb6a79ee4",
-  "0x00000000000000000000000000000000000871218befd52f350f8a6e6ed1f3a4",
-  "0x0000000000000000000000000000003612b63ce1ba2913e8d9847414ac278e90",
-  "0x0000000000000000000000000000000000183d6943070362752ddfc4a87dcd5f",
-  "0x000000000000000000000000000000ce800005a71f12cc1923e80fec787721ad",
-  "0x00000000000000000000000000000000002bbc6db5784ee86a77a24b6692d4ca",
-  "0x000000000000000000000000000000c083bdd068a157e96ba8657b50ecb0cdbc",
-  "0x00000000000000000000000000000000000646105917a33eec246c470f8e5ff3",
-  "0x000000000000000000000000000000dd55fb0bb5efd5fe51251932307d0e42e1",
-  "0x000000000000000000000000000000000027b35fe7aeb94e5427d028db387e1a",
-  "0x0000000000000000000000000000004af9bc2d92ff8015353c874b1554d27c9c",
-  "0x00000000000000000000000000000000001e631edb990c73393facf22014c670",
-  "0x0000000000000000000000000000002420dbf4fa6f0b7241118959c109fc2de9",
-  "0x00000000000000000000000000000000000c0af01d73d6d3364d9670c66af10b",
-  "0x000000000000000000000000000000450b2bd095730122fd2baf0e77bbf65ecf",
-  "0x000000000000000000000000000000000021b0e000990c155a18bc000022ca76",
-  "0x0000000000000000000000000000004e7f91ea5dae855be68d91b2e08c2cfd42",
-  "0x0000000000000000000000000000000000282c0fc1c220c4b64554a123e2f470",
-  "0x000000000000000000000000000000e22de2967bdd4ee88f5e6d9c354312d09e",
-  "0x000000000000000000000000000000000023b226d5bc37add149d05ecd66b5a5",
-  "0x000000000000000000000000000000f4a6c6ffdf80a72db78762e237d58cd5f6",
-  "0x000000000000000000000000000000000026814a59803555635a3b6dfd056d19",
-  "0x000000000000000000000000000000f45b8d96069231f48e0d0c34d57593a6a6",
-  "0x00000000000000000000000000000000000b9dc32399025796005b2f68c15991",
-  "0x000000000000000000000000000000750e1b5cb997a3adf8540bf55bb9264ec4",
-  "0x00000000000000000000000000000000001f6cd5b6d43f67798ae4655c016f37",
-  "0x000000000000000000000000000000596cc6183848f32c60ec74fe2bcd76b20f",
-  "0x00000000000000000000000000000000000ed62d10b019355f008b46412d0e2d",
-  "0x0000000000000000000000000000002020dfdab8c9db8335bca3c8284b1585b2",
-  "0x000000000000000000000000000000000023a2906d03204aa4f79b5b80b92eaa",
-  "0x0000000000000000000000000000009116c4d15f7c9a51f17c3830fe7c1e3b42",
-  "0x000000000000000000000000000000000024aecae332db48e03b97fc645a7f05",
-  "0x000000000000000000000000000000834c5e938cf9e8bd4bd5847e2408407276",
-  "0x000000000000000000000000000000000008524b40cf87b668119022f691cfac",
-  "0x000000000000000000000000000000e699df860731437ec57f9890fe4b3a4205",
-  "0x00000000000000000000000000000000000e1e9d4327e635f547da67aef57e86",
-  "0x0000000000000000000000000000000000000000000000000000000000000001",
+  "0x0000000000000000000000000000000000000000000000000000000000000005",
+  "0x000000000000000000000000000000302787373675614b5065e413ff7cb47635",
+  "0x000000000000000000000000000000000030223bf53e330987976984cbc8b777",
+  "0x0000000000000000000000000000005d7e3c622753bc9765188b58278de58e2b",
+  "0x0000000000000000000000000000000000155d33c8914989120390dd1f1b565a",
+  "0x000000000000000000000000000000ee6a96b509792fe4cb08ba5b690a829260",
+  "0x00000000000000000000000000000000002334a82c7c45a013fd6565043b3e34",
+  "0x000000000000000000000000000000b64df10cafd4414f4ca1cfcc9df1104b83",
+  "0x0000000000000000000000000000000000146a7f5eacb3170bc6517966b91c32",
+  "0x0000000000000000000000000000009d478f8685010a03b0c7e082a0bc36f004",
+  "0x000000000000000000000000000000000000ba76040d675cb33d320e90572c0b",
+  "0x0000000000000000000000000000003be6828a9dfcbeaf8f85587eb0e140f22c",
+  "0x00000000000000000000000000000000002be8cad756fc14e20e65bcdac55d84",
+  "0x00000000000000000000000000000060d5a42641ead1f373092743119aa3af8c",
+  "0x0000000000000000000000000000000000164fde87f47eecf92ee4516ec82322",
+  "0x000000000000000000000000000000a8a3b797a6fe3470f8e4f7869dd43c2bc7",
+  "0x000000000000000000000000000000000017ec5446085f31ee161d9b3aeb1dc4",
+  "0x00000000000000000000000000000058cb2aac262dfffdaf058bcc776cd9a491",
+  "0x00000000000000000000000000000000000c3392013d42001efe4b51a9f9839d",
+  "0x000000000000000000000000000000eccc64c49eb40425e8fe5224ccdc43c1e4",
+  "0x00000000000000000000000000000000001f6506bedb6d949f1f86098e65a72d",
+  "0x0000000000000000000000000000002dd78f1fd00370a8383fbc3ba9753685ec",
+  "0x00000000000000000000000000000000002162b403b60b934527df3cdf67eaeb",
+  "0x000000000000000000000000000000d68ea8aebfb824365dabd01f6423c18a43",
+  "0x00000000000000000000000000000000000e1416c2f366756eb6713a61c29e0e",
+  "0x000000000000000000000000000000577c33d5c10b485d8c213d16ac4664dd62",
+  "0x00000000000000000000000000000000001dbb32af825db919015b2f62ac527a",
+  "0x0000000000000000000000000000004089798ec9503f6d851e3f36c8134fffca",
+  "0x0000000000000000000000000000000000258c2a8625473699411a82c908b205",
+  "0x000000000000000000000000000000900e70ab0eb295b2339744f30290816695",
+  "0x00000000000000000000000000000000002b8710de153dbcb980c871c8641455",
+  "0x00000000000000000000000000000064c8a69e30c314b2c9f307b9859388b725",
+  "0x00000000000000000000000000000000000274811b6c58c4854427d143980169",
+  "0x000000000000000000000000000000bd95ab45995e60444bcbcf2f650df95bfb",
+  "0x00000000000000000000000000000000001f24b2f347e01bcdbd025ac0559c85",
+  "0x000000000000000000000000000000ee494e93426c721d97ae5aa62c90310e73",
+  "0x000000000000000000000000000000000015237248ed9e657735f540e8c7756d",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "0x0000000000000000000000000000000000000000000000000000000000000002",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "0x000000000000000000000000000000a0c3d77ea30a89e9b9728507193050881b",
-  "0x00000000000000000000000000000000002358eed771d49c0e15036cccc5dc13",
-  "0x000000000000000000000000000000842ffbd2b370afe31af503c8be68b5ec63",
-  "0x0000000000000000000000000000000000296578e21bbf276e8916716a0c2208"
+  "0x00000000000000000000000000000013c3bccc5388da92f5d871dfc5798c6f7d",
+  "0x00000000000000000000000000000000001ed1d4ff8584dd1dd72fa169b590d1",
+  "0x0000000000000000000000000000003de967fe48c15d8973f84a210a95dd64de",
+  "0x0000000000000000000000000000000000127264f024fdb1905c1b9311a69989",
+  "0x00000000000000000000000000000067ab29550dc70b79125476307dde9d4eb1",
+  "0x00000000000000000000000000000000002dc480e42e6eea643f7ceb8de96baf",
+  "0x000000000000000000000000000000b78c2d92f2d7d849bac283fd66764341fb",
+  "0x0000000000000000000000000000000000230044dfbb796950437c31b1813440",
+  "0x0000000000000000000000000000002864afee535c3f2025e8d4270039646e66",
+  "0x00000000000000000000000000000000000dc28f5cecb40979171218dd29e4fe",
+  "0x0000000000000000000000000000009a0ffd05fb01bef000cc4c463054f3c151",
+  "0x000000000000000000000000000000000021d43883eb57a05047400f4a96ef19",
+  "0x000000000000000000000000000000acf8cee1de7f48c4f06266c8cfbad2151e",
+  "0x000000000000000000000000000000000006cd8fd38f0b7cd6f9151b5ac5337e",
+  "0x0000000000000000000000000000005654df5102eb796e74c9de073e107a39ac",
+  "0x0000000000000000000000000000000000028174128b65de0f5263c0e175b23b",
+  "0x0000000000000000000000000000008ca702a32d860f9280e625c387f3521f13",
+  "0x000000000000000000000000000000000019d792292ea80445492b5514e0dddc",
+  "0x00000000000000000000000000000050bbf69e0ae3345cd601a80f62379ab9b2",
+  "0x000000000000000000000000000000000023cc9e9fb3e9cb8b7c8e06200a279b",
+  "0x000000000000000000000000000000c3b8f00f6e9bd29ac661c44ce1a18528a2",
+  "0x000000000000000000000000000000000014a93c6f48de42b23c9ac1f7dbe811",
+  "0x000000000000000000000000000000f5328aed500abdc6320165cddcaca4fffa",
+  "0x0000000000000000000000000000000000232b23c95bd3a3df804c4a93de6472",
+  "0x0000000000000000000000000000006676bec8a1892b306e941dcc5d4011100c",
+  "0x00000000000000000000000000000000001df5186ae0a33ea8836ed671a892b4",
+  "0x0000000000000000000000000000004bad445ac665f80bc6acf512e07e85bc38",
+  "0x00000000000000000000000000000000001d2cdff266585d4078e18118fa9092",
+  "0x0000000000000000000000000000002c610edad308e27919b035922986bc8bff",
+  "0x0000000000000000000000000000000000088752e898b6a27f557963cf76e0c0",
+  "0x0000000000000000000000000000004f28478251fd7e453b7baa9f3020a953c6",
+  "0x0000000000000000000000000000000000169c31849094fa7939daae18f3c5bb",
+  "0x0000000000000000000000000000005dc0a499195b7457c28e8736067f4aded8",
+  "0x000000000000000000000000000000000025d7847b139148f3fc3f063fb052f1",
+  "0x000000000000000000000000000000789ab89aaf1ab942d695d28b895ed5b26a",
+  "0x000000000000000000000000000000000001b405d8ca6f44a8937d1becbe4681",
+  "0x0000000000000000000000000000005d3e2c6adda13104da28bd3d0d40726903",
+  "0x000000000000000000000000000000000006657556bced744fca4baebc7a7a08",
+  "0x0000000000000000000000000000001f1e42fe306d2ed7e063bc7dcaae2d30b3",
+  "0x000000000000000000000000000000000029f36b235f098995d51d6825cea708",
+  "0x00000000000000000000000000000011de9fe4ab7736b1c511efcb2eef509918",
+  "0x00000000000000000000000000000000002b60e192da925f3d135e6641d4ea6e",
+  "0x000000000000000000000000000000f088858045a80449ef186d814d04b39f9d",
+  "0x0000000000000000000000000000000000153d832bdd7a9f6463622c3507f239",
+  "0x000000000000000000000000000000d8a9eebdce988c3fd2f0999930a15138b2",
+  "0x0000000000000000000000000000000000075f1ac6bf2a6b487ae46aa505d3fa",
+  "0x00000000000000000000000000000087ee2dbbf2a048bad137c4db1b8ebff300",
+  "0x000000000000000000000000000000000011cbf2a4f1f11c63d8eb9513ee53e5",
+  "0x000000000000000000000000000000f5e4c418c7383a63f7237510cbcbb73c14",
+  "0x000000000000000000000000000000000028199b65e442cc03e751b5deb448e4",
+  "0x000000000000000000000000000000a702cc20da20448c18d688e550e57c745c",
+  "0x00000000000000000000000000000000001f309a205e7f82854e940ece89372c",
+  "0x0000000000000000000000000000007aac52d4113e4e71f28eb47905e925a389",
+  "0x000000000000000000000000000000000020e9e49e102536e6956c9bae558653",
+  "0x00000000000000000000000000000001ba2d9676f12016903f2696eba0098b47",
+  "0x00000000000000000000000000000000002f61c08a9c545fd795f8433ca00c12",
+  "0x0000000000000000000000000000001edfe50b3721a067770f9499a6083d4c77",
+  "0x0000000000000000000000000000000000248065a6e53c3f8b8d3db47272f7b0",
+  "0x000000000000000000000000000000ae34cb14f3eb595d76a2dd9402b1b23d64",
+  "0x000000000000000000000000000000000017ec2c75eec02d3be50d530b2b11fa",
+  "0x000000000000000000000000000000b0c14b05eabc7a7ad842ef1166b9fbdd8b",
+  "0x00000000000000000000000000000000002e2832206b3d1167b6287b5eb53374",
+  "0x0000000000000000000000000000002bf99439219158d7f65fa75dea73dc9a15",
+  "0x00000000000000000000000000000000002149e5cd921f23b5d7de4650b9daa0",
+  "0x0000000000000000000000000000001eee81b23a887f299049b14c11e98460d6",
+  "0x00000000000000000000000000000000002a56ce41f6b0be13b9c26747621b82",
+  "0x000000000000000000000000000000d5827d6338c78656c0d12ca1aea6ef2c7c",
+  "0x00000000000000000000000000000000001aa98f2de3ddda547d8f6de4e725de",
+  "0x000000000000000000000000000000f6e131d6ce506eb0d3892b0c27cfe0f4a8",
+  "0x00000000000000000000000000000000001668301c6c961e364526eb8abf9792",
+  "0x0000000000000000000000000000001ace35f485f93f441c7e0a6df02303688a",
+  "0x000000000000000000000000000000000010adb5f7e278a58893faf2b4b3ed80"
 ]
-    hash = "0x025ae2725b39a7dd723fcae620d38287cb1a08da745efb08d4eca9eede9c87b3"
+    hash = "0x16e2d4dba2d1561651bffffca7396ffbb146c6eea7b127f67a4b056c70bc7da3"
diff --git a/noir-projects/noir-protocol-circuits/crates/rollup-tx-base-private/Prover.toml b/noir-projects/noir-protocol-circuits/crates/rollup-tx-base-private/Prover.toml
index b98cbd542bb1..0daea78c3d23 100644
--- a/noir-projects/noir-protocol-circuits/crates/rollup-tx-base-private/Prover.toml
+++ b/noir-projects/noir-protocol-circuits/crates/rollup-tx-base-private/Prover.toml
@@ -3,7 +3,7 @@ anchor_block_archive_sibling_path = [
   "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x19f1a0c09db4cd026f686e9c8fb45501a9fefb4eb1b4c6c328a51343a0094eeb",
   "0x14e4b977b2203b70e6ee1c2456eb7114d090fe4b907f631eecd0919fed432e7d",
-  "0x05b046ac3626d2e59e73bb24881c4cb66c24684566860e077cd096137bfc4857",
+  "0x2b3b2f80ea4227dfe7ab4edec33942ff08b95b023d6d15efb0abde90594c993b",
   "0x1e20ad4181460cbfdc74ca773502c59b890f184efe300ebad895956d318422da",
   "0x1434e6e2d5db1053ab8a3be58704509c799ee17e109c77f441f7bf1755400249",
   "0x119f56a2e8423a7feaab49b9b5dcbadec0648dfa4096b61b6774ea33ae29dc7f",
@@ -3061,1003 +3061,1037 @@ contract_class_log_fields = [
 
   [inputs.hiding_kernel_proof_data]
   proof = [
-  "0x00a40530530116950cfddda9f1cd6ed27806e4918748235d03a95ac8d13fba49",
-  "0x00f4a5cca310d31ae82e824d675b5e15ea1745771178ae4891428265438882d6",
-  "0x0053c41e6a89d056224a29b39807308a96654a5675dcd50162a4a764deff627b",
-  "0x00e4e5f19ae081c4a80f9643be7a56a5b4cb25f97a4887aaf8628fc7a23f5155",
-  "0x0051a964bad018f110b795bdb97ece92de3215db6ca2c9541454b714fd922ebe",
-  "0x00b3f7832fc2c45ad92e9624c3d908956dc4bf50681371db45023d56eb099b62",
-  "0x00e33fdaa809f4806ce126307457525b94edad96c5e99c93f8c4ef07ea33aefe",
-  "0x006074888e9a011be364026331c72ec41169b495187a30dcfa4eb62956729a1d",
-  "0x008a41294ec493f172f43900b1ae43abe5da9933a49c0c03a252e4b7bb53b01d",
-  "0x0096e83a98300da463072da491fcb7ead9ca25b7aab1dd4a1e2e8e236e8bc371",
-  "0x0042856d0aef8922f7e505d732770c9e4b979d37d0d12474169f9e77279bca17",
-  "0x00c998ce83b9eb6aa50704621276342a5f83ff4e79a687c2a33a93b7c7f14117",
-  "0x006126fdcfeb873739dc18420745ca8579644093f4be2967100336b14b531e6b",
-  "0x00c960940ca247efaee0bbdd7f9bca3f3b37a1795b95a129b980cc47378041ab",
-  "0x000cd9e09223f7660bdf9d97bd5a0d863fc9d21ce7bee0bff8488670d0a83c18",
-  "0x00d6c114b59f3f70b1d935c0fc171fe347e906bfade0e9de6ba0dcd9d8832023",
-  "0x001d4bbea59f5f00b02c613ef9f039b99e8d6b1a9565961fc9a5a077b5a51112",
-  "0x00a4bd7fe1729af73a757f2876edf0438c09efe6fe233337af2be977d9aace07",
-  "0x00971b660da55ca7f2d49e431c4011142d853d43105044091188ae205c2443fa",
-  "0x006ca7d0dbe61090342218d4ce1570c1ab2667f367bc47332040e4464e6b7d11",
-  "0x00b6cab1457079d74bb928a990e923107c1f3dc1e8539aeb8d2f785bd30eef05",
-  "0x003560c7a16124e84c7ac727b320fa42853b5ac87a78adce5712cd539c12999a",
-  "0x00166ebffd8def126c16bac7e94ba096d095725e725dab047de59df032453d23",
-  "0x00cd5416c2dd45796e9a2faef5a6978f68cf6f21f9c769549af4be5f5207f5c1",
-  "0x00becc374b41e3405804445c1148534aeeab453b27192e218f824c8bd6ab0a73",
-  "0x0003c9b93ac4f515b430e29eb07def21efd93089eed9e0372dec80a54a387249",
-  "0x009743057425512d523daec6d58832007926eaf4343afb45052ce4380a4f70d2",
-  "0x0079e15e3891c9eb69446c9435ee6a619602b77bb411e490548f682196f5b8f6",
-  "0x003b117c38258a766637d841dbc763b81e4731e84c05c05579645172e5ea12ae",
-  "0x003ca3c62a94911e1a235eaef39f92eadb95415add290510d6aab5582fc52eb8",
-  "0x00a98d7da9a163656fec46a7f17a572be7d7fa33d1b69a400e84c17427ebfe3b",
-  "0x001bd9d9ec4a9a64c4bafcfea6fd397f896617772ee4bb4a7055f6e48180103f",
-  "0x00a69858a53b38daf7832f806ef181a88f9911d2b15f9fd5c44af7e552b711a5",
-  "0x007f01f05fa67c213d12bff56b44b754f27450ef5c88a29565d341c49d15bb7f",
-  "0x006cdfc4aa01ca5258e0233e08cf5419f2af5b0dc0d335e1739f41baef50201b",
-  "0x0015be2c6f94a11df0344c5ad72d7b2d5c65aa38cc2a5be5efa00de497d2b06f",
-  "0x00f32fdb7be12ec8849519a4f505bc1f55b251220a006f48307d0bdab98107fd",
-  "0x0090b382a825fa89f28adb99e8bac8a67878bfe951f007a0f040bbcb3514e4df",
-  "0x002c9ba6f53e795c8048cefa61ef1abcde8e0d42c94bade339c7f759537ecbf2",
-  "0x00fe5b56ed49da9550ede2b2117263150f1aae3538574b1535903df6fc41442e",
-  "0x0063289680e4fb61e8eca32ac2efbb898cab57666db7a1012cf5a3005b638bf4",
-  "0x0035b4c766748fbc8142c55c6bf4db87a3059b7da4c853cbec5ed4f6bc9b9ee5",
-  "0x00dd3b10ceecd831d4ebbbba0eedee740a0b64e8966108612110c772815d07d9",
-  "0x0042b7d57ae1be0475f09b022e311aa3ad1664357ff42c1e6016fe8e97c74173",
-  "0x00e04dd4e83d2d1ca4e42aa0124827af931a635d40b05a9316ff1dfa5831cfb1",
-  "0x002a49caaeaba4daccfc89f5b9748dafefd4e67c63ca67e89d92003140d22887",
-  "0x003207af49ef5d16bdea75655c4a93dbaf0cde46d8d7d24ac2d4c5a59e74abe9",
-  "0x00482713fcf5f8f7d7b10f5669352e0f46551e614aa1df24fa9dc2d3fadfa220",
-  "0x00826c316b533fc06d9eacb46f1ce500708cd1e608470a42d77789a3dc1b07dd",
-  "0x00b964d4050887bd71f8914f8c0ced43d752fcee2c5afe4b4f398970f741474d",
-  "0x00b993c49d167bc95ff912a5ba3e92c513c8e3924a3c3649c0beaa478a4b57f2",
-  "0x000ba733692fd0bbf07f68e79498d95216f8c7b84f6cb0fe15da21e75fa445fe",
-  "0x0084c6f36cbf107e476fc5b036802f7c6e0afbb5b72191ce3191c7b26c847984",
-  "0x004bb882605868acad8ff525c5f353de31e793654ee55f8af972892d9ff62b6d",
-  "0x00a4e716b73f5b39ec8c9d08def64427bbea1761daa81049f32f7aa99bf83ed2",
-  "0x00346009217bce030cd99bb3e9d907fb3e8b79caf2e6b4d4f712aab4f086103a",
-  "0x00952dcb96d7b6b18fc60fdb789065b5e84e495566f7613d6c9ef0cfba91876c",
-  "0x00129cda05b7d51ca2c2315f6f1312b98abfd59965834401b4d759f257ab960f",
-  "0x00f78ba8f72655f4a7a19aa76da9765f7c97dc3492019112f7292ee16517b4d6",
-  "0x00d2ad28b05975332ab8526f298a070c184cfcfc9533c606431433d29125afb8",
-  "0x00cf506395d59c1d6d2f899e6711879b1dfd03153bf6ddd31619875e4a18cd82",
-  "0x006a7dc8a5336d2ad36814c4d667611369805d72482bf1f8a1c62203c7d5c755",
-  "0x000f7c40b5e1ab25816bf7f9f993e65089bd85ff3bf710ad313bca57ce641383",
-  "0x00b6636cafbda11d352aab567d598807d8818c9f5e048d0602ef35c126aa293d",
-  "0x0070a4101787e51c5e5070ec0e3f401e93be61334bc143110f27206c43d865a1",
-  "0x002af94b09961f51c452d6ba055706dd8a62b28e55eba7c3d15f952d2694663d",
-  "0x001c8826f76ad6302458093796321eddc2fa269256a2e2a2791e0c603c35a62f",
-  "0x004b069ce8fbdc4221e5e7266bf4c941204cc0e714a2a44eef45ae8b48dc9b83",
-  "0x001544de3f539c90adbc55b145d33a75a0c1fca7cbd01b7bb89380b6b34104fb",
-  "0x0003756bba3d6d141bc2ff8ae7dd500c7a8d68311e5d1d6abec28f825b08c6c8",
-  "0x00db69231330f4b3597adf5f914c7a672ce420d9bcb5e7a61f17913ff70b304b",
-  "0x003ae04a1960293e637c42b147a64bc69dee16052c56b271131664cd3a8dd410",
-  "0x002f119d325a4385cae48c5c93f805e50677026a941f38f9d401b09f303f08c4",
-  "0x009d1f152c7e8e95afd5674fb287d1962553d9f00ba6038edbe85bb8624a1436",
-  "0x00c9b93df49c69c019bb76c3bb97392466d810f0fa8e98a45c06ab422db111bf",
-  "0x001557df43e4af0d0423ad7798d1ad41a9230dd2fc3ff1dbea5b5fad2988d559",
-  "0x006a807bcd9d6ec27d001bce4c432150c242706d8aea2812271bf33aa81bb542",
-  "0x00435e539543bbf7eed521d8623381ced2d66eb2e1964a9c4ac487f005c352cb",
-  "0x00df090abfa2dab9c180f677149bf312991977852fa71900930cb4e6cf5978ef",
-  "0x007ad908d94482ff180ffd8059ecec11205406faaa9c599b81f3f6290852c3c4",
-  "0x008319da4712b5da905777147be3f8746df1bdd14618966db0347c4552fc401e",
-  "0x00610a3c2d217299fb407c8bf1e2018b90deefcf8e5785ab0b29d5e6aef03915",
-  "0x00aca7746abd97d2a8947237fab41e32ff4a059467ea9a6c96c5c19949ab1cc5",
-  "0x00386910e0f393972f5dffef3c26308307c3500fc8c6ce8230c245c4a3d4a823",
-  "0x00ca308f433db2bfb57268951621cf285b3364d2043c33c39b24d0231b3a6799",
-  "0x000e2de7eee287f4112ef26c8797f03956fcda5cbc1df1e58996a979389cb6e0",
-  "0x008146b240157837bf88a00a1281371f75c61efa878b3c755e7ad19c2f3708a0",
-  "0x00445c6d6907e2b4816a12696a271c07a87a1510eda5b8a69ec35bd5cbf23674",
-  "0x007aa02531b275bc1472933703ae69f9df354c343e1fc4ca63be55f8ae75f47a",
-  "0x004f5c10d9343b494a4786569593ce35e2b1a5a306975a666fa7eb33966ceb88",
-  "0x00b153a42cf348fcbca47a4ecf26ebf766ebd96acc88576ee6e0a4de0323e117",
-  "0x0020f01c44fd88ad728b603603e9b33c3ca7ef962f35fecf9be1d8111bef38be",
-  "0x006fcc6d6053ef165d0730bd0b1a391eaf1180767bb961bce16dbac0e6fa4040",
-  "0x009a57b4dd19548eac2797a86fc221c7446b1ee9115037d79feee85347a37916",
-  "0x00e716d7ef804ac52fce689f68969d2f966e4127cd8f77339e84906602c3c87b",
-  "0x00b4fc384ea3be17e30abd96fc330e46b41704fd3e7d5f28a04c199c02eafece",
-  "0x00e82101fc9de876583041714d1a203900b055ad244ace8c5f40d4ab2e5d09de",
-  "0x001db557ef7dbfbd9edfda4e3de4f3a1aeee9a773fdbf04a0959af366a36e991",
-  "0x00d162f4701b6996a5595cafb5b587668826b35136b6a9b898d73c6feb54d1c9",
-  "0x00414dde83fe3352a2ffdf3899e872570002a81add863c35f446197b554d5362",
-  "0x00792efe8374df8bc8e7f3c4e6550304f8d83764e5e05b89efb1db73898524c8",
-  "0x002d0d37264b4a58daa3018a20af5b286526c836c861ab710cca9d33f28fa293",
-  "0x004034708722b30c5f70c11a0d55c035e9c6a2413e72ddd1d0643cfab8371a0a",
-  "0x00b36d34f339e5b47779a6fc0762693f510350c83e360ba1ccd262a0bd90b827",
-  "0x00db7dce313b81da050ea38debe4dfb67efeb05fba570dea308d5a7b1f54a1ea",
-  "0x002cf8c153129bae9510b802c79a9d88fd987ac50628038d99baea381964b2db",
-  "0x0032011bacc09b25a377eb34650e5c39f317178cabc79756f18ee247a10b0281",
-  "0x007efe4b38888cc35fbf50a5aa4813681b6c9a6ce944896cbeee579369ed66f2",
-  "0x003481fc30e7439d0750fe2325a9ad81fef2b8e8cf8da0c35bccb4f5bcd206bb",
-  "0x00fcd60c57e450d27cccef580c3ec787ca754550d1611b286a5be9355b8cb094",
-  "0x00bfeac9ec6c1c7ea89dd2aa01a615802425f9089ac0e5f7f8f4592c90267407",
-  "0x00bb65b9f67d7868cddfed46fc981de0c2dc15657e8faf74e1e44b4c0cafe5be",
-  "0x00fb7bac68cd5fdafccd93e68f9da68107f86ff26c8c745e5f07a3cc127423bf",
-  "0x00bc2ceab5871c4bb03dc2e301e9966748bb8f7c493457187543ceeb5a2d0a8c",
-  "0x000b0d373787a8eb6bd170d847bb3e995a24288d62e732c39a8a9eda702135f1",
-  "0x007e2646f69d4ed67c84c34cb95f175517fbc3e1023d0e760f30835b92dc0586",
-  "0x00fc9677178793c9e978d3f07bafe76fe2e2d0fb925dcb28c714408a68ade8ee",
-  "0x00dfec6409758651638a69fc101ee371f4ca8fdf3a522d6f5defaf8511334c27",
-  "0x004564aa79cec74c83fdc661b33821dcc98c009b880b4d445c2d3ff5b46df70b",
-  "0x00a5763bc8c78c6a08765b653fe8bc231c46d7403833203bb1d5285fdd483dab",
-  "0x00149003d6f9e34e0bf34ddcbf4250a79c9e692b0647d4d41d7d1efdc272a368",
-  "0x0030ee97bcc8e574bdbd1554bad7744deb4399362d56f536e2329a01ab277c2b",
-  "0x004b748ff2f2057b8ac549ef8e8b94b2e567837118abe98f90ef4b97607dec63",
-  "0x0006e59a325770e3a477c9a48d31bff2f5d067d33f8fe518c880c5dedee415d2",
-  "0x0031603127700745114ed0ac2af7aead9070b5fd49f235a699efe4136073ea8c",
-  "0x007d01628b882212b7049f2e7a6a4150f974082035d0dbc9f39216f78b2399f3",
-  "0x0019a8d547cef4d6f6a1c14961ed22bcf8954fe22fe4d76c6372975745363f5f",
-  "0x006205a8ed18b24374d3e522e94bce1e57c6d0e71c292bfa7164e2de19357bd7",
-  "0x009709c14d841c26a3c4456c4a80aaf283bb8d0a205f404816527f05e23f341f",
-  "0x001f24a18c48d79dec9539dbc74dcd0ac5f1f4ff043354d7a6846ffb9ec944f9",
-  "0x002f6627304c9a89f986a0cd82a37ceecdd23b7fa3dc28371c57a4af9f81b4f0",
-  "0x000162803c7e689a11dbcb0bffcaa5d232db9780388c5e79b85a14beb173cac7",
-  "0x007707c2d7a374130fc214d798e63cfd3965cc8a6288d24f8913f303e644d8f7",
-  "0x004937e2cb060e502547272d205d722357732239901990e386dc84bc4181aa0e",
-  "0x00889e7822eb96cb1e2db62903a1930bf44f9dd5d75f99137a4685378a22da81",
-  "0x00f952a879147ddb48c894a417cdf1a96d2b1084550333cb5463197169b0d696",
-  "0x00584bfb966f1edc3e0ffcadd079b75ead094619a43782f690aceea2956ccba0",
-  "0x001786bc9410eb175bc4819c970111c1074bba9949727fae707683300a3e18af",
-  "0x0036ed6c86a91d6349325dbe64c5739ea418b9a8d87e04b7e21f3a20d002857d",
-  "0x00f521a4ece053c97923cb69c3bd7f753103f67a8b9aa9d43a1f20015b5ce15c",
-  "0x005e7de32a501a769eb9696ccac0f26e836691cb9bbbe119ac71fb86e9c09984",
-  "0x00c62669c4c2ff7ad5aee6dec0f3e4cbc0031eb2147fc5466d502bca3e7d2506",
-  "0x0095821d12d03b604038d65cc2af0513cae5a2da26e841e0febb20a54b566752",
-  "0x0050941ce4469c36970269e1f183a91057c435d471d8059274ca7784457031ee",
-  "0x00a0ad1cd1d77bc1b8a9251b8a51abb763b2a10a5e41d0f20122d6c3cffc60a3",
-  "0x002756a61ef04fb7ed32fe28284307dfcd6d7866996211fd4252863d004c3560",
-  "0x00cedf6eac0ca1e2ba2a35ba2b56eb59430c11afb5ad8386b414bd6bbb0b0507",
-  "0x0027c6fc194ef750b1fb0b48f982b84efd1fd5c24f6549bd3b8262430d3bc49d",
-  "0x0092da767cb84e1de6429c765cebfad6bfa1ec062424fbb3477acbd00835552a",
-  "0x007af557cebf451487ebfed9f9d0eb68b6deb0c8b69cc1f4db4b4b1949c6b6d6",
-  "0x008b7647117ffcf4818a423040a7840913b4ce800303c3d0f612c2eeaa86d4ed",
-  "0x009f7620563c44c48a53d5887b2cef549d1b8f887f45fe290f8e4d3b188c1bb2",
-  "0x00c48f68e12886bed0a83c185009217b3bd25140f973691320e63b08dc76ba1e",
-  "0x0028b49781300e013cf0eade301b0c540dbf694e88ec007e7001e54ed09a13a2",
-  "0x009ff9f01a8759f4b4aa7133f400614aa72f97426c78b59e0159e24b42e77f9e",
-  "0x000a60e7140ee2df9025f291ab4b02938d22f21d33bc95de6fc54a3389b14c62",
-  "0x0004f8317a2cec08f89ccb5011ccc40de1ccb5b796bcc17583f559c1449947ea",
-  "0x000a47e3834974cc44b8204f2c07890531cf6a4fad0faf87368dd65614f6e602",
-  "0x0001e754e2c1599ec8cce1e8383c03a8ac1fbc3392079863ed2d6396c5bbff4e",
-  "0x00b2194b834a1c4ab0fd3b406ecd6bb0eb744a22145b6baf65b14b2d827c7284",
-  "0x00040a4eeb57e6d993221ac61f06bc75bf8dad12cb32e0bb4544afb9eca37d58",
-  "0x0043fd9eb31bbd77e679978ccdd118d4bf15c386b3733accbaf5f40264cc2e87",
-  "0x00015ec0827d768b5010dde0c6fd0b7c1d157c9a7f52a227372b203710767b36",
-  "0x0086f90150c5f158c7e3b68c6af70e90e9ef6109b6234ada27ef5535c3466edb",
-  "0x00dd2642c18b012414ac12dff13df47c0f0438d8ddab41a8507c34eb0bb4e5b9",
-  "0x00fbe478a71bcb006cef95ce695f7a1a6e4bcdaf9d36394b88eb8a9ada078aa8",
-  "0x00823aff5c97f5bfb541be65d84029fc3f22312fa302378db0fac5265acac86a",
-  "0x005f8b032c17eb176302bc6219e620d51b310a26e0c488c4b89a9990e2c67269",
-  "0x009d7aee6abc82be9045dc7fc8e172643e993cedc72253043ff66a7ac00b54ec",
-  "0x004b57192b8835027b0c0ad35d8079780b3da129dc8f0ac05ed5e51561483ab0",
-  "0x007048ba6df6a095e48004edbaf7236ab8a0370e6d81331a3e8c660a0f435ed1",
-  "0x00f0fec200fd753ee1e291d1cf7beb1ec6d04d4fa04cb833b4d845307af05a9e",
-  "0x00230917561d212264fc238d21a1308b9e6cda9f83dff6346aea1ccfa32c61f8",
-  "0x003b6a538f6e33e779eb9315714e16743f4662b4d2087025e7b77c1aa853a1ab",
-  "0x0037f4168d94cabdcf61c8cdae20320bb06bbba2cf63fbe900ea84ca3dd28ca3",
-  "0x00331eea869b3dae2130cb2841c09e255757eef52b074e08d688c340961d4091",
-  "0x00ce670d0775fd8c4ae45e85471f74fa0855c3fc11d11d263082d92ca618dbe8",
-  "0x00f45cfdd50e32c4ea545fd2dcc17d448ffe796473879c9de949762f284cfb50",
-  "0x004fe321bb759ef7e0bb00c88fc4a048da5c8fff01db0325a64c3d832cdff048",
-  "0x0035a0c85551cef4913274755ada3a890115a8e43cc73ca8a3778f48ea629135",
-  "0x00d52685d9550eaf2a36c836ba5f04d82d870ba0a6e756f0b27f3fd0f8faba61",
-  "0x0085830a5a4bcef8cdd041a80aa2a96fa596dcf664295e83260ea6df0329d2e1",
-  "0x009694c5fe1243f864d4f34871c46f4cd2cc5213b3f189eef4cc550132d897f9",
-  "0x00c0388d24ec43683ce02d92bfd95e3cced187dc712aca16083a895f4de298fa",
-  "0x00953d6502b8f40ec97ca16687347adca69fb9ced103ce44d3dba9f0cffceb3c",
-  "0x008502db19db9d0aa8dbf2295fc7b4d485b11cc1380bbc6757d5875967ee72ec",
-  "0x00a0bf18d9369567c5787ec2c9a9adcd198ef8f41fd4661de6b604785fe80b23",
-  "0x009ae6072a71363eee9654108f6100402317e7898104cd97f8b1506abc9b904a",
-  "0x00739204454170691e401298a607d42c5284b17be3877e881eedfd17d5b17ec8",
-  "0x0042ce439d209696cbff278c51fcca109515085c6b3b3f33ec67dac7213b933f",
-  "0x006cc92b2c7d1d102a0dee6e7cd61327a76a390c5848e07690b0e5295ea642bc",
-  "0x00ceb76009b02e9570c50036058e6511deddc1b5b9179df97ca2d5ee783ec0f6",
-  "0x006794dbc9bd9a45cea01799a77e29c8560706514199ceaf5b9b3eac25b6c224",
-  "0x0066aaaab6fb13b3f66bfaba23a635dc7b295950e0e2f7e7cc961fe0ed3612fc",
-  "0x009f2dc86ac459a572903519071e63d1cf545980e6572ed9e3a265f7a055867f",
-  "0x00f7ff9a698e22bda12b3fe41251a1c12b21359210839e703860e219254d960c",
-  "0x00d40aad8f975b516ca7368ac66232cdbbefd8459668a37f283ea60772d54cd7",
-  "0x00bbf298ff1c8af2d09edee4414c6b3d26723da62e3747bc4abd88b6b84a688a",
-  "0x00bd1963d985d4c9569f93ef4aa1232ce641fa69fe9d9a4b5783f26e3dde8337",
-  "0x004e499eff477b16dd403e9ea90a52eba517881b2640f5457404ceae3a2059ca",
-  "0x00e38813a9ea71b22d5252e1ac924faa78f0ea7cb0ed84405e9e5a13c869dcbe",
-  "0x00af5dd7f621ba55155a0a31333a96c84e5bbf442c8c90aaf238be89dddc0725",
-  "0x0036601608d840a27e5c70a4db45ddbbf1ad86ab7254686b9cb7d771d11dce59",
-  "0x00b7fe8d1fda12ff678bcd357c37ea31b0030b0987fd947fdfd7b0c073af55cd",
-  "0x004a1a23bb879525199481e7eeb2c99a5e311dca92d6e71ecade2abeee16c0f0",
-  "0x00c625dfaeeab3c139201a7d190a137f9c209d2eb74557c6970578dc2ddf618b",
-  "0x00e015801070ded210785f7a68a3a15c8c6020f179ca377de391930088a5e528",
-  "0x005e1df1bf7a577780a086a354237186bfa75defbca21615efa1f16bbd152778",
-  "0x00c7701a4d08cba4bd8911d15a1aa5a68213aae16f1cb46660a5574fea0c4a49",
-  "0x001cb82f9e6fd184911a0f0c47acd8682910e6a67d2f057ba368a3d5867977e4",
-  "0x00695af97b3226617d553a2755726ed1c13b2a5f64492929501039e9dd00c857",
-  "0x0079b7d6abc7dfedef7c72f3710d5364ce094f448f094ea57540c71e2df1b558",
-  "0x00aeddf17bfd3a99812289d8091f141e160b49dfd19ac82b8c3942130a64229b",
-  "0x0039c7efca56a5d94ef37f728e391487a9525bc9b304ef7ffd1d956ae13710b0",
-  "0x00f61e1338cd01fb67e8c6ec9a5f23a5ac82a596188c2be979b5fa6954b124b8",
-  "0x002c5bc313f313ef95ebc7c90b943396cc9e372230ff5390d4c24f4612be23f4",
-  "0x008a67a9ab35dbb1dec0fd6bc91a7f270478b61bf1ff9030a791cc288c65a41d",
-  "0x0094697fcccd6245a93577ed36d20b2f6d95265e165f4c00126b6f794c411fb0",
-  "0x00b2aec13530cbe80ae556674cc029126e6fdc775509fa560819c65221f4352f",
-  "0x0059ef3d0a5f9ebe13c69a2029b3ff35d625416ca4bc119648c9c4b208603876",
-  "0x00c6e1ea37afe1bc3a69ecb1a39475eba50207904b14f4412d0db70ecb11fa49",
-  "0x008d1a8500380d999d4dd2f732c5289db2a1a837200896a3e9338eaf03f2409b",
-  "0x0008c16c1390e58bbca2fdc416571008ccfd8663be1ae9538bee5bdca21c041a",
-  "0x00b781cc85ad49afb84e5788854b78d487285806b9389cbbfa430fd521b06b41",
-  "0x001b254df17e98c57ad7d6c61855854f7039153f52cde6245c6ad17f8fd9366f",
-  "0x0012144a47507f6538265e525a2f594ab310c644c21d4969dc1a518b3c154360",
-  "0x007b7e48db999a148380ab306ed72a41213ed3c00cc2378b19da17bd0cb23ab9",
-  "0x00d48d8d19230aace3ce172268a6667117e55404607b96047b0302fdba927efe",
-  "0x00d622ef6f4a1685235e35eb1d53bd952b86a66ee8dd16c0d23ac4b37e66e344",
-  "0x005c27ea1ec70e9a26be4cea816901c28578efc8ec4b3b73044b3869d1419d0e",
-  "0x007d5ef9829eb964e8ea19b504ae24f2e1fcfffb9094d4c582ea218cfa934994",
-  "0x00f12219ac1b76006b533fce407fb6dab83ffcf723516b620bc849e86bdf7128",
-  "0x0044805b14ecd96f085d33f0875dc38a4e9a96a0d243b5cf254aa42824507cbb",
-  "0x003a4e06ddfed6376c47270e87102e14653d6aa171113ca05f14af7925d4e15f",
-  "0x0005baf485fd6b19f8e4d6f3301aeb6ee4be6c27f699da7957b796e67d25b23d",
-  "0x00b86305004bc3391ea6877cb1eed9902d3bdd17459f86953139eeac87abfef0",
-  "0x00c8b6c5a2ffb0c1f4651794a44844f88c078a02154efa3fd146d25914f1e623",
-  "0x00c210d006d866761187353e23fca8373e0d29c638be5e4313db2d41862aa52a",
-  "0x00ef5de7bf3d0a41e0bafa281b95ca1c85f654eb65a8b68d442bf83cc83879c3",
-  "0x0000ada25d1c8ea2a2191623cb925b6e3e6ad8681e2b3b7611cd1af09060454c",
-  "0x005f29389589052f3d0ab10b8f6f0d39802e2f1d305d69c0def3efb858ae79f4",
-  "0x004275abab1b65a48fcca22795670e7b634839dc0de22d857155011e3a7f63c1",
-  "0x005540d8f436efc25f34d4f128cc159c86741f938ef8886440678c60a6226962",
-  "0x005982d4958e294d1dc7908bb2c8d87ccbad17091ba61d02ba3b0d152350246a",
-  "0x009324d765d52db8d10fb8f4d06a91f6e3205af6d73f2bc8eff5feb0ba56ae01",
-  "0x008bc4f23b6931ed68f95ce645aa00b660bc82143547e4360361bacc98057ac4",
-  "0x00042dbfa9540375d17c5571157bfa15327bdf2a7a65e0a23936b05dcbaee427",
-  "0x00e9c5d900207a7b117221df6519a9bd752de6c4c3ea6a277b00dcc7bb37cd7c",
-  "0x00b32311aa94edd75ad635de9d0c59ab6617220d62db477589a80f1a834f876f",
-  "0x005f655e6f61a7fb1dfd1231fe3c3e5b5299bd94daa22fe3e70d2abe6cfdc6ee",
-  "0x000f304a6ab43d0092e4a1f8bfff0a5def93bdedc69d798f09f3cf2c10718eb3",
-  "0x008d0b1b3574ef25a0993d03009c2e196fc31100f0b815166a8bd39bedf85a8e",
-  "0x0038bb9d62ed4c07097374a3ef1fc798e585a3b16087eacb6719d8f311b416e5",
-  "0x000d1065c2559f1b94f428db98609ec01f05e8fc36af2f9edf2e7bfc3d3113de",
-  "0x00682b6321b1d8b6acbcd3b051e79cb331b47ae176408f0b1e591fe36be02b88",
-  "0x002172797c335cf2c31d2c5af7c115036c03eae338ece977c121fd1b7d75287f",
-  "0x004a95d411451ecaa0eef7061e64ec7b3593d3947bcc2024a47ac6d7a0ddf7b5",
-  "0x006e04ea024df7adcd757f443879152a9ac0f0d8cffd3d6b5433d28f18704a92",
-  "0x0015ea9669c7b7fc2316394002880593ac172a046cfc6f1ab370efcf50af2a8f",
-  "0x00539fdd5153a542331f334ac7661d2c97e23bac4b1a82fd935d6d21c325bfdd",
-  "0x00bab347acc83c188be0d828a02b2e963ee87313b7d23b0407da452da278be0c",
-  "0x0006a67bdfcf81c1513af5ca258a3b782625ee84824927e79468ea06c21347d7",
-  "0x007bd4dab150bc1e5095b159b0dbc09768a89da838c1fdb611478e64687edcdc",
-  "0x00caea29dc8724edea931a25f8807e7127df59b36a6d5adfac3e3fc062a3d56a",
-  "0x00f333403dd02de6a67b3c1ddbc21b3a753a7f1fc24b0bb39e39d571f617978a",
-  "0x00a3c1e4db6e6234fd96bc99a44bc87c0d67ca60e8c82400573beacefcf4e290",
-  "0x0010c7d44b3eb0979972fdb145ad56234a684326119417dc4f581d5bde415cb2",
-  "0x00d23beadda45659bd7f2e1d87f2f992868f99ce13025e08daae29a40b5e2b8a",
-  "0x0008cca3e8af5d622deee37276edeb736fe6c3ed6291fc9ae654bf6167adb152",
-  "0x0072262995b63929b5d2e53cee481c3fef560aedfc29517c7c02dfa000603209",
-  "0x0055d8f21522365fa2cf6648f9971dc6fc8e7f07db58a0c781852e6d22988d82",
-  "0x00f7d0f7f8673dee18d3ccde5af0f7cd00257d24e0e34b7a692d58e192eeeb40",
-  "0x005ae5b1453206e768afcb43065a77e7f894c32aa34a06f843afaee5735c2d1f",
-  "0x0090809b8c310bdd3825b882619599f05f9238e48a41ffcea84da20500b4acd6",
-  "0x009167828b0161b4613dbc085caae75fb48296dd5d7da5b581a48cb3a622b69a",
-  "0x00d21024376a7ebc8f4e8cdfe3c6893c7d412927f0cb03088001bb133835f058",
-  "0x00526f45d787873dca6065e3844dbb55bc171f140840ce97b84955543d349e79",
-  "0x00800463f0ed1898f0738271a5456eafef22428c6dec7fa5054676a258d69af5",
-  "0x0052fc92eee4894895a12cb821b737d2db30c8270115c317360e5fd783451e7a",
-  "0x00476b7ca62c510768e1673dee99fdabf81a7cc32bcf7aff2002a8372720f191",
-  "0x00591567f0aa225bba264cf9bfe35d2a7b7c70967b257f48b100e098ff47ebb4",
-  "0x003c8a07a80156780353048913b1917a7a313ac5cd6d5deeddfff8e46896bdae",
-  "0x008c283afe03b9663e21749243df58717ef989a1fbcc04072a166970fd8aacf7",
-  "0x00f73337ed4978acc02e0c831d8b3fa81b2f45c0a6c9c7807a6a29c2961cfb33",
-  "0x0002c9a1f6d194131ff33cd7842adde791cfb1b5835a240ad2e7a786e9705f11",
-  "0x0043156c992f8c6683eb5ac87cf31e17c049222469a505c1a728ae584e415d25",
-  "0x00cd467e2d327bcddb11403f7e8a27df40fbf72ec9fd0d563d292d943b699750",
-  "0x0053bc1ebe2e1b95a341dcf9c75e0571f717630b58c18e6a3077ec26abc8384a",
-  "0x001d6fed576eb8302b5d4a058e1ac4df9ac5fb331152126b044b076319a3e7bf",
-  "0x006cd8a65eee57aab9d3e996a0addab91d2011673296875f0e565859128dab86",
-  "0x00ad6e123031755d93ff8e11ce7f022dd7bde686e7d37a567270959f811db6f8",
-  "0x00e63759f9c4cb66381de57eaf52867e4249cdb919b530b2755d79bedaff5f75",
-  "0x0029aa31bb042bd9ec51e5ba01846e8f70b97391942fb73817c2131e09d6d19a",
-  "0x0038c209a70faba0ea95ebc88eb21f58173acb5aa84046de2ee89402995e692f",
-  "0x0076eef7ff58bb7310474390519707dd39f09b562d30ec9591f3d6e954e9a381",
-  "0x00b293c600a4be1cb59514b32902c69d73ef0e6a8e5a07793d6f5ba50af468d2",
-  "0x00dcc0cc24154fa6a5d9c55bb1befcd1d0cf30538bb05f8d703cb936a0f07982",
-  "0x005aac447ce4c0e399e8159de7b9233cdb2a8c70c86ee126b5e64e2e27291031",
-  "0x006c5757d0d24a104a67159b4caf3c44d8a1e2983f8964511d16509f773a235b",
-  "0x0010916c9cc8d5c7c7d745630519d1b4a9d9a4a4e50042f808a4b577a8adcef5",
-  "0x00be303698d477600de5e137aa0ff5603dca15f920d1c658021339f516315c87",
-  "0x000cf9f9f5d4e33d87b8f97e395ec863519b1894ebd411774283d83163105677",
-  "0x00bc1692fe3477fd3a190d21ac27e9b57a50350ce326b18f61084dafc56e3043",
-  "0x0019eaa2e918abd4f0fe5df27da93a267a286e4c3adeac3fd36c98636e72a10f",
-  "0x00434ca6920c19423b15fe2a684bf2b28f3cfb76470f75303a2acaf2140a5381",
-  "0x0007141672ffe0396ec154d8bf9bf8301ab765f4fca24c16be241e9b62000099",
-  "0x00ac8d211e3ac6e15535c22bcc007661c5758b59e78511e1e5c4f4452b542f2d",
-  "0x008c95768136d3d4f0043bdbefd9ff408caf4ce32745a4f687131f09461a616c",
-  "0x003f71aa853d211e2ed7ea8551b0efa799edcf95e6de5f3ddcbe8f3d8544b4ff",
-  "0x0048bb3e94b6ba58f93019183806ad0cd73e86aac8bee677ccbccebda9b49ae3",
-  "0x00bfc346bd232294050cbb54f7db73dbf032a503b805166a39dcad382c87268d",
-  "0x00273ccead35fef5c450be11f13e5654f9882bc5728af4361b4afc8c67a0ea90",
-  "0x0070d42818bd6787ca1596432018723a27b5d201f1dc84e308d533dac03819cc",
-  "0x00a47801114d5e91703a88a2735949af662f9baf5a6cae6f8e420a2062f35dae",
-  "0x00b588a6d0d45e4850b6ee153977a67676c7599cff38172ef34179e4db1edf5c",
-  "0x00f6fe4dddf91a760a6fe62dfe88043211890cab5d5c82ce1752b169688082cc",
-  "0x00f108b5692368b5bf461dad4853612bf103bbb5c3224a04cb500b8d1067c1e2",
-  "0x00f555f7f9405e84a6298aac92b25a2ac8400df89da50f0622004f77f573c58f",
-  "0x0008b484d28d73aecc5b33f8430f2f2ce2f7a142c7d550f827abb95cd35624b0",
-  "0x003bc8be9c8c1c70351d5f9f9e346e93ff0c1805acf75cd42d099049f8654e15",
-  "0x0048259dd34958001c6b4d2a2ec5c9b423c85eee930e9d2343b92fabace8fcda",
-  "0x00d1da552e9367611d3a604d6ba56e1251d47208f4ecf1e4e19b6ecd82aa1a55",
-  "0x00a979e02ff6969165727a84a4ef5d9a4dce12de62a8d2ba16f20639c849f30b",
-  "0x00701a69f14f23e1fa76a800a192bcc1d02261c703ede8249fe3bc8f2d3c9e31",
-  "0x0077ffb4d734225ecd3c1c77a27e0e02a78f34a452a700271fda2141d804ed72",
-  "0x0094475de5ad9512fd54bc2d89f0974eadfde867c232261b81d1a95f3a1460d9",
-  "0x00060fe9730da79e3691807504c1f876cdc8074dbe5620153b60dd8cac1e6993",
-  "0x003d3f7bcf39153d476a9f87d1df66c38ef81d3bc50d7690800658ccfb901b13",
-  "0x00e08db3d635b81c8ea963680337b1874bf5f086676f5fbe547731cd136d86dd",
-  "0x0007513cc1ffbb02d63591868a153ac6fed12665b8609115164bc4a26fe1b257",
-  "0x00e4f4e88ce2a8772150fada53da0a1c51c859f3ffb6b72e77ff94a516f0646e",
-  "0x00e65d1f932c2fe3d3a7cd3131bd40ea6c06cffaa088a3d81ec09606b5fd50b2",
-  "0x0007e8460ef64bf7e9b3b31b7efce316de3d6196d94f5ad126280546311b951a",
-  "0x00b4bc8da138cef6435e5febb635b6532a5ae055a24be481f0bd5c81b4410cc8",
-  "0x004a57463a69d094262f298a9cf328d5cdb0075bb6e328605a87349a76671175",
-  "0x007a5afe866e1f15997f250ca9fc1bc8e560f028bea44964d17317d423a7c6af",
-  "0x0089851e05dcea680c46749e35ae85e8c004745e8f8e91ba58f4fe16671b7bbc",
-  "0x00c723a96cc68fb498b93e5f1932012896fef88f694537237afff795468c7321",
-  "0x0031362c4ead06a3a8fc445a2f427ad5098dbf64dd95d82bc49b88b88466c5b3",
-  "0x00695050a567173c1380f1dcd7a78de97f52e5067730b207b41949d9483c54a3",
-  "0x000adc19b3f14485e58d83c17f335fcc32082b4ed4c40160f1bfd5fc16acb1fc",
-  "0x0061f0b1b8c32cc9c0340852ed6383accd2f2fed1d1d3bbc101c222c1e279fe7",
-  "0x00ea504862ee17cbc5e80ecf656769604b877c8b73b9d3bff9e34c0ba8a806e2",
-  "0x0085f06e9f5f5ddbdd5afd6f695bf584c7dd6fd95aba11f4aeb9ca64782ff4a8",
-  "0x00c3b6f84c079953d1c7ea7a709f7c8cf6c35768571bcf98bab1a3edf0f7a29a",
-  "0x00ae6ee29a863acc4bdebb74c078e4321df8db0704ba61ffeb0d31bac38096a3",
-  "0x006f8559f69f34f5b3531b9e9c5ac95f642e8adbb288ee56d370f10d14fb8481",
-  "0x0056023346a55b699f1b86fa4300fab3db76d1c9b112274e99922f402d3bea98",
-  "0x00930274aaff899a6b464a9c70a7e93edfb11f788978fb0f7de8d041802fe104",
-  "0x005cf1b17523e7020deb89e23495324a711668236134a41e83f4be23a58420d5",
-  "0x003405f5921d657f5230e648a5907e542d4dc711c6ca5f0905a88bf761f7618c",
-  "0x00629f259ff31204ea970ecd9a9e2aea2aa70e6efab13892b9f7d75fbc45933a",
-  "0x0049f0ccfa6d6958ce701bd02afe19075f10ef1fe2b290fc8d070216074d3b79",
-  "0x00252b9019e72d580082e49bbf2e1ea855c91187a4b079808dfa6d44356bc752",
-  "0x0077acb123a40304fbeac7c8c4de7c325f4b8fbbcbcae406aa434b73ac5ef188",
-  "0x00d10220cdd2ccf3a36cb2da72b30b8eeb09e3cb30722ed5da8d2a8ee6890c7c",
-  "0x00d7d98b7e56e6d3de902622917eae72796663f4f0498efd47efc8bbd4196225",
-  "0x00e102fb30da882b469096053642c966b0ea85873aecffc5cf63d5cf9473c5a7",
-  "0x00d0ddf71096d41718e25e86245f285e68fa02f9f40e0d2196a2c040e58311ef",
-  "0x00d02503e1366a50b451b4b7641002f8d10033e9d2d2d08f352c4143fa9b7f5a",
-  "0x0017a85f5eebba6ce9ee7a544defa923dba3c046a68edae467ce6e432d35c2e7",
-  "0x008d599b9950240ddb2029c278bb38dac29bfae0414f2131a0aadf74181afa79",
-  "0x009c25661f70a303725068c78fe9b621f18b053a86abb157171ff559462b9aef",
-  "0x008bdb5ae8536a3df1934de47c711f2ad6383992bdf8a0a1c94e7ec864963b11",
-  "0x003bf2a958b6cf5f4e5a3a2c4d7aa5e18ee5bd9a367dfbdf1032a258331d21de",
-  "0x00e0ed561b0b90b33b1074d59ea0329d567f91632a03dddd36289428b1778a67",
-  "0x00558f7fc4e8c5e7a6a3ab83c6973f67f98bdb2e8c18022f5dbdddefad449fc0",
-  "0x00aed5779ff57dce4ac9519e004b36ffeb380dbbe713d500d5cf4f8b9c591ee6",
-  "0x00c27ad9978860725cb3e6c20df0c794abebed46564dccc728c9d3a56fb6b08a",
-  "0x00fca2fe40750d0e853e7d1bd14b0869ec919017534f1cea44d0cf4f15dd449c",
-  "0x00723b15d0fc12fc36ddaf27403c1b50549b0e2c97f27ca2fab2308784302137",
-  "0x000dbddb5aeea7439c0fd47d3408f3a3899c0e0a570603b5aad541673febbba2",
-  "0x009815c65c5c864eea6f6de403cb1fa8dcef2cc047d91e3009379060d8b1369f",
-  "0x008a8bcf61549efd1ef7805fc8012c5c822c5876dc781c4095374b4d9fd751aa",
-  "0x0068c9caba0ffa1fd64eb6879c150b601328781e82acad141690977020c88e40",
-  "0x00c3920517fc6a0d7e0d638ffd33d2e48064bfd79197fe7c2833352a8eb46931",
-  "0x00e7dd1ab8e29d9288bc8479f8ece1507ee442e7df9e9955f4522a758e849b78",
-  "0x007638b2bdfaeab743f331ede0429bd929c698758b1300a06d971c9c19aa4d62",
-  "0x00176c5563093f51a9ae6a15da609cb52848626411b54266eefc0fe8c574c3c9",
-  "0x009f298c843709672327afdfa7f015b777e0f20ed283ae081f5a90f29db94cf2",
-  "0x00354ecb7920fa9d962685e23fc5369a85d6e8bca02a60a9766937c448196231",
-  "0x00abc694f5377fdc1011fdb814d873d337aa0380cb34b4e5a1d72da8821c339a",
-  "0x007d38fb3d9b389b2d7c1225ca128cc5993dbf1beb80edb5c1b989e05ccd331d",
-  "0x006d7ad2e56ae72e81b22cb624efefb21d54f6580835e04b24dbd23410d78225",
-  "0x000b645fde0419a0e413027eeebd16615788d5a10638053c2a0dfae982177a26",
-  "0x005de8f6ea6ff4191525cce2655a87e784f3468f38a4162f0519c5aa48352cd0",
-  "0x00b07f6a49f967608f6dd20da7a3917caac0315ede32f90ac801030bb8a62378",
-  "0x0090e3e0edfa5ea512ed85ae9925720e14cf67516907df98b5dabb48b5763909",
-  "0x008b5dae965d8ddb0f99b4d0d26bb16ed3313861d9ff7571dbcca87bc8306d5a",
-  "0x00b24e3dccf7772db9d9998d556e963680d2e0052e2315b9c33c73c40832260c",
-  "0x0029cde64450eb552548c45a08459b57fbe8b3201ceb5224d937adb1e143dbf7",
-  "0x00ea53c82188c67fb179854ec74e63a6871a3758763ac5deb1a756b249852aca",
-  "0x004b7a2892351b904025fa44d8d8d9fe1b522f55de4970bfc55124cf9906c434",
-  "0x001a1822954e6f856c8ec9e07d4b6fee0b5f2dc0e1454653dc5e70a029a5cda1",
-  "0x008be52c54ac82912d4d2e06d050796d61318a2c794d8abd4f5f8f295daf6175",
-  "0x0082e7cef5b803e880b3a5d71308052dd8f625155ee580ef4c4c219deabc2f06",
-  "0x00ccc540870cc6190ec155ff2885ff09a798874c251189b20556ec2f737b7542",
-  "0x009dd942547ced6de386ea4537f734e7a5e4b23cb2999e171d194089cde71482",
-  "0x00715dd950ce3bb6c0d4f7162b28e83323c2b9d02f670a2025cb9d67d4dfc80b",
-  "0x003dc97136d3eabf067d54e90f8985ba37dadb4f9faad3afc67e4d531a408ac2",
-  "0x001e157389dd575c56c841fa62c42003b2d60654842fea3b235f100d74b1e95f",
-  "0x006d775db940b16598ab8449377e3ead1eeb2e1bb6d29a06c8c120c7b170a3ed",
-  "0x0027a2658e99dc6fa01847c238b07a60aab6371e1bf9ebe3e318489ceab90a09",
-  "0x007c5b9cbd03600a3e2f10c07c9efb0a41db886e84203e85faa519b5831827ca",
-  "0x009cff52eff74b2bad04b68fdec74f27ad0107ae635c87817360fc362eb5d465",
-  "0x009d9b9c2ffaf8dbc19701ba59cc00cd77b84a9fef9084dd7705d734f5186457",
-  "0x000d42a4ce036803afe97f59ebdcdef2f3bb5b1f69ab071eaeffc17bb5402279",
-  "0x00de4038c7261a213effa4a94e35f13fa45ef03812d0499545f5ab9c0a670618",
-  "0x00c755f34e9460b6d144bb1ad2fb3d2dc776b1ae8d2ce73d7a52e85fcb32d986",
-  "0x005f9c23ce48a2dd1eb60916f1783ae42239dd503208a61c57b5e9228990f75a",
-  "0x00e0519a9dc66758fb5e2d35729531f41775f18dbcca77cde34a49284968e617",
-  "0x00a5b187c3edc79a5deee3b28167cd7be18e4f3ab281daf8e8a2ccceadfaba38",
-  "0x00bd96f76e456a8b6d756aca0ba543f491c96d030df0e5fe19ab4dc7463a47e6",
-  "0x008705e5bb19c8bf2784c7775bdd5d4f858bea427830fade2164343203d56b32",
-  "0x00462f4dd7db131def43a70d2c757433aa02cc62b6e8698a296965f87893d2d3",
-  "0x008ac888782d2a135a7ac264e8dcbf2bf61f0130aa83eb8d02025ab581ecc892",
-  "0x0096ea9455d4a49d27dd5458548d0eb3e75649f74503b07492e6414f951a3161",
-  "0x0090d2db3d7723c6a94b493b1bee8c0ed8dfb9e1ee3b3c6d8cdd8dec39591f55",
-  "0x0031e14fffb09c14013c2337d368f431c74dd7d81a6d5352e68c685a5ff34338",
-  "0x009760ad8235ad0c754e508a30b2b40161abea297d4ca5bef70e02a3b96e5789",
-  "0x000c5122488d63d3551454fc87cc11b2c0c450f4882603447990c15400d43749",
-  "0x00da9d44e2655d7142e183fb1c7520f0954802a20250f13fc43e1e04f41cb3e4",
-  "0x000b5da32d2f15ed25d0a23079258b696bb4ae7b2dc15266d36fbea97e8702a0",
-  "0x00cf985e5795081e7ba03e04bd1107663ebcdb0be6ae4661040c97a80a8f1fab",
-  "0x00797940b47ebd8d7b6ecca21be4e5ab05dc288940bf3190b744b2643a70d51a",
-  "0x0001102597fb52c68455669f68ba4afc22938f1a30faab332d8cf96047260e49",
-  "0x00ba6e45f7a551f6a6e9d80734522eb43bd50a0791ee55706c93c1c53ba43a95",
-  "0x00fad74800a30ba68555260a4ffc56a7ff56ff220fec09ba5b39e98e725db7d7",
-  "0x00d7e7a85762adfcc4b7503f86bdbc159f2ec41b2df830fa3ec2c8fcf5f38e58",
-  "0x00c6e239e6f18892ad573f700bbf9d3f0987f46349b655a8d3bdebdf5baa9f8c",
-  "0x0087bb93c2e6651a9fa9e5945199087dae5eda38333124c76ed3657ca37df9b2",
-  "0x0056e8930f2f5368e3e6eb8a4104ab91d0644215ef78c4ea6fe65c3b50ed542f",
-  "0x00953de056e12d3a1840176ee5d98a307d72dd4a487cbdeb729d7ce9d5201e95",
-  "0x0093e2a50fb55311d2fbbe1df22bf5e67559d0d73c3e6c00d55af6c05b67ace7",
-  "0x0043d6cc22a57d2998fd5ab4696fc8a2fd7b9eea4e9c7a5d7dba46555f282450",
-  "0x005079ee2c95a383cd82c28b30458d1e8f9b0a4e14b389f92650f00b6cb86f37",
-  "0x001e974ea040fc40eef8af9832eaa64832ae75ac98a7d6ff1e7d7203be1777f2",
-  "0x001a948a8091157d54014263bae548200da57759ffb90fdf131a9829bca4feb8",
-  "0x006ed05d553bbcf031609f82a0e1db8e69e50f45a569f34b900f7da802a7ce85",
-  "0x00c01cedccce71583be6733ee83cd01416b7702ec36b057b433fc96db60affb4",
-  "0x00bfe90e7bc7fcc414051d5f5e6a32a5e2d5ef487164622449a45aaa45e95374",
-  "0x00f0fb4dd125dc5529da275078c743ae5ce681dfecced2f1ccb72b606b3ffcc8",
-  "0x00375e258f4c4fd3e07d2f62be153b725ef3ed3a82933429d0868238686eef94",
-  "0x00bd2b1228b2d83fc59fc2be5f1670764b3c4c8109a5c666ba7f003577e476fd",
-  "0x0000ea02c126c56bd510ea83f0a0c7da5d03a66d4044b4a17432d5511d28923d",
-  "0x00b4de7199f7ea5ff394890ed16139ce833ef918690293a2eb1fa98b9efc36b7",
-  "0x00b7f22f23d667223c6b07423fc28272752be85f64683b7f911e5b3194cac9c7",
-  "0x009962d28d9525561ecc31f304fcfe8ecced8cdad4ebd996e7c1558dd4ff18e4",
-  "0x007d26215fffcc186815e8011639e7473c04fa0c1427ee5125418455e0088e5f",
-  "0x004397aa903e215faa5b6f9fca3d6345bef59cfcdc93b8c83e0c5992d7590b24",
-  "0x00df6b90eecb891c42ee7e75b90275606068069203190082b57e79ebc16703ea",
-  "0x00420f5cc4c9edc951332b62112caf77a0095384458f481b061794bfa82f6f76",
-  "0x00540bc238f1d85b32888482da9252377a16bb1b500d4aa800ff1a9058e0205d",
-  "0x00d28ead3fe7593bf8dac381dd4e656158982d790724baf32f26026729eb38f5",
-  "0x005ae6362c6ecd4420dce5ecd52a81cf48496e22f981634012a28746091ab0ff",
-  "0x006baf2129aba7c933dcccc0a8558c3503b4ab9b98c82b5b24a26f1098e953a5",
-  "0x005f63695d7ba6bfc255434749bac8bfd05febad154125bf79580f95b21ee22a",
-  "0x0022cc462c048a26b845ba2be8eda8d8e06f7aa7d17046b65d96718abca7bc26",
-  "0x00ef81de323e304912f907cb911c8d5e994fb243b871587f8b9a515c0cfd13dd",
-  "0x00bb84510f829e675f1e8077d056a6d40a581ae9e21cf9b84d90851f24b068c3",
-  "0x00cd4bf6d0292eb0949b581847363a02910a7c11ff90baac8042d2ef6bebfa1f",
-  "0x005682725eb75cfa3db57438afed9fba4146b3d453e3669a232ee0837f67dfed",
-  "0x0069b975c9c5f00c81013de4c1dee3484a2e3517a8c24efdff3a3cffba7d793b",
-  "0x009c3501ea8a065f7569f37f4e06d0fa236308cdf89ccb953dee84f7de2556bc",
-  "0x00e1d9ff16a66bb03083d8fe2f7ebaf95e338248c8181721e1c7726951c7cdcb",
-  "0x00a04e580b8ba29aa813f2d5343618351096ea45446f569583fc4e7d8c3fd74b",
-  "0x00230802e9c70ab6bdaf075dcab7dac6ef9712e4f17d2f8c92bafba7f8631cd8",
-  "0x0074e6cbab600af744611aaece731196e591c8afe409a80f0bafbdb680c22988",
-  "0x0077eb6bf2c0246a866dce7ddbc1a6952edaa0f17f985dd91574ea3a9ee22a50",
-  "0x0051f4eac6ee9e9f6bbd0eda04ebcef2d1a9eed33f7dcdc4e9b7a32de6aa1145",
-  "0x003088fc46f2bb7534b63e6d2a34a31a11b724a4f95f90d8030b7f9651cdd308",
-  "0x00d9c8b9f95a0106e73c47cf79d8deae0d0cdd4d7f860325f043fd1fd41bdfe5",
-  "0x0030be681c97108b61a2b2060269e3787e9927e9c98cc2be836efb4534181cbe",
-  "0x006331c8b7e6edd57c3a03091508786a2390fa64921c303ee55453869e5a62c1",
-  "0x00b07d5dea6bb2595891b0fe70ebe6222e3922f18e4b489c07a92e8697895a34",
-  "0x00f8429244b2e7482de2f3476276a350a2994f23b02009b7c47d013d819ed0a7",
-  "0x00049b8632433adf37d6f3f26b54abd69c21b40e442dae6aaa0a4715ec6f52bf",
-  "0x008a410b1794f23516d1dd6d3375c6c5a334b266a90dc7a1c46e0e047cc3a116",
-  "0x00011337fabb835f5734dc9ef9cc76efd8af92eaddb83627e971a4d74c28320b",
-  "0x00223313d54e5279e86e48c8e457822a71fadbc9353221f1ccd5fb630e2d82a7",
-  "0x000cfa4568c8e62023da5228310dad9f0bcba2906132fb5d5a2f96724edca047",
-  "0x00ad247c7facfd6e836b92f961957c834e4537b7ed0222388d78344db74effde",
-  "0x004c7e5aefd70de640d2854c4557cd3c36bec638e35ede7759248a682c5560b5",
-  "0x00cf17d296421b5a668991bcdadc99a89c136b46579c183d8e5803909f974dfa",
-  "0x0034e2ec1f4c616ec3e1855818d8c5607aa04251f6e810ff08a891f7d7ace180",
-  "0x00f120e55e6dbea7983abfd5ee2b04d881aab573e82436bc269d2e4dcafc7b1d",
-  "0x00c921ba065d6b7e0f9babdc2afede014f98111d5898f8d87c1f20e44017158a",
-  "0x001aeff5417a2e086ac887dca9a1c2f26e707e4a18a87a22253430e22d245c34",
-  "0x00b11823b915173e9c568ebd053847dd6bce7452697d2290fa154ff414247f84",
-  "0x00bda533ca7ef2f5618e6fc94042ff0fe5ef31542e5cd1419926c1028e30d998",
-  "0x00a4ffad8ba9ac1ce3c88fa3c118125829c98897b97fd0ff5d9febe575efcec6",
-  "0x003c8991b02aa5ba7089e7a0cdc94a417c4bd0af76c98ef0f18c3e19cb16c579",
-  "0x00eafeafa53addceec0bcbed3584aaad3600babc31987fcce499718af3f5e3b4",
-  "0x008727defef40e14324e0ff9037fd94492a020932b5ac25f10518bdfb492047b",
-  "0x00773ed6cb8a093eb0ea1dcf0ccd944b67a53fc06e0d30aebb814e475d960bbc",
-  "0x00a80b82d5e1ce5abd14bf476fd559ca67f765c16cc2bfdc1830d87af8ef72a6",
-  "0x00a97474c57a3fd4e03e4392248a44b6a55ded2c34e3a219c9c020a6f95b6afd",
-  "0x000cd5c28755260ea58a497eb6d2c407686e593fae62f9612f2ead8ed1521a62",
-  "0x006a1be742a38fcc51888f3cc6fa7d776588fcd5c1206b014ee9f67d10dc88e8",
-  "0x00d67d1cc786afde5748c5959e2b290ed9c7090ad645b10b94ee58d1bb41afe8",
-  "0x000070f1d0bfd1f2c855980c4517d6f994953f0a4360dd8f55933fbf33ed13d3",
-  "0x0092ef77a4deaec5adc7ed85a0b011fc8484fbf7de7af5113a00b30e987274d7",
-  "0x006c3d9fa9e2b832d8884cba387c2b4ef08df948d9c836bbeede9843ddd5b100",
-  "0x008560b08d2ac96b75d25cfce39a0544faf75bae9fea24229083945479f6493a",
-  "0x00e1e2c406d8bf23c46628a836638132276546cdf8a15b7b0edc409ce66d306d",
-  "0x001ed1467db4c6ac42e087889f7a50dfdebd843a101f45984f86aadbba7aa005",
-  "0x00c6d0f76373864553f16dd17cfe83c934a07c045bcc5051faeb37b95be3cc01",
-  "0x00ef5e2425e322f18e9ba8c735c4321d42d65086b72269c76782978a2051e448",
-  "0x00cb0355fa70472635cf9d090be0fa68f32235364a5f9f1500885b972a212019",
-  "0x0022f215808c4f39203bc1b144026c42602f9a445e734e5857d94cad12131a07",
-  "0x00f72b2199d74616e452beb53cd43ca0416c938443229812fc1e65e0b1496e65",
-  "0x00242841505cb5063e8db65dcf4a80ec104bb819097bc6fcf275a7892a39b5bc",
-  "0x00bd9976ba2b4f3ac8c34eb2cb8bee3f726a8351ab88b6c17adedea35a6fce4a",
-  "0x0001742f6169cf5a02c91e3441fa94863480251335a40b302e186870a0b8dd3a",
-  "0x00ea5c9e263487344209752fca3acb0c2e69e0ae1f01106ffcf63554c83705c8",
-  "0x00f4f56b5275de2a6c6f9188b1ee703a7f29938640dda2ecbb57fdbb37b79027",
-  "0x001c9e97167d1142a940bd4ab46025ce46b593d1b489697140bf649ca635e48f",
-  "0x002e294bf367f5460fbb6ec82cf515566e5373fd34276cd707cedeb186783dfb",
-  "0x0054ad08695ddc83504f5e8d57781368de1347030d4b884454509718bb3d7a31",
-  "0x00959d49f4c71875ad3cc4db2888c1eed91d3066ee24cd1f9bb972a3e0a59488",
-  "0x0043e00e9e47e9900205ffebef58c12ea068e0fc3953f1ab1ac44148b1dc6b06",
-  "0x0079b4bf040b1b0142fb35396e6af00e47928edba448ff1e3ceb3a1ece7ce0b0",
-  "0x00712b1f7ca8cace5efdf21819027388618fa71883545fd840a7abf8d2457c23",
-  "0x0045bb369f97a8622ce72402386f34ac0ebb422cc5385aedf134c3248ee7c2b0",
-  "0x00e839ac928174898e0c8de6a242e5e5cc21a43e49520a553a88733825a195cd",
-  "0x007fc02bd3d835827ab8f2a52289f76d92bd4c24cc9351eb90151dd5dfb9bb12",
-  "0x0023a8d985119175b52390590c23187e09f6fa702ce25976f8143f7e88d9718c",
-  "0x005d516decaa714402648a2a32fd361894ed015da8916905f7ac0df4432d0d65",
-  "0x00d5579ff5db252b64673d9147a161c489bd750b999f22a212479f9f20098d18",
-  "0x00040f0c109bc640e6098e537ec8c9fe545fed7e0a92ce5c004bcd83f3a8e4e3",
-  "0x009ca94b43694bc15ea1312b51f73d5e21ea091b62fab552757859f34073fbeb",
-  "0x003d2f555ba312b764596ebbb590b55eef0d3dfba04a30c689aaab05c2cd605a",
-  "0x008b749485d9d1d15c22d8ab78ac3fccd8afbbb4f98fbc51c3f4bbbf313cd119",
-  "0x009501b5c4e9c611a03671dcf840389518d7cbeba465714cff40a1c88bb9cc95",
-  "0x00fb01c82197887fbcbeb975a7348855ffbcb5c04421dfe5e91567f3b4a7abb0",
-  "0x00a67f38e5c3da5181e8d40a6fc3fa7e6892be3ebcb7c3468ec1bf45b32d8e73",
-  "0x005c4f22401d4386bde1ffb034a9264c055e451398b0835835f601c2392cc4a0",
-  "0x009c38c2c2be00dbd8278676f38c957fdd11b19400633433e5aa3911ea7c88b9",
-  "0x006c63ce631d5cdce31b62258863009509952c1a2d7d61a63d4b37271a629622",
-  "0x006cbc1c5ab2f4b807efb745a8744f0d3bdcd52e2b0ad872caf06b4d35c7e24b",
-  "0x00b984889afdda732c51496fb89c3a087077790e3efa06aa2ebcc5ccda2fa516",
-  "0x00370f5d29203936051da217e333759f2151b3f2c754c189f9df41914083e9e9",
-  "0x000d8b056ab657771d715a8742928798ddef67179f9963b13724b15bce45e20e",
-  "0x001d2c0a10943b847477883b25848e9059abf27759a12b6aacb6b224410ab0f0",
-  "0x006fe437336697ae0d200ca15c967d003016ec8f8f6076e570b0efed9ecd8977",
-  "0x00883904346790771860be7819781bc4fea6858bd9e3340fac5cd3b7cc3f6dac",
-  "0x008f727887637fe3061241d407dba1456e879ec59a5d7c080dc2eea6efba97b4",
-  "0x00c4c5168d3d90ec712126136089bfc5f20eca4b8858da7fc69f66832813644d",
-  "0x0007caaef7ab0c4e463337392f76a7199e6d22755ebda78589a1bcab6f3807a4",
-  "0x00616c9794349bdf95bb6643a835b3d2f6c2dc4a39b9dafbe56981048114c1fd",
-  "0x00aa17006baa60d7eb67c3bfa80261094a847d6cc7c5d7ca5c288d9d98a63db9",
-  "0x00fd8eec741551997b6e7a0a0b479dc4d3b9809e720f9fef72bc19f95b4e2fd5",
-  "0x000c67d20efb1ae6b39dc25e7b86572634ba69d0306695bf517336e26b3ea89c",
-  "0x00300088f8b9de0566fc745600a28ce579069133f133b365b1e6be139b23beea",
-  "0x00fb9f840dcb8ed08c9b5bce067c232041c94fd3a03f944276f9a40bd68f9cb0",
-  "0x00c524db926d64db72700ae2119c8009558dfcd1f0e4e703174a715f0e96ccb6",
-  "0x00a78b1bf50863f1f4743a9fe0669d6aab46ac04d4103da398eabf401049867b",
-  "0x00ca2eb37ddd34b896c8534cd49149a336137beb1ac2d0bb8339fbc479d79ff5",
-  "0x00c3962fe1de70f3d415393eb470d3ae67d09de3feb8719eb0021c08ece29f87",
-  "0x009f120fc6e4bb9bbc398ca3143482cf39a3ee729fc46313987174dafe7e30e4",
-  "0x003ae0433e8a3478683f26416cddd6ea6d9e5531036db05385a38b444aa1c6cd",
-  "0x00dbc7f56e580655ccafb0da8e2027541f06818603ef2b65ecc3e1c10edd9b80",
-  "0x001a560088e911ace8b6de22097b7747cf7db1fcd817fdc6947c738ddf54e982",
-  "0x0005327a22e532d70857927eed7f1c6e25b828f94866a1bb6668b9fbfce3d6a0",
-  "0x0029710d0e00e8cf2dfb15b76ac72431f0d58b0f96a30787f719f13bcc019984",
-  "0x004539e6d24717f44922978dc7ed92673dddc78e3bbf8d490314be45624c910f",
-  "0x001c4bca8c404f4fa16a33fc9b17b876534d0ac257d3adb07bcd9ec42e308ad1",
-  "0x004333c869765911fb9dad3868466381166e08da72b37dc0802bc9bdfc160783",
-  "0x00a62456419444b9b1e3b56c5b088f94c378ae2fa986c1dddd8afc852ad63573",
-  "0x00b7c75b8570d3fe09d9eaee276db06257c59b35d7ac01de75fb0d904925965e",
-  "0x0004dd28163fbd5e38a609a977685a0ea2bdb2d5d8377197b643ec0e73321325",
-  "0x007b5b40855504a66142cc03635696404049b573e9a805d659b5a9dd99a9e9f2",
-  "0x005595aeb297e15f22fdb309dc4f20eb780c8307ee4cbc94a441767918202640",
-  "0x00bcfb4b7cb9a227c503d1a06f76c4f98df767de5d92a48df63cf074535d7eb1",
-  "0x003f4c809e6b9fef2328890629f28b7308cbde89b4f45509b4f6cafc7518cce9",
-  "0x003d2153e819b6b5a8f7f3376ec8d3656398188c39a50cc11e872ff652401da8",
-  "0x007df2a59ea1eddcf46141d8eabd70168ce6a428fd6d3ba594e5407702a632d1",
-  "0x009bc2077d35ea0a05b46eba830b54c4274c8d3fea7073ab8c254ddcbfe273ca",
-  "0x0006037e11d85bf0cbf8c2894b97cde772d303b76c4957b81e1a7fef3a85c760",
-  "0x009823e305ff0f950a33c0095f87dbd4b759a547dec94598deda5e6430e0f1f4",
-  "0x00fe8335b82449164c56e25dcd0f848a4489546cb6b72c3e7b5358acc446b36f",
-  "0x003fc0525c4c18632d45eea6d2141f326e1868a1613a99ffc96fa9d81929849a",
-  "0x008b47bf11713fdb4a89ed4551af6f17973035905e928a6f1ba60add6a46960e",
-  "0x0017aeb8a636336516589a9c9f7d98c2016e0e5edb1269d6000d200bef163942",
-  "0x006472377c022118dbdba639c7c25a6c9dc9dd6254cc1b738fdfc0edc03265cc",
-  "0x008713fbacd9e5479e0638dcda3f64b206108de454fb3a639c659670d2e2509b",
-  "0x000cb2476a2f0366404b29f3a57a65e6162e04823645a3716d717586248e81e6",
-  "0x00a8bc6ea0c75e6e567794ebbee65b718f0d7f53c0c9c6e1ca1ba94abb92784f",
-  "0x00c4090092ae28e5bba4cc4f0b5c6840099ffa81818e6195834396f9e78b8c7a",
-  "0x001eb33161ae91496ba80ecb2434e4096d615d3d8be10bc300919d72d8f65ebb",
-  "0x00ce294de9ed5fdbd152d7c9d5659af199735a35d63a6533bfcada07c1f8c7e2",
-  "0x00af018cdb4fedf6c86c8484e7df18b5491cc86c2c80610533d52d22413a4f82",
-  "0x0096679b01b0ffa57e48a08f04db797deb8516f5acc82d232d481057034efe15",
-  "0x00d37334026a1ff011648394bf5be1800064e04bb937a6ab9d1cbec21b3b4b77",
-  "0x003302da96c96129831a970690fb05f558cb780e18b768121580f5c02fd63939",
-  "0x00261f94cbffeda76a8a0b6d0f32b6fca2c112e9eed157435768dd38532a22de",
-  "0x00a3169a4db7cde00b46e11cdf36cee15e098b1d4007a93df93d91062c18c14c",
-  "0x00577b09375327eea507f1951bbb06c9ed499ff13816adb63b9293d87a5c278c",
-  "0x003d57e8d3b3a1d8939842e23ed2dd27f5f8a6527737cafe1bfb93318894f5c4",
-  "0x00706b822f1b179dd9eba2968abac5e8d49e998ac28eb91074f297adbb0962f8",
-  "0x00e48985f0bb76cc8d3c47b9c8d31d801758a6e5c7e4ffe6942ba6b35335b224",
-  "0x00a3e64fd7a982ef61c15e698e9cfc8eb3579c78e3c74c734844eaecd9598bcf",
-  "0x0042b2a70952ee90616c664b5945fbf155710a20978b2860637d3b34e8c8be37",
-  "0x00e039fef4a3613a9dec029579ea7058e8fe9e45c1a47d32772c59849c504428",
-  "0x00b469d255e514a1e528b80fd398ecb96230dc69f9be75cf59dc4d1ff0ea5c14",
-  "0x00f3e5b62190012043126bc7a9c6bb23c91feecca71e4893af411e8db18fac2f",
-  "0x0023b79fad61b9919462bf2230c30cc16ddc74f7d0c4fa902789c93c2b1c0b70",
-  "0x00dbbe12427022e8f781ca8f929f0dd3e3ceac7cb4eee870cb262c2f8d811c0b",
-  "0x003a267d66698110778b81e6703ea68e505ef1bc3007f71bb71a028cdde88dfa",
-  "0x00cadb724d234685cd47733bf23104d1c8894d96454dfe83d59e4f8272f16cd3",
-  "0x00a2c9b3c5af8ff13e93a7cb9b17d9fbd48e626563a4879a51b7aa4427347bf5",
-  "0x0078b0e3efe4c1a950801cb2c3998585bbeaf7950e5fe6c503999d3a699e0eaa",
-  "0x00329dd7656fbc5e34165a287252d61da108aeb0a3ef4cbe84c7a872b091de76",
-  "0x006a30c4dfcba2eadf23853ea538712cc9acbab8a6f58888b58fa6c7c8464d6f",
-  "0x00593754fdf62004f13c1db7d1de3c474d80c8eff08208d110710877a8c675ce",
-  "0x00ccc77fddde634632fd191b1ce3cccea7da88035340ef498bb2a06e2f5a1ab3",
-  "0x000e753e644232ec9f858aea8e29828cdd2238768aaab96edefb195bad9b560c",
-  "0x00ae28f2c004f1842b2e05d910341131956bfd7e9138dea8b0b46c38fffdbfec",
-  "0x0067f0768335c12f5e8a4ae1d5ed946a54811f85d62201339307dda76b196492",
-  "0x00fcce82f14298909cd7d1b73860b5c9869b8e2a0e14816db2a3bbd96013fca8",
-  "0x003b2710bb57db071c8baf190a8dcbe597d46bf98341036278b73417c40f2e15",
-  "0x006b4c4117818e549acc35f28a81fda347f81ccb57f0d2fa3bc0b21db1e03921",
-  "0x0073db47756e36c04022c9e55e3edabb597dfa406b25364e85cb3d079589aaa8",
-  "0x00dbb9e857a70c9140561bd75ed010852ab9b405fb616aa331de6221eb6a8b29",
-  "0x00ff9b482ffc5af212a0eaf222d849ac2fabd801008f9e644af757ea0275a86d",
-  "0x00ff358f127e9d234e88ce56a7a7266b9567598d7a2a8724542e987ba33b66ab",
-  "0x0013d29719c2063eee9e659b70fab84354085c1e67a39d40eaeee6d3454e0248",
-  "0x00c96baf4214ff5c9eee8183d959dd2be50f20df2ff6612d772a097efccc7306",
-  "0x006da4e5b5fbc8bfd4e56ce388b58d3fc5723f0a05b1ae5f5546f28eb11ac7d1",
-  "0x002ec539a41ac940d0047fbd87e688f06ad7b8a0074137b0cbc8e94b2d372d8b",
-  "0x0034a41178f815b9608084e2c08e6843ba6f5bab0ce7d2999e0165993052656e",
-  "0x006c685d733dfcd1a910bced338ccb461f5fb7d7862aa020252bd2772809172f",
-  "0x00057f03fa6f6dccbf3d927cf06a4d5e7107568dec689a70cbbeb41bd3108258",
-  "0x00b516869948ecfe7e5827c981def3febea67f7bee3753d37c1a189c7ffe6822",
-  "0x00e43724760f84467a8b2b9f3f2b0218c9831818bd08d5512b4c63c9155d839e",
-  "0x00e51e3428cddc8509cb2902aed837e30bb93b58c81833de923cd979a58590e3",
-  "0x000ec5e5680b7b342b7891fe422f28d369585ceb4395f1ff5d39a43868fd1ee7",
-  "0x00bf106af497c98008d87f64eedadd859acb9d9ae409b11dbfafbcded62f57eb",
-  "0x00824d26fc61521143a0e5026f1ccf594b72a207dcda5cda388438a655661e6f",
-  "0x00dfec25a027538af7c4c9f773fc627e6d4853d4402805738265fedff62cfa9a",
-  "0x00f8561fc5687a38642e4ff72e00ae0e4e60e6e7cc0dccfd19f18bf4833cbd01",
-  "0x004ae20250f5da04f1fc251b400c14cbcf949192618c25e7463a593260a88230",
-  "0x001a5c15ec767b54eeb84d3c48cacafc07504550a364151c14b1d6ad15c04d9b",
-  "0x0017f8e80ae8415d8b7a04b309ade969fd28d4790fa66be1204fc4085fe65e96",
-  "0x00dfb512e531060d9aad9c876596b18b81199af9ae1a838c2ef93d55e13d4b51",
-  "0x005e1e153301db5b94698d00c945305c6519491ed8fb57e5a6f5bd545a5a9586",
-  "0x00afa25fff7dd7e6ba43fc0e95dc90936ee43a66d258ecf889c69ece1b546fb1",
-  "0x007cbe5cfaa02bf9bcb20d3f5733b75f992ae3278db86cd7375144b03b64f034",
-  "0x003f963a1f3369a9f102c5a07cb831fa17c2b467089d6dff4d0411be1dc537f2",
-  "0x00ec300991b42b3bc813e6e1a04d1a11720970abab55807923e1c746f0e977f8",
-  "0x001c963c03a1d3891397cc565f83020d5b199b5c92d6d93874cbb2f1a3c32be7",
-  "0x0062df3e5dc0022474a7de540aca777d622227d5024f07a4a20200dcf5abd4be",
-  "0x00fa94d5f66ebdfda5d2de41fe4cf669062fbade9cded4b6236103aa05062095",
-  "0x00a5b01c89c50f64ca8f911984cd0240ddec9f1cde41f6913ad85c98b1df80ad",
-  "0x00dc69d77111efe766d1739badde85faf75599f3aec546a8c546f32af3709d6a",
-  "0x00cfee90948de342c6f51768fbc266de702ecc9cbfa331ac6483faf7f20e6726",
-  "0x00f313cf1ba189b62f359de020f7948776aecd8216f75f50f6dd77de65d31b22",
-  "0x001092b284e3a9908b8e312381f6174c87b95d9e4d2eacb4e82b5eb50817a5e9",
-  "0x00b32656aac3d1c26a0b417f03f25d8834b0ca6f6b3bc3813c2ee29230938ce3",
-  "0x002c3b001f9dd7f1732d64235333685a9cd728bb6c3119a88b5f4f525b40de92",
-  "0x0056712729c1bf41fc115bed31774a47e3730e35ea2c2bb84e552ddc12db5f85",
-  "0x00737e6338c74931fa66d316b1a1b4b4b536277488bab6305d9b3826559ac028",
-  "0x005e4024f55f4bb936a4289b863a7505ef3456dcb20732b0899b5d284ef8bcce",
-  "0x0012247301ae434bab6ab8feadb8ccd0cd30e7fb00302a8fc3ab11a0eee16336",
-  "0x00ee288304ce622d77a0afdd9e4053dce9fc2309cc9a23b425d9a32344c8cdb8",
-  "0x0029fcb110dc0eb58dac0f09da078065ece146b6ad57913e5b38ce7d60abae1d",
-  "0x00de8139f1fbd5600f8edd23845892c5995ee700cfbc43125913206309ee7443",
-  "0x0012035fe5f81dfb47b80c6aafaea8935409095b1575edf71193a6afc238a47a",
-  "0x00dc8ea2f169340ae3f11458254774d9b9c5c29cacbc97c392020c15e284d0cd",
-  "0x0094ade6309ef530cccab84915e6cb63aa36cdc8b1cc7c0c67ab4038327be7fc",
-  "0x0017a751d902c86b5a5c37716d3eb71211b22aa3e6aa8706fc2fed9ec8333c97",
-  "0x0004c162430f6cc9a0bc0f366b3484c776560c8d2309dcf086f0a9c906f477aa",
-  "0x0004bc1745878509f88208086a8d9928ff3362ddb9563e186d6ef6dba3c558e9",
-  "0x0011adf9de276f0b3950511f18ff2b42f33076bbc9ce84235def0a4df702036a",
-  "0x0007320ae608acdbaa24ba736f0efc0cc1ad564c92c9f4a072f6ea054b968d4c",
-  "0x00da0fa627cde13b945b4b19f541e469d328e71faa968011160cff105113123e",
-  "0x0008edf2f4e14519e0889730622dd8be8cd2ef61c16b6ec1e568c7663e76c18f",
-  "0x00a52ec4bfba685f41434fd205849d169f3504295330315fd7eade4a41d8913a",
-  "0x00d3ac13e6c76b9b6dcd577faf3af44cdf9540ee178bea3d69afaac67407f0c0",
-  "0x00fe811c60b40c94043fbbdfa614cd5e24b438fbce74c3fa16a51274217eabf6",
-  "0x002bb120bcf5eeab19316e792713c7ae944c96fd4041adc1d1730431b6dc12f5",
-  "0x00af31d75bc22a2ed197762af88e322d879dd679392a932baee2a54cb2849396",
-  "0x00e884f7fb40b4178d0e7d7618ce3b957e144f4782232c8e463c13a320ee97a3",
-  "0x00af20216d160512e4f182e6d37d591f911227c4549dc24ffbb839c2bc0d4619",
-  "0x00e2c5d9b77627444ad78e824820f98b6cd2ef638b09f72e3792352f8e8cf5e9",
-  "0x0087c1a3fe92cca41f0ba2da4ddfbf7152bf98a8fd5eb642a6150359eb30bcef",
-  "0x005b67144ea90b7a5a3ebf435c19dfd90241669b7bf6bd6ac577b13bf1fbacae",
-  "0x00c4c214b8228226cd19ca8329823d9a876f98a41afab5e3648bf257a7754d4f",
-  "0x0073ffa181dff38be0474c83491242c20288012d1b234e071039e57d9146f5c1",
-  "0x007b155c86debc4c1ad204ca6c2469b639d1ec90feeceed5eb97221a810c3ebf",
-  "0x0094493f3f875d4e0be545bcb88b32b11c141a3da0f2cb1760b39d4fe277e97d",
-  "0x00f567fd023a84e47a6fb7b7465c1104bdfda55a04c726e316106bbfe9ae46ba",
-  "0x00000fe1d339f8f1f8260841dc2081c8272b57e66b1e80d6527055e132156b6a",
-  "0x00b89c8caff95578112fcaa35c565fe888058e10c28f20a56f544442ce4226fa",
-  "0x00cbf8622bb645c31fb3a9cc4ecd1e93132f176b035eae42e8c99a63e46ddb4d",
-  "0x0061966154457013f1b5c0277db37e6df7324d6610d50684fa5b6695e8619c5b",
-  "0x0068e2f534f8afa0623b8bbd87d8c224d94cd09a326f5ad4a8fb73f614ff1d52",
-  "0x00288fa10715e597939ded5c915c442427f58b5f6df626a0a998d68ef41a1f41",
-  "0x00d87f1e88e3c0277c66c0f5fabb5c3acbfaa7cdfa7c02fa3af84cc4a830ab55",
-  "0x007776e1fa6021626d896ad6a726bc215faa65c61a07de1759eccb85fd1805e5",
-  "0x00299915f9f2fd124e52535a3c0c874d95945d66dc280f0c92c3918cfe4d99c5",
-  "0x000cd36b2bf7e5a4dd5c580279cd8f5fba664b25286c7a21add90ff543f0b19d",
-  "0x00393912fbca2a82b6efd45a04cadc33456e72aa9f5c205c40f026a7e0452dc1",
-  "0x00e2073327532f5351d4a33c5411235d749ca31b1c9eb18095d726c0b1e349b1",
-  "0x00ea5af50e6012f48bdc468d84e4900495cf901279d27b97b089d32d7780ab01",
-  "0x0004e907a15e8b79481d900a93a865efdb44c03c1a803908cf293724cd191383",
-  "0x00fc619b9c9828502d73a615f81007e5ee07a0a5f7f5b16509151f847c92cff0",
-  "0x00ce047ea278bd9a53343fed904a53aa759e2327a4c2517495fe5c6a034b1d6e",
-  "0x00a010b97accbf8e609299a0e822d95fefdb9c25bffaa4b7ea91ffa83d80ac93",
-  "0x00f697d44ec3023d229bd2ddde3ed2290683d03d7558176e4f2e3560f1ede73e",
-  "0x00dab9d0e1d64cb464d360598a18d74e4ef1f54055200f347dfb54208b5a5ebd",
-  "0x00a73ab3ad3fb2ac1f5aa84b0d9bc19e5ce72c6930b51b085ec9f00edf2d5992",
-  "0x00506b982ab0332ea9d7e908bd0d89597764f0291bd79f71bd5302a5e79ed491",
-  "0x006f8620ab223a758968f10ce355f64173893489b8fcff8d7cffd0e981852206",
-  "0x00d02fbb4f392cc6d4aa42f9e68625cfb79233e4b8ff7a40a9b30d3425660440",
-  "0x0033228a128c298193d1a244e0649d050363c1e5e1ecda92f123f4bc8de58c90",
-  "0x0071ed93bb87b5fbae566cea576055ce037546158365a3d8fa3450fa7a75acd8",
-  "0x00424e0131a72e82b7a339553f70b3724547828bdcea0721317164c944543e9e",
-  "0x00a234664d3315e0534004e52fec6efcd2a4874d6e8f5bff0a59b427bf2ba8be",
-  "0x00ffb77d699759fdbeabc8abc2cf3ee9d855bdfa67150695a7005950823d5ff5",
-  "0x004359eb2ecb263a48eda84735a05102809e949576fd40fefe8942580e17c9ab",
-  "0x00b6593566b03f53185a58da51f0d82563bffaf682cc4b7c1836d8615e743931",
-  "0x00c830f621c4ae304a5dcf628d573427424446f5b4adfa9bb6f2eac4f6e329ce",
-  "0x008d22b3fa55116735134adace57273018edf172fa40a7ee6bcaec8231debc4c",
-  "0x00dcebe4e24c9e0ec9faf4784d06b6e3acd466eca24f6daf504a31db48102c41",
-  "0x00357acab86d7673c3d13857cc1a5ecb0d0d339d0b8f38cdbb4cc498838f3781",
-  "0x0036f45659fe2f64bc7a4a46b8ac4a0172195a8623bb52eae964e1b674dbf90f",
-  "0x003621c7cdaf345757ea4a6475827f62dcc834eb14fe2547d9e073f66b81b8f4",
-  "0x001b35e135e780a426ac3d268b97081207b8c296a4281bb0587e2557d837637d",
-  "0x007205a9e392b3ef7615f293ded643056d5261b17b71b417c2672ceeb01366af",
-  "0x00db30f42b91c96c5a0fc16f626934bfd68f99b3f3a49220c8af3e9adcef240a",
-  "0x003ba55d77a58f439d67ec42304789a1331ef361a349625bf1c0a22a8b88962e",
-  "0x00769e11f9d1d54ace585ce585908e1c907499ccd3cf69d263197efee684c3d1",
-  "0x002f01638169425e1e5b52ddfe89d963f858fb09a4a31b24e6e78fed790ba4af",
-  "0x00200ec6e0dd42400ba0b2299174cc19ec8cd3747a9ab312b6c065a50f41fe91",
-  "0x00f2d1c8ed8e6a5be780a5019d24703cf11d5f68353aa95140e443aec2087825",
-  "0x00f68fe33209969dbc5f25c6654009d98088de06b17658b7e50e75ef66cd57c1",
-  "0x00945e7a3dc628150665e1d4a93c66dff98a9fbd923fab00d9a418e698dd2efa",
-  "0x00bed884f69cacc8fa23f540fdb7857ff2f9c93ebffab746fb94072de424dc95",
-  "0x001c3618cade36007bc108bd9684e5a71bdcc6010bf83ca3ed2ee9f8b246be30",
-  "0x00644f18d518c100c82e32f6ce283b0e70a8930d93afe67c310f2be270188a91",
-  "0x00982068e31e34cadd47f20f7706f46ce38f2aa9d15024a61ee4f0431f3aa90f",
-  "0x008b2318219985f82ec3b5c0dccf3cc013dcc095606c3c4f457aca07423b535d",
-  "0x004bdd4e942c385692768b8705db916544a65122d38b0a9281795e8927dd6286",
-  "0x0089eb61f4470048c4b4503030dd3cd9f868b376cdd61684b042ed8c7246806b",
-  "0x002e114fd42f1448481ac18b8fa6e84edeaa1df5cff40cdb300c0527788e6b03",
-  "0x00a3354c3768525b9686dcef5b57191fe07c4c2a083e0bffc0fdb3d95335ef02",
-  "0x0081a2004ff760e6e5cb60383e2a5500f582091bbd51b09a3d844173a10fdb2d",
-  "0x0023ed6a7b28a6ab85cde2242176055d7b104dbf03ba94378b8ffcc190b0e8ab",
-  "0x000ef4e2f59260aeb4e6d225d4a1e94268a40753c5c29876001d5d75e0b86901",
-  "0x0094173678d754160a9ae977f68404e499be049b8518db485e0b196c13d539f5",
-  "0x00e1c149670a26f015de18a625d8db47ab96093bd6696acc45f3c45ef39f500a",
-  "0x0078dbaf4fc2ae16585f4d76dccc4c312a6bde5e567c4c7f8928428d1430d3bc",
-  "0x00d49244b9c3a3141a062b3c751ccc5bffd8aca611ee30519bcbc37d772a4125",
-  "0x00f7c178712aa0fe82f8d18ad83bcafb2e5e566e5762243d0f2983d968f4496b",
-  "0x006c064c6a596d7e8e1e846ca558d24fb9faf73c352905ba26e8aa895072fcf6",
-  "0x00eb9c8044f6e5530a1a5db8e6ce14e93cf8b31a54634ad4d0d4d9d8b65a9999",
-  "0x0016ebd721f2e11d0bcd2c087c92987cfd0b53fb8dd1649c2f18a61325708630",
-  "0x0093130dad9b1ccf65b69ee3978292dbadf484845bc91ac3a4f314e5b0831f0a",
-  "0x0034f8940fefbea2a7da799ffb002fd6852fe88158d13abd9f5d80e57251e5bd",
-  "0x008d3603a9722927877ffc8fd431a70b17762dcec5e5be7260635817c5bad6cf",
-  "0x00939eeaff12c7476e05cedce85bae8ca959a2320fc10efff8528de1f63e1157",
-  "0x00a41e261d4e850af7f56f148c5ea205337e6a734484163db310361e8388d66a",
-  "0x00cc516395129b8d60bc35185051c8860d721879d8c24ce61b5738db0e150e90",
-  "0x00378e96c07abf479990f486120b4816718c293ee1b0c92bd9f2ff24282503ac",
-  "0x0061e365ec189753e17be04ad6ec9de22665c613ce83c95e127a5902dc07e984",
-  "0x005150ef29c6a2ea7de71e0cf968a6271faffdcc24f15e6400ec1bcfa33cf0dc",
-  "0x001db3e8d4b41607e1ee5541979d77c90e3cd9e2d0f8760a69f53bd661c94b9f",
-  "0x004ee3734ec1bb4503cb6f65c136b76310711e433222d53233d65f75e2723c4e",
-  "0x009c0d24a36d5a708f34f181a5d0b5fa10c4af97eecccb0838b411543ed8bf9c",
-  "0x006f6bae87bbbec00b7886a47a204c74b88512b2cdeb163fab26e48dd3aaf472",
-  "0x00437baa2c84cf48da7fb8df186b79a6f525ca0b9db3cf790d564fe0711ebd34",
-  "0x0070d2cc4ff69e77ea61c2dcddf32cfb4aaf60bf64e431379306b09bf92a687c",
-  "0x009c42d3b1a2ecc207eef53eb74d76e7371e1aeba7660871f2bb88690eecf6c4",
-  "0x0028b3e46494c1628a7342e2893e16581e3f8af68a8cefdb42c687eafebd1078",
-  "0x0032e88718e3dc80a5a825c34ab2d723e88db060f821eeea812fae1d45e8032a",
-  "0x00555254cb99a608aa4415bfd6dc4e29453b61cb58b51d302832c9668be6756e",
-  "0x004118ae46641b2320243aa255b05d5f5fc1188035e48fc0da481f9385a4b3e4",
-  "0x0074b3beb918ca3726efd6d6e3d72f6538c60dc4e6f4342bb902d72066b2f677",
-  "0x00b1bd0172c3bfc9696286c6a9366bdcab944d335b068af65defd005d5591803",
-  "0x00332e18afb4b48498e487f215b3e1bbfdd3998e8d6db0fff429d72fdb7bcb33",
-  "0x0028ee1bb1e290b44a28598ac1389ccfbc4e22cdbc15604bcc8c47b005112cb7",
-  "0x000b1994919cb9f6d6497de0e7fa2b4699de4145ce443023bedfd2e4d68bb285",
-  "0x008c0d9199d5e553a4ad3677f94a7627082f77717acb00f7b25b7d6b02353fbc",
-  "0x00c42d8796f5103b96951c0c37bc769f8566f447cc0df2450b33dd8d09e3ea0d",
-  "0x003f87cc2a642bda83227b21d9d9a9458ebe1093aaa855bce7d368122eb152b9",
-  "0x006ea92e93dab81d091fa37de154450c320ee1487f5750d0c6555a24b4221946",
-  "0x00181bacdbe11ae5d2a1459504dedb3299f91f8d3b90f23bf12942b3ebc935ab",
-  "0x0020f81d98f19095ea6df61f697a9a959dc467a92beb22c6aa91d918f4f8b9a6",
-  "0x007dca9259b4437d03b0719a835c1d237b1295b86d21435e60c663a481fbae14",
-  "0x0052a359353414cff1fff442b0452f3471bf0d3bc7983a7054088346fb7ed81a",
-  "0x0085bcf75f436e2c804d44a04bc5345686daf11c9f4da9354abb68d69d3a46a3",
-  "0x00849c0e4fd9f261a71a402ec3ef39848808c1baf4775895509752913baf290e",
-  "0x00926b504bbd0ece4a684138032d12922d76396614f1c60b34de390886c2f3d4",
-  "0x00734bbc8bf38e256f8c4f04a36d6e50de07a0a7d75a8f04262648fed3d1f131",
-  "0x000d96c28ac5a58f393aaac885c37c96c0c5449d42ce8720505a9b25a5f9b86b",
-  "0x00e02c4c188901ddff6cd998ec14d441155544985ecf662001f340c8d03ca473",
-  "0x008152827e8bda551a2b79b74e5da9a5ed59b93e30636ab07dc71875fc39d7b4",
-  "0x00ba3c3221abfb1912a11bab487796a9389dda3e7908a3509d17ac76d9161ee7",
-  "0x00289b7bdd2ac5474aceee08ab0026ab6fa8719e0836132c74a45867edb061e3",
-  "0x00ad4870a933c8f1408bb4f5f42f8011d30869eb9a7d8c2b2633a09c5c56c8b5",
-  "0x000f049f92057b47c4ceb1aa9abd97669ba4f8df9e454cf8efc9416303f44c89",
-  "0x006cfc101a9b597a6be518064153bf2814ca1e272ffeefb5418b4b53ea38ca26",
-  "0x00cba9318f9a23057cd5f36baa42eb91d4243101a69f2aa1cc35119b78e6aee4",
-  "0x00fc3cb58199e1bf28a62af509cbf1c7f30871e7c792ed9a762564f2223bba18",
-  "0x0031644acd7b9d0d2fa07fe1409d34fc2c20080411e9d8b56dbee18d890ac9c0",
-  "0x0075acb27e04b225ba82e79e49b696fce072b80ffcc97a7505cf1e3e31524993",
-  "0x00a549e92d874be9f97abff19b445ac04f536a5daabaec00d96fc371fd32ab60",
-  "0x00e5ee8cf8f3c3978a79d494eb9274abcf9eff6d41ec3ba3bb9d627bcc8cb212",
-  "0x00def4df4e47fc737b30295b924aaa08a51d55c83ad2678628fef1525ee07bac",
-  "0x006778665738e3881f5d1f186dc3424bef05884ee1b202a1ede052756007170b",
-  "0x00c95d743c218f7a068fd10da82070c48e5fce7e9c0a721dca2d837dde674be2",
-  "0x0041ab6b38c4fdb9351e642be8d20b885d893ccb2e7685544c1e2106c06d9d37",
-  "0x006ebd468a1903c61732290dd84354a2a56f0af0a8ec09ca6e870802e4d163f9",
-  "0x00f892648d9b1f199f73730d2022b0ba8c5b86454f56c58216fc2233ca218e39",
-  "0x00da0a6c27b7fa14ede57348c4fc0470151f218c469c4fea73b2b6f8c1a1ce7b",
-  "0x00e787478f0d5ff5b8ebe3de9deb2e9b4fbd891bd1f7c9d25dc92751c5f07c7b",
-  "0x00b4fc03ae26d62372774c157799b7cdc6f074a66ade59c6ded3110e3cbc3410",
-  "0x00b0aea1e01cee5e707d7647aedefd353a768540be9283dd8b8c257ed349af50",
-  "0x00187f8764d718abcb7f6a8bc5023ba3063a7777bf343f47aa0fcaad3d3518f8",
-  "0x00e8f2834ed125b017d5e46ac854435085b9436b727196badec7e0883d8d799c",
-  "0x009f68730b1f4f747f16fe9f8cbd31b1aab4b7bde4d6e98b1a1cc7a288fd6609",
-  "0x00007561b11b8e521c02b26407904ff084ffa4043ebc88bc8b85c4ddd6eacc3f",
-  "0x00bc967fa3cb0659a28856639b33befa0195f788e89e3469a6bfb4efb6b6b139",
-  "0x00719f91f88ad1d9617d98f2c8ed425c693fbbcb69f3694644fd112eef9f0051",
-  "0x00e19461adcc660dd88e2ff3aa3b3e15c66837bf2b135cd337a3435743453c7f",
-  "0x001e5b53b4c016bf93ec452ed6f1ec9c0d9a19dca6428b17cadec91b560bed44",
-  "0x00e629d8c860f30e07505b1c397c3397faaffd28cc8ccf8dbc31bc133f8a52cb",
-  "0x00b192b6f5f147b221d86c5421ff62fe0976bd2b5f28d4577d304499d59dd99b",
-  "0x00f9968bf4cf1935ce03991d9d20ea93d7cf65477307d04f5fd8ac3688ec5be9",
-  "0x00f0f8b56f5b0f6a83b4101eeef284080ea0b3875f88472d8fbed8f7790b6f24",
-  "0x009f847c83493323c4aec295f11820a041f596b46d520b4057ba159b8fcbc488",
-  "0x00bda8cf0016cd466fc04b69794eb8cbc9ceb0136d8885f013a866feef4a09b2",
-  "0x00b208243e2bcb86564de22bb02d1e9ffecfce731fa2d25bb06d78830840b0c9",
-  "0x006483f75acdee5d65b62679ae2ea0a42b8443dfd0d5bb66d8d56e188cd0e0f4",
-  "0x0080ef0edf0d305a4af8db9edb8cb3d02da99f77965fa1fab191e69b60568af9",
-  "0x000c105ad4a3b7129548f4262711b8e2bf46fbf79a8dec8e345483019a237c0a",
-  "0x000067627501c34069ec2b52d225f7b0bda1d6d5f231c5e3f8d1f18bcbac9a51",
-  "0x0028fb06f09b7b47fffe707d6e6d473e0392ce9fc66c8f96d644b4271372cb79",
-  "0x00852b9238048df2042a55a9e3bbe48f961ec646ebcc8db51bb98616a01828fc",
-  "0x00a3e243b3d43cd4c6c9ff1ee13037d76b03e47abd6637d518f84f9490804b7a",
-  "0x0013795d5c1d463bd57b736285c3384320da92baf40c91635f63c8400c1461e9",
-  "0x00c7beac63fa1595091e9a5e36c0b07779cbc017efbd058163888faea44a84ef",
-  "0x006b2f822b9fd68e6289d3d3a292510c9be9448dd0462ab5194a80a5495f2a2c",
-  "0x0049cd4017b415874fd2e14713da314fed732ab8d640b49f0f322e5ceba57d67",
-  "0x005e831422ba9d44312450e7425b1d9b2298355a72220d49588e889884d0b9dc",
-  "0x000871416145faf4a13d816c7f3f6fd33cb09c3fa958845a5fa56946e0b2082b",
-  "0x00dd3911764a58783ac771f6836cdf4aeec968e760a5a47197c745c2c0c012fa",
-  "0x009c4a2a0445271d3e644d9676b03b4879983200909f487e5270a991ea11772b",
-  "0x00119eea6039bffc703cabd677143b8edf93bb3a130222bcad67838ae848d06f",
-  "0x00a398ce78c408e28e1582fefcb63051bb359ed17c61f37a6e65c2c363f94725",
-  "0x00c65eb7d460cc1f93ec3d33e4fcf84bf420bf6af8a54256105487dfc3c6188c",
-  "0x003081f64eebf48811cececa727ecd50fc5c248cc13565f968fa0cc138bc41ff",
-  "0x00d39b4cd39ec7dfc0dcbf048bd3f0add89d9a01ce66c5736d8149bd1cd7bf15",
-  "0x005deddbf389b5b7c207cded6a255779ee1b56ca751c5bed1726a515b3d3c63b",
-  "0x004143e9caa59bcf8e6137d95349d7dec232f4ba73f6e370be947063a85370c3",
-  "0x00a88ac6fe93d1d0d78c8f492886973f7a0af96589480bebdd4fe64dbc11b40e",
-  "0x00c8ba3db7b28ebe3f0656b5d941d50bc1a216d2f94cb8074809064d476ade96",
-  "0x00e14df0ba630b40494e25a612d4a5305bdf836e54769992f85307b8bb8ea297",
-  "0x006bc8ea7c04dff8e8eb407786b6a80f3780ac469f34d549b2c0a4c5d7d2e119",
-  "0x00b9ceedda12fb042236a31ea7591b91a24e949bf8a529f656d54838c6a3eec4",
-  "0x00cd16c186daf9dd6e80485d4c229fb90b98c9dc505dd1bcc3b9f90c0c3f72a7",
-  "0x00afb1d4907e08d3805df3eba787ccf2bdf91183e648db7948dfd3e05dea6fc4",
-  "0x000cf6310f0fa16775e7b993772d8d968c4890fee06ac60d63ae22d85c4f5110",
-  "0x00978fd59a833deafbe18286a97b9d7f57a72ae8b947127cad7a1d5090695bd3",
-  "0x0076dc3d1307ab2cf367289b3f84047ea652d31717edc0fecb2f7fe5fd91dd85",
-  "0x004fc648af2517516f5c1b19f872bdf65198e0023553293a4fcac74d817462bc",
-  "0x0009bc061c1296732d084e0aa28db8f3d85ae709a8f8859fd3e0ed5a1b9a174d",
-  "0x00b0b2fe7960e89390998b3196e306b9035b8a5ae950260b0310bee4b0f59f1a",
-  "0x00e9ba4b83ad6be4c867966842e64c46e5d25a2df000ebddfb28681298796457",
-  "0x0026632fbd30e1f2d0d6b8fd1ffe57a8999e8dd6089329dce3fc7e44b608f0d6",
-  "0x008501234dd504b41b9c146eaaa2370b5db9e1679dfd7a5d6bc673ea1ffbaf99",
-  "0x0043bda9c56a590fd0aa0b3637f7c35d48c28bf4bf11b10a29bedba2f79fb0f0",
-  "0x00f8691047578d5d6933abc77a26a23b91804d5c7c67e114621400fd5880ff73",
-  "0x00c298dfac0be9a2a0d6f821de99e0b37ba770e045b1d223bf944b0a37a4f47e",
-  "0x00b823ce2c64049501be9640687e6a04b01262c0748450f9bdc7e5cfe67bd64e",
-  "0x00bc4fb148d5a14e43ae2996acd256eb4be9519b9b8122bc7d014a00f7ca68b6",
-  "0x008f0e3f00b05716e11a3d68523c8d310af1a16687192d0d3308ee0023a83189",
-  "0x00ab55ebae536a636d121178ce675e12405297aec764e1f63216a2effd750dd4",
-  "0x006446769238af03fd6aeba12883cedbdc3d58482180f32328bd556f9908592b",
-  "0x004589757d94781615c7588ed12b23dc111973e116d9352f736adf74df0a4250",
-  "0x00df0300585a369da53c2d1fa76357a965ffe5fd806cbd6dcce67f3116e335ab",
-  "0x00742a8cb07a8cdcc66186a8cebe99908f7868cd113c8201c9e73577f9ecbf27",
-  "0x00938cdca192262b223032d00b556cf99c5929720e45b044f7f3e0ea1fa23947",
-  "0x0000604390af3197d9f9d39d02c42b3bea85d11e51213b4c09118e86f3dbe984",
-  "0x00be885a4dd6eff916db1c40d18cbd6380487c68c4d10a97975a67523eb353e0",
-  "0x001f1fdc07e5999e3e16967c99c59cb47e202378100c219a56afb59d9a1379f9",
-  "0x00c7bba61236a796a05ceecc3059c24196fe0a46a09fe26eda11dc4c083fd8d0",
-  "0x00198e9bccb03cb5704608a29d643e3e03b3259741910f28186af2ffb8789161",
-  "0x0024761372df3580a62e26d6ba8f3e3436ef4d7b010aa806310ac6136fdfbdc8",
-  "0x0039d55827192825a3cb0ddbaf73f6d4f92be6443a627a26b7b4e653ec305f9f",
-  "0x003e491a46b7c1bf502d5e4017f9c08f970153d8fda19e70d53734d881fd6bc0",
-  "0x005b62630b3d97cb643f90251f0de008135dcd0d0266695962842f7e887e3fbf",
-  "0x0041340cfea7ce7bafa3037cd17bc81dfafa587b599239734a665b72f6333c49",
-  "0x00bb96fb40f8780e03fb94ba4d722af1fd245e814ca652b47437279711ad88a9",
-  "0x006f56cb2e921cd73118307863a0556513c836dc46ef9a6c4b1a8bd60658829e",
-  "0x00804c56a895b2edb7c41141502d92ac0213912f50f7e40cbe924cfe4c9a0c8e",
-  "0x00c502c2740c325ed4d9ad4fa0d5043e4366faec467046b05d9d1a51f0f5fd16",
-  "0x002f65f70cf4231511b4d2ab16c14e822910c819ce91bbd29139a90d151998a3",
-  "0x00221c20927807ca4f069752f982949f58cbb95c3b0825cec7b9fc06dad71ce7",
-  "0x00bca45bbac5a5296983dd614e77358c1448c0508c7186649b2bf43c6c2d00fa",
-  "0x00a854ce5520548f841b8b8b55d4a867a16ada7c34511f9a2c6bf61f41cb74f8",
-  "0x00f465ea7c15353ed820eaee956137747ddb45aff96c13480d4d216c31750000",
-  "0x0034f6dd5a039dd123d5d24b8ac6e2dcc4f1b10de373a226187e9cde2751cda6",
-  "0x00919ad0055a5f3c04149767434ff73418d303ba150a9247acb4711d7f5c494e",
-  "0x00bf5aff2bf0972877d7cd0254ccc3e1f6cb68fc56933ddec0021978c9ae78b1",
-  "0x00c471883c6b2b68de732de5e7b8f27706793f4f28f66a7b76179633f49dbd78",
-  "0x00138a53e3d1e5642f7624667e6c0cdfb0f580282966dc96629c1331196b6a42",
-  "0x00d064ddc3e1cdab1d44c0b14e90dab9407533200d2f20921eec0d1569be6268",
-  "0x0053b7c2b0f207d84635c938216ea0fb01da3651aeb660bfc545464694238b0e",
-  "0x0013d4308f36e66cbf65673a9290e5157a0da5e9a0d3e31e2cedebc1a739149d",
-  "0x00d51538e5690d2114706a6da9a912d57257e1352874e5df3ca6dd427cb6c329",
-  "0x00df0a9d6cb6f4b9a1b11a9cfa5d77cf3fca988b7bd8711acbc305866ec04301",
-  "0x00c44c210a7c80ca9c6ef5f4dba5d2350f669f09373eb4841977cda24bb74eb0",
-  "0x00f55f58634c9367af6a514b4b7aedfe964887d5bf1bd04f630106004938f61f",
-  "0x00933c315c12fa1ebc4a29d73b032277d8a62dfa3176141914ba1ef69e9eeb55",
-  "0x007219204263dd388f55719fdf487315cc188655bab4b515e7f75de27f91090a",
-  "0x001083717131bedcc0f0c434a98c347f974eb3b74e28b388f9fc7ea666b16b56",
-  "0x00d5671c357db9836995cd4956dbb1196b7fd5a0937ba8d6df9e0fcf3d10cba9",
-  "0x00004f9aee94b50ed92fafce5f792321b61deb34147218cb8e230b2aed3a2967",
-  "0x007693c3f1f47d877d92d3388a2372a84a2e1d2f8cd0b09c3514fa4641b0e1e3",
-  "0x007104ace8b45f2b18fbabdb4c360d83481936cf29626982e6be911e7f48949f",
-  "0x0067a4efdd6117eb03ebbd01de1cdc648596c1340bd9e7ea215de80b64848879",
-  "0x0075e40e3cac70443107370836c4303c4cdea8d9db2fa9817cf8418d7d5d1d6e",
-  "0x00a684c8c5b8334cb15a165285c0a0b8ca07c05cdeeb0491f7bff7a2c11a1a5f",
-  "0x002e500b04dc7a0f1397d341c07fde07dcbec95cf2721124c532701e38ac51c5",
-  "0x00665505bc04da17e69d52d2a7048a30f90d161b591548b23526407c8bfed4b1",
-  "0x00dd392c10c24e51e073994a924f1d159bd1050c30f3b9f9b479cfdb6a97fd43",
-  "0x00b5d3968a8cb28184559657e766f7f48359de426714b422da02f8fc904c2fc8",
-  "0x00d0a50e7532c85dc1a84de39f84dee279f93b7e5c2c6185f43dde71a678bc36",
-  "0x00aa104d6127734980eeeec19bbdbd1477b8ec784d54ce5c76d50c84b94e1c9c",
-  "0x00a2504879f3bddd1265253aace2a156aa923a320d52ca0b1f283dc8edfd0f73",
-  "0x0093b3f53a89fd60621bf7bbcecf334d3e61f135be66aaa14dd75702e6023e58",
-  "0x00ee02f06f02e8aa421278da54dfda9c3fb783a556da05ee501f6de65ed581f5",
-  "0x003902108dd7d8154049cc2592e9adbd82a0a6256370c923c63138c6e043bc22",
-  "0x00921b47d1ab859f98065a9b945e473fa53bd92d0f24a7f0397e3fd225878775",
-  "0x000b5ab7e95d220965da0bbb0867d37179f696c823de4e72d12195fcde99b2ef",
-  "0x00f20c45f0aa35ae87188075d9a5e6338ff25ee34dcc8d940383976da0ffc7cc",
-  "0x00b0d8412476e4f149ffc4b39fc05031f9cac997d33269069702e21e43d938ca",
-  "0x00c9edbe3dd95a31a5495d485a790e2ab9806820a0c9909b7884ec0bd9c4e83c",
-  "0x00f6547170d6881c91266f2f71e1038fc392e932f05452f619ce236422acc2f1",
-  "0x009e44ac8cb4fb71aa39d10e0e93a7e27dcfd6ac24681a0fc34df19eb63c3e8a",
-  "0x003cc314f8bfff2ea0048e46c6098f1d4d21611530a2433be6e8777920020751",
-  "0x000f88a60857fbcf469b357357fe055b75d33e8e0cd6651838af0153e0970bb0",
-  "0x003ffd33300e5aaaba0295c725e8974ddf4033a467c0a367dd74bb42b31db76b",
-  "0x000dac3af641992821fcf6689b7856811ee65844fa72db5d68365e732206dbc7",
-  "0x00ffb63c220e967680f61f3b618323266e12332e82714a9651f6371ea37ec04c",
-  "0x005a528bf40c9c9940514a5c3f58f2f421bec1c4626bf276bdebc14cabe09c45",
-  "0x0095a66e4f31f5be46ef4b5b0042cb8755af326f4cdd6f65aecc392a53f3ad6d",
-  "0x008a8adc5f05341de706ef83d70c343a4a25e3154e44090bc79f6295b4df9a62",
-  "0x00393b265cb71c36b91a8b675049109cc6dd566947d3fcceb1e860c9277a5d69",
-  "0x002159c425b0b9569803e209b09eb0d12b8f58793854b3715d72b4f1d059035f",
-  "0x004b3f29b571cc6bb62b328f9eb802dd560060863452e690ce5bfdfc84d81e9a",
-  "0x004aae64836c89d3025a2ee14d0130b1b39cc561c47ae7667cb177a46cd79684",
-  "0x0013c8ca528f788b4acefb0ad7ff13db7a15e7ac4c6f68b3b2fd46fe46f8ae88",
-  "0x00dae93156eca2221ee8f3e7d10fdad60e9b797835effaa0dda8e55f56ff4064",
-  "0x003e78c1e2e7aa35e63ca0660bfbe7e63960e6c736c4942dbb5653f65f1d93c4",
-  "0x00a45dbcef4443bfb860e38c73426eeac0b58bf65a2861f90d4b256becfab21e",
-  "0x00df1fa0c6275a6ea7c46558ed242af9c95dbc3742b13bf72f594e3b288b8b0c",
-  "0x00f8a68bdb6e72ec1854eb452ea26cc04809ffdbc5e00a33b39142fbe4c9a23d",
-  "0x007e7749a4732cbb7f0e7e0478d538271032138493ec39e0516a7e3cef028f89",
-  "0x00e846810a49e493531bb46bc7f643afbda47f68f7a6416efac629bc4f074d2b",
-  "0x0090e957d940acedd2495d4effdfc9ea64ea079cca4fb8bd932686a1f3594b8a",
-  "0x004937a0567bda3241e6685086dddcab320fffb041ae4ee2a0c83e5a8b56ebb1",
-  "0x005b761875dd4aa53a9c6ff05a674e0122ccabf6de2d5e5b87ce499cacae7a5e",
-  "0x0047d02f8a0d406ecdb0f8933c34232fd50f91c08c69c6470e466dc253b8bce2",
-  "0x00c057f456782b391a3b67470f4d18938894c3e8dd5980aaa25c5833bec2c2b1",
-  "0x00f92b959f532f4483ea0c2acce66d4b3454786ba68c4e4ab22612a9aa63fb52",
-  "0x00a8c53165cfa98c44bceef6c60ff5d811370e5dbe5a08783771535f63979e58",
-  "0x001bda2fe5bb048cd38bfad266e39a34531fc6c175ab6e19aec2038569aaed69",
-  "0x001d8089e17b7df3be86abb72c9d0f33d74b77c3e5534cd366da8347db7b26b9",
-  "0x004c7184225d9f31a9c4620a3e089ec2f0b88aa72f3451120701cdb08bd0bcca",
-  "0x007949987a5422af1824d2439ae6e3866aa9c524e195a461ff8997c36d2602e0",
-  "0x00cdc3b70373deb91b2b602537d8d7cb8d2aea7c01acd0d4bea2a3de783354ce",
-  "0x00159fd9a45f470c6b7f2aefea168508d3e8c0e3d4ee550cdde5506a65d50f23",
-  "0x007e5b1ad57406ff1ffa688af798301893429352ca3726601fe419e7d3cc3cc9",
-  "0x00684ed5f7b86fddafd7eefd5ddc2a6f666dc536cfae71ba438c1ffb6c3ff762",
-  "0x0023b0311f70587ede7cdbe6d0c2d1b2c4fda667d262f3ef3920af7aaf7a1d96",
-  "0x00fc69e552f616135ee8827726bee681ad8859c0724fba47e2a0693cb6b39e92",
-  "0x0026592f1f54a8a6c933677830a03c87ab11476052d9f61fe89ef4268cec86e9",
-  "0x00243ef04ba1b08b59686cdbfa82b2e901ae0e6bf68299dd407340be2fdbb0ba",
-  "0x00892a713ad05e3bbeeaa29f84ee1fa6636460bf989b1585da3a28981ec2c947",
-  "0x0096493593fc5466f7289b0b664ccc9d58a3c22db9df4ebcf0513e709e168efc",
-  "0x0000af8d131c53b15d02e1515057869de3ccae0a2196f0cc6e3d178f0e027732",
-  "0x00a8bba969462d2dc22cd0b65ca0aeced6cb114c4b89efce2a9af20062fd20a6",
-  "0x00d2e1ab064ba2cfdb09b868d84807e1f43735832e1100920f442a7a4efb6fac",
-  "0x00462d5cb4ee174472cf298b21057b3c801e6c423b7bdc4150c3c32ead5cd14a",
-  "0x0045c5b813a6d65d00dbf72f2790fa7625093874e9e90a16bc1328e18678ba8a",
-  "0x00ec7ba5ac53036a498d73721c51e295dd50e94d573851777ea62dc6dc5271aa",
-  "0x005efd6eaff4141855e884e251e170bbd7b059755de4fcae21d9994fc08e3d32",
-  "0x00b7ebf9cd9d742d6a7f1d11d967f9b82c733bb99531579e803f674ae6704e4d",
-  "0x00cad0ba013c092a91e7ab6b822174c1eeb0fcb1490d7bc5cc67336e43c8e56c",
-  "0x00363d822c5a7bb87b15805727f369f155f6bf004b92de7d1648fd759594f96b",
-  "0x004867e7f91bfa69291b4153698d00c572709670600b3b7ae9b42a1ac4a748d4",
-  "0x00d590541bca3c7cd611613120033aa295c4691b26ab5a78269cd9394e5465d2",
-  "0x00ccca30af2f2b8320b1c65b5d1fc234652bd459b1b12450c4fce82df8410161",
-  "0x00cf40b41e869fee5411e710a04907c2338101eabb59619749cd5b7e689e7f1c",
+  "0x00ffd75efda6e34b65121fde81a69ba5f2a45acc69b143f1e333d23658e80f55",
+  "0x0094776a12fb89f4b79a211bfa3a123207f9ad5633b79be105497666fb335bf5",
+  "0x00d17297ba98cbb8657cb604ec67599c7a85328c46b50b54b0cbc52943fd2264",
+  "0x009dff5d1b2b67b894899ebcc54bca90dd7480e42a685a692c75d0f8055bec2c",
+  "0x00c0d25d3d357e684dbb3e1b28e7aabf97967a5ff28a67c38886575be5b6babd",
+  "0x0022cb2794ffb670f60a8dff4602cf5e93ca43bf651c52fc0919a8fb973374e9",
+  "0x00adf3b1bad196cacf4bbced5c5901d3efebf39d6b89e517f94d45ccfb1efbd3",
+  "0x0028c69ebe9961c53434f6c4d4f3e9921ff5b652674b535f132a1fc7c8228de3",
+  "0x00fe3ad1f7d405ad161fe64ba928307a2fbdb9ac1157dbe82e2d6d72f5044edf",
+  "0x002dc6b27c1b5fbabceb49c8ed5d3c2dec4fb00afe60324b03cca49974726d60",
+  "0x000f1525f80fe686760ef1f3b292c309ab7452b0c3678b4c0654b5ae25a3f32d",
+  "0x00dbcbc18aef1cd4c03e4335ecd088883fd93e6a2ba98c10d2ac34cda77dfc48",
+  "0x00f4e56686b75cd63c78b800bc9a5fe549ca6bcd9d6eca61c1fa5a104fce5546",
+  "0x0054e54c83d00911ef88f8f1ed287779c630a34045420201d0669f14c1b4de66",
+  "0x0018c65a26ab7e3b8ebac5221afa73da55ae5c36c08d9a0018da7d5d17e29872",
+  "0x00711647e952591a6ca41f5620fa9a03bb75790f8f81db6dfa82c31548480456",
+  "0x0013925676e49ac65094b4d49d52e1a170e5039602fcf864b0ac6f7e9da2e562",
+  "0x00d91b375ddef300c30fbb8aeab90cf398034b025f3a80928e5648caa4305977",
+  "0x005482eb58c00660408674a52b2dbcf144f6cd81e8eae46f8472f23e676656a2",
+  "0x00eaca2a637d4108f9d875a6894f7b6d422c7866620003ae177a6e3d0f8144f4",
+  "0x00e94a79f13f9ac53694a4f4a7937305f9ee22511b40f32cdc5295f811329b1d",
+  "0x0092a64411b0146c87875de91204ed5887e86adc0e1420b95095a40c3bebe4e4",
+  "0x000b8ee89f7b2e5b15306b27947219fa81b6ed217c7e2f062405610b17a3eac3",
+  "0x00cb681d138ffcd55f855e933bb676a70e00ee0cfe6b052c3ad9bd98b0f2830a",
+  "0x004ad7e724966e80273dd1cbc4438c33753f51003cfa7a9539e655b5500b916e",
+  "0x00da0e801b70978301c27e0932a556f858dae29306da56a5e9fc4d12ae81d4bc",
+  "0x003c88b248de4edcb308ffabca61a81d0badf09ab8c0db324115cac211a33315",
+  "0x00fa54e31397b715b3b4f78d101a92f46182627272e4bcaa9661c18423b7aad2",
+  "0x004bf3e6103dbc0f11e88e4a96ae979650b453fb23293d6042f422ecee105c8e",
+  "0x00aa32266a8e4a7794d11c5cdc0b3a94828fdec171940886f71c481595573c45",
+  "0x004d234cff37718289fedc718cbc31527aedea95dc6dbfda696e03b7eabf9023",
+  "0x0072505be5605360c6974f2456aa1ef0a20a9d080af340cf4ca3a9a605398257",
+  "0x0027fb05374784e684c91cc9d14237550a7c4f394cd83dc375629c0992093892",
+  "0x005a78001cf50b1003c738fb1d5bafa348bd87a995a627ea058d269df6467538",
+  "0x00f5a712d8697c55a2d079a425ea01b2d5f1835a6024452a4dee96d8d84ce12e",
+  "0x0049b1ac87b46fb780996fea081b31f7fc3a48e93b44c74b961086fac1dec208",
+  "0x00fad978518359b69586fd3898da97a077f2c7cef71f5092a187a0c514c3af05",
+  "0x00c59283427a17f123d663975bd19939ee89775b8e7c94fcd9bd5b3241ccaab4",
+  "0x00923ee87ab5358cec0dbd2a80b8692b4bf7f4dad1f8d844f4a7f9ab4d8bac8c",
+  "0x006b4cfa0700b36c4eba18ff146692a3280bbfd3ca77afff2ed4f28b77279806",
+  "0x00b3df44b2ede48afd7f8623cc1effc2ba735a26f84c7bab2fbefcec7811f5e8",
+  "0x001c2661dc49f216ea9d0a8aa92b42bd3b47d33fd14489514cb7f8bc27904e48",
+  "0x002dd11f2ea077b2dae65a51527862c022df36c0307acd228dcfeaaad24c348f",
+  "0x00cce3192f03077621ac9dfa9d3c74578df9fc4cd92279c5424a5005bd96d494",
+  "0x0019b5385a04d7a04bc5e959cf3c7ab40161643e708d0e7fb4ed3e041ea05b27",
+  "0x00c69e7eee0f2d74ab6f09f20334f09d71c70aa1debc9ea6982a4466a1b0d940",
+  "0x000470dac797cee8c98eff759b080f250f4741af184c23ce815aea4cfc4e8c48",
+  "0x0077db2fa409a80393e0e0a2c11e9d70c2e5a8638c1c9437699dec6294712973",
+  "0x00dbe9cc8ea14f3af035459adf3a81e8907f6825ecff3d23339995592e3ef0ab",
+  "0x0005cd8fa6df56ff6bea8aca5174379bc05b1be3005208151bc6ff12127acfed",
+  "0x00fe3a1af45ef5e3ad0e4600434f0d35e2f2497d0f2b8af16731563ca0e61964",
+  "0x009e0611af494263d72231e5bd024838ee9d685df45054adc5605287dd911383",
+  "0x00cb244e2dc1b125f1b63565440a6b12d7fadd2f224dd9398eef59dec2c519f2",
+  "0x00ab953633f658117abda1c94812bf746724499504dab6d9f73ca4b1e5b479ad",
+  "0x00a5e839bb44dff0b346d4785e34274d2efbfc96466adbb951531aa23745fdec",
+  "0x004081ac19c5d624029d58663f1a2d81fb43559ee9f4a0ada6939ee3cbcb59d0",
+  "0x00fc77c7714e75ddd629369407eacc37d4f06ebb6408e1a674c2e6f7458486d4",
+  "0x00200f4567c708d8bf6305e1596756bf740c1565b6685bed4acbec81c21e334d",
+  "0x005190221e0ed1fadb52805279274d6070b4e66e8f99d6d677c5ac7698c5585d",
+  "0x00c060759e742ac60dee8624e7bef11d95c25a75752ba54a9756cd8a3ad29b49",
+  "0x0088bfdbc2d149a96860d92213b3efffe302b8047b685f2f070f92ffd11f126b",
+  "0x00a9709e3d7c990f3e9df6aa1158b267befce727676a06470440a3d439493fa5",
+  "0x00481b00e3ea9fed099f355ff7d93f845461ff60187d1a93048e185fb3fa17b0",
+  "0x00b0ad26295afe5052a8a146fcdd7256616c8502f52c581d39939284c10b88e7",
+  "0x00f37729095752021c4c756ec5f82a1665dccac4838106225af649aba0719466",
+  "0x00896364974c0f4ab9ddf0ff8efc0ea0291196a724c38c9f0bfaa824669e735d",
+  "0x00ca06d90a05cfa04f1f12c01b554b77ed4a1803ef900d1739e5b7e0fcc4298f",
+  "0x005cf219fa11cdaaeecc9111a3c6d5d9f6b6ac48d73cf2ca8459f0001a7252aa",
+  "0x00a0dcacf4d8909895fa74ac2fb19dac071f3eebaa87a9b288569545d3d4a459",
+  "0x00560885c50c9b3330f2883185fb9fb889d8274b7aad7c09287602cb34b57736",
+  "0x0014091ac9016c73f76c16da9ee2d7c0fcb1923dff44069f3e0c48516a489dff",
+  "0x0011f6cc01f0c634990c827ed8ce622106bca44d800dfceab72eaca7b97aaf26",
+  "0x00062a8bdd4c181da3c0d8db39fd5e3fb4a2c73502e74d1582545241cee24f6d",
+  "0x0002dcdf3ef72c76dc4f2db72b71f0c38092e7336e4819ab3071674f1e213948",
+  "0x00d300b5e4bc03e1786182b5e2acb06b9bcecf220dcfedf8282cb66daa14b336",
+  "0x0098bd593aba34edd8c5ab0196ef9decf21b554fdefd3d65e20e0bd10615f893",
+  "0x00bdae3b00f52e096681762b639eadc26f8d5ae0152e435103664816630998ab",
+  "0x000d4377eb4b67c45637153ce4e9d91ed9cfb974ecc78b839f6accdacb71dd92",
+  "0x0074b62778d941a2539ff5f3c5612df968c04a5edc39722fa9c58fc6d79531b9",
+  "0x00d4ebaa8947bf046bf3d9c56661d4974fcd2c59db6b00534c338a65567759eb",
+  "0x00a53e0d5d5a57bc2b20f0a6212d3dee63816e0ac3adbfd7c3c688a6477d306f",
+  "0x003dd28b3becf359f1038832484168f47ccfb88daf62379251f125c14c75000d",
+  "0x00049973f1c05f070fe62138443073bbe3f28dbe2e0389ba7350220dbf127c8e",
+  "0x00450aa2c34fbfcbfa2ff9c037426f06c3fb1686ee6f4f12f5b4f5afc073272c",
+  "0x004f8dc9c25c46adf54e838982fcc9ab2396a13a8810d4cf32cde4168ca64f56",
+  "0x006e8e03f85bc18191b58538adccb21ad65246f59e591f97f48733f7d6bea23b",
+  "0x006cd3fb83405999e677cf5d7487887acc7b1cc496aa44e297166bc89ce65024",
+  "0x00960212536689cdbba2bb302a06be296fafa80c8188d0f63e081c7c8024e9c5",
+  "0x00544a83d08c93b1389d7725528861b5026c2c3e85cbd85ecb68f3082908a73e",
+  "0x000e7a9088d83afd167463f0837390214f4000db121bae34a90bca1f159b7e8a",
+  "0x00f98fc88ea73c8f6942d155ef39829684cb33dc0a9b408309fc4c1bfe22b894",
+  "0x008e676979c9c2c35c2e53e771cd34706c337f220952e07aec75be0d51145027",
+  "0x00f3f80db41e4d5b34a48bcfbcc7f82f3b878d81da4ee41d739eca84037b9e2f",
+  "0x0054af458a4daff7aaa295af26733ea8d49749b759bccef54de69638fc93799a",
+  "0x009d699fadc87947ea6d2c12445c1a5265ff01ad0c91582fa4bfac62d95cd3ad",
+  "0x00a2a16b2d92288b9f954d012ae4db21e50d538a94c38558cba0899d7e73e2ad",
+  "0x0067b4a5355b3b0087041a43f2ab03ee7745df904fef5ea244d039c903ceb091",
+  "0x00d7a48abc04a190ba3912271166e8dc93fc86be702a6411d7d66d6ecb9b293e",
+  "0x00d38a3a570b4d0e3bd2a304c34898351936db4e8e9278f331247f77c736b210",
+  "0x00872ddb3e904029c680fb188e5475e855fece2fedd07f2a4ae1bad46ede51d3",
+  "0x009075efaeaa2b761ac8520a05f8d633d5018f63fd4b27bb140fda33483b33a2",
+  "0x0074283d7872f1ea5f1b97b8f9921faea86c1cdbd66164eb39dffc6bede8558d",
+  "0x00c56fc456899d3e6ce3f1affbb9b7b070b7606a4378c1878555c38dda18ccd8",
+  "0x0077628608d0615b89905aecfc878a2e56ece2359ef12a196f200d094862a2b9",
+  "0x0028bf28f847b0f28ea3bcf441390d6688d6f388d6c14d056bf810c0a2e36012",
+  "0x0094b752463346e22191e752f55e58adca12af840b7491b8630e12e5bd53d87d",
+  "0x001f60ab6e2bfdac64e66e9d67553501cf841d8ae37fe2aa8f469ee7680760c7",
+  "0x00dfb73cb441dab864f6ca5fdbf5cc6278ba1905b663970340175eeefcbf90bb",
+  "0x005c57d2a80127b9902f9799f172fe384852ba94a84e8454b823bea37b6c6bc6",
+  "0x008350a4f1a5bbca102bafd6aa0fdb0d547cefef0f251f0fac0bfdbf45f6f535",
+  "0x007e1655610eca51be0a6518710cd90ff44cdd78a60ad37bca7a6a99e784c81b",
+  "0x00c896fd7f29c3be28f83c987ed24a96883034b4e2c86afca477b70ce3bb48a5",
+  "0x00ac938106af7be51e768d9f6c0b31b2e8a5aae4f948fcb965e8b512b1b115c1",
+  "0x00821ca77be45ecab881a47a312782959c9910da5c92ec3b465363bb9318eaea",
+  "0x000379a5292696b0c00395f7a88f399d57d1e82553fbf2b00edbbdfc4b1cd670",
+  "0x006a4a43463fb2797c2a64e82f5ba9cd0aada8500947b370a2b6c1509eeb96ef",
+  "0x002320aebd6d209852a8b20bc96027da97ffe47230146f331c3b2fe3ef5fd166",
+  "0x00084900fa32b26e930cf45f312d3c951b715d8c0d92b6d7b15ddc6cd2dda6f6",
+  "0x00094fe8e88d007793fbbd41812b45ef1bb92bce16f1759c030f0f30e5a78b35",
+  "0x001c4ae4a057fce62c55a015018840fbce0155f39dcd90f1c85bf0d3cd478320",
+  "0x000df43e5f53ebcf4dd664c94eb5cd93afb3abe811d9dc9da7b1679ece9bcbbe",
+  "0x00c373b8a8e96f6c15f165aa1f44677c65ffb3cf2586d235017d2ec7202a83af",
+  "0x005ac0d0316e9e5b58c9cda198618bf934350ca446e1d89b9678d8febfa7097f",
+  "0x00db546a5ffc90afe616014af94fba468e0bf9294a9fdc9cc018fce0bd187f79",
+  "0x006f0f795c70daa026780016ab81ae08f980dcbb16f5b66a48bdc8c1d8ed78ac",
+  "0x0053112e3ef6b8bff7d3c974890bd8f21f73fcd29104743047857d1b28cd5272",
+  "0x0012dfe8535397ca222b82fd8d1f81049b6b329fc8e8c04b9df4b6b7a31d8d5a",
+  "0x004c579a0cabef2ba7b850c224d97eafe93ed023c801ce34d404542dc699ef11",
+  "0x006438d149b3d5c954b5c2c6bd432ba51f72db66407335f43b20487cbcc1526f",
+  "0x00e710daf787f00e5b597f9bdc0d9a4386ef718fd709986b1a8d0b28a5eb81b4",
+  "0x00729aa5d89c00f22753a7b1e4a2cd1266de1d310b8f7d3bad6082bd857b7bd5",
+  "0x00403c0b7e953a13c5256b9462c07ea69472714235189cd7734e0d538b8db887",
+  "0x00fd4ef4be186ba095017acc419a1a8d7ebcc5d3973c4cc77cc164beaba73754",
+  "0x0099e12b2609e52f328f354774bd596258bdb35f33480df2474ea08696b87f50",
+  "0x00b82de1aa129698cca68f2628bab1079b35b17e437002ca53ed3255e1d9da34",
+  "0x0065c3db031004b4a6e4990921825f56f6f422d1286d4979c7f9d26c6358e712",
+  "0x00b9d89ee4ec898236d76f64d2dfc13960d34c857f9f14d1bcde5a6b3e34b7b3",
+  "0x00e6fb2d7923e923471898b2a6abd8e68b1e633fb5d8f2a97fe606e6da15543d",
+  "0x006bbfa2f0f0daef13ab7e09bb0ef99b279a6b7ebbbc12ba5a9f47b9106de112",
+  "0x006595e5c105f34c8c4c4d4e67d31ea16155682a65c1ba7f79cf27212b8d361c",
+  "0x00d1a2660dde4ab6a0ad877f0df31e2ff0cd0dc5323c01821f599d642b951be0",
+  "0x0081d8bcbe038387d02c809fadc3bce26132a1ad7a47e330ffe839ea1c89b3e5",
+  "0x00576b8bd38a2dcb3ec1b8ad9e096c202ee4fb55aebffc89a03d2d47f26add5e",
+  "0x001cba28aaf197f41e1dc41a81d0c88fee35fffb6d042d4487154caa422a6d8c",
+  "0x006b81e2330ab8f4d1ce4db000b983bfce4791b7abf2efe5595b55360dca7969",
+  "0x00b4401865c0c3946f1d81289ab27a6033fcbe235401c37f22bd02c7c2e24428",
+  "0x0006127b874f1cecb3957e777b4ca2fe721a97d2fdad5a2af4f68413ba979959",
+  "0x00bb7c0a9934bd781f9f1c681acc25f427f07bd2e78aad85a501d3b606984495",
+  "0x005d76103ead6a757f8fabb9c72020d6bb90ec103d3e6ea2f8692046cdcbb45d",
+  "0x0019709bd085b1f93613b32fdca2c6dedd0730a646912fc2f49339ad308144f0",
+  "0x006eeca96beb05e0f9f698616df386f9712d15f0cf1c1c5cfd6afc5225c66948",
+  "0x001eb5e07beca7bd38bf6c4b02e7997ecd13980eaadaa86d6ef58c2d3918c62d",
+  "0x00fe00922708a2aad3a04daa28a593b6bf6acdcd823d4625a931c0a6485a5aec",
+  "0x009f237894bb526fce60e5c637901a1d3e08d385a075700e6b022717c8f447a7",
+  "0x001cc87573a2403b57c33c7183741d6d36c15842cdda37d23778d145d14da4de",
+  "0x00a9adcd8429ef9b8f3d3ae132171c592dc0802fad274195e50ddb73824694c6",
+  "0x0047dc2ffb61192b0c493947c88b1ad1ad7dc0ffdc3e0c04cbafaf769c536220",
+  "0x00c059a88961db19f636a82854f64d1ded34fecd9c585ebf9d4aca2394379e28",
+  "0x009351d93deb3b3ee7a35aa01333ea9ca7d61c992964c07401b25647bb37ea37",
+  "0x00db6b15ffa6ec93d39147b7a9af6aa98bcadc690909f308f2503a780811cf9a",
+  "0x00fd6c330d8dfd651c813ca035f477797596fb899bb11a768f1b1a52ea85755d",
+  "0x00c7774db0f4e18244137cb81719fc2eab000d9d153103ed8dd8f32c4edf1c13",
+  "0x00afc4f9d1ff14d489dd68521e0ded5455d70830991dd6e2708a58356ca12e7d",
+  "0x00929192a946977e99104ee11d804b4a08e3d3da6485657ca0627e4997379710",
+  "0x006f0745aadf72ab233cfecfd29b3597360c903c1e84df03e0520ceee23b4a57",
+  "0x0046f5e6db10eb3714b755db5c5e7c2b3ac2668774fdc08c735441279ad42d3f",
+  "0x00ebd085fbfc64309b050d27d23aa593384f8675192df988f0622d2326d4b5fa",
+  "0x0051d30985d7420fef891dcf954577f43f72442dd14958007069161715fb81b4",
+  "0x00412c89c8f0decc36298b1fc5ba23469ac29cbc49c69daaead41bd19dc09582",
+  "0x00f8fce0cbef040beb905b34ae2c996a0ef885682bbca113f8285d2db57577b8",
+  "0x006c0ceaba27ceda641a17b1427740c990e1e437c77d5e23266872cf00a36c2e",
+  "0x00893b6de2c88c4a7683f0ff07674b3df94027059859af2e7dc961c5dc5ef422",
+  "0x0035e01687f7b8d267ddbd5d06d920c1dd38bd2df81ea60b19c5462473a330ce",
+  "0x00859df0bc08c635e533612e5076771e2828591753e04d3334e3e0d05433f144",
+  "0x00cd9272cff295baaf871105b6ec5122314d3ac7c2ee1b2f9d0e7879318634a6",
+  "0x002c87cda016444dbc917e11d0d8335f61ede22f4fe50626bb5f6ef828730dac",
+  "0x008224e5fe0d50a304acd9ee9c68e192b08f6467a546e34706768c971ad66147",
+  "0x003f1a06b9f95b85a086f203180d62e04cf14a37d78619467625a2d1f1633f78",
+  "0x005cc6b58453d764cd710d8ab736495432f18e38d08c003727dd87bae7b42c93",
+  "0x004454633281b2a338fa9c95968a5b275f6e1e5aafad780934864602f1cd2087",
+  "0x00e5c8023938a790e06abc1b8106aa928f46c2250bbbd4775d1a54cce7baaacd",
+  "0x001f916f9091b389c433ffdc4213efaa669981e189ebb69d3c284978e61bc15b",
+  "0x00e98e83d99d75d0fea9fefc315b8948d0f9a7acf672da99de21c3404da94718",
+  "0x00feceb7c5e1072097e2a845688360588446cbe818d5839cef07ad1e2993bae6",
+  "0x0005cb012c5aad05df939c952d4aeccf8fe41c374f89cceeec9f052b9e4d36ae",
+  "0x00c5120938da314252f6bcecd19c59c6dba4ec7b5c8e520d843d4a2de4f1b600",
+  "0x008a994849701000b98dd8fcf80ce7b201a879c16669149dff6402bc40e5a7c0",
+  "0x00c97d832d3751bc73fc6fede1bd7cfa98dd2c4bbb68a6c8383839300e682450",
+  "0x00b28f05bbfec9df9bab03e383b61e03be7eab8296ea15b4dc9ae7018b05f410",
+  "0x0045d0948a36255ead2a4e3f67a7998d1f43ee582cf8e2fe33956ecfbd94a3f3",
+  "0x00803739861d21c9fed48738f35ef388d3f824a867c3adcc13867a00f7aaa841",
+  "0x00cbf27734572c73b5a951d1d670c4424d6a334eb0df45d45eb6e4e32bbcc1bb",
+  "0x006626f2d2e74ed28ce5e8e928a6cad27acc9af56f54bcc011c5e82c797f635b",
+  "0x00ed10c007e316321f34cfb631ff8260203cae956ae96e5af80c6422a3898917",
+  "0x0063d2fdb6e2c228381da5d260f4b417408d813df544d3a6e8bb00801d051bc8",
+  "0x00fa593e59765b7a27b7c31f5328abbc901fcd4984bb548637760c7d9626a442",
+  "0x00b97fa0058eeb124eef202db8a976dfb69ed659cacb39f23bf56f948fd7c796",
+  "0x00f94c2010645d948185e5c3a2ac60462840e4a871a92af1f64df8886a580286",
+  "0x00cac18445eceba6c8725cd0de1263d5c4173e5d0cf7aab73d738b6a31a45a85",
+  "0x000a2113239fe3d27b3120542813e1bebd70cdfcfaa953296fa32af0d0737178",
+  "0x009f960132dc779a78675640b618f3752d1790204bfaf8159cff245718f7241a",
+  "0x00e67a98c71548b543e46295c54f2231970d238c26b24b9daed786aba53a2545",
+  "0x00fb5df950e6965168f0a8f3f66864b1b620d6a96fbae80716c76f59c3a281df",
+  "0x00ed3914ebc916dcf26e790381aed9a941d5c69b262037cd75736e96362e2094",
+  "0x0087f910e892ab621049823d5631488bb2258fa10af61e8ca5b7dee6ff5422dd",
+  "0x0039d386b2a5d26debe8f0fd33593877c4d511c07f036693aa8a7bffd79479bb",
+  "0x00bf53f9ef776b2dad1e14cf570da2b3c6ec5188abab81f5b629d7a6331c43b1",
+  "0x007ec3f9527a354470924841e137b1df52cf2eba5ccf5b9f5d9b886749bff249",
+  "0x0053071b4a36a52a417530d34c3591139d44ce602dd2c8eaf988a95746395db3",
+  "0x000587592f2468934db51946107a54558d95367c0576c1ce536744fba4492d71",
+  "0x0065af317f0fd32d37e628f8e18c9174fbb669203ff313a65166b7431668cb6c",
+  "0x0044e779e4e05417f85967929a69a34f86ec199d2ce31c4848271b9daedce37d",
+  "0x009d0d7d8695c61575a96975e8ad5bd95322eddfde0a6af9e1a7df016fc070cf",
+  "0x00c187c9f42d0b9e52ec528b8010a89dad2195422406a6e3985fe3d93fc67b23",
+  "0x003435fdf41c90a3026d126b5c7d27a4613961d4e9140781c2d9da7cb93c5177",
+  "0x00a4d559a67cfafa5586f4dd41a127feb8922538dc5fa6f674df6d63b2c51ecc",
+  "0x00a9226ab679d1fa7fddad4a15866812cb88b3a4c4b36c2026390fea5b69b389",
+  "0x006c9b8b90fa6126ec0aace713ba6b250b0667032cfddfca72b473d92a5007cd",
+  "0x00a0af11b05e1aa5560947d6c7addf8ca31018d34f2dc6d32b3d0ab074e63738",
+  "0x00db831fc2d3815776aaba48befcd028892967d4699164bd5074f8d157853d53",
+  "0x00cdbbff416de0f6e41582566437308ba8c076848019d74ad8b49627c51a4f73",
+  "0x008179ea3b56e7a97e80c54948dca87bfc121970837357339727f1620c444fee",
+  "0x00569197e1d57f2e55dc558445e60eb39874afa6398f62d7e5b13c7122f0920e",
+  "0x0033b1475d787c2328f268fa21ae15aa7f23c91f1807c4252b4af906b0a5017d",
+  "0x00ba222d8faab6bab3fe7924f542c42703a4532ec2b12db64941d6da94042baf",
+  "0x00440007981d35f9807cec4ab3c1fccb1a7663b4b519319a8ff702168148cedd",
+  "0x004b6a9db0814e8745b843820b311ef303424f7d59b36e8196b431eb4ad1b5e2",
+  "0x009974c2cf09239241ef41cc58a9876f8e139cb9901a4fd601661e61738effe7",
+  "0x00497d94e7ee3502f82e0372b6dcb2c7d6a6baae2806e8f33e1102b8b09b9a42",
+  "0x00caf15f143864b6d30bc45cf25e31b4e44d059e9ee5d3b680a0cefd653efe0d",
+  "0x00434f6eb2de9d610084a97a35db3c96eb243fd1c32f05c2838366978de98723",
+  "0x00c295e4bbdc97aa43b76749cc47e59454add92f808ffb8da24578bcfe3172d6",
+  "0x006f9d8f49484fbfce068b40e5a8a861c2f337bda1d4a9f2798b7b6930df2812",
+  "0x005bd671744dfe868cd0d6cb537aa55aa06384c9c6a996cb4c9ed464c7dd57e3",
+  "0x001c3d99745d675ba6ecd235d74dbfd695e266a4d81305f4b5657ad324874b27",
+  "0x00a2f2e6e5c4841bc4b10bdca84461f16fc075f1571b5755f05630cc92fa14e2",
+  "0x006b1592c2792f603b60674378f9497d74c510028b91e488de73febe4861ab07",
+  "0x00bd696fd25342d9857e95ed3ec8f9e98d115f47e6bb66036785e8883939987d",
+  "0x0015c4a748cadd901e0c9b8349b807c87b6831e006005fc9b413c8c9bd698fee",
+  "0x00e107f7e3ff4ecbc45df43d5d1cec06baa93f01d4b4615a9453414084f403a9",
+  "0x00efb6503304bcb43f887f3f0486c57dc0ff4e4e669e32687e889f3e5d46b9af",
+  "0x007a9dbf1a582cf78d81a3a40e932e2bc00ea172b755d780920034f5ea6e1b60",
+  "0x00e7eecf2c063dde782cd63eda3ba4b42f9827e68711d317e414949fe9cb0710",
+  "0x0008935dcb8e91efc2b9831d4bac1dc4e56b98a8159a40cd232c178d5fc5cfde",
+  "0x00cf1838d052786e8dfef6a7883190317f4a73357652d5d665202cca1429deb2",
+  "0x0010c3ddf277ebd93bb2d5fee0bc7d0edb843359e64c5dfe82c3b0d48efa873a",
+  "0x00c824a9533b66ab045697eedd253fa18cb1e95d850249d3f09c2a938dcae0d4",
+  "0x007156d6b02b018cba8760a0af3756a3b94144076ce812e11ea9b00d050c0efa",
+  "0x00b4d9bf8ede6d11f69b972edbf54e36e94707f49fdbb17300caff5b7a1d070a",
+  "0x00013d8a25340fedd8e15e8d25ccb630aedb822013524edb278818c9cfcaa81b",
+  "0x00394cd7963cd247252695b972c18ce9682a027a22a351d06181645c929e82d6",
+  "0x00de672f48d3d8eb72d64a03e3672b70f9239c913e3fe02eb0c35f722406e1ac",
+  "0x004508757a2c12e60f996b6848ca330fb8cf405e12865aab691bf974752ff42f",
+  "0x006d7f4d16aa07e6c931e737cc01a9415c9b02373acfca42f3dae9526f71fae2",
+  "0x004e7f67cc8442552e1c0e09d9f758a3e5a869e284fd3f8bbaec144c7e9a3bac",
+  "0x00afb991b35b029c85b0ce6acf7ea08c11e33a5e7fb6d92fcba5217e5ffd1a62",
+  "0x003f485ce8bf7b480c4c4734ead950995025911a1d48fbcbee5095fbccaecc0e",
+  "0x000d579c7b1e0ec1f4730f510b9c72f956117d17c8a3e6e5446feaf5b9d4a50f",
+  "0x004c890392d4210e246aa06c0053b88d0bd1a53f5e4f64bd3bab3f5d9ae99c82",
+  "0x00625cf279886246d867cd940c2b3bcc756668c95c8ed06025055e7d38c675a6",
+  "0x00b1d6b739b9d1b27a244adf9bb95e7de44f940729d73bc50928bbf4e7a075ad",
+  "0x0056dbd27a9debfc94f76a80513b02c16280ff7015f6231530bd24d860650416",
+  "0x00d25dac66eaa0d1bec2a3e5a4a477a4d5478d15c628f0c1ddbcbc1631bcc567",
+  "0x0063e82a55d1561156305314214f1ad41985feb85435f9a31dfdc7503446a8d8",
+  "0x005e83f1c176cc85d3196e495e6d2418374c83b2e945e632ac5ebcb51e5ba22b",
+  "0x00b82bd386fdeed319d28d5c0c7b979759b86cd6112475169a5dbd8c447743ae",
+  "0x0043f95a57b0747d61d6528638f74c23a9292bf01c68fa7c9a2ed646300605fd",
+  "0x00b6a28c85cfceaa33b6ff1e7b633844f464ea90fe4803ab8d6c70cf789ddd27",
+  "0x0061eba3447dccb6af71f4d2ee1a0a2b1c536e4e9719b034783e668ee4d22c93",
+  "0x00da3da7305e90e2470ad554f72c3fa39f0ab2ff4a027da47d6fa339eb54d458",
+  "0x009aa07e92693637da6b27b1a59b7269ddc3f6fde9c2f7f0b0757709ad5f10d9",
+  "0x0095e4e9ebc98e0fd1a463945051c4fad05fe8e7a40de7ba0955481c23246e5f",
+  "0x00786591f30ea8cca4d2e6cf5e8e167280fc88b492ba3d66a4e820c4b58ddf31",
+  "0x00d293eced477f1b512b571a896748fa28fd7b959de24a27d18931cdec7f95ca",
+  "0x00488fb8bebf5aa9a9bb8fb15d198700f164dc312c78b13d7a549bd7302093d7",
+  "0x00ece734a1714105e1efca2a23fa52b530221dfbc77068d6102ff528a2a5bcc0",
+  "0x0004dfd8541ee0983ee999f8fb3319729345ae2b3874e3dba25d9e1cb2a86136",
+  "0x0045f7705a9d879316b815a2168c2aa064bac071079da801743be070c219399d",
+  "0x00080b5740d36fe624daa440e93a2726b3c06d73f7fff4ee665a2fa7348b43d5",
+  "0x00d7ca72828209ef2e035b944b77626bf623f4d5a47efac129ddd51080dbfc3e",
+  "0x00a8532039dd04a051582395ccce3f4b0ca8aa0bd97a14ad5a596795bc55bab7",
+  "0x00d3b7dc8a994af1eb3b4cf640a038752d50e6b13ce2ab32ae9fa3c4094bda53",
+  "0x006cc4a20d6fec9047e3216c530863d6937f07a772545c8a5b0a6d7c440b1ea8",
+  "0x001ce20b88ba8332c8dd90f2b68f22cc0485ec1dedea804e2cacbc8678ad069c",
+  "0x0026104e7b5f85abd4de1a71197f15ad38742bd9e760914368c4b18670379c36",
+  "0x00b01e7c7738117af7cebe580cce6d7a7e612f682d56ec276cb1996eb8900d37",
+  "0x00f4485c9ef6dda339253649b1f9d67e09508c3bf3da93953a5fca7e6e3978bc",
+  "0x00793bcbe79176a6c421979524aa30b789772322ba10fae14225b629fe602a56",
+  "0x00ff6805402adc003952288a2353935c668264ab168c10ab655a1d77ce168d1d",
+  "0x0068cec87c83f4ba2cbbb2ec4dc16984e6d86261e02900d88e17f89b8a8eed7e",
+  "0x001d932cb122169859d58ec76cea9a7e93322ae34e59fdf0d69fe03731a23b1b",
+  "0x00c31104b882eabdb66a593989ba644f242cf5bd93bc558be98baf02f595946d",
+  "0x0073547358ef777cb56870a820a78f20697c40498b51d11e0dc34d6711f4e24e",
+  "0x000851cac7427e53b2f70000c0a2c7c96d31f80566f35986a22730f35a9fcf91",
+  "0x0035d7defd9d73f7a6bd058f93938e352e372f580d7098058b2d8751043f9b16",
+  "0x006a5adf37eeb382765b95f83ae4e95c9df07d89fb47481b299664aa254babc6",
+  "0x003980f4a613aa9dde7568b58f4a86c9c832cecf63d2800e6ce4466fa47a95c9",
+  "0x0010b01decd2829c49145c579cc8e6b8b1066ab168df17c7f2ae4b218c396225",
+  "0x007cf6b636072af9ac70356d3d42b567e39d1c0c725c1dea9a8dd2000185a4da",
+  "0x004dd769682eb9d81c506a8305de20847da1a6b6f1b0b62c9003ad4cafaa6a9e",
+  "0x007194cfe26ae27ce1aef7afe598369b3d08cddda1175f059174c81f391a9885",
+  "0x00322d54b321e759ff7d83d1e28aadb279abe9d4d1baeaa8de5ccdf42c2e0d16",
+  "0x00f3f115f2b7025c38ea32578820435340af0036dc7360d1a3cfa69979090872",
+  "0x001f7bee2bf91a6d0ea6a10496489f6aca2a383905803c545c7ff40f0f711142",
+  "0x0011a91dba977a45fbdaf8adfff1eb57b66b8f87e7db1de8b8d4c4eb9ccebe8f",
+  "0x001e57696e18d9a688cf0002eccdc684c15cad451e679215e8a65f862e3320e1",
+  "0x006421b1cb7bd2b13311a859c59da97fbc3d5d5bc25aefd900ad4e16b8b3b0cf",
+  "0x0026b17fc8bc48c88e047c8b528edb21835a18af2e0d874d381303aa904eff0f",
+  "0x00c1961652e30e94d73fda8d799e423d8bc764f6d97dd8ede1a19c6c5dc70464",
+  "0x004a6e001397659e7a0bb279be9b7903f532e7b44590f00b6848754bae009d42",
+  "0x008a9dc9489f4523e93daa72821dd65ffaaec5717b18598c93ec6ac079be3069",
+  "0x00da341e23397c124f0d53ac401cbcdac3c44747c1bac1096c6d98c0da183d5d",
+  "0x006c58a3f37c5df707e8d94c2972beb52f15e47355539b9addc0174d6c6be209",
+  "0x00cb187f0e15164cefa73998eb47927a9916aa3260c64b60a3d2d6f652904e21",
+  "0x00ba08f432383d58568473298f2de33e1f8ff2166a2c0ec30fa2f77c55d4a045",
+  "0x003462a547dae02a2afc2acabbc6bdd6d564c04cd3adc5ecfcee0851646d7e60",
+  "0x0004498ebc76965512143e2f787b1616d4f25a3dc0faff3e8683c587ee70d949",
+  "0x0021f3ce4afb60658b25454056f963f050534837c6ba9e4a7644623ca7f54783",
+  "0x006d6e9c5e2ea31cafffb24c503396b596cee93175fafdc93727e4e3e6c700f1",
+  "0x00ef307836469011447a855cb184a328141b2263b4cdc9b1e7414f7c419b801b",
+  "0x00390b4f404ecfff6e61d5ea37e9d75f30d3dfc700b2555495d1f31ac8341c8e",
+  "0x00b887045c4b1a3daaa05c483381500a4d462982b2ea46b255886f513fa8ccd1",
+  "0x005d616f0e3db7ee09628b2b5f553b7af1ed979b2c627b15feb2e2a3655c390d",
+  "0x008cb16a58c81f3ac9242693bea36dab1c50b074ef01ac832250d6a4302071a3",
+  "0x00e12fa70a8ecafaef84b55ba80724b6cacea2737fbe24cf88abddbb787ac08c",
+  "0x0009afb6dfdb9ffd01daafafb6286cfe2bac31f92985a50964163072902afef1",
+  "0x00a8bd1773264a1d771aaa2af0b6acd9123bae285aa5514f984b16723d012868",
+  "0x001416245c921a142996e804c835df3f152603640503b91e1695efbdaba4dc2b",
+  "0x00c918d3e883e038e1622256e0b92f6e2b483dc6d18c306efad62b49e82ae128",
+  "0x00f3b35c543b95d32e7bba0a9d40d8f2707e7761e25122b1641b028920750774",
+  "0x00b76f6e2559d53433fd0f7a199bf872490e516ee6cad92a6b5ba4cd3ae186c1",
+  "0x0089ba99c77ef9780b4d155011a2f4be68102064f5de3c9b7e2e301e40526dc0",
+  "0x00be2d0597949f9d9c9504d62cf42800915108f7874bdb80227ba6eac6ef21f9",
+  "0x004a2801a7cde7cc3f2832a3679272e0a3e5d8392b8e2ee39ea2af9e44c329ce",
+  "0x003a6669029fb7fdb889d5f2a61bed8afde5b92658cfb1b9790740b7709dc500",
+  "0x00744d53993651b565cf3ac0be186f072b57d58e01790106af3ea9adae1dd9fb",
+  "0x0072c624b81dd98e2341f99652ced6e5534b0a3f0c0ae34eb18f1eaedc384a5e",
+  "0x00a9ade86c9d45af0b9d462a5b73cc0fcf8d23948da0d8a879e5d319e0c466f5",
+  "0x0080b54ef2ded4dedbfd66ef0ba785c940d875fcfc8046d6376bf027f65b696b",
+  "0x00ce8285bff4f9bd5f1fd8871ee0cb94afa7495c6d23111b7269db4028a6c80c",
+  "0x004033d9de20b0a2adbf35cfc89a91148b1a3c0cfc810ae87e978f7ab158bdfa",
+  "0x00fb37db0763807dc792922432f401e2aa6f0b43b3b0d99f0fc505c41deacb9c",
+  "0x009042c835698764223756a75e4e754d7872882ec1b6487892dd40fe7e947581",
+  "0x0019469e129651a23956b741323800a8003ad1f154c82057536f1479fcbc8eb9",
+  "0x0085a7dd1da394824ebcd8c349512ab79109e2d69e120aca982a54e6253efad6",
+  "0x001654187a7ddf702ed68ff0314da3400e77c69f205d62f8d4c4829f9c0e4f7d",
+  "0x00b032c8a30c02ecfaff36a090c65c5ed0204d83a2508ec5b930ebf9ec3c2a94",
+  "0x002537946c16ad9446d343d31d6b3a6da11b522106b62da38fae227827ca4c61",
+  "0x00ee302398f310892e0dfd2c30dfe79895528ec3cbf6dc19b898c2970729ffff",
+  "0x00acc97dd23e719129e5990eedaf3d1e21da53ebbdc0385f7632ee42c28e8ed0",
+  "0x00266d99956b450493165e43a9bac9c75e2fecdfe698cde7198f9825a0307abb",
+  "0x00c0891aeb4aca038b55ead25ed2b2a6fd08d2e03617c0ba507869b5ffab3ec9",
+  "0x00661e6ba65aa316a460e18997db703d4f419e24fccb80e45c8ec5778d1068a8",
+  "0x00a9c9a8c5cf6fb7ad0407acbce39711c602305c9acd0ab571a4ae022aa1fbdc",
+  "0x006ca97c7f6f9b6e5e6ca99572bdb5ef6ea1ef1674ed72b0b65e860db70534c9",
+  "0x00f646a9d6393cb8a6d739fee207bdcee1e4ef5885e293e91f8837f2f9dfbce6",
+  "0x00409f54eaa65d9fde410ed788caf4328dc8c11c7da7fea0bc65e02543e32d09",
+  "0x0007f5c48dcd6dd9badabd9be9b0ae377d1235818ca2e7dd23869a4bc1d05a8d",
+  "0x0047e7238f9a0789b896bd145b1cd27d89615ff4e02f24b69c4df920970fdeb7",
+  "0x00b1870d17a845e1d321dbf9df2782a031ba2c1694ac17048ea39e3a279b32e4",
+  "0x0097ed075b27eda5a524bb0c33d1c16000aa42c945ace6a6b3f6cba29bd55486",
+  "0x0047e4a3c59ef42a2439c4054e2092f634d1e4be71edda6016a9e36c66b75818",
+  "0x00b6cba9846a1c443e1384be55cb8289a37de3e01ef6ea93338e615213ae71a5",
+  "0x0055c2809553071e3328238505be68c0f6b92943120e337930599823f072cbbf",
+  "0x00ea39ea4611fe1dfc8233d0c9c849ab55488df89dff6de6dfca46888ca192b8",
+  "0x00f0bdc36eb0e9dad5ff34bcc9f0b41bc48d07509698463a874bef497c861016",
+  "0x00217d4617657a01b0e5718bef2c24a9046f291f5472b19b43ee97852898e8d6",
+  "0x0032dac077fc4d8b956ce1317d9469ed367482415297e1e90b685b1fc43ff436",
+  "0x00b8711e7a071cb7b56a056ab9fd6177c38e671449c65cc4e6a9a8c3f23d038b",
+  "0x00561fff112ca35dc86d3324a8c34e951a9ed2d9805100c8c87d35241702681f",
+  "0x001672d552d381810c18254aa00e15ff776c5624bab1856437824b1c022392ce",
+  "0x00f60c036bd0d0f20d2c717cd667cd36f290048676938ca2eee79fa9acc28119",
+  "0x0080ed0fb199b0258cdfe5ce1bba69aeef285f775b497a30134f26bf3b218911",
+  "0x00484720db954a7287a71b3aafb3c309a20175e377529c70f8fe949492339e05",
+  "0x0028cf2c06b89102b18a48d58cf628e98487ebc4325fbeb78d9c0b39f7eb6236",
+  "0x00db83e1058527ef71062910be25fbe1244a6761d60cc2710ebfebb2531658c9",
+  "0x00cd66e2b6d3cc96966047f2a6d210628de71d4579116df407aa8713c5816f58",
+  "0x007210d79dd986fc766d83f84b26d47889394345fa0bdba93f4b1fc927924375",
+  "0x0078fbe505229973b34f50bc7d800eb5e54f38584ebf346075b4b91c6575eec3",
+  "0x00cfa6bda52b6b9b5260308cc6ef7673e7a816deb11240175bb24f3f44121255",
+  "0x0077d6ee969ace06ff026c4232e04b9a7d91ff661b4aa595984f78fc2fc647be",
+  "0x005c9a73b0dc3b552016b09f935c13851dcf923b38b0f9b565185e1322ee1049",
+  "0x007005acd61cc31a25bcb1c86f7fd494c96b2c6edb1bcff9c963e91c4f937c9a",
+  "0x0093f62703055f2acfb1ce64b01d997072503f2b6739225cf46f1b0b2fff76fc",
+  "0x004f95a24b9ec9b5debdeda93b837ec389825cc41b2b0d4ad99cbb9b34e1399a",
+  "0x008bbc99bb2931303f81974758301d3667bca9c61b7cff15b4e98d6c51a2d40b",
+  "0x0012d93de24b10defac6d8ab6cc14cf17099a58d55c74519efcd6db0cda04c2d",
+  "0x0012d2045aa8610ead37eb583bd8883b55ec25e97e07de162caa530676b24c4d",
+  "0x008948c810a65d05b43102985960cbabc1351bcafc9c57b005300e197e4b89ec",
+  "0x0065751b37243be79651133c8a9dafc3a434999bb33f82c743ca826ad40b7e24",
+  "0x006de73468028ec48414e25e31bb6154c4c9d71d7c40396b9a9dcceee76907e0",
+  "0x00d5fa9707a1c546be3dd8ed53c83c701e5ac9f5ae5efac8e6bbd98fb0d336eb",
+  "0x00a8edcda29f05d7fe0e83ec541e7d5e0650162decb4cb19623ff358f5be62f7",
+  "0x00a3d83bb966e0f8a72a78d4758432c19c77054980a8fc622cc826c885a5c219",
+  "0x00c5c2500b03d552f2ec0cf6b96247c38d3f96042376752832d93b895e3656d4",
+  "0x008a2d8206f35775723a2b8b7c0d7c6d5ddf0562d9e360db11857dc9e92b9fd8",
+  "0x008c3a1409f27172db6c7fc7adc05a6a3b693de2824648b36533e03543ab8181",
+  "0x009eaeafcea45fe3ea3919d8ae2f55e057779d4ca17f65b9e86b0e8e337a4b38",
+  "0x00a03033165e54784b15dc62c28eaaa7f1f4e2ff511e1729717e3045cbe83013",
+  "0x00998960de16b36ef856cb58a5076f93fc6778993b83220acf056c9d55f9a6b7",
+  "0x00a496017feb079dec75831874e7f10b7cde8df653af66c19984f534383943bb",
+  "0x00d2ddc484cd66a011147f0b759478413ffaeb2803d5ad9e3615d5d635fe7144",
+  "0x00dcf5b0287874dd87c97dceda2702f398087a25e3f5f0a5e0b9ed68e8d464bf",
+  "0x00f210ce35ab7693a0437187f16a7928dec107197d9430942875250080cee682",
+  "0x0005db2d6c79fd4fbd599a298b2c936ac244d283cf3814ff42d61a77da755364",
+  "0x00480de62399d8f975b616c06de7e5f89334051b1e35d91d5bdebccc2e2859fc",
+  "0x00afc8d62a7d2b953635e396ed755c2c8a9130827f6bc416a9676b2fb452d72e",
+  "0x000e595ce3aeea011114b7f0458bcf35dd112f5f84b65ac8b6d87e14a126da08",
+  "0x000fb0493b58d3a8541b39685a930a569118a285877a389664a54800dd8d0999",
+  "0x0048762dd339e3d7c2b2ffa7659ff832408439df6d6a12a7d74e805a64e9e437",
+  "0x00d596b111641be8ce5560ccb7909fa2d1396fcc014d0a1b85a7428ff86978a1",
+  "0x00f12241e3d6682392e65c7277353b477bf2a1db9cfa2be44065f63822dfc4e0",
+  "0x00aa8231b45f9c7e2fd0210affac698932fa89f78dda34a21c7690f119d0f4b5",
+  "0x00dfe4f32cd8929f7edfb45424ea5123054ff8b3cf3c0e1fb40a7bb7775b3d21",
+  "0x0059fb6fdd15b4c49a247816956ab5ccca31a7533bf6e4962f0b32ffb48be944",
+  "0x0038bf7726e4aabd1a6ee826ee8249a35bc792b134e848ac350efb9ec1d14c2f",
+  "0x0096ea99f28904f5059cd6ff82e80a9e99923053abb9148f04aca00ceb486aa8",
+  "0x006556e173193ae07fb43041162ef5e009e33433ae6bd7df4b20c9d7b372e71d",
+  "0x0095df3415298995a4087cd4f1582205efd7754f6ef946a1b73b7ac949eeb1ed",
+  "0x00b7eda6d48e90c26712b625efcbf9727e5aed6d36200d9e1a5833321ce3b5f6",
+  "0x0033c17c709b639e33b568dd4f60c7d2c71af4d28ff90570e6e193d26b5bdfba",
+  "0x0060153aeed79ca04c20b4070468dbc26faf5891a5df6c915843030620b5b614",
+  "0x0029c3bfc42b9cfc82e2bf4d52cb47670af49bf1028cad6e6894767813b2be1a",
+  "0x0014b72401d4bf7b31114d0c3c26b136937b13cd5843a394dad41fa778566d0a",
+  "0x00b7755c9458c686061f150fd48d240c9069794ec778db6cfedf61f1519643fa",
+  "0x005097979a6d857e9a1581f1ba3aa21acef7a3c765d47a37b6ddcb988fb52aaf",
+  "0x008498158549c70232c861894475c612daa5d64db078546396c50a166954d320",
+  "0x00102bf3372e5c28041ec1505e0a9678596fab9967ada6156b7546bf4066285a",
+  "0x00daaee3ad08ecf5b38e69a70d305b7bc96efc1cb4d99289f72d738b9e23eace",
+  "0x0090fab262a6059137abca96794e43feddd453f2ead489117ff739957eb6bba3",
+  "0x006049d41185c94b4ab6e0354a86719201c1aee19546cdf8493bd1e81c004fc5",
+  "0x00e7dbe10471ec8ad58060f4ef0eb17b25b002aa979ac08d6d03b0c417e60f77",
+  "0x0021b8d731ca7a24bd1c6e58d2291450fbb6a950bca4cbd8bbb4e63cec3c8ab1",
+  "0x00d9c607c5882fb21b92f570dfbf4c7b9525d3da2f5124acfeda662a54d2f464",
+  "0x002be5b4db952607075ba6ed781d38168fc27b412bb67fd9cbc19ff5066514f0",
+  "0x00a05524194f092d4412455321f096267654e21df7566c782c3d712f8bcfe1ca",
+  "0x006f4f7d2d3de4189b3fa02cf7f0cef266620c72611de4dca2dc8e18e2d763ef",
+  "0x0041022c77a6aa6c2d445ec2262e26745d58a409c0046bfea0a0525b0f748895",
+  "0x0092199f6538b4c0195ef48dba387c35351e88a1a3c030b888e21f4cb8323f05",
+  "0x00293645a899f76bc8a1fbd2c1c7efe5b4a9d507918502000992efbb51011f60",
+  "0x0074da5b7e2829d67bc4c79cf9b1e78f00f6ddcdc858051dd7ee4cc1f925ec18",
+  "0x007c9f970668b6578c805799b524a36e4f9d0bd59074163982b5fe4c733217cd",
+  "0x004162ce1a5b24b66a7de04543a98e40cd7642f6ac7017f4e189f6be8662ecdb",
+  "0x00b3d99610106ec1f812fe0f5231ba4cab4d1754f217071f3ff5f7b433969e48",
+  "0x009d7dc08d508ec044cf2586b0a5f215684e0407db7390e28af84955a3165e18",
+  "0x002a54af38f59bb7ad99cccf08157311064cd26cbc31d7a6f8a2050430cf12df",
+  "0x00634dfc782ce17d0c583528c670886ce70a555d3be42a0bf377db313de3410b",
+  "0x00f4fbd9fa0608dce992ef251b3d68ed912eeebd6a6756ca654d1e3bc6a3f39a",
+  "0x0055796fa0685090728af59d441704f74bd85f75e507bdc000e298b2fb342933",
+  "0x00ddcf0b29027616546167319dbb263747f91298f743bf7280fb1ce4c6cc5747",
+  "0x0097e9eb907fa16d3dfb810ced857ae805b6f36bf6e24a260aad068881440ee8",
+  "0x002b873d99eb62fca06c2e72bd872848c45f1d8f38bd05fa7fe396bb938a2e39",
+  "0x007505014763582dc3009f488b11f0f5a1f1e80ce370d6c279c818dbae21372b",
+  "0x004c0bc970105312e78d80cb1fb4ea0dedb06430058d6917efb0c16240fbbe92",
+  "0x0054792388230a394b7133c8dcb644ce477dec4975dd1f6a4e247eff6c32588e",
+  "0x00e1a0e351c1fdc95b88e2d3edc3cd88d15d714380099bb1dfa12067a04f5602",
+  "0x00cc933a196908e0f083e130c07528b094037b92c74bb0fc4fd6546192740edc",
+  "0x00eeb5cfba3f5d63989adc24f1dcf875a6af907a541f6809e62ce1a4dbbb1a11",
+  "0x0008a19c7933639087771172e8638a3675e33c6630b7fd901e115f5ab2251e42",
+  "0x00d4bf83c694e7ca5a63fc8bf89bb261d70c19cf495cfc33114f2396650ffe17",
+  "0x00a6ab05639fa4a4b634ba063da57fc9a6baef246d03673e7f3cf0d9fb16de1e",
+  "0x00699e3781d1a49af75590e48f3d4e6a7d81ecb5a78eb9bcd1fa80d25b5dc41d",
+  "0x003ef6de9b5c589d7a3b4f30aea1ea08a97fb6a6404bf37ec5504c5752b0f6a4",
+  "0x00f3ae3a93fbe0ebdebeefd121abbc0ce765950d40261063ba6117c1110d498f",
+  "0x0083d2cd99fcc40a4c7a2a742691bad197d4ad53e44920038b39c3e4924005d6",
+  "0x00fdd09bec815874e3a26848a3cc0b29225ff87419385b8f94f0d3a44fa0e089",
+  "0x00f923677e08cb610950bf7cc4d27df21c7d1fa14b969cd7392924a696b75a25",
+  "0x00ac51d27b8a8f459fca2eaa01ae85c814af4e0e548daaf3d5fe3f4a7a2020a0",
+  "0x0094701cd0b4ae19ab085afb2316d8f559eb8a8d81e9d342552ada721abe2799",
+  "0x0066365258465f584cec3e37ab0ebf3f9216d835f26123237013d19650a7ac36",
+  "0x00402032be6d26ea8fa1fdfe41f5205a71dc126cbd169d7ed5ecd0b01f2bd172",
+  "0x0077e181ba4e01ca49c8f08b6b63bd1c49a24818dd47315253ff67a7ff5c6fe0",
+  "0x00592a19fc5e00c50ec5c619279614d87928a6dcfa86a304eddc736fa12b25a9",
+  "0x00b72403bc8ddcf7095150079be551db86914a3b982a5e67709bebe3df291a6d",
+  "0x0027a666071c954b6ecbb1663a9683bbac38b0f10546c52dfa69997095a9c0d6",
+  "0x00390d4e8e1b28e498c8e4c160ac7d21e081e8375b301543320cfe51197cc406",
+  "0x005b2e7bfd08886719b2e673d65936d68655a034c9c4834282873474769fc854",
+  "0x0032420c144255fb4edb3e0d22fd59b35340d0a7a74039e281031d3b452d9800",
+  "0x001d050a728c649e7aec361f259e5e5757e0eef826182722ced6c5e122442ef4",
+  "0x0069a2279f8cc23cf9446b70d8ec025243f4278f7c6ea20402a6f6d27fc3ab5d",
+  "0x00c0b611a2224fc66b9890a4307bbd5a134d0a15a0c3fba75389e1b96577cf04",
+  "0x0032b94f760391c50624b626ccb74c2d72ff41ef56a45417388ff9daa3bbd547",
+  "0x00ef16974c80019ae0b0b631433f7ee5594b7e4e65eda02b01278f63b271eae7",
+  "0x00cc06ffa62b8cb12e1c9f0a79eb16eada591d8b8fa70f3396f90dda8bb4f2b6",
+  "0x0074c8c2c1d84c1d6202d2e20a05b62de79155dacb0fab4646e83daa84fd4c69",
+  "0x0038157f808bf17ee0a5bc8a8acda426b38fd5ca0ab80951782932c5d0c9c7e2",
+  "0x009059d0280983f24981e1a95de80c3664492b455c038c9be00f50749d632f11",
+  "0x0096559ba577aff2696028690877693dc52f07ca721a7d7553aacafd17393ef1",
+  "0x00bd7c6272b42ac7205dea4d5dd2d5874eb97e15d596f08866cebc5cec7f24c6",
+  "0x0041b812202d55296df7d47f1520934cbe378d60f9c0bbefca21bad1fb0335f2",
+  "0x0046cd913acc3cd16414ee1eae07777a489b4bf15a2820fd3097baa3de5da280",
+  "0x00f9c2ae9f3fff3d3bfe0761a682fd51eec42c9c1c33092f43621eacc6a68400",
+  "0x00a5e59d03936b14146cf70552ddd33290b2a892ade5cb2fe74389eee36c303d",
+  "0x0047be7b5eea3b502b91236ddfc93df72a8aeed993412a761b78b99e4648fc1d",
+  "0x0089eed3e596fe002301915e7251ac3907a14179a2e22e5555719d2c78af3af7",
+  "0x00f18ad1dbcffec3ba086e8dfb19c3f054f34dd5c62665497d3222fcac9c338f",
+  "0x00626b0d015e7cdd4d13a97d498059a4f341cd9169e8561f02a3746c15485f81",
+  "0x00e87174b78e5070f64b18deef4b4bed1507dfbc95ed53370fce13c6c42f25eb",
+  "0x00d6b0bc1959ce15124135490d2930047268a82e34cfc2910494c9171dabe191",
+  "0x004e5b3147d777a3bbf235d8fbcfffda62be7d41370c3e81c2dab75496721659",
+  "0x0089a4050e736bfc6ee6ae6dfd2ca19af625fb68e4686823ca901a556cc74b12",
+  "0x00b51c9b9ae4caf000ac8510c45be95fb3a985dfeca04f66babc054f12a8be6b",
+  "0x00c2418704a6d6d599b4167643be571e460c33b88aa7bda5526f810dc1062062",
+  "0x004212f364f8d0557b912336f78742d8220e85c4e82fe9e029da475161799b20",
+  "0x00e414e06f2aea7ac7f9447371477182e38cac663ee3d74ef8bd726766c1cde4",
+  "0x002b831cd0102a507a3a79e1a522d4a8f0ba947ecdc7b31e38c09783222bd099",
+  "0x002de598eb5b42a4e7a10d377638b6ded34d130cd59902fb490ed3bbfdf5402b",
+  "0x0072b51174bb9c421229e955394dd594f7c44600d701e80f47b20b473462b7a3",
+  "0x00dacd8c36027d4a1f712ed0500e5a93c46cb0326bca1486293bd235d63daa90",
+  "0x00e66a6d98dc335ee91f44fe54292bcc22baf95aaad1547200a88f9ba0932798",
+  "0x00f0b092c92f1848396e4f8b6fcb5a7650006bcd250fb61599e996c364ed6c28",
+  "0x00db5869cc1e5e3b594dd4e4250c4dd446d31c6344dfeafa1ff339827a2ac2e9",
+  "0x0082e0bbfb54d9326adfcf2040f650438e506498dc6b32f3b90584ef09305347",
+  "0x0058216aa87aa505adec13a4e9b4be40ca1452c4584ebe9f84fb1d2ce148b135",
+  "0x00192435918b999e569997f880b1c9eb9db98a8c580c99b0173d9b7e5bf84303",
+  "0x008dad1bb65f21c3ea82e6fe2623c550b4a3cfe8c6dfb79ef97b77efbd88c0f6",
+  "0x00f8a14e988d5e0a4285842523ff64f7cbdc8dde817b72a4072abff07d8539c4",
+  "0x007171252adf76eb3897a57e0f565dce28ebfbc3aad498031fafd58f5bb6a72e",
+  "0x00d3e1e3b900fad00c2c1be9fe63b39cb8958468f71c1523a5c7023079fda99a",
+  "0x0078442f2ce373a49f88417d921908ad1ab0863b9499aecd6a0edc6f6505a9d2",
+  "0x00e15eb6d09bb440400fe301159866d6add5f56c906a24916d90f860e05551e6",
+  "0x00c327250870ef6734c1dfe580302360cd235f5a0605aca9a1197e263e87c178",
+  "0x002b4d422f6844280324000bf44339c9b0a48598bd81f649a548205920c2adf6",
+  "0x00faab41f2cf26027730ac78dc444bdd6338de6ae5341b4406b3ba6d80cc2971",
+  "0x00dcba5deab25edb0ca6f5add9e9f4d36b88a4adaade4262a1d07f154ffb4bff",
+  "0x0020772efa3b24c42bc01ea949485bebfc6bf03c9be80d573cde650f9f359575",
+  "0x00eb785eef4ca0f66109f7913518c0cbed0e6e3585dbbb47dadf756fe79dddc2",
+  "0x0037fb1934311f1bd0268d61ecc312c5a54d2906bad5a8fe5e05802ddbb9b98a",
+  "0x002cc2a2fc86bc4299dc446eef84639c93dec0f438f33219a3b5af8912c61084",
+  "0x00b4091748714489ecb634c47cef630e1cbea1669f94fde6674fb9e19288ca0d",
+  "0x00968b1772eb98e304993437b5eb6654a5899671091cf6b8cac002b2150001a2",
+  "0x005e7dbdf94a95140f98db3128d42543526f0f6efc83b3ca22fe538c433bc5b1",
+  "0x002b6e6edb84dae70a5c0cccc64c3c8e1abc132ab9edd158ca5cf92ae59add34",
+  "0x0023b2e04f4af1ce58208cf9718bbb45cfae1950ee31aafac39ae6357feac75f",
+  "0x009973e488bedfad6ab93c33a975af8ac588f1e81df42d36dbcb593c679d89f1",
+  "0x000751599bd51fdd4b4a747d02f2eaf671d5c322193bcefd43f30a07d5432eb0",
+  "0x00eaf0b87a45431fb41aee5cacf4f7d266dc9a51bee21580e711941664a1b2d3",
+  "0x0035e4608811d77ad97fb20c283715bc8ac76196898cafcfb570ab294b7d2858",
+  "0x0055d5cf2a94d3cd98920f232d8fb3fa22c46437369c201b6de71032bb3ee3cc",
+  "0x0082f04ebd3baa6b6f9d0cc6fb0c92ea8f15cf5fc27ec9718f21a14f8eb09b63",
+  "0x00ae37fbe3459adce07b45fc35476e2b9c41d586acf0cd2a18cf509f3b3c08e6",
+  "0x00164540b3ae1688f379dd4f1873eec2b7ab6700230bd34962adbd7f4aa9ea8c",
+  "0x0027fddd235266b54c4f348ed59e70e6c1cffc14e743517a7eb07fd15b0431a2",
+  "0x00555c532a06d63e531df3de39b26a20c5f7ed54cc32b66ce5c6b673ac681f74",
+  "0x005d92bf45d9bfc85a1a8e7281631b8a4206464858d144392c157d3c5e0b5f01",
+  "0x009bc493067afe64a880b6da5fb5f1c3bb4d232ecceced74ddc15f069e441205",
+  "0x000b50dd3b1f0680f1b2d43c81a0a66f521ace5c6685fd9c13dee816e43f8e85",
+  "0x0007b54a7d55a84824b3c652d5cfbc1f252d337d9e27b681f2425859d0fcc90e",
+  "0x0029311bd6809b80124de04db0836b010207abb5a1c0c2e5639e29388c52eccb",
+  "0x00c42c757145ce367dcbd0e8bf1d7de81d873488096ea6ccd88b3953403d7eef",
+  "0x002d0b31be6716a7f533336800c1f7e6506a644696880a54f3da44f837c4b5ab",
+  "0x00ed205d788b03195a32416c9c93883d59644680cb88975032f8321e0b94fcc4",
+  "0x0017619cbcfa828629587488069dbc7ff205c84890823fa0c336fa52ecca3e5e",
+  "0x009ab0bfe81f5af6d1daeea6ced79e00574632607edb16f48aa84c5e96050b56",
+  "0x002981c4f4d4b85f6e2d65e01160555058b056bdd17e24b3934ffdd37a38af64",
+  "0x005f66ab0c33bacd650bc2c3f37457fb3aa8008bbd96105d6ac5fbc1b0ebafb4",
+  "0x00f623f102c60deba54e75e23f2193567bea7e0b8b572fb2196f3591bb5e89f1",
+  "0x006b88ea09650ae8e34b3e3e94dac4bde8595d1119105c461054d1f105b9aad4",
+  "0x00ea7d52ef74a94ec89b11bdbbd43f3616ccb5a5195f24fabd46579ab21ca6e9",
+  "0x009c0c2abba646d55471850556b0f45ee59d4c6f17fdb58440e654fa2f29659d",
+  "0x00ac034710d0eaacf1ce171ea0bf8e93342f3cf452bc0ba08d745673c314b917",
+  "0x000b5d43a8b74d3066fdb89793a12b4a205da8c7dd6f27a67bd5c7dc76c9f76f",
+  "0x0073b9aa68afe300d5739b6926719db7e3cb040a93621060a5ba76f74c7e9b6d",
+  "0x00a06235c58c0000064c210f15bf8ee1ae4384e1bad464258ae743e432d96ffe",
+  "0x000e3313fb5bb0775ef510c6c2b2a7562bcb91e5d3153d4121c3b2818504b9f1",
+  "0x00a5363dbcba0410a9256a96cebae752620b7483d3cb19365f7870155d0e95d5",
+  "0x006b6bb243779ea267ecdbe821a7e639fe925b5118fe74c9f58f86e3e7083c7e",
+  "0x0070b0028d3407b02eeaa816a6fd7ce6f89e515dd84101b33606b88d03a85c80",
+  "0x00a2f438bd7997a72155438a46e92aec6df5db9f8962cfc17dcf289b9b68d520",
+  "0x0040239249061450a0d8c77d7a604f8d633ee7bbac2a087b6884f1bc123558b6",
+  "0x003e36a893a8b911f2a18f7139f1cf22b01e3fe7ea2e38b67c1a43b55b8336ea",
+  "0x00978143ae5b309aebc7c97714878fdb5c4c7a6f859c6bfefbec2ea92598d0a0",
+  "0x00ec5f0f47a37c4b6935e7bae756405a449a4abf2902c48dd435eb2ece0c1d15",
+  "0x00cadbcb3c86719ca1427234c2f931f315e624c8f8756f691e546c501591916e",
+  "0x00fc72b00ccb764d6420a14bf31b0080e9e1cc38d02c3b3734f813ba179e63da",
+  "0x008e3c075b3b9116c6e21489b750a0aff10b0db87188aeffaca35d3f782357a3",
+  "0x008e466b9eb264e84d6ed99aff0206942e6b7283a5a88a7201bb5a89baac6b99",
+  "0x0043046a364960d0fa1a1cf43ecbc07f224767bdab8a8b323e540f302c4b8443",
+  "0x00a014111dfbca436cc249678fcf79ba14162fa9d28e42ac563c05046c782a69",
+  "0x0081c0be4228e6f18973ff864cd41bdd772a847b57cd106644ee70099cc7b596",
+  "0x009277b21e2b06988b271d0cb0af9624d994cb894e0444155b664f05b31feeb4",
+  "0x0029e268031faffe37dc6296b2b77f81508ce511d75a499d54da0d96369e0d3e",
+  "0x004103229ecda07f2fc9ef7e0ebe1b2c2fd99b4b875f9856dd5c5e35e72c93e3",
+  "0x00616312396b89125cbabc09e74d545f397789240c536ba4f39b226f0b467dd1",
+  "0x00679486beabf52631223dc04ed39d7b3ff26e9f56609b587d8bcb74bc0e13b7",
+  "0x00d93fc63692714cfb113e50c2bf10f0963344c2c9982686edbadc286ab137d1",
+  "0x00a4c8d59622580491ea4b07e1777c0a5b9c3c7d35cb5eef20c196df60e3687d",
+  "0x002dd063325975883a311bee3760f5814886fe2142b88f91a94869e82fb4cf9a",
+  "0x00b59bb79b5bfdb1b51e723e5e6dfe345e50d4e61102f770a356f371cca1cafd",
+  "0x0018a22cab9c4eca43f9a364ff22842e637fa0981c67755df11a134f278de900",
+  "0x0044cca4c37bc93c12fcad395862f29f9cd39cf050c7b8eff8be743369ae509a",
+  "0x00de40aff78eaa74e9f7ed6f1b7c7a06fa9df3938515631b5c30f978d2198300",
+  "0x00fb0298ac2468436c7cec5b0e9c25233dbc06c94134eda688c9a967fdcbc130",
+  "0x0087ca5125de8ce4b5ef973b1e0494adc5d41b703067ca4b1f6ba3228dd4ea88",
+  "0x0027ddde931a385c4c7f7b992125d3c0a209e71a36644970170db7b673b69aa5",
+  "0x0039f76dad1a2b49cc65cda1c97f996a21447b2320ac46e3cf8f7da852cc9026",
+  "0x002de34b3d6bc958035b2b57cd80ae5ffeb17534337d80c005728714de53de8e",
+  "0x00c4dfe4f22b613d29b5b0e28ebbcd016e84a43168da46b0521822bf2a257d14",
+  "0x0041e799d0c373d2b1ef6921be31d6f0827387e9e19220825e873da4dd9fbab8",
+  "0x0021a99eba035761bc4dd19fd87b8d5079c289497c942c9023d25973510b3742",
+  "0x00b0d37a0eb3735e6a55afc8c7e57f5e160dc30bd6468019788da2d27b96759b",
+  "0x00bf30f8b3563533737e4be28ec349e45e67fcd81318d4f8e53aafd2f2ad597c",
+  "0x0077d4990830670e3863d31db4f3ce62954ab950f6bc6737e2ed1aa66d85e300",
+  "0x00d997fa3f42f65892596ed49c1a7a5b77db1e816d61114a6f6e605e06a42ea7",
+  "0x00ed7af15e6c065e851baabc83b524ecfb032e77fb9ae63a005a2eb81fd33c99",
+  "0x00eb0a10582156270dfec4232dca2c28a683e3b3b5c3eb4ff1b005efc1d10f19",
+  "0x00d5fd441995b347391ebad406bc480a5b819c73af1989830f64e7d3397718f3",
+  "0x0068418a26b36dba791dc8c574f3f113552f692f501c5f195d2aa054e0a2a892",
+  "0x007518cf85e75ed95334fa55ee5ebf341ba4467692098f21465b39597d2cd35f",
+  "0x0033a2c8aa616b948579d426ee403f858f7cf4f893ff0f4dc10a39042ed34a2a",
+  "0x003fcf16ee44efe5bfbd419d4b0c437df93d209d29eb5f2784468dba39d52286",
+  "0x00cf14b3d06768a4f8e3d8c4a750a72b64a15b40361532a1d110b7539f84e135",
+  "0x00cd6e6d1df77609fd7fc8cb3192b94290725a064de6e8f3ddf67e1ac0edbaee",
+  "0x00e9b542e054c8ee647531621bca9c3cb1fd7229b7e78215206f556f45555a2f",
+  "0x009428a2e69910f4614badd58afc732edb8c1c828e33c9b928d19802b4827906",
+  "0x00802442282af8dcd3f2f4e307f78b6db0b1cdea4180b54875c7615f39025e80",
+  "0x00eac9f396cde654588fa3ddcd1c02fb67471d46fa6cf75a66d458c188614c8b",
+  "0x0043db2c78b98dc917c82f403acb6c7637d77f9b78ef35191ab65f5504896fe1",
+  "0x00f0932e30acc8d8554b496c09ad84dff13002b8cdae2fbb5307c8a6872e666c",
+  "0x00b5ac28c7aedca0a7f015d9a0fb4e33db30f278266fe07462470e6e873fddda",
+  "0x0078626f66518fd5b756a0bd154cf58a9a43b1b91da0bbf99bb0cea380b6c6ee",
+  "0x005cfe096407fd6a81066f14a495f77bfc7cab57eafd38f60717ea84b053ddac",
+  "0x0090f9bdd92b3c2ffa75a3ef70c163e2666b2012051fd303c976ac6fdadfa765",
+  "0x001ed3187603927a0d54e3b5f11cf1747025a64fd74f638835c2abc7636936c3",
+  "0x004f6b0e48d2e599114f46a4a7ca06bfc2b6d1a138abde15d5c0356648e0b620",
+  "0x000204006daa305aeffdd9c662614eb56236f772f55f84d54ac4b1fce77bca3e",
+  "0x00c947625d2e5a47d9ddc83caa8d08e7c15389122a9518d681fb77008007fd93",
+  "0x0057e0795f0fd63508b002328596534a0afe56df1c75d7907eb9a97cc9ffcf92",
+  "0x00e4dd42e02e368b789ed2e013b29f655acc73cdcd2152deb0a348f13bc52283",
+  "0x0042c1f3b8625af56499fa22f1cc9aa50857b665af9d59ade878b4ef5f4e30f9",
+  "0x00891c2dd8c837960a07146a93de27562eb06cc9ccf287f02377c62320274c36",
+  "0x00c1a1cc9361c0392c79007acef33fef59381622ceda07e715071bc260724b71",
+  "0x00974121c30b2f2b3f9572ea8fc358cde0a5bae6e8acba3e616262140e09c1f1",
+  "0x0060860f6a0562f7f15c2a3a31a2ca4e8438ee07eef3ebdda28074b76ddd7d2b",
+  "0x002683851b781cbb5505cb4dc28b03779303f214a0921ca431c018c1924d0e32",
+  "0x00c7930a4d3f0156cd33f7933fe069012a5018f4d7ae791bf78d73f2dd6d7530",
+  "0x00029c262085df0f677aa233a4cf69ebef7a75235f89dd0c1a3c950c9d2385ec",
+  "0x001db2937fd86c799fdc72eca9147e3550d1065585885f187ffdbb4eb33f2494",
+  "0x00f549a1d51c88bb1346ffcbbfe842f222a22a8dfa589038c72074a90eb64088",
+  "0x0078667e3d201a88c4e03e3983130b51474d42a58886478db9d621910067adc9",
+  "0x003423abca055983bb638b1d4c8266d4cdedab104161a807043ff8e6c0f3913d",
+  "0x0081ca1bc8681dc8401c096a8e00cc001a5d78ff4487bbe8cc123a4fb5905742",
+  "0x0051121b11a844b5b30d3ce7791f0d33c4e149f7e78a78d0e6cee8d80fb23dae",
+  "0x000660f87a3cdb53cad607700257662dc4ce7befb1e819f10daf04b8c28332ba",
+  "0x007c26bf786d1a9e283f6b93b4e656d234b9ed80c67f972fbea92145618e125b",
+  "0x003a1a96fcb937a7f3ffe3d11605cc8464fcad93990db68057c0988857874fa2",
+  "0x004968f1d37d38feb58a89ba3820e50a5a68df03efbdb182fe0c9ac4c85c2c53",
+  "0x00e3143eeb5e59b0cc30660c828ae84b9e5507cd92a53aff80ed2dee70a55042",
+  "0x005b7a1986caf5a8174886d8e487f9107a46ca078c5f348714428b124036e4f4",
+  "0x00562682977e9f57930b7b2f3130520332e76e890aa4a9e0128e9c6613b662a7",
+  "0x00b083cb8e8f1d64be69876b979cea8c154b9f667074f678b3d1a4a6eb31a214",
+  "0x002769239657f87ad773404a9f2549211c25412271dfb57b76059e5f8200f0c3",
+  "0x00aaba85ea5f87e0f47c13aa3cab5b8f7ee889a92059670b9f69379b41be65d0",
+  "0x00b36708702fdef91ac6454d6f09e232e2dfdb3ccc1c53f595ae7bb1ca378f8a",
+  "0x00fbb5b2164f6350f811a8510ceec2ffd3fdddbe426c1ef7b4324790c88dc3b5",
+  "0x0002e1d6c3ec5a8e9d5e1314812f914befabc338ae15bbf90ed669fdf570d117",
+  "0x00a1913ad8b715ced73cec8a960bc7ad127648632c6d64dc9a0e8b5cac5153bc",
+  "0x000be0b83f17294115c1a087ed035eb4a5bf18881296436cf4bf3b9f51a00104",
+  "0x00b773300ca26de7d001de1d3535787309b4139fb7442102ff07e3e0342dde67",
+  "0x00050fcf0c0876a27de926585694e0048ef14c6b8f4d1ee757c7aeaafeaf1e05",
+  "0x005d558bfc6603800e93d2524d1c4f1d22f3760e782514e9dcb81bef54792c90",
+  "0x004b64fa5da331fbb080f87e8bea5854e890bf6931d147a0d9d5a04c18bbdf95",
+  "0x008c1a857cc026c0ca5f2f3422d544d265f1be098c41d17acef13ac303ac6d2f",
+  "0x00bf9224ff41d297be8ed84bfc8b232f6ecbb48b2544cd7a644dd47200907625",
+  "0x00da65ff8f8f9d9bb5918a334f043b5e4f3b6eebc57bb6e544836afed2f013e9",
+  "0x009bff7b93d682e90dbfb1d74196ea0af7e157c2d22c16d2dde0fa3d3df45159",
+  "0x009ecf2ed51fd2f8ac15c9903a8efa25ad306311d0e92ec7b4d8fccd0254932d",
+  "0x0045d5b5b79528ab4518ea5f149a9d7a1a3ccb2d1db616925636d6feaef307cb",
+  "0x0045ed6221fec61f74467815059e3885331daca8c2931e661b86bb4a99e35067",
+  "0x0022a7bdeb9f9d56724caf6383a20ddc5d5d632f29e6ba24053850ec39bf6f15",
+  "0x008a2fb155f227684b21ac494a2c02836706a16b9ece517e39f1bea82d3a02a4",
+  "0x0000ba19fe5cf8dcc74671dd43bd2edbc15d0609914c2aa4afafabd345c5891e",
+  "0x007df6a50e24de48a49923d4d2c905cc616332722fcb663c61ff3712cbab9899",
+  "0x00c3f4f1206823e140b891f2a8747a33954a466cb7dd885c38ed6714cffe9fea",
+  "0x0004def546f9b959d77844d258b5ca5544f07474302da68795409f0928232b4d",
+  "0x00fde46a16c4242cfa6be47b87166a5b0023f785b41735234a83eb74fcd4621f",
+  "0x0051dbc245a2077947ba455ba1c3602160e3c59698fadeb0828e2ea3808d8fb1",
+  "0x00187c83f0a5cf18ca3970aae39323a750265faeee0c59d5715df646332cf8a4",
+  "0x00ea1d548c59f6981a65f1db95b508e5ceb3dfc9035adb5d0db3d04e0d8474e0",
+  "0x00844a72ab5ba8b394dbb5ce94837f6ecc7bb909b7ccde6233ad18fd121c605a",
+  "0x00769c67624ce4e153f531ea4293090a1f94f66671e99f99976eaf357f2c43d0",
+  "0x00841acd621b9dfb17422420b0fcd7f7a31313e837942d29488011d15f575b68",
+  "0x00bb4d793ab42a89af0496ce239f2c1c22de534ec7770195e3d5a28d700115e8",
+  "0x00bda74583737476b1bea6c1f92fdddb7d8e25877f6187be6b674ca09a9322b7",
+  "0x008d57020f8fdfe37aa0a9e525f1e1cba129333cc57ee42f4f5772928d2e9cf1",
+  "0x003e3d05c52d155c7c796da073ad7b7c82695b25c5c1fb9093e6ee5af9859f7d",
+  "0x00ca8cce459b3dd8a7df9eca756c1fa8a65bf100c16409cfe18df4e562b7b568",
+  "0x001d89155ca7d77451651fc23eef91ed7d266934195d637e868b9ffc5b77deef",
+  "0x00565cbf92785c3c08c4e88cab5913d1bd88dfcf6a06a521f80eff885485e47d",
+  "0x006a4130ae567e8eb72b9e21d3bb9637380e91f88010e3551fdec59e2785e165",
+  "0x00b70458a7572e33479b35bc8ccadd038b9d79f82a1f27c55e2c5f9bc12cb3fb",
+  "0x008df6c4b1b88f68bb018ddc8307eaeeb54e495c1f10a2921666feba14902a00",
+  "0x0009b11df1d5424ca4edd8eb435ec78d350830a11a0f247fe0082b404250e84a",
+  "0x00c4a45408ecd9f5ac8f5bfd10a1345add1ea5d394d7c5c9ea6460dfdce8600a",
+  "0x00267d2e825e33c5f1882ee182b4f3df95ad09e633c4d0e2b49f3b6d70d9fa8d",
+  "0x0037d310928e052b9fbe2066e0a06aca882578f14d8c82b3c56c51b706d616fc",
+  "0x00eb89ae35fadaa7d4d1d080abcd3b8c4b023b35cbf11deca059a7fe7b58c44a",
+  "0x006aa1d93af7df5d69c1e50c5beb369ecb695331493182314c55fb761e3aa6e4",
+  "0x000fce57d97ece79f17915bc01302d696f958df690d2b757c702dfa51b4839b8",
+  "0x002511a48492e8ad15d1c666020d80ec8640c09f4fea99e88ffdaf969e628053",
+  "0x007413ae919641dae994be0b87e33e130baecf81e5023cafd825ba96dcc9edb6",
+  "0x00660f3526dce6106c945c6638a87aa361e8c2d0ccd5c35697179140ceec93a7",
+  "0x00a1cdf1a125a41be0fbd0ca445f0c3a2daac605b8a4991df18c088b98500beb",
+  "0x00fcb4d25a3cf57254e1db5c78d62fa255f3fd0844bebc59bda17046233c8629",
+  "0x00e1854a7b4f2967d3e508c93b92479bd0517eb59165c815fb0121aae9012df3",
+  "0x00b4405618b66c8a5758fa196cd50337642b2308276f5a29530411aafabe2cdf",
+  "0x00821d31ff4bcc14d1329f88a0f733bc406c4b1ccf79709253e343dde797b720",
+  "0x00eb04e18aa1d62d0e51292102628f8ecf9bafe112e0f9ee5ecd3a68d738d2b8",
+  "0x009fb4e1d8665aa33dbd4f64bfef86da2cd0056a5cd3be3b7b111b74c0e8e8a8",
+  "0x00881163850e2be179bc8b6d4c62f69e6d09189c6c197b3231bd7ca80dfd7071",
+  "0x0050ef48a6150a6af7e5e78678037d02c535a60e5294ece5b79970f73e65ace7",
+  "0x001bc3798d16af8352692601754c1a13233084a384c296cc564e9523315e6af5",
+  "0x0093ca9274b2744c9e382d3d56ef14a0c94e43b0f14492de3296e576c085b92c",
+  "0x008110f3e7d41e155cb6a09320132afee984a532ae627acd686462cfa1e165ec",
+  "0x002d385599e108c576bfd30603ea300dbf355c692a5b720e8335b94e517c25cf",
+  "0x00fbbf5ccd869b16fa371ed0d1c694840d6c6ac178e76501b90429e9d3cf820f",
+  "0x004f080c1ae5ada8b995a8b2207f03af97479ee57a5ce4d564d24d12481bf9fc",
+  "0x007253bfcd5eda0c0e93a19084b2c650831f3ee8c179a3d86eb6a3b2953b5e7c",
+  "0x00079e83add6efb2cc092a9f5e874bcb7b04504cae964ce9be1831d3f2bb0e93",
+  "0x0051e8988555abbc8256410da0d3fbab806f5f4db6e705d88e8d4c3e5aaba1be",
+  "0x00ef49fedfb5f1f118006f0bf777a9b7d62a6756e4902fea42e031e01178a7fc",
+  "0x00d6d8ccded4358d89426596b475de2ccef482b48d3e5200643d86d7e14b09c9",
+  "0x005694b86e45c15ec9ad63f0c30dfdc23f2df4d81bc8170681180eee28e38b66",
+  "0x006bd217ca307b9cba3457a47e2eb7e8bab39d84adc8410668450905aa7b4d41",
+  "0x000f4ac8e7e588f614af6cbefffbfc7caeb6be747cbde622276167d80386b61a",
+  "0x00cab2bcf27dd054222508846bf4b1b0384dff0ce58ee0336e4ee13adc4d54bc",
+  "0x0077a6d2afe3f9ca9a885a479042a419dc6b8592ee6f4a289547c682b991680e",
+  "0x006505d1d65ea5f8fcfb80ff011a7cb2462e451af2fab2419c23c518b471026c",
+  "0x004d8139f1860984f71985a15e6f4ef1d970b0b4cf86779b5efc9aba46de1d28",
+  "0x00b18e088f7872e9814bd07f96bef095606f77e3624df06402e1e192fb5b9013",
+  "0x007a0e9b4f733e2526dcfb60e64abdae60400aca33301286898715544a11c52b",
+  "0x005d1f38940350ebaacb628c58d12b5a9dac466106f4438cb9fda29013c857d4",
+  "0x00f528e83f574274764dfec83d966e53b4b32711c2d01a381665fd28fac38c94",
+  "0x0020134f308f6940d72205c32f3c9e39cdb2a5da5ff596ea30b536b0eb0d1b86",
+  "0x00698d613ede794dc44ea9d6cb1950ce1da6bc32239a1405d83e3133ff8f65ec",
+  "0x0011569f18e732261cf03a4bce81ccc41a23907b783f42250dc87014666ce539",
+  "0x0002eda4482e8d6aefd45d9cf8ffd48fa0fdadf65b5f9f289222d887614e2f24",
+  "0x0043babadc76fdf6d848d6ae291530bddd3b856f3ba433feaaf23aa4808f7be2",
+  "0x0040ca1e1a2e1e35e31a87be6c3b132c2f523f15705d0b51afa5d83e1615f53a",
+  "0x00c2581b99c40b18026fe2c1aa73151b27e3e5bb6a7eee2d4ebdd46fb93b4903",
+  "0x00ae0ff13151f1596a0e1513b53ae1a162adaec65b06f3afe3f2559ef623b81f",
+  "0x005af7fcf3923934689b4ed32c9ff5678fefeae5a00f6710074af1bc11094375",
+  "0x0097629be6e0d24c2fbdafb63f9fdfa61a55ba222a47ddff5fb8f84fe390ec1d",
+  "0x001d526cf1844b746e2efe0ad40c6d4942989368184318654cac4323f1de9e9e",
+  "0x004ea1163d5815a29a0376d95dd7967c2a93dcf3abacea1b1ae40a6aff754c86",
+  "0x00fce018722147568a48ca40a7387ef5b9d0833d39ea4499d2543d1dd949504f",
+  "0x000e9e509471d4f4264d1baf7bf5f726ff6f3afbc556564b43ce625307f54f15",
+  "0x00b616cea2c205b5c3e3dc46dc365c7081d77081305333b0847628cae6456f28",
+  "0x00ed9f0c6759624dba966298eca85ec8d50d7e7f358ed1fea537e1a2813f7b24",
+  "0x00d7837b54b387f3f8b1c8ffb27f5085f2aadce030505e251bf2722f2ed26629",
+  "0x00a46811b7d25c81c7a1a150b3142fc694a9b6c8074e7fb7bb91b74a9b0aba41",
+  "0x009a38db52b18e04ac4a74217a7c4c9b5d0d8abe908b6add6f04368a55eef5f6",
+  "0x00f24efa8d47d8378bcfd3f920d9282a46bc6c98243dd3b0987bdaa40302d101",
+  "0x00c2a61cae149e3904cce8c64992f85aeb22262de76d599aa6356ac5e78075fc",
+  "0x0091a78300ed0bb40283ac5b92d3979bc396457f4578256271b45bb27e1bbbcf",
+  "0x0024cb7533fcbcd1244fb9b3c7215188b3775cf0e407d0ead993cc7853c59ca6",
+  "0x00eb84b959b39f4e0248f9e4074794358ad2af2ecf610bf1a600d3030207e151",
+  "0x0011c7774a5558df6cf5af4528a9510bcfabad823f0f0fc25a52b406d46e87db",
+  "0x001108e419d0c2f783a04b1b810f53f1a847b985216b05d2c211a16a2bd06f4b",
+  "0x00e7682a67068e1c0b703286090647e5e93977c1d3352f11959d1dff3747dc2d",
+  "0x009508f3904681212761b1eca71ce1758a6aed0f0a05733cb8267b82c125fec5",
+  "0x000444ff11be6f5178c7175ec10e22ae4f8005fe6896aca25fd122d91980c4fc",
+  "0x006f7e76aee4d71aafb29bb42fcb81412cf125b2f330bc939397255a7fd55090",
+  "0x00108f389ade9406ad815b88b15472278a0ba0409f6ffba2db1edaacba7f658a",
+  "0x002507e80c190ca339f34b25f7fc14c7c9ff623a6cd63c12e02a8af5abba5026",
+  "0x00ef327d6bea8fe33b13369691352277d384e9326847fc5287330a9f2165b219",
+  "0x00d84f41ac36fc58f0ba8f031c6da338658e7badb2924b8628ef4510d0591235",
+  "0x00cf1ebc675da03ca64b3d930e2bf62b92bc0eff12dab2f9478f17067cf2bb21",
+  "0x00145942979d2b8e05ec3745aa5306706a006cc7ae95f691231d0a362cbb6a68",
+  "0x0022db9841a92cf92677ac7bd26a9b8ed82d54b0190d99fa0cde0d810a25a8c1",
+  "0x006874c045f8330ea928f51b4ca6a069369a71ffd17ffd1d9679524077a1b35a",
+  "0x0068480397f24b760c9c98080a9ba8a8cbd25b0634ac117c323593745705d9be",
+  "0x00c92ae3ad1810ef0122cc330dea145a56bb0011136461da7cda1fc3b44a457c",
+  "0x0014596cc5a6baf93bdecf95fa3580752cf2ee4ea980fd32b49784f59800b5df",
+  "0x005c8ca8973c24d90e87692fe89f55497a4a37e356537a3ff01f12bdb90aa092",
+  "0x00dc188ed323c43894b1c81f2fd5a9c71602e67dba3356800ab4ac1e2c1d5918",
+  "0x0066518050366859b45629f72ba26016a9ea62535f02fa82b523651df0b5d753",
+  "0x007442188c7b459ae9027d62e0408111c70180cb38696e9bb469661fad8ab200",
+  "0x00aeda161fb36670d595671d2759cad450e43e994a571509b7307da2aa723f06",
+  "0x00a6f430f17193d4c08b9e2e89035ac4d8bfab8ab646bc7da15b1e57704bc5dd",
+  "0x004ca5ae172216d54669382ce121f3a275d3e5fc044ff1e82402e2a7840ae117",
+  "0x0000b160d73368b23cc6954b3ab36d6e3f5bc8b200c8b2ca3167c0f63921b6f3",
+  "0x00a2a638f8dc3c94034a02e4c4c26f252ab536e3e1899f853527a0c5f596d11b",
+  "0x0053ee06a92c6a39f18a30195bb14dee57199a888513afb5ed96c293930fea69",
+  "0x008913ee1dc9d441d193909fd3f142cb3d9118a7ce0c29fb4780c6fc2005c683",
+  "0x001d5c6ac837b53f43847b0bfda41a7fd10ec9ca240b4a14314b16d5c6db729b",
+  "0x00236ac2c2651d2152a66fecc752a16761f8d2cb03ff26e5c7d40c6ba8cd2cba",
+  "0x008c397f7b243fb6c624af787f85e023fa5f91e1d6fc5a4e611d64bbb7742d70",
+  "0x008e86d281851b5d65ef3a4d1e0adfe21b2350e8ed182f827f4eb96a29aaaed3",
+  "0x0024c02be87b6af706aab85764988814006115cf32368cc999e161486a7365c4",
+  "0x0050da706549c8e7d7261a34204ee3ac75bd5fd13467bc76cfe1de3a4874ac73",
+  "0x0097b3ffaa681883d2aa3e43ab6808d44f29efcf58b5c72051c308e0b6f6bce3",
+  "0x00f77183d76edd10d28dd53e043ff91864cc55e219a91b8e444d1fa9b5ec9b8b",
+  "0x008bda8621ccb9e6d7ad9d7452e7a15ed36fed3349fa68616c27b061430742a0",
+  "0x00494e0aa240d8a8cc98a44ec7fdcc692bebcd9c8c5553c3e9ebfffffed9bb62",
+  "0x00582a238d24f79658f70373187bfa961a0c97cb79413bb25772781ebede8c65",
+  "0x004e3b24dff1e3bd91cd6a680a369826443c2600580ad22896b326692704acdf",
+  "0x00d99f54580ab536eb9c83b6dc46b3aa59f841e7209ae6596cc439101bd2b876",
+  "0x009a18ab053ee8b9705411619a2819881964e3869d7395f69a167c6ad005f03b",
+  "0x00eabbc443eab6b5681b34624aecff8486f9f46f2ca3d2bd290d80476542f376",
+  "0x003735f74c28745ac427e6a4b0b7777db70f193741c4fb3a3ed8432ee4e03452",
+  "0x00dbacf84091bc52f3c07adb8bfffe12aaf8abc03f13a2d7408d0cf6d0b3fbd2",
+  "0x0055f1971b168819a50aee02f4b5b444cae85266d11d30f58cb78a1996c44d6c",
+  "0x00041c059acd7c464cda3bcc426fa783b01e48e43bd6805dd610243ef8596c14",
+  "0x00c7c64b53c75ae5820dcdd3f31a7f03067e387b1e0ee47467addbe8f95a6f94",
+  "0x0081d7d1b01a25933dd08901144e4d5e155945d65e9f3e9d25d5fa336ea52068",
+  "0x00cbcb6203fd77f6dff2004d30917ab260c2d5de1e60b523200950a027fa2d1d",
+  "0x00fd9a38b9cef8161f8248e0bfa1bba169d2f8f6e08bbd12f721cd3bd1383d4f",
+  "0x005256e541218a56543d1a428f35f80b4e223349782050868671676f0172f094",
+  "0x00834a7a5ca767845ed4779e6b84bb76744370221339959060cd3b002b79b9cc",
+  "0x00fc510acc2b43f9999f70f33c28f9328da1a32ad9f76ba78221673229f1186c",
+  "0x0070eead671aa7a870a66a5ebeda458d897988f9c2ca504ecee4b0a1211c7654",
+  "0x00102c397adc498b428ddde3bb934383425e0510d7caf05e748af3ec0828c822",
+  "0x00d7e2bb5fbab534626dcd8dc17c0534c60cdc84479b6ad6a567bd0d42c5ab01",
+  "0x007f966013ce0d62cfd26987a00ec5c6340223cde34421f2ceaadcb2e0c5f96b",
+  "0x00b46b50616ea709b7b9cedc3d9350bfccfd8389d7db3d0c61feb4704b018586",
+  "0x008e01bb301e44ea4b792a73add7c93fc75e2791b6e8b538323b2be76698775d",
+  "0x005088cad74a7ea673e509bd39785182f7dbde615702b9bf0c6b6d1caaaccb05",
+  "0x00119b894fc7cc06e38efdbef991d31506d9472f0255938e2de37058fb374ad4",
+  "0x00dd55d25ade2c9ecbe29a1b60cad71ab2238319991389cfaa686ce92df47e5e",
+  "0x00a2f2a419de3953a02c2acadab62a8c75ffc5c5ba591c1d86c90babf1069830",
+  "0x0075e268e9d735e820c988689b5c9365e5f8f4a9a13103a1ea6b0d74cbc6644d",
+  "0x004534f640677f1a003a02154d9c676b6f02d67e633d37176e9396072d2eeffe",
+  "0x002e0ad5a2d50f07c485fa43078f0bbc6199e19bf181b4433c6f3eb9f34b390f",
+  "0x0028f84491466af62395ac7f0eb47ad27aa55c7bfde503692f626906d91da08d",
+  "0x00e9538d2f6375dabe77cdd730f4577c30070f6d84405c4b11764025e5b63355",
+  "0x003a359adf80cdc0e8169aa6e5854191c4df8c40d21a937d8a3f8d47bffa4be8",
+  "0x0049fba612072f6a39ad502ab6adc2c4917464030c26c07187b94615b1f515b1",
+  "0x00ca07c016fdf1492d559c4355168c7a1094c30ea725f43d546a970ef28d160e",
+  "0x009190671b2c5b1a64db617bc69220c610d0bf5cea5d113440b9fc0722fcc333",
+  "0x0027e1becace65ef820a7b969198142cde22c8e8f9b49a9db6959192f26f3587",
+  "0x00ac7b19c39414a8e0ff70d9499c3a60edea3e81db33837e1084a75899dbb30b",
+  "0x00feca08240358a3d9cad5081facb5373d7b5a187e90519aa4dc368dc458a994",
+  "0x00664d0a856917e53f3ae86cff7a2f507494bd9eab92fb6ddf930332e43c345d",
+  "0x007628a341a1d9170a3d0603bb7df61f5d8c0f75c825a3072dc08cf1890bbbd6",
+  "0x002055907bceab4216899125f71b8f8e7ff6e11d3906a45c18ad2f8d337905ef",
+  "0x0057963ffd640cfedfbb1c461d4a56615454d52a0d4062f2f8dcf8301ba1adc0",
+  "0x000a2234f6fc2f28499f1473b00facd1c5eeee9fd8821ee5dbacb79d5e6e4ff1",
+  "0x0019da34095714ed53ad090eda2bc9cdf0833ecc9569fcec272eafc3ac2a1f33",
+  "0x0096295d0c45ede71b5504d02035c0bc05cd2c4f5b1eb909c96d0c8d2bf4142e",
+  "0x00e0f8cec46c24e6e925edea4b94d38f2d9c7f9233b9f76296b7a59c520514c1",
+  "0x00b60827f815e65224c33175ef0e6cc78d1d4b39f98b7a94e45f96c4db469fe4",
+  "0x0000217e3247f7164f41d694ddfabdb3cefb6d248d1cc583f5d3223b75284c02",
+  "0x00775107d20ae35064648a3727e8e2b9c18dd4fec982b45bc7de5b73923f731e",
+  "0x00e015078cd0975060d0742080729ef60e01d13359fa7fd17e4bf4ab9c5c8e56",
+  "0x004e928545a69e9fcdd60306aab358803cb84ab248aee8da7009254dde182a79",
+  "0x006486ef2803a83cc18ede6f2bc98213fcaa62046be3b08918c09b4cc12fe770",
+  "0x00b8303d1c8966136bf0219706678ae22cc84d6c42c8d6a3191308f79d34e65d",
+  "0x00c1799307023adb77d8dea967595753ad9090d0c512568f58bb87d48793aa43",
+  "0x0066652609deac8c8c4d580eb9d4d3d98d375e85038cff0c9892a8a5119c0cd8",
+  "0x008af6666f071d471afd3394939e5771d14b1daa2d98c896ccc7438c51f44d01",
+  "0x00c0b836e693463f32b049e5d31fc966cde21c13a05428d277b057383e10fd76",
+  "0x0000f4d52679f0cc5a1e7af23b753adc14dba05db147298736b4f3aab62cb7fd",
+  "0x003936b4500362d18767b18d0824d669c709e05bd78050119a9a5fa3ab3c84c0",
+  "0x006c7b28aab8de729dbc03189a411309454f66bf7142458077156027c08b850c",
+  "0x00c6a89a60751800c298a6bc18b2faed7b2df137e7a6793edd31e2e6ff985a74",
+  "0x00c803cdf490b23bd5b0ea67330c028b6fbe3ac35f8a9a318cd69aaa47cdc52a",
+  "0x003a5666dac52fc68269b27b44c8690eaa995c42f1d694702db632086d6af501",
+  "0x00849d0e9b252b8522322b034b27c2bb68e4528bfe0f75ba17709901f688b42a",
+  "0x00add646a69972cdd16b2290ec6fa12afc9c96bc7d99be37212d12f6cdb4a438",
+  "0x00381c5fb7a77e6388eb5f92909c7469af764f27d9ab901cbef45f6e843e6dd0",
+  "0x005a7139d01c8baa5528c7fc59157cb2c49c628baab9c3ef6422f1140b6ac1e2",
+  "0x00804ee8b0a27172613b0be8785881a068b92cce35accfabfad88210523f564e",
+  "0x00f252d1c48e479853877b30d8c06dc9a59e2aac0be9e245fce4e8542416b0a2",
+  "0x00674074e43964a3afe009a4e4de3fbbe767d27cb1727a8a5d330be16084e495",
+  "0x009409405870d94dde70e188869e989cf6212c62495a47f644763c7434fd8a58",
+  "0x00b7ca67d0b62ee847e8e545405ce1fcdec1883353ea54f0befe21e432fa5eb4",
+  "0x006f52663aec0e95fac70376485a933d51329f27de604f6db108161932a1ae58",
+  "0x001d8975e6875c47df6308000f9379d2afa5a1ccc5da3756cf8bb4c32d945c27",
+  "0x00d18d674a9b02b9cc50cac7793a5948966fa3e5b40be5ae6774dd810623e7ec",
+  "0x000f709230189dc3165cb5979210daad95a5b9fbb8539c9d8d71c46530d72a63",
+  "0x0093b773e6a5ca2219a6b3fed02e00e2184e70ba055bad491604c6d969c22f6c",
+  "0x001a323dd93e9fabcb8a0df96c457a57e8e2145d57780375aaf889c9d8a89dff",
+  "0x007459faddc443ea711f62209f6c45dca37ed52375d246e693aa1d08d6b30bcb",
+  "0x00210b104e1f8e0c99d61206a7ae4bd716bbf774b7eb27359407d32f92e83dfc",
+  "0x004b61b9dc37dc4f246aa2e0bda7f2646b39b83fa27e45442eba67ddc79ca3c2",
+  "0x0050db8fa088727c0ea1b8a24ef8f4020deadde169591739130f3ffe463a0033",
+  "0x001f8b0175d5b04905fe081a65231318395a5b52258d07fb0189beb369a502fd",
+  "0x0064ca66978c44296ac027233efe944902510a0362efd66c2ce7ee6a8be43c19",
+  "0x007dcaf373a162095c24ce0ad090fbc5b86e055c34b70fc6c65f3e2f60bb1bf8",
+  "0x00982c9b171906abd046984344676983226a3cf418838018ceedf1ffe3de9864",
+  "0x0077d8a006572b8813fab61ce6154f3d12f2ec61e6662888f2f5279fc602534c",
+  "0x004dfb4cdd14662226e67ac4f981e8a446cda79d82d65b3e7eeb47d787c054ac",
+  "0x008f41f49b193f56cfb4d5140aa35fe2d6c41797ce03b706fca0710c75790c09",
+  "0x00893edd2adc5c38a4544e952655f79c9b9b4f4ae56ac7df4363043d0a35a089",
+  "0x00ea0247b48d845e42fb81c474343e7be2a99e02e379c3da17e497d750326484",
+  "0x00f4f4df1e0ef9faf02c848d7cfcabc2226f8421d8f745fdda324685478afd4a",
+  "0x008c4de699acb61c402968419dac950645b1d5f0a8e576fbb372a4b4df6da80f",
+  "0x00461af7766e32fcfe292337fe236db3e3ed8d8ef6f2f258efeef8fdcf487d16",
+  "0x002ee8187d14337e5b45bda6314ac6438bd26709297ae68fbe333882be8a3b20",
+  "0x00ef68d89466cd293a450d344dbd754daec056a4c0fc8265cf1ed54d3a8bceaf",
+  "0x00c39d0d028504a7033d80ee254fa52de159692489833146bc2d6c99b7fbd11c",
+  "0x00cb540c434a2e196542c84ed38ae8196e379295e4016ad272549ae906b82723",
+  "0x009a6745fb1235e1c746dc401f041cb5bd2f059234d2d9fb8601e9ab589f4fff",
+  "0x00e523a13fe340ca2afbb8618e003557cc7e127d7cafe295571ec651600461d4",
+  "0x0008492b6e31978961f59d1d47a02ab4243d1bea425134b8e164abf9cb0efdd4",
+  "0x0064b2981bac1dfa5483b0cf4796c8d6ca125efad2f090024398ec847e69650c",
+  "0x0082fba81399d98989749ed130c02cad4a243cd54ff71eb23eadb7a6d31b25dc",
+  "0x0009ff9f87c691dccaedec33f12a25cd393d6f5005ad9d4a0a0e164f614848bb",
+  "0x0029badbce2d2faafd63c5aa9fe443748f0ed1894d8713c96fb2308f098c0b1b",
+  "0x00e39c969bf2e0dafb59c513f0ca05b5d9c68725c98467440dfcd936d60bb296",
+  "0x0064ca8a53c1dc473adcc757870589eb1becacb245ec8e062aee3c01fa0fdd38",
+  "0x00a8c990d0597ceaf0d5e73008aee34edafc7c2f99b552933e94ecf46059eea0",
+  "0x00023bbbdca7321968bd665fff8fe0f1580ae4da60a2e359b4289bd435fc37a5",
+  "0x00dec6d3ee43d8b8e48844ceab1d937c62d0da17badbb5d1ad0d024dc7c88409",
+  "0x00ef74463a8f764ae4cfc85d9d2da5ad0cfb83617dfb98dbaee4f60c1c37d331",
+  "0x00bd51917e184e968908cd28f93fcbde494be761658e468e12aa189a2d8001b6",
+  "0x007c0d8448a9a2a8768eb6bca937d785d80828f4c56990b36ac3ba8369e733f1",
+  "0x00b60e28ed5596f80d555e06a5255fb766ffad1944852c6b6cfad33f3acd091f",
+  "0x001ec7fc56d14cd79e184c42333217d20e3148b127690520e269b8287f4f413e",
+  "0x007c826b1188b3163f13e38235a298e26d549132560e7d5b9bb5c4cea154265f",
+  "0x0076763fe90ac659473c3fa10d658e1f6c3bd5963e7d3cc27f8776ded50b79d5",
+  "0x00afb7be07cc43887af184d9b2c1f98df9451bf2a8b6fa960dd207f71a32aeed",
+  "0x003822c11cc46d4165924199f0010fb461c6383c905a38212837e2c0a9dd3e00",
+  "0x00cf521401042b4d40348d1ff1f04c0e1204a75c0fd525ad783c3cc211031022",
+  "0x00cc79e40a73868006375cc886ed89f2d26178a2ce40ff252fd7b516e0fd5c3d",
+  "0x00cced604baa3e5786db1dae0a3aadb881ee69e16e74908dc1293a28c80f40c0",
+  "0x00c424e2f2b60c910d1ab552995745e328898a6bf89287412ab9665460e0ccb2",
+  "0x000c6ce6660302f9952613646d9b8fd127c7eacc536c4876c95023ef8e199caf",
+  "0x00f5ebf18400e5a138d6410064d533796a887211a38f2b32802380380ac0fd7e",
+  "0x00c0f9ad51f1fce3d154d38ebc56304f79175b69f6cf912bdac2eea1d5a2b7c2",
+  "0x00325f617a66b3f16b4268b3f4095a91566d2f1626c284837f5fe4056d893883",
+  "0x000427a812fde4eb87de7e80787802d793dbe7d761e62aa3e6d0443ec795cd6f",
+  "0x00bb01ac2279f454ded47b4f886f24c8bf6a3b4c5d4bd91a9ddd494a1c63d4b5",
+  "0x006f81d775a51df76a45ee6e4dc946b8887244305eeeec6aad84c718a03f273d",
+  "0x0042abe0d13bf2896c9f19b62fcde90703ad9e18be7faf72e0507bc5ab787340",
+  "0x002d7a27fb528704810b11ab4bb3cd6d33debb8ab1e94cf6ddf7f5446ccbec02",
+  "0x00dd93ab4627aa895d4ef096b7685ed741a2b901f6a138ee4b3cecd704eb0f48",
+  "0x007ea2dd17102df4a4610295ccf474ab601dee62c5bf3a4362fbb51d8d0dcb24",
+  "0x0067dda7130b167c0e8db85b71f9d4f884d9d769d1d80ebf010d180d79a5b55f",
+  "0x001d9c1a1acbb3e9acaff6421ad9880f7c85eeb052bcc1e91692fd8fe7a3dd68",
+  "0x00dbc455870a1849973dc66bff013e147e2d774c7b707cc64c2ef084b82c851b",
+  "0x0047b5fe61cd7b6b4f51e6c2bd8cd4bfebaa7155afb368aef0471a4184fa0bf1",
+  "0x0079bd71992f76162423cab5d7b02258c0c5a1477f832a41c08cfb6b9fa9233e",
+  "0x004a8bd86f3e6e31e6ffd125dad1b9ffa27d5dfd14f85ce9ca1d926693cdab6c",
+  "0x00055c188c89250af43ded608cbb34f4b5b8de45993fdd8be5c5f92c45935f4e",
+  "0x00f201664a8e76bff376b62a6d46ee4e1451fd32c2288f6dcbc216829297f1b9",
+  "0x009035391ae3c7c35f8639f35a9135c50bd13a5ab2b15eb81e7472d718c85ac1",
+  "0x00cdebf25966caebeebeab624d4ba3d7b3d68e6806ec9f515c7066f52b49a82a",
+  "0x00240965252fce3f76048fc610c0e5d79242deaedc1e9e30d783480ba51d3c50",
+  "0x00edf5cb5bfe7161d54b8167e590177353d923d4c20ff3671ddc41d2014457f2",
+  "0x00674cae373b064d834f36edfb05f12c74d9f7a25814fe91ece47169e75d9a39",
+  "0x0071ad9ffe21b9ca1343629a502fdb90b3ed53ae6cb2fe5a81e5516bcf1306ab",
+  "0x00917e5999953767a18e196a80fae79ae4fef3bb9fce342de81945f898a04749",
+  "0x006f27b1281cf6e6b0e5ec12a6339f7c1b3acb039d38a5bc4c9cae67d691bf89",
+  "0x00a18ff97605ea633c60a4fa6763efe411737606ea3f7a8d9e01445e087f0b24",
+  "0x00a5185c2e0e3339eba8ff51e09b675c1ab7c5ace7a98e33e5ffce2605d24aeb",
+  "0x00cea2b81b4df3390d78771a9de9426b2cbac5f33bd3f983ecdd08680be8cf4f",
+  "0x00a3f28fc651ad7614a36d5b08b9a6e8d8229f2f337905ff13e9ac235f4709ff",
+  "0x00fefc822d08c83273c6582432c171dcf5265a22496097e66b33ee68779ab400",
+  "0x0024c393fc7a3f523b33a34411909ce7929e0333f8b807adf471a70a0bfb50a2",
+  "0x0085d2445ebfdff44d4c2cd8e07f55d0ec993d34c3efb25aeb704c73f01c09f6",
+  "0x004d683331014d99ac2725a9d993d0b4059ea223b7e31d74af3813bffcbb3130",
+  "0x00f41b4cf36d3208e99621ce733d354a006a7ae7ecb4c0968d073dbadbb6fe7d",
+  "0x00478a2f7b7cb66040b958d016432afb638f3d8fcd32f9d408c88e8c2d7df648",
+  "0x00ce7d3ba45022039c48fae4afd18cdb36e299c45cafa764328c38d3e0a0ef9c",
+  "0x003a12fab23caada924fd3d6c019ef1259c9cc304ab02dcb3dd072ed3a1662d5",
+  "0x006a80fbc35c26bbf6ed6df2f810f9bd44b4ee0b8076f48b4ea5d2eeae00f3ba",
+  "0x001b0d41f959428f337aa0b50c4e24e534e52a83a4b096092eca5873d70bc6d2",
+  "0x00f497ec2e2258557795bcff5c2df277e6251ec4905f0017e2b41642c1d2addc",
+  "0x0071cd93c85ab2dfab79298ed35454be48e9a3a345ba5e24954744b7a87b1a92",
+  "0x0072512b56f373b8ccb05d86998997bbd47c14c8c2377bdd67c44133123c6883",
+  "0x0094794ca3a4246c0e6047135b7e41438ed077f16fef9b7b96518ba834d37950",
+  "0x00a95f9e79854c280aea8e9f9417e2943ec2762a646dfed73c72bcafef5194a1",
+  "0x0029dccbf8157a663c2c4e736ec8b7f524fb2158e620e6a34a52496f37585e84",
+  "0x0063b903262eebbecc0df8747c6bf3ca4ba8641116868a6d2afaa987eb2ec965",
+  "0x009e0bdfe6e49dfc32f9c9c7e7993cd3fb8f6be6190a38fad20e64db2997cd4b",
+  "0x00460e501c7564af3e1717d76200a7d98fe2b347778f0d4e479878d893ea3b82",
+  "0x00a5d52737d0f50e88e25681ed0bb6f3e703c1537856ae7ecc18fa16fa84adb5",
+  "0x005225656c6cd4a61aa51d2d72cc2de7e92778db0457bc11fd16823d05d1adf4",
+  "0x0000d571ef44c866096d9706a5c4c2082a156c5aded42980f3ab3faf9573118c",
+  "0x00cd9acb959fa7c5eba13e45ad849e473894d1b810976ce65bccc7bdf7618694",
+  "0x009583c849a267b0661f3043abf775c315b5feac5975fc33381cbde33cac496d",
+  "0x0085d6ccc2f950949e87b4b3a76f5546742380347422be1b78e0844db3792fd1",
+  "0x0033944e00247a5a2712226c5067fb43f396f96218fcfa79553a1fd16106601b",
+  "0x00d433dc8fbc3fdf0d98b9bbd39ff30cf78eba28b2671bba8feac5f0725cc1a0",
+  "0x00521b4bb5c5d5675ffccf4d134c4d2c61b34bb48f50e7d9ed0248fffb5d250a",
+  "0x00de20e5083c57afdad62274b8a61f653d17203ca3b3978796bb8a5fc419fc39",
+  "0x008c02e3549140ed04aa5a80c47bf257f8b120c6e11f3e207d5a0462d6b8d136",
+  "0x004a5efa0b570bc3101d3f395ea473c58f1337c9f965efee56f01ee366ebb4d9",
+  "0x0017a8e4340c45fc07313f8b1d879618cf3c6929e076e72ddca28ff30728c527",
+  "0x00076e324f29cd5f138e9dd030e07cda9096e17208a3fd24f56fcd36376de916",
+  "0x00d067615a678881766faf0cf0f1061e6e0950638d7e83f61cb749f997925f1f",
+  "0x009f5a78e33e4d2b1ae65e8efd8dde16b9c57cb9b757a76597c8418fbb755952",
+  "0x001255b42490b7576e5c4e7d45742e557e8e0632b126439096819bceb83a6f67",
+  "0x00ce056f6c2ce1aa2846099beef049d0fe7194857a77dc6c53b15e3874b6b0ea",
+  "0x00328789d08f890c6ddb568b460a23372dda56fb30c4397622123c902f3b0deb",
+  "0x009f18f74cfb3987b2e49f1b685bf90fb0268a4c91c01ffbd9ef1935ebbc6ea6",
+  "0x00b440dc28c5f36ec86f47a99d2c62cfe59d80efca93f0ffc14e27df8d22902b",
+  "0x000c6a77b74bddd3ee6d8a4da66dbafd46671de68c48e372a1ab579f15be9ae7",
+  "0x0086a67d462288424cfbd79ca8b4478a74ab1c9b213388c3abf16dd732b25e01",
+  "0x0059293d1940c9b34b751a16746984ff27f12c853af142b997a973dbd0c37a96",
+  "0x00df07f6dff6d0b9ba69e2c38c7aa0cc48ba7761965d5b53e5cb0085bbb62ec5",
+  "0x009203893b6c573ce30925349a6e4ae86eaa576854391ee123c798a8f6fc0c9d",
+  "0x00b82067799880e173140291dfd8462b375381c698da9958d6c8cbdc0f14f6bb",
+  "0x00a80239dbcb4f5697149d83172c3abf04849a76637c1ebb2f0473228c6fd440",
+  "0x00ff27a0cbd5aa22bafdb4fc8937ff815a34b401708fa6ab21af96802dec7652",
+  "0x0035ac2ccbc1bc48a606f69a7b04e86e5575cc857b876df5b715c0b6936da828",
+  "0x00f4d3a2bb1ba0eb8bfacb451b4aa395dc91407a413430e168a30bcb417a46d9",
+  "0x00987a8d90f196ba2d3703f736c063fd2dd7afe3aeafe6077cf7e7d9768c14cc",
+  "0x00c761384c384407bb9cc03ee4730883b7a90652cbe148d568d3bbf46c06e59e",
+  "0x00390eb58be8348057c816fd69146603f4446d38119059c4f3be314decef985b",
+  "0x0032c102042079cb329e90a71abf160a2936716e129a4252ab2c9dfeaea86d35",
+  "0x005bccf7ac0055e048ba2554840c6fa949e9fde33fb429e45e50ebffa12640e2",
+  "0x00eeb1af7d16dd99b1de776ad3aba50827429382485766fa0f7901d472115d6e",
+  "0x00e94d64d74e248a84eb00621ee86e21af7a2e961e09460c0dbb8681e4f92c2b",
+  "0x00ec7c5dcd849b1c90081a0801570080a301c88089f10e083779fbb14a8996b9",
+  "0x004bba0512c20c49a6710d76868780612ffbee35374d8001d79425e7cc5ed0b4",
+  "0x008f33fa89948e107eaa55adb6de704198b6f981534be89baee435f196565057",
+  "0x00e6ab12712bae9e6dc657971003f8523df152e6c3e904d08f4e549df89e8631",
+  "0x0075f3a4c15b6b6a31ceb5a7af49f1ada67f2ea5665ced8e2ad65162d004caa9",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -4379,19 +4413,19 @@ contract_class_log_fields = [
 ]
 
     [inputs.hiding_kernel_proof_data.public_inputs]
-    expiration_timestamp = "0x0000000000000000000000000000000000000000000000000000000069e54f72"
+    expiration_timestamp = "0x0000000000000000000000000000000000000000000000000000000069ff1b30"
 
       [inputs.hiding_kernel_proof_data.public_inputs.constants]
-      vk_tree_root = "0x0141caf6779674bc31225636c4cc4259a731835c52fc462f2dcbfabf7de01a1d"
-      protocol_contracts_hash = "0x01af64239167dcc8333e25456aab71348f66d9f6de731a8b62181d16cf0818c1"
+      vk_tree_root = "0x0c16448b65c4b3f83f9db3bebf635bd38957c74c9c1ea36036cbda16432cf558"
+      protocol_contracts_hash = "0x0333160f082dfc02e255c756febac14dc42c4c88b882e0403d44710c1f0bb80f"
 
         [inputs.hiding_kernel_proof_data.public_inputs.constants.anchor_block_header]
-        sponge_blob_hash = "0x2f6cbc1e2991d249f92b52eab711b5b69653f27dc615f8548486ee4f905db9d1"
-        total_fees = "0x00000000000000000000000000000000000000000000000002b226a71e115940"
-        total_mana_used = "0x00000000000000000000000000000000000000000000000000000000000a3919"
+        sponge_blob_hash = "0x13a1bf44c19e7c2eb7fc1a96527d072cf424bc99c760e392f4abcecc1fc597f8"
+        total_fees = "0x00000000000000000000000000000000000000000000000002b26ec5db7a7140"
+        total_mana_used = "0x00000000000000000000000000000000000000000000000000000000000a3979"
 
           [inputs.hiding_kernel_proof_data.public_inputs.constants.anchor_block_header.last_archive]
-          root = "0x1658130986216f2f0ffc888c65e948a57a28c64721e664f522cfbb7d01492231"
+          root = "0x0d18996e508e8c1e51f6a56652cc5d71169450ff16c25de9af7f79af5385e334"
           next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000008"
 
 [inputs.hiding_kernel_proof_data.public_inputs.constants.anchor_block_header.state.l1_to_l2_message_tree]
@@ -4399,37 +4433,37 @@ root = "0x0fef6d80d31109ddb56d6b3f607cbc9c0af0bff3ea0d43e8f278983c64c11f7a"
 next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000002000"
 
 [inputs.hiding_kernel_proof_data.public_inputs.constants.anchor_block_header.state.partial.note_hash_tree]
-root = "0x101e57ba43504cd90f08cd61ed589b9367d33eed30ccd7a2e8333cf633f2fb6f"
+root = "0x1c223e428d6faa36822890e3b99417ddf73ffb069bf4c44b6ae9d7fc741733f6"
 next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000200"
 
 [inputs.hiding_kernel_proof_data.public_inputs.constants.anchor_block_header.state.partial.nullifier_tree]
-root = "0x0ec61562d933c8948a789b996a4057b5ef647965d854a7d6e36d28c2d2aea06e"
+root = "0x01c778a6b3dcb1245bb0aee174252dd95256e67309f952e5d2f8cbafffe20d0f"
 next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000280"
 
 [inputs.hiding_kernel_proof_data.public_inputs.constants.anchor_block_header.state.partial.public_data_tree]
-root = "0x021204d873082156522eb6603c9c7f7acb21fa936d470764f1fda90cf504891c"
+root = "0x134e44df49ddb89525046d19bcfc2734c78e419994de9d6f7467eb84d02d1060"
 next_available_leaf_index = "0x000000000000000000000000000000000000000000000000000000000000008b"
 
           [inputs.hiding_kernel_proof_data.public_inputs.constants.anchor_block_header.global_variables]
           chain_id = "0x0000000000000000000000000000000000000000000000000000000000007a69"
-          version = "0x000000000000000000000000000000000000000000000000000000007b6d50be"
+          version = "0x00000000000000000000000000000000000000000000000000000000ad49d7cd"
           block_number = "0x0000000000000000000000000000000000000000000000000000000000000008"
           slot_number = "0x0000000000000000000000000000000000000000000000000000000000000022"
-          timestamp = "0x0000000000000000000000000000000000000000000000000000000069e40c02"
+          timestamp = "0x0000000000000000000000000000000000000000000000000000000069fdd7c0"
 
             [inputs.hiding_kernel_proof_data.public_inputs.constants.anchor_block_header.global_variables.coinbase]
-            inner = "0x000000000000000000000000080c5a37d2d3dade855a034bac3548a8b2dfd887"
+            inner = "0x000000000000000000000000fde0805eba75f23cd30a3bb4f0e567a356075904"
 
             [inputs.hiding_kernel_proof_data.public_inputs.constants.anchor_block_header.global_variables.fee_recipient]
             inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
             [inputs.hiding_kernel_proof_data.public_inputs.constants.anchor_block_header.global_variables.gas_fees]
             fee_per_da_gas = "0x0000000000000000000000000000000000000000000000000000000000000000"
-            fee_per_l2_gas = "0x0000000000000000000000000000000000000000000000000000004382670b40"
+            fee_per_l2_gas = "0x0000000000000000000000000000000000000000000000000000004386faeb40"
 
         [inputs.hiding_kernel_proof_data.public_inputs.constants.tx_context]
         chain_id = "0x0000000000000000000000000000000000000000000000000000000000007a69"
-        version = "0x000000000000000000000000000000000000000000000000000000007b6d50be"
+        version = "0x00000000000000000000000000000000000000000000000000000000ad49d7cd"
 
 [inputs.hiding_kernel_proof_data.public_inputs.constants.tx_context.gas_settings.gas_limits]
 da_gas = "0x0000000000000000000000000000000000000000000000000000000000030000"
@@ -4441,7 +4475,7 @@ l2_gas = "0x00000000000000000000000000000000000000000000000000000000000c795c"
 
 [inputs.hiding_kernel_proof_data.public_inputs.constants.tx_context.gas_settings.max_fees_per_gas]
 fee_per_da_gas = "0x0000000000000000000000000000000000000000000000000000000000000000"
-fee_per_l2_gas = "0x0000000000000000000000000000000000000000000000000000000cd98ff1cb"
+fee_per_l2_gas = "0x000000000000000000000000000000000000000000000000000000336bfe2ba6"
 
 [inputs.hiding_kernel_proof_data.public_inputs.constants.tx_context.gas_settings.max_priority_fees_per_gas]
 fee_per_da_gas = "0x0000000000000000000000000000000000000000000000000000000000000000"
@@ -4449,8 +4483,8 @@ fee_per_l2_gas = "0x000000000000000000000000000000000000000000000000000000000000
 
       [inputs.hiding_kernel_proof_data.public_inputs.end]
       note_hashes = [
-  "0x06140f88666c88412ea6f88ad31d11fdc1078c9842da15f244171ef3dd58692a",
-  "0x21153e1db328edfbc5ab37b822c8aa9def09c2333ae5f63806505f3cfc5c037b",
+  "0x2295fa9f079bf362a4f01c3b07d9f912f9b484e5ee527ad7a528025a165b9352",
+  "0x27f0738f58cf7f88e6845175913245e6f82475f464578de70619eceaff66402e",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -4515,9 +4549,9 @@ fee_per_l2_gas = "0x000000000000000000000000000000000000000000000000000000000000
   "0x0000000000000000000000000000000000000000000000000000000000000000"
 ]
       nullifiers = [
-  "0x26f58ea4e59caccca23fd7342a9dbd649426e1ba431becfcd84536bc804136da",
-  "0x0514b0458fed053da93ce988061dcd5ec8fcedf9b907635a1596d5efc27a3e4c",
-  "0x2de5d04c4bfcd53864eced485ffaa5b7d0bff9098fc7916955f7b3d43b535d76",
+  "0x282b555a2f009837bd02f744ae119250934c991464481b5613f7f2112a615f7c",
+  "0x1567c8c1ff81dda9727361df23c92849c46772567aa0bf3723db03c3751e9d2e",
+  "0x1cb96ed0bfe97ed05e23f013062425e5ce6599fb6430b162e69edfc317d5bf82",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -4663,64 +4697,64 @@ inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
         [[inputs.hiding_kernel_proof_data.public_inputs.end.private_logs]]
         fields = [
-  "0x2f6eddcfe22dbb45718bf6098096aac7ad1d1a8fc660c9d5242144b9edd6c0dc",
-  "0x2c73615d9ab6464cbe0c8d451648e96d492e73823467a98efa21f1ea1eb33784",
-  "0x0c584a6e7f5e450f52d1b8d67c73502ecaf1b76e92a3b0ea7ade566c8cae75a3",
-  "0x12eb5caaced046c5e1735a2acccda53139a97359d3c20584a333da0017c1580d",
-  "0x26c7951ef3dcd7d15932be1c034d76eb980cebe77a3abece23d09c23abd992b0",
-  "0x05f8a3597c63ed8a979d0fd278fb5a544959bd9d68f871f7ec79a32e28db3ad4",
-  "0x022d67bc4435543e4c2b6d43b836438058c35a38ee62a27cfbadaa70257b9d7f",
-  "0x17b7cb589d82b5265591d1f6ba68534ecf4dbb2343c54dd755315f22f83c028b",
-  "0x0d1f61abac8fbc8607d199a8d0803b2f98b3ee8d39a2258622fc48b4c4c9fe60",
-  "0x2f3fe27da81ee8e09d1e17cbc275ac75dc5e04d474eb158f2e7306a8dfdecbef",
-  "0x1e2e5d1037c7355ebd297bbf511116120babcb6f2b0f8d4d2a7e1447993c0917",
-  "0x158df03558cf71dd85b122c058a95fe931ec81ed88989d157f6fe35c8a2918fe",
-  "0x0f6ec8c84a85d474160be346e29ccdf2814b15db4c6f85dcc764037c62b76ded",
-  "0x27fe1c1dfc2202c61f7f956ba23c3b0355364e68bb86b443f0667d47173019f0",
-  "0x093896965f941424a522c0a323106574653321df79a8080af2eab1e3754824b9",
-  "0x0c216771dc7929abf732fc00ece83dc11e7d9fd77daece5021650ffbee67af71"
+  "0x2c3715409dc4762ec9a9a602d199ea9932d61edd3fd32c9891fe5ea5a722acde",
+  "0x10433733db106ed8336b9b799ec2debee9fe2da75f114f567eefde5abf9f74d3",
+  "0x17440c522b009a136c2207db86790b05464774690523c7fbf949ad381664d0ea",
+  "0x0a5e8928a4d74ad3256e8a697cfdf84b7baae32abad67b2de7c36ffd67acb665",
+  "0x0b1200621e156c6d79f463e17e81b96f11d18d716ca5222e7276e07d45845a26",
+  "0x04b2b64d09e487d10d557106046a94a97f2c40f4316e6667a2c2d9a99db05385",
+  "0x193da3d713c24b85e1c8f22dd8ef575e88d19c6732f8fd17e370cf64e65b3e04",
+  "0x08569203e8f3d028234ed200df77bca848c9b4b015ad8797c37669a5e5d1ee0c",
+  "0x13a9b2003409ad3d4f38caba797acc77092ddd431af25a955a83dc6f5b92cc93",
+  "0x16fece01bc0b0205bcbaca2904d5674d10573bfef038f94d3e5d526596da2ae9",
+  "0x0a438177a05071eaeb1862f154b187315de4dc804e275b0f2258baf4700c6d64",
+  "0x0959244a76e5e861ce5b8833101b91e19d758109d68cc174a6f9eec9c7afa008",
+  "0x03533d18a1c3ebcf22f820a243be161c9798ea59a506572e32e125c53b7aee7e",
+  "0x1e2b22ea302597bfcbcfdefcda48b60e35fce9c70f46c6cb90fa6db6e8d4dc6d",
+  "0x28fab93b8cd28d8d2a993badc3d1a080902feecfab019dc7c00af0ea9f6f403d",
+  "0x104c4c81c135af94af35a1eeb49b1262e5c53e25ee513731ddeb9f6496eea2ab"
 ]
         length = "0x0000000000000000000000000000000000000000000000000000000000000010"
 
         [[inputs.hiding_kernel_proof_data.public_inputs.end.private_logs]]
         fields = [
-  "0x10a55334a44a21d1a1d26f480597450ec953371a435a1c6c13481c61c75af9c8",
-  "0x16375b8398a42fdbd75bc47c454a3a41f3009588892a70dfe8d4c9066a45221a",
-  "0x2c9e87de46c5866d54ec78e7e3193006609a69f064b0c320493e5a86323a8cb3",
-  "0x02ca56efa5503d808e0d4670f4298c1c35cb2eecd6dfa8212265771ab28383e7",
-  "0x1e4e46136a23c4fcd8a6e3f55f2dbf4bfb643b534013b5e30916e265acef1396",
-  "0x0f76dd665fe04db360190f74bb067692674265e012e8b9c035e58682874c8ad2",
-  "0x1b7af81c24df129a494d2046ea533680d34c3cf59a705b0b7eb6dbe950c93a3b",
-  "0x1023283665d7538cb0b4ceb1757ffe5496ae3b04e38c92a3d88543262acadf4c",
-  "0x1d9f1615f8f1c5d01787846d36608039073bddd52b931363f2ad25066198590c",
-  "0x0ccba93943db048cee4e8cac6386a38fb3411dec41c5727512f5452626db9005",
-  "0x2fed61053470e8726452339f2dddf7aa2a681013fdf09dda3cee503b856e98a6",
-  "0x168608b1f3246093f423c22552c3e2b73d9940806fb6a206f2894f0aec8d9804",
-  "0x1ad0396979cb210c427797f7e9cd130a943a116ffc89191c7dde426f9815f5f3",
-  "0x0e26f9632a1ceb6b3529d1f3e646c5e2635ac7282f771ed015867e5608ac492b",
-  "0x0c8a6181168c14779084d69bd94d619c3bc9b461db844fb179f8fc21c6b667d5",
-  "0x043191aa5f94c3eff6c189762723c296abd3a7c10303b65129622630b7ab6fd4"
+  "0x1b7f52b7a346b47077bab6835a0810e5d75e977fc3f3fbb0436055bcdaa167ee",
+  "0x2320e89fb76918e7dc48b13861302dbf78af5ba8d5a20da77d19781ac32b9bc2",
+  "0x2a99619c0d4d380dbc3d53d03ed35011aa9c296a507fabcf712f43a0e5a10850",
+  "0x02e5d98e7dfbe7653dafb14afddd7e00f403b5a60816d7ab961823bd3cc4b628",
+  "0x223b37d6caffe87e91cddafdf65c4f641a609ff13350d02654b0fed1443088ab",
+  "0x2846b9aa4544f8f8851554f5d0c189c188756d734112e1eedd6840c8aeb0e66f",
+  "0x21cda3f228d55fb1b37f2b7c7a5d42066007143db17645669521ff58956fa7bf",
+  "0x1d8d79951d7389e5f9dfa963f93e399aebaa346e9ce3b3a5da1b45e4600a1553",
+  "0x15eabc8ed921f60621fa4fa35214748a7593f1c06a1e66b76092f789b4960bc5",
+  "0x16babb28d68725cb64d6d7558d49fb921c480359488fcdfb5292019239a50563",
+  "0x015e561b49da425d081b87bac01336defa1e29ee50d01b7be798ac28e05b24d6",
+  "0x04bf1a23807cb0711511a6140caf195df55fcf029842652243034ae2ca740648",
+  "0x2789cc422a86395739004c513cf6a15024e3adf5f2e238b18e1b4f1211a9383a",
+  "0x00c4e950cfe804e8a3623fe768c82b7340b0216f93c00351c53e2144364cfb51",
+  "0x2fd9827b4118b7ef401dff1727785e46fdd31947d2e733f4b39076f43652c18a",
+  "0x158ca7fba6e7fa7b3eb7c062751182d93b4e36b5c77d2e609e246b810650e59e"
 ]
         length = "0x0000000000000000000000000000000000000000000000000000000000000010"
 
         [[inputs.hiding_kernel_proof_data.public_inputs.end.private_logs]]
         fields = [
-  "0x0fada7f16aa7f639db005263ee03b5d94e549187f0f77f92cf4df66e40f35077",
-  "0x2c93c0e720639d650652f8a3207389e68bbddc23a5c77bac86cf76d18d2d4c6e",
-  "0x13886d46429598c222d060b3f1310ab08426f52591a0048ba69c5f8c9fc878e5",
-  "0x06f84323865ae16fba50254f50d6644da0fdd4f7858abeac8e490d6b8e582ff1",
-  "0x2e13bd8098fc2c84136b36e7c8ac6ad91a956851a53414e598bc965a53bd7d56",
-  "0x12606d99ba16253e396904e04ffc666608dd862755887cfa059f5598564398f0",
-  "0x125d17e65b7d789efd50049851d0dab0275777066fc335731e91a10f59a754c1",
-  "0x00fa47821eb005815aff3fdf498f4304a253ea5d6623477b779c6f24dac3f7a2",
-  "0x1d4e2a1c53da9e892c281a869cc68d6012380b64bfb6482fc5a8df6582889d88",
-  "0x2bc1b3d6d18a4fa9c9a6de522ec66e330d0452b89ea54621eddfe6d2a922ef69",
-  "0x150ed27ceffc6f923f89e1e841238eb3fa47c938baf201ab5c75795c039ba436",
-  "0x030e3ebccab9056b7ef14ee89ccfe595bdb050938199811b291615b356220271",
-  "0x255b84fbc5cca3c3dedcec7002347f53f608cb6528f12b1143280307a1c46e14",
-  "0x0c10873c5dd54ec52fd5402af0c75916b2b4df23a9a9aa643896fb956d60ba50",
-  "0x0bc0aa29990bcf3c275323fd20c2871e45f6c31921fc50c9bcad51ad9aa41553",
-  "0x0d2d7cb49928f91e000fd2f08e702b96621a24d92a3dd31a3062abed3b550c96"
+  "0x07d20bd951900d3094f2894e3c76c117114e3150dc3197e9e325e42b4487c6e2",
+  "0x127157561e774918ba656738fb61ad37f92086431bd4f1e4842ab11928b0f8d2",
+  "0x2e5cf59c8f2eee7a06d14cdedb8fe58945357cb16f4c792094325909a12924b2",
+  "0x0e29376c31f2aa7a156c6ce6d1fc9529998251d8500604658f173ff86adffa98",
+  "0x20761b8be9a186cf6a1730b8a1e99049a07e45c005e66d27b6e0ef15a2833e2f",
+  "0x1adf679b2441cf3535241924a35164cf8309256721e3f9fcb860bc2acc462b46",
+  "0x06a613741497b7b7ee978a495bfed7d19bbf76c462d268cee17a3920b1b1abe0",
+  "0x10ade06e253c1cfd65f24246211fb703c157fd9b563ffaf6ab01b6fba4635155",
+  "0x2311c6b104555d4d9afc7d66be6b47a41f8aa96eb77f613a75fc952da5975ccf",
+  "0x08431c3838d7ad6198c1d33ff138953ace3520551bd95b69692609ee11ded216",
+  "0x1822c33cf8097138c896bb9f7aad7def909a6859d5e640919fd16ebcf153a0db",
+  "0x11203b31ef49d39fb85a5ea474116c334c156091ab468493a480f13ad1ec1849",
+  "0x207a4712bacadd2f631fe253cb62932a7acb586dd6dd1b10e0fbe733f61a8f11",
+  "0x2c862b0eb14b1325a0ca63dda4570f718541d998fb4aba96339b7913b80757c9",
+  "0x1bf17ee7d3cf2487dcf1eb7a3647b0920c9e68aacc0a33c9a424d4ee6601ded3",
+  "0x2c70c9b7da7d7df78fcae182d124d7041209070f76d920e5d5c2d7590c385ea1"
 ]
         length = "0x0000000000000000000000000000000000000000000000000000000000000010"
 
@@ -6018,162 +6052,178 @@ inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
       l2_gas = "0x000000000000000000000000000000000000000000000000000000000007d76c"
 
       [inputs.hiding_kernel_proof_data.public_inputs.fee_payer]
-      inner = "0x0c6be08a5e070b343e733716e4ad76ea05de25e2b7fc6e6f50f0ec549f7c0bfa"
+      inner = "0x0635e757a5f05ba5322db37d6930525b43c2e055ed7c4600559a07fc38ab09ec"
 
     [inputs.hiding_kernel_proof_data.vk_data]
     leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000004"
     sibling_path = [
-  "0x03be213d20d047f70ca70ee453a67fc224f9b10bdc15244ad186892bbe6e5e08",
-  "0x2381b675e34261291cea37047545d572302c5e937646c55135b39a46a16e6e5a",
-  "0x15707dd2628665b8d136b5593562e45db70471e34f52ddad843df79991fad464",
-  "0x17bd0d0c2b0bd623b7d30132f5ef171136ca83b2d51821c45763a2b1bb503f0a",
-  "0x15313312ac8ca4825afd3891479fbb14626ca65499d939e23b1f653cd7d018ea",
-  "0x19de2a32662702dd872e529ad89836e16b013012f910daf2bc7c2a67356dd107",
-  "0x1f07bca7a14f9a969539c0afd388affa18926689f431fc541841a2a7604d388c"
+  "0x242211eb4067563a1667c912cfa2492c7b8bcf5e2b97fde4d26fd9bef12ee5f8",
+  "0x0e20194c2fc70cf5d2006345608c9f5abc7cdaf2cebe11870301359962bf326e",
+  "0x08c3364c5142d8fe956b12902940b54a7be36a42ce00cfc5831385a9d55cbe99",
+  "0x166399703d23a5c22febc6185f8eb93c72b65906eefef226e643c35fa0022adb",
+  "0x25f6f5fc25ee815cef59a1889f1e39db3d431d01b01ee1554f9492afec9d41d6",
+  "0x28650667b92be48b116289119fa4794a5fe8fe5792a49d89b9977feae7f685a6",
+  "0x2aa74c20807e8cbb3e32a86ad29472c42a3fb7021dcfaad112a6b68eb0eca98e"
 ]
 
       [inputs.hiding_kernel_proof_data.vk_data.vk]
       key = [
   "0x0000000000000000000000000000000000000000000000000000000000000010",
   "0x000000000000000000000000000000000000000000000000000000000000051d",
-  "0x0000000000000000000000000000000000000000000000000000000000000104",
-  "0x0000000000000000000000000000007bdd9be6bb03c81f03f414d0e7952c3b62",
-  "0x00000000000000000000000000000000001a4c582bedc3644182b1cdaaf6542f",
-  "0x0000000000000000000000000000004bed8f488f5a6f86c954cf47ec2534d4be",
-  "0x000000000000000000000000000000000016f5deb389ed734dfd31895b49195b",
-  "0x0000000000000000000000000000009ecc9fa764f714bf77aa0faf11d5522333",
-  "0x000000000000000000000000000000000029e2c15ce435c2cf1b6fbab396609d",
-  "0x0000000000000000000000000000009003f2b2b72644edb85b4463ed107451d2",
-  "0x00000000000000000000000000000000002c074a5fcdb2096cc64f7fffdd1e87",
-  "0x000000000000000000000000000000943fcc5fb0ac1effe07a437c7612b0add7",
-  "0x00000000000000000000000000000000000132648db01772abb28ffe1fee0545",
-  "0x000000000000000000000000000000051e6f0bb7311f333bbfa14fd8d1c30ff0",
-  "0x000000000000000000000000000000000004ecbf14cbcc26c38e223e061eaea8",
-  "0x000000000000000000000000000000987cb38904dcc08db5d0108c1959ebc96e",
-  "0x00000000000000000000000000000000000634ce5962feff48566cfe00acf25e",
-  "0x000000000000000000000000000000067d1c67031874c3b16204e69e0b20e3f4",
-  "0x000000000000000000000000000000000001792b0899be6ddf9915f72db8820f",
-  "0x000000000000000000000000000000e7968cdce749411a0c53b69b32fee9fbf2",
-  "0x00000000000000000000000000000000002af9218b663f198d3e26a1262c43f5",
-  "0x000000000000000000000000000000dc482024998e8bff5f8584831e119d365a",
-  "0x0000000000000000000000000000000000225a97fb11c0b01247055aae05aa83",
-  "0x000000000000000000000000000000f820d255ffe2c7a27006c73ef18a8acc0e",
-  "0x00000000000000000000000000000000001ec7f0e550ddccea29bbf9723e0abf",
-  "0x0000000000000000000000000000007cc7ff42ed330308c53d0f0b1adf8c82bb",
-  "0x00000000000000000000000000000000002b71b5f2ff117aca9d2931405072a9",
-  "0x0000000000000000000000000000009bca2705f5b06524277e10938b1e3ae130",
-  "0x000000000000000000000000000000000000dca2218fe0f85327b41f7572de25",
-  "0x0000000000000000000000000000006ad436f7542cb6ea8778782bb21e1e6e1a",
-  "0x000000000000000000000000000000000024912352a6a33bfcaea6ac985f004c",
-  "0x0000000000000000000000000000000aa40e6a5602341413a115c7f645c0e224",
-  "0x0000000000000000000000000000000000292cbf23b57a6da333df93099bf297",
-  "0x000000000000000000000000000000399817dedd7386d456dcdc11ef918170d8",
-  "0x00000000000000000000000000000000002fd4a5c125a19398586f81f50d08ed",
-  "0x000000000000000000000000000000128f2e4e4046ddaa8eec1b3c58b42498f4",
-  "0x00000000000000000000000000000000000b2c12532f10d0b462cf9528dbcd0e",
-  "0x0000000000000000000000000000008ae65931af724c3c0400838c3e0f14a63f",
-  "0x00000000000000000000000000000000003021b5aeb155ab4098ea319216c150",
-  "0x00000000000000000000000000000099cb3271ceb56ba17b7ea6cb985a066795",
-  "0x00000000000000000000000000000000002d08ef31caedba407a8910064c348e",
-  "0x0000000000000000000000000000007a24a91d7f41ddf097c774bfc5c5b14f7f",
-  "0x00000000000000000000000000000000001215e16e8990a71da011263a5bb1b0",
-  "0x0000000000000000000000000000000b8699750205159e85952211a6b796b2c3",
-  "0x000000000000000000000000000000000007f31b659c12e19bde449ce97b7581",
-  "0x00000000000000000000000000000099919e515f737b284f929cc403902045aa",
-  "0x0000000000000000000000000000000000282779444444b748cded6dfa03a8c8",
-  "0x000000000000000000000000000000c948e855c54c341564bd6385006e7b7e7a",
-  "0x00000000000000000000000000000000000d805f4d6780d20ff8fd0138baba0b",
-  "0x000000000000000000000000000000adc3d165ba7a3535ecd66b3685cc52e216",
-  "0x000000000000000000000000000000000020ea41e2032506165b090564a1f156",
-  "0x000000000000000000000000000000257ce5707a1c3ed8a7f31136d36bfebe46",
-  "0x000000000000000000000000000000000008a594c9391574a106988000299a86",
-  "0x0000000000000000000000000000007ba51fcbc5a0e3ebb81785ef90f801f328",
-  "0x000000000000000000000000000000000018e5bb93c2849fbc8f33f440668da1",
-  "0x000000000000000000000000000000298c9d6ba0feb3ba1ce7bda687a1d46d8c",
-  "0x00000000000000000000000000000000001a061e0ebbdf640372e4df8b604e2c",
-  "0x00000000000000000000000000000035a476a1830b1571ed5efa989f9c8456a7",
-  "0x0000000000000000000000000000000000152d1ec4cdaa084dd7fe3e1d7943c3",
-  "0x0000000000000000000000000000007969c064f63acd28fc4e9af1fb14b029e9",
-  "0x000000000000000000000000000000000022568bb0376631666642d61c0413d3",
-  "0x000000000000000000000000000000d8f03a334b5fb5a2b19d5f97c34002c737",
-  "0x00000000000000000000000000000000002ade6fb7791560f6617c57a8d93675",
-  "0x000000000000000000000000000000205771a544bf044a16f18a71860e980c56",
-  "0x000000000000000000000000000000000009ea51bef74f307e80a1ce3eb04f0c",
-  "0x0000000000000000000000000000004bd9f9f48587904abb15a8f0744695f750",
-  "0x000000000000000000000000000000000008d70e886bb1856f8ddde1a2ac2ea0",
-  "0x0000000000000000000000000000000b5c578b5c69bf525eac0f427781c2735f",
-  "0x0000000000000000000000000000000000194f71a519161646bd2e69579ce18d",
-  "0x000000000000000000000000000000371920d1369edf77a430f2acad5c5efad6",
-  "0x000000000000000000000000000000000002e19edd79f5b2f26cffc5f746be23",
-  "0x000000000000000000000000000000c049a57e72c1358b11320cdc3642480848",
-  "0x0000000000000000000000000000000000255a39bc5288098ea3c97298050123",
-  "0x000000000000000000000000000000eea27e28aa13a85cd77c3455b4572cdebf",
-  "0x00000000000000000000000000000000000f71670b1547f3e8fa4199a0260b16",
-  "0x00000000000000000000000000000079053fbb0da199499ff2e425fd13b2806b",
-  "0x000000000000000000000000000000000008eab1d046d6b3760caa9497347ca5",
-  "0x000000000000000000000000000000b4bae97b9c2bb4dfbe8bbb4635495a31ee",
-  "0x000000000000000000000000000000000029669ede5615e16c69a08b00d74491",
-  "0x000000000000000000000000000000d4f0382d993f4e892a67c88c73e58d16a5",
-  "0x000000000000000000000000000000000025aeca568dd8a15ba86449f08720ae",
-  "0x0000000000000000000000000000007176a72688a1bb99e23cb7978ef620a9e5",
-  "0x0000000000000000000000000000000000140efd2bca1c4d831ccf4403df6531",
-  "0x0000000000000000000000000000007c6574b14e2e2259a41760474151568049",
-  "0x000000000000000000000000000000000015a437355f799b987761d6ffd79b93",
-  "0x000000000000000000000000000000f582079cc4a54ccacd4890c7a74963ac7f",
-  "0x000000000000000000000000000000000023e3ba3ea3acf56e1b9c1af5262148",
-  "0x000000000000000000000000000000185e6f48adc1b0d832ec194049203044d3",
-  "0x000000000000000000000000000000000005c9c2c1ae26b826c516644a5c75fc",
-  "0x0000000000000000000000000000000934d89dd06972504b2fd4809718a22b2f",
-  "0x000000000000000000000000000000000026eb2ec5bdb55093df6f70c6026dba",
-  "0x00000000000000000000000000000034069739183b7106c6ac488bfef2a04845",
-  "0x00000000000000000000000000000000002fe45d8c640bcd932a2627dcca5d0f",
-  "0x000000000000000000000000000000ae7bf7fbb6477eef1afadcd075635aac81",
-  "0x000000000000000000000000000000000015b1a53ce593cb8f29aebcf29fc410",
-  "0x00000000000000000000000000000095b5d8b7b4a63b05df652b0d10ef146d26",
-  "0x0000000000000000000000000000000000099e3bd5a0a00ab7fe18040105b9b3",
-  "0x0000000000000000000000000000002129af3a637f5a622a32440f860d1e2a7f",
-  "0x00000000000000000000000000000000000015b8d2515d76e2ccec99dcd19459",
-  "0x000000000000000000000000000000222b888108dc25d1aa450e0b4bc212c37e",
-  "0x00000000000000000000000000000000001b917517920bad3d8bc01c9595092a",
-  "0x000000000000000000000000000000482141c7ebe42000a1d58ccb74381f6d19",
-  "0x0000000000000000000000000000000000305e8992b148eedb22e6e992077a84",
-  "0x0000000000000000000000000000007c86847618681dc29d8a9363ab7c40e1c3",
-  "0x000000000000000000000000000000000016465a5ccbb550cd2c63bd58116fe4",
-  "0x000000000000000000000000000000439973ac12d7ca796d6fe98ca40e6ca6b7",
-  "0x00000000000000000000000000000000002e24d420fbf9508ed31de692db477b",
-  "0x00000000000000000000000000000028edd1a7e46c840d9c943fdf45521c64ce",
-  "0x0000000000000000000000000000000000043d063b130adfb37342af45d0155a",
-  "0x0000000000000000000000000000009330952ae74c573d1686d9cb4a00733854",
-  "0x0000000000000000000000000000000000261522c4089330646aff9673619494",
-  "0x0000000000000000000000000000000000000000000000000000000000000001",
+  "0x00000000000000000000000000000000000000000000000000000000000002a1",
+  "0x0000000000000000000000000000000ab14d45ce00b83dcd3648bd26cc8d090b",
+  "0x00000000000000000000000000000000002593a8100ce9585467512fcf91ec7b",
+  "0x000000000000000000000000000000f8d90fcca08a132e8c74071130b4dd6ba2",
+  "0x000000000000000000000000000000000009ed2c8e568d1c0bfb88359638ecc3",
+  "0x0000000000000000000000000000008ca980f3a113cb18af92e9b46fa2ee593f",
+  "0x00000000000000000000000000000000001868591fc02929eabde4c59e045da2",
+  "0x000000000000000000000000000000c6ab2e21b4a539352b0fa85480e59614ae",
+  "0x0000000000000000000000000000000000261e9e331e1b1ff66475a4b2f1b06a",
+  "0x0000000000000000000000000000007e56fd37d74673969cb7b63ea552bb73a3",
+  "0x00000000000000000000000000000000001e8357b40dd66812ac10332a195384",
+  "0x0000000000000000000000000000009a67b00618d5931bf5729bc33200494a34",
+  "0x00000000000000000000000000000000001ec289dd5defd426f8406f7b459b18",
+  "0x000000000000000000000000000000cbf5654f66cc59e049ab9d41f3c09bd805",
+  "0x00000000000000000000000000000000002b58263df3b151f6c40270e7265b9a",
+  "0x00000000000000000000000000000037bb418c69de7b7241a23c52bf15539f21",
+  "0x000000000000000000000000000000000018f927ce86b0ae6730ebe40aeb479d",
+  "0x000000000000000000000000000000a6c0c2c9b73a61c36d313ae8a8835f9278",
+  "0x0000000000000000000000000000000000218292eb4b2cc949b9a1315393be51",
+  "0x000000000000000000000000000000b9113d213372b954d9c141b974f7e83b59",
+  "0x0000000000000000000000000000000000185176d8207747c8dc08cf4343d104",
+  "0x00000000000000000000000000000088f854446e38d6c631e6d194df4d990d19",
+  "0x0000000000000000000000000000000000063e94ad0c12c349a7c709bf5d83a6",
+  "0x00000000000000000000000000000012009ec4a97aca5b331efae62e756dd218",
+  "0x000000000000000000000000000000000020f3ecd68b17961d4405cc3df51bc2",
+  "0x000000000000000000000000000000fae1b073325ab133cca1307d23251b4542",
+  "0x0000000000000000000000000000000000180baf67e13f8bce4344ae7ce19e62",
+  "0x000000000000000000000000000000441610208cdd2b1bf3fe4d2e0eae863df6",
+  "0x0000000000000000000000000000000000208ff907f35f1db8abb4c646a697a2",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x00000000000000000000000000000044ca8e336c84b6b7b89c467703fac5d670",
+  "0x000000000000000000000000000000000002ad904d1bb01533b073fac2c45ce3",
+  "0x0000000000000000000000000000003f970dde0524d5d3aa5ec42dbe27151000",
+  "0x00000000000000000000000000000000001ef30a3f4adf2bcd413bdc8c5dd5fc",
+  "0x0000000000000000000000000000003c57ebef1052061d87a5444189184fedc4",
+  "0x0000000000000000000000000000000000202e3cff46a50f235830601cb46441",
+  "0x0000000000000000000000000000004fa856a797354063fe34e5f27c9c83bc6d",
+  "0x00000000000000000000000000000000000ea5ae9cdfabe406cf2a5b55237bbc",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "0x0000000000000000000000000000000000000000000000000000000000000002",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "0x0000000000000000000000000000005950aebe32851f28439f52ec2efb16f6ff",
-  "0x00000000000000000000000000000000000fdb634d8367fd1d793445ea0c3646",
-  "0x00000000000000000000000000000012c8d1afbd2cf5506e876150669824a88e",
-  "0x0000000000000000000000000000000000129e82352b03521e13a3312e29c3a1",
-  "0x000000000000000000000000000000be948631e606389a86e73f56daa91bcf29",
-  "0x000000000000000000000000000000000022ea6bc1f706f42d490e07c62daa7b",
-  "0x000000000000000000000000000000bcfcb41e8b38bf6e05b42a676273361ca3",
-  "0x00000000000000000000000000000000000873b1ebd84a31b29fcd1da1f98b71",
-  "0x0000000000000000000000000000008d8989b2d31e10898b46241c4d9f8bb737",
-  "0x00000000000000000000000000000000002d411158a9e4a6e01873b22ede2391",
-  "0x000000000000000000000000000000da8b33109e7346fd73e6ae3d1063063b9f",
-  "0x00000000000000000000000000000000000ed26cb62953993d14bfc3d21d099b"
-]
-      hash = "0x12ac996f8d5a4c17d5376d6f73001abc5336c750db1531e618dca113fa73cc28"
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000005977a6ca5f818fb4c7815b21d8b2c447c4",
+  "0x0000000000000000000000000000000000179899652de3fc82e7456af39124ae",
+  "0x0000000000000000000000000000004c333e10f6d767ace9da1fbb2288a9dfd9",
+  "0x0000000000000000000000000000000000064a1eef3136b9b2548ca701a560c5",
+  "0x0000000000000000000000000000005270409324c72d9bcf82404a92da27a0b9",
+  "0x000000000000000000000000000000000005a3c90a71682a6efd0e54e9a77b89",
+  "0x000000000000000000000000000000bd6b98c7a410f2935e980650ba6bace9b5",
+  "0x00000000000000000000000000000000002d6b10a8eb83916d5d0c73e87de7ce",
+  "0x00000000000000000000000000000016f253a21824c1b72d31c0b83fbd2f67a8",
+  "0x00000000000000000000000000000000002325ceb5d73a52da7e5f66948919ef",
+  "0x00000000000000000000000000000040a423b91a5e01fbd70c7afd9a841a5d68",
+  "0x00000000000000000000000000000000002ea67a3d7ec40d5d34e04785575833",
+  "0x000000000000000000000000000000c8feceb5f3e4f6869fb472314a0ec5c13d",
+  "0x00000000000000000000000000000000000cdd4e4d0a3d53aa984997d0e6fa13",
+  "0x00000000000000000000000000000038e40f18d3b621775ee0840817e67e4a28",
+  "0x000000000000000000000000000000000003044396c5186b3eda019538d50d0a",
+  "0x000000000000000000000000000000c87c8b81887e6f9d28c03abce21e8d3163",
+  "0x00000000000000000000000000000000002108813d0ad0d6b267b85de0aebd72",
+  "0x000000000000000000000000000000229bd7949ff133b8a8bcb34ae3f63c3f29",
+  "0x00000000000000000000000000000000001ffbf799ed6f961da2c95dfcfda5c8",
+  "0x00000000000000000000000000000019fd93cb6ad0c37b1d129df87b8f0045bd",
+  "0x00000000000000000000000000000000002769159aff882745d2decdd24fc534",
+  "0x00000000000000000000000000000059125a89aa20d5c34e487a9964378fb1dd",
+  "0x00000000000000000000000000000000001a4525e53b8e1b713b0d533a75697b",
+  "0x0000000000000000000000000000009db52358939e9c8b5a81e5da54d15fcbc5",
+  "0x0000000000000000000000000000000000141daa5d1eb80a619cf69d939911ce",
+  "0x000000000000000000000000000000920de362ff60f4fb20aa168a9c69e8fb5b",
+  "0x0000000000000000000000000000000000212ee1ea497025e81aafd6b0f19d7f",
+  "0x000000000000000000000000000000afda39c8899c90c3f3c12af6ff9d1e4943",
+  "0x00000000000000000000000000000000002b9f0ac04ffa30b26e6470ac4fb14b",
+  "0x000000000000000000000000000000e758282e0a189ee40406bfb4780af28d7e",
+  "0x00000000000000000000000000000000002609b91eb682e98ba642f7676a2317",
+  "0x000000000000000000000000000000d653ab7bb49c6b252c8e9ece66d6af5bf6",
+  "0x00000000000000000000000000000000001beaa320911b43dd07d4942ece7af6",
+  "0x000000000000000000000000000000e98161cdc233e836672b09193d36736be7",
+  "0x00000000000000000000000000000000002f790e29e15d548e312423649419b1",
+  "0x00000000000000000000000000000078a02f728f55d22b411fce8dab2560a5a1",
+  "0x0000000000000000000000000000000000261cc262f8a013c71095173558eb8e",
+  "0x000000000000000000000000000000be0b88125d5dd9fcf63ac48d25afe09f29",
+  "0x0000000000000000000000000000000000214cc8538e55cda1e79845f647003a",
+  "0x0000000000000000000000000000009a7928874cbe96e8443cbb1215d1b37abc",
+  "0x0000000000000000000000000000000000120294e39f046405e4986504ad6f7a",
+  "0x000000000000000000000000000000ce3304e128f05c7c683575d902224a55a9",
+  "0x0000000000000000000000000000000000226ce0f91acba0f52ada4d75b3ce0b",
+  "0x0000000000000000000000000000002901833809eb0e5b376ddac735643d6bdd",
+  "0x000000000000000000000000000000000019df493501a843dd724c5d2438d552",
+  "0x0000000000000000000000000000005ad0910098503762a09c6b023dd9f7da88",
+  "0x000000000000000000000000000000000002a07897d034bca13cb58055f21060",
+  "0x000000000000000000000000000000a6d13cc406101c2fabdf6b9cd6c3321042",
+  "0x000000000000000000000000000000000014ca383ea3166dae2bb8821be0534c",
+  "0x0000000000000000000000000000007c739a2d33655f29993f3fc070826fc862",
+  "0x0000000000000000000000000000000000186c53325575964028f2a7766ff461",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000001eee81b23a887f299049b14c11e98460d6",
+  "0x00000000000000000000000000000000002a56ce41f6b0be13b9c26747621b82",
+  "0x000000000000000000000000000000d5827d6338c78656c0d12ca1aea6ef2c7c",
+  "0x00000000000000000000000000000000001aa98f2de3ddda547d8f6de4e725de",
+  "0x000000000000000000000000000000155b3c28adb416200e101a487f2543ad2d",
+  "0x00000000000000000000000000000000002246235cb513807e578e42074a19ac",
+  "0x0000000000000000000000000000003c98c757eb995c93d27b6110290cb56e11",
+  "0x00000000000000000000000000000000000171c6f0bf293ce782225c929fe120",
+  "0x0000000000000000000000000000002bdadc3b09761e1b4d67ad3518ae559daf",
+  "0x00000000000000000000000000000000002b1e9255d36e908e5e0f52735641f6",
+  "0x000000000000000000000000000000580384ef31417750e03bc6cb0d72548e2a",
+  "0x00000000000000000000000000000000001739146d24b1486477e87b1e6d56b3",
+  "0x0000000000000000000000000000004b8401fb26c87b7401c51682241869a352",
+  "0x000000000000000000000000000000000019e1ceec2b14da6d66c7ef728e70f4",
+  "0x0000000000000000000000000000007b4b8a0e3f4ed790c8fd59833694d6ae17",
+  "0x00000000000000000000000000000000002e9132dcee89b635cc51f03d30a856"
+]
+      hash = "0x0adf07f9ae6efe161812ba23ef36c864880bc3b0a8461ffaf756f4400c7e9f80"
 
 [inputs.start_tree_snapshots.note_hash_tree]
-root = "0x101e57ba43504cd90f08cd61ed589b9367d33eed30ccd7a2e8333cf633f2fb6f"
+root = "0x1c223e428d6faa36822890e3b99417ddf73ffb069bf4c44b6ae9d7fc741733f6"
 next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000200"
 
 [inputs.start_tree_snapshots.nullifier_tree]
-root = "0x0ec61562d933c8948a789b996a4057b5ef647965d854a7d6e36d28c2d2aea06e"
+root = "0x01c778a6b3dcb1245bb0aee174252dd95256e67309f952e5d2f8cbafffe20d0f"
 next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000280"
 
 [inputs.start_tree_snapshots.public_data_tree]
-root = "0x021204d873082156522eb6603c9c7f7acb21fa936d470764f1fda90cf504891c"
+root = "0x134e44df49ddb89525046d19bcfc2734c78e419994de9d6f7467eb84d02d1060"
 next_available_leaf_index = "0x000000000000000000000000000000000000000000000000000000000000008b"
 
   [inputs.start_sponge_blob]
@@ -6199,7 +6249,7 @@ next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000
   "0x119f56a2e8423a7feaab49b9b5dcbadec0648dfa4096b61b6774ea33ae29dc7f",
   "0x221cf368938c74e4fced9dfb2a8e37cd8a6c57d21385c249f0b5c2412341287f",
   "0x2c5214dfc4d70d2619fce2a7e02ddcf380576dca42b66c9215c7d8d1ec154116",
-  "0x11a5db1602474d8568966b03c9a1734ea53a25a90f796a7909af75af1e797f14",
+  "0x1b250005eb96ff625256d16bb83fedca81f8952f06c2d3031636c0e1d8c9fecd",
   "0x0d04c63f36bd168215c9b09a227c7e8d3ad48e2f11b8202fd07c524bd30ee88f",
   "0x042c72d0ca208f0631ed947050258333518c26059f0a2ef041e933b1b2a6d8ad",
   "0x00c21235cdc5d4241fab782680421cdd99c088a3b48a740d8289d0e67b2ee5da",
@@ -6234,9 +6284,9 @@ next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000
   "0x08c286d5f8584ac20b64b63f763d4ec37d3fa13244234a3280f34bbc70a32d53"
 ]
   sorted_nullifiers = [
-  "0x2de5d04c4bfcd53864eced485ffaa5b7d0bff9098fc7916955f7b3d43b535d76",
-  "0x26f58ea4e59caccca23fd7342a9dbd649426e1ba431becfcd84536bc804136da",
-  "0x0514b0458fed053da93ce988061dcd5ec8fcedf9b907635a1596d5efc27a3e4c",
+  "0x282b555a2f009837bd02f744ae119250934c991464481b5613f7f2112a615f7c",
+  "0x1cb96ed0bfe97ed05e23f013062425e5ce6599fb6430b162e69edfc317d5bf82",
+  "0x1567c8c1ff81dda9727361df23c92849c46772567aa0bf3723db03c3751e9d2e",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -6300,8 +6350,8 @@ next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000
   "0x0000000000000000000000000000000000000000000000000000000000000000"
 ]
   sorted_nullifier_indexes = [
-  "0x0000000000000000000000000000000000000000000000000000000000000002",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000002",
   "0x0000000000000000000000000000000000000000000000000000000000000001",
   "0x0000000000000000000000000000000000000000000000000000000000000003",
   "0x0000000000000000000000000000000000000000000000000000000000000004",
@@ -6367,9 +6417,9 @@ next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000
 ]
   nullifier_subtree_root_sibling_path = [
   "0x09166b559c0f096e897bb202971954b6c576adc978e55de25b96e97269f0e461",
-  "0x012cd00b5e9ed16001a1d2fc6cb4d551092fcae92d188092aa8b81d1fd4182df",
+  "0x0362ef192033d8dd7561fb3d5599ffef50988df3dfb2d2a62db522b4dd468396",
   "0x2e5d15ff444e6868f293419113070aae8ce133e2ab4d2705a6a696caf2a17e21",
-  "0x12109e884eeae36c751c7e47b80b61f8c0cc6f2e4b0d119273656e8e8feb47b4",
+  "0x11b6672806903af07ce5206700433633952804bd3668e15fac8868f0695bed72",
   "0x2842a7e5a723d69a6f6c088fcc7b2e289173ca583987359c712c15ee44806960",
   "0x2bc8d89815dcd02215ab5a89956f9743a205a7fd71e002096d7c250ffc3544bf",
   "0x01d2012039a4d9492bb83367eead0282083ff9011b9c3884c96022f90dcf7432",
@@ -6405,19 +6455,19 @@ next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000
 ]
 
     [[inputs.tree_snapshot_diff_hints.nullifier_predecessor_preimages]]
-    nullifier = "0x2cadcd0ba841421827cc2d9919e249a3e045a3cef6b4d60e3fce4f6df9e02513"
-    next_nullifier = "0x2f4a0d12b9a49147da2fb36e3fb9e86cfda5f9d9c3c37d282c28c9a902b1ec7c"
-    next_index = "0x0000000000000000000000000000000000000000000000000000000000000141"
+    nullifier = "0x20847724d5be09ca0af6e9b36ec5ce1147d557c6a4a2c61bb2aa4d62bdc08e66"
+    next_nullifier = "0x2bd24d9521cfcd8b14bb5f749a761545f4fe94dcc56618d57bcfea385a5db168"
+    next_index = "0x0000000000000000000000000000000000000000000000000000000000000145"
 
     [[inputs.tree_snapshot_diff_hints.nullifier_predecessor_preimages]]
-    nullifier = "0x239f77ec97b247527037505fb7cb42909ecc22b257a66d88b6d9dd18c27063cb"
-    next_nullifier = "0x2baaf04e80fa70e26a2bb66165b86907706e7fb9516a5607add1075873799b9a"
-    next_index = "0x0000000000000000000000000000000000000000000000000000000000000080"
+    nullifier = "0x1b292354acb3ba526050467dbc93d2d505c80e73a41b7d2fb0c09cd32d03875f"
+    next_nullifier = "0x1ceec3511b2489568c8344be81e970a769044dd97be95562536c6867e09b8677"
+    next_index = "0x00000000000000000000000000000000000000000000000000000000000000c1"
 
     [[inputs.tree_snapshot_diff_hints.nullifier_predecessor_preimages]]
-    nullifier = "0x0507a5b579d2b1473ac764da64fa0f60b52b73298f4cf6dfde41d68397823c88"
-    next_nullifier = "0x0738fecdff78b48d0cfa480db3f79e668c740e8e85f1c66cce4426ad95d67a38"
-    next_index = "0x0000000000000000000000000000000000000000000000000000000000000200"
+    nullifier = "0x1546bc72fd1c9f595cc29ec322397f0c1306a17f5de02a12ae937e48b30f316d"
+    next_nullifier = "0x16c07a80d3d164d5d8082a5dda9fb5d5f0de35fc2bc4ac2fa36182ed91ce381f"
+    next_index = "0x0000000000000000000000000000000000000000000000000000000000000146"
 
     [[inputs.tree_snapshot_diff_hints.nullifier_predecessor_preimages]]
     nullifier = "0x0000000000000000000000000000000000000000000000000000000000000000"
@@ -6725,18 +6775,18 @@ next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000
     next_index = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
     [[inputs.tree_snapshot_diff_hints.nullifier_predecessor_membership_witnesses]]
-    leaf_index = "193"
+    leaf_index = "449"
     sibling_path = [
-  "0x3017546b9bb132c2ad2a84da3744c25b7f048de0a334fd70944ac7ccf9a6bfd7",
+  "0x2941a7272bf49125b7e5c8f9c8a06939064d366f933f8ebfcbe4257716243dad",
   "0x19b8970c3845d2244da0851d0f9b631fae6156a9846a5598a0216fb537fb37d9",
   "0x1fca8e5d48b8e1a70cb333a4f5ca28a3355ec77b582acf926a4a17d42c31f776",
   "0x218d6b91b3a210e878d135aab2560fb2801db442dbd439ff2efd1fdfdfeeaad0",
   "0x0b926aa38fc854f094d02c0b719a75e50a7d4a0ef11685217c6568095b41fccc",
   "0x09c18d449a07bd072b1eb2b042e466fde1f82f740d57ab0ecb3ff368b3868abd",
-  "0x1b32928a35e717ef5797eecda24d20e505e8548ae171186cdf241caf41db096c",
-  "0x206e84993bf8795362c99568fa50b7102beb8a2560da5eb5bb7bed0aeabf61fb",
-  "0x120a3960069b931a27ce97cb431bcd818a23d91cc1d3b703349585e063065d5e",
-  "0x175649c0033c2ba0e0b7e89a12923425785847014cb2865186f654df578bb164",
+  "0x0df0ef1adc3691e5553b5304a971c203841eabef3423142e2e3c0bb4cfb01a82",
+  "0x233e166aa2a44dc5f9bcfbba514493bab8b8a00e3dd56e0d813888f5d06203f8",
+  "0x24bd80edafc13493c1edb17a018f34698eca5bed3b768dee95961dc577560e4e",
+  "0x29dbd0f2b5aec42761b1d801d1f899352dbb3b8c358abbf17c97069b6827de9e",
   "0x2842a7e5a723d69a6f6c088fcc7b2e289173ca583987359c712c15ee44806960",
   "0x2bc8d89815dcd02215ab5a89956f9743a205a7fd71e002096d7c250ffc3544bf",
   "0x01d2012039a4d9492bb83367eead0282083ff9011b9c3884c96022f90dcf7432",
@@ -6772,18 +6822,18 @@ next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000
 ]
 
     [[inputs.tree_snapshot_diff_hints.nullifier_predecessor_membership_witnesses]]
-    leaf_index = "257"
+    leaf_index = "327"
     sibling_path = [
-  "0x03731d2d7df1efaf1fa12ab3e7979951412c44fcfcbeab359b8ecbbd0088373f",
-  "0x11f2bf667e4f76a19252a353d94d315872c72d00241310974515c5393a483d7b",
-  "0x1fca8e5d48b8e1a70cb333a4f5ca28a3355ec77b582acf926a4a17d42c31f776",
+  "0x10ef06a0c859785e8d7fcbbf7d1a624f045c1544816d195838405eaacd740010",
+  "0x2573a0e9cf295372545c619b8c9329e46b01b7ab974cec3bd12def9098d16620",
+  "0x08db730f7a5e1eed62556f1a919321b5e4f5ab9cf68cd8982fd80e1cadc6369f",
   "0x218d6b91b3a210e878d135aab2560fb2801db442dbd439ff2efd1fdfdfeeaad0",
   "0x0b926aa38fc854f094d02c0b719a75e50a7d4a0ef11685217c6568095b41fccc",
   "0x09c18d449a07bd072b1eb2b042e466fde1f82f740d57ab0ecb3ff368b3868abd",
-  "0x1eea29d783bb2b7b7f43a7f4b6d2bc036d64c8ae5f01b37d2b56d7d948fc790b",
-  "0x2e00db97c6546bf45810d9c8073a2daf44ecc1d8e786e11edb12cdec4395dfd6",
-  "0x10ce999724e5d1e0be0fbb742b9097f4a5090a2a247d097209dadad5bb3a1ee4",
-  "0x175649c0033c2ba0e0b7e89a12923425785847014cb2865186f654df578bb164",
+  "0x259490a13493a82580afd12e91ff42f23d398b46827e29d819e2a64dfa907c47",
+  "0x20b151f51c25e2fbf0e6eb3c22eddd39b87ca1836592ed50d5d8fd3b489ee69d",
+  "0x24bd80edafc13493c1edb17a018f34698eca5bed3b768dee95961dc577560e4e",
+  "0x29dbd0f2b5aec42761b1d801d1f899352dbb3b8c358abbf17c97069b6827de9e",
   "0x2842a7e5a723d69a6f6c088fcc7b2e289173ca583987359c712c15ee44806960",
   "0x2bc8d89815dcd02215ab5a89956f9743a205a7fd71e002096d7c250ffc3544bf",
   "0x01d2012039a4d9492bb83367eead0282083ff9011b9c3884c96022f90dcf7432",
@@ -6819,18 +6869,18 @@ next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000
 ]
 
     [[inputs.tree_snapshot_diff_hints.nullifier_predecessor_membership_witnesses]]
-    leaf_index = "325"
+    leaf_index = "448"
     sibling_path = [
-  "0x28dfc9f30d0a4880a8a83fe70c2e075c62a768f696ea01ec1f014c3d32370792",
-  "0x22d9f38e31348f6e82475420c9e866f13bf745b7fcf657d4f72d004e8aa33ce2",
-  "0x1a1d0af9a52e7b6560f4974401d8e66405a38b240b41279934529b5b8525ee34",
+  "0x09828dd1f15420f5ae235412b7e16ecbce1b932812b73b7564e762bfd566f9a5",
+  "0x19b8970c3845d2244da0851d0f9b631fae6156a9846a5598a0216fb537fb37d9",
+  "0x1fca8e5d48b8e1a70cb333a4f5ca28a3355ec77b582acf926a4a17d42c31f776",
   "0x218d6b91b3a210e878d135aab2560fb2801db442dbd439ff2efd1fdfdfeeaad0",
   "0x0b926aa38fc854f094d02c0b719a75e50a7d4a0ef11685217c6568095b41fccc",
   "0x09c18d449a07bd072b1eb2b042e466fde1f82f740d57ab0ecb3ff368b3868abd",
-  "0x050aea947ce5e5da57443a4d7f9e95fc7d39cb87ad5eee1eb17e3fd37521b123",
-  "0x2e00db97c6546bf45810d9c8073a2daf44ecc1d8e786e11edb12cdec4395dfd6",
-  "0x10ce999724e5d1e0be0fbb742b9097f4a5090a2a247d097209dadad5bb3a1ee4",
-  "0x175649c0033c2ba0e0b7e89a12923425785847014cb2865186f654df578bb164",
+  "0x0df0ef1adc3691e5553b5304a971c203841eabef3423142e2e3c0bb4cfb01a82",
+  "0x1cf8e3ee3a38d1b5aa62577b1820cc6a13b2bd9af440383c958fb833e05e831a",
+  "0x24bd80edafc13493c1edb17a018f34698eca5bed3b768dee95961dc577560e4e",
+  "0x29dbd0f2b5aec42761b1d801d1f899352dbb3b8c358abbf17c97069b6827de9e",
   "0x2842a7e5a723d69a6f6c088fcc7b2e289173ca583987359c712c15ee44806960",
   "0x2bc8d89815dcd02215ab5a89956f9743a205a7fd71e002096d7c250ffc3544bf",
   "0x01d2012039a4d9492bb83367eead0282083ff9011b9c3884c96022f90dcf7432",
@@ -9733,16 +9783,16 @@ next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000
 ]
 
     [inputs.tree_snapshot_diff_hints.fee_payer_balance_membership_witness]
-    leaf_index = "121"
+    leaf_index = "120"
     sibling_path = [
-  "0x2d906c937960c32b4c29ea5e8b8c7137680b97c3ceba8dbabdf832430f9915ab",
-  "0x2d790da94081a068b1ff4612488f7340a2cc47af23cb034e2e2acaec73c2a46f",
-  "0x1fa53d5c3aa7776a29a9b222d371b92ace15f834dac4fc957828c7c827b2a147",
-  "0x303a520710efca26f4fb4264b749c493e851056c83315b622d83215ea2eabc93",
+  "0x13d5c2f78d433c774b2f9be7bb5d666fb8fd80452d0896af987365d04f9f681b",
+  "0x25f3536c3eb76fd96d5ccdde3cbbe50f5548e23683bf9f2cbad67f53d10537bc",
+  "0x2835a744c1a26d89fca8be670b7b8d7a2473a3eb7fd72bf533a007d6cc443772",
+  "0x2d0726c97dd7add62ef5c3e71e02ff90e76079e2650f2217ec0fe5e678b0bb8c",
   "0x2edd4e68944dac758244213037fbe9d622c7c28d6070f16862b3e8986090bee4",
   "0x1d5ea1a288ff1ff4cabceaaa2f93eda378a5fb0a2a55423f4d4d205969181931",
   "0x23b80d0ef13d744a52faabf5651164d28f7faf902653e41a35472eea87936e6e",
-  "0x1b6dbdaf3892ffd984063d39358e03c5ac80444f5bbce713f431ccb4dff30b04",
+  "0x27c696ad87d2ae17e4005225c67d015eaca8a9c6e97dec181f97f15e2c1ff894",
   "0x16c8aff52f0422f4bfc502620fe15dd6a4de67637563b7a8175f2d5727d268a4",
   "0x1c76b6744bc3d6b1cd4b53459a08b4959643c0768fde657299fcc82e2732f744",
   "0x12a6fac0fdfbd7897d8fe955f454cdb309ce8597d647ebfd0ba614c4eb215581",
@@ -9778,18 +9828,18 @@ next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000
 ]
 
   [inputs.fee_payer_balance_leaf_preimage]
-  slot = "0x15cecc56c070afe91aacccc6d3b165ad1f791b7644f606f6f60eaa2f87826abc"
-  value = "0x00000000000000000000000000000000000000000000021e01df9260771412a0"
-  next_slot = "0x179ad66b830216438b86b08205cec86c12c91e20f2e72c60f6b5c6c2cde870bb"
+  slot = "0x12d1296a2643b832fbd1d6d3ed3678833fce770084efd75adfd517de8214ccf3"
+  value = "0x00000000000000000000000000000000000000000000021e01deb310ea6e1140"
+  next_slot = "0x133d35b9030a815b221f9205ef080f220fd8ba968e9bd88b60033b4854e100ad"
   next_index = "0x0000000000000000000000000000000000000000000000000000000000000085"
 
   [inputs.constants]
-  vk_tree_root = "0x0141caf6779674bc31225636c4cc4259a731835c52fc462f2dcbfabf7de01a1d"
-  protocol_contracts_hash = "0x01af64239167dcc8333e25456aab71348f66d9f6de731a8b62181d16cf0818c1"
+  vk_tree_root = "0x0c16448b65c4b3f83f9db3bebf635bd38957c74c9c1ea36036cbda16432cf558"
+  protocol_contracts_hash = "0x0333160f082dfc02e255c756febac14dc42c4c88b882e0403d44710c1f0bb80f"
   prover_id = "0x0000000000000000000000003c44cdddb6a900fa2b585dd299e03d12fa4293bc"
 
     [inputs.constants.last_archive]
-    root = "0x2a7e736656c2f8342e2e096500493f5acd825b2fb9ef2017b5ec23d029d5783a"
+    root = "0x00f30d99838de8d9e0b40bb5f19c53ebd2cea2e4e324a6b48a4db2655906ad63"
     next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000009"
 
     [inputs.constants.l1_to_l2_tree_snapshot]
@@ -9798,17 +9848,17 @@ next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000
 
     [inputs.constants.global_variables]
     chain_id = "0x0000000000000000000000000000000000000000000000000000000000007a69"
-    version = "0x000000000000000000000000000000000000000000000000000000007b6d50be"
+    version = "0x00000000000000000000000000000000000000000000000000000000ad49d7cd"
     block_number = "0x0000000000000000000000000000000000000000000000000000000000000009"
     slot_number = "0x0000000000000000000000000000000000000000000000000000000000000041"
-    timestamp = "0x0000000000000000000000000000000000000000000000000000000069e414ba"
+    timestamp = "0x0000000000000000000000000000000000000000000000000000000069fde078"
 
       [inputs.constants.global_variables.coinbase]
-      inner = "0x000000000000000000000000080c5a37d2d3dade855a034bac3548a8b2dfd887"
+      inner = "0x000000000000000000000000fde0805eba75f23cd30a3bb4f0e567a356075904"
 
       [inputs.constants.global_variables.fee_recipient]
       inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
       [inputs.constants.global_variables.gas_fees]
       fee_per_da_gas = "0x0000000000000000000000000000000000000000000000000000000000000000"
-      fee_per_l2_gas = "0x000000000000000000000000000000000000000000000000000000078b64a540"
+      fee_per_l2_gas = "0x000000000000000000000000000000000000000000000000000000078c3bcb60"
diff --git a/noir-projects/noir-protocol-circuits/crates/rollup-tx-base-public/Prover.toml b/noir-projects/noir-protocol-circuits/crates/rollup-tx-base-public/Prover.toml
index cc2d00b22ee0..d2414328ae1d 100644
--- a/noir-projects/noir-protocol-circuits/crates/rollup-tx-base-public/Prover.toml
+++ b/noir-projects/noir-protocol-circuits/crates/rollup-tx-base-public/Prover.toml
@@ -1,9 +1,9 @@
 [inputs]
 anchor_block_archive_sibling_path = [
-  "0x0d2845db8eb919e79530e7a38b01130bfc6fad326bdf3c498125926f56c4a4ce",
-  "0x19f1a0c09db4cd026f686e9c8fb45501a9fefb4eb1b4c6c328a51343a0094eeb",
+  "0x1444237c68ff756b5bcab6ef4b010657fbc4911b8a806638579f1df27f6e43f0",
+  "0x048c76bde3b9047f9f34f7fe8811109eafa422f663c1825d2399df06f4f11689",
   "0x14e4b977b2203b70e6ee1c2456eb7114d090fe4b907f631eecd0919fed432e7d",
-  "0x05b046ac3626d2e59e73bb24881c4cb66c24684566860e077cd096137bfc4857",
+  "0x2b3b2f80ea4227dfe7ab4edec33942ff08b95b023d6d15efb0abde90594c993b",
   "0x1e20ad4181460cbfdc74ca773502c59b890f184efe300ebad895956d318422da",
   "0x1434e6e2d5db1053ab8a3be58704509c799ee17e109c77f441f7bf1755400249",
   "0x119f56a2e8423a7feaab49b9b5dcbadec0648dfa4096b61b6774ea33ae29dc7f",
@@ -3547,57 +3547,57 @@ contract_class_log_fields = [
     prover_id = "0x0000000000000000000000003c44cdddb6a900fa2b585dd299e03d12fa4293bc"
 
       [inputs.public_chonk_verifier_proof_data.public_inputs.private_tail]
-      expiration_timestamp = "0x0000000000000000000000000000000000000000000000000000000069e5582a"
+      expiration_timestamp = "0x0000000000000000000000000000000000000000000000000000000069ff1b30"
 
         [inputs.public_chonk_verifier_proof_data.public_inputs.private_tail.constants]
-        vk_tree_root = "0x0141caf6779674bc31225636c4cc4259a731835c52fc462f2dcbfabf7de01a1d"
-        protocol_contracts_hash = "0x01af64239167dcc8333e25456aab71348f66d9f6de731a8b62181d16cf0818c1"
+        vk_tree_root = "0x0c16448b65c4b3f83f9db3bebf635bd38957c74c9c1ea36036cbda16432cf558"
+        protocol_contracts_hash = "0x0333160f082dfc02e255c756febac14dc42c4c88b882e0403d44710c1f0bb80f"
 
           [inputs.public_chonk_verifier_proof_data.public_inputs.private_tail.constants.anchor_block_header]
-          sponge_blob_hash = "0x00d0272f45b964b5718f034a8a7f11c6979bf3967ef708b86a5a20c818d2523d"
-          total_fees = "0x000000000000000000000000000000000000000000000000003b2900d9fe7700"
-          total_mana_used = "0x000000000000000000000000000000000000000000000000000000000007d76c"
+          sponge_blob_hash = "0x13a1bf44c19e7c2eb7fc1a96527d072cf424bc99c760e392f4abcecc1fc597f8"
+          total_fees = "0x00000000000000000000000000000000000000000000000002b26ec5db7a7140"
+          total_mana_used = "0x00000000000000000000000000000000000000000000000000000000000a3979"
 
             [inputs.public_chonk_verifier_proof_data.public_inputs.private_tail.constants.anchor_block_header.last_archive]
-            root = "0x2a7e736656c2f8342e2e096500493f5acd825b2fb9ef2017b5ec23d029d5783a"
-            next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000009"
+            root = "0x0d18996e508e8c1e51f6a56652cc5d71169450ff16c25de9af7f79af5385e334"
+            next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000008"
 
 [inputs.public_chonk_verifier_proof_data.public_inputs.private_tail.constants.anchor_block_header.state.l1_to_l2_message_tree]
 root = "0x0fef6d80d31109ddb56d6b3f607cbc9c0af0bff3ea0d43e8f278983c64c11f7a"
-next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000002400"
+next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000002000"
 
 [inputs.public_chonk_verifier_proof_data.public_inputs.private_tail.constants.anchor_block_header.state.partial.note_hash_tree]
-root = "0x0d1486d20ab1e8b2c0f5b20bdfbdec68221df15c627ed08998dd5c8588ffa837"
-next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000240"
+root = "0x1c223e428d6faa36822890e3b99417ddf73ffb069bf4c44b6ae9d7fc741733f6"
+next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000200"
 
 [inputs.public_chonk_verifier_proof_data.public_inputs.private_tail.constants.anchor_block_header.state.partial.nullifier_tree]
-root = "0x110826504b33839e51da855c449decce4ebdd54e25d7d7e367d227f35af255d8"
-next_available_leaf_index = "0x00000000000000000000000000000000000000000000000000000000000002c0"
+root = "0x01c778a6b3dcb1245bb0aee174252dd95256e67309f952e5d2f8cbafffe20d0f"
+next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000280"
 
 [inputs.public_chonk_verifier_proof_data.public_inputs.private_tail.constants.anchor_block_header.state.partial.public_data_tree]
-root = "0x1f541006a73deacce38c68df69605ef338d187ead8474a3af66d0b6b81fe01bc"
+root = "0x134e44df49ddb89525046d19bcfc2734c78e419994de9d6f7467eb84d02d1060"
 next_available_leaf_index = "0x000000000000000000000000000000000000000000000000000000000000008b"
 
             [inputs.public_chonk_verifier_proof_data.public_inputs.private_tail.constants.anchor_block_header.global_variables]
             chain_id = "0x0000000000000000000000000000000000000000000000000000000000007a69"
-            version = "0x000000000000000000000000000000000000000000000000000000007b6d50be"
-            block_number = "0x0000000000000000000000000000000000000000000000000000000000000009"
-            slot_number = "0x0000000000000000000000000000000000000000000000000000000000000041"
-            timestamp = "0x0000000000000000000000000000000000000000000000000000000069e414ba"
+            version = "0x00000000000000000000000000000000000000000000000000000000ad49d7cd"
+            block_number = "0x0000000000000000000000000000000000000000000000000000000000000008"
+            slot_number = "0x0000000000000000000000000000000000000000000000000000000000000022"
+            timestamp = "0x0000000000000000000000000000000000000000000000000000000069fdd7c0"
 
               [inputs.public_chonk_verifier_proof_data.public_inputs.private_tail.constants.anchor_block_header.global_variables.coinbase]
-              inner = "0x000000000000000000000000080c5a37d2d3dade855a034bac3548a8b2dfd887"
+              inner = "0x000000000000000000000000fde0805eba75f23cd30a3bb4f0e567a356075904"
 
               [inputs.public_chonk_verifier_proof_data.public_inputs.private_tail.constants.anchor_block_header.global_variables.fee_recipient]
               inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
               [inputs.public_chonk_verifier_proof_data.public_inputs.private_tail.constants.anchor_block_header.global_variables.gas_fees]
               fee_per_da_gas = "0x0000000000000000000000000000000000000000000000000000000000000000"
-              fee_per_l2_gas = "0x000000000000000000000000000000000000000000000000000000078b64a540"
+              fee_per_l2_gas = "0x0000000000000000000000000000000000000000000000000000004386faeb40"
 
           [inputs.public_chonk_verifier_proof_data.public_inputs.private_tail.constants.tx_context]
           chain_id = "0x0000000000000000000000000000000000000000000000000000000000007a69"
-          version = "0x000000000000000000000000000000000000000000000000000000007b6d50be"
+          version = "0x00000000000000000000000000000000000000000000000000000000ad49d7cd"
 
 [inputs.public_chonk_verifier_proof_data.public_inputs.private_tail.constants.tx_context.gas_settings.gas_limits]
 da_gas = "0x0000000000000000000000000000000000000000000000000000000000030000"
@@ -3609,7 +3609,7 @@ l2_gas = "0x00000000000000000000000000000000000000000000000000000000000c795c"
 
 [inputs.public_chonk_verifier_proof_data.public_inputs.private_tail.constants.tx_context.gas_settings.max_fees_per_gas]
 fee_per_da_gas = "0x0000000000000000000000000000000000000000000000000000000000000000"
-fee_per_l2_gas = "0x0000000000000000000000000000000000000000000000000000000b5116f7e0"
+fee_per_l2_gas = "0x000000000000000000000000000000000000000000000000000000336bfe2ba6"
 
 [inputs.public_chonk_verifier_proof_data.public_inputs.private_tail.constants.tx_context.gas_settings.max_priority_fees_per_gas]
 fee_per_da_gas = "0x0000000000000000000000000000000000000000000000000000000000000000"
@@ -3683,7 +3683,7 @@ fee_per_l2_gas = "0x000000000000000000000000000000000000000000000000000000000000
   "0x0000000000000000000000000000000000000000000000000000000000000000"
 ]
         nullifiers = [
-  "0x1137cbbcc4978644f9ac565ce2be0edfdfd031eff09b17cd5c960f04a51fd81f",
+  "0x09fac458f9e079d0117ef63746c55ce66b3e5d95c8420974d9c69f369b0d77ef",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -7069,13 +7069,13 @@ inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
           [[inputs.public_chonk_verifier_proof_data.public_inputs.private_tail.revertible_accumulated_data.public_call_requests]]
           is_static_call = false
-          calldata_hash = "0x0a19b0b6cdd9d5dd7682fb1072a492d52a9d818a01d463a7e4f7610e936d919f"
+          calldata_hash = "0x16acf8ee72d77f214e5286307ed2710fda25445374c38debbef546a746b679ce"
 
             [inputs.public_chonk_verifier_proof_data.public_inputs.private_tail.revertible_accumulated_data.public_call_requests.msg_sender]
-            inner = "0x0c6be08a5e070b343e733716e4ad76ea05de25e2b7fc6e6f50f0ec549f7c0bfa"
+            inner = "0x0635e757a5f05ba5322db37d6930525b43c2e055ed7c4600559a07fc38ab09ec"
 
             [inputs.public_chonk_verifier_proof_data.public_inputs.private_tail.revertible_accumulated_data.public_call_requests.contract_address]
-            inner = "0x1e0d825a84ebc33bf160363bca7a6855c0bfc677043e7dd77205004c861ff880"
+            inner = "0x16fc6ad8c94527d45832bb8631b0c1dedf3218fe7c3ca04e01850a3eff6a511a"
 
           [[inputs.public_chonk_verifier_proof_data.public_inputs.private_tail.revertible_accumulated_data.public_call_requests]]
           is_static_call = false
@@ -7402,139 +7402,139 @@ inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
         l2_gas = "0x00000000000000000000000000000000000000000000000000000000000903d0"
 
         [inputs.public_chonk_verifier_proof_data.public_inputs.private_tail.fee_payer]
-        inner = "0x0c6be08a5e070b343e733716e4ad76ea05de25e2b7fc6e6f50f0ec549f7c0bfa"
+        inner = "0x0635e757a5f05ba5322db37d6930525b43c2e055ed7c4600559a07fc38ab09ec"
 
     [inputs.public_chonk_verifier_proof_data.vk_data]
     leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000006"
     sibling_path = [
-  "0x12570859a42a736d7b79fcf848f87430a57a9d0744983776da0f8860ccdc4ac4",
-  "0x16515cf70fd0a35f0879410801529713af516389793d3ab255c717aac1f67b1e",
-  "0x15707dd2628665b8d136b5593562e45db70471e34f52ddad843df79991fad464",
-  "0x17bd0d0c2b0bd623b7d30132f5ef171136ca83b2d51821c45763a2b1bb503f0a",
-  "0x15313312ac8ca4825afd3891479fbb14626ca65499d939e23b1f653cd7d018ea",
-  "0x19de2a32662702dd872e529ad89836e16b013012f910daf2bc7c2a67356dd107",
-  "0x1f07bca7a14f9a969539c0afd388affa18926689f431fc541841a2a7604d388c"
+  "0x1b3bb563a5febae9302424bc9b80841523b8773b3e521fb20de577a64e78bc9e",
+  "0x0a2d5d1c88992fa153310bc96af4c750c81353526f8c7dfe2b069ed57136e696",
+  "0x08c3364c5142d8fe956b12902940b54a7be36a42ce00cfc5831385a9d55cbe99",
+  "0x166399703d23a5c22febc6185f8eb93c72b65906eefef226e643c35fa0022adb",
+  "0x25f6f5fc25ee815cef59a1889f1e39db3d431d01b01ee1554f9492afec9d41d6",
+  "0x28650667b92be48b116289119fa4794a5fe8fe5792a49d89b9977feae7f685a6",
+  "0x2aa74c20807e8cbb3e32a86ad29472c42a3fb7021dcfaad112a6b68eb0eca98e"
 ]
 
       [inputs.public_chonk_verifier_proof_data.vk_data.vk]
       key = [
   "0x0000000000000000000000000000000000000000000000000000000000000015",
   "0x0000000000000000000000000000000000000000000000000000000000000aef",
-  "0x0000000000000000000000000000000000000000000000000000000000000001",
-  "0x00000000000000000000000000000026b3839fa1a91ccacc533daf69e1c8b85a",
-  "0x00000000000000000000000000000000001006077958a6ada4d748de0e05ccf4",
-  "0x0000000000000000000000000000008ba0eb613c0c6088b48f48ea402f7763e9",
-  "0x000000000000000000000000000000000024f8f3256c81cb454f714b4c5251c4",
-  "0x00000000000000000000000000000082e44e6029c441b560f11427a999dc3634",
-  "0x0000000000000000000000000000000000275a48c06fb470026f0933168f0699",
-  "0x00000000000000000000000000000066c32cf7932bd4a5b1981232d64a4c189c",
-  "0x0000000000000000000000000000000000017cf302eff5ee5fd37a05dc36b4d9",
-  "0x000000000000000000000000000000fd20980d5bacac4e660f934de7056d6745",
-  "0x0000000000000000000000000000000000290225dc3475204fd461b8fdced21a",
-  "0x00000000000000000000000000000086617a0a7c6bda4bf9b879a0e7db25836a",
-  "0x00000000000000000000000000000000002b597000f10f015786e180a728435c",
-  "0x0000000000000000000000000000000134a01c7af8b472e5e2ca9cbe0b31d577",
-  "0x000000000000000000000000000000000001bb9fd32e3118ea3169932d82e5a3",
-  "0x00000000000000000000000000000023a648c6702c5f87e62698b9b1aff8ae2d",
-  "0x000000000000000000000000000000000000e6bb7f4db2986bd2c90eaed80f39",
-  "0x0000000000000000000000000000002f587b268cafeee064b1e4447aeee63639",
-  "0x00000000000000000000000000000000002db34055ece1be64c88844286d1762",
-  "0x000000000000000000000000000000568304e649635e1ac8e3b5d1c34576954f",
-  "0x0000000000000000000000000000000000077ce9d44715085245aa7573b1ba69",
-  "0x000000000000000000000000000000546056d84f9894381d88a20cf03bb40bb8",
-  "0x0000000000000000000000000000000000009ff581b1e47a9f6a227bd273a49c",
-  "0x000000000000000000000000000000e4b48bcc21e1da3b96c0c85782299729a2",
-  "0x000000000000000000000000000000000018697b2d28b6eca80b538d26366714",
-  "0x00000000000000000000000000000003f09783f7e80c1a8bdafdd2481704539d",
-  "0x00000000000000000000000000000000000acbc79aaabbbcc6ae033a0abb622a",
-  "0x0000000000000000000000000000009b5d7339c1b7958f24a2a88e70e54a685a",
-  "0x0000000000000000000000000000000000043d8690ab7c8c1a5eee8f8f8f0184",
-  "0x000000000000000000000000000000726bb44e9ba27a3ec4e31517b413dfd355",
-  "0x00000000000000000000000000000000002e57e44c0f275c9bccf631b689ce1e",
-  "0x000000000000000000000000000000a8914e0b03555663d0423c9460431083b6",
-  "0x0000000000000000000000000000000000283504e2a7e3525bd3065f748c457c",
-  "0x0000000000000000000000000000001c27fc936adea2484beb590f2893672342",
-  "0x00000000000000000000000000000000002ef55d4ccdcdd1375cf9b3ef8ebcfe",
-  "0x000000000000000000000000000000659ec8533411d6390105259b2a77ee94bc",
-  "0x00000000000000000000000000000000002a865e42aec3c124b7168321dd9e52",
-  "0x000000000000000000000000000000f9decf21ccff3701fbe48379c66d90e201",
-  "0x000000000000000000000000000000000029e83ce8686ea8cccab9f6ec0a8973",
-  "0x000000000000000000000000000000a0b56d9d290361af6c0d20d6ba4e5aa2d2",
-  "0x0000000000000000000000000000000000129f45d27da3304ad33d0ba749b32f",
-  "0x00000000000000000000000000000041dcf1746389fbcff4636e6b9ba6332928",
-  "0x000000000000000000000000000000000007d36473eb5aa3104b3496e8df023a",
-  "0x000000000000000000000000000000271e222fc81fa3ccf383f4fec8a0eb403c",
-  "0x0000000000000000000000000000000000233426da404be02ddfca697b5f0e7d",
-  "0x000000000000000000000000000000a86098ca8b470a6942bbcd7d5b245a0f04",
-  "0x000000000000000000000000000000000000441aa9f637bafe8914eaf6198dba",
-  "0x0000000000000000000000000000007fe8ae442fa3bee019b93efba59938ec2d",
-  "0x0000000000000000000000000000000000159969cf28730d2f3e4f9c359d50e5",
-  "0x0000000000000000000000000000006612277bab3232e7e954900345ed28ee9b",
-  "0x000000000000000000000000000000000010d54406b102c0860f0a55dc5ef274",
-  "0x000000000000000000000000000000a5386b38eb747cbcfb3abc50924ebb9e68",
-  "0x0000000000000000000000000000000000179fa10fab6b4ebbbb3d3ee6923128",
-  "0x0000000000000000000000000000007da986b9026b323b854c432a685ff6935c",
-  "0x00000000000000000000000000000000001c1f78ea244e93a824dff469fb181b",
-  "0x0000000000000000000000000000007782761986b1e53f837883fa31642e7638",
-  "0x00000000000000000000000000000000002365b5375b50cb7e96b2e41cfebc8e",
-  "0x0000000000000000000000000000008ce9767a7ddc7f606352acb7996d27c9da",
-  "0x00000000000000000000000000000000002faf54dc0e72cb88af5fd7c94d0458",
-  "0x000000000000000000000000000000b817fc58125f3244bbfcb5ca307b8aa82e",
-  "0x00000000000000000000000000000000000da2feb3842f039a880bef08f1c312",
-  "0x00000000000000000000000000000002d5e8a7890e047f7993278a45ea5f305f",
-  "0x00000000000000000000000000000000000c525487c6b03d6a76a0a9786de99b",
-  "0x0000000000000000000000000000004a0a48fe66f7652b3380dd2f32dd88eb2a",
-  "0x00000000000000000000000000000000000174ff74ed8d94392692614a4691f9",
-  "0x0000000000000000000000000000003c987fd24b424b8fbd520f89e9bdd80462",
-  "0x0000000000000000000000000000000000204c854f9ed7c0167b70ed0b57214c",
-  "0x000000000000000000000000000000be4d03f7434c25669ed98ddeefad7ffbe6",
-  "0x00000000000000000000000000000000001857354b71dc22ae28e6ef7e05e948",
-  "0x0000000000000000000000000000009f5dbfeae5ae6d8c37df23f9d55eb79678",
-  "0x0000000000000000000000000000000000132034bc0005d0a978a1281be5c470",
-  "0x00000000000000000000000000000083d40fef23c5e637bdb07a9334f7b716a3",
-  "0x000000000000000000000000000000000027b9f2160119d3ff8d2b7d1b77b79a",
-  "0x0000000000000000000000000000005345026cef6470bf69065387d3156f3d04",
-  "0x00000000000000000000000000000000001bc6c1c6991f4a587ea880d45d4af3",
-  "0x000000000000000000000000000000d18a837738ec3194ced8a9ff80c37e8a07",
-  "0x000000000000000000000000000000000012b2a08bf7e8865f7ff741bceda55e",
-  "0x00000000000000000000000000000081e588e00a68df5d60b6c5f49e50100324",
-  "0x0000000000000000000000000000000000010427b7cfa8930139b4f40327348c",
-  "0x000000000000000000000000000000ae0acea7bf3a048e7ba4c7d09bbd0c69e3",
-  "0x000000000000000000000000000000000006cc9ad5c01f87ccbb8fe2731ade04",
-  "0x000000000000000000000000000000155ab2f00df9819a6be0093797b71f0f4e",
-  "0x0000000000000000000000000000000000090acb2f27007effba43fde8cad965",
-  "0x000000000000000000000000000000c8241fb1126e2308749c04cfc67a76fa48",
-  "0x00000000000000000000000000000000002a37167f1edddee3a6d99f2cb838fc",
-  "0x000000000000000000000000000000063d1201e44316be7cfbf6e5db515955d5",
-  "0x00000000000000000000000000000000001efa5347110d583410129987b73d61",
-  "0x00000000000000000000000000000016ceca4db6cbb13773eb9c0f5062d8df5b",
-  "0x00000000000000000000000000000000001c916e66d26e1a19a0ae6c5c938a9c",
-  "0x00000000000000000000000000000095b5d8b7b4a63b05df652b0d10ef146d26",
-  "0x0000000000000000000000000000000000099e3bd5a0a00ab7fe18040105b9b3",
-  "0x0000000000000000000000000000002129af3a637f5a622a32440f860d1e2a7f",
-  "0x00000000000000000000000000000000000015b8d2515d76e2ccec99dcd19459",
-  "0x000000000000000000000000000000222b888108dc25d1aa450e0b4bc212c37e",
-  "0x00000000000000000000000000000000001b917517920bad3d8bc01c9595092a",
-  "0x000000000000000000000000000000482141c7ebe42000a1d58ccb74381f6d19",
-  "0x0000000000000000000000000000000000305e8992b148eedb22e6e992077a84",
-  "0x0000000000000000000000000000007c86847618681dc29d8a9363ab7c40e1c3",
-  "0x000000000000000000000000000000000016465a5ccbb550cd2c63bd58116fe4",
-  "0x000000000000000000000000000000439973ac12d7ca796d6fe98ca40e6ca6b7",
-  "0x00000000000000000000000000000000002e24d420fbf9508ed31de692db477b",
-  "0x00000000000000000000000000000028edd1a7e46c840d9c943fdf45521c64ce",
-  "0x0000000000000000000000000000000000043d063b130adfb37342af45d0155a",
-  "0x0000000000000000000000000000009330952ae74c573d1686d9cb4a00733854",
-  "0x0000000000000000000000000000000000261522c4089330646aff9673619494",
-  "0x0000000000000000000000000000000000000000000000000000000000000001",
-  "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "0x0000000000000000000000000000000000000000000000000000000000000002",
-  "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "0x000000000000000000000000000000ff0ab7c7cc186d4ae68c18730eb9dafea4",
-  "0x00000000000000000000000000000000001ed4c5cbea866254b425f65dabfdd9",
-  "0x0000000000000000000000000000000f82d154371f0cd4aeadeb08a20c0a6e78",
-  "0x0000000000000000000000000000000000202e13a38735b78d2529c4dc195211"
+  "0x0000000000000000000000000000000000000000000000000000000000000005",
+  "0x0000000000000000000000000000001a8ea793d4cdae748667e6cdeb797ade65",
+  "0x00000000000000000000000000000000001cdf44a19565682df1db9105c2cd50",
+  "0x0000000000000000000000000000007d45bf53693d1e5f8c726b3b9090a3bdba",
+  "0x00000000000000000000000000000000002ddd08200eb9544a216dd19a8b59c9",
+  "0x00000000000000000000000000000096b0edfeb3ee3338c818b6e462ae496f95",
+  "0x00000000000000000000000000000000001bb979e3cd7d8111d021237de30bb7",
+  "0x000000000000000000000000000000e785a70c5bc29de6993bcd63514b5b856f",
+  "0x00000000000000000000000000000000001b6701a1a9de0c4e25c2eee81fbfc5",
+  "0x000000000000000000000000000000ccad5e1b43ec3cad430d126196ed4b784f",
+  "0x000000000000000000000000000000000026c8cfeea88730a069f9f8aae45eff",
+  "0x000000000000000000000000000000f25307bf7ae8166628fb8ca2aa186d80cc",
+  "0x000000000000000000000000000000000022a312b7a1b12f670d059924fde061",
+  "0x000000000000000000000000000000cfa8bf07d4dd07bd309194ad43dcf460aa",
+  "0x0000000000000000000000000000000000167ca0ccc32845025c5a76273b1b08",
+  "0x0000000000000000000000000000002a2f6be8e93ea920cd14a7b043ef6ed5d1",
+  "0x0000000000000000000000000000000000277ea66800e42f0b7078688718305a",
+  "0x0000000000000000000000000000007f88f1687491d3f3326c737061282c2e20",
+  "0x000000000000000000000000000000000019f0c295284fc42024aacbd46f9ae9",
+  "0x0000000000000000000000000000008a6e059479dbef05407682d018e1d7fd0d",
+  "0x0000000000000000000000000000000000276f6c02388d41b068d36f0e4082b0",
+  "0x0000000000000000000000000000006fe39d9df6859556bc04a2847a62aad7ff",
+  "0x00000000000000000000000000000000000faecf34f51e503f9c5bdf6f57aca8",
+  "0x0000000000000000000000000000004b4587deb70388b513862ba57de24e4596",
+  "0x0000000000000000000000000000000000167c35f16800e5924b66b6c395c2e1",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x000000000000000000000000000000351e060c59f2f13ceb5c631381e110552b",
+  "0x00000000000000000000000000000000002eeb2d2cba09260a9e138d0d24555c",
+  "0x000000000000000000000000000000d3bae05ebcb86c7b4921f00e4c579e9c5f",
+  "0x00000000000000000000000000000000002d4be8ae9ebbf085739d2c52d2ab93",
+  "0x000000000000000000000000000000940377e34f17c5ad22102cca865bb574a1",
+  "0x00000000000000000000000000000000000a723717bfcee9dcb71e21b6de10f8",
+  "0x000000000000000000000000000000991a4b02291df9c14b77e2473315d673b3",
+  "0x00000000000000000000000000000000001e89b95cf6b2ad2506d684fc7b7a30",
+  "0x0000000000000000000000000000004022b331528bfac4bdb04464fc89ff83fb",
+  "0x0000000000000000000000000000000000196330867786a8c08738881b739ce0",
+  "0x0000000000000000000000000000009df8b221819ebf22dc413d730b0c8a1e31",
+  "0x0000000000000000000000000000000000276ed9c7e725f586bf3b0f7d5f1594",
+  "0x0000000000000000000000000000008eb30c526734ef3a740aea96282908f962",
+  "0x00000000000000000000000000000000001624f456603c219b9f79b39960c61b",
+  "0x000000000000000000000000000000b9e9ead3a80d73be248eb82b65a23dbaf9",
+  "0x000000000000000000000000000000000022e03caaedc42d8b4b100610f33723",
+  "0x00000000000000000000000000000004914aab219c2e5c1388d1c5b276006436",
+  "0x00000000000000000000000000000000002426e1277a7907df8ec2e0e609f0a6",
+  "0x000000000000000000000000000000508e79b26489525bf5386a5c910dca5a5d",
+  "0x00000000000000000000000000000000003063b87ddf8ff817e547fe4ac149dc",
+  "0x000000000000000000000000000000f106fc4afe6bda7761c0d4ed7ded72ce1c",
+  "0x00000000000000000000000000000000002547059f6e3ae71ef9efe2be7dc5c0",
+  "0x0000000000000000000000000000001c8589cec2b200eed912f3e76cf5562b2b",
+  "0x0000000000000000000000000000000000154c96e49bb18fdd1aed7abd315822",
+  "0x0000000000000000000000000000009c4fcdf6541a1a4fd3d01630e1bba3fad8",
+  "0x00000000000000000000000000000000000e2b7c9dabb30e63d6cb909551d6d8",
+  "0x0000000000000000000000000000003e17757fa84eda964303f6fea5cca55ef1",
+  "0x00000000000000000000000000000000001efc4c896804eb95a3b76060ee5db8",
+  "0x000000000000000000000000000000514fabf9f6c618a2c084e1e9e64393459d",
+  "0x00000000000000000000000000000000000e851da603a179ea88a694100ed72e",
+  "0x00000000000000000000000000000081c7f92e6390c9fbe0627a879ecbd8f8e4",
+  "0x00000000000000000000000000000000002378d597dead1c2952534dc50aa04f",
+  "0x00000000000000000000000000000033435458f18b0436847ac2652e1aab3a81",
+  "0x000000000000000000000000000000000010f0f995d2e1ddfc2e2820abac64f5",
+  "0x000000000000000000000000000000cdc9c148beeb2652667b2a4be097432e98",
+  "0x00000000000000000000000000000000001790fa444ce77b0f17ced05ac77644",
+  "0x000000000000000000000000000000b4e0fa181577e0fce2a73e33cb1c7ef76a",
+  "0x00000000000000000000000000000000001248979a0b4c713d52467ef1091214",
+  "0x00000000000000000000000000000078b68a818812e294d27ed5173181eca67b",
+  "0x00000000000000000000000000000000001202f015e527e07bc8aa3b29bfc68a",
+  "0x0000000000000000000000000000002e37c769468f1d3bd64860032eeec60c95",
+  "0x000000000000000000000000000000000013a9a82892cb1b4ba982fa96f6fe5f",
+  "0x000000000000000000000000000000a4f97445c3ce77b60a4f89e090ed25f90d",
+  "0x00000000000000000000000000000000001bfe48767b9d9852929fd6c6ef7489",
+  "0x000000000000000000000000000000009788ffc458269e32c68d8529122209c6",
+  "0x00000000000000000000000000000000001ad94133da104b491b0533c283058d",
+  "0x00000000000000000000000000000082943f7e3e8277c5573c7bc01ee756e08e",
+  "0x0000000000000000000000000000000000093e0b3b3b286763d72202e7d89bd3",
+  "0x000000000000000000000000000000661e1803122d810a714ede90be3cff69ed",
+  "0x00000000000000000000000000000000000d11450f56fe63fe8dc9c9bcf5e0cd",
+  "0x0000000000000000000000000000003bbb3abba3a132e8d8f45f371281a8162a",
+  "0x000000000000000000000000000000000022484ddb85caad7259d40a2feaf9f0",
+  "0x000000000000000000000000000000d5c60aad9d3206ac85c01b2bbe07bb882c",
+  "0x0000000000000000000000000000000000064dbab19fabf630e0a01c9c644f28",
+  "0x0000000000000000000000000000000c6d39a6cc1814cb9c474639a2c85d7696",
+  "0x0000000000000000000000000000000000052e9746024ad3039b28344dff0160",
+  "0x00000000000000000000000000000082d5e3a922fab44e31d4948721b4c26f6a",
+  "0x00000000000000000000000000000000000209322634f0a5d2a3bd73f1e3eefa",
+  "0x000000000000000000000000000000ae542b5e28179ea83bd48b32d82857e6ce",
+  "0x00000000000000000000000000000000002e46a1b641046cc74f095ebc925043",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000001eee81b23a887f299049b14c11e98460d6",
+  "0x00000000000000000000000000000000002a56ce41f6b0be13b9c26747621b82",
+  "0x000000000000000000000000000000d5827d6338c78656c0d12ca1aea6ef2c7c",
+  "0x00000000000000000000000000000000001aa98f2de3ddda547d8f6de4e725de",
+  "0x000000000000000000000000000000b2cda22d682b80465a610820a455ccfe00",
+  "0x000000000000000000000000000000000014dbf65b57cd412e5a4e51e2e8fcb1",
+  "0x0000000000000000000000000000009324a599f7e39fa876752e4178e66cf056",
+  "0x000000000000000000000000000000000012a5445413899397985b2de3535efa"
 ]
-      hash = "0x23ab2fa638d48fde156f5c3082791ab313ee84b081fb9f93ccd13f67c5943063"
+      hash = "0x0c77683b8fb3dbb3c652ec7c75c7edab0f9597a4763fa388ed23a1a7dc7d4ba0"
 
   [inputs.avm_proof_data]
   proof = [
@@ -23942,43 +23942,43 @@ inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
     [inputs.avm_proof_data.public_inputs]
     prover_id = "0x0000000000000000000000003c44cdddb6a900fa2b585dd299e03d12fa4293bc"
-    transaction_fee = "0x000000000000000000000000000000000000000000000000004889d342f192c0"
+    transaction_fee = "0x0000000000000000000000000000000000000000000000000022e452ad469ea0"
     reverted = false
 
       [inputs.avm_proof_data.public_inputs.global_variables]
       chain_id = "0x0000000000000000000000000000000000000000000000000000000000007a69"
-      version = "0x000000000000000000000000000000000000000000000000000000007b6d50be"
-      block_number = "0x000000000000000000000000000000000000000000000000000000000000000a"
-      slot_number = "0x0000000000000000000000000000000000000000000000000000000000000042"
-      timestamp = "0x0000000000000000000000000000000000000000000000000000000069e41502"
+      version = "0x00000000000000000000000000000000000000000000000000000000ad49d7cd"
+      block_number = "0x000000000000000000000000000000000000000000000000000000000000000b"
+      slot_number = "0x0000000000000000000000000000000000000000000000000000000000000043"
+      timestamp = "0x0000000000000000000000000000000000000000000000000000000069fde108"
 
         [inputs.avm_proof_data.public_inputs.global_variables.coinbase]
-        inner = "0x000000000000000000000000080c5a37d2d3dade855a034bac3548a8b2dfd887"
+        inner = "0x000000000000000000000000fde0805eba75f23cd30a3bb4f0e567a356075904"
 
         [inputs.avm_proof_data.public_inputs.global_variables.fee_recipient]
         inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
         [inputs.avm_proof_data.public_inputs.global_variables.gas_fees]
         fee_per_da_gas = "0x0000000000000000000000000000000000000000000000000000000000000000"
-        fee_per_l2_gas = "0x000000000000000000000000000000000000000000000000000000078b64a540"
+        fee_per_l2_gas = "0x00000000000000000000000000000000000000000000000000000003699e8ba0"
 
 [[inputs.avm_proof_data.public_inputs.protocol_contracts.derived_addresses]]
-inner = "0x0f8addbb176a80288379af1fe3f6e128881df1ab13f9a4dbf25de12287e61b95"
+inner = "0x1520f4bb11a3a1d2248a03d8472e9af4bb8324eb1d2d8c83bce61894383464b9"
 
 [[inputs.avm_proof_data.public_inputs.protocol_contracts.derived_addresses]]
-inner = "0x0b0006ff0bbf70a2ec9171c2301b65f66536e0c36cc70177a1ffadbb3f69189f"
+inner = "0x26a43bf066852a7b1ec3c5b454f41735fea12e2ffbefed471058124b91d94018"
 
 [[inputs.avm_proof_data.public_inputs.protocol_contracts.derived_addresses]]
-inner = "0x0ffdc845a84050f056157a1c1d52abe18da16b961c9a9a881043c2c02ad2aded"
+inner = "0x1bd26c6831ebc53674b13ac69a0c534563c37e46c2cbb36f2deca107a26515fa"
 
 [[inputs.avm_proof_data.public_inputs.protocol_contracts.derived_addresses]]
-inner = "0x1612f27832228b08a6ee80c5a5fb54e123ce6bddf7a6501de4fb8f426c4d8070"
+inner = "0x06870c63132d2a4e3356a76d773240efe729e7d9b9380a7a3cf1798fc9031aed"
 
 [[inputs.avm_proof_data.public_inputs.protocol_contracts.derived_addresses]]
-inner = "0x0d53da6d9ad9ce42a1ecd9f80a437151035951677b72d7d0af06b6221d0bf913"
+inner = "0x0083c4dfb922796f1086d399f8f3d021159d1a87ba3b833dcdf9863c630ba643"
 
 [[inputs.avm_proof_data.public_inputs.protocol_contracts.derived_addresses]]
-inner = "0x0758bfa195d8fd7782a5e27ef55ad8655afc8d23e57a73cc0331ab1075547146"
+inner = "0x0b4d3a9a7a3caf83f9c2060347e48cc28c7f04d2560d1cbf5bf08d4832128a97"
 
 [[inputs.avm_proof_data.public_inputs.protocol_contracts.derived_addresses]]
 inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
@@ -23997,18 +23997,18 @@ inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
 [inputs.avm_proof_data.public_inputs.start_tree_snapshots.l1_to_l2_message_tree]
 root = "0x0fef6d80d31109ddb56d6b3f607cbc9c0af0bff3ea0d43e8f278983c64c11f7a"
-next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000002800"
+next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000002c00"
 
 [inputs.avm_proof_data.public_inputs.start_tree_snapshots.note_hash_tree]
-root = "0x1a39796064aa1aeebaebaca37917db6423d8d5131ce212ca6d3c2be5bbd30ad7"
-next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000280"
+root = "0x2126a6e400b3fae90b44b74482d5b59dc707ba8f044c90a5f0e06ff48029f19f"
+next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000300"
 
 [inputs.avm_proof_data.public_inputs.start_tree_snapshots.nullifier_tree]
-root = "0x0c270f0d5fb61c302ace28f76135df0f9388650dddf0832b699d36845a521862"
-next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000300"
+root = "0x0e8d32952999631ff527d706426177bdb3208db1d3b8dd4e74ba883610dc37e5"
+next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000380"
 
 [inputs.avm_proof_data.public_inputs.start_tree_snapshots.public_data_tree]
-root = "0x12696ec5eaba16b245bf8c8beac75711aab968fdfa6056cbcb4ca33df2cd468c"
+root = "0x0d21d4944ca04ad548057c7362ba76b7370e29929fe9cdd32ec1d04c07e21179"
 next_available_leaf_index = "0x000000000000000000000000000000000000000000000000000000000000008b"
 
       [inputs.avm_proof_data.public_inputs.start_gas_used]
@@ -24025,7 +24025,7 @@ l2_gas = "0x00000000000000000000000000000000000000000000000000000000000c795c"
 
 [inputs.avm_proof_data.public_inputs.gas_settings.max_fees_per_gas]
 fee_per_da_gas = "0x0000000000000000000000000000000000000000000000000000000000000000"
-fee_per_l2_gas = "0x0000000000000000000000000000000000000000000000000000000b5116f7e0"
+fee_per_l2_gas = "0x000000000000000000000000000000000000000000000000000000336bfe2ba6"
 
 [inputs.avm_proof_data.public_inputs.gas_settings.max_priority_fees_per_gas]
 fee_per_da_gas = "0x0000000000000000000000000000000000000000000000000000000000000000"
@@ -24033,10 +24033,10 @@ fee_per_l2_gas = "0x000000000000000000000000000000000000000000000000000000000000
 
       [inputs.avm_proof_data.public_inputs.effective_gas_fees]
       fee_per_da_gas = "0x0000000000000000000000000000000000000000000000000000000000000000"
-      fee_per_l2_gas = "0x000000000000000000000000000000000000000000000000000000078b64a540"
+      fee_per_l2_gas = "0x00000000000000000000000000000000000000000000000000000003699e8ba0"
 
       [inputs.avm_proof_data.public_inputs.fee_payer]
-      inner = "0x0c6be08a5e070b343e733716e4ad76ea05de25e2b7fc6e6f50f0ec549f7c0bfa"
+      inner = "0x0635e757a5f05ba5322db37d6930525b43c2e055ed7c4600559a07fc38ab09ec"
 
       [inputs.avm_proof_data.public_inputs.public_call_request_array_lengths]
       setup_calls = "0x0000000000000000000000000000000000000000000000000000000000000000"
@@ -24365,13 +24365,13 @@ fee_per_l2_gas = "0x000000000000000000000000000000000000000000000000000000000000
 
       [[inputs.avm_proof_data.public_inputs.public_app_logic_call_requests]]
       is_static_call = false
-      calldata_hash = "0x0a19b0b6cdd9d5dd7682fb1072a492d52a9d818a01d463a7e4f7610e936d919f"
+      calldata_hash = "0x16acf8ee72d77f214e5286307ed2710fda25445374c38debbef546a746b679ce"
 
         [inputs.avm_proof_data.public_inputs.public_app_logic_call_requests.msg_sender]
-        inner = "0x0c6be08a5e070b343e733716e4ad76ea05de25e2b7fc6e6f50f0ec549f7c0bfa"
+        inner = "0x0635e757a5f05ba5322db37d6930525b43c2e055ed7c4600559a07fc38ab09ec"
 
         [inputs.avm_proof_data.public_inputs.public_app_logic_call_requests.contract_address]
-        inner = "0x1e0d825a84ebc33bf160363bca7a6855c0bfc677043e7dd77205004c861ff880"
+        inner = "0x16fc6ad8c94527d45832bb8631b0c1dedf3218fe7c3ca04e01850a3eff6a511a"
 
       [[inputs.avm_proof_data.public_inputs.public_app_logic_call_requests]]
       is_static_call = false
@@ -24771,7 +24771,7 @@ fee_per_l2_gas = "0x000000000000000000000000000000000000000000000000000000000000
   "0x0000000000000000000000000000000000000000000000000000000000000000"
 ]
       nullifiers = [
-  "0x1137cbbcc4978644f9ac565ce2be0edfdfd031eff09b17cd5c960f04a51fd81f",
+  "0x09fac458f9e079d0117ef63746c55ce66b3e5d95c8420974d9c69f369b0d77ef",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -25133,29 +25133,29 @@ inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
 [inputs.avm_proof_data.public_inputs.end_tree_snapshots.l1_to_l2_message_tree]
 root = "0x0fef6d80d31109ddb56d6b3f607cbc9c0af0bff3ea0d43e8f278983c64c11f7a"
-next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000002800"
+next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000002c00"
 
 [inputs.avm_proof_data.public_inputs.end_tree_snapshots.note_hash_tree]
-root = "0x1a39796064aa1aeebaebaca37917db6423d8d5131ce212ca6d3c2be5bbd30ad7"
-next_available_leaf_index = "0x00000000000000000000000000000000000000000000000000000000000002c0"
+root = "0x2126a6e400b3fae90b44b74482d5b59dc707ba8f044c90a5f0e06ff48029f19f"
+next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000340"
 
 [inputs.avm_proof_data.public_inputs.end_tree_snapshots.nullifier_tree]
-root = "0x2ff802c018eb6ff4a0f01bf75f893a8577412eaaf1177dcb1405a471ff10dfa2"
-next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000340"
+root = "0x28f8d2b1f0315d8539c1e4ff651e2eaac034de0a2271cd6f198f557ecf449cb1"
+next_available_leaf_index = "0x00000000000000000000000000000000000000000000000000000000000003c0"
 
 [inputs.avm_proof_data.public_inputs.end_tree_snapshots.public_data_tree]
-root = "0x0eafdbd9b305ae3ce36b50d95fbef3964305a3b88ea486377a3e750467e7bde6"
+root = "0x1a010e7a4312757d9349e0058c907064764c9836de016199dbd957ca46fefc3b"
 next_available_leaf_index = "0x000000000000000000000000000000000000000000000000000000000000008b"
 
       [inputs.avm_proof_data.public_inputs.end_gas_used]
-      da_gas = "0x00000000000000000000000000000000000000000000000000000000000000c0"
-      l2_gas = "0x0000000000000000000000000000000000000000000000000000000000099d5f"
+      da_gas = "0x0000000000000000000000000000000000000000000000000000000000000100"
+      l2_gas = "0x00000000000000000000000000000000000000000000000000000000000a3979"
 
       [inputs.avm_proof_data.public_inputs.accumulated_data_array_lengths]
       note_hashes = "0x0000000000000000000000000000000000000000000000000000000000000000"
       nullifiers = "0x0000000000000000000000000000000000000000000000000000000000000001"
       l2_to_l1_msgs = "0x0000000000000000000000000000000000000000000000000000000000000000"
-      public_data_writes = "0x0000000000000000000000000000000000000000000000000000000000000002"
+      public_data_writes = "0x0000000000000000000000000000000000000000000000000000000000000003"
 
       [inputs.avm_proof_data.public_inputs.accumulated_data]
       note_hashes = [
@@ -25225,7 +25225,7 @@ next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000
   "0x0000000000000000000000000000000000000000000000000000000000000000"
 ]
       nullifiers = [
-  "0x1137cbbcc4978644f9ac565ce2be0edfdfd031eff09b17cd5c960f04a51fd81f",
+  "0x09fac458f9e079d0117ef63746c55ce66b3e5d95c8420974d9c69f369b0d77ef",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
   "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -29473,16 +29473,16 @@ inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
 ]
 
         [[inputs.avm_proof_data.public_inputs.accumulated_data.public_data_writes]]
-        leaf_slot = "0x0b9ae8ac04ecda623423c04d5c02c4d72a9ae4a2e9cfc579b58094612d45db54"
-        value = "0x0c6be08a5e070b343e733716e4ad76ea05de25e2b7fc6e6f50f0ec549f7c0bfa"
+        leaf_slot = "0x2935995b8343928a25acdb09654bdc27aeef345ec185caa48fb0048bd475fbcb"
+        value = "0x0000000000000000000000000000000000000000000000000000000000001c20"
 
         [[inputs.avm_proof_data.public_inputs.accumulated_data.public_data_writes]]
-        leaf_slot = "0x15cecc56c070afe91aacccc6d3b165ad1f791b7644f606f6f60eaa2f87826abc"
-        value = "0x00000000000000000000000000000000000000000000021e0120b68b802591e0"
+        leaf_slot = "0x0dc02e099550676b3dcfd522010d4db9d2c47a4556dfa28aa20a4a0eb35c54a4"
+        value = "0x0000000000000000000000000000000000000000000000000000000000000af0"
 
         [[inputs.avm_proof_data.public_inputs.accumulated_data.public_data_writes]]
-        leaf_slot = "0x0000000000000000000000000000000000000000000000000000000000000000"
-        value = "0x0000000000000000000000000000000000000000000000000000000000000000"
+        leaf_slot = "0x12d1296a2643b832fbd1d6d3ed3678833fce770084efd75adfd517de8214ccf3"
+        value = "0x00000000000000000000000000000000000000000000021e00afaeb15ed67ca0"
 
         [[inputs.avm_proof_data.public_inputs.accumulated_data.public_data_writes]]
         leaf_slot = "0x0000000000000000000000000000000000000000000000000000000000000000"
@@ -29729,23 +29729,23 @@ inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
         value = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
   [inputs.start_sponge_blob]
-  num_absorbed_fields = "0x000000000000000000000000000000000000000000000000000000000000003d"
+  num_absorbed_fields = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
     [inputs.start_sponge_blob.sponge]
     cache = [
-  "0x12b7c1f114cc78e17911e84ec9c211e634efaa7f308351d8ed065c0e2d7c3913",
-  "0x0c06a97dd2eca4923ef5d85176f0250274def490be0f7cbff56b11c0b60826e0",
-  "0x0bca244f4a005e7e4e2a4ad4e8d62f8cae8816025812e90aa7cb18dc83f81e0e"
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000"
 ]
     state = [
-  "0x11d8a1be4eefa7faa68a772e3c0a42e00056b5060492d97a6aeaefcce76d5271",
-  "0x0bec66793774e26c51e8a1b63379f84f35a7431fe467647a96615e8753b6ca3f",
-  "0x1f0462ae0a135e959015b010c790d01bd97a7e2b08ef4e6740e417b78f959f6f",
-  "0x22e18c96354766d5a3798b5de768c52ecac4fa8acc629ca8e47064175a5890b1"
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "0x0000000000000000000000000000000000000000000060000000000000000000"
 ]
-    cache_size = "0x0000000000000000000000000000000000000000000000000000000000000001"
+    cache_size = "0x0000000000000000000000000000000000000000000000000000000000000000"
     squeeze_mode = false
 
   [inputs.last_archive]
-  root = "0x280a1dc0fc66f05e5627b85e7375854013fa767efae0e792cc4c77e6e7641135"
-  next_available_leaf_index = "0x000000000000000000000000000000000000000000000000000000000000000a"
+  root = "0x24f3d6261780561e8ede638edf15d34d9f93372572631856307c57a08dfb9cb1"
+  next_available_leaf_index = "0x000000000000000000000000000000000000000000000000000000000000000b"
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/constants.nr b/noir-projects/noir-protocol-circuits/crates/types/src/constants.nr
index 7be80af52726..a029c7e18f8e 100644
--- a/noir-projects/noir-protocol-circuits/crates/types/src/constants.nr
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/constants.nr
@@ -610,10 +610,20 @@ pub global ULTRA_KECCAK_PROOF_LENGTH: u32 = 331; // See UltraKeccakFlavor for fo
 pub global RECURSIVE_ROLLUP_HONK_PROOF_LENGTH: u32 =
     RECURSIVE_PROOF_LENGTH + IPA_CLAIM_SIZE + IPA_PROOF_LENGTH;
 pub global NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH: u32 = RECURSIVE_ROLLUP_HONK_PROOF_LENGTH;
-pub global CHONK_PROOF_LENGTH: u32 = 1315;
+// Chonk sub-proof lengths; pinned to bb via static_asserts in mock_verifier_inputs.test.cpp.
+pub global CHONK_HIDING_OINK_LENGTH: u32 = 108;
+pub global CHONK_MERGE_PROOF_SIZE: u32 = 42;
+pub global CHONK_ECCVM_PROOF_LENGTH: u32 = 608;
+pub global CHONK_JOINT_PROOF_LENGTH: u32 = 499;
+pub global CHONK_PROOF_LENGTH: u32 = CHONK_HIDING_OINK_LENGTH
+    + HIDING_KERNEL_IO_PUBLIC_INPUTS_SIZE
+    + CHONK_MERGE_PROOF_SIZE
+    + CHONK_ECCVM_PROOF_LENGTH
+    + IPA_PROOF_LENGTH
+    + CHONK_JOINT_PROOF_LENGTH;
 
 pub global ULTRA_VK_LENGTH_IN_FIELDS: u32 = 115; // size of an Ultra verification key
-pub global MEGA_VK_LENGTH_IN_FIELDS: u32 = 127; // size of a Mega verification key
+pub global MEGA_VK_LENGTH_IN_FIELDS: u32 = 143; // size of a Mega verification key
 // CHONK: "Client Honk" - An UltraHonk variant with incremental folding and delayed non-native arithmetic.
 pub global CHONK_VK_LENGTH_IN_FIELDS: u32 = MEGA_VK_LENGTH_IN_FIELDS; // size of a chonk verification key
 // VK is composed of
@@ -639,6 +649,15 @@ pub global MAX_PUBLIC_CALLS_TO_UNIQUE_CONTRACT_CLASS_IDS: u32 = 21;
 /// This is not technically a protocol constant as note hashes are computed by each contract.
 pub global DOM_SEP__NOTE_HASH: u32 = 116501019;
 
+/// Domain separator for partial note commitments.
+///
+/// This is not technically a protocol constant as partial note commitments are computed by each contract.
+///
+/// A partial note commitment is the first round of hashing of a partial note, combining the private fields before the
+/// public completion fields (storage slot and public note data) are mixed in. Distinct from [`DOM_SEP__NOTE_HASH`],
+/// which preserves the storage-slot-first invariant.
+pub global DOM_SEP__PARTIAL_NOTE_COMMITMENT: u32 = 568912195;
+
 /// Domain separator for siloed note hashes.
 ///
 /// Used by [`crate::hash::compute_siloed_note_hash`].
@@ -680,6 +699,9 @@ pub global DOM_SEP__EVENT_LOG_TAG: u32 = 926040838;
 pub global DOM_SEP__NOTE_COMPLETION_LOG_TAG: u32 = 3372669888;
 /// Domain separator for unconstrained message delivery log tags. Used by [`crate::hash::compute_log_tag`].
 pub global DOM_SEP__UNCONSTRAINED_MSG_LOG_TAG: u32 = 1485357192;
+/// Domain separator for non-interactive handshake log tags emitted by the handshake registry contract. Used by
+/// [`crate::hash::compute_log_tag`].
+pub global DOM_SEP__NON_INTERACTIVE_HANDSHAKE_LOG_TAG: u32 = 4046403018;
 /// Domain separator for private log tags.
 ///
 /// Used by [`crate::hash::compute_siloed_private_log_first_field`].
@@ -776,6 +798,10 @@ pub global DOM_SEP__PRIVATE_INITIALIZATION_NULLIFIER: u32 = 3990889078;
 /// Domain separator for L1 to L2 message secret hashes.
 pub global DOM_SEP__SECRET_HASH: u32 = 4199652938;
 
+/// Domain separator for the secret hash stored in handshake notes produced by the handshake registry contract.
+/// Kept distinct from [`DOM_SEP__SECRET_HASH`] (which is specifically for L1 to L2 messages).
+pub global DOM_SEP__HANDSHAKE_SECRET_HASH: u32 = 3596796143;
+
 /// Domain separator for transaction nullifiers.
 ///
 /// Used to produce cancellable (replaceable) transactions.
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/constants_tests.nr b/noir-projects/noir-protocol-circuits/crates/types/src/constants_tests.nr
index 5773e2332904..2a37b72e524a 100644
--- a/noir-projects/noir-protocol-circuits/crates/types/src/constants_tests.nr
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/constants_tests.nr
@@ -12,11 +12,12 @@ use crate::{
         DOM_SEP__BLOCK_HEADER_HASH, DOM_SEP__BLOCK_HEADERS_HASH, DOM_SEP__CONTRACT_ADDRESS_V1,
         DOM_SEP__CONTRACT_CLASS_ID, DOM_SEP__ECDH_FIELD_MASK, DOM_SEP__ECDH_SUBKEY,
         DOM_SEP__EVENT_COMMITMENT, DOM_SEP__EVENT_LOG_TAG, DOM_SEP__FUNCTION_ARGS,
-        DOM_SEP__INITIALIZATION_NULLIFIER, DOM_SEP__INITIALIZER, DOM_SEP__IVSK_M,
-        DOM_SEP__MERKLE_HASH, DOM_SEP__MESSAGE_NULLIFIER, DOM_SEP__NHK_M,
-        DOM_SEP__NOTE_COMPLETION_LOG_TAG, DOM_SEP__NOTE_HASH, DOM_SEP__NOTE_HASH_NONCE,
-        DOM_SEP__NOTE_NULLIFIER, DOM_SEP__NULLIFIER_MERKLE, DOM_SEP__OVSK_M,
-        DOM_SEP__PARTIAL_ADDRESS, DOM_SEP__PARTIAL_NOTE_VALIDITY_COMMITMENT,
+        DOM_SEP__HANDSHAKE_SECRET_HASH, DOM_SEP__INITIALIZATION_NULLIFIER, DOM_SEP__INITIALIZER,
+        DOM_SEP__IVSK_M, DOM_SEP__MERKLE_HASH, DOM_SEP__MESSAGE_NULLIFIER, DOM_SEP__NHK_M,
+        DOM_SEP__NON_INTERACTIVE_HANDSHAKE_LOG_TAG, DOM_SEP__NOTE_COMPLETION_LOG_TAG,
+        DOM_SEP__NOTE_HASH, DOM_SEP__NOTE_HASH_NONCE, DOM_SEP__NOTE_NULLIFIER,
+        DOM_SEP__NULLIFIER_MERKLE, DOM_SEP__OVSK_M, DOM_SEP__PARTIAL_ADDRESS,
+        DOM_SEP__PARTIAL_NOTE_COMMITMENT, DOM_SEP__PARTIAL_NOTE_VALIDITY_COMMITMENT,
         DOM_SEP__PRIVATE_FUNCTION_LEAF, DOM_SEP__PRIVATE_INITIALIZATION_NULLIFIER,
         DOM_SEP__PRIVATE_LOG_FIRST_FIELD, DOM_SEP__PRIVATE_TX_HASH, DOM_SEP__PROTOCOL_CONTRACTS,
         DOM_SEP__PUBLIC_BYTECODE, DOM_SEP__PUBLIC_CALLDATA, DOM_SEP__PUBLIC_DATA_MERKLE,
@@ -141,7 +142,7 @@ impl<let NUM_VALUES: u32, let NUM_U32_VALUES: u32> HashedValueTester<NUM_VALUES,
 
 #[test]
 fn hashed_values_match_derived() {
-    let mut tester = HashedValueTester::<68, 61>::new();
+    let mut tester = HashedValueTester::<71, 64>::new();
 
     // -----------------
     // Domain separators
@@ -174,6 +175,11 @@ fn hashed_values_match_derived() {
         DOM_SEP__UNCONSTRAINED_MSG_LOG_TAG,
         "unconstrained_msg_log_tag",
     );
+    tester.assert_dom_sep_matches_derived(
+        DOM_SEP__NON_INTERACTIVE_HANDSHAKE_LOG_TAG,
+        "non_interactive_handshake_log_tag",
+    );
+    tester.assert_dom_sep_matches_derived(DOM_SEP__HANDSHAKE_SECRET_HASH, "handshake_secret_hash");
     tester.assert_dom_sep_matches_derived(DOM_SEP__MESSAGE_NULLIFIER, "message_nullifier");
     tester.assert_dom_sep_matches_derived(DOM_SEP__PRIVATE_FUNCTION_LEAF, "private_function_leaf");
     tester.assert_dom_sep_matches_derived(DOM_SEP__PUBLIC_BYTECODE, "public_bytecode");
@@ -211,6 +217,10 @@ fn hashed_values_match_derived() {
         DOM_SEP__PARTIAL_NOTE_VALIDITY_COMMITMENT,
         "partial_note_validity_commitment",
     );
+    tester.assert_dom_sep_matches_derived(
+        DOM_SEP__PARTIAL_NOTE_COMMITMENT,
+        "partial_note_commitment",
+    );
     tester.assert_dom_sep_matches_derived(
         DOM_SEP__INITIALIZATION_NULLIFIER,
         "initialization_nullifier",
diff --git a/noir-projects/protocol-fuzzer/.gitignore b/noir-projects/protocol-fuzzer/.gitignore
index ecd9d7472433..4d9a90ba887b 100644
--- a/noir-projects/protocol-fuzzer/.gitignore
+++ b/noir-projects/protocol-fuzzer/.gitignore
@@ -1,3 +1,5 @@
 /target
 contracts/target/
 *.sw?
+# Symlink to yarn-project/node_modules created by setup-local.sh.
+/node_modules
diff --git a/noir-projects/protocol-fuzzer/README.md b/noir-projects/protocol-fuzzer/README.md
index 6116998ff2d9..a3f6103ef6c5 100644
--- a/noir-projects/protocol-fuzzer/README.md
+++ b/noir-projects/protocol-fuzzer/README.md
@@ -1,5 +1,5 @@
 A state-machine fuzzer for Aztec contract interactions. It talks to a running
-sandbox via a persistent Node.js HTTP bridge (`bridge.mjs`), compares the
+sandbox via a persistent Node.js HTTP bridge (`wallet-bridge.mjs`), compares the
 sandbox's behavior to an in-memory model, and asserts on any divergence.
 
 Two machines are available:
@@ -19,16 +19,22 @@ it uses the standard `Token` contract that ships with the wallet CLI:
 cargo run -- token --max-steps 100
 ```
 
-The **side-effect** machine requires the **nightly** sandbox because it deploys custom
-contracts compiled against the nightly's aztec-nr. Use `setup-nightly-sandbox.sh` to
-automate the full setup (defaults to the last tested nightly tag; pass `--latest` to
-try the newest one). See `SANDBOX_INSTRUCTIONS.md` for manual steps.
+The **side-effect** machine requires custom contracts. There are two ways to set it up:
 
+**Local setup** (no Docker, uses your repo build):
+```
+bash setup-local.sh              # compiles contracts, starts anvil + node + bridge
+cargo run -- side-effect --artifacts-dir contracts/target --max-steps 100
 ```
-bash setup-nightly-sandbox.sh
 
+**Nightly Docker setup** (defaults to the last tested nightly tag; pass `--latest` for newest):
+```
+bash setup-nightly-sandbox.sh
 cargo run -- side-effect --max-steps 100
 ```
+The nightly script places artifacts at `/tmp/` inside the container (the default `--artifacts-dir`).
+
+See `SANDBOX_INSTRUCTIONS.md` for manual nightly steps and troubleshooting.
 
 To replay a specific failure seed:
 
@@ -44,8 +50,15 @@ cargo run -- side-effect --max-steps 100000 --seed 0x5a7211231dcd6500
 --seed 0xHEX          Replay a specific seed
 --max-steps N         Max fuzzing steps (default: 400)
 --max-batch-size N    Max parallel sends per batch (default: 8)
+--artifacts-dir DIR   Contract artifact directory (side-effect only, default: /tmp)
 ```
 
+> **Note:** `--artifacts-dir` is resolved on the host and sent as-is to the bridge.
+> For **local** setup the bridge runs on the host, so use the real path (e.g.
+> `contracts/target`). For **nightly Docker** the bridge runs inside the container,
+> so the path must be valid inside it — the default `/tmp` works because the nightly
+> script places artifacts at `/tmp/*.json` inside the container.
+
 ### Parallel batching
 
 Consecutive non-conflicting state-changing commands are batched and fired concurrently,
@@ -64,12 +77,16 @@ Conflict rules (conservative -- false positives only reduce batch size):
 To verify that the sandbox is running correctly, run the integration smoke tests:
 
 ```
-cargo test -- --ignored --nocapture
+ARTIFACTS_DIR=contracts/target cargo test -- --ignored --nocapture
 ```
 
 These are `#[ignore]`d by default because they require a running sandbox. With
 bridge + fast slots, a full suite run takes ~1-2 minutes (~5-13s per transaction).
 
+Environment variables for tests:
+- `ARTIFACTS_DIR` -- contract artifact directory (default: `/tmp`)
+- `BRIDGE_URL` -- bridge server URL (default: `http://localhost:8089`)
+
 ## Contracts
 
 Contract sources live in `contracts/` within this crate, not in `noir-contracts/`. They
@@ -82,9 +99,9 @@ with oracle calls (like `utilityLog`) that the nightly PXE doesn't support.
 - **Parent** (`contracts/parent_contract/`) -- forwards calls to SideEffect for
   cross-contract call testing
 
-Artifacts are built by `setup-nightly-sandbox.sh` inside the nightly container and
-placed in `contracts/target/` (not checked into git).
+Artifacts are built by `setup-local.sh` or `setup-nightly-sandbox.sh` and placed in
+`contracts/target/`. Pre-built artifacts are checked into git for convenience.
 
-The setup script auto-detects the nightly commit by matching the container's nargo
-hash against `origin/next`. See `SANDBOX_INSTRUCTIONS.md` for the full build pipeline,
-version matrix, and troubleshooting.
+The nightly setup script auto-detects the nightly commit by matching the container's
+nargo hash against `origin/next`. See `SANDBOX_INSTRUCTIONS.md` for the full build
+pipeline, version matrix, and troubleshooting.
diff --git a/noir-projects/protocol-fuzzer/SANDBOX_INSTRUCTIONS.md b/noir-projects/protocol-fuzzer/SANDBOX_INSTRUCTIONS.md
index 760425a0bcae..36438de6aa8f 100644
--- a/noir-projects/protocol-fuzzer/SANDBOX_INSTRUCTIONS.md
+++ b/noir-projects/protocol-fuzzer/SANDBOX_INSTRUCTIONS.md
@@ -1,5 +1,9 @@
 # Protocol Fuzzer: Running with Nightly Docker Sandbox
 
+> **For local development** (no Docker), use `setup-local.sh` instead. It starts
+> anvil, the Aztec node, compiles contracts, and launches the bridge — all on the
+> host. See `README.md` for quick-start instructions.
+
 ## Overview
 
 The protocol fuzzer has two state machines:
@@ -9,7 +13,7 @@ The protocol fuzzer has two state machines:
 - **side-effect**: Fuzzes note lifecycle, nullifier emission, and cross-contract calls via
   custom `SideEffect` and `Parent` contracts. **Requires the nightly sandbox.**
 
-Both machines talk to the sandbox via a persistent Node.js HTTP bridge (`bridge.mjs`)
+Both machines talk to the sandbox via a persistent Node.js HTTP bridge (`wallet-bridge.mjs`)
 that keeps a single CLIWallet instance alive across requests.
 
 ## Why the nightly sandbox?
@@ -69,7 +73,7 @@ for the next block. Four things bring per-transaction time from ~35s down to ~4-
 
 1. **Fast slots.** The setup script starts the sandbox with 5-second L1/L2 slot durations
    (default 36s/12s) and disables sequencer timetable enforcement.
-2. **Persistent bridge.** `bridge.mjs` keeps a single Node.js wallet instance alive inside
+2. **Persistent bridge.** `wallet-bridge.mjs` keeps a single Node.js wallet instance alive inside
    the container. Without it, each operation would shell out to the CLI wallet, paying a
    ~1.5s Node.js cold-start every time.
 3. **Parallel batching.** The fuzzer buffers consecutive non-conflicting sends and fires
@@ -216,14 +220,14 @@ done
 
 ### 5. Start the bridge server
 
-The bridge server (`bridge.mjs`) runs inside the container and provides a persistent
+The bridge server (`wallet-bridge.mjs`) runs inside the container and provides a persistent
 HTTP API that the fuzzer calls:
 
 ```bash
-docker cp bridge.mjs aztec-sandbox-nightly:/usr/src/yarn-project/bridge.mjs
+docker cp wallet-bridge.mjs aztec-sandbox-nightly:/usr/src/yarn-project/wallet-bridge.mjs
 
 docker exec -d aztec-sandbox-nightly \
-  bash -c 'cd /usr/src/yarn-project && exec node --no-warnings bridge.mjs > /tmp/bridge.log 2>&1'
+  bash -c 'cd /usr/src/yarn-project && exec node --no-warnings wallet-bridge.mjs > /tmp/bridge.log 2>&1'
 
 # Wait for it to start
 curl -s http://localhost:8089/health  # {"ok":true}
@@ -317,7 +321,7 @@ on every operation.
 
 ### How the bridge works
 
-`bridge.mjs` runs inside the container and lazily initializes a `CLIWallet` instance
+`wallet-bridge.mjs` runs inside the container and lazily initializes a `CLIWallet` instance
 on the first request. The Rust fuzzer resolves aliases (`accounts:test0`,
 `contracts:test0`) to hex addresses before sending them to the bridge via HTTP POST.
 
@@ -344,7 +348,7 @@ on the first request. The Rust fuzzer resolves aliases (`accounts:test0`,
 | wallet CLI | `node --no-warnings /usr/src/yarn-project/cli-wallet/dest/bin/index.js` |
 | sandbox CLI | `node --no-warnings /usr/src/yarn-project/aztec/dest/bin/index.js` |
 | anvil | `/opt/foundry/bin/anvil` |
-| bridge server | `/usr/src/yarn-project/bridge.mjs` |
+| bridge server | `/usr/src/yarn-project/wallet-bridge.mjs` |
 | bridge log | `/tmp/bridge.log` |
 
 ## Stopping
diff --git a/noir-projects/protocol-fuzzer/setup-local.sh b/noir-projects/protocol-fuzzer/setup-local.sh
new file mode 100755
index 000000000000..8d169bf2079a
--- /dev/null
+++ b/noir-projects/protocol-fuzzer/setup-local.sh
@@ -0,0 +1,302 @@
+#!/usr/bin/env bash
+#
+# Sets up a local Aztec sandbox for use with the protocol fuzzer.
+# No Docker required — everything runs on the host.
+#
+# Prerequisites:
+#   cd $REPO_ROOT && ./bootstrap.sh build yarn-project
+#
+# What this script does:
+#   1. Checks prerequisites (nargo, bb, anvil, node, jq, yarn-project build)
+#   2. Kills any existing processes on ports 8545/8080/8089
+#   3. Starts anvil (L1) and the Aztec node + PXE
+#   4. Compiles contracts (nargo + transpile + VK generation)
+#   5. Starts the bridge server
+#
+# Options:
+#   --skip-compile   Skip contract compilation (reuse existing artifacts)
+#
+set -euo pipefail
+
+SKIP_COMPILE=false
+for arg in "$@"; do
+    case "$arg" in
+        --skip-compile) SKIP_COMPILE=true ;;
+        *) echo "Unknown option: $arg" >&2; exit 1 ;;
+    esac
+done
+
+REPO_ROOT="$(cd "$(dirname "$0")/../.." && pwd)"
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+CONTRACTS_DIR="${SCRIPT_DIR}/contracts"
+
+# Binaries (overridable via env vars)
+NARGO="${NARGO:-${REPO_ROOT}/noir/noir-repo/target/release/nargo}"
+BB="${BB:-${REPO_ROOT}/barretenberg/cpp/build/bin/bb}"
+ANVIL="${ANVIL:-/opt/foundry/bin/anvil}"
+TRANSPILER="${TRANSPILER:-${REPO_ROOT}/avm-transpiler/target/release/avm-transpiler}"
+
+# --------------------------------------------------------------------------- #
+# Helpers
+# --------------------------------------------------------------------------- #
+
+log()  { echo "==> $*"; }
+die()  { echo "ERROR: $*" >&2; exit 1; }
+
+# PIDs of background processes we start — killed if the script fails partway through.
+BG_PIDS=()
+SETUP_COMPLETE=false
+cleanup() {
+    if [ "$SETUP_COMPLETE" = true ]; then
+        return
+    fi
+    if [ ${#BG_PIDS[@]} -gt 0 ]; then
+        log "Setup failed — stopping background processes: ${BG_PIDS[*]}"
+        kill "${BG_PIDS[@]}" 2>/dev/null || true
+        wait "${BG_PIDS[@]}" 2>/dev/null || true
+    fi
+}
+trap cleanup EXIT
+
+# kill_on_port PORT — kill any process listening on this TCP port
+kill_on_port() {
+    local port=$1 pids
+    pids=$(lsof -ti "tcp:${port}" 2>/dev/null || true)
+    if [ -n "$pids" ]; then
+        log "Killing process(es) on port ${port}: ${pids}"
+        echo "$pids" | xargs kill -9 2>/dev/null || true
+        # Wait for the port to be fully released (up to 10s).
+        local elapsed=0
+        while lsof -ti "tcp:${port}" >/dev/null 2>&1 && [ $elapsed -lt 10 ]; do
+            sleep 1
+            elapsed=$((elapsed + 1))
+        done
+    fi
+}
+
+# wait_for_url PID URL MAX_SECONDS LOG_FILE
+# Polls URL every 2s. Bails early if PID dies, printing last 30 lines of LOG_FILE.
+wait_for_url() {
+    local pid=$1 url=$2 max=$3 logfile=$4 elapsed=0
+    while [ $elapsed -lt "$max" ]; do
+        if ! kill -0 "$pid" 2>/dev/null; then
+            echo "--- last 30 lines of ${logfile} ---"
+            tail -30 "$logfile"
+            die "Process ${pid} exited unexpectedly"
+        fi
+        local code
+        code=$(curl -so /dev/null -w '%{http_code}' "$url" 2>/dev/null || true)
+        [ -n "$code" ] && [ "$code" != "000" ] && return 0
+        sleep 2
+        elapsed=$((elapsed + 2))
+    done
+    die "Timed out after ${max}s waiting for ${url}. Check ${logfile}"
+}
+
+# --------------------------------------------------------------------------- #
+# 1. Check prerequisites
+# --------------------------------------------------------------------------- #
+
+log "Checking prerequisites..."
+
+missing=()
+[ -x "$NARGO" ]  || missing+=("nargo (expected at ${NARGO})")
+[ -x "$BB" ]     || missing+=("bb (expected at ${BB})")
+[ -x "$ANVIL" ]  || missing+=("anvil (expected at ${ANVIL})")
+command -v node >/dev/null  || missing+=("node")
+command -v jq >/dev/null    || missing+=("jq")
+command -v curl >/dev/null  || missing+=("curl")
+
+if [ ${#missing[@]} -gt 0 ]; then
+    die "Missing prerequisites: ${missing[*]}
+  Run the full bootstrap to build everything:
+    cd ${REPO_ROOT} && ./bootstrap.sh build yarn-project"
+fi
+
+# Determine which tool to use for artifact processing (transpilation + prefix stripping).
+# bb aztec_process (new) does it all in one step; avm-transpiler (old) needs separate steps.
+USE_BB_AZTEC_PROCESS=false
+if "$BB" aztec_process 2>&1 | grep -q "contract artifact"; then
+    USE_BB_AZTEC_PROCESS=true
+    log "Using: bb aztec_process"
+elif [ -x "$TRANSPILER" ]; then
+    log "Using: avm-transpiler + jq prefix strip + bb write_vk"
+else
+    die "No artifact processor found.
+  Option A: Rebuild bb with AVM support
+  Option B: Build the avm-transpiler:
+    cd ${REPO_ROOT}/avm-transpiler && cargo build --release"
+fi
+
+# Verify yarn-project is properly built. A partial build (swc-only, no generate steps)
+# will have dest/ dirs but missing generated files, causing runtime crashes.
+YP="${REPO_ROOT}/yarn-project"
+missing_build=()
+[ -d "${YP}/cli-wallet/dest" ]                                  || missing_build+=("cli-wallet/dest")
+[ -f "${YP}/cli/dest/config/generated/networks.js" ]            || missing_build+=("cli/generated/networks.js")
+[ -f "${YP}/ethereum/dest/generated/l1-contracts-defaults.js" ] || missing_build+=("ethereum/generated/l1-contracts-defaults.js")
+[ -f "${YP}/noir-protocol-circuits-types/dest/vk_tree.js" ]     || missing_build+=("noir-protocol-circuits-types/vk_tree.js")
+if [ ${#missing_build[@]} -gt 0 ]; then
+    die "yarn-project is not fully built (missing: ${missing_build[*]}).
+  Run the full bootstrap first:
+    cd ${REPO_ROOT} && ./bootstrap.sh build yarn-project"
+fi
+
+log "All prerequisites OK"
+
+# --------------------------------------------------------------------------- #
+# 2. Kill existing processes on our ports
+# --------------------------------------------------------------------------- #
+
+log "Checking for port conflicts..."
+kill_on_port 8545
+kill_on_port 8080
+kill_on_port 8089
+
+# --------------------------------------------------------------------------- #
+# 3. Start anvil
+# --------------------------------------------------------------------------- #
+
+log "Starting anvil on port 8545..."
+"$ANVIL" --host 0.0.0.0 --port 8545 > /tmp/anvil-local.log 2>&1 &
+ANVIL_PID=$!
+BG_PIDS+=("$ANVIL_PID")
+sleep 1
+if ! kill -0 "$ANVIL_PID" 2>/dev/null; then
+    die "Anvil failed to start. Check /tmp/anvil-local.log"
+fi
+log "Anvil running (PID ${ANVIL_PID})"
+
+# --------------------------------------------------------------------------- #
+# 4. Start Aztec node and wait for PXE
+# --------------------------------------------------------------------------- #
+
+log "Starting Aztec node on port 8080..."
+(
+    cd "${REPO_ROOT}/yarn-project"
+    ETHEREUM_SLOT_DURATION=5 \
+    AZTEC_SLOT_DURATION=5 \
+    AZTEC_EPOCH_DURATION=4 \
+    SEQ_ENFORCE_TIME_TABLE=false \
+    LOG_LEVEL=info \
+    node --no-warnings ./aztec/dest/bin/index.js start \
+        --local-network \
+        --l1-rpc-urls http://127.0.0.1:8545 \
+        > /tmp/aztec-node-local.log 2>&1
+) &
+NODE_PID=$!
+BG_PIDS+=("$NODE_PID")
+
+log "Waiting for PXE on port 8080 (up to 300s)..."
+wait_for_url "$NODE_PID" http://localhost:8080 300 /tmp/aztec-node-local.log
+log "PXE is ready"
+
+# --------------------------------------------------------------------------- #
+# 5. Compile contracts
+# --------------------------------------------------------------------------- #
+
+# Map package names to artifact base names (nargo uses the contract name, not the package name)
+declare -A ARTIFACT_NAMES=(
+    [side_effect_contract]="side_effect_contract-SideEffect"
+    [parent_contract]="parent_contract-Parent"
+)
+
+if [ "$SKIP_COMPILE" = true ]; then
+    log "Skipping contract compilation (--skip-compile)"
+    for contract_pkg in side_effect_contract parent_contract; do
+        artifact="${ARTIFACT_NAMES[$contract_pkg]}"
+        json_path="${CONTRACTS_DIR}/target/${artifact}.json"
+        [ -f "$json_path" ] || die "Artifact not found: ${json_path} (cannot --skip-compile without prior build)"
+    done
+else
+    mkdir -p "${CONTRACTS_DIR}/target"
+
+    for contract_pkg in side_effect_contract parent_contract; do
+        artifact="${ARTIFACT_NAMES[$contract_pkg]}"
+        json_path="${CONTRACTS_DIR}/target/${artifact}.json"
+
+        log "Compiling ${contract_pkg}..."
+        (cd "$CONTRACTS_DIR" && "$NARGO" compile --silence-warnings --inliner-aggressiveness 0 --package "$contract_pkg")
+
+        if [ "$USE_BB_AZTEC_PROCESS" = true ]; then
+            log "Processing ${artifact} with bb aztec_process..."
+            "$BB" aztec_process -i "$json_path"
+        else
+            log "Transpiling ${artifact}..."
+            "$TRANSPILER" "$json_path" "$json_path"
+
+            log "Stripping __aztec_nr_internals__ prefix..."
+            jq '.functions |= map(.name |= sub("^__aztec_nr_internals__"; ""))' "$json_path" > "${json_path}.tmp"
+            mv "${json_path}.tmp" "$json_path"
+
+            # Generate verification keys for private functions.
+            log "Generating VKs for private functions..."
+            vk_tmp_dir=$(mktemp -d)
+            func_count=$(jq '.functions | length' "$json_path")
+            for (( i=0; i<func_count; i++ )); do
+                make_vk=$(jq -e ".functions[$i] | (.custom_attributes | index(\"public\") == null) and (.is_unconstrained == false)" "$json_path" 2>/dev/null || true)
+                if [ "$make_vk" = "true" ]; then
+                    fname=$(jq -r ".functions[$i].name" "$json_path")
+                    log "  VK: ${fname}"
+                    jq -r ".functions[$i].bytecode" "$json_path" \
+                        | base64 -d | gunzip \
+                        | "$BB" write_vk --scheme chonk -b - -o "$vk_tmp_dir" -v 2>/dev/null
+                    vk_b64=$(base64 -w 0 < "$vk_tmp_dir/vk")
+                    jq --arg vk "$vk_b64" --argjson idx "$i" \
+                        '.functions[$idx].verification_key = $vk' "$json_path" > "${json_path}.tmp"
+                    mv "${json_path}.tmp" "$json_path"
+                fi
+            done
+            rm -rf "$vk_tmp_dir"
+        fi
+
+        log "Built ${artifact}"
+    done
+fi
+
+# --------------------------------------------------------------------------- #
+# 6. Start bridge
+# --------------------------------------------------------------------------- #
+
+# Verify node is still alive after compilation
+if ! kill -0 "$NODE_PID" 2>/dev/null; then
+    die "Aztec node died during contract compilation. Check /tmp/aztec-node-local.log"
+fi
+
+# Clear stale wallet state from previous runs (avoids "block hash not found" errors).
+rm -rf "${HOME}/.aztec/wallet"
+
+# Symlink yarn-project/node_modules next to wallet-bridge.mjs so its @aztec/* imports
+# resolve. Keeping the symlink under noir-projects/ avoids polluting yarn-project/.
+ln -sfn "${REPO_ROOT}/yarn-project/node_modules" "${SCRIPT_DIR}/node_modules"
+
+log "Starting bridge server on port 8089..."
+(cd "${SCRIPT_DIR}" && exec node --no-warnings wallet-bridge.mjs > /tmp/bridge-local.log 2>&1) &
+BRIDGE_PID=$!
+BG_PIDS+=("$BRIDGE_PID")
+
+wait_for_url "$BRIDGE_PID" http://localhost:8089/health 60 /tmp/bridge-local.log
+log "Bridge is ready (PID ${BRIDGE_PID})"
+
+# --------------------------------------------------------------------------- #
+# Done
+# --------------------------------------------------------------------------- #
+
+echo ""
+log "Local sandbox is ready!"
+echo ""
+echo "  Anvil:      http://localhost:8545  (PID ${ANVIL_PID}, log: /tmp/anvil-local.log)"
+echo "  Aztec node: http://localhost:8080  (PID ${NODE_PID}, log: /tmp/aztec-node-local.log)"
+echo "  Bridge:     http://localhost:8089  (PID ${BRIDGE_PID}, log: /tmp/bridge-local.log)"
+echo "  Slot time:  5s"
+echo ""
+echo "Run the fuzzer:"
+echo ""
+echo "  cd ${SCRIPT_DIR}"
+echo "  RUST_LOG=debug cargo run -- side-effect --artifacts-dir ${CONTRACTS_DIR}/target --max-steps 5"
+echo ""
+echo "To stop all services:"
+echo "  kill ${ANVIL_PID} ${NODE_PID} ${BRIDGE_PID}"
+echo ""
+
+SETUP_COMPLETE=true
diff --git a/noir-projects/protocol-fuzzer/setup-nightly-sandbox.sh b/noir-projects/protocol-fuzzer/setup-nightly-sandbox.sh
index 207566171bcf..cda546d8951c 100755
--- a/noir-projects/protocol-fuzzer/setup-nightly-sandbox.sh
+++ b/noir-projects/protocol-fuzzer/setup-nightly-sandbox.sh
@@ -16,7 +16,7 @@ set -euo pipefail
 
 CONTAINER_NAME="aztec-sandbox-nightly"
 # Last nightly tag verified to work with the current contract source code.
-KNOWN_GOOD_TAG="5.0.0-nightly.20260224"
+KNOWN_GOOD_TAG="5.0.0-nightly.20260402"
 WRAPPER_DIR="${HOME}/.local/bin"
 WRAPPER_PATH="${WRAPPER_DIR}/aztec-wallet"
 REPO_ROOT="$(cd "$(dirname "$0")/../.." && pwd)"
@@ -223,15 +223,15 @@ done
 log "Waiting for Aztec Server HTTP endpoint to be ready..."
 wait_for_http http://localhost:8080 120 || die "PXE HTTP endpoint did not recover"
 
-BRIDGE_SRC="${REPO_ROOT}/noir-projects/protocol-fuzzer/bridge.mjs"
+BRIDGE_SRC="${REPO_ROOT}/noir-projects/protocol-fuzzer/wallet-bridge.mjs"
 if [ ! -f "$BRIDGE_SRC" ]; then
     die "Bridge source not found: ${BRIDGE_SRC}"
 fi
 
 log "Starting bridge server..."
-docker cp "$BRIDGE_SRC" "${CONTAINER_NAME}:/usr/src/yarn-project/bridge.mjs"
+docker cp "$BRIDGE_SRC" "${CONTAINER_NAME}:/usr/src/yarn-project/wallet-bridge.mjs"
 docker exec -d "$CONTAINER_NAME" \
-    bash -c 'cd /usr/src/yarn-project && exec node --no-warnings bridge.mjs > /tmp/bridge.log 2>&1'
+    bash -c 'cd /usr/src/yarn-project && exec node --no-warnings wallet-bridge.mjs > /tmp/bridge.log 2>&1'
 
 if wait_for_http http://localhost:8089/health 60 2; then
     log "Bridge is ready on port 8089"
diff --git a/noir-projects/protocol-fuzzer/src/main.rs b/noir-projects/protocol-fuzzer/src/main.rs
index 2daa74e96c57..c9427275899c 100644
--- a/noir-projects/protocol-fuzzer/src/main.rs
+++ b/noir-projects/protocol-fuzzer/src/main.rs
@@ -60,6 +60,9 @@ struct SideEffectArgs {
     common: CommonArgs,
     #[arg(long, default_value_t = 5)]
     storage_slots: usize,
+    /// Directory containing compiled contract artifacts.
+    #[arg(long, default_value = "/tmp")]
+    artifacts_dir: String,
 }
 
 fn parse_hex_u64(s: &str) -> Result<u64, String> {
@@ -123,6 +126,7 @@ fn main() {
             let mut machine = side_effect::SideEffectMachine {
                 storage_slots: se_args.storage_slots,
                 bridge: Some(&bridge),
+                artifacts_dir: se_args.artifacts_dir.clone(),
             };
             log::debug!(
                 "Starting side-effect machine with parameters: {:?}",
@@ -164,6 +168,10 @@ mod integration_tests {
         &BRIDGE
     }
 
+    fn artifacts_dir() -> String {
+        std::env::var("ARTIFACTS_DIR").unwrap_or_else(|_| "/tmp".to_string())
+    }
+
     /// Verifies the sandbox is reachable and test accounts can be imported.
     /// Run this first to diagnose setup issues before running heavier tests.
     /// Prefixed with `_0` so it sorts first alphabetically (`_` < `a` in
@@ -205,6 +213,7 @@ mod integration_tests {
         let mut machine = side_effect::SideEffectMachine {
             storage_slots: 2,
             bridge: Some(bridge),
+            artifacts_dir: artifacts_dir(),
         };
         smt::fixed_size_builder(1024).run(|u| smt::run(u, &mut machine, 5))
     }
@@ -271,6 +280,7 @@ mod integration_tests {
         let mut machine = side_effect::SideEffectMachine {
             storage_slots: 1,
             bridge: Some(bridge),
+            artifacts_dir: artifacts_dir(),
         };
         let state = side_effect::machine::SideEffectState {
             accounts: vec![0, 1, 2],
@@ -327,6 +337,7 @@ mod integration_tests {
             let mut machine = side_effect::SideEffectMachine {
                 storage_slots: 3,
                 bridge: None,
+                artifacts_dir: artifacts_dir(),
             };
             let mut state = machine.gen_state(&mut u).unwrap();
             let mut commands = Vec::new();
diff --git a/noir-projects/protocol-fuzzer/src/side_effect/machine.rs b/noir-projects/protocol-fuzzer/src/side_effect/machine.rs
index c1b236825ece..f5b74ec0b78c 100644
--- a/noir-projects/protocol-fuzzer/src/side_effect/machine.rs
+++ b/noir-projects/protocol-fuzzer/src/side_effect/machine.rs
@@ -21,6 +21,9 @@ pub struct SideEffectMachine<'a> {
     /// Required for `new_system()` (deploy + import). `None` is fine for
     /// model-only tests that never call `new_system`.
     pub bridge: Option<&'a Bridge>,
+    /// Directory containing compiled contract JSON artifacts (resolved to
+    /// an absolute path in `SideEffectSystem::new`).
+    pub artifacts_dir: String,
 }
 
 #[derive(Debug, Clone)]
@@ -466,7 +469,7 @@ impl<'a> smt::StateMachine for SideEffectMachine<'a> {
         bridge
             .import_test_accounts()
             .expect("could not import test accounts");
-        let system = SideEffectSystem::new(bridge);
+        let system = SideEffectSystem::new(bridge, &self.artifacts_dir);
         system
             .deploy_side_effect_contract(0)
             .expect("side-effect contract could not be deployed");
@@ -804,6 +807,7 @@ mod tests {
         SideEffectMachine {
             storage_slots: 5,
             bridge: None,
+            artifacts_dir: "/tmp".into(),
         }
     }
 
diff --git a/noir-projects/protocol-fuzzer/src/side_effect/system.rs b/noir-projects/protocol-fuzzer/src/side_effect/system.rs
index aa60b2b36268..b53cdad84865 100644
--- a/noir-projects/protocol-fuzzer/src/side_effect/system.rs
+++ b/noir-projects/protocol-fuzzer/src/side_effect/system.rs
@@ -2,8 +2,8 @@ use super::machine::SideEffectCommand;
 use crate::wallet::{AccountId, Bridge, WalletCommand};
 
 pub struct SideEffectSystem<'a> {
-    side_effect_artifact: &'static str,
-    parent_artifact: &'static str,
+    side_effect_artifact: String,
+    parent_artifact: String,
     bridge: &'a Bridge,
 }
 
@@ -144,7 +144,7 @@ impl<'a> SideEffectSystem<'a> {
 
     pub(crate) fn deploy_side_effect_contract(&self, account: AccountId) -> anyhow::Result<String> {
         self.bridge.deploy(
-            self.side_effect_artifact,
+            &self.side_effect_artifact,
             &format!("accounts:test{account}"),
             "test0",
             Some("initialize"),
@@ -154,7 +154,7 @@ impl<'a> SideEffectSystem<'a> {
 
     pub(crate) fn deploy_parent_contract(&self, account: AccountId) -> anyhow::Result<String> {
         self.bridge.deploy(
-            self.parent_artifact,
+            &self.parent_artifact,
             &format!("accounts:test{account}"),
             "parent0",
             Some("initialize"),
@@ -162,10 +162,14 @@ impl<'a> SideEffectSystem<'a> {
         )
     }
 
-    pub(crate) fn new(bridge: &'a Bridge) -> Self {
+    pub(crate) fn new(bridge: &'a Bridge, artifacts_dir: &str) -> Self {
+        let dir = std::path::Path::new(artifacts_dir)
+            .canonicalize()
+            .unwrap_or_else(|e| panic!("cannot resolve artifacts dir {artifacts_dir:?}: {e}"));
+        let dir = dir.display();
         Self {
-            side_effect_artifact: "/tmp/side_effect_contract-SideEffect.json",
-            parent_artifact: "/tmp/parent_contract-Parent.json",
+            side_effect_artifact: format!("{dir}/side_effect_contract-SideEffect.json"),
+            parent_artifact: format!("{dir}/parent_contract-Parent.json"),
             bridge,
         }
     }
diff --git a/noir-projects/protocol-fuzzer/bridge.mjs b/noir-projects/protocol-fuzzer/wallet-bridge.mjs
similarity index 76%
rename from noir-projects/protocol-fuzzer/bridge.mjs
rename to noir-projects/protocol-fuzzer/wallet-bridge.mjs
index 112d4239466a..b37cc1cb6ea4 100644
--- a/noir-projects/protocol-fuzzer/bridge.mjs
+++ b/noir-projects/protocol-fuzzer/wallet-bridge.mjs
@@ -1,14 +1,20 @@
 #!/usr/bin/env node
-// bridge.mjs -- Persistent HTTP bridge for the Aztec protocol fuzzer.
+// wallet-bridge.mjs -- Persistent HTTP bridge for the Aztec protocol fuzzer.
 //
-// Runs inside the nightly sandbox container. Reuses CLIWallet to avoid
-// the ~1.5s cold-start of spawning a new Node process per call.
+// Works both inside the nightly sandbox container and on the host against a
+// locally-built yarn-project. The CLI path is auto-detected: if the container
+// path exists we use it, otherwise we resolve relative to the repo root.
+// For @aztec/* imports to resolve, either run from yarn-project/ (Docker path)
+// or have a node_modules symlink alongside this file pointing to
+// yarn-project/node_modules (local setup -- see setup-local.sh).
 // All addresses arrive as raw 0x hex strings (resolved by the Rust fuzzer).
 
 import { createServer } from 'node:http';
-import { join } from 'node:path';
+import { join, resolve, dirname } from 'node:path';
+import { existsSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { format } from 'node:util';
+import { fileURLToPath } from 'node:url';
 
 const PORT = parseInt(process.env.BRIDGE_PORT || '8089', 10);
 const NODE_URL = process.env.AZTEC_NODE_URL || 'http://localhost:8080';
@@ -17,7 +23,16 @@ const DATA_DIR = process.env.WALLET_DATA_DIRECTORY || join(homedir(), '.aztec/wa
 const { createAztecNodeClient } = await import('@aztec/aztec.js/node');
 const { AztecAddress } = await import('@aztec/aztec.js/addresses');
 const { openStoreAt } = await import('@aztec/kv-store/lmdb-v2');
-const CLI = '/usr/src/yarn-project/cli-wallet/dest';
+
+// Auto-detect CLI path: try container path, then common local locations.
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const candidates = [
+  '/usr/src/yarn-project/cli-wallet/dest',                  // nightly container
+  resolve(__dirname, 'cli-wallet/dest'),                     // symlinked into yarn-project/
+  resolve(__dirname, '../../yarn-project/cli-wallet/dest'),  // original location in protocol-fuzzer/
+];
+const CLI = candidates.find(p => existsSync(p));
+if (!CLI) throw new Error('Cannot find cli-wallet/dest in any known location');
 const { CLIWallet } = await import(`${CLI}/utils/wallet.js`);
 const { WalletDB } = await import(`${CLI}/storage/wallet_db.js`);
 const { importTestAccounts } = await import(`${CLI}/cmds/import_test_accounts.js`);
@@ -80,7 +95,9 @@ const handlers = {
         false,                                  /* skipClassPublication */
         false,                                  /* skipInitialization */
         true,                                   /* wait */
-        feeOpts, false, 120,                    /* fee, verbose, timeout */
+        feeOpts,                                  /* fee */
+        'mined',                                /* waitForStatus */
+        false, 120,                             /* verbose, timeout */
         { debug: noop, error: noop }, log,      /* debugLogger, log */
       ),
     );
@@ -94,7 +111,7 @@ const handlers = {
     const callArgs = args || [];
     const { stdout } = await capturing(log =>
       verb === 'send'
-        ? send(w, node, sender, method, callArgs, artifact, target, true, false, feeOpts, [], false, log)
+        ? send(w, node, sender, method, callArgs, artifact, target, true, false, feeOpts, [], 'mined', false, log)
         : simulate(w, node, sender, method, callArgs, artifact, target, feeOpts, [], false, log),
     );
     return { ok: true, stdout };
diff --git a/noir/noir-repo b/noir/noir-repo
index 5f685966dadb..d52888d57c7c 160000
--- a/noir/noir-repo
+++ b/noir/noir-repo
@@ -1 +1 @@
-Subproject commit 5f685966dadbb42bffb46994fd49c502601525b4
+Subproject commit d52888d57c7ce960d81b4ba1f996234211f1ba24
diff --git a/playground/src/components/contract/components/CreateContractDialog.tsx b/playground/src/components/contract/components/CreateContractDialog.tsx
index df62af0305a2..0b2ac8d34a6f 100644
--- a/playground/src/components/contract/components/CreateContractDialog.tsx
+++ b/playground/src/components/contract/components/CreateContractDialog.tsx
@@ -115,17 +115,13 @@ export function CreateContractDialog({
       if (publiclyDeploy) {
         const postDeployCtor = (instance: ContractInstanceWithAddress, wallet: Wallet) =>
           Contract.at(instance.address, contractArtifact, wallet);
-        deployMethod = new DeployMethod(
-          contract.publicKeys,
-          wallet,
-          contractArtifact,
-          postDeployCtor,
-          parameters,
-          initializer?.name,
-        );
+        deployMethod = new DeployMethod(wallet, contractArtifact, postDeployCtor, parameters, initializer?.name, {
+          publicKeys: contract.publicKeys,
+          salt: contract.salt,
+          deployer: from,
+        });
         opts = {
           from,
-          contractAddressSalt: salt,
           fee: { paymentMethod: feePaymentMethod },
         };
         onClose(contract, publiclyDeploy, deployMethod, opts);
diff --git a/spartan/AGENTS.md b/spartan/AGENTS.md
new file mode 120000
index 000000000000..681311eb9cf4
--- /dev/null
+++ b/spartan/AGENTS.md
@@ -0,0 +1 @@
+CLAUDE.md
\ No newline at end of file
diff --git a/spartan/aztec-bot/values.yaml b/spartan/aztec-bot/values.yaml
index 57e2f2d1ce9a..4a36a63211e5 100644
--- a/spartan/aztec-bot/values.yaml
+++ b/spartan/aztec-bot/values.yaml
@@ -93,7 +93,6 @@ bot:
 
     startCmd:
       - --bot
-      - --pxe
 
     hostNetwork: false
 
diff --git a/spartan/bootstrap.sh b/spartan/bootstrap.sh
index 3850c4c4133d..15d908e4409b 100755
--- a/spartan/bootstrap.sh
+++ b/spartan/bootstrap.sh
@@ -183,13 +183,11 @@ function block_capacity_bench_cmds {
 }
 
 function bench_10tps_cmds {
-  # Single 38-min sustained 10 TPS run on the bench-10tps network. Long enough
-  # for the sequencer to hit steady state beyond the initial mempool fill-up.
   local high_value_tps=10
   local low_value_tps=0
-  local test_duration=2280 # 38 min
-  local timeout=3600       # 1h — test plus drain/teardown buffer
-  echo "$(hash):TIMEOUT=${timeout} BENCH_OUTPUT=bench-out/n_tps.10tps.bench.json BENCH_SCENARIO=10tps LOW_VALUE_TPS=${low_value_tps} HIGH_VALUE_TPS=${high_value_tps} TEST_DURATION_SECONDS=${test_duration} $root/yarn-project/end-to-end/scripts/run_test.sh simple n_tps.test.ts"
+  local test_duration=${TEST_DURATION_SECONDS:-600} # 10 mins
+  local timeout=${BENCH_TIMEOUT_SECONDS:-7200} # account for initial committee formation
+  echo "$(hash):TIMEOUT=${timeout} BENCH_RUN_ID=${BENCH_RUN_ID:-} BENCH_OUTPUT=bench-out/n_tps.10tps.bench.json BENCH_SCENARIO=10tps LOW_VALUE_TPS=${low_value_tps} HIGH_VALUE_TPS=${high_value_tps} TEST_DURATION_SECONDS=${test_duration} $root/yarn-project/end-to-end/scripts/run_test.sh simple n_tps.test.ts"
 }
 
 function network_bench {
@@ -245,7 +243,100 @@ function bench_10tps {
   gcp_auth
   export_admin_api_key
   export K8S_ENRICHER=${K8S_ENRICHER:-1}
+  export BENCH_RUN_ID="${BENCH_RUN_ID:-$(date -u +%Y%m%d)-${COMMIT_HASH:0:10}}"
   bench_10tps_cmds | parallelize 1
+
+  local metadata="/tmp/n_tps_timing_data.json"
+  local run_json="bench-out/bench-10tps-${BENCH_RUN_ID}.json"
+  if [[ -f "$metadata" ]]; then
+    local started=$(jq -r .startedAt < "$metadata")
+    local ended=$(jq -r .endedAt < "$metadata")
+    echo "Scraping bench-10tps run ${BENCH_RUN_ID} (started=${started} ended=${ended})"
+    NAMESPACE="$NAMESPACE" GCP_PROJECT_ID="${GCP_PROJECT_ID:-}" ./scripts/bench_10tps/bench_scrape.ts \
+      --run-id "$BENCH_RUN_ID" \
+      --started "$started" \
+      --ended "$ended" \
+      --target-tps 10 \
+      --workload sha256_hash_1024 \
+      --output "$run_json" \
+      --wait-for-pending-zero \
+      --max-pending-wait-seconds "${BENCH_SCRAPE_MAX_PENDING_WAIT_SECONDS:-3600}" \
+      || echo "[bench_10tps] scraper failed (non-fatal)"
+    network_bench_upload "$run_json" || echo "[network_bench] upload failed (non-fatal)"
+  else
+    echo "[bench_10tps] no timing metadata at ${metadata}; skipping scraper"
+  fi
+}
+
+function network_bench_upload {
+  local run_json=$1
+  if [[ "${CI:-0}" != "1" ]]; then
+    echo "[network_bench] CI != 1, skipping upload (run JSON at ${run_json})"
+    return 0
+  fi
+  if [[ ! -f "$run_json" ]]; then
+    echo "[network_bench] no run JSON at ${run_json}; skipping upload"
+    return 0
+  fi
+
+  # Reject anything that's not the schema we've designed the index against.
+  local schema=$(jq -r .schemaVersion "$run_json")
+  if [[ "$schema" != "3" ]]; then
+    echo "[network_bench] run JSON has schemaVersion '$schema', expected '3'; skipping upload"
+    return 0
+  fi
+
+  local bucket="gs://aztec-testnet/network_bench"
+  local run_id=$(jq -r .run.runId "$run_json")
+  local target="${bucket}/${run_id}.json"
+
+  echo "[network_bench] uploading ${run_json} to ${target}"
+  gcloud storage cp "$run_json" "$target"
+
+  local entry=$(jq '{
+    runId: .run.runId,
+    path: (.run.runId + ".json"),
+    startedAt: .run.startedAt,
+    endedAt: .run.endedAt,
+    targetTps: .run.targetTps,
+    workload: .run.workload,
+    testDurationSeconds: .run.testDurationSeconds,
+    namespace: .run.namespace,
+    headlineKpi: .summary.headlineKpi,
+    inclusionTpsMean: .summary.inclusionTpsMean,
+    inclusionTpsPeak: .summary.inclusionTpsPeak,
+    totalTxsMined: .summary.totalTxsMined,
+    reorgCount: .summary.reorgCount
+  }' "$run_json")
+
+  local idx_local
+  idx_local=$(mktemp)
+  trap "rm -f $idx_local ${idx_local}.new" RETURN
+  # Distinguish "index does not exist yet" (404 -> seed empty) from real errors
+  # (auth/network/permission -> fail closed). Without this probe, a naive
+  # `cp ... 2>/dev/null || seed_empty` would silently overwrite a healthy index
+  # with a single-entry one whenever GCS hiccups.
+  local desc_err
+  if desc_err=$(gcloud storage objects describe "${bucket}/index.json" 2>&1 >/dev/null); then
+    gcloud storage cp "${bucket}/index.json" "$idx_local"
+  elif echo "$desc_err" | grep -qiE 'not.?found|matched no objects|404'; then
+    echo "[network_bench] no remote index.json yet; seeding empty"
+    echo '{"schemaVersion":"1","runs":[]}' > "$idx_local"
+  else
+    echo "[network_bench] cannot read remote index.json:"
+    echo "$desc_err" | head -5
+    return 1
+  fi
+
+  jq --argjson entry "$entry" --arg ts "$(date -u +%Y-%m-%dT%H:%M:%SZ)" '
+    .schemaVersion = "1"
+    | .generatedAt = $ts
+    | .runs = ((.runs // []) | map(select(.runId != $entry.runId)) + [$entry]
+              | sort_by(.endedAt) | reverse)
+  ' "$idx_local" > "${idx_local}.new"
+
+  gcloud storage cp "${idx_local}.new" "${bucket}/index.json"
+  echo "[network_bench] updated ${bucket}/index.json"
 }
 
 function ensure_eth_balances {
diff --git a/spartan/environments/bench-10tps.env b/spartan/environments/bench-10tps.env
index f3fd9c363818..b4782d9e35e8 100644
--- a/spartan/environments/bench-10tps.env
+++ b/spartan/environments/bench-10tps.env
@@ -17,6 +17,7 @@ AZTEC_SLOT_DURATION=72
 AZTEC_PROOF_SUBMISSION_EPOCHS=2
 AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET=1
 AZTEC_LAG_IN_EPOCHS_FOR_RANDAO=1
+AZTEC_INBOX_LAG=2
 
 # 2B mana target - good for about ~800 txs at 2.5M mana each
 AZTEC_MANA_TARGET=2000000000
@@ -26,7 +27,7 @@ SPONSORED_FPC=true
 OTEL_COLLECTOR_ENDPOINT=REPLACE_WITH_GCP_SECRET
 
 VALIDATOR_REPLICAS=3
-VALIDATORS_PER_NODE=24
+VALIDATORS_PER_NODE=20
 VALIDATOR_PUBLISHERS_PER_REPLICA=4
 VALIDATOR_PUBLISHER_MNEMONIC_START_INDEX=5000
 VALIDATOR_RESOURCE_PROFILE="prod-spot"
@@ -39,6 +40,7 @@ SEQ_MAX_TX_PER_CHECKPOINT=800
 P2P_MAX_PENDING_TX_COUNT=20000
 SEQ_MIN_TX_PER_BLOCK=1
 SEQ_BUILD_CHECKPOINT_IF_EMPTY=true
+SEQ_ENABLE_PROPOSER_PIPELINING=true
 
 RPC_REPLICAS=1
 RPC_RESOURCE_PROFILE="prod"
@@ -64,7 +66,7 @@ AZTEC_SLASHING_OFFSET_IN_ROUNDS=1
 AZTEC_LOCAL_EJECTION_THRESHOLD=90000000000000000000
 
 DEBUG_P2P_INSTRUMENT_MESSAGES=true
-LOG_LEVEL='info;debug:simulator:public-processor'
+LOG_LEVEL='info;debug:simulator:public-processor,sequencer:state,sequencer:checkpoint-events'
 
 VALIDATOR_L1_PRIORITY_FEE_BUMP_PERCENTAGE=0
 VALIDATOR_L1_PRIORITY_FEE_RETRY_BUMP_PERCENTAGE=0
diff --git a/spartan/metrics/grafana/alerts/contactpoints.yaml b/spartan/metrics/grafana/alerts/contactpoints.yaml
index e12c618ab61b..956d94cce523 100644
--- a/spartan/metrics/grafana/alerts/contactpoints.yaml
+++ b/spartan/metrics/grafana/alerts/contactpoints.yaml
@@ -7,40 +7,9 @@ contactPoints:
         type: slack
         settings:
           url: $SLACK_WEBHOOK_URL
+          mentionUsers: $SLACK_ALERT_MENTION_USER_IDS
           text: |-
-            {{ "{{" }} if gt (len .Alerts) 0 {{ "}}" }}
-            *Alerts:*
-            {{ "{{" }} range .Alerts {{ "}}" }}
-            - {{ "{{" }} with (index .Labels "k8s_namespace_name") {{ "}}" }}{{ "{{" }} . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown-namespace{{ "{{" }} end {{ "}}" }}: {{ "{{" }} with (index .Annotations "summary") {{ "}}" }}{{ "{{" }} . {{ "}}" }}{{ "{{" }} else {{ "}}" }}(no summary){{ "{{" }} end {{ "}}" }}
-            {{ "{{" }} end {{ "}}" }}
-            {{ "{{" }} else {{ "}}" }}
-            *Alerts:*
-            - {{ "{{" }} with (index .CommonAnnotations "summary") {{ "}}" }}{{ "{{" }} . {{ "}}" }}{{ "{{" }} else {{ "}}" }}(no summary){{ "{{" }} end {{ "}}" }}
-            {{ "{{" }} end {{ "}}" }}
-
-            *Grafana overview:*
-            {{ "{{" }} .ExternalURL {{ "}}" }}d/aztec-network/network-overview?orgId=1&refresh=30s&var-data_source=default&var-namespace={{ "{{" }}
-              if gt (len .Alerts) 0
-            {{ "}}" }}{{ "{{" }}
-              with (index (index .Alerts 0).Labels "k8s_namespace_name")
-            {{ "}}" }}{{ "{{" }} urlquery . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown{{ "{{" }} end {{ "}}" }}{{ "{{" }} else {{ "}}" }}{{ "{{" }}
-              with (index .CommonLabels "k8s_namespace_name")
-            {{ "}}" }}{{ "{{" }} urlquery . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown{{ "{{" }} end {{ "}}" }}{{ "{{" }} end {{ "}}" }}{{ "{{" }} printf "\n" {{ "}}" }}
-
-            *GKE workloads:*
-            https://console.cloud.google.com/kubernetes/workload/overview?project={{ "{{" }}
-              if gt (len .Alerts) 0
-            {{ "}}" }}{{ "{{" }}
-              with (index (index .Alerts 0).Labels "gcp_project")
-            {{ "}}" }}{{ "{{" }} . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown{{ "{{" }} end {{ "}}" }}{{ "{{" }} else {{ "}}" }}{{ "{{" }}
-              with (index .CommonLabels "gcp_project")
-            {{ "}}" }}{{ "{{" }} . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown{{ "{{" }} end {{ "}}" }}{{ "{{" }} end {{ "}}" }}&supportedpurview=project&pageState=%28%22savedViews%22%3A%28%22n%22%3A%5B%22{{ "{{" }}
-              if gt (len .Alerts) 0
-            {{ "}}" }}{{ "{{" }}
-              with (index (index .Alerts 0).Labels "k8s_namespace_name")
-            {{ "}}" }}{{ "{{" }} urlquery . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown{{ "{{" }} end {{ "}}" }}{{ "{{" }} else {{ "}}" }}{{ "{{" }}
-              with (index .CommonLabels "k8s_namespace_name")
-            {{ "}}" }}{{ "{{" }} urlquery . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown{{ "{{" }} end {{ "}}" }}{{ "{{" }} end {{ "}}" }}%22%5D%29%29
+            {{ template "aztec.slack.by_namespace" . }}
         disableResolveMessage: false
 
   - orgId: 1
@@ -50,40 +19,9 @@ contactPoints:
         type: slack
         settings:
           url: $SLACK_WEBHOOK_NEXT_SCENARIO_URL
+          mentionUsers: $SLACK_ALERT_MENTION_USER_IDS
           text: |-
-            {{ "{{" }} if gt (len .Alerts) 0 {{ "}}" }}
-            *Alerts:*
-            {{ "{{" }} range .Alerts {{ "}}" }}
-            - {{ "{{" }} with (index .Labels "k8s_namespace_name") {{ "}}" }}{{ "{{" }} . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown-namespace{{ "{{" }} end {{ "}}" }}: {{ "{{" }} with (index .Annotations "summary") {{ "}}" }}{{ "{{" }} . {{ "}}" }}{{ "{{" }} else {{ "}}" }}(no summary){{ "{{" }} end {{ "}}" }}
-            {{ "{{" }} end {{ "}}" }}
-            {{ "{{" }} else {{ "}}" }}
-            *Alerts:*
-            - {{ "{{" }} with (index .CommonAnnotations "summary") {{ "}}" }}{{ "{{" }} . {{ "}}" }}{{ "{{" }} else {{ "}}" }}(no summary){{ "{{" }} end {{ "}}" }}
-            {{ "{{" }} end {{ "}}" }}
-
-            *Grafana overview:*
-            {{ "{{" }} .ExternalURL {{ "}}" }}d/aztec-network/network-overview?orgId=1&refresh=30s&var-data_source=default&var-namespace={{ "{{" }}
-              if gt (len .Alerts) 0
-            {{ "}}" }}{{ "{{" }}
-              with (index (index .Alerts 0).Labels "k8s_namespace_name")
-            {{ "}}" }}{{ "{{" }} urlquery . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown{{ "{{" }} end {{ "}}" }}{{ "{{" }} else {{ "}}" }}{{ "{{" }}
-              with (index .CommonLabels "k8s_namespace_name")
-            {{ "}}" }}{{ "{{" }} urlquery . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown{{ "{{" }} end {{ "}}" }}{{ "{{" }} end {{ "}}" }}{{ "{{" }} printf "\n" {{ "}}" }}
-
-            *GKE workloads:*
-            https://console.cloud.google.com/kubernetes/workload/overview?project={{ "{{" }}
-              if gt (len .Alerts) 0
-            {{ "}}" }}{{ "{{" }}
-              with (index (index .Alerts 0).Labels "gcp_project")
-            {{ "}}" }}{{ "{{" }} . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown{{ "{{" }} end {{ "}}" }}{{ "{{" }} else {{ "}}" }}{{ "{{" }}
-              with (index .CommonLabels "gcp_project")
-            {{ "}}" }}{{ "{{" }} . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown{{ "{{" }} end {{ "}}" }}{{ "{{" }} end {{ "}}" }}&supportedpurview=project&pageState=%28%22savedViews%22%3A%28%22n%22%3A%5B%22{{ "{{" }}
-              if gt (len .Alerts) 0
-            {{ "}}" }}{{ "{{" }}
-              with (index (index .Alerts 0).Labels "k8s_namespace_name")
-            {{ "}}" }}{{ "{{" }} urlquery . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown{{ "{{" }} end {{ "}}" }}{{ "{{" }} else {{ "}}" }}{{ "{{" }}
-              with (index .CommonLabels "k8s_namespace_name")
-            {{ "}}" }}{{ "{{" }} urlquery . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown{{ "{{" }} end {{ "}}" }}{{ "{{" }} end {{ "}}" }}%22%5D%29%29
+            {{ template "aztec.slack.by_namespace" . }}
         disableResolveMessage: false
 
   - orgId: 1
@@ -93,40 +31,9 @@ contactPoints:
         type: slack
         settings:
           url: $SLACK_WEBHOOK_NEXT_NET_URL
+          mentionUsers: $SLACK_ALERT_MENTION_USER_IDS
           text: |-
-            {{ "{{" }} if gt (len .Alerts) 0 {{ "}}" }}
-            *Alerts:*
-            {{ "{{" }} range .Alerts {{ "}}" }}
-            - {{ "{{" }} with (index .Labels "k8s_namespace_name") {{ "}}" }}{{ "{{" }} . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown-namespace{{ "{{" }} end {{ "}}" }}: {{ "{{" }} with (index .Annotations "summary") {{ "}}" }}{{ "{{" }} . {{ "}}" }}{{ "{{" }} else {{ "}}" }}(no summary){{ "{{" }} end {{ "}}" }}
-            {{ "{{" }} end {{ "}}" }}
-            {{ "{{" }} else {{ "}}" }}
-            *Alerts:*
-            - {{ "{{" }} with (index .CommonAnnotations "summary") {{ "}}" }}{{ "{{" }} . {{ "}}" }}{{ "{{" }} else {{ "}}" }}(no summary){{ "{{" }} end {{ "}}" }}
-            {{ "{{" }} end {{ "}}" }}
-
-            *Grafana overview:*
-            {{ "{{" }} .ExternalURL {{ "}}" }}d/aztec-network/network-overview?orgId=1&refresh=30s&var-data_source=default&var-namespace={{ "{{" }}
-              if gt (len .Alerts) 0
-            {{ "}}" }}{{ "{{" }}
-              with (index (index .Alerts 0).Labels "k8s_namespace_name")
-            {{ "}}" }}{{ "{{" }} urlquery . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown{{ "{{" }} end {{ "}}" }}{{ "{{" }} else {{ "}}" }}{{ "{{" }}
-              with (index .CommonLabels "k8s_namespace_name")
-            {{ "}}" }}{{ "{{" }} urlquery . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown{{ "{{" }} end {{ "}}" }}{{ "{{" }} end {{ "}}" }}{{ "{{" }} printf "\n" {{ "}}" }}
-
-            *GKE workloads:*
-            https://console.cloud.google.com/kubernetes/workload/overview?project={{ "{{" }}
-              if gt (len .Alerts) 0
-            {{ "}}" }}{{ "{{" }}
-              with (index (index .Alerts 0).Labels "gcp_project")
-            {{ "}}" }}{{ "{{" }} . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown{{ "{{" }} end {{ "}}" }}{{ "{{" }} else {{ "}}" }}{{ "{{" }}
-              with (index .CommonLabels "gcp_project")
-            {{ "}}" }}{{ "{{" }} . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown{{ "{{" }} end {{ "}}" }}{{ "{{" }} end {{ "}}" }}&supportedpurview=project&pageState=%28%22savedViews%22%3A%28%22n%22%3A%5B%22{{ "{{" }}
-              if gt (len .Alerts) 0
-            {{ "}}" }}{{ "{{" }}
-              with (index (index .Alerts 0).Labels "k8s_namespace_name")
-            {{ "}}" }}{{ "{{" }} urlquery . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown{{ "{{" }} end {{ "}}" }}{{ "{{" }} else {{ "}}" }}{{ "{{" }}
-              with (index .CommonLabels "k8s_namespace_name")
-            {{ "}}" }}{{ "{{" }} urlquery . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown{{ "{{" }} end {{ "}}" }}{{ "{{" }} end {{ "}}" }}%22%5D%29%29
+            {{ template "aztec.slack.by_namespace" . }}
         disableResolveMessage: false
 
   - orgId: 1
@@ -136,40 +43,9 @@ contactPoints:
         type: slack
         settings:
           url: $SLACK_WEBHOOK_TESTNET_URL
+          mentionUsers: $SLACK_ALERT_MENTION_USER_IDS
           text: |-
-            {{ "{{" }} if gt (len .Alerts) 0 {{ "}}" }}
-            *Alerts:*
-            {{ "{{" }} range .Alerts {{ "}}" }}
-            - {{ "{{" }} with (index .Labels "k8s_namespace_name") {{ "}}" }}{{ "{{" }} . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown-namespace{{ "{{" }} end {{ "}}" }}: {{ "{{" }} with (index .Annotations "summary") {{ "}}" }}{{ "{{" }} . {{ "}}" }}{{ "{{" }} else {{ "}}" }}(no summary){{ "{{" }} end {{ "}}" }}
-            {{ "{{" }} end {{ "}}" }}
-            {{ "{{" }} else {{ "}}" }}
-            *Alerts:*
-            - {{ "{{" }} with (index .CommonAnnotations "summary") {{ "}}" }}{{ "{{" }} . {{ "}}" }}{{ "{{" }} else {{ "}}" }}(no summary){{ "{{" }} end {{ "}}" }}
-            {{ "{{" }} end {{ "}}" }}
-
-            *Grafana overview:*
-            {{ "{{" }} .ExternalURL {{ "}}" }}d/aztec-network/network-overview?orgId=1&refresh=30s&var-data_source=default&var-namespace={{ "{{" }}
-              if gt (len .Alerts) 0
-            {{ "}}" }}{{ "{{" }}
-              with (index (index .Alerts 0).Labels "k8s_namespace_name")
-            {{ "}}" }}{{ "{{" }} urlquery . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown{{ "{{" }} end {{ "}}" }}{{ "{{" }} else {{ "}}" }}{{ "{{" }}
-              with (index .CommonLabels "k8s_namespace_name")
-            {{ "}}" }}{{ "{{" }} urlquery . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown{{ "{{" }} end {{ "}}" }}{{ "{{" }} end {{ "}}" }}{{ "{{" }} printf "\n" {{ "}}" }}
-
-            *GKE workloads:*
-            https://console.cloud.google.com/kubernetes/workload/overview?project={{ "{{" }}
-              if gt (len .Alerts) 0
-            {{ "}}" }}{{ "{{" }}
-              with (index (index .Alerts 0).Labels "gcp_project")
-            {{ "}}" }}{{ "{{" }} . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown{{ "{{" }} end {{ "}}" }}{{ "{{" }} else {{ "}}" }}{{ "{{" }}
-              with (index .CommonLabels "gcp_project")
-            {{ "}}" }}{{ "{{" }} . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown{{ "{{" }} end {{ "}}" }}{{ "{{" }} end {{ "}}" }}&supportedpurview=project&pageState=%28%22savedViews%22%3A%28%22n%22%3A%5B%22{{ "{{" }}
-              if gt (len .Alerts) 0
-            {{ "}}" }}{{ "{{" }}
-              with (index (index .Alerts 0).Labels "k8s_namespace_name")
-            {{ "}}" }}{{ "{{" }} urlquery . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown{{ "{{" }} end {{ "}}" }}{{ "{{" }} else {{ "}}" }}{{ "{{" }}
-              with (index .CommonLabels "k8s_namespace_name")
-            {{ "}}" }}{{ "{{" }} urlquery . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown{{ "{{" }} end {{ "}}" }}{{ "{{" }} end {{ "}}" }}%22%5D%29%29
+            {{ template "aztec.slack.by_namespace" . }}
         disableResolveMessage: false
 
   - orgId: 1
@@ -179,40 +55,9 @@ contactPoints:
         type: slack
         settings:
           url: $SLACK_WEBHOOK_MAINNET_URL
+          mentionUsers: $SLACK_ALERT_MENTION_USER_IDS
           text: |-
-            {{ "{{" }} if gt (len .Alerts) 0 {{ "}}" }}
-            *Alerts:*
-            {{ "{{" }} range .Alerts {{ "}}" }}
-            - {{ "{{" }} with (index .Labels "k8s_namespace_name") {{ "}}" }}{{ "{{" }} . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown-namespace{{ "{{" }} end {{ "}}" }}: {{ "{{" }} with (index .Annotations "summary") {{ "}}" }}{{ "{{" }} . {{ "}}" }}{{ "{{" }} else {{ "}}" }}(no summary){{ "{{" }} end {{ "}}" }}
-            {{ "{{" }} end {{ "}}" }}
-            {{ "{{" }} else {{ "}}" }}
-            *Alerts:*
-            - {{ "{{" }} with (index .CommonAnnotations "summary") {{ "}}" }}{{ "{{" }} . {{ "}}" }}{{ "{{" }} else {{ "}}" }}(no summary){{ "{{" }} end {{ "}}" }}
-            {{ "{{" }} end {{ "}}" }}
-
-            *Grafana overview:*
-            {{ "{{" }} .ExternalURL {{ "}}" }}d/aztec-network/network-overview?orgId=1&refresh=30s&var-data_source=default&var-namespace={{ "{{" }}
-              if gt (len .Alerts) 0
-            {{ "}}" }}{{ "{{" }}
-              with (index (index .Alerts 0).Labels "k8s_namespace_name")
-            {{ "}}" }}{{ "{{" }} urlquery . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown{{ "{{" }} end {{ "}}" }}{{ "{{" }} else {{ "}}" }}{{ "{{" }}
-              with (index .CommonLabels "k8s_namespace_name")
-            {{ "}}" }}{{ "{{" }} urlquery . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown{{ "{{" }} end {{ "}}" }}{{ "{{" }} end {{ "}}" }}{{ "{{" }} printf "\n" {{ "}}" }}
-
-            *GKE workloads:*
-            https://console.cloud.google.com/kubernetes/workload/overview?project={{ "{{" }}
-              if gt (len .Alerts) 0
-            {{ "}}" }}{{ "{{" }}
-              with (index (index .Alerts 0).Labels "gcp_project")
-            {{ "}}" }}{{ "{{" }} . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown{{ "{{" }} end {{ "}}" }}{{ "{{" }} else {{ "}}" }}{{ "{{" }}
-              with (index .CommonLabels "gcp_project")
-            {{ "}}" }}{{ "{{" }} . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown{{ "{{" }} end {{ "}}" }}{{ "{{" }} end {{ "}}" }}&supportedpurview=project&pageState=%28%22savedViews%22%3A%28%22n%22%3A%5B%22{{ "{{" }}
-              if gt (len .Alerts) 0
-            {{ "}}" }}{{ "{{" }}
-              with (index (index .Alerts 0).Labels "k8s_namespace_name")
-            {{ "}}" }}{{ "{{" }} urlquery . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown{{ "{{" }} end {{ "}}" }}{{ "{{" }} else {{ "}}" }}{{ "{{" }}
-              with (index .CommonLabels "k8s_namespace_name")
-            {{ "}}" }}{{ "{{" }} urlquery . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown{{ "{{" }} end {{ "}}" }}{{ "{{" }} end {{ "}}" }}%22%5D%29%29
+            {{ template "aztec.slack.by_namespace" . }}
         disableResolveMessage: false
 
   - orgId: 1
@@ -222,25 +67,9 @@ contactPoints:
         type: slack
         settings:
           url: $SLACK_WEBHOOK_TESTNET_URL
+          mentionUsers: $SLACK_ALERT_MENTION_USER_IDS
           text: |-
-            {{ "{{" }} if gt (len .Alerts) 0 {{ "}}" }}
-            *Alerts:*
-            {{ "{{" }} range .Alerts {{ "}}" }}
-            - {{ "{{" }} with (index .Labels "network") {{ "}}" }}{{ "{{" }} . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown-network{{ "{{" }} end {{ "}}" }}: {{ "{{" }} with (index .Annotations "summary") {{ "}}" }}{{ "{{" }} . {{ "}}" }}{{ "{{" }} else {{ "}}" }}(no summary){{ "{{" }} end {{ "}}" }}
-            {{ "{{" }} end {{ "}}" }}
-            {{ "{{" }} else {{ "}}" }}
-            *Alerts:*
-            - {{ "{{" }} with (index .CommonAnnotations "summary") {{ "}}" }}{{ "{{" }} . {{ "}}" }}{{ "{{" }} else {{ "}}" }}(no summary){{ "{{" }} end {{ "}}" }}
-            {{ "{{" }} end {{ "}}" }}
-
-            *Grafana overview:*
-            {{ "{{" }} .ExternalURL {{ "}}" }}d/bexge5lz3e51cd/p2p-bootnodes?orgId=1&var-network={{ "{{" }}
-              if gt (len .Alerts) 0
-            {{ "}}" }}{{ "{{" }}
-              with (index (index .Alerts 0).Labels "network")
-            {{ "}}" }}{{ "{{" }} urlquery . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown{{ "{{" }} end {{ "}}" }}{{ "{{" }} else {{ "}}" }}{{ "{{" }}
-              with (index .CommonLabels "network")
-            {{ "}}" }}{{ "{{" }} urlquery . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown{{ "{{" }} end {{ "}}" }}{{ "{{" }} end {{ "}}" }}
+            {{ template "aztec.slack.by_network" . }}
         disableResolveMessage: false
 
   - orgId: 1
@@ -250,25 +79,9 @@ contactPoints:
         type: slack
         settings:
           url: $SLACK_WEBHOOK_MAINNET_URL
+          mentionUsers: $SLACK_ALERT_MENTION_USER_IDS
           text: |-
-            {{ "{{" }} if gt (len .Alerts) 0 {{ "}}" }}
-            *Alerts:*
-            {{ "{{" }} range .Alerts {{ "}}" }}
-            - {{ "{{" }} with (index .Labels "network") {{ "}}" }}{{ "{{" }} . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown-network{{ "{{" }} end {{ "}}" }}: {{ "{{" }} with (index .Annotations "summary") {{ "}}" }}{{ "{{" }} . {{ "}}" }}{{ "{{" }} else {{ "}}" }}(no summary){{ "{{" }} end {{ "}}" }}
-            {{ "{{" }} end {{ "}}" }}
-            {{ "{{" }} else {{ "}}" }}
-            *Alerts:*
-            - {{ "{{" }} with (index .CommonAnnotations "summary") {{ "}}" }}{{ "{{" }} . {{ "}}" }}{{ "{{" }} else {{ "}}" }}(no summary){{ "{{" }} end {{ "}}" }}
-            {{ "{{" }} end {{ "}}" }}
-
-            *Grafana overview:*
-            {{ "{{" }} .ExternalURL {{ "}}" }}d/bexge5lz3e51cd/p2p-bootnodes?orgId=1&var-network={{ "{{" }}
-              if gt (len .Alerts) 0
-            {{ "}}" }}{{ "{{" }}
-              with (index (index .Alerts 0).Labels "network")
-            {{ "}}" }}{{ "{{" }} urlquery . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown{{ "{{" }} end {{ "}}" }}{{ "{{" }} else {{ "}}" }}{{ "{{" }}
-              with (index .CommonLabels "network")
-            {{ "}}" }}{{ "{{" }} urlquery . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown{{ "{{" }} end {{ "}}" }}{{ "{{" }} end {{ "}}" }}
+            {{ template "aztec.slack.by_network" . }}
         disableResolveMessage: false
 
   - orgId: 1
@@ -278,38 +91,7 @@ contactPoints:
         type: slack
         settings:
           url: $SLACK_WEBHOOK_DEVNET_URL
+          mentionUsers: $SLACK_ALERT_MENTION_USER_IDS
           text: |-
-            {{ "{{" }} if gt (len .Alerts) 0 {{ "}}" }}
-            *Alerts:*
-            {{ "{{" }} range .Alerts {{ "}}" }}
-            - {{ "{{" }} with (index .Labels "k8s_namespace_name") {{ "}}" }}{{ "{{" }} . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown-namespace{{ "{{" }} end {{ "}}" }}: {{ "{{" }} with (index .Annotations "summary") {{ "}}" }}{{ "{{" }} . {{ "}}" }}{{ "{{" }} else {{ "}}" }}(no summary){{ "{{" }} end {{ "}}" }}
-            {{ "{{" }} end {{ "}}" }}
-            {{ "{{" }} else {{ "}}" }}
-            *Alerts:*
-            - {{ "{{" }} with (index .CommonAnnotations "summary") {{ "}}" }}{{ "{{" }} . {{ "}}" }}{{ "{{" }} else {{ "}}" }}(no summary){{ "{{" }} end {{ "}}" }}
-            {{ "{{" }} end {{ "}}" }}
-
-            *Grafana overview:*
-            {{ "{{" }} .ExternalURL {{ "}}" }}d/aztec-network/network-overview?orgId=1&refresh=30s&var-data_source=default&var-namespace={{ "{{" }}
-              if gt (len .Alerts) 0
-            {{ "}}" }}{{ "{{" }}
-              with (index (index .Alerts 0).Labels "k8s_namespace_name")
-            {{ "}}" }}{{ "{{" }} urlquery . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown{{ "{{" }} end {{ "}}" }}{{ "{{" }} else {{ "}}" }}{{ "{{" }}
-              with (index .CommonLabels "k8s_namespace_name")
-            {{ "}}" }}{{ "{{" }} urlquery . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown{{ "{{" }} end {{ "}}" }}{{ "{{" }} end {{ "}}" }}{{ "{{" }} printf "\n" {{ "}}" }}
-
-            *GKE workloads:*
-            https://console.cloud.google.com/kubernetes/workload/overview?project={{ "{{" }}
-              if gt (len .Alerts) 0
-            {{ "}}" }}{{ "{{" }}
-              with (index (index .Alerts 0).Labels "gcp_project")
-            {{ "}}" }}{{ "{{" }} . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown{{ "{{" }} end {{ "}}" }}{{ "{{" }} else {{ "}}" }}{{ "{{" }}
-              with (index .CommonLabels "gcp_project")
-            {{ "}}" }}{{ "{{" }} . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown{{ "{{" }} end {{ "}}" }}{{ "{{" }} end {{ "}}" }}&supportedpurview=project&pageState=%28%22savedViews%22%3A%28%22n%22%3A%5B%22{{ "{{" }}
-              if gt (len .Alerts) 0
-            {{ "}}" }}{{ "{{" }}
-              with (index (index .Alerts 0).Labels "k8s_namespace_name")
-            {{ "}}" }}{{ "{{" }} urlquery . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown{{ "{{" }} end {{ "}}" }}{{ "{{" }} else {{ "}}" }}{{ "{{" }}
-              with (index .CommonLabels "k8s_namespace_name")
-            {{ "}}" }}{{ "{{" }} urlquery . {{ "}}" }}{{ "{{" }} else {{ "}}" }}unknown{{ "{{" }} end {{ "}}" }}{{ "{{" }} end {{ "}}" }}%22%5D%29%29
+            {{ template "aztec.slack.by_namespace" . }}
         disableResolveMessage: false
diff --git a/spartan/metrics/grafana/alerts/rules.yaml b/spartan/metrics/grafana/alerts/rules.yaml
index 213204f4da5c..553cac34419b 100644
--- a/spartan/metrics/grafana/alerts/rules.yaml
+++ b/spartan/metrics/grafana/alerts/rules.yaml
@@ -173,7 +173,7 @@ groups:
           for: 5m
           annotations:
             summary: Fisherman detected block re-execution failure
-            description: Fisherman node ({{ ` {{ $labels.k8s_namespace_name }} ` }}) failed to re-execute block(s).
+            description: Fisherman node ({{ $labels.k8s_namespace_name }}) failed to re-execute block(s).
           labels:
             <<: *common_labels
           isPaused: false
@@ -188,7 +188,7 @@ groups:
               datasourceUid: spartan-metrics-prometheus
               model:
                 editorMode: code
-                expr: sum by (k8s_namespace_name, aztec_error_type) (increase(aztec_sequencer_block_proposal_failed_count{k8s_namespace_name=~".*(fisherman|mainnet).*"}[$__rate_interval]))
+                expr: sum by (k8s_namespace_name, aztec_error_type) (increase(aztec_sequencer_block_proposal_failed_count{k8s_namespace_name=~".*(fisherman|mainnet).*", aztec_error_type!="insufficient_txs"}[$__rate_interval]))
                 instant: true
                 intervalMs: 60000
                 legendFormat: __auto
@@ -258,7 +258,7 @@ groups:
           for: 5m
           annotations:
             summary: Fisherman node failed to build validation block
-            description: Fisherman node ({{ ` {{ $labels.k8s_namespace_name }} ` }}) failed to build block. Reason - {{ ` {{ $labels.aztec_error_type }} ` }}.
+            description: Fisherman node ({{ $labels.k8s_namespace_name }}) failed to build block. Reason - {{ $labels.aztec_error_type }}.
           labels:
             <<: *common_labels
           isPaused: false
@@ -343,7 +343,7 @@ groups:
           for: 5m
           annotations:
             summary: Fisherman node failed pre-build checks
-            description: Fisherman node ({{ ` {{ $labels.k8s_namespace_name }} ` }}) failed pre-build checks. Check type - {{ ` {{ $labels.aztec_error_type }} ` }}.
+            description: Fisherman node ({{ $labels.k8s_namespace_name }}) failed pre-build checks. Check type - {{ $labels.aztec_error_type }}.
           labels:
             <<: *common_labels
           isPaused: false
@@ -428,7 +428,7 @@ groups:
           for: 5m
           annotations:
             summary: Fisherman node received invalid attestations
-            description: Fisherman node ({{ ` {{ $labels.k8s_namespace_name }} ` }}) received invalid attestations from other validators. Reason - {{ ` {{ $labels.aztec_error_type }} ` }}.
+            description: Fisherman node ({{ $labels.k8s_namespace_name }}) received invalid attestations from other validators. Reason - {{ $labels.aztec_error_type }}.
           labels:
             <<: *common_labels
           isPaused: false
@@ -512,7 +512,7 @@ groups:
           execErrState: Error
           for: 10m
           annotations:
-            summary: Pending chain in {{ ` {{ $labels.k8s_namespace_name  }} ` }} hasn't advanced in 10 minutes
+            summary: Pending chain in {{ $labels.k8s_namespace_name }} hasn't advanced in 10 minutes
           labels:
             <<: *common_labels
           isPaused: false
@@ -596,7 +596,7 @@ groups:
           execErrState: Error
           for: 0s
           annotations:
-            summary: Pending chain has re-orged in {{ ` {{ $labels.k8s_namespace_name  }} ` }}
+            summary: Pending chain has re-orged in {{ $labels.k8s_namespace_name }}
           labels:
             <<: *common_labels
           isPaused: false
@@ -680,7 +680,7 @@ groups:
           execErrState: Error
           for: 1m
           annotations:
-            summary: Attestations collection is taking over 10 seconds in {{ ` {{ $labels.k8s_namespace_name  }} ` }}
+            summary: Attestations collection is taking over 10 seconds in {{ $labels.k8s_namespace_name }}
           labels:
             <<: *common_labels
           isPaused: false
@@ -764,7 +764,7 @@ groups:
           execErrState: Error
           for: 5m
           annotations:
-            summary: High CPU usage in {{ ` {{ $labels.k8s_namespace_name  }} ` }} by {{ ` {{ $labels.service_name  }} ` }}
+            summary: High CPU usage in {{ $labels.k8s_namespace_name }} by {{ $labels.service_name }}
           labels:
             <<: *common_labels
           isPaused: false
@@ -779,7 +779,7 @@ groups:
               datasourceUid: spartan-metrics-prometheus
               model:
                 editorMode: code
-                expr: avg by (k8s_namespace_name,service_name) (process_memory_usage) / 1024^3
+                expr: avg by (k8s_namespace_name,service_name) (system_memory_utilization{system_memory_state="used"})
                 instant: true
                 intervalMs: 1000
                 legendFormat: __auto
@@ -823,7 +823,7 @@ groups:
                 conditions:
                     - evaluator:
                         params:
-                            - 5
+                            - 0.8 # trigger alert if using more than 80% total memory
                         type: gt
                       operator:
                         type: and
@@ -848,7 +848,7 @@ groups:
           execErrState: Error
           for: 5m
           annotations:
-            summary: High memory usage in {{ ` {{ $labels.k8s_namespace_name  }} ` }} by {{ ` {{ $labels.service_name  }} ` }}
+            summary: High memory usage in {{ $labels.k8s_namespace_name }} by {{ $labels.service_name }}
           labels:
             <<: *common_labels
           isPaused: false
@@ -932,7 +932,7 @@ groups:
           execErrState: Error
           for: 1m
           annotations:
-            summary: Something is blocking the main thread in {{ ` {{ $labels.service_name  }} ` }} ({{ ` {{ $labels.k8s_namespace_name  }} ` }})
+            summary: Something is blocking the main thread in {{ $labels.service_name }} ({{ $labels.k8s_namespace_name }})
           labels:
             <<: *common_labels
           isPaused: false
@@ -1016,7 +1016,7 @@ groups:
           execErrState: Error
           for: 1m
           annotations:
-            summary: Critical errors in the WorldState of {{ ` {{ $labels.service_name  }} ` }} ({{ ` {{ $labels.k8s_namespace_name  }} ` }})
+            summary: Critical errors in the WorldState of {{ $labels.service_name }} ({{ $labels.k8s_namespace_name }})
           labels:
             <<: *common_labels
           isPaused: false
@@ -1182,7 +1182,7 @@ groups:
           execErrState: Error
           for: 0s
           annotations:
-            summary: There was an error taking a snapshot in {{ ` {{ $labels.k8s_namespace_name  }} ` }}
+            summary: There was an error taking a snapshot in {{ $labels.k8s_namespace_name }}
           labels:
             <<: *common_labels
           isPaused: false
@@ -1271,7 +1271,7 @@ groups:
           execErrState: Error
           for: 1m
           annotations:
-            summary: Prometheus scraping for job {{ ` {{ $labels.job  }} ` }} takes more than 7.5s
+            summary: Prometheus scraping for job {{ $labels.job }} takes more than 7.5s
           labels:
             <<: *common_labels
           isPaused: false
@@ -1336,7 +1336,7 @@ groups:
             __panelId__: "5"
             description: ""
             runbook_url: ""
-            summary: One or more bootnodes for {{ ` {{ $labels.network }} ` }} may have stopped.
+            summary: One or more bootnodes for {{ $labels.network }} may have stopped.
           labels:
             "": ""
           isPaused: false
@@ -1421,7 +1421,7 @@ groups:
           for: 5m
           annotations:
             summary: Proof failed
-            description: One or more proving jobs were rejected in {{ ` {{ $labels.k8s_namespace_name }} ` }}.
+            description: One or more proving jobs were rejected in {{ $labels.k8s_namespace_name }}.
           labels:
             <<: *common_labels
           isPaused: false
diff --git a/spartan/metrics/grafana/alerts/templates.yaml b/spartan/metrics/grafana/alerts/templates.yaml
new file mode 100644
index 000000000000..1d8fbf4ccb5e
--- /dev/null
+++ b/spartan/metrics/grafana/alerts/templates.yaml
@@ -0,0 +1,37 @@
+apiVersion: 1
+templates:
+  - orgId: 1
+    name: aztec-slack-notifications
+    template: |
+      {{ define "aztec.slack.by_namespace" -}}
+      {{ if gt (len .Alerts) 0 }}
+      *Alerts:*
+      {{ range .Alerts }}
+      - {{ with (index .Labels "k8s_namespace_name") }}{{ . }}{{ else }}unknown-namespace{{ end }}: {{ with (index .Annotations "summary") }}{{ . }}{{ else }}(no summary){{ end }}
+      {{ end }}
+      {{ else }}
+      *Alerts:*
+      - {{ with (index .CommonAnnotations "summary") }}{{ . }}{{ else }}(no summary){{ end }}
+      {{ end }}
+
+      *Grafana overview:*
+      {{ .ExternalURL }}d/aztec-network/network-overview?orgId=1&refresh=30s&var-data_source=default&var-namespace={{ if gt (len .Alerts) 0 }}{{ with (index (index .Alerts 0).Labels "k8s_namespace_name") }}{{ urlquery . }}{{ else }}unknown{{ end }}{{ else }}{{ with (index .CommonLabels "k8s_namespace_name") }}{{ urlquery . }}{{ else }}unknown{{ end }}{{ end }}
+
+      *GKE workloads:*
+      https://console.cloud.google.com/kubernetes/workload/overview?project={{ if gt (len .Alerts) 0 }}{{ with (index (index .Alerts 0).Labels "gcp_project") }}{{ . }}{{ else }}unknown{{ end }}{{ else }}{{ with (index .CommonLabels "gcp_project") }}{{ . }}{{ else }}unknown{{ end }}{{ end }}&supportedpurview=project&pageState=%28%22savedViews%22%3A%28%22n%22%3A%5B%22{{ if gt (len .Alerts) 0 }}{{ with (index (index .Alerts 0).Labels "k8s_namespace_name") }}{{ urlquery . }}{{ else }}unknown{{ end }}{{ else }}{{ with (index .CommonLabels "k8s_namespace_name") }}{{ urlquery . }}{{ else }}unknown{{ end }}{{ end }}%22%5D%29%29
+      {{- end }}
+
+      {{ define "aztec.slack.by_network" -}}
+      {{ if gt (len .Alerts) 0 }}
+      *Alerts:*
+      {{ range .Alerts }}
+      - {{ with (index .Labels "network") }}{{ . }}{{ else }}unknown-network{{ end }}: {{ with (index .Annotations "summary") }}{{ . }}{{ else }}(no summary){{ end }}
+      {{ end }}
+      {{ else }}
+      *Alerts:*
+      - {{ with (index .CommonAnnotations "summary") }}{{ . }}{{ else }}(no summary){{ end }}
+      {{ end }}
+
+      *Grafana overview:*
+      {{ .ExternalURL }}d/bexge5lz3e51cd/p2p-bootnodes?orgId=1&var-network={{ if gt (len .Alerts) 0 }}{{ with (index (index .Alerts 0).Labels "network") }}{{ urlquery . }}{{ else }}unknown{{ end }}{{ else }}{{ with (index .CommonLabels "network") }}{{ urlquery . }}{{ else }}unknown{{ end }}{{ end }}
+      {{- end }}
diff --git a/spartan/metrics/values.yaml b/spartan/metrics/values.yaml
index d5dce4d246fc..5919fc8c34b9 100644
--- a/spartan/metrics/values.yaml
+++ b/spartan/metrics/values.yaml
@@ -127,14 +127,6 @@ grafana:
     TESTNET_NAMESPACES_REGEX: "testnet|v[0-9]+-testnet"
     MAINNET_NAMESPACES_REGEX: "mainnet|v[0-9]+-mainnet|ignition"
     DEVNET_NAMESPACES_REGEX: ".*devnet.*"
-    SLACK_WEBHOOK_URL: "http://127.0.0.1" # dummy value
-    SLACK_WEBHOOK_STAGING_PUBLIC_URL: "http://127.0.0.1" # dummy value
-    SLACK_WEBHOOK_STAGING_IGNITION_URL: "http://127.0.0.1" # dummy value
-    SLACK_WEBHOOK_NEXT_SCENARIO_URL: "http://127.0.0.1" # dummy value
-    SLACK_WEBHOOK_NEXT_NET_URL: "http://127.0.0.1" # dummy value
-    SLACK_WEBHOOK_TESTNET_URL: "http://127.0.0.1" # dummy value
-    SLACK_WEBHOOK_MAINNET_URL: "http://127.0.0.1" # dummy value
-    SLACK_WEBHOOK_DEVNET_URL: "http://127.0.0.1" # dummy value
   datasources:
     datasources.yaml:
       apiVersion: 1
@@ -153,7 +145,7 @@ grafana:
       label: grafana_dashboard
       folderAnnotation: grafana_dashboard_folder
       provider:
-        foldersFromFilesStructure: false
+        foldersFromFilesStructure: true
     alerts:
       enabled: true
       label: grafana_alert
diff --git a/spartan/scripts/bench_10tps/bench_output.schema.json b/spartan/scripts/bench_10tps/bench_output.schema.json
new file mode 100644
index 000000000000..8820573083b2
--- /dev/null
+++ b/spartan/scripts/bench_10tps/bench_output.schema.json
@@ -0,0 +1,493 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "https://github.com/AztecProtocol/aztec-packages/benchmark-design/benchmark-output.schema.json",
+  "title": "Aztec 10 TPS benchmark — per-run output",
+  "description": "One JSON per benchmark run, self-contained. Produced by bench_scrape.ts after a run finishes. Two scrape paths, run independently so one failing does not prevent the other from populating: (a) PromQL query_range for continuous time-series; (b) gcloud log scrape for per-block records and discrete events.",
+  "type": "object",
+  "additionalProperties": false,
+  "required": [
+    "schemaVersion",
+    "run",
+    "summary",
+    "timeSeries",
+    "blocks",
+    "events"
+  ],
+  "properties": {
+    "schemaVersion": {
+      "type": "string",
+      "const": "3",
+      "description": "Bump when breaking the schema. Old JSONs keep their previous version so the dashboard can render them side-by-side. v3: timeSeries entries carry `series: [{labels, points}]` instead of bare `points` to support per-pod / per-label data."
+    },
+    "run": { "$ref": "#/$defs/runMeta" },
+    "summary": {
+      "$ref": "#/$defs/summary",
+      "description": "Scalar reductions — one number per run. Shown on the dashboard trend page and duplicated into index.json so the index can render headline numbers without fetching every run."
+    },
+    "timeSeries": {
+      "$ref": "#/$defs/timeSeriesSection",
+      "description": "PromQL query_range results. Continuous-sampled metrics keyed by unixEpoch; the dashboard normalises to time-within-run via unixEpoch - run.startedAt at render time so multiple runs can overlay on the same x-axis."
+    },
+    "blocks": {
+      "type": "array",
+      "description": "Per-block records parsed from structured logs (each block emits one `Processed N successful txs and M failed txs ...` info line). Authoritative for per-block facts — Prometheus histograms cannot recover per-block samples.",
+      "items": { "$ref": "#/$defs/blockRecord" }
+    },
+    "events": {
+      "type": "array",
+      "description": "Discrete occurrences during the run (currently just chain prunes). Typically rendered as annotations on charts.",
+      "items": { "$ref": "#/$defs/event" }
+    },
+    "sequencerStateSlots": {
+      "type": "array",
+      "description": "Per-slot sequencer state time budget reconstructed from structured state-transition logs. Optional for older runs and empty when sequencer debug logs were not enabled.",
+      "items": { "$ref": "#/$defs/sequencerStateSlot" }
+    },
+    "notes": {
+      "type": "array",
+      "items": { "type": "string" },
+      "description": "Free-form operator notes (e.g. 'ran with doubled prover agents'). Optional."
+    }
+  },
+
+  "$defs": {
+    "runMeta": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": ["runId", "startedAt", "endedAt", "namespace"],
+      "properties": {
+        "runId": {
+          "type": "string",
+          "description": "ULID/UUID. Same value stamped on pods as BENCH_RUN_ID label when that instrumentation lands."
+        },
+        "startedAt": {
+          "type": "string",
+          "format": "date-time",
+          "description": "Wall-clock time the load generator started sending txs. Dashboards normalise time-series x-axes against this for cross-run overlay."
+        },
+        "endedAt": {
+          "type": "string",
+          "format": "date-time",
+          "description": "Wall-clock time the load generator stopped sending txs (not the test-teardown time)."
+        },
+        "inclusionEndedAt": {
+          "type": "string",
+          "format": "date-time",
+          "description": "Wall-clock time the scraper considers proposer-visible load fully included. With pending-drain scraping enabled, this is when validator pending TxPool depth first reached zero; otherwise it falls back to the bounded scrape window end. RPC/full-node pending may remain non-zero when load failed to propagate to validators."
+        },
+        "drainEndedAt": {
+          "type": "string",
+          "format": "date-time",
+          "description": "Wall-clock time the scraper began querying Prometheus. Typically endedAt + ~90s to let the OTel batch push (60s default) and one Prom scrape (15s) settle."
+        },
+        "namespace": { "type": "string", "examples": ["bench-10tps"] },
+        "gcpProject": {
+          "type": "string",
+          "description": "GCP project containing the GKE container logs."
+        },
+        "gcpLocation": {
+          "type": "string",
+          "description": "GKE cluster location used by Cloud Logging resource labels."
+        },
+        "gkeCluster": {
+          "type": "string",
+          "description": "GKE cluster name used by Cloud Logging resource labels."
+        },
+        "image": {
+          "type": "string",
+          "description": "Aztec image tag or digest the validators ran."
+        },
+        "targetTps": { "type": "number", "minimum": 0 },
+        "testDurationSeconds": { "type": "integer", "minimum": 0 },
+        "workload": { "type": "string", "examples": ["sha256_hash_1024"] },
+        "aztecConfig": {
+          "type": "object",
+          "additionalProperties": { "type": "string" },
+          "description": "Curated subset of Aztec config env vars captured from a running validator pod. Keys include SEQ_MAX_TX_PER_BLOCK, P2P_MAX_PENDING_TX_COUNT, AZTEC_MANA_TARGET, etc. Lets the dashboard show 'pool=20k vs pool=1000' alongside compared runs."
+        },
+        "infrastructure": {
+          "type": "object",
+          "additionalProperties": false,
+          "description": "Benchmark pod placement captured from Kubernetes at scrape time. Lets dashboards show which machine shapes validators, provers, RPC nodes, and full nodes used.",
+          "properties": {
+            "roles": {
+              "type": "object",
+              "additionalProperties": {
+                "type": "object",
+                "additionalProperties": false,
+                "properties": {
+                  "instanceTypes": {
+                    "type": "array",
+                    "items": { "type": "string" },
+                    "description": "Distinct Kubernetes node instance types used by this role."
+                  },
+                  "nodePools": {
+                    "type": "array",
+                    "items": { "type": "string" },
+                    "description": "Distinct node pools used by this role, when exposed as node labels."
+                  },
+                  "nodes": {
+                    "type": "array",
+                    "items": {
+                      "type": "object",
+                      "additionalProperties": false,
+                      "required": ["role", "podName", "nodeName"],
+                      "properties": {
+                        "role": { "type": "string" },
+                        "podName": { "type": "string" },
+                        "nodeName": { "type": "string" },
+                        "instanceType": { "type": "string" },
+                        "nodePool": { "type": "string" }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "chaosMesh": {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "enabled": { "type": "boolean" },
+            "profile": {
+              "type": "string",
+              "examples": ["network-requirements"]
+            }
+          }
+        },
+        "scrapeConfig": {
+          "type": "object",
+          "description": "What the scraper itself did. Kept so a future maintainer can tell whether a gappy time-series was caused by too-short drain or too-large step.",
+          "additionalProperties": false,
+          "properties": {
+            "drainSeconds": {
+              "type": "integer",
+              "minimum": 0,
+              "description": "Seconds waited between endedAt and the first Prom query."
+            },
+            "stepSeconds": {
+              "type": "integer",
+              "minimum": 1,
+              "description": "PromQL range-query step."
+            },
+            "promUrl": { "type": "string" },
+            "waitForPendingZero": {
+              "type": "boolean",
+              "description": "Whether live scraping waited for validator pending TxPool depth to reach zero before querying."
+            },
+            "maxPendingWaitSeconds": {
+              "type": "integer",
+              "minimum": 0,
+              "description": "Maximum time the scraper was allowed to wait for validator pending TxPool depth to reach zero."
+            },
+            "pendingAtScrape": {
+              "type": ["number", "null"],
+              "minimum": 0,
+              "description": "Validator pending TxPool depth observed when scraping started, or null when the pending drain gate was disabled."
+            },
+            "pendingByRoleAtScrape": {
+              "type": ["object", "null"],
+              "description": "Pending TxPool depth by pod role at scrape start. RPC/full-node pending can remain non-zero after validators drain, which indicates load that did not propagate to proposers before expiry.",
+              "additionalProperties": false,
+              "properties": {
+                "rpc": { "type": ["number", "null"], "minimum": 0 },
+                "validator": { "type": ["number", "null"], "minimum": 0 },
+                "fullNode": { "type": ["number", "null"], "minimum": 0 }
+              }
+            },
+            "pendingWaitTimedOut": {
+              "type": "boolean",
+              "description": "True if scraping began because the pending-drain timeout expired."
+            }
+          }
+        }
+      }
+    },
+
+    "summary": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": ["headlineKpi", "inclusionTpsMean", "targetTps"],
+      "properties": {
+        "headlineKpi": {
+          "type": ["number", "null"],
+          "description": "inclusionTpsMean / targetTps. The single number on the dashboard top strip."
+        },
+        "targetTps": { "type": "number" },
+        "inclusionTpsMean": {
+          "type": ["number", "null"],
+          "description": "Exact block-log inclusion throughput over the observed inclusion window: totalTxsMined / (inclusionEndedAt - startedAt)."
+        },
+        "inclusionTpsPeak": {
+          "type": ["number", "null"],
+          "description": "Peak sampled Prometheus rolling inclusion rate over the observed scrape window."
+        },
+        "inclusionLatencyP50Ms": { "type": ["number", "null"] },
+        "inclusionLatencyP95Ms": { "type": ["number", "null"] },
+        "inclusionLatencyP99Ms": { "type": ["number", "null"] },
+        "blockBuildDurationP50Ms": { "type": ["number", "null"] },
+        "blockBuildDurationP95Ms": { "type": ["number", "null"] },
+        "publicProcessorTxDurationP50Ms": { "type": ["number", "null"] },
+        "publicProcessorTxDurationP95Ms": { "type": ["number", "null"] },
+        "totalTxsMined": { "type": ["integer", "null"] },
+        "totalTxsFailed": { "type": ["integer", "null"] },
+        "totalSilentSkipCount": {
+          "type": ["integer", "null"],
+          "description": "Sum of per-block silentlySkippedCount. > 0 means the post-process blob-field revert path fired during the run."
+        },
+        "totalSilentSkipDurationMs": {
+          "type": ["integer", "null"],
+          "description": "Sum of per-block silentlySkippedDurationMs. Wall-clock 'wasted' on silently-skipped txs across the run."
+        },
+        "reorgCount": {
+          "type": ["integer", "null"],
+          "description": "Count of `Chain pruned` events during the run."
+        },
+        "deepestReorgBlocks": {
+          "type": ["integer", "null"],
+          "description": "Max (fromBlock - toBlock) across reorg events. 0 if no reorgs."
+        }
+      }
+    },
+
+    "timeSeriesSection": {
+      "type": "object",
+      "description": "Key = stable slug (used by the dashboard to look up series); value = a series. Slugs decouple the display name from Prometheus metric names (which may be renamed across Aztec versions).",
+      "additionalProperties": { "$ref": "#/$defs/timeSeries" },
+      "properties": {
+        "inclusionTps": { "$ref": "#/$defs/timeSeries" },
+        "ingressTps": { "$ref": "#/$defs/timeSeries" },
+        "mempoolSizeRpc": { "$ref": "#/$defs/timeSeries" },
+        "mempoolSizeValidator": { "$ref": "#/$defs/timeSeries" },
+        "mempoolSizeFullNode": { "$ref": "#/$defs/timeSeries" },
+        "mempoolMinedMax": { "$ref": "#/$defs/timeSeries" },
+        "mempoolEvictedByReasonRate": { "$ref": "#/$defs/timeSeries" },
+        "mempoolRejectedByReasonRate": { "$ref": "#/$defs/timeSeries" },
+        "blockBuildDurationP95": { "$ref": "#/$defs/timeSeries" },
+        "blockBuildDurationP50": { "$ref": "#/$defs/timeSeries" },
+        "publicProcessorTxDurationP95": { "$ref": "#/$defs/timeSeries" },
+        "publicProcessorTxDurationP50": { "$ref": "#/$defs/timeSeries" },
+        "publicProcessorGasRate": { "$ref": "#/$defs/timeSeries" },
+        "checkpointLastBlockToBroadcastP95": { "$ref": "#/$defs/timeSeries" },
+        "checkpointBlockCountMean": { "$ref": "#/$defs/timeSeries" },
+        "checkpointTxCountMean": { "$ref": "#/$defs/timeSeries" },
+        "l1InclusionDelayP95": { "$ref": "#/$defs/timeSeries" },
+        "gossipLatencyP95": { "$ref": "#/$defs/timeSeries" },
+        "peerCountMean": {
+          "$ref": "#/$defs/timeSeries",
+          "description": "Legacy aggregate peer-count series kept for older run JSONs."
+        },
+        "peerCountByRole": { "$ref": "#/$defs/timeSeries" },
+        "peerCountByValidator": { "$ref": "#/$defs/timeSeries" },
+        "attestationsCollectDurationMean": { "$ref": "#/$defs/timeSeries" },
+        "attestationsCollectAllowanceMean": { "$ref": "#/$defs/timeSeries" },
+        "txCollectorTxsFromMempoolRate": { "$ref": "#/$defs/timeSeries" },
+        "txCollectorTxsFromP2pRate": { "$ref": "#/$defs/timeSeries" },
+        "txCollectorMissingRate": { "$ref": "#/$defs/timeSeries" },
+        "txCollectorRequestedFractionMean": { "$ref": "#/$defs/timeSeries" },
+        "txCollectorRequestDelayP95": { "$ref": "#/$defs/timeSeries" },
+        "sequencerStateDurationP95": { "$ref": "#/$defs/timeSeries" }
+      }
+    },
+
+    "timeSeries": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": ["metric", "source", "series"],
+      "properties": {
+        "metric": {
+          "type": "string",
+          "description": "Prometheus metric name this series was derived from."
+        },
+        "unit": {
+          "type": "string",
+          "examples": ["ms", "tps", "mana/s", "count"]
+        },
+        "source": {
+          "type": "string",
+          "const": "promql",
+          "description": "Future-proofing: other series sources may exist (e.g. 'log-aggregated') with different provenance semantics."
+        },
+        "query": {
+          "type": "string",
+          "description": "Exact PromQL used. Kept for audit: if a value looks wrong, the query is the first thing to check."
+        },
+        "stepSeconds": { "type": "integer", "minimum": 1 },
+        "series": {
+          "type": "array",
+          "description": "One entry per Prometheus series returned by the query. Single-series queries (e.g. inclusionTps) emit one entry with empty labels. Multi-series queries (per-pod, per-topic, per-rejection-reason, etc.) emit one entry per label combination.",
+          "items": { "$ref": "#/$defs/seriesEntry" }
+        }
+      }
+    },
+
+    "seriesEntry": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": ["labels", "points"],
+      "properties": {
+        "labels": {
+          "type": "object",
+          "additionalProperties": { "type": "string" },
+          "description": "Prometheus labels that disambiguate this series. Empty {} for single-series queries. Common keys: k8s_pod_name, aztec_gossip_topic_name, rejection_reason, aztec_sequencer_state."
+        },
+        "points": {
+          "type": "array",
+          "description": "Samples ordered by unixEpoch ascending. Missing samples (Prom didn't scrape in that window) are omitted rather than interpolated — consumers decide how to handle gaps.",
+          "items": { "$ref": "#/$defs/tsPoint" }
+        }
+      }
+    },
+
+    "tsPoint": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": ["unixEpoch", "value"],
+      "properties": {
+        "unixEpoch": {
+          "type": "integer",
+          "description": "Seconds since unix epoch for this sample. Dashboards normalise to time-within-run via unixEpoch - run.startedAt at render time."
+        },
+        "value": {
+          "type": ["number", "null"],
+          "description": "Metric value. null if Prom returned NaN / no data for this step."
+        }
+      }
+    },
+
+    "blockRecord": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": ["blockNumber", "blockNumberInTest", "minedAt"],
+      "properties": {
+        "blockNumber": { "type": "integer", "minimum": 0 },
+        "blockNumberInTest": {
+          "type": "integer",
+          "description": "blockNumber - firstBlockInTest. First block mined after run.startedAt is 0."
+        },
+        "minedAt": { "type": "string", "format": "date-time" },
+        "successfulCount": { "type": "integer", "minimum": 0 },
+        "failedCount": { "type": "integer", "minimum": 0 },
+        "silentlySkippedCount": {
+          "type": "integer",
+          "minimum": 0,
+          "description": "Txs processed to completion then reverted (post-process blob-field limit). Added 2026-04-22."
+        },
+        "silentlySkippedDurationMs": {
+          "type": "integer",
+          "minimum": 0,
+          "description": "Wall-clock time spent on silently-skipped txs in this block. Added 2026-04-22."
+        },
+        "buildDurationSeconds": { "type": "number", "minimum": 0 },
+        "totalPublicGas": {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "daGas": { "type": "integer" },
+            "l2Gas": { "type": "integer" }
+          }
+        },
+        "totalSizeInBytes": { "type": "integer", "minimum": 0 },
+        "source": {
+          "type": "string",
+          "const": "log",
+          "description": "Source of record. Currently all block records come from the structured 'Processed N successful…' info log."
+        }
+      }
+    },
+
+    "event": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": ["at", "type"],
+      "properties": {
+        "at": { "type": "string", "format": "date-time" },
+        "type": { "type": "string", "enum": ["chainPruned", "slotSummary"] },
+        "source": { "type": "string", "const": "log" },
+        "fromBlock": {
+          "type": "integer",
+          "description": "For chainPruned: the pre-prune tip."
+        },
+        "toBlock": {
+          "type": "integer",
+          "description": "For chainPruned: the post-prune tip."
+        },
+        "slotNumber": {
+          "type": "integer",
+          "description": "For slotSummary: L2 slot number."
+        },
+        "buildSlot": {
+          "type": "integer",
+          "description": "For slotSummary: wall-clock slot in which the checkpoint was built."
+        },
+        "checkpointNumber": { "type": "integer" },
+        "sourcePod": { "type": "string" },
+        "proposer": {
+          "type": "string",
+          "description": "Validator/proposer address selected for this slot."
+        },
+        "attestorAddress": { "type": "string" },
+        "publisherAddress": { "type": "string" },
+        "blocksBuilt": { "type": "number", "minimum": 0 },
+        "txCount": { "type": "number", "minimum": 0 },
+        "totalMana": { "type": "number", "minimum": 0 },
+        "blockBuildFailures": {
+          "type": "array",
+          "items": { "type": "object", "additionalProperties": true }
+        },
+        "checkpointBuildFailure": {
+          "type": "object",
+          "additionalProperties": true
+        },
+        "attestations": {
+          "type": "object",
+          "additionalProperties": true,
+          "description": "For slotSummary: committee size, required/collected counts, and missing validator addresses when known."
+        },
+        "publish": {
+          "type": "object",
+          "additionalProperties": true,
+          "description": "For slotSummary: checkpoint publish status and L1 publisher action breakdown."
+        }
+      }
+    },
+
+    "sequencerStateSlot": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": ["slotNumber", "startedAt", "endedAt", "totalMs", "states"],
+      "properties": {
+        "slotNumber": {
+          "type": "integer",
+          "description": "L2 slot number whose sequencer-state durations are represented."
+        },
+        "startedAt": {
+          "type": "string",
+          "format": "date-time",
+          "description": "Timestamp of the first parsed transition for this pod-slot."
+        },
+        "endedAt": {
+          "type": "string",
+          "format": "date-time",
+          "description": "Timestamp of the last parsed transition for this pod-slot."
+        },
+        "sourcePod": {
+          "type": "string",
+          "description": "Validator pod whose transitions were selected for this slot. The scraper chooses the pod-slot with the strongest proposer-state signal."
+        },
+        "totalMs": {
+          "type": "number",
+          "minimum": 0,
+          "description": "Sum of all state durations in this slot record."
+        },
+        "states": {
+          "type": "object",
+          "additionalProperties": { "type": "number", "minimum": 0 },
+          "description": "Map from SequencerState name to total milliseconds spent in that state during this slot."
+        }
+      }
+    }
+  }
+}
diff --git a/spartan/scripts/bench_10tps/bench_scrape.ts b/spartan/scripts/bench_10tps/bench_scrape.ts
new file mode 100755
index 000000000000..69c7f920e88a
--- /dev/null
+++ b/spartan/scripts/bench_10tps/bench_scrape.ts
@@ -0,0 +1,1759 @@
+#!/usr/bin/env -S node --experimental-strip-types --no-warnings
+//
+// Scrape a completed bench-10tps run into a schema-conformant JSON payload.
+// Contract: bench_output.schema.json (v3). Invoked by the bench_10tps function
+// in spartan/bootstrap.sh after n_tps.test.ts finishes.
+//
+// Two independent scrape paths so one failing does not abort the other:
+//   1. Prometheus (port-forward to the cluster-shared metrics-prometheus-server)
+//   2. gcloud logging read (per-block and discrete-event records)
+//
+// Usage:
+//   ./bench_scrape.ts \
+//     --run-id <id> --started <iso> --ended <iso> \
+//     --target-tps 10 --workload sha256_hash_1024
+//
+// By default the scraper waits for pending TxPool depth to reach zero before
+// finalizing the run. Use --no-wait-for-pending-zero for historical replays
+// where the namespace no longer exists.
+
+import { spawn } from "node:child_process";
+import { randomUUID } from "node:crypto";
+import { readFile, writeFile } from "node:fs/promises";
+import { argv, env, exit, stderr } from "node:process";
+import { setTimeout as sleep } from "node:timers/promises";
+
+// --- Config ---
+
+const NAMESPACE = env.NAMESPACE ?? "bench-10tps";
+
+const GCP_PROJECT_ID = env.GCP_PROJECT_ID;
+if (!GCP_PROJECT_ID) {
+  throw new Error("Missing GCP_PROJECT_ID env var");
+}
+
+const GCP_REGION = env.GCP_REGION ?? "us-west1-a";
+const GKE_CLUSTER = env.CLUSTER ?? "aztec-gke-private";
+// Prometheus is cluster-shared in the "metrics" namespace, not per-environment.
+const PROM_NS = env.PROM_NS ?? "metrics";
+const PROM_SERVICE = env.PROM_SERVICE ?? "metrics-prometheus-server";
+const PROM_PORT = Number(env.PROM_PORT ?? 9090);
+const STEP_SECONDS = 15;
+const DRAIN_BUFFER_SECONDS = 90; // OTel batch push 60s + one Prom scrape 15s + slack
+const PENDING_POLL_SECONDS = 30;
+const DEFAULT_MAX_PENDING_WAIT_SECONDS = 60 * 60;
+
+// --- CLI ---
+
+type Args = {
+  runId: string;
+  startedAt: string;
+  endedAt: string;
+  targetTps: number;
+  workload: string;
+  output: string | undefined;
+  waitForPendingZero: boolean;
+  maxPendingWaitSeconds: number;
+};
+
+function parseArgs(): Args {
+  const get = (flag: string, fallback?: string) => {
+    const i = argv.indexOf(flag);
+    if (i === -1) {
+      if (fallback !== undefined) {
+        return fallback;
+      }
+      throw new Error(`Missing required flag ${flag}`);
+    }
+    return argv[i + 1];
+  };
+  return {
+    runId: get("--run-id", env.BENCH_RUN_ID ?? randomUUID()),
+    startedAt: get("--started"),
+    endedAt: get("--ended"),
+    targetTps: Number(get("--target-tps", "10")),
+    workload: get("--workload", "sha256_hash_1024"),
+    output:
+      argv.indexOf("--output") === -1
+        ? undefined
+        : argv[argv.indexOf("--output") + 1],
+    waitForPendingZero:
+      !argv.includes("--no-wait-for-pending-zero") &&
+      (argv.includes("--wait-for-pending-zero") ||
+        env.BENCH_SCRAPE_WAIT_FOR_PENDING_ZERO !== "0"),
+    maxPendingWaitSeconds: Number(
+      get(
+        "--max-pending-wait-seconds",
+        env.BENCH_SCRAPE_MAX_PENDING_WAIT_SECONDS ??
+          String(DEFAULT_MAX_PENDING_WAIT_SECONDS),
+      ),
+    ),
+  };
+}
+
+function log(msg: string, extra?: unknown): void {
+  stderr.write(
+    `[scrape] ${msg}${extra === undefined ? "" : " " + JSON.stringify(extra)}\n`,
+  );
+}
+
+// --- Port-forward ---
+
+async function portForwardProm(): Promise<() => void> {
+  const child = spawn(
+    "kubectl",
+    ["-n", PROM_NS, "port-forward", `svc/${PROM_SERVICE}`, `${PROM_PORT}:80`],
+    { stdio: ["ignore", "pipe", "pipe"] },
+  );
+  await new Promise<void>((resolve, reject) => {
+    const onData = (buf: Buffer) => {
+      if (buf.toString().includes("Forwarding from")) {
+        resolve();
+      }
+    };
+    child.stdout?.on("data", onData);
+    child.stderr?.on("data", onData);
+    child.on("exit", (code, signal) =>
+      reject(new Error(`port-forward exited: ${code}/${signal}`)),
+    );
+    setTimeout(() => reject(new Error("port-forward timeout")), 15_000);
+  });
+  return () => child.kill();
+}
+
+// --- PromQL client ---
+
+type TsPoint = {
+  unixEpoch: number;
+  value: number | null;
+};
+
+type SeriesEntry = {
+  labels: Record<string, string>;
+  points: TsPoint[];
+};
+
+const parseValue = (v: string | undefined): number | null =>
+  v === undefined || v === "NaN" ? null : Number(v);
+
+async function queryInstant(
+  promql: string,
+  tEpoch: number,
+): Promise<number | null> {
+  const url =
+    `http://localhost:${PROM_PORT}/api/v1/query` +
+    `?query=${encodeURIComponent(promql)}&time=${tEpoch}`;
+  const res = await fetch(url);
+  if (!res.ok) {
+    throw new Error(`instant query ${res.status} ${res.statusText}: ${promql}`);
+  }
+  const json = (await res.json()) as {
+    data?: { result?: Array<{ value?: [number, string] }> };
+  };
+  return parseValue(json.data?.result?.[0]?.value?.[1]);
+}
+
+async function queryRange(
+  promql: string,
+  startEpoch: number,
+  endEpoch: number,
+  stepSeconds = STEP_SECONDS,
+): Promise<SeriesEntry[]> {
+  const url =
+    `http://localhost:${PROM_PORT}/api/v1/query_range` +
+    `?query=${encodeURIComponent(promql)}` +
+    `&start=${startEpoch}&end=${endEpoch}&step=${stepSeconds}`;
+  const res = await fetch(url);
+  if (!res.ok) {
+    throw new Error(`range query ${res.status} ${res.statusText}: ${promql}`);
+  }
+  const json = (await res.json()) as {
+    data?: {
+      result?: Array<{
+        metric?: Record<string, string>;
+        values?: Array<[number, string]>;
+      }>;
+    };
+  };
+  const results = json.data?.result ?? [];
+  return results.map(({ metric, values }) => ({
+    labels: metric ?? {},
+    points: (values ?? []).map(([t, v]) => ({
+      unixEpoch: Math.round(t),
+      value: parseValue(v),
+    })),
+  }));
+}
+
+// --- Time-series definitions ---
+// Every query includes the namespace filter: Prometheus is cluster-shared across
+// all Aztec deployments, so un-filtered queries would pick up data from mbps-pipe,
+// staging-v4-1, nightly-block-capacity, etc.
+
+const NS = `{k8s_namespace_name="${NAMESPACE}"}`;
+const pendingTxsQueryForRole = (role: string) =>
+  `max(aztec_mempool_tx_count{k8s_namespace_name="${NAMESPACE}",aztec_pool_name="TxPool",aztec_status="pending",k8s_pod_name=~"${NAMESPACE}-${role}.*"})`;
+const PENDING_RPC_TXS_QUERY = pendingTxsQueryForRole("rpc");
+const PENDING_VALIDATOR_TXS_QUERY = pendingTxsQueryForRole("validator");
+const PENDING_FULL_NODE_TXS_QUERY = pendingTxsQueryForRole("full-node");
+const histQuantile = (q: number, bucket: string, groupBy: string[] = []) => {
+  const groupKeys = ["le", ...groupBy].join(", ");
+  return `histogram_quantile(${q}, sum by (${groupKeys})(rate(${bucket}${NS}[1m])))`;
+};
+
+type TimeSeriesDef = { metric: string; unit: string; query: string };
+
+type PreviousRunContext = {
+  image?: string;
+  aztecConfig?: Record<string, string>;
+  infrastructure?: Infrastructure;
+};
+
+async function loadPreviousRunContext(
+  output: string | undefined,
+): Promise<PreviousRunContext> {
+  if (!output) {
+    return {};
+  }
+  try {
+    const existing = JSON.parse(await readFile(output, "utf8")) as {
+      run?: PreviousRunContext;
+    };
+    return existing.run ?? {};
+  } catch {
+    return {};
+  }
+}
+
+const TIME_SERIES_DEFS: Record<string, TimeSeriesDef> = {
+  // aztec_archiver_block_tx_count is a histogram where each observation is
+  // "this block contained N txs" — _sum is total txs observed, _count is total
+  // blocks observed. Every archiver (RPC + every validator + every full node)
+  // observes the same block, so sum() across pods over-counts by the number of
+  // archivers. avg() gives the true per-block rate since all archivers see the
+  // same canonical chain.
+  inclusionTps: {
+    metric: "aztec_archiver_block_tx_count_sum",
+    unit: "tps",
+    query: `avg(rate(aztec_archiver_block_tx_count_sum${NS}[1m]))`,
+  },
+  // aztec_node_receive_tx_count is only incremented on the RPC node that the
+  // load generator hits, so sum() is fine here — there's only one non-zero
+  // series. (Full nodes receive via gossip, not ReceiveTx.)
+  ingressTps: {
+    metric: "aztec_node_receive_tx_count",
+    unit: "tps",
+    query: `sum(rate(aztec_node_receive_tx_count${NS}[1m]))`,
+  },
+  // Pending mempool size sliced by pod role. Three single-series slugs make cross-run
+  // overlay clean: pod names are unstable (replica counts and restart suffixes
+  // change between runs) but role is stable. Each query filters to TxPool to
+  // avoid mixing in the AttestationPool counters that share the metric name, and
+  // to pending status so max() does not collapse pending/protected/mined/softDeleted.
+  // max() over a role collapses the per-pod fan-out — for an under-fill
+  // investigation we care about the role's deepest backlog at any moment.
+  mempoolSizeRpc: {
+    metric: "aztec_mempool_tx_count",
+    unit: "count",
+    query: `max(aztec_mempool_tx_count{k8s_namespace_name="${NAMESPACE}",aztec_pool_name="TxPool",aztec_status="pending",k8s_pod_name=~"${NAMESPACE}-rpc.*"})`,
+  },
+  mempoolSizeValidator: {
+    metric: "aztec_mempool_tx_count",
+    unit: "count",
+    query: `max(aztec_mempool_tx_count{k8s_namespace_name="${NAMESPACE}",aztec_pool_name="TxPool",aztec_status="pending",k8s_pod_name=~"${NAMESPACE}-validator.*"})`,
+  },
+  mempoolSizeFullNode: {
+    metric: "aztec_mempool_tx_count",
+    unit: "count",
+    query: `max(aztec_mempool_tx_count{k8s_namespace_name="${NAMESPACE}",aztec_pool_name="TxPool",aztec_status="pending",k8s_pod_name=~"${NAMESPACE}-full-node.*"})`,
+  },
+  mempoolMinedMax: {
+    metric: "aztec_mempool_tx_count",
+    unit: "count",
+    query: `max(aztec_mempool_tx_count{k8s_namespace_name="${NAMESPACE}",aztec_pool_name="TxPool",aztec_status="mined"})`,
+  },
+  mempoolEvictedByReasonRate: {
+    metric: "aztec_mempool_tx_pool_v2_evicted_count",
+    unit: "tps",
+    query: `sum by (aztec_mempool_eviction_reason)(rate(aztec_mempool_tx_pool_v2_evicted_count${NS}[1m]))`,
+  },
+  mempoolRejectedByReasonRate: {
+    metric: "aztec_mempool_tx_pool_v2_rejected_count",
+    unit: "tps",
+    // Rejections currently do not carry a reason label, unlike evictions.
+    query: `sum(rate(aztec_mempool_tx_pool_v2_rejected_count${NS}[1m]))`,
+  },
+  blockBuildDurationP50: {
+    metric: "aztec_sequencer_block_build_duration_milliseconds",
+    unit: "ms",
+    query: histQuantile(
+      0.5,
+      "aztec_sequencer_block_build_duration_milliseconds_bucket",
+    ),
+  },
+  blockBuildDurationP95: {
+    metric: "aztec_sequencer_block_build_duration_milliseconds",
+    unit: "ms",
+    query: histQuantile(
+      0.95,
+      "aztec_sequencer_block_build_duration_milliseconds_bucket",
+    ),
+  },
+  publicProcessorTxDurationP50: {
+    metric: "aztec_public_processor_tx_duration_milliseconds",
+    unit: "ms",
+    query: histQuantile(
+      0.5,
+      "aztec_public_processor_tx_duration_milliseconds_bucket",
+    ),
+  },
+  publicProcessorTxDurationP95: {
+    metric: "aztec_public_processor_tx_duration_milliseconds",
+    unit: "ms",
+    query: histQuantile(
+      0.95,
+      "aztec_public_processor_tx_duration_milliseconds_bucket",
+    ),
+  },
+  publicProcessorGasRate: {
+    metric: "aztec_public_processor_gas_rate_per_second",
+    unit: "mana/s",
+    // gas_rate is a histogram of per-block public-processor L2 mana/s. The
+    // total_gas metric is a gauge, so rate(total_gas) is not meaningful.
+    query: `sum(rate(aztec_public_processor_gas_rate_per_second_sum{k8s_namespace_name="${NAMESPACE}",aztec_gas_dimension="L2"}[1m])) / sum(rate(aztec_public_processor_gas_rate_per_second_count{k8s_namespace_name="${NAMESPACE}",aztec_gas_dimension="L2"}[1m]))`,
+  },
+  checkpointLastBlockToBroadcastP95: {
+    metric:
+      "aztec_sequencer_checkpoint_last_block_to_broadcast_duration_milliseconds",
+    unit: "ms",
+    query: histQuantile(
+      0.95,
+      "aztec_sequencer_checkpoint_last_block_to_broadcast_duration_milliseconds_bucket",
+    ),
+  },
+  // Archiver exports this as seconds into the L2 slot when the checkpoint L1
+  // tx was included, not submit→mined latency. Convert to ms so the dashboard
+  // can use the same duration formatting as the other build-internals panels.
+  l1InclusionDelayP95: {
+    metric: "aztec_archiver_checkpoint_l1_inclusion_delay_seconds",
+    unit: "ms",
+    query: `${histQuantile(0.95, "aztec_archiver_checkpoint_l1_inclusion_delay_seconds_bucket")} * 1000`,
+  },
+  // Multi-series by topic (tx, block_proposal, attestation, …).
+  gossipLatencyP95: {
+    metric: "aztec_p2p_gossip_message_latency_milliseconds",
+    unit: "ms",
+    query: histQuantile(
+      0.95,
+      "aztec_p2p_gossip_message_latency_milliseconds_bucket",
+      ["aztec_gossip_topic_name"],
+    ),
+  },
+  peerCountByRole: {
+    metric: "aztec_peer_manager_peer_count_peers",
+    unit: "count",
+    query: `avg by (service_name)(aztec_peer_manager_peer_count_peers${NS})`,
+  },
+  peerCountByValidator: {
+    metric: "aztec_peer_manager_peer_count_peers",
+    unit: "count",
+    query: `max by (k8s_pod_name)(aztec_peer_manager_peer_count_peers{k8s_namespace_name="${NAMESPACE}",k8s_pod_name=~"${NAMESPACE}-validator.*"})`,
+  },
+  attestationsCollectDurationMean: {
+    metric: "aztec_sequencer_attestations_collect_duration_milliseconds",
+    unit: "ms",
+    // This metric is exported as a gauge, not a histogram.
+    query: `avg(aztec_sequencer_attestations_collect_duration_milliseconds${NS})`,
+  },
+  attestationsCollectAllowanceMean: {
+    metric: "aztec_sequencer_attestations_collect_allowance_milliseconds",
+    unit: "ms",
+    // The metric is declared/exported as milliseconds, but current sequencer
+    // code records attestationTimeAllowed in seconds.
+    query: `avg(aztec_sequencer_attestations_collect_allowance_milliseconds${NS}) * 1000`,
+  },
+  checkpointBlockCountMean: {
+    metric: "aztec_sequencer_checkpoint_block_count",
+    unit: "count",
+    query: `avg(aztec_sequencer_checkpoint_block_count${NS})`,
+  },
+  checkpointTxCountMean: {
+    metric: "aztec_sequencer_checkpoint_tx_count",
+    unit: "count",
+    query: `avg(aztec_sequencer_checkpoint_tx_count${NS})`,
+  },
+  // tx_collector signals: each node's view of where proposal txs came from.
+  // These counters are emitted by every node reconstructing/validating blocks;
+  // avg() keeps this as a per-node view instead of multiplying by node count.
+  txCollectorTxsFromProposalRate: {
+    metric: "aztec_tx_collector_txs_from_proposal_count",
+    unit: "tps",
+    query: `avg(rate(aztec_tx_collector_txs_from_proposal_count${NS}[1m]))`,
+  },
+  txCollectorTxsFromMempoolRate: {
+    metric: "aztec_tx_collector_txs_from_mempool_count",
+    unit: "tps",
+    query: `avg(rate(aztec_tx_collector_txs_from_mempool_count${NS}[1m]))`,
+  },
+  txCollectorTxsFromP2pRate: {
+    metric: "aztec_tx_collector_txs_from_p2p_count",
+    unit: "tps",
+    query: `avg(rate(aztec_tx_collector_txs_from_p2p_count${NS}[1m]))`,
+  },
+  txCollectorMissingRate: {
+    metric: "aztec_tx_collector_missing_txs_count",
+    unit: "tps",
+    query: `avg(rate(aztec_tx_collector_missing_txs_count${NS}[1m]))`,
+  },
+  txCollectorRequestedFractionMean: {
+    metric: "aztec_tx_collector_txs_requested_fraction",
+    unit: "fraction",
+    // Exported as a histogram even though the observation is already a fraction.
+    query: `sum(rate(aztec_tx_collector_txs_requested_fraction_sum${NS}[1m])) / sum(rate(aztec_tx_collector_txs_requested_fraction_count${NS}[1m]))`,
+  },
+  txCollectorRequestDelayP95: {
+    metric: "aztec_tx_collector_txs_requested_delay_milliseconds",
+    unit: "ms",
+    query: histQuantile(
+      0.95,
+      "aztec_tx_collector_txs_requested_delay_milliseconds_bucket",
+    ),
+  },
+  // Time-in-state per sequencer state. Empty until the new image carrying
+  // aztec.sequencer.state_duration ships to bench-10tps. Multi-series by state.
+  sequencerStateDurationP95: {
+    metric: "aztec_sequencer_state_duration_milliseconds",
+    unit: "ms",
+    query: histQuantile(
+      0.95,
+      "aztec_sequencer_state_duration_milliseconds_bucket",
+      ["aztec_sequencer_state"],
+    ),
+  },
+};
+
+async function scrapeTimeSeries(
+  startedAtEpoch: number,
+  endedAtEpoch: number,
+): Promise<Record<string, unknown>> {
+  const out: Record<string, unknown> = {};
+  for (const [slug, def] of Object.entries(TIME_SERIES_DEFS)) {
+    try {
+      const series = await queryRange(def.query, startedAtEpoch, endedAtEpoch);
+      out[slug] = {
+        metric: def.metric,
+        unit: def.unit,
+        source: "promql",
+        query: def.query,
+        stepSeconds: STEP_SECONDS,
+        series,
+      };
+    } catch (err) {
+      log(`timeSeries.${slug} scrape failed, emitting empty series`, {
+        err: err instanceof Error ? err.message : String(err),
+      });
+      out[slug] = {
+        metric: def.metric,
+        unit: def.unit,
+        source: "promql",
+        query: def.query,
+        stepSeconds: STEP_SECONDS,
+        series: [],
+      };
+    }
+  }
+  return out;
+}
+
+// --- gcloud log scrape ---
+
+type GcloudEntry = {
+  timestamp: string;
+  jsonPayload?: Record<string, unknown>;
+  resource?: { labels?: { pod_name?: string } };
+};
+
+async function gcloudRead(filter: string): Promise<GcloudEntry[]> {
+  return new Promise((resolve, reject) => {
+    const child = spawn(
+      "gcloud",
+      [
+        "logging",
+        "read",
+        filter,
+        "--project",
+        GCP_PROJECT_ID,
+        "--format=json",
+        "--order=asc",
+        "--freshness=24h",
+        "--limit=50000",
+      ],
+      { stdio: ["ignore", "pipe", "pipe"] },
+    );
+    const chunks: Buffer[] = [];
+    const errChunks: Buffer[] = [];
+    child.stdout.on("data", (c) => chunks.push(c));
+    child.stderr.on("data", (c) => errChunks.push(c));
+    child.on("exit", (code) => {
+      if (code !== 0) {
+        reject(
+          new Error(
+            `gcloud logging read exited ${code}: ${Buffer.concat(errChunks).toString()}`,
+          ),
+        );
+        return;
+      }
+      try {
+        resolve(JSON.parse(Buffer.concat(chunks).toString() || "[]"));
+      } catch (err) {
+        reject(err);
+      }
+    });
+  });
+}
+
+const timeFilter = (startedAt: string, endedAt: string) =>
+  `timestamp >= "${startedAt}" AND timestamp <= "${endedAt}"`;
+
+// --- Run-context capture (image + aztec config env) ---
+
+type RoleNode = {
+  role: string;
+  podName: string;
+  nodeName: string;
+  instanceType?: string;
+  nodePool?: string;
+};
+
+type RoleInfrastructure = {
+  instanceTypes: string[];
+  nodePools: string[];
+  nodes: RoleNode[];
+};
+
+type Infrastructure = {
+  roles: Record<string, RoleInfrastructure>;
+};
+
+const INFRASTRUCTURE_ROLE_PATTERNS = [
+  { role: "validator", pattern: /-validator(?:-|$)/ },
+  { role: "prover", pattern: /-prover-(?:agent|node|broker)(?:-|$)/ },
+  { role: "rpc", pattern: /-rpc(?:-|$)/ },
+  { role: "fullNode", pattern: /-full-node(?:-|$)/ },
+];
+
+// Curated subset of env vars worth recording per run so the dashboard can
+// show e.g. "pool=20k vs pool=1000" alongside two compared runs. Anything not
+// in this list is excluded — full env would be huge and mostly uninteresting.
+const AZTEC_CONFIG_KEYS = [
+  "SEQ_ENABLE_PROPOSER_PIPELINING",
+  "SEQ_BLOCK_DURATION_MS",
+  "SEQ_MAX_TX_PER_BLOCK",
+  "SEQ_MAX_TX_PER_CHECKPOINT",
+  "SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT",
+  "SEQ_BUILD_CHECKPOINT_IF_EMPTY",
+  "AZTEC_MANA_TARGET",
+  "P2P_MAX_PENDING_TX_COUNT",
+  "AZTEC_EPOCH_DURATION",
+  "AZTEC_SLOT_DURATION",
+  "AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET",
+  "LOG_LEVEL",
+];
+
+async function runKubectl(args: string[]): Promise<string> {
+  return new Promise((resolve, reject) => {
+    const child = spawn("kubectl", args, {
+      stdio: ["ignore", "pipe", "pipe"],
+    });
+    const chunks: Buffer[] = [];
+    const errs: Buffer[] = [];
+    child.stdout.on("data", (c) => chunks.push(c));
+    child.stderr.on("data", (c) => errs.push(c));
+    child.on("exit", (code) => {
+      if (code !== 0) {
+        reject(
+          new Error(
+            `kubectl ${args.join(" ")} exited ${code}: ${Buffer.concat(errs).toString()}`,
+          ),
+        );
+        return;
+      }
+      resolve(Buffer.concat(chunks).toString());
+    });
+  });
+}
+
+async function captureImage(): Promise<string | undefined> {
+  try {
+    const out = await runKubectl([
+      "get",
+      "statefulset",
+      `${NAMESPACE}-validator`,
+      "-n",
+      NAMESPACE,
+      "-o",
+      'jsonpath={.spec.template.spec.containers[?(@.name=="aztec")].image}',
+    ]);
+    const trimmed = out.trim();
+    return trimmed.length > 0 ? trimmed : undefined;
+  } catch (err) {
+    log("image capture failed", {
+      err: err instanceof Error ? err.message : String(err),
+    });
+    return undefined;
+  }
+}
+
+async function captureAztecConfig(): Promise<Record<string, string>> {
+  try {
+    const out = await runKubectl([
+      "exec",
+      `${NAMESPACE}-validator-0`,
+      "-c",
+      "aztec",
+      "-n",
+      NAMESPACE,
+      "--",
+      "printenv",
+    ]);
+    const aztecConfig: Record<string, string> = {};
+    for (const line of out.split("\n")) {
+      const idx = line.indexOf("=");
+      if (idx < 0) {
+        continue;
+      }
+      const key = line.slice(0, idx);
+      if (AZTEC_CONFIG_KEYS.includes(key)) {
+        aztecConfig[key] = line.slice(idx + 1);
+      }
+    }
+    return aztecConfig;
+  } catch (err) {
+    log("aztec config env capture failed", {
+      err: err instanceof Error ? err.message : String(err),
+    });
+    return {};
+  }
+}
+
+async function captureInfrastructure(): Promise<Infrastructure | undefined> {
+  try {
+    const [podsOut, nodesOut] = await Promise.all([
+      runKubectl(["get", "pods", "-n", NAMESPACE, "-o", "json"]),
+      runKubectl(["get", "nodes", "-o", "json"]),
+    ]);
+    const podsJson = JSON.parse(podsOut) as {
+      items?: Array<{
+        metadata?: { name?: string };
+        spec?: { nodeName?: string };
+      }>;
+    };
+    const nodesJson = JSON.parse(nodesOut) as {
+      items?: Array<{
+        metadata?: {
+          name?: string;
+          labels?: Record<string, string>;
+        };
+      }>;
+    };
+
+    const nodesByName = new Map(
+      (nodesJson.items ?? [])
+        .map((node) => {
+          const name = node.metadata?.name;
+          return name ? ([name, node.metadata?.labels ?? {}] as const) : null;
+        })
+        .filter(
+          (entry): entry is readonly [string, Record<string, string>] =>
+            entry !== null,
+        ),
+    );
+
+    const roleNodes = (podsJson.items ?? [])
+      .map((pod): RoleNode | undefined => {
+        const podName = pod.metadata?.name;
+        const nodeName = pod.spec?.nodeName;
+        const role = podName ? roleForPodName(podName) : undefined;
+        if (!podName || !nodeName || !role) {
+          return undefined;
+        }
+        const labels = nodesByName.get(nodeName) ?? {};
+        return {
+          role,
+          podName,
+          nodeName,
+          instanceType:
+            labels["node.kubernetes.io/instance-type"] ??
+            labels["beta.kubernetes.io/instance-type"],
+          nodePool:
+            labels["cloud.google.com/gke-nodepool"] ??
+            labels["eks.amazonaws.com/nodegroup"],
+        };
+      })
+      .filter((node): node is RoleNode => node !== undefined)
+      .sort((a, b) => a.podName.localeCompare(b.podName));
+
+    if (roleNodes.length === 0) {
+      return undefined;
+    }
+
+    const roles: Record<string, RoleInfrastructure> = {};
+    for (const { role } of INFRASTRUCTURE_ROLE_PATTERNS) {
+      const nodes = roleNodes.filter((node) => node.role === role);
+      if (nodes.length === 0) {
+        continue;
+      }
+      roles[role] = infrastructureForNodes(nodes);
+    }
+    return { roles };
+  } catch (err) {
+    log("infrastructure capture failed", {
+      err: err instanceof Error ? err.message : String(err),
+    });
+    return undefined;
+  }
+}
+
+function roleForPodName(podName: string): string | undefined {
+  if (!podName.startsWith(`${NAMESPACE}-`)) {
+    return undefined;
+  }
+  return INFRASTRUCTURE_ROLE_PATTERNS.find(({ pattern }) =>
+    pattern.test(podName),
+  )?.role;
+}
+
+function infrastructureForNodes(nodes: RoleNode[]): RoleInfrastructure {
+  return {
+    instanceTypes: Array.from(
+      new Set(
+        nodes.flatMap((node) => (node.instanceType ? [node.instanceType] : [])),
+      ),
+    ).sort(),
+    nodePools: Array.from(
+      new Set(nodes.flatMap((node) => (node.nodePool ? [node.nodePool] : []))),
+    ).sort(),
+    nodes,
+  };
+}
+
+type BlockRecord = {
+  blockNumber: number;
+  blockNumberInTest: number;
+  minedAt: string;
+  successfulCount: number;
+  failedCount: number;
+  silentlySkippedCount: number;
+  silentlySkippedDurationMs: number;
+  buildDurationSeconds: number;
+  totalPublicGas?: { daGas: number; l2Gas: number };
+  totalSizeInBytes?: number;
+  source: "log";
+};
+
+async function scrapeBlocks(
+  startedAt: string,
+  endedAt: string,
+): Promise<BlockRecord[]> {
+  const filter = [
+    `resource.labels.namespace_name="${NAMESPACE}"`,
+    `resource.labels.pod_name=~"${NAMESPACE}-(validator|rpc).*"`,
+    `jsonPayload.message=~"^Processed [0-9]+ successful txs and"`,
+    timeFilter(startedAt, endedAt),
+  ].join(" AND ");
+  const entries = await gcloudRead(filter);
+
+  // Each block is logged once per pod that processed it (validators +
+  // RPC-colocated full node sync). Dedupe by blockNumber, keep the earliest
+  // timestamp — that's most likely the proposer who built the block.
+  const byBlock = new Map<number, { entry: GcloudEntry; time: number }>();
+  for (const entry of entries) {
+    const p = entry.jsonPayload;
+    if (!p) {
+      continue;
+    }
+    const blockNumber =
+      typeof p.blockNumber === "number"
+        ? p.blockNumber
+        : typeof p.blockNumber === "string"
+          ? Number(p.blockNumber)
+          : NaN;
+    if (!Number.isFinite(blockNumber)) {
+      continue;
+    }
+    const t = Date.parse(entry.timestamp);
+    const prev = byBlock.get(blockNumber);
+    if (!prev || t < prev.time) {
+      byBlock.set(blockNumber, { entry, time: t });
+    }
+  }
+
+  if (byBlock.size === 0) {
+    return [];
+  }
+  const blockNumbers = [...byBlock.keys()].sort((a, b) => a - b);
+  const first = blockNumbers[0];
+
+  return blockNumbers.map((bn) => {
+    const { entry } = byBlock.get(bn)!;
+    const p = entry.jsonPayload!;
+    return {
+      blockNumber: bn,
+      blockNumberInTest: bn - first,
+      minedAt: entry.timestamp,
+      successfulCount: Number(p.successfulCount ?? 0),
+      failedCount: Number(p.failedCount ?? 0),
+      silentlySkippedCount: Number(p.silentlySkippedCount ?? 0),
+      silentlySkippedDurationMs: Number(p.silentlySkippedDurationMs ?? 0),
+      buildDurationSeconds: Number(p.duration ?? 0),
+      totalPublicGas: p.totalPublicGas as
+        | { daGas: number; l2Gas: number }
+        | undefined,
+      totalSizeInBytes:
+        typeof p.totalSizeInBytes === "number" ? p.totalSizeInBytes : undefined,
+      source: "log",
+    };
+  });
+}
+
+type ChainPrunedEvent = {
+  at: string;
+  type: "chainPruned";
+  source: "log";
+  fromBlock?: number;
+  toBlock?: number;
+};
+
+type SlotSummaryEvent = {
+  at: string;
+  type: "slotSummary";
+  source: "log";
+  slotNumber: number;
+  buildSlot?: number;
+  checkpointNumber?: number;
+  sourcePod?: string;
+  proposer?: string;
+  attestorAddress?: string;
+  publisherAddress?: string;
+  blocksBuilt?: number;
+  txCount?: number;
+  totalMana?: number;
+  blockBuildFailures?: Array<Record<string, unknown>>;
+  checkpointBuildFailure?: Record<string, unknown>;
+  attestations?: Record<string, unknown>;
+  publish?: Record<string, unknown>;
+};
+
+type Event = ChainPrunedEvent | SlotSummaryEvent;
+
+type SequencerStateSlot = {
+  slotNumber: number;
+  startedAt: string;
+  endedAt: string;
+  sourcePod?: string;
+  totalMs: number;
+  states: Record<string, number>;
+};
+
+const CHAIN_PRUNED_MSG = /Chain pruned to block (\d+)/;
+
+async function scrapeEvents(
+  startedAt: string,
+  endedAt: string,
+  blocks: BlockRecord[],
+): Promise<Event[]> {
+  const [chainPruned, slotSummaries] = await Promise.all([
+    scrapeChainPrunedEvents(startedAt, endedAt, blocks),
+    scrapeSlotSummaryEvents(startedAt, endedAt),
+  ]);
+  return [...chainPruned, ...slotSummaries].sort(
+    (a, b) => Date.parse(a.at) - Date.parse(b.at),
+  );
+}
+
+async function scrapeChainPrunedEvents(
+  startedAt: string,
+  endedAt: string,
+  blocks: BlockRecord[],
+): Promise<ChainPrunedEvent[]> {
+  const filter = [
+    `resource.labels.namespace_name="${NAMESPACE}"`,
+    `jsonPayload.message=~"Chain pruned to block [0-9]+"`,
+    timeFilter(startedAt, endedAt),
+  ].join(" AND ");
+  const entries = await gcloudRead(filter);
+
+  // Same real prune is logged by every node as they catch up — multiple log
+  // lines with ms-spaced timestamps for the same toBlock. But toBlock is not a
+  // unique key across a run: if proposals fail in consecutive slots after a
+  // first prune, the chain can re-prune to the same block. Dedupe by (toBlock
+  // within a 30s window of the earliest observation): preserves distinct
+  // prune events, collapses the per-node log fan-out.
+  const DEDUPE_WINDOW_MS = 30_000;
+  const parsed = entries
+    .map((entry) => {
+      const msg = (entry.jsonPayload?.message as string | undefined) ?? "";
+      const m = CHAIN_PRUNED_MSG.exec(msg);
+      if (!m) {
+        return null;
+      }
+      return {
+        at: entry.timestamp,
+        time: Date.parse(entry.timestamp),
+        toBlock: Number(m[1]),
+      };
+    })
+    .filter(
+      (x): x is { at: string; time: number; toBlock: number } => x !== null,
+    )
+    .sort((a, b) => a.time - b.time);
+
+  const deduped: typeof parsed = [];
+  for (const e of parsed) {
+    const sameEvent = deduped.find(
+      (prev) =>
+        prev.toBlock === e.toBlock && e.time - prev.time < DEDUPE_WINDOW_MS,
+    );
+    if (!sameEvent) {
+      deduped.push(e);
+    }
+  }
+
+  return deduped.map(({ at, time, toBlock }) => {
+    // fromBlock is reconstructed because server_world_state_synchronizer.ts:459
+    // doesn't log it structurally. Correlate with the latest block we've seen
+    // at or before the prune timestamp.
+    const before = blocks
+      .filter((b) => Date.parse(b.minedAt) <= time)
+      .reduce((max, b) => (b.blockNumber > max ? b.blockNumber : max), 0);
+    return {
+      at,
+      type: "chainPruned" as const,
+      source: "log" as const,
+      fromBlock: before || undefined,
+      toBlock,
+    };
+  });
+}
+
+async function scrapeSlotSummaryEvents(
+  startedAt: string,
+  endedAt: string,
+): Promise<SlotSummaryEvent[]> {
+  const filter = [
+    `resource.labels.namespace_name="${NAMESPACE}"`,
+    `resource.labels.pod_name=~"${NAMESPACE}-validator.*"`,
+    `jsonPayload.eventName=~"^(benchmark-|sequencer-checkpoint-)"`,
+    timeFilter(startedAt, endedAt),
+  ].join(" AND ");
+  const entries = await gcloudRead(filter);
+
+  const bySlot = new Map<number, SlotSummaryEvent>();
+  for (const entry of entries) {
+    const p = entry.jsonPayload;
+    const slotNumber = numberField(p?.slot);
+    if (!p || !Number.isFinite(slotNumber)) {
+      continue;
+    }
+    const eventName = normalizeSlotSummaryEventName(String(p.eventName ?? ""));
+    if (eventName === undefined) {
+      continue;
+    }
+    const event = getOrCreateSlotSummary(bySlot, slotNumber, entry);
+
+    if (eventName === "slot-started") {
+      assignDefined(event, {
+        buildSlot: numberOrUndefined(p.buildSlot),
+        checkpointNumber: numberOrUndefined(p.checkpointNumber),
+        proposer: stringOrUndefined(p.proposer),
+        attestorAddress: stringOrUndefined(p.attestorAddress),
+        publisherAddress: stringOrUndefined(p.publisherAddress),
+      });
+    } else if (eventName === "checkpoint-built") {
+      assignDefined(event, {
+        buildSlot: numberOrUndefined(p.buildSlot),
+        checkpointNumber: numberOrUndefined(p.checkpointNumber),
+        proposer: stringOrUndefined(p.proposer),
+        attestorAddress: stringOrUndefined(p.attestorAddress),
+        publisherAddress: stringOrUndefined(p.publisherAddress),
+        blocksBuilt: numberOrUndefined(p.blocksBuilt),
+        txCount: numberOrUndefined(p.txCount),
+        totalMana: numberOrUndefined(p.totalMana),
+      });
+    } else if (eventName === "block-build-failed") {
+      event.blockBuildFailures ??= [];
+      event.blockBuildFailures.push(
+        compactObject({
+          at: entry.timestamp,
+          reason: stringOrUndefined(p.reason),
+          blockNumber: numberOrUndefined(p.blockNumber),
+          checkpointNumber: numberOrUndefined(p.checkpointNumber),
+          indexWithinCheckpoint: numberOrUndefined(p.indexWithinCheckpoint),
+          availableTxs: numberOrUndefined(p.availableTxs),
+          minTxs: numberOrUndefined(p.minTxs),
+          minValidTxs: numberOrUndefined(p.minValidTxs),
+          numTxs: numberOrUndefined(p.numTxs),
+        }),
+      );
+    } else if (eventName === "checkpoint-build-failed") {
+      event.checkpointBuildFailure = compactObject({
+        at: entry.timestamp,
+        reason: stringOrUndefined(p.reason),
+        checkpointNumber: numberOrUndefined(p.checkpointNumber),
+        blocksBuilt: numberOrUndefined(p.blocksBuilt),
+        minBlocksForCheckpoint: numberOrUndefined(p.minBlocksForCheckpoint),
+      });
+    } else if (
+      eventName === "attestations-collected" ||
+      eventName === "attestations-failed"
+    ) {
+      event.attestations = compactObject({
+        status: eventName === "attestations-collected" ? "collected" : "failed",
+        checkpointNumber: numberOrUndefined(p.checkpointNumber),
+        committeeSize: numberOrUndefined(p.committeeSize),
+        requiredAttestations: numberOrUndefined(p.requiredAttestations),
+        collectedAttestations: numberOrUndefined(p.collectedAttestations),
+        submittedAttestations: numberOrUndefined(p.submittedAttestations),
+        missingValidatorCount: numberOrUndefined(p.missingValidatorCount),
+        missingValidators: stringArrayOrUndefined(p.missingValidators),
+        reason: stringOrUndefined(p.reason),
+      });
+    } else if (
+      eventName === "checkpoint-published" ||
+      eventName === "checkpoint-publish-failed"
+    ) {
+      event.publish = compactObject({
+        status: eventName === "checkpoint-published" ? "published" : "failed",
+        checkpointNumber: numberOrUndefined(p.checkpointNumber),
+        successfulActions: stringArrayOrUndefined(p.successfulActions),
+        failedActions: stringArrayOrUndefined(p.failedActions),
+        sentActions: stringArrayOrUndefined(p.sentActions),
+        expiredActions: stringArrayOrUndefined(p.expiredActions),
+        reason: stringOrUndefined(p.reason),
+      });
+    }
+  }
+
+  return [...bySlot.values()].sort((a, b) => a.slotNumber - b.slotNumber);
+}
+
+function normalizeSlotSummaryEventName(eventName: string): string | undefined {
+  if (eventName.startsWith("benchmark-")) {
+    return eventName.slice("benchmark-".length);
+  }
+  if (!eventName.startsWith("sequencer-checkpoint-")) {
+    return undefined;
+  }
+
+  const name = eventName.slice("sequencer-checkpoint-".length);
+  const aliases: Record<string, string> = {
+    built: "checkpoint-built",
+    "build-failed": "checkpoint-build-failed",
+    published: "checkpoint-published",
+    "publish-failed": "checkpoint-publish-failed",
+  };
+  return aliases[name] ?? name;
+}
+
+function getOrCreateSlotSummary(
+  bySlot: Map<number, SlotSummaryEvent>,
+  slotNumber: number,
+  entry: GcloudEntry,
+): SlotSummaryEvent {
+  const existing = bySlot.get(slotNumber);
+  if (existing) {
+    if (Date.parse(entry.timestamp) < Date.parse(existing.at)) {
+      existing.at = entry.timestamp;
+    }
+    return existing;
+  }
+  const created: SlotSummaryEvent = {
+    at: entry.timestamp,
+    type: "slotSummary",
+    source: "log",
+    slotNumber,
+    sourcePod: entry.resource?.labels?.pod_name,
+  };
+  bySlot.set(slotNumber, created);
+  return created;
+}
+
+function assignDefined(
+  target: Record<string, unknown>,
+  values: Record<string, unknown>,
+): void {
+  for (const [key, value] of Object.entries(values)) {
+    if (value !== undefined) {
+      target[key] = value;
+    }
+  }
+}
+
+function compactObject<T extends Record<string, unknown>>(obj: T): T {
+  for (const key of Object.keys(obj)) {
+    if (obj[key] === undefined) {
+      delete obj[key];
+    }
+  }
+  return obj;
+}
+
+function numberOrUndefined(v: unknown): number | undefined {
+  const n = numberField(v);
+  return Number.isFinite(n) ? n : undefined;
+}
+
+function stringOrUndefined(v: unknown): string | undefined {
+  return typeof v === "string" && v !== "" ? v : undefined;
+}
+
+function stringArrayOrUndefined(v: unknown): string[] | undefined {
+  if (!Array.isArray(v)) {
+    return undefined;
+  }
+  return v.map(String);
+}
+
+const SEQUENCER_STATE_MSG = /^Transitioning from ([A-Z_]+) to ([A-Z_]+)/;
+const PROPOSER_STATE_SCORE = new Set([
+  "INITIALIZING_CHECKPOINT",
+  "WAITING_FOR_TXS",
+  "CREATING_BLOCK",
+  "WAITING_UNTIL_NEXT_BLOCK",
+  "ASSEMBLING_CHECKPOINT",
+  "COLLECTING_ATTESTATIONS",
+  "PUBLISHING_CHECKPOINT",
+]);
+
+async function scrapeSequencerStateSlots(
+  startedAt: string,
+  endedAt: string,
+): Promise<SequencerStateSlot[]> {
+  const filter = [
+    `resource.labels.namespace_name="${NAMESPACE}"`,
+    `resource.labels.pod_name=~"${NAMESPACE}-validator.*"`,
+    `jsonPayload.message=~"^Transitioning from "`,
+    timeFilter(startedAt, endedAt),
+  ].join(" AND ");
+  const entries = await gcloudRead(filter);
+
+  type PodSlot = {
+    slotNumber: number;
+    sourcePod?: string;
+    startedAt: string;
+    endedAt: string;
+    firstTime: number;
+    lastTime: number;
+    states: Record<string, number>;
+  };
+
+  const byPodSlot = new Map<string, PodSlot>();
+
+  for (const entry of entries) {
+    const p = entry.jsonPayload;
+    if (!p) {
+      continue;
+    }
+    const message = String(p.message ?? "");
+    const match = SEQUENCER_STATE_MSG.exec(message);
+    const state =
+      typeof p.oldState === "string" ? p.oldState : (match?.[1] ?? "");
+    const slotNumber = numberField(p.stateSlotNumber);
+    const durationMs = numberField(p.stateDurationMs);
+    if (
+      !state ||
+      !Number.isFinite(slotNumber) ||
+      !Number.isFinite(durationMs)
+    ) {
+      continue;
+    }
+    const time = Date.parse(entry.timestamp);
+    if (!Number.isFinite(time)) {
+      continue;
+    }
+    const podName = entry.resource?.labels?.pod_name;
+    const key = `${podName ?? "unknown"}:${slotNumber}`;
+    const current = byPodSlot.get(key);
+    if (!current) {
+      byPodSlot.set(key, {
+        slotNumber,
+        sourcePod: podName,
+        startedAt: entry.timestamp,
+        endedAt: entry.timestamp,
+        firstTime: time,
+        lastTime: time,
+        states: { [state]: durationMs },
+      });
+      continue;
+    }
+    current.states[state] = (current.states[state] ?? 0) + durationMs;
+    if (time < current.firstTime) {
+      current.firstTime = time;
+      current.startedAt = entry.timestamp;
+    }
+    if (time > current.lastTime) {
+      current.lastTime = time;
+      current.endedAt = entry.timestamp;
+    }
+  }
+
+  // Multiple validator pods can log sequencer transitions for the same slot.
+  // For the benchmark chart we want the proposer path, so choose the pod-slot
+  // with the most time in checkpoint/block-production states.
+  const bestBySlot = new Map<number, PodSlot>();
+  for (const candidate of byPodSlot.values()) {
+    const prev = bestBySlot.get(candidate.slotNumber);
+    if (!prev || podSlotScore(candidate) > podSlotScore(prev)) {
+      bestBySlot.set(candidate.slotNumber, candidate);
+    }
+  }
+
+  return [...bestBySlot.values()]
+    .sort((a, b) => a.slotNumber - b.slotNumber)
+    .map((slot) => {
+      const totalMs = Object.values(slot.states).reduce((a, b) => a + b, 0);
+      return {
+        slotNumber: slot.slotNumber,
+        startedAt: slot.startedAt,
+        endedAt: slot.endedAt,
+        ...(slot.sourcePod !== undefined && { sourcePod: slot.sourcePod }),
+        totalMs,
+        states: slot.states,
+      };
+    });
+}
+
+function podSlotScore(slot: { states: Record<string, number> }): number {
+  let score = 0;
+  for (const [state, durationMs] of Object.entries(slot.states)) {
+    score += PROPOSER_STATE_SCORE.has(state) ? durationMs * 10 : durationMs;
+  }
+  return score;
+}
+
+function numberField(v: unknown): number {
+  if (typeof v === "number") {
+    return Number.isFinite(v) ? v : NaN;
+  }
+  if (typeof v === "string" && v.trim() !== "") {
+    const n = Number(v);
+    return Number.isFinite(n) ? n : NaN;
+  }
+  return NaN;
+}
+
+// --- Summary ---
+
+const meanNonNull = (points: TsPoint[]): number | null => {
+  const vals = points
+    .map((p) => p.value)
+    .filter((v): v is number => v !== null && Number.isFinite(v));
+  if (vals.length === 0) {
+    return null;
+  }
+  return vals.reduce((a, b) => a + b, 0) / vals.length;
+};
+
+const maxNonNull = (points: TsPoint[]): number | null => {
+  const vals = points
+    .map((p) => p.value)
+    .filter((v): v is number => v !== null && Number.isFinite(v));
+  return vals.length === 0 ? null : Math.max(...vals);
+};
+
+type SummaryArgs = {
+  targetTps: number;
+  startedAtEpoch: number;
+  inclusionEndedAtEpoch: number;
+  windowSec: number;
+  histogramWindowSec: number;
+  endedAtEpoch: number;
+  timeSeries: Record<string, { series: SeriesEntry[] }>;
+  blocks: BlockRecord[];
+  events: Event[];
+};
+
+async function buildSummary(a: SummaryArgs): Promise<Record<string, unknown>> {
+  // inclusionTps is single-series; series[0] holds all points.
+  const inclusionPoints = (
+    a.timeSeries.inclusionTps?.series?.[0]?.points ?? []
+  ).filter(
+    (p) =>
+      p.unixEpoch >= a.startedAtEpoch && p.unixEpoch <= a.inclusionEndedAtEpoch,
+  );
+  const inclusionBlocks = a.blocks.filter((b) => {
+    const minedAtEpoch = Math.floor(Date.parse(b.minedAt) / 1000);
+    return (
+      Number.isFinite(minedAtEpoch) &&
+      minedAtEpoch >= a.startedAtEpoch &&
+      minedAtEpoch <= a.inclusionEndedAtEpoch
+    );
+  });
+  const totalTxsMined = inclusionBlocks.reduce(
+    (s, b) => s + b.successfulCount,
+    0,
+  );
+  const inclusionTpsMean =
+    a.windowSec > 0
+      ? totalTxsMined / a.windowSec
+      : meanNonNull(inclusionPoints);
+  const inclusionTpsPeak = maxNonNull(inclusionPoints);
+
+  const safeInstant = async (promql: string): Promise<number | null> => {
+    try {
+      return await queryInstant(promql, a.endedAtEpoch);
+    } catch (err) {
+      log("summary instant query failed", {
+        err: err instanceof Error ? err.message : String(err),
+        promql,
+      });
+      return null;
+    }
+  };
+
+  const windowSpec = `${a.histogramWindowSec}s`;
+  const oneShotQuantile = (q: number, bucket: string) =>
+    `histogram_quantile(${q}, sum by (le)(rate(${bucket}${NS}[${windowSpec}])))`;
+
+  const [
+    inclLatP50,
+    inclLatP95,
+    inclLatP99,
+    buildP50,
+    buildP95,
+    ppTxP50,
+    ppTxP95,
+  ] = await Promise.all([
+    safeInstant(
+      oneShotQuantile(0.5, "aztec_mempool_tx_mined_delay_milliseconds_bucket"),
+    ),
+    safeInstant(
+      oneShotQuantile(0.95, "aztec_mempool_tx_mined_delay_milliseconds_bucket"),
+    ),
+    safeInstant(
+      oneShotQuantile(0.99, "aztec_mempool_tx_mined_delay_milliseconds_bucket"),
+    ),
+    safeInstant(
+      oneShotQuantile(
+        0.5,
+        "aztec_sequencer_block_build_duration_milliseconds_bucket",
+      ),
+    ),
+    safeInstant(
+      oneShotQuantile(
+        0.95,
+        "aztec_sequencer_block_build_duration_milliseconds_bucket",
+      ),
+    ),
+    safeInstant(
+      oneShotQuantile(
+        0.5,
+        "aztec_public_processor_tx_duration_milliseconds_bucket",
+      ),
+    ),
+    safeInstant(
+      oneShotQuantile(
+        0.95,
+        "aztec_public_processor_tx_duration_milliseconds_bucket",
+      ),
+    ),
+  ]);
+
+  const reorgs = a.events.filter((e) => e.type === "chainPruned");
+  const deepest = reorgs.reduce((max, e) => {
+    const d = (e.fromBlock ?? 0) - (e.toBlock ?? 0);
+    return d > max ? d : max;
+  }, 0);
+
+  return {
+    headlineKpi:
+      inclusionTpsMean === null ? null : inclusionTpsMean / a.targetTps,
+    targetTps: a.targetTps,
+    inclusionTpsMean,
+    inclusionTpsPeak,
+    inclusionLatencyP50Ms: inclLatP50,
+    inclusionLatencyP95Ms: inclLatP95,
+    inclusionLatencyP99Ms: inclLatP99,
+    blockBuildDurationP50Ms: buildP50,
+    blockBuildDurationP95Ms: buildP95,
+    publicProcessorTxDurationP50Ms: ppTxP50,
+    publicProcessorTxDurationP95Ms: ppTxP95,
+    totalTxsMined,
+    totalTxsFailed: inclusionBlocks.reduce((s, b) => s + b.failedCount, 0),
+    totalSilentSkipCount: inclusionBlocks.reduce(
+      (s, b) => s + b.silentlySkippedCount,
+      0,
+    ),
+    totalSilentSkipDurationMs: inclusionBlocks.reduce(
+      (s, b) => s + b.silentlySkippedDurationMs,
+      0,
+    ),
+    reorgCount: reorgs.length,
+    deepestReorgBlocks: deepest,
+  };
+}
+
+// --- Inline shape validation ---
+
+function assertShape(payload: Record<string, unknown>): void {
+  const required = [
+    "schemaVersion",
+    "run",
+    "summary",
+    "timeSeries",
+    "blocks",
+    "events",
+  ] as const;
+  for (const key of required) {
+    if (!(key in payload)) {
+      throw new Error(`output missing required top-level key: ${key}`);
+    }
+  }
+  if (payload.schemaVersion !== "3") {
+    throw new Error(
+      `schemaVersion must be "3", got ${String(payload.schemaVersion)}`,
+    );
+  }
+  const run = payload.run as Record<string, unknown>;
+  for (const key of ["runId", "startedAt", "endedAt", "namespace"] as const) {
+    if (!(key in run)) {
+      throw new Error(`run.${key} missing`);
+    }
+  }
+}
+
+// --- Live drain gate ---
+
+async function waitForScrapeWindowEnd(args: Args, endedAtEpoch: number) {
+  const minimumEndEpoch = endedAtEpoch + DRAIN_BUFFER_SECONDS;
+  const invokedAtEpoch = Math.floor(Date.now() / 1000);
+
+  if (!args.waitForPendingZero) {
+    const drainSeconds = Math.max(0, minimumEndEpoch - invokedAtEpoch);
+    if (drainSeconds > 0) {
+      log(
+        `Draining ${drainSeconds}s to let OTel batches (60s) + Prom scrape (15s) settle`,
+      );
+      await sleep(drainSeconds * 1000);
+    }
+    return {
+      scrapeWindowEndEpoch: minimumEndEpoch,
+      inclusionEndedAtEpoch: minimumEndEpoch,
+      pendingAtEnd: null as number | null,
+      pendingByRoleAtEnd: null,
+      pendingTimedOut: false,
+    };
+  }
+
+  if (
+    !Number.isFinite(args.maxPendingWaitSeconds) ||
+    args.maxPendingWaitSeconds < 0
+  ) {
+    throw new Error(
+      `invalid --max-pending-wait-seconds: ${args.maxPendingWaitSeconds}`,
+    );
+  }
+
+  const deadlineEpoch = endedAtEpoch + args.maxPendingWaitSeconds;
+  const historicalZeroEpoch = await findPendingZeroEpoch(
+    endedAtEpoch,
+    Math.min(invokedAtEpoch, deadlineEpoch),
+  );
+  if (historicalZeroEpoch !== undefined) {
+    const scrapeWindowEndEpoch = Math.max(
+      minimumEndEpoch,
+      historicalZeroEpoch + DRAIN_BUFFER_SECONDS,
+    );
+    const waitSeconds = Math.max(0, scrapeWindowEndEpoch - invokedAtEpoch);
+    if (waitSeconds > 0) {
+      log("Pending txs drained; waiting for telemetry/log settle window", {
+        pendingZeroAt: historicalZeroEpoch,
+        waitSeconds,
+      });
+      await sleep(waitSeconds * 1000);
+    } else {
+      log("Found historical pending-drain point; starting scrape", {
+        pendingZeroAt: historicalZeroEpoch,
+        scrapeWindowEndEpoch,
+      });
+    }
+    return {
+      scrapeWindowEndEpoch,
+      inclusionEndedAtEpoch: historicalZeroEpoch,
+      pendingAtEnd: 0,
+      pendingByRoleAtEnd: await readPendingByRole(scrapeWindowEndEpoch),
+      pendingTimedOut: false,
+    };
+  }
+
+  let lastPending: number | null = null;
+  let pendingZeroSinceEpoch: number | undefined;
+
+  while (Math.floor(Date.now() / 1000) <= deadlineEpoch) {
+    const nowEpoch = Math.floor(Date.now() / 1000);
+    try {
+      lastPending = await queryInstant(PENDING_VALIDATOR_TXS_QUERY, nowEpoch);
+      const pending = lastPending;
+      pendingZeroSinceEpoch =
+        pending !== null && pending <= 0
+          ? (pendingZeroSinceEpoch ?? nowEpoch)
+          : undefined;
+      const zeroSettleEndEpoch =
+        pendingZeroSinceEpoch === undefined
+          ? undefined
+          : pendingZeroSinceEpoch + DRAIN_BUFFER_SECONDS;
+      const scrapeReadyEpoch = Math.max(
+        minimumEndEpoch,
+        zeroSettleEndEpoch ?? Number.POSITIVE_INFINITY,
+      );
+      const settleRemainingSeconds = Math.max(
+        0,
+        Number.isFinite(scrapeReadyEpoch) ? scrapeReadyEpoch - nowEpoch : 0,
+      );
+      if (pending !== null && pending <= 0 && settleRemainingSeconds === 0) {
+        const pendingByRoleAtEnd = await readPendingByRole(scrapeReadyEpoch);
+        log("Validator pending txs drained; starting scrape", {
+          pending,
+          pendingByRoleAtEnd,
+        });
+        return {
+          scrapeWindowEndEpoch: scrapeReadyEpoch,
+          inclusionEndedAtEpoch: pendingZeroSinceEpoch ?? nowEpoch,
+          pendingAtEnd: pending,
+          pendingByRoleAtEnd,
+          pendingTimedOut: false,
+        };
+      }
+      log("Waiting for validator pending txs to drain before scrape", {
+        validatorPending: pending,
+        pendingZeroSinceEpoch,
+        settleRemainingSeconds,
+        timeoutRemainingSeconds: Math.max(0, deadlineEpoch - nowEpoch),
+      });
+    } catch (err) {
+      log("pending tx drain check failed", {
+        err: err instanceof Error ? err.message : String(err),
+        timeoutRemainingSeconds: Math.max(0, deadlineEpoch - nowEpoch),
+      });
+    }
+    await sleep(PENDING_POLL_SECONDS * 1000);
+  }
+
+  const nowEpoch = Math.floor(Date.now() / 1000);
+  log("Timed out waiting for pending txs to drain; scraping current window", {
+    validatorPending: lastPending,
+    maxPendingWaitSeconds: args.maxPendingWaitSeconds,
+  });
+  return {
+    scrapeWindowEndEpoch: Math.max(nowEpoch, minimumEndEpoch),
+    inclusionEndedAtEpoch: Math.max(nowEpoch, minimumEndEpoch),
+    pendingAtEnd: lastPending,
+    pendingByRoleAtEnd: await readPendingByRole(nowEpoch),
+    pendingTimedOut: true,
+  };
+}
+
+async function readPendingByRole(tEpoch: number) {
+  const read = async (promql: string): Promise<number | null> => {
+    try {
+      return await queryInstant(promql, tEpoch);
+    } catch (err) {
+      log("pending-by-role instant query failed", {
+        err: err instanceof Error ? err.message : String(err),
+        promql,
+      });
+      return null;
+    }
+  };
+  const [rpc, validator, fullNode] = await Promise.all([
+    read(PENDING_RPC_TXS_QUERY),
+    read(PENDING_VALIDATOR_TXS_QUERY),
+    read(PENDING_FULL_NODE_TXS_QUERY),
+  ]);
+  return { rpc, validator, fullNode };
+}
+
+async function findPendingZeroEpoch(
+  startEpoch: number,
+  endEpoch: number,
+): Promise<number | undefined> {
+  if (endEpoch <= startEpoch) {
+    return undefined;
+  }
+  try {
+    const series = await queryRange(
+      PENDING_VALIDATOR_TXS_QUERY,
+      startEpoch,
+      endEpoch,
+      PENDING_POLL_SECONDS,
+    );
+    const points = series
+      .flatMap((s) => s.points)
+      .sort((a, b) => {
+        return a.unixEpoch - b.unixEpoch;
+      });
+    return points.find((p) => p.value !== null && p.value <= 0)?.unixEpoch;
+  } catch (err) {
+    log("historical pending tx drain check failed", {
+      err: err instanceof Error ? err.message : String(err),
+    });
+    return undefined;
+  }
+}
+
+// --- Main ---
+
+async function main(): Promise<void> {
+  const args = parseArgs();
+  const startedAtEpoch = Math.floor(Date.parse(args.startedAt) / 1000);
+  const endedAtEpoch = Math.floor(Date.parse(args.endedAt) / 1000);
+  if (!Number.isFinite(startedAtEpoch) || !Number.isFinite(endedAtEpoch)) {
+    throw new Error(
+      `invalid timestamp: started=${args.startedAt}, ended=${args.endedAt}`,
+    );
+  }
+  const windowSec = Math.max(1, endedAtEpoch - startedAtEpoch);
+
+  log("Opening port-forward to Prometheus");
+  const teardown = await portForwardProm();
+
+  try {
+    const drain = await waitForScrapeWindowEnd(args, endedAtEpoch);
+    const drainEndedAt = new Date(
+      drain.scrapeWindowEndEpoch * 1000,
+    ).toISOString();
+
+    // Bounded window: by default [startedAt, endedAt + drain buffer]. Live runs
+    // can opt into extending the end until pending TxPool depth reaches zero.
+    const promEndEpoch = drain.scrapeWindowEndEpoch;
+
+    log("Capturing run context (image + aztec config env + pod nodes)");
+    const [capturedImage, capturedAztecConfig, capturedInfrastructure] =
+      await Promise.all([
+        captureImage(),
+        captureAztecConfig(),
+        captureInfrastructure(),
+      ]);
+    const previousRunContext = await loadPreviousRunContext(args.output);
+    const image = capturedImage ?? previousRunContext.image;
+    const aztecConfig =
+      Object.keys(capturedAztecConfig).length > 0
+        ? capturedAztecConfig
+        : (previousRunContext.aztecConfig ?? {});
+    const infrastructure =
+      capturedInfrastructure ?? previousRunContext.infrastructure;
+
+    log("Scraping Prometheus time-series");
+    const timeSeries = await scrapeTimeSeries(startedAtEpoch, promEndEpoch);
+
+    log("Scraping per-block logs from gcloud");
+    // Extend the log window by the drain buffer too — some blocks near endedAt
+    // arrive in gcloud after the test stops sending.
+    const logEndedAt = drainEndedAt;
+    let blocks: BlockRecord[] = [];
+    try {
+      blocks = await scrapeBlocks(args.startedAt, logEndedAt);
+      log(`Collected ${blocks.length} block records`);
+    } catch (err) {
+      log("blocks scrape failed", {
+        err: err instanceof Error ? err.message : String(err),
+      });
+    }
+
+    log("Scraping event logs from gcloud");
+    let events: Event[] = [];
+    try {
+      events = await scrapeEvents(args.startedAt, logEndedAt, blocks);
+      log(`Collected ${events.length} events`);
+    } catch (err) {
+      log("events scrape failed", {
+        err: err instanceof Error ? err.message : String(err),
+      });
+    }
+
+    log("Scraping sequencer state transition logs from gcloud");
+    let sequencerStateSlots: SequencerStateSlot[] = [];
+    try {
+      sequencerStateSlots = await scrapeSequencerStateSlots(
+        args.startedAt,
+        logEndedAt,
+      );
+      log(`Collected ${sequencerStateSlots.length} sequencer state slots`);
+    } catch (err) {
+      log("sequencer state scrape failed", {
+        err: err instanceof Error ? err.message : String(err),
+      });
+    }
+
+    log("Building summary");
+    const observedWindowSec = Math.max(
+      1,
+      drain.inclusionEndedAtEpoch - startedAtEpoch,
+    );
+    const summary = await buildSummary({
+      targetTps: args.targetTps,
+      startedAtEpoch,
+      inclusionEndedAtEpoch: drain.inclusionEndedAtEpoch,
+      windowSec: observedWindowSec,
+      histogramWindowSec: observedWindowSec,
+      endedAtEpoch: drain.inclusionEndedAtEpoch,
+      timeSeries: timeSeries as Record<string, { series: SeriesEntry[] }>,
+      blocks,
+      events,
+    });
+
+    const payload = {
+      schemaVersion: "3",
+      run: {
+        runId: args.runId,
+        startedAt: args.startedAt,
+        endedAt: args.endedAt,
+        inclusionEndedAt: new Date(
+          drain.inclusionEndedAtEpoch * 1000,
+        ).toISOString(),
+        drainEndedAt,
+        namespace: NAMESPACE,
+        gcpProject: GCP_PROJECT_ID,
+        gcpLocation: GCP_REGION,
+        gkeCluster: GKE_CLUSTER,
+        ...(image !== undefined && { image }),
+        targetTps: args.targetTps,
+        testDurationSeconds: windowSec,
+        workload: args.workload,
+        ...(Object.keys(aztecConfig).length > 0 && { aztecConfig }),
+        ...(infrastructure !== undefined && { infrastructure }),
+        scrapeConfig: {
+          drainSeconds: Math.max(0, drain.scrapeWindowEndEpoch - endedAtEpoch),
+          stepSeconds: STEP_SECONDS,
+          promUrl: `http://localhost:${PROM_PORT}`,
+          waitForPendingZero: args.waitForPendingZero,
+          maxPendingWaitSeconds: args.maxPendingWaitSeconds,
+          pendingAtScrape: drain.pendingAtEnd,
+          pendingByRoleAtScrape: drain.pendingByRoleAtEnd,
+          pendingWaitTimedOut: drain.pendingTimedOut,
+        },
+      },
+      summary,
+      timeSeries,
+      blocks,
+      events,
+      sequencerStateSlots,
+    };
+
+    assertShape(payload);
+
+    const outPath = args.output ?? `/tmp/bench-10tps-${args.runId}.json`;
+    await writeFile(outPath, JSON.stringify(payload, null, 2));
+    // stdout: single line, consumed by the shell wrapper.
+    console.log(outPath);
+  } finally {
+    teardown();
+  }
+}
+
+main().catch((err) => {
+  stderr.write(
+    `[scrape] fatal: ${err instanceof Error ? (err.stack ?? err.message) : String(err)}\n`,
+  );
+  exit(1);
+});
diff --git a/spartan/scripts/check_env_vars.sh b/spartan/scripts/check_env_vars.sh
index a42f9c25427d..4622a51757f1 100755
--- a/spartan/scripts/check_env_vars.sh
+++ b/spartan/scripts/check_env_vars.sh
@@ -115,7 +115,7 @@ EXCLUDED_VARS_ARRAY=(
     "ETH_DEVNET_VALUES"
     "EXPOSE_HTTPS_BOOTNODE"
     "GAS_LIMIT"
-    "GCP_PROJECT"
+    "GCP_PROJECT_ID"
     "GCP_REGION"
     "GKE_CLUSTER_CONTEXT"
     "GRAFANA_PASSWORD_SECRET_NAME"
diff --git a/spartan/scripts/deploy_network.sh b/spartan/scripts/deploy_network.sh
index 85568aa25957..6027cad2d272 100755
--- a/spartan/scripts/deploy_network.sh
+++ b/spartan/scripts/deploy_network.sh
@@ -121,6 +121,7 @@ PROVER_FAILED_PROOF_STORE=${PROVER_FAILED_PROOF_STORE:-}
 SEQ_MIN_TX_PER_BLOCK=${SEQ_MIN_TX_PER_BLOCK:-1}
 SEQ_MAX_TX_PER_BLOCK=${SEQ_MAX_TX_PER_BLOCK:-null}
 SEQ_MAX_TX_PER_CHECKPOINT=${SEQ_MAX_TX_PER_CHECKPOINT:-8}
+P2P_MAX_PENDING_TX_COUNT=${P2P_MAX_PENDING_TX_COUNT:-null}
 SEQ_PER_BLOCK_ALLOCATION_MULTIPLIER=${SEQ_PER_BLOCK_ALLOCATION_MULTIPLIER:-null}
 SEQ_BLOCK_DURATION_MS=${SEQ_BLOCK_DURATION_MS:-}
 SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT=${SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT:-}
@@ -570,6 +571,7 @@ VALIDATOR_HA_OLD_DUTIES_MAX_AGE_H = ${VALIDATOR_HA_OLD_DUTIES_MAX_AGE_H}
 SEQ_MIN_TX_PER_BLOCK = ${SEQ_MIN_TX_PER_BLOCK}
 SEQ_MAX_TX_PER_BLOCK = ${SEQ_MAX_TX_PER_BLOCK}
 SEQ_MAX_TX_PER_CHECKPOINT = ${SEQ_MAX_TX_PER_CHECKPOINT}
+P2P_MAX_PENDING_TX_COUNT = ${P2P_MAX_PENDING_TX_COUNT}
 SEQ_PER_BLOCK_ALLOCATION_MULTIPLIER = ${SEQ_PER_BLOCK_ALLOCATION_MULTIPLIER}
 SEQ_BLOCK_DURATION_MS = ${SEQ_BLOCK_DURATION_MS:-null}
 SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT = ${SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT:-null}
diff --git a/spartan/terraform/deploy-aztec-infra/main.tf b/spartan/terraform/deploy-aztec-infra/main.tf
index 125009ce7e70..6b4d33e803fb 100644
--- a/spartan/terraform/deploy-aztec-infra/main.tf
+++ b/spartan/terraform/deploy-aztec-infra/main.tf
@@ -220,6 +220,7 @@ locals {
     "validator.node.env.SEQ_MIN_TX_PER_BLOCK"                     = var.SEQ_MIN_TX_PER_BLOCK
     "validator.node.env.SEQ_MAX_TX_PER_BLOCK"                     = var.SEQ_MAX_TX_PER_BLOCK
     "validator.node.env.SEQ_MAX_TX_PER_CHECKPOINT"                = var.SEQ_MAX_TX_PER_CHECKPOINT
+    "validator.node.env.P2P_MAX_PENDING_TX_COUNT"                 = var.P2P_MAX_PENDING_TX_COUNT
     "validator.node.env.SEQ_PER_BLOCK_ALLOCATION_MULTIPLIER"      = var.SEQ_PER_BLOCK_ALLOCATION_MULTIPLIER
     "validator.node.env.SEQ_BLOCK_DURATION_MS"                    = var.SEQ_BLOCK_DURATION_MS
     "validator.node.env.SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT" = var.SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT
@@ -315,10 +316,11 @@ locals {
         }
       })]
       custom_settings = {
-        "nodeType"                    = "p2p-bootstrap"
-        "service.p2p.nodePortEnabled" = var.P2P_NODEPORT_ENABLED
-        "service.p2p.announcePort"    = local.p2p_port_p2p_bootstrap
-        "service.p2p.port"            = local.p2p_port_p2p_bootstrap
+        "nodeType"                          = "p2p-bootstrap"
+        "service.p2p.nodePortEnabled"       = var.P2P_NODEPORT_ENABLED
+        "service.p2p.announcePort"          = local.p2p_port_p2p_bootstrap
+        "service.p2p.port"                  = local.p2p_port_p2p_bootstrap
+        "node.env.P2P_MAX_PENDING_TX_COUNT" = var.P2P_MAX_PENDING_TX_COUNT
       }
       boot_node_host_path  = ""
       bootstrap_nodes_path = ""
@@ -402,8 +404,10 @@ locals {
           "node.node.env.P2P_GOSSIPSUB_DLO"                     = var.P2P_GOSSIPSUB_DLO
           "node.node.env.P2P_GOSSIPSUB_DHI"                     = var.P2P_GOSSIPSUB_DHI
           "node.node.env.P2P_DROP_TX_CHANCE"                    = var.P2P_DROP_TX_CHANCE
+          "node.node.env.P2P_MAX_PENDING_TX_COUNT"              = var.P2P_MAX_PENDING_TX_COUNT
           "node.node.env.WS_NUM_HISTORIC_CHECKPOINTS"           = var.WS_NUM_HISTORIC_CHECKPOINTS
           "node.node.env.TX_COLLECTION_FILE_STORE_URLS"         = var.TX_COLLECTION_FILE_STORE_URLS
+          "node.node.env.SEQ_ENABLE_PROPOSER_PIPELINING"        = var.SEQ_ENABLE_PROPOSER_PIPELINING
           "node.service.p2p.nodePortEnabled"                    = var.P2P_NODEPORT_ENABLED
           "node.service.p2p.announcePort"                       = local.p2p_port_prover
           "node.service.p2p.port"                               = local.p2p_port_prover
@@ -481,10 +485,12 @@ locals {
         "node.env.P2P_GOSSIPSUB_DLO"                  = var.P2P_GOSSIPSUB_DLO
         "node.env.P2P_GOSSIPSUB_DHI"                  = var.P2P_GOSSIPSUB_DHI
         "node.env.P2P_DROP_TX_CHANCE"                 = var.P2P_DROP_TX_CHANCE
+        "node.env.P2P_MAX_PENDING_TX_COUNT"           = var.P2P_MAX_PENDING_TX_COUNT
         "node.env.WS_NUM_HISTORIC_CHECKPOINTS"        = var.WS_NUM_HISTORIC_CHECKPOINTS
         "node.env.TX_FILE_STORE_ENABLED"              = var.TX_FILE_STORE_ENABLED
         "node.env.TX_FILE_STORE_URL"                  = var.TX_FILE_STORE_URL
         "node.env.TX_COLLECTION_FILE_STORE_URLS"      = var.TX_COLLECTION_FILE_STORE_URLS
+        "node.env.SEQ_ENABLE_PROPOSER_PIPELINING"     = var.SEQ_ENABLE_PROPOSER_PIPELINING
       })
       boot_node_host_path  = "node.env.BOOT_NODE_HOST"
       bootstrap_nodes_path = "node.env.BOOTSTRAP_NODES"
@@ -515,6 +521,7 @@ locals {
         "node.proverRealProofs"                       = var.PROVER_REAL_PROOFS
         "node.env.BLOB_ALLOW_EMPTY_SOURCES"           = var.BLOB_ALLOW_EMPTY_SOURCES
         "node.env.WS_NUM_HISTORIC_CHECKPOINTS"        = var.WS_NUM_HISTORIC_CHECKPOINTS
+        "node.env.P2P_MAX_PENDING_TX_COUNT"           = var.P2P_MAX_PENDING_TX_COUNT
         "node.env.P2P_TX_POOL_DELETE_TXS_AFTER_REORG" = var.P2P_TX_POOL_DELETE_TXS_AFTER_REORG
         "node.secret.envEnabled"                      = true
         "node.env.FISHERMAN_MODE"                     = "true"
@@ -523,6 +530,7 @@ locals {
         "node.secret.mnemonicIndex"                   = var.FISHERMAN_MNEMONIC_START_INDEX
         "node.env.KEY_INDEX_START"                    = var.FISHERMAN_MNEMONIC_START_INDEX
         "node.env.VALIDATORS_PER_NODE"                = "1"
+        "node.env.SEQ_ENABLE_PROPOSER_PIPELINING"     = var.SEQ_ENABLE_PROPOSER_PIPELINING
         "node.preStartScript"                         = "source /scripts/get-private-key.sh"
       }
       boot_node_host_path  = "node.env.BOOT_NODE_HOST"
@@ -564,8 +572,10 @@ locals {
         "node.env.P2P_GOSSIPSUB_DLO"                  = var.P2P_GOSSIPSUB_DLO
         "node.env.P2P_GOSSIPSUB_DHI"                  = var.P2P_GOSSIPSUB_DHI
         "node.env.P2P_DROP_TX_CHANCE"                 = var.P2P_DROP_TX_CHANCE
+        "node.env.P2P_MAX_PENDING_TX_COUNT"           = var.P2P_MAX_PENDING_TX_COUNT
         "node.env.WS_NUM_HISTORIC_CHECKPOINTS"        = var.WS_NUM_HISTORIC_CHECKPOINTS
         "node.env.TX_COLLECTION_FILE_STORE_URLS"      = var.TX_COLLECTION_FILE_STORE_URLS
+        "node.env.SEQ_ENABLE_PROPOSER_PIPELINING"     = var.SEQ_ENABLE_PROPOSER_PIPELINING
       }
       boot_node_host_path  = "node.env.BOOT_NODE_HOST"
       bootstrap_nodes_path = "node.env.BOOTSTRAP_NODES"
@@ -604,9 +614,11 @@ locals {
         "node.env.P2P_GOSSIPSUB_DLO"                  = var.P2P_GOSSIPSUB_DLO
         "node.env.P2P_GOSSIPSUB_DHI"                  = var.P2P_GOSSIPSUB_DHI
         "node.env.P2P_DROP_TX_CHANCE"                 = var.P2P_DROP_TX_CHANCE
+        "node.env.P2P_MAX_PENDING_TX_COUNT"           = var.P2P_MAX_PENDING_TX_COUNT
         "node.env.WS_NUM_HISTORIC_CHECKPOINTS"        = var.WS_NUM_HISTORIC_CHECKPOINTS
         "node.env.TX_COLLECTION_FILE_STORE_URLS"      = var.TX_COLLECTION_FILE_STORE_URLS
         "node.env.BLOB_FILE_STORE_URLS"               = var.BLOB_FILE_STORE_URLS
+        "node.env.SEQ_ENABLE_PROPOSER_PIPELINING"     = var.SEQ_ENABLE_PROPOSER_PIPELINING
       }
       boot_node_host_path  = "node.env.BOOT_NODE_HOST"
       bootstrap_nodes_path = "node.env.BOOTSTRAP_NODES"
@@ -641,7 +653,9 @@ locals {
         "node.env.P2P_GOSSIPSUB_DLO"                 = var.P2P_GOSSIPSUB_DLO
         "node.env.P2P_GOSSIPSUB_DHI"                 = var.P2P_GOSSIPSUB_DHI
         "node.env.P2P_DROP_TX_CHANCE"                = var.P2P_DROP_TX_CHANCE
+        "node.env.P2P_MAX_PENDING_TX_COUNT"          = var.P2P_MAX_PENDING_TX_COUNT
         "node.env.WS_NUM_HISTORIC_CHECKPOINTS"       = var.WS_NUM_HISTORIC_CHECKPOINTS
+        "node.env.SEQ_ENABLE_PROPOSER_PIPELINING"    = var.SEQ_ENABLE_PROPOSER_PIPELINING
       }
       boot_node_host_path  = "node.env.BOOT_NODE_HOST"
       bootstrap_nodes_path = "node.env.BOOTSTRAP_NODES"
diff --git a/spartan/terraform/deploy-aztec-infra/variables.tf b/spartan/terraform/deploy-aztec-infra/variables.tf
index 9bea5661f8bd..834b4d833217 100644
--- a/spartan/terraform/deploy-aztec-infra/variables.tf
+++ b/spartan/terraform/deploy-aztec-infra/variables.tf
@@ -389,6 +389,12 @@ variable "SEQ_MAX_TX_PER_CHECKPOINT" {
   default     = null
 }
 
+variable "P2P_MAX_PENDING_TX_COUNT" {
+  description = "Maximum number of pending txs the local mempool will hold before evictions kick in"
+  type        = string
+  default     = null
+}
+
 variable "SEQ_ENFORCE_TIME_TABLE" {
   description = "Whether to enforce the time table when building blocks"
   type        = string
diff --git a/spartan/terraform/deploy-metrics/main.tf b/spartan/terraform/deploy-metrics/main.tf
index 3a38d21eada9..57467ee59855 100644
--- a/spartan/terraform/deploy-metrics/main.tf
+++ b/spartan/terraform/deploy-metrics/main.tf
@@ -65,6 +65,19 @@ provider "helm" {
   }
 }
 
+locals {
+  metrics_chart_path = "${path.module}/../../metrics"
+  metrics_chart_trigger_files = sort(concat(
+    tolist(fileset(local.metrics_chart_path, "Chart.yaml")),
+    tolist(fileset(local.metrics_chart_path, "Chart.lock")),
+    tolist(fileset(local.metrics_chart_path, "templates/**")),
+    tolist(fileset(local.metrics_chart_path, "grafana/**")),
+  ))
+  metrics_chart_content_hash = sha256(join("", [
+    for file in local.metrics_chart_trigger_files : "${file}:${filesha256("${local.metrics_chart_path}/${file}")}"
+  ]))
+}
+
 # Aztec Helm release for gke-cluster
 resource "helm_release" "aztec-gke-cluster" {
   provider          = helm.gke-cluster
@@ -76,13 +89,16 @@ resource "helm_release" "aztec-gke-cluster" {
   upgrade_install   = true
   dependency_update = true
   force_update      = true
-  reuse_values      = true
+  reuse_values      = false
 
   # base values file
   values = [
     file("../../metrics/values.yaml"),
     file("../../metrics/values/${var.VALUES_FILE}"),
     yamlencode({
+      aztecMetricsChart = {
+        contentHash = local.metrics_chart_content_hash
+      }
       grafana = {
         service = {
           annotations = {
@@ -99,6 +115,9 @@ resource "helm_release" "aztec-gke-cluster" {
             "ingress.gcp.kubernetes.io/pre-shared-cert"   = data.terraform_remote_state.ssl.outputs.grafana_cert_name
           }
         }
+        podAnnotations = {
+          "aztec.network/metrics-chart-content-hash" = local.metrics_chart_content_hash
+        }
         admin = {
           existingSecret = "grafana-admin"
           passwordKey    = "admin-password"
@@ -106,7 +125,21 @@ resource "helm_release" "aztec-gke-cluster" {
 
         env = {
           # we have to set an admin username through env vars otherwise the chart expects to find an 'admin-user' key in the admin secret
-          GF_SECURITY_ADMIN_USER = "admin"
+          GF_SECURITY_ADMIN_USER       = "admin"
+          SLACK_ALERT_MENTION_USER_IDS = join(",", var.SLACK_ALERT_MENTION_USER_IDS)
+        }
+
+        sidecar = {
+          alerts = {
+            env = {
+              REQ_USERNAME = "admin"
+            }
+          }
+          dashboards = {
+            env = {
+              REQ_USERNAME = "admin"
+            }
+          }
         }
 
         envFromSecrets = [
diff --git a/spartan/terraform/deploy-metrics/variables.tf b/spartan/terraform/deploy-metrics/variables.tf
index 88ca6e974f13..f7327e84877e 100644
--- a/spartan/terraform/deploy-metrics/variables.tf
+++ b/spartan/terraform/deploy-metrics/variables.tf
@@ -70,6 +70,12 @@ variable "SLACK_WEBHOOK_MAINNET_SECRET_NAME" {
   default     = "slack-webhook-mainnet-url"
 }
 
+variable "SLACK_ALERT_MENTION_USER_IDS" {
+  description = "Optional Slack user IDs to mention on Grafana alert notifications."
+  type        = list(string)
+  default     = ["U0AHB6VR8N5"]
+}
+
 variable "project" {
   default = "testnet-440309"
   type    = string
diff --git a/spartan/terraform/gke-cluster/network-bench-bucket.tf b/spartan/terraform/gke-cluster/network-bench-bucket.tf
new file mode 100644
index 000000000000..9554850415a0
--- /dev/null
+++ b/spartan/terraform/gke-cluster/network-bench-bucket.tf
@@ -0,0 +1,11 @@
+resource "google_storage_managed_folder" "aztec_testnet_network_bench_folder" {
+  bucket        = google_storage_bucket.snapshots-bucket.name
+  name          = "network_bench/"
+  force_destroy = true
+}
+
+resource "google_storage_managed_folder_iam_policy" "aztec_testnet_network_bench_folder_policy" {
+  bucket         = google_storage_managed_folder.aztec_testnet_network_bench_folder.bucket
+  managed_folder = google_storage_managed_folder.aztec_testnet_network_bench_folder.name
+  policy_data    = data.google_iam_policy.all_users_storage_read.policy_data
+}
diff --git a/spartan/terraform/gke-cluster/snapshots.tf b/spartan/terraform/gke-cluster/snapshots.tf
index ed5840aba99d..244636cb2a19 100644
--- a/spartan/terraform/gke-cluster/snapshots.tf
+++ b/spartan/terraform/gke-cluster/snapshots.tf
@@ -8,6 +8,13 @@ resource "google_storage_bucket" "snapshots-bucket" {
     log_object_prefix = "aztec-testnet"
   }
 
+  cors {
+    origin          = ["*"]
+    method          = ["GET", "HEAD"]
+    response_header = ["Content-Type"]
+    max_age_seconds = 3600
+  }
+
   autoclass {
     enabled                = true
     terminal_storage_class = "ARCHIVE"
diff --git a/yarn-project/.prettierignore b/yarn-project/.prettierignore
index a8a08ffc2d47..2ef26151862a 100644
--- a/yarn-project/.prettierignore
+++ b/yarn-project/.prettierignore
@@ -20,3 +20,5 @@ noir-protocol-circuits-types/src/vk_tree.ts
 noir-protocol-circuits-types/src/client_artifacts_helper.ts
 constants/src/constants.gen.ts
 cli/src/config/generated
+sqlite3mc-wasm/vendor/
+
diff --git a/yarn-project/AGENTS.md b/yarn-project/AGENTS.md
new file mode 120000
index 000000000000..681311eb9cf4
--- /dev/null
+++ b/yarn-project/AGENTS.md
@@ -0,0 +1 @@
+CLAUDE.md
\ No newline at end of file
diff --git a/yarn-project/archiver/src/archiver-misc.test.ts b/yarn-project/archiver/src/archiver-misc.test.ts
index d021953fa1f3..433b83dc0f2e 100644
--- a/yarn-project/archiver/src/archiver-misc.test.ts
+++ b/yarn-project/archiver/src/archiver-misc.test.ts
@@ -10,6 +10,7 @@ import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { openTmpStore } from '@aztec/kv-store/lmdb-v2';
 import type { L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
+import { BlockHeader } from '@aztec/stdlib/tx';
 import { getTelemetryClient } from '@aztec/telemetry-client';
 
 import { EventEmitter } from 'events';
@@ -18,7 +19,7 @@ import { type MockProxy, mock } from 'jest-mock-extended';
 import { Archiver, type ArchiverEmitter } from './archiver.js';
 import type { ArchiverInstrumentation } from './modules/instrumentation.js';
 import { ArchiverL1Synchronizer } from './modules/l1_synchronizer.js';
-import { KVArchiverDataStore } from './store/kv_archiver_store.js';
+import { createArchiverDataStores } from './store/data_stores.js';
 import { L2TipsCache } from './store/l2_tips_cache.js';
 
 describe('Archiver misc', () => {
@@ -55,9 +56,11 @@ describe('Archiver misc', () => {
 
     const tracer = getTelemetryClient().getTracer('');
     const instrumentation = mock<ArchiverInstrumentation>({ isEnabled: () => true, tracer });
-    const archiverStore = new KVArchiverDataStore(await openTmpStore('archiver_misc_test'), 1000);
+    const archiverStore = createArchiverDataStores(await openTmpStore('archiver_misc_test'), { logsMaxPageSize: 1000 });
     const events = new EventEmitter() as ArchiverEmitter;
-    const l2TipsCache = new L2TipsCache(archiverStore.blockStore);
+    const initialHeader = BlockHeader.empty();
+    const initialBlockHash = await initialHeader.hash();
+    const l2TipsCache = new L2TipsCache(archiverStore.blocks, initialBlockHash);
 
     archiver = new Archiver(
       publicClient,
@@ -77,6 +80,8 @@ describe('Archiver misc', () => {
       l1Constants,
       synchronizer,
       events,
+      initialHeader,
+      initialBlockHash,
       l2TipsCache,
     );
   });
diff --git a/yarn-project/archiver/src/archiver-store.test.ts b/yarn-project/archiver/src/archiver-store.test.ts
index c3bc47e6306e..2f1a0b770390 100644
--- a/yarn-project/archiver/src/archiver-store.test.ts
+++ b/yarn-project/archiver/src/archiver-store.test.ts
@@ -1,5 +1,4 @@
 import type { BlobClientInterface } from '@aztec/blob-client/client';
-import { GENESIS_ARCHIVE_ROOT } from '@aztec/constants';
 import type { EpochCache, EpochCommitteeInfo } from '@aztec/epoch-cache';
 import { RollupContract } from '@aztec/ethereum/contracts';
 import type { ViemPublicClient } from '@aztec/ethereum/types';
@@ -18,6 +17,7 @@ import { L2Block } from '@aztec/stdlib/block';
 import type { L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
 import { makeStateReference } from '@aztec/stdlib/testing';
 import { AppendOnlyTreeSnapshot } from '@aztec/stdlib/trees';
+import { BlockHeader } from '@aztec/stdlib/tx';
 import { getTelemetryClient } from '@aztec/telemetry-client';
 
 import { EventEmitter } from 'events';
@@ -27,7 +27,8 @@ import { Archiver, type ArchiverEmitter } from './archiver.js';
 import { BlockNumberNotSequentialError } from './errors.js';
 import type { ArchiverInstrumentation } from './modules/instrumentation.js';
 import { ArchiverL1Synchronizer } from './modules/l1_synchronizer.js';
-import { KVArchiverDataStore } from './store/kv_archiver_store.js';
+import { type ArchiverDataStores, createArchiverDataStores, getArchiverSynchPoint } from './store/data_stores.js';
+import { L2TipsCache } from './store/l2_tips_cache.js';
 import { makeChainedCheckpoints } from './test/mock_structs.js';
 
 describe('Archiver Store', () => {
@@ -42,12 +43,19 @@ describe('Archiver Store', () => {
   let instrumentation: MockProxy<ArchiverInstrumentation>;
   let blobClient: MockProxy<BlobClientInterface>;
   let epochCache: MockProxy<EpochCache>;
-  let archiverStore: KVArchiverDataStore;
+  let archiverStore: ArchiverDataStores;
   let l1Constants: L1RollupConstants & { l1StartBlockHash: Buffer32; genesisArchiveRoot: Fr };
+  let initialHeader: BlockHeader;
+  let genesisArchiveRoot: Fr;
   let archiver: Archiver;
 
   beforeEach(async () => {
     const now = +new Date();
+    // Build a non-trivial initial header so we can distinguish it from BlockHeader.empty().
+    initialHeader = BlockHeader.empty({ lastArchive: new AppendOnlyTreeSnapshot(Fr.fromString('0x1234'), 1) });
+    // Genesis archive root is the post-block-0 archive root from L1, distinct from
+    // initialHeader.lastArchive.root (which is the pre-block-0 archive, always empty in practice).
+    genesisArchiveRoot = Fr.fromString('0xabcd');
 
     publicClient = mock<ViemPublicClient>();
     debugClient = publicClient;
@@ -61,7 +69,7 @@ describe('Archiver Store', () => {
     const tracer = getTelemetryClient().getTracer('');
     instrumentation = mock<ArchiverInstrumentation>({ isEnabled: () => true, tracer });
 
-    archiverStore = new KVArchiverDataStore(await openTmpStore('archiver_test'), 1000);
+    archiverStore = createArchiverDataStores(await openTmpStore('archiver_test'), { logsMaxPageSize: 1000 });
 
     l1Constants = {
       l1GenesisTime: BigInt(now),
@@ -73,7 +81,7 @@ describe('Archiver Store', () => {
       proofSubmissionEpochs: 1,
       targetCommitteeSize: 48,
       rollupManaLimit: Number.MAX_SAFE_INTEGER,
-      genesisArchiveRoot: new Fr(GENESIS_ARCHIVE_ROOT),
+      genesisArchiveRoot,
     };
 
     const contractAddresses = {
@@ -94,6 +102,8 @@ describe('Archiver Store', () => {
     const events = new EventEmitter() as ArchiverEmitter;
     const synchronizer = mock<ArchiverL1Synchronizer>();
 
+    const initialBlockHash = await initialHeader.hash();
+    const l2TipsCache = new L2TipsCache(archiverStore.blocks, initialBlockHash);
     archiver = new Archiver(
       publicClient,
       debugClient,
@@ -106,6 +116,9 @@ describe('Archiver Store', () => {
       l1Constants,
       synchronizer,
       events,
+      initialHeader,
+      initialBlockHash,
+      l2TipsCache,
     );
   });
 
@@ -115,9 +128,9 @@ describe('Archiver Store', () => {
 
   describe('getCheckpoints', () => {
     it('returns published checkpoints with full checkpoint data', async () => {
-      const genesisArchive = new AppendOnlyTreeSnapshot(new Fr(GENESIS_ARCHIVE_ROOT), 1);
+      const genesisArchive = new AppendOnlyTreeSnapshot(genesisArchiveRoot, 1);
       const testCheckpoints = await makeChainedCheckpoints(3, { previousArchive: genesisArchive });
-      await archiverStore.addCheckpoints(testCheckpoints);
+      await archiverStore.blocks.addCheckpoints(testCheckpoints);
 
       const result = await archiver.getCheckpoints(CheckpointNumber(1), 10);
 
@@ -131,9 +144,9 @@ describe('Archiver Store', () => {
     });
 
     it('respects the limit parameter', async () => {
-      const genesisArchive = new AppendOnlyTreeSnapshot(new Fr(GENESIS_ARCHIVE_ROOT), 1);
+      const genesisArchive = new AppendOnlyTreeSnapshot(genesisArchiveRoot, 1);
       const testCheckpoints = await makeChainedCheckpoints(3, { previousArchive: genesisArchive });
-      await archiverStore.addCheckpoints(testCheckpoints);
+      await archiverStore.blocks.addCheckpoints(testCheckpoints);
 
       const result = await archiver.getCheckpoints(CheckpointNumber(1), 2);
 
@@ -142,9 +155,9 @@ describe('Archiver Store', () => {
     });
 
     it('respects the starting checkpoint number', async () => {
-      const genesisArchive = new AppendOnlyTreeSnapshot(new Fr(GENESIS_ARCHIVE_ROOT), 1);
+      const genesisArchive = new AppendOnlyTreeSnapshot(genesisArchiveRoot, 1);
       const testCheckpoints = await makeChainedCheckpoints(3, { previousArchive: genesisArchive });
-      await archiverStore.addCheckpoints(testCheckpoints);
+      await archiverStore.blocks.addCheckpoints(testCheckpoints);
 
       const result = await archiver.getCheckpoints(CheckpointNumber(2), 10);
 
@@ -162,7 +175,7 @@ describe('Archiver Store', () => {
   describe('getCheckpointsForEpoch', () => {
     it('returns checkpoints for a specific epoch based on slot numbers', async () => {
       // l1Constants has epochDuration: 4, so epoch 0 has slots 0-3, epoch 1 has slots 4-7
-      const genesisArchive = new AppendOnlyTreeSnapshot(new Fr(GENESIS_ARCHIVE_ROOT), 1);
+      const genesisArchive = new AppendOnlyTreeSnapshot(genesisArchiveRoot, 1);
       const testCheckpoints = await makeChainedCheckpoints(3, {
         previousArchive: genesisArchive,
         makeCheckpointOptions: cpNumber => {
@@ -171,7 +184,7 @@ describe('Archiver Store', () => {
           return { slotNumber: slotNumbers[Number(cpNumber)] };
         },
       });
-      await archiverStore.addCheckpoints(testCheckpoints);
+      await archiverStore.blocks.addCheckpoints(testCheckpoints);
 
       const epoch0Checkpoints = await archiver.getCheckpointsForEpoch(EpochNumber(0));
       expect(epoch0Checkpoints.length).toBe(2);
@@ -183,12 +196,12 @@ describe('Archiver Store', () => {
     });
 
     it('returns empty array for epoch with no checkpoints', async () => {
-      const genesisArchive = new AppendOnlyTreeSnapshot(new Fr(GENESIS_ARCHIVE_ROOT), 1);
+      const genesisArchive = new AppendOnlyTreeSnapshot(genesisArchiveRoot, 1);
       const testCheckpoints = await makeChainedCheckpoints(1, {
         previousArchive: genesisArchive,
         makeCheckpointOptions: () => ({ slotNumber: SlotNumber(2) }), // Epoch 0
       });
-      await archiverStore.addCheckpoints(testCheckpoints);
+      await archiverStore.blocks.addCheckpoints(testCheckpoints);
 
       const epoch1Checkpoints = await archiver.getCheckpointsForEpoch(EpochNumber(1));
       expect(epoch1Checkpoints).toEqual([]);
@@ -196,7 +209,7 @@ describe('Archiver Store', () => {
 
     it('returns checkpoints in correct order (ascending by checkpoint number)', async () => {
       // Create multiple checkpoints all in epoch 0
-      const genesisArchive = new AppendOnlyTreeSnapshot(new Fr(GENESIS_ARCHIVE_ROOT), 1);
+      const genesisArchive = new AppendOnlyTreeSnapshot(genesisArchiveRoot, 1);
       const testCheckpoints = await makeChainedCheckpoints(3, {
         previousArchive: genesisArchive,
         makeCheckpointOptions: cpNumber => {
@@ -205,7 +218,7 @@ describe('Archiver Store', () => {
           return { slotNumber: slotNumbers[Number(cpNumber)] };
         },
       });
-      await archiverStore.addCheckpoints(testCheckpoints);
+      await archiverStore.blocks.addCheckpoints(testCheckpoints);
 
       const epoch0Checkpoints = await archiver.getCheckpointsForEpoch(EpochNumber(0));
       expect(epoch0Checkpoints.length).toBe(3);
@@ -228,14 +241,17 @@ describe('Archiver Store', () => {
         ...(previousArchive ? { lastArchive: previousArchive } : {}),
       });
 
-    // Genesis archive for the first block
-    const genesisArchive = new AppendOnlyTreeSnapshot(new Fr(GENESIS_ARCHIVE_ROOT), 1);
+    // Genesis archive for the first block — bound in beforeEach so it picks up the suite-level genesisArchiveRoot.
+    let genesisArchive: AppendOnlyTreeSnapshot;
+    beforeEach(() => {
+      genesisArchive = new AppendOnlyTreeSnapshot(genesisArchiveRoot, 1);
+    });
 
     it('adds a block to the store', async () => {
       const block = await makeBlock(BlockNumber(1), IndexWithinCheckpoint(0), genesisArchive);
       await archiver.addBlock(block);
 
-      const retrievedBlock = await archiver.getL2Block(BlockNumber(1));
+      const retrievedBlock = await archiver.getBlock({ number: BlockNumber(1) });
       expect(retrievedBlock).toBeDefined();
       expect(retrievedBlock!.number).toEqual(BlockNumber(1));
       expect((await retrievedBlock!.header.hash()).toString()).toEqual((await block.header.hash()).toString());
@@ -250,9 +266,9 @@ describe('Archiver Store', () => {
       await archiver.addBlock(block2);
       await archiver.addBlock(block3);
 
-      const retrievedBlock1 = await archiver.getL2Block(BlockNumber(1));
-      const retrievedBlock2 = await archiver.getL2Block(BlockNumber(2));
-      const retrievedBlock3 = await archiver.getL2Block(BlockNumber(3));
+      const retrievedBlock1 = await archiver.getBlock({ number: BlockNumber(1) });
+      const retrievedBlock2 = await archiver.getBlock({ number: BlockNumber(2) });
+      const retrievedBlock3 = await archiver.getBlock({ number: BlockNumber(3) });
 
       expect(retrievedBlock1!.number).toEqual(BlockNumber(1));
       expect(retrievedBlock2!.number).toEqual(BlockNumber(2));
@@ -292,7 +308,7 @@ describe('Archiver Store', () => {
 
       await archiver.addBlock(block1);
 
-      const retrievedBlock = await archiver.getL2Block(BlockNumber(1));
+      const retrievedBlock = await archiver.getBlock({ number: BlockNumber(1) });
       expect(retrievedBlock).toBeDefined();
       expect(retrievedBlock!.number).toEqual(BlockNumber(1));
     });
@@ -306,7 +322,7 @@ describe('Archiver Store', () => {
       await archiver.addBlock(block2);
       await archiver.addBlock(block3);
 
-      const blocks = await archiver.getBlocks(BlockNumber(1), 3);
+      const blocks = await archiver.getBlocks({ from: BlockNumber(1), limit: 3 });
       expect(blocks.length).toEqual(3);
       expect(await blocks[0].hash()).toEqual(await block1.hash());
       expect(await blocks[1].hash()).toEqual(await block2.hash());
@@ -323,7 +339,7 @@ describe('Archiver Store', () => {
       await archiver.addBlock(block3);
 
       // Request only 2 blocks starting from block 1
-      const blocks = await archiver.getBlocks(BlockNumber(1), 2);
+      const blocks = await archiver.getBlocks({ from: BlockNumber(1), limit: 2 });
       expect(blocks.length).toEqual(2);
       expect(await blocks[0].hash()).toEqual(await block1.hash());
       expect(await blocks[1].hash()).toEqual(await block2.hash());
@@ -339,7 +355,7 @@ describe('Archiver Store', () => {
       await archiver.addBlock(block3);
 
       // Start from block 2
-      const blocks = await archiver.getBlocks(BlockNumber(2), 2);
+      const blocks = await archiver.getBlocks({ from: BlockNumber(2), limit: 2 });
       expect(blocks.length).toEqual(2);
       expect(await blocks[0].hash()).toEqual(await block2.hash());
       expect(await blocks[1].hash()).toEqual(await block3.hash());
@@ -351,7 +367,7 @@ describe('Archiver Store', () => {
       await archiver.addBlock(block1);
 
       // Request blocks starting from block 5 (which doesn't exist)
-      const blocks = await archiver.getBlocks(BlockNumber(5), 3);
+      const blocks = await archiver.getBlocks({ from: BlockNumber(5), limit: 3 });
       expect(blocks).toEqual([]);
     });
 
@@ -363,20 +379,20 @@ describe('Archiver Store', () => {
       await archiver.addBlock(block2);
 
       // Request 10 blocks but only 2 are available
-      const blocks = await archiver.getBlocks(BlockNumber(1), 10);
+      const blocks = await archiver.getBlocks({ from: BlockNumber(1), limit: 10 });
       expect(blocks.length).toEqual(2);
       expect(await blocks[0].hash()).toEqual(await block1.hash());
       expect(await blocks[1].hash()).toEqual(await block2.hash());
     });
   });
 
-  describe('getCheckpointedBlocks', () => {
+  describe('getBlocks with onlyCheckpointed', () => {
     it('returns checkpointed blocks with checkpoint info', async () => {
-      const genesisArchive = new AppendOnlyTreeSnapshot(new Fr(GENESIS_ARCHIVE_ROOT), 1);
+      const genesisArchive = new AppendOnlyTreeSnapshot(genesisArchiveRoot, 1);
       const testCheckpoints = await makeChainedCheckpoints(3, { previousArchive: genesisArchive });
-      await archiverStore.addCheckpoints(testCheckpoints);
+      await archiverStore.blocks.addCheckpoints(testCheckpoints);
 
-      const result = await archiver.getCheckpointedBlocks(BlockNumber(1), 100);
+      const result = await archiver.getBlocks({ from: BlockNumber(1), limit: 100, onlyCheckpointed: true });
 
       const expectedBlocks = testCheckpoints.flatMap(c => c.checkpoint.blocks);
       expect(result.length).toBe(expectedBlocks.length);
@@ -389,11 +405,12 @@ describe('Archiver Store', () => {
           const cb = result[blockIndex];
           const expectedBlock = checkpoint.checkpoint.blocks[i];
 
-          expect(cb.block.number).toBe(expectedBlock.number);
+          expect(cb.number).toBe(expectedBlock.number);
           expect(cb.checkpointNumber).toBe(checkpoint.checkpoint.number);
-          expect(cb.block.archive.root.toString()).toBe(expectedBlock.archive.root.toString());
-          expect(cb.l1).toBeDefined();
-          expect(cb.l1.blockNumber).toBeGreaterThan(0n);
+          expect(cb.archive.root.toString()).toBe(expectedBlock.archive.root.toString());
+          const checkpointData = await archiverStore.blocks.getCheckpointData(cb.checkpointNumber);
+          expect(checkpointData?.l1).toBeDefined();
+          expect(checkpointData!.l1.blockNumber).toBeGreaterThan(0n);
 
           blockIndex++;
         }
@@ -401,40 +418,141 @@ describe('Archiver Store', () => {
     });
 
     it('respects the limit parameter', async () => {
-      const genesisArchive = new AppendOnlyTreeSnapshot(new Fr(GENESIS_ARCHIVE_ROOT), 1);
+      const genesisArchive = new AppendOnlyTreeSnapshot(genesisArchiveRoot, 1);
       const testCheckpoints = await makeChainedCheckpoints(3, { previousArchive: genesisArchive });
-      await archiverStore.addCheckpoints(testCheckpoints);
+      await archiverStore.blocks.addCheckpoints(testCheckpoints);
 
-      const result = await archiver.getCheckpointedBlocks(BlockNumber(1), 2);
+      const result = await archiver.getBlocks({ from: BlockNumber(1), limit: 2, onlyCheckpointed: true });
 
       expect(result.length).toBe(2);
-      expect(result[0].block.number).toBe(BlockNumber(1));
-      expect(result[1].block.number).toBe(BlockNumber(2));
+      expect(result[0].number).toBe(BlockNumber(1));
+      expect(result[1].number).toBe(BlockNumber(2));
       expect(result[0].checkpointNumber).toBe(1);
       expect(result[1].checkpointNumber).toBe(2);
     });
 
     it('returns blocks starting from specified block number', async () => {
-      const genesisArchive = new AppendOnlyTreeSnapshot(new Fr(GENESIS_ARCHIVE_ROOT), 1);
+      const genesisArchive = new AppendOnlyTreeSnapshot(genesisArchiveRoot, 1);
       const testCheckpoints = await makeChainedCheckpoints(3, { previousArchive: genesisArchive });
-      await archiverStore.addCheckpoints(testCheckpoints);
+      await archiverStore.blocks.addCheckpoints(testCheckpoints);
 
-      const result = await archiver.getCheckpointedBlocks(BlockNumber(2), 10);
+      const result = await archiver.getBlocks({ from: BlockNumber(2), limit: 10, onlyCheckpointed: true });
 
       expect(result.length).toBe(2);
-      expect(result[0].block.number).toBe(BlockNumber(2));
-      expect(result[1].block.number).toBe(BlockNumber(3));
+      expect(result[0].number).toBe(BlockNumber(2));
+      expect(result[1].number).toBe(BlockNumber(3));
       expect(result[0].checkpointNumber).toBe(2);
       expect(result[1].checkpointNumber).toBe(3);
     });
 
     it('returns empty array when no checkpointed blocks exist', async () => {
-      const result = await archiver.getCheckpointedBlocks(BlockNumber(1), 10);
+      const result = await archiver.getBlocks({ from: BlockNumber(1), limit: 10, onlyCheckpointed: true });
 
       expect(result).toEqual([]);
     });
   });
 
+  describe('getBlocks / getBlocksData with epoch query', () => {
+    it('returns empty array for epoch with no checkpoints', async () => {
+      const genesisArchive = new AppendOnlyTreeSnapshot(genesisArchiveRoot, 1);
+      // Checkpoint 1 is in epoch 0 (slot 1, epochDuration=4)
+      const testCheckpoints = await makeChainedCheckpoints(1, {
+        previousArchive: genesisArchive,
+        makeCheckpointOptions: () => ({ slotNumber: SlotNumber(1) }),
+      });
+      await archiverStore.blocks.addCheckpoints(testCheckpoints);
+
+      // Epoch 1 has no checkpoints — both methods must return [] without throwing
+      await expect(archiver.getBlocks({ epoch: EpochNumber(1), onlyCheckpointed: true })).resolves.toEqual([]);
+      await expect(archiver.getBlocksData({ epoch: EpochNumber(1), onlyCheckpointed: true })).resolves.toEqual([]);
+    });
+
+    it('returns blocks for epoch with checkpoints', async () => {
+      const genesisArchive = new AppendOnlyTreeSnapshot(genesisArchiveRoot, 1);
+      const testCheckpoints = await makeChainedCheckpoints(2, {
+        previousArchive: genesisArchive,
+        makeCheckpointOptions: cpNumber => ({
+          slotNumber: SlotNumber(Number(cpNumber) - 1), // Slots 0 and 1, both in epoch 0
+        }),
+      });
+      await archiverStore.blocks.addCheckpoints(testCheckpoints);
+
+      const blocks = await archiver.getBlocks({ epoch: EpochNumber(0), onlyCheckpointed: true });
+      expect(blocks.length).toBe(2);
+      expect(blocks[0].number).toBe(BlockNumber(1));
+      expect(blocks[1].number).toBe(BlockNumber(2));
+
+      const blocksData = await archiver.getBlocksData({ epoch: EpochNumber(0), onlyCheckpointed: true });
+      expect(blocksData.length).toBe(2);
+    });
+  });
+
+  describe('getBlock / getBlockData with tag', () => {
+    it('returns the genesis block for any tag when chain is empty', async () => {
+      for (const tag of ['proposed', 'checkpointed', 'proven', 'finalized'] as const) {
+        const block = await archiver.getBlock({ tag });
+        expect(block?.number).toBe(BlockNumber.ZERO);
+        const data = await archiver.getBlockData({ tag });
+        expect(data?.header.globalVariables.blockNumber).toBe(BlockNumber.ZERO);
+      }
+    });
+
+    it('resolves proposed to the latest block', async () => {
+      const genesisArchive = new AppendOnlyTreeSnapshot(genesisArchiveRoot, 1);
+      const testCheckpoints = await makeChainedCheckpoints(3, {
+        previousArchive: genesisArchive,
+        blocksPerCheckpoint: 2,
+      });
+      await archiverStore.blocks.addCheckpoints(testCheckpoints);
+
+      const block = await archiver.getBlock({ tag: 'proposed' });
+      expect(block?.number).toBe(BlockNumber(6));
+      const data = await archiver.getBlockData({ tag: 'proposed' });
+      expect(data?.header.globalVariables.blockNumber).toBe(BlockNumber(6));
+    });
+
+    it('resolves checkpointed, proven, and finalized to the corresponding block', async () => {
+      const genesisArchive = new AppendOnlyTreeSnapshot(genesisArchiveRoot, 1);
+      const testCheckpoints = await makeChainedCheckpoints(3, {
+        previousArchive: genesisArchive,
+        blocksPerCheckpoint: 2,
+      });
+      await archiverStore.blocks.addCheckpoints(testCheckpoints);
+
+      // Checkpoint 1 = blocks 1-2, checkpoint 2 = blocks 3-4, checkpoint 3 = blocks 5-6.
+      // All checkpoints are added so checkpointed L2 block = 6.
+      await archiverStore.blocks.setProvenCheckpointNumber(CheckpointNumber(2));
+      await archiverStore.blocks.setFinalizedCheckpointNumber(CheckpointNumber(1));
+
+      const checkpointedBlock = await archiver.getBlock({ tag: 'checkpointed' });
+      expect(checkpointedBlock?.number).toBe(BlockNumber(6));
+
+      const provenBlock = await archiver.getBlock({ tag: 'proven' });
+      expect(provenBlock?.number).toBe(BlockNumber(4));
+
+      const finalizedBlock = await archiver.getBlock({ tag: 'finalized' });
+      expect(finalizedBlock?.number).toBe(BlockNumber(2));
+
+      const provenData = await archiver.getBlockData({ tag: 'proven' });
+      expect(provenData?.header.globalVariables.blockNumber).toBe(BlockNumber(4));
+    });
+
+    it('returns the genesis block when proven tag points to genesis', async () => {
+      const genesisArchive = new AppendOnlyTreeSnapshot(genesisArchiveRoot, 1);
+      const testCheckpoints = await makeChainedCheckpoints(1, {
+        previousArchive: genesisArchive,
+        blocksPerCheckpoint: 1,
+      });
+      await archiverStore.blocks.addCheckpoints(testCheckpoints);
+
+      // No proven checkpoint set — proven block number is 0 → genesis.
+      const block = await archiver.getBlock({ tag: 'proven' });
+      expect(block?.number).toBe(BlockNumber.ZERO);
+      const data = await archiver.getBlockData({ tag: 'proven' });
+      expect(data?.header.globalVariables.blockNumber).toBe(BlockNumber.ZERO);
+    });
+  });
+
   describe('rollbackTo', () => {
     beforeEach(() => {
       publicClient.getBlock.mockImplementation(
@@ -444,13 +562,13 @@ describe('Archiver Store', () => {
     });
 
     it('rejects rollback to a block that is not at a checkpoint boundary', async () => {
-      const genesisArchive = new AppendOnlyTreeSnapshot(new Fr(GENESIS_ARCHIVE_ROOT), 1);
+      const genesisArchive = new AppendOnlyTreeSnapshot(genesisArchiveRoot, 1);
       // Checkpoint 1: 3 blocks (1, 2, 3). Checkpoint 2: 3 blocks (4, 5, 6).
       const testCheckpoints = await makeChainedCheckpoints(2, {
         previousArchive: genesisArchive,
         blocksPerCheckpoint: 3,
       });
-      await archiverStore.addCheckpoints(testCheckpoints);
+      await archiverStore.blocks.addCheckpoints(testCheckpoints);
 
       // Block 1 is not at a checkpoint boundary (checkpoint 1 ends at block 3)
       await expect(archiver.rollbackTo(BlockNumber(1))).rejects.toThrow(
@@ -463,14 +581,35 @@ describe('Archiver Store', () => {
       );
     });
 
+    it('rejects rollback to a proposed but not yet checkpointed block', async () => {
+      const genesisArchive = new AppendOnlyTreeSnapshot(genesisArchiveRoot, 1);
+      const checkpoints1 = await makeChainedCheckpoints(1, {
+        previousArchive: genesisArchive,
+        blocksPerCheckpoint: 2,
+      });
+      const checkpoints2 = await makeChainedCheckpoints(1, {
+        previousArchive: checkpoints1[0].checkpoint.blocks.at(-1)!.archive,
+        startCheckpointNumber: CheckpointNumber(2),
+        startBlockNumber: 3,
+        startL1BlockNumber: 20,
+        blocksPerCheckpoint: 2,
+      });
+      await archiverStore.blocks.addCheckpoints(checkpoints1);
+      for (const block of checkpoints2[0].checkpoint.blocks) {
+        await archiverStore.blocks.addProposedBlock(block);
+      }
+
+      await expect(archiver.rollbackTo(BlockNumber(3))).rejects.toThrow(/Target L2 block 3 is not checkpointed yet/);
+    });
+
     it('allows rollback to the last block of a checkpoint and updates sync points', async () => {
-      const genesisArchive = new AppendOnlyTreeSnapshot(new Fr(GENESIS_ARCHIVE_ROOT), 1);
+      const genesisArchive = new AppendOnlyTreeSnapshot(genesisArchiveRoot, 1);
       // Checkpoint 1: 3 blocks (1, 2, 3), L1 block 10. Checkpoint 2: 3 blocks (4, 5, 6), L1 block 20.
       const testCheckpoints = await makeChainedCheckpoints(2, {
         previousArchive: genesisArchive,
         blocksPerCheckpoint: 3,
       });
-      await archiverStore.addCheckpoints(testCheckpoints);
+      await archiverStore.blocks.addCheckpoints(testCheckpoints);
 
       // Block 3 is the last block of checkpoint 1 — should succeed
       await archiver.rollbackTo(BlockNumber(3));
@@ -478,13 +617,13 @@ describe('Archiver Store', () => {
       expect(await archiver.getSynchedCheckpointNumber()).toEqual(CheckpointNumber(1));
 
       // Verify sync points are set to checkpoint 1's L1 block number (10)
-      const synchPoint = await archiverStore.getSynchPoint();
+      const synchPoint = await getArchiverSynchPoint(archiverStore);
       expect(synchPoint.blocksSynchedTo).toEqual(10n);
       expect(synchPoint.messagesSynchedTo?.l1BlockNumber).toEqual(10n);
     });
 
     it('includes correct boundary info in error for mid-checkpoint rollback', async () => {
-      const genesisArchive = new AppendOnlyTreeSnapshot(new Fr(GENESIS_ARCHIVE_ROOT), 1);
+      const genesisArchive = new AppendOnlyTreeSnapshot(genesisArchiveRoot, 1);
       // Checkpoint 1: 2 blocks (1, 2). Checkpoint 2: 3 blocks (3, 4, 5).
       const checkpoints1 = await makeChainedCheckpoints(1, {
         previousArchive: genesisArchive,
@@ -497,7 +636,7 @@ describe('Archiver Store', () => {
         startL1BlockNumber: 20,
         blocksPerCheckpoint: 3,
       });
-      await archiverStore.addCheckpoints([...checkpoints1, ...checkpoints2]);
+      await archiverStore.blocks.addCheckpoints([...checkpoints1, ...checkpoints2]);
 
       // Block 3 is the first of checkpoint 2 (spans 3-5)
       // Should suggest block 5 (end of this checkpoint) or block 2 (end of previous)
@@ -507,16 +646,16 @@ describe('Archiver Store', () => {
     });
 
     it('rolls back proven checkpoint number when target is before proven block', async () => {
-      const genesisArchive = new AppendOnlyTreeSnapshot(new Fr(GENESIS_ARCHIVE_ROOT), 1);
+      const genesisArchive = new AppendOnlyTreeSnapshot(genesisArchiveRoot, 1);
       // Checkpoint 1: blocks 1-2, Checkpoint 2: blocks 3-4, Checkpoint 3: blocks 5-6
       const testCheckpoints = await makeChainedCheckpoints(3, {
         previousArchive: genesisArchive,
         blocksPerCheckpoint: 2,
       });
-      await archiverStore.addCheckpoints(testCheckpoints);
+      await archiverStore.blocks.addCheckpoints(testCheckpoints);
 
       // Mark checkpoint 2 as proven
-      await archiverStore.setProvenCheckpointNumber(CheckpointNumber(2));
+      await archiverStore.blocks.setProvenCheckpointNumber(CheckpointNumber(2));
       expect(await archiver.getProvenCheckpointNumber()).toEqual(CheckpointNumber(2));
 
       // Roll back to block 2 (end of checkpoint 1), which is before proven block 4
@@ -527,16 +666,16 @@ describe('Archiver Store', () => {
     });
 
     it('preserves proven checkpoint number when target is after proven block', async () => {
-      const genesisArchive = new AppendOnlyTreeSnapshot(new Fr(GENESIS_ARCHIVE_ROOT), 1);
+      const genesisArchive = new AppendOnlyTreeSnapshot(genesisArchiveRoot, 1);
       // Checkpoint 1: blocks 1-2, Checkpoint 2: blocks 3-4, Checkpoint 3: blocks 5-6
       const testCheckpoints = await makeChainedCheckpoints(3, {
         previousArchive: genesisArchive,
         blocksPerCheckpoint: 2,
       });
-      await archiverStore.addCheckpoints(testCheckpoints);
+      await archiverStore.blocks.addCheckpoints(testCheckpoints);
 
       // Mark checkpoint 1 as proven
-      await archiverStore.setProvenCheckpointNumber(CheckpointNumber(1));
+      await archiverStore.blocks.setProvenCheckpointNumber(CheckpointNumber(1));
       expect(await archiver.getProvenCheckpointNumber()).toEqual(CheckpointNumber(1));
 
       // Roll back to block 4 (end of checkpoint 2), which is after proven block 2
@@ -547,17 +686,17 @@ describe('Archiver Store', () => {
     });
 
     it('rolls back finalized checkpoint number when target is before finalized block', async () => {
-      const genesisArchive = new AppendOnlyTreeSnapshot(new Fr(GENESIS_ARCHIVE_ROOT), 1);
+      const genesisArchive = new AppendOnlyTreeSnapshot(genesisArchiveRoot, 1);
       // Checkpoint 1: blocks 1-2, Checkpoint 2: blocks 3-4, Checkpoint 3: blocks 5-6
       const testCheckpoints = await makeChainedCheckpoints(3, {
         previousArchive: genesisArchive,
         blocksPerCheckpoint: 2,
       });
-      await archiverStore.addCheckpoints(testCheckpoints);
+      await archiverStore.blocks.addCheckpoints(testCheckpoints);
 
       // Mark checkpoints 1 and 2 as proven and finalized
-      await archiverStore.setProvenCheckpointNumber(CheckpointNumber(2));
-      await archiverStore.setFinalizedCheckpointNumber(CheckpointNumber(2));
+      await archiverStore.blocks.setProvenCheckpointNumber(CheckpointNumber(2));
+      await archiverStore.blocks.setFinalizedCheckpointNumber(CheckpointNumber(2));
       expect(await archiver.getFinalizedL2BlockNumber()).toEqual(BlockNumber(4));
 
       // Roll back to block 2 (end of checkpoint 1), which is before finalized block 4
@@ -568,17 +707,17 @@ describe('Archiver Store', () => {
     });
 
     it('preserves finalized checkpoint number when target is after finalized block', async () => {
-      const genesisArchive = new AppendOnlyTreeSnapshot(new Fr(GENESIS_ARCHIVE_ROOT), 1);
+      const genesisArchive = new AppendOnlyTreeSnapshot(genesisArchiveRoot, 1);
       // Checkpoint 1: blocks 1-2, Checkpoint 2: blocks 3-4, Checkpoint 3: blocks 5-6
       const testCheckpoints = await makeChainedCheckpoints(3, {
         previousArchive: genesisArchive,
         blocksPerCheckpoint: 2,
       });
-      await archiverStore.addCheckpoints(testCheckpoints);
+      await archiverStore.blocks.addCheckpoints(testCheckpoints);
 
       // Mark checkpoint 1 as finalized, checkpoint 2 as proven
-      await archiverStore.setProvenCheckpointNumber(CheckpointNumber(2));
-      await archiverStore.setFinalizedCheckpointNumber(CheckpointNumber(1));
+      await archiverStore.blocks.setProvenCheckpointNumber(CheckpointNumber(2));
+      await archiverStore.blocks.setFinalizedCheckpointNumber(CheckpointNumber(1));
       expect(await archiver.getFinalizedL2BlockNumber()).toEqual(BlockNumber(2));
 
       // Roll back to block 4 (end of checkpoint 2), which is after finalized block 2
@@ -588,4 +727,62 @@ describe('Archiver Store', () => {
       expect(await archiver.getFinalizedL2BlockNumber()).toEqual(BlockNumber(2));
     });
   });
+
+  describe('genesis block handling', () => {
+    it('getBlock({number:0}) returns the synthetic genesis block', async () => {
+      const block = await archiver.getBlock({ number: BlockNumber.ZERO });
+      expect(block).toBeDefined();
+      expect(block!.header).toEqual(initialHeader);
+    });
+
+    it('getBlock({hash:initialHeaderHash}) returns the synthetic genesis block', async () => {
+      const initialHeaderHash = await initialHeader.hash();
+      const block = await archiver.getBlock({ hash: initialHeaderHash });
+      expect(block).toBeDefined();
+      expect(block!.header).toEqual(initialHeader);
+    });
+
+    it('getBlock({archive:genesisArchiveRoot}) returns the synthetic genesis block', async () => {
+      const block = await archiver.getBlock({ archive: genesisArchiveRoot });
+      expect(block).toBeDefined();
+      expect(block!.header).toEqual(initialHeader);
+      expect(block!.archive.root).toEqual(genesisArchiveRoot);
+      expect(block!.archive.nextAvailableLeafIndex).toEqual(1);
+    });
+
+    it('getBlock({archive:initialHeader.lastArchive.root}) does NOT match genesis (it is the pre-block-0 archive)', async () => {
+      const block = await archiver.getBlock({ archive: initialHeader.lastArchive.root });
+      expect(block).toBeUndefined();
+    });
+
+    it('getBlock({tag:"finalized"}) returns the synthetic genesis block when no blocks synced', async () => {
+      // With an empty store the finalized tip is INITIAL_L2_BLOCK_NUM - 1 = 0 → resolves to genesis.
+      const block = await archiver.getBlock({ tag: 'finalized' });
+      expect(block).toBeDefined();
+      expect(block!.header).toEqual(initialHeader);
+    });
+
+    it('getBlockData({number:0}) returns the synthetic genesis block data', async () => {
+      const data = await archiver.getBlockData({ number: BlockNumber.ZERO });
+      expect(data).toBeDefined();
+      expect(data!.header).toEqual(initialHeader);
+      expect(data!.blockHash).toEqual(await initialHeader.hash());
+    });
+
+    it('getBlockNumber({hash:initialHeaderHash}) returns 0', async () => {
+      const initialHeaderHash = await initialHeader.hash();
+      const number = await archiver.getBlockNumber({ hash: initialHeaderHash });
+      expect(number).toEqual(BlockNumber.ZERO);
+    });
+
+    it('getBlocks({from:0, limit:5}) throws — range queries do not support genesis', async () => {
+      await expect(archiver.getBlocks({ from: BlockNumber.ZERO, limit: 5 })).rejects.toThrow(/from/);
+    });
+
+    it('returns the same block instance on consecutive calls (caching invariant)', async () => {
+      const block1 = await archiver.getBlock({ number: BlockNumber.ZERO });
+      const block2 = await archiver.getBlock({ number: BlockNumber.ZERO });
+      expect(block1).toBe(block2);
+    });
+  });
 });
diff --git a/yarn-project/archiver/src/archiver-sync.test.ts b/yarn-project/archiver/src/archiver-sync.test.ts
index 1e4156ae8d57..81c820ddcb3b 100644
--- a/yarn-project/archiver/src/archiver-sync.test.ts
+++ b/yarn-project/archiver/src/archiver-sync.test.ts
@@ -20,6 +20,7 @@ import type { ProposedCheckpointInput } from '@aztec/stdlib/checkpoint';
 import type { L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
 import { computeInHashFromL1ToL2Messages } from '@aztec/stdlib/messaging';
 import { CheckpointHeader } from '@aztec/stdlib/rollup';
+import { BlockHeader } from '@aztec/stdlib/tx';
 import { getTelemetryClient } from '@aztec/telemetry-client';
 
 import { jest } from '@jest/globals';
@@ -29,10 +30,10 @@ import { type MockProxy, mock } from 'jest-mock-extended';
 import type { GetBlockReturnType } from 'viem';
 
 import { Archiver, type ArchiverEmitter } from './archiver.js';
-import { L1ToL2MessagesNotReadyError } from './errors.js';
+import { BlockOrCheckpointSlotExpiredError, L1ToL2MessagesNotReadyError } from './errors.js';
 import type { ArchiverInstrumentation } from './modules/instrumentation.js';
 import { ArchiverL1Synchronizer } from './modules/l1_synchronizer.js';
-import { KVArchiverDataStore } from './store/kv_archiver_store.js';
+import { type ArchiverDataStores, createArchiverDataStores } from './store/data_stores.js';
 import { L2TipsCache } from './store/l2_tips_cache.js';
 import { FakeL1State } from './test/fake_l1_state.js';
 
@@ -51,7 +52,7 @@ describe('Archiver Sync', () => {
   let inboxContract: MockProxy<InboxContract>;
   let instrumentation: MockProxy<ArchiverInstrumentation>;
   let dateProvider: TestDateProvider;
-  let archiverStore: KVArchiverDataStore;
+  let archiverStore: ArchiverDataStores;
   let l1Constants: L1RollupConstants & { l1StartBlockHash: Buffer32; genesisArchiveRoot: Fr };
   let archiver: Archiver;
   let synchronizer: ArchiverL1Synchronizer;
@@ -97,7 +98,7 @@ describe('Archiver Sync', () => {
     instrumentation = mock<ArchiverInstrumentation>({ isEnabled: () => true, tracer });
 
     // Create archiver store
-    archiverStore = new KVArchiverDataStore(await openTmpStore('archiver_sync_test'), 1000);
+    archiverStore = createArchiverDataStores(await openTmpStore('archiver_sync_test'), { logsMaxPageSize: 1000 });
 
     const contractAddresses = {
       rollupAddress,
@@ -123,7 +124,9 @@ describe('Archiver Sync', () => {
     const events = new EventEmitter() as ArchiverEmitter;
 
     // Create L2 tips cache shared by archiver and synchronizer
-    const l2TipsCache = new L2TipsCache(archiverStore.blockStore);
+    const initialHeader = BlockHeader.empty();
+    const initialBlockHash = await initialHeader.hash();
+    const l2TipsCache = new L2TipsCache(archiverStore.blocks, initialBlockHash);
 
     // Create the L1 synchronizer
     synchronizer = new ArchiverL1Synchronizer(
@@ -156,6 +159,8 @@ describe('Archiver Sync', () => {
       l1Constants,
       synchronizer,
       events,
+      initialHeader,
+      initialBlockHash,
       l2TipsCache,
     );
   });
@@ -224,7 +229,7 @@ describe('Archiver Sync', () => {
           const expectedTotalNumLogs = (name: 'private' | 'public' | 'contractClass') =>
             sum(block.body.txEffects.map(txEffect => txEffect[`${name}Logs`].length));
 
-          const privateLogs = (await archiver.getBlock(blockNumber))!.getPrivateLogs();
+          const privateLogs = (await archiver.getBlock({ number: blockNumber }))!.getPrivateLogs();
           expect(privateLogs.length).toBe(expectedTotalNumLogs('private'));
 
           const publicLogs = (await archiver.getPublicLogs({ fromBlock: blockNumber, toBlock: blockNumber + 1 })).logs;
@@ -945,6 +950,102 @@ describe('Archiver Sync', () => {
       );
     });
 
+    it('short-circuits rollback at the finalized L1 block', async () => {
+      // Sync two checkpoints worth of messages so we have history to roll back over.
+      const msgs1 = [Fr.random(), Fr.random()];
+      fake.addMessages(CheckpointNumber(1), 100n, msgs1);
+
+      const msgs3 = [Fr.random(), Fr.random(), Fr.random(), Fr.random()];
+      fake.addMessages(CheckpointNumber(3), 101n, msgs3);
+
+      // Mark block 100 as finalized so messages there cannot be reorged.
+      fake.setFinalizedL1BlockNumber(100n);
+      fake.setL1BlockNumber(110n);
+      await archiver.syncImmediate();
+
+      expect(await archiver.getL1ToL2Messages(CheckpointNumber(1))).toHaveLength(2);
+      expect(await archiver.getL1ToL2Messages(CheckpointNumber(3))).toHaveLength(4);
+
+      // Simulate L1 reorg: remove the last 2 messages from checkpoint 3 and add new ones.
+      fake.removeMessagesAfter(4);
+      const msg40 = Fr.random();
+      fake.addMessages(CheckpointNumber(4), 102n, [msg40]);
+
+      fake.setL1BlockNumber(111n);
+
+      // Spy on getMessageSentEventByHash — used by retrieveL1ToL2Message for per-message log queries.
+      const eventByHashSpy = jest.spyOn(inboxContract, 'getMessageSentEventByHash');
+
+      await archiver.syncImmediate();
+
+      // The two checkpoint-1 messages sit at L1 block 100 (≤ finalized). The rollback loop
+      // should stop there without issuing a per-message log query for them.
+      const callsAtFinalizedOrBelow = eventByHashSpy.mock.calls.filter(
+        ([, aroundL1BlockNumber]) => aroundL1BlockNumber <= 100n,
+      );
+      expect(callsAtFinalizedOrBelow).toHaveLength(0);
+
+      expect(await archiver.getL1ToL2Messages(CheckpointNumber(1))).toHaveLength(2);
+      expect(await archiver.getL1ToL2Messages(CheckpointNumber(4))).toHaveLength(1);
+    });
+
+    it('falls back to per-message log queries when finalized block is undefined', async () => {
+      const msgs1 = [Fr.random(), Fr.random()];
+      fake.addMessages(CheckpointNumber(1), 100n, msgs1);
+
+      const msgs3 = [Fr.random(), Fr.random(), Fr.random(), Fr.random()];
+      fake.addMessages(CheckpointNumber(3), 101n, msgs3);
+
+      // No finalized block — simulates a fresh devnet.
+      fake.setFinalizedL1BlockNumber(undefined);
+      fake.setL1BlockNumber(110n);
+      await archiver.syncImmediate();
+
+      // Reorg: remove last 2 messages from checkpoint 3.
+      fake.removeMessagesAfter(4);
+      const msg40 = Fr.random();
+      fake.addMessages(CheckpointNumber(4), 102n, [msg40]);
+      fake.setL1BlockNumber(111n);
+
+      const eventByHashSpy = jest.spyOn(inboxContract, 'getMessageSentEventByHash');
+
+      await archiver.syncImmediate();
+
+      // Without a finalized pointer the synchronizer must use per-message log queries to find the common point.
+      // 2 messages mismatch on remote (msgs3[2], msgs3[3]) and one matches (msgs3[1]) before we break.
+      expect(eventByHashSpy).toHaveBeenCalledTimes(3);
+
+      expect(await archiver.getL1ToL2Messages(CheckpointNumber(1))).toHaveLength(2);
+      expect(await archiver.getL1ToL2Messages(CheckpointNumber(4))).toHaveLength(1);
+    });
+
+    it('persists the finalized L1 block monotonically after message sync', async () => {
+      const msgs1 = [Fr.random(), Fr.random()];
+      fake.addMessages(CheckpointNumber(1), 100n, msgs1);
+
+      fake.setFinalizedL1BlockNumber(95n);
+      fake.setL1BlockNumber(110n);
+      await archiver.syncImmediate();
+
+      const stored1 = await archiverStore.messages.getMessagesFinalizedL1Block();
+      expect(stored1?.l1BlockNumber).toEqual(95n);
+
+      // A second sync where the finalized block has not advanced.
+      fake.setL1BlockNumber(111n);
+      await archiver.syncImmediate();
+
+      const stored2 = await archiverStore.messages.getMessagesFinalizedL1Block();
+      expect(stored2?.l1BlockNumber).toEqual(95n);
+
+      // Now advance the finalized block — the pointer should follow.
+      fake.setFinalizedL1BlockNumber(105n);
+      fake.setL1BlockNumber(112n);
+      await archiver.syncImmediate();
+
+      const stored3 = await archiverStore.messages.getMessagesFinalizedL1Block();
+      expect(stored3?.l1BlockNumber).toEqual(105n);
+    });
+
     // Regression for https://github.com/AztecProtocol/aztec-packages/issues/13604
     it('handles a checkpoint gap due to a spurious L2 prune', async () => {
       expect(await archiver.getBlockNumber()).toEqual(0);
@@ -1218,9 +1319,9 @@ describe('Archiver Sync', () => {
       // Manually advance the sync point past where the new checkpoint will appear.
       // This simulates a scenario where the sync point was advanced (e.g., via invalid
       // attestation handling at line 204), placing it ahead of a new checkpoint.
-      await archiverStore.setCheckpointSynchedL1BlockNumber(200n);
+      await archiverStore.blocks.setSynchedL1BlockNumber(200n);
       // checkForNewCheckpointsBeforeL1SyncPoint requires validationResult?.valid to be true
-      await archiverStore.setPendingChainValidationStatus({ valid: true });
+      await archiverStore.blocks.setPendingChainValidationStatus({ valid: true });
 
       // Add checkpoint 2 at L1 block 150 (behind the manual sync point of 200).
       // This simulates an L1 reorg that added a new checkpoint in a range already scanned.
@@ -1431,7 +1532,7 @@ describe('Archiver Sync', () => {
       const lastBlockInCheckpoint2 = cp2.blocks[cp2.blocks.length - 1].number;
       expect(await archiver.getBlockNumber()).toEqual(lastBlockInCheckpoint2);
       expect(await archiver.getSynchedCheckpointNumber()).toEqual(CheckpointNumber(1));
-      expect((await archiver.getL2Block(cp2.blocks[0].number))!.equals(cp2.blocks[0])).toBe(true);
+      expect((await archiver.getBlock({ number: cp2.blocks[0].number }))!.equals(cp2.blocks[0])).toBe(true);
 
       // Verify L2Tips after adding blocks: proposed advances but checkpointed stays at checkpoint 1
       const tipsAfterAddBlock = await archiver.getL2Tips();
@@ -1439,13 +1540,17 @@ describe('Archiver Sync', () => {
       expect(tipsAfterAddBlock.checkpointed.block.number).toEqual(lastBlockInCheckpoint1);
       expect(tipsAfterAddBlock.checkpointed.checkpoint.number).toEqual(CheckpointNumber(1));
 
-      // getCheckpointedBlock should return undefined for the new blocks since checkpoint 2 hasn't synced
+      // getBlocks with onlyCheckpointed should return empty for the new blocks since checkpoint 2 hasn't synced
       const firstNewBlockNumber = BlockNumber(lastBlockInCheckpoint1 + 1);
-      const uncheckpointedBlock = await archiver.getCheckpointedBlock(firstNewBlockNumber);
-      expect(uncheckpointedBlock).toBeUndefined();
+      const uncheckpointedBlocks = await archiver.getBlocks({
+        from: firstNewBlockNumber,
+        limit: 1,
+        onlyCheckpointed: true,
+      });
+      expect(uncheckpointedBlocks).toHaveLength(0);
 
-      // But getL2Block should work (it retrieves both checkpointed and uncheckpointed blocks)
-      const block = await archiver.getL2Block(firstNewBlockNumber);
+      // But getBlock should work (it retrieves both checkpointed and uncheckpointed blocks)
+      const block = await archiver.getBlock({ number: firstNewBlockNumber });
       expect(block).toBeDefined();
 
       // Now advance L1 so checkpoint 2 becomes visible
@@ -1465,10 +1570,14 @@ describe('Archiver Sync', () => {
       expect(tipsAfterCheckpoint2.checkpointed.block.number).toEqual(lastBlockInCheckpoint2);
       expect(tipsAfterCheckpoint2.checkpointed.checkpoint.number).toEqual(CheckpointNumber(2));
 
-      // getCheckpointedBlock should now work for the new blocks
-      const checkpointedBlock = await archiver.getCheckpointedBlock(firstNewBlockNumber);
-      expect(checkpointedBlock).toBeDefined();
-      expect(checkpointedBlock!.checkpointNumber).toEqual(2);
+      // getBlocks with onlyCheckpointed should now include the new blocks
+      const checkpointedBlocks = await archiver.getBlocks({
+        from: firstNewBlockNumber,
+        limit: 1,
+        onlyCheckpointed: true,
+      });
+      expect(checkpointedBlocks).toHaveLength(1);
+      expect(checkpointedBlocks[0].checkpointNumber).toEqual(2);
     }, 10_000);
 
     it('rejects adding blocks that are already checkpointed', async () => {
@@ -1522,7 +1631,7 @@ describe('Archiver Sync', () => {
       });
 
       // Try to add the block for the past slot - should be rejected
-      await expect(archiver.addBlock(pastSlotBlocks[0])).rejects.toThrow(/past slot/);
+      await expect(archiver.addBlock(pastSlotBlocks[0])).rejects.toThrow(BlockOrCheckpointSlotExpiredError);
     }, 10_000);
 
     it('adds missing blocks when checkpoint has more blocks than local', async () => {
@@ -1587,10 +1696,10 @@ describe('Archiver Sync', () => {
 
       // Add blocks from BOTH checkpoints locally (matching the L1 checkpoints)
       for (const block of cp2.blocks) {
-        await archiverStore.addProposedBlock(block, { force: true });
+        await archiverStore.blocks.addProposedBlock(block, { force: true });
       }
       for (const block of cp3.blocks) {
-        await archiverStore.addProposedBlock(block, { force: true });
+        await archiverStore.blocks.addProposedBlock(block, { force: true });
       }
 
       // Verify all blocks are visible locally
@@ -1867,7 +1976,7 @@ describe('Archiver Sync', () => {
         totalManaUsed: 0n,
         feeAssetPriceModifier: 0n,
       };
-      await archiver.setProposedCheckpoint(proposedCheckpoint);
+      await archiver.addProposedCheckpoint(proposedCheckpoint);
 
       // Advance L1 to block 2 (still in slot 1) — proposed checkpoint is still current
       fake.setL1BlockNumber(2n);
@@ -1878,7 +1987,7 @@ describe('Archiver Sync', () => {
       expect(await archiver.getBlockNumber()).toEqual(lastProvisionalBlockNumber);
 
       // Proposed checkpoint should still be set
-      expect(await archiverStore.blockStore.getProposedCheckpointOnly()).toBeDefined();
+      expect(await archiverStore.blocks.getLastProposedCheckpoint()).toBeDefined();
 
       // Proposed tip should be ahead of the checkpointed tip
       const tips = await archiver.getL2Tips();
@@ -1928,7 +2037,7 @@ describe('Archiver Sync', () => {
         totalManaUsed: 0n,
         feeAssetPriceModifier: 0n,
       };
-      await archiver.setProposedCheckpoint(proposedCheckpoint);
+      await archiver.addProposedCheckpoint(proposedCheckpoint);
 
       // Advance L1 to block 4 (slot 2), ending slot 1 without checkpoint on L1
       fake.setL1BlockNumber(4n);
@@ -1948,7 +2057,7 @@ describe('Archiver Sync', () => {
       expect(await archiver.getSynchedCheckpointNumber()).toEqual(CheckpointNumber(1));
 
       // Proposed checkpoint should be cleared, so proposed tip falls back to checkpointed tip
-      expect(await archiverStore.blockStore.getProposedCheckpointOnly()).toBeUndefined();
+      expect(await archiverStore.blocks.getLastProposedCheckpoint()).toBeUndefined();
       const tips = await archiver.getL2Tips();
       expect(tips.proposedCheckpoint.checkpoint.number).toEqual(tips.checkpointed.checkpoint.number);
       expect(tips.proposedCheckpoint.block.number).toEqual(tips.checkpointed.block.number);
diff --git a/yarn-project/archiver/src/archiver.ts b/yarn-project/archiver/src/archiver.ts
index 0e440d8c9697..23f417c088e3 100644
--- a/yarn-project/archiver/src/archiver.ts
+++ b/yarn-project/archiver/src/archiver.ts
@@ -14,6 +14,7 @@ import { RunningPromise, makeLoggingErrorHandler } from '@aztec/foundation/runni
 import { DateProvider, elapsed } from '@aztec/foundation/timer';
 import {
   type ArchiverEmitter,
+  type BlockHash,
   L2Block,
   type L2BlockSink,
   type L2Tips,
@@ -25,19 +26,21 @@ import {
   getEpochAtSlot,
   getSlotAtNextL1Block,
   getSlotRangeForEpoch,
+  getTimestampForSlot,
   getTimestampRangeForEpoch,
 } from '@aztec/stdlib/epoch-helpers';
+import type { BlockHeader } from '@aztec/stdlib/tx';
 import { type TelemetryClient, type Traceable, type Tracer, trackSpan } from '@aztec/telemetry-client';
 
 import { type ArchiverConfig, mapArchiverConfig } from './config.js';
-import { BlockAlreadyCheckpointedError, NoBlobBodiesFoundError } from './errors.js';
+import { BlockAlreadyCheckpointedError, BlockOrCheckpointSlotExpiredError, NoBlobBodiesFoundError } from './errors.js';
 import { validateAndLogHistoricalLogsAvailability } from './l1/validate_historical_logs.js';
 import { validateAndLogTraceAvailability } from './l1/validate_trace.js';
 import { ArchiverDataSourceBase } from './modules/data_source_base.js';
 import { ArchiverDataStoreUpdater } from './modules/data_store_updater.js';
 import type { ArchiverInstrumentation } from './modules/instrumentation.js';
 import type { ArchiverL1Synchronizer } from './modules/l1_synchronizer.js';
-import type { KVArchiverDataStore } from './store/kv_archiver_store.js';
+import { type ArchiverDataStores, backupArchiverDataStores, getArchiverSynchPoint } from './store/data_stores.js';
 import { L2TipsCache } from './store/l2_tips_cache.js';
 
 /** Export ArchiverEmitter for use in factory and tests. */
@@ -45,11 +48,20 @@ export type { ArchiverEmitter };
 
 /** Request to add a block to the archiver, queued for processing by the sync loop. */
 type AddBlockRequest = {
+  type: 'block';
   block: L2Block;
   resolve: () => void;
   reject: (err: Error) => void;
 };
 
+/** Request to add a proposed checkpoint to the archiver, queued for processing by the sync loop. */
+type AddProposedCheckpointRequest = {
+  type: 'checkpoint';
+  checkpoint: ProposedCheckpointInput;
+  resolve: () => void;
+  reject: (err: Error) => void;
+};
+
 export type ArchiverDeps = {
   telemetry?: TelemetryClient;
   blobClient: BlobClientInterface;
@@ -75,8 +87,8 @@ export class Archiver extends ArchiverDataSourceBase implements L2BlockSink, Tra
   private initialSyncComplete: boolean = false;
   private initialSyncPromise: PromiseWithResolvers<void>;
 
-  /** Queue of blocks to be added to the store, processed by the sync loop. */
-  private blockQueue: AddBlockRequest[] = [];
+  /** Queue of blocks and checkpoints to be added to the store, processed by the sync loop. */
+  private inboundQueue: (AddBlockRequest | AddProposedCheckpointRequest)[] = [];
 
   /** Helper to handle updates to the store */
   private readonly updater: ArchiverDataStoreUpdater;
@@ -95,7 +107,7 @@ export class Archiver extends ArchiverDataSourceBase implements L2BlockSink, Tra
    * @param rollup - Rollup contract instance.
    * @param inbox - Inbox contract instance.
    * @param l1Addresses - L1 contract addresses (registry, governance proposer, slashing proposer).
-   * @param dataStore - An archiver data store for storage & retrieval of blocks, encrypted logs & contract data.
+   * @param dataStores - Archiver substores for storage & retrieval of blocks, encrypted logs & contract data.
    * @param config - Archiver configuration options.
    * @param blobClient - Client for retrieving blob data.
    * @param dateProvider - Provider for current date/time.
@@ -113,7 +125,7 @@ export class Archiver extends ArchiverDataSourceBase implements L2BlockSink, Tra
     > & {
       slashingProposerAddress: EthAddress;
     },
-    readonly dataStore: KVArchiverDataStore,
+    readonly dataStores: ArchiverDataStores,
     private config: {
       pollingIntervalMs: number;
       batchSize: number;
@@ -130,18 +142,20 @@ export class Archiver extends ArchiverDataSourceBase implements L2BlockSink, Tra
     },
     synchronizer: ArchiverL1Synchronizer,
     events: ArchiverEmitter,
-    l2TipsCache?: L2TipsCache,
+    initialHeader: BlockHeader,
+    initialBlockHash: BlockHash,
+    l2TipsCache: L2TipsCache,
     private readonly log: Logger = createLogger('archiver'),
   ) {
-    super(dataStore, l1Constants);
+    super(dataStores, l1Constants, initialHeader, initialBlockHash, l1Constants.genesisArchiveRoot);
 
     this.tracer = instrumentation.tracer;
     this.instrumentation = instrumentation;
     this.initialSyncPromise = promiseWithResolvers();
     this.synchronizer = synchronizer;
     this.events = events;
-    this.l2TipsCache = l2TipsCache ?? new L2TipsCache(this.dataStore.blockStore);
-    this.updater = new ArchiverDataStoreUpdater(this.dataStore, this.l2TipsCache, {
+    this.l2TipsCache = l2TipsCache;
+    this.updater = new ArchiverDataStoreUpdater(this.dataStores, this.l2TipsCache, {
       rollupManaLimit: l1Constants.rollupManaLimit,
     });
 
@@ -191,7 +205,9 @@ export class Archiver extends ArchiverDataSourceBase implements L2BlockSink, Tra
 
     // Log initial state for the archiver
     const { l1StartBlock } = this.l1Constants;
-    const { blocksSynchedTo = l1StartBlock, messagesSynchedTo = l1StartBlock } = await this.store.getSynchPoint();
+    const { blocksSynchedTo = l1StartBlock, messagesSynchedTo = l1StartBlock } = await getArchiverSynchPoint(
+      this.stores,
+    );
     const currentL2Checkpoint = await this.getSynchedCheckpointNumber();
     this.log.info(
       `Starting archiver sync to rollup contract ${this.rollup.address} from L1 block ${blocksSynchedTo} and L2 checkpoint ${currentL2Checkpoint}`,
@@ -209,6 +225,14 @@ export class Archiver extends ArchiverDataSourceBase implements L2BlockSink, Tra
     return this.runningPromise.trigger();
   }
 
+  public trySyncImmediate() {
+    try {
+      return this.syncImmediate();
+    } catch (err) {
+      this.log.error(`Failed to trigger immediate archiver sync: ${err}`, err);
+    }
+  }
+
   /**
    * Queues a block to be added to the archiver store and triggers processing.
    * The block will be processed by the sync loop.
@@ -217,63 +241,85 @@ export class Archiver extends ArchiverDataSourceBase implements L2BlockSink, Tra
    * @returns A promise that resolves when the block has been added to the store, or rejects on error.
    */
   public addBlock(block: L2Block): Promise<void> {
-    return new Promise<void>((resolve, reject) => {
-      this.blockQueue.push({ block, resolve, reject });
-      this.log.debug(`Queued block ${block.number} for processing`);
-      // Trigger an immediate sync, but don't wait for it - the promise resolves when the block is processed
-      this.syncImmediate().catch(err => {
-        this.log.error(`Sync immediate call failed: ${err}`);
-      });
-    });
+    const promise = promiseWithResolvers<void>();
+    this.inboundQueue.push({ block, ...promise, type: 'block' });
+    this.log.debug(`Queued block ${block.number} for processing`);
+    void this.trySyncImmediate();
+    return promise.promise;
   }
 
-  public async setProposedCheckpoint(pending: ProposedCheckpointInput): Promise<void> {
-    await this.updater.setProposedCheckpoint(pending);
+  /**
+   * Queues a new proposed checkpoint into the archiver store.
+   * Checks that the checkpoint is not for an L2 slot already synced from L1.
+   * Resolves once the checkpoint has been processed.
+   */
+  public addProposedCheckpoint(pending: ProposedCheckpointInput): Promise<void> {
+    const promise = promiseWithResolvers<void>();
+    this.inboundQueue.push({ checkpoint: pending, ...promise, type: 'checkpoint' });
+    this.log.debug(`Queued checkpoint ${pending.checkpointNumber} for processing`);
+    void this.trySyncImmediate();
+    return promise.promise;
   }
 
   /**
-   * Processes all queued blocks, adding them to the store.
+   * Processes all queued blocks and checkpoints, adding them to the store.
    * Called at the beginning of each sync iteration.
-   * Blocks are processed in the order they were queued.
+   * Items are processed in the order they were queued.
    */
-  private async processQueuedBlocks(): Promise<void> {
-    if (this.blockQueue.length === 0) {
+  private async processInboundQueue(): Promise<void> {
+    if (this.inboundQueue.length === 0) {
       return;
     }
 
-    // Take all blocks from the queue
-    const queuedItems = this.blockQueue.splice(0, this.blockQueue.length);
-    this.log.debug(`Processing ${queuedItems.length} queued block(s)`);
+    // Take all items from the queue
+    const queuedItems = this.inboundQueue.splice(0, this.inboundQueue.length);
+    this.log.debug(`Processing ${queuedItems.length} queued inbound items`);
 
     // Calculate slot threshold for validation
     const l1Timestamp = this.synchronizer.getL1Timestamp();
     const slotAtNextL1Block =
       l1Timestamp === undefined ? undefined : getSlotAtNextL1Block(l1Timestamp, this.l1Constants);
 
-    // Process each block individually to properly resolve/reject each promise
-    for (const { block, resolve, reject } of queuedItems) {
-      const blockSlot = block.header.globalVariables.slotNumber;
-      if (slotAtNextL1Block !== undefined && blockSlot < slotAtNextL1Block) {
+    // Helpers for manipulating blocks and checkpoints in the queue
+    const getSlot: (item: AddBlockRequest | AddProposedCheckpointRequest) => SlotNumber = item =>
+      item.type === 'block' ? item.block.header.globalVariables.slotNumber : item.checkpoint.header.slotNumber;
+    const getNumber: (item: AddBlockRequest | AddProposedCheckpointRequest) => number = item =>
+      item.type === 'block' ? item.block.number : item.checkpoint.checkpointNumber;
+
+    // Process each item individually to properly resolve/reject each promise
+    for (const item of queuedItems) {
+      const { resolve, reject, type } = item;
+      const itemSlot = getSlot(item);
+      const itemNumber = getNumber(item);
+      if (slotAtNextL1Block !== undefined && itemSlot < slotAtNextL1Block) {
+        const nextSlotTimestamp = getTimestampForSlot(slotAtNextL1Block, this.l1Constants);
         this.log.warn(
-          `Rejecting proposed block ${block.number} for past slot ${blockSlot} (current is ${slotAtNextL1Block})`,
-          { block: block.toBlockInfo(), l1Timestamp, slotAtNextL1Block },
+          `Rejecting proposed ${type} ${itemNumber} for past slot ${itemSlot} (current ${slotAtNextL1Block})`,
+          { number: itemNumber, type, l1Timestamp, slotAtNextL1Block, nextSlotTimestamp },
         );
-        reject(new Error(`Block ${block.number} is for past slot ${blockSlot} (current is ${slotAtNextL1Block})`));
+        reject(new BlockOrCheckpointSlotExpiredError(itemSlot, nextSlotTimestamp, l1Timestamp));
         continue;
       }
 
       try {
-        const [durationMs] = await elapsed(() => this.updater.addProposedBlock(block));
-        this.instrumentation.processNewProposedBlock(durationMs, block);
-        this.log.debug(`Added block ${block.number} to store`);
+        if (type === 'block') {
+          const [durationMs] = await elapsed(() => this.updater.addProposedBlock(item.block));
+          this.instrumentation.processNewProposedBlock(durationMs, item.block);
+        } else {
+          await this.updater.addProposedCheckpoint(item.checkpoint);
+        }
+        this.log.debug(`Added ${type} ${itemNumber} to store`);
         resolve();
       } catch (err: any) {
         if (err instanceof BlockAlreadyCheckpointedError) {
-          this.log.debug(`Proposed block ${block.number} matches already checkpointed block, ignoring late proposal`);
+          this.log.debug(`Proposed block ${itemNumber} matches already checkpointed block, ignoring late proposal`);
           resolve();
           continue;
         }
-        this.log.error(`Failed to add block ${block.number} to store: ${err.message}`);
+        this.log.error(`Failed to add ${type} ${itemNumber} to store: ${err.message}`, err, {
+          number: itemNumber,
+          type,
+        });
         reject(err);
       }
     }
@@ -289,7 +335,7 @@ export class Archiver extends ArchiverDataSourceBase implements L2BlockSink, Tra
   @trackSpan('Archiver.sync')
   private async sync() {
     // Process any queued blocks first, before doing L1 sync
-    await this.processQueuedBlocks();
+    await this.processInboundQueue();
     // Now perform L1 sync
     await this.syncFromL1();
   }
@@ -305,7 +351,7 @@ export class Archiver extends ArchiverDataSourceBase implements L2BlockSink, Tra
       if (currentL1BlockNumber + 1n >= l1BlockNumberAtEnd) {
         this.log.info(`Initial archiver sync to L1 block ${currentL1BlockNumber} complete`, {
           l1BlockNumber: currentL1BlockNumber,
-          syncPoint: await this.store.getSynchPoint(),
+          syncPoint: await getArchiverSynchPoint(this.stores),
           ...(await this.getL2Tips()),
         });
         this.runningPromise.setPollingIntervalMS(this.config.pollingIntervalMs);
@@ -337,7 +383,7 @@ export class Archiver extends ArchiverDataSourceBase implements L2BlockSink, Tra
   }
 
   public backupTo(destPath: string): Promise<string> {
-    return this.dataStore.backupTo(destPath);
+    return backupArchiverDataStores(this.dataStores, destPath);
   }
 
   public getL1Constants(): Promise<L1RollupConstants> {
@@ -379,9 +425,9 @@ export class Archiver extends ArchiverDataSourceBase implements L2BlockSink, Tra
     }
 
     let slotFromCheckpoint: SlotNumber | undefined;
-    const latestCheckpointNumber = await this.store.getSynchedCheckpointNumber();
+    const latestCheckpointNumber = await this.stores.blocks.getLatestCheckpointNumber();
     if (latestCheckpointNumber > 0) {
-      const checkpointData = await this.store.getCheckpointData(latestCheckpointNumber);
+      const checkpointData = await this.stores.blocks.getCheckpointData(latestCheckpointNumber);
       if (checkpointData) {
         slotFromCheckpoint = checkpointData.header.slotNumber;
       }
@@ -413,8 +459,7 @@ export class Archiver extends ArchiverDataSourceBase implements L2BlockSink, Tra
     // The epoch is complete if the current checkpointed L2 block is the last one in the epoch (or later).
     // We use the checkpointed block number (synced from L1) instead of 'latest' to avoid returning true
     // prematurely when proposed blocks have been pushed to the archiver but not yet checkpointed on L1.
-    const checkpointedBlockNumber = await this.getCheckpointedL2BlockNumber();
-    const header = checkpointedBlockNumber > 0 ? await this.getBlockHeader(checkpointedBlockNumber) : undefined;
+    const header = (await this.getBlockData({ tag: 'checkpointed' }))?.header;
     const slot = header ? header.globalVariables.slotNumber : undefined;
     const [_startSlot, endSlot] = getSlotRangeForEpoch(epochNumber, this.l1Constants);
     if (slot && slot >= endSlot) {
@@ -470,29 +515,34 @@ export class Archiver extends ArchiverDataSourceBase implements L2BlockSink, Tra
     if (targetL2BlockNumber >= currentL2Block) {
       throw new Error(`Target L2 block ${targetL2BlockNumber} must be less than current L2 block ${currentL2Block}`);
     }
-    const targetL2Block = await this.store.getCheckpointedBlock(targetL2BlockNumber);
-    if (!targetL2Block) {
+    const checkpointedTip = await this.stores.blocks.getCheckpointedL2BlockNumber();
+    if (targetL2BlockNumber > checkpointedTip) {
+      throw new Error(`Target L2 block ${targetL2BlockNumber} is not checkpointed yet`);
+    }
+    const targetBlockData = await this.stores.blocks.getBlockData({ number: targetL2BlockNumber });
+    if (!targetBlockData) {
       throw new Error(`Target L2 block ${targetL2BlockNumber} not found`);
     }
-    const targetCheckpointNumber = targetL2Block.checkpointNumber;
+    const targetCheckpointNumber = targetBlockData.checkpointNumber;
 
     // Rollback operates at checkpoint granularity: the target block must be the last block of its checkpoint.
-    const checkpointData = await this.store.getCheckpointData(targetCheckpointNumber);
-    if (checkpointData) {
-      const lastBlockInCheckpoint = BlockNumber(checkpointData.startBlock + checkpointData.blockCount - 1);
-      if (targetL2BlockNumber !== lastBlockInCheckpoint) {
-        const previousCheckpointBoundary =
-          checkpointData.startBlock > 1 ? BlockNumber(checkpointData.startBlock - 1) : BlockNumber(0);
-        throw new Error(
-          `Target L2 block ${targetL2BlockNumber} is not at a checkpoint boundary. ` +
-            `Checkpoint ${targetCheckpointNumber} spans blocks ${checkpointData.startBlock} to ${lastBlockInCheckpoint}. ` +
-            `Use block ${lastBlockInCheckpoint} to roll back to this checkpoint, ` +
-            `or block ${previousCheckpointBoundary} to roll back to the previous one.`,
-        );
-      }
+    const checkpointData = await this.stores.blocks.getCheckpointData(targetCheckpointNumber);
+    if (!checkpointData) {
+      throw new Error(`Checkpoint ${targetCheckpointNumber} not found for block ${targetL2BlockNumber}`);
+    }
+    const lastBlockInCheckpoint = BlockNumber(checkpointData.startBlock + checkpointData.blockCount - 1);
+    if (targetL2BlockNumber !== lastBlockInCheckpoint) {
+      const previousCheckpointBoundary =
+        checkpointData.startBlock > 1 ? BlockNumber(checkpointData.startBlock - 1) : BlockNumber(0);
+      throw new Error(
+        `Target L2 block ${targetL2BlockNumber} is not at a checkpoint boundary. ` +
+          `Checkpoint ${targetCheckpointNumber} spans blocks ${checkpointData.startBlock} to ${lastBlockInCheckpoint}. ` +
+          `Use block ${lastBlockInCheckpoint} to roll back to this checkpoint, ` +
+          `or block ${previousCheckpointBoundary} to roll back to the previous one.`,
+      );
     }
 
-    const targetL1BlockNumber = targetL2Block.l1.blockNumber;
+    const targetL1BlockNumber = checkpointData.l1.blockNumber;
     const targetL1Block = await this.publicClient.getBlock({
       blockNumber: targetL1BlockNumber,
       includeTransactions: false,
@@ -506,10 +556,10 @@ export class Archiver extends ArchiverDataSourceBase implements L2BlockSink, Tra
     );
     await this.updater.removeCheckpointsAfter(targetCheckpointNumber);
     this.log.info(`Rolling back L1 to L2 messages to checkpoint ${targetCheckpointNumber}`);
-    await this.store.rollbackL1ToL2MessagesToCheckpoint(targetCheckpointNumber);
+    await this.stores.messages.rollbackL1ToL2MessagesToCheckpoint(targetCheckpointNumber);
     this.log.info(`Setting L1 syncpoints to ${targetL1BlockNumber}`);
-    await this.store.setCheckpointSynchedL1BlockNumber(targetL1BlockNumber);
-    await this.store.setMessageSyncState(
+    await this.stores.blocks.setSynchedL1BlockNumber(targetL1BlockNumber);
+    await this.stores.messages.setMessageSyncState(
       { l1BlockNumber: targetL1BlockNumber, l1BlockHash: targetL1BlockHash },
       undefined,
     );
diff --git a/yarn-project/archiver/src/config.ts b/yarn-project/archiver/src/config.ts
index 7bae461e9110..8e6586d3fd9a 100644
--- a/yarn-project/archiver/src/config.ts
+++ b/yarn-project/archiver/src/config.ts
@@ -7,6 +7,7 @@ import {
   booleanConfigHelper,
   getConfigFromMappings,
   numberConfigHelper,
+  optionalNumberConfigHelper,
 } from '@aztec/foundation/config';
 import {
   type ChainConfig,
@@ -50,7 +51,7 @@ export const archiverConfigMappings: ConfigMappingsType<ArchiverConfig> = {
   },
   archiverStoreMapSizeKb: {
     env: 'ARCHIVER_STORE_MAP_SIZE_KB',
-    parseEnv: (val: string) => +val,
+    ...optionalNumberConfigHelper(),
     description: 'The maximum possible size of the archiver DB in KB. Overwrites the general dataStoreMapSizeKb.',
   },
   skipValidateCheckpointAttestations: {
diff --git a/yarn-project/archiver/src/errors.ts b/yarn-project/archiver/src/errors.ts
index f9a021a4d296..64fae2aa69dd 100644
--- a/yarn-project/archiver/src/errors.ts
+++ b/yarn-project/archiver/src/errors.ts
@@ -1,14 +1,17 @@
+import type { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
 import type { Fr } from '@aztec/foundation/schemas';
 
 export class NoBlobBodiesFoundError extends Error {
   constructor(l2BlockNum: number) {
     super(`No blob bodies found for block ${l2BlockNum}`);
+    this.name = 'NoBlobBodiesFoundError';
   }
 }
 
 export class BlockNumberNotSequentialError extends Error {
   constructor(newBlockNumber: number, previous: number | undefined) {
     super(`Cannot insert new block ${newBlockNumber} given previous block number is ${previous ?? 'undefined'}`);
+    this.name = 'BlockNumberNotSequentialError';
   }
 }
 
@@ -22,18 +25,35 @@ export class InitialCheckpointNumberNotSequentialError extends Error {
         previousCheckpointNumber ?? 'undefined'
       }`,
     );
+    this.name = 'InitialCheckpointNumberNotSequentialError';
   }
 }
 
 export class CheckpointNumberNotSequentialError extends Error {
   constructor(
-    newCheckpointNumber: number,
-    previous: number | undefined,
-    source: 'confirmed' | 'proposed' = 'confirmed',
+    newCheckpointNumber: CheckpointNumber,
+    previous: CheckpointNumber | undefined,
+    source?: 'proposed' | 'confirmed',
   ) {
+    const qualifier = source ? `${source} ` : '';
     super(
-      `Cannot insert new checkpoint ${newCheckpointNumber} given previous ${source} checkpoint number is ${previous ?? 'undefined'}`,
+      `Cannot insert new checkpoint ${newCheckpointNumber} given previous ${qualifier}checkpoint number is ${previous ?? 'undefined'}`,
     );
+    this.name = 'CheckpointNumberNotSequentialError';
+  }
+}
+
+/** Thrown when a proposed block carries a checkpoint number that does not follow the latest one. */
+export class BlockCheckpointNumberNotSequentialError extends Error {
+  constructor(
+    blockNumber: BlockNumber,
+    blockCheckpointNumber: CheckpointNumber,
+    previous: CheckpointNumber | undefined,
+  ) {
+    super(
+      `Cannot insert new block ${blockNumber} for checkpoint ${blockCheckpointNumber} given previous checkpoint number is ${previous ?? 'undefined'}`,
+    );
+    this.name = 'BlockCheckpointNumberNotSequentialError';
   }
 }
 
@@ -42,6 +62,7 @@ export class BlockIndexNotSequentialError extends Error {
     super(
       `Cannot insert new block at checkpoint index ${newBlockIndex} given previous block index is ${previousBlockIndex ?? 'undefined'}`,
     );
+    this.name = 'BlockIndexNotSequentialError';
   }
 }
 
@@ -55,18 +76,21 @@ export class BlockArchiveNotConsistentError extends Error {
     super(
       `Cannot insert new block number ${newBlockNumber} with archive ${newBlockArchive.toString()} previous block number is ${previousBlockNumber ?? 'undefined'}, previous archive is ${previousBlockArchive?.toString() ?? 'undefined'}`,
     );
+    this.name = 'BlockArchiveNotConsistentError';
   }
 }
 
 export class CheckpointNotFoundError extends Error {
   constructor(checkpointNumber: number) {
     super(`Failed to find expected checkpoint number ${checkpointNumber}`);
+    this.name = 'CheckpointNotFoundError';
   }
 }
 
 export class BlockNotFoundError extends Error {
   constructor(blockNumber: number) {
     super(`Failed to find expected block number ${blockNumber}`);
+    this.name = 'BlockNotFoundError';
   }
 }
 
@@ -119,19 +143,34 @@ export class ProposedCheckpointStaleError extends Error {
   }
 }
 
-/** Thrown when a proposed checkpoint number is not the expected confirmed + 1. */
+/** Thrown when a proposed checkpoint number is not the expected latestTip + 1. */
 export class ProposedCheckpointNotSequentialError extends Error {
   constructor(
     public readonly proposedCheckpointNumber: number,
-    public readonly confirmedCheckpointNumber: number,
+    public readonly latestTipNumber: number,
   ) {
     super(
-      `Proposed checkpoint ${proposedCheckpointNumber} is not sequential: expected ${confirmedCheckpointNumber + 1} (confirmed + 1)`,
+      `Proposed checkpoint ${proposedCheckpointNumber} is not sequential: expected ${latestTipNumber + 1} (latest tip + 1, where tip is highest of confirmed or pending)`,
     );
     this.name = 'ProposedCheckpointNotSequentialError';
   }
 }
 
+/** Thrown when a proposed checkpoint or block L2 slot has already expired on L1. */
+export class BlockOrCheckpointSlotExpiredError extends Error {
+  constructor(
+    public readonly slot: number,
+    public readonly nextSlotStart: bigint,
+    public readonly l1TimestampSynced: bigint | undefined,
+  ) {
+    super(
+      `Checkpoint or block for slot ${slot} is expired: L1 synced to ${l1TimestampSynced} which is past the next slot start ${nextSlotStart}. ` +
+        `If the checkpoint still lands via a late L1 tx, the archiver will pick it up via normal L1-sync (not the pending-queue shortcut).`,
+    );
+    this.name = 'BlockOrCheckpointSlotExpiredError';
+  }
+}
+
 /** Thrown when attempting to promote a proposed checkpoint but no proposed checkpoint exists in the store. */
 export class NoProposedCheckpointToPromoteError extends Error {
   constructor() {
diff --git a/yarn-project/archiver/src/factory.ts b/yarn-project/archiver/src/factory.ts
index 481638943414..e5eb2eb1bac4 100644
--- a/yarn-project/archiver/src/factory.ts
+++ b/yarn-project/archiver/src/factory.ts
@@ -12,9 +12,10 @@ import { createStore } from '@aztec/kv-store/lmdb-v2';
 import { protocolContractNames } from '@aztec/protocol-contracts';
 import { BundledProtocolContractsProvider } from '@aztec/protocol-contracts/providers/bundle';
 import { FunctionType, decodeFunctionSignature } from '@aztec/stdlib/abi';
-import type { ArchiverEmitter } from '@aztec/stdlib/block';
+import type { ArchiverEmitter, BlockHash } from '@aztec/stdlib/block';
 import { type ContractClassPublicWithCommitment, computePublicBytecodeCommitment } from '@aztec/stdlib/contract';
 import type { DataStoreConfig } from '@aztec/stdlib/kv-store';
+import type { BlockHeader } from '@aztec/stdlib/tx';
 import { getTelemetryClient } from '@aztec/telemetry-client';
 
 import { EventEmitter } from 'events';
@@ -24,7 +25,7 @@ import { Archiver, type ArchiverDeps } from './archiver.js';
 import { type ArchiverConfig, mapArchiverConfig } from './config.js';
 import { ArchiverInstrumentation } from './modules/instrumentation.js';
 import { ArchiverL1Synchronizer } from './modules/l1_synchronizer.js';
-import { ARCHIVER_DB_VERSION, KVArchiverDataStore } from './store/kv_archiver_store.js';
+import { ARCHIVER_DB_VERSION, type ArchiverDataStores, createArchiverDataStores } from './store/data_stores.js';
 import { L2TipsCache } from './store/l2_tips_cache.js';
 
 export const ARCHIVER_STORE_NAME = 'archiver';
@@ -32,13 +33,13 @@ export const ARCHIVER_STORE_NAME = 'archiver';
 /** Creates an archiver store. */
 export async function createArchiverStore(
   userConfig: Pick<ArchiverConfig, 'archiverStoreMapSizeKb' | 'maxLogs'> & DataStoreConfig,
-) {
+): Promise<ArchiverDataStores> {
   const config = {
     ...userConfig,
     dataStoreMapSizeKb: userConfig.archiverStoreMapSizeKb ?? userConfig.dataStoreMapSizeKb,
   };
   const store = await createStore(ARCHIVER_STORE_NAME, ARCHIVER_DB_VERSION, config);
-  return new KVArchiverDataStore(store, config.maxLogs);
+  return createArchiverDataStores(store, { logsMaxPageSize: config.maxLogs });
 }
 
 /**
@@ -46,12 +47,17 @@ export async function createArchiverStore(
  * @param config - The archiver configuration.
  * @param deps - The archiver dependencies (blobClient, epochCache, dateProvider, telemetry).
  * @param opts - The options.
+ * @param initialHeader - The genesis block header from world-state, used to answer block-0 queries.
+ * @param initialBlockHash - Precomputed hash of `initialHeader`. Hoisted to the caller so the archiver
+ * can expose `getGenesisBlockHash()` synchronously.
  * @returns The local archiver.
  */
 export async function createArchiver(
   config: ArchiverConfig & DataStoreConfig,
   deps: ArchiverDeps,
   opts: { blockUntilSync: boolean } = { blockUntilSync: true },
+  initialHeader: BlockHeader,
+  initialBlockHash: BlockHash,
 ): Promise<Archiver> {
   const archiverStore = await createArchiverStore(config);
   await registerProtocolContracts(archiverStore);
@@ -128,13 +134,15 @@ export async function createArchiver(
 
   const epochCache = deps.epochCache ?? (await EpochCache.create(config.l1Contracts.rollupAddress, config, deps));
   const telemetry = deps.telemetry ?? getTelemetryClient();
-  const instrumentation = await ArchiverInstrumentation.new(telemetry, () => archiverStore.estimateSize());
+  const instrumentation = await ArchiverInstrumentation.new(telemetry, () => archiverStore.db.estimateSize());
 
   // Create the event emitter that will be shared by archiver and synchronizer
   const events = new EventEmitter() as ArchiverEmitter;
 
-  // Create L2 tips cache shared by archiver and synchronizer
-  const l2TipsCache = new L2TipsCache(archiverStore.blockStore);
+  // Create L2 tips cache shared by archiver and synchronizer. The genesis block hash is dynamic —
+  // it depends on the injected initial header (genesisTimestamp + prefilled state). Hoisted to the
+  // caller so we can pass the same value to the archiver and expose it via `getGenesisBlockHash()`.
+  const l2TipsCache = new L2TipsCache(archiverStore.blocks, initialBlockHash);
 
   // Create the L1 synchronizer
   const synchronizer = new ArchiverL1Synchronizer(
@@ -167,6 +175,8 @@ export async function createArchiver(
     l1Constants,
     synchronizer,
     events,
+    initialHeader,
+    initialBlockHash,
     l2TipsCache,
   );
 
@@ -175,14 +185,14 @@ export async function createArchiver(
 }
 
 /** Registers protocol contracts in the archiver store. Idempotent — skips contracts that already exist (e.g. on node restart). */
-export async function registerProtocolContracts(store: KVArchiverDataStore) {
+export async function registerProtocolContracts(stores: ArchiverDataStores) {
   const blockNumber = 0;
   for (const name of protocolContractNames) {
     const provider = new BundledProtocolContractsProvider();
     const contract = await provider.getProtocolContractArtifact(name);
 
     // Skip if already registered (happens on node restart with a persisted store).
-    if (await store.getContractClass(contract.contractClass.id)) {
+    if (await stores.contractClasses.getContractClass(contract.contractClass.id)) {
       continue;
     }
 
@@ -196,8 +206,8 @@ export async function registerProtocolContracts(store: KVArchiverDataStore) {
       .filter(fn => fn.functionType === FunctionType.PUBLIC)
       .map(fn => decodeFunctionSignature(fn.name, fn.parameters));
 
-    await store.registerContractFunctionSignatures(publicFunctionSignatures);
-    await store.addContractClasses([contractClassPublic], BlockNumber(blockNumber));
-    await store.addContractInstances([contract.instance], BlockNumber(blockNumber));
+    await stores.functionNames.register(publicFunctionSignatures);
+    await stores.contractClasses.addContractClasses([contractClassPublic], BlockNumber(blockNumber));
+    await stores.contractInstances.addContractInstances([contract.instance], BlockNumber(blockNumber));
   }
 }
diff --git a/yarn-project/archiver/src/index.ts b/yarn-project/archiver/src/index.ts
index 8076b4350676..78587150a24b 100644
--- a/yarn-project/archiver/src/index.ts
+++ b/yarn-project/archiver/src/index.ts
@@ -6,7 +6,21 @@ export * from './modules/data_store_updater.js';
 export * from './config.js';
 
 export { type L1PublishedData } from './structs/published.js';
-export { KVArchiverDataStore, ARCHIVER_DB_VERSION } from './store/kv_archiver_store.js';
+export {
+  ARCHIVER_DB_VERSION,
+  type ArchiverDataStores,
+  type ArchiverL1SynchPoint,
+  backupArchiverDataStores,
+  createArchiverDataStores,
+  createContractDataSource,
+  getArchiverSynchPoint,
+} from './store/data_stores.js';
+export { FunctionNamesCache } from './store/function_names_cache.js';
+export { ArchiverContractDataSourceAdapter } from './modules/contract_data_source_adapter.js';
+export { BlockStore } from './store/block_store.js';
+export { LogStore } from './store/log_store.js';
+export { MessageStore } from './store/message_store.js';
+export { ContractClassStore } from './store/contract_class_store.js';
 export { ContractInstanceStore } from './store/contract_instance_store.js';
 export { L2TipsCache } from './store/l2_tips_cache.js';
 
diff --git a/yarn-project/archiver/src/l1/calldata_retriever.test.ts b/yarn-project/archiver/src/l1/calldata_retriever.test.ts
index 0d1c78ef707c..36f1db400daf 100644
--- a/yarn-project/archiver/src/l1/calldata_retriever.test.ts
+++ b/yarn-project/archiver/src/l1/calldata_retriever.test.ts
@@ -11,7 +11,7 @@ import { withHexPrefix } from '@aztec/foundation/string';
 import { RollupAbi } from '@aztec/l1-artifacts';
 import { Signature } from '@aztec/stdlib/block';
 import { GasFees } from '@aztec/stdlib/gas';
-import { ConsensusPayload, SignatureDomainSeparator } from '@aztec/stdlib/p2p';
+import { ConsensusPayload, getHashedSignaturePayloadTypedData } from '@aztec/stdlib/p2p';
 import { CheckpointHeader } from '@aztec/stdlib/rollup';
 
 import { jest } from '@jest/globals';
@@ -88,6 +88,8 @@ describe('CalldataRetriever', () => {
   beforeEach(() => {
     txHash = '0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef';
     publicClient = mock<ViemPublicClient>();
+    // CalldataRetriever reads `publicClient.chain.id` to build the EIP-712 signing context.
+    (publicClient as unknown as { chain: { id: number } }).chain = { id: 1 };
     debugClient = mock<ViemPublicDebugClient>();
     logger = createLogger('test:calldata_retriever');
     instrumentation = mock<ArchiverInstrumentation>();
@@ -376,12 +378,14 @@ describe('CalldataRetriever', () => {
       const tx = makeMulticall3Transaction([{ target: rollupAddress.toString(), callData: proposeCalldata }]);
       publicClient.getTransaction.mockResolvedValue(tx);
 
-      // Compute the expected payloadDigest using ConsensusPayload (same logic as the validator)
-      // Note: feeAssetPriceModifier is 0n in makeProposeCalldata
+      // Compute the expected payloadDigest using the same EIP-712 typed data hash
+      // that CalldataRetriever.computePayloadDigest uses under the hood.
       const checkpointHeader = CheckpointHeader.fromViem(header);
-      const consensusPayload = new ConsensusPayload(checkpointHeader, archiveRoot, feeAssetPriceModifier);
-      const payloadToSign = consensusPayload.getPayloadToSign(SignatureDomainSeparator.checkpointAttestation);
-      const expectedPayloadDigest = keccak256(payloadToSign);
+      const consensusPayload = new ConsensusPayload(checkpointHeader, archiveRoot, feeAssetPriceModifier, {
+        chainId: 1,
+        rollupAddress,
+      });
+      const expectedPayloadDigest = getHashedSignaturePayloadTypedData(consensusPayload).toString() as Hex;
 
       // Mock only attestationsHash computation; use real payloadDigest
       jest
diff --git a/yarn-project/archiver/src/l1/calldata_retriever.ts b/yarn-project/archiver/src/l1/calldata_retriever.ts
index 98bcbe52866a..22acd1df7c02 100644
--- a/yarn-project/archiver/src/l1/calldata_retriever.ts
+++ b/yarn-project/archiver/src/l1/calldata_retriever.ts
@@ -7,7 +7,7 @@ import { EthAddress } from '@aztec/foundation/eth-address';
 import type { Logger } from '@aztec/foundation/log';
 import { RollupAbi } from '@aztec/l1-artifacts';
 import { CommitteeAttestation } from '@aztec/stdlib/block';
-import { ConsensusPayload, SignatureDomainSeparator } from '@aztec/stdlib/p2p';
+import { ConsensusPayload, getHashedSignaturePayloadTypedData } from '@aztec/stdlib/p2p';
 import { CheckpointHeader } from '@aztec/stdlib/rollup';
 
 import {
@@ -61,6 +61,13 @@ export class CalldataRetriever {
     private readonly rollupAddress: EthAddress,
   ) {}
 
+  private getSignatureContext() {
+    return {
+      chainId: this.publicClient.chain.id,
+      rollupAddress: this.rollupAddress,
+    };
+  }
+
   /**
    * Gets checkpoint header and metadata from the calldata of an L1 transaction.
    * Tries multicall3 decoding, falls back to trace-based extraction.
@@ -466,9 +473,13 @@ export class CalldataRetriever {
 
   /** Computes the keccak256 payload digest from the checkpoint header, archive root, and fee asset price modifier. */
   private computePayloadDigest(header: CheckpointHeader, archiveRoot: Fr, feeAssetPriceModifier: bigint): Hex {
-    const consensusPayload = new ConsensusPayload(header, archiveRoot, feeAssetPriceModifier);
-    const payloadToSign = consensusPayload.getPayloadToSign(SignatureDomainSeparator.checkpointAttestation);
-    return keccak256(payloadToSign);
+    const consensusPayload = new ConsensusPayload(
+      header,
+      archiveRoot,
+      feeAssetPriceModifier,
+      this.getSignatureContext(),
+    );
+    return getHashedSignaturePayloadTypedData(consensusPayload).toString();
   }
 
   /**
diff --git a/yarn-project/archiver/src/modules/contract_data_source_adapter.ts b/yarn-project/archiver/src/modules/contract_data_source_adapter.ts
new file mode 100644
index 000000000000..9fc7a39bce20
--- /dev/null
+++ b/yarn-project/archiver/src/modules/contract_data_source_adapter.ts
@@ -0,0 +1,55 @@
+import type { BlockNumber } from '@aztec/foundation/branded-types';
+import type { Fr } from '@aztec/foundation/curves/bn254';
+import type { FunctionSelector } from '@aztec/stdlib/abi';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { ContractClassPublic, ContractDataSource, ContractInstanceWithAddress } from '@aztec/stdlib/contract';
+import type { UInt64 } from '@aztec/stdlib/types';
+
+import type { ArchiverDataStores } from '../store/data_stores.js';
+
+/**
+ * Thin {@link ContractDataSource} adapter over {@link ArchiverDataStores}.
+ *
+ * Used by contexts (e.g. offline epoch re-prover tools) that need a ContractDataSource
+ * but do not need a full archiver instance.
+ */
+export class ArchiverContractDataSourceAdapter implements ContractDataSource {
+  constructor(private readonly stores: ArchiverDataStores) {}
+
+  public getBlockNumber(): Promise<BlockNumber> {
+    return this.stores.blocks.getLatestL2BlockNumber();
+  }
+
+  public getContractClass(id: Fr): Promise<ContractClassPublic | undefined> {
+    return this.stores.contractClasses.getContractClass(id);
+  }
+
+  public getBytecodeCommitment(id: Fr): Promise<Fr | undefined> {
+    return this.stores.contractClasses.getBytecodeCommitment(id);
+  }
+
+  public async getContract(
+    address: AztecAddress,
+    maybeTimestamp?: UInt64,
+  ): Promise<ContractInstanceWithAddress | undefined> {
+    let timestamp = maybeTimestamp;
+    if (timestamp === undefined) {
+      const latest = await this.stores.blocks.getLatestL2BlockNumber();
+      const blockData = latest > 0 ? await this.stores.blocks.getBlockData({ number: latest }) : undefined;
+      timestamp = blockData ? blockData.header.globalVariables.timestamp : 0n;
+    }
+    return this.stores.contractInstances.getContractInstance(address, timestamp);
+  }
+
+  public getContractClassIds(): Promise<Fr[]> {
+    return this.stores.contractClasses.getContractClassIds();
+  }
+
+  public getDebugFunctionName(_address: AztecAddress, selector: FunctionSelector): Promise<string | undefined> {
+    return Promise.resolve(this.stores.functionNames.get(selector));
+  }
+
+  public registerContractFunctionSignatures(signatures: string[]): Promise<void> {
+    return this.stores.functionNames.register(signatures);
+  }
+}
diff --git a/yarn-project/archiver/src/modules/data_source_base.ts b/yarn-project/archiver/src/modules/data_source_base.ts
index c05bec3cde24..ad051843475c 100644
--- a/yarn-project/archiver/src/modules/data_source_base.ts
+++ b/yarn-project/archiver/src/modules/data_source_base.ts
@@ -1,11 +1,25 @@
-import { range } from '@aztec/foundation/array';
-import { BlockNumber, CheckpointNumber, type EpochNumber, type SlotNumber } from '@aztec/foundation/branded-types';
+import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
+import {
+  BlockNumber,
+  CheckpointNumber,
+  type EpochNumber,
+  IndexWithinCheckpoint,
+  type SlotNumber,
+} from '@aztec/foundation/branded-types';
 import type { Fr } from '@aztec/foundation/curves/bn254';
 import type { EthAddress } from '@aztec/foundation/eth-address';
-import { isDefined } from '@aztec/foundation/types';
 import type { FunctionSelector } from '@aztec/stdlib/abi';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { type BlockData, type BlockHash, CheckpointedL2Block, L2Block, type L2Tips } from '@aztec/stdlib/block';
+import {
+  type BlockData,
+  type BlockHash,
+  type BlockQuery,
+  type BlockTag,
+  type BlocksQuery,
+  Body,
+  L2Block,
+  type L2Tips,
+} from '@aztec/stdlib/block';
 import {
   Checkpoint,
   type CheckpointData,
@@ -20,25 +34,93 @@ import type { L2LogsSource } from '@aztec/stdlib/interfaces/server';
 import type { LogFilter, SiloedTag, Tag, TxScopedL2Log } from '@aztec/stdlib/logs';
 import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
 import type { CheckpointHeader } from '@aztec/stdlib/rollup';
+import { AppendOnlyTreeSnapshot } from '@aztec/stdlib/trees';
 import type { BlockHeader, IndexedTxEffect, TxHash, TxReceipt } from '@aztec/stdlib/tx';
 import type { UInt64 } from '@aztec/stdlib/types';
 
 import type { ArchiverDataSource } from '../interfaces.js';
-import type { KVArchiverDataStore } from '../store/kv_archiver_store.js';
+import type { ResolvedBlockQuery, ResolvedBlocksQuery } from '../store/block_store.js';
+import type { ArchiverDataStores } from '../store/data_stores.js';
 import type { ValidateCheckpointResult } from './validation.js';
 
 /**
- * Abstract base class implementing ArchiverDataSource using a KVArchiverDataStore.
- * Provides implementations for all store-delegating methods and declares abstract methods
- * for L1-dependent functionality that subclasses must implement.
+ * Sentinel returned by {@link ArchiverDataSourceBase#resolveBlockQuery} when a query resolves
+ * to the genesis block. Forces single-block lookup methods to take the genesis branch
+ * explicitly rather than silently falling through to the BlockStore (which never has a block 0).
+ */
+type GenesisBlockQuery = { genesis: true };
+
+/**
+ * Abstract base class implementing ArchiverDataSource using a bundle of archiver substores.
+ * Provides implementations for all read-side methods and declares abstract methods for
+ * L1-dependent functionality that subclasses must implement.
  */
 export abstract class ArchiverDataSourceBase
   implements ArchiverDataSource, L2LogsSource, ContractDataSource, L1ToL2MessageSource
 {
+  /** The injected genesis block header. */
+  protected readonly initialHeader: BlockHeader;
+  /** Precomputed hash of the initial header, exposed via {@link getGenesisBlockHash}. */
+  protected readonly initialBlockHash: BlockHash;
+  /** Archive root after block 0 was appended — read from L1 (`Rollup.getGenesisArchiveTreeRoot`). */
+  protected readonly genesisArchiveRoot: Fr;
+
+  /** Memoized synthetic genesis block — callers rely on referential identity for caching. */
+  private readonly genesisBlock: L2Block;
+  /** Memoized synthetic genesis block data — kept consistent with {@link genesisBlock}. */
+  private readonly genesisBlockData: BlockData;
+
   constructor(
-    protected readonly store: KVArchiverDataStore,
-    protected readonly l1Constants?: L1RollupConstants,
-  ) {}
+    protected readonly stores: ArchiverDataStores,
+    protected readonly l1Constants: L1RollupConstants | undefined,
+    initialHeader: BlockHeader,
+    initialBlockHash: BlockHash,
+    genesisArchiveRoot: Fr,
+  ) {
+    this.initialHeader = initialHeader;
+    this.initialBlockHash = initialBlockHash;
+    this.genesisArchiveRoot = genesisArchiveRoot;
+
+    const genesisArchive = new AppendOnlyTreeSnapshot(genesisArchiveRoot, 1);
+    this.genesisBlock = new L2Block(
+      genesisArchive,
+      initialHeader,
+      Body.empty(),
+      CheckpointNumber.ZERO,
+      IndexWithinCheckpoint(0),
+    );
+    this.genesisBlockData = {
+      header: initialHeader,
+      archive: genesisArchive,
+      blockHash: initialBlockHash,
+      checkpointNumber: CheckpointNumber.ZERO,
+      indexWithinCheckpoint: IndexWithinCheckpoint(0),
+    };
+  }
+
+  /** Returns the precomputed hash of the genesis block header. */
+  public getGenesisBlockHash(): BlockHash {
+    return this.initialBlockHash;
+  }
+
+  /** Returns the synthetic genesis L2Block (memoized — same instance across calls). */
+  private getGenesisBlock(): L2Block {
+    return this.genesisBlock;
+  }
+
+  /** Returns genesis block data (memoized — same instance across calls). */
+  private getGenesisBlockData(): BlockData {
+    return this.genesisBlockData;
+  }
+
+  /**
+   * Type guard distinguishing the genesis sentinel from a {@link ResolvedBlockQuery}.
+   * `resolveBlockQuery` already rewrites every genesis-matching shape to the sentinel,
+   * so callers only need this single sync check.
+   */
+  private isGenesisBlockQuery(query: ResolvedBlockQuery | GenesisBlockQuery): query is GenesisBlockQuery {
+    return 'genesis' in query;
+  }
 
   abstract getRollupAddress(): Promise<EthAddress>;
 
@@ -61,54 +143,53 @@ export abstract class ArchiverDataSourceBase
   abstract syncImmediate(): Promise<void>;
 
   public getCheckpointNumber(): Promise<CheckpointNumber> {
-    return this.store.getSynchedCheckpointNumber();
+    return this.stores.blocks.getLatestCheckpointNumber();
   }
 
   public getSynchedCheckpointNumber(): Promise<CheckpointNumber> {
-    return this.store.getSynchedCheckpointNumber();
+    return this.stores.blocks.getLatestCheckpointNumber();
   }
 
   public getProvenCheckpointNumber(): Promise<CheckpointNumber> {
-    return this.store.getProvenCheckpointNumber();
+    return this.stores.blocks.getProvenCheckpointNumber();
   }
 
-  public getBlockNumber(): Promise<BlockNumber> {
-    return this.store.getLatestBlockNumber();
-  }
-
-  public getProvenBlockNumber(): Promise<BlockNumber> {
-    return this.store.getProvenBlockNumber();
-  }
-
-  public async getBlockHeader(number: BlockNumber | 'latest'): Promise<BlockHeader | undefined> {
-    const blockNumber = number === 'latest' ? await this.store.getLatestBlockNumber() : number;
-    if (blockNumber === 0) {
+  public getBlockNumber(): Promise<BlockNumber>;
+  public getBlockNumber(query: BlockQuery): Promise<BlockNumber | undefined>;
+  public async getBlockNumber(query?: BlockQuery): Promise<BlockNumber | undefined> {
+    if (!query) {
+      return this.stores.blocks.getLatestL2BlockNumber();
+    }
+    const resolved = await this.resolveBlockQuery(query);
+    if (resolved === undefined) {
       return undefined;
     }
-    const headers = await this.store.getBlockHeaders(blockNumber, 1);
-    return headers.length === 0 ? undefined : headers[0];
+    if (this.isGenesisBlockQuery(resolved)) {
+      return BlockNumber.ZERO;
+    }
+    return this.stores.blocks.getBlockNumber(resolved);
   }
 
-  public getCheckpointedBlock(number: BlockNumber): Promise<CheckpointedL2Block | undefined> {
-    return this.store.getCheckpointedBlock(number);
+  public getProvenBlockNumber(): Promise<BlockNumber> {
+    return this.stores.blocks.getProvenBlockNumber();
   }
 
   public getCheckpointedL2BlockNumber(): Promise<BlockNumber> {
-    return this.store.getCheckpointedL2BlockNumber();
+    return this.stores.blocks.getCheckpointedL2BlockNumber();
   }
 
   public getFinalizedL2BlockNumber(): Promise<BlockNumber> {
-    return this.store.getFinalizedL2BlockNumber();
+    return this.stores.blocks.getFinalizedL2BlockNumber();
   }
 
   public async getCheckpointHeader(number: CheckpointNumber | 'latest'): Promise<CheckpointHeader | undefined> {
     if (number === 'latest') {
-      number = await this.store.getSynchedCheckpointNumber();
+      number = await this.stores.blocks.getLatestCheckpointNumber();
     }
     if (number === 0) {
       return undefined;
     }
-    const checkpoint = await this.store.getCheckpointData(number);
+    const checkpoint = await this.stores.blocks.getCheckpointData(number);
     if (!checkpoint) {
       return undefined;
     }
@@ -116,59 +197,39 @@ export abstract class ArchiverDataSourceBase
   }
 
   public async getLastBlockNumberInCheckpoint(checkpointNumber: CheckpointNumber): Promise<BlockNumber | undefined> {
-    const checkpointData = await this.store.getCheckpointData(checkpointNumber);
+    const checkpointData = await this.stores.blocks.getCheckpointData(checkpointNumber);
     if (!checkpointData) {
       return undefined;
     }
     return BlockNumber(checkpointData.startBlock + checkpointData.blockCount - 1);
   }
 
-  public getCheckpointedBlocks(from: BlockNumber, limit: number): Promise<CheckpointedL2Block[]> {
-    return this.store.getCheckpointedBlocks(from, limit);
-  }
-
-  public getBlockHeaderByHash(blockHash: BlockHash): Promise<BlockHeader | undefined> {
-    return this.store.getBlockHeaderByHash(blockHash);
-  }
-
-  public getBlockHeaderByArchive(archive: Fr): Promise<BlockHeader | undefined> {
-    return this.store.getBlockHeaderByArchive(archive);
+  public getCheckpointData(checkpointNumber: CheckpointNumber): Promise<CheckpointData | undefined> {
+    return this.stores.blocks.getCheckpointData(checkpointNumber);
   }
 
-  public getBlockData(number: BlockNumber): Promise<BlockData | undefined> {
-    return this.store.getBlockData(number);
+  public getCheckpointDataRange(from: CheckpointNumber, limit: number): Promise<CheckpointData[]> {
+    return this.stores.blocks.getRangeOfCheckpoints(from, limit);
   }
 
-  public getBlockDataByArchive(archive: Fr): Promise<BlockData | undefined> {
-    return this.store.getBlockDataByArchive(archive);
-  }
-
-  public async getL2Block(number: BlockNumber): Promise<L2Block | undefined> {
-    // If the number provided is -ve, then return the latest block.
-    if (number < 0) {
-      number = await this.store.getLatestBlockNumber();
-    }
-    if (number === 0) {
-      return undefined;
-    }
-    const publishedBlock = await this.store.getBlock(number);
-    return publishedBlock;
+  public getCheckpointNumberBySlot(slot: SlotNumber): Promise<CheckpointNumber | undefined> {
+    return this.stores.blocks.getCheckpointNumberBySlot(slot);
   }
 
   public getTxEffect(txHash: TxHash): Promise<IndexedTxEffect | undefined> {
-    return this.store.getTxEffect(txHash);
+    return this.stores.blocks.getTxEffect(txHash);
   }
 
   public getSettledTxReceipt(txHash: TxHash): Promise<TxReceipt | undefined> {
-    return this.store.getSettledTxReceipt(txHash, this.l1Constants);
+    return this.stores.blocks.getSettledTxReceipt(txHash, this.l1Constants);
   }
 
-  public getProposedCheckpoint(): Promise<CommonCheckpointData | undefined> {
-    return this.store.getProposedCheckpoint();
+  public getLastCheckpoint(): Promise<CommonCheckpointData | undefined> {
+    return this.stores.blocks.getLastCheckpoint();
   }
 
-  public getProposedCheckpointOnly(): Promise<ProposedCheckpointData | undefined> {
-    return this.store.getProposedCheckpointOnly();
+  public getLastProposedCheckpoint(): Promise<ProposedCheckpointData | undefined> {
+    return this.stores.blocks.getLastProposedCheckpoint();
   }
 
   public isPendingChainInvalid(): Promise<boolean> {
@@ -176,7 +237,7 @@ export abstract class ArchiverDataSourceBase
   }
 
   public async getPendingChainValidationStatus(): Promise<ValidateCheckpointResult> {
-    return (await this.store.getPendingChainValidationStatus()) ?? { valid: true };
+    return (await this.stores.blocks.getPendingChainValidationStatus()) ?? { valid: true };
   }
 
   public getPrivateLogsByTags(
@@ -184,7 +245,7 @@ export abstract class ArchiverDataSourceBase
     page?: number,
     upToBlockNumber?: BlockNumber,
   ): Promise<TxScopedL2Log[][]> {
-    return this.store.getPrivateLogsByTags(tags, page, upToBlockNumber);
+    return this.stores.logs.getPrivateLogsByTags(tags, page, upToBlockNumber);
   }
 
   public getPublicLogsByTagsFromContract(
@@ -193,23 +254,23 @@ export abstract class ArchiverDataSourceBase
     page?: number,
     upToBlockNumber?: BlockNumber,
   ): Promise<TxScopedL2Log[][]> {
-    return this.store.getPublicLogsByTagsFromContract(contractAddress, tags, page, upToBlockNumber);
+    return this.stores.logs.getPublicLogsByTagsFromContract(contractAddress, tags, page, upToBlockNumber);
   }
 
   public getPublicLogs(filter: LogFilter): Promise<GetPublicLogsResponse> {
-    return this.store.getPublicLogs(filter);
+    return this.stores.logs.getPublicLogs(filter);
   }
 
   public getContractClassLogs(filter: LogFilter): Promise<GetContractClassLogsResponse> {
-    return this.store.getContractClassLogs(filter);
+    return this.stores.logs.getContractClassLogs(filter);
   }
 
   public getContractClass(id: Fr): Promise<ContractClassPublic | undefined> {
-    return this.store.getContractClass(id);
+    return this.stores.contractClasses.getContractClass(id);
   }
 
   public getBytecodeCommitment(id: Fr): Promise<Fr | undefined> {
-    return this.store.getBytecodeCommitment(id);
+    return this.stores.contractClasses.getBytecodeCommitment(id);
   }
 
   public async getContract(
@@ -218,43 +279,44 @@ export abstract class ArchiverDataSourceBase
   ): Promise<ContractInstanceWithAddress | undefined> {
     let timestamp;
     if (maybeTimestamp === undefined) {
-      const latestBlockHeader = await this.getBlockHeader('latest');
-      // If we get undefined block header, it means that the archiver has not yet synced any block so we default to 0.
-      timestamp = latestBlockHeader ? latestBlockHeader.globalVariables.timestamp : 0n;
+      const latestBlockData = await this.getBlockData({ tag: 'proposed' });
+      timestamp = latestBlockData ? latestBlockData.header.globalVariables.timestamp : 0n;
     } else {
       timestamp = maybeTimestamp;
     }
 
-    return this.store.getContractInstance(address, timestamp);
+    return this.stores.contractInstances.getContractInstance(address, timestamp);
   }
 
   public getContractClassIds(): Promise<Fr[]> {
-    return this.store.getContractClassIds();
+    return this.stores.contractClasses.getContractClassIds();
   }
 
-  public getDebugFunctionName(address: AztecAddress, selector: FunctionSelector): Promise<string | undefined> {
-    return this.store.getDebugFunctionName(address, selector);
+  /** Looks up a public function name given a selector. */
+  public getDebugFunctionName(_address: AztecAddress, selector: FunctionSelector): Promise<string | undefined> {
+    return Promise.resolve(this.stores.functionNames.get(selector));
   }
 
+  /** Register public function signatures so they can be looked up by selector. */
   public registerContractFunctionSignatures(signatures: string[]): Promise<void> {
-    return this.store.registerContractFunctionSignatures(signatures);
+    return this.stores.functionNames.register(signatures);
   }
 
   public getL1ToL2Messages(checkpointNumber: CheckpointNumber): Promise<Fr[]> {
-    return this.store.getL1ToL2Messages(checkpointNumber);
+    return this.stores.messages.getL1ToL2Messages(checkpointNumber);
   }
 
   public getL1ToL2MessageIndex(l1ToL2Message: Fr): Promise<bigint | undefined> {
-    return this.store.getL1ToL2MessageIndex(l1ToL2Message);
+    return this.stores.messages.getL1ToL2MessageIndex(l1ToL2Message);
   }
 
   public async getCheckpoints(checkpointNumber: CheckpointNumber, limit: number): Promise<PublishedCheckpoint[]> {
-    const checkpoints = await this.store.getRangeOfCheckpoints(checkpointNumber, limit);
+    const checkpoints = await this.stores.blocks.getRangeOfCheckpoints(checkpointNumber, limit);
     return Promise.all(checkpoints.map(ch => this.getPublishedCheckpointFromCheckpointData(ch)));
   }
 
   private async getPublishedCheckpointFromCheckpointData(checkpoint: CheckpointData): Promise<PublishedCheckpoint> {
-    const blocksForCheckpoint = await this.store.getBlocksForCheckpoint(checkpoint.checkpointNumber);
+    const blocksForCheckpoint = await this.stores.blocks.getBlocksForCheckpoint(checkpoint.checkpointNumber);
     if (!blocksForCheckpoint) {
       throw new Error(`Blocks for checkpoint ${checkpoint.checkpointNumber} not found`);
     }
@@ -263,36 +325,13 @@ export abstract class ArchiverDataSourceBase
       checkpoint.header,
       blocksForCheckpoint,
       checkpoint.checkpointNumber,
+      checkpoint.feeAssetPriceModifier,
     );
     return new PublishedCheckpoint(fullCheckpoint, checkpoint.l1, checkpoint.attestations);
   }
 
   public getBlocksForSlot(slotNumber: SlotNumber): Promise<L2Block[]> {
-    return this.store.getBlocksForSlot(slotNumber);
-  }
-
-  public async getCheckpointedBlocksForEpoch(epochNumber: EpochNumber): Promise<CheckpointedL2Block[]> {
-    const checkpointsData = await this.getCheckpointsDataForEpoch(epochNumber);
-    const blocks = await Promise.all(
-      checkpointsData.flatMap(checkpoint =>
-        range(checkpoint.blockCount, checkpoint.startBlock).map(blockNumber =>
-          this.getCheckpointedBlock(BlockNumber(blockNumber)),
-        ),
-      ),
-    );
-    return blocks.filter(isDefined);
-  }
-
-  public async getCheckpointedBlockHeadersForEpoch(epochNumber: EpochNumber): Promise<BlockHeader[]> {
-    const checkpointsData = await this.getCheckpointsDataForEpoch(epochNumber);
-    const blocks = await Promise.all(
-      checkpointsData.flatMap(checkpoint =>
-        range(checkpoint.blockCount, checkpoint.startBlock).map(blockNumber =>
-          this.getBlockHeader(BlockNumber(blockNumber)),
-        ),
-      ),
-    );
-    return blocks.filter(isDefined);
+    return this.stores.blocks.getBlocksForSlot(slotNumber);
   }
 
   public async getCheckpointsForEpoch(epochNumber: EpochNumber): Promise<Checkpoint[]> {
@@ -309,39 +348,127 @@ export abstract class ArchiverDataSourceBase
     }
 
     const [start, end] = getSlotRangeForEpoch(epochNumber, this.l1Constants);
-    return this.store.getCheckpointDataForSlotRange(start, end);
+    return this.stores.blocks.getCheckpointDataForSlotRange(start, end);
   }
 
-  public async getBlock(number: BlockNumber): Promise<L2Block | undefined> {
-    // If the number provided is -ve, then return the latest block.
-    if (number < 0) {
-      number = await this.store.getLatestBlockNumber();
+  /** Returns just the checkpoint numbers for all checkpoints whose slot falls within the given epoch. */
+  public getCheckpointNumbersForEpoch(epochNumber: EpochNumber): Promise<CheckpointNumber[]> {
+    if (!this.l1Constants) {
+      throw new Error('L1 constants not set');
     }
-    if (number === 0) {
+
+    const [start, end] = getSlotRangeForEpoch(epochNumber, this.l1Constants);
+    return this.stores.blocks.getCheckpointNumbersForSlotRange(start, end);
+  }
+
+  public async getBlock(query: BlockQuery): Promise<L2Block | undefined> {
+    const resolved = await this.resolveBlockQuery(query);
+    if (resolved === undefined) {
       return undefined;
     }
-    return this.store.getBlock(number);
+    if (this.isGenesisBlockQuery(resolved)) {
+      return this.getGenesisBlock();
+    }
+    return this.stores.blocks.getBlock(resolved);
   }
 
-  public getBlocks(from: BlockNumber, limit: number): Promise<L2Block[]> {
-    return this.store.getBlocks(from, limit);
+  /**
+   * Range queries iterate physical blocks only; the genesis block is NOT prepended.
+   * `L2BlockStream` consumers (`world-state.handleL2Blocks`, etc.) emit `blocks-added` events for
+   * real blocks and would be surprised by a synthetic block 0. Use {@link getBlock} or
+   * {@link getBlockData} for genesis-aware single-block lookups.
+   */
+  public async getBlocks(query: BlocksQuery): Promise<L2Block[]> {
+    const resolved = await this.resolveBlocksQuery(query);
+    return resolved ? this.stores.blocks.getBlocks(resolved) : [];
   }
 
-  public getCheckpointedBlockByHash(blockHash: BlockHash): Promise<CheckpointedL2Block | undefined> {
-    return this.store.getCheckpointedBlockByHash(blockHash);
+  public async getBlockData(query: BlockQuery): Promise<BlockData | undefined> {
+    const resolved = await this.resolveBlockQuery(query);
+    if (resolved === undefined) {
+      return undefined;
+    }
+    if (this.isGenesisBlockQuery(resolved)) {
+      return this.getGenesisBlockData();
+    }
+    return this.stores.blocks.getBlockData(resolved);
   }
 
-  public getCheckpointedBlockByArchive(archive: Fr): Promise<CheckpointedL2Block | undefined> {
-    return this.store.getCheckpointedBlockByArchive(archive);
+  /** See {@link getBlocks} — range queries do not prepend the genesis block. */
+  public async getBlocksData(query: BlocksQuery): Promise<BlockData[]> {
+    const resolved = await this.resolveBlocksQuery(query);
+    return resolved ? this.stores.blocks.getBlocksData(resolved) : [];
   }
 
-  public async getL2BlockByHash(blockHash: BlockHash): Promise<L2Block | undefined> {
-    const checkpointedBlock = await this.store.getCheckpointedBlockByHash(blockHash);
-    return checkpointedBlock?.block;
+  /**
+   * Resolves a {@link BlockQuery} to either the genesis sentinel or a {@link ResolvedBlockQuery}
+   * understood by BlockStore. Detects every shape that points at block 0 — `{number:0}`,
+   * `{hash}` matching the initial header, `{archive}` matching the post-genesis archive root,
+   * and `{tag}` resolving to 0 — and rewrites them to the sentinel so callers branch once.
+   */
+  private async resolveBlockQuery(query: BlockQuery): Promise<ResolvedBlockQuery | GenesisBlockQuery | undefined> {
+    if ('number' in query) {
+      return query.number === BlockNumber.ZERO ? { genesis: true } : query;
+    }
+    if ('hash' in query) {
+      return query.hash.equals(this.initialBlockHash) ? { genesis: true } : query;
+    }
+    if ('archive' in query) {
+      return query.archive.equals(this.genesisArchiveRoot) ? { genesis: true } : query;
+    }
+    const number = await this.resolveBlockTag(query.tag);
+    if (number === BlockNumber.ZERO) {
+      return { genesis: true };
+    }
+    return { number };
+  }
+
+  /** Maps a {@link BlockTag} to the matching block number for the current chain state. */
+  private resolveBlockTag(tag: BlockTag): Promise<BlockNumber> {
+    switch (tag) {
+      case 'latest':
+      case 'proposed':
+        return this.stores.blocks.getLatestL2BlockNumber();
+      case 'checkpointed':
+        return this.stores.blocks.getCheckpointedL2BlockNumber();
+      case 'proven':
+        return this.stores.blocks.getProvenBlockNumber();
+      case 'finalized':
+        return this.stores.blocks.getFinalizedL2BlockNumber();
+    }
   }
 
-  public async getL2BlockByArchive(archive: Fr): Promise<L2Block | undefined> {
-    const checkpointedBlock = await this.store.getCheckpointedBlockByArchive(archive);
-    return checkpointedBlock?.block;
+  /**
+   * Converts an epoch-based BlocksQuery to a from/limit query using l1Constants.
+   * Returns undefined when the epoch has no checkpoints, so callers can return [] without
+   * entering BlockStore. Reads only the two endpoint checkpoints rather than the whole epoch.
+   */
+  private async resolveBlocksQuery(query: BlocksQuery): Promise<ResolvedBlocksQuery | undefined> {
+    if (!('epoch' in query)) {
+      if (query.from < INITIAL_L2_BLOCK_NUM) {
+        throw new Error(
+          `getBlocks/getBlocksData: 'from' must be >= ${INITIAL_L2_BLOCK_NUM}, got ${query.from}. ` +
+            `Use getBlock({number:0})/getBlockData({number:0}) for genesis-aware single-block lookups.`,
+        );
+      }
+      return query;
+    }
+    const checkpointNumbers = await this.getCheckpointNumbersForEpoch(query.epoch);
+    if (checkpointNumbers.length === 0) {
+      return undefined;
+    }
+    const firstNumber = checkpointNumbers[0];
+    const lastNumber = checkpointNumbers[checkpointNumbers.length - 1];
+    const first = await this.stores.blocks.getCheckpointData(firstNumber);
+    if (!first) {
+      return undefined;
+    }
+    const last = firstNumber === lastNumber ? first : await this.stores.blocks.getCheckpointData(lastNumber);
+    if (!last) {
+      return undefined;
+    }
+    const from = BlockNumber(first.startBlock);
+    const limit = last.startBlock + last.blockCount - first.startBlock;
+    return { from, limit, onlyCheckpointed: true };
   }
 }
diff --git a/yarn-project/archiver/src/modules/data_store_updater.test.ts b/yarn-project/archiver/src/modules/data_store_updater.test.ts
index 360efd21eef3..3722d6eb8654 100644
--- a/yarn-project/archiver/src/modules/data_store_updater.test.ts
+++ b/yarn-project/archiver/src/modules/data_store_updater.test.ts
@@ -12,7 +12,7 @@ import { readFileSync } from 'fs';
 import { dirname, resolve } from 'path';
 import { fileURLToPath } from 'url';
 
-import { KVArchiverDataStore } from '../store/kv_archiver_store.js';
+import { type ArchiverDataStores, createArchiverDataStores } from '../store/data_stores.js';
 import { makeCheckpoint, makePublishedCheckpoint } from '../test/mock_structs.js';
 import { ArchiverDataStoreUpdater } from './data_store_updater.js';
 
@@ -35,14 +35,14 @@ function getSampleContractInstancePublishedEventPayload(): Buffer {
 }
 
 describe('ArchiverDataStoreUpdater', () => {
-  let store: KVArchiverDataStore;
+  let store: ArchiverDataStores;
   let updater: ArchiverDataStoreUpdater;
   let contractClassLog: ContractClassLog;
   let contractClassId: Fr;
   let instanceAddress: AztecAddress;
 
   beforeEach(async () => {
-    store = new KVArchiverDataStore(await openTmpStore('data_store_updater_test'), 1000);
+    store = createArchiverDataStores(await openTmpStore('data_store_updater_test'), { logsMaxPageSize: 1000 });
     updater = new ArchiverDataStoreUpdater(store);
 
     // Create contract class log from sample fixture data
@@ -69,13 +69,13 @@ describe('ArchiverDataStoreUpdater', () => {
       await updater.addProposedBlock(block);
 
       // Verify contract class was stored
-      const retrievedClass = await store.getContractClass(contractClassId);
+      const retrievedClass = await store.contractClasses.getContractClass(contractClassId);
       expect(retrievedClass).toBeDefined();
       expect(retrievedClass?.id.equals(contractClassId)).toBe(true);
 
       // Verify contract instance was stored (use a timestamp after block creation)
       const timestamp = block.header.globalVariables.timestamp + 1n;
-      const retrievedInstance = await store.getContractInstance(instanceAddress, timestamp);
+      const retrievedInstance = await store.contractInstances.getContractInstance(instanceAddress, timestamp);
       expect(retrievedInstance).toBeDefined();
       expect(retrievedInstance?.address.equals(instanceAddress)).toBe(true);
     });
@@ -96,8 +96,8 @@ describe('ArchiverDataStoreUpdater', () => {
 
       // Verify contract data was stored
       const timestamp = localBlock.header.globalVariables.timestamp + 1n;
-      expect(await store.getContractClass(contractClassId)).toBeDefined();
-      expect(await store.getContractInstance(instanceAddress, timestamp)).toBeDefined();
+      expect(await store.contractClasses.getContractClass(contractClassId)).toBeDefined();
+      expect(await store.contractInstances.getContractInstance(instanceAddress, timestamp)).toBeDefined();
 
       // Now create a checkpoint with a conflicting block (same slot but different archive root)
       const conflictingBlock = await L2Block.random(BlockNumber(1), {
@@ -115,8 +115,8 @@ describe('ArchiverDataStoreUpdater', () => {
       await updater.addCheckpoints([publishedCheckpoint]);
 
       // Verify the contract data from the local block was removed
-      expect(await store.getContractClass(contractClassId)).toBeUndefined();
-      expect(await store.getContractInstance(instanceAddress, timestamp)).toBeUndefined();
+      expect(await store.contractClasses.getContractClass(contractClassId)).toBeUndefined();
+      expect(await store.contractInstances.getContractInstance(instanceAddress, timestamp)).toBeUndefined();
     });
 
     it('removes contract data when checkpoints are unwound', async () => {
@@ -134,15 +134,15 @@ describe('ArchiverDataStoreUpdater', () => {
 
       // Verify contract data was stored
       const timestamp = block.header.globalVariables.timestamp + 1n;
-      expect(await store.getContractClass(contractClassId)).toBeDefined();
-      expect(await store.getContractInstance(instanceAddress, timestamp)).toBeDefined();
+      expect(await store.contractClasses.getContractClass(contractClassId)).toBeDefined();
+      expect(await store.contractInstances.getContractInstance(instanceAddress, timestamp)).toBeDefined();
 
       // Remove the checkpoint
       await updater.removeCheckpointsAfter(CheckpointNumber(0));
 
       // Verify the contract data was removed
-      expect(await store.getContractClass(contractClassId)).toBeUndefined();
-      expect(await store.getContractInstance(instanceAddress, timestamp)).toBeUndefined();
+      expect(await store.contractClasses.getContractClass(contractClassId)).toBeUndefined();
+      expect(await store.contractInstances.getContractInstance(instanceAddress, timestamp)).toBeUndefined();
     });
   });
 
@@ -163,7 +163,7 @@ describe('ArchiverDataStoreUpdater', () => {
       await updater.addCheckpoints([publishedCheckpoint]);
 
       // Verify logs are NOT duplicated
-      const publicLogs = await store.getPublicLogs({ fromBlock: block.number, toBlock: block.number + 1 });
+      const publicLogs = await store.logs.getPublicLogs({ fromBlock: block.number, toBlock: block.number + 1 });
       expect(publicLogs.logs.length).toBe(block.body.txEffects.flatMap(tx => tx.publicLogs).length);
       expect(publicLogs.logs.length).toBeGreaterThan(0);
     });
@@ -176,7 +176,7 @@ describe('ArchiverDataStoreUpdater', () => {
         slotNumber: SlotNumber(100),
       });
       await updater.addProposedBlock(localBlock);
-      const publicLogsBefore = await store.getPublicLogs({});
+      const publicLogsBefore = await store.logs.getPublicLogs({});
       expect(publicLogsBefore.logs.map(l => l.log)).toEqual(localBlock.body.txEffects.flatMap(tx => tx.publicLogs));
 
       // Create checkpoint with DIFFERENT block (different archive root)
@@ -190,9 +190,9 @@ describe('ArchiverDataStoreUpdater', () => {
       await updater.addCheckpoints([makePublishedCheckpoint(makeCheckpoint([checkpointBlock]), 10)]);
 
       // Verify checkpoint block is stored
-      const storedBlock = await store.getBlock(BlockNumber(1));
+      const storedBlock = await store.blocks.getBlock({ number: BlockNumber(1) });
       expect(storedBlock?.archive.root.equals(checkpointBlock.archive.root)).toBe(true);
-      const publicLogsAfter = await store.getPublicLogs({});
+      const publicLogsAfter = await store.logs.getPublicLogs({});
       expect(publicLogsAfter.logs.map(l => l.log)).toEqual(checkpointBlock.body.txEffects.flatMap(tx => tx.publicLogs));
     });
 
@@ -204,14 +204,14 @@ describe('ArchiverDataStoreUpdater', () => {
         slotNumber: SlotNumber(100),
       });
       await updater.addProposedBlock(localBlock);
-      const publicLogsBefore = await store.getPublicLogs({});
+      const publicLogsBefore = await store.logs.getPublicLogs({});
       expect(publicLogsBefore.logs.map(l => l.log)).toEqual(localBlock.body.txEffects.flatMap(tx => tx.publicLogs));
 
       // Remove the uncheckpointed block
       await updater.removeUncheckpointedBlocksAfter(BlockNumber.ZERO);
 
       // Verify logs are removed
-      const publicLogsAfter = await store.getPublicLogs({});
+      const publicLogsAfter = await store.logs.getPublicLogs({});
       expect(publicLogsAfter.logs.length).toBe(0);
     });
   });
diff --git a/yarn-project/archiver/src/modules/data_store_updater.ts b/yarn-project/archiver/src/modules/data_store_updater.ts
index f4f67a96b4c5..e1b50131d589 100644
--- a/yarn-project/archiver/src/modules/data_store_updater.ts
+++ b/yarn-project/archiver/src/modules/data_store_updater.ts
@@ -21,7 +21,7 @@ import {
 import type { ContractClassLog, PrivateLog, PublicLog } from '@aztec/stdlib/logs';
 import type { UInt64 } from '@aztec/stdlib/types';
 
-import type { KVArchiverDataStore } from '../store/kv_archiver_store.js';
+import type { ArchiverDataStores } from '../store/data_stores.js';
 import type { L2TipsCache } from '../store/l2_tips_cache.js';
 
 /** Operation type for contract data updates. */
@@ -43,7 +43,7 @@ export class ArchiverDataStoreUpdater {
   private readonly log = createLogger('archiver:store_updater');
 
   constructor(
-    private store: KVArchiverDataStore,
+    private stores: ArchiverDataStores,
     private l2TipsCache?: L2TipsCache,
     private opts: { rollupManaLimit?: number } = {},
   ) {}
@@ -61,14 +61,15 @@ export class ArchiverDataStoreUpdater {
     block: L2Block,
     pendingChainValidationStatus?: ValidateCheckpointResult,
   ): Promise<boolean> {
-    const result = await this.store.transactionAsync(async () => {
-      await this.store.addProposedBlock(block);
+    const result = await this.stores.db.transactionAsync(async () => {
+      await this.stores.blocks.addProposedBlock(block);
 
       const opResults = await Promise.all([
         // Update the pending chain validation status if provided
-        pendingChainValidationStatus && this.store.setPendingChainValidationStatus(pendingChainValidationStatus),
+        pendingChainValidationStatus &&
+          this.stores.blocks.setPendingChainValidationStatus(pendingChainValidationStatus),
         // Add any logs emitted during the retrieved block
-        this.store.addLogs([block]),
+        this.stores.logs.addLogs([block]),
         // Unroll all logs emitted during the retrieved block and extract any contract classes and instances from it
         this.addContractDataToDb(block),
       ]);
@@ -100,6 +101,7 @@ export class ArchiverDataStoreUpdater {
       attestations: CommitteeAttestation[];
       checkpoint: PublishedCheckpoint;
     },
+    evictProposedFrom?: CheckpointNumber,
   ): Promise<ReconcileCheckpointsResult> {
     for (const checkpoint of checkpoints) {
       validateCheckpoint(checkpoint.checkpoint, { rollupManaLimit: this.opts?.rollupManaLimit });
@@ -108,11 +110,11 @@ export class ArchiverDataStoreUpdater {
       validateCheckpoint(promoteProposed.checkpoint.checkpoint, { rollupManaLimit: this.opts?.rollupManaLimit });
     }
 
-    const result = await this.store.transactionAsync(async () => {
+    const result = await this.stores.db.transactionAsync(async () => {
       // Before adding checkpoints, check for conflicts with local blocks if any
       const { prunedBlocks, lastAlreadyInsertedBlockNumber } = await this.pruneMismatchingLocalBlocks(checkpoints);
 
-      await this.store.addCheckpoints(checkpoints);
+      await this.stores.blocks.addCheckpoints(checkpoints);
 
       // Filter out blocks that were already inserted via addProposedBlock() to avoid duplicating logs/contract data
       const newBlocks = checkpoints
@@ -121,19 +123,25 @@ export class ArchiverDataStoreUpdater {
 
       await Promise.all([
         // Update the pending chain validation status if provided
-        pendingChainValidationStatus && this.store.setPendingChainValidationStatus(pendingChainValidationStatus),
+        pendingChainValidationStatus &&
+          this.stores.blocks.setPendingChainValidationStatus(pendingChainValidationStatus),
         // Add any logs emitted during the retrieved blocks
-        this.store.addLogs(newBlocks),
+        this.stores.logs.addLogs(newBlocks),
         // Unroll all logs emitted during the retrieved blocks and extract any contract classes and instances from them
         ...newBlocks.map(block => this.addContractDataToDb(block)),
-        // Promote the proposed checkpoint if requested
+        // Promote the proposed checkpoint if requested (uses explicit checkpoint number)
         promoteProposed
-          ? this.store.promoteProposedToCheckpointed(
+          ? this.stores.blocks.promoteProposedToCheckpointed(
+              promoteProposed.checkpoint.checkpoint.number,
               promoteProposed.l1,
               promoteProposed.attestations,
               promoteProposed.checkpoint.checkpoint.archive.root,
             )
           : undefined,
+        // Evict pending checkpoints that diverged from what L1 mined
+        evictProposedFrom !== undefined
+          ? this.stores.blocks.evictProposedCheckpointsFrom(evictProposedFrom)
+          : undefined,
       ]);
 
       await this.l2TipsCache?.refresh();
@@ -142,9 +150,9 @@ export class ArchiverDataStoreUpdater {
     return result;
   }
 
-  public async setProposedCheckpoint(proposedCheckpoint: ProposedCheckpointInput) {
-    const result = await this.store.transactionAsync(async () => {
-      await this.store.setProposedCheckpoint(proposedCheckpoint);
+  public async addProposedCheckpoint(proposedCheckpoint: ProposedCheckpointInput) {
+    const result = await this.stores.db.transactionAsync(async () => {
+      await this.stores.blocks.addProposedCheckpoint(proposedCheckpoint);
       await this.l2TipsCache?.refresh();
     });
 
@@ -159,8 +167,8 @@ export class ArchiverDataStoreUpdater {
    */
   private async pruneMismatchingLocalBlocks(checkpoints: PublishedCheckpoint[]): Promise<ReconcileCheckpointsResult> {
     const [lastCheckpointedBlockNumber, lastBlockNumber] = await Promise.all([
-      this.store.getCheckpointedL2BlockNumber(),
-      this.store.getLatestBlockNumber(),
+      this.stores.blocks.getCheckpointedL2BlockNumber(),
+      this.stores.blocks.getLatestL2BlockNumber(),
     ]);
 
     // Exit early if there are no local uncheckpointed blocks
@@ -169,10 +177,10 @@ export class ArchiverDataStoreUpdater {
     }
 
     // Get all uncheckpointed local blocks
-    const uncheckpointedLocalBlocks = await this.store.getBlocks(
-      BlockNumber.add(lastCheckpointedBlockNumber, 1),
-      lastBlockNumber - lastCheckpointedBlockNumber,
-    );
+    const uncheckpointedLocalBlocks = await this.stores.blocks.getBlocks({
+      from: BlockNumber.add(lastCheckpointedBlockNumber, 1),
+      limit: lastBlockNumber - lastCheckpointedBlockNumber,
+    });
 
     let lastAlreadyInsertedBlockNumber: BlockNumber | undefined;
 
@@ -234,9 +242,9 @@ export class ArchiverDataStoreUpdater {
    * @throws Error if any block to be removed is checkpointed.
    */
   public async removeUncheckpointedBlocksAfter(blockNumber: BlockNumber): Promise<L2Block[]> {
-    const result = await this.store.transactionAsync(async () => {
+    const result = await this.stores.db.transactionAsync(async () => {
       // Verify we're only removing uncheckpointed blocks
-      const lastCheckpointedBlockNumber = await this.store.getCheckpointedL2BlockNumber();
+      const lastCheckpointedBlockNumber = await this.stores.blocks.getCheckpointedL2BlockNumber();
       if (blockNumber < lastCheckpointedBlockNumber) {
         throw new Error(
           `Cannot remove blocks after ${blockNumber} because checkpointed blocks exist up to ${lastCheckpointedBlockNumber}`,
@@ -245,8 +253,8 @@ export class ArchiverDataStoreUpdater {
 
       const result = await this.removeBlocksAfter(blockNumber);
 
-      // Clear the proposed checkpoint if it exists, since its blocks have been pruned
-      await this.store.deleteProposedCheckpoint();
+      // Clear all pending proposed checkpoints since their blocks have been pruned
+      await this.stores.blocks.deleteProposedCheckpoints();
 
       await this.l2TipsCache?.refresh();
       return result;
@@ -260,11 +268,11 @@ export class ArchiverDataStoreUpdater {
    */
   private async removeBlocksAfter(blockNumber: BlockNumber): Promise<L2Block[]> {
     // First get the blocks to be removed so we can clean up contract data
-    const removedBlocks = await this.store.removeBlocksAfter(blockNumber);
+    const removedBlocks = await this.stores.blocks.removeBlocksAfter(blockNumber);
 
     // Clean up contract data and logs for the removed blocks
     await Promise.all([
-      this.store.deleteLogs(removedBlocks),
+      this.stores.logs.deleteLogs(removedBlocks),
       ...removedBlocks.map(block => this.removeContractDataFromDb(block)),
     ]);
 
@@ -281,15 +289,15 @@ export class ArchiverDataStoreUpdater {
    * @returns True if the operation is successful.
    */
   public async removeCheckpointsAfter(checkpointNumber: CheckpointNumber): Promise<boolean> {
-    return await this.store.transactionAsync(async () => {
-      const { blocksRemoved = [] } = await this.store.removeCheckpointsAfter(checkpointNumber);
+    return await this.stores.db.transactionAsync(async () => {
+      const { blocksRemoved = [] } = await this.stores.blocks.removeCheckpointsAfter(checkpointNumber);
 
       const opResults = await Promise.all([
         // Prune rolls back to the last proven block, which is by definition valid
-        this.store.setPendingChainValidationStatus({ valid: true }),
+        this.stores.blocks.setPendingChainValidationStatus({ valid: true }),
         // Remove contract data for all blocks being removed
         ...blocksRemoved.map(block => this.removeContractDataFromDb(block)),
-        this.store.deleteLogs(blocksRemoved),
+        this.stores.logs.deleteLogs(blocksRemoved),
       ]);
 
       await this.l2TipsCache?.refresh();
@@ -302,8 +310,8 @@ export class ArchiverDataStoreUpdater {
    * @param checkpointNumber - The checkpoint number to set as proven.
    */
   public async setProvenCheckpointNumber(checkpointNumber: CheckpointNumber): Promise<void> {
-    await this.store.transactionAsync(async () => {
-      await this.store.setProvenCheckpointNumber(checkpointNumber);
+    await this.stores.db.transactionAsync(async () => {
+      await this.stores.blocks.setProvenCheckpointNumber(checkpointNumber);
       await this.l2TipsCache?.refresh();
     });
   }
@@ -313,8 +321,8 @@ export class ArchiverDataStoreUpdater {
    * @param checkpointNumber - The checkpoint number to set as finalized.
    */
   public async setFinalizedCheckpointNumber(checkpointNumber: CheckpointNumber): Promise<void> {
-    await this.store.transactionAsync(async () => {
-      await this.store.setFinalizedCheckpointNumber(checkpointNumber);
+    await this.stores.db.transactionAsync(async () => {
+      await this.stores.blocks.setFinalizedCheckpointNumber(checkpointNumber);
       await this.l2TipsCache?.refresh();
     });
   }
@@ -360,7 +368,7 @@ export class ArchiverDataStoreUpdater {
       const contractClasses = contractClassPublishedEvents.map(e => e.toContractClassPublic());
       if (contractClasses.length > 0) {
         contractClasses.forEach(c => this.log.verbose(`${Operation[operation]} contract class ${c.id.toString()}`));
-        return await this.store.deleteContractClasses(contractClasses, blockNum);
+        return await this.stores.contractClasses.deleteContractClasses(contractClasses, blockNum);
       }
       return true;
     }
@@ -386,7 +394,7 @@ export class ArchiverDataStoreUpdater {
 
     if (contractClasses.length > 0) {
       contractClasses.forEach(c => this.log.verbose(`${Operation[operation]} contract class ${c.id.toString()}`));
-      return await this.store.addContractClasses(contractClasses, blockNum);
+      return await this.stores.contractClasses.addContractClasses(contractClasses, blockNum);
     }
     return true;
   }
@@ -425,9 +433,9 @@ export class ArchiverDataStoreUpdater {
         this.log.verbose(`${Operation[operation]} contract instance at ${c.address.toString()}`),
       );
       if (operation == Operation.Store) {
-        return await this.store.addContractInstances(contractInstances, blockNum);
+        return await this.stores.contractInstances.addContractInstances(contractInstances, blockNum);
       } else if (operation == Operation.Delete) {
-        return await this.store.deleteContractInstances(contractInstances, blockNum);
+        return await this.stores.contractInstances.deleteContractInstances(contractInstances);
       }
     }
     return true;
@@ -451,9 +459,9 @@ export class ArchiverDataStoreUpdater {
         this.log.verbose(`${Operation[operation]} contract instance update at ${c.address.toString()}`),
       );
       if (operation == Operation.Store) {
-        return await this.store.addContractInstanceUpdates(contractUpdates, timestamp);
+        return await this.stores.contractInstances.addContractInstanceUpdates(contractUpdates, timestamp);
       } else if (operation == Operation.Delete) {
-        return await this.store.deleteContractInstanceUpdates(contractUpdates, timestamp);
+        return await this.stores.contractInstances.deleteContractInstanceUpdates(contractUpdates, timestamp);
       }
     }
     return true;
diff --git a/yarn-project/archiver/src/modules/l1_synchronizer.ts b/yarn-project/archiver/src/modules/l1_synchronizer.ts
index d2cbb5924e6a..f31f08cd0658 100644
--- a/yarn-project/archiver/src/modules/l1_synchronizer.ts
+++ b/yarn-project/archiver/src/modules/l1_synchronizer.ts
@@ -8,8 +8,9 @@ import { asyncPool } from '@aztec/foundation/async-pool';
 import { maxBigint } from '@aztec/foundation/bigint';
 import { BlockNumber, CheckpointNumber, EpochNumber } from '@aztec/foundation/branded-types';
 import { Buffer16, Buffer32 } from '@aztec/foundation/buffer';
-import { partition, pick } from '@aztec/foundation/collection';
+import { compactArray, partition, pick } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/curves/bn254';
+import { EthAddress } from '@aztec/foundation/eth-address';
 import { type Logger, createLogger } from '@aztec/foundation/log';
 import { retryTimes } from '@aztec/foundation/retry';
 import { count } from '@aztec/foundation/string';
@@ -19,6 +20,7 @@ import { type ArchiverEmitter, L2BlockSourceEvents, type ValidateCheckpointResul
 import { Checkpoint, PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
 import { type L1RollupConstants, getEpochAtSlot, getSlotAtNextL1Block } from '@aztec/stdlib/epoch-helpers';
 import { computeInHashFromL1ToL2Messages } from '@aztec/stdlib/messaging';
+import type { CoordinationSignatureContext } from '@aztec/stdlib/p2p';
 import { type Traceable, type Tracer, execInSpan, trackSpan } from '@aztec/telemetry-client';
 
 import { InitialCheckpointNumberNotSequentialError } from '../errors.js';
@@ -30,7 +32,7 @@ import {
   retrieveL1ToL2Messages,
   retrievedToPublishedCheckpoint,
 } from '../l1/data_retrieval.js';
-import type { KVArchiverDataStore } from '../store/kv_archiver_store.js';
+import { type ArchiverDataStores, getArchiverSynchPoint } from '../store/data_stores.js';
 import type { L2TipsCache } from '../store/l2_tips_cache.js';
 import { MessageStoreError } from '../store/message_store.js';
 import type { InboxMessage } from '../structs/inbox_message.js';
@@ -65,7 +67,7 @@ export class ArchiverL1Synchronizer implements Traceable {
     private readonly debugClient: ViemPublicDebugClient,
     private readonly rollup: RollupContract,
     private readonly inbox: InboxContract,
-    private readonly store: KVArchiverDataStore,
+    private readonly stores: ArchiverDataStores,
     private config: {
       batchSize: number;
       skipValidateCheckpointAttestations?: boolean;
@@ -85,7 +87,7 @@ export class ArchiverL1Synchronizer implements Traceable {
     l2TipsCache?: L2TipsCache,
     private readonly log: Logger = createLogger('archiver:l1-sync'),
   ) {
-    this.updater = new ArchiverDataStoreUpdater(this.store, l2TipsCache, {
+    this.updater = new ArchiverDataStoreUpdater(this.stores, l2TipsCache, {
       rollupManaLimit: l1Constants.rollupManaLimit,
     });
     this.tracer = tracer;
@@ -111,6 +113,13 @@ export class ArchiverL1Synchronizer implements Traceable {
     return this.l1Timestamp;
   }
 
+  private getSignatureContext(): CoordinationSignatureContext {
+    return {
+      chainId: this.publicClient.chain.id,
+      rollupAddress: EthAddress.fromString(this.rollup.address),
+    };
+  }
+
   /** Checks that the ethereum node we are connected to has a latest timestamp no more than the allowed drift. Throw if not. */
   public async testEthereumNodeSynced(): Promise<void> {
     const maxAllowedDelay = this.config.maxAllowedEthClientDriftSeconds;
@@ -153,14 +162,26 @@ export class ArchiverL1Synchronizer implements Traceable {
       );
     }
 
+    // Query finalized block on L1
+    const rawFinalizedL1Block = await getFinalizedL1Block(this.publicClient);
+    const finalizedL1Block: L1BlockId | undefined = rawFinalizedL1Block && {
+      l1BlockNumber: rawFinalizedL1Block.number,
+      l1BlockHash: Buffer32.fromString(rawFinalizedL1Block.hash),
+    };
+
     // Load sync point for blocks defaulting to start block
-    const { blocksSynchedTo = this.l1Constants.l1StartBlock } = await this.store.getSynchPoint();
-    this.log.debug(`Starting new archiver sync iteration`, { blocksSynchedTo, currentL1BlockData });
+    const { blocksSynchedTo = this.l1Constants.l1StartBlock } = await getArchiverSynchPoint(this.stores);
+    this.log.debug(`Starting new archiver sync iteration`, { blocksSynchedTo, currentL1BlockData, finalizedL1Block });
 
     // Sync L1 to L2 messages. We retry this a few times since there are error conditions that reset the sync point, requiring a new iteration.
     // Note that we cannot just wait for the l1 synchronizer to loop again, since the synchronizer would report as synced up to the current L1
     // block, when that wouldn't be the case, since L1 to L2 messages would need another iteration.
-    await retryTimes(() => this.handleL1ToL2Messages(currentL1BlockData), 'Handling L1 to L2 messages', 3, 0.1);
+    await retryTimes(
+      () => this.handleL1ToL2Messages(currentL1BlockData, finalizedL1Block),
+      'Handling L1 to L2 messages',
+      3,
+      0.1,
+    );
 
     if (currentL1BlockNumber > blocksSynchedTo) {
       // First we retrieve new checkpoints and L2 blocks and store them in the DB. This will also update the
@@ -185,7 +206,7 @@ export class ArchiverL1Synchronizer implements Traceable {
       // past it, since otherwise we'll keep downloading it and reprocessing it on every iteration until
       // we get a valid checkpoint to advance the syncpoint.
       if (!rollupStatus.validationResult?.valid && rollupStatus.lastL1BlockWithCheckpoint !== undefined) {
-        await this.store.setCheckpointSynchedL1BlockNumber(rollupStatus.lastL1BlockWithCheckpoint);
+        await this.stores.blocks.setSynchedL1BlockNumber(rollupStatus.lastL1BlockWithCheckpoint);
       }
 
       // And lastly we check if we are missing any checkpoints behind us due to a possible L1 reorg.
@@ -200,7 +221,7 @@ export class ArchiverL1Synchronizer implements Traceable {
     }
 
     // Update the finalized L2 checkpoint based on L1 finality.
-    await this.updateFinalizedCheckpoint();
+    await this.updateFinalizedCheckpoint(finalizedL1Block);
 
     // After syncing has completed, update the current l1 block number and timestamp,
     // otherwise we risk announcing to the world that we've synced to a given point,
@@ -217,19 +238,18 @@ export class ArchiverL1Synchronizer implements Traceable {
     });
   }
 
-  /** Query L1 for its finalized block and update the finalized checkpoint accordingly. */
-  private async updateFinalizedCheckpoint(): Promise<void> {
+  /** Updates the finalized checkpoint using the pre-fetched finalized L1 block from the current sync iteration. */
+  private async updateFinalizedCheckpoint(finalizedL1Block: L1BlockId | undefined): Promise<void> {
     try {
-      const finalizedL1Block = await getFinalizedL1Block(this.publicClient);
       if (!finalizedL1Block) {
         this.log.trace(`Skipping finalized checkpoint update: L1 has no finalized block yet.`);
         return;
       }
-      const finalizedL1BlockNumber = finalizedL1Block.number;
+      const finalizedL1BlockNumber = finalizedL1Block.l1BlockNumber;
       const finalizedCheckpointNumber = await this.rollup.getProvenCheckpointNumber({
         blockNumber: finalizedL1BlockNumber,
       });
-      const localFinalizedCheckpointNumber = await this.store.getFinalizedCheckpointNumber();
+      const localFinalizedCheckpointNumber = await this.stores.blocks.getFinalizedCheckpointNumber();
       if (localFinalizedCheckpointNumber !== finalizedCheckpointNumber) {
         await this.updater.setFinalizedCheckpointNumber(finalizedCheckpointNumber);
         this.log.info(`Updated finalized chain to checkpoint ${finalizedCheckpointNumber}`, {
@@ -248,8 +268,8 @@ export class ArchiverL1Synchronizer implements Traceable {
   /** Prune all proposed local blocks that should have been checkpointed by now. */
   private async pruneUncheckpointedBlocks(currentL1Timestamp: bigint) {
     const [lastCheckpointedBlockNumber, lastProposedBlockNumber] = await Promise.all([
-      this.store.getCheckpointedL2BlockNumber(),
-      this.store.getLatestBlockNumber(),
+      this.stores.blocks.getCheckpointedL2BlockNumber(),
+      this.stores.blocks.getLatestL2BlockNumber(),
     ]);
 
     // If there are no uncheckpointed blocks, we got nothing to do
@@ -263,8 +283,10 @@ export class ArchiverL1Synchronizer implements Traceable {
     const firstUncheckpointedBlockNumber = BlockNumber(lastCheckpointedBlockNumber + 1);
 
     // What's the slot of the first uncheckpointed block?
-    const [firstUncheckpointedBlockHeader] = await this.store.getBlockHeaders(firstUncheckpointedBlockNumber, 1);
-    const firstUncheckpointedBlockSlot = firstUncheckpointedBlockHeader?.getSlot();
+    const firstUncheckpointedBlockData = await this.stores.blocks.getBlockData({
+      number: firstUncheckpointedBlockNumber,
+    });
+    const firstUncheckpointedBlockSlot = firstUncheckpointedBlockData?.header.getSlot();
 
     if (firstUncheckpointedBlockSlot === undefined || firstUncheckpointedBlockSlot >= slotAtNextL1Block) {
       return;
@@ -274,7 +296,7 @@ export class ArchiverL1Synchronizer implements Traceable {
     // This also clears any proposed checkpoint whose blocks are being pruned.
     this.log.warn(
       `Pruning blocks after block ${lastCheckpointedBlockNumber} due to slot ${firstUncheckpointedBlockSlot} not being checkpointed`,
-      { firstUncheckpointedBlockHeader: firstUncheckpointedBlockHeader.toInspect(), slotAtNextL1Block },
+      { firstUncheckpointedBlockHeader: firstUncheckpointedBlockData?.header.toInspect(), slotAtNextL1Block },
     );
 
     const prunedBlocks = await this.updater.removeUncheckpointedBlocksAfter(lastCheckpointedBlockNumber);
@@ -310,7 +332,7 @@ export class ArchiverL1Synchronizer implements Traceable {
     currentL1Timestamp: bigint,
   ): Promise<{ rollupCanPrune: boolean }> {
     const rollupCanPrune = await this.canPrune(currentL1BlockNumber, currentL1Timestamp);
-    const localPendingCheckpointNumber = await this.store.getSynchedCheckpointNumber();
+    const localPendingCheckpointNumber = await this.stores.blocks.getLatestCheckpointNumber();
     const canPrune = localPendingCheckpointNumber > provenCheckpointNumber && rollupCanPrune;
 
     if (canPrune) {
@@ -331,12 +353,12 @@ export class ArchiverL1Synchronizer implements Traceable {
       // promises when the gap between local pending and proven checkpoint numbers is large.
       const BATCH_SIZE = 10;
       const indices = Array.from({ length: checkpointsToUnwind }, (_, i) => CheckpointNumber(i + pruneFrom));
-      const checkpoints = (await asyncPool(BATCH_SIZE, indices, idx => this.store.getCheckpointData(idx))).filter(
-        isDefined,
-      );
+      const checkpoints = (
+        await asyncPool(BATCH_SIZE, indices, idx => this.stores.blocks.getCheckpointData(idx))
+      ).filter(isDefined);
       const newBlocks = (
         await asyncPool(BATCH_SIZE, checkpoints, cp =>
-          this.store.getBlocksForCheckpoint(CheckpointNumber(cp.checkpointNumber)),
+          this.stores.blocks.getBlocksForCheckpoint(CheckpointNumber(cp.checkpointNumber)),
         )
       )
         .filter(isDefined)
@@ -356,12 +378,12 @@ export class ArchiverL1Synchronizer implements Traceable {
       this.log.warn(
         `Removed ${count(checkpointsToUnwind, 'checkpoint')} after checkpoint ${provenCheckpointNumber} ` +
           `due to predicted reorg at L1 block ${currentL1BlockNumber}. ` +
-          `Updated latest checkpoint is ${await this.store.getSynchedCheckpointNumber()}.`,
+          `Updated latest checkpoint is ${await this.stores.blocks.getLatestCheckpointNumber()}.`,
       );
       this.instrumentation.processPrune(timer.ms());
       // TODO(palla/reorg): Do we need to set the block synched L1 block number here?
       // Seems like the next iteration should handle this.
-      // await this.store.setCheckpointSynchedL1BlockNumber(currentL1BlockNumber);
+      // await this.stores.blocks.setSynchedL1BlockNumber(currentL1BlockNumber);
     }
 
     return { rollupCanPrune };
@@ -378,14 +400,17 @@ export class ArchiverL1Synchronizer implements Traceable {
   }
 
   @trackSpan('Archiver.handleL1ToL2Messages')
-  private async handleL1ToL2Messages(currentL1Block: L1BlockId): Promise<boolean> {
+  private async handleL1ToL2Messages(
+    currentL1Block: L1BlockId,
+    finalizedL1Block: L1BlockId | undefined,
+  ): Promise<boolean> {
     // Load the syncpoint, which may have been updated in a previous iteration
     const {
       messagesSynchedTo = {
         l1BlockNumber: this.l1Constants.l1StartBlock,
         l1BlockHash: this.l1Constants.l1StartBlockHash,
       },
-    } = await this.store.getSynchPoint();
+    } = await getArchiverSynchPoint(this.stores);
 
     // Nothing to do if L1 block number has not moved forward
     const currentL1BlockNumber = currentL1Block.l1BlockNumber;
@@ -395,10 +420,14 @@ export class ArchiverL1Synchronizer implements Traceable {
 
     // Compare local message store state with the remote. If they match, we just advance the match pointer.
     const remoteMessagesState = await this.inbox.getState({ blockNumber: currentL1BlockNumber });
-    const localLastMessage = await this.store.getLastL1ToL2Message();
+    const localLastMessage = await this.stores.messages.getLastMessage();
     if (await this.localStateMatches(localLastMessage, remoteMessagesState)) {
       this.log.trace(`Local L1 to L2 messages are already in sync with remote at L1 block ${currentL1BlockNumber}`);
-      await this.store.setMessageSyncState(currentL1Block, remoteMessagesState.treeInProgress);
+      await this.stores.messages.setMessageSyncState(
+        currentL1Block,
+        remoteMessagesState.treeInProgress,
+        finalizedL1Block,
+      );
       return true;
     }
 
@@ -423,7 +452,7 @@ export class ArchiverL1Synchronizer implements Traceable {
     // Note that, if there are no new messages to insert, but there was an L1 reorg that pruned out last messages,
     // we'd notice by comparing our local state with the remote one again, and seeing they don't match even after
     // our sync attempt. In this case, we also rollback our syncpoint, and trigger a retry.
-    const localLastMessageAfterSync = await this.store.getLastL1ToL2Message();
+    const localLastMessageAfterSync = await this.stores.messages.getLastMessage();
     if (!(await this.localStateMatches(localLastMessageAfterSync, remoteMessagesState))) {
       this.log.warn(
         `Local L1 to L2 messages state does not match remote after sync attempt. Rolling back syncpoint to retry.`,
@@ -434,13 +463,17 @@ export class ArchiverL1Synchronizer implements Traceable {
     }
 
     // Advance the syncpoint after a successful sync
-    await this.store.setMessageSyncState(currentL1Block, remoteMessagesState.treeInProgress);
+    await this.stores.messages.setMessageSyncState(
+      currentL1Block,
+      remoteMessagesState.treeInProgress,
+      finalizedL1Block,
+    );
     return true;
   }
 
   /** Checks if the local rolling hash and message count matches the remote state */
   private async localStateMatches(localLastMessage: InboxMessage | undefined, remoteState: InboxContractState) {
-    const localMessageCount = await this.store.getTotalL1ToL2MessageCount();
+    const localMessageCount = await this.stores.messages.getTotalL1ToL2MessageCount();
     this.log.trace(`Comparing local and remote inbox state`, { localMessageCount, localLastMessage, remoteState });
 
     return (
@@ -462,7 +495,7 @@ export class ArchiverL1Synchronizer implements Traceable {
       this.log.trace(`Retrieving L1 to L2 messages in L1 blocks ${searchStartBlock}-${searchEndBlock}`);
       const messages = await retrieveL1ToL2Messages(this.inbox, searchStartBlock, searchEndBlock);
       const timer = new Timer();
-      await this.store.addL1ToL2Messages(messages);
+      await this.stores.messages.addL1ToL2Messages(messages);
       const perMsg = timer.ms() / messages.length;
       this.instrumentation.processNewMessages(messages.length, perMsg);
       for (const msg of messages) {
@@ -487,13 +520,16 @@ export class ArchiverL1Synchronizer implements Traceable {
   private async rollbackL1ToL2Messages(remoteMessagesState: InboxContractState): Promise<L1BlockId> {
     const { treeInProgress: remoteTreeInProgress, messagesRollingHash: remoteRollingHash } = remoteMessagesState;
 
+    const messagesFinalizedL1Block = await this.stores.messages.getMessagesFinalizedL1Block();
+    const finalizedL1BlockNumber = messagesFinalizedL1Block?.l1BlockNumber;
+
     // Slowly go back through our messages until we find the last common message. We could query the logs in
     // batch as an optimization, but the depth of the reorg should not be deep, and this is a very rare case,
     // so it's fine to query one log at a time.
     let commonMsg: undefined | InboxMessage;
     let messagesToDelete = 0;
     this.log.verbose(`Searching most recent common L1 to L2 message`);
-    for await (const localMsg of this.store.iterateL1ToL2Messages({ reverse: true })) {
+    for await (const localMsg of this.stores.messages.iterateL1ToL2Messages({ reverse: true })) {
       const logCtx = { remoteMsg: undefined as InboxMessage | undefined, localMsg, remoteMessagesState };
 
       // First check if the local message rolling hash matches the current rolling hash of the inbox contract,
@@ -508,6 +544,13 @@ export class ArchiverL1Synchronizer implements Traceable {
         break;
       }
 
+      // Messages at or below the finalized L1 block cannot have been reorged — accept as common without querying L1.
+      if (finalizedL1BlockNumber !== undefined && localMsg.l1BlockNumber <= finalizedL1BlockNumber) {
+        this.log.info(`Found common L1 to L2 message at finalized L1 block ${localMsg.l1BlockNumber}`, logCtx);
+        commonMsg = localMsg;
+        break;
+      }
+
       // If there's no match with the current remote state, check if the message exists on the inbox contract at all
       // by looking at the inbox events. If the L1 reorg *added* new messages in addition to deleting existing ones,
       // then the current remote state's rolling hash will not match anything we have locally, so we need to check existence
@@ -536,17 +579,29 @@ export class ArchiverL1Synchronizer implements Traceable {
     if (messagesToDelete > 0) {
       const lastGoodIndex = commonMsg?.index;
       this.log.warn(`Rolling back all local L1 to L2 messages after index ${lastGoodIndex ?? 'initial'}`);
-      await this.store.removeL1ToL2Messages(lastGoodIndex !== undefined ? lastGoodIndex + 1n : 0n);
+      await this.stores.messages.removeL1ToL2Messages(lastGoodIndex !== undefined ? lastGoodIndex + 1n : 0n);
     }
 
     // Update the syncpoint so the loop below reprocesses the changed messages. We go to the block before
     // the last common one, so we force reprocessing it, in case new messages were added on that same L1 block
-    // after the last common message.
-    const syncPointL1BlockNumber = commonMsg ? commonMsg.l1BlockNumber - 1n : this.l1Constants.l1StartBlock;
-    const syncPointL1BlockHash = await this.getL1BlockHash(syncPointL1BlockNumber);
+    // after the last common message. Cap at the finalized L1 block: messages at or below finalized cannot
+    // have been reorged, so there is no need to walk back any further than that.
+    const syncPointL1BlockNumber = maxBigint(
+      ...compactArray([
+        commonMsg ? commonMsg.l1BlockNumber - 1n : undefined,
+        finalizedL1BlockNumber,
+        this.l1Constants.l1StartBlock,
+      ]),
+    );
+
+    const syncPointL1BlockHash =
+      syncPointL1BlockNumber === finalizedL1BlockNumber
+        ? messagesFinalizedL1Block!.l1BlockHash
+        : await this.getL1BlockHash(syncPointL1BlockNumber);
+
     const messagesSyncPoint = { l1BlockNumber: syncPointL1BlockNumber, l1BlockHash: syncPointL1BlockHash };
-    await this.store.setMessageSyncState(messagesSyncPoint, remoteTreeInProgress);
-    this.log.verbose(`Updated messages syncpoint to L1 block ${syncPointL1BlockNumber}`, {
+    await this.stores.messages.setMessageSyncState(messagesSyncPoint, remoteTreeInProgress);
+    this.log.verbose(`Updated messages syncpoint to L1 block ${messagesSyncPoint.l1BlockNumber}`, {
       ...messagesSyncPoint,
       remoteTreeInProgress,
     });
@@ -567,9 +622,9 @@ export class ArchiverL1Synchronizer implements Traceable {
     currentL1BlockNumber: bigint,
     initialSyncComplete: boolean,
   ): Promise<RollupStatus> {
-    const localPendingCheckpointNumber = await this.store.getSynchedCheckpointNumber();
+    const localPendingCheckpointNumber = await this.stores.blocks.getLatestCheckpointNumber();
     const initialValidationResult: ValidateCheckpointResult | undefined =
-      await this.store.getPendingChainValidationStatus();
+      await this.stores.blocks.getPendingChainValidationStatus();
     const {
       provenCheckpointNumber,
       provenArchive,
@@ -599,7 +654,7 @@ export class ArchiverL1Synchronizer implements Traceable {
       // we need to set it to zero. This is an edge case because we dont have a checkpoint zero (initial checkpoint is one),
       // so localCheckpointForDestinationProvenCheckpointNumber would not be found below.
       if (provenCheckpointNumber === 0) {
-        const localProvenCheckpointNumber = await this.store.getProvenCheckpointNumber();
+        const localProvenCheckpointNumber = await this.stores.blocks.getProvenCheckpointNumber();
         if (localProvenCheckpointNumber !== provenCheckpointNumber) {
           await this.updater.setProvenCheckpointNumber(provenCheckpointNumber);
           this.log.info(`Rolled back proven chain to checkpoint ${provenCheckpointNumber}`, { provenCheckpointNumber });
@@ -607,11 +662,11 @@ export class ArchiverL1Synchronizer implements Traceable {
       }
 
       const localCheckpointForDestinationProvenCheckpointNumber =
-        await this.store.getCheckpointData(provenCheckpointNumber);
+        await this.stores.blocks.getCheckpointData(provenCheckpointNumber);
 
       // Sanity check. I've hit what seems to be a state where the proven checkpoint is set to a value greater than the latest
       // synched checkpoint when requesting L2Tips from the archiver. This is the only place where the proven checkpoint is set.
-      const synched = await this.store.getSynchedCheckpointNumber();
+      const synched = await this.stores.blocks.getLatestCheckpointNumber();
       if (
         localCheckpointForDestinationProvenCheckpointNumber &&
         synched < localCheckpointForDestinationProvenCheckpointNumber.checkpointNumber
@@ -631,7 +686,7 @@ export class ArchiverL1Synchronizer implements Traceable {
         localCheckpointForDestinationProvenCheckpointNumber &&
         provenArchive.equals(localCheckpointForDestinationProvenCheckpointNumber.archive.root)
       ) {
-        const localProvenCheckpointNumber = await this.store.getProvenCheckpointNumber();
+        const localProvenCheckpointNumber = await this.stores.blocks.getProvenCheckpointNumber();
         if (localProvenCheckpointNumber !== provenCheckpointNumber) {
           await this.updater.setProvenCheckpointNumber(provenCheckpointNumber);
           this.log.info(`Updated proven chain to checkpoint ${provenCheckpointNumber}`, { provenCheckpointNumber });
@@ -659,7 +714,7 @@ export class ArchiverL1Synchronizer implements Traceable {
     // If we have 0 checkpoints locally and there are no checkpoints onchain there is nothing to do.
     const noCheckpoints = localPendingCheckpointNumber === 0 && pendingCheckpointNumber === 0;
     if (noCheckpoints) {
-      await this.store.setCheckpointSynchedL1BlockNumber(currentL1BlockNumber);
+      await this.stores.blocks.setSynchedL1BlockNumber(currentL1BlockNumber);
       this.log.debug(
         `No checkpoints to retrieve from ${blocksSynchedTo + 1n} to ${currentL1BlockNumber}, no checkpoints on chain`,
       );
@@ -671,7 +726,7 @@ export class ArchiverL1Synchronizer implements Traceable {
     // Related to the L2 reorgs of the pending chain. We are only interested in actually addressing a reorg if there
     // are any state that could be impacted by it. If we have no checkpoints, there is no impact.
     if (localPendingCheckpointNumber > 0) {
-      const localPendingCheckpoint = await this.store.getCheckpointData(localPendingCheckpointNumber);
+      const localPendingCheckpoint = await this.stores.blocks.getCheckpointData(localPendingCheckpointNumber);
       if (localPendingCheckpoint === undefined) {
         throw new Error(`Missing checkpoint ${localPendingCheckpointNumber}`);
       }
@@ -686,7 +741,7 @@ export class ArchiverL1Synchronizer implements Traceable {
         // However, in the re-org scenario, our L1 node is temporarily lying to us and we end up potentially missing checkpoints.
         // We must only set this block number based on actually retrieved logs.
         // TODO(#8621): Tackle this properly when we handle L1 Re-orgs.
-        // await this.store.setCheckpointSynchedL1BlockNumber(currentL1BlockNumber);
+        // await this.stores.blocks.setSynchedL1BlockNumber(currentL1BlockNumber);
         this.log.debug(`No checkpoints to retrieve from ${blocksSynchedTo + 1n} to ${currentL1BlockNumber}`);
         return rollupStatus;
       }
@@ -706,7 +761,7 @@ export class ArchiverL1Synchronizer implements Traceable {
 
         let tipAfterUnwind = localPendingCheckpointNumber;
         while (true) {
-          const candidateCheckpoint = await this.store.getCheckpointData(tipAfterUnwind);
+          const candidateCheckpoint = await this.stores.blocks.getCheckpointData(tipAfterUnwind);
           if (candidateCheckpoint === undefined) {
             break;
           }
@@ -731,7 +786,7 @@ export class ArchiverL1Synchronizer implements Traceable {
         this.log.warn(
           `Removed ${count(checkpointsToRemove, 'checkpoint')} after checkpoint ${tipAfterUnwind} ` +
             `due to mismatched checkpoint hashes at L1 block ${currentL1BlockNumber}. ` +
-            `Updated L2 latest checkpoint is ${await this.store.getSynchedCheckpointNumber()}.`,
+            `Updated L2 latest checkpoint is ${await this.stores.blocks.getLatestCheckpointNumber()}.`,
         );
       }
     }
@@ -777,11 +832,14 @@ export class ArchiverL1Synchronizer implements Traceable {
         },
       );
 
-      // Check if the last checkpoint matches the proposed one (so we can skip blob fetch).
-      // We only check the last one because the proposed checkpoint is always the most recent one,
-      // and if it's in a multi-checkpoint batch it will always be last (sorted by L1 block number).
+      // Check if the last checkpoint matches a local pending entry (so we can skip blob fetch).
+      // We only check the last one; if it matches, the blob fetch is skipped for that entry.
+      // TODO(palla/pipelining): We may have more than a single checkpoint to promote
       const lastCalldataCheckpoint = calldataCheckpoints[calldataCheckpoints.length - 1];
-      const checkpointToPromote = await this.tryBuildPublishedCheckpointFromProposed(lastCalldataCheckpoint);
+      const promoteResult = await this.tryBuildPublishedCheckpointFromProposed(lastCalldataCheckpoint);
+      const checkpointToPromote = promoteResult && !('diverged' in promoteResult) ? promoteResult : undefined;
+      const evictProposedFrom =
+        promoteResult && 'diverged' in promoteResult ? promoteResult.fromCheckpointNumber : undefined;
 
       // Then fetch blobs in parallel and build the full published checkpoints
       const toFetchBlobs = checkpointToPromote ? calldataCheckpoints.slice(0, -1) : calldataCheckpoints;
@@ -809,7 +867,13 @@ export class ArchiverL1Synchronizer implements Traceable {
       for (const published of publishedCheckpoints) {
         const validationResult = this.config.skipValidateCheckpointAttestations
           ? { valid: true as const }
-          : await validateCheckpointAttestations(published, this.epochCache, this.l1Constants, this.log);
+          : await validateCheckpointAttestations(
+              published,
+              this.epochCache,
+              this.l1Constants,
+              this.getSignatureContext(),
+              this.log,
+            );
 
         // Only update the validation result if it has changed, so we can keep track of the first invalid checkpoint
         // in case there is a sequence of more than one invalid checkpoint, as we need to invalidate the first one.
@@ -847,7 +911,7 @@ export class ArchiverL1Synchronizer implements Traceable {
         // Check the inHash of the checkpoint against the l1->l2 messages.
         // The messages should've been synced up to the currentL1BlockNumber and must be available for the published
         // checkpoints we just retrieved.
-        const l1ToL2Messages = await this.store.getL1ToL2Messages(published.checkpoint.number);
+        const l1ToL2Messages = await this.stores.messages.getL1ToL2Messages(published.checkpoint.number);
         const computedInHash = computeInHashFromL1ToL2Messages(l1ToL2Messages);
         const publishedInHash = published.checkpoint.header.inHash;
         if (!computedInHash.equals(publishedInHash)) {
@@ -904,6 +968,7 @@ export class ArchiverL1Synchronizer implements Traceable {
                 attestations: lastCalldataCheckpoint.attestations,
                 checkpoint: maybeValidCheckpointToPromote,
               },
+              evictProposedFrom,
             ),
           ),
         );
@@ -938,10 +1003,10 @@ export class ArchiverL1Synchronizer implements Traceable {
         if (err instanceof InitialCheckpointNumberNotSequentialError) {
           const { previousCheckpointNumber, newCheckpointNumber } = err;
           const previousCheckpoint = previousCheckpointNumber
-            ? await this.store.getCheckpointData(CheckpointNumber(previousCheckpointNumber))
+            ? await this.stores.blocks.getCheckpointData(CheckpointNumber(previousCheckpointNumber))
             : undefined;
           const updatedL1SyncPoint = previousCheckpoint?.l1.blockNumber ?? this.l1Constants.l1StartBlock;
-          await this.store.setCheckpointSynchedL1BlockNumber(updatedL1SyncPoint);
+          await this.stores.blocks.setSynchedL1BlockNumber(updatedL1SyncPoint);
           this.log.warn(
             `Attempting to insert checkpoint ${newCheckpointNumber} with previous block ${previousCheckpointNumber}. Rolling back L1 sync point to ${updatedL1SyncPoint} to try and fetch the missing blocks.`,
             {
@@ -975,17 +1040,24 @@ export class ArchiverL1Synchronizer implements Traceable {
     return { ...rollupStatus, lastRetrievedCheckpoint, lastL1BlockWithCheckpoint };
   }
 
-  /** Checks if this checkpoint matches the local proposed one, and if so, loads local data to build a synthetic published checkpoint. */
+  /**
+   * Checks if a specific checkpoint matches a local pending entry, and if so, loads local data to build
+   * a synthetic published checkpoint (skipping blob fetch).
+   *
+   * Returns { diverged: true, fromCheckpointNumber } when the L1 checkpoint does NOT match local pending
+   * data for that number, so the caller can evict the entire pending suffix >= fromCheckpointNumber
+   * (those entries chain off the now-invalid local state) within the same addCheckpoints transaction.
+   */
   private async tryBuildPublishedCheckpointFromProposed(
     calldataCheckpoint: RetrievedCheckpointFromCalldata | undefined,
-  ): Promise<PublishedCheckpoint | undefined> {
-    const proposed = await this.store.getProposedCheckpointOnly();
-    if (
-      this.config.skipPromoteProposedCheckpointDuringL1Sync ||
-      !proposed ||
-      !calldataCheckpoint ||
-      proposed.checkpointNumber !== calldataCheckpoint.checkpointNumber
-    ) {
+  ): Promise<PublishedCheckpoint | { diverged: true; fromCheckpointNumber: CheckpointNumber } | undefined> {
+    if (this.config.skipPromoteProposedCheckpointDuringL1Sync || !calldataCheckpoint) {
+      return undefined;
+    }
+
+    // Look up the specific pending entry for the checkpoint being mined, not just the tip
+    const proposed = await this.stores.blocks.getProposedCheckpointByNumber(calldataCheckpoint.checkpointNumber);
+    if (!proposed) {
       return undefined;
     }
 
@@ -1004,7 +1076,8 @@ export class ArchiverL1Synchronizer implements Traceable {
           calldataArchiveRoot: calldataCheckpoint.archiveRoot.toString(),
         },
       );
-      return undefined;
+      // Return a divergence signal so the caller can evict pending >= this number
+      return { diverged: true, fromCheckpointNumber: proposed.checkpointNumber };
     }
 
     this.log.debug(
@@ -1012,7 +1085,10 @@ export class ArchiverL1Synchronizer implements Traceable {
       { proposedHeader: proposed.header.toInspect(), proposedArchiveRoot: proposed.archive.root.toString() },
     );
 
-    const blocks = await this.store.getBlocks(BlockNumber(proposed.startBlock), proposed.blockCount);
+    const blocks = await this.stores.blocks.getBlocks({
+      from: BlockNumber(proposed.startBlock),
+      limit: proposed.blockCount,
+    });
     if (blocks.length !== proposed.blockCount) {
       this.log.warn(
         `Local proposed checkpoint ${proposed.checkpointNumber} has wrong block count (expected ${proposed.blockCount} blocks starting at ${proposed.startBlock} but got ${blocks.length})`,
@@ -1052,7 +1128,7 @@ export class ArchiverL1Synchronizer implements Traceable {
     // Compare the last checkpoint we have (either retrieved in this round or loaded from store) with what the
     // rollup contract told us was the latest one (pinned at the currentL1BlockNumber).
     const latestLocalCheckpointNumber =
-      lastRetrievedCheckpoint?.checkpoint.number ?? (await this.store.getSynchedCheckpointNumber());
+      lastRetrievedCheckpoint?.checkpoint.number ?? (await this.stores.blocks.getLatestCheckpointNumber());
     if (latestLocalCheckpointNumber < pendingCheckpointNumber) {
       // Here we have consumed all logs until the `currentL1Block` we pinned at the beginning of the archiver loop,
       // but still haven't reached the pending checkpoint according to the call to the rollup contract.
@@ -1065,7 +1141,9 @@ export class ArchiverL1Synchronizer implements Traceable {
         latestLocalCheckpointArchive = lastRetrievedCheckpoint.checkpoint.archive.root.toString();
         targetL1BlockNumber = lastRetrievedCheckpoint.l1.blockNumber;
       } else if (latestLocalCheckpointNumber > 0) {
-        const checkpoint = await this.store.getRangeOfCheckpoints(latestLocalCheckpointNumber, 1).then(([c]) => c);
+        const checkpoint = await this.stores.blocks
+          .getRangeOfCheckpoints(latestLocalCheckpointNumber, 1)
+          .then(([c]) => c);
         latestLocalCheckpointArchive = checkpoint.archive.root.toString();
         targetL1BlockNumber = checkpoint.l1.blockNumber;
       }
@@ -1080,7 +1158,7 @@ export class ArchiverL1Synchronizer implements Traceable {
           ...status,
         },
       );
-      await this.store.setCheckpointSynchedL1BlockNumber(targetL1BlockNumber);
+      await this.stores.blocks.setSynchedL1BlockNumber(targetL1BlockNumber);
     } else {
       this.log.trace(`No new checkpoints behind L1 sync point to retrieve.`, {
         latestLocalCheckpointNumber,
@@ -1090,7 +1168,7 @@ export class ArchiverL1Synchronizer implements Traceable {
   }
 
   private async getCheckpointHeader(number: CheckpointNumber) {
-    const checkpoint = await this.store.getCheckpointData(number);
+    const checkpoint = await this.stores.blocks.getCheckpointData(number);
     if (!checkpoint) {
       return undefined;
     }
diff --git a/yarn-project/archiver/src/modules/validation.test.ts b/yarn-project/archiver/src/modules/validation.test.ts
index 0bfeb50f1566..50fa30fc5efa 100644
--- a/yarn-project/archiver/src/modules/validation.test.ts
+++ b/yarn-project/archiver/src/modules/validation.test.ts
@@ -7,6 +7,7 @@ import { Signature } from '@aztec/foundation/eth-signature';
 import { type Logger, createLogger } from '@aztec/foundation/log';
 import { CommitteeAttestation, EthAddress } from '@aztec/stdlib/block';
 import { Checkpoint } from '@aztec/stdlib/checkpoint';
+import { TEST_COORDINATION_SIGNATURE_CONTEXT } from '@aztec/stdlib/testing';
 
 import { type MockProxy, mock } from 'jest-mock-extended';
 import assert from 'node:assert';
@@ -58,7 +59,13 @@ describe('validateCheckpointAttestations', () => {
 
     it('validates a checkpoint if no committee is found', async () => {
       const checkpoint = await makeCheckpoint([], []);
-      const result = await validateCheckpointAttestations(checkpoint, epochCache, constants, logger);
+      const result = await validateCheckpointAttestations(
+        checkpoint,
+        epochCache,
+        constants,
+        TEST_COORDINATION_SIGNATURE_CONTEXT,
+        logger,
+      );
 
       expect(result.valid).toBe(true);
       expect(epochCache.getCommitteeForEpoch).toHaveBeenCalledWith(EpochNumber(0));
@@ -66,7 +73,13 @@ describe('validateCheckpointAttestations', () => {
 
     it('validates a checkpoint with no attestations if no committee is found', async () => {
       const checkpoint = await makeCheckpoint(signers, committee);
-      const result = await validateCheckpointAttestations(checkpoint, epochCache, constants, logger);
+      const result = await validateCheckpointAttestations(
+        checkpoint,
+        epochCache,
+        constants,
+        TEST_COORDINATION_SIGNATURE_CONTEXT,
+        logger,
+      );
 
       expect(result.valid).toBe(true);
       expect(epochCache.getCommitteeForEpoch).toHaveBeenCalledWith(EpochNumber(0));
@@ -76,7 +89,13 @@ describe('validateCheckpointAttestations', () => {
       // This should already be covered by the case of empty committee
       epochCache.isEscapeHatchOpen.mockResolvedValue(true);
       const checkpoint = await makeCheckpoint(signers, committee);
-      const result = await validateCheckpointAttestations(checkpoint, epochCache, constants, logger);
+      const result = await validateCheckpointAttestations(
+        checkpoint,
+        epochCache,
+        constants,
+        TEST_COORDINATION_SIGNATURE_CONTEXT,
+        logger,
+      );
       expect(result.valid).toBe(true);
       expect(epochCache.isEscapeHatchOpen).not.toHaveBeenCalled();
     });
@@ -90,23 +109,44 @@ describe('validateCheckpointAttestations', () => {
     it('uses feeAssetPriceModifier when recovering attestors', async () => {
       const checkpoint = await makeCheckpoint(signers.slice(0, 4), committee, 1, 1n);
 
-      const attestationInfos = getAttestationInfoFromPublishedCheckpoint(checkpoint);
+      const attestationInfos = getAttestationInfoFromPublishedCheckpoint(
+        checkpoint,
+        TEST_COORDINATION_SIGNATURE_CONTEXT,
+      );
       expect(attestationInfos.filter(a => a.status === 'recovered-from-signature').length).toBe(4);
 
-      const result = await validateCheckpointAttestations(checkpoint, epochCache, constants, logger);
+      const result = await validateCheckpointAttestations(
+        checkpoint,
+        epochCache,
+        constants,
+        TEST_COORDINATION_SIGNATURE_CONTEXT,
+        logger,
+      );
       expect(result.valid).toBe(true);
     });
 
     it('requests committee for the correct epoch', async () => {
       const checkpoint = await makeCheckpoint(signers, committee, 28);
-      await validateCheckpointAttestations(checkpoint, epochCache, constants, logger);
+      await validateCheckpointAttestations(
+        checkpoint,
+        epochCache,
+        constants,
+        TEST_COORDINATION_SIGNATURE_CONTEXT,
+        logger,
+      );
       expect(epochCache.getCommitteeForEpoch).toHaveBeenCalledWith(EpochNumber(2));
     });
 
     it('fails if there is an attestation from a non-committee member', async () => {
       const badSigner = Secp256k1Signer.random();
       const checkpoint = await makeCheckpoint([...signers, badSigner], [...committee, badSigner.address]);
-      const result = await validateCheckpointAttestations(checkpoint, epochCache, constants, logger);
+      const result = await validateCheckpointAttestations(
+        checkpoint,
+        epochCache,
+        constants,
+        TEST_COORDINATION_SIGNATURE_CONTEXT,
+        logger,
+      );
       assert(!result.valid);
       assert(result.reason === 'invalid-attestation');
       expect(result.checkpoint.checkpointNumber).toEqual(checkpoint.checkpoint.number);
@@ -118,7 +158,13 @@ describe('validateCheckpointAttestations', () => {
     it('fails if there is an empty attestation', async () => {
       const checkpoint = await makeCheckpoint(signers.slice(0, 4), committee);
       checkpoint.attestations[1] = new CommitteeAttestation(EthAddress.ZERO, Signature.empty());
-      const result = await validateCheckpointAttestations(checkpoint, epochCache, constants, logger);
+      const result = await validateCheckpointAttestations(
+        checkpoint,
+        epochCache,
+        constants,
+        TEST_COORDINATION_SIGNATURE_CONTEXT,
+        logger,
+      );
       assert(!result.valid);
       assert(result.reason === 'invalid-attestation');
       expect(result.checkpoint.checkpointNumber).toEqual(checkpoint.checkpoint.number);
@@ -141,10 +187,16 @@ describe('validateCheckpointAttestations', () => {
       checkpoint.attestations[0] = new CommitteeAttestation(EthAddress.ZERO, invalidSig);
 
       // Verify that the invalid signature is detected
-      const attestations = getAttestationInfoFromPublishedCheckpoint(checkpoint);
+      const attestations = getAttestationInfoFromPublishedCheckpoint(checkpoint, TEST_COORDINATION_SIGNATURE_CONTEXT);
       expect(attestations[0].status).toBe('invalid-signature');
 
-      const result = await validateCheckpointAttestations(checkpoint, epochCache, constants, logger);
+      const result = await validateCheckpointAttestations(
+        checkpoint,
+        epochCache,
+        constants,
+        TEST_COORDINATION_SIGNATURE_CONTEXT,
+        logger,
+      );
       assert(!result.valid);
       assert(result.reason === 'invalid-attestation');
       expect(result.checkpoint.checkpointNumber).toEqual(checkpoint.checkpoint.number);
@@ -162,10 +214,16 @@ describe('validateCheckpointAttestations', () => {
       checkpoint.attestations[2] = new CommitteeAttestation(original.address, flipped);
 
       // Verify the flipped signature is detected as invalid
-      const attestations = getAttestationInfoFromPublishedCheckpoint(checkpoint);
+      const attestations = getAttestationInfoFromPublishedCheckpoint(checkpoint, TEST_COORDINATION_SIGNATURE_CONTEXT);
       expect(attestations[2].status).toBe('invalid-signature');
 
-      const result = await validateCheckpointAttestations(checkpoint, epochCache, constants, logger);
+      const result = await validateCheckpointAttestations(
+        checkpoint,
+        epochCache,
+        constants,
+        TEST_COORDINATION_SIGNATURE_CONTEXT,
+        logger,
+      );
       assert(!result.valid);
       assert(result.reason === 'invalid-attestation');
       expect(result.checkpoint.checkpointNumber).toEqual(checkpoint.checkpoint.number);
@@ -185,7 +243,13 @@ describe('validateCheckpointAttestations', () => {
 
       // Index 2 is a valid attestation from signers[2]
 
-      const result = await validateCheckpointAttestations(checkpoint, epochCache, constants, logger);
+      const result = await validateCheckpointAttestations(
+        checkpoint,
+        epochCache,
+        constants,
+        TEST_COORDINATION_SIGNATURE_CONTEXT,
+        logger,
+      );
       assert(!result.valid);
       assert(result.reason === 'invalid-attestation');
       expect(result.invalidIndex).toBe(1); // Should be 1 (the original index), not 0
@@ -193,7 +257,13 @@ describe('validateCheckpointAttestations', () => {
 
     it('returns false if insufficient attestations', async () => {
       const checkpoint = await makeCheckpoint(signers.slice(0, 2), committee);
-      const result = await validateCheckpointAttestations(checkpoint, epochCache, constants, logger);
+      const result = await validateCheckpointAttestations(
+        checkpoint,
+        epochCache,
+        constants,
+        TEST_COORDINATION_SIGNATURE_CONTEXT,
+        logger,
+      );
       assert(!result.valid);
       expect(result.reason).toBe('insufficient-attestations');
       expect(result.checkpoint.checkpointNumber).toEqual(checkpoint.checkpoint.number);
@@ -203,7 +273,13 @@ describe('validateCheckpointAttestations', () => {
 
     it('returns true if all attestations are valid and sufficient', async () => {
       const checkpoint = await makeCheckpoint(signers.slice(0, 4), committee);
-      const result = await validateCheckpointAttestations(checkpoint, epochCache, constants, logger);
+      const result = await validateCheckpointAttestations(
+        checkpoint,
+        epochCache,
+        constants,
+        TEST_COORDINATION_SIGNATURE_CONTEXT,
+        logger,
+      );
       expect(result.valid).toBe(true);
     });
 
@@ -217,7 +293,13 @@ describe('validateCheckpointAttestations', () => {
       checkpoint.attestations[1] = checkpoint.attestations[2];
       checkpoint.attestations[2] = temp;
 
-      const result = await validateCheckpointAttestations(checkpoint, epochCache, constants, logger);
+      const result = await validateCheckpointAttestations(
+        checkpoint,
+        epochCache,
+        constants,
+        TEST_COORDINATION_SIGNATURE_CONTEXT,
+        logger,
+      );
       assert(!result.valid);
       assert(result.reason === 'invalid-attestation');
       expect(result.checkpoint.checkpointNumber).toEqual(checkpoint.checkpoint.number);
@@ -230,7 +312,13 @@ describe('validateCheckpointAttestations', () => {
     it('validates a checkpoint if escape hatch is open', async () => {
       epochCache.isEscapeHatchOpen.mockResolvedValue(true);
       const checkpoint = await makeCheckpoint(signers, committee);
-      const result = await validateCheckpointAttestations(checkpoint, epochCache, constants, logger);
+      const result = await validateCheckpointAttestations(
+        checkpoint,
+        epochCache,
+        constants,
+        TEST_COORDINATION_SIGNATURE_CONTEXT,
+        logger,
+      );
       expect(result.valid).toBe(true);
       expect(epochCache.isEscapeHatchOpen).toHaveBeenCalledWith(EpochNumber(0));
     });
diff --git a/yarn-project/archiver/src/modules/validation.ts b/yarn-project/archiver/src/modules/validation.ts
index 726054151729..ffb6c0f57c7f 100644
--- a/yarn-project/archiver/src/modules/validation.ts
+++ b/yarn-project/archiver/src/modules/validation.ts
@@ -10,7 +10,7 @@ import {
 } from '@aztec/stdlib/block';
 import type { PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
 import { type L1RollupConstants, computeQuorum, getEpochAtSlot } from '@aztec/stdlib/epoch-helpers';
-import { ConsensusPayload } from '@aztec/stdlib/p2p';
+import { ConsensusPayload, type CoordinationSignatureContext } from '@aztec/stdlib/p2p';
 
 export type { ValidateCheckpointResult };
 
@@ -18,11 +18,11 @@ export type { ValidateCheckpointResult };
  * Extracts attestation information from a published checkpoint.
  * Returns info for each attestation, preserving array indices.
  */
-export function getAttestationInfoFromPublishedCheckpoint({
-  checkpoint,
-  attestations,
-}: PublishedCheckpoint): AttestationInfo[] {
-  const payload = ConsensusPayload.fromCheckpoint(checkpoint);
+export function getAttestationInfoFromPublishedCheckpoint(
+  { checkpoint, attestations }: PublishedCheckpoint,
+  signatureContext: CoordinationSignatureContext,
+): AttestationInfo[] {
+  const payload = ConsensusPayload.fromCheckpoint(checkpoint, signatureContext);
   return getAttestationInfoFromPayload(payload, attestations);
 }
 
@@ -34,9 +34,10 @@ export async function validateCheckpointAttestations(
   publishedCheckpoint: PublishedCheckpoint,
   epochCache: EpochCache,
   constants: Pick<L1RollupConstants, 'epochDuration'>,
+  signatureContext: CoordinationSignatureContext,
   logger?: Logger,
 ): Promise<ValidateCheckpointResult> {
-  const attestorInfos = getAttestationInfoFromPublishedCheckpoint(publishedCheckpoint);
+  const attestorInfos = getAttestationInfoFromPublishedCheckpoint(publishedCheckpoint, signatureContext);
   const attestors = compactArray(attestorInfos.map(info => ('address' in info ? info.address : undefined)));
   const { checkpoint, attestations } = publishedCheckpoint;
   const headerHash = checkpoint.header.hash();
diff --git a/yarn-project/archiver/src/store/block_store.test.ts b/yarn-project/archiver/src/store/block_store.test.ts
new file mode 100644
index 000000000000..08e72e029d08
--- /dev/null
+++ b/yarn-project/archiver/src/store/block_store.test.ts
@@ -0,0 +1,2777 @@
+import { GENESIS_ARCHIVE_ROOT, INITIAL_CHECKPOINT_NUMBER } from '@aztec/constants';
+import {
+  BlockNumber,
+  CheckpointNumber,
+  EpochNumber,
+  IndexWithinCheckpoint,
+  SlotNumber,
+} from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { sleep } from '@aztec/foundation/sleep';
+import { openTmpStore } from '@aztec/kv-store/lmdb-v2';
+import {
+  BlockHash,
+  CommitteeAttestation,
+  EthAddress,
+  GENESIS_BLOCK_HEADER_HASH,
+  L2Block,
+  type ValidateCheckpointResult,
+} from '@aztec/stdlib/block';
+import { Checkpoint, PublishedCheckpoint, randomCheckpointInfo } from '@aztec/stdlib/checkpoint';
+import { CheckpointHeader } from '@aztec/stdlib/rollup';
+import '@aztec/stdlib/testing/jest';
+import { AppendOnlyTreeSnapshot } from '@aztec/stdlib/trees';
+import { type IndexedTxEffect, TxHash } from '@aztec/stdlib/tx';
+
+import {
+  BlockAlreadyCheckpointedError,
+  BlockArchiveNotConsistentError,
+  BlockCheckpointNumberNotSequentialError,
+  BlockIndexNotSequentialError,
+  BlockNumberNotSequentialError,
+  CannotOverwriteCheckpointedBlockError,
+  CheckpointNumberNotSequentialError,
+  InitialCheckpointNumberNotSequentialError,
+} from '../errors.js';
+import {
+  makeChainedCheckpoints,
+  makeL1PublishedData,
+  makePublishedCheckpoint,
+  makeStateForBlock,
+} from '../test/mock_structs.js';
+import { BlockStore } from './block_store.js';
+import { L2TipsCache } from './l2_tips_cache.js';
+
+async function addProposedBlocks(
+  blockStore: BlockStore,
+  blocks: L2Block[],
+  opts?: { force?: boolean },
+): Promise<boolean> {
+  let result = true;
+  for (const block of blocks) {
+    result = (await blockStore.addProposedBlock(block, opts)) && result;
+  }
+  return result;
+}
+
+describe('BlockStore', () => {
+  let blockStore: BlockStore;
+  let publishedCheckpoints: PublishedCheckpoint[];
+
+  const blockNumberTests: [number, () => L2Block][] = [
+    [1, () => publishedCheckpoints[0].checkpoint.blocks[0]],
+    [10, () => publishedCheckpoints[9].checkpoint.blocks[0]],
+    [5, () => publishedCheckpoints[4].checkpoint.blocks[0]],
+  ];
+
+  const expectCheckpointedBlockEquals = async (
+    actual: L2Block,
+    expectedBlock: L2Block,
+    expectedCheckpoint: PublishedCheckpoint,
+  ) => {
+    expect(actual.header.equals(expectedBlock.header)).toBe(true);
+    expect(actual.checkpointNumber).toEqual(expectedCheckpoint.checkpoint.number);
+    const checkpointData = await blockStore.getCheckpointData(actual.checkpointNumber);
+    expect(checkpointData?.l1).toEqual(expectedCheckpoint.l1);
+    expect(checkpointData?.attestations.every((a, i) => a.equals(expectedCheckpoint.attestations[i]))).toBe(true);
+  };
+
+  beforeEach(async () => {
+    blockStore = new BlockStore(await openTmpStore('block_store_test'));
+    // Create checkpoints sequentially to ensure archive roots are chained properly.
+    // Each block's header.lastArchive must equal the previous block's archive.
+    publishedCheckpoints = [];
+    const txsPerBlock = 4;
+    for (let i = 0; i < 10; i++) {
+      const blockNumber = i + 1;
+      const previousArchive = i > 0 ? publishedCheckpoints[i - 1].checkpoint.blocks[0].archive : undefined;
+      const checkpoint = await Checkpoint.random(CheckpointNumber(i + 1), {
+        numBlocks: 1,
+        startBlockNumber: blockNumber,
+        previousArchive,
+        txsPerBlock,
+        state: makeStateForBlock(blockNumber, txsPerBlock),
+        // Ensure each tx has public logs for getPublicLogs tests
+        txOptions: { numPublicCallsPerTx: 2, numPublicLogsPerCall: 2 },
+      });
+      publishedCheckpoints.push(makePublishedCheckpoint(checkpoint, i + 10));
+    }
+  });
+
+  describe('addCheckpoints', () => {
+    it('returns success when adding checkpoints', async () => {
+      await expect(blockStore.addCheckpoints(publishedCheckpoints)).resolves.toBe(true);
+    });
+
+    it('accepts duplicate checkpoints with matching archives and updates L1 info', async () => {
+      // Add first 3 checkpoints
+      const first3 = publishedCheckpoints.slice(0, 3);
+      await blockStore.addCheckpoints(first3);
+
+      // Verify initial L1 block number for checkpoint 3
+      const beforeData = await blockStore.getCheckpointData(CheckpointNumber(3));
+      expect(beforeData).toBeDefined();
+      const originalL1Block = beforeData!.l1.blockNumber;
+
+      // Re-add checkpoint 3 with the same content but different L1 published data
+      // This simulates an L1 reorg that moved the checkpoint to a different L1 block
+      const cp3WithNewL1 = new PublishedCheckpoint(
+        first3[2].checkpoint,
+        makeL1PublishedData(999),
+        first3[2].attestations,
+      );
+      // Also add checkpoint 4 (the next one) in the same batch
+      await blockStore.addCheckpoints([cp3WithNewL1, publishedCheckpoints[3]]);
+
+      // Checkpoint 3's L1 info should be updated
+      const afterData = await blockStore.getCheckpointData(CheckpointNumber(3));
+      expect(afterData).toBeDefined();
+      expect(afterData!.l1.blockNumber).toEqual(999n);
+      expect(afterData!.l1.blockNumber).not.toEqual(originalL1Block);
+
+      // Checkpoint 4 should be stored
+      expect(await blockStore.getLatestCheckpointNumber()).toEqual(CheckpointNumber(4));
+    });
+
+    it('accepts a batch that is entirely already-stored checkpoints', async () => {
+      const first3 = publishedCheckpoints.slice(0, 3);
+      await blockStore.addCheckpoints(first3);
+
+      // Re-add the same 3 checkpoints — should succeed without error
+      await expect(blockStore.addCheckpoints(first3)).resolves.toBe(true);
+    });
+
+    it('throws on duplicate checkpoints with mismatching archives', async () => {
+      const first3 = publishedCheckpoints.slice(0, 3);
+      await blockStore.addCheckpoints(first3);
+
+      // Create a fake checkpoint 3 with a different archive root (content mismatch)
+      const differentCheckpoint3 = await Checkpoint.random(CheckpointNumber(3), {
+        numBlocks: 1,
+        startBlockNumber: 3,
+      });
+      const mismatchedCp3 = makePublishedCheckpoint(differentCheckpoint3, 999);
+      await expect(blockStore.addCheckpoints([mismatchedCp3])).rejects.toThrow(
+        'already exists in store but with a different archive',
+      );
+    });
+
+    it('throws an error if the previous block does not exist in the store', async () => {
+      const checkpoint = await Checkpoint.random(CheckpointNumber(2), { numBlocks: 1, startBlockNumber: 2 });
+      const block = makePublishedCheckpoint(checkpoint, 2);
+      await expect(blockStore.addCheckpoints([block])).rejects.toThrow(InitialCheckpointNumberNotSequentialError);
+      await expect(blockStore.getBlock({ number: BlockNumber(1) })).resolves.toBeUndefined();
+    });
+
+    it('throws an error if there is a gap in the blocks being added', async () => {
+      const checkpoint1 = await Checkpoint.random(CheckpointNumber(1), { numBlocks: 1, startBlockNumber: 1 });
+      const checkpoint3 = await Checkpoint.random(CheckpointNumber(3), { numBlocks: 1, startBlockNumber: 3 });
+      const checkpoints = [makePublishedCheckpoint(checkpoint1, 1), makePublishedCheckpoint(checkpoint3, 3)];
+      await expect(blockStore.addCheckpoints(checkpoints)).rejects.toThrow(CheckpointNumberNotSequentialError);
+      await expect(blockStore.getBlock({ number: BlockNumber(1) })).resolves.toBeUndefined();
+    });
+
+    it('throws an error if blocks within a checkpoint are not sequential', async () => {
+      // Create a checkpoint with non-sequential block numbers (block 1 and block 3, skipping block 2)
+      const block1 = await L2Block.random(BlockNumber(1), { checkpointNumber: CheckpointNumber(1) });
+      const block3 = await L2Block.random(BlockNumber(3), { checkpointNumber: CheckpointNumber(1) });
+
+      const checkpoint = new Checkpoint(
+        AppendOnlyTreeSnapshot.random(),
+        CheckpointHeader.random(),
+        [block1, block3],
+        CheckpointNumber(1),
+      );
+      const publishedCheckpoint = makePublishedCheckpoint(checkpoint, 10);
+
+      await expect(blockStore.addCheckpoints([publishedCheckpoint])).rejects.toThrow(BlockNumberNotSequentialError);
+      await expect(blockStore.getBlock({ number: BlockNumber(1) })).resolves.toBeUndefined();
+    });
+
+    it('throws an error if blocks within a checkpoint do not have sequential indexes', async () => {
+      // Create a checkpoint with non-sequential indexes
+      const block1 = await L2Block.random(BlockNumber(1), {
+        checkpointNumber: CheckpointNumber(1),
+        indexWithinCheckpoint: IndexWithinCheckpoint(0),
+      });
+      const block3 = await L2Block.random(BlockNumber(2), {
+        checkpointNumber: CheckpointNumber(1),
+        indexWithinCheckpoint: IndexWithinCheckpoint(2),
+      });
+
+      const checkpoint = new Checkpoint(
+        AppendOnlyTreeSnapshot.random(),
+        CheckpointHeader.random(),
+        [block1, block3],
+        CheckpointNumber(1),
+      );
+      const publishedCheckpoint = makePublishedCheckpoint(checkpoint, 10);
+
+      await expect(blockStore.addCheckpoints([publishedCheckpoint])).rejects.toThrow(BlockIndexNotSequentialError);
+      await expect(blockStore.getBlock({ number: BlockNumber(1) })).resolves.toBeUndefined();
+    });
+
+    it('throws an error if blocks within a checkpoint do not start from index 0', async () => {
+      // Create a checkpoint with non-sequential indexes
+      const block1 = await L2Block.random(BlockNumber(1), {
+        checkpointNumber: CheckpointNumber(1),
+        indexWithinCheckpoint: IndexWithinCheckpoint(1),
+      });
+      const block3 = await L2Block.random(BlockNumber(2), {
+        checkpointNumber: CheckpointNumber(1),
+        indexWithinCheckpoint: IndexWithinCheckpoint(2),
+      });
+
+      const checkpoint = new Checkpoint(
+        AppendOnlyTreeSnapshot.random(),
+        CheckpointHeader.random(),
+        [block1, block3],
+        CheckpointNumber(1),
+      );
+      const publishedCheckpoint = makePublishedCheckpoint(checkpoint, 10);
+
+      await expect(blockStore.addCheckpoints([publishedCheckpoint])).rejects.toThrow(BlockIndexNotSequentialError);
+      await expect(blockStore.getBlock({ number: BlockNumber(1) })).resolves.toBeUndefined();
+    });
+
+    it('throws an error if block has invalid checkpoint index', async () => {
+      // Create a block wit an invalid checkpoint index
+      const block1 = await L2Block.random(BlockNumber(1), {
+        checkpointNumber: CheckpointNumber(1),
+        indexWithinCheckpoint: -1 as IndexWithinCheckpoint,
+      });
+
+      const checkpoint = new Checkpoint(
+        AppendOnlyTreeSnapshot.random(),
+        CheckpointHeader.random(),
+        [block1],
+        CheckpointNumber(1),
+      );
+      const publishedCheckpoint = makePublishedCheckpoint(checkpoint, 10);
+
+      await expect(blockStore.addCheckpoints([publishedCheckpoint])).rejects.toThrow(BlockIndexNotSequentialError);
+      await expect(blockStore.getBlock({ number: BlockNumber(1) })).resolves.toBeUndefined();
+    });
+
+    it('throws an error if checkpoint has invalid initial number', async () => {
+      const block1 = await L2Block.random(BlockNumber(1), {
+        checkpointNumber: CheckpointNumber(2),
+        indexWithinCheckpoint: IndexWithinCheckpoint(0),
+      });
+
+      const checkpoint = new Checkpoint(
+        AppendOnlyTreeSnapshot.random(),
+        CheckpointHeader.random(),
+        [block1],
+        CheckpointNumber(2),
+      );
+      const publishedCheckpoint = makePublishedCheckpoint(checkpoint, 10);
+
+      await expect(blockStore.addCheckpoints([publishedCheckpoint])).rejects.toThrow(
+        InitialCheckpointNumberNotSequentialError,
+      );
+    });
+
+    it('allows the correct initial checkpoint', async () => {
+      const block1 = await L2Block.random(BlockNumber(1), {
+        checkpointNumber: CheckpointNumber(1),
+        indexWithinCheckpoint: IndexWithinCheckpoint(0),
+      });
+
+      const checkpoint = new Checkpoint(
+        AppendOnlyTreeSnapshot.random(),
+        CheckpointHeader.random(),
+        [block1],
+        CheckpointNumber(1),
+      );
+      const publishedCheckpoint = makePublishedCheckpoint(checkpoint, 10);
+
+      await expect(blockStore.addCheckpoints([publishedCheckpoint])).resolves.toBe(true);
+    });
+
+    it('throws on duplicate checkpoint with different content', async () => {
+      const block1 = await L2Block.random(BlockNumber(1), {
+        checkpointNumber: CheckpointNumber(1),
+        indexWithinCheckpoint: IndexWithinCheckpoint(0),
+      });
+
+      const block2 = await L2Block.random(BlockNumber(1), {
+        checkpointNumber: CheckpointNumber(1),
+        indexWithinCheckpoint: IndexWithinCheckpoint(0),
+      });
+
+      const checkpoint = new Checkpoint(
+        AppendOnlyTreeSnapshot.random(),
+        CheckpointHeader.random(),
+        [block1],
+        CheckpointNumber(1),
+      );
+      const publishedCheckpoint = makePublishedCheckpoint(checkpoint, 10);
+
+      const checkpoint2 = new Checkpoint(
+        AppendOnlyTreeSnapshot.random(),
+        CheckpointHeader.random(),
+        [block2],
+        CheckpointNumber(1),
+      );
+      const publishedCheckpoint2 = makePublishedCheckpoint(checkpoint2, 10);
+
+      await expect(blockStore.addCheckpoints([publishedCheckpoint])).resolves.toBe(true);
+      await expect(blockStore.addCheckpoints([publishedCheckpoint2])).rejects.toThrow(
+        'already exists in store but with a different archive',
+      );
+    });
+
+    it('throws when crossing checkpoint boundary with non-zero index on first block', async () => {
+      // Checkpoint 1: block 1
+      const cp1 = await Checkpoint.random(CheckpointNumber(1), { numBlocks: 1, startBlockNumber: 1 });
+      const cp1Published = makePublishedCheckpoint(cp1, 10);
+
+      // Checkpoint 2: block 2 has indexWithinCheckpoint=1 (should be 0 for first block in new checkpoint)
+      const block2 = await L2Block.random(BlockNumber(2), {
+        checkpointNumber: CheckpointNumber(2),
+        indexWithinCheckpoint: IndexWithinCheckpoint(1),
+        lastArchive: cp1.blocks[0].archive,
+      });
+      const cp2 = new Checkpoint(
+        AppendOnlyTreeSnapshot.random(),
+        CheckpointHeader.random(),
+        [block2],
+        CheckpointNumber(2),
+      );
+      const cp2Published = makePublishedCheckpoint(cp2, 20);
+
+      await expect(blockStore.addCheckpoints([cp1Published, cp2Published])).rejects.toThrow(
+        BlockIndexNotSequentialError,
+      );
+    });
+
+    it('accepts blocks that properly cross checkpoint boundaries', async () => {
+      // Checkpoint 1: blocks 1-2, Checkpoint 2: blocks 3-4 — proper boundary crossing
+      const genesisArchive = new AppendOnlyTreeSnapshot(new Fr(GENESIS_ARCHIVE_ROOT), 1);
+      const checkpoints = await makeChainedCheckpoints(2, {
+        previousArchive: genesisArchive,
+        blocksPerCheckpoint: 2,
+      });
+
+      await expect(blockStore.addCheckpoints(checkpoints)).resolves.toBe(true);
+
+      // Verify blocks have correct checkpoint assignments
+      const block1 = await blockStore.getBlock({ number: BlockNumber(1) });
+      const block2 = await blockStore.getBlock({ number: BlockNumber(2) });
+      const block3 = await blockStore.getBlock({ number: BlockNumber(3) });
+      const block4 = await blockStore.getBlock({ number: BlockNumber(4) });
+
+      expect(block1!.checkpointNumber).toBe(1);
+      expect(block2!.checkpointNumber).toBe(1);
+      expect(block3!.checkpointNumber).toBe(2);
+      expect(block4!.checkpointNumber).toBe(2);
+    });
+  });
+
+  describe('removeCheckpointsAfter', () => {
+    it('removing checkpoints will remove checkpoints from the chain', async () => {
+      await blockStore.addCheckpoints(publishedCheckpoints);
+      const checkpointNumber = await blockStore.getLatestCheckpointNumber();
+      const lastCheckpoint = publishedCheckpoints.at(-1)!;
+      const lastBlockNumber = lastCheckpoint.checkpoint.blocks[0].number;
+
+      // Verify block exists before removing
+      const retrievedBlock = await blockStore.getBlock({ number: BlockNumber(lastBlockNumber) });
+      expect(retrievedBlock).toBeDefined();
+      expect(retrievedBlock!.header.equals(lastCheckpoint.checkpoint.blocks[0].header)).toBe(true);
+      expect(retrievedBlock!.checkpointNumber).toEqual(checkpointNumber);
+
+      await blockStore.removeCheckpointsAfter(CheckpointNumber(checkpointNumber - 1));
+
+      expect(await blockStore.getLatestCheckpointNumber()).toBe(checkpointNumber - 1);
+      await expect(blockStore.getBlock({ number: BlockNumber(lastBlockNumber) })).resolves.toBeUndefined();
+    });
+
+    it('can remove multiple checkpoints', async () => {
+      // Create checkpoints sequentially to chain archive roots
+      const emptyCheckpoints: PublishedCheckpoint[] = [];
+      for (let i = 0; i < 10; i++) {
+        const previousArchive = i > 0 ? emptyCheckpoints[i - 1].checkpoint.blocks[0].archive : undefined;
+        const checkpoint = await Checkpoint.random(CheckpointNumber(i + 1), {
+          numBlocks: 1,
+          startBlockNumber: i + 1,
+          txsPerBlock: 0,
+          previousArchive,
+        });
+        emptyCheckpoints.push(makePublishedCheckpoint(checkpoint, i + 10));
+      }
+      await blockStore.addCheckpoints(emptyCheckpoints);
+      expect(await blockStore.getLatestCheckpointNumber()).toBe(10);
+
+      await blockStore.removeCheckpointsAfter(CheckpointNumber(7));
+      expect(await blockStore.getLatestCheckpointNumber()).toBe(7);
+      expect((await blockStore.getRangeOfCheckpoints(CheckpointNumber(1), 10)).map(b => b.checkpointNumber)).toEqual([
+        1, 2, 3, 4, 5, 6, 7,
+      ]);
+    });
+
+    it('removed blocks and headers cannot be retrieved by hash or archive', async () => {
+      await blockStore.addCheckpoints(publishedCheckpoints);
+      const lastCheckpoint = publishedCheckpoints[publishedCheckpoints.length - 1];
+      const lastBlock = lastCheckpoint.checkpoint.blocks[0];
+      const blockHash = await lastBlock.header.hash();
+      const archive = lastBlock.archive.root;
+
+      // Verify block and header exist before removing
+      const retrievedByHash = await blockStore.getBlock({ hash: blockHash });
+      expect(retrievedByHash).toBeDefined();
+      expect(retrievedByHash!.header.equals(lastBlock.header)).toBe(true);
+
+      const retrievedByArchive = await blockStore.getBlock({ archive: archive });
+      expect(retrievedByArchive).toBeDefined();
+      expect(retrievedByArchive!.header.equals(lastBlock.header)).toBe(true);
+
+      const headerByHash = (await blockStore.getBlockData({ hash: blockHash }))?.header;
+      expect(headerByHash).toBeDefined();
+      expect(headerByHash!.equals(lastBlock.header)).toBe(true);
+
+      const headerByArchive = (await blockStore.getBlockData({ archive: archive }))?.header;
+      expect(headerByArchive).toBeDefined();
+      expect(headerByArchive!.equals(lastBlock.header)).toBe(true);
+
+      // Remove the checkpoint
+      await blockStore.removeCheckpointsAfter(CheckpointNumber(lastCheckpoint.checkpoint.number - 1));
+
+      // Verify neither block nor header can be retrieved after removal
+      expect(await blockStore.getBlock({ hash: blockHash })).toBeUndefined();
+      expect(await blockStore.getBlock({ archive: archive })).toBeUndefined();
+      expect(await blockStore.getBlockData({ hash: blockHash })).toBeUndefined();
+      expect(await blockStore.getBlockData({ archive: archive })).toBeUndefined();
+    });
+
+    it('orphaned blocks are removed when removing checkpoints', async () => {
+      // This test covers the scenario where:
+      // 1. Checkpoint 1 is added (with block 1)
+      // 2. Block 2 is added locally for upcoming checkpoint 2 (but checkpoint 2 doesn't exist yet)
+      // 3. Checkpoint 1 is removed due to L1 reorg
+      // 4. Block 2 should also be removed, even though it's not associated with any checkpoint entry
+
+      // Add checkpoint 1 with block 1
+      const checkpoint1Cp = await Checkpoint.random(CheckpointNumber(1), { numBlocks: 1, startBlockNumber: 1 });
+      const checkpoint1 = makePublishedCheckpoint(checkpoint1Cp, 10);
+      await blockStore.addCheckpoints([checkpoint1]);
+
+      expect(await blockStore.getLatestCheckpointNumber()).toBe(1);
+      expect(await blockStore.getLatestL2BlockNumber()).toBe(1);
+      expect(await blockStore.getCheckpointedL2BlockNumber()).toBe(1);
+
+      // Add block 2 locally for upcoming checkpoint 2 (no checkpoint entry yet)
+      const lastBlockArchive = checkpoint1.checkpoint.blocks[0].archive;
+      const block2 = await L2Block.random(BlockNumber(2), {
+        checkpointNumber: CheckpointNumber(2),
+        indexWithinCheckpoint: IndexWithinCheckpoint(0),
+        lastArchive: lastBlockArchive,
+      });
+      await blockStore.addProposedBlock(block2);
+
+      // Verify state: checkpoint 1 exists, block 2 exists but is orphaned (no checkpoint 2)
+      expect(await blockStore.getLatestCheckpointNumber()).toBe(1);
+      expect(await blockStore.getLatestL2BlockNumber()).toBe(2);
+      expect(await blockStore.getCheckpointedL2BlockNumber()).toBe(1);
+      expect(await blockStore.getBlock({ number: BlockNumber(2) })).toBeDefined();
+
+      // Remove checkpoint 1 (simulating L1 reorg)
+      await blockStore.removeCheckpointsAfter(CheckpointNumber(0));
+
+      // Verify that BOTH block 1 (from checkpoint) AND block 2 (orphaned) are removed
+      expect(await blockStore.getLatestCheckpointNumber()).toBe(0);
+      expect(await blockStore.getLatestL2BlockNumber()).toBe(0);
+      expect(await blockStore.getCheckpointedL2BlockNumber()).toBe(0);
+      expect(await blockStore.getBlock({ number: BlockNumber(1) })).toBeUndefined();
+      expect(await blockStore.getBlock({ number: BlockNumber(2) })).toBeUndefined();
+    });
+
+    it('multiple orphaned blocks are removed when removing checkpoints', async () => {
+      // Similar to above but with multiple orphaned blocks
+      // Add checkpoint 1 with block 1
+      const checkpoint1Cp = await Checkpoint.random(CheckpointNumber(1), { numBlocks: 1, startBlockNumber: 1 });
+      const checkpoint1 = makePublishedCheckpoint(checkpoint1Cp, 10);
+      await blockStore.addCheckpoints([checkpoint1]);
+
+      // Add blocks 2, 3, 4 locally for upcoming checkpoint 2
+      const lastBlockArchive = checkpoint1.checkpoint.blocks[0].archive;
+      const block2 = await L2Block.random(BlockNumber(2), {
+        checkpointNumber: CheckpointNumber(2),
+        indexWithinCheckpoint: IndexWithinCheckpoint(0),
+        lastArchive: lastBlockArchive,
+      });
+      const block3 = await L2Block.random(BlockNumber(3), {
+        checkpointNumber: CheckpointNumber(2),
+        indexWithinCheckpoint: IndexWithinCheckpoint(1),
+        lastArchive: block2.archive,
+      });
+      const block4 = await L2Block.random(BlockNumber(4), {
+        checkpointNumber: CheckpointNumber(2),
+        indexWithinCheckpoint: IndexWithinCheckpoint(2),
+        lastArchive: block3.archive,
+      });
+      await addProposedBlocks(blockStore, [block2, block3, block4]);
+
+      expect(await blockStore.getLatestCheckpointNumber()).toBe(1);
+      expect(await blockStore.getLatestL2BlockNumber()).toBe(4);
+
+      // Remove checkpoint 1
+      await blockStore.removeCheckpointsAfter(CheckpointNumber(0));
+
+      // All blocks should be removed
+      expect(await blockStore.getLatestCheckpointNumber()).toBe(0);
+      expect(await blockStore.getLatestL2BlockNumber()).toBe(0);
+      for (let i = 1; i <= 4; i++) {
+        expect(await blockStore.getBlock({ number: BlockNumber(i) })).toBeUndefined();
+      }
+    });
+  });
+
+  describe('multi-block checkpoints', () => {
+    it('block number increases correctly when adding checkpoints with multiple blocks', async () => {
+      // Create 3 checkpoints: first with 2 blocks, second with 3 blocks, third with 1 block
+      // Total blocks: 6, spanning block numbers 1-6
+      // Chain archive roots across checkpoints
+      const checkpoint1Cp = await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 });
+      const checkpoint1 = makePublishedCheckpoint(checkpoint1Cp, 10);
+
+      const previousArchive1 = checkpoint1Cp.blocks.at(-1)!.archive;
+      const checkpoint2Cp = await Checkpoint.random(CheckpointNumber(2), {
+        numBlocks: 3,
+        startBlockNumber: 3,
+        previousArchive: previousArchive1,
+      });
+      const checkpoint2 = makePublishedCheckpoint(checkpoint2Cp, 11);
+
+      const previousArchive2 = checkpoint2Cp.blocks.at(-1)!.archive;
+      const checkpoint3Cp = await Checkpoint.random(CheckpointNumber(3), {
+        numBlocks: 1,
+        startBlockNumber: 6,
+        previousArchive: previousArchive2,
+      });
+      const checkpoint3 = makePublishedCheckpoint(checkpoint3Cp, 12);
+
+      await blockStore.addCheckpoints([checkpoint1, checkpoint2, checkpoint3]);
+
+      // Checkpoint number should be 3 (the last checkpoint number)
+      expect(await blockStore.getLatestCheckpointNumber()).toBe(3);
+      // Block number should be 6 (the last block number across all checkpoints)
+      expect(await blockStore.getLatestL2BlockNumber()).toBe(6);
+    });
+
+    it('block number decreases correctly when unwinding checkpoints with multiple blocks', async () => {
+      // Create 3 checkpoints with varying block counts, chaining archive roots
+      const checkpoint1Cp = await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 });
+      const checkpoint1 = makePublishedCheckpoint(checkpoint1Cp, 10);
+
+      const previousArchive1 = checkpoint1Cp.blocks.at(-1)!.archive;
+      const checkpoint2Cp = await Checkpoint.random(CheckpointNumber(2), {
+        numBlocks: 3,
+        startBlockNumber: 3,
+        previousArchive: previousArchive1,
+      });
+      const checkpoint2 = makePublishedCheckpoint(checkpoint2Cp, 11);
+
+      const previousArchive2 = checkpoint2Cp.blocks.at(-1)!.archive;
+      const checkpoint3Cp = await Checkpoint.random(CheckpointNumber(3), {
+        numBlocks: 2,
+        startBlockNumber: 6,
+        previousArchive: previousArchive2,
+      });
+      const checkpoint3 = makePublishedCheckpoint(checkpoint3Cp, 12);
+
+      await blockStore.addCheckpoints([checkpoint1, checkpoint2, checkpoint3]);
+
+      expect(await blockStore.getLatestCheckpointNumber()).toBe(3);
+      expect(await blockStore.getLatestL2BlockNumber()).toBe(7);
+
+      // Remove the last checkpoint (which has 2 blocks)
+      await blockStore.removeCheckpointsAfter(CheckpointNumber(2));
+
+      expect(await blockStore.getLatestCheckpointNumber()).toBe(2);
+      expect(await blockStore.getLatestL2BlockNumber()).toBe(5);
+
+      // Remove another checkpoint (which has 3 blocks)
+      await blockStore.removeCheckpointsAfter(CheckpointNumber(1));
+
+      expect(await blockStore.getLatestCheckpointNumber()).toBe(1);
+      expect(await blockStore.getLatestL2BlockNumber()).toBe(2);
+    });
+
+    it('removing multiple checkpoints with multiple blocks in one go', async () => {
+      // Create 4 checkpoints with varying block counts, chaining archive roots
+      // Checkpoint 1: blocks 1-2 (2 blocks)
+      // Checkpoint 2: blocks 3-5 (3 blocks)
+      // Checkpoint 3: blocks 6-7 (2 blocks)
+      // Checkpoint 4: blocks 8-10 (3 blocks)
+      // Total: 10 blocks across 4 checkpoints
+      const checkpoint1Cp = await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 });
+      const checkpoint1 = makePublishedCheckpoint(checkpoint1Cp, 10);
+
+      const previousArchive1 = checkpoint1Cp.blocks.at(-1)!.archive;
+      const checkpoint2Cp = await Checkpoint.random(CheckpointNumber(2), {
+        numBlocks: 3,
+        startBlockNumber: 3,
+        previousArchive: previousArchive1,
+      });
+      const checkpoint2 = makePublishedCheckpoint(checkpoint2Cp, 11);
+
+      const previousArchive2 = checkpoint2Cp.blocks.at(-1)!.archive;
+      const checkpoint3Cp = await Checkpoint.random(CheckpointNumber(3), {
+        numBlocks: 2,
+        startBlockNumber: 6,
+        previousArchive: previousArchive2,
+      });
+      const checkpoint3 = makePublishedCheckpoint(checkpoint3Cp, 12);
+
+      const previousArchive3 = checkpoint3Cp.blocks.at(-1)!.archive;
+      const checkpoint4Cp = await Checkpoint.random(CheckpointNumber(4), {
+        numBlocks: 3,
+        startBlockNumber: 8,
+        previousArchive: previousArchive3,
+      });
+      const checkpoint4 = makePublishedCheckpoint(checkpoint4Cp, 13);
+
+      await blockStore.addCheckpoints([checkpoint1, checkpoint2, checkpoint3, checkpoint4]);
+
+      expect(await blockStore.getLatestCheckpointNumber()).toBe(4);
+      expect(await blockStore.getLatestL2BlockNumber()).toBe(10);
+
+      // Remove checkpoints 3 and 4 (which together have 5 blocks)
+      await blockStore.removeCheckpointsAfter(CheckpointNumber(2));
+
+      expect(await blockStore.getLatestCheckpointNumber()).toBe(2);
+      expect(await blockStore.getLatestL2BlockNumber()).toBe(5);
+
+      // Verify blocks 1-5 still exist (from checkpoints 1 and 2)
+      for (let blockNumber = 1; blockNumber <= 5; blockNumber++) {
+        expect(await blockStore.getBlock({ number: BlockNumber(blockNumber) })).toBeDefined();
+      }
+
+      // Verify blocks 6-10 are gone (from checkpoints 3 and 4)
+      for (let blockNumber = 6; blockNumber <= 10; blockNumber++) {
+        expect(await blockStore.getBlock({ number: BlockNumber(blockNumber) })).toBeUndefined();
+      }
+
+      // Remove remaining checkpoints 1 and 2 (which together have 5 blocks)
+      await blockStore.removeCheckpointsAfter(CheckpointNumber(0));
+
+      expect(await blockStore.getLatestCheckpointNumber()).toBe(0);
+      expect(await blockStore.getLatestL2BlockNumber()).toBe(0);
+
+      // Verify all blocks are gone
+      for (let blockNumber = 1; blockNumber <= 10; blockNumber++) {
+        expect(await blockStore.getBlock({ number: BlockNumber(blockNumber) })).toBeUndefined();
+      }
+    });
+
+    it('getCheckpointedBlock returns correct checkpoint info for blocks within multi-block checkpoints', async () => {
+      // Create checkpoints with chained archive roots
+      // Create a checkpoint with 3 blocks
+      const checkpoint1Cp = await Checkpoint.random(CheckpointNumber(1), { numBlocks: 3, startBlockNumber: 1 });
+      const checkpoint1 = makePublishedCheckpoint(checkpoint1Cp, 10);
+
+      // Create another checkpoint with 2 blocks
+      const previousArchive1 = checkpoint1Cp.blocks.at(-1)!.archive;
+      const checkpoint2Cp = await Checkpoint.random(CheckpointNumber(2), {
+        numBlocks: 2,
+        startBlockNumber: 4,
+        previousArchive: previousArchive1,
+      });
+      const checkpoint2 = makePublishedCheckpoint(checkpoint2Cp, 11);
+
+      await blockStore.addCheckpoints([checkpoint1, checkpoint2]);
+
+      // Check blocks from the first checkpoint (blocks 1, 2, 3)
+      for (let i = 0; i < 3; i++) {
+        const blockNumber = i + 1;
+        const retrievedBlock = await blockStore.getBlock({ number: BlockNumber(blockNumber) });
+
+        expect(retrievedBlock).toBeDefined();
+        expect(retrievedBlock!.checkpointNumber).toBe(1);
+        expect(retrievedBlock!.number).toBe(blockNumber);
+        const checkpointData1 = await blockStore.getCheckpointData(retrievedBlock!.checkpointNumber);
+        expect(checkpointData1?.l1).toEqual(checkpoint1.l1);
+        expect(checkpointData1?.attestations.every((a, j) => a.equals(checkpoint1.attestations[j]))).toBe(true);
+      }
+
+      // Check blocks from the second checkpoint (blocks 4, 5)
+      for (let i = 0; i < 2; i++) {
+        const blockNumber = i + 4;
+        const retrievedBlock = await blockStore.getBlock({ number: BlockNumber(blockNumber) });
+
+        expect(retrievedBlock).toBeDefined();
+        expect(retrievedBlock!.checkpointNumber).toBe(2);
+        expect(retrievedBlock!.number).toBe(blockNumber);
+        const checkpointData2 = await blockStore.getCheckpointData(retrievedBlock!.checkpointNumber);
+        expect(checkpointData2?.l1).toEqual(checkpoint2.l1);
+        expect(checkpointData2?.attestations.every((a, j) => a.equals(checkpoint2.attestations[j]))).toBe(true);
+      }
+    });
+
+    it('getCheckpointedBlockByHash returns correct checkpoint info for blocks within multi-block checkpoints', async () => {
+      const checkpoint = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 3, startBlockNumber: 1 }),
+        10,
+      );
+
+      await blockStore.addCheckpoints([checkpoint]);
+
+      // Check each block by its hash
+      for (let i = 0; i < checkpoint.checkpoint.blocks.length; i++) {
+        const block = checkpoint.checkpoint.blocks[i];
+        const blockHash = await block.header.hash();
+        const retrievedBlock = await blockStore.getBlock({ hash: blockHash });
+
+        expect(retrievedBlock).toBeDefined();
+        expect(retrievedBlock!.checkpointNumber).toBe(1);
+        expect(retrievedBlock!.number).toBe(i + 1);
+        const checkpointData = await blockStore.getCheckpointData(retrievedBlock!.checkpointNumber);
+        expect(checkpointData?.l1).toEqual(checkpoint.l1);
+      }
+    });
+
+    it('getCheckpointedBlockByArchive returns correct checkpoint info for blocks within multi-block checkpoints', async () => {
+      const checkpoint = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 3, startBlockNumber: 1 }),
+        10,
+      );
+
+      await blockStore.addCheckpoints([checkpoint]);
+
+      // Check each block by its archive root
+      for (let i = 0; i < checkpoint.checkpoint.blocks.length; i++) {
+        const block = checkpoint.checkpoint.blocks[i];
+        const archive = block.archive.root;
+        const retrievedBlock = await blockStore.getBlock({ archive: archive });
+
+        expect(retrievedBlock).toBeDefined();
+        expect(retrievedBlock!.checkpointNumber).toBe(1);
+        expect(retrievedBlock!.number).toBe(i + 1);
+        const checkpointData = await blockStore.getCheckpointData(retrievedBlock!.checkpointNumber);
+        expect(checkpointData?.l1).toEqual(checkpoint.l1);
+      }
+    });
+
+    it('removing a multi-block checkpoint removes all its blocks', async () => {
+      const checkpoint = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 3, startBlockNumber: 1 }),
+        10,
+      );
+
+      await blockStore.addCheckpoints([checkpoint]);
+
+      // Verify all 3 blocks exist
+      for (let blockNumber = 1; blockNumber <= 3; blockNumber++) {
+        expect(await blockStore.getBlock({ number: BlockNumber(blockNumber) })).toBeDefined();
+      }
+
+      // Remove the checkpoint
+      await blockStore.removeCheckpointsAfter(CheckpointNumber(0));
+
+      // Verify all 3 blocks are removed
+      for (let blockNumber = 1; blockNumber <= 3; blockNumber++) {
+        expect(await blockStore.getBlock({ number: BlockNumber(blockNumber) })).toBeUndefined();
+      }
+
+      expect(await blockStore.getLatestCheckpointNumber()).toBe(0);
+      expect(await blockStore.getLatestL2BlockNumber()).toBe(0);
+    });
+  });
+
+  describe('uncheckpointed blocks', () => {
+    it('can add blocks independently before a checkpoint arrives', async () => {
+      // First, establish some checkpointed blocks (checkpoint 1 with blocks 1-3)
+      const checkpoint1 = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 3, startBlockNumber: 1 }),
+        10,
+      );
+      await blockStore.addCheckpoints([checkpoint1]);
+
+      expect(await blockStore.getLatestCheckpointNumber()).toBe(1);
+      expect(await blockStore.getLatestL2BlockNumber()).toBe(3);
+
+      // Now add blocks 4, 5, 6 independently (without a checkpoint) for upcoming checkpoint 2
+      // Chain archive roots from the last block of checkpoint 1
+      const lastBlockArchive = checkpoint1.checkpoint.blocks.at(-1)!.archive;
+      const block4 = await L2Block.random(BlockNumber(4), {
+        checkpointNumber: CheckpointNumber(2),
+        indexWithinCheckpoint: IndexWithinCheckpoint(0),
+        lastArchive: lastBlockArchive,
+      });
+      const block5 = await L2Block.random(BlockNumber(5), {
+        checkpointNumber: CheckpointNumber(2),
+        indexWithinCheckpoint: IndexWithinCheckpoint(1),
+        lastArchive: block4.archive,
+      });
+      const block6 = await L2Block.random(BlockNumber(6), {
+        checkpointNumber: CheckpointNumber(2),
+        indexWithinCheckpoint: IndexWithinCheckpoint(2),
+        lastArchive: block5.archive,
+      });
+
+      await addProposedBlocks(blockStore, [block4, block5, block6]);
+
+      // Checkpoint number should still be 1 (no new checkpoint added)
+      expect(await blockStore.getLatestCheckpointNumber()).toBe(1);
+      // But latest block number should be 6
+      expect(await blockStore.getLatestL2BlockNumber()).toBe(6);
+    });
+
+    it('getBlock retrieves uncheckpointed blocks', async () => {
+      // First, establish some checkpointed blocks
+      const checkpoint1 = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 }),
+        10,
+      );
+      await blockStore.addCheckpoints([checkpoint1]);
+
+      // Add uncheckpointed blocks for upcoming checkpoint 2, chaining archive roots
+      const lastBlockArchive = checkpoint1.checkpoint.blocks.at(-1)!.archive;
+      const block3 = await L2Block.random(BlockNumber(3), {
+        checkpointNumber: CheckpointNumber(2),
+        indexWithinCheckpoint: IndexWithinCheckpoint(0),
+        lastArchive: lastBlockArchive,
+      });
+      const block4 = await L2Block.random(BlockNumber(4), {
+        checkpointNumber: CheckpointNumber(2),
+        indexWithinCheckpoint: IndexWithinCheckpoint(1),
+        lastArchive: block3.archive,
+      });
+      await addProposedBlocks(blockStore, [block3, block4]);
+
+      // getBlock should work for both checkpointed and uncheckpointed blocks
+      expect((await blockStore.getBlock({ number: BlockNumber(1) }))?.number).toBe(1);
+      expect((await blockStore.getBlock({ number: BlockNumber(2) }))?.number).toBe(2);
+      expect((await blockStore.getBlock({ number: BlockNumber(3) }))?.equals(block3)).toBe(true);
+      expect((await blockStore.getBlock({ number: BlockNumber(4) }))?.equals(block4)).toBe(true);
+      expect(await blockStore.getBlock({ number: BlockNumber(5) })).toBeUndefined();
+
+      const block5 = await L2Block.random(BlockNumber(5), {
+        checkpointNumber: CheckpointNumber(2),
+        indexWithinCheckpoint: IndexWithinCheckpoint(2),
+        lastArchive: block4.archive,
+      });
+      await blockStore.addProposedBlock(block5);
+
+      // Verify the uncheckpointed blocks have correct data
+      const retrieved3 = await blockStore.getBlock({ number: BlockNumber(3) });
+      expect(retrieved3!.number).toBe(3);
+      expect(retrieved3!.equals(block3)).toBe(true);
+      const retrieved4 = await blockStore.getBlock({ number: BlockNumber(4) });
+      expect(retrieved4!.number).toBe(4);
+      expect(retrieved4!.equals(block4)).toBe(true);
+      const retrieved5 = await blockStore.getBlock({ number: BlockNumber(5) });
+      expect(retrieved5!.number).toBe(5);
+      expect(retrieved5!.equals(block5)).toBe(true);
+    });
+
+    it('getBlockByHash retrieves uncheckpointed blocks', async () => {
+      // Add uncheckpointed blocks (no checkpoints at all) for initial checkpoint 1, chaining archive roots
+      const block1 = await L2Block.random(BlockNumber(1), {
+        checkpointNumber: CheckpointNumber(1),
+        indexWithinCheckpoint: IndexWithinCheckpoint(0),
+      });
+      const block2 = await L2Block.random(BlockNumber(2), {
+        checkpointNumber: CheckpointNumber(1),
+        indexWithinCheckpoint: IndexWithinCheckpoint(1),
+        lastArchive: block1.archive,
+      });
+      await addProposedBlocks(blockStore, [block1, block2]);
+
+      // getBlockByHash should work for uncheckpointed blocks
+      const hash1 = await block1.header.hash();
+      const hash2 = await block2.header.hash();
+
+      const retrieved1 = await blockStore.getBlock({ hash: hash1 });
+      expect(retrieved1!.equals(block1)).toBe(true);
+
+      const retrieved2 = await blockStore.getBlock({ hash: hash2 });
+      expect(retrieved2!.equals(block2)).toBe(true);
+    });
+
+    it('getBlockByArchive retrieves uncheckpointed blocks', async () => {
+      // Add uncheckpointed blocks for initial checkpoint 1, chaining archive roots
+      const block1 = await L2Block.random(BlockNumber(1), {
+        checkpointNumber: CheckpointNumber(1),
+        indexWithinCheckpoint: IndexWithinCheckpoint(0),
+      });
+      const block2 = await L2Block.random(BlockNumber(2), {
+        checkpointNumber: CheckpointNumber(1),
+        indexWithinCheckpoint: IndexWithinCheckpoint(1),
+        lastArchive: block1.archive,
+      });
+      await addProposedBlocks(blockStore, [block1, block2]);
+
+      // getBlockByArchive should work for uncheckpointed blocks
+      const archive1 = block1.archive.root;
+      const archive2 = block2.archive.root;
+
+      const retrieved1 = await blockStore.getBlock({ archive: archive1 });
+      expect(retrieved1!.equals(block1)).toBe(true);
+
+      const retrieved2 = await blockStore.getBlock({ archive: archive2 });
+      expect(retrieved2!.equals(block2)).toBe(true);
+    });
+
+    it('checkpoint adopts previously added uncheckpointed blocks', async () => {
+      // Add blocks 1-3 without a checkpoint (for initial checkpoint 1), chaining archive roots
+      const block1 = await L2Block.random(BlockNumber(1), {
+        checkpointNumber: CheckpointNumber(1),
+        indexWithinCheckpoint: IndexWithinCheckpoint(0),
+      });
+      const block2 = await L2Block.random(BlockNumber(2), {
+        checkpointNumber: CheckpointNumber(1),
+        indexWithinCheckpoint: IndexWithinCheckpoint(1),
+        lastArchive: block1.archive,
+      });
+      const block3 = await L2Block.random(BlockNumber(3), {
+        checkpointNumber: CheckpointNumber(1),
+        indexWithinCheckpoint: IndexWithinCheckpoint(2),
+        lastArchive: block2.archive,
+      });
+      await addProposedBlocks(blockStore, [block1, block2, block3]);
+
+      expect(await blockStore.getLatestCheckpointNumber()).toBe(0);
+      expect(await blockStore.getLatestL2BlockNumber()).toBe(3);
+
+      // Now add a checkpoint that covers blocks 1-3
+      const checkpoint1 = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 3, startBlockNumber: 1 }),
+        10,
+      );
+      await blockStore.addCheckpoints([checkpoint1]);
+
+      expect(await blockStore.getLatestCheckpointNumber()).toBe(1);
+      expect(await blockStore.getLatestL2BlockNumber()).toBe(3);
+
+      // Now getBlock should return all blocks
+      const checkpointed1 = await blockStore.getBlock({ number: BlockNumber(1) });
+      expect(checkpointed1).toBeDefined();
+      expect(checkpointed1!.checkpointNumber).toBe(1);
+      const checkpointData1 = await blockStore.getCheckpointData(checkpointed1!.checkpointNumber);
+      expect(checkpointData1?.l1).toEqual(checkpoint1.l1);
+
+      const checkpointed2 = await blockStore.getBlock({ number: BlockNumber(2) });
+      expect(checkpointed2).toBeDefined();
+      expect(checkpointed2!.checkpointNumber).toBe(1);
+
+      const checkpointed3 = await blockStore.getBlock({ number: BlockNumber(3) });
+      expect(checkpointed3).toBeDefined();
+      expect(checkpointed3!.checkpointNumber).toBe(1);
+    });
+
+    it('can add more uncheckpointed blocks after a checkpoint and then checkpoint them', async () => {
+      // Start with checkpoint 1 covering blocks 1-2
+      const checkpoint1 = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 }),
+        10,
+      );
+      await blockStore.addCheckpoints([checkpoint1]);
+
+      // Add uncheckpointed blocks 3-5 for the upcoming checkpoint 2, chaining archive roots
+      const lastBlockArchive = checkpoint1.checkpoint.blocks.at(-1)!.archive;
+      const block3 = await L2Block.random(BlockNumber(3), {
+        checkpointNumber: CheckpointNumber(2),
+        indexWithinCheckpoint: IndexWithinCheckpoint(0),
+        lastArchive: lastBlockArchive,
+      });
+      const block4 = await L2Block.random(BlockNumber(4), {
+        checkpointNumber: CheckpointNumber(2),
+        indexWithinCheckpoint: IndexWithinCheckpoint(1),
+        lastArchive: block3.archive,
+      });
+      const block5 = await L2Block.random(BlockNumber(5), {
+        checkpointNumber: CheckpointNumber(2),
+        indexWithinCheckpoint: IndexWithinCheckpoint(2),
+        lastArchive: block4.archive,
+      });
+      await addProposedBlocks(blockStore, [block3, block4, block5]);
+
+      expect(await blockStore.getLatestCheckpointNumber()).toBe(1);
+      expect(await blockStore.getLatestL2BlockNumber()).toBe(5);
+
+      // Add checkpoint 2 covering blocks 3-5, chaining from checkpoint1
+      const checkpoint2 = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(2), {
+          numBlocks: 3,
+          startBlockNumber: 3,
+          previousArchive: lastBlockArchive,
+        }),
+        11,
+      );
+      await blockStore.addCheckpoints([checkpoint2]);
+
+      expect(await blockStore.getLatestCheckpointNumber()).toBe(2);
+      expect(await blockStore.getLatestL2BlockNumber()).toBe(5);
+
+      // Now blocks 3-5 should be checkpointed with checkpoint 2's info
+      const checkpointed3 = await blockStore.getBlock({ number: BlockNumber(3) });
+      expect(checkpointed3).toBeDefined();
+      expect(checkpointed3!.checkpointNumber).toBe(2);
+      const checkpointData2 = await blockStore.getCheckpointData(checkpointed3!.checkpointNumber);
+      expect(checkpointData2?.l1).toEqual(checkpoint2.l1);
+
+      const checkpointed4 = await blockStore.getBlock({ number: BlockNumber(4) });
+      expect(checkpointed4).toBeDefined();
+      expect(checkpointed4!.checkpointNumber).toBe(2);
+
+      const checkpointed5 = await blockStore.getBlock({ number: BlockNumber(5) });
+      expect(checkpointed5).toBeDefined();
+      expect(checkpointed5!.checkpointNumber).toBe(2);
+    });
+
+    it('getBlocks retrieves both checkpointed and uncheckpointed blocks', async () => {
+      // Add checkpoint with blocks 1-2
+      const checkpoint1 = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 }),
+        10,
+      );
+      await blockStore.addCheckpoints([checkpoint1]);
+
+      // Add uncheckpointed blocks 3-4 for the upcoming checkpoint 2, chaining archive roots
+      const lastBlockArchive = checkpoint1.checkpoint.blocks.at(-1)!.archive;
+      const block3 = await L2Block.random(BlockNumber(3), {
+        checkpointNumber: CheckpointNumber(2),
+        indexWithinCheckpoint: IndexWithinCheckpoint(0),
+        lastArchive: lastBlockArchive,
+      });
+      const block4 = await L2Block.random(BlockNumber(4), {
+        checkpointNumber: CheckpointNumber(2),
+        indexWithinCheckpoint: IndexWithinCheckpoint(1),
+        lastArchive: block3.archive,
+      });
+      await addProposedBlocks(blockStore, [block3, block4]);
+
+      // getBlocks should retrieve all blocks
+      const allBlocks = await blockStore.getBlocks({ from: BlockNumber(1), limit: 10 });
+      expect(allBlocks.length).toBe(4);
+      expect(allBlocks.map(b => b.number)).toEqual([1, 2, 3, 4]);
+    });
+  });
+
+  describe('addProposedBlock validation', () => {
+    it('throws if checkpoint number is not the current checkpoint', async () => {
+      // First, establish checkpoint 1 with blocks 1-2
+      const checkpoint1 = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 }),
+        10,
+      );
+      await blockStore.addCheckpoints([checkpoint1]);
+
+      // Try to add a block for checkpoint 3 (skipping checkpoint 2)
+      const block3 = await L2Block.random(BlockNumber(3), {
+        checkpointNumber: CheckpointNumber(3),
+        indexWithinCheckpoint: IndexWithinCheckpoint(0),
+      });
+
+      await expect(blockStore.addProposedBlock(block3)).rejects.toThrow(BlockCheckpointNumberNotSequentialError);
+    });
+
+    it('allows blocks with the same checkpoint number for the current checkpoint', async () => {
+      // First, establish checkpoint 1 with blocks 1-2
+      const checkpoint1 = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 }),
+        10,
+      );
+      await blockStore.addCheckpoints([checkpoint1]);
+
+      // Add blocks 3 and 4 with consistent checkpoint number (2), chaining archive roots
+      const lastBlockArchive = checkpoint1.checkpoint.blocks.at(-1)!.archive;
+      const block3 = await L2Block.random(BlockNumber(3), {
+        checkpointNumber: CheckpointNumber(2),
+        indexWithinCheckpoint: IndexWithinCheckpoint(0),
+        lastArchive: lastBlockArchive,
+      });
+      const block4 = await L2Block.random(BlockNumber(4), {
+        checkpointNumber: CheckpointNumber(2),
+        indexWithinCheckpoint: IndexWithinCheckpoint(1),
+        lastArchive: block3.archive,
+      });
+
+      await expect(addProposedBlocks(blockStore, [block3, block4])).resolves.toBe(true);
+
+      // Verify blocks were added
+      expect((await blockStore.getBlock({ number: BlockNumber(3) }))?.equals(block3)).toBe(true);
+      expect((await blockStore.getBlock({ number: BlockNumber(4) }))?.equals(block4)).toBe(true);
+    });
+
+    it('allows blocks for the initial checkpoint when store is empty', async () => {
+      // Add blocks for the initial checkpoint (1), chaining archive roots
+      const block1 = await L2Block.random(BlockNumber(1), {
+        checkpointNumber: CheckpointNumber(1),
+        indexWithinCheckpoint: IndexWithinCheckpoint(0),
+      });
+      const block2 = await L2Block.random(BlockNumber(2), {
+        checkpointNumber: CheckpointNumber(1),
+        indexWithinCheckpoint: IndexWithinCheckpoint(1),
+        lastArchive: block1.archive,
+      });
+
+      await expect(addProposedBlocks(blockStore, [block1, block2])).resolves.toBe(true);
+
+      // Verify blocks were added
+      expect((await blockStore.getBlock({ number: BlockNumber(1) }))?.equals(block1)).toBe(true);
+      expect((await blockStore.getBlock({ number: BlockNumber(2) }))?.equals(block2)).toBe(true);
+      expect(await blockStore.getLatestL2BlockNumber()).toBe(2);
+    });
+
+    it('throws if initial block is duplicated across calls', async () => {
+      // Add blocks for the initial checkpoint (1)
+      const block1 = await L2Block.random(BlockNumber(1), {
+        checkpointNumber: CheckpointNumber(1),
+        indexWithinCheckpoint: IndexWithinCheckpoint(0),
+      });
+      const block2 = await L2Block.random(BlockNumber(1), {
+        checkpointNumber: CheckpointNumber(1),
+        indexWithinCheckpoint: IndexWithinCheckpoint(0),
+      });
+
+      await expect(blockStore.addProposedBlock(block1)).resolves.toBe(true);
+      await expect(blockStore.addProposedBlock(block2)).rejects.toThrow(BlockNumberNotSequentialError);
+    });
+
+    it('throws if first block has wrong checkpoint number when store is empty', async () => {
+      // Try to add a block for checkpoint 2 when store is empty (should start at 1)
+      const block1 = await L2Block.random(BlockNumber(1), {
+        checkpointNumber: CheckpointNumber(2),
+        indexWithinCheckpoint: IndexWithinCheckpoint(0),
+      });
+
+      await expect(blockStore.addProposedBlock(block1)).rejects.toThrow(BlockCheckpointNumberNotSequentialError);
+    });
+
+    it('allows adding more blocks to the same checkpoint in separate calls', async () => {
+      // First, establish checkpoint 1 with blocks 1-2
+      const checkpoint1 = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 }),
+        10,
+      );
+      await blockStore.addCheckpoints([checkpoint1]);
+
+      // Add block 3 for checkpoint 2, chaining archive roots
+      const lastBlockArchive = checkpoint1.checkpoint.blocks.at(-1)!.archive;
+      const block3 = await L2Block.random(BlockNumber(3), {
+        checkpointNumber: CheckpointNumber(2),
+        indexWithinCheckpoint: IndexWithinCheckpoint(0),
+        lastArchive: lastBlockArchive,
+      });
+      await expect(blockStore.addProposedBlock(block3)).resolves.toBe(true);
+
+      // Add block 4 for the same checkpoint 2 in a separate call
+      const block4 = await L2Block.random(BlockNumber(4), {
+        checkpointNumber: CheckpointNumber(2),
+        indexWithinCheckpoint: IndexWithinCheckpoint(1),
+        lastArchive: block3.archive,
+      });
+      await expect(blockStore.addProposedBlock(block4)).resolves.toBe(true);
+
+      expect(await blockStore.getLatestL2BlockNumber()).toBe(4);
+    });
+
+    it('throws if adding blocks in separate calls with non-consecutive indexes', async () => {
+      // First, establish checkpoint 1 with blocks 1-2
+      const checkpoint1 = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 }),
+        10,
+      );
+      await blockStore.addCheckpoints([checkpoint1]);
+
+      // Add block 3 for checkpoint 2, chaining archive roots
+      const lastBlockArchive = checkpoint1.checkpoint.blocks.at(-1)!.archive;
+      const block3 = await L2Block.random(BlockNumber(3), {
+        checkpointNumber: CheckpointNumber(2),
+        indexWithinCheckpoint: IndexWithinCheckpoint(0),
+        lastArchive: lastBlockArchive,
+      });
+      await expect(blockStore.addProposedBlock(block3)).resolves.toBe(true);
+
+      // Add block 4 for the same checkpoint 2 in a separate call but with a missing index
+      const block4 = await L2Block.random(BlockNumber(4), {
+        checkpointNumber: CheckpointNumber(2),
+        indexWithinCheckpoint: IndexWithinCheckpoint(2),
+        lastArchive: block3.archive,
+      });
+      await expect(blockStore.addProposedBlock(block4)).rejects.toThrow(BlockIndexNotSequentialError);
+
+      expect(await blockStore.getLatestL2BlockNumber()).toBe(3);
+    });
+
+    it('throws if second batch of blocks has different checkpoint number than first batch', async () => {
+      // First, establish checkpoint 1 with blocks 1-2
+      const checkpoint1 = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 }),
+        10,
+      );
+      await blockStore.addCheckpoints([checkpoint1]);
+
+      // Add block 3 for checkpoint 2, chaining archive roots
+      const lastBlockArchive = checkpoint1.checkpoint.blocks.at(-1)!.archive;
+      const block3 = await L2Block.random(BlockNumber(3), {
+        checkpointNumber: CheckpointNumber(2),
+        indexWithinCheckpoint: IndexWithinCheckpoint(0),
+        lastArchive: lastBlockArchive,
+      });
+      await blockStore.addProposedBlock(block3);
+
+      // Try to add block 4 for checkpoint 3 (should fail because current checkpoint is still 2)
+      const block4 = await L2Block.random(BlockNumber(4), {
+        checkpointNumber: CheckpointNumber(3),
+        indexWithinCheckpoint: IndexWithinCheckpoint(0),
+        lastArchive: block3.archive,
+      });
+      await expect(blockStore.addProposedBlock(block4)).rejects.toThrow(BlockCheckpointNumberNotSequentialError);
+    });
+
+    it('force option bypasses checkpoint number validation', async () => {
+      // First, establish checkpoint 1 with blocks 1-2
+      const checkpoint1 = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 }),
+        10,
+      );
+      await blockStore.addCheckpoints([checkpoint1]);
+
+      // Add blocks with different checkpoint numbers using force option, chaining archive roots
+      const lastBlockArchive = checkpoint1.checkpoint.blocks.at(-1)!.archive;
+      const block3 = await L2Block.random(BlockNumber(3), {
+        checkpointNumber: CheckpointNumber(2),
+        indexWithinCheckpoint: IndexWithinCheckpoint(0),
+        lastArchive: lastBlockArchive,
+      });
+      const block4 = await L2Block.random(BlockNumber(4), {
+        checkpointNumber: CheckpointNumber(5),
+        indexWithinCheckpoint: IndexWithinCheckpoint(0),
+        lastArchive: block3.archive,
+      });
+
+      await expect(addProposedBlocks(blockStore, [block3, block4], { force: true })).resolves.toBe(true);
+    });
+
+    it('force option bypasses blockindex number validation', async () => {
+      // First, establish checkpoint 1 with blocks 1-2
+      const checkpoint1 = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 }),
+        10,
+      );
+      await blockStore.addCheckpoints([checkpoint1]);
+
+      // Add blocks with different checkpoint numbers using force option, chaining archive roots
+      const lastBlockArchive = checkpoint1.checkpoint.blocks.at(-1)!.archive;
+      const block3 = await L2Block.random(BlockNumber(3), {
+        checkpointNumber: CheckpointNumber(2),
+        indexWithinCheckpoint: IndexWithinCheckpoint(0),
+        lastArchive: lastBlockArchive,
+      });
+      const block4 = await L2Block.random(BlockNumber(4), {
+        checkpointNumber: CheckpointNumber(2),
+        indexWithinCheckpoint: IndexWithinCheckpoint(2),
+        lastArchive: block3.archive,
+      });
+
+      await expect(addProposedBlocks(blockStore, [block3, block4], { force: true })).resolves.toBe(true);
+    });
+
+    it('throws if adding blocks with non-consecutive archives', async () => {
+      // First, establish checkpoint 1 with blocks 1-2
+      const checkpoint1 = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 }),
+        10,
+      );
+      await blockStore.addCheckpoints([checkpoint1]);
+
+      // Add block 3 for checkpoint 2 with incorrect archive
+      const block3 = await L2Block.random(BlockNumber(3), {
+        checkpointNumber: CheckpointNumber(2),
+        indexWithinCheckpoint: IndexWithinCheckpoint(0),
+      });
+      await expect(blockStore.addProposedBlock(block3)).rejects.toThrow(BlockArchiveNotConsistentError);
+
+      expect(await blockStore.getLatestL2BlockNumber()).toBe(2);
+    });
+
+    it('throws if adding blocks with non-consecutive archives across calls', async () => {
+      // First, establish checkpoint 1 with blocks 1-2
+      const checkpoint1 = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 }),
+        10,
+      );
+      await blockStore.addCheckpoints([checkpoint1]);
+
+      // Add block 3 for checkpoint 2 with correct archive
+      const lastBlockArchive = checkpoint1.checkpoint.blocks.at(-1)!.archive;
+      const block3 = await L2Block.random(BlockNumber(3), {
+        checkpointNumber: CheckpointNumber(2),
+        indexWithinCheckpoint: IndexWithinCheckpoint(0),
+        lastArchive: lastBlockArchive,
+      });
+      await expect(blockStore.addProposedBlock(block3)).resolves.toBe(true);
+
+      // Add block 4 with incorrect archive (should fail)
+      const block4 = await L2Block.random(BlockNumber(4), {
+        checkpointNumber: CheckpointNumber(2),
+        indexWithinCheckpoint: IndexWithinCheckpoint(1),
+        lastArchive: AppendOnlyTreeSnapshot.random(),
+      });
+      await expect(blockStore.addProposedBlock(block4)).rejects.toThrow(BlockArchiveNotConsistentError);
+
+      expect(await blockStore.getLatestL2BlockNumber()).toBe(3);
+    });
+
+    it('throws if adding blocks that would overwrite checkpointed blocks', async () => {
+      // First, establish checkpoint 1 with blocks 1-2
+      const checkpoint1 = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 }),
+        10,
+      );
+      await blockStore.addCheckpoints([checkpoint1]);
+
+      expect(await blockStore.getCheckpointedL2BlockNumber()).toBe(2);
+
+      // Try to add a block that would overwrite checkpointed block 2
+      const block2 = await L2Block.random(BlockNumber(2), {
+        checkpointNumber: CheckpointNumber(1),
+        indexWithinCheckpoint: IndexWithinCheckpoint(1),
+      });
+      await expect(blockStore.addProposedBlock(block2)).rejects.toThrow(CannotOverwriteCheckpointedBlockError);
+
+      // Try to add a block that would overwrite checkpointed block 1
+      const block1 = await L2Block.random(BlockNumber(1), {
+        checkpointNumber: CheckpointNumber(1),
+        indexWithinCheckpoint: IndexWithinCheckpoint(0),
+      });
+      await expect(blockStore.addProposedBlock(block1)).rejects.toThrow(CannotOverwriteCheckpointedBlockError);
+    });
+
+    it('throws BlockAlreadyCheckpointedError if proposed block matches the checkpointed one', async () => {
+      const checkpoint1 = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 }),
+        10,
+      );
+      await blockStore.addCheckpoints([checkpoint1]);
+
+      // Re-propose the same block that was already checkpointed
+      const checkpointedBlock = checkpoint1.checkpoint.blocks[1];
+      await expect(blockStore.addProposedBlock(checkpointedBlock)).rejects.toThrow(BlockAlreadyCheckpointedError);
+    });
+  });
+
+  describe('getBlocksForCheckpoint', () => {
+    it('returns blocks for a single-block checkpoint', async () => {
+      const checkpoint = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 1, startBlockNumber: 1 }),
+        10,
+      );
+      await blockStore.addCheckpoints([checkpoint]);
+
+      const blocks = await blockStore.getBlocksForCheckpoint(CheckpointNumber(1));
+      expect(blocks).toBeDefined();
+      expect(blocks!.length).toBe(1);
+      expect(blocks![0].number).toBe(1);
+    });
+
+    it('returns all blocks for a multi-block checkpoint', async () => {
+      const checkpoint = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 4, startBlockNumber: 1 }),
+        10,
+      );
+      await blockStore.addCheckpoints([checkpoint]);
+
+      const blocks = await blockStore.getBlocksForCheckpoint(CheckpointNumber(1));
+      expect(blocks).toBeDefined();
+      expect(blocks!.length).toBe(4);
+      expect(blocks!.map(b => b.number)).toEqual([1, 2, 3, 4]);
+    });
+
+    it('returns correct blocks for different checkpoints', async () => {
+      // Create checkpoints with chained archive roots
+      // Checkpoint 1: blocks 1-2
+      const checkpoint1Cp = await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 });
+      const checkpoint1 = makePublishedCheckpoint(checkpoint1Cp, 10);
+
+      // Checkpoint 2: blocks 3-5
+      const previousArchive1 = checkpoint1Cp.blocks.at(-1)!.archive;
+      const checkpoint2Cp = await Checkpoint.random(CheckpointNumber(2), {
+        numBlocks: 3,
+        startBlockNumber: 3,
+        previousArchive: previousArchive1,
+      });
+      const checkpoint2 = makePublishedCheckpoint(checkpoint2Cp, 11);
+
+      // Checkpoint 3: blocks 6-7
+      const previousArchive2 = checkpoint2Cp.blocks.at(-1)!.archive;
+      const checkpoint3Cp = await Checkpoint.random(CheckpointNumber(3), {
+        numBlocks: 2,
+        startBlockNumber: 6,
+        previousArchive: previousArchive2,
+      });
+      const checkpoint3 = makePublishedCheckpoint(checkpoint3Cp, 12);
+
+      await blockStore.addCheckpoints([checkpoint1, checkpoint2, checkpoint3]);
+
+      const blocks1 = await blockStore.getBlocksForCheckpoint(CheckpointNumber(1));
+      expect(blocks1).toBeDefined();
+      expect(blocks1!.map(b => b.number)).toEqual([1, 2]);
+
+      const blocks2 = await blockStore.getBlocksForCheckpoint(CheckpointNumber(2));
+      expect(blocks2).toBeDefined();
+      expect(blocks2!.map(b => b.number)).toEqual([3, 4, 5]);
+
+      const blocks3 = await blockStore.getBlocksForCheckpoint(CheckpointNumber(3));
+      expect(blocks3).toBeDefined();
+      expect(blocks3!.map(b => b.number)).toEqual([6, 7]);
+    });
+
+    it('returns undefined for non-existent checkpoint', async () => {
+      const checkpoint = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 }),
+        10,
+      );
+      await blockStore.addCheckpoints([checkpoint]);
+
+      const blocks = await blockStore.getBlocksForCheckpoint(CheckpointNumber(5));
+      expect(blocks).toBeUndefined();
+    });
+
+    it('returns undefined when no checkpoints exist', async () => {
+      const blocks = await blockStore.getBlocksForCheckpoint(CheckpointNumber(1));
+      expect(blocks).toBeUndefined();
+    });
+  });
+
+  describe('getRangeOfCheckpoints', () => {
+    it('returns empty array when no checkpoints exist', async () => {
+      const checkpoints = await blockStore.getRangeOfCheckpoints(CheckpointNumber(1), 10);
+      expect(checkpoints).toEqual([]);
+    });
+
+    it('returns single checkpoint', async () => {
+      const checkpoint = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 }),
+        10,
+      );
+      await blockStore.addCheckpoints([checkpoint]);
+
+      const checkpoints = await blockStore.getRangeOfCheckpoints(CheckpointNumber(1), 10);
+      expect(checkpoints.length).toBe(1);
+      expect(checkpoints[0].checkpointNumber).toBe(1);
+      expect(checkpoints[0].startBlock).toBe(1);
+      expect(checkpoints[0].blockCount).toBe(2);
+    });
+
+    it('returns multiple checkpoints in order', async () => {
+      // Create checkpoints with chained archive roots
+      const checkpoint1Cp = await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 });
+      const checkpoint1 = makePublishedCheckpoint(checkpoint1Cp, 10);
+
+      const previousArchive1 = checkpoint1Cp.blocks.at(-1)!.archive;
+      const checkpoint2Cp = await Checkpoint.random(CheckpointNumber(2), {
+        numBlocks: 3,
+        startBlockNumber: 3,
+        previousArchive: previousArchive1,
+      });
+      const checkpoint2 = makePublishedCheckpoint(checkpoint2Cp, 11);
+
+      const previousArchive2 = checkpoint2Cp.blocks.at(-1)!.archive;
+      const checkpoint3Cp = await Checkpoint.random(CheckpointNumber(3), {
+        numBlocks: 1,
+        startBlockNumber: 6,
+        previousArchive: previousArchive2,
+      });
+      const checkpoint3 = makePublishedCheckpoint(checkpoint3Cp, 12);
+
+      await blockStore.addCheckpoints([checkpoint1, checkpoint2, checkpoint3]);
+
+      const checkpoints = await blockStore.getRangeOfCheckpoints(CheckpointNumber(1), 10);
+      expect(checkpoints.length).toBe(3);
+      expect(checkpoints.map(c => c.checkpointNumber)).toEqual([1, 2, 3]);
+      expect(checkpoints.map(c => c.startBlock)).toEqual([1, 3, 6]);
+      expect(checkpoints.map(c => c.blockCount)).toEqual([2, 3, 1]);
+    });
+
+    it('respects the from parameter', async () => {
+      // Create checkpoints with chained archive roots
+      const checkpoint1Cp = await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 });
+      const checkpoint1 = makePublishedCheckpoint(checkpoint1Cp, 10);
+
+      const previousArchive1 = checkpoint1Cp.blocks.at(-1)!.archive;
+      const checkpoint2Cp = await Checkpoint.random(CheckpointNumber(2), {
+        numBlocks: 2,
+        startBlockNumber: 3,
+        previousArchive: previousArchive1,
+      });
+      const checkpoint2 = makePublishedCheckpoint(checkpoint2Cp, 11);
+
+      const previousArchive2 = checkpoint2Cp.blocks.at(-1)!.archive;
+      const checkpoint3Cp = await Checkpoint.random(CheckpointNumber(3), {
+        numBlocks: 2,
+        startBlockNumber: 5,
+        previousArchive: previousArchive2,
+      });
+      const checkpoint3 = makePublishedCheckpoint(checkpoint3Cp, 12);
+
+      await blockStore.addCheckpoints([checkpoint1, checkpoint2, checkpoint3]);
+
+      // Start from checkpoint 2
+      const checkpoints = await blockStore.getRangeOfCheckpoints(CheckpointNumber(2), 10);
+      expect(checkpoints.length).toBe(2);
+      expect(checkpoints.map(c => c.checkpointNumber)).toEqual([2, 3]);
+    });
+
+    it('respects the limit parameter', async () => {
+      // Create checkpoints with chained archive roots
+      const checkpoint1Cp = await Checkpoint.random(CheckpointNumber(1), { numBlocks: 1, startBlockNumber: 1 });
+      const checkpoint1 = makePublishedCheckpoint(checkpoint1Cp, 10);
+
+      const previousArchive1 = checkpoint1Cp.blocks.at(-1)!.archive;
+      const checkpoint2Cp = await Checkpoint.random(CheckpointNumber(2), {
+        numBlocks: 1,
+        startBlockNumber: 2,
+        previousArchive: previousArchive1,
+      });
+      const checkpoint2 = makePublishedCheckpoint(checkpoint2Cp, 11);
+
+      const previousArchive2 = checkpoint2Cp.blocks.at(-1)!.archive;
+      const checkpoint3Cp = await Checkpoint.random(CheckpointNumber(3), {
+        numBlocks: 1,
+        startBlockNumber: 3,
+        previousArchive: previousArchive2,
+      });
+      const checkpoint3 = makePublishedCheckpoint(checkpoint3Cp, 12);
+
+      const previousArchive3 = checkpoint3Cp.blocks.at(-1)!.archive;
+      const checkpoint4Cp = await Checkpoint.random(CheckpointNumber(4), {
+        numBlocks: 1,
+        startBlockNumber: 4,
+        previousArchive: previousArchive3,
+      });
+      const checkpoint4 = makePublishedCheckpoint(checkpoint4Cp, 13);
+
+      await blockStore.addCheckpoints([checkpoint1, checkpoint2, checkpoint3, checkpoint4]);
+
+      // Only get 2 checkpoints
+      const checkpoints = await blockStore.getRangeOfCheckpoints(CheckpointNumber(1), 2);
+      expect(checkpoints.length).toBe(2);
+      expect(checkpoints.map(c => c.checkpointNumber)).toEqual([1, 2]);
+    });
+
+    it('returns correct checkpoint data including L1 info', async () => {
+      const checkpoint = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 3, startBlockNumber: 1 }),
+        42,
+      );
+      await blockStore.addCheckpoints([checkpoint]);
+
+      const checkpoints = await blockStore.getRangeOfCheckpoints(CheckpointNumber(1), 1);
+      expect(checkpoints.length).toBe(1);
+
+      const data = checkpoints[0];
+      expect(data.checkpointNumber).toBe(1);
+      expect(data.startBlock).toBe(1);
+      expect(data.blockCount).toBe(3);
+      expect(data.l1.blockNumber).toBe(42n);
+      expect(data.header.equals(checkpoint.checkpoint.header)).toBe(true);
+      expect(data.archive.equals(checkpoint.checkpoint.archive)).toBe(true);
+    });
+
+    it('returns empty array when from is beyond available checkpoints', async () => {
+      const checkpoint = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 }),
+        10,
+      );
+      await blockStore.addCheckpoints([checkpoint]);
+
+      const checkpoints = await blockStore.getRangeOfCheckpoints(CheckpointNumber(5), 10);
+      expect(checkpoints).toEqual([]);
+    });
+
+    it('works correctly after unwinding checkpoints', async () => {
+      // Create checkpoints with chained archive roots
+      const checkpoint1Cp = await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 });
+      const checkpoint1 = makePublishedCheckpoint(checkpoint1Cp, 10);
+
+      const previousArchive1 = checkpoint1Cp.blocks.at(-1)!.archive;
+      const checkpoint2Cp = await Checkpoint.random(CheckpointNumber(2), {
+        numBlocks: 2,
+        startBlockNumber: 3,
+        previousArchive: previousArchive1,
+      });
+      const checkpoint2 = makePublishedCheckpoint(checkpoint2Cp, 11);
+
+      const previousArchive2 = checkpoint2Cp.blocks.at(-1)!.archive;
+      const checkpoint3Cp = await Checkpoint.random(CheckpointNumber(3), {
+        numBlocks: 2,
+        startBlockNumber: 5,
+        previousArchive: previousArchive2,
+      });
+      const checkpoint3 = makePublishedCheckpoint(checkpoint3Cp, 12);
+
+      await blockStore.addCheckpoints([checkpoint1, checkpoint2, checkpoint3]);
+
+      // Remove checkpoint 3
+      await blockStore.removeCheckpointsAfter(CheckpointNumber(2));
+
+      const checkpoints = await blockStore.getRangeOfCheckpoints(CheckpointNumber(1), 10);
+      expect(checkpoints.length).toBe(2);
+      expect(checkpoints.map(c => c.checkpointNumber)).toEqual([1, 2]);
+    });
+  });
+
+  describe('getCheckpointNumbersForSlotRange', () => {
+    it('returns empty array when no checkpoints exist', async () => {
+      const numbers = await blockStore.getCheckpointNumbersForSlotRange(SlotNumber(0), SlotNumber(100));
+      expect(numbers).toEqual([]);
+    });
+
+    it('returns checkpoint numbers for checkpoints whose slot is within the range (inclusive)', async () => {
+      const cp1 = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 1, startBlockNumber: 1, slotNumber: SlotNumber(5) }),
+        10,
+      );
+      const previousArchive1 = cp1.checkpoint.blocks.at(-1)!.archive;
+      const cp2 = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(2), {
+          numBlocks: 1,
+          startBlockNumber: 2,
+          previousArchive: previousArchive1,
+          slotNumber: SlotNumber(8),
+        }),
+        11,
+      );
+      const previousArchive2 = cp2.checkpoint.blocks.at(-1)!.archive;
+      const cp3 = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(3), {
+          numBlocks: 1,
+          startBlockNumber: 3,
+          previousArchive: previousArchive2,
+          slotNumber: SlotNumber(12),
+        }),
+        12,
+      );
+      await blockStore.addCheckpoints([cp1, cp2, cp3]);
+
+      // Inclusive range covering all three slots
+      expect(await blockStore.getCheckpointNumbersForSlotRange(SlotNumber(0), SlotNumber(20))).toEqual([1, 2, 3]);
+
+      // Range that excludes the first checkpoint
+      expect(await blockStore.getCheckpointNumbersForSlotRange(SlotNumber(6), SlotNumber(20))).toEqual([2, 3]);
+
+      // Range that includes only the middle checkpoint (endpoints are inclusive)
+      expect(await blockStore.getCheckpointNumbersForSlotRange(SlotNumber(8), SlotNumber(8))).toEqual([2]);
+
+      // Range with no matching checkpoints
+      expect(await blockStore.getCheckpointNumbersForSlotRange(SlotNumber(9), SlotNumber(11))).toEqual([]);
+    });
+
+    it('reflects unwound checkpoints', async () => {
+      const cp1 = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 1, startBlockNumber: 1, slotNumber: SlotNumber(1) }),
+        10,
+      );
+      const previousArchive1 = cp1.checkpoint.blocks.at(-1)!.archive;
+      const cp2 = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(2), {
+          numBlocks: 1,
+          startBlockNumber: 2,
+          previousArchive: previousArchive1,
+          slotNumber: SlotNumber(2),
+        }),
+        11,
+      );
+      await blockStore.addCheckpoints([cp1, cp2]);
+
+      await blockStore.removeCheckpointsAfter(CheckpointNumber(1));
+
+      expect(await blockStore.getCheckpointNumbersForSlotRange(SlotNumber(0), SlotNumber(10))).toEqual([1]);
+    });
+  });
+
+  describe('getCheckpointedBlock', () => {
+    beforeEach(async () => {
+      await blockStore.addCheckpoints(publishedCheckpoints);
+    });
+
+    it.each(blockNumberTests)('retrieves previously stored block %i', async (blockNumber, getExpectedBlock) => {
+      const retrievedBlock = await blockStore.getBlock({ number: BlockNumber(blockNumber) });
+      const expectedBlock = getExpectedBlock();
+      const expectedCheckpoint = publishedCheckpoints[blockNumber - 1];
+
+      expect(retrievedBlock).toBeDefined();
+      await expectCheckpointedBlockEquals(retrievedBlock!, expectedBlock, expectedCheckpoint);
+    });
+
+    it('returns undefined if block is not found', async () => {
+      await expect(blockStore.getBlock({ number: BlockNumber(12) })).resolves.toBeUndefined();
+    });
+
+    it('returns undefined for block number 0', async () => {
+      await expect(blockStore.getBlock({ number: BlockNumber(0) })).resolves.toBeUndefined();
+    });
+  });
+
+  describe('getCheckpointedBlockByHash', () => {
+    beforeEach(async () => {
+      await blockStore.addCheckpoints(publishedCheckpoints);
+    });
+
+    it('retrieves a block by its hash', async () => {
+      const expectedCheckpoint = publishedCheckpoints[5];
+      const expectedBlock = expectedCheckpoint.checkpoint.blocks[0];
+      const blockHash = await expectedBlock.header.hash();
+      const retrievedBlock = await blockStore.getBlock({ hash: blockHash });
+
+      expect(retrievedBlock).toBeDefined();
+      await expectCheckpointedBlockEquals(retrievedBlock!, expectedBlock, expectedCheckpoint);
+    });
+
+    it('returns undefined for non-existent block hash', async () => {
+      const nonExistentHash = BlockHash.random();
+      await expect(blockStore.getBlock({ hash: nonExistentHash })).resolves.toBeUndefined();
+    });
+  });
+
+  describe('getCheckpointedBlockByArchive', () => {
+    beforeEach(async () => {
+      await blockStore.addCheckpoints(publishedCheckpoints);
+    });
+
+    it('retrieves a block by its archive root', async () => {
+      const expectedCheckpoint = publishedCheckpoints[3];
+      const expectedBlock = expectedCheckpoint.checkpoint.blocks[0];
+      const archive = expectedBlock.archive.root;
+      const retrievedBlock = await blockStore.getBlock({ archive: archive });
+
+      expect(retrievedBlock).toBeDefined();
+      await expectCheckpointedBlockEquals(retrievedBlock!, expectedBlock, expectedCheckpoint);
+    });
+
+    it('returns undefined for non-existent archive root', async () => {
+      const nonExistentArchive = Fr.random();
+      await expect(blockStore.getBlock({ archive: nonExistentArchive })).resolves.toBeUndefined();
+    });
+  });
+
+  describe('getBlockData by hash', () => {
+    beforeEach(async () => {
+      await blockStore.addCheckpoints(publishedCheckpoints);
+    });
+
+    it('retrieves block header by hash', async () => {
+      const expectedBlock = publishedCheckpoints[7].checkpoint.blocks[0];
+      const blockHash = await expectedBlock.header.hash();
+      const retrievedHeader = (await blockStore.getBlockData({ hash: blockHash }))?.header;
+
+      expect(retrievedHeader).toBeDefined();
+      expect(retrievedHeader!.equals(expectedBlock.header)).toBe(true);
+    });
+
+    it('returns undefined for non-existent block hash', async () => {
+      const nonExistentHash = BlockHash.random();
+      await expect(blockStore.getBlockData({ hash: nonExistentHash })).resolves.toBeUndefined();
+    });
+  });
+
+  describe('getBlockData by archive', () => {
+    beforeEach(async () => {
+      await blockStore.addCheckpoints(publishedCheckpoints);
+    });
+
+    it('retrieves block header by archive root', async () => {
+      const expectedBlock = publishedCheckpoints[2].checkpoint.blocks[0];
+      const archive = expectedBlock.archive.root;
+      const retrievedHeader = (await blockStore.getBlockData({ archive: archive }))?.header;
+
+      expect(retrievedHeader).toBeDefined();
+      expect(retrievedHeader!.equals(expectedBlock.header)).toBe(true);
+    });
+
+    it('returns undefined for non-existent archive root', async () => {
+      const nonExistentArchive = Fr.random();
+      await expect(blockStore.getBlockData({ archive: nonExistentArchive })).resolves.toBeUndefined();
+    });
+  });
+
+  describe('getBlockNumber', () => {
+    beforeEach(async () => {
+      await blockStore.addCheckpoints(publishedCheckpoints);
+    });
+
+    it('resolves a number query', async () => {
+      await expect(blockStore.getBlockNumber({ number: BlockNumber(3) })).resolves.toBe(3);
+    });
+
+    it('resolves a hash query', async () => {
+      const block = publishedCheckpoints[4].checkpoint.blocks[0];
+      const hash = await block.header.hash();
+      await expect(blockStore.getBlockNumber({ hash })).resolves.toBe(block.number);
+    });
+
+    it('resolves an archive query', async () => {
+      const block = publishedCheckpoints[6].checkpoint.blocks[0];
+      await expect(blockStore.getBlockNumber({ archive: block.archive.root })).resolves.toBe(block.number);
+    });
+
+    it('returns undefined for unknown hash', async () => {
+      await expect(blockStore.getBlockNumber({ hash: BlockHash.random() })).resolves.toBeUndefined();
+    });
+
+    it('returns undefined for unknown archive', async () => {
+      await expect(blockStore.getBlockNumber({ archive: Fr.random() })).resolves.toBeUndefined();
+    });
+  });
+
+  describe('getSynchedCheckpointNumber', () => {
+    it('returns the checkpoint number before INITIAL_CHECKPOINT_NUMBER if no checkpoints have been added', async () => {
+      await expect(blockStore.getLatestCheckpointNumber()).resolves.toEqual(INITIAL_CHECKPOINT_NUMBER - 1);
+    });
+
+    it('returns the most recently added checkpoint number', async () => {
+      await blockStore.addCheckpoints(publishedCheckpoints);
+      await expect(blockStore.getLatestCheckpointNumber()).resolves.toEqual(
+        publishedCheckpoints.at(-1)!.checkpoint.number,
+      );
+    });
+  });
+
+  describe('getTxEffect', () => {
+    const getBlock = (i: number) => publishedCheckpoints[i].checkpoint.blocks[0];
+
+    beforeEach(async () => {
+      await blockStore.addCheckpoints(publishedCheckpoints);
+    });
+
+    it.each([
+      () => ({ data: getBlock(0).body.txEffects[0], block: getBlock(0), txIndexInBlock: 0 }),
+      () => ({ data: getBlock(9).body.txEffects[3], block: getBlock(9), txIndexInBlock: 3 }),
+      () => ({ data: getBlock(3).body.txEffects[1], block: getBlock(3), txIndexInBlock: 1 }),
+      () => ({ data: getBlock(5).body.txEffects[2], block: getBlock(5), txIndexInBlock: 2 }),
+      () => ({ data: getBlock(1).body.txEffects[0], block: getBlock(1), txIndexInBlock: 0 }),
+    ])('retrieves a previously stored transaction', async getExpectedTx => {
+      const { data, block, txIndexInBlock } = getExpectedTx();
+      const expectedTx: IndexedTxEffect = {
+        data,
+        l2BlockNumber: block.number,
+        l2BlockHash: await block.header.hash(),
+        txIndexInBlock,
+      };
+      const actualTx = await blockStore.getTxEffect(data.txHash);
+      expect(actualTx).toEqual(expectedTx);
+    });
+
+    it('returns undefined if tx is not found', async () => {
+      await expect(blockStore.getTxEffect(TxHash.random())).resolves.toBeUndefined();
+    });
+
+    it.each([
+      () => getBlock(0).body.txEffects[0],
+      () => getBlock(9).body.txEffects[3],
+      () => getBlock(3).body.txEffects[1],
+      () => getBlock(5).body.txEffects[2],
+      () => getBlock(1).body.txEffects[0],
+    ])('tries to retrieves a previously stored transaction after deleted', async getTxEffect => {
+      await blockStore.removeCheckpointsAfter(CheckpointNumber(0));
+
+      const txEffect = getTxEffect();
+      const actualTx = await blockStore.getTxEffect(txEffect.txHash);
+      expect(actualTx).toEqual(undefined);
+    });
+
+    it('returns undefined if tx is not found', async () => {
+      await expect(blockStore.getTxEffect(TxHash.random())).resolves.toBeUndefined();
+    });
+
+    it('does not fail if the block is removed while requesting a tx', async () => {
+      const txEffect = getBlock(1).body.txEffects[0];
+      let done = false;
+      void (async () => {
+        while (!done) {
+          void blockStore.getTxEffect(txEffect.txHash);
+          await sleep(1);
+        }
+      })();
+      await blockStore.removeCheckpointsAfter(CheckpointNumber(0));
+      done = true;
+      expect(await blockStore.getTxEffect(txEffect.txHash)).toEqual(undefined);
+    });
+  });
+
+  describe('pendingChainValidationStatus', () => {
+    it('should return undefined when no status is set', async () => {
+      const status = await blockStore.getPendingChainValidationStatus();
+      expect(status).toBeUndefined();
+    });
+
+    it('should store and retrieve a valid validation status', async () => {
+      const validStatus: ValidateCheckpointResult = { valid: true };
+
+      await blockStore.setPendingChainValidationStatus(validStatus);
+      const retrievedStatus = await blockStore.getPendingChainValidationStatus();
+
+      expect(retrievedStatus).toEqual(validStatus);
+    });
+
+    it('should store and retrieve an invalid validation status with insufficient attestations', async () => {
+      const invalidStatus: ValidateCheckpointResult = {
+        valid: false,
+        checkpoint: randomCheckpointInfo(1),
+        committee: [EthAddress.random(), EthAddress.random()],
+        epoch: EpochNumber(123),
+        seed: 456n,
+        attestors: [EthAddress.random()],
+        attestations: [CommitteeAttestation.random()],
+        reason: 'insufficient-attestations',
+      };
+
+      await blockStore.setPendingChainValidationStatus(invalidStatus);
+      const retrievedStatus = await blockStore.getPendingChainValidationStatus();
+
+      expect(retrievedStatus).toEqual(invalidStatus);
+    });
+
+    it('should store and retrieve an invalid validation status with invalid attestation', async () => {
+      const invalidStatus: ValidateCheckpointResult = {
+        valid: false,
+        checkpoint: randomCheckpointInfo(2),
+        committee: [EthAddress.random()],
+        attestors: [EthAddress.random()],
+        epoch: EpochNumber(789),
+        seed: 101n,
+        attestations: [CommitteeAttestation.random()],
+        reason: 'invalid-attestation',
+        invalidIndex: 5,
+      };
+
+      await blockStore.setPendingChainValidationStatus(invalidStatus);
+      const retrievedStatus = await blockStore.getPendingChainValidationStatus();
+
+      expect(retrievedStatus).toEqual(invalidStatus);
+    });
+
+    it('should overwrite existing status when setting a new one', async () => {
+      const firstStatus: ValidateCheckpointResult = { valid: true };
+      const secondStatus: ValidateCheckpointResult = {
+        valid: false,
+        checkpoint: randomCheckpointInfo(3),
+        committee: [EthAddress.random()],
+        epoch: EpochNumber(999),
+        seed: 888n,
+        attestors: [EthAddress.random()],
+        attestations: [CommitteeAttestation.random()],
+        reason: 'insufficient-attestations',
+      };
+
+      await blockStore.setPendingChainValidationStatus(firstStatus);
+      await blockStore.setPendingChainValidationStatus(secondStatus);
+      const retrievedStatus = await blockStore.getPendingChainValidationStatus();
+
+      expect(retrievedStatus).toEqual(secondStatus);
+    });
+
+    it('should handle empty committee and attestations arrays', async () => {
+      const statusWithEmptyArrays: ValidateCheckpointResult = {
+        valid: false,
+        checkpoint: randomCheckpointInfo(4),
+        committee: [],
+        epoch: EpochNumber(0),
+        seed: 0n,
+        attestors: [],
+        attestations: [],
+        reason: 'insufficient-attestations',
+      };
+
+      await blockStore.setPendingChainValidationStatus(statusWithEmptyArrays);
+      const retrievedStatus = await blockStore.getPendingChainValidationStatus();
+
+      expect(retrievedStatus).toEqual(statusWithEmptyArrays);
+    });
+  });
+
+  describe('idempotency', () => {
+    it('handles adding blocks via addProposedBlock then same blocks via addCheckpoints', async () => {
+      // First add checkpoint 1 to establish a base
+      const checkpoint1 = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 1, startBlockNumber: 1 }),
+        5,
+      );
+      await blockStore.addCheckpoints([checkpoint1]);
+
+      // Add provisional block 2 via addProposedBlock
+      const provisionalBlock = await L2Block.random(BlockNumber(2), {
+        checkpointNumber: CheckpointNumber(2),
+        indexWithinCheckpoint: IndexWithinCheckpoint(0),
+        lastArchive: checkpoint1.checkpoint.blocks[0].archive,
+      });
+      await blockStore.addProposedBlock(provisionalBlock);
+
+      // Now add checkpoint 2 containing the same block via addCheckpoints
+      const checkpoint2 = new Checkpoint(
+        provisionalBlock.archive,
+        CheckpointHeader.random(),
+        [provisionalBlock],
+        CheckpointNumber(2),
+      );
+      const publishedCheckpoint2 = makePublishedCheckpoint(checkpoint2, 10);
+
+      // This should NOT throw - addCheckpoints uses .set() which is idempotent
+      await expect(blockStore.addCheckpoints([publishedCheckpoint2])).resolves.toBe(true);
+
+      // Verify block exists and is consistent
+      const storedBlock = await blockStore.getBlock({ number: BlockNumber(2) });
+      expect(storedBlock?.archive.root.equals(provisionalBlock.archive.root)).toBe(true);
+    });
+
+    // Note: contract class/instance idempotency tests moved to contract_class_store.test.ts /
+    // contract_instance_store.test.ts. Log idempotency moved to log_store.test.ts.
+  });
+
+  describe('getBlocksForSlot', () => {
+    it('returns blocks matching the given slot number', async () => {
+      // Create blocks with specific slot numbers
+      const block1 = await L2Block.random(BlockNumber(1), {
+        checkpointNumber: CheckpointNumber(1),
+        indexWithinCheckpoint: IndexWithinCheckpoint(0),
+        slotNumber: SlotNumber(100),
+      });
+      const block2 = await L2Block.random(BlockNumber(2), {
+        checkpointNumber: CheckpointNumber(1),
+        indexWithinCheckpoint: IndexWithinCheckpoint(1),
+        lastArchive: block1.archive,
+        slotNumber: SlotNumber(100), // Same slot number as block1
+      });
+      const block3 = await L2Block.random(BlockNumber(3), {
+        checkpointNumber: CheckpointNumber(1),
+        indexWithinCheckpoint: IndexWithinCheckpoint(2),
+        lastArchive: block2.archive,
+        slotNumber: SlotNumber(101), // Different slot number
+      });
+
+      await addProposedBlocks(blockStore, [block1, block2, block3]);
+
+      const blocksForSlot100 = await blockStore.getBlocksForSlot(SlotNumber(100));
+      expect(blocksForSlot100.length).toBe(2);
+      expect(blocksForSlot100[0].equals(block1)).toBe(true);
+      expect(blocksForSlot100[1].equals(block2)).toBe(true);
+
+      const blocksForSlot101 = await blockStore.getBlocksForSlot(SlotNumber(101));
+      expect(blocksForSlot101.length).toBe(1);
+      expect(blocksForSlot101[0].equals(block3)).toBe(true);
+    });
+
+    it('returns empty array when no blocks exist for that slot', async () => {
+      // Create a block with a specific slot number
+      const block1 = await L2Block.random(BlockNumber(1), {
+        checkpointNumber: CheckpointNumber(1),
+        indexWithinCheckpoint: IndexWithinCheckpoint(0),
+        slotNumber: SlotNumber(100),
+      });
+
+      await blockStore.addProposedBlock(block1);
+
+      const blocksForSlot999 = await blockStore.getBlocksForSlot(SlotNumber(999));
+      expect(blocksForSlot999).toEqual([]);
+    });
+
+    it('returns empty array when store is empty', async () => {
+      const blocksForSlot = await blockStore.getBlocksForSlot(SlotNumber(1));
+      expect(blocksForSlot).toEqual([]);
+    });
+
+    it('returns blocks in ascending block number order', async () => {
+      // Create multiple blocks with the same slot number
+      const block1 = await L2Block.random(BlockNumber(1), {
+        checkpointNumber: CheckpointNumber(1),
+        indexWithinCheckpoint: IndexWithinCheckpoint(0),
+        slotNumber: SlotNumber(50),
+      });
+      const block2 = await L2Block.random(BlockNumber(2), {
+        checkpointNumber: CheckpointNumber(1),
+        indexWithinCheckpoint: IndexWithinCheckpoint(1),
+        lastArchive: block1.archive,
+        slotNumber: SlotNumber(50),
+      });
+      const block3 = await L2Block.random(BlockNumber(3), {
+        checkpointNumber: CheckpointNumber(1),
+        indexWithinCheckpoint: IndexWithinCheckpoint(2),
+        lastArchive: block2.archive,
+        slotNumber: SlotNumber(50),
+      });
+
+      await addProposedBlocks(blockStore, [block1, block2, block3]);
+
+      const blocksForSlot = await blockStore.getBlocksForSlot(SlotNumber(50));
+      expect(blocksForSlot.length).toBe(3);
+      expect(blocksForSlot[0].number).toBe(1);
+      expect(blocksForSlot[1].number).toBe(2);
+      expect(blocksForSlot[2].number).toBe(3);
+    });
+  });
+
+  describe('proposedCheckpointNumber', () => {
+    /** Adds proposed blocks to the store so addProposedCheckpoint can validate them.
+     *  Uses force: true to skip addProposedBlock's own chaining checks (we only want to test addProposedCheckpoint). */
+    async function addBlocksForProposedCheckpoint(
+      startBlock: number,
+      blockCount: number,
+      checkpointNumber: number,
+      previousArchive?: AppendOnlyTreeSnapshot,
+    ): Promise<void> {
+      for (let i = 0; i < blockCount; i++) {
+        const opts: Parameters<typeof L2Block.random>[1] = {
+          checkpointNumber: CheckpointNumber(checkpointNumber),
+          indexWithinCheckpoint: IndexWithinCheckpoint(i),
+        };
+        if (i === 0 && previousArchive) {
+          (opts as any).lastArchive = previousArchive;
+        }
+        const block = await L2Block.random(BlockNumber(startBlock + i), opts);
+        await blockStore.addProposedBlock(block, { force: true });
+      }
+    }
+
+    it('returns initial value when no proposed checkpoint is set', async () => {
+      const pending = await blockStore.getProposedCheckpointNumber();
+      expect(pending).toBe(INITIAL_CHECKPOINT_NUMBER - 1);
+    });
+
+    it('stores and retrieves proposed checkpoint number', async () => {
+      await addBlocksForProposedCheckpoint(1, 1, 1);
+      await blockStore.addProposedCheckpoint({
+        checkpointNumber: CheckpointNumber(1),
+        header: CheckpointHeader.empty(),
+        startBlock: BlockNumber(1),
+        blockCount: 1,
+        totalManaUsed: 100n,
+        feeAssetPriceModifier: 50n,
+      });
+      const pending = await blockStore.getProposedCheckpointNumber();
+      expect(pending).toBe(1);
+    });
+
+    it('stores and retrieves proposed checkpoint data with fee fields', async () => {
+      await addBlocksForProposedCheckpoint(1, 1, 1);
+      await blockStore.addProposedCheckpoint({
+        checkpointNumber: CheckpointNumber(1),
+        header: CheckpointHeader.empty(),
+        startBlock: BlockNumber(1),
+        blockCount: 1,
+        totalManaUsed: 12345n,
+        feeAssetPriceModifier: -75n,
+      });
+      const pending = await blockStore.getLastProposedCheckpoint();
+      expect(pending).toBeDefined();
+      expect(pending!.checkpointNumber).toBe(1);
+      expect(pending!.totalManaUsed).toBe(12345n);
+      expect(pending!.feeAssetPriceModifier).toBe(-75n);
+    });
+
+    it('clears proposed checkpoint when confirmed checkpoints are added', async () => {
+      // Add checkpoint 1
+      const checkpoint1 = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 1, startBlockNumber: 1 }),
+        10,
+      );
+      await blockStore.addCheckpoints([checkpoint1]);
+
+      // Add blocks for proposed checkpoint 2, chaining from checkpoint 1's last block
+      await addBlocksForProposedCheckpoint(2, 1, 2, checkpoint1.checkpoint.blocks[0].archive);
+
+      // Set proposed checkpoint to 2 (attested but not yet on L1)
+      await blockStore.addProposedCheckpoint({
+        checkpointNumber: CheckpointNumber(2),
+        header: CheckpointHeader.empty(),
+        startBlock: BlockNumber(2),
+        blockCount: 1,
+        totalManaUsed: 100n,
+        feeAssetPriceModifier: 50n,
+      });
+      expect(await blockStore.getProposedCheckpointNumber()).toBe(2);
+
+      // Confirm checkpoint 2 on L1
+      const checkpoint2 = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(2), {
+          numBlocks: 1,
+          startBlockNumber: 2,
+          previousArchive: checkpoint1.checkpoint.blocks[0].archive,
+        }),
+        20,
+      );
+      await blockStore.addCheckpoints([checkpoint2]);
+
+      // Proposed checkpoint should be cleared
+      expect(await blockStore.hasProposedCheckpoint()).toBe(false);
+    });
+
+    it('throws on proposed checkpoint that is more than 1 ahead of confirmed', async () => {
+      // Add checkpoint 1
+      const checkpoint1 = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 1, startBlockNumber: 1 }),
+        10,
+      );
+      await blockStore.addCheckpoints([checkpoint1]);
+
+      // Try to set proposed checkpoint to 3 (confirmed=1, expected=2)
+      await expect(
+        blockStore.addProposedCheckpoint({
+          checkpointNumber: CheckpointNumber(3),
+          header: CheckpointHeader.empty(),
+          startBlock: BlockNumber(1),
+          blockCount: 1,
+          totalManaUsed: 100n,
+          feeAssetPriceModifier: 50n,
+        }),
+      ).rejects.toThrow('not sequential');
+
+      // Proposed checkpoint should remain unset (3 !== 1 + 1)
+      expect(await blockStore.hasProposedCheckpoint()).toBe(false);
+    });
+
+    it('throws on proposed checkpoint that equals the confirmed checkpoint', async () => {
+      // Add checkpoint 1
+      const checkpoint1 = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 1, startBlockNumber: 1 }),
+        10,
+      );
+      await blockStore.addCheckpoints([checkpoint1]);
+
+      // Try to set proposed checkpoint to 1 (confirmed=1, expected=2).
+      // With fallback behavior, getProposedCheckpointNumber returns 1 (confirmed), so this triggers the stale check.
+      await expect(
+        blockStore.addProposedCheckpoint({
+          checkpointNumber: CheckpointNumber(1),
+          header: CheckpointHeader.empty(),
+          startBlock: BlockNumber(1),
+          blockCount: 1,
+          totalManaUsed: 100n,
+          feeAssetPriceModifier: 50n,
+        }),
+      ).rejects.toThrow('not sequential');
+
+      // Proposed checkpoint should remain unset
+      expect(await blockStore.hasProposedCheckpoint()).toBe(false);
+    });
+
+    it('clears proposed checkpoint when checkpoints are removed past it', async () => {
+      // Add checkpoints 1 and 2
+      const checkpoint1 = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 1, startBlockNumber: 1 }),
+        10,
+      );
+      const checkpoint2 = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(2), {
+          numBlocks: 1,
+          startBlockNumber: 2,
+          previousArchive: checkpoint1.checkpoint.blocks[0].archive,
+        }),
+        20,
+      );
+      await blockStore.addCheckpoints([checkpoint1, checkpoint2]);
+
+      // Add blocks for proposed checkpoint 3, chaining from checkpoint 2's last block
+      await addBlocksForProposedCheckpoint(3, 1, 3, checkpoint2.checkpoint.blocks[0].archive);
+
+      // Set proposed checkpoint to 3
+      await blockStore.addProposedCheckpoint({
+        checkpointNumber: CheckpointNumber(3),
+        header: CheckpointHeader.empty(),
+        startBlock: BlockNumber(3),
+        blockCount: 1,
+        totalManaUsed: 100n,
+        feeAssetPriceModifier: 50n,
+      });
+
+      // Remove checkpoints after 1 (removes checkpoint 2, and pending 3 should be cleared)
+      await blockStore.removeCheckpointsAfter(CheckpointNumber(1));
+
+      expect(await blockStore.hasProposedCheckpoint()).toBe(false);
+    });
+
+    it('does not clear proposed checkpoint when removing checkpoints before it', async () => {
+      // Add checkpoints 1, 2
+      const checkpoint1 = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 1, startBlockNumber: 1 }),
+        10,
+      );
+      const checkpoint2 = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(2), {
+          numBlocks: 1,
+          startBlockNumber: 2,
+          previousArchive: checkpoint1.checkpoint.blocks[0].archive,
+        }),
+        20,
+      );
+      await blockStore.addCheckpoints([checkpoint1, checkpoint2]);
+
+      // Add blocks for proposed checkpoint 3, chaining from checkpoint 2's last block
+      await addBlocksForProposedCheckpoint(3, 1, 3, checkpoint2.checkpoint.blocks[0].archive);
+
+      // Set pending to 3 (confirmed=2, 3===2+1 ✓)
+      await blockStore.addProposedCheckpoint({
+        checkpointNumber: CheckpointNumber(3),
+        header: CheckpointHeader.empty(),
+        startBlock: BlockNumber(3),
+        blockCount: 1,
+        totalManaUsed: 100n,
+        feeAssetPriceModifier: 50n,
+      });
+
+      // Remove checkpoints after 2 (nothing removed since latest is 2, pending=3 stays)
+      await blockStore.removeCheckpointsAfter(CheckpointNumber(2));
+
+      expect(await blockStore.getProposedCheckpointNumber()).toBe(3);
+    });
+
+    it('allows addProposedBlocks when proposed checkpoint matches expected', async () => {
+      // Add checkpoint 1
+      const checkpoint1 = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 1, startBlockNumber: 1 }),
+        10,
+      );
+      await blockStore.addCheckpoints([checkpoint1]);
+
+      // Add blocks for proposed checkpoint 2, chaining from checkpoint 1's last block
+      await addBlocksForProposedCheckpoint(2, 1, 2, checkpoint1.checkpoint.blocks[0].archive);
+
+      // Set proposed checkpoint to 2 (attested but not on L1 yet)
+      await blockStore.addProposedCheckpoint({
+        checkpointNumber: CheckpointNumber(2),
+        header: CheckpointHeader.empty(),
+        startBlock: BlockNumber(2),
+        blockCount: 1,
+        totalManaUsed: 100n,
+        feeAssetPriceModifier: 50n,
+      });
+
+      // Add a block for checkpoint 3 — this should succeed because
+      // proposed checkpoint (2) matches expectedCheckpointNumber (3 - 1 = 2)
+      const pendingBlock = await blockStore.getBlock({ number: BlockNumber(2) });
+      const block3 = await L2Block.random(BlockNumber(3), {
+        checkpointNumber: CheckpointNumber(3),
+        indexWithinCheckpoint: IndexWithinCheckpoint(0),
+        lastArchive: pendingBlock!.archive,
+      });
+
+      await expect(blockStore.addProposedBlock(block3)).resolves.toBe(true);
+    });
+
+    it('throws with proposed checkpoint value when neither confirmed nor pending matches', async () => {
+      // Add checkpoint 1
+      const checkpoint1 = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 1, startBlockNumber: 1 }),
+        10,
+      );
+      await blockStore.addCheckpoints([checkpoint1]);
+
+      // Add blocks for proposed checkpoint 2, chaining from checkpoint 1's last block
+      await addBlocksForProposedCheckpoint(2, 1, 2, checkpoint1.checkpoint.blocks[0].archive);
+
+      // Set proposed checkpoint to 2
+      await blockStore.addProposedCheckpoint({
+        checkpointNumber: CheckpointNumber(2),
+        header: CheckpointHeader.empty(),
+        startBlock: BlockNumber(2),
+        blockCount: 1,
+        totalManaUsed: 100n,
+        feeAssetPriceModifier: 50n,
+      });
+
+      // Try to add a block for checkpoint 4 (expected = 3, confirmed = 1, pending = 2 — neither matches)
+      const pendingBlock = await blockStore.getBlock({ number: BlockNumber(2) });
+      const block3 = await L2Block.random(BlockNumber(3), {
+        checkpointNumber: CheckpointNumber(4),
+        indexWithinCheckpoint: IndexWithinCheckpoint(0),
+        lastArchive: pendingBlock!.archive,
+      });
+
+      await expect(blockStore.addProposedBlock(block3)).rejects.toThrow(
+        // Error should report the proposed checkpoint number (2), not the confirmed one (1)
+        'Cannot insert new block 3 for checkpoint 4 given previous checkpoint number is 2',
+      );
+    });
+
+    it('throws with confirmed checkpoint value when pending is not set', async () => {
+      // Add checkpoint 1 (no pending set, so pending defaults to 0)
+      const checkpoint1 = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 1, startBlockNumber: 1 }),
+        10,
+      );
+      await blockStore.addCheckpoints([checkpoint1]);
+
+      // Try to add a block for checkpoint 4 (expected = 3, confirmed = 1, pending = 0)
+      // Error should report confirmed (1) since it's higher than the default pending (0)
+      const lastBlockArchive = checkpoint1.checkpoint.blocks[0].archive;
+      const block2 = await L2Block.random(BlockNumber(2), {
+        checkpointNumber: CheckpointNumber(4),
+        indexWithinCheckpoint: IndexWithinCheckpoint(0),
+        lastArchive: lastBlockArchive,
+      });
+
+      await expect(blockStore.addProposedBlock(block2)).rejects.toThrow(
+        'Cannot insert new block 2 for checkpoint 4 given previous checkpoint number is 1',
+      );
+    });
+
+    it('getProposedCheckpointL2BlockNumber defaults to checkpointed block number', async () => {
+      // Add checkpoint 1 with blocks 1-3
+      const checkpoint1 = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 3, startBlockNumber: 1 }),
+        10,
+      );
+      await blockStore.addCheckpoints([checkpoint1]);
+
+      // No proposed checkpoint set — should fall back to the checkpointed block number
+      const pendingBlockNumber = await blockStore.getProposedCheckpointL2BlockNumber();
+      const checkpointedBlockNumber = await blockStore.getCheckpointedL2BlockNumber();
+      expect(pendingBlockNumber).toBe(checkpointedBlockNumber);
+      expect(pendingBlockNumber).toBe(3);
+    });
+
+    it('getProposedCheckpointL2BlockNumber returns pending block number when set', async () => {
+      // Add checkpoint 1 with block 1
+      const checkpoint1 = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 1, startBlockNumber: 1 }),
+        10,
+      );
+      await blockStore.addCheckpoints([checkpoint1]);
+
+      // Add proposed block for proposed checkpoint 2
+      await addBlocksForProposedCheckpoint(2, 1, 2, checkpoint1.checkpoint.blocks[0].archive);
+
+      // Set proposed checkpoint
+      await blockStore.addProposedCheckpoint({
+        checkpointNumber: CheckpointNumber(2),
+        header: CheckpointHeader.empty(),
+        startBlock: BlockNumber(2),
+        blockCount: 1,
+        totalManaUsed: 100n,
+        feeAssetPriceModifier: 50n,
+      });
+
+      // Should return last block of proposed checkpoint (startBlock + blockCount - 1)
+      const pendingBlockNumber = await blockStore.getProposedCheckpointL2BlockNumber();
+      expect(pendingBlockNumber).toBe(2);
+      // And it should be greater than the checkpointed block number
+      expect(pendingBlockNumber).toBeGreaterThan(await blockStore.getCheckpointedL2BlockNumber());
+    });
+
+    it('getProposedCheckpointL2BlockNumber falls back to checkpointed after pending is cleared', async () => {
+      // Add checkpoint 1
+      const checkpoint1 = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 1, startBlockNumber: 1 }),
+        10,
+      );
+      await blockStore.addCheckpoints([checkpoint1]);
+
+      // Add blocks and set proposed checkpoint 2
+      await addBlocksForProposedCheckpoint(2, 1, 2, checkpoint1.checkpoint.blocks[0].archive);
+      await blockStore.addProposedCheckpoint({
+        checkpointNumber: CheckpointNumber(2),
+        header: CheckpointHeader.empty(),
+        startBlock: BlockNumber(2),
+        blockCount: 1,
+        totalManaUsed: 100n,
+        feeAssetPriceModifier: 50n,
+      });
+      expect(await blockStore.getProposedCheckpointL2BlockNumber()).toBe(2);
+
+      // Confirm checkpoint 2 on L1 (clears pending)
+      const checkpoint2 = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(2), {
+          numBlocks: 1,
+          startBlockNumber: 2,
+          previousArchive: checkpoint1.checkpoint.blocks[0].archive,
+        }),
+        20,
+      );
+      await blockStore.addCheckpoints([checkpoint2]);
+
+      // Pending cleared — should fall back to the new checkpointed block number
+      const pendingBlockNumber = await blockStore.getProposedCheckpointL2BlockNumber();
+      const checkpointedBlockNumber = await blockStore.getCheckpointedL2BlockNumber();
+      expect(pendingBlockNumber).toBe(checkpointedBlockNumber);
+      expect(pendingBlockNumber).toBe(2);
+    });
+  });
+
+  describe('promoteProposedToCheckpointed', () => {
+    async function setupProposedCheckpoint() {
+      // Add confirmed checkpoint 1
+      const checkpoint1 = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 1, startBlockNumber: 1 }),
+        10,
+      );
+      await blockStore.addCheckpoints([checkpoint1]);
+
+      // Add proposed blocks for checkpoint 2
+      const block2 = await L2Block.random(BlockNumber(2), {
+        checkpointNumber: CheckpointNumber(2),
+        indexWithinCheckpoint: IndexWithinCheckpoint(0),
+        lastArchive: checkpoint1.checkpoint.blocks[0].archive,
+      });
+      await blockStore.addProposedBlock(block2, { force: true });
+
+      // Set proposed checkpoint 2
+      await blockStore.addProposedCheckpoint({
+        checkpointNumber: CheckpointNumber(2),
+        header: CheckpointHeader.empty(),
+        startBlock: BlockNumber(2),
+        blockCount: 1,
+        totalManaUsed: 100n,
+        feeAssetPriceModifier: 50n,
+      });
+
+      const proposed = await blockStore.getLastProposedCheckpoint();
+      return { checkpoint1, proposed: proposed! };
+    }
+
+    it('promotes proposed checkpoint to confirmed', async () => {
+      const { proposed } = await setupProposedCheckpoint();
+      const l1 = makeL1PublishedData(20);
+      const attestations = [CommitteeAttestation.random()];
+
+      await blockStore.promoteProposedToCheckpointed(
+        proposed.checkpointNumber,
+        l1,
+        attestations,
+        proposed.archive.root,
+      );
+
+      expect(await blockStore.hasProposedCheckpoint()).toBe(false);
+      expect(await blockStore.getLatestCheckpointNumber()).toBe(2);
+    });
+
+    it('throws when no proposed checkpoint exists', async () => {
+      await expect(
+        blockStore.promoteProposedToCheckpointed(CheckpointNumber(1), makeL1PublishedData(20), [], Fr.random()),
+      ).rejects.toThrow('no proposed checkpoint exists');
+    });
+
+    it('throws on archive root mismatch', async () => {
+      const { proposed } = await setupProposedCheckpoint();
+
+      await expect(
+        blockStore.promoteProposedToCheckpointed(proposed.checkpointNumber, makeL1PublishedData(20), [], Fr.random()),
+      ).rejects.toThrow('archive root mismatch');
+
+      // Proposed checkpoint should still exist (transaction rolled back)
+      expect(await blockStore.hasProposedCheckpoint()).toBe(true);
+    });
+  });
+
+  describe('L2TipsCache proposedCheckpoint', () => {
+    it('returns proposedCheckpoint equal to checkpointed when no pending exists', async () => {
+      // Add checkpoint 1 with blocks 1-3
+      const checkpoint1 = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 3, startBlockNumber: 1 }),
+        10,
+      );
+      await blockStore.addCheckpoints([checkpoint1]);
+
+      const l2TipsCache = new L2TipsCache(blockStore, GENESIS_BLOCK_HEADER_HASH);
+      const tips = await l2TipsCache.getL2Tips();
+
+      // proposedCheckpoint should always be defined
+      expect(tips.proposedCheckpoint).toBeDefined();
+      // With no proposed checkpoint, it should equal the checkpointed tip
+      expect(tips.proposedCheckpoint!.block.number).toBe(tips.checkpointed.block.number);
+      expect(tips.proposedCheckpoint!.checkpoint.number).toBe(tips.checkpointed.checkpoint.number);
+    });
+
+    it('returns proposedCheckpoint ahead of checkpointed when pending is set', async () => {
+      // Add checkpoint 1
+      const checkpoint1 = makePublishedCheckpoint(
+        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 1, startBlockNumber: 1 }),
+        10,
+      );
+      await blockStore.addCheckpoints([checkpoint1]);
+
+      // Add a proposed block for proposed checkpoint 2, chaining from checkpoint 1
+      const block2 = await L2Block.random(BlockNumber(2), {
+        checkpointNumber: CheckpointNumber(2),
+        indexWithinCheckpoint: IndexWithinCheckpoint(0),
+        lastArchive: checkpoint1.checkpoint.blocks[0].archive,
+      });
+      await blockStore.addProposedBlock(block2, { force: true });
+
+      // Set proposed checkpoint
+      await blockStore.addProposedCheckpoint({
+        checkpointNumber: CheckpointNumber(2),
+        header: CheckpointHeader.empty(),
+        startBlock: BlockNumber(2),
+        blockCount: 1,
+        totalManaUsed: 100n,
+        feeAssetPriceModifier: 50n,
+      });
+
+      const l2TipsCache = new L2TipsCache(blockStore, GENESIS_BLOCK_HEADER_HASH);
+      const tips = await l2TipsCache.getL2Tips();
+
+      expect(tips.proposedCheckpoint).toBeDefined();
+      expect(tips.proposedCheckpoint!.block.number).toBeGreaterThan(tips.checkpointed.block.number);
+      expect(tips.proposedCheckpoint!.checkpoint.number).toBeGreaterThan(tips.checkpointed.checkpoint.number);
+    });
+  });
+
+  describe('removeBlocksAfterBlock', () => {
+    it('removes blocks with number > given blockNumber', async () => {
+      // Create blocks for initial checkpoint
+      const block1 = await L2Block.random(BlockNumber(1), {
+        checkpointNumber: CheckpointNumber(1),
+        indexWithinCheckpoint: IndexWithinCheckpoint(0),
+      });
+      const block2 = await L2Block.random(BlockNumber(2), {
+        checkpointNumber: CheckpointNumber(1),
+        indexWithinCheckpoint: IndexWithinCheckpoint(1),
+        lastArchive: block1.archive,
+      });
+      const block3 = await L2Block.random(BlockNumber(3), {
+        checkpointNumber: CheckpointNumber(1),
+        indexWithinCheckpoint: IndexWithinCheckpoint(2),
+        lastArchive: block2.archive,
+      });
+      const block4 = await L2Block.random(BlockNumber(4), {
+        checkpointNumber: CheckpointNumber(1),
+        indexWithinCheckpoint: IndexWithinCheckpoint(3),
+        lastArchive: block3.archive,
+      });
+
+      await addProposedBlocks(blockStore, [block1, block2, block3, block4]);
+      expect(await blockStore.getLatestL2BlockNumber()).toBe(4);
+
+      // Remove blocks after block 2
+      await blockStore.removeBlocksAfter(BlockNumber(2));
+
+      expect(await blockStore.getLatestL2BlockNumber()).toBe(2);
+      expect(await blockStore.getBlock({ number: BlockNumber(1) })).toBeDefined();
+      expect(await blockStore.getBlock({ number: BlockNumber(2) })).toBeDefined();
+      expect(await blockStore.getBlock({ number: BlockNumber(3) })).toBeUndefined();
+      expect(await blockStore.getBlock({ number: BlockNumber(4) })).toBeUndefined();
+    });
+
+    it('returns the removed blocks', async () => {
+      const block1 = await L2Block.random(BlockNumber(1), {
+        checkpointNumber: CheckpointNumber(1),
+        indexWithinCheckpoint: IndexWithinCheckpoint(0),
+      });
+      const block2 = await L2Block.random(BlockNumber(2), {
+        checkpointNumber: CheckpointNumber(1),
+        indexWithinCheckpoint: IndexWithinCheckpoint(1),
+        lastArchive: block1.archive,
+      });
+      const block3 = await L2Block.random(BlockNumber(3), {
+        checkpointNumber: CheckpointNumber(1),
+        indexWithinCheckpoint: IndexWithinCheckpoint(2),
+        lastArchive: block2.archive,
+      });
+
+      await addProposedBlocks(blockStore, [block1, block2, block3]);
+
+      // Remove blocks after block 1
+      const removedBlocks = await blockStore.removeBlocksAfter(BlockNumber(1));
+
+      expect(removedBlocks.length).toBe(2);
+      expect(removedBlocks[0].equals(block2)).toBe(true);
+      expect(removedBlocks[1].equals(block3)).toBe(true);
+    });
+
+    it('returns empty array when no blocks need to be removed', async () => {
+      const block1 = await L2Block.random(BlockNumber(1), {
+        checkpointNumber: CheckpointNumber(1),
+        indexWithinCheckpoint: IndexWithinCheckpoint(0),
+      });
+      const block2 = await L2Block.random(BlockNumber(2), {
+        checkpointNumber: CheckpointNumber(1),
+        indexWithinCheckpoint: IndexWithinCheckpoint(1),
+        lastArchive: block1.archive,
+      });
+
+      await addProposedBlocks(blockStore, [block1, block2]);
+
+      // Remove blocks after block 2 (none to remove)
+      const removedBlocks = await blockStore.removeBlocksAfter(BlockNumber(2));
+
+      expect(removedBlocks).toEqual([]);
+      expect(await blockStore.getLatestL2BlockNumber()).toBe(2);
+    });
+
+    it('returns empty array when store is empty', async () => {
+      const removedBlocks = await blockStore.removeBlocksAfter(BlockNumber(0));
+
+      expect(removedBlocks).toEqual([]);
+    });
+
+    it('cleans up related data (tx effects, hash index, archive index)', async () => {
+      const block1 = await L2Block.random(BlockNumber(1), {
+        checkpointNumber: CheckpointNumber(1),
+        indexWithinCheckpoint: IndexWithinCheckpoint(0),
+        txsPerBlock: 2,
+      });
+      const block2 = await L2Block.random(BlockNumber(2), {
+        checkpointNumber: CheckpointNumber(1),
+        indexWithinCheckpoint: IndexWithinCheckpoint(1),
+        lastArchive: block1.archive,
+        txsPerBlock: 2,
+      });
+
+      await addProposedBlocks(blockStore, [block1, block2]);
+
+      // Verify block2 is retrievable by hash and archive before removal
+      const block2Hash = await block2.header.hash();
+      const block2Archive = block2.archive.root;
+
+      expect(await blockStore.getBlock({ hash: block2Hash })).toBeDefined();
+      expect(await blockStore.getBlock({ archive: block2Archive })).toBeDefined();
+
+      // Verify tx effects for block2 are retrievable before removal
+      for (const txEffect of block2.body.txEffects) {
+        const retrieved = await blockStore.getTxEffect(txEffect.txHash);
+        expect(retrieved).toBeDefined();
+      }
+
+      // Remove blocks after block 1
+      await blockStore.removeBlocksAfter(BlockNumber(1));
+
+      // Verify block2 is no longer retrievable by hash or archive
+      expect(await blockStore.getBlock({ hash: block2Hash })).toBeUndefined();
+      expect(await blockStore.getBlock({ archive: block2Archive })).toBeUndefined();
+
+      // Verify tx effects for block2 are no longer retrievable
+      for (const txEffect of block2.body.txEffects) {
+        const retrieved = await blockStore.getTxEffect(txEffect.txHash);
+        expect(retrieved).toBeUndefined();
+      }
+
+      // Verify block1's data is still intact
+      const block1Hash = await block1.header.hash();
+      const block1Archive = block1.archive.root;
+
+      expect(await blockStore.getBlock({ hash: block1Hash })).toBeDefined();
+      expect(await blockStore.getBlock({ archive: block1Archive })).toBeDefined();
+
+      for (const txEffect of block1.body.txEffects) {
+        const retrieved = await blockStore.getTxEffect(txEffect.txHash);
+        expect(retrieved).toBeDefined();
+      }
+    });
+
+    it('removes all blocks when blockNumber is 0', async () => {
+      const block1 = await L2Block.random(BlockNumber(1), {
+        checkpointNumber: CheckpointNumber(1),
+        indexWithinCheckpoint: IndexWithinCheckpoint(0),
+      });
+      const block2 = await L2Block.random(BlockNumber(2), {
+        checkpointNumber: CheckpointNumber(1),
+        indexWithinCheckpoint: IndexWithinCheckpoint(1),
+        lastArchive: block1.archive,
+      });
+
+      await addProposedBlocks(blockStore, [block1, block2]);
+
+      const removedBlocks = await blockStore.removeBlocksAfter(BlockNumber(0));
+
+      expect(removedBlocks.length).toBe(2);
+      expect(await blockStore.getLatestL2BlockNumber()).toBe(0);
+      expect(await blockStore.getBlock({ number: BlockNumber(1) })).toBeUndefined();
+      expect(await blockStore.getBlock({ number: BlockNumber(2) })).toBeUndefined();
+    });
+  });
+});
diff --git a/yarn-project/archiver/src/store/block_store.ts b/yarn-project/archiver/src/store/block_store.ts
index 36db8ce0a539..6ec9d07f19b2 100644
--- a/yarn-project/archiver/src/store/block_store.ts
+++ b/yarn-project/archiver/src/store/block_store.ts
@@ -12,7 +12,6 @@ import {
   type BlockData,
   BlockHash,
   Body,
-  CheckpointedL2Block,
   CommitteeAttestation,
   L2Block,
   type ValidateCheckpointResult,
@@ -45,6 +44,7 @@ import {
 import {
   BlockAlreadyCheckpointedError,
   BlockArchiveNotConsistentError,
+  BlockCheckpointNumberNotSequentialError,
   BlockIndexNotSequentialError,
   BlockNotFoundError,
   BlockNumberNotSequentialError,
@@ -56,7 +56,6 @@ import {
   ProposedCheckpointArchiveRootMismatchError,
   ProposedCheckpointNotSequentialError,
   ProposedCheckpointPromotionNotSequentialError,
-  ProposedCheckpointStaleError,
 } from '../errors.js';
 
 export { TxReceipt, type TxEffect, type TxHash } from '@aztec/stdlib/tx';
@@ -84,6 +83,7 @@ type CommonCheckpointStorage = {
 type CheckpointStorage = CommonCheckpointStorage & {
   l1: Buffer;
   attestations: Buffer[];
+  feeAssetPriceModifier: string;
 };
 
 /** Storage format for a proposed checkpoint (attested but not yet L1-confirmed). */
@@ -94,6 +94,19 @@ type ProposedCheckpointStorage = CommonCheckpointStorage & {
 
 export type RemoveCheckpointsResult = { blocksRemoved: L2Block[] | undefined };
 
+/**
+ * Single-block lookup with the chain-tip `tag` variant of {@link BlockQuery} already resolved
+ * to a concrete block number. The `tag` branch is unrepresentable here so storage code does
+ * not need to handle it at runtime.
+ */
+export type ResolvedBlockQuery = { number: BlockNumber } | { hash: BlockHash } | { archive: Fr };
+
+/**
+ * Range lookup with the `epoch` variant of {@link BlocksQuery} already resolved to a
+ * `{ from, limit }` pair. Storage code never needs to map epoch numbers to block ranges.
+ */
+export type ResolvedBlocksQuery = { from: BlockNumber; limit: number; onlyCheckpointed?: boolean };
+
 /**
  * LMDB-based block storage for the archiver.
  */
@@ -101,7 +114,10 @@ export class BlockStore {
   /** Map block number to block data */
   #blocks: AztecAsyncMap<number, BlockStorage>;
 
-  /** Map checkpoint number to checkpoint data */
+  /** Map keyed by checkpoint number holding proposed (locally-validated, not yet L1-confirmed) checkpoints. */
+  #proposedCheckpoints: AztecAsyncMap<number, ProposedCheckpointStorage>;
+
+  /** Map checkpoint number to checkpoint data for mined checkpoints only */
   #checkpoints: AztecAsyncMap<number, CheckpointStorage>;
 
   /** Map slot number to checkpoint number, for looking up checkpoints by slot range. */
@@ -134,9 +150,6 @@ export class BlockStore {
   /** Index mapping block archive to block number */
   #blockArchiveIndex: AztecAsyncMap<string, number>;
 
-  /** Singleton: assumes max 1-deep pipeline. For deeper pipelining, replace with a map keyed by checkpoint number. */
-  #proposedCheckpoint: AztecAsyncSingleton<ProposedCheckpointStorage>;
-
   #log = createLogger('archiver:block_store');
 
   constructor(private db: AztecAsyncKVStore) {
@@ -152,7 +165,7 @@ export class BlockStore {
     this.#pendingChainValidationStatus = db.openSingleton('archiver_pending_chain_validation_status');
     this.#checkpoints = db.openMap('archiver_checkpoints');
     this.#slotToCheckpoint = db.openMap('archiver_slot_to_checkpoint');
-    this.#proposedCheckpoint = db.openSingleton('proposed_checkpoint_data');
+    this.#proposedCheckpoints = db.openMap('archiver_proposed_checkpoints');
   }
 
   /**
@@ -188,14 +201,13 @@ export class BlockStore {
 
       // Extract the latest block and checkpoint numbers
       const previousBlockNumber = await this.getLatestL2BlockNumber();
-      const proposedCheckpointNumber = await this.getProposedCheckpointNumber();
-      const previousCheckpointNumber = await this.getLatestCheckpointNumber();
+      const latestCheckpointNumber = await this.getLatestCheckpointNumber();
 
       // Verify we're not overwriting checkpointed blocks
       const lastCheckpointedBlockNumber = await this.getCheckpointedL2BlockNumber();
       if (!opts.force && blockNumber <= lastCheckpointedBlockNumber) {
         // Check if the proposed block matches the already-checkpointed one
-        const existingBlock = await this.getBlock(BlockNumber(blockNumber));
+        const existingBlock = await this.getBlockData({ number: BlockNumber(blockNumber) });
         if (existingBlock && existingBlock.archive.root.equals(block.archive.root)) {
           throw new BlockAlreadyCheckpointedError(blockNumber);
         }
@@ -207,23 +219,18 @@ export class BlockStore {
         throw new BlockNumberNotSequentialError(blockNumber, previousBlockNumber);
       }
 
-      // The same check as above but for checkpoints. Accept the block if either the confirmed
-      // checkpoint or the pending (locally validated but not yet confirmed) checkpoint matches.
+      // Accept the block if either the confirmed checkpoint or a pending checkpoint matches
+      // the expected predecessor. We look for a pending entry at exactly blockCheckpointNumber - 1.
       const expectedCheckpointNumber = blockCheckpointNumber - 1;
-      if (
-        !opts.force &&
-        previousCheckpointNumber !== expectedCheckpointNumber &&
-        proposedCheckpointNumber !== expectedCheckpointNumber
-      ) {
-        const [reported, source]: [CheckpointNumber, 'confirmed' | 'proposed'] =
-          proposedCheckpointNumber > previousCheckpointNumber
-            ? [proposedCheckpointNumber, 'proposed']
-            : [previousCheckpointNumber, 'confirmed'];
-        throw new CheckpointNumberNotSequentialError(blockCheckpointNumber, reported, source);
+      const hasPendingAtExpected = await this.#proposedCheckpoints.hasAsync(expectedCheckpointNumber);
+      if (!opts.force && latestCheckpointNumber !== expectedCheckpointNumber && !hasPendingAtExpected) {
+        const [latestPendingKey] = await toArray(this.#proposedCheckpoints.keysAsync({ reverse: true, limit: 1 }));
+        const previous = CheckpointNumber(Math.max(latestCheckpointNumber, latestPendingKey ?? 0));
+        throw new BlockCheckpointNumberNotSequentialError(BlockNumber(blockNumber), blockCheckpointNumber, previous);
       }
 
       // Extract the previous block if there is one and see if it is for the same checkpoint or not
-      const previousBlockResult = await this.getBlock(previousBlockNumber);
+      const previousBlockResult = await this.getBlockData({ number: previousBlockNumber });
 
       let expectedBlockIndex = 0;
       let previousBlockIndex: number | undefined = undefined;
@@ -236,7 +243,7 @@ export class BlockStore {
         if (!previousBlockResult.archive.root.equals(blockLastArchive)) {
           throw new BlockArchiveNotConsistentError(
             blockNumber,
-            previousBlockResult.number,
+            previousBlockResult.header.globalVariables.blockNumber,
             blockLastArchive,
             previousBlockResult.archive.root,
           );
@@ -322,15 +329,15 @@ export class BlockStore {
           checkpointNumber: checkpoint.checkpoint.number,
           startBlock: checkpoint.checkpoint.blocks[0].number,
           blockCount: checkpoint.checkpoint.blocks.length,
+          feeAssetPriceModifier: checkpoint.checkpoint.feeAssetPriceModifier.toString(),
         });
 
         // Update slot-to-checkpoint index
         await this.#slotToCheckpoint.set(checkpoint.checkpoint.header.slotNumber, checkpoint.checkpoint.number);
-      }
 
-      // Clear the proposed checkpoint if any of the confirmed checkpoints match or supersede it
-      const lastConfirmedCheckpointNumber = checkpoints[checkpoints.length - 1].checkpoint.number;
-      await this.clearProposedCheckpointIfSuperseded(lastConfirmedCheckpointNumber);
+        // Remove proposed checkpoint if it exists, since L1 is authoritative
+        await this.#proposedCheckpoints.delete(checkpoint.checkpoint.number);
+      }
 
       await this.#lastSynchedL1Block.set(checkpoints[checkpoints.length - 1].l1.blockNumber);
       return true;
@@ -374,6 +381,7 @@ export class BlockStore {
         checkpointNumber: incoming.checkpoint.number,
         startBlock: incoming.checkpoint.blocks[0].number,
         blockCount: incoming.checkpoint.blocks.length,
+        feeAssetPriceModifier: incoming.checkpoint.feeAssetPriceModifier.toString(),
       });
       // Update the sync point to reflect the new L1 block
       await this.#lastSynchedL1Block.set(incoming.l1.blockNumber);
@@ -391,24 +399,27 @@ export class BlockStore {
       return undefined;
     }
 
-    const previousCheckpointData = await this.getCheckpointData(previousCheckpointNumber);
-    if (previousCheckpointData === undefined) {
+    // Check across both proposed and mined checkpoints
+    const predecessor =
+      (await this.getProposedCheckpointByNumber(previousCheckpointNumber)) ??
+      (await this.getCheckpointData(previousCheckpointNumber));
+
+    if (!predecessor) {
       throw new CheckpointNotFoundError(previousCheckpointNumber);
     }
 
-    const previousBlockNumber = BlockNumber(previousCheckpointData.startBlock + previousCheckpointData.blockCount - 1);
-    const previousBlock = await this.getBlock(previousBlockNumber);
+    const previousBlockNumber = BlockNumber(predecessor.startBlock + predecessor.blockCount - 1);
+    const previousBlock = await this.getBlock({ number: previousBlockNumber });
     if (previousBlock === undefined) {
       throw new BlockNotFoundError(previousBlockNumber);
     }
-
     return previousBlock;
   }
 
   /**
    * Validates that blocks are sequential, have correct indexes, and chain via archive roots.
    * This is the same validation used for both confirmed checkpoints (addCheckpoints) and
-   * proposed checkpoints (setProposedCheckpoint).
+   * proposed checkpoints (addProposedCheckpoint).
    */
   private validateCheckpointBlocks(blocks: L2Block[], previousBlock: L2Block | undefined): void {
     for (const block of blocks) {
@@ -535,11 +546,8 @@ export class BlockStore {
         this.#log.debug(`Removed checkpoint ${c}`);
       }
 
-      // Clear any proposed checkpoint that was orphaned by the removal (its base chain no longer exists)
-      const proposedCheckpointNumber = await this.getProposedCheckpointNumber();
-      if (proposedCheckpointNumber > checkpointNumber) {
-        await this.#proposedCheckpoint.delete();
-      }
+      // Evict all pending checkpoints > checkpointNumber (their base chain no longer exists)
+      await this.evictProposedCheckpointsFrom(CheckpointNumber(checkpointNumber + 1));
 
       return { blocksRemoved };
     });
@@ -580,6 +588,22 @@ export class BlockStore {
     return result;
   }
 
+  /**
+   * Returns the checkpoint numbers for all checkpoints whose slot falls within the given range (inclusive).
+   * Lighter than {@link getCheckpointDataForSlotRange} when callers only need to identify which
+   * checkpoints fall in the range and will fetch full data for at most a few of them.
+   */
+  async getCheckpointNumbersForSlotRange(startSlot: SlotNumber, endSlot: SlotNumber): Promise<CheckpointNumber[]> {
+    const result: CheckpointNumber[] = [];
+    for await (const [, checkpointNumber] of this.#slotToCheckpoint.entriesAsync({
+      start: startSlot,
+      end: endSlot + 1,
+    })) {
+      result.push(CheckpointNumber(checkpointNumber));
+    }
+    return result;
+  }
+
   private checkpointDataFromCheckpointStorage(checkpointStorage: CheckpointStorage): CheckpointData {
     return {
       header: CheckpointHeader.fromBuffer(checkpointStorage.header),
@@ -588,6 +612,7 @@ export class BlockStore {
       checkpointNumber: CheckpointNumber(checkpointStorage.checkpointNumber),
       startBlock: BlockNumber(checkpointStorage.startBlock),
       blockCount: checkpointStorage.blockCount,
+      feeAssetPriceModifier: BigInt(checkpointStorage.feeAssetPriceModifier),
       l1: L1PublishedData.fromBuffer(checkpointStorage.l1),
       attestations: checkpointStorage.attestations.map(buf => CommitteeAttestation.fromBuffer(buf)),
     };
@@ -650,7 +675,7 @@ export class BlockStore {
 
       // Iterate from blockNumber + 1 to latestBlockNumber
       for (let bn = blockNumber + 1; bn <= latestBlockNumber; bn++) {
-        const block = await this.getBlock(BlockNumber(bn));
+        const block = await this.getBlock({ number: BlockNumber(bn) });
 
         if (block === undefined) {
           this.#log.warn(`Cannot remove block ${bn} from the store since we don't have it`);
@@ -688,28 +713,34 @@ export class BlockStore {
   }
 
   async hasProposedCheckpoint(): Promise<boolean> {
-    const proposed = await this.#proposedCheckpoint.getAsync();
-    return proposed !== undefined;
+    const [key] = await toArray(this.#proposedCheckpoints.keysAsync({ limit: 1 }));
+    return key !== undefined;
   }
 
-  /** Deletes the proposed checkpoint from storage. */
-  async deleteProposedCheckpoint(): Promise<void> {
-    await this.#proposedCheckpoint.delete();
+  /** Deletes all pending proposed checkpoints from storage. */
+  async deleteProposedCheckpoints(): Promise<void> {
+    for await (const key of this.#proposedCheckpoints.keysAsync()) {
+      await this.#proposedCheckpoints.delete(key);
+    }
   }
 
   /**
-   * Promotes the proposed checkpoint singleton to a confirmed checkpoint entry.
-   * This persists the checkpoint to the store, clears the proposed singleton, and updates the L1 sync point.
-   * Should only be called after the checkpoint has been validated.
-   * @param expectedArchiveRoot - The archive root to match against the proposed checkpoint, to guard against races.
+   * Promotes a specific pending checkpoint to a confirmed checkpoint entry.
+   * This persists the checkpoint to the store, removes only that pending entry, and updates the L1 sync point.
+   * Remaining pending entries (e.g. N+1, N+2) are left intact — they chain off the just-promoted one.
+   * @param checkpointNumber - The checkpoint number to promote.
+   * @param l1 - L1 published data for the checkpoint.
+   * @param attestations - Committee attestations.
+   * @param expectedArchiveRoot - Archive root guard against races.
    */
   async promoteProposedToCheckpointed(
+    checkpointNumber: CheckpointNumber,
     l1: L1PublishedData,
     attestations: CommitteeAttestation[],
     expectedArchiveRoot: Fr,
   ): Promise<void> {
     return await this.db.transactionAsync(async () => {
-      const proposed = await this.getProposedCheckpointOnly();
+      const proposed = await this.getProposedCheckpointByNumber(checkpointNumber);
       if (!proposed) {
         throw new NoProposedCheckpointToPromoteError();
       }
@@ -733,48 +764,67 @@ export class BlockStore {
         checkpointNumber: proposed.checkpointNumber,
         startBlock: proposed.startBlock,
         blockCount: proposed.blockCount,
+        feeAssetPriceModifier: proposed.feeAssetPriceModifier.toString(),
       });
 
       // Update the slot-to-checkpoint index
       await this.#slotToCheckpoint.set(proposed.header.slotNumber, proposed.checkpointNumber);
 
-      // Clear the proposed checkpoint singleton
-      await this.#proposedCheckpoint.delete();
+      // Remove only this pending entry — remaining entries N+1, N+2, ... stay valid
+      await this.#proposedCheckpoints.delete(proposed.checkpointNumber);
 
       // Update the last synced L1 block
       await this.#lastSynchedL1Block.set(l1.blockNumber);
     });
   }
 
-  /** Clears the proposed checkpoint if the given confirmed checkpoint number supersedes it. */
-  async clearProposedCheckpointIfSuperseded(confirmedCheckpointNumber: CheckpointNumber): Promise<void> {
-    const proposedCheckpointNumber = await this.getProposedCheckpointNumber();
-    if (proposedCheckpointNumber <= confirmedCheckpointNumber) {
-      await this.#proposedCheckpoint.delete();
+  /**
+   * Returns the latest pending checkpoint (highest-numbered entry), or undefined if none.
+   * No fallback to confirmed.
+   */
+  async getLastProposedCheckpoint(): Promise<ProposedCheckpointData | undefined> {
+    const [key] = await toArray(this.#proposedCheckpoints.keysAsync({ reverse: true, limit: 1 }));
+    if (key === undefined) {
+      return undefined;
     }
+    const stored = await this.#proposedCheckpoints.getAsync(key);
+    return stored ? this.convertToProposedCheckpointData(stored) : undefined;
   }
 
-  /** Returns the proposed checkpoint data, or undefined if no proposed checkpoint exists. No fallback to confirmed. */
-  async getProposedCheckpointOnly(): Promise<ProposedCheckpointData | undefined> {
-    const stored = await this.#proposedCheckpoint.getAsync();
-    if (!stored) {
-      return undefined;
+  /** Returns the pending checkpoint for a specific checkpoint number, or undefined if not found. */
+  async getProposedCheckpointByNumber(n: CheckpointNumber): Promise<ProposedCheckpointData | undefined> {
+    const stored = await this.#proposedCheckpoints.getAsync(n);
+    return stored ? this.convertToProposedCheckpointData(stored) : undefined;
+  }
+
+  /**
+   * Evicts all pending checkpoints with checkpoint number >= fromNumber.
+   * Used for divergent-mined-checkpoint cleanup: when L1 mines checkpoint N with a different archive,
+   * all pending >= N must be evicted since they chain off the now-invalid pending N.
+   */
+  async evictProposedCheckpointsFrom(fromNumber: CheckpointNumber): Promise<void> {
+    const keysToDelete: number[] = [];
+    for await (const key of this.#proposedCheckpoints.keysAsync()) {
+      if (key >= fromNumber) {
+        keysToDelete.push(key);
+      }
+    }
+    for (const key of keysToDelete) {
+      await this.#proposedCheckpoints.delete(key);
     }
-    return this.convertToProposedCheckpointData(stored);
   }
 
   /**
-   * Gets the checkpoint at the proposed tip
-   * - pending checkpoint if it exists
+   * Gets the checkpoint at the proposed tip:
+   * - latest pending checkpoint if any exist
    * - fallsback to latest confirmed checkpoint otherwise
-   * @returns CommonCheckpointData
    */
-  async getProposedCheckpoint(): Promise<CommonCheckpointData | undefined> {
-    const stored = await this.#proposedCheckpoint.getAsync();
-    if (!stored) {
+  async getLastCheckpoint(): Promise<CommonCheckpointData | undefined> {
+    const latest = await this.getLastProposedCheckpoint();
+    if (!latest) {
       return this.getCheckpointData(await this.getLatestCheckpointNumber());
     }
-    return this.convertToProposedCheckpointData(stored);
+    return latest;
   }
 
   private convertToProposedCheckpointData(stored: ProposedCheckpointStorage): ProposedCheckpointData {
@@ -795,7 +845,7 @@ export class BlockStore {
    * @returns CheckpointNumber
    */
   async getProposedCheckpointNumber(): Promise<CheckpointNumber> {
-    const proposed = await this.getProposedCheckpoint();
+    const proposed = await this.getLastCheckpoint();
     if (!proposed) {
       return await this.getLatestCheckpointNumber();
     }
@@ -807,165 +857,40 @@ export class BlockStore {
    * @returns BlockNumber
    */
   async getProposedCheckpointL2BlockNumber(): Promise<BlockNumber> {
-    const proposed = await this.getProposedCheckpoint();
+    const proposed = await this.getLastCheckpoint();
     if (!proposed) {
       return await this.getCheckpointedL2BlockNumber();
     }
     return BlockNumber(proposed.startBlock + proposed.blockCount - 1);
   }
 
-  async getCheckpointedBlock(number: BlockNumber): Promise<CheckpointedL2Block | undefined> {
-    const blockStorage = await this.#blocks.getAsync(number);
-    if (!blockStorage) {
-      return undefined;
-    }
-    const checkpoint = await this.#checkpoints.getAsync(blockStorage.checkpointNumber);
-    if (!checkpoint) {
-      return undefined;
-    }
-    const block = await this.getBlockFromBlockStorage(number, blockStorage);
-    if (!block) {
-      return undefined;
-    }
-    return new CheckpointedL2Block(
-      CheckpointNumber(checkpoint.checkpointNumber),
-      block,
-      L1PublishedData.fromBuffer(checkpoint.l1),
-      checkpoint.attestations.map(buf => CommitteeAttestation.fromBuffer(buf)),
-    );
+  /** Returns the checkpoint number that contains the given slot (or undefined if not found). */
+  async getCheckpointNumberBySlot(slot: SlotNumber): Promise<CheckpointNumber | undefined> {
+    const checkpointNumber = await this.#slotToCheckpoint.getAsync(slot);
+    return checkpointNumber === undefined ? undefined : CheckpointNumber(checkpointNumber);
   }
 
-  /**
-   * Gets up to `limit` amount of Checkpointed L2 blocks starting from `from`.
-   * @param start - Number of the first block to return (inclusive).
-   * @param limit - The number of blocks to return.
-   * @returns The requested L2 blocks
-   */
-  async *getCheckpointedBlocks(start: BlockNumber, limit: number): AsyncIterableIterator<CheckpointedL2Block> {
-    const checkpointCache = new Map<CheckpointNumber, CheckpointStorage>();
-    for await (const [blockNumber, blockStorage] of this.getBlockStorages(start, limit)) {
-      const block = await this.getBlockFromBlockStorage(blockNumber, blockStorage);
-      if (block) {
-        const checkpoint =
-          checkpointCache.get(CheckpointNumber(blockStorage.checkpointNumber)) ??
-          (await this.#checkpoints.getAsync(blockStorage.checkpointNumber));
-        if (checkpoint) {
-          checkpointCache.set(CheckpointNumber(blockStorage.checkpointNumber), checkpoint);
-          const checkpointedBlock = new CheckpointedL2Block(
-            CheckpointNumber(checkpoint.checkpointNumber),
-            block,
-            L1PublishedData.fromBuffer(checkpoint.l1),
-            checkpoint.attestations.map(buf => CommitteeAttestation.fromBuffer(buf)),
-          );
-          yield checkpointedBlock;
-        }
-      }
-    }
-  }
-
-  async getCheckpointedBlockByHash(blockHash: BlockHash): Promise<CheckpointedL2Block | undefined> {
-    const blockNumber = await this.#blockHashIndex.getAsync(blockHash.toString());
-    if (blockNumber === undefined) {
-      return undefined;
-    }
-    return this.getCheckpointedBlock(BlockNumber(blockNumber));
-  }
-
-  async getCheckpointedBlockByArchive(archive: Fr): Promise<CheckpointedL2Block | undefined> {
-    const blockNumber = await this.#blockArchiveIndex.getAsync(archive.toString());
+  /** Gets a single L2 block matching the given resolved query. */
+  async getBlock(query: ResolvedBlockQuery): Promise<L2Block | undefined> {
+    const blockNumber = await this.getBlockNumber(query);
     if (blockNumber === undefined) {
       return undefined;
     }
-    return this.getCheckpointedBlock(BlockNumber(blockNumber));
-  }
-
-  /**
-   * Gets up to `limit` amount of L2 blocks starting from `from`.
-   * @param start - Number of the first block to return (inclusive).
-   * @param limit - The number of blocks to return.
-   * @returns The requested L2 blocks
-   */
-  async *getBlocks(start: BlockNumber, limit: number): AsyncIterableIterator<L2Block> {
-    for await (const [blockNumber, blockStorage] of this.getBlockStorages(start, limit)) {
-      const block = await this.getBlockFromBlockStorage(blockNumber, blockStorage);
-      if (block) {
-        yield block;
-      }
-    }
-  }
-
-  /**
-   * Gets block metadata (without tx data) by block number.
-   * @param blockNumber - The number of the block to return.
-   * @returns The requested block data.
-   */
-  async getBlockData(blockNumber: BlockNumber): Promise<BlockData | undefined> {
     const blockStorage = await this.#blocks.getAsync(blockNumber);
-    if (!blockStorage || !blockStorage.header) {
-      return undefined;
-    }
-    return this.getBlockDataFromBlockStorage(blockStorage);
-  }
-
-  /**
-   * Gets block metadata (without tx data) by archive root.
-   * @param archive - The archive root of the block to return.
-   * @returns The requested block data.
-   */
-  async getBlockDataByArchive(archive: Fr): Promise<BlockData | undefined> {
-    const blockNumber = await this.#blockArchiveIndex.getAsync(archive.toString());
-    if (blockNumber === undefined) {
+    if (!blockStorage) {
       return undefined;
     }
-    return this.getBlockData(BlockNumber(blockNumber));
-  }
-
-  /**
-   * Gets an L2 block.
-   * @param blockNumber - The number of the block to return.
-   * @returns The requested L2 block.
-   */
-  async getBlock(blockNumber: BlockNumber): Promise<L2Block | undefined> {
-    const blockStorage = await this.#blocks.getAsync(blockNumber);
-    if (!blockStorage || !blockStorage.header) {
-      return Promise.resolve(undefined);
-    }
     return this.getBlockFromBlockStorage(blockNumber, blockStorage);
   }
 
-  /**
-   * Gets an L2 block by its hash.
-   * @param blockHash - The hash of the block to return.
-   * @returns The requested L2 block.
-   */
-  async getBlockByHash(blockHash: BlockHash): Promise<L2Block | undefined> {
-    const blockNumber = await this.#blockHashIndex.getAsync(blockHash.toString());
-    if (blockNumber === undefined) {
-      return undefined;
-    }
-    return this.getBlock(BlockNumber(blockNumber));
+  /** Gets a collection of L2 blocks for a resolved range. */
+  getBlocks(query: ResolvedBlocksQuery): Promise<L2Block[]> {
+    return toArray(this.iterateBlocks(query));
   }
 
-  /**
-   * Gets an L2 block by its archive root.
-   * @param archive - The archive root of the block to return.
-   * @returns The requested L2 block.
-   */
-  async getBlockByArchive(archive: Fr): Promise<L2Block | undefined> {
-    const blockNumber = await this.#blockArchiveIndex.getAsync(archive.toString());
-    if (blockNumber === undefined) {
-      return undefined;
-    }
-    return this.getBlock(BlockNumber(blockNumber));
-  }
-
-  /**
-   * Gets a block header by its hash.
-   * @param blockHash - The hash of the block to return.
-   * @returns The requested block header.
-   */
-  async getBlockHeaderByHash(blockHash: BlockHash): Promise<BlockHeader | undefined> {
-    const blockNumber = await this.#blockHashIndex.getAsync(blockHash.toString());
+  /** Gets single block metadata matching the given resolved query. */
+  async getBlockData(query: ResolvedBlockQuery): Promise<BlockData | undefined> {
+    const blockNumber = await this.getBlockNumber(query);
     if (blockNumber === undefined) {
       return undefined;
     }
@@ -973,41 +898,36 @@ export class BlockStore {
     if (!blockStorage || !blockStorage.header) {
       return undefined;
     }
-    return BlockHeader.fromBuffer(blockStorage.header);
+    return this.getBlockDataFromBlockStorage(blockStorage);
   }
 
-  /**
-   * Gets a block header by its archive root.
-   * @param archive - The archive root of the block to return.
-   * @returns The requested block header.
-   */
-  async getBlockHeaderByArchive(archive: Fr): Promise<BlockHeader | undefined> {
-    const blockNumber = await this.#blockArchiveIndex.getAsync(archive.toString());
-    if (blockNumber === undefined) {
-      return undefined;
-    }
-    const blockStorage = await this.#blocks.getAsync(blockNumber);
-    if (!blockStorage || !blockStorage.header) {
-      return undefined;
+  /** Gets a collection of block metadata entries for a resolved range. */
+  getBlocksData(query: ResolvedBlocksQuery): Promise<BlockData[]> {
+    return toArray(this.iterateBlocksData(query));
+  }
+
+  /** Async iterator over L2 blocks for a resolved range. */
+  private async *iterateBlocks(query: ResolvedBlocksQuery): AsyncIterableIterator<L2Block> {
+    const cap = query.onlyCheckpointed ? await this.getCheckpointedL2BlockNumber() : undefined;
+    for await (const [blockNumber, blockStorage] of this.getBlockStorages(query.from, query.limit)) {
+      if (cap !== undefined && blockNumber > cap) {
+        break;
+      }
+      const block = await this.getBlockFromBlockStorage(blockNumber, blockStorage);
+      if (block) {
+        yield block;
+      }
     }
-    return BlockHeader.fromBuffer(blockStorage.header);
   }
 
-  /**
-   * Gets the headers for a sequence of L2 blocks.
-   * @param start - Number of the first block to return (inclusive).
-   * @param limit - The number of blocks to return.
-   * @returns The requested L2 block headers
-   */
-  async *getBlockHeaders(start: BlockNumber, limit: number): AsyncIterableIterator<BlockHeader> {
-    for await (const [blockNumber, blockStorage] of this.getBlockStorages(start, limit)) {
-      const header = BlockHeader.fromBuffer(blockStorage.header);
-      if (header.getBlockNumber() !== blockNumber) {
-        throw new Error(
-          `Block number mismatch when retrieving block header from archive (expected ${blockNumber} but got ${header.getBlockNumber()})`,
-        );
+  /** Async iterator over block metadata for a resolved range. */
+  private async *iterateBlocksData(query: ResolvedBlocksQuery): AsyncIterableIterator<BlockData> {
+    const cap = query.onlyCheckpointed ? await this.getCheckpointedL2BlockNumber() : undefined;
+    for await (const [blockNumber, blockStorage] of this.getBlockStorages(query.from, query.limit)) {
+      if (cap !== undefined && blockNumber > cap) {
+        break;
       }
-      yield header;
+      yield this.getBlockDataFromBlockStorage(blockStorage);
     }
   }
 
@@ -1024,6 +944,24 @@ export class BlockStore {
     }
   }
 
+  /** Resolves a ResolvedBlockQuery discriminant to a block number, or undefined if not found. */
+  async getBlockNumber(query: ResolvedBlockQuery): Promise<BlockNumber | undefined> {
+    let blockNumber: BlockNumber | undefined;
+    if ('number' in query) {
+      blockNumber = query.number;
+    } else if ('hash' in query) {
+      const n = await this.#blockHashIndex.getAsync(query.hash.toString());
+      blockNumber = n !== undefined ? BlockNumber(n) : undefined;
+    } else {
+      const n = await this.#blockArchiveIndex.getAsync(query.archive.toString());
+      blockNumber = n !== undefined ? BlockNumber(n) : undefined;
+    }
+    if (blockNumber === undefined) {
+      return undefined;
+    }
+    return blockNumber;
+  }
+
   private getBlockDataFromBlockStorage(blockStorage: BlockStorage): BlockData {
     return {
       header: BlockHeader.fromBuffer(blockStorage.header),
@@ -1106,7 +1044,7 @@ export class BlockStore {
       this.getProvenBlockNumber(),
       this.getCheckpointedL2BlockNumber(),
       this.getFinalizedL2BlockNumber(),
-      this.getBlockData(blockNumber),
+      this.getBlockData({ number: blockNumber }),
     ]);
 
     let status: TxStatus;
@@ -1188,24 +1126,29 @@ export class BlockStore {
     return this.#lastSynchedL1Block.set(l1BlockNumber);
   }
 
-  /** Sets the proposed checkpoint (not yet L1-confirmed). Only accepts confirmed + 1.
-   *  Computes archive and checkpointOutHash from the stored blocks. */
-  async setProposedCheckpoint(proposed: ProposedCheckpointInput) {
+  /**
+   * Adds a proposed checkpoint to the pending queue.
+   * Accepts proposed.checkpointNumber === latestTip + 1, where latestTip is the highest of
+   * confirmed and the highest pending checkpoint number.
+   * Computes archive and checkpointOutHash from the stored blocks.
+   */
+  async addProposedCheckpoint(proposed: ProposedCheckpointInput) {
     return await this.db.transactionAsync(async () => {
-      const current = await this.getProposedCheckpointNumber();
-      if (proposed.checkpointNumber <= current) {
-        throw new ProposedCheckpointStaleError(proposed.checkpointNumber, current);
-      }
       const confirmed = await this.getLatestCheckpointNumber();
-      if (proposed.checkpointNumber !== confirmed + 1) {
-        throw new ProposedCheckpointNotSequentialError(proposed.checkpointNumber, confirmed);
+      const [latestPendingKey] = await toArray(this.#proposedCheckpoints.keysAsync({ reverse: true, limit: 1 }));
+      const latestTip = CheckpointNumber(
+        latestPendingKey !== undefined ? Math.max(latestPendingKey, confirmed) : confirmed,
+      );
+
+      if (proposed.checkpointNumber !== latestTip + 1) {
+        throw new ProposedCheckpointNotSequentialError(proposed.checkpointNumber, latestTip);
       }
 
-      // Ensure the previous checkpoint + blocks exist
+      // Ensure the predecessor block (from pending or confirmed chain) exists
       const previousBlock = await this.getPreviousCheckpointBlock(proposed.checkpointNumber);
       const blocks: L2Block[] = [];
       for (let i = 0; i < proposed.blockCount; i++) {
-        const block = await this.getBlock(BlockNumber(proposed.startBlock + i));
+        const block = await this.getBlock({ number: BlockNumber(proposed.startBlock + i) });
         if (!block) {
           throw new BlockNotFoundError(proposed.startBlock + i);
         }
@@ -1216,7 +1159,7 @@ export class BlockStore {
       const archive = blocks[blocks.length - 1].archive;
       const checkpointOutHash = Checkpoint.getCheckpointOutHash(blocks);
 
-      await this.#proposedCheckpoint.set({
+      await this.#proposedCheckpoints.set(proposed.checkpointNumber, {
         header: proposed.header.toBuffer(),
         archive: archive.toBuffer(),
         checkpointOutHash: checkpointOutHash.toBuffer(),
diff --git a/yarn-project/archiver/src/store/contract_class_store.test.ts b/yarn-project/archiver/src/store/contract_class_store.test.ts
new file mode 100644
index 000000000000..42a389c84031
--- /dev/null
+++ b/yarn-project/archiver/src/store/contract_class_store.test.ts
@@ -0,0 +1,61 @@
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { openTmpStore } from '@aztec/kv-store/lmdb-v2';
+import {
+  type ContractClassPublic,
+  type ContractClassPublicWithCommitment,
+  computePublicBytecodeCommitment,
+} from '@aztec/stdlib/contract';
+import { makeContractClassPublic } from '@aztec/stdlib/testing';
+import '@aztec/stdlib/testing/jest';
+
+import { ContractClassStore } from './contract_class_store.js';
+
+async function withCommitment(contractClass: ContractClassPublic): Promise<ContractClassPublicWithCommitment> {
+  return {
+    ...contractClass,
+    publicBytecodeCommitment: await computePublicBytecodeCommitment(contractClass.packedBytecode),
+  };
+}
+
+describe('ContractClassStore', () => {
+  let contractClassStore: ContractClassStore;
+
+  beforeEach(async () => {
+    contractClassStore = new ContractClassStore(await openTmpStore('contract_class_store_test'));
+  });
+
+  describe('contractClasses', () => {
+    let contractClass: ContractClassPublic;
+    const blockNum = 10;
+
+    beforeEach(async () => {
+      contractClass = await makeContractClassPublic();
+      await contractClassStore.addContractClasses([await withCommitment(contractClass)], BlockNumber(blockNum));
+    });
+
+    it('returns previously stored contract class', async () => {
+      await expect(contractClassStore.getContractClass(contractClass.id)).resolves.toMatchObject(contractClass);
+    });
+
+    it('returns undefined if the initial deployed contract class was deleted', async () => {
+      await contractClassStore.deleteContractClasses([contractClass], BlockNumber(blockNum));
+      await expect(contractClassStore.getContractClass(contractClass.id)).resolves.toBeUndefined();
+    });
+
+    it('throws if the same contract class is added again', async () => {
+      await expect(
+        contractClassStore.addContractClasses([await withCommitment(contractClass)], BlockNumber(blockNum + 1)),
+      ).rejects.toThrow(/already exists/);
+    });
+
+    it('returns contract class if deleted at a later block number', async () => {
+      await contractClassStore.deleteContractClasses([contractClass], BlockNumber(blockNum + 1));
+      await expect(contractClassStore.getContractClass(contractClass.id)).resolves.toMatchObject(contractClass);
+    });
+
+    it('returns undefined if contract class is not found', async () => {
+      await expect(contractClassStore.getContractClass(Fr.random())).resolves.toBeUndefined();
+    });
+  });
+});
diff --git a/yarn-project/archiver/src/store/contract_class_store.ts b/yarn-project/archiver/src/store/contract_class_store.ts
index bf266c3a086a..ea3b5a48ef56 100644
--- a/yarn-project/archiver/src/store/contract_class_store.ts
+++ b/yarn-project/archiver/src/store/contract_class_store.ts
@@ -2,7 +2,11 @@ import { Fr } from '@aztec/foundation/curves/bn254';
 import { toArray } from '@aztec/foundation/iterable';
 import { BufferReader, numToUInt8, serializeToBuffer } from '@aztec/foundation/serialize';
 import type { AztecAsyncKVStore, AztecAsyncMap } from '@aztec/kv-store';
-import type { ContractClassPublic, ContractClassPublicWithBlockNumber } from '@aztec/stdlib/contract';
+import type {
+  ContractClassPublic,
+  ContractClassPublicWithBlockNumber,
+  ContractClassPublicWithCommitment,
+} from '@aztec/stdlib/contract';
 
 /**
  * LMDB-based contract class storage for the archiver.
@@ -16,6 +20,28 @@ export class ContractClassStore {
     this.#bytecodeCommitments = db.openMap('archiver_bytecode_commitments');
   }
 
+  /**
+   * Adds multiple contract classes to the store.
+   * @param data - Contract classes (with bytecode commitments) to add.
+   * @param blockNumber - L2 block number where the classes were registered.
+   * @returns True if every insert succeeded.
+   */
+  async addContractClasses(data: ContractClassPublicWithCommitment[], blockNumber: number): Promise<boolean> {
+    return (await Promise.all(data.map(c => this.addContractClass(c, c.publicBytecodeCommitment, blockNumber)))).every(
+      Boolean,
+    );
+  }
+
+  /**
+   * Removes multiple contract classes from the store, but only if they were registered at or after the given block.
+   * @param data - Contract classes to delete.
+   * @param blockNumber - Lower bound on the block number at which the classes were registered.
+   * @returns True if every delete succeeded.
+   */
+  async deleteContractClasses(data: ContractClassPublic[], blockNumber: number): Promise<boolean> {
+    return (await Promise.all(data.map(c => this.deleteContractClass(c, blockNumber)))).every(Boolean);
+  }
+
   async addContractClass(
     contractClass: ContractClassPublic,
     bytecodeCommitment: Fr,
@@ -34,7 +60,7 @@ export class ContractClassStore {
     });
   }
 
-  async deleteContractClasses(contractClass: ContractClassPublic, blockNumber: number): Promise<void> {
+  async deleteContractClass(contractClass: ContractClassPublic, blockNumber: number): Promise<void> {
     const restoredContractClass = await this.#contractClasses.getAsync(contractClass.id.toString());
     if (restoredContractClass && deserializeContractClassPublic(restoredContractClass).l2BlockNumber >= blockNumber) {
       await this.db.transactionAsync(async () => {
diff --git a/yarn-project/archiver/src/store/contract_instance_store.test.ts b/yarn-project/archiver/src/store/contract_instance_store.test.ts
new file mode 100644
index 000000000000..f6330c2ed0a2
--- /dev/null
+++ b/yarn-project/archiver/src/store/contract_instance_store.test.ts
@@ -0,0 +1,165 @@
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { openTmpStore } from '@aztec/kv-store/lmdb-v2';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { type ContractInstanceWithAddress, SerializableContractInstance } from '@aztec/stdlib/contract';
+import '@aztec/stdlib/testing/jest';
+
+import { ContractInstanceStore } from './contract_instance_store.js';
+
+describe('ContractInstanceStore', () => {
+  let contractInstanceStore: ContractInstanceStore;
+
+  beforeEach(async () => {
+    contractInstanceStore = new ContractInstanceStore(await openTmpStore('contract_instance_store_test'));
+  });
+
+  describe('contractInstances', () => {
+    let contractInstance: ContractInstanceWithAddress;
+    const blockNum = 10;
+    const timestamp = 3600n;
+
+    beforeEach(async () => {
+      const classId = Fr.random();
+      const randomInstance = await SerializableContractInstance.random({
+        currentContractClassId: classId,
+        originalContractClassId: classId,
+      });
+      contractInstance = { ...randomInstance, address: await AztecAddress.random() };
+      await contractInstanceStore.addContractInstances([contractInstance], BlockNumber(blockNum));
+    });
+
+    it('returns previously stored contract instances', async () => {
+      await expect(
+        contractInstanceStore.getContractInstance(contractInstance.address, timestamp),
+      ).resolves.toMatchObject(contractInstance);
+    });
+
+    it('returns undefined if contract instance is not found', async () => {
+      await expect(
+        contractInstanceStore.getContractInstance(await AztecAddress.random(), timestamp),
+      ).resolves.toBeUndefined();
+    });
+
+    it('returns undefined if previously stored contract instances was deleted', async () => {
+      await contractInstanceStore.deleteContractInstances([contractInstance]);
+      await expect(
+        contractInstanceStore.getContractInstance(contractInstance.address, timestamp),
+      ).resolves.toBeUndefined();
+    });
+
+    it('throws when adding the same contract instance twice', async () => {
+      await expect(contractInstanceStore.addContractInstances([contractInstance], BlockNumber(2))).rejects.toThrow(
+        /already exists/,
+      );
+    });
+  });
+
+  describe('contractInstanceUpdates', () => {
+    let contractInstance: ContractInstanceWithAddress;
+    let classId: Fr;
+    let nextClassId: Fr;
+    const timestampOfChange = 3600n;
+
+    beforeEach(async () => {
+      classId = Fr.random();
+      nextClassId = Fr.random();
+      const randomInstance = await SerializableContractInstance.random({
+        currentContractClassId: classId,
+        originalContractClassId: classId,
+      });
+      contractInstance = { ...randomInstance, address: await AztecAddress.random() };
+      await contractInstanceStore.addContractInstances([contractInstance], BlockNumber(1));
+      await contractInstanceStore.addContractInstanceUpdates(
+        [
+          {
+            prevContractClassId: classId,
+            newContractClassId: nextClassId,
+            timestampOfChange,
+            address: contractInstance.address,
+          },
+        ],
+        timestampOfChange - 1n,
+      );
+    });
+
+    it('gets the correct current class id for a contract not updated yet', async () => {
+      const fetchedInstance = await contractInstanceStore.getContractInstance(
+        contractInstance.address,
+        timestampOfChange - 1n,
+      );
+      expect(fetchedInstance?.originalContractClassId).toEqual(classId);
+      expect(fetchedInstance?.currentContractClassId).toEqual(classId);
+    });
+
+    it('gets the correct current class id for a contract that has just been updated', async () => {
+      const fetchedInstance = await contractInstanceStore.getContractInstance(
+        contractInstance.address,
+        timestampOfChange,
+      );
+      expect(fetchedInstance?.originalContractClassId).toEqual(classId);
+      expect(fetchedInstance?.currentContractClassId).toEqual(nextClassId);
+    });
+
+    it('gets the correct current class id for a contract that was updated in the past', async () => {
+      const fetchedInstance = await contractInstanceStore.getContractInstance(
+        contractInstance.address,
+        timestampOfChange + 1n,
+      );
+      expect(fetchedInstance?.originalContractClassId).toEqual(classId);
+      expect(fetchedInstance?.currentContractClassId).toEqual(nextClassId);
+    });
+
+    it('ignores updates for the wrong contract', async () => {
+      const otherClassId = Fr.random();
+      const randomInstance = await SerializableContractInstance.random({
+        currentContractClassId: otherClassId,
+        originalContractClassId: otherClassId,
+      });
+      const otherContractInstance = {
+        ...randomInstance,
+        address: await AztecAddress.random(),
+      };
+      await contractInstanceStore.addContractInstances([otherContractInstance], BlockNumber(1));
+
+      const fetchedInstance = await contractInstanceStore.getContractInstance(
+        otherContractInstance.address,
+        timestampOfChange + 1n,
+      );
+      expect(fetchedInstance?.originalContractClassId).toEqual(otherClassId);
+      expect(fetchedInstance?.currentContractClassId).toEqual(otherClassId);
+    });
+
+    it('bounds its search to the right contract if more than than one update exists', async () => {
+      const otherClassId = Fr.random();
+      const otherNextClassId = Fr.random();
+      const randomInstance = await SerializableContractInstance.random({
+        currentContractClassId: otherClassId,
+        originalContractClassId: otherNextClassId,
+      });
+      const otherContractInstance = {
+        ...randomInstance,
+        address: await AztecAddress.random(),
+      };
+      await contractInstanceStore.addContractInstances([otherContractInstance], BlockNumber(1));
+      await contractInstanceStore.addContractInstanceUpdates(
+        [
+          {
+            prevContractClassId: otherClassId,
+            newContractClassId: otherNextClassId,
+            timestampOfChange,
+            address: otherContractInstance.address,
+          },
+        ],
+        timestampOfChange - 1n,
+      );
+
+      const fetchedInstance = await contractInstanceStore.getContractInstance(
+        contractInstance.address,
+        timestampOfChange + 1n,
+      );
+      expect(fetchedInstance?.originalContractClassId).toEqual(classId);
+      expect(fetchedInstance?.currentContractClassId).toEqual(nextClassId);
+    });
+  });
+});
diff --git a/yarn-project/archiver/src/store/contract_instance_store.ts b/yarn-project/archiver/src/store/contract_instance_store.ts
index 332605240e04..eed2aa55b681 100644
--- a/yarn-project/archiver/src/store/contract_instance_store.ts
+++ b/yarn-project/archiver/src/store/contract_instance_store.ts
@@ -25,6 +25,49 @@ export class ContractInstanceStore {
     this.#contractInstanceUpdates = db.openMap('archiver_contract_instance_updates');
   }
 
+  /**
+   * Adds multiple contract instances to the store.
+   * @param data - Contract instances to add.
+   * @param blockNumber - L2 block number where the instances were deployed.
+   * @returns True if every insert succeeded.
+   */
+  async addContractInstances(data: ContractInstanceWithAddress[], blockNumber: number): Promise<boolean> {
+    return (await Promise.all(data.map(c => this.addContractInstance(c, blockNumber)))).every(Boolean);
+  }
+
+  /**
+   * Removes multiple contract instances from the store.
+   * @param data - Contract instances to delete.
+   * @returns True if every delete succeeded.
+   */
+  async deleteContractInstances(data: ContractInstanceWithAddress[]): Promise<boolean> {
+    return (await Promise.all(data.map(c => this.deleteContractInstance(c)))).every(Boolean);
+  }
+
+  /**
+   * Adds multiple contract instance updates to the store.
+   * @param data - Contract instance updates to add.
+   * @param timestamp - Timestamp at which the updates were scheduled.
+   * @returns True if every insert succeeded.
+   */
+  async addContractInstanceUpdates(data: ContractInstanceUpdateWithAddress[], timestamp: UInt64): Promise<boolean> {
+    return (
+      await Promise.all(data.map((update, logIndex) => this.addContractInstanceUpdate(update, timestamp, logIndex)))
+    ).every(Boolean);
+  }
+
+  /**
+   * Removes multiple contract instance updates from the store.
+   * @param data - Contract instance updates to delete.
+   * @param timestamp - Timestamp at which the updates were scheduled.
+   * @returns True if every delete succeeded.
+   */
+  async deleteContractInstanceUpdates(data: ContractInstanceUpdateWithAddress[], timestamp: UInt64): Promise<boolean> {
+    return (
+      await Promise.all(data.map((update, logIndex) => this.deleteContractInstanceUpdate(update, timestamp, logIndex)))
+    ).every(Boolean);
+  }
+
   addContractInstance(contractInstance: ContractInstanceWithAddress, blockNumber: number): Promise<void> {
     return this.db.transactionAsync(async () => {
       const key = contractInstance.address.toString();
diff --git a/yarn-project/archiver/src/store/data_stores.ts b/yarn-project/archiver/src/store/data_stores.ts
new file mode 100644
index 000000000000..86fe761a5962
--- /dev/null
+++ b/yarn-project/archiver/src/store/data_stores.ts
@@ -0,0 +1,108 @@
+import type { L1BlockId } from '@aztec/ethereum/l1-types';
+import type { AztecAsyncKVStore } from '@aztec/kv-store';
+import type { ContractDataSource } from '@aztec/stdlib/contract';
+
+import { join } from 'path';
+
+import { ArchiverContractDataSourceAdapter } from '../modules/contract_data_source_adapter.js';
+import { BlockStore } from './block_store.js';
+import { ContractClassStore } from './contract_class_store.js';
+import { ContractInstanceStore } from './contract_instance_store.js';
+import { FunctionNamesCache } from './function_names_cache.js';
+import { LogStore } from './log_store.js';
+import { MessageStore } from './message_store.js';
+
+export const ARCHIVER_DB_VERSION = 6;
+
+/**
+ * Represents the latest L1 block processed by the archiver for various objects in L2.
+ */
+export type ArchiverL1SynchPoint = {
+  /** Number of the last L1 block that added a new L2 checkpoint metadata.  */
+  blocksSynchedTo?: bigint;
+  /** Last L1 block checked for L1 to L2 messages. */
+  messagesSynchedTo?: L1BlockId;
+};
+
+/**
+ * Bundle of archiver-owned LMDB substores plus the in-memory caches that span them.
+ *
+ * Replaces the former `KVArchiverDataStore` pass-through wrapper. Callers reach into
+ * the relevant substore directly (e.g. `stores.blocks.getBlock`) and use
+ * {@link createArchiverDataStores} to wire them up against a shared KV store.
+ */
+export type ArchiverDataStores = {
+  /** The underlying key-value store. Use {@link AztecAsyncKVStore.transactionAsync} to compose updates atomically. */
+  db: AztecAsyncKVStore;
+  /** Blocks, checkpoints, tx effects, proven/finalized state. */
+  blocks: BlockStore;
+  /** Public, private and contract class logs. */
+  logs: LogStore;
+  /** L1 to L2 messages and message sync state. */
+  messages: MessageStore;
+  /** Contract classes (with bytecode commitments). */
+  contractClasses: ContractClassStore;
+  /** Contract instances and contract instance updates. */
+  contractInstances: ContractInstanceStore;
+  /** In-memory cache of public function selectors -> names. */
+  functionNames: FunctionNamesCache;
+};
+
+/** Options used by {@link createArchiverDataStores}. */
+export type CreateArchiverDataStoresOptions = {
+  /** Maximum number of logs returned per page when paginating tagged log queries. */
+  logsMaxPageSize?: number;
+};
+
+/**
+ * Wires up the archiver substores against a shared KV store and returns the
+ * {@link ArchiverDataStores} bundle.
+ */
+export function createArchiverDataStores(
+  db: AztecAsyncKVStore,
+  opts: CreateArchiverDataStoresOptions = {},
+): ArchiverDataStores {
+  const blocks = new BlockStore(db);
+  return {
+    db,
+    blocks,
+    logs: new LogStore(db, blocks, opts.logsMaxPageSize ?? 1000),
+    messages: new MessageStore(db),
+    contractClasses: new ContractClassStore(db),
+    contractInstances: new ContractInstanceStore(db),
+    functionNames: new FunctionNamesCache(),
+  };
+}
+
+/**
+ * Returns the L1 sync point of the archiver, combining the block sync point from {@link BlockStore}
+ * and the message sync point from {@link MessageStore}.
+ */
+export async function getArchiverSynchPoint(stores: ArchiverDataStores): Promise<ArchiverL1SynchPoint> {
+  const [blocksSynchedTo, messagesSynchedTo] = await Promise.all([
+    stores.blocks.getSynchedL1BlockNumber(),
+    stores.messages.getSynchedL1Block(),
+  ]);
+  return { blocksSynchedTo, messagesSynchedTo };
+}
+
+/**
+ * Backs up the underlying KV store to the given folder. Returns the path to the resulting db file.
+ */
+export async function backupArchiverDataStores(
+  stores: ArchiverDataStores,
+  path: string,
+  compress = true,
+): Promise<string> {
+  await stores.db.backupTo(path, compress);
+  return join(path, 'data.mdb');
+}
+
+/**
+ * Returns a {@link ContractDataSource} adapter over {@link ArchiverDataStores}.
+ * Used by contexts (e.g. offline epoch re-prover tools) that need a ContractDataSource
+ * but do not need a full archiver instance.
+ */
+export function createContractDataSource(stores: ArchiverDataStores): ContractDataSource {
+  return new ArchiverContractDataSourceAdapter(stores);
+}
diff --git a/yarn-project/archiver/src/store/function_names_cache.ts b/yarn-project/archiver/src/store/function_names_cache.ts
new file mode 100644
index 000000000000..8ab145d64cc6
--- /dev/null
+++ b/yarn-project/archiver/src/store/function_names_cache.ts
@@ -0,0 +1,37 @@
+import { createLogger } from '@aztec/foundation/log';
+import { FunctionSelector } from '@aztec/stdlib/abi';
+
+const MAX_FUNCTION_SIGNATURES = 1000;
+const MAX_FUNCTION_NAME_LEN = 256;
+
+/**
+ * In-memory cache mapping public function selectors to function names.
+ *
+ * Populated opportunistically (e.g. by PXE registering signatures from artifacts) so the
+ * archiver can attach human-readable names to logs and traces. Bounded by
+ * {@link MAX_FUNCTION_SIGNATURES} to avoid unbounded growth from untrusted callers.
+ */
+export class FunctionNamesCache {
+  private readonly log = createLogger('archiver:data-stores');
+  private readonly names: Map<string, string> = new Map();
+
+  /** Adds the given public function signatures to the cache. */
+  public async register(signatures: string[]): Promise<void> {
+    for (const sig of signatures) {
+      if (this.names.size > MAX_FUNCTION_SIGNATURES) {
+        return;
+      }
+      try {
+        const selector = await FunctionSelector.fromSignature(sig);
+        this.names.set(selector.toString(), sig.slice(0, sig.indexOf('(')).slice(0, MAX_FUNCTION_NAME_LEN));
+      } catch {
+        this.log.warn(`Failed to parse signature: ${sig}. Ignoring`);
+      }
+    }
+  }
+
+  /** Looks up a function name for the given selector, or returns undefined if not registered. */
+  public get(selector: FunctionSelector): string | undefined {
+    return this.names.get(selector.toString());
+  }
+}
diff --git a/yarn-project/archiver/src/store/kv_archiver_store.test.ts b/yarn-project/archiver/src/store/kv_archiver_store.test.ts
deleted file mode 100644
index b3c2a718512b..000000000000
--- a/yarn-project/archiver/src/store/kv_archiver_store.test.ts
+++ /dev/null
@@ -1,4286 +0,0 @@
-import {
-  GENESIS_ARCHIVE_ROOT,
-  INITIAL_CHECKPOINT_NUMBER,
-  INITIAL_L2_BLOCK_NUM,
-  NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
-} from '@aztec/constants';
-import {
-  BlockNumber,
-  CheckpointNumber,
-  EpochNumber,
-  IndexWithinCheckpoint,
-  SlotNumber,
-} from '@aztec/foundation/branded-types';
-import { Buffer16, Buffer32 } from '@aztec/foundation/buffer';
-import { randomInt } from '@aztec/foundation/crypto/random';
-import { Fr } from '@aztec/foundation/curves/bn254';
-import { toArray } from '@aztec/foundation/iterable';
-import { sleep } from '@aztec/foundation/sleep';
-import { openTmpStore } from '@aztec/kv-store/lmdb-v2';
-import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import {
-  BlockHash,
-  CheckpointedL2Block,
-  CommitteeAttestation,
-  EthAddress,
-  L2Block,
-  type ValidateCheckpointResult,
-} from '@aztec/stdlib/block';
-import { Checkpoint, PublishedCheckpoint, randomCheckpointInfo } from '@aztec/stdlib/checkpoint';
-import {
-  type ContractClassPublic,
-  type ContractClassPublicWithCommitment,
-  type ContractInstanceWithAddress,
-  SerializableContractInstance,
-  computePublicBytecodeCommitment,
-} from '@aztec/stdlib/contract';
-import { MAX_LOGS_PER_TAG } from '@aztec/stdlib/interfaces/api-limit';
-import { ContractClassLog, LogId } from '@aztec/stdlib/logs';
-import { CheckpointHeader } from '@aztec/stdlib/rollup';
-import { makeContractClassPublic } from '@aztec/stdlib/testing';
-import '@aztec/stdlib/testing/jest';
-import { AppendOnlyTreeSnapshot } from '@aztec/stdlib/trees';
-import { type IndexedTxEffect, TxHash } from '@aztec/stdlib/tx';
-
-import {
-  BlockAlreadyCheckpointedError,
-  BlockArchiveNotConsistentError,
-  BlockIndexNotSequentialError,
-  BlockNumberNotSequentialError,
-  CannotOverwriteCheckpointedBlockError,
-  CheckpointNumberNotSequentialError,
-  InitialCheckpointNumberNotSequentialError,
-  L1ToL2MessagesNotReadyError,
-  OutOfOrderLogInsertionError,
-} from '../errors.js';
-import { MessageStoreError } from '../store/message_store.js';
-import type { InboxMessage } from '../structs/inbox_message.js';
-import {
-  makeChainedCheckpoints,
-  makeCheckpointWithLogs,
-  makeInboxMessage,
-  makeInboxMessages,
-  makeInboxMessagesWithFullBlocks,
-  makeL1PublishedData,
-  makePrivateLog,
-  makePrivateLogTag,
-  makePublicLog,
-  makePublicLogTag,
-  makePublishedCheckpoint,
-  makeStateForBlock,
-} from '../test/mock_structs.js';
-import { type ArchiverL1SynchPoint, KVArchiverDataStore } from './kv_archiver_store.js';
-import { L2TipsCache } from './l2_tips_cache.js';
-
-async function addProposedBlocks(
-  store: KVArchiverDataStore,
-  blocks: L2Block[],
-  opts?: { force?: boolean },
-): Promise<boolean> {
-  let result = true;
-  for (const block of blocks) {
-    result = (await store.addProposedBlock(block, opts)) && result;
-  }
-  return result;
-}
-
-async function withCommitment(contractClass: ContractClassPublic): Promise<ContractClassPublicWithCommitment> {
-  return {
-    ...contractClass,
-    publicBytecodeCommitment: await computePublicBytecodeCommitment(contractClass.packedBytecode),
-  };
-}
-
-describe('KVArchiverDataStore', () => {
-  let store: KVArchiverDataStore;
-  let publishedCheckpoints: PublishedCheckpoint[];
-
-  const blockNumberTests: [number, () => L2Block][] = [
-    [1, () => publishedCheckpoints[0].checkpoint.blocks[0]],
-    [10, () => publishedCheckpoints[9].checkpoint.blocks[0]],
-    [5, () => publishedCheckpoints[4].checkpoint.blocks[0]],
-  ];
-
-  const expectCheckpointedBlockEquals = (
-    actual: CheckpointedL2Block,
-    expectedBlock: L2Block,
-    expectedCheckpoint: PublishedCheckpoint,
-  ) => {
-    expect(actual.l1).toEqual(expectedCheckpoint.l1);
-    expect(actual.block.header.equals(expectedBlock.header)).toBe(true);
-    expect(actual.checkpointNumber).toEqual(expectedCheckpoint.checkpoint.number);
-    expect(actual.attestations.every((a, i) => a.equals(expectedCheckpoint.attestations[i]))).toBe(true);
-  };
-
-  beforeEach(async () => {
-    store = new KVArchiverDataStore(await openTmpStore('archiver_test'), 1000);
-    // Create checkpoints sequentially to ensure archive roots are chained properly.
-    // Each block's header.lastArchive must equal the previous block's archive.
-    publishedCheckpoints = [];
-    const txsPerBlock = 4;
-    for (let i = 0; i < 10; i++) {
-      const blockNumber = i + 1;
-      const previousArchive = i > 0 ? publishedCheckpoints[i - 1].checkpoint.blocks[0].archive : undefined;
-      const checkpoint = await Checkpoint.random(CheckpointNumber(i + 1), {
-        numBlocks: 1,
-        startBlockNumber: blockNumber,
-        previousArchive,
-        txsPerBlock,
-        state: makeStateForBlock(blockNumber, txsPerBlock),
-        // Ensure each tx has public logs for getPublicLogs tests
-        txOptions: { numPublicCallsPerTx: 2, numPublicLogsPerCall: 2 },
-      });
-      publishedCheckpoints.push(makePublishedCheckpoint(checkpoint, i + 10));
-    }
-  });
-
-  describe('addCheckpoints', () => {
-    it('returns success when adding checkpoints', async () => {
-      await expect(store.addCheckpoints(publishedCheckpoints)).resolves.toBe(true);
-    });
-
-    it('accepts duplicate checkpoints with matching archives and updates L1 info', async () => {
-      // Add first 3 checkpoints
-      const first3 = publishedCheckpoints.slice(0, 3);
-      await store.addCheckpoints(first3);
-
-      // Verify initial L1 block number for checkpoint 3
-      const beforeData = await store.getCheckpointData(CheckpointNumber(3));
-      expect(beforeData).toBeDefined();
-      const originalL1Block = beforeData!.l1.blockNumber;
-
-      // Re-add checkpoint 3 with the same content but different L1 published data
-      // This simulates an L1 reorg that moved the checkpoint to a different L1 block
-      const cp3WithNewL1 = new PublishedCheckpoint(
-        first3[2].checkpoint,
-        makeL1PublishedData(999),
-        first3[2].attestations,
-      );
-      // Also add checkpoint 4 (the next one) in the same batch
-      await store.addCheckpoints([cp3WithNewL1, publishedCheckpoints[3]]);
-
-      // Checkpoint 3's L1 info should be updated
-      const afterData = await store.getCheckpointData(CheckpointNumber(3));
-      expect(afterData).toBeDefined();
-      expect(afterData!.l1.blockNumber).toEqual(999n);
-      expect(afterData!.l1.blockNumber).not.toEqual(originalL1Block);
-
-      // Checkpoint 4 should be stored
-      expect(await store.getSynchedCheckpointNumber()).toEqual(CheckpointNumber(4));
-    });
-
-    it('accepts a batch that is entirely already-stored checkpoints', async () => {
-      const first3 = publishedCheckpoints.slice(0, 3);
-      await store.addCheckpoints(first3);
-
-      // Re-add the same 3 checkpoints — should succeed without error
-      await expect(store.addCheckpoints(first3)).resolves.toBe(true);
-    });
-
-    it('throws on duplicate checkpoints with mismatching archives', async () => {
-      const first3 = publishedCheckpoints.slice(0, 3);
-      await store.addCheckpoints(first3);
-
-      // Create a fake checkpoint 3 with a different archive root (content mismatch)
-      const differentCheckpoint3 = await Checkpoint.random(CheckpointNumber(3), {
-        numBlocks: 1,
-        startBlockNumber: 3,
-      });
-      const mismatchedCp3 = makePublishedCheckpoint(differentCheckpoint3, 999);
-      await expect(store.addCheckpoints([mismatchedCp3])).rejects.toThrow(
-        'already exists in store but with a different archive',
-      );
-    });
-
-    it('throws an error if the previous block does not exist in the store', async () => {
-      const checkpoint = await Checkpoint.random(CheckpointNumber(2), { numBlocks: 1, startBlockNumber: 2 });
-      const block = makePublishedCheckpoint(checkpoint, 2);
-      await expect(store.addCheckpoints([block])).rejects.toThrow(InitialCheckpointNumberNotSequentialError);
-      await expect(store.getCheckpointedBlock(BlockNumber(1))).resolves.toBeUndefined();
-    });
-
-    it('throws an error if there is a gap in the blocks being added', async () => {
-      const checkpoint1 = await Checkpoint.random(CheckpointNumber(1), { numBlocks: 1, startBlockNumber: 1 });
-      const checkpoint3 = await Checkpoint.random(CheckpointNumber(3), { numBlocks: 1, startBlockNumber: 3 });
-      const checkpoints = [makePublishedCheckpoint(checkpoint1, 1), makePublishedCheckpoint(checkpoint3, 3)];
-      await expect(store.addCheckpoints(checkpoints)).rejects.toThrow(CheckpointNumberNotSequentialError);
-      await expect(store.getCheckpointedBlock(BlockNumber(1))).resolves.toBeUndefined();
-    });
-
-    it('throws an error if blocks within a checkpoint are not sequential', async () => {
-      // Create a checkpoint with non-sequential block numbers (block 1 and block 3, skipping block 2)
-      const block1 = await L2Block.random(BlockNumber(1), { checkpointNumber: CheckpointNumber(1) });
-      const block3 = await L2Block.random(BlockNumber(3), { checkpointNumber: CheckpointNumber(1) });
-
-      const checkpoint = new Checkpoint(
-        AppendOnlyTreeSnapshot.random(),
-        CheckpointHeader.random(),
-        [block1, block3],
-        CheckpointNumber(1),
-      );
-      const publishedCheckpoint = makePublishedCheckpoint(checkpoint, 10);
-
-      await expect(store.addCheckpoints([publishedCheckpoint])).rejects.toThrow(BlockNumberNotSequentialError);
-      await expect(store.getCheckpointedBlock(BlockNumber(1))).resolves.toBeUndefined();
-    });
-
-    it('throws an error if blocks within a checkpoint do not have sequential indexes', async () => {
-      // Create a checkpoint with non-sequential indexes
-      const block1 = await L2Block.random(BlockNumber(1), {
-        checkpointNumber: CheckpointNumber(1),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-      });
-      const block3 = await L2Block.random(BlockNumber(2), {
-        checkpointNumber: CheckpointNumber(1),
-        indexWithinCheckpoint: IndexWithinCheckpoint(2),
-      });
-
-      const checkpoint = new Checkpoint(
-        AppendOnlyTreeSnapshot.random(),
-        CheckpointHeader.random(),
-        [block1, block3],
-        CheckpointNumber(1),
-      );
-      const publishedCheckpoint = makePublishedCheckpoint(checkpoint, 10);
-
-      await expect(store.addCheckpoints([publishedCheckpoint])).rejects.toThrow(BlockIndexNotSequentialError);
-      await expect(store.getCheckpointedBlock(BlockNumber(1))).resolves.toBeUndefined();
-    });
-
-    it('throws an error if blocks within a checkpoint do not start from index 0', async () => {
-      // Create a checkpoint with non-sequential indexes
-      const block1 = await L2Block.random(BlockNumber(1), {
-        checkpointNumber: CheckpointNumber(1),
-        indexWithinCheckpoint: IndexWithinCheckpoint(1),
-      });
-      const block3 = await L2Block.random(BlockNumber(2), {
-        checkpointNumber: CheckpointNumber(1),
-        indexWithinCheckpoint: IndexWithinCheckpoint(2),
-      });
-
-      const checkpoint = new Checkpoint(
-        AppendOnlyTreeSnapshot.random(),
-        CheckpointHeader.random(),
-        [block1, block3],
-        CheckpointNumber(1),
-      );
-      const publishedCheckpoint = makePublishedCheckpoint(checkpoint, 10);
-
-      await expect(store.addCheckpoints([publishedCheckpoint])).rejects.toThrow(BlockIndexNotSequentialError);
-      await expect(store.getCheckpointedBlock(BlockNumber(1))).resolves.toBeUndefined();
-    });
-
-    it('throws an error if block has invalid checkpoint index', async () => {
-      // Create a block wit an invalid checkpoint index
-      const block1 = await L2Block.random(BlockNumber(1), {
-        checkpointNumber: CheckpointNumber(1),
-        indexWithinCheckpoint: -1 as IndexWithinCheckpoint,
-      });
-
-      const checkpoint = new Checkpoint(
-        AppendOnlyTreeSnapshot.random(),
-        CheckpointHeader.random(),
-        [block1],
-        CheckpointNumber(1),
-      );
-      const publishedCheckpoint = makePublishedCheckpoint(checkpoint, 10);
-
-      await expect(store.addCheckpoints([publishedCheckpoint])).rejects.toThrow(BlockIndexNotSequentialError);
-      await expect(store.getCheckpointedBlock(BlockNumber(BlockNumber(1)))).resolves.toBeUndefined();
-    });
-
-    it('throws an error if checkpoint has invalid initial number', async () => {
-      const block1 = await L2Block.random(BlockNumber(1), {
-        checkpointNumber: CheckpointNumber(2),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-      });
-
-      const checkpoint = new Checkpoint(
-        AppendOnlyTreeSnapshot.random(),
-        CheckpointHeader.random(),
-        [block1],
-        CheckpointNumber(2),
-      );
-      const publishedCheckpoint = makePublishedCheckpoint(checkpoint, 10);
-
-      await expect(store.addCheckpoints([publishedCheckpoint])).rejects.toThrow(
-        InitialCheckpointNumberNotSequentialError,
-      );
-    });
-
-    it('allows the correct initial checkpoint', async () => {
-      const block1 = await L2Block.random(BlockNumber(1), {
-        checkpointNumber: CheckpointNumber(1),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-      });
-
-      const checkpoint = new Checkpoint(
-        AppendOnlyTreeSnapshot.random(),
-        CheckpointHeader.random(),
-        [block1],
-        CheckpointNumber(1),
-      );
-      const publishedCheckpoint = makePublishedCheckpoint(checkpoint, 10);
-
-      await expect(store.addCheckpoints([publishedCheckpoint])).resolves.toBe(true);
-    });
-
-    it('throws on duplicate checkpoint with different content', async () => {
-      const block1 = await L2Block.random(BlockNumber(1), {
-        checkpointNumber: CheckpointNumber(1),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-      });
-
-      const block2 = await L2Block.random(BlockNumber(1), {
-        checkpointNumber: CheckpointNumber(1),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-      });
-
-      const checkpoint = new Checkpoint(
-        AppendOnlyTreeSnapshot.random(),
-        CheckpointHeader.random(),
-        [block1],
-        CheckpointNumber(1),
-      );
-      const publishedCheckpoint = makePublishedCheckpoint(checkpoint, 10);
-
-      const checkpoint2 = new Checkpoint(
-        AppendOnlyTreeSnapshot.random(),
-        CheckpointHeader.random(),
-        [block2],
-        CheckpointNumber(1),
-      );
-      const publishedCheckpoint2 = makePublishedCheckpoint(checkpoint2, 10);
-
-      await expect(store.addCheckpoints([publishedCheckpoint])).resolves.toBe(true);
-      await expect(store.addCheckpoints([publishedCheckpoint2])).rejects.toThrow(
-        'already exists in store but with a different archive',
-      );
-    });
-
-    it('throws when crossing checkpoint boundary with non-zero index on first block', async () => {
-      // Checkpoint 1: block 1
-      const cp1 = await Checkpoint.random(CheckpointNumber(1), { numBlocks: 1, startBlockNumber: 1 });
-      const cp1Published = makePublishedCheckpoint(cp1, 10);
-
-      // Checkpoint 2: block 2 has indexWithinCheckpoint=1 (should be 0 for first block in new checkpoint)
-      const block2 = await L2Block.random(BlockNumber(2), {
-        checkpointNumber: CheckpointNumber(2),
-        indexWithinCheckpoint: IndexWithinCheckpoint(1),
-        lastArchive: cp1.blocks[0].archive,
-      });
-      const cp2 = new Checkpoint(
-        AppendOnlyTreeSnapshot.random(),
-        CheckpointHeader.random(),
-        [block2],
-        CheckpointNumber(2),
-      );
-      const cp2Published = makePublishedCheckpoint(cp2, 20);
-
-      await expect(store.addCheckpoints([cp1Published, cp2Published])).rejects.toThrow(BlockIndexNotSequentialError);
-    });
-
-    it('accepts blocks that properly cross checkpoint boundaries', async () => {
-      // Checkpoint 1: blocks 1-2, Checkpoint 2: blocks 3-4 — proper boundary crossing
-      const genesisArchive = new AppendOnlyTreeSnapshot(new Fr(GENESIS_ARCHIVE_ROOT), 1);
-      const checkpoints = await makeChainedCheckpoints(2, {
-        previousArchive: genesisArchive,
-        blocksPerCheckpoint: 2,
-      });
-
-      await expect(store.addCheckpoints(checkpoints)).resolves.toBe(true);
-
-      // Verify blocks have correct checkpoint assignments
-      const block1 = await store.getCheckpointedBlock(BlockNumber(1));
-      const block2 = await store.getCheckpointedBlock(BlockNumber(2));
-      const block3 = await store.getCheckpointedBlock(BlockNumber(3));
-      const block4 = await store.getCheckpointedBlock(BlockNumber(4));
-
-      expect(block1!.checkpointNumber).toBe(1);
-      expect(block2!.checkpointNumber).toBe(1);
-      expect(block3!.checkpointNumber).toBe(2);
-      expect(block4!.checkpointNumber).toBe(2);
-    });
-  });
-
-  describe('removeCheckpointsAfter', () => {
-    it('removing checkpoints will remove checkpoints from the chain', async () => {
-      await store.addCheckpoints(publishedCheckpoints);
-      const checkpointNumber = await store.getSynchedCheckpointNumber();
-      const lastCheckpoint = publishedCheckpoints.at(-1)!;
-      const lastBlockNumber = lastCheckpoint.checkpoint.blocks[0].number;
-
-      // Verify block exists before removing
-      const retrievedBlock = await store.getCheckpointedBlock(BlockNumber(BlockNumber(lastBlockNumber)));
-      expect(retrievedBlock).toBeDefined();
-      expect(retrievedBlock!.block.header.equals(lastCheckpoint.checkpoint.blocks[0].header)).toBe(true);
-      expect(retrievedBlock!.checkpointNumber).toEqual(checkpointNumber);
-
-      await store.removeCheckpointsAfter(CheckpointNumber(checkpointNumber - 1));
-
-      expect(await store.getSynchedCheckpointNumber()).toBe(checkpointNumber - 1);
-      await expect(store.getCheckpointedBlock(BlockNumber(BlockNumber(lastBlockNumber)))).resolves.toBeUndefined();
-    });
-
-    it('can remove multiple checkpoints', async () => {
-      // Create checkpoints sequentially to chain archive roots
-      const emptyCheckpoints: PublishedCheckpoint[] = [];
-      for (let i = 0; i < 10; i++) {
-        const previousArchive = i > 0 ? emptyCheckpoints[i - 1].checkpoint.blocks[0].archive : undefined;
-        const checkpoint = await Checkpoint.random(CheckpointNumber(i + 1), {
-          numBlocks: 1,
-          startBlockNumber: i + 1,
-          txsPerBlock: 0,
-          previousArchive,
-        });
-        emptyCheckpoints.push(makePublishedCheckpoint(checkpoint, i + 10));
-      }
-      await store.addCheckpoints(emptyCheckpoints);
-      expect(await store.getSynchedCheckpointNumber()).toBe(10);
-
-      await store.removeCheckpointsAfter(CheckpointNumber(7));
-      expect(await store.getSynchedCheckpointNumber()).toBe(7);
-      expect((await store.getRangeOfCheckpoints(CheckpointNumber(1), 10)).map(b => b.checkpointNumber)).toEqual([
-        1, 2, 3, 4, 5, 6, 7,
-      ]);
-    });
-
-    it('removed blocks and headers cannot be retrieved by hash or archive', async () => {
-      await store.addCheckpoints(publishedCheckpoints);
-      const lastCheckpoint = publishedCheckpoints[publishedCheckpoints.length - 1];
-      const lastBlock = lastCheckpoint.checkpoint.blocks[0];
-      const blockHash = await lastBlock.header.hash();
-      const archive = lastBlock.archive.root;
-
-      // Verify block and header exist before removing
-      const retrievedByHash = await store.getCheckpointedBlockByHash(blockHash);
-      expect(retrievedByHash).toBeDefined();
-      expect(retrievedByHash!.block.header.equals(lastBlock.header)).toBe(true);
-
-      const retrievedByArchive = await store.getCheckpointedBlockByArchive(archive);
-      expect(retrievedByArchive).toBeDefined();
-      expect(retrievedByArchive!.block.header.equals(lastBlock.header)).toBe(true);
-
-      const headerByHash = await store.getBlockHeaderByHash(blockHash);
-      expect(headerByHash).toBeDefined();
-      expect(headerByHash!.equals(lastBlock.header)).toBe(true);
-
-      const headerByArchive = await store.getBlockHeaderByArchive(archive);
-      expect(headerByArchive).toBeDefined();
-      expect(headerByArchive!.equals(lastBlock.header)).toBe(true);
-
-      // Remove the checkpoint
-      await store.removeCheckpointsAfter(CheckpointNumber(lastCheckpoint.checkpoint.number - 1));
-
-      // Verify neither block nor header can be retrieved after removal
-      expect(await store.getCheckpointedBlockByHash(blockHash)).toBeUndefined();
-      expect(await store.getCheckpointedBlockByArchive(archive)).toBeUndefined();
-      expect(await store.getBlockHeaderByHash(blockHash)).toBeUndefined();
-      expect(await store.getBlockHeaderByArchive(archive)).toBeUndefined();
-    });
-
-    it('orphaned blocks are removed when removing checkpoints', async () => {
-      // This test covers the scenario where:
-      // 1. Checkpoint 1 is added (with block 1)
-      // 2. Block 2 is added locally for upcoming checkpoint 2 (but checkpoint 2 doesn't exist yet)
-      // 3. Checkpoint 1 is removed due to L1 reorg
-      // 4. Block 2 should also be removed, even though it's not associated with any checkpoint entry
-
-      // Add checkpoint 1 with block 1
-      const checkpoint1Cp = await Checkpoint.random(CheckpointNumber(1), { numBlocks: 1, startBlockNumber: 1 });
-      const checkpoint1 = makePublishedCheckpoint(checkpoint1Cp, 10);
-      await store.addCheckpoints([checkpoint1]);
-
-      expect(await store.getSynchedCheckpointNumber()).toBe(1);
-      expect(await store.getLatestBlockNumber()).toBe(1);
-      expect(await store.getCheckpointedL2BlockNumber()).toBe(1);
-
-      // Add block 2 locally for upcoming checkpoint 2 (no checkpoint entry yet)
-      const lastBlockArchive = checkpoint1.checkpoint.blocks[0].archive;
-      const block2 = await L2Block.random(BlockNumber(2), {
-        checkpointNumber: CheckpointNumber(2),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-        lastArchive: lastBlockArchive,
-      });
-      await store.addProposedBlock(block2);
-
-      // Verify state: checkpoint 1 exists, block 2 exists but is orphaned (no checkpoint 2)
-      expect(await store.getSynchedCheckpointNumber()).toBe(1);
-      expect(await store.getLatestBlockNumber()).toBe(2);
-      expect(await store.getCheckpointedL2BlockNumber()).toBe(1);
-      expect(await store.getBlock(BlockNumber(2))).toBeDefined();
-
-      // Remove checkpoint 1 (simulating L1 reorg)
-      await store.removeCheckpointsAfter(CheckpointNumber(0));
-
-      // Verify that BOTH block 1 (from checkpoint) AND block 2 (orphaned) are removed
-      expect(await store.getSynchedCheckpointNumber()).toBe(0);
-      expect(await store.getLatestBlockNumber()).toBe(0);
-      expect(await store.getCheckpointedL2BlockNumber()).toBe(0);
-      expect(await store.getBlock(BlockNumber(1))).toBeUndefined();
-      expect(await store.getBlock(BlockNumber(2))).toBeUndefined();
-    });
-
-    it('multiple orphaned blocks are removed when removing checkpoints', async () => {
-      // Similar to above but with multiple orphaned blocks
-      // Add checkpoint 1 with block 1
-      const checkpoint1Cp = await Checkpoint.random(CheckpointNumber(1), { numBlocks: 1, startBlockNumber: 1 });
-      const checkpoint1 = makePublishedCheckpoint(checkpoint1Cp, 10);
-      await store.addCheckpoints([checkpoint1]);
-
-      // Add blocks 2, 3, 4 locally for upcoming checkpoint 2
-      const lastBlockArchive = checkpoint1.checkpoint.blocks[0].archive;
-      const block2 = await L2Block.random(BlockNumber(2), {
-        checkpointNumber: CheckpointNumber(2),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-        lastArchive: lastBlockArchive,
-      });
-      const block3 = await L2Block.random(BlockNumber(3), {
-        checkpointNumber: CheckpointNumber(2),
-        indexWithinCheckpoint: IndexWithinCheckpoint(1),
-        lastArchive: block2.archive,
-      });
-      const block4 = await L2Block.random(BlockNumber(4), {
-        checkpointNumber: CheckpointNumber(2),
-        indexWithinCheckpoint: IndexWithinCheckpoint(2),
-        lastArchive: block3.archive,
-      });
-      await addProposedBlocks(store, [block2, block3, block4]);
-
-      expect(await store.getSynchedCheckpointNumber()).toBe(1);
-      expect(await store.getLatestBlockNumber()).toBe(4);
-
-      // Remove checkpoint 1
-      await store.removeCheckpointsAfter(CheckpointNumber(0));
-
-      // All blocks should be removed
-      expect(await store.getSynchedCheckpointNumber()).toBe(0);
-      expect(await store.getLatestBlockNumber()).toBe(0);
-      for (let i = 1; i <= 4; i++) {
-        expect(await store.getBlock(BlockNumber(i))).toBeUndefined();
-      }
-    });
-  });
-
-  describe('multi-block checkpoints', () => {
-    it('block number increases correctly when adding checkpoints with multiple blocks', async () => {
-      // Create 3 checkpoints: first with 2 blocks, second with 3 blocks, third with 1 block
-      // Total blocks: 6, spanning block numbers 1-6
-      // Chain archive roots across checkpoints
-      const checkpoint1Cp = await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 });
-      const checkpoint1 = makePublishedCheckpoint(checkpoint1Cp, 10);
-
-      const previousArchive1 = checkpoint1Cp.blocks.at(-1)!.archive;
-      const checkpoint2Cp = await Checkpoint.random(CheckpointNumber(2), {
-        numBlocks: 3,
-        startBlockNumber: 3,
-        previousArchive: previousArchive1,
-      });
-      const checkpoint2 = makePublishedCheckpoint(checkpoint2Cp, 11);
-
-      const previousArchive2 = checkpoint2Cp.blocks.at(-1)!.archive;
-      const checkpoint3Cp = await Checkpoint.random(CheckpointNumber(3), {
-        numBlocks: 1,
-        startBlockNumber: 6,
-        previousArchive: previousArchive2,
-      });
-      const checkpoint3 = makePublishedCheckpoint(checkpoint3Cp, 12);
-
-      await store.addCheckpoints([checkpoint1, checkpoint2, checkpoint3]);
-
-      // Checkpoint number should be 3 (the last checkpoint number)
-      expect(await store.getSynchedCheckpointNumber()).toBe(3);
-      // Block number should be 6 (the last block number across all checkpoints)
-      expect(await store.getLatestBlockNumber()).toBe(6);
-    });
-
-    it('block number decreases correctly when unwinding checkpoints with multiple blocks', async () => {
-      // Create 3 checkpoints with varying block counts, chaining archive roots
-      const checkpoint1Cp = await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 });
-      const checkpoint1 = makePublishedCheckpoint(checkpoint1Cp, 10);
-
-      const previousArchive1 = checkpoint1Cp.blocks.at(-1)!.archive;
-      const checkpoint2Cp = await Checkpoint.random(CheckpointNumber(2), {
-        numBlocks: 3,
-        startBlockNumber: 3,
-        previousArchive: previousArchive1,
-      });
-      const checkpoint2 = makePublishedCheckpoint(checkpoint2Cp, 11);
-
-      const previousArchive2 = checkpoint2Cp.blocks.at(-1)!.archive;
-      const checkpoint3Cp = await Checkpoint.random(CheckpointNumber(3), {
-        numBlocks: 2,
-        startBlockNumber: 6,
-        previousArchive: previousArchive2,
-      });
-      const checkpoint3 = makePublishedCheckpoint(checkpoint3Cp, 12);
-
-      await store.addCheckpoints([checkpoint1, checkpoint2, checkpoint3]);
-
-      expect(await store.getSynchedCheckpointNumber()).toBe(3);
-      expect(await store.getLatestBlockNumber()).toBe(7);
-
-      // Remove the last checkpoint (which has 2 blocks)
-      await store.removeCheckpointsAfter(CheckpointNumber(2));
-
-      expect(await store.getSynchedCheckpointNumber()).toBe(2);
-      expect(await store.getLatestBlockNumber()).toBe(5);
-
-      // Remove another checkpoint (which has 3 blocks)
-      await store.removeCheckpointsAfter(CheckpointNumber(1));
-
-      expect(await store.getSynchedCheckpointNumber()).toBe(1);
-      expect(await store.getLatestBlockNumber()).toBe(2);
-    });
-
-    it('removing multiple checkpoints with multiple blocks in one go', async () => {
-      // Create 4 checkpoints with varying block counts, chaining archive roots
-      // Checkpoint 1: blocks 1-2 (2 blocks)
-      // Checkpoint 2: blocks 3-5 (3 blocks)
-      // Checkpoint 3: blocks 6-7 (2 blocks)
-      // Checkpoint 4: blocks 8-10 (3 blocks)
-      // Total: 10 blocks across 4 checkpoints
-      const checkpoint1Cp = await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 });
-      const checkpoint1 = makePublishedCheckpoint(checkpoint1Cp, 10);
-
-      const previousArchive1 = checkpoint1Cp.blocks.at(-1)!.archive;
-      const checkpoint2Cp = await Checkpoint.random(CheckpointNumber(2), {
-        numBlocks: 3,
-        startBlockNumber: 3,
-        previousArchive: previousArchive1,
-      });
-      const checkpoint2 = makePublishedCheckpoint(checkpoint2Cp, 11);
-
-      const previousArchive2 = checkpoint2Cp.blocks.at(-1)!.archive;
-      const checkpoint3Cp = await Checkpoint.random(CheckpointNumber(3), {
-        numBlocks: 2,
-        startBlockNumber: 6,
-        previousArchive: previousArchive2,
-      });
-      const checkpoint3 = makePublishedCheckpoint(checkpoint3Cp, 12);
-
-      const previousArchive3 = checkpoint3Cp.blocks.at(-1)!.archive;
-      const checkpoint4Cp = await Checkpoint.random(CheckpointNumber(4), {
-        numBlocks: 3,
-        startBlockNumber: 8,
-        previousArchive: previousArchive3,
-      });
-      const checkpoint4 = makePublishedCheckpoint(checkpoint4Cp, 13);
-
-      await store.addCheckpoints([checkpoint1, checkpoint2, checkpoint3, checkpoint4]);
-
-      expect(await store.getSynchedCheckpointNumber()).toBe(4);
-      expect(await store.getLatestBlockNumber()).toBe(10);
-
-      // Remove checkpoints 3 and 4 (which together have 5 blocks)
-      await store.removeCheckpointsAfter(CheckpointNumber(2));
-
-      expect(await store.getSynchedCheckpointNumber()).toBe(2);
-      expect(await store.getLatestBlockNumber()).toBe(5);
-
-      // Verify blocks 1-5 still exist (from checkpoints 1 and 2)
-      for (let blockNumber = 1; blockNumber <= 5; blockNumber++) {
-        expect(await store.getCheckpointedBlock(BlockNumber(BlockNumber(blockNumber)))).toBeDefined();
-      }
-
-      // Verify blocks 6-10 are gone (from checkpoints 3 and 4)
-      for (let blockNumber = 6; blockNumber <= 10; blockNumber++) {
-        expect(await store.getCheckpointedBlock(BlockNumber(BlockNumber(blockNumber)))).toBeUndefined();
-      }
-
-      // Remove remaining checkpoints 1 and 2 (which together have 5 blocks)
-      await store.removeCheckpointsAfter(CheckpointNumber(0));
-
-      expect(await store.getSynchedCheckpointNumber()).toBe(0);
-      expect(await store.getLatestBlockNumber()).toBe(0);
-
-      // Verify all blocks are gone
-      for (let blockNumber = 1; blockNumber <= 10; blockNumber++) {
-        expect(await store.getCheckpointedBlock(BlockNumber(BlockNumber(blockNumber)))).toBeUndefined();
-      }
-    });
-
-    it('getCheckpointedBlock returns correct checkpoint info for blocks within multi-block checkpoints', async () => {
-      // Create checkpoints with chained archive roots
-      // Create a checkpoint with 3 blocks
-      const checkpoint1Cp = await Checkpoint.random(CheckpointNumber(1), { numBlocks: 3, startBlockNumber: 1 });
-      const checkpoint1 = makePublishedCheckpoint(checkpoint1Cp, 10);
-
-      // Create another checkpoint with 2 blocks
-      const previousArchive1 = checkpoint1Cp.blocks.at(-1)!.archive;
-      const checkpoint2Cp = await Checkpoint.random(CheckpointNumber(2), {
-        numBlocks: 2,
-        startBlockNumber: 4,
-        previousArchive: previousArchive1,
-      });
-      const checkpoint2 = makePublishedCheckpoint(checkpoint2Cp, 11);
-
-      await store.addCheckpoints([checkpoint1, checkpoint2]);
-
-      // Check blocks from the first checkpoint (blocks 1, 2, 3)
-      for (let i = 0; i < 3; i++) {
-        const blockNumber = i + 1;
-        const retrievedBlock = await store.getCheckpointedBlock(BlockNumber(BlockNumber(blockNumber)));
-
-        expect(retrievedBlock).toBeDefined();
-        expect(retrievedBlock!.checkpointNumber).toBe(1);
-        expect(retrievedBlock!.block.number).toBe(blockNumber);
-        expect(retrievedBlock!.l1).toEqual(checkpoint1.l1);
-        expect(retrievedBlock!.attestations.every((a, j) => a.equals(checkpoint1.attestations[j]))).toBe(true);
-      }
-
-      // Check blocks from the second checkpoint (blocks 4, 5)
-      for (let i = 0; i < 2; i++) {
-        const blockNumber = i + 4;
-        const retrievedBlock = await store.getCheckpointedBlock(BlockNumber(BlockNumber(blockNumber)));
-
-        expect(retrievedBlock).toBeDefined();
-        expect(retrievedBlock!.checkpointNumber).toBe(2);
-        expect(retrievedBlock!.block.number).toBe(blockNumber);
-        expect(retrievedBlock!.l1).toEqual(checkpoint2.l1);
-        expect(retrievedBlock!.attestations.every((a, j) => a.equals(checkpoint2.attestations[j]))).toBe(true);
-      }
-    });
-
-    it('getCheckpointedBlockByHash returns correct checkpoint info for blocks within multi-block checkpoints', async () => {
-      const checkpoint = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 3, startBlockNumber: 1 }),
-        10,
-      );
-
-      await store.addCheckpoints([checkpoint]);
-
-      // Check each block by its hash
-      for (let i = 0; i < checkpoint.checkpoint.blocks.length; i++) {
-        const block = checkpoint.checkpoint.blocks[i];
-        const blockHash = await block.header.hash();
-        const retrievedBlock = await store.getCheckpointedBlockByHash(blockHash);
-
-        expect(retrievedBlock).toBeDefined();
-        expect(retrievedBlock!.checkpointNumber).toBe(1);
-        expect(retrievedBlock!.block.number).toBe(i + 1);
-        expect(retrievedBlock!.l1).toEqual(checkpoint.l1);
-      }
-    });
-
-    it('getCheckpointedBlockByArchive returns correct checkpoint info for blocks within multi-block checkpoints', async () => {
-      const checkpoint = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 3, startBlockNumber: 1 }),
-        10,
-      );
-
-      await store.addCheckpoints([checkpoint]);
-
-      // Check each block by its archive root
-      for (let i = 0; i < checkpoint.checkpoint.blocks.length; i++) {
-        const block = checkpoint.checkpoint.blocks[i];
-        const archive = block.archive.root;
-        const retrievedBlock = await store.getCheckpointedBlockByArchive(archive);
-
-        expect(retrievedBlock).toBeDefined();
-        expect(retrievedBlock!.checkpointNumber).toBe(1);
-        expect(retrievedBlock!.block.number).toBe(i + 1);
-        expect(retrievedBlock!.l1).toEqual(checkpoint.l1);
-      }
-    });
-
-    it('removing a multi-block checkpoint removes all its blocks', async () => {
-      const checkpoint = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 3, startBlockNumber: 1 }),
-        10,
-      );
-
-      await store.addCheckpoints([checkpoint]);
-
-      // Verify all 3 blocks exist
-      for (let blockNumber = 1; blockNumber <= 3; blockNumber++) {
-        expect(await store.getCheckpointedBlock(BlockNumber(blockNumber))).toBeDefined();
-      }
-
-      // Remove the checkpoint
-      await store.removeCheckpointsAfter(CheckpointNumber(0));
-
-      // Verify all 3 blocks are removed
-      for (let blockNumber = 1; blockNumber <= 3; blockNumber++) {
-        expect(await store.getCheckpointedBlock(BlockNumber(blockNumber))).toBeUndefined();
-      }
-
-      expect(await store.getSynchedCheckpointNumber()).toBe(0);
-      expect(await store.getLatestBlockNumber()).toBe(0);
-    });
-  });
-
-  describe('uncheckpointed blocks', () => {
-    it('can add blocks independently before a checkpoint arrives', async () => {
-      // First, establish some checkpointed blocks (checkpoint 1 with blocks 1-3)
-      const checkpoint1 = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 3, startBlockNumber: 1 }),
-        10,
-      );
-      await store.addCheckpoints([checkpoint1]);
-
-      expect(await store.getSynchedCheckpointNumber()).toBe(1);
-      expect(await store.getLatestBlockNumber()).toBe(3);
-
-      // Now add blocks 4, 5, 6 independently (without a checkpoint) for upcoming checkpoint 2
-      // Chain archive roots from the last block of checkpoint 1
-      const lastBlockArchive = checkpoint1.checkpoint.blocks.at(-1)!.archive;
-      const block4 = await L2Block.random(BlockNumber(4), {
-        checkpointNumber: CheckpointNumber(2),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-        lastArchive: lastBlockArchive,
-      });
-      const block5 = await L2Block.random(BlockNumber(5), {
-        checkpointNumber: CheckpointNumber(2),
-        indexWithinCheckpoint: IndexWithinCheckpoint(1),
-        lastArchive: block4.archive,
-      });
-      const block6 = await L2Block.random(BlockNumber(6), {
-        checkpointNumber: CheckpointNumber(2),
-        indexWithinCheckpoint: IndexWithinCheckpoint(2),
-        lastArchive: block5.archive,
-      });
-
-      await addProposedBlocks(store, [block4, block5, block6]);
-
-      // Checkpoint number should still be 1 (no new checkpoint added)
-      expect(await store.getSynchedCheckpointNumber()).toBe(1);
-      // But latest block number should be 6
-      expect(await store.getLatestBlockNumber()).toBe(6);
-    });
-
-    it('getBlock retrieves uncheckpointed blocks', async () => {
-      // First, establish some checkpointed blocks
-      const checkpoint1 = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 }),
-        10,
-      );
-      await store.addCheckpoints([checkpoint1]);
-
-      // Add uncheckpointed blocks for upcoming checkpoint 2, chaining archive roots
-      const lastBlockArchive = checkpoint1.checkpoint.blocks.at(-1)!.archive;
-      const block3 = await L2Block.random(BlockNumber(3), {
-        checkpointNumber: CheckpointNumber(2),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-        lastArchive: lastBlockArchive,
-      });
-      const block4 = await L2Block.random(BlockNumber(4), {
-        checkpointNumber: CheckpointNumber(2),
-        indexWithinCheckpoint: IndexWithinCheckpoint(1),
-        lastArchive: block3.archive,
-      });
-      await addProposedBlocks(store, [block3, block4]);
-
-      // getBlock should work for both checkpointed and uncheckpointed blocks
-      expect((await store.getBlock(BlockNumber(1)))?.number).toBe(1);
-      expect((await store.getBlock(BlockNumber(2)))?.number).toBe(2);
-      expect((await store.getBlock(BlockNumber(3)))?.equals(block3)).toBe(true);
-      expect((await store.getBlock(BlockNumber(4)))?.equals(block4)).toBe(true);
-      expect(await store.getBlock(BlockNumber(5))).toBeUndefined();
-
-      const block5 = await L2Block.random(BlockNumber(5), {
-        checkpointNumber: CheckpointNumber(2),
-        indexWithinCheckpoint: IndexWithinCheckpoint(2),
-        lastArchive: block4.archive,
-      });
-      await store.addProposedBlock(block5);
-
-      // Verify the uncheckpointed blocks have correct data
-      const retrieved3 = await store.getBlock(BlockNumber(3));
-      expect(retrieved3!.number).toBe(3);
-      expect(retrieved3!.equals(block3)).toBe(true);
-      const retrieved4 = await store.getBlock(BlockNumber(4));
-      expect(retrieved4!.number).toBe(4);
-      expect(retrieved4!.equals(block4)).toBe(true);
-      const retrieved5 = await store.getBlock(BlockNumber(5));
-      expect(retrieved5!.number).toBe(5);
-      expect(retrieved5!.equals(block5)).toBe(true);
-    });
-
-    it('getBlockByHash retrieves uncheckpointed blocks', async () => {
-      // Add uncheckpointed blocks (no checkpoints at all) for initial checkpoint 1, chaining archive roots
-      const block1 = await L2Block.random(BlockNumber(1), {
-        checkpointNumber: CheckpointNumber(1),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-      });
-      const block2 = await L2Block.random(BlockNumber(2), {
-        checkpointNumber: CheckpointNumber(1),
-        indexWithinCheckpoint: IndexWithinCheckpoint(1),
-        lastArchive: block1.archive,
-      });
-      await addProposedBlocks(store, [block1, block2]);
-
-      // getBlockByHash should work for uncheckpointed blocks
-      const hash1 = await block1.header.hash();
-      const hash2 = await block2.header.hash();
-
-      const retrieved1 = await store.getBlockByHash(hash1);
-      expect(retrieved1!.equals(block1)).toBe(true);
-
-      const retrieved2 = await store.getBlockByHash(hash2);
-      expect(retrieved2!.equals(block2)).toBe(true);
-    });
-
-    it('getBlockByArchive retrieves uncheckpointed blocks', async () => {
-      // Add uncheckpointed blocks for initial checkpoint 1, chaining archive roots
-      const block1 = await L2Block.random(BlockNumber(1), {
-        checkpointNumber: CheckpointNumber(1),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-      });
-      const block2 = await L2Block.random(BlockNumber(2), {
-        checkpointNumber: CheckpointNumber(1),
-        indexWithinCheckpoint: IndexWithinCheckpoint(1),
-        lastArchive: block1.archive,
-      });
-      await addProposedBlocks(store, [block1, block2]);
-
-      // getBlockByArchive should work for uncheckpointed blocks
-      const archive1 = block1.archive.root;
-      const archive2 = block2.archive.root;
-
-      const retrieved1 = await store.getBlockByArchive(archive1);
-      expect(retrieved1!.equals(block1)).toBe(true);
-
-      const retrieved2 = await store.getBlockByArchive(archive2);
-      expect(retrieved2!.equals(block2)).toBe(true);
-    });
-
-    it('getCheckpointedBlock returns undefined for uncheckpointed blocks', async () => {
-      // Add a checkpoint with blocks 1-2
-      const checkpoint1 = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 }),
-        10,
-      );
-      await store.addCheckpoints([checkpoint1]);
-
-      // Add uncheckpointed blocks 3-4 for upcoming checkpoint 2, chaining archive roots
-      const lastBlockArchive = checkpoint1.checkpoint.blocks.at(-1)!.archive;
-      const block3 = await L2Block.random(BlockNumber(3), {
-        checkpointNumber: CheckpointNumber(2),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-        lastArchive: lastBlockArchive,
-      });
-      const block4 = await L2Block.random(BlockNumber(4), {
-        checkpointNumber: CheckpointNumber(2),
-        indexWithinCheckpoint: IndexWithinCheckpoint(1),
-        lastArchive: block3.archive,
-      });
-      await addProposedBlocks(store, [block3, block4]);
-
-      // getCheckpointedBlock should work for checkpointed blocks
-      expect((await store.getCheckpointedBlock(BlockNumber(1)))?.block.number).toBe(1);
-      expect((await store.getCheckpointedBlock(BlockNumber(2)))?.block.number).toBe(2);
-
-      // getCheckpointedBlock should return undefined for uncheckpointed blocks
-      expect(await store.getCheckpointedBlock(BlockNumber(3))).toBeUndefined();
-      expect(await store.getCheckpointedBlock(BlockNumber(4))).toBeUndefined();
-
-      // But getBlock should work for all blocks
-      expect((await store.getBlock(BlockNumber(3)))?.equals(block3)).toBe(true);
-      expect((await store.getBlock(BlockNumber(4)))?.equals(block4)).toBe(true);
-    });
-
-    it('getCheckpointedBlockByHash returns undefined for uncheckpointed blocks', async () => {
-      // Add uncheckpointed blocks for initial checkpoint 1
-      const block1 = await L2Block.random(BlockNumber(1), {
-        checkpointNumber: CheckpointNumber(1),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-      });
-      await store.addProposedBlock(block1);
-
-      const hash = await block1.header.hash();
-
-      // getCheckpointedBlockByHash should return undefined
-      expect(await store.getCheckpointedBlockByHash(hash)).toBeUndefined();
-
-      // But getBlockByHash should work
-      expect((await store.getBlockByHash(hash))?.equals(block1)).toBe(true);
-    });
-
-    it('getCheckpointedBlockByArchive returns undefined for uncheckpointed blocks', async () => {
-      // Add uncheckpointed blocks for initial checkpoint 1
-      const block1 = await L2Block.random(BlockNumber(1), {
-        checkpointNumber: CheckpointNumber(1),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-      });
-      await store.addProposedBlock(block1);
-
-      const archive = block1.archive.root;
-
-      // getCheckpointedBlockByArchive should return undefined
-      expect(await store.getCheckpointedBlockByArchive(archive)).toBeUndefined();
-
-      // But getBlockByArchive should work
-      expect((await store.getBlockByArchive(archive))?.equals(block1)).toBe(true);
-    });
-
-    it('checkpoint adopts previously added uncheckpointed blocks', async () => {
-      // Add blocks 1-3 without a checkpoint (for initial checkpoint 1), chaining archive roots
-      const block1 = await L2Block.random(BlockNumber(1), {
-        checkpointNumber: CheckpointNumber(1),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-      });
-      const block2 = await L2Block.random(BlockNumber(2), {
-        checkpointNumber: CheckpointNumber(1),
-        indexWithinCheckpoint: IndexWithinCheckpoint(1),
-        lastArchive: block1.archive,
-      });
-      const block3 = await L2Block.random(BlockNumber(3), {
-        checkpointNumber: CheckpointNumber(1),
-        indexWithinCheckpoint: IndexWithinCheckpoint(2),
-        lastArchive: block2.archive,
-      });
-      await addProposedBlocks(store, [block1, block2, block3]);
-
-      expect(await store.getSynchedCheckpointNumber()).toBe(0);
-      expect(await store.getLatestBlockNumber()).toBe(3);
-
-      // getCheckpointedBlock should return undefined for all
-      expect(await store.getCheckpointedBlock(BlockNumber(1))).toBeUndefined();
-      expect(await store.getCheckpointedBlock(BlockNumber(2))).toBeUndefined();
-      expect(await store.getCheckpointedBlock(BlockNumber(3))).toBeUndefined();
-
-      // Now add a checkpoint that covers blocks 1-3
-      const checkpoint1 = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 3, startBlockNumber: 1 }),
-        10,
-      );
-      await store.addCheckpoints([checkpoint1]);
-
-      expect(await store.getSynchedCheckpointNumber()).toBe(1);
-      expect(await store.getLatestBlockNumber()).toBe(3);
-
-      // Now getCheckpointedBlock should work for all blocks
-      const checkpointed1 = await store.getCheckpointedBlock(BlockNumber(1));
-      expect(checkpointed1).toBeDefined();
-      expect(checkpointed1!.checkpointNumber).toBe(1);
-      expect(checkpointed1!.l1).toEqual(checkpoint1.l1);
-
-      const checkpointed2 = await store.getCheckpointedBlock(BlockNumber(2));
-      expect(checkpointed2).toBeDefined();
-      expect(checkpointed2!.checkpointNumber).toBe(1);
-
-      const checkpointed3 = await store.getCheckpointedBlock(BlockNumber(3));
-      expect(checkpointed3).toBeDefined();
-      expect(checkpointed3!.checkpointNumber).toBe(1);
-    });
-
-    it('can add more uncheckpointed blocks after a checkpoint and then checkpoint them', async () => {
-      // Start with checkpoint 1 covering blocks 1-2
-      const checkpoint1 = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 }),
-        10,
-      );
-      await store.addCheckpoints([checkpoint1]);
-
-      // Add uncheckpointed blocks 3-5 for the upcoming checkpoint 2, chaining archive roots
-      const lastBlockArchive = checkpoint1.checkpoint.blocks.at(-1)!.archive;
-      const block3 = await L2Block.random(BlockNumber(3), {
-        checkpointNumber: CheckpointNumber(2),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-        lastArchive: lastBlockArchive,
-      });
-      const block4 = await L2Block.random(BlockNumber(4), {
-        checkpointNumber: CheckpointNumber(2),
-        indexWithinCheckpoint: IndexWithinCheckpoint(1),
-        lastArchive: block3.archive,
-      });
-      const block5 = await L2Block.random(BlockNumber(5), {
-        checkpointNumber: CheckpointNumber(2),
-        indexWithinCheckpoint: IndexWithinCheckpoint(2),
-        lastArchive: block4.archive,
-      });
-      await addProposedBlocks(store, [block3, block4, block5]);
-
-      expect(await store.getSynchedCheckpointNumber()).toBe(1);
-      expect(await store.getLatestBlockNumber()).toBe(5);
-
-      // Blocks 3-5 are not checkpointed yet
-      expect(await store.getCheckpointedBlock(BlockNumber(3))).toBeUndefined();
-      expect(await store.getCheckpointedBlock(BlockNumber(4))).toBeUndefined();
-      expect(await store.getCheckpointedBlock(BlockNumber(5))).toBeUndefined();
-
-      // Add checkpoint 2 covering blocks 3-5, chaining from checkpoint1
-      const checkpoint2 = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(2), {
-          numBlocks: 3,
-          startBlockNumber: 3,
-          previousArchive: lastBlockArchive,
-        }),
-        11,
-      );
-      await store.addCheckpoints([checkpoint2]);
-
-      expect(await store.getSynchedCheckpointNumber()).toBe(2);
-      expect(await store.getLatestBlockNumber()).toBe(5);
-
-      // Now blocks 3-5 should be checkpointed with checkpoint 2's info
-      const checkpointed3 = await store.getCheckpointedBlock(BlockNumber(3));
-      expect(checkpointed3).toBeDefined();
-      expect(checkpointed3!.checkpointNumber).toBe(2);
-      expect(checkpointed3!.l1).toEqual(checkpoint2.l1);
-
-      const checkpointed4 = await store.getCheckpointedBlock(BlockNumber(4));
-      expect(checkpointed4).toBeDefined();
-      expect(checkpointed4!.checkpointNumber).toBe(2);
-
-      const checkpointed5 = await store.getCheckpointedBlock(BlockNumber(5));
-      expect(checkpointed5).toBeDefined();
-      expect(checkpointed5!.checkpointNumber).toBe(2);
-    });
-
-    it('getBlocks retrieves both checkpointed and uncheckpointed blocks', async () => {
-      // Add checkpoint with blocks 1-2
-      const checkpoint1 = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 }),
-        10,
-      );
-      await store.addCheckpoints([checkpoint1]);
-
-      // Add uncheckpointed blocks 3-4 for the upcoming checkpoint 2, chaining archive roots
-      const lastBlockArchive = checkpoint1.checkpoint.blocks.at(-1)!.archive;
-      const block3 = await L2Block.random(BlockNumber(3), {
-        checkpointNumber: CheckpointNumber(2),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-        lastArchive: lastBlockArchive,
-      });
-      const block4 = await L2Block.random(BlockNumber(4), {
-        checkpointNumber: CheckpointNumber(2),
-        indexWithinCheckpoint: IndexWithinCheckpoint(1),
-        lastArchive: block3.archive,
-      });
-      await addProposedBlocks(store, [block3, block4]);
-
-      // getBlocks should retrieve all blocks
-      const allBlocks = await store.getBlocks(BlockNumber(1), 10);
-      expect(allBlocks.length).toBe(4);
-      expect(allBlocks.map(b => b.number)).toEqual([1, 2, 3, 4]);
-    });
-  });
-
-  describe('addProposedBlock validation', () => {
-    it('throws if checkpoint number is not the current checkpoint', async () => {
-      // First, establish checkpoint 1 with blocks 1-2
-      const checkpoint1 = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 }),
-        10,
-      );
-      await store.addCheckpoints([checkpoint1]);
-
-      // Try to add a block for checkpoint 3 (skipping checkpoint 2)
-      const block3 = await L2Block.random(BlockNumber(3), {
-        checkpointNumber: CheckpointNumber(3),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-      });
-
-      await expect(store.addProposedBlock(block3)).rejects.toThrow(CheckpointNumberNotSequentialError);
-    });
-
-    it('allows blocks with the same checkpoint number for the current checkpoint', async () => {
-      // First, establish checkpoint 1 with blocks 1-2
-      const checkpoint1 = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 }),
-        10,
-      );
-      await store.addCheckpoints([checkpoint1]);
-
-      // Add blocks 3 and 4 with consistent checkpoint number (2), chaining archive roots
-      const lastBlockArchive = checkpoint1.checkpoint.blocks.at(-1)!.archive;
-      const block3 = await L2Block.random(BlockNumber(3), {
-        checkpointNumber: CheckpointNumber(2),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-        lastArchive: lastBlockArchive,
-      });
-      const block4 = await L2Block.random(BlockNumber(4), {
-        checkpointNumber: CheckpointNumber(2),
-        indexWithinCheckpoint: IndexWithinCheckpoint(1),
-        lastArchive: block3.archive,
-      });
-
-      await expect(addProposedBlocks(store, [block3, block4])).resolves.toBe(true);
-
-      // Verify blocks were added
-      expect((await store.getBlock(BlockNumber(3)))?.equals(block3)).toBe(true);
-      expect((await store.getBlock(BlockNumber(4)))?.equals(block4)).toBe(true);
-    });
-
-    it('allows blocks for the initial checkpoint when store is empty', async () => {
-      // Add blocks for the initial checkpoint (1), chaining archive roots
-      const block1 = await L2Block.random(BlockNumber(1), {
-        checkpointNumber: CheckpointNumber(1),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-      });
-      const block2 = await L2Block.random(BlockNumber(2), {
-        checkpointNumber: CheckpointNumber(1),
-        indexWithinCheckpoint: IndexWithinCheckpoint(1),
-        lastArchive: block1.archive,
-      });
-
-      await expect(addProposedBlocks(store, [block1, block2])).resolves.toBe(true);
-
-      // Verify blocks were added
-      expect((await store.getBlock(BlockNumber(1)))?.equals(block1)).toBe(true);
-      expect((await store.getBlock(BlockNumber(2)))?.equals(block2)).toBe(true);
-      expect(await store.getLatestBlockNumber()).toBe(2);
-    });
-
-    it('throws if initial block is duplicated across calls', async () => {
-      // Add blocks for the initial checkpoint (1)
-      const block1 = await L2Block.random(BlockNumber(1), {
-        checkpointNumber: CheckpointNumber(1),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-      });
-      const block2 = await L2Block.random(BlockNumber(1), {
-        checkpointNumber: CheckpointNumber(1),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-      });
-
-      await expect(store.addProposedBlock(block1)).resolves.toBe(true);
-      await expect(store.addProposedBlock(block2)).rejects.toThrow(BlockNumberNotSequentialError);
-    });
-
-    it('throws if first block has wrong checkpoint number when store is empty', async () => {
-      // Try to add a block for checkpoint 2 when store is empty (should start at 1)
-      const block1 = await L2Block.random(BlockNumber(1), {
-        checkpointNumber: CheckpointNumber(2),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-      });
-
-      await expect(store.addProposedBlock(block1)).rejects.toThrow(CheckpointNumberNotSequentialError);
-    });
-
-    it('allows adding more blocks to the same checkpoint in separate calls', async () => {
-      // First, establish checkpoint 1 with blocks 1-2
-      const checkpoint1 = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 }),
-        10,
-      );
-      await store.addCheckpoints([checkpoint1]);
-
-      // Add block 3 for checkpoint 2, chaining archive roots
-      const lastBlockArchive = checkpoint1.checkpoint.blocks.at(-1)!.archive;
-      const block3 = await L2Block.random(BlockNumber(3), {
-        checkpointNumber: CheckpointNumber(2),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-        lastArchive: lastBlockArchive,
-      });
-      await expect(store.addProposedBlock(block3)).resolves.toBe(true);
-
-      // Add block 4 for the same checkpoint 2 in a separate call
-      const block4 = await L2Block.random(BlockNumber(4), {
-        checkpointNumber: CheckpointNumber(2),
-        indexWithinCheckpoint: IndexWithinCheckpoint(1),
-        lastArchive: block3.archive,
-      });
-      await expect(store.addProposedBlock(block4)).resolves.toBe(true);
-
-      expect(await store.getLatestBlockNumber()).toBe(4);
-    });
-
-    it('throws if adding blocks in separate calls with non-consecutive indexes', async () => {
-      // First, establish checkpoint 1 with blocks 1-2
-      const checkpoint1 = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 }),
-        10,
-      );
-      await store.addCheckpoints([checkpoint1]);
-
-      // Add block 3 for checkpoint 2, chaining archive roots
-      const lastBlockArchive = checkpoint1.checkpoint.blocks.at(-1)!.archive;
-      const block3 = await L2Block.random(BlockNumber(3), {
-        checkpointNumber: CheckpointNumber(2),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-        lastArchive: lastBlockArchive,
-      });
-      await expect(store.addProposedBlock(block3)).resolves.toBe(true);
-
-      // Add block 4 for the same checkpoint 2 in a separate call but with a missing index
-      const block4 = await L2Block.random(BlockNumber(4), {
-        checkpointNumber: CheckpointNumber(2),
-        indexWithinCheckpoint: IndexWithinCheckpoint(2),
-        lastArchive: block3.archive,
-      });
-      await expect(store.addProposedBlock(block4)).rejects.toThrow(BlockIndexNotSequentialError);
-
-      expect(await store.getLatestBlockNumber()).toBe(3);
-    });
-
-    it('throws if second batch of blocks has different checkpoint number than first batch', async () => {
-      // First, establish checkpoint 1 with blocks 1-2
-      const checkpoint1 = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 }),
-        10,
-      );
-      await store.addCheckpoints([checkpoint1]);
-
-      // Add block 3 for checkpoint 2, chaining archive roots
-      const lastBlockArchive = checkpoint1.checkpoint.blocks.at(-1)!.archive;
-      const block3 = await L2Block.random(BlockNumber(3), {
-        checkpointNumber: CheckpointNumber(2),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-        lastArchive: lastBlockArchive,
-      });
-      await store.addProposedBlock(block3);
-
-      // Try to add block 4 for checkpoint 3 (should fail because current checkpoint is still 2)
-      const block4 = await L2Block.random(BlockNumber(4), {
-        checkpointNumber: CheckpointNumber(3),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-        lastArchive: block3.archive,
-      });
-      await expect(store.addProposedBlock(block4)).rejects.toThrow(CheckpointNumberNotSequentialError);
-    });
-
-    it('force option bypasses checkpoint number validation', async () => {
-      // First, establish checkpoint 1 with blocks 1-2
-      const checkpoint1 = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 }),
-        10,
-      );
-      await store.addCheckpoints([checkpoint1]);
-
-      // Add blocks with different checkpoint numbers using force option, chaining archive roots
-      const lastBlockArchive = checkpoint1.checkpoint.blocks.at(-1)!.archive;
-      const block3 = await L2Block.random(BlockNumber(3), {
-        checkpointNumber: CheckpointNumber(2),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-        lastArchive: lastBlockArchive,
-      });
-      const block4 = await L2Block.random(BlockNumber(4), {
-        checkpointNumber: CheckpointNumber(5),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-        lastArchive: block3.archive,
-      });
-
-      await expect(addProposedBlocks(store, [block3, block4], { force: true })).resolves.toBe(true);
-    });
-
-    it('force option bypasses blockindex number validation', async () => {
-      // First, establish checkpoint 1 with blocks 1-2
-      const checkpoint1 = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 }),
-        10,
-      );
-      await store.addCheckpoints([checkpoint1]);
-
-      // Add blocks with different checkpoint numbers using force option, chaining archive roots
-      const lastBlockArchive = checkpoint1.checkpoint.blocks.at(-1)!.archive;
-      const block3 = await L2Block.random(BlockNumber(3), {
-        checkpointNumber: CheckpointNumber(2),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-        lastArchive: lastBlockArchive,
-      });
-      const block4 = await L2Block.random(BlockNumber(4), {
-        checkpointNumber: CheckpointNumber(2),
-        indexWithinCheckpoint: IndexWithinCheckpoint(2),
-        lastArchive: block3.archive,
-      });
-
-      await expect(addProposedBlocks(store, [block3, block4], { force: true })).resolves.toBe(true);
-    });
-
-    it('throws if adding blocks with non-consecutive archives', async () => {
-      // First, establish checkpoint 1 with blocks 1-2
-      const checkpoint1 = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 }),
-        10,
-      );
-      await store.addCheckpoints([checkpoint1]);
-
-      // Add block 3 for checkpoint 2 with incorrect archive
-      const block3 = await L2Block.random(BlockNumber(3), {
-        checkpointNumber: CheckpointNumber(2),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-      });
-      await expect(store.addProposedBlock(block3)).rejects.toThrow(BlockArchiveNotConsistentError);
-
-      expect(await store.getLatestBlockNumber()).toBe(2);
-    });
-
-    it('throws if adding blocks with non-consecutive archives across calls', async () => {
-      // First, establish checkpoint 1 with blocks 1-2
-      const checkpoint1 = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 }),
-        10,
-      );
-      await store.addCheckpoints([checkpoint1]);
-
-      // Add block 3 for checkpoint 2 with correct archive
-      const lastBlockArchive = checkpoint1.checkpoint.blocks.at(-1)!.archive;
-      const block3 = await L2Block.random(BlockNumber(3), {
-        checkpointNumber: CheckpointNumber(2),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-        lastArchive: lastBlockArchive,
-      });
-      await expect(store.addProposedBlock(block3)).resolves.toBe(true);
-
-      // Add block 4 with incorrect archive (should fail)
-      const block4 = await L2Block.random(BlockNumber(4), {
-        checkpointNumber: CheckpointNumber(2),
-        indexWithinCheckpoint: IndexWithinCheckpoint(1),
-        lastArchive: AppendOnlyTreeSnapshot.random(),
-      });
-      await expect(store.addProposedBlock(block4)).rejects.toThrow(BlockArchiveNotConsistentError);
-
-      expect(await store.getLatestBlockNumber()).toBe(3);
-    });
-
-    it('throws if adding blocks that would overwrite checkpointed blocks', async () => {
-      // First, establish checkpoint 1 with blocks 1-2
-      const checkpoint1 = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 }),
-        10,
-      );
-      await store.addCheckpoints([checkpoint1]);
-
-      expect(await store.getCheckpointedL2BlockNumber()).toBe(2);
-
-      // Try to add a block that would overwrite checkpointed block 2
-      const block2 = await L2Block.random(BlockNumber(2), {
-        checkpointNumber: CheckpointNumber(1),
-        indexWithinCheckpoint: IndexWithinCheckpoint(1),
-      });
-      await expect(store.addProposedBlock(block2)).rejects.toThrow(CannotOverwriteCheckpointedBlockError);
-
-      // Try to add a block that would overwrite checkpointed block 1
-      const block1 = await L2Block.random(BlockNumber(1), {
-        checkpointNumber: CheckpointNumber(1),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-      });
-      await expect(store.addProposedBlock(block1)).rejects.toThrow(CannotOverwriteCheckpointedBlockError);
-    });
-
-    it('throws BlockAlreadyCheckpointedError if proposed block matches the checkpointed one', async () => {
-      const checkpoint1 = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 }),
-        10,
-      );
-      await store.addCheckpoints([checkpoint1]);
-
-      // Re-propose the same block that was already checkpointed
-      const checkpointedBlock = checkpoint1.checkpoint.blocks[1];
-      await expect(store.addProposedBlock(checkpointedBlock)).rejects.toThrow(BlockAlreadyCheckpointedError);
-    });
-  });
-
-  describe('getBlocksForCheckpoint', () => {
-    it('returns blocks for a single-block checkpoint', async () => {
-      const checkpoint = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 1, startBlockNumber: 1 }),
-        10,
-      );
-      await store.addCheckpoints([checkpoint]);
-
-      const blocks = await store.getBlocksForCheckpoint(CheckpointNumber(1));
-      expect(blocks).toBeDefined();
-      expect(blocks!.length).toBe(1);
-      expect(blocks![0].number).toBe(1);
-    });
-
-    it('returns all blocks for a multi-block checkpoint', async () => {
-      const checkpoint = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 4, startBlockNumber: 1 }),
-        10,
-      );
-      await store.addCheckpoints([checkpoint]);
-
-      const blocks = await store.getBlocksForCheckpoint(CheckpointNumber(1));
-      expect(blocks).toBeDefined();
-      expect(blocks!.length).toBe(4);
-      expect(blocks!.map(b => b.number)).toEqual([1, 2, 3, 4]);
-    });
-
-    it('returns correct blocks for different checkpoints', async () => {
-      // Create checkpoints with chained archive roots
-      // Checkpoint 1: blocks 1-2
-      const checkpoint1Cp = await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 });
-      const checkpoint1 = makePublishedCheckpoint(checkpoint1Cp, 10);
-
-      // Checkpoint 2: blocks 3-5
-      const previousArchive1 = checkpoint1Cp.blocks.at(-1)!.archive;
-      const checkpoint2Cp = await Checkpoint.random(CheckpointNumber(2), {
-        numBlocks: 3,
-        startBlockNumber: 3,
-        previousArchive: previousArchive1,
-      });
-      const checkpoint2 = makePublishedCheckpoint(checkpoint2Cp, 11);
-
-      // Checkpoint 3: blocks 6-7
-      const previousArchive2 = checkpoint2Cp.blocks.at(-1)!.archive;
-      const checkpoint3Cp = await Checkpoint.random(CheckpointNumber(3), {
-        numBlocks: 2,
-        startBlockNumber: 6,
-        previousArchive: previousArchive2,
-      });
-      const checkpoint3 = makePublishedCheckpoint(checkpoint3Cp, 12);
-
-      await store.addCheckpoints([checkpoint1, checkpoint2, checkpoint3]);
-
-      const blocks1 = await store.getBlocksForCheckpoint(CheckpointNumber(1));
-      expect(blocks1).toBeDefined();
-      expect(blocks1!.map(b => b.number)).toEqual([1, 2]);
-
-      const blocks2 = await store.getBlocksForCheckpoint(CheckpointNumber(2));
-      expect(blocks2).toBeDefined();
-      expect(blocks2!.map(b => b.number)).toEqual([3, 4, 5]);
-
-      const blocks3 = await store.getBlocksForCheckpoint(CheckpointNumber(3));
-      expect(blocks3).toBeDefined();
-      expect(blocks3!.map(b => b.number)).toEqual([6, 7]);
-    });
-
-    it('returns undefined for non-existent checkpoint', async () => {
-      const checkpoint = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 }),
-        10,
-      );
-      await store.addCheckpoints([checkpoint]);
-
-      const blocks = await store.getBlocksForCheckpoint(CheckpointNumber(5));
-      expect(blocks).toBeUndefined();
-    });
-
-    it('returns undefined when no checkpoints exist', async () => {
-      const blocks = await store.getBlocksForCheckpoint(CheckpointNumber(1));
-      expect(blocks).toBeUndefined();
-    });
-  });
-
-  describe('getRangeOfCheckpoints', () => {
-    it('returns empty array when no checkpoints exist', async () => {
-      const checkpoints = await store.getRangeOfCheckpoints(CheckpointNumber(1), 10);
-      expect(checkpoints).toEqual([]);
-    });
-
-    it('returns single checkpoint', async () => {
-      const checkpoint = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 }),
-        10,
-      );
-      await store.addCheckpoints([checkpoint]);
-
-      const checkpoints = await store.getRangeOfCheckpoints(CheckpointNumber(1), 10);
-      expect(checkpoints.length).toBe(1);
-      expect(checkpoints[0].checkpointNumber).toBe(1);
-      expect(checkpoints[0].startBlock).toBe(1);
-      expect(checkpoints[0].blockCount).toBe(2);
-    });
-
-    it('returns multiple checkpoints in order', async () => {
-      // Create checkpoints with chained archive roots
-      const checkpoint1Cp = await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 });
-      const checkpoint1 = makePublishedCheckpoint(checkpoint1Cp, 10);
-
-      const previousArchive1 = checkpoint1Cp.blocks.at(-1)!.archive;
-      const checkpoint2Cp = await Checkpoint.random(CheckpointNumber(2), {
-        numBlocks: 3,
-        startBlockNumber: 3,
-        previousArchive: previousArchive1,
-      });
-      const checkpoint2 = makePublishedCheckpoint(checkpoint2Cp, 11);
-
-      const previousArchive2 = checkpoint2Cp.blocks.at(-1)!.archive;
-      const checkpoint3Cp = await Checkpoint.random(CheckpointNumber(3), {
-        numBlocks: 1,
-        startBlockNumber: 6,
-        previousArchive: previousArchive2,
-      });
-      const checkpoint3 = makePublishedCheckpoint(checkpoint3Cp, 12);
-
-      await store.addCheckpoints([checkpoint1, checkpoint2, checkpoint3]);
-
-      const checkpoints = await store.getRangeOfCheckpoints(CheckpointNumber(1), 10);
-      expect(checkpoints.length).toBe(3);
-      expect(checkpoints.map(c => c.checkpointNumber)).toEqual([1, 2, 3]);
-      expect(checkpoints.map(c => c.startBlock)).toEqual([1, 3, 6]);
-      expect(checkpoints.map(c => c.blockCount)).toEqual([2, 3, 1]);
-    });
-
-    it('respects the from parameter', async () => {
-      // Create checkpoints with chained archive roots
-      const checkpoint1Cp = await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 });
-      const checkpoint1 = makePublishedCheckpoint(checkpoint1Cp, 10);
-
-      const previousArchive1 = checkpoint1Cp.blocks.at(-1)!.archive;
-      const checkpoint2Cp = await Checkpoint.random(CheckpointNumber(2), {
-        numBlocks: 2,
-        startBlockNumber: 3,
-        previousArchive: previousArchive1,
-      });
-      const checkpoint2 = makePublishedCheckpoint(checkpoint2Cp, 11);
-
-      const previousArchive2 = checkpoint2Cp.blocks.at(-1)!.archive;
-      const checkpoint3Cp = await Checkpoint.random(CheckpointNumber(3), {
-        numBlocks: 2,
-        startBlockNumber: 5,
-        previousArchive: previousArchive2,
-      });
-      const checkpoint3 = makePublishedCheckpoint(checkpoint3Cp, 12);
-
-      await store.addCheckpoints([checkpoint1, checkpoint2, checkpoint3]);
-
-      // Start from checkpoint 2
-      const checkpoints = await store.getRangeOfCheckpoints(CheckpointNumber(2), 10);
-      expect(checkpoints.length).toBe(2);
-      expect(checkpoints.map(c => c.checkpointNumber)).toEqual([2, 3]);
-    });
-
-    it('respects the limit parameter', async () => {
-      // Create checkpoints with chained archive roots
-      const checkpoint1Cp = await Checkpoint.random(CheckpointNumber(1), { numBlocks: 1, startBlockNumber: 1 });
-      const checkpoint1 = makePublishedCheckpoint(checkpoint1Cp, 10);
-
-      const previousArchive1 = checkpoint1Cp.blocks.at(-1)!.archive;
-      const checkpoint2Cp = await Checkpoint.random(CheckpointNumber(2), {
-        numBlocks: 1,
-        startBlockNumber: 2,
-        previousArchive: previousArchive1,
-      });
-      const checkpoint2 = makePublishedCheckpoint(checkpoint2Cp, 11);
-
-      const previousArchive2 = checkpoint2Cp.blocks.at(-1)!.archive;
-      const checkpoint3Cp = await Checkpoint.random(CheckpointNumber(3), {
-        numBlocks: 1,
-        startBlockNumber: 3,
-        previousArchive: previousArchive2,
-      });
-      const checkpoint3 = makePublishedCheckpoint(checkpoint3Cp, 12);
-
-      const previousArchive3 = checkpoint3Cp.blocks.at(-1)!.archive;
-      const checkpoint4Cp = await Checkpoint.random(CheckpointNumber(4), {
-        numBlocks: 1,
-        startBlockNumber: 4,
-        previousArchive: previousArchive3,
-      });
-      const checkpoint4 = makePublishedCheckpoint(checkpoint4Cp, 13);
-
-      await store.addCheckpoints([checkpoint1, checkpoint2, checkpoint3, checkpoint4]);
-
-      // Only get 2 checkpoints
-      const checkpoints = await store.getRangeOfCheckpoints(CheckpointNumber(1), 2);
-      expect(checkpoints.length).toBe(2);
-      expect(checkpoints.map(c => c.checkpointNumber)).toEqual([1, 2]);
-    });
-
-    it('returns correct checkpoint data including L1 info', async () => {
-      const checkpoint = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 3, startBlockNumber: 1 }),
-        42,
-      );
-      await store.addCheckpoints([checkpoint]);
-
-      const checkpoints = await store.getRangeOfCheckpoints(CheckpointNumber(1), 1);
-      expect(checkpoints.length).toBe(1);
-
-      const data = checkpoints[0];
-      expect(data.checkpointNumber).toBe(1);
-      expect(data.startBlock).toBe(1);
-      expect(data.blockCount).toBe(3);
-      expect(data.l1.blockNumber).toBe(42n);
-      expect(data.header.equals(checkpoint.checkpoint.header)).toBe(true);
-      expect(data.archive.equals(checkpoint.checkpoint.archive)).toBe(true);
-    });
-
-    it('returns empty array when from is beyond available checkpoints', async () => {
-      const checkpoint = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 }),
-        10,
-      );
-      await store.addCheckpoints([checkpoint]);
-
-      const checkpoints = await store.getRangeOfCheckpoints(CheckpointNumber(5), 10);
-      expect(checkpoints).toEqual([]);
-    });
-
-    it('works correctly after unwinding checkpoints', async () => {
-      // Create checkpoints with chained archive roots
-      const checkpoint1Cp = await Checkpoint.random(CheckpointNumber(1), { numBlocks: 2, startBlockNumber: 1 });
-      const checkpoint1 = makePublishedCheckpoint(checkpoint1Cp, 10);
-
-      const previousArchive1 = checkpoint1Cp.blocks.at(-1)!.archive;
-      const checkpoint2Cp = await Checkpoint.random(CheckpointNumber(2), {
-        numBlocks: 2,
-        startBlockNumber: 3,
-        previousArchive: previousArchive1,
-      });
-      const checkpoint2 = makePublishedCheckpoint(checkpoint2Cp, 11);
-
-      const previousArchive2 = checkpoint2Cp.blocks.at(-1)!.archive;
-      const checkpoint3Cp = await Checkpoint.random(CheckpointNumber(3), {
-        numBlocks: 2,
-        startBlockNumber: 5,
-        previousArchive: previousArchive2,
-      });
-      const checkpoint3 = makePublishedCheckpoint(checkpoint3Cp, 12);
-
-      await store.addCheckpoints([checkpoint1, checkpoint2, checkpoint3]);
-
-      // Remove checkpoint 3
-      await store.removeCheckpointsAfter(CheckpointNumber(2));
-
-      const checkpoints = await store.getRangeOfCheckpoints(CheckpointNumber(1), 10);
-      expect(checkpoints.length).toBe(2);
-      expect(checkpoints.map(c => c.checkpointNumber)).toEqual([1, 2]);
-    });
-  });
-
-  describe('getCheckpointedBlock', () => {
-    beforeEach(async () => {
-      await store.addCheckpoints(publishedCheckpoints);
-    });
-
-    it.each(blockNumberTests)('retrieves previously stored block %i', async (blockNumber, getExpectedBlock) => {
-      const retrievedBlock = await store.getCheckpointedBlock(BlockNumber(blockNumber));
-      const expectedBlock = getExpectedBlock();
-      const expectedCheckpoint = publishedCheckpoints[blockNumber - 1];
-
-      expect(retrievedBlock).toBeDefined();
-      expectCheckpointedBlockEquals(retrievedBlock!, expectedBlock, expectedCheckpoint);
-    });
-
-    it('returns undefined if block is not found', async () => {
-      await expect(store.getCheckpointedBlock(BlockNumber(12))).resolves.toBeUndefined();
-    });
-
-    it('returns undefined for block number 0', async () => {
-      await expect(store.getCheckpointedBlock(BlockNumber(0))).resolves.toBeUndefined();
-    });
-  });
-
-  describe('getCheckpointedBlockByHash', () => {
-    beforeEach(async () => {
-      await store.addCheckpoints(publishedCheckpoints);
-    });
-
-    it('retrieves a block by its hash', async () => {
-      const expectedCheckpoint = publishedCheckpoints[5];
-      const expectedBlock = expectedCheckpoint.checkpoint.blocks[0];
-      const blockHash = await expectedBlock.header.hash();
-      const retrievedBlock = await store.getCheckpointedBlockByHash(blockHash);
-
-      expect(retrievedBlock).toBeDefined();
-      expectCheckpointedBlockEquals(retrievedBlock!, expectedBlock, expectedCheckpoint);
-    });
-
-    it('returns undefined for non-existent block hash', async () => {
-      const nonExistentHash = BlockHash.random();
-      await expect(store.getCheckpointedBlockByHash(nonExistentHash)).resolves.toBeUndefined();
-    });
-  });
-
-  describe('getCheckpointedBlockByArchive', () => {
-    beforeEach(async () => {
-      await store.addCheckpoints(publishedCheckpoints);
-    });
-
-    it('retrieves a block by its archive root', async () => {
-      const expectedCheckpoint = publishedCheckpoints[3];
-      const expectedBlock = expectedCheckpoint.checkpoint.blocks[0];
-      const archive = expectedBlock.archive.root;
-      const retrievedBlock = await store.getCheckpointedBlockByArchive(archive);
-
-      expect(retrievedBlock).toBeDefined();
-      expectCheckpointedBlockEquals(retrievedBlock!, expectedBlock, expectedCheckpoint);
-    });
-
-    it('returns undefined for non-existent archive root', async () => {
-      const nonExistentArchive = Fr.random();
-      await expect(store.getCheckpointedBlockByArchive(nonExistentArchive)).resolves.toBeUndefined();
-    });
-  });
-
-  describe('getBlockHeaderByHash', () => {
-    beforeEach(async () => {
-      await store.addCheckpoints(publishedCheckpoints);
-    });
-
-    it('retrieves a block header by its hash', async () => {
-      const expectedBlock = publishedCheckpoints[7].checkpoint.blocks[0];
-      const blockHash = await expectedBlock.header.hash();
-      const retrievedHeader = await store.getBlockHeaderByHash(blockHash);
-
-      expect(retrievedHeader).toBeDefined();
-      expect(retrievedHeader!.equals(expectedBlock.header)).toBe(true);
-    });
-
-    it('returns undefined for non-existent block hash', async () => {
-      const nonExistentHash = BlockHash.random();
-      await expect(store.getBlockHeaderByHash(nonExistentHash)).resolves.toBeUndefined();
-    });
-  });
-
-  describe('getBlockHeaderByArchive', () => {
-    beforeEach(async () => {
-      await store.addCheckpoints(publishedCheckpoints);
-    });
-
-    it('retrieves a block header by its archive root', async () => {
-      const expectedBlock = publishedCheckpoints[2].checkpoint.blocks[0];
-      const archive = expectedBlock.archive.root;
-      const retrievedHeader = await store.getBlockHeaderByArchive(archive);
-
-      expect(retrievedHeader).toBeDefined();
-      expect(retrievedHeader!.equals(expectedBlock.header)).toBe(true);
-    });
-
-    it('returns undefined for non-existent archive root', async () => {
-      const nonExistentArchive = Fr.random();
-      await expect(store.getBlockHeaderByArchive(nonExistentArchive)).resolves.toBeUndefined();
-    });
-  });
-
-  describe('getSynchedCheckpointNumber', () => {
-    it('returns the checkpoint number before INITIAL_CHECKPOINT_NUMBER if no checkpoints have been added', async () => {
-      await expect(store.getSynchedCheckpointNumber()).resolves.toEqual(INITIAL_CHECKPOINT_NUMBER - 1);
-    });
-
-    it('returns the most recently added checkpoint number', async () => {
-      await store.addCheckpoints(publishedCheckpoints);
-      await expect(store.getSynchedCheckpointNumber()).resolves.toEqual(publishedCheckpoints.at(-1)!.checkpoint.number);
-    });
-  });
-
-  describe('getSynchPoint', () => {
-    it('returns undefined if no blocks have been added', async () => {
-      await expect(store.getSynchPoint()).resolves.toEqual({
-        blocksSynchedTo: undefined,
-        messagesSynchedTo: undefined,
-      } satisfies ArchiverL1SynchPoint);
-    });
-
-    it('returns the L1 block number in which the most recent L2 block was published', async () => {
-      await store.addCheckpoints(publishedCheckpoints);
-      await expect(store.getSynchPoint()).resolves.toEqual({
-        blocksSynchedTo: 19n,
-        messagesSynchedTo: undefined,
-      } satisfies ArchiverL1SynchPoint);
-    });
-
-    it('returns the L1 block set via setMessageSyncState', async () => {
-      const l1BlockHash = Buffer32.random();
-      const l1BlockNumber = 10n;
-      await store.setMessageSyncState({ l1BlockNumber, l1BlockHash }, 1n);
-      await store.addL1ToL2Messages([
-        makeInboxMessage(Buffer16.ZERO, { l1BlockNumber: 5n, l1BlockHash: Buffer32.random() }),
-      ]);
-      await expect(store.getSynchPoint()).resolves.toEqual({
-        blocksSynchedTo: undefined,
-        messagesSynchedTo: { l1BlockHash, l1BlockNumber },
-      } satisfies ArchiverL1SynchPoint);
-    });
-  });
-
-  describe('addLogs', () => {
-    it('adds private & public logs', async () => {
-      const checkpoint = publishedCheckpoints[0];
-      await store.addCheckpoints([checkpoint]);
-      await expect(store.addLogs(checkpoint.checkpoint.blocks)).resolves.toEqual(true);
-    });
-  });
-
-  describe('deleteLogs', () => {
-    it('deletes public logs for a block', async () => {
-      const block = publishedCheckpoints[0].checkpoint.blocks[0];
-      await store.addProposedBlock(block);
-      await expect(store.addLogs([block])).resolves.toEqual(true);
-
-      expect((await store.getPublicLogs({ fromBlock: BlockNumber(1) })).logs.length).toEqual(
-        block.body.txEffects.map(txEffect => txEffect.publicLogs).flat().length,
-      );
-
-      await store.deleteLogs([block]);
-
-      expect((await store.getPublicLogs({ fromBlock: BlockNumber(1) })).logs.length).toEqual(0);
-    });
-
-    it('deletes contract class logs for a block', async () => {
-      // Create a block that explicitly has contract class logs
-      const block = await L2Block.random(BlockNumber(1), {
-        txsPerBlock: 2,
-        txOptions: { numContractClassLogs: 1 },
-        state: makeStateForBlock(1, 2),
-      });
-      await store.addProposedBlock(block);
-      await store.addLogs([block]);
-
-      const logsBefore = await store.getContractClassLogs({ fromBlock: BlockNumber(1) });
-      expect(logsBefore.logs.length).toBeGreaterThan(0);
-
-      await store.deleteLogs([block]);
-
-      const logsAfter = await store.getContractClassLogs({ fromBlock: BlockNumber(1) });
-      expect(logsAfter.logs.length).toEqual(0);
-    });
-
-    it('retains private logs from non-reorged block when same tag appears in reorged block', async () => {
-      const sharedTag = makePrivateLogTag(1, 0, 0);
-
-      // Block 1 with a private log using sharedTag
-      const cp1 = await makeCheckpointWithLogs(1, {
-        numTxsPerBlock: 1,
-        privateLogs: { numLogsPerTx: 1 },
-      });
-      const block1 = cp1.checkpoint.blocks[0];
-
-      // Block 2 with a private log using the SAME tag
-      const cp2 = await makeCheckpointWithLogs(2, {
-        previousArchive: block1.archive,
-        numTxsPerBlock: 1,
-        privateLogs: { numLogsPerTx: 1 },
-      });
-      const block2 = cp2.checkpoint.blocks[0];
-      // Override block2's private log tag to match block1's
-      block2.body.txEffects[0].privateLogs[0] = makePrivateLog(sharedTag);
-
-      await addProposedBlocks(store, [block1, block2], { force: true });
-      await store.addLogs([block1, block2]);
-
-      // Both blocks' logs should be present
-      const logsBefore = await store.getPrivateLogsByTags([sharedTag]);
-      expect(logsBefore[0]).toHaveLength(2);
-
-      // Reorg: delete block 2
-      await store.deleteLogs([block2]);
-
-      // Block 1's log should still be present
-      const logsAfter = await store.getPrivateLogsByTags([sharedTag]);
-      expect(logsAfter[0]).toHaveLength(1);
-      expect(logsAfter[0][0].blockNumber).toEqual(1);
-    });
-
-    it('retains public logs from non-reorged block when same tag appears in reorged block', async () => {
-      const contractAddress = AztecAddress.fromNumber(543254);
-      const sharedTag = makePublicLogTag(1, 0, 0);
-
-      // Block 1 with a public log using sharedTag
-      const cp1 = await makeCheckpointWithLogs(1, {
-        numTxsPerBlock: 1,
-        publicLogs: { numLogsPerTx: 1, contractAddress },
-      });
-      const block1 = cp1.checkpoint.blocks[0];
-
-      // Block 2 with a public log using the SAME tag from the same contract
-      const cp2 = await makeCheckpointWithLogs(2, {
-        previousArchive: block1.archive,
-        numTxsPerBlock: 1,
-        publicLogs: { numLogsPerTx: 1, contractAddress },
-      });
-      const block2 = cp2.checkpoint.blocks[0];
-      // Override block2's public log tag to match block1's
-      block2.body.txEffects[0].publicLogs[0] = makePublicLog(sharedTag, contractAddress);
-
-      await addProposedBlocks(store, [block1, block2], { force: true });
-      await store.addLogs([block1, block2]);
-
-      // Both blocks' logs should be present
-      const logsBefore = await store.getPublicLogsByTagsFromContract(contractAddress, [sharedTag]);
-      expect(logsBefore[0]).toHaveLength(2);
-
-      // Reorg: delete block 2
-      await store.deleteLogs([block2]);
-
-      // Block 1's log should still be present
-      const logsAfter = await store.getPublicLogsByTagsFromContract(contractAddress, [sharedTag]);
-      expect(logsAfter[0]).toHaveLength(1);
-      expect(logsAfter[0][0].blockNumber).toEqual(1);
-    });
-
-    it('deletes multiple blocks at once', async () => {
-      const cp1 = await makeCheckpointWithLogs(1, {
-        numTxsPerBlock: 2,
-        privateLogs: { numLogsPerTx: 1 },
-        publicLogs: { numLogsPerTx: 1 },
-      });
-      const block1 = cp1.checkpoint.blocks[0];
-
-      const cp2 = await makeCheckpointWithLogs(2, {
-        previousArchive: block1.archive,
-        numTxsPerBlock: 2,
-        privateLogs: { numLogsPerTx: 1 },
-        publicLogs: { numLogsPerTx: 1 },
-      });
-      const block2 = cp2.checkpoint.blocks[0];
-
-      await addProposedBlocks(store, [block1, block2], { force: true });
-      await store.addLogs([block1, block2]);
-
-      // Verify logs exist
-      expect((await store.getPublicLogs({ fromBlock: BlockNumber(1) })).logs.length).toBeGreaterThan(0);
-
-      // Delete both blocks at once
-      await store.deleteLogs([block1, block2]);
-
-      expect((await store.getPublicLogs({ fromBlock: BlockNumber(1) })).logs.length).toEqual(0);
-    });
-
-    it('is a no-op when deleting blocks with no logs', async () => {
-      const block = publishedCheckpoints[0].checkpoint.blocks[0];
-      // Don't add logs, just try to delete
-      await expect(store.deleteLogs([block])).resolves.toEqual(true);
-    });
-  });
-
-  describe('getTxEffect', () => {
-    const getBlock = (i: number) => publishedCheckpoints[i].checkpoint.blocks[0];
-
-    beforeEach(async () => {
-      await store.addLogs(publishedCheckpoints.flatMap(x => x.checkpoint.blocks));
-      await store.addCheckpoints(publishedCheckpoints);
-    });
-
-    it.each([
-      () => ({ data: getBlock(0).body.txEffects[0], block: getBlock(0), txIndexInBlock: 0 }),
-      () => ({ data: getBlock(9).body.txEffects[3], block: getBlock(9), txIndexInBlock: 3 }),
-      () => ({ data: getBlock(3).body.txEffects[1], block: getBlock(3), txIndexInBlock: 1 }),
-      () => ({ data: getBlock(5).body.txEffects[2], block: getBlock(5), txIndexInBlock: 2 }),
-      () => ({ data: getBlock(1).body.txEffects[0], block: getBlock(1), txIndexInBlock: 0 }),
-    ])('retrieves a previously stored transaction', async getExpectedTx => {
-      const { data, block, txIndexInBlock } = getExpectedTx();
-      const expectedTx: IndexedTxEffect = {
-        data,
-        l2BlockNumber: block.number,
-        l2BlockHash: await block.header.hash(),
-        txIndexInBlock,
-      };
-      const actualTx = await store.getTxEffect(data.txHash);
-      expect(actualTx).toEqual(expectedTx);
-    });
-
-    it('returns undefined if tx is not found', async () => {
-      await expect(store.getTxEffect(TxHash.random())).resolves.toBeUndefined();
-    });
-
-    it.each([
-      () => getBlock(0).body.txEffects[0],
-      () => getBlock(9).body.txEffects[3],
-      () => getBlock(3).body.txEffects[1],
-      () => getBlock(5).body.txEffects[2],
-      () => getBlock(1).body.txEffects[0],
-    ])('tries to retrieves a previously stored transaction after deleted', async getTxEffect => {
-      await store.removeCheckpointsAfter(CheckpointNumber(0));
-
-      const txEffect = getTxEffect();
-      const actualTx = await store.getTxEffect(txEffect.txHash);
-      expect(actualTx).toEqual(undefined);
-    });
-
-    it('returns undefined if tx is not found', async () => {
-      await expect(store.getTxEffect(TxHash.random())).resolves.toBeUndefined();
-    });
-
-    it('does not fail if the block is removed while requesting a tx', async () => {
-      const txEffect = getBlock(1).body.txEffects[0];
-      let done = false;
-      void (async () => {
-        while (!done) {
-          void store.getTxEffect(txEffect.txHash);
-          await sleep(1);
-        }
-      })();
-      await store.removeCheckpointsAfter(CheckpointNumber(0));
-      done = true;
-      expect(await store.getTxEffect(txEffect.txHash)).toEqual(undefined);
-    });
-  });
-
-  describe('L1 to L2 Messages', () => {
-    const initialCheckpointNumber = CheckpointNumber(13);
-
-    const checkMessages = async (msgs: InboxMessage[]) => {
-      expect(await store.getLastL1ToL2Message()).toEqual(msgs.at(-1));
-      expect(await toArray(store.iterateL1ToL2Messages())).toEqual(msgs);
-      expect(await store.getTotalL1ToL2MessageCount()).toEqual(BigInt(msgs.length));
-    };
-
-    it('stores first message ever', async () => {
-      const msg = makeInboxMessage(Buffer16.ZERO, { index: 0n, checkpointNumber: CheckpointNumber(1) });
-      await store.addL1ToL2Messages([msg]);
-
-      await checkMessages([msg]);
-      expect(await store.getL1ToL2Messages(CheckpointNumber(1))).toEqual([msg.leaf]);
-    });
-
-    it('stores single message', async () => {
-      const msg = makeInboxMessage(Buffer16.ZERO, { checkpointNumber: CheckpointNumber(2) });
-      await store.addL1ToL2Messages([msg]);
-
-      await checkMessages([msg]);
-      expect(await store.getL1ToL2Messages(CheckpointNumber(2))).toEqual([msg.leaf]);
-    });
-
-    it('stores and returns messages across different blocks', async () => {
-      const msgs = makeInboxMessages(5, { initialCheckpointNumber });
-      await store.addL1ToL2Messages(msgs);
-
-      await checkMessages(msgs);
-      expect(await store.getL1ToL2Messages(CheckpointNumber(initialCheckpointNumber + 2))).toEqual(
-        [msgs[2]].map(m => m.leaf),
-      );
-    });
-
-    it('stores the same messages again', async () => {
-      const msgs = makeInboxMessages(5, { initialCheckpointNumber });
-      await store.addL1ToL2Messages(msgs);
-      await store.addL1ToL2Messages(msgs.slice(2));
-
-      await checkMessages(msgs);
-    });
-
-    it('stores and returns messages across different blocks with gaps', async () => {
-      const msgs1 = makeInboxMessages(3, { initialCheckpointNumber: CheckpointNumber(1) });
-      const msgs2 = makeInboxMessages(3, {
-        initialCheckpointNumber: CheckpointNumber(20),
-        initialHash: msgs1.at(-1)!.rollingHash,
-      });
-
-      await store.addL1ToL2Messages(msgs1);
-      await store.addL1ToL2Messages(msgs2);
-
-      await checkMessages([...msgs1, ...msgs2]);
-
-      expect(await store.getL1ToL2Messages(CheckpointNumber(1))).toEqual([msgs1[0].leaf]);
-      expect(await store.getL1ToL2Messages(CheckpointNumber(4))).toEqual([]);
-      expect(await store.getL1ToL2Messages(CheckpointNumber(20))).toEqual([msgs2[0].leaf]);
-      expect(await store.getL1ToL2Messages(CheckpointNumber(24))).toEqual([]);
-    });
-
-    it('stores and returns messages with block numbers larger than a byte', async () => {
-      const msgs = makeInboxMessages(5, { initialCheckpointNumber: CheckpointNumber(1000) });
-      await store.addL1ToL2Messages(msgs);
-
-      await checkMessages(msgs);
-      expect(await store.getL1ToL2Messages(CheckpointNumber(1002))).toEqual([msgs[2]].map(m => m.leaf));
-    });
-
-    it('stores and returns multiple messages per block', async () => {
-      const msgs = makeInboxMessagesWithFullBlocks(4);
-      await store.addL1ToL2Messages(msgs);
-
-      await checkMessages(msgs);
-      const blockMessages = await store.getL1ToL2Messages(CheckpointNumber(initialCheckpointNumber + 1));
-      expect(blockMessages).toHaveLength(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
-      expect(blockMessages).toEqual(
-        msgs.slice(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP * 2).map(m => m.leaf),
-      );
-    });
-
-    it('stores messages in multiple operations', async () => {
-      const msgs = makeInboxMessages(20, { initialCheckpointNumber });
-      await store.addL1ToL2Messages(msgs.slice(0, 10));
-      await store.addL1ToL2Messages(msgs.slice(10, 20));
-
-      expect(await store.getL1ToL2Messages(CheckpointNumber(initialCheckpointNumber + 2))).toEqual(
-        [msgs[2]].map(m => m.leaf),
-      );
-      expect(await store.getL1ToL2Messages(CheckpointNumber(initialCheckpointNumber + 12))).toEqual(
-        [msgs[12]].map(m => m.leaf),
-      );
-      await checkMessages(msgs);
-    });
-
-    it('iterates over messages from start index', async () => {
-      const msgs = makeInboxMessages(10, { initialCheckpointNumber });
-      await store.addL1ToL2Messages(msgs);
-
-      const iterated = await toArray(store.iterateL1ToL2Messages({ start: msgs[3].index }));
-      expect(iterated).toEqual(msgs.slice(3));
-    });
-
-    it('iterates over messages in reverse', async () => {
-      const msgs = makeInboxMessages(10, { initialCheckpointNumber });
-      await store.addL1ToL2Messages(msgs);
-      initialCheckpointNumber;
-
-      const iterated = await toArray(store.iterateL1ToL2Messages({ reverse: true, end: msgs[3].index }));
-      expect(iterated).toEqual(msgs.slice(0, 4).reverse());
-    });
-
-    it('throws if messages are added out of order', async () => {
-      const msgs = makeInboxMessages(5, { overrideFn: (msg, i) => ({ ...msg, index: BigInt(10 - i) }) });
-      await expect(store.addL1ToL2Messages(msgs)).rejects.toThrow(MessageStoreError);
-    });
-
-    it('throws if block number for the first message is out of order', async () => {
-      const msgs = makeInboxMessages(4, { initialCheckpointNumber });
-      msgs[2].checkpointNumber = CheckpointNumber(initialCheckpointNumber - 1);
-      await store.addL1ToL2Messages(msgs.slice(0, 2));
-      await expect(store.addL1ToL2Messages(msgs.slice(2, 4))).rejects.toThrow(MessageStoreError);
-    });
-
-    it('throws if rolling hash is not correct', async () => {
-      const msgs = makeInboxMessages(5);
-      msgs[1].rollingHash = Buffer16.random();
-      await expect(store.addL1ToL2Messages(msgs)).rejects.toThrow(MessageStoreError);
-    });
-
-    it('throws if rolling hash for first message is not correct', async () => {
-      const msgs = makeInboxMessages(4);
-      msgs[2].rollingHash = Buffer16.random();
-      await store.addL1ToL2Messages(msgs.slice(0, CheckpointNumber(2)));
-      await expect(store.addL1ToL2Messages(msgs.slice(2, 4))).rejects.toThrow(MessageStoreError);
-    });
-
-    it('throws if index is not in the correct range', async () => {
-      const msgs = makeInboxMessages(5, { initialCheckpointNumber });
-      msgs.at(-1)!.index += 100n;
-      await expect(store.addL1ToL2Messages(msgs)).rejects.toThrow(MessageStoreError);
-    });
-
-    it('throws if first index in block has gaps', async () => {
-      const msgs = makeInboxMessages(4, { initialCheckpointNumber });
-      msgs[2].index++;
-      await expect(store.addL1ToL2Messages(msgs)).rejects.toThrow(MessageStoreError);
-    });
-
-    it('throws if index does not follow previous one', async () => {
-      const msgs = makeInboxMessages(2, {
-        initialCheckpointNumber,
-        overrideFn: (msg, i) => ({
-          ...msg,
-          checkpointNumber: CheckpointNumber(2),
-          index: BigInt(i + NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP * 2),
-        }),
-      });
-      msgs[1].index++;
-      await expect(store.addL1ToL2Messages(msgs)).rejects.toThrow(MessageStoreError);
-    });
-
-    it('removes messages up to the given block number', async () => {
-      const msgs = makeInboxMessagesWithFullBlocks(4, { initialCheckpointNumber: CheckpointNumber(1) });
-
-      await store.addL1ToL2Messages(msgs);
-      await checkMessages(msgs);
-
-      expect(await store.getL1ToL2Messages(CheckpointNumber(1))).toHaveLength(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
-      expect(await store.getL1ToL2Messages(CheckpointNumber(2))).toHaveLength(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
-      expect(await store.getL1ToL2Messages(CheckpointNumber(3))).toHaveLength(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
-      expect(await store.getL1ToL2Messages(CheckpointNumber(4))).toHaveLength(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
-
-      await store.rollbackL1ToL2MessagesToCheckpoint(CheckpointNumber(2));
-
-      expect(await store.getL1ToL2Messages(CheckpointNumber(1))).toHaveLength(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
-      expect(await store.getL1ToL2Messages(CheckpointNumber(2))).toHaveLength(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
-      expect(await store.getL1ToL2Messages(CheckpointNumber(3))).toHaveLength(0);
-      expect(await store.getL1ToL2Messages(CheckpointNumber(4))).toHaveLength(0);
-
-      await checkMessages(msgs.slice(0, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP * 2));
-    });
-
-    it('removes messages starting with the given index', async () => {
-      const msgs = makeInboxMessagesWithFullBlocks(4, { initialCheckpointNumber: CheckpointNumber(1) });
-      await store.addL1ToL2Messages(msgs);
-
-      await store.removeL1ToL2Messages(msgs[13].index);
-      await checkMessages(msgs.slice(0, 13));
-    });
-
-    describe('inbox tree in progress guard', () => {
-      it('throws when checkpointNumber >= treeInProgress', async () => {
-        const msgs = makeInboxMessages(3, { initialCheckpointNumber: CheckpointNumber(5) });
-        await store.addL1ToL2Messages(msgs);
-
-        // Set treeInProgress to 7, meaning checkpoints 5 and 6 are sealed, 7+ are not
-        await store.setMessageSyncState({ l1BlockNumber: 1n, l1BlockHash: Buffer32.random() }, 7n);
-
-        // Sealed checkpoint should succeed
-        await expect(store.getL1ToL2Messages(CheckpointNumber(5))).resolves.toEqual([msgs[0].leaf]);
-
-        // Unsealed checkpoint (== treeInProgress) should throw
-        await expect(store.getL1ToL2Messages(CheckpointNumber(7))).rejects.toThrow(L1ToL2MessagesNotReadyError);
-
-        // Future checkpoint should also throw
-        await expect(store.getL1ToL2Messages(CheckpointNumber(8))).rejects.toThrow(L1ToL2MessagesNotReadyError);
-      });
-
-      it('returns messages when checkpointNumber < treeInProgress', async () => {
-        const msgs = makeInboxMessages(3, { initialCheckpointNumber: CheckpointNumber(10) });
-        await store.addL1ToL2Messages(msgs);
-
-        await store.setMessageSyncState({ l1BlockNumber: 1n, l1BlockHash: Buffer32.random() }, 13n);
-
-        await expect(store.getL1ToL2Messages(CheckpointNumber(10))).resolves.toEqual([msgs[0].leaf]);
-        await expect(store.getL1ToL2Messages(CheckpointNumber(11))).resolves.toEqual([msgs[1].leaf]);
-      });
-
-      it('skips guard when treeInProgress is not set', async () => {
-        const msgs = makeInboxMessages(2, { initialCheckpointNumber: CheckpointNumber(1) });
-        await store.addL1ToL2Messages(msgs);
-
-        // No setMessageSyncState call — guard should be permissive
-        await expect(store.getL1ToL2Messages(CheckpointNumber(1))).resolves.toEqual([msgs[0].leaf]);
-      });
-    });
-  });
-
-  describe('contractInstances', () => {
-    let contractInstance: ContractInstanceWithAddress;
-    const blockNum = 10;
-    const timestamp = 3600n;
-
-    beforeEach(async () => {
-      const classId = Fr.random();
-      const randomInstance = await SerializableContractInstance.random({
-        currentContractClassId: classId,
-        originalContractClassId: classId,
-      });
-      contractInstance = { ...randomInstance, address: await AztecAddress.random() };
-      await store.addContractInstances([contractInstance], BlockNumber(blockNum));
-    });
-
-    it('returns previously stored contract instances', async () => {
-      await expect(store.getContractInstance(contractInstance.address, timestamp)).resolves.toMatchObject(
-        contractInstance,
-      );
-    });
-
-    it('returns undefined if contract instance is not found', async () => {
-      await expect(store.getContractInstance(await AztecAddress.random(), timestamp)).resolves.toBeUndefined();
-    });
-
-    it('returns undefined if previously stored contract instances was deleted', async () => {
-      await store.deleteContractInstances([contractInstance], BlockNumber(blockNum));
-      await expect(store.getContractInstance(contractInstance.address, timestamp)).resolves.toBeUndefined();
-    });
-  });
-
-  describe('contractInstanceUpdates', () => {
-    let contractInstance: ContractInstanceWithAddress;
-    let classId: Fr;
-    let nextClassId: Fr;
-    const timestampOfChange = 3600n;
-
-    beforeEach(async () => {
-      classId = Fr.random();
-      nextClassId = Fr.random();
-      const randomInstance = await SerializableContractInstance.random({
-        currentContractClassId: classId,
-        originalContractClassId: classId,
-      });
-      contractInstance = { ...randomInstance, address: await AztecAddress.random() };
-      await store.addContractInstances([contractInstance], BlockNumber(1));
-      await store.addContractInstanceUpdates(
-        [
-          {
-            prevContractClassId: classId,
-            newContractClassId: nextClassId,
-            timestampOfChange,
-            address: contractInstance.address,
-          },
-        ],
-        timestampOfChange - 1n,
-      );
-    });
-
-    it('gets the correct current class id for a contract not updated yet', async () => {
-      const fetchedInstance = await store.getContractInstance(contractInstance.address, timestampOfChange - 1n);
-      expect(fetchedInstance?.originalContractClassId).toEqual(classId);
-      expect(fetchedInstance?.currentContractClassId).toEqual(classId);
-    });
-
-    it('gets the correct current class id for a contract that has just been updated', async () => {
-      const fetchedInstance = await store.getContractInstance(contractInstance.address, timestampOfChange);
-      expect(fetchedInstance?.originalContractClassId).toEqual(classId);
-      expect(fetchedInstance?.currentContractClassId).toEqual(nextClassId);
-    });
-
-    it('gets the correct current class id for a contract that was updated in the past', async () => {
-      const fetchedInstance = await store.getContractInstance(contractInstance.address, timestampOfChange + 1n);
-      expect(fetchedInstance?.originalContractClassId).toEqual(classId);
-      expect(fetchedInstance?.currentContractClassId).toEqual(nextClassId);
-    });
-
-    it('ignores updates for the wrong contract', async () => {
-      const otherClassId = Fr.random();
-      const randomInstance = await SerializableContractInstance.random({
-        currentContractClassId: otherClassId,
-        originalContractClassId: otherClassId,
-      });
-      const otherContractInstance = {
-        ...randomInstance,
-        address: await AztecAddress.random(),
-      };
-      await store.addContractInstances([otherContractInstance], BlockNumber(1));
-
-      const fetchedInstance = await store.getContractInstance(otherContractInstance.address, timestampOfChange + 1n);
-      expect(fetchedInstance?.originalContractClassId).toEqual(otherClassId);
-      expect(fetchedInstance?.currentContractClassId).toEqual(otherClassId);
-    });
-
-    it('bounds its search to the right contract if more than than one update exists', async () => {
-      const otherClassId = Fr.random();
-      const otherNextClassId = Fr.random();
-      const randomInstance = await SerializableContractInstance.random({
-        currentContractClassId: otherClassId,
-        originalContractClassId: otherNextClassId,
-      });
-      const otherContractInstance = {
-        ...randomInstance,
-        address: await AztecAddress.random(),
-      };
-      await store.addContractInstances([otherContractInstance], BlockNumber(1));
-      await store.addContractInstanceUpdates(
-        [
-          {
-            prevContractClassId: otherClassId,
-            newContractClassId: otherNextClassId,
-            timestampOfChange,
-            address: otherContractInstance.address,
-          },
-        ],
-        timestampOfChange - 1n,
-      );
-
-      const fetchedInstance = await store.getContractInstance(contractInstance.address, timestampOfChange + 1n);
-      expect(fetchedInstance?.originalContractClassId).toEqual(classId);
-      expect(fetchedInstance?.currentContractClassId).toEqual(nextClassId);
-    });
-  });
-
-  describe('contractClasses', () => {
-    let contractClass: ContractClassPublic;
-    const blockNum = 10;
-
-    beforeEach(async () => {
-      contractClass = await makeContractClassPublic();
-      await store.addContractClasses([await withCommitment(contractClass)], BlockNumber(blockNum));
-    });
-
-    it('returns previously stored contract class', async () => {
-      await expect(store.getContractClass(contractClass.id)).resolves.toMatchObject(contractClass);
-    });
-
-    it('returns undefined if the initial deployed contract class was deleted', async () => {
-      await store.deleteContractClasses([contractClass], BlockNumber(blockNum));
-      await expect(store.getContractClass(contractClass.id)).resolves.toBeUndefined();
-    });
-
-    it('throws if the same contract class is added again', async () => {
-      await expect(
-        store.addContractClasses([await withCommitment(contractClass)], BlockNumber(blockNum + 1)),
-      ).rejects.toThrow(/already exists/);
-    });
-
-    it('returns contract class if deleted at a later block number', async () => {
-      await store.deleteContractClasses([contractClass], BlockNumber(blockNum + 1));
-      await expect(store.getContractClass(contractClass.id)).resolves.toMatchObject(contractClass);
-    });
-
-    it('returns undefined if contract class is not found', async () => {
-      await expect(store.getContractClass(Fr.random())).resolves.toBeUndefined();
-    });
-  });
-
-  // Note that a lot of tests here are basically duplicates of the ones in getPublicLogsByTagsFromContract but
-  // the types used by each of the endpoints are different and that makes improving code reuse here not
-  // straightforward.
-  describe('getPrivateLogsByTags', () => {
-    const numBlocksForLogs = 3;
-    const numTxsPerBlock = 4;
-    const numPrivateLogsPerTx = 3;
-
-    let logsCheckpoints: PublishedCheckpoint[];
-
-    beforeEach(async () => {
-      // Create checkpoints sequentially to chain archive roots
-      logsCheckpoints = [];
-      for (let i = 0; i < numBlocksForLogs; i++) {
-        const previousArchive = i > 0 ? logsCheckpoints[i - 1].checkpoint.blocks[0].archive : undefined;
-        logsCheckpoints.push(
-          await makeCheckpointWithLogs(i + 1, {
-            previousArchive,
-            numTxsPerBlock,
-            privateLogs: { numLogsPerTx: numPrivateLogsPerTx },
-          }),
-        );
-      }
-
-      await store.addCheckpoints(logsCheckpoints);
-      await store.addLogs(logsCheckpoints.flatMap(p => p.checkpoint.blocks));
-    });
-
-    it('is possible to batch request private logs via tags', async () => {
-      const tags = [makePrivateLogTag(2, 1, 2), makePrivateLogTag(1, 2, 0)];
-
-      const logsByTags = await store.getPrivateLogsByTags(tags);
-
-      expect(logsByTags).toEqual([
-        [
-          expect.objectContaining({
-            blockNumber: 2,
-            logData: makePrivateLog(tags[0]).getEmittedFields(),
-          }),
-        ],
-        [
-          expect.objectContaining({
-            blockNumber: 1,
-            logData: makePrivateLog(tags[1]).getEmittedFields(),
-          }),
-        ],
-      ]);
-    });
-
-    it('is possible to batch request logs that have the same tag but different content', async () => {
-      const tags = [makePrivateLogTag(1, 2, 1)];
-
-      // Create a checkpoint containing logs that have the same tag as the checkpoints before.
-      // Chain from the last checkpoint's archive
-      const newBlockNumber = numBlocksForLogs + 1;
-      const previousArchive = logsCheckpoints[logsCheckpoints.length - 1].checkpoint.blocks[0].archive;
-      const newCheckpoint = await makeCheckpointWithLogs(newBlockNumber, {
-        previousArchive,
-        numTxsPerBlock,
-        privateLogs: { numLogsPerTx: numPrivateLogsPerTx },
-      });
-      const newLog = newCheckpoint.checkpoint.blocks[0].body.txEffects[1].privateLogs[1];
-      newLog.fields[0] = tags[0].value;
-      newCheckpoint.checkpoint.blocks[0].body.txEffects[1].privateLogs[1] = newLog;
-      await store.addCheckpoints([newCheckpoint]);
-      await store.addLogs([newCheckpoint.checkpoint.blocks[0]]);
-
-      const logsByTags = await store.getPrivateLogsByTags(tags);
-
-      expect(logsByTags).toEqual([
-        [
-          expect.objectContaining({
-            blockNumber: 1,
-            logData: makePrivateLog(tags[0]).getEmittedFields(),
-          }),
-          expect.objectContaining({
-            blockNumber: newBlockNumber,
-            logData: newLog.getEmittedFields(),
-          }),
-        ],
-      ]);
-    });
-
-    it('throws on out-of-order private log insertion', async () => {
-      const sharedTag = makePrivateLogTag(99, 0, 0);
-
-      // Create blocks 4 and 5 with the same shared tag
-      const prevArchive1 = logsCheckpoints[logsCheckpoints.length - 1].checkpoint.blocks[0].archive;
-      const checkpoint4 = await makeCheckpointWithLogs(numBlocksForLogs + 1, {
-        previousArchive: prevArchive1,
-        numTxsPerBlock,
-        privateLogs: { numLogsPerTx: numPrivateLogsPerTx },
-      });
-      checkpoint4.checkpoint.blocks[0].body.txEffects[0].privateLogs[0] = makePrivateLog(sharedTag);
-
-      const prevArchive2 = checkpoint4.checkpoint.blocks[0].archive;
-      const checkpoint5 = await makeCheckpointWithLogs(numBlocksForLogs + 2, {
-        previousArchive: prevArchive2,
-        numTxsPerBlock,
-        privateLogs: { numLogsPerTx: numPrivateLogsPerTx },
-      });
-      checkpoint5.checkpoint.blocks[0].body.txEffects[0].privateLogs[0] = makePrivateLog(sharedTag);
-
-      // Store block 5's logs first (higher block number), then try to store block 4's logs
-      // (lower block number) — this should fail.
-      await store.addLogs([checkpoint5.checkpoint.blocks[0]]);
-      await expect(store.addLogs([checkpoint4.checkpoint.blocks[0]])).rejects.toThrow(OutOfOrderLogInsertionError);
-    });
-
-    it('is possible to request logs for non-existing tags and determine their position', async () => {
-      const tags = [makePrivateLogTag(99, 88, 77), makePrivateLogTag(1, 1, 1)];
-
-      const logsByTags = await store.getPrivateLogsByTags(tags);
-
-      expect(logsByTags).toEqual([
-        [
-          // No logs for the first tag.
-        ],
-        [
-          expect.objectContaining({
-            blockNumber: 1,
-            logData: makePrivateLog(tags[1]).getEmittedFields(),
-          }),
-        ],
-      ]);
-    });
-
-    it('filters logs up to specified block number', async () => {
-      // Tags are unique per block, so create a shared tag across blocks by adding logs with the same tag
-      const sharedTag = makePrivateLogTag(1, 2, 1);
-
-      // Add extra blocks with logs sharing the same tag
-      for (let blockNum = numBlocksForLogs + 1; blockNum <= numBlocksForLogs + 2; blockNum++) {
-        const previousArchive = logsCheckpoints[logsCheckpoints.length - 1].checkpoint.blocks[0].archive;
-        const newCheckpoint = await makeCheckpointWithLogs(blockNum, {
-          previousArchive,
-          numTxsPerBlock,
-          privateLogs: { numLogsPerTx: numPrivateLogsPerTx },
-        });
-        const newLog = newCheckpoint.checkpoint.blocks[0].body.txEffects[1].privateLogs[1];
-        newLog.fields[0] = sharedTag.value;
-        newCheckpoint.checkpoint.blocks[0].body.txEffects[1].privateLogs[1] = newLog;
-        await store.addCheckpoints([newCheckpoint]);
-        await store.addLogs([newCheckpoint.checkpoint.blocks[0]]);
-        logsCheckpoints.push(newCheckpoint);
-      }
-
-      // Without filter, should return logs from block 1 and the extra blocks
-      const allLogs = await store.getPrivateLogsByTags([sharedTag]);
-      expect(allLogs[0].some(log => log.blockNumber > numBlocksForLogs)).toBe(true);
-
-      // With upToBlockNumber=numBlocksForLogs, should only return the original log from block 1
-      const filteredLogs = await store.getPrivateLogsByTags([sharedTag], 0, BlockNumber(numBlocksForLogs));
-      expect(filteredLogs[0].length).toBeGreaterThan(0);
-      for (const log of filteredLogs[0]) {
-        expect(log.blockNumber).toBeLessThanOrEqual(numBlocksForLogs);
-      }
-      expect(filteredLogs[0].length).toBeLessThan(allLogs[0].length);
-    });
-
-    it('returns all logs when upToBlockNumber is not set', async () => {
-      const tag = makePrivateLogTag(1, 2, 1);
-
-      const logsWithoutFilter = await store.getPrivateLogsByTags([tag]);
-      const logsWithUndefined = await store.getPrivateLogsByTags([tag], 0, undefined);
-
-      expect(logsWithoutFilter).toEqual(logsWithUndefined);
-    });
-
-    describe('pagination', () => {
-      const paginationTag = makePrivateLogTag(1, 2, 1);
-
-      beforeEach(async () => {
-        // Add more blocks with the same tag to exceed MAX_LOGS_PER_TAG
-        for (let i = numBlocksForLogs; i < numBlocksForLogs + MAX_LOGS_PER_TAG + 5; i++) {
-          const previousArchive = logsCheckpoints[logsCheckpoints.length - 1].checkpoint.blocks[0].archive;
-          const newCheckpoint = await makeCheckpointWithLogs(i + 1, {
-            previousArchive,
-            numTxsPerBlock,
-            privateLogs: { numLogsPerTx: numPrivateLogsPerTx },
-          });
-          const newLog = newCheckpoint.checkpoint.blocks[0].body.txEffects[1].privateLogs[1];
-          newLog.fields[0] = paginationTag.value;
-          newCheckpoint.checkpoint.blocks[0].body.txEffects[1].privateLogs[1] = newLog;
-          await store.addCheckpoints([newCheckpoint]);
-          await store.addLogs([newCheckpoint.checkpoint.blocks[0]]);
-          logsCheckpoints.push(newCheckpoint);
-        }
-      });
-
-      it('pagination works correctly with upToBlockNumber', async () => {
-        // With a low upToBlockNumber, the filtered set should be smaller than MAX_LOGS_PER_TAG
-        const filteredPage0 = await store.getPrivateLogsByTags([paginationTag], 0, BlockNumber(5));
-        for (const log of filteredPage0[0]) {
-          expect(log.blockNumber).toBeLessThanOrEqual(5);
-        }
-
-        // Page 1 with the same filter should only contain remaining filtered logs
-        const filteredPage1 = await store.getPrivateLogsByTags([paginationTag], 1, BlockNumber(5));
-        for (const log of filteredPage1[0]) {
-          expect(log.blockNumber).toBeLessThanOrEqual(5);
-        }
-      });
-
-      it('returns first page of logs when page=0', async () => {
-        const logsByTags = await store.getPrivateLogsByTags([paginationTag], 0);
-
-        expect(logsByTags[0]).toHaveLength(MAX_LOGS_PER_TAG);
-        expect(logsByTags[0][0].blockNumber).toBe(1); // First log from block 1
-      });
-
-      it('returns second page of logs when page=1', async () => {
-        const logsByTags = await store.getPrivateLogsByTags([paginationTag], 1);
-
-        // Should have the remaining logs (total was MAX_LOGS_PER_TAG + 6, so page 1 has 6)
-        expect(logsByTags[0]).toHaveLength(6);
-      });
-
-      it('returns empty array when page is beyond available logs', async () => {
-        const logsByTags = await store.getPrivateLogsByTags([paginationTag], 100);
-
-        expect(logsByTags).toEqual([[]]);
-      });
-
-      /**
-       * Verifies that logs are stored and returned in block order (ascending).
-       * This ordering guarantee is critical for pagination safety: if logs were not ordered
-       * by block number, new logs added between paginated calls could be inserted in the
-       * middle of the result set, causing callers to receive duplicate logs or miss logs
-       * entirely. By maintaining block order, new logs always appear at the end of the
-       * result set, meaning previously fetched pages remain stable.
-       */
-      it('maintains stable pagination when new logs are added between page fetches', async () => {
-        // Fetch page 0 and record the block numbers
-        const page0Before = await store.getPrivateLogsByTags([paginationTag], 0);
-        expect(page0Before[0]).toHaveLength(MAX_LOGS_PER_TAG);
-        const blockNumbersBefore = page0Before[0].map(log => log.blockNumber);
-
-        // Verify block numbers are in ascending order
-        for (let i = 1; i < blockNumbersBefore.length; i++) {
-          expect(blockNumbersBefore[i]).toBeGreaterThanOrEqual(blockNumbersBefore[i - 1]);
-        }
-
-        // Add more blocks with the same tag
-        const additionalBlocks = 3;
-        for (let i = 0; i < additionalBlocks; i++) {
-          const previousArchive = logsCheckpoints[logsCheckpoints.length - 1].checkpoint.blocks[0].archive;
-          const blockNumber = logsCheckpoints.length + 1;
-          const newCheckpoint = await makeCheckpointWithLogs(blockNumber, {
-            previousArchive,
-            numTxsPerBlock,
-            privateLogs: { numLogsPerTx: numPrivateLogsPerTx },
-          });
-          const newLog = newCheckpoint.checkpoint.blocks[0].body.txEffects[1].privateLogs[1];
-          newLog.fields[0] = paginationTag.value;
-          newCheckpoint.checkpoint.blocks[0].body.txEffects[1].privateLogs[1] = newLog;
-          await store.addCheckpoints([newCheckpoint]);
-          await store.addLogs([newCheckpoint.checkpoint.blocks[0]]);
-          logsCheckpoints.push(newCheckpoint);
-        }
-
-        // Fetch page 0 again - should return the exact same logs
-        const page0After = await store.getPrivateLogsByTags([paginationTag], 0);
-        expect(page0After[0]).toHaveLength(MAX_LOGS_PER_TAG);
-        const blockNumbersAfter = page0After[0].map(log => log.blockNumber);
-        expect(blockNumbersAfter).toEqual(blockNumbersBefore);
-
-        // Fetch page 1 - should include the newly added logs
-        const page1 = await store.getPrivateLogsByTags([paginationTag], 1);
-        expect(page1[0].length).toBeGreaterThan(0);
-
-        // Verify all logs across both pages are in ascending block order
-        const allBlockNumbers = [...blockNumbersAfter, ...page1[0].map(log => log.blockNumber)];
-        for (let i = 1; i < allBlockNumbers.length; i++) {
-          expect(allBlockNumbers[i]).toBeGreaterThanOrEqual(allBlockNumbers[i - 1]);
-        }
-
-        // The new logs should appear on page 1, meaning their block numbers
-        // should be greater than or equal to the max block number on page 0
-        const maxBlockOnPage0 = Math.max(...blockNumbersAfter);
-        const newLogBlockNumbers = page1[0].slice(-additionalBlocks).map(log => log.blockNumber);
-        for (const blockNum of newLogBlockNumbers) {
-          expect(blockNum).toBeGreaterThanOrEqual(maxBlockOnPage0);
-        }
-      });
-    });
-  });
-
-  // Note that a lot of tests here are basically duplicates of the ones in getPrivateLogsByTags but the types used
-  // by each of the endpoints are different and that makes improving code reuse here not straightforward.
-  describe('getPublicLogsByTagsFromContract', () => {
-    const numBlocksForLogs = 3;
-    const numTxsPerBlock = 4;
-    const numPublicLogsPerTx = 2;
-    const contractAddress = AztecAddress.fromNumber(543254);
-
-    let logsCheckpoints: PublishedCheckpoint[];
-
-    beforeEach(async () => {
-      // Create checkpoints sequentially to chain archive roots
-      logsCheckpoints = [];
-      for (let i = 0; i < numBlocksForLogs; i++) {
-        const previousArchive = i > 0 ? logsCheckpoints[i - 1].checkpoint.blocks[0].archive : undefined;
-        logsCheckpoints.push(
-          await makeCheckpointWithLogs(i + 1, {
-            previousArchive,
-            numTxsPerBlock,
-            publicLogs: { numLogsPerTx: numPublicLogsPerTx, contractAddress },
-          }),
-        );
-      }
-
-      await store.addCheckpoints(logsCheckpoints);
-      await store.addLogs(logsCheckpoints.flatMap(p => p.checkpoint.blocks));
-    });
-
-    it('is possible to batch request public logs via tags', async () => {
-      const tags = [makePublicLogTag(2, 1, 1), makePublicLogTag(1, 2, 0)];
-
-      const logsByTags = await store.getPublicLogsByTagsFromContract(contractAddress, tags);
-
-      expect(logsByTags).toEqual([
-        [
-          expect.objectContaining({
-            blockNumber: 2,
-            logData: makePublicLog(tags[0]).getEmittedFields(),
-          }),
-        ],
-        [
-          expect.objectContaining({
-            blockNumber: 1,
-            logData: makePublicLog(tags[1]).getEmittedFields(),
-          }),
-        ],
-      ]);
-    });
-
-    it('is possible to batch request logs that have the same tag but different content', async () => {
-      const tags = [makePublicLogTag(1, 2, 1)];
-
-      // Create a checkpoint containing logs that have the same tag as the checkpoints before.
-      // Chain from the last checkpoint's archive
-      const newBlockNumber = numBlocksForLogs + 1;
-      const previousArchive = logsCheckpoints[logsCheckpoints.length - 1].checkpoint.blocks[0].archive;
-      const newCheckpoint = await makeCheckpointWithLogs(newBlockNumber, {
-        previousArchive,
-        numTxsPerBlock,
-        publicLogs: { numLogsPerTx: numPublicLogsPerTx, contractAddress },
-      });
-      const newLog = newCheckpoint.checkpoint.blocks[0].body.txEffects[1].publicLogs[1];
-      newLog.fields[0] = tags[0].value;
-      newCheckpoint.checkpoint.blocks[0].body.txEffects[1].publicLogs[1] = newLog;
-      await store.addCheckpoints([newCheckpoint]);
-      await store.addLogs([newCheckpoint.checkpoint.blocks[0]]);
-
-      const logsByTags = await store.getPublicLogsByTagsFromContract(contractAddress, tags);
-
-      expect(logsByTags).toEqual([
-        [
-          expect.objectContaining({
-            blockNumber: 1,
-            logData: makePublicLog(tags[0]).getEmittedFields(),
-          }),
-          expect.objectContaining({
-            blockNumber: newBlockNumber,
-            logData: newLog.getEmittedFields(),
-          }),
-        ],
-      ]);
-    });
-
-    it('throws on out-of-order public log insertion', async () => {
-      const sharedTag = makePublicLogTag(99, 0, 0);
-
-      // Create blocks 4 and 5 with the same shared tag
-      const prevArchive1 = logsCheckpoints[logsCheckpoints.length - 1].checkpoint.blocks[0].archive;
-      const checkpoint4 = await makeCheckpointWithLogs(numBlocksForLogs + 1, {
-        previousArchive: prevArchive1,
-        numTxsPerBlock,
-        publicLogs: { numLogsPerTx: numPublicLogsPerTx, contractAddress },
-      });
-      checkpoint4.checkpoint.blocks[0].body.txEffects[0].publicLogs[0] = makePublicLog(sharedTag, contractAddress);
-
-      const prevArchive2 = checkpoint4.checkpoint.blocks[0].archive;
-      const checkpoint5 = await makeCheckpointWithLogs(numBlocksForLogs + 2, {
-        previousArchive: prevArchive2,
-        numTxsPerBlock,
-        publicLogs: { numLogsPerTx: numPublicLogsPerTx, contractAddress },
-      });
-      checkpoint5.checkpoint.blocks[0].body.txEffects[0].publicLogs[0] = makePublicLog(sharedTag, contractAddress);
-
-      // Store block 5's logs first (higher block number), then try to store block 4's logs
-      // (lower block number) — this should fail.
-      await store.addLogs([checkpoint5.checkpoint.blocks[0]]);
-      await expect(store.addLogs([checkpoint4.checkpoint.blocks[0]])).rejects.toThrow(OutOfOrderLogInsertionError);
-    });
-
-    it('is possible to request logs for non-existing tags and determine their position', async () => {
-      const tags = [makePublicLogTag(99, 88, 77), makePublicLogTag(1, 1, 0)];
-
-      const logsByTags = await store.getPublicLogsByTagsFromContract(contractAddress, tags);
-
-      expect(logsByTags).toEqual([
-        [
-          // No logs for the first tag.
-        ],
-        [
-          expect.objectContaining({
-            blockNumber: 1,
-            logData: makePublicLog(tags[1]).getEmittedFields(),
-          }),
-        ],
-      ]);
-    });
-
-    it('filters logs up to specified block number', async () => {
-      const sharedTag = makePublicLogTag(1, 2, 1);
-
-      // Add extra blocks with logs sharing the same tag
-      for (let blockNum = numBlocksForLogs + 1; blockNum <= numBlocksForLogs + 2; blockNum++) {
-        const previousArchive = logsCheckpoints[logsCheckpoints.length - 1].checkpoint.blocks[0].archive;
-        const newCheckpoint = await makeCheckpointWithLogs(blockNum, {
-          previousArchive,
-          numTxsPerBlock,
-          publicLogs: { numLogsPerTx: numPublicLogsPerTx, contractAddress },
-        });
-        const newLog = newCheckpoint.checkpoint.blocks[0].body.txEffects[1].publicLogs[1];
-        newLog.fields[0] = sharedTag.value;
-        newCheckpoint.checkpoint.blocks[0].body.txEffects[1].publicLogs[1] = newLog;
-        await store.addCheckpoints([newCheckpoint]);
-        await store.addLogs([newCheckpoint.checkpoint.blocks[0]]);
-        logsCheckpoints.push(newCheckpoint);
-      }
-
-      // Without filter, should return logs from block 1 and the extra blocks
-      const allLogs = await store.getPublicLogsByTagsFromContract(contractAddress, [sharedTag]);
-      expect(allLogs[0].some(log => log.blockNumber > numBlocksForLogs)).toBe(true);
-
-      // With upToBlockNumber=numBlocksForLogs, should only return the original log from block 1
-      const filteredLogs = await store.getPublicLogsByTagsFromContract(
-        contractAddress,
-        [sharedTag],
-        0,
-        BlockNumber(numBlocksForLogs),
-      );
-      expect(filteredLogs[0].length).toBeGreaterThan(0);
-      for (const log of filteredLogs[0]) {
-        expect(log.blockNumber).toBeLessThanOrEqual(numBlocksForLogs);
-      }
-      expect(filteredLogs[0].length).toBeLessThan(allLogs[0].length);
-    });
-
-    it('returns all logs when upToBlockNumber is not set', async () => {
-      const tag = makePublicLogTag(1, 2, 1);
-
-      const logsWithoutFilter = await store.getPublicLogsByTagsFromContract(contractAddress, [tag]);
-      const logsWithUndefined = await store.getPublicLogsByTagsFromContract(contractAddress, [tag], 0, undefined);
-
-      expect(logsWithoutFilter).toEqual(logsWithUndefined);
-    });
-
-    describe('pagination', () => {
-      const paginationTag = makePublicLogTag(1, 2, 1);
-
-      beforeEach(async () => {
-        // Add more blocks with the same tag to exceed MAX_LOGS_PER_TAG
-        for (let i = numBlocksForLogs; i < numBlocksForLogs + MAX_LOGS_PER_TAG + 5; i++) {
-          const previousArchive = logsCheckpoints[logsCheckpoints.length - 1].checkpoint.blocks[0].archive;
-          const newCheckpoint = await makeCheckpointWithLogs(i + 1, {
-            previousArchive,
-            numTxsPerBlock,
-            publicLogs: { numLogsPerTx: numPublicLogsPerTx, contractAddress },
-          });
-          const newLog = newCheckpoint.checkpoint.blocks[0].body.txEffects[1].publicLogs[1];
-          newLog.fields[0] = paginationTag.value;
-          newCheckpoint.checkpoint.blocks[0].body.txEffects[1].publicLogs[1] = newLog;
-          await store.addCheckpoints([newCheckpoint]);
-          await store.addLogs([newCheckpoint.checkpoint.blocks[0]]);
-          logsCheckpoints.push(newCheckpoint);
-        }
-      });
-
-      it('pagination works correctly with upToBlockNumber', async () => {
-        const filteredPage0 = await store.getPublicLogsByTagsFromContract(
-          contractAddress,
-          [paginationTag],
-          0,
-          BlockNumber(5),
-        );
-        for (const log of filteredPage0[0]) {
-          expect(log.blockNumber).toBeLessThanOrEqual(5);
-        }
-
-        const filteredPage1 = await store.getPublicLogsByTagsFromContract(
-          contractAddress,
-          [paginationTag],
-          1,
-          BlockNumber(5),
-        );
-        for (const log of filteredPage1[0]) {
-          expect(log.blockNumber).toBeLessThanOrEqual(5);
-        }
-      });
-
-      it('returns first page of logs when page=0', async () => {
-        const logsByTags = await store.getPublicLogsByTagsFromContract(contractAddress, [paginationTag], 0);
-
-        expect(logsByTags[0]).toHaveLength(MAX_LOGS_PER_TAG);
-        expect(logsByTags[0][0].blockNumber).toBe(1); // First log from block 1
-      });
-
-      it('returns second page of logs when page=1', async () => {
-        const logsByTags = await store.getPublicLogsByTagsFromContract(contractAddress, [paginationTag], 1);
-
-        // Should have the remaining logs (total was MAX_LOGS_PER_TAG + 6, so page 1 has 6)
-        expect(logsByTags[0]).toHaveLength(6);
-      });
-
-      it('returns empty array when page is beyond available logs', async () => {
-        const logsByTags = await store.getPublicLogsByTagsFromContract(contractAddress, [paginationTag], 100);
-
-        expect(logsByTags).toEqual([[]]);
-      });
-
-      /**
-       * Verifies that logs are stored and returned in block order (ascending).
-       * This ordering guarantee is critical for pagination safety: if logs were not ordered
-       * by block number, new logs added between paginated calls could be inserted in the
-       * middle of the result set, causing callers to receive duplicate logs or miss logs
-       * entirely. By maintaining block order, new logs always appear at the end of the
-       * result set, meaning previously fetched pages remain stable.
-       */
-      it('maintains stable pagination when new logs are added between page fetches', async () => {
-        // Fetch page 0 and record the block numbers
-        const page0Before = await store.getPublicLogsByTagsFromContract(contractAddress, [paginationTag], 0);
-        expect(page0Before[0]).toHaveLength(MAX_LOGS_PER_TAG);
-        const blockNumbersBefore = page0Before[0].map(log => log.blockNumber);
-
-        // Verify block numbers are in ascending order
-        for (let i = 1; i < blockNumbersBefore.length; i++) {
-          expect(blockNumbersBefore[i]).toBeGreaterThanOrEqual(blockNumbersBefore[i - 1]);
-        }
-
-        // Add more blocks with the same tag
-        const additionalBlocks = 3;
-        for (let i = 0; i < additionalBlocks; i++) {
-          const previousArchive = logsCheckpoints[logsCheckpoints.length - 1].checkpoint.blocks[0].archive;
-          const blockNumber = logsCheckpoints.length + 1;
-          const newCheckpoint = await makeCheckpointWithLogs(blockNumber, {
-            previousArchive,
-            numTxsPerBlock,
-            publicLogs: { numLogsPerTx: numPublicLogsPerTx, contractAddress },
-          });
-          const newLog = newCheckpoint.checkpoint.blocks[0].body.txEffects[1].publicLogs[1];
-          newLog.fields[0] = paginationTag.value;
-          newCheckpoint.checkpoint.blocks[0].body.txEffects[1].publicLogs[1] = newLog;
-          await store.addCheckpoints([newCheckpoint]);
-          await store.addLogs([newCheckpoint.checkpoint.blocks[0]]);
-          logsCheckpoints.push(newCheckpoint);
-        }
-
-        // Fetch page 0 again - should return the exact same logs
-        const page0After = await store.getPublicLogsByTagsFromContract(contractAddress, [paginationTag], 0);
-        expect(page0After[0]).toHaveLength(MAX_LOGS_PER_TAG);
-        const blockNumbersAfter = page0After[0].map(log => log.blockNumber);
-        expect(blockNumbersAfter).toEqual(blockNumbersBefore);
-
-        // Fetch page 1 - should include the newly added logs
-        const page1 = await store.getPublicLogsByTagsFromContract(contractAddress, [paginationTag], 1);
-        expect(page1[0].length).toBeGreaterThan(0);
-
-        // Verify all logs across both pages are in ascending block order
-        const allBlockNumbers = [...blockNumbersAfter, ...page1[0].map(log => log.blockNumber)];
-        for (let i = 1; i < allBlockNumbers.length; i++) {
-          expect(allBlockNumbers[i]).toBeGreaterThanOrEqual(allBlockNumbers[i - 1]);
-        }
-
-        // The new logs should appear on page 1, meaning their block numbers
-        // should be greater than or equal to the max block number on page 0
-        const maxBlockOnPage0 = Math.max(...blockNumbersAfter);
-        const newLogBlockNumbers = page1[0].slice(-additionalBlocks).map(log => log.blockNumber);
-        for (const blockNum of newLogBlockNumbers) {
-          expect(blockNum).toBeGreaterThanOrEqual(maxBlockOnPage0);
-        }
-      });
-    });
-  });
-
-  describe('getPublicLogs', () => {
-    const numBlocksForPublicLogs = 10;
-
-    // Helper to get total public logs per tx from a block
-    const getPublicLogsPerTx = (block: L2Block, txIndex: number) => block.body.txEffects[txIndex].publicLogs.length;
-
-    // Helper to get number of txs in a block
-    const getTxsPerBlock = (block: L2Block) => block.body.txEffects.length;
-
-    beforeEach(async () => {
-      // Use the outer publishedCheckpoints for log tests
-      for (let i = 0; i < numBlocksForPublicLogs; i++) {
-        await store.addCheckpoints([publishedCheckpoints[i]]);
-        await store.addLogs(publishedCheckpoints[i].checkpoint.blocks);
-      }
-    });
-
-    it('no logs returned if deleted ("txHash" filter param is respected variant)', async () => {
-      // get random tx
-      const targetBlockIndex = randomInt(numBlocksForPublicLogs);
-      const targetBlock = publishedCheckpoints[targetBlockIndex].checkpoint.blocks[0];
-      const targetTxIndex = randomInt(getTxsPerBlock(targetBlock));
-      const targetTxHash = targetBlock.body.txEffects[targetTxIndex].txHash;
-
-      await Promise.all([
-        store.removeCheckpointsAfter(CheckpointNumber(0)),
-        store.deleteLogs(publishedCheckpoints.slice(0, numBlocksForPublicLogs).flatMap(b => b.checkpoint.blocks)),
-      ]);
-
-      const response = await store.getPublicLogs({ txHash: targetTxHash });
-      const logs = response.logs;
-
-      expect(response.maxLogsHit).toBeFalsy();
-      expect(logs.length).toEqual(0);
-    });
-
-    it('"txHash" filter param is respected', async () => {
-      // get random tx
-      const targetBlockIndex = randomInt(numBlocksForPublicLogs);
-      const targetBlock = publishedCheckpoints[targetBlockIndex].checkpoint.blocks[0];
-      const targetTxIndex = randomInt(getTxsPerBlock(targetBlock));
-      const targetTxHash = targetBlock.body.txEffects[targetTxIndex].txHash;
-
-      const response = await store.getPublicLogs({ txHash: targetTxHash });
-      const logs = response.logs;
-
-      expect(response.maxLogsHit).toBeFalsy();
-
-      const expectedNumLogs = getPublicLogsPerTx(targetBlock, targetTxIndex);
-      expect(logs.length).toEqual(expectedNumLogs);
-
-      const targeBlockNumber = targetBlockIndex + INITIAL_L2_BLOCK_NUM;
-      for (const log of logs) {
-        expect(log.id.blockNumber).toEqual(targeBlockNumber);
-        expect(log.id.txIndex).toEqual(targetTxIndex);
-      }
-    });
-
-    it('returns block hash on public log ids', async () => {
-      const targetBlock = publishedCheckpoints[0].checkpoint.blocks[0];
-      const expectedBlockHash = await targetBlock.header.hash();
-
-      const logs = (await store.getPublicLogs({ fromBlock: targetBlock.number, toBlock: targetBlock.number + 1 })).logs;
-
-      expect(logs.length).toBeGreaterThan(0);
-      expect(logs.every(log => log.id.blockHash.equals(expectedBlockHash))).toBe(true);
-    });
-
-    it('returns tx hash on public log ids', async () => {
-      const targetBlock = publishedCheckpoints[0].checkpoint.blocks[0];
-
-      const logs = (await store.getPublicLogs({ fromBlock: targetBlock.number, toBlock: targetBlock.number + 1 })).logs;
-
-      expect(logs.length).toBeGreaterThan(0);
-      const expectedTxHashes = targetBlock.body.txEffects.map(txEffect => txEffect.txHash);
-      for (const log of logs) {
-        const expectedTxHash = expectedTxHashes[log.id.txIndex];
-        expect(log.id.txHash.equals(expectedTxHash)).toBe(true);
-      }
-    });
-
-    it('"fromBlock" and "toBlock" filter params are respected', async () => {
-      // Set "fromBlock" and "toBlock"
-      const fromBlock = 3;
-      const toBlock = 7;
-
-      const response = await store.getPublicLogs({ fromBlock, toBlock });
-      const logs = response.logs;
-
-      expect(response.maxLogsHit).toBeFalsy();
-
-      // Compute expected logs from the blocks in range
-      let expectedNumLogs = 0;
-      for (let i = fromBlock - 1; i < toBlock - 1; i++) {
-        const block = publishedCheckpoints[i].checkpoint.blocks[0];
-        expectedNumLogs += block.body.txEffects.reduce((sum, tx) => sum + tx.publicLogs.length, 0);
-      }
-      expect(logs.length).toEqual(expectedNumLogs);
-
-      for (const log of logs) {
-        const blockNumber = log.id.blockNumber;
-        expect(blockNumber).toBeGreaterThanOrEqual(fromBlock);
-        expect(blockNumber).toBeLessThan(toBlock);
-      }
-    });
-
-    it('"contractAddress" filter param is respected', async () => {
-      // Get a random contract address from the logs
-      const targetBlockIndex = randomInt(numBlocksForPublicLogs);
-      const targetBlock = publishedCheckpoints[targetBlockIndex].checkpoint.blocks[0];
-      const targetTxIndex = randomInt(getTxsPerBlock(targetBlock));
-      const targetLogIndex = randomInt(getPublicLogsPerTx(targetBlock, targetTxIndex));
-      const targetContractAddress =
-        targetBlock.body.txEffects[targetTxIndex].publicLogs[targetLogIndex].contractAddress;
-
-      const response = await store.getPublicLogs({ contractAddress: targetContractAddress });
-
-      expect(response.maxLogsHit).toBeFalsy();
-
-      for (const extendedLog of response.logs) {
-        expect(extendedLog.log.contractAddress.equals(targetContractAddress)).toBeTruthy();
-      }
-    });
-
-    it('"tag" filter param is respected', async () => {
-      // Get a random tag from the logs
-      const targetBlockIndex = randomInt(numBlocksForPublicLogs);
-      const targetBlock = publishedCheckpoints[targetBlockIndex].checkpoint.blocks[0];
-      const targetTxIndex = randomInt(getTxsPerBlock(targetBlock));
-      const targetLogIndex = randomInt(getPublicLogsPerTx(targetBlock, targetTxIndex));
-      const targetTag = targetBlock.body.txEffects[targetTxIndex].publicLogs[targetLogIndex].fields[0];
-
-      const response = await store.getPublicLogs({ tag: targetTag });
-
-      expect(response.maxLogsHit).toBeFalsy();
-      expect(response.logs.length).toBeGreaterThan(0);
-
-      for (const extendedLog of response.logs) {
-        expect(extendedLog.log.fields[0].equals(targetTag)).toBeTruthy();
-      }
-    });
-
-    it('"afterLog" filter param is respected', async () => {
-      // Get a random log as reference
-      const targetBlockIndex = randomInt(numBlocksForPublicLogs);
-      const targetBlock = publishedCheckpoints[targetBlockIndex].checkpoint.blocks[0];
-      const targetTxIndex = randomInt(getTxsPerBlock(targetBlock));
-      const numLogsInTx = targetBlock.body.txEffects[targetTxIndex].publicLogs.length;
-      const targetLogIndex = numLogsInTx > 0 ? randomInt(numLogsInTx) : 0;
-      const targetBlockHash = await targetBlock.header.hash();
-
-      const targetTxHash = targetBlock.body.txEffects[targetTxIndex].txHash;
-      const afterLog = new LogId(
-        BlockNumber(targetBlockIndex + INITIAL_L2_BLOCK_NUM),
-        targetBlockHash,
-        targetTxHash,
-        targetTxIndex,
-        targetLogIndex,
-      );
-
-      const response = await store.getPublicLogs({ afterLog });
-      const logs = response.logs;
-
-      expect(response.maxLogsHit).toBeFalsy();
-
-      for (const log of logs) {
-        const logId = log.id;
-        expect(logId.blockNumber).toBeGreaterThanOrEqual(afterLog.blockNumber);
-        if (logId.blockNumber === afterLog.blockNumber) {
-          expect(logId.txIndex).toBeGreaterThanOrEqual(afterLog.txIndex);
-          if (logId.txIndex === afterLog.txIndex) {
-            expect(logId.logIndex).toBeGreaterThan(afterLog.logIndex);
-          }
-        }
-      }
-    });
-
-    it('"txHash" filter param is respected when "afterLog" is set', async () => {
-      // A random txHash should match nothing, even with afterLog set
-      const txHash = TxHash.random();
-      const afterLog = new LogId(BlockNumber(1), BlockHash.random(), TxHash.random(), 0, 0);
-
-      const response = await store.getPublicLogs({ txHash, afterLog });
-      expect(response.logs.length).toBe(0);
-    });
-
-    it('intersecting works', async () => {
-      let logs = (await store.getPublicLogs({ fromBlock: -10 as BlockNumber, toBlock: -5 as BlockNumber })).logs;
-      expect(logs.length).toBe(0);
-
-      // "fromBlock" gets correctly trimmed to range and "toBlock" is exclusive
-      logs = (await store.getPublicLogs({ fromBlock: -10 as BlockNumber, toBlock: BlockNumber(5) })).logs;
-      let blockNumbers = new Set(logs.map(log => log.id.blockNumber));
-      expect(blockNumbers).toEqual(new Set([1, 2, 3, 4]));
-
-      // "toBlock" should be exclusive
-      logs = (await store.getPublicLogs({ fromBlock: BlockNumber(1), toBlock: BlockNumber(1) })).logs;
-      expect(logs.length).toBe(0);
-
-      logs = (await store.getPublicLogs({ fromBlock: BlockNumber(10), toBlock: BlockNumber(5) })).logs;
-      expect(logs.length).toBe(0);
-
-      // both "fromBlock" and "toBlock" get correctly capped to range and logs from all blocks are returned
-      logs = (await store.getPublicLogs({ fromBlock: -100 as BlockNumber, toBlock: +100 })).logs;
-      blockNumbers = new Set(logs.map(log => log.id.blockNumber));
-      expect(blockNumbers.size).toBe(numBlocksForPublicLogs);
-
-      // intersecting with "afterLog" works
-      logs = (
-        await store.getPublicLogs({
-          fromBlock: BlockNumber(2),
-          toBlock: BlockNumber(5),
-          afterLog: new LogId(BlockNumber(4), BlockHash.random(), TxHash.random(), 0, 0),
-        })
-      ).logs;
-      blockNumbers = new Set(logs.map(log => log.id.blockNumber));
-      expect(blockNumbers).toEqual(new Set([4]));
-
-      logs = (
-        await store.getPublicLogs({
-          toBlock: BlockNumber(5),
-          afterLog: new LogId(BlockNumber(5), BlockHash.random(), TxHash.random(), 1, 0),
-        })
-      ).logs;
-      expect(logs.length).toBe(0);
-
-      logs = (
-        await store.getPublicLogs({
-          fromBlock: BlockNumber(2),
-          toBlock: BlockNumber(5),
-          afterLog: new LogId(BlockNumber(100), BlockHash.random(), TxHash.random(), 0, 0),
-        })
-      ).logs;
-      expect(logs.length).toBe(0);
-    });
-
-    it('"txIndex" and "logIndex" are respected when "afterLog.blockNumber" is equal to "fromBlock"', async () => {
-      // Get a random log as reference
-      const targetBlockIndex = randomInt(numBlocksForPublicLogs);
-      const targetBlock = publishedCheckpoints[targetBlockIndex].checkpoint.blocks[0];
-      const targetTxIndex = randomInt(getTxsPerBlock(targetBlock));
-      const numLogsInTx = targetBlock.body.txEffects[targetTxIndex].publicLogs.length;
-      const targetLogIndex = numLogsInTx > 0 ? randomInt(numLogsInTx) : 0;
-      const targetBlockHash = await targetBlock.header.hash();
-      const targetTxHash = targetBlock.body.txEffects[targetTxIndex].txHash;
-
-      const afterLog = new LogId(
-        BlockNumber(targetBlockIndex + INITIAL_L2_BLOCK_NUM),
-        targetBlockHash,
-        targetTxHash,
-        targetTxIndex,
-        targetLogIndex,
-      );
-
-      const response = await store.getPublicLogs({ afterLog, fromBlock: afterLog.blockNumber });
-      const logs = response.logs;
-
-      expect(response.maxLogsHit).toBeFalsy();
-
-      for (const log of logs) {
-        const logId = log.id;
-        expect(logId.blockNumber).toBeGreaterThanOrEqual(afterLog.blockNumber);
-        if (logId.blockNumber === afterLog.blockNumber) {
-          expect(logId.txIndex).toBeGreaterThanOrEqual(afterLog.txIndex);
-          if (logId.txIndex === afterLog.txIndex) {
-            expect(logId.logIndex).toBeGreaterThan(afterLog.logIndex);
-          }
-        }
-      }
-    });
-  });
-
-  describe('getContractClassLogs', () => {
-    let targetBlock: L2Block;
-    let expectedContractClassLog: ContractClassLog;
-
-    beforeEach(async () => {
-      await store.addCheckpoints(publishedCheckpoints);
-
-      targetBlock = publishedCheckpoints[0].checkpoint.blocks[0];
-      expectedContractClassLog = await ContractClassLog.random();
-      targetBlock.body.txEffects.forEach((txEffect, index) => {
-        txEffect.contractClassLogs = index === 0 ? [expectedContractClassLog] : [];
-      });
-
-      await store.addLogs([targetBlock]);
-    });
-
-    it('returns block hash on contract class log ids', async () => {
-      const result = await store.getContractClassLogs({
-        fromBlock: targetBlock.number,
-        toBlock: targetBlock.number + 1,
-      });
-
-      expect(result.maxLogsHit).toBeFalsy();
-      expect(result.logs).toHaveLength(1);
-
-      const [{ id, log }] = result.logs;
-      const expectedBlockHash = await targetBlock.header.hash();
-
-      expect(id.blockHash.equals(expectedBlockHash)).toBe(true);
-      expect(id.blockNumber).toEqual(targetBlock.number);
-      expect(log).toEqual(expectedContractClassLog);
-    });
-  });
-
-  describe('pendingChainValidationStatus', () => {
-    it('should return undefined when no status is set', async () => {
-      const status = await store.getPendingChainValidationStatus();
-      expect(status).toBeUndefined();
-    });
-
-    it('should store and retrieve a valid validation status', async () => {
-      const validStatus: ValidateCheckpointResult = { valid: true };
-
-      await store.setPendingChainValidationStatus(validStatus);
-      const retrievedStatus = await store.getPendingChainValidationStatus();
-
-      expect(retrievedStatus).toEqual(validStatus);
-    });
-
-    it('should store and retrieve an invalid validation status with insufficient attestations', async () => {
-      const invalidStatus: ValidateCheckpointResult = {
-        valid: false,
-        checkpoint: randomCheckpointInfo(1),
-        committee: [EthAddress.random(), EthAddress.random()],
-        epoch: EpochNumber(123),
-        seed: 456n,
-        attestors: [EthAddress.random()],
-        attestations: [CommitteeAttestation.random()],
-        reason: 'insufficient-attestations',
-      };
-
-      await store.setPendingChainValidationStatus(invalidStatus);
-      const retrievedStatus = await store.getPendingChainValidationStatus();
-
-      expect(retrievedStatus).toEqual(invalidStatus);
-    });
-
-    it('should store and retrieve an invalid validation status with invalid attestation', async () => {
-      const invalidStatus: ValidateCheckpointResult = {
-        valid: false,
-        checkpoint: randomCheckpointInfo(2),
-        committee: [EthAddress.random()],
-        attestors: [EthAddress.random()],
-        epoch: EpochNumber(789),
-        seed: 101n,
-        attestations: [CommitteeAttestation.random()],
-        reason: 'invalid-attestation',
-        invalidIndex: 5,
-      };
-
-      await store.setPendingChainValidationStatus(invalidStatus);
-      const retrievedStatus = await store.getPendingChainValidationStatus();
-
-      expect(retrievedStatus).toEqual(invalidStatus);
-    });
-
-    it('should overwrite existing status when setting a new one', async () => {
-      const firstStatus: ValidateCheckpointResult = { valid: true };
-      const secondStatus: ValidateCheckpointResult = {
-        valid: false,
-        checkpoint: randomCheckpointInfo(3),
-        committee: [EthAddress.random()],
-        epoch: EpochNumber(999),
-        seed: 888n,
-        attestors: [EthAddress.random()],
-        attestations: [CommitteeAttestation.random()],
-        reason: 'insufficient-attestations',
-      };
-
-      await store.setPendingChainValidationStatus(firstStatus);
-      await store.setPendingChainValidationStatus(secondStatus);
-      const retrievedStatus = await store.getPendingChainValidationStatus();
-
-      expect(retrievedStatus).toEqual(secondStatus);
-    });
-
-    it('should handle empty committee and attestations arrays', async () => {
-      const statusWithEmptyArrays: ValidateCheckpointResult = {
-        valid: false,
-        checkpoint: randomCheckpointInfo(4),
-        committee: [],
-        epoch: EpochNumber(0),
-        seed: 0n,
-        attestors: [],
-        attestations: [],
-        reason: 'insufficient-attestations',
-      };
-
-      await store.setPendingChainValidationStatus(statusWithEmptyArrays);
-      const retrievedStatus = await store.getPendingChainValidationStatus();
-
-      expect(retrievedStatus).toEqual(statusWithEmptyArrays);
-    });
-  });
-
-  describe('idempotency', () => {
-    it('handles adding blocks via addProposedBlock then same blocks via addCheckpoints', async () => {
-      // First add checkpoint 1 to establish a base
-      const checkpoint1 = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 1, startBlockNumber: 1 }),
-        5,
-      );
-      await store.addCheckpoints([checkpoint1]);
-
-      // Add provisional block 2 via addProposedBlock
-      const provisionalBlock = await L2Block.random(BlockNumber(2), {
-        checkpointNumber: CheckpointNumber(2),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-        lastArchive: checkpoint1.checkpoint.blocks[0].archive,
-      });
-      await store.addProposedBlock(provisionalBlock);
-
-      // Now add checkpoint 2 containing the same block via addCheckpoints
-      const checkpoint2 = new Checkpoint(
-        provisionalBlock.archive,
-        CheckpointHeader.random(),
-        [provisionalBlock],
-        CheckpointNumber(2),
-      );
-      const publishedCheckpoint2 = makePublishedCheckpoint(checkpoint2, 10);
-
-      // This should NOT throw - addCheckpoints uses .set() which is idempotent
-      await expect(store.addCheckpoints([publishedCheckpoint2])).resolves.toBe(true);
-
-      // Verify block exists and is consistent
-      const storedBlock = await store.getBlock(BlockNumber(2));
-      expect(storedBlock?.archive.root.equals(provisionalBlock.archive.root)).toBe(true);
-    });
-
-    it('throws when adding the same contract class twice', async () => {
-      const contractClass = await makeContractClassPublic();
-      const contractClassWithCommitment = await withCommitment(contractClass);
-
-      await store.addContractClasses([contractClassWithCommitment], BlockNumber(1));
-      await expect(store.addContractClasses([contractClassWithCommitment], BlockNumber(2))).rejects.toThrow(
-        /already exists/,
-      );
-    });
-
-    it('throws when adding the same contract instance twice', async () => {
-      const contractClass = await makeContractClassPublic();
-      await store.addContractClasses([await withCommitment(contractClass)], BlockNumber(1));
-
-      const instance = {
-        ...(await SerializableContractInstance.random({
-          currentContractClassId: contractClass.id,
-          originalContractClassId: contractClass.id,
-        })),
-        address: await AztecAddress.random(),
-      };
-
-      await store.addContractInstances([instance], BlockNumber(1));
-      await expect(store.addContractInstances([instance], BlockNumber(2))).rejects.toThrow(/already exists/);
-    });
-
-    it('does not duplicate logs when addLogs is called twice with same block', async () => {
-      const block = await L2Block.random(BlockNumber(1), {
-        checkpointNumber: CheckpointNumber(1),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-      });
-
-      // Add logs first time
-      await store.addLogs([block]);
-
-      // Get initial log count
-      const initialLogs = await store.getPublicLogs({ fromBlock: BlockNumber(1), toBlock: BlockNumber(2) });
-      const initialCount = initialLogs.logs.length;
-      expect(initialCount).toBeGreaterThan(0);
-
-      // Add logs second time (same block)
-      await store.addLogs([block]);
-
-      // Verify logs are NOT duplicated
-      const finalLogs = await store.getPublicLogs({ fromBlock: BlockNumber(1), toBlock: BlockNumber(2) });
-      expect(finalLogs.logs.length).toBe(initialCount);
-    });
-  });
-
-  describe('getBlocksForSlot', () => {
-    it('returns blocks matching the given slot number', async () => {
-      // Create blocks with specific slot numbers
-      const block1 = await L2Block.random(BlockNumber(1), {
-        checkpointNumber: CheckpointNumber(1),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-        slotNumber: SlotNumber(100),
-      });
-      const block2 = await L2Block.random(BlockNumber(2), {
-        checkpointNumber: CheckpointNumber(1),
-        indexWithinCheckpoint: IndexWithinCheckpoint(1),
-        lastArchive: block1.archive,
-        slotNumber: SlotNumber(100), // Same slot number as block1
-      });
-      const block3 = await L2Block.random(BlockNumber(3), {
-        checkpointNumber: CheckpointNumber(1),
-        indexWithinCheckpoint: IndexWithinCheckpoint(2),
-        lastArchive: block2.archive,
-        slotNumber: SlotNumber(101), // Different slot number
-      });
-
-      await addProposedBlocks(store, [block1, block2, block3]);
-
-      const blocksForSlot100 = await store.getBlocksForSlot(SlotNumber(100));
-      expect(blocksForSlot100.length).toBe(2);
-      expect(blocksForSlot100[0].equals(block1)).toBe(true);
-      expect(blocksForSlot100[1].equals(block2)).toBe(true);
-
-      const blocksForSlot101 = await store.getBlocksForSlot(SlotNumber(101));
-      expect(blocksForSlot101.length).toBe(1);
-      expect(blocksForSlot101[0].equals(block3)).toBe(true);
-    });
-
-    it('returns empty array when no blocks exist for that slot', async () => {
-      // Create a block with a specific slot number
-      const block1 = await L2Block.random(BlockNumber(1), {
-        checkpointNumber: CheckpointNumber(1),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-        slotNumber: SlotNumber(100),
-      });
-
-      await store.addProposedBlock(block1);
-
-      const blocksForSlot999 = await store.getBlocksForSlot(SlotNumber(999));
-      expect(blocksForSlot999).toEqual([]);
-    });
-
-    it('returns empty array when store is empty', async () => {
-      const blocksForSlot = await store.getBlocksForSlot(SlotNumber(1));
-      expect(blocksForSlot).toEqual([]);
-    });
-
-    it('returns blocks in ascending block number order', async () => {
-      // Create multiple blocks with the same slot number
-      const block1 = await L2Block.random(BlockNumber(1), {
-        checkpointNumber: CheckpointNumber(1),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-        slotNumber: SlotNumber(50),
-      });
-      const block2 = await L2Block.random(BlockNumber(2), {
-        checkpointNumber: CheckpointNumber(1),
-        indexWithinCheckpoint: IndexWithinCheckpoint(1),
-        lastArchive: block1.archive,
-        slotNumber: SlotNumber(50),
-      });
-      const block3 = await L2Block.random(BlockNumber(3), {
-        checkpointNumber: CheckpointNumber(1),
-        indexWithinCheckpoint: IndexWithinCheckpoint(2),
-        lastArchive: block2.archive,
-        slotNumber: SlotNumber(50),
-      });
-
-      await addProposedBlocks(store, [block1, block2, block3]);
-
-      const blocksForSlot = await store.getBlocksForSlot(SlotNumber(50));
-      expect(blocksForSlot.length).toBe(3);
-      expect(blocksForSlot[0].number).toBe(1);
-      expect(blocksForSlot[1].number).toBe(2);
-      expect(blocksForSlot[2].number).toBe(3);
-    });
-  });
-
-  describe('proposedCheckpointNumber', () => {
-    /** Adds proposed blocks to the store so setProposedCheckpoint can validate them.
-     *  Uses force: true to skip addProposedBlock's own chaining checks (we only want to test setProposedCheckpoint). */
-    async function addBlocksForProposedCheckpoint(
-      startBlock: number,
-      blockCount: number,
-      checkpointNumber: number,
-      previousArchive?: AppendOnlyTreeSnapshot,
-    ): Promise<void> {
-      for (let i = 0; i < blockCount; i++) {
-        const opts: Parameters<typeof L2Block.random>[1] = {
-          checkpointNumber: CheckpointNumber(checkpointNumber),
-          indexWithinCheckpoint: IndexWithinCheckpoint(i),
-        };
-        if (i === 0 && previousArchive) {
-          (opts as any).lastArchive = previousArchive;
-        }
-        const block = await L2Block.random(BlockNumber(startBlock + i), opts);
-        await store.addProposedBlock(block, { force: true });
-      }
-    }
-
-    it('returns initial value when no proposed checkpoint is set', async () => {
-      const pending = await store.blockStore.getProposedCheckpointNumber();
-      expect(pending).toBe(INITIAL_CHECKPOINT_NUMBER - 1);
-    });
-
-    it('stores and retrieves proposed checkpoint number', async () => {
-      await addBlocksForProposedCheckpoint(1, 1, 1);
-      await store.blockStore.setProposedCheckpoint({
-        checkpointNumber: CheckpointNumber(1),
-        header: CheckpointHeader.empty(),
-        startBlock: BlockNumber(1),
-        blockCount: 1,
-        totalManaUsed: 100n,
-        feeAssetPriceModifier: 50n,
-      });
-      const pending = await store.blockStore.getProposedCheckpointNumber();
-      expect(pending).toBe(1);
-    });
-
-    it('stores and retrieves proposed checkpoint data with fee fields', async () => {
-      await addBlocksForProposedCheckpoint(1, 1, 1);
-      await store.blockStore.setProposedCheckpoint({
-        checkpointNumber: CheckpointNumber(1),
-        header: CheckpointHeader.empty(),
-        startBlock: BlockNumber(1),
-        blockCount: 1,
-        totalManaUsed: 12345n,
-        feeAssetPriceModifier: -75n,
-      });
-      const pending = await store.blockStore.getProposedCheckpointOnly();
-      expect(pending).toBeDefined();
-      expect(pending!.checkpointNumber).toBe(1);
-      expect(pending!.totalManaUsed).toBe(12345n);
-      expect(pending!.feeAssetPriceModifier).toBe(-75n);
-    });
-
-    it('clears proposed checkpoint when confirmed checkpoints are added', async () => {
-      // Add checkpoint 1
-      const checkpoint1 = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 1, startBlockNumber: 1 }),
-        10,
-      );
-      await store.addCheckpoints([checkpoint1]);
-
-      // Add blocks for proposed checkpoint 2, chaining from checkpoint 1's last block
-      await addBlocksForProposedCheckpoint(2, 1, 2, checkpoint1.checkpoint.blocks[0].archive);
-
-      // Set proposed checkpoint to 2 (attested but not yet on L1)
-      await store.blockStore.setProposedCheckpoint({
-        checkpointNumber: CheckpointNumber(2),
-        header: CheckpointHeader.empty(),
-        startBlock: BlockNumber(2),
-        blockCount: 1,
-        totalManaUsed: 100n,
-        feeAssetPriceModifier: 50n,
-      });
-      expect(await store.blockStore.getProposedCheckpointNumber()).toBe(2);
-
-      // Confirm checkpoint 2 on L1
-      const checkpoint2 = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(2), {
-          numBlocks: 1,
-          startBlockNumber: 2,
-          previousArchive: checkpoint1.checkpoint.blocks[0].archive,
-        }),
-        20,
-      );
-      await store.addCheckpoints([checkpoint2]);
-
-      // Proposed checkpoint should be cleared
-      expect(await store.blockStore.hasProposedCheckpoint()).toBe(false);
-    });
-
-    it('throws on proposed checkpoint that is more than 1 ahead of confirmed', async () => {
-      // Add checkpoint 1
-      const checkpoint1 = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 1, startBlockNumber: 1 }),
-        10,
-      );
-      await store.addCheckpoints([checkpoint1]);
-
-      // Try to set proposed checkpoint to 3 (confirmed=1, expected=2)
-      await expect(
-        store.blockStore.setProposedCheckpoint({
-          checkpointNumber: CheckpointNumber(3),
-          header: CheckpointHeader.empty(),
-          startBlock: BlockNumber(1),
-          blockCount: 1,
-          totalManaUsed: 100n,
-          feeAssetPriceModifier: 50n,
-        }),
-      ).rejects.toThrow('not sequential');
-
-      // Proposed checkpoint should remain unset (3 !== 1 + 1)
-      expect(await store.blockStore.hasProposedCheckpoint()).toBe(false);
-    });
-
-    it('throws on proposed checkpoint that equals the confirmed checkpoint', async () => {
-      // Add checkpoint 1
-      const checkpoint1 = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 1, startBlockNumber: 1 }),
-        10,
-      );
-      await store.addCheckpoints([checkpoint1]);
-
-      // Try to set proposed checkpoint to 1 (confirmed=1, expected=2).
-      // With fallback behavior, getProposedCheckpointNumber returns 1 (confirmed), so this triggers the stale check.
-      await expect(
-        store.blockStore.setProposedCheckpoint({
-          checkpointNumber: CheckpointNumber(1),
-          header: CheckpointHeader.empty(),
-          startBlock: BlockNumber(1),
-          blockCount: 1,
-          totalManaUsed: 100n,
-          feeAssetPriceModifier: 50n,
-        }),
-      ).rejects.toThrow('Stale');
-
-      // Proposed checkpoint should remain unset
-      expect(await store.blockStore.hasProposedCheckpoint()).toBe(false);
-    });
-
-    it('clears proposed checkpoint when checkpoints are removed past it', async () => {
-      // Add checkpoints 1 and 2
-      const checkpoint1 = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 1, startBlockNumber: 1 }),
-        10,
-      );
-      const checkpoint2 = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(2), {
-          numBlocks: 1,
-          startBlockNumber: 2,
-          previousArchive: checkpoint1.checkpoint.blocks[0].archive,
-        }),
-        20,
-      );
-      await store.addCheckpoints([checkpoint1, checkpoint2]);
-
-      // Add blocks for proposed checkpoint 3, chaining from checkpoint 2's last block
-      await addBlocksForProposedCheckpoint(3, 1, 3, checkpoint2.checkpoint.blocks[0].archive);
-
-      // Set proposed checkpoint to 3
-      await store.blockStore.setProposedCheckpoint({
-        checkpointNumber: CheckpointNumber(3),
-        header: CheckpointHeader.empty(),
-        startBlock: BlockNumber(3),
-        blockCount: 1,
-        totalManaUsed: 100n,
-        feeAssetPriceModifier: 50n,
-      });
-
-      // Remove checkpoints after 1 (removes checkpoint 2, and pending 3 should be cleared)
-      await store.removeCheckpointsAfter(CheckpointNumber(1));
-
-      expect(await store.blockStore.hasProposedCheckpoint()).toBe(false);
-    });
-
-    it('does not clear proposed checkpoint when removing checkpoints before it', async () => {
-      // Add checkpoints 1, 2
-      const checkpoint1 = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 1, startBlockNumber: 1 }),
-        10,
-      );
-      const checkpoint2 = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(2), {
-          numBlocks: 1,
-          startBlockNumber: 2,
-          previousArchive: checkpoint1.checkpoint.blocks[0].archive,
-        }),
-        20,
-      );
-      await store.addCheckpoints([checkpoint1, checkpoint2]);
-
-      // Add blocks for proposed checkpoint 3, chaining from checkpoint 2's last block
-      await addBlocksForProposedCheckpoint(3, 1, 3, checkpoint2.checkpoint.blocks[0].archive);
-
-      // Set pending to 3 (confirmed=2, 3===2+1 ✓)
-      await store.blockStore.setProposedCheckpoint({
-        checkpointNumber: CheckpointNumber(3),
-        header: CheckpointHeader.empty(),
-        startBlock: BlockNumber(3),
-        blockCount: 1,
-        totalManaUsed: 100n,
-        feeAssetPriceModifier: 50n,
-      });
-
-      // Remove checkpoints after 2 (nothing removed since latest is 2, pending=3 stays)
-      await store.removeCheckpointsAfter(CheckpointNumber(2));
-
-      expect(await store.blockStore.getProposedCheckpointNumber()).toBe(3);
-    });
-
-    it('allows addProposedBlocks when proposed checkpoint matches expected', async () => {
-      // Add checkpoint 1
-      const checkpoint1 = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 1, startBlockNumber: 1 }),
-        10,
-      );
-      await store.addCheckpoints([checkpoint1]);
-
-      // Add blocks for proposed checkpoint 2, chaining from checkpoint 1's last block
-      await addBlocksForProposedCheckpoint(2, 1, 2, checkpoint1.checkpoint.blocks[0].archive);
-
-      // Set proposed checkpoint to 2 (attested but not on L1 yet)
-      await store.blockStore.setProposedCheckpoint({
-        checkpointNumber: CheckpointNumber(2),
-        header: CheckpointHeader.empty(),
-        startBlock: BlockNumber(2),
-        blockCount: 1,
-        totalManaUsed: 100n,
-        feeAssetPriceModifier: 50n,
-      });
-
-      // Add a block for checkpoint 3 — this should succeed because
-      // proposed checkpoint (2) matches expectedCheckpointNumber (3 - 1 = 2)
-      const pendingBlock = await store.blockStore.getBlock(BlockNumber(2));
-      const block3 = await L2Block.random(BlockNumber(3), {
-        checkpointNumber: CheckpointNumber(3),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-        lastArchive: pendingBlock!.archive,
-      });
-
-      await expect(store.addProposedBlock(block3)).resolves.toBe(true);
-    });
-
-    it('throws with proposed checkpoint value when neither confirmed nor pending matches', async () => {
-      // Add checkpoint 1
-      const checkpoint1 = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 1, startBlockNumber: 1 }),
-        10,
-      );
-      await store.addCheckpoints([checkpoint1]);
-
-      // Add blocks for proposed checkpoint 2, chaining from checkpoint 1's last block
-      await addBlocksForProposedCheckpoint(2, 1, 2, checkpoint1.checkpoint.blocks[0].archive);
-
-      // Set proposed checkpoint to 2
-      await store.blockStore.setProposedCheckpoint({
-        checkpointNumber: CheckpointNumber(2),
-        header: CheckpointHeader.empty(),
-        startBlock: BlockNumber(2),
-        blockCount: 1,
-        totalManaUsed: 100n,
-        feeAssetPriceModifier: 50n,
-      });
-
-      // Try to add a block for checkpoint 4 (expected = 3, confirmed = 1, pending = 2 — neither matches)
-      const pendingBlock = await store.blockStore.getBlock(BlockNumber(2));
-      const block3 = await L2Block.random(BlockNumber(3), {
-        checkpointNumber: CheckpointNumber(4),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-        lastArchive: pendingBlock!.archive,
-      });
-
-      await expect(store.addProposedBlock(block3)).rejects.toThrow(
-        // Error should report the proposed checkpoint number (2), not the confirmed one (1)
-        'Cannot insert new checkpoint 4 given previous proposed checkpoint number is 2',
-      );
-    });
-
-    it('throws with confirmed checkpoint value when pending is not set', async () => {
-      // Add checkpoint 1 (no pending set, so pending defaults to 0)
-      const checkpoint1 = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 1, startBlockNumber: 1 }),
-        10,
-      );
-      await store.addCheckpoints([checkpoint1]);
-
-      // Try to add a block for checkpoint 4 (expected = 3, confirmed = 1, pending = 0)
-      // Error should report confirmed (1) since it's higher than the default pending (0)
-      const lastBlockArchive = checkpoint1.checkpoint.blocks[0].archive;
-      const block2 = await L2Block.random(BlockNumber(2), {
-        checkpointNumber: CheckpointNumber(4),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-        lastArchive: lastBlockArchive,
-      });
-
-      await expect(store.addProposedBlock(block2)).rejects.toThrow(
-        'Cannot insert new checkpoint 4 given previous confirmed checkpoint number is 1',
-      );
-    });
-
-    it('getProposedCheckpointL2BlockNumber defaults to checkpointed block number', async () => {
-      // Add checkpoint 1 with blocks 1-3
-      const checkpoint1 = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 3, startBlockNumber: 1 }),
-        10,
-      );
-      await store.addCheckpoints([checkpoint1]);
-
-      // No proposed checkpoint set — should fall back to the checkpointed block number
-      const pendingBlockNumber = await store.blockStore.getProposedCheckpointL2BlockNumber();
-      const checkpointedBlockNumber = await store.blockStore.getCheckpointedL2BlockNumber();
-      expect(pendingBlockNumber).toBe(checkpointedBlockNumber);
-      expect(pendingBlockNumber).toBe(3);
-    });
-
-    it('getProposedCheckpointL2BlockNumber returns pending block number when set', async () => {
-      // Add checkpoint 1 with block 1
-      const checkpoint1 = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 1, startBlockNumber: 1 }),
-        10,
-      );
-      await store.addCheckpoints([checkpoint1]);
-
-      // Add proposed block for proposed checkpoint 2
-      await addBlocksForProposedCheckpoint(2, 1, 2, checkpoint1.checkpoint.blocks[0].archive);
-
-      // Set proposed checkpoint
-      await store.blockStore.setProposedCheckpoint({
-        checkpointNumber: CheckpointNumber(2),
-        header: CheckpointHeader.empty(),
-        startBlock: BlockNumber(2),
-        blockCount: 1,
-        totalManaUsed: 100n,
-        feeAssetPriceModifier: 50n,
-      });
-
-      // Should return last block of proposed checkpoint (startBlock + blockCount - 1)
-      const pendingBlockNumber = await store.blockStore.getProposedCheckpointL2BlockNumber();
-      expect(pendingBlockNumber).toBe(2);
-      // And it should be greater than the checkpointed block number
-      expect(pendingBlockNumber).toBeGreaterThan(await store.blockStore.getCheckpointedL2BlockNumber());
-    });
-
-    it('getProposedCheckpointL2BlockNumber falls back to checkpointed after pending is cleared', async () => {
-      // Add checkpoint 1
-      const checkpoint1 = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 1, startBlockNumber: 1 }),
-        10,
-      );
-      await store.addCheckpoints([checkpoint1]);
-
-      // Add blocks and set proposed checkpoint 2
-      await addBlocksForProposedCheckpoint(2, 1, 2, checkpoint1.checkpoint.blocks[0].archive);
-      await store.blockStore.setProposedCheckpoint({
-        checkpointNumber: CheckpointNumber(2),
-        header: CheckpointHeader.empty(),
-        startBlock: BlockNumber(2),
-        blockCount: 1,
-        totalManaUsed: 100n,
-        feeAssetPriceModifier: 50n,
-      });
-      expect(await store.blockStore.getProposedCheckpointL2BlockNumber()).toBe(2);
-
-      // Confirm checkpoint 2 on L1 (clears pending)
-      const checkpoint2 = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(2), {
-          numBlocks: 1,
-          startBlockNumber: 2,
-          previousArchive: checkpoint1.checkpoint.blocks[0].archive,
-        }),
-        20,
-      );
-      await store.addCheckpoints([checkpoint2]);
-
-      // Pending cleared — should fall back to the new checkpointed block number
-      const pendingBlockNumber = await store.blockStore.getProposedCheckpointL2BlockNumber();
-      const checkpointedBlockNumber = await store.blockStore.getCheckpointedL2BlockNumber();
-      expect(pendingBlockNumber).toBe(checkpointedBlockNumber);
-      expect(pendingBlockNumber).toBe(2);
-    });
-  });
-
-  describe('promoteProposedToCheckpointed', () => {
-    async function setupProposedCheckpoint() {
-      // Add confirmed checkpoint 1
-      const checkpoint1 = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 1, startBlockNumber: 1 }),
-        10,
-      );
-      await store.addCheckpoints([checkpoint1]);
-
-      // Add proposed blocks for checkpoint 2
-      const block2 = await L2Block.random(BlockNumber(2), {
-        checkpointNumber: CheckpointNumber(2),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-        lastArchive: checkpoint1.checkpoint.blocks[0].archive,
-      });
-      await store.addProposedBlock(block2, { force: true });
-
-      // Set proposed checkpoint 2
-      await store.blockStore.setProposedCheckpoint({
-        checkpointNumber: CheckpointNumber(2),
-        header: CheckpointHeader.empty(),
-        startBlock: BlockNumber(2),
-        blockCount: 1,
-        totalManaUsed: 100n,
-        feeAssetPriceModifier: 50n,
-      });
-
-      const proposed = await store.getProposedCheckpointOnly();
-      return { checkpoint1, proposed: proposed! };
-    }
-
-    it('promotes proposed checkpoint to confirmed', async () => {
-      const { proposed } = await setupProposedCheckpoint();
-      const l1 = makeL1PublishedData(20);
-      const attestations = [CommitteeAttestation.random()];
-
-      await store.promoteProposedToCheckpointed(l1, attestations, proposed.archive.root);
-
-      expect(await store.blockStore.hasProposedCheckpoint()).toBe(false);
-      expect(await store.blockStore.getLatestCheckpointNumber()).toBe(2);
-    });
-
-    it('throws when no proposed checkpoint exists', async () => {
-      await expect(store.promoteProposedToCheckpointed(makeL1PublishedData(20), [], Fr.random())).rejects.toThrow(
-        'no proposed checkpoint exists',
-      );
-    });
-
-    it('throws on archive root mismatch', async () => {
-      await setupProposedCheckpoint();
-
-      await expect(store.promoteProposedToCheckpointed(makeL1PublishedData(20), [], Fr.random())).rejects.toThrow(
-        'archive root mismatch',
-      );
-
-      // Proposed checkpoint should still exist (transaction rolled back)
-      expect(await store.blockStore.hasProposedCheckpoint()).toBe(true);
-    });
-  });
-
-  describe('L2TipsCache proposedCheckpoint', () => {
-    it('returns proposedCheckpoint equal to checkpointed when no pending exists', async () => {
-      // Add checkpoint 1 with blocks 1-3
-      const checkpoint1 = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 3, startBlockNumber: 1 }),
-        10,
-      );
-      await store.addCheckpoints([checkpoint1]);
-
-      const l2TipsCache = new L2TipsCache(store.blockStore);
-      const tips = await l2TipsCache.getL2Tips();
-
-      // proposedCheckpoint should always be defined
-      expect(tips.proposedCheckpoint).toBeDefined();
-      // With no proposed checkpoint, it should equal the checkpointed tip
-      expect(tips.proposedCheckpoint!.block.number).toBe(tips.checkpointed.block.number);
-      expect(tips.proposedCheckpoint!.checkpoint.number).toBe(tips.checkpointed.checkpoint.number);
-    });
-
-    it('returns proposedCheckpoint ahead of checkpointed when pending is set', async () => {
-      // Add checkpoint 1
-      const checkpoint1 = makePublishedCheckpoint(
-        await Checkpoint.random(CheckpointNumber(1), { numBlocks: 1, startBlockNumber: 1 }),
-        10,
-      );
-      await store.addCheckpoints([checkpoint1]);
-
-      // Add a proposed block for proposed checkpoint 2, chaining from checkpoint 1
-      const block2 = await L2Block.random(BlockNumber(2), {
-        checkpointNumber: CheckpointNumber(2),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-        lastArchive: checkpoint1.checkpoint.blocks[0].archive,
-      });
-      await store.addProposedBlock(block2, { force: true });
-
-      // Set proposed checkpoint
-      await store.blockStore.setProposedCheckpoint({
-        checkpointNumber: CheckpointNumber(2),
-        header: CheckpointHeader.empty(),
-        startBlock: BlockNumber(2),
-        blockCount: 1,
-        totalManaUsed: 100n,
-        feeAssetPriceModifier: 50n,
-      });
-
-      const l2TipsCache = new L2TipsCache(store.blockStore);
-      const tips = await l2TipsCache.getL2Tips();
-
-      expect(tips.proposedCheckpoint).toBeDefined();
-      expect(tips.proposedCheckpoint!.block.number).toBeGreaterThan(tips.checkpointed.block.number);
-      expect(tips.proposedCheckpoint!.checkpoint.number).toBeGreaterThan(tips.checkpointed.checkpoint.number);
-    });
-  });
-
-  describe('removeBlocksAfterBlock', () => {
-    it('removes blocks with number > given blockNumber', async () => {
-      // Create blocks for initial checkpoint
-      const block1 = await L2Block.random(BlockNumber(1), {
-        checkpointNumber: CheckpointNumber(1),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-      });
-      const block2 = await L2Block.random(BlockNumber(2), {
-        checkpointNumber: CheckpointNumber(1),
-        indexWithinCheckpoint: IndexWithinCheckpoint(1),
-        lastArchive: block1.archive,
-      });
-      const block3 = await L2Block.random(BlockNumber(3), {
-        checkpointNumber: CheckpointNumber(1),
-        indexWithinCheckpoint: IndexWithinCheckpoint(2),
-        lastArchive: block2.archive,
-      });
-      const block4 = await L2Block.random(BlockNumber(4), {
-        checkpointNumber: CheckpointNumber(1),
-        indexWithinCheckpoint: IndexWithinCheckpoint(3),
-        lastArchive: block3.archive,
-      });
-
-      await addProposedBlocks(store, [block1, block2, block3, block4]);
-      expect(await store.getLatestBlockNumber()).toBe(4);
-
-      // Remove blocks after block 2
-      await store.removeBlocksAfter(BlockNumber(2));
-
-      expect(await store.getLatestBlockNumber()).toBe(2);
-      expect(await store.getBlock(BlockNumber(1))).toBeDefined();
-      expect(await store.getBlock(BlockNumber(2))).toBeDefined();
-      expect(await store.getBlock(BlockNumber(3))).toBeUndefined();
-      expect(await store.getBlock(BlockNumber(4))).toBeUndefined();
-    });
-
-    it('returns the removed blocks', async () => {
-      const block1 = await L2Block.random(BlockNumber(1), {
-        checkpointNumber: CheckpointNumber(1),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-      });
-      const block2 = await L2Block.random(BlockNumber(2), {
-        checkpointNumber: CheckpointNumber(1),
-        indexWithinCheckpoint: IndexWithinCheckpoint(1),
-        lastArchive: block1.archive,
-      });
-      const block3 = await L2Block.random(BlockNumber(3), {
-        checkpointNumber: CheckpointNumber(1),
-        indexWithinCheckpoint: IndexWithinCheckpoint(2),
-        lastArchive: block2.archive,
-      });
-
-      await addProposedBlocks(store, [block1, block2, block3]);
-
-      // Remove blocks after block 1
-      const removedBlocks = await store.removeBlocksAfter(BlockNumber(1));
-
-      expect(removedBlocks.length).toBe(2);
-      expect(removedBlocks[0].equals(block2)).toBe(true);
-      expect(removedBlocks[1].equals(block3)).toBe(true);
-    });
-
-    it('returns empty array when no blocks need to be removed', async () => {
-      const block1 = await L2Block.random(BlockNumber(1), {
-        checkpointNumber: CheckpointNumber(1),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-      });
-      const block2 = await L2Block.random(BlockNumber(2), {
-        checkpointNumber: CheckpointNumber(1),
-        indexWithinCheckpoint: IndexWithinCheckpoint(1),
-        lastArchive: block1.archive,
-      });
-
-      await addProposedBlocks(store, [block1, block2]);
-
-      // Remove blocks after block 2 (none to remove)
-      const removedBlocks = await store.removeBlocksAfter(BlockNumber(2));
-
-      expect(removedBlocks).toEqual([]);
-      expect(await store.getLatestBlockNumber()).toBe(2);
-    });
-
-    it('returns empty array when store is empty', async () => {
-      const removedBlocks = await store.removeBlocksAfter(BlockNumber(0));
-
-      expect(removedBlocks).toEqual([]);
-    });
-
-    it('cleans up related data (tx effects, hash index, archive index)', async () => {
-      const block1 = await L2Block.random(BlockNumber(1), {
-        checkpointNumber: CheckpointNumber(1),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-        txsPerBlock: 2,
-      });
-      const block2 = await L2Block.random(BlockNumber(2), {
-        checkpointNumber: CheckpointNumber(1),
-        indexWithinCheckpoint: IndexWithinCheckpoint(1),
-        lastArchive: block1.archive,
-        txsPerBlock: 2,
-      });
-
-      await addProposedBlocks(store, [block1, block2]);
-
-      // Verify block2 is retrievable by hash and archive before removal
-      const block2Hash = await block2.header.hash();
-      const block2Archive = block2.archive.root;
-
-      expect(await store.getBlockByHash(block2Hash)).toBeDefined();
-      expect(await store.getBlockByArchive(block2Archive)).toBeDefined();
-
-      // Verify tx effects for block2 are retrievable before removal
-      for (const txEffect of block2.body.txEffects) {
-        const retrieved = await store.getTxEffect(txEffect.txHash);
-        expect(retrieved).toBeDefined();
-      }
-
-      // Remove blocks after block 1
-      await store.removeBlocksAfter(BlockNumber(1));
-
-      // Verify block2 is no longer retrievable by hash or archive
-      expect(await store.getBlockByHash(block2Hash)).toBeUndefined();
-      expect(await store.getBlockByArchive(block2Archive)).toBeUndefined();
-
-      // Verify tx effects for block2 are no longer retrievable
-      for (const txEffect of block2.body.txEffects) {
-        const retrieved = await store.getTxEffect(txEffect.txHash);
-        expect(retrieved).toBeUndefined();
-      }
-
-      // Verify block1's data is still intact
-      const block1Hash = await block1.header.hash();
-      const block1Archive = block1.archive.root;
-
-      expect(await store.getBlockByHash(block1Hash)).toBeDefined();
-      expect(await store.getBlockByArchive(block1Archive)).toBeDefined();
-
-      for (const txEffect of block1.body.txEffects) {
-        const retrieved = await store.getTxEffect(txEffect.txHash);
-        expect(retrieved).toBeDefined();
-      }
-    });
-
-    it('removes all blocks when blockNumber is 0', async () => {
-      const block1 = await L2Block.random(BlockNumber(1), {
-        checkpointNumber: CheckpointNumber(1),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-      });
-      const block2 = await L2Block.random(BlockNumber(2), {
-        checkpointNumber: CheckpointNumber(1),
-        indexWithinCheckpoint: IndexWithinCheckpoint(1),
-        lastArchive: block1.archive,
-      });
-
-      await addProposedBlocks(store, [block1, block2]);
-
-      const removedBlocks = await store.removeBlocksAfter(BlockNumber(0));
-
-      expect(removedBlocks.length).toBe(2);
-      expect(await store.getLatestBlockNumber()).toBe(0);
-      expect(await store.getBlock(BlockNumber(1))).toBeUndefined();
-      expect(await store.getBlock(BlockNumber(2))).toBeUndefined();
-    });
-  });
-});
diff --git a/yarn-project/archiver/src/store/kv_archiver_store.ts b/yarn-project/archiver/src/store/kv_archiver_store.ts
deleted file mode 100644
index a0814222a2e3..000000000000
--- a/yarn-project/archiver/src/store/kv_archiver_store.ts
+++ /dev/null
@@ -1,728 +0,0 @@
-import type { L1BlockId } from '@aztec/ethereum/l1-types';
-import type { BlockNumber, CheckpointNumber, SlotNumber } from '@aztec/foundation/branded-types';
-import type { Fr } from '@aztec/foundation/curves/bn254';
-import { toArray } from '@aztec/foundation/iterable';
-import { createLogger } from '@aztec/foundation/log';
-import type { AztecAsyncKVStore, CustomRange, StoreSize } from '@aztec/kv-store';
-import { FunctionSelector } from '@aztec/stdlib/abi';
-import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import {
-  type BlockData,
-  BlockHash,
-  CheckpointedL2Block,
-  type CommitteeAttestation,
-  L2Block,
-  type ValidateCheckpointResult,
-} from '@aztec/stdlib/block';
-import type {
-  CheckpointData,
-  CommonCheckpointData,
-  L1PublishedData,
-  ProposedCheckpointData,
-  ProposedCheckpointInput,
-  PublishedCheckpoint,
-} from '@aztec/stdlib/checkpoint';
-import type {
-  ContractClassPublic,
-  ContractClassPublicWithCommitment,
-  ContractDataSource,
-  ContractInstanceUpdateWithAddress,
-  ContractInstanceWithAddress,
-} from '@aztec/stdlib/contract';
-import type { L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
-import type { GetContractClassLogsResponse, GetPublicLogsResponse } from '@aztec/stdlib/interfaces/client';
-import type { LogFilter, SiloedTag, Tag, TxScopedL2Log } from '@aztec/stdlib/logs';
-import type { BlockHeader, TxHash, TxReceipt } from '@aztec/stdlib/tx';
-import type { UInt64 } from '@aztec/stdlib/types';
-
-import { join } from 'path';
-
-import type { InboxMessage } from '../structs/inbox_message.js';
-import { BlockStore, type RemoveCheckpointsResult } from './block_store.js';
-import { ContractClassStore } from './contract_class_store.js';
-import { ContractInstanceStore } from './contract_instance_store.js';
-import { LogStore } from './log_store.js';
-import { MessageStore } from './message_store.js';
-
-export const ARCHIVER_DB_VERSION = 6;
-export const MAX_FUNCTION_SIGNATURES = 1000;
-export const MAX_FUNCTION_NAME_LEN = 256;
-
-/**
- * Represents the latest L1 block processed by the archiver for various objects in L2.
- */
-export type ArchiverL1SynchPoint = {
-  /** Number of the last L1 block that added a new L2 checkpoint metadata.  */
-  blocksSynchedTo?: bigint;
-  /** Last L1 block checked for L1 to L2 messages. */
-  messagesSynchedTo?: L1BlockId;
-};
-
-/**
- * LMDB-based data store for the archiver.
- * Stores all archiver data including blocks, logs, contract classes/instances, and L1 to L2 messages.
- */
-export class KVArchiverDataStore implements ContractDataSource {
-  public static readonly SCHEMA_VERSION = ARCHIVER_DB_VERSION;
-
-  #blockStore: BlockStore;
-  #logStore: LogStore;
-  #messageStore: MessageStore;
-  #contractClassStore: ContractClassStore;
-  #contractInstanceStore: ContractInstanceStore;
-
-  private functionNames = new Map<string, string>();
-
-  #log = createLogger('archiver:data-store');
-
-  constructor(
-    private db: AztecAsyncKVStore,
-    logsMaxPageSize: number = 1000,
-  ) {
-    this.#blockStore = new BlockStore(db);
-    this.#logStore = new LogStore(db, this.#blockStore, logsMaxPageSize);
-    this.#messageStore = new MessageStore(db);
-    this.#contractClassStore = new ContractClassStore(db);
-    this.#contractInstanceStore = new ContractInstanceStore(db);
-  }
-
-  /** Returns the underlying block store. Used by L2TipsCache. */
-  get blockStore(): BlockStore {
-    return this.#blockStore;
-  }
-
-  /** Opens a new transaction to the underlying store and runs all operations within it. */
-  public transactionAsync<T>(callback: () => Promise<T>): Promise<T> {
-    return this.db.transactionAsync(callback);
-  }
-
-  public getBlockNumber(): Promise<BlockNumber> {
-    return this.#blockStore.getLatestL2BlockNumber();
-  }
-
-  public async getContract(
-    address: AztecAddress,
-    maybeTimestamp?: UInt64,
-  ): Promise<ContractInstanceWithAddress | undefined> {
-    const [header] = await this.getBlockHeaders(await this.getBlockNumber(), 1);
-    const timestamp = maybeTimestamp ?? header!.globalVariables.timestamp;
-    return this.getContractInstance(address, timestamp);
-  }
-
-  /** Backups the archiver db to the target folder. Returns the path to the db file. */
-  public async backupTo(path: string, compress = true): Promise<string> {
-    await this.db.backupTo(path, compress);
-    return join(path, 'data.mdb');
-  }
-
-  /** Closes the underlying data store. */
-  public close() {
-    return this.db.close();
-  }
-
-  /** Computes the finalized block number based on the proven block number. */
-  getFinalizedL2BlockNumber(): Promise<BlockNumber> {
-    return this.#blockStore.getFinalizedL2BlockNumber();
-  }
-
-  /** Looks up a public function name given a selector. */
-  getDebugFunctionName(_address: AztecAddress, selector: FunctionSelector): Promise<string | undefined> {
-    return Promise.resolve(this.functionNames.get(selector.toString()));
-  }
-
-  /** Register a public function signature, so it can be looked up by selector. */
-  async registerContractFunctionSignatures(signatures: string[]): Promise<void> {
-    for (const sig of signatures) {
-      if (this.functionNames.size > MAX_FUNCTION_SIGNATURES) {
-        return;
-      }
-      try {
-        const selector = await FunctionSelector.fromSignature(sig);
-        this.functionNames.set(selector.toString(), sig.slice(0, sig.indexOf('(')).slice(0, MAX_FUNCTION_NAME_LEN));
-      } catch {
-        this.#log.warn(`Failed to parse signature: ${sig}. Ignoring`);
-      }
-    }
-  }
-
-  /**
-   * Returns a contract class given its id, or undefined if not exists.
-   * @param id - Id of the contract class.
-   */
-  getContractClass(id: Fr): Promise<ContractClassPublic | undefined> {
-    return this.#contractClassStore.getContractClass(id);
-  }
-
-  /** Returns the list of all class ids known by the archiver. */
-  getContractClassIds(): Promise<Fr[]> {
-    return this.#contractClassStore.getContractClassIds();
-  }
-
-  /**
-   * Returns a contract instance given its address and the given timestamp, or undefined if not exists.
-   * @param address - Address of the contract.
-   * @param timestamp - Timestamp to get the contract instance at. Contract updates might change the instance.
-   * @returns The contract instance or undefined if not found.
-   */
-  getContractInstance(address: AztecAddress, timestamp: UInt64): Promise<ContractInstanceWithAddress | undefined> {
-    return this.#contractInstanceStore.getContractInstance(address, timestamp);
-  }
-
-  getContractInstanceDeploymentBlockNumber(address: AztecAddress): Promise<number | undefined> {
-    return this.#contractInstanceStore.getContractInstanceDeploymentBlockNumber(address);
-  }
-
-  /**
-   * Add new contract classes from an L2 block to the store's list.
-   * @param data - List of contract classes (with bytecode commitments) to be added.
-   * @param blockNumber - Number of the L2 block the contracts were registered in.
-   * @returns True if the operation is successful.
-   */
-  async addContractClasses(data: ContractClassPublicWithCommitment[], blockNumber: BlockNumber): Promise<boolean> {
-    return (
-      await Promise.all(
-        data.map(c => this.#contractClassStore.addContractClass(c, c.publicBytecodeCommitment, blockNumber)),
-      )
-    ).every(Boolean);
-  }
-
-  async deleteContractClasses(data: ContractClassPublic[], blockNumber: BlockNumber): Promise<boolean> {
-    return (await Promise.all(data.map(c => this.#contractClassStore.deleteContractClasses(c, blockNumber)))).every(
-      Boolean,
-    );
-  }
-
-  getBytecodeCommitment(contractClassId: Fr): Promise<Fr | undefined> {
-    return this.#contractClassStore.getBytecodeCommitment(contractClassId);
-  }
-
-  /**
-   * Add new contract instances from an L2 block to the store's list.
-   * @param data - List of contract instances to be added.
-   * @param blockNumber - Number of the L2 block the instances were deployed in.
-   * @returns True if the operation is successful.
-   */
-  async addContractInstances(data: ContractInstanceWithAddress[], blockNumber: BlockNumber): Promise<boolean> {
-    return (await Promise.all(data.map(c => this.#contractInstanceStore.addContractInstance(c, blockNumber)))).every(
-      Boolean,
-    );
-  }
-
-  async deleteContractInstances(data: ContractInstanceWithAddress[], _blockNumber: BlockNumber): Promise<boolean> {
-    return (await Promise.all(data.map(c => this.#contractInstanceStore.deleteContractInstance(c)))).every(Boolean);
-  }
-
-  /**
-   * Add new contract instance updates
-   * @param data - List of contract updates to be added.
-   * @param timestamp - Timestamp at which the updates were scheduled.
-   * @returns True if the operation is successful.
-   */
-  async addContractInstanceUpdates(data: ContractInstanceUpdateWithAddress[], timestamp: UInt64): Promise<boolean> {
-    return (
-      await Promise.all(
-        data.map((update, logIndex) =>
-          this.#contractInstanceStore.addContractInstanceUpdate(update, timestamp, logIndex),
-        ),
-      )
-    ).every(Boolean);
-  }
-  async deleteContractInstanceUpdates(data: ContractInstanceUpdateWithAddress[], timestamp: UInt64): Promise<boolean> {
-    return (
-      await Promise.all(
-        data.map((update, logIndex) =>
-          this.#contractInstanceStore.deleteContractInstanceUpdate(update, timestamp, logIndex),
-        ),
-      )
-    ).every(Boolean);
-  }
-
-  /**
-   * Append a new proposed block to the store.
-   * This is an uncheckpointed block that has been proposed by the sequencer but not yet included in a checkpoint on L1.
-   * For checkpointed blocks (already published to L1), use addCheckpoints() instead.
-   * @param block - The proposed L2 block to be added to the store.
-   * @returns True if the operation is successful.
-   */
-  addProposedBlock(block: L2Block, opts: { force?: boolean } = {}): Promise<boolean> {
-    return this.#blockStore.addProposedBlock(block, opts);
-  }
-
-  /**
-   * Returns an array of checkpoint objects
-   * @param from The first checkpoint number to be retrieved
-   * @param limit The maximum number of checkpoints to retrieve
-   * @returns The array of requested checkpoint data objects
-   */
-  getRangeOfCheckpoints(from: CheckpointNumber, limit: number): Promise<CheckpointData[]> {
-    return this.#blockStore.getRangeOfCheckpoints(from, limit);
-  }
-  /**
-   * Returns the number of the latest block
-   * @returns The number of the latest block
-   */
-  getLatestBlockNumber(): Promise<BlockNumber> {
-    return this.#blockStore.getLatestL2BlockNumber();
-  }
-
-  /**
-   * Removes all checkpoints with checkpoint number > checkpointNumber.
-   * Also removes ALL blocks (both checkpointed and uncheckpointed) after the last block of the given checkpoint.
-   * @param checkpointNumber - Remove all checkpoints strictly after this one.
-   */
-  removeCheckpointsAfter(checkpointNumber: CheckpointNumber): Promise<RemoveCheckpointsResult> {
-    return this.#blockStore.removeCheckpointsAfter(checkpointNumber);
-  }
-
-  /**
-   * Appends new checkpoints, and their blocks to the store's collection
-   * @param checkpoints The collection of checkpoints to be added
-   * @returns True if the operation is successful
-   */
-  addCheckpoints(checkpoints: PublishedCheckpoint[]): Promise<boolean> {
-    return this.#blockStore.addCheckpoints(checkpoints);
-  }
-
-  /**
-   * Returns the block for the given number, or undefined if not exists.
-   * @param number - The block number to return.
-   */
-  getCheckpointedBlock(number: BlockNumber): Promise<CheckpointedL2Block | undefined> {
-    return this.#blockStore.getCheckpointedBlock(number);
-  }
-  /**
-   * Returns the block for the given hash, or undefined if not exists.
-   * @param blockHash - The block hash to return.
-   */
-  getCheckpointedBlockByHash(blockHash: BlockHash): Promise<CheckpointedL2Block | undefined> {
-    return this.#blockStore.getCheckpointedBlockByHash(blockHash);
-  }
-  /**
-   * Returns the block for the given archive root, or undefined if not exists.
-   * @param archive - The archive root to return.
-   */
-  getCheckpointedBlockByArchive(archive: Fr): Promise<CheckpointedL2Block | undefined> {
-    return this.#blockStore.getCheckpointedBlockByArchive(archive);
-  }
-  /**
-   * Returns the block for the given number, or undefined if not exists.
-   * @param number - The block number to return.
-   */
-  getBlock(number: BlockNumber): Promise<L2Block | undefined> {
-    return this.#blockStore.getBlock(number);
-  }
-  /**
-   * Returns the block for the given hash, or undefined if not exists.
-   * @param blockHash - The block hash to return.
-   */
-  getBlockByHash(blockHash: BlockHash): Promise<L2Block | undefined> {
-    return this.#blockStore.getBlockByHash(blockHash);
-  }
-  /**
-   * Returns the block for the given archive root, or undefined if not exists.
-   * @param archive - The archive root to return.
-   */
-  getBlockByArchive(archive: Fr): Promise<L2Block | undefined> {
-    return this.#blockStore.getBlockByArchive(archive);
-  }
-
-  /**
-   * Gets up to `limit` amount of published L2 blocks starting from `from`.
-   * @param from - Number of the first block to return (inclusive).
-   * @param limit - The number of blocks to return.
-   * @returns The requested L2 blocks.
-   */
-  getBlocks(from: BlockNumber, limit: number): Promise<L2Block[]> {
-    return toArray(this.#blockStore.getBlocks(from, limit));
-  }
-
-  /**
-   * Gets up to `limit` amount of checkpointed L2 blocks starting from `from`.
-   * @param from - Number of the first block to return (inclusive).
-   * @param limit - The number of blocks to return.
-   * @returns The requested checkpointed L2 blocks.
-   */
-  getCheckpointedBlocks(from: BlockNumber, limit: number): Promise<CheckpointedL2Block[]> {
-    return toArray(this.#blockStore.getCheckpointedBlocks(from, limit));
-  }
-
-  /**
-   * Gets up to `limit` amount of L2 block headers starting from `from`.
-   * @param start - Number of the first block to return (inclusive).
-   * @param limit - The number of blocks to return.
-   * @returns The requested L2 block headers.
-   */
-  getBlockHeaders(start: BlockNumber, limit: number): Promise<BlockHeader[]> {
-    return toArray(this.#blockStore.getBlockHeaders(start, limit));
-  }
-
-  /**
-   * Returns the block header for the given hash, or undefined if not exists.
-   * @param blockHash - The block hash to return.
-   */
-  getBlockHeaderByHash(blockHash: BlockHash): Promise<BlockHeader | undefined> {
-    return this.#blockStore.getBlockHeaderByHash(blockHash);
-  }
-
-  /**
-   * Returns the block header for the given archive root, or undefined if not exists.
-   * @param archive - The archive root to return.
-   */
-  getBlockHeaderByArchive(archive: Fr): Promise<BlockHeader | undefined> {
-    return this.#blockStore.getBlockHeaderByArchive(archive);
-  }
-
-  /**
-   * Gets block metadata (without tx data) by block number.
-   * @param blockNumber - The block number to return.
-   */
-  getBlockData(blockNumber: BlockNumber): Promise<BlockData | undefined> {
-    return this.#blockStore.getBlockData(blockNumber);
-  }
-
-  /**
-   * Gets block metadata (without tx data) by archive root.
-   * @param archive - The archive root to return.
-   */
-  getBlockDataByArchive(archive: Fr): Promise<BlockData | undefined> {
-    return this.#blockStore.getBlockDataByArchive(archive);
-  }
-
-  /**
-   * Gets a tx effect.
-   * @param txHash - The hash of the tx corresponding to the tx effect.
-   * @returns The requested tx effect with block info (or undefined if not found).
-   */
-  getTxEffect(txHash: TxHash) {
-    return this.#blockStore.getTxEffect(txHash);
-  }
-
-  /**
-   * Gets a receipt of a settled tx.
-   * @param txHash - The hash of a tx we try to get the receipt for.
-   * @returns The requested tx receipt (or undefined if not found).
-   */
-  getSettledTxReceipt(
-    txHash: TxHash,
-    l1Constants?: Pick<L1RollupConstants, 'epochDuration'>,
-  ): Promise<TxReceipt | undefined> {
-    return this.#blockStore.getSettledTxReceipt(txHash, l1Constants);
-  }
-
-  /**
-   * Append new logs to the store's list.
-   * @param blocks - The blocks for which to add the logs.
-   * @returns True if the operation is successful.
-   */
-  addLogs(blocks: L2Block[]): Promise<boolean> {
-    return this.#logStore.addLogs(blocks);
-  }
-
-  deleteLogs(blocks: L2Block[]): Promise<boolean> {
-    return this.#logStore.deleteLogs(blocks);
-  }
-
-  /**
-   * Get the total number of L1 to L2 messages
-   * @returns The number of L1 to L2 messages in the store
-   */
-  getTotalL1ToL2MessageCount(): Promise<bigint> {
-    return this.#messageStore.getTotalL1ToL2MessageCount();
-  }
-
-  /** Returns the last L1 to L2 message stored. */
-  getLastL1ToL2Message(): Promise<InboxMessage | undefined> {
-    return this.#messageStore.getLastMessage();
-  }
-
-  /**
-   * Append L1 to L2 messages to the store.
-   * @param messages - The L1 to L2 messages to be added to the store.
-   * @returns True if the operation is successful.
-   */
-  addL1ToL2Messages(messages: InboxMessage[]): Promise<void> {
-    return this.#messageStore.addL1ToL2Messages(messages);
-  }
-
-  /**
-   * Gets the L1 to L2 message index in the L1 to L2 message tree.
-   * @param l1ToL2Message - The L1 to L2 message.
-   * @returns The index of the L1 to L2 message in the L1 to L2 message tree (undefined if not found).
-   */
-  getL1ToL2MessageIndex(l1ToL2Message: Fr): Promise<bigint | undefined> {
-    return this.#messageStore.getL1ToL2MessageIndex(l1ToL2Message);
-  }
-
-  /**
-   * Gets L1 to L2 message (to be) included in a given checkpoint.
-   * @param checkpointNumber - Checkpoint number to get messages for.
-   * @returns The L1 to L2 messages/leaves of the messages subtree (throws if not found).
-   */
-  getL1ToL2Messages(checkpointNumber: CheckpointNumber): Promise<Fr[]> {
-    return this.#messageStore.getL1ToL2Messages(checkpointNumber);
-  }
-
-  /**
-   * Gets private logs that match any of the `tags`. For each tag, an array of matching logs is returned. An empty
-   * array implies no logs match that tag.
-   * @param tags - The tags to search for.
-   * @param page - The page number (0-indexed) for pagination. Returns at most 10 logs per tag per page.
-   * @param upToBlockNumber - If set, only return logs from blocks up to and including this block number.
-   */
-  getPrivateLogsByTags(tags: SiloedTag[], page?: number, upToBlockNumber?: BlockNumber): Promise<TxScopedL2Log[][]> {
-    try {
-      return this.#logStore.getPrivateLogsByTags(tags, page, upToBlockNumber);
-    } catch (err) {
-      return Promise.reject(err);
-    }
-  }
-
-  /**
-   * Gets public logs that match any of the `tags` from the specified contract. For each tag, an array of matching
-   * logs is returned. An empty array implies no logs match that tag.
-   * @param contractAddress - The contract address to search logs for.
-   * @param tags - The tags to search for.
-   * @param page - The page number (0-indexed) for pagination. Returns at most 10 logs per tag per page.
-   * @param upToBlockNumber - If set, only return logs from blocks up to and including this block number.
-   */
-  getPublicLogsByTagsFromContract(
-    contractAddress: AztecAddress,
-    tags: Tag[],
-    page?: number,
-    upToBlockNumber?: BlockNumber,
-  ): Promise<TxScopedL2Log[][]> {
-    try {
-      return this.#logStore.getPublicLogsByTagsFromContract(contractAddress, tags, page, upToBlockNumber);
-    } catch (err) {
-      return Promise.reject(err);
-    }
-  }
-
-  /**
-   * Gets public logs based on the provided filter.
-   * @param filter - The filter to apply to the logs.
-   * @returns The requested logs.
-   */
-  getPublicLogs(filter: LogFilter): Promise<GetPublicLogsResponse> {
-    try {
-      return this.#logStore.getPublicLogs(filter);
-    } catch (err) {
-      return Promise.reject(err);
-    }
-  }
-
-  /**
-   * Gets contract class logs based on the provided filter.
-   * @param filter - The filter to apply to the logs.
-   * @returns The requested logs.
-   */
-  getContractClassLogs(filter: LogFilter): Promise<GetContractClassLogsResponse> {
-    try {
-      return this.#logStore.getContractClassLogs(filter);
-    } catch (err) {
-      return Promise.reject(err);
-    }
-  }
-
-  /**
-   * Gets the number of the latest proven checkpoint processed.
-   * @returns The number of the latest proven checkpoint processed.
-   */
-  getProvenCheckpointNumber(): Promise<CheckpointNumber> {
-    return this.#blockStore.getProvenCheckpointNumber();
-  }
-
-  /**
-   * Stores the number of the latest proven checkpoint processed.
-   * @param checkpointNumber - The number of the latest proven checkpoint processed.
-   */
-  async setProvenCheckpointNumber(checkpointNumber: CheckpointNumber) {
-    await this.#blockStore.setProvenCheckpointNumber(checkpointNumber);
-  }
-
-  /**
-   * Gets the number of the latest finalized checkpoint processed.
-   * @returns The number of the latest finalized checkpoint processed.
-   */
-  getFinalizedCheckpointNumber(): Promise<CheckpointNumber> {
-    return this.#blockStore.getFinalizedCheckpointNumber();
-  }
-
-  /**
-   * Stores the number of the latest finalized checkpoint processed.
-   * @param checkpointNumber - The number of the latest finalized checkpoint processed.
-   */
-  async setFinalizedCheckpointNumber(checkpointNumber: CheckpointNumber) {
-    await this.#blockStore.setFinalizedCheckpointNumber(checkpointNumber);
-  }
-
-  async setBlockSynchedL1BlockNumber(l1BlockNumber: bigint) {
-    await this.#blockStore.setSynchedL1BlockNumber(l1BlockNumber);
-  }
-
-  /**
-   * Returns the number of the most recent proven block
-   * @returns The number of the most recent proven block
-   */
-  getProvenBlockNumber(): Promise<BlockNumber> {
-    return this.#blockStore.getProvenBlockNumber();
-  }
-
-  /**
-   * Gets the synch point of the archiver
-   */
-  async getSynchPoint(): Promise<ArchiverL1SynchPoint> {
-    const [blocksSynchedTo, messagesSynchedTo] = await Promise.all([
-      this.#blockStore.getSynchedL1BlockNumber(),
-      this.#messageStore.getSynchedL1Block(),
-    ]);
-    return {
-      blocksSynchedTo,
-      messagesSynchedTo,
-    };
-  }
-
-  /** Estimates the size of the store in bytes. */
-  public estimateSize(): Promise<StoreSize> {
-    return this.db.estimateSize();
-  }
-
-  /** Deletes all L1 to L2 messages up until (excluding) the target checkpoint number. */
-  public rollbackL1ToL2MessagesToCheckpoint(targetCheckpointNumber: CheckpointNumber): Promise<void> {
-    return this.#messageStore.rollbackL1ToL2MessagesToCheckpoint(targetCheckpointNumber);
-  }
-
-  /** Atomically updates the message sync state: the L1 sync point and the inbox tree-in-progress marker. */
-  public setMessageSyncState(l1Block: L1BlockId, treeInProgress: bigint | undefined): Promise<void> {
-    return this.#messageStore.setMessageSyncState(l1Block, treeInProgress);
-  }
-
-  /** Returns an async iterator to all L1 to L2 messages on the range. */
-  public iterateL1ToL2Messages(range: CustomRange<bigint> = {}): AsyncIterableIterator<InboxMessage> {
-    return this.#messageStore.iterateL1ToL2Messages(range);
-  }
-
-  /** Removes all L1 to L2 messages starting from the given index (inclusive). */
-  public removeL1ToL2Messages(startIndex: bigint): Promise<void> {
-    return this.#messageStore.removeL1ToL2Messages(startIndex);
-  }
-
-  /** Returns the last synced validation status of the pending chain. */
-  public getPendingChainValidationStatus(): Promise<ValidateCheckpointResult | undefined> {
-    return this.#blockStore.getPendingChainValidationStatus();
-  }
-
-  /** Sets the last synced validation status of the pending chain. */
-  public setPendingChainValidationStatus(status: ValidateCheckpointResult | undefined): Promise<void> {
-    return this.#blockStore.setPendingChainValidationStatus(status);
-  }
-
-  /**
-   * Gets the L2 block number of the proposed checkpoint.
-   * @returns The block number of the proposed checkpoint, or the checkpointed block number if none.
-   */
-  public getProposedCheckpointL2BlockNumber(): Promise<BlockNumber> {
-    return this.#blockStore.getProposedCheckpointL2BlockNumber();
-  }
-
-  /** Returns the checkpoint data at the proposed tip */
-  public getProposedCheckpoint(): Promise<CommonCheckpointData | undefined> {
-    return this.#blockStore.getProposedCheckpoint();
-  }
-
-  /** Returns the proposed checkpoint data, or undefined if no proposed checkpoint exists. No fallback to confirmed. */
-  public getProposedCheckpointOnly(): Promise<ProposedCheckpointData | undefined> {
-    return this.#blockStore.getProposedCheckpointOnly();
-  }
-
-  /**
-   * Set proposed checkpoint
-   * @param proposedCheckpoint
-   * @returns
-   */
-  public setProposedCheckpoint(proposedCheckpoint: ProposedCheckpointInput): Promise<void> {
-    return this.#blockStore.setProposedCheckpoint(proposedCheckpoint);
-  }
-
-  /** Deletes the proposed checkpoint from storage. */
-  public deleteProposedCheckpoint(): Promise<void> {
-    return this.#blockStore.deleteProposedCheckpoint();
-  }
-
-  /**
-   * Promotes the proposed checkpoint to a confirmed checkpoint entry.
-   * Should only be called after the checkpoint has been validated.
-   * @param expectedArchiveRoot - The archive root to match against the proposed checkpoint, to guard against races.
-   */
-  public promoteProposedToCheckpointed(
-    l1: L1PublishedData,
-    attestations: CommitteeAttestation[],
-    expectedArchiveRoot: Fr,
-  ): Promise<void> {
-    return this.#blockStore.promoteProposedToCheckpointed(l1, attestations, expectedArchiveRoot);
-  }
-
-  /**
-   * Gets the number of the latest L2 block processed.
-   * @returns The number of the latest L2 block processed.
-   */
-  public getCheckpointedL2BlockNumber(): Promise<BlockNumber> {
-    return this.#blockStore.getCheckpointedL2BlockNumber();
-  }
-  /**
-   * Gets the number of the latest published checkpoint processed.
-   * @returns The number of the latest published checkpoint processed
-   */
-  public getSynchedCheckpointNumber(): Promise<CheckpointNumber> {
-    return this.#blockStore.getLatestCheckpointNumber();
-  }
-  /**
-   * Stores the l1 block number that checkpoints have been synched until
-   * @param l1BlockNumber  - The l1 block number
-   */
-  async setCheckpointSynchedL1BlockNumber(l1BlockNumber: bigint): Promise<void> {
-    await this.#blockStore.setSynchedL1BlockNumber(l1BlockNumber);
-  }
-
-  /**
-   * Retrieves all blocks for the requested checkpoint
-   * @param checkpointNumber Retrieves all blocks for the given checkpoint
-   * @returns The collection of blocks for the requested checkpoint if available (undefined otherwise)
-   */
-  getBlocksForCheckpoint(checkpointNumber: CheckpointNumber): Promise<L2Block[] | undefined> {
-    return this.#blockStore.getBlocksForCheckpoint(checkpointNumber);
-  }
-
-  /**
-   * Returns checkpoint data for the requested checkpoint number
-   * @param checkpointNumber - The checkpoint requested
-   * @returns The checkpoint data or undefined if not found
-   */
-  getCheckpointData(checkpointNumber: CheckpointNumber): Promise<CheckpointData | undefined> {
-    return this.#blockStore.getCheckpointData(checkpointNumber);
-  }
-
-  /** Returns checkpoint data for all checkpoints whose slot falls within the given range (inclusive). */
-  getCheckpointDataForSlotRange(startSlot: SlotNumber, endSlot: SlotNumber): Promise<CheckpointData[]> {
-    return this.#blockStore.getCheckpointDataForSlotRange(startSlot, endSlot);
-  }
-
-  /**
-   * Gets all blocks that have the given slot number.
-   * @param slotNumber - The slot number to search for.
-   * @returns All blocks with the given slot number.
-   */
-  getBlocksForSlot(slotNumber: SlotNumber): Promise<L2Block[]> {
-    return this.#blockStore.getBlocksForSlot(slotNumber);
-  }
-
-  /**
-   * Removes all blocks with block number > blockNumber.
-   * Does not remove any associated checkpoints.
-   * @param blockNumber - The block number to remove after.
-   * @returns The removed blocks (for event emission).
-   */
-  removeBlocksAfter(blockNumber: BlockNumber): Promise<L2Block[]> {
-    return this.#blockStore.removeBlocksAfter(blockNumber);
-  }
-}
diff --git a/yarn-project/archiver/src/store/l2_tips_cache.ts b/yarn-project/archiver/src/store/l2_tips_cache.ts
index 1f34a0628c8f..21c4b08f47d0 100644
--- a/yarn-project/archiver/src/store/l2_tips_cache.ts
+++ b/yarn-project/archiver/src/store/l2_tips_cache.ts
@@ -2,8 +2,8 @@ import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
 import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
 import {
   type BlockData,
+  type BlockHash,
   type CheckpointId,
-  GENESIS_BLOCK_HEADER_HASH,
   GENESIS_CHECKPOINT_HEADER_HASH,
   type L2Tips,
 } from '@aztec/stdlib/block';
@@ -18,7 +18,16 @@ import type { BlockStore } from './block_store.js';
 export class L2TipsCache {
   #tipsPromise: Promise<L2Tips> | undefined;
 
-  constructor(private blockStore: BlockStore) {}
+  /**
+   * Asymmetric by design: the genesis block hash is dynamic — derived from the injected initial header,
+   * which depends on `genesisTimestamp` and any prefilled state. The genesis checkpoint hash is static —
+   * checkpoint 0 is fully synthetic (no real checkpoint header exists at 0), so it stays at the protocol
+   * constant `GENESIS_CHECKPOINT_HEADER_HASH`.
+   */
+  constructor(
+    private blockStore: BlockStore,
+    private readonly initialBlockHash: BlockHash,
+  ) {}
 
   /** Returns the cached L2 tips. Loads from the block store on first call. */
   public getL2Tips(): Promise<L2Tips> {
@@ -47,13 +56,15 @@ export class L2TipsCache {
     ]);
 
     const genesisBlockHeader = {
-      blockHash: GENESIS_BLOCK_HEADER_HASH,
+      blockHash: this.initialBlockHash,
       checkpointNumber: CheckpointNumber.ZERO,
     } as const;
     const beforeInitialBlockNumber = BlockNumber(INITIAL_L2_BLOCK_NUM - 1);
 
     const getBlockData = (blockNumber: BlockNumber) =>
-      blockNumber > beforeInitialBlockNumber ? this.blockStore.getBlockData(blockNumber) : genesisBlockHeader;
+      blockNumber > beforeInitialBlockNumber
+        ? this.blockStore.getBlockData({ number: blockNumber })
+        : genesisBlockHeader;
 
     const [latestBlockData, provenBlockData, proposedCheckpointBlockData, checkpointedBlockData, finalizedBlockData] =
       await Promise.all(
@@ -108,7 +119,7 @@ export class L2TipsCache {
   private async getCheckpointIdForProposedCheckpoint(
     checkpointedBlockData: Pick<BlockData, 'checkpointNumber'>,
   ): Promise<CheckpointId> {
-    const checkpointData = await this.blockStore.getProposedCheckpointOnly();
+    const checkpointData = await this.blockStore.getLastProposedCheckpoint();
     if (!checkpointData) {
       return this.getCheckpointIdForBlock(checkpointedBlockData);
     }
diff --git a/yarn-project/archiver/src/store/log_store.test.ts b/yarn-project/archiver/src/store/log_store.test.ts
new file mode 100644
index 000000000000..b4212aa6b166
--- /dev/null
+++ b/yarn-project/archiver/src/store/log_store.test.ts
@@ -0,0 +1,1132 @@
+import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
+import { BlockNumber, CheckpointNumber, IndexWithinCheckpoint } from '@aztec/foundation/branded-types';
+import { randomInt } from '@aztec/foundation/crypto/random';
+import { openTmpStore } from '@aztec/kv-store/lmdb-v2';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { BlockHash, L2Block } from '@aztec/stdlib/block';
+import { Checkpoint, PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
+import { MAX_LOGS_PER_TAG } from '@aztec/stdlib/interfaces/api-limit';
+import { ContractClassLog, LogId } from '@aztec/stdlib/logs';
+import '@aztec/stdlib/testing/jest';
+import { TxHash } from '@aztec/stdlib/tx';
+
+import { OutOfOrderLogInsertionError } from '../errors.js';
+import {
+  makeCheckpointWithLogs,
+  makePrivateLog,
+  makePrivateLogTag,
+  makePublicLog,
+  makePublicLogTag,
+  makePublishedCheckpoint,
+  makeStateForBlock,
+} from '../test/mock_structs.js';
+import { BlockStore } from './block_store.js';
+import { LogStore } from './log_store.js';
+
+async function addProposedBlocks(
+  blockStore: BlockStore,
+  blocks: L2Block[],
+  opts?: { force?: boolean },
+): Promise<boolean> {
+  let result = true;
+  for (const block of blocks) {
+    result = (await blockStore.addProposedBlock(block, opts)) && result;
+  }
+  return result;
+}
+
+describe('LogStore', () => {
+  let blockStore: BlockStore;
+  let logStore: LogStore;
+  let publishedCheckpoints: PublishedCheckpoint[];
+
+  beforeEach(async () => {
+    const db = await openTmpStore('log_store_test');
+    blockStore = new BlockStore(db);
+    logStore = new LogStore(db, blockStore, 1000);
+    // Create checkpoints sequentially to ensure archive roots are chained properly.
+    publishedCheckpoints = [];
+    const txsPerBlock = 4;
+    for (let i = 0; i < 10; i++) {
+      const blockNumber = i + 1;
+      const previousArchive = i > 0 ? publishedCheckpoints[i - 1].checkpoint.blocks[0].archive : undefined;
+      const checkpoint = await Checkpoint.random(CheckpointNumber(i + 1), {
+        numBlocks: 1,
+        startBlockNumber: blockNumber,
+        previousArchive,
+        txsPerBlock,
+        state: makeStateForBlock(blockNumber, txsPerBlock),
+        txOptions: { numPublicCallsPerTx: 2, numPublicLogsPerCall: 2 },
+      });
+      publishedCheckpoints.push(makePublishedCheckpoint(checkpoint, i + 10));
+    }
+  });
+
+  describe('addLogs', () => {
+    it('adds private & public logs', async () => {
+      const checkpoint = publishedCheckpoints[0];
+      await blockStore.addCheckpoints([checkpoint]);
+      await expect(logStore.addLogs(checkpoint.checkpoint.blocks)).resolves.toEqual(true);
+    });
+  });
+
+  describe('deleteLogs', () => {
+    it('deletes public logs for a block', async () => {
+      const block = publishedCheckpoints[0].checkpoint.blocks[0];
+      await blockStore.addProposedBlock(block);
+      await expect(logStore.addLogs([block])).resolves.toEqual(true);
+
+      expect((await logStore.getPublicLogs({ fromBlock: BlockNumber(1) })).logs.length).toEqual(
+        block.body.txEffects.map(txEffect => txEffect.publicLogs).flat().length,
+      );
+
+      await logStore.deleteLogs([block]);
+
+      expect((await logStore.getPublicLogs({ fromBlock: BlockNumber(1) })).logs.length).toEqual(0);
+    });
+
+    it('deletes contract class logs for a block', async () => {
+      // Create a block that explicitly has contract class logs
+      const block = await L2Block.random(BlockNumber(1), {
+        txsPerBlock: 2,
+        txOptions: { numContractClassLogs: 1 },
+        state: makeStateForBlock(1, 2),
+      });
+      await blockStore.addProposedBlock(block);
+      await logStore.addLogs([block]);
+
+      const logsBefore = await logStore.getContractClassLogs({ fromBlock: BlockNumber(1) });
+      expect(logsBefore.logs.length).toBeGreaterThan(0);
+
+      await logStore.deleteLogs([block]);
+
+      const logsAfter = await logStore.getContractClassLogs({ fromBlock: BlockNumber(1) });
+      expect(logsAfter.logs.length).toEqual(0);
+    });
+
+    it('retains private logs from non-reorged block when same tag appears in reorged block', async () => {
+      const sharedTag = makePrivateLogTag(1, 0, 0);
+
+      // Block 1 with a private log using sharedTag
+      const cp1 = await makeCheckpointWithLogs(1, {
+        numTxsPerBlock: 1,
+        privateLogs: { numLogsPerTx: 1 },
+      });
+      const block1 = cp1.checkpoint.blocks[0];
+
+      // Block 2 with a private log using the SAME tag
+      const cp2 = await makeCheckpointWithLogs(2, {
+        previousArchive: block1.archive,
+        numTxsPerBlock: 1,
+        privateLogs: { numLogsPerTx: 1 },
+      });
+      const block2 = cp2.checkpoint.blocks[0];
+      // Override block2's private log tag to match block1's
+      block2.body.txEffects[0].privateLogs[0] = makePrivateLog(sharedTag);
+
+      await addProposedBlocks(blockStore, [block1, block2], { force: true });
+      await logStore.addLogs([block1, block2]);
+
+      // Both blocks' logs should be present
+      const logsBefore = await logStore.getPrivateLogsByTags([sharedTag]);
+      expect(logsBefore[0]).toHaveLength(2);
+
+      // Reorg: delete block 2
+      await logStore.deleteLogs([block2]);
+
+      // Block 1's log should still be present
+      const logsAfter = await logStore.getPrivateLogsByTags([sharedTag]);
+      expect(logsAfter[0]).toHaveLength(1);
+      expect(logsAfter[0][0].blockNumber).toEqual(1);
+    });
+
+    it('retains public logs from non-reorged block when same tag appears in reorged block', async () => {
+      const contractAddress = AztecAddress.fromNumber(543254);
+      const sharedTag = makePublicLogTag(1, 0, 0);
+
+      // Block 1 with a public log using sharedTag
+      const cp1 = await makeCheckpointWithLogs(1, {
+        numTxsPerBlock: 1,
+        publicLogs: { numLogsPerTx: 1, contractAddress },
+      });
+      const block1 = cp1.checkpoint.blocks[0];
+
+      // Block 2 with a public log using the SAME tag from the same contract
+      const cp2 = await makeCheckpointWithLogs(2, {
+        previousArchive: block1.archive,
+        numTxsPerBlock: 1,
+        publicLogs: { numLogsPerTx: 1, contractAddress },
+      });
+      const block2 = cp2.checkpoint.blocks[0];
+      // Override block2's public log tag to match block1's
+      block2.body.txEffects[0].publicLogs[0] = makePublicLog(sharedTag, contractAddress);
+
+      await addProposedBlocks(blockStore, [block1, block2], { force: true });
+      await logStore.addLogs([block1, block2]);
+
+      // Both blocks' logs should be present
+      const logsBefore = await logStore.getPublicLogsByTagsFromContract(contractAddress, [sharedTag]);
+      expect(logsBefore[0]).toHaveLength(2);
+
+      // Reorg: delete block 2
+      await logStore.deleteLogs([block2]);
+
+      // Block 1's log should still be present
+      const logsAfter = await logStore.getPublicLogsByTagsFromContract(contractAddress, [sharedTag]);
+      expect(logsAfter[0]).toHaveLength(1);
+      expect(logsAfter[0][0].blockNumber).toEqual(1);
+    });
+
+    it('deletes multiple blocks at once', async () => {
+      const cp1 = await makeCheckpointWithLogs(1, {
+        numTxsPerBlock: 2,
+        privateLogs: { numLogsPerTx: 1 },
+        publicLogs: { numLogsPerTx: 1 },
+      });
+      const block1 = cp1.checkpoint.blocks[0];
+
+      const cp2 = await makeCheckpointWithLogs(2, {
+        previousArchive: block1.archive,
+        numTxsPerBlock: 2,
+        privateLogs: { numLogsPerTx: 1 },
+        publicLogs: { numLogsPerTx: 1 },
+      });
+      const block2 = cp2.checkpoint.blocks[0];
+
+      await addProposedBlocks(blockStore, [block1, block2], { force: true });
+      await logStore.addLogs([block1, block2]);
+
+      // Verify logs exist
+      expect((await logStore.getPublicLogs({ fromBlock: BlockNumber(1) })).logs.length).toBeGreaterThan(0);
+
+      // Delete both blocks at once
+      await logStore.deleteLogs([block1, block2]);
+
+      expect((await logStore.getPublicLogs({ fromBlock: BlockNumber(1) })).logs.length).toEqual(0);
+    });
+
+    it('is a no-op when deleting blocks with no logs', async () => {
+      const block = publishedCheckpoints[0].checkpoint.blocks[0];
+      // Don't add logs, just try to delete
+      await expect(logStore.deleteLogs([block])).resolves.toEqual(true);
+    });
+  });
+
+  describe('getPrivateLogsByTags', () => {
+    const numBlocksForLogs = 3;
+    const numTxsPerBlock = 4;
+    const numPrivateLogsPerTx = 3;
+
+    let logsCheckpoints: PublishedCheckpoint[];
+
+    beforeEach(async () => {
+      // Create checkpoints sequentially to chain archive roots
+      logsCheckpoints = [];
+      for (let i = 0; i < numBlocksForLogs; i++) {
+        const previousArchive = i > 0 ? logsCheckpoints[i - 1].checkpoint.blocks[0].archive : undefined;
+        logsCheckpoints.push(
+          await makeCheckpointWithLogs(i + 1, {
+            previousArchive,
+            numTxsPerBlock,
+            privateLogs: { numLogsPerTx: numPrivateLogsPerTx },
+          }),
+        );
+      }
+
+      await blockStore.addCheckpoints(logsCheckpoints);
+      await logStore.addLogs(logsCheckpoints.flatMap(p => p.checkpoint.blocks));
+    });
+
+    it('is possible to batch request private logs via tags', async () => {
+      const tags = [makePrivateLogTag(2, 1, 2), makePrivateLogTag(1, 2, 0)];
+
+      const logsByTags = await logStore.getPrivateLogsByTags(tags);
+
+      expect(logsByTags).toEqual([
+        [
+          expect.objectContaining({
+            blockNumber: 2,
+            logData: makePrivateLog(tags[0]).getEmittedFields(),
+          }),
+        ],
+        [
+          expect.objectContaining({
+            blockNumber: 1,
+            logData: makePrivateLog(tags[1]).getEmittedFields(),
+          }),
+        ],
+      ]);
+    });
+
+    it('is possible to batch request logs that have the same tag but different content', async () => {
+      const tags = [makePrivateLogTag(1, 2, 1)];
+
+      // Create a checkpoint containing logs that have the same tag as the checkpoints before.
+      // Chain from the last checkpoint's archive
+      const newBlockNumber = numBlocksForLogs + 1;
+      const previousArchive = logsCheckpoints[logsCheckpoints.length - 1].checkpoint.blocks[0].archive;
+      const newCheckpoint = await makeCheckpointWithLogs(newBlockNumber, {
+        previousArchive,
+        numTxsPerBlock,
+        privateLogs: { numLogsPerTx: numPrivateLogsPerTx },
+      });
+      const newLog = newCheckpoint.checkpoint.blocks[0].body.txEffects[1].privateLogs[1];
+      newLog.fields[0] = tags[0].value;
+      newCheckpoint.checkpoint.blocks[0].body.txEffects[1].privateLogs[1] = newLog;
+      await blockStore.addCheckpoints([newCheckpoint]);
+      await logStore.addLogs([newCheckpoint.checkpoint.blocks[0]]);
+
+      const logsByTags = await logStore.getPrivateLogsByTags(tags);
+
+      expect(logsByTags).toEqual([
+        [
+          expect.objectContaining({
+            blockNumber: 1,
+            logData: makePrivateLog(tags[0]).getEmittedFields(),
+          }),
+          expect.objectContaining({
+            blockNumber: newBlockNumber,
+            logData: newLog.getEmittedFields(),
+          }),
+        ],
+      ]);
+    });
+
+    it('throws on out-of-order private log insertion', async () => {
+      const sharedTag = makePrivateLogTag(99, 0, 0);
+
+      // Create blocks 4 and 5 with the same shared tag
+      const prevArchive1 = logsCheckpoints[logsCheckpoints.length - 1].checkpoint.blocks[0].archive;
+      const checkpoint4 = await makeCheckpointWithLogs(numBlocksForLogs + 1, {
+        previousArchive: prevArchive1,
+        numTxsPerBlock,
+        privateLogs: { numLogsPerTx: numPrivateLogsPerTx },
+      });
+      checkpoint4.checkpoint.blocks[0].body.txEffects[0].privateLogs[0] = makePrivateLog(sharedTag);
+
+      const prevArchive2 = checkpoint4.checkpoint.blocks[0].archive;
+      const checkpoint5 = await makeCheckpointWithLogs(numBlocksForLogs + 2, {
+        previousArchive: prevArchive2,
+        numTxsPerBlock,
+        privateLogs: { numLogsPerTx: numPrivateLogsPerTx },
+      });
+      checkpoint5.checkpoint.blocks[0].body.txEffects[0].privateLogs[0] = makePrivateLog(sharedTag);
+
+      // Store block 5's logs first (higher block number), then try to store block 4's logs
+      // (lower block number) — this should fail.
+      await logStore.addLogs([checkpoint5.checkpoint.blocks[0]]);
+      await expect(logStore.addLogs([checkpoint4.checkpoint.blocks[0]])).rejects.toThrow(OutOfOrderLogInsertionError);
+    });
+
+    it('is possible to request logs for non-existing tags and determine their position', async () => {
+      const tags = [makePrivateLogTag(99, 88, 77), makePrivateLogTag(1, 1, 1)];
+
+      const logsByTags = await logStore.getPrivateLogsByTags(tags);
+
+      expect(logsByTags).toEqual([
+        [
+          // No logs for the first tag.
+        ],
+        [
+          expect.objectContaining({
+            blockNumber: 1,
+            logData: makePrivateLog(tags[1]).getEmittedFields(),
+          }),
+        ],
+      ]);
+    });
+
+    it('filters logs up to specified block number', async () => {
+      // Tags are unique per block, so create a shared tag across blocks by adding logs with the same tag
+      const sharedTag = makePrivateLogTag(1, 2, 1);
+
+      // Add extra blocks with logs sharing the same tag
+      for (let blockNum = numBlocksForLogs + 1; blockNum <= numBlocksForLogs + 2; blockNum++) {
+        const previousArchive = logsCheckpoints[logsCheckpoints.length - 1].checkpoint.blocks[0].archive;
+        const newCheckpoint = await makeCheckpointWithLogs(blockNum, {
+          previousArchive,
+          numTxsPerBlock,
+          privateLogs: { numLogsPerTx: numPrivateLogsPerTx },
+        });
+        const newLog = newCheckpoint.checkpoint.blocks[0].body.txEffects[1].privateLogs[1];
+        newLog.fields[0] = sharedTag.value;
+        newCheckpoint.checkpoint.blocks[0].body.txEffects[1].privateLogs[1] = newLog;
+        await blockStore.addCheckpoints([newCheckpoint]);
+        await logStore.addLogs([newCheckpoint.checkpoint.blocks[0]]);
+        logsCheckpoints.push(newCheckpoint);
+      }
+
+      // Without filter, should return logs from block 1 and the extra blocks
+      const allLogs = await logStore.getPrivateLogsByTags([sharedTag]);
+      expect(allLogs[0].some(log => log.blockNumber > numBlocksForLogs)).toBe(true);
+
+      // With upToBlockNumber=numBlocksForLogs, should only return the original log from block 1
+      const filteredLogs = await logStore.getPrivateLogsByTags([sharedTag], 0, BlockNumber(numBlocksForLogs));
+      expect(filteredLogs[0].length).toBeGreaterThan(0);
+      for (const log of filteredLogs[0]) {
+        expect(log.blockNumber).toBeLessThanOrEqual(numBlocksForLogs);
+      }
+      expect(filteredLogs[0].length).toBeLessThan(allLogs[0].length);
+    });
+
+    it('returns all logs when upToBlockNumber is not set', async () => {
+      const tag = makePrivateLogTag(1, 2, 1);
+
+      const logsWithoutFilter = await logStore.getPrivateLogsByTags([tag]);
+      const logsWithUndefined = await logStore.getPrivateLogsByTags([tag], 0, undefined);
+
+      expect(logsWithoutFilter).toEqual(logsWithUndefined);
+    });
+
+    describe('pagination', () => {
+      const paginationTag = makePrivateLogTag(1, 2, 1);
+
+      beforeEach(async () => {
+        // Add more blocks with the same tag to exceed MAX_LOGS_PER_TAG
+        for (let i = numBlocksForLogs; i < numBlocksForLogs + MAX_LOGS_PER_TAG + 5; i++) {
+          const previousArchive = logsCheckpoints[logsCheckpoints.length - 1].checkpoint.blocks[0].archive;
+          const newCheckpoint = await makeCheckpointWithLogs(i + 1, {
+            previousArchive,
+            numTxsPerBlock,
+            privateLogs: { numLogsPerTx: numPrivateLogsPerTx },
+          });
+          const newLog = newCheckpoint.checkpoint.blocks[0].body.txEffects[1].privateLogs[1];
+          newLog.fields[0] = paginationTag.value;
+          newCheckpoint.checkpoint.blocks[0].body.txEffects[1].privateLogs[1] = newLog;
+          await blockStore.addCheckpoints([newCheckpoint]);
+          await logStore.addLogs([newCheckpoint.checkpoint.blocks[0]]);
+          logsCheckpoints.push(newCheckpoint);
+        }
+      });
+
+      it('pagination works correctly with upToBlockNumber', async () => {
+        // With a low upToBlockNumber, the filtered set should be smaller than MAX_LOGS_PER_TAG
+        const filteredPage0 = await logStore.getPrivateLogsByTags([paginationTag], 0, BlockNumber(5));
+        for (const log of filteredPage0[0]) {
+          expect(log.blockNumber).toBeLessThanOrEqual(5);
+        }
+
+        // Page 1 with the same filter should only contain remaining filtered logs
+        const filteredPage1 = await logStore.getPrivateLogsByTags([paginationTag], 1, BlockNumber(5));
+        for (const log of filteredPage1[0]) {
+          expect(log.blockNumber).toBeLessThanOrEqual(5);
+        }
+      });
+
+      it('returns first page of logs when page=0', async () => {
+        const logsByTags = await logStore.getPrivateLogsByTags([paginationTag], 0);
+
+        expect(logsByTags[0]).toHaveLength(MAX_LOGS_PER_TAG);
+        expect(logsByTags[0][0].blockNumber).toBe(1); // First log from block 1
+      });
+
+      it('returns second page of logs when page=1', async () => {
+        const logsByTags = await logStore.getPrivateLogsByTags([paginationTag], 1);
+
+        // Should have the remaining logs (total was MAX_LOGS_PER_TAG + 6, so page 1 has 6)
+        expect(logsByTags[0]).toHaveLength(6);
+      });
+
+      it('returns empty array when page is beyond available logs', async () => {
+        const logsByTags = await logStore.getPrivateLogsByTags([paginationTag], 100);
+
+        expect(logsByTags).toEqual([[]]);
+      });
+
+      /**
+       * Verifies that logs are stored and returned in block order (ascending).
+       * This ordering guarantee is critical for pagination safety: if logs were not ordered
+       * by block number, new logs added between paginated calls could be inserted in the
+       * middle of the result set, causing callers to receive duplicate logs or miss logs
+       * entirely. By maintaining block order, new logs always appear at the end of the
+       * result set, meaning previously fetched pages remain stable.
+       */
+      it('maintains stable pagination when new logs are added between page fetches', async () => {
+        // Fetch page 0 and record the block numbers
+        const page0Before = await logStore.getPrivateLogsByTags([paginationTag], 0);
+        expect(page0Before[0]).toHaveLength(MAX_LOGS_PER_TAG);
+        const blockNumbersBefore = page0Before[0].map(log => log.blockNumber);
+
+        // Verify block numbers are in ascending order
+        for (let i = 1; i < blockNumbersBefore.length; i++) {
+          expect(blockNumbersBefore[i]).toBeGreaterThanOrEqual(blockNumbersBefore[i - 1]);
+        }
+
+        // Add more blocks with the same tag
+        const additionalBlocks = 3;
+        for (let i = 0; i < additionalBlocks; i++) {
+          const previousArchive = logsCheckpoints[logsCheckpoints.length - 1].checkpoint.blocks[0].archive;
+          const blockNumber = logsCheckpoints.length + 1;
+          const newCheckpoint = await makeCheckpointWithLogs(blockNumber, {
+            previousArchive,
+            numTxsPerBlock,
+            privateLogs: { numLogsPerTx: numPrivateLogsPerTx },
+          });
+          const newLog = newCheckpoint.checkpoint.blocks[0].body.txEffects[1].privateLogs[1];
+          newLog.fields[0] = paginationTag.value;
+          newCheckpoint.checkpoint.blocks[0].body.txEffects[1].privateLogs[1] = newLog;
+          await blockStore.addCheckpoints([newCheckpoint]);
+          await logStore.addLogs([newCheckpoint.checkpoint.blocks[0]]);
+          logsCheckpoints.push(newCheckpoint);
+        }
+
+        // Fetch page 0 again - should return the exact same logs
+        const page0After = await logStore.getPrivateLogsByTags([paginationTag], 0);
+        expect(page0After[0]).toHaveLength(MAX_LOGS_PER_TAG);
+        const blockNumbersAfter = page0After[0].map(log => log.blockNumber);
+        expect(blockNumbersAfter).toEqual(blockNumbersBefore);
+
+        // Fetch page 1 - should include the newly added logs
+        const page1 = await logStore.getPrivateLogsByTags([paginationTag], 1);
+        expect(page1[0].length).toBeGreaterThan(0);
+
+        // Verify all logs across both pages are in ascending block order
+        const allBlockNumbers = [...blockNumbersAfter, ...page1[0].map(log => log.blockNumber)];
+        for (let i = 1; i < allBlockNumbers.length; i++) {
+          expect(allBlockNumbers[i]).toBeGreaterThanOrEqual(allBlockNumbers[i - 1]);
+        }
+
+        // The new logs should appear on page 1, meaning their block numbers
+        // should be greater than or equal to the max block number on page 0
+        const maxBlockOnPage0 = Math.max(...blockNumbersAfter);
+        const newLogBlockNumbers = page1[0].slice(-additionalBlocks).map(log => log.blockNumber);
+        for (const blockNum of newLogBlockNumbers) {
+          expect(blockNum).toBeGreaterThanOrEqual(maxBlockOnPage0);
+        }
+      });
+    });
+  });
+
+  // Note that a lot of tests here are basically duplicates of the ones in getPrivateLogsByTags but the types used
+  // by each of the endpoints are different and that makes improving code reuse here not straightforward.
+
+  describe('getPublicLogsByTagsFromContract', () => {
+    const numBlocksForLogs = 3;
+    const numTxsPerBlock = 4;
+    const numPublicLogsPerTx = 2;
+    const contractAddress = AztecAddress.fromNumber(543254);
+
+    let logsCheckpoints: PublishedCheckpoint[];
+
+    beforeEach(async () => {
+      // Create checkpoints sequentially to chain archive roots
+      logsCheckpoints = [];
+      for (let i = 0; i < numBlocksForLogs; i++) {
+        const previousArchive = i > 0 ? logsCheckpoints[i - 1].checkpoint.blocks[0].archive : undefined;
+        logsCheckpoints.push(
+          await makeCheckpointWithLogs(i + 1, {
+            previousArchive,
+            numTxsPerBlock,
+            publicLogs: { numLogsPerTx: numPublicLogsPerTx, contractAddress },
+          }),
+        );
+      }
+
+      await blockStore.addCheckpoints(logsCheckpoints);
+      await logStore.addLogs(logsCheckpoints.flatMap(p => p.checkpoint.blocks));
+    });
+
+    it('is possible to batch request public logs via tags', async () => {
+      const tags = [makePublicLogTag(2, 1, 1), makePublicLogTag(1, 2, 0)];
+
+      const logsByTags = await logStore.getPublicLogsByTagsFromContract(contractAddress, tags);
+
+      expect(logsByTags).toEqual([
+        [
+          expect.objectContaining({
+            blockNumber: 2,
+            logData: makePublicLog(tags[0]).getEmittedFields(),
+          }),
+        ],
+        [
+          expect.objectContaining({
+            blockNumber: 1,
+            logData: makePublicLog(tags[1]).getEmittedFields(),
+          }),
+        ],
+      ]);
+    });
+
+    it('is possible to batch request logs that have the same tag but different content', async () => {
+      const tags = [makePublicLogTag(1, 2, 1)];
+
+      // Create a checkpoint containing logs that have the same tag as the checkpoints before.
+      // Chain from the last checkpoint's archive
+      const newBlockNumber = numBlocksForLogs + 1;
+      const previousArchive = logsCheckpoints[logsCheckpoints.length - 1].checkpoint.blocks[0].archive;
+      const newCheckpoint = await makeCheckpointWithLogs(newBlockNumber, {
+        previousArchive,
+        numTxsPerBlock,
+        publicLogs: { numLogsPerTx: numPublicLogsPerTx, contractAddress },
+      });
+      const newLog = newCheckpoint.checkpoint.blocks[0].body.txEffects[1].publicLogs[1];
+      newLog.fields[0] = tags[0].value;
+      newCheckpoint.checkpoint.blocks[0].body.txEffects[1].publicLogs[1] = newLog;
+      await blockStore.addCheckpoints([newCheckpoint]);
+      await logStore.addLogs([newCheckpoint.checkpoint.blocks[0]]);
+
+      const logsByTags = await logStore.getPublicLogsByTagsFromContract(contractAddress, tags);
+
+      expect(logsByTags).toEqual([
+        [
+          expect.objectContaining({
+            blockNumber: 1,
+            logData: makePublicLog(tags[0]).getEmittedFields(),
+          }),
+          expect.objectContaining({
+            blockNumber: newBlockNumber,
+            logData: newLog.getEmittedFields(),
+          }),
+        ],
+      ]);
+    });
+
+    it('throws on out-of-order public log insertion', async () => {
+      const sharedTag = makePublicLogTag(99, 0, 0);
+
+      // Create blocks 4 and 5 with the same shared tag
+      const prevArchive1 = logsCheckpoints[logsCheckpoints.length - 1].checkpoint.blocks[0].archive;
+      const checkpoint4 = await makeCheckpointWithLogs(numBlocksForLogs + 1, {
+        previousArchive: prevArchive1,
+        numTxsPerBlock,
+        publicLogs: { numLogsPerTx: numPublicLogsPerTx, contractAddress },
+      });
+      checkpoint4.checkpoint.blocks[0].body.txEffects[0].publicLogs[0] = makePublicLog(sharedTag, contractAddress);
+
+      const prevArchive2 = checkpoint4.checkpoint.blocks[0].archive;
+      const checkpoint5 = await makeCheckpointWithLogs(numBlocksForLogs + 2, {
+        previousArchive: prevArchive2,
+        numTxsPerBlock,
+        publicLogs: { numLogsPerTx: numPublicLogsPerTx, contractAddress },
+      });
+      checkpoint5.checkpoint.blocks[0].body.txEffects[0].publicLogs[0] = makePublicLog(sharedTag, contractAddress);
+
+      // Store block 5's logs first (higher block number), then try to store block 4's logs
+      // (lower block number) — this should fail.
+      await logStore.addLogs([checkpoint5.checkpoint.blocks[0]]);
+      await expect(logStore.addLogs([checkpoint4.checkpoint.blocks[0]])).rejects.toThrow(OutOfOrderLogInsertionError);
+    });
+
+    it('is possible to request logs for non-existing tags and determine their position', async () => {
+      const tags = [makePublicLogTag(99, 88, 77), makePublicLogTag(1, 1, 0)];
+
+      const logsByTags = await logStore.getPublicLogsByTagsFromContract(contractAddress, tags);
+
+      expect(logsByTags).toEqual([
+        [
+          // No logs for the first tag.
+        ],
+        [
+          expect.objectContaining({
+            blockNumber: 1,
+            logData: makePublicLog(tags[1]).getEmittedFields(),
+          }),
+        ],
+      ]);
+    });
+
+    it('filters logs up to specified block number', async () => {
+      const sharedTag = makePublicLogTag(1, 2, 1);
+
+      // Add extra blocks with logs sharing the same tag
+      for (let blockNum = numBlocksForLogs + 1; blockNum <= numBlocksForLogs + 2; blockNum++) {
+        const previousArchive = logsCheckpoints[logsCheckpoints.length - 1].checkpoint.blocks[0].archive;
+        const newCheckpoint = await makeCheckpointWithLogs(blockNum, {
+          previousArchive,
+          numTxsPerBlock,
+          publicLogs: { numLogsPerTx: numPublicLogsPerTx, contractAddress },
+        });
+        const newLog = newCheckpoint.checkpoint.blocks[0].body.txEffects[1].publicLogs[1];
+        newLog.fields[0] = sharedTag.value;
+        newCheckpoint.checkpoint.blocks[0].body.txEffects[1].publicLogs[1] = newLog;
+        await blockStore.addCheckpoints([newCheckpoint]);
+        await logStore.addLogs([newCheckpoint.checkpoint.blocks[0]]);
+        logsCheckpoints.push(newCheckpoint);
+      }
+
+      // Without filter, should return logs from block 1 and the extra blocks
+      const allLogs = await logStore.getPublicLogsByTagsFromContract(contractAddress, [sharedTag]);
+      expect(allLogs[0].some(log => log.blockNumber > numBlocksForLogs)).toBe(true);
+
+      // With upToBlockNumber=numBlocksForLogs, should only return the original log from block 1
+      const filteredLogs = await logStore.getPublicLogsByTagsFromContract(
+        contractAddress,
+        [sharedTag],
+        0,
+        BlockNumber(numBlocksForLogs),
+      );
+      expect(filteredLogs[0].length).toBeGreaterThan(0);
+      for (const log of filteredLogs[0]) {
+        expect(log.blockNumber).toBeLessThanOrEqual(numBlocksForLogs);
+      }
+      expect(filteredLogs[0].length).toBeLessThan(allLogs[0].length);
+    });
+
+    it('returns all logs when upToBlockNumber is not set', async () => {
+      const tag = makePublicLogTag(1, 2, 1);
+
+      const logsWithoutFilter = await logStore.getPublicLogsByTagsFromContract(contractAddress, [tag]);
+      const logsWithUndefined = await logStore.getPublicLogsByTagsFromContract(contractAddress, [tag], 0, undefined);
+
+      expect(logsWithoutFilter).toEqual(logsWithUndefined);
+    });
+
+    describe('pagination', () => {
+      const paginationTag = makePublicLogTag(1, 2, 1);
+
+      beforeEach(async () => {
+        // Add more blocks with the same tag to exceed MAX_LOGS_PER_TAG
+        for (let i = numBlocksForLogs; i < numBlocksForLogs + MAX_LOGS_PER_TAG + 5; i++) {
+          const previousArchive = logsCheckpoints[logsCheckpoints.length - 1].checkpoint.blocks[0].archive;
+          const newCheckpoint = await makeCheckpointWithLogs(i + 1, {
+            previousArchive,
+            numTxsPerBlock,
+            publicLogs: { numLogsPerTx: numPublicLogsPerTx, contractAddress },
+          });
+          const newLog = newCheckpoint.checkpoint.blocks[0].body.txEffects[1].publicLogs[1];
+          newLog.fields[0] = paginationTag.value;
+          newCheckpoint.checkpoint.blocks[0].body.txEffects[1].publicLogs[1] = newLog;
+          await blockStore.addCheckpoints([newCheckpoint]);
+          await logStore.addLogs([newCheckpoint.checkpoint.blocks[0]]);
+          logsCheckpoints.push(newCheckpoint);
+        }
+      });
+
+      it('pagination works correctly with upToBlockNumber', async () => {
+        const filteredPage0 = await logStore.getPublicLogsByTagsFromContract(
+          contractAddress,
+          [paginationTag],
+          0,
+          BlockNumber(5),
+        );
+        for (const log of filteredPage0[0]) {
+          expect(log.blockNumber).toBeLessThanOrEqual(5);
+        }
+
+        const filteredPage1 = await logStore.getPublicLogsByTagsFromContract(
+          contractAddress,
+          [paginationTag],
+          1,
+          BlockNumber(5),
+        );
+        for (const log of filteredPage1[0]) {
+          expect(log.blockNumber).toBeLessThanOrEqual(5);
+        }
+      });
+
+      it('returns first page of logs when page=0', async () => {
+        const logsByTags = await logStore.getPublicLogsByTagsFromContract(contractAddress, [paginationTag], 0);
+
+        expect(logsByTags[0]).toHaveLength(MAX_LOGS_PER_TAG);
+        expect(logsByTags[0][0].blockNumber).toBe(1); // First log from block 1
+      });
+
+      it('returns second page of logs when page=1', async () => {
+        const logsByTags = await logStore.getPublicLogsByTagsFromContract(contractAddress, [paginationTag], 1);
+
+        // Should have the remaining logs (total was MAX_LOGS_PER_TAG + 6, so page 1 has 6)
+        expect(logsByTags[0]).toHaveLength(6);
+      });
+
+      it('returns empty array when page is beyond available logs', async () => {
+        const logsByTags = await logStore.getPublicLogsByTagsFromContract(contractAddress, [paginationTag], 100);
+
+        expect(logsByTags).toEqual([[]]);
+      });
+
+      /**
+       * Verifies that logs are stored and returned in block order (ascending).
+       * This ordering guarantee is critical for pagination safety: if logs were not ordered
+       * by block number, new logs added between paginated calls could be inserted in the
+       * middle of the result set, causing callers to receive duplicate logs or miss logs
+       * entirely. By maintaining block order, new logs always appear at the end of the
+       * result set, meaning previously fetched pages remain stable.
+       */
+      it('maintains stable pagination when new logs are added between page fetches', async () => {
+        // Fetch page 0 and record the block numbers
+        const page0Before = await logStore.getPublicLogsByTagsFromContract(contractAddress, [paginationTag], 0);
+        expect(page0Before[0]).toHaveLength(MAX_LOGS_PER_TAG);
+        const blockNumbersBefore = page0Before[0].map(log => log.blockNumber);
+
+        // Verify block numbers are in ascending order
+        for (let i = 1; i < blockNumbersBefore.length; i++) {
+          expect(blockNumbersBefore[i]).toBeGreaterThanOrEqual(blockNumbersBefore[i - 1]);
+        }
+
+        // Add more blocks with the same tag
+        const additionalBlocks = 3;
+        for (let i = 0; i < additionalBlocks; i++) {
+          const previousArchive = logsCheckpoints[logsCheckpoints.length - 1].checkpoint.blocks[0].archive;
+          const blockNumber = logsCheckpoints.length + 1;
+          const newCheckpoint = await makeCheckpointWithLogs(blockNumber, {
+            previousArchive,
+            numTxsPerBlock,
+            publicLogs: { numLogsPerTx: numPublicLogsPerTx, contractAddress },
+          });
+          const newLog = newCheckpoint.checkpoint.blocks[0].body.txEffects[1].publicLogs[1];
+          newLog.fields[0] = paginationTag.value;
+          newCheckpoint.checkpoint.blocks[0].body.txEffects[1].publicLogs[1] = newLog;
+          await blockStore.addCheckpoints([newCheckpoint]);
+          await logStore.addLogs([newCheckpoint.checkpoint.blocks[0]]);
+          logsCheckpoints.push(newCheckpoint);
+        }
+
+        // Fetch page 0 again - should return the exact same logs
+        const page0After = await logStore.getPublicLogsByTagsFromContract(contractAddress, [paginationTag], 0);
+        expect(page0After[0]).toHaveLength(MAX_LOGS_PER_TAG);
+        const blockNumbersAfter = page0After[0].map(log => log.blockNumber);
+        expect(blockNumbersAfter).toEqual(blockNumbersBefore);
+
+        // Fetch page 1 - should include the newly added logs
+        const page1 = await logStore.getPublicLogsByTagsFromContract(contractAddress, [paginationTag], 1);
+        expect(page1[0].length).toBeGreaterThan(0);
+
+        // Verify all logs across both pages are in ascending block order
+        const allBlockNumbers = [...blockNumbersAfter, ...page1[0].map(log => log.blockNumber)];
+        for (let i = 1; i < allBlockNumbers.length; i++) {
+          expect(allBlockNumbers[i]).toBeGreaterThanOrEqual(allBlockNumbers[i - 1]);
+        }
+
+        // The new logs should appear on page 1, meaning their block numbers
+        // should be greater than or equal to the max block number on page 0
+        const maxBlockOnPage0 = Math.max(...blockNumbersAfter);
+        const newLogBlockNumbers = page1[0].slice(-additionalBlocks).map(log => log.blockNumber);
+        for (const blockNum of newLogBlockNumbers) {
+          expect(blockNum).toBeGreaterThanOrEqual(maxBlockOnPage0);
+        }
+      });
+    });
+  });
+
+  describe('getPublicLogs', () => {
+    const numBlocksForPublicLogs = 10;
+
+    // Helper to get total public logs per tx from a block
+    const getPublicLogsPerTx = (block: L2Block, txIndex: number) => block.body.txEffects[txIndex].publicLogs.length;
+
+    // Helper to get number of txs in a block
+    const getTxsPerBlock = (block: L2Block) => block.body.txEffects.length;
+
+    beforeEach(async () => {
+      // Use the outer publishedCheckpoints for log tests
+      for (let i = 0; i < numBlocksForPublicLogs; i++) {
+        await blockStore.addCheckpoints([publishedCheckpoints[i]]);
+        await logStore.addLogs(publishedCheckpoints[i].checkpoint.blocks);
+      }
+    });
+
+    it('no logs returned if deleted ("txHash" filter param is respected variant)', async () => {
+      // get random tx
+      const targetBlockIndex = randomInt(numBlocksForPublicLogs);
+      const targetBlock = publishedCheckpoints[targetBlockIndex].checkpoint.blocks[0];
+      const targetTxIndex = randomInt(getTxsPerBlock(targetBlock));
+      const targetTxHash = targetBlock.body.txEffects[targetTxIndex].txHash;
+
+      await Promise.all([
+        blockStore.removeCheckpointsAfter(CheckpointNumber(0)),
+        logStore.deleteLogs(publishedCheckpoints.slice(0, numBlocksForPublicLogs).flatMap(b => b.checkpoint.blocks)),
+      ]);
+
+      const response = await logStore.getPublicLogs({ txHash: targetTxHash });
+      const logs = response.logs;
+
+      expect(response.maxLogsHit).toBeFalsy();
+      expect(logs.length).toEqual(0);
+    });
+
+    it('"txHash" filter param is respected', async () => {
+      // get random tx
+      const targetBlockIndex = randomInt(numBlocksForPublicLogs);
+      const targetBlock = publishedCheckpoints[targetBlockIndex].checkpoint.blocks[0];
+      const targetTxIndex = randomInt(getTxsPerBlock(targetBlock));
+      const targetTxHash = targetBlock.body.txEffects[targetTxIndex].txHash;
+
+      const response = await logStore.getPublicLogs({ txHash: targetTxHash });
+      const logs = response.logs;
+
+      expect(response.maxLogsHit).toBeFalsy();
+
+      const expectedNumLogs = getPublicLogsPerTx(targetBlock, targetTxIndex);
+      expect(logs.length).toEqual(expectedNumLogs);
+
+      const targeBlockNumber = targetBlockIndex + INITIAL_L2_BLOCK_NUM;
+      for (const log of logs) {
+        expect(log.id.blockNumber).toEqual(targeBlockNumber);
+        expect(log.id.txIndex).toEqual(targetTxIndex);
+      }
+    });
+
+    it('returns block hash on public log ids', async () => {
+      const targetBlock = publishedCheckpoints[0].checkpoint.blocks[0];
+      const expectedBlockHash = await targetBlock.header.hash();
+
+      const logs = (await logStore.getPublicLogs({ fromBlock: targetBlock.number, toBlock: targetBlock.number + 1 }))
+        .logs;
+
+      expect(logs.length).toBeGreaterThan(0);
+      expect(logs.every(log => log.id.blockHash.equals(expectedBlockHash))).toBe(true);
+    });
+
+    it('returns tx hash on public log ids', async () => {
+      const targetBlock = publishedCheckpoints[0].checkpoint.blocks[0];
+
+      const logs = (await logStore.getPublicLogs({ fromBlock: targetBlock.number, toBlock: targetBlock.number + 1 }))
+        .logs;
+
+      expect(logs.length).toBeGreaterThan(0);
+      const expectedTxHashes = targetBlock.body.txEffects.map(txEffect => txEffect.txHash);
+      for (const log of logs) {
+        const expectedTxHash = expectedTxHashes[log.id.txIndex];
+        expect(log.id.txHash.equals(expectedTxHash)).toBe(true);
+      }
+    });
+
+    it('"fromBlock" and "toBlock" filter params are respected', async () => {
+      // Set "fromBlock" and "toBlock"
+      const fromBlock = 3;
+      const toBlock = 7;
+
+      const response = await logStore.getPublicLogs({ fromBlock, toBlock });
+      const logs = response.logs;
+
+      expect(response.maxLogsHit).toBeFalsy();
+
+      // Compute expected logs from the blocks in range
+      let expectedNumLogs = 0;
+      for (let i = fromBlock - 1; i < toBlock - 1; i++) {
+        const block = publishedCheckpoints[i].checkpoint.blocks[0];
+        expectedNumLogs += block.body.txEffects.reduce((sum, tx) => sum + tx.publicLogs.length, 0);
+      }
+      expect(logs.length).toEqual(expectedNumLogs);
+
+      for (const log of logs) {
+        const blockNumber = log.id.blockNumber;
+        expect(blockNumber).toBeGreaterThanOrEqual(fromBlock);
+        expect(blockNumber).toBeLessThan(toBlock);
+      }
+    });
+
+    it('"contractAddress" filter param is respected', async () => {
+      // Get a random contract address from the logs
+      const targetBlockIndex = randomInt(numBlocksForPublicLogs);
+      const targetBlock = publishedCheckpoints[targetBlockIndex].checkpoint.blocks[0];
+      const targetTxIndex = randomInt(getTxsPerBlock(targetBlock));
+      const targetLogIndex = randomInt(getPublicLogsPerTx(targetBlock, targetTxIndex));
+      const targetContractAddress =
+        targetBlock.body.txEffects[targetTxIndex].publicLogs[targetLogIndex].contractAddress;
+
+      const response = await logStore.getPublicLogs({ contractAddress: targetContractAddress });
+
+      expect(response.maxLogsHit).toBeFalsy();
+
+      for (const extendedLog of response.logs) {
+        expect(extendedLog.log.contractAddress.equals(targetContractAddress)).toBeTruthy();
+      }
+    });
+
+    it('"tag" filter param is respected', async () => {
+      // Get a random tag from the logs
+      const targetBlockIndex = randomInt(numBlocksForPublicLogs);
+      const targetBlock = publishedCheckpoints[targetBlockIndex].checkpoint.blocks[0];
+      const targetTxIndex = randomInt(getTxsPerBlock(targetBlock));
+      const targetLogIndex = randomInt(getPublicLogsPerTx(targetBlock, targetTxIndex));
+      const targetTag = targetBlock.body.txEffects[targetTxIndex].publicLogs[targetLogIndex].fields[0];
+
+      const response = await logStore.getPublicLogs({ tag: targetTag });
+
+      expect(response.maxLogsHit).toBeFalsy();
+      expect(response.logs.length).toBeGreaterThan(0);
+
+      for (const extendedLog of response.logs) {
+        expect(extendedLog.log.fields[0].equals(targetTag)).toBeTruthy();
+      }
+    });
+
+    it('"afterLog" filter param is respected', async () => {
+      // Get a random log as reference
+      const targetBlockIndex = randomInt(numBlocksForPublicLogs);
+      const targetBlock = publishedCheckpoints[targetBlockIndex].checkpoint.blocks[0];
+      const targetTxIndex = randomInt(getTxsPerBlock(targetBlock));
+      const numLogsInTx = targetBlock.body.txEffects[targetTxIndex].publicLogs.length;
+      const targetLogIndex = numLogsInTx > 0 ? randomInt(numLogsInTx) : 0;
+      const targetBlockHash = await targetBlock.header.hash();
+
+      const targetTxHash = targetBlock.body.txEffects[targetTxIndex].txHash;
+      const afterLog = new LogId(
+        BlockNumber(targetBlockIndex + INITIAL_L2_BLOCK_NUM),
+        targetBlockHash,
+        targetTxHash,
+        targetTxIndex,
+        targetLogIndex,
+      );
+
+      const response = await logStore.getPublicLogs({ afterLog });
+      const logs = response.logs;
+
+      expect(response.maxLogsHit).toBeFalsy();
+
+      for (const log of logs) {
+        const logId = log.id;
+        expect(logId.blockNumber).toBeGreaterThanOrEqual(afterLog.blockNumber);
+        if (logId.blockNumber === afterLog.blockNumber) {
+          expect(logId.txIndex).toBeGreaterThanOrEqual(afterLog.txIndex);
+          if (logId.txIndex === afterLog.txIndex) {
+            expect(logId.logIndex).toBeGreaterThan(afterLog.logIndex);
+          }
+        }
+      }
+    });
+
+    it('"txHash" filter param is respected when "afterLog" is set', async () => {
+      // A random txHash should match nothing, even with afterLog set
+      const txHash = TxHash.random();
+      const afterLog = new LogId(BlockNumber(1), BlockHash.random(), TxHash.random(), 0, 0);
+
+      const response = await logStore.getPublicLogs({ txHash, afterLog });
+      expect(response.logs.length).toBe(0);
+    });
+
+    it('intersecting works', async () => {
+      let logs = (await logStore.getPublicLogs({ fromBlock: -10 as BlockNumber, toBlock: -5 as BlockNumber })).logs;
+      expect(logs.length).toBe(0);
+
+      // "fromBlock" gets correctly trimmed to range and "toBlock" is exclusive
+      logs = (await logStore.getPublicLogs({ fromBlock: -10 as BlockNumber, toBlock: BlockNumber(5) })).logs;
+      let blockNumbers = new Set(logs.map(log => log.id.blockNumber));
+      expect(blockNumbers).toEqual(new Set([1, 2, 3, 4]));
+
+      // "toBlock" should be exclusive
+      logs = (await logStore.getPublicLogs({ fromBlock: BlockNumber(1), toBlock: BlockNumber(1) })).logs;
+      expect(logs.length).toBe(0);
+
+      logs = (await logStore.getPublicLogs({ fromBlock: BlockNumber(10), toBlock: BlockNumber(5) })).logs;
+      expect(logs.length).toBe(0);
+
+      // both "fromBlock" and "toBlock" get correctly capped to range and logs from all blocks are returned
+      logs = (await logStore.getPublicLogs({ fromBlock: -100 as BlockNumber, toBlock: +100 })).logs;
+      blockNumbers = new Set(logs.map(log => log.id.blockNumber));
+      expect(blockNumbers.size).toBe(numBlocksForPublicLogs);
+
+      // intersecting with "afterLog" works
+      logs = (
+        await logStore.getPublicLogs({
+          fromBlock: BlockNumber(2),
+          toBlock: BlockNumber(5),
+          afterLog: new LogId(BlockNumber(4), BlockHash.random(), TxHash.random(), 0, 0),
+        })
+      ).logs;
+      blockNumbers = new Set(logs.map(log => log.id.blockNumber));
+      expect(blockNumbers).toEqual(new Set([4]));
+
+      logs = (
+        await logStore.getPublicLogs({
+          toBlock: BlockNumber(5),
+          afterLog: new LogId(BlockNumber(5), BlockHash.random(), TxHash.random(), 1, 0),
+        })
+      ).logs;
+      expect(logs.length).toBe(0);
+
+      logs = (
+        await logStore.getPublicLogs({
+          fromBlock: BlockNumber(2),
+          toBlock: BlockNumber(5),
+          afterLog: new LogId(BlockNumber(100), BlockHash.random(), TxHash.random(), 0, 0),
+        })
+      ).logs;
+      expect(logs.length).toBe(0);
+    });
+
+    it('"txIndex" and "logIndex" are respected when "afterLog.blockNumber" is equal to "fromBlock"', async () => {
+      // Get a random log as reference
+      const targetBlockIndex = randomInt(numBlocksForPublicLogs);
+      const targetBlock = publishedCheckpoints[targetBlockIndex].checkpoint.blocks[0];
+      const targetTxIndex = randomInt(getTxsPerBlock(targetBlock));
+      const numLogsInTx = targetBlock.body.txEffects[targetTxIndex].publicLogs.length;
+      const targetLogIndex = numLogsInTx > 0 ? randomInt(numLogsInTx) : 0;
+      const targetBlockHash = await targetBlock.header.hash();
+      const targetTxHash = targetBlock.body.txEffects[targetTxIndex].txHash;
+
+      const afterLog = new LogId(
+        BlockNumber(targetBlockIndex + INITIAL_L2_BLOCK_NUM),
+        targetBlockHash,
+        targetTxHash,
+        targetTxIndex,
+        targetLogIndex,
+      );
+
+      const response = await logStore.getPublicLogs({ afterLog, fromBlock: afterLog.blockNumber });
+      const logs = response.logs;
+
+      expect(response.maxLogsHit).toBeFalsy();
+
+      for (const log of logs) {
+        const logId = log.id;
+        expect(logId.blockNumber).toBeGreaterThanOrEqual(afterLog.blockNumber);
+        if (logId.blockNumber === afterLog.blockNumber) {
+          expect(logId.txIndex).toBeGreaterThanOrEqual(afterLog.txIndex);
+          if (logId.txIndex === afterLog.txIndex) {
+            expect(logId.logIndex).toBeGreaterThan(afterLog.logIndex);
+          }
+        }
+      }
+    });
+  });
+
+  describe('getContractClassLogs', () => {
+    let targetBlock: L2Block;
+    let expectedContractClassLog: ContractClassLog;
+
+    beforeEach(async () => {
+      await blockStore.addCheckpoints(publishedCheckpoints);
+
+      targetBlock = publishedCheckpoints[0].checkpoint.blocks[0];
+      expectedContractClassLog = await ContractClassLog.random();
+      targetBlock.body.txEffects.forEach((txEffect, index) => {
+        txEffect.contractClassLogs = index === 0 ? [expectedContractClassLog] : [];
+      });
+
+      await logStore.addLogs([targetBlock]);
+    });
+
+    it('returns block hash on contract class log ids', async () => {
+      const result = await logStore.getContractClassLogs({
+        fromBlock: targetBlock.number,
+        toBlock: targetBlock.number + 1,
+      });
+
+      expect(result.maxLogsHit).toBeFalsy();
+      expect(result.logs).toHaveLength(1);
+
+      const [{ id, log }] = result.logs;
+      const expectedBlockHash = await targetBlock.header.hash();
+
+      expect(id.blockHash.equals(expectedBlockHash)).toBe(true);
+      expect(id.blockNumber).toEqual(targetBlock.number);
+      expect(log).toEqual(expectedContractClassLog);
+    });
+  });
+
+  describe('idempotency', () => {
+    it('does not duplicate logs when addLogs is called twice with same block', async () => {
+      const block = await L2Block.random(BlockNumber(1), {
+        checkpointNumber: CheckpointNumber(1),
+        indexWithinCheckpoint: IndexWithinCheckpoint(0),
+      });
+
+      // Add logs first time
+      await logStore.addLogs([block]);
+
+      // Get initial log count
+      const initialLogs = await logStore.getPublicLogs({ fromBlock: BlockNumber(1), toBlock: BlockNumber(2) });
+      const initialCount = initialLogs.logs.length;
+      expect(initialCount).toBeGreaterThan(0);
+
+      // Add logs second time (same block)
+      await logStore.addLogs([block]);
+
+      // Verify logs are NOT duplicated
+      const finalLogs = await logStore.getPublicLogs({ fromBlock: BlockNumber(1), toBlock: BlockNumber(2) });
+      expect(finalLogs.logs.length).toBe(initialCount);
+    });
+  });
+});
diff --git a/yarn-project/archiver/src/store/message_store.test.ts b/yarn-project/archiver/src/store/message_store.test.ts
new file mode 100644
index 000000000000..ef2ca57b9013
--- /dev/null
+++ b/yarn-project/archiver/src/store/message_store.test.ts
@@ -0,0 +1,330 @@
+import { NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP } from '@aztec/constants';
+import { CheckpointNumber } from '@aztec/foundation/branded-types';
+import { Buffer16, Buffer32 } from '@aztec/foundation/buffer';
+import { toArray } from '@aztec/foundation/iterable';
+import { openTmpStore } from '@aztec/kv-store/lmdb-v2';
+import { Checkpoint, type PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
+import '@aztec/stdlib/testing/jest';
+
+import { L1ToL2MessagesNotReadyError } from '../errors.js';
+import type { InboxMessage } from '../structs/inbox_message.js';
+import {
+  makeInboxMessage,
+  makeInboxMessages,
+  makeInboxMessagesWithFullBlocks,
+  makePublishedCheckpoint,
+  makeStateForBlock,
+} from '../test/mock_structs.js';
+import { BlockStore } from './block_store.js';
+import { type ArchiverL1SynchPoint, getArchiverSynchPoint } from './data_stores.js';
+import { MessageStore, MessageStoreError } from './message_store.js';
+
+describe('MessageStore', () => {
+  let blockStore: BlockStore;
+  let messageStore: MessageStore;
+  let publishedCheckpoints: PublishedCheckpoint[];
+
+  // Helper that mirrors the legacy `getSynchPoint` API by calling the helper that takes the bundle.
+  const getSynchPoint = (block: BlockStore, message: MessageStore) =>
+    getArchiverSynchPoint({
+      db: undefined as never,
+      blocks: block,
+      logs: undefined as never,
+      messages: message,
+      contractClasses: undefined as never,
+      contractInstances: undefined as never,
+      functionNames: undefined as never,
+    });
+
+  beforeEach(async () => {
+    const db = await openTmpStore('message_store_test');
+    blockStore = new BlockStore(db);
+    messageStore = new MessageStore(db);
+    // Create checkpoints sequentially to ensure archive roots are chained properly.
+    publishedCheckpoints = [];
+    const txsPerBlock = 4;
+    for (let i = 0; i < 10; i++) {
+      const blockNumber = i + 1;
+      const previousArchive = i > 0 ? publishedCheckpoints[i - 1].checkpoint.blocks[0].archive : undefined;
+      const checkpoint = await Checkpoint.random(CheckpointNumber(i + 1), {
+        numBlocks: 1,
+        startBlockNumber: blockNumber,
+        previousArchive,
+        txsPerBlock,
+        state: makeStateForBlock(blockNumber, txsPerBlock),
+        txOptions: { numPublicCallsPerTx: 2, numPublicLogsPerCall: 2 },
+      });
+      publishedCheckpoints.push(makePublishedCheckpoint(checkpoint, i + 10));
+    }
+  });
+
+  describe('getSynchPoint', () => {
+    it('returns undefined if no blocks have been added', async () => {
+      await expect(getSynchPoint(blockStore, messageStore)).resolves.toEqual({
+        blocksSynchedTo: undefined,
+        messagesSynchedTo: undefined,
+      } satisfies ArchiverL1SynchPoint);
+    });
+
+    it('returns the L1 block number in which the most recent L2 block was published', async () => {
+      await blockStore.addCheckpoints(publishedCheckpoints);
+      await expect(getSynchPoint(blockStore, messageStore)).resolves.toEqual({
+        blocksSynchedTo: 19n,
+        messagesSynchedTo: undefined,
+      } satisfies ArchiverL1SynchPoint);
+    });
+
+    it('returns the L1 block set via setMessageSyncState', async () => {
+      const l1BlockHash = Buffer32.random();
+      const l1BlockNumber = 10n;
+      await messageStore.setMessageSyncState({ l1BlockNumber, l1BlockHash }, 1n);
+      await messageStore.addL1ToL2Messages([
+        makeInboxMessage(Buffer16.ZERO, { l1BlockNumber: 5n, l1BlockHash: Buffer32.random() }),
+      ]);
+      await expect(getSynchPoint(blockStore, messageStore)).resolves.toEqual({
+        blocksSynchedTo: undefined,
+        messagesSynchedTo: { l1BlockHash, l1BlockNumber },
+      } satisfies ArchiverL1SynchPoint);
+    });
+  });
+
+  describe('L1 to L2 Messages', () => {
+    const initialCheckpointNumber = CheckpointNumber(13);
+
+    const checkMessages = async (msgs: InboxMessage[]) => {
+      expect(await messageStore.getLastMessage()).toEqual(msgs.at(-1));
+      expect(await toArray(messageStore.iterateL1ToL2Messages())).toEqual(msgs);
+      expect(await messageStore.getTotalL1ToL2MessageCount()).toEqual(BigInt(msgs.length));
+    };
+
+    it('stores first message ever', async () => {
+      const msg = makeInboxMessage(Buffer16.ZERO, { index: 0n, checkpointNumber: CheckpointNumber(1) });
+      await messageStore.addL1ToL2Messages([msg]);
+
+      await checkMessages([msg]);
+      expect(await messageStore.getL1ToL2Messages(CheckpointNumber(1))).toEqual([msg.leaf]);
+    });
+
+    it('stores single message', async () => {
+      const msg = makeInboxMessage(Buffer16.ZERO, { checkpointNumber: CheckpointNumber(2) });
+      await messageStore.addL1ToL2Messages([msg]);
+
+      await checkMessages([msg]);
+      expect(await messageStore.getL1ToL2Messages(CheckpointNumber(2))).toEqual([msg.leaf]);
+    });
+
+    it('stores and returns messages across different blocks', async () => {
+      const msgs = makeInboxMessages(5, { initialCheckpointNumber });
+      await messageStore.addL1ToL2Messages(msgs);
+
+      await checkMessages(msgs);
+      expect(await messageStore.getL1ToL2Messages(CheckpointNumber(initialCheckpointNumber + 2))).toEqual(
+        [msgs[2]].map(m => m.leaf),
+      );
+    });
+
+    it('stores the same messages again', async () => {
+      const msgs = makeInboxMessages(5, { initialCheckpointNumber });
+      await messageStore.addL1ToL2Messages(msgs);
+      await messageStore.addL1ToL2Messages(msgs.slice(2));
+
+      await checkMessages(msgs);
+    });
+
+    it('stores and returns messages across different blocks with gaps', async () => {
+      const msgs1 = makeInboxMessages(3, { initialCheckpointNumber: CheckpointNumber(1) });
+      const msgs2 = makeInboxMessages(3, {
+        initialCheckpointNumber: CheckpointNumber(20),
+        initialHash: msgs1.at(-1)!.rollingHash,
+      });
+
+      await messageStore.addL1ToL2Messages(msgs1);
+      await messageStore.addL1ToL2Messages(msgs2);
+
+      await checkMessages([...msgs1, ...msgs2]);
+
+      expect(await messageStore.getL1ToL2Messages(CheckpointNumber(1))).toEqual([msgs1[0].leaf]);
+      expect(await messageStore.getL1ToL2Messages(CheckpointNumber(4))).toEqual([]);
+      expect(await messageStore.getL1ToL2Messages(CheckpointNumber(20))).toEqual([msgs2[0].leaf]);
+      expect(await messageStore.getL1ToL2Messages(CheckpointNumber(24))).toEqual([]);
+    });
+
+    it('stores and returns messages with block numbers larger than a byte', async () => {
+      const msgs = makeInboxMessages(5, { initialCheckpointNumber: CheckpointNumber(1000) });
+      await messageStore.addL1ToL2Messages(msgs);
+
+      await checkMessages(msgs);
+      expect(await messageStore.getL1ToL2Messages(CheckpointNumber(1002))).toEqual([msgs[2]].map(m => m.leaf));
+    });
+
+    it('stores and returns multiple messages per block', async () => {
+      const msgs = makeInboxMessagesWithFullBlocks(4);
+      await messageStore.addL1ToL2Messages(msgs);
+
+      await checkMessages(msgs);
+      const blockMessages = await messageStore.getL1ToL2Messages(CheckpointNumber(initialCheckpointNumber + 1));
+      expect(blockMessages).toHaveLength(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
+      expect(blockMessages).toEqual(
+        msgs.slice(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP * 2).map(m => m.leaf),
+      );
+    });
+
+    it('stores messages in multiple operations', async () => {
+      const msgs = makeInboxMessages(20, { initialCheckpointNumber });
+      await messageStore.addL1ToL2Messages(msgs.slice(0, 10));
+      await messageStore.addL1ToL2Messages(msgs.slice(10, 20));
+
+      expect(await messageStore.getL1ToL2Messages(CheckpointNumber(initialCheckpointNumber + 2))).toEqual(
+        [msgs[2]].map(m => m.leaf),
+      );
+      expect(await messageStore.getL1ToL2Messages(CheckpointNumber(initialCheckpointNumber + 12))).toEqual(
+        [msgs[12]].map(m => m.leaf),
+      );
+      await checkMessages(msgs);
+    });
+
+    it('iterates over messages from start index', async () => {
+      const msgs = makeInboxMessages(10, { initialCheckpointNumber });
+      await messageStore.addL1ToL2Messages(msgs);
+
+      const iterated = await toArray(messageStore.iterateL1ToL2Messages({ start: msgs[3].index }));
+      expect(iterated).toEqual(msgs.slice(3));
+    });
+
+    it('iterates over messages in reverse', async () => {
+      const msgs = makeInboxMessages(10, { initialCheckpointNumber });
+      await messageStore.addL1ToL2Messages(msgs);
+
+      const iterated = await toArray(messageStore.iterateL1ToL2Messages({ reverse: true, end: msgs[3].index }));
+      expect(iterated).toEqual(msgs.slice(0, 4).reverse());
+    });
+
+    it('throws if messages are added out of order', async () => {
+      const msgs = makeInboxMessages(5, { overrideFn: (msg, i) => ({ ...msg, index: BigInt(10 - i) }) });
+      await expect(messageStore.addL1ToL2Messages(msgs)).rejects.toThrow(MessageStoreError);
+    });
+
+    it('throws if block number for the first message is out of order', async () => {
+      const msgs = makeInboxMessages(4, { initialCheckpointNumber });
+      msgs[2].checkpointNumber = CheckpointNumber(initialCheckpointNumber - 1);
+      await messageStore.addL1ToL2Messages(msgs.slice(0, 2));
+      await expect(messageStore.addL1ToL2Messages(msgs.slice(2, 4))).rejects.toThrow(MessageStoreError);
+    });
+
+    it('throws if rolling hash is not correct', async () => {
+      const msgs = makeInboxMessages(5);
+      msgs[1].rollingHash = Buffer16.random();
+      await expect(messageStore.addL1ToL2Messages(msgs)).rejects.toThrow(MessageStoreError);
+    });
+
+    it('throws if rolling hash for first message is not correct', async () => {
+      const msgs = makeInboxMessages(4);
+      msgs[2].rollingHash = Buffer16.random();
+      await messageStore.addL1ToL2Messages(msgs.slice(0, CheckpointNumber(2)));
+      await expect(messageStore.addL1ToL2Messages(msgs.slice(2, 4))).rejects.toThrow(MessageStoreError);
+    });
+
+    it('throws if index is not in the correct range', async () => {
+      const msgs = makeInboxMessages(5, { initialCheckpointNumber });
+      msgs.at(-1)!.index += 100n;
+      await expect(messageStore.addL1ToL2Messages(msgs)).rejects.toThrow(MessageStoreError);
+    });
+
+    it('throws if first index in block has gaps', async () => {
+      const msgs = makeInboxMessages(4, { initialCheckpointNumber });
+      msgs[2].index++;
+      await expect(messageStore.addL1ToL2Messages(msgs)).rejects.toThrow(MessageStoreError);
+    });
+
+    it('throws if index does not follow previous one', async () => {
+      const msgs = makeInboxMessages(2, {
+        initialCheckpointNumber,
+        overrideFn: (msg, i) => ({
+          ...msg,
+          checkpointNumber: CheckpointNumber(2),
+          index: BigInt(i + NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP * 2),
+        }),
+      });
+      msgs[1].index++;
+      await expect(messageStore.addL1ToL2Messages(msgs)).rejects.toThrow(MessageStoreError);
+    });
+
+    it('removes messages up to the given block number', async () => {
+      const msgs = makeInboxMessagesWithFullBlocks(4, { initialCheckpointNumber: CheckpointNumber(1) });
+
+      await messageStore.addL1ToL2Messages(msgs);
+      await checkMessages(msgs);
+
+      expect(await messageStore.getL1ToL2Messages(CheckpointNumber(1))).toHaveLength(
+        NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
+      );
+      expect(await messageStore.getL1ToL2Messages(CheckpointNumber(2))).toHaveLength(
+        NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
+      );
+      expect(await messageStore.getL1ToL2Messages(CheckpointNumber(3))).toHaveLength(
+        NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
+      );
+      expect(await messageStore.getL1ToL2Messages(CheckpointNumber(4))).toHaveLength(
+        NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
+      );
+
+      await messageStore.rollbackL1ToL2MessagesToCheckpoint(CheckpointNumber(2));
+
+      expect(await messageStore.getL1ToL2Messages(CheckpointNumber(1))).toHaveLength(
+        NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
+      );
+      expect(await messageStore.getL1ToL2Messages(CheckpointNumber(2))).toHaveLength(
+        NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
+      );
+      expect(await messageStore.getL1ToL2Messages(CheckpointNumber(3))).toHaveLength(0);
+      expect(await messageStore.getL1ToL2Messages(CheckpointNumber(4))).toHaveLength(0);
+
+      await checkMessages(msgs.slice(0, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP * 2));
+    });
+
+    it('removes messages starting with the given index', async () => {
+      const msgs = makeInboxMessagesWithFullBlocks(4, { initialCheckpointNumber: CheckpointNumber(1) });
+      await messageStore.addL1ToL2Messages(msgs);
+
+      await messageStore.removeL1ToL2Messages(msgs[13].index);
+      await checkMessages(msgs.slice(0, 13));
+    });
+
+    describe('inbox tree in progress guard', () => {
+      it('throws when checkpointNumber >= treeInProgress', async () => {
+        const msgs = makeInboxMessages(3, { initialCheckpointNumber: CheckpointNumber(5) });
+        await messageStore.addL1ToL2Messages(msgs);
+
+        // Set treeInProgress to 7, meaning checkpoints 5 and 6 are sealed, 7+ are not
+        await messageStore.setMessageSyncState({ l1BlockNumber: 1n, l1BlockHash: Buffer32.random() }, 7n);
+
+        // Sealed checkpoint should succeed
+        await expect(messageStore.getL1ToL2Messages(CheckpointNumber(5))).resolves.toEqual([msgs[0].leaf]);
+
+        // Unsealed checkpoint (== treeInProgress) should throw
+        await expect(messageStore.getL1ToL2Messages(CheckpointNumber(7))).rejects.toThrow(L1ToL2MessagesNotReadyError);
+
+        // Future checkpoint should also throw
+        await expect(messageStore.getL1ToL2Messages(CheckpointNumber(8))).rejects.toThrow(L1ToL2MessagesNotReadyError);
+      });
+
+      it('returns messages when checkpointNumber < treeInProgress', async () => {
+        const msgs = makeInboxMessages(3, { initialCheckpointNumber: CheckpointNumber(10) });
+        await messageStore.addL1ToL2Messages(msgs);
+
+        await messageStore.setMessageSyncState({ l1BlockNumber: 1n, l1BlockHash: Buffer32.random() }, 13n);
+
+        await expect(messageStore.getL1ToL2Messages(CheckpointNumber(10))).resolves.toEqual([msgs[0].leaf]);
+        await expect(messageStore.getL1ToL2Messages(CheckpointNumber(11))).resolves.toEqual([msgs[1].leaf]);
+      });
+
+      it('skips guard when treeInProgress is not set', async () => {
+        const msgs = makeInboxMessages(2, { initialCheckpointNumber: CheckpointNumber(1) });
+        await messageStore.addL1ToL2Messages(msgs);
+
+        // No setMessageSyncState call — guard should be permissive
+        await expect(messageStore.getL1ToL2Messages(CheckpointNumber(1))).resolves.toEqual([msgs[0].leaf]);
+      });
+    });
+  });
+});
diff --git a/yarn-project/archiver/src/store/message_store.ts b/yarn-project/archiver/src/store/message_store.ts
index 12b53e935f55..5aaf949ee3b0 100644
--- a/yarn-project/archiver/src/store/message_store.ts
+++ b/yarn-project/archiver/src/store/message_store.ts
@@ -43,6 +43,8 @@ export class MessageStore {
   #totalMessageCount: AztecAsyncSingleton<bigint>;
   /** Stores the checkpoint number whose message tree is currently being filled on L1. */
   #inboxTreeInProgress: AztecAsyncSingleton<bigint>;
+  /** Stores the L1 finalized block as of the last successful message sync. */
+  #messagesFinalizedL1Block: AztecAsyncSingleton<Buffer>;
 
   #log = createLogger('archiver:message_store');
 
@@ -52,6 +54,7 @@ export class MessageStore {
     this.#lastSynchedL1Block = db.openSingleton('archiver_last_l1_block_id');
     this.#totalMessageCount = db.openSingleton('archiver_l1_to_l2_message_count');
     this.#inboxTreeInProgress = db.openSingleton('archiver_inbox_tree_in_progress');
+    this.#messagesFinalizedL1Block = db.openSingleton('archiver_messages_finalized_l1_block');
   }
 
   public async getTotalL1ToL2MessageCount(): Promise<bigint> {
@@ -75,6 +78,26 @@ export class MessageStore {
     await this.#lastSynchedL1Block.set(buffer);
   }
 
+  /** Gets the L1 finalized block as of the last successful message sync. */
+  public async getMessagesFinalizedL1Block(): Promise<L1BlockId | undefined> {
+    const buffer = await this.#messagesFinalizedL1Block.getAsync();
+    if (!buffer) {
+      return undefined;
+    }
+    const reader = BufferReader.asReader(buffer);
+    return { l1BlockNumber: reader.readUInt256(), l1BlockHash: Buffer32.fromBuffer(reader.readBytes(Buffer32.SIZE)) };
+  }
+
+  /** Monotonically advances the persisted L1 finalized block for message sync. Never regresses. */
+  private async maybeAdvanceFinalizedL1Block(l1Block: L1BlockId): Promise<void> {
+    const existing = await this.getMessagesFinalizedL1Block();
+    if (existing && l1Block.l1BlockNumber <= existing.l1BlockNumber) {
+      return;
+    }
+    const buffer = serializeToBuffer([l1Block.l1BlockNumber, l1Block.l1BlockHash]);
+    await this.#messagesFinalizedL1Block.set(buffer);
+  }
+
   /**
    * Append L1 to L2 messages to the store.
    * Requires new messages to be in order and strictly after the last message added.
@@ -185,8 +208,15 @@ export class MessageStore {
     return this.#inboxTreeInProgress.getAsync();
   }
 
-  /** Atomically updates the message sync state: the L1 sync point and the inbox tree-in-progress marker. */
-  public setMessageSyncState(l1Block: L1BlockId, treeInProgress: bigint | undefined): Promise<void> {
+  /**
+   * Atomically updates the message sync state: the L1 sync point, the inbox tree-in-progress marker, and
+   * (optionally) the L1 finalized block as of this sync. The finalized block is advanced monotonically.
+   */
+  public setMessageSyncState(
+    l1Block: L1BlockId,
+    treeInProgress: bigint | undefined,
+    finalizedL1Block?: L1BlockId,
+  ): Promise<void> {
     return this.db.transactionAsync(async () => {
       await this.setSynchedL1Block(l1Block);
       if (treeInProgress !== undefined) {
@@ -194,6 +224,9 @@ export class MessageStore {
       } else {
         await this.#inboxTreeInProgress.delete();
       }
+      if (finalizedL1Block !== undefined) {
+        await this.maybeAdvanceFinalizedL1Block(finalizedL1Block);
+      }
     });
   }
 
diff --git a/yarn-project/archiver/src/test/fake_l1_state.ts b/yarn-project/archiver/src/test/fake_l1_state.ts
index 790a5988f2fb..005cb8577c73 100644
--- a/yarn-project/archiver/src/test/fake_l1_state.ts
+++ b/yarn-project/archiver/src/test/fake_l1_state.ts
@@ -15,12 +15,8 @@ import { CommitteeAttestation, CommitteeAttestationsAndSigners, L2Block } from '
 import { Checkpoint } from '@aztec/stdlib/checkpoint';
 import { getSlotAtTimestamp } from '@aztec/stdlib/epoch-helpers';
 import { InboxLeaf } from '@aztec/stdlib/messaging';
-import { ConsensusPayload, SignatureDomainSeparator } from '@aztec/stdlib/p2p';
-import {
-  makeAndSignCommitteeAttestationsAndSigners,
-  makeCheckpointAttestationFromCheckpoint,
-  mockCheckpointAndMessages,
-} from '@aztec/stdlib/testing';
+import { ConsensusPayload, getHashedSignaturePayloadTypedData } from '@aztec/stdlib/p2p';
+import { mockCheckpointAndMessages } from '@aztec/stdlib/testing';
 import { AppendOnlyTreeSnapshot } from '@aztec/stdlib/trees';
 
 import { type MockProxy, mock } from 'jest-mock-extended';
@@ -519,6 +515,9 @@ export class FakeL1State {
     const publicClient = mock<ViemPublicClient>();
 
     publicClient.getChainId.mockResolvedValue(1);
+    // Several consumers (CalldataRetriever, ArchiverL1Synchronizer) derive the EIP-712 signing
+    // context from `publicClient.chain.id`. Pin it so it matches `getSignatureContext()` below.
+    (publicClient as unknown as { chain: { id: number } }).chain = { id: 1 };
     publicClient.getBlockNumber.mockImplementation(() => Promise.resolve(this.l1BlockNumber));
 
     publicClient.getBlock.mockImplementation((async (args: { blockNumber?: bigint; blockTag?: string } = {}) => {
@@ -660,9 +659,11 @@ export class FakeL1State {
     checkpoint: Checkpoint,
     signers: Secp256k1Signer[],
   ): Promise<{ tx: Transaction; attestationsHash: Buffer32; payloadDigest: Buffer32 }> {
+    const signatureContext = this.getSignatureContext();
+    const consensusPayload = ConsensusPayload.fromCheckpoint(checkpoint, signatureContext);
+    const attestationDigest = getHashedSignaturePayloadTypedData(consensusPayload);
     const attestations = signers
-      .map(signer => makeCheckpointAttestationFromCheckpoint(checkpoint, signer))
-      .map(attestation => CommitteeAttestation.fromSignature(attestation.signature))
+      .map(signer => CommitteeAttestation.fromSignature(signer.sign(attestationDigest)))
       .map(committeeAttestation => committeeAttestation.toViem());
 
     const header = checkpoint.header.toViem();
@@ -670,11 +671,15 @@ export class FakeL1State {
     const archive = toHex(checkpoint.archive.root.toBuffer());
     const attestationsAndSigners = new CommitteeAttestationsAndSigners(
       attestations.map(attestation => CommitteeAttestation.fromViem(attestation)),
+      signatureContext,
     );
 
-    const attestationsAndSignersSignature = makeAndSignCommitteeAttestationsAndSigners(
-      attestationsAndSigners,
-      signers[0],
+    // Fall back to a random signer when no attesters are provided, so tests that
+    // don't care about the proposer identity (e.g. sync tests) still produce a
+    // valid-looking signature for the attestationsAndSigners struct.
+    const proposerSigner = signers[0] ?? Secp256k1Signer.random();
+    const attestationsAndSignersSignature = proposerSigner.sign(
+      getHashedSignaturePayloadTypedData(attestationsAndSigners),
     );
 
     const packedAttestations = attestationsAndSigners.getPackedAttestations();
@@ -715,9 +720,7 @@ export class FakeL1State {
     );
 
     // Compute payloadDigest (same logic as CalldataRetriever)
-    const consensusPayload = ConsensusPayload.fromCheckpoint(checkpoint);
-    const payloadToSign = consensusPayload.getPayloadToSign(SignatureDomainSeparator.checkpointAttestation);
-    const payloadDigest = Buffer32.fromString(keccak256(payloadToSign));
+    const payloadDigest = getHashedSignaturePayloadTypedData(consensusPayload);
 
     const tx = {
       input: multiCallInput,
@@ -729,6 +732,13 @@ export class FakeL1State {
     return { tx, attestationsHash, payloadDigest };
   }
 
+  private getSignatureContext() {
+    return {
+      chainId: 1,
+      rollupAddress: this.config.rollupAddress,
+    };
+  }
+
   /** Extracts the CommitteeAttestations struct definition from RollupAbi for hash computation. */
   private getCommitteeAttestationsStructDef(): AbiParameter {
     const proposeFunction = RollupAbi.find(item => item.type === 'function' && item.name === 'propose') as
diff --git a/yarn-project/archiver/src/test/mock_l2_block_source.ts b/yarn-project/archiver/src/test/mock_l2_block_source.ts
index 3e5d427dc358..0250dd7159ad 100644
--- a/yarn-project/archiver/src/test/mock_l2_block_source.ts
+++ b/yarn-project/archiver/src/test/mock_l2_block_source.ts
@@ -1,6 +1,12 @@
 import { GENESIS_ARCHIVE_ROOT } from '@aztec/constants';
 import { DefaultL1ContractsConfig } from '@aztec/ethereum/config';
-import { BlockNumber, CheckpointNumber, EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
+import {
+  BlockNumber,
+  CheckpointNumber,
+  EpochNumber,
+  IndexWithinCheckpoint,
+  SlotNumber,
+} from '@aztec/foundation/branded-types';
 import { Buffer32 } from '@aztec/foundation/buffer';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
@@ -9,8 +15,13 @@ import type { FunctionSelector } from '@aztec/stdlib/abi';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import {
   type BlockData,
-  BlockHash,
-  CheckpointedL2Block,
+  type BlockHash,
+  type BlockQuery,
+  type BlockTag,
+  type BlocksQuery,
+  Body,
+  GENESIS_BLOCK_HEADER_HASH,
+  GENESIS_CHECKPOINT_HEADER_HASH,
   L2Block,
   type L2BlockSource,
   type L2Tips,
@@ -32,7 +43,8 @@ import {
 } from '@aztec/stdlib/epoch-helpers';
 import { computeCheckpointOutHash } from '@aztec/stdlib/messaging';
 import { CheckpointHeader } from '@aztec/stdlib/rollup';
-import { type BlockHeader, TxExecutionResult, TxHash, TxReceipt, TxStatus } from '@aztec/stdlib/tx';
+import { AppendOnlyTreeSnapshot } from '@aztec/stdlib/trees';
+import { BlockHeader, TxExecutionResult, TxHash, TxReceipt, TxStatus } from '@aztec/stdlib/tx';
 import type { UInt64 } from '@aztec/stdlib/types';
 
 /**
@@ -47,8 +59,66 @@ export class MockL2BlockSource implements L2BlockSource, ContractDataSource {
   private checkpointedBlockNumber: number = 0;
   private proposedCheckpointBlockNumber: number = 0;
 
+  private initialHeader: BlockHeader = BlockHeader.empty();
+  private initialHeaderHash: BlockHash = GENESIS_BLOCK_HEADER_HASH;
+  private genesisArchiveRoot?: Fr;
+  private genesisBlock?: L2Block;
+
   private log = createLogger('archiver:mock_l2_block_source');
 
+  /** Returns the initial header used to synthesize block 0. */
+  public getInitialHeader(): BlockHeader {
+    return this.initialHeader;
+  }
+
+  /**
+   * Sets the initial header used to synthesize block 0. Tests that wire up a real
+   * world-state should call this with `worldState.getInitialHeader()` so the L2BlockStream
+   * agrees on the genesis hash on both sides. Precomputes and caches the header hash so
+   * `getGenesisBlockHash()` can return synchronously.
+   */
+  public async setInitialHeader(header: BlockHeader): Promise<void> {
+    this.initialHeader = header;
+    this.initialHeaderHash = await header.hash();
+    this.genesisBlock = undefined;
+  }
+
+  /**
+   * Returns the precomputed hash of the genesis block header. Defaults to the static
+   * {@link GENESIS_BLOCK_HEADER_HASH} unless {@link setInitialHeader} has been called with a
+   * custom header.
+   */
+  public getGenesisBlockHash(): BlockHash {
+    return this.initialHeaderHash;
+  }
+
+  /**
+   * Sets the post-genesis archive root used to synthesize block 0. Mirrors the real archiver,
+   * whose synthetic block 0 carries `new AppendOnlyTreeSnapshot(genesisArchiveRoot, 1)` rather
+   * than `AppendOnlyTreeSnapshot.empty()`. Tests wiring up a real world-state should set this so
+   * archive-based block lookups against the mock match production semantics.
+   */
+  public setGenesisArchiveRoot(root: Fr): void {
+    this.genesisArchiveRoot = root;
+    this.genesisBlock = undefined;
+  }
+
+  private getGenesisBlock(): L2Block {
+    if (this.genesisBlock) {
+      return this.genesisBlock;
+    }
+    const archive = this.genesisArchiveRoot
+      ? new AppendOnlyTreeSnapshot(this.genesisArchiveRoot, 1)
+      : AppendOnlyTreeSnapshot.empty();
+    return (this.genesisBlock = new L2Block(
+      archive,
+      this.initialHeader,
+      Body.empty(),
+      CheckpointNumber.ZERO,
+      IndexWithinCheckpoint(0),
+    ));
+  }
+
   /** Creates blocks grouped into single-block checkpoints. */
   public async createBlocks(numBlocks: number) {
     await this.createCheckpoints(numBlocks, 1);
@@ -171,8 +241,20 @@ export class MockL2BlockSource implements L2BlockSource, ContractDataSource {
    * Gets the number of the latest L2 block processed by the block source implementation.
    * @returns In this mock instance, returns the number of L2 blocks that we've mocked.
    */
-  public getBlockNumber() {
-    return Promise.resolve(BlockNumber(this.l2Blocks.length));
+  public getBlockNumber(): Promise<BlockNumber>;
+  public getBlockNumber(query: BlockQuery): Promise<BlockNumber | undefined>;
+  public async getBlockNumber(query?: BlockQuery): Promise<BlockNumber | undefined> {
+    if (!query) {
+      return BlockNumber(this.l2Blocks.length);
+    }
+    if ('number' in query) {
+      return query.number;
+    }
+    if ('tag' in query) {
+      return BlockNumber(this.resolveBlockTag(query.tag));
+    }
+    const block = await this.getBlock(query);
+    return block ? block.header.globalVariables.blockNumber : undefined;
   }
 
   public getProvenBlockNumber() {
@@ -191,62 +273,6 @@ export class MockL2BlockSource implements L2BlockSource, ContractDataSource {
     return Promise.resolve(BlockNumber(this.proposedCheckpointBlockNumber));
   }
 
-  public getCheckpointedBlock(number: BlockNumber): Promise<CheckpointedL2Block | undefined> {
-    if (number > this.checkpointedBlockNumber) {
-      return Promise.resolve(undefined);
-    }
-    const block = this.l2Blocks[number - 1];
-    if (!block) {
-      return Promise.resolve(undefined);
-    }
-    return Promise.resolve(this.toCheckpointedBlock(block));
-  }
-
-  public async getCheckpointedBlocks(from: BlockNumber, limit: number): Promise<CheckpointedL2Block[]> {
-    const result: CheckpointedL2Block[] = [];
-    for (let i = 0; i < limit; i++) {
-      const blockNum = from + i;
-      if (blockNum > this.checkpointedBlockNumber) {
-        break;
-      }
-      const block = await this.getCheckpointedBlock(BlockNumber(blockNum));
-      if (block) {
-        result.push(block);
-      }
-    }
-    return result;
-  }
-
-  /**
-   * Gets an l2 block.
-   * @param number - The block number to return (inclusive).
-   * @returns The requested L2 block.
-   */
-  public getBlock(number: number): Promise<L2Block | undefined> {
-    const block = this.l2Blocks[number - 1];
-    return Promise.resolve(block);
-  }
-
-  /**
-   * Gets an L2 block (new format).
-   * @param number - The block number to return.
-   * @returns The requested L2 block.
-   */
-  public getL2Block(number: BlockNumber): Promise<L2Block | undefined> {
-    const block = this.l2Blocks[number - 1];
-    return Promise.resolve(block);
-  }
-
-  /**
-   * Gets up to `limit` amount of L2 blocks starting from `from`.
-   * @param from - Number of the first block to return (inclusive).
-   * @param limit - The maximum number of blocks to return.
-   * @returns The requested mocked L2 blocks.
-   */
-  public getBlocks(from: number, limit: number): Promise<L2Block[]> {
-    return Promise.resolve(this.l2Blocks.slice(from - 1, from - 1 + limit));
-  }
-
   public getCheckpoints(from: CheckpointNumber, limit: number) {
     const checkpoints = this.checkpointList.slice(from - 1, from - 1 + limit);
     return Promise.resolve(
@@ -259,84 +285,16 @@ export class MockL2BlockSource implements L2BlockSource, ContractDataSource {
     return Promise.resolve(checkpoint);
   }
 
-  public async getCheckpointedBlockByHash(blockHash: BlockHash): Promise<CheckpointedL2Block | undefined> {
-    for (const block of this.l2Blocks) {
-      const hash = await block.hash();
-      if (hash.equals(blockHash)) {
-        return this.toCheckpointedBlock(block);
-      }
-    }
-    return undefined;
-  }
-
-  public getCheckpointedBlockByArchive(archive: Fr): Promise<CheckpointedL2Block | undefined> {
-    const block = this.l2Blocks.find(b => b.archive.root.equals(archive));
-    if (!block) {
-      return Promise.resolve(undefined);
-    }
-    return Promise.resolve(this.toCheckpointedBlock(block));
-  }
-
-  public async getL2BlockByHash(blockHash: BlockHash): Promise<L2Block | undefined> {
-    for (const block of this.l2Blocks) {
-      const hash = await block.hash();
-      if (hash.equals(blockHash)) {
-        return block;
-      }
-    }
-    return undefined;
-  }
-
-  public getL2BlockByArchive(archive: Fr): Promise<L2Block | undefined> {
-    const block = this.l2Blocks.find(b => b.archive.root.equals(archive));
-    return Promise.resolve(block);
-  }
-
-  public async getBlockHeaderByHash(blockHash: BlockHash): Promise<BlockHeader | undefined> {
-    for (const block of this.l2Blocks) {
-      const hash = await block.hash();
-      if (hash.equals(blockHash)) {
-        return block.header;
-      }
-    }
-    return undefined;
-  }
-
-  public getBlockHeaderByArchive(archive: Fr): Promise<BlockHeader | undefined> {
-    const block = this.l2Blocks.find(b => b.archive.root.equals(archive));
-    return Promise.resolve(block?.header);
-  }
-
-  public async getBlockData(number: BlockNumber): Promise<BlockData | undefined> {
-    const block = this.l2Blocks[number - 1];
-    if (!block) {
-      return undefined;
-    }
-    return {
-      header: block.header,
-      archive: block.archive,
-      blockHash: await block.hash(),
-      checkpointNumber: block.checkpointNumber,
-      indexWithinCheckpoint: block.indexWithinCheckpoint,
-    };
+  public getCheckpointData(_n: CheckpointNumber): Promise<CheckpointData | undefined> {
+    return Promise.resolve(undefined);
   }
 
-  public async getBlockDataByArchive(archive: Fr): Promise<BlockData | undefined> {
-    const block = this.l2Blocks.find(b => b.archive.root.equals(archive));
-    if (!block) {
-      return undefined;
-    }
-    return {
-      header: block.header,
-      archive: block.archive,
-      blockHash: await block.hash(),
-      checkpointNumber: block.checkpointNumber,
-      indexWithinCheckpoint: block.indexWithinCheckpoint,
-    };
+  public getCheckpointDataRange(_from: CheckpointNumber, _limit: number): Promise<CheckpointData[]> {
+    return Promise.resolve([]);
   }
 
-  getBlockHeader(number: number | 'latest'): Promise<BlockHeader | undefined> {
-    return Promise.resolve(this.l2Blocks.at(typeof number === 'number' ? number - 1 : -1)?.header);
+  public getCheckpointNumberBySlot(_slot: SlotNumber): Promise<CheckpointNumber | undefined> {
+    return Promise.resolve(undefined);
   }
 
   getCheckpointsForEpoch(epochNumber: EpochNumber): Promise<Checkpoint[]> {
@@ -356,6 +314,7 @@ export class MockL2BlockSource implements L2BlockSource, ContractDataSource {
           ),
           startBlock: checkpoint.blocks[0].number,
           blockCount: checkpoint.blocks.length,
+          feeAssetPriceModifier: checkpoint.feeAssetPriceModifier,
           attestations: [],
           l1: this.mockL1DataForCheckpoint(checkpoint),
         }),
@@ -363,23 +322,11 @@ export class MockL2BlockSource implements L2BlockSource, ContractDataSource {
     );
   }
 
-  getCheckpointedBlocksForEpoch(epochNumber: EpochNumber): Promise<CheckpointedL2Block[]> {
-    const checkpoints = this.getCheckpointsInEpoch(epochNumber);
-    return Promise.resolve(
-      checkpoints.flatMap(checkpoint => checkpoint.blocks.map(block => this.toCheckpointedBlock(block))),
-    );
-  }
-
   getBlocksForSlot(slotNumber: SlotNumber): Promise<L2Block[]> {
     const blocks = this.l2Blocks.filter(b => b.header.globalVariables.slotNumber === slotNumber);
     return Promise.resolve(blocks);
   }
 
-  async getCheckpointedBlockHeadersForEpoch(epochNumber: EpochNumber): Promise<BlockHeader[]> {
-    const checkpointedBlocks = await this.getCheckpointedBlocksForEpoch(epochNumber);
-    return checkpointedBlocks.map(b => b.block.header);
-  }
-
   /**
    * Gets a tx effect.
    * @param txHash - The hash of the tx corresponding to the tx effect.
@@ -442,34 +389,48 @@ export class MockL2BlockSource implements L2BlockSource, ContractDataSource {
     const checkpointedBlock = this.l2Blocks[checkpointed - 1];
     const proposedCheckpointBlock = this.l2Blocks[proposedCheckpoint - 1];
 
+    // For genesis tips (block number 0) report the dynamic initial header hash so consumers
+    // running L2BlockStream against this mock agree at block 0 with their local tip store.
+    const genesisHash = (await this.initialHeader.hash()).toString();
+    const tipHash = async (block: L2Block | undefined, number: number): Promise<string> => {
+      if (block) {
+        return (await block.hash()).toString();
+      }
+      return number === 0 ? genesisHash : '';
+    };
+
     const latestBlockId = {
       number: BlockNumber(latest),
-      hash: (await latestBlock?.hash())?.toString(),
+      hash: await tipHash(latestBlock, latest),
     };
     const provenBlockId = {
       number: BlockNumber(proven),
-      hash: (await provenBlock?.hash())?.toString(),
+      hash: await tipHash(provenBlock, proven),
     };
     const finalizedBlockId = {
       number: BlockNumber(finalized),
-      hash: (await finalizedBlock?.hash())?.toString(),
+      hash: await tipHash(finalizedBlock, finalized),
     };
     const checkpointedBlockId = {
       number: BlockNumber(checkpointed),
-      hash: (await checkpointedBlock?.hash())?.toString(),
+      hash: await tipHash(checkpointedBlock, checkpointed),
     };
     const proposedCheckpointBlockId = {
       number: BlockNumber(proposedCheckpoint),
-      hash: (await proposedCheckpointBlock?.hash())?.toString(),
+      hash: await tipHash(proposedCheckpointBlock, proposedCheckpoint),
     };
 
-    const makeTipId = (blockId: typeof latestBlockId) => ({
-      block: blockId,
-      checkpoint: {
-        number: this.findCheckpointNumberForBlock(blockId.number) ?? CheckpointNumber(0),
-        hash: blockId.hash,
-      },
-    });
+    const makeTipId = (blockId: typeof latestBlockId) => {
+      const checkpointNumber = this.findCheckpointNumberForBlock(blockId.number) ?? CheckpointNumber(0);
+      // Match production semantics: checkpoint 0 is fully synthetic (no real checkpoint header
+      // exists at 0), so its hash stays at the protocol constant `GENESIS_CHECKPOINT_HEADER_HASH`
+      // even though the block-0 hash is dynamic. See L2TipsCache for the production path.
+      const hash = checkpointNumber === 0 ? GENESIS_CHECKPOINT_HEADER_HASH.toString() : blockId.hash;
+      return {
+        block: blockId,
+        checkpoint: { number: checkpointNumber, hash },
+      };
+    };
 
     return {
       proposed: latestBlockId,
@@ -497,7 +458,7 @@ export class MockL2BlockSource implements L2BlockSource, ContractDataSource {
   }
 
   getGenesisValues(): Promise<{ genesisArchiveRoot: Fr }> {
-    return Promise.resolve({ genesisArchiveRoot: new Fr(GENESIS_ARCHIVE_ROOT) });
+    return Promise.resolve({ genesisArchiveRoot: this.genesisArchiveRoot ?? new Fr(GENESIS_ARCHIVE_ROOT) });
   }
 
   getL1Timestamp(): Promise<bigint> {
@@ -550,6 +511,95 @@ export class MockL2BlockSource implements L2BlockSource, ContractDataSource {
     return Promise.resolve();
   }
 
+  async getBlock(query: BlockQuery): Promise<L2Block | undefined> {
+    if ('number' in query) {
+      if (query.number === 0) {
+        return this.getGenesisBlock();
+      }
+      return this.l2Blocks[query.number - 1];
+    }
+    if ('hash' in query) {
+      const genesis = this.getGenesisBlock();
+      if ((await genesis.hash()).equals(query.hash)) {
+        return genesis;
+      }
+      for (const b of this.l2Blocks) {
+        const hash = await b.hash();
+        if (hash.equals(query.hash)) {
+          return b;
+        }
+      }
+      return undefined;
+    }
+    if ('archive' in query) {
+      const genesis = this.getGenesisBlock();
+      if (genesis.archive.root.equals(query.archive)) {
+        return genesis;
+      }
+      return this.l2Blocks.find(b => b.archive.root.equals(query.archive));
+    }
+    const number = this.resolveBlockTag(query.tag);
+    if (number === 0) {
+      return this.getGenesisBlock();
+    }
+    return this.l2Blocks[number - 1];
+  }
+
+  private resolveBlockTag(tag: BlockTag): number {
+    switch (tag) {
+      case 'latest':
+      case 'proposed':
+        return this.l2Blocks.length;
+      case 'checkpointed':
+        return this.checkpointedBlockNumber;
+      case 'proven':
+        return this.provenBlockNumber;
+      case 'finalized':
+        return this.finalizedBlockNumber;
+    }
+  }
+
+  getBlocks(query: BlocksQuery): Promise<L2Block[]> {
+    let blocks: L2Block[];
+    if ('from' in query) {
+      blocks = this.l2Blocks.slice(query.from - 1, query.from - 1 + query.limit);
+    } else {
+      const epochCheckpoints = this.getCheckpointsInEpoch(query.epoch);
+      blocks = epochCheckpoints.flatMap(c => c.blocks);
+    }
+    if (query.onlyCheckpointed) {
+      blocks = blocks.filter(b => b.header.globalVariables.blockNumber <= this.checkpointedBlockNumber);
+    }
+    return Promise.resolve(blocks);
+  }
+
+  async getBlockData(query: BlockQuery): Promise<BlockData | undefined> {
+    const block = await this.getBlock(query);
+    if (!block) {
+      return undefined;
+    }
+    return {
+      header: block.header,
+      archive: block.archive,
+      blockHash: await block.hash(),
+      checkpointNumber: block.checkpointNumber,
+      indexWithinCheckpoint: block.indexWithinCheckpoint,
+    };
+  }
+
+  async getBlocksData(query: BlocksQuery): Promise<BlockData[]> {
+    const blocks = await this.getBlocks(query);
+    return Promise.all(
+      blocks.map(async block => ({
+        header: block.header,
+        archive: block.archive,
+        blockHash: await block.hash(),
+        checkpointNumber: block.checkpointNumber,
+        indexWithinCheckpoint: block.indexWithinCheckpoint,
+      })),
+    );
+  }
+
   isPendingChainInvalid(): Promise<boolean> {
     return Promise.resolve(false);
   }
@@ -558,11 +608,11 @@ export class MockL2BlockSource implements L2BlockSource, ContractDataSource {
     return Promise.resolve({ valid: true });
   }
 
-  getProposedCheckpoint(): Promise<ProposedCheckpointData | undefined> {
+  getLastCheckpoint(): Promise<ProposedCheckpointData | undefined> {
     return Promise.resolve(undefined);
   }
 
-  getProposedCheckpointOnly(): Promise<ProposedCheckpointData | undefined> {
+  getLastProposedCheckpoint(): Promise<ProposedCheckpointData | undefined> {
     return Promise.resolve(undefined);
   }
 
@@ -578,22 +628,6 @@ export class MockL2BlockSource implements L2BlockSource, ContractDataSource {
     return new L1PublishedData(BigInt(checkpoint.number), BigInt(checkpoint.number), Buffer32.random().toString());
   }
 
-  /** Creates a CheckpointedL2Block from a block using stored checkpoint info. */
-  private toCheckpointedBlock(block: L2Block): CheckpointedL2Block {
-    const checkpoint = this.checkpointList.find(c => c.blocks.some(b => b.number === block.number));
-    const checkpointNumber = checkpoint?.number ?? block.checkpointNumber;
-    return new CheckpointedL2Block(
-      checkpointNumber,
-      block,
-      new L1PublishedData(
-        BigInt(block.number),
-        BigInt(block.number),
-        `0x${block.number.toString(16).padStart(64, '0')}`,
-      ),
-      [],
-    );
-  }
-
   /** Finds the checkpoint number for a block, or undefined if the block is not in any checkpoint. */
   private findCheckpointNumberForBlock(blockNumber: BlockNumber): CheckpointNumber | undefined {
     const checkpoint = this.checkpointList.find(c => c.blocks.some(b => b.number === blockNumber));
diff --git a/yarn-project/archiver/src/test/noop_l1_archiver.ts b/yarn-project/archiver/src/test/noop_l1_archiver.ts
index 3f70da3452d1..e4601b30fdfe 100644
--- a/yarn-project/archiver/src/test/noop_l1_archiver.ts
+++ b/yarn-project/archiver/src/test/noop_l1_archiver.ts
@@ -6,8 +6,9 @@ import { Buffer32 } from '@aztec/foundation/buffer';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import type { FunctionsOf } from '@aztec/foundation/types';
-import type { ArchiverEmitter } from '@aztec/stdlib/block';
+import type { ArchiverEmitter, BlockHash } from '@aztec/stdlib/block';
 import type { L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
+import type { BlockHeader } from '@aztec/stdlib/tx';
 import { type TelemetryClient, type Tracer, getTelemetryClient } from '@aztec/telemetry-client';
 
 import { mock } from 'jest-mock-extended';
@@ -16,7 +17,8 @@ import { EventEmitter } from 'node:events';
 import { Archiver } from '../archiver.js';
 import { ArchiverInstrumentation } from '../modules/instrumentation.js';
 import type { ArchiverL1Synchronizer } from '../modules/l1_synchronizer.js';
-import type { KVArchiverDataStore } from '../store/kv_archiver_store.js';
+import type { ArchiverDataStores } from '../store/data_stores.js';
+import { L2TipsCache } from '../store/l2_tips_cache.js';
 
 /** Noop L1 synchronizer for testing without L1 connectivity. */
 class NoopL1Synchronizer implements FunctionsOf<ArchiverL1Synchronizer> {
@@ -48,9 +50,12 @@ class NoopL1Synchronizer implements FunctionsOf<ArchiverL1Synchronizer> {
  */
 export class NoopL1Archiver extends Archiver {
   constructor(
-    dataStore: KVArchiverDataStore,
+    dataStores: ArchiverDataStores,
     l1Constants: L1RollupConstants & { genesisArchiveRoot: Fr },
     instrumentation: ArchiverInstrumentation,
+    initialHeader: BlockHeader,
+    initialBlockHash: BlockHash,
+    l2TipsCache: L2TipsCache,
   ) {
     // Create mocks for L1 clients
     const publicClient = mock<ViemPublicClient>();
@@ -76,7 +81,7 @@ export class NoopL1Archiver extends Archiver {
         governanceProposerAddress: EthAddress.ZERO,
         slashingProposerAddress: EthAddress.ZERO,
       },
-      dataStore,
+      dataStores,
       {
         pollingIntervalMs: 1000,
         batchSize: 100,
@@ -90,6 +95,9 @@ export class NoopL1Archiver extends Archiver {
       { ...l1Constants, l1StartBlockHash: Buffer32.random() },
       synchronizer as ArchiverL1Synchronizer,
       events,
+      initialHeader,
+      initialBlockHash,
+      l2TipsCache,
     );
   }
 
@@ -108,10 +116,17 @@ export class NoopL1Archiver extends Archiver {
 
 /** Creates an archiver with mocked L1 connectivity for testing. */
 export async function createNoopL1Archiver(
-  dataStore: KVArchiverDataStore,
+  dataStores: ArchiverDataStores,
   l1Constants: L1RollupConstants & { genesisArchiveRoot: Fr },
   telemetry: TelemetryClient = getTelemetryClient(),
+  initialHeader: BlockHeader,
 ): Promise<NoopL1Archiver> {
-  const instrumentation = await ArchiverInstrumentation.new(telemetry, () => dataStore.estimateSize());
-  return new NoopL1Archiver(dataStore, l1Constants, instrumentation);
+  const instrumentation = await ArchiverInstrumentation.new(telemetry, () => dataStores.db.estimateSize());
+  // Mirror the production factory: precompute the dynamic genesis block hash from the injected
+  // initial header so `L2TipsCache` reports the correct tip hash at block 0. Without this, the
+  // cache falls back to the static `GENESIS_BLOCK_HEADER_HASH`, which only matches deployments
+  // with default empty genesis.
+  const initialBlockHash = await initialHeader.hash();
+  const l2TipsCache = new L2TipsCache(dataStores.blocks, initialBlockHash);
+  return new NoopL1Archiver(dataStores, l1Constants, instrumentation, initialHeader, initialBlockHash, l2TipsCache);
 }
diff --git a/yarn-project/aztec-node/src/aztec-node/block_response_helpers.ts b/yarn-project/aztec-node/src/aztec-node/block_response_helpers.ts
new file mode 100644
index 000000000000..672c031329a0
--- /dev/null
+++ b/yarn-project/aztec-node/src/aztec-node/block_response_helpers.ts
@@ -0,0 +1,116 @@
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import { type BlockData, type CommitteeAttestation, L2Block } from '@aztec/stdlib/block';
+import type { CheckpointData, L1PublishedData, PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
+import {
+  type BlockIncludeOptions,
+  type BlockResponse,
+  type CheckpointIncludeOptions,
+  type CheckpointResponse,
+  l1PublishInfoFromL1PublishedData,
+} from '@aztec/stdlib/interfaces/client';
+
+/** Projects a full {@link L2Block} into a {@link BlockResponse}, attaching L1 / attestation context when provided. */
+export async function blockResponseFromL2Block(
+  block: L2Block,
+  options: BlockIncludeOptions,
+  context?: { l1?: L1PublishedData; attestations?: CommitteeAttestation[] },
+): Promise<BlockResponse> {
+  const response: BlockResponse = {
+    header: block.header,
+    archive: block.archive,
+    hash: await block.hash(),
+    checkpointNumber: block.checkpointNumber,
+    indexWithinCheckpoint: block.indexWithinCheckpoint,
+    number: block.number,
+  };
+  if (options.includeTransactions) {
+    (response as BlockResponse).body = block.body;
+  }
+  if (options.includeL1PublishInfo) {
+    (response as BlockResponse).l1 = l1PublishInfoFromL1PublishedData(context?.l1);
+  }
+  if (options.includeAttestations) {
+    (response as BlockResponse).attestations = context?.attestations ?? [];
+  }
+  return response;
+}
+
+/** Projects metadata-only {@link BlockData} into a {@link BlockResponse}. */
+export function blockResponseFromBlockData(
+  data: BlockData,
+  options: BlockIncludeOptions,
+  context?: { l1?: L1PublishedData; attestations?: CommitteeAttestation[] },
+): BlockResponse {
+  const response: BlockResponse = {
+    header: data.header,
+    archive: data.archive,
+    hash: data.blockHash,
+    checkpointNumber: data.checkpointNumber,
+    indexWithinCheckpoint: data.indexWithinCheckpoint,
+    number: data.header.getBlockNumber(),
+  };
+  if (options.includeL1PublishInfo) {
+    (response as BlockResponse).l1 = l1PublishInfoFromL1PublishedData(context?.l1);
+  }
+  if (options.includeAttestations) {
+    (response as BlockResponse).attestations = context?.attestations ?? [];
+  }
+  return response;
+}
+
+/** Projects a {@link PublishedCheckpoint} into a {@link CheckpointResponse}. */
+export async function checkpointResponseFromPublishedCheckpoint(
+  pc: PublishedCheckpoint,
+  options: CheckpointIncludeOptions,
+): Promise<CheckpointResponse> {
+  const response: CheckpointResponse = {
+    number: pc.checkpoint.number,
+    header: pc.checkpoint.header,
+    archive: pc.checkpoint.archive,
+    checkpointOutHash: pc.checkpoint.getCheckpointOutHash(),
+    startBlock: pc.checkpoint.blocks[0]?.number ?? BlockNumber.ZERO,
+    blockCount: pc.checkpoint.blocks.length,
+    feeAssetPriceModifier: pc.checkpoint.feeAssetPriceModifier,
+  };
+  if (options.includeBlocks) {
+    (response as CheckpointResponse).blocks = await Promise.all(
+      pc.checkpoint.blocks.map(block =>
+        blockResponseFromL2Block(block, {
+          includeTransactions: options.includeTransactions,
+          includeL1PublishInfo: false,
+          includeAttestations: false,
+        }),
+      ),
+    );
+  }
+  if (options.includeL1PublishInfo) {
+    (response as CheckpointResponse).l1 = l1PublishInfoFromL1PublishedData(pc.l1);
+  }
+  if (options.includeAttestations) {
+    (response as CheckpointResponse).attestations = pc.attestations;
+  }
+  return response;
+}
+
+/** Projects metadata-only {@link CheckpointData} into a {@link CheckpointResponse}. `includeBlocks` is ignored (no blocks loaded). */
+export function checkpointResponseFromCheckpointData(
+  cd: CheckpointData,
+  options: CheckpointIncludeOptions,
+): CheckpointResponse {
+  const response: CheckpointResponse = {
+    number: cd.checkpointNumber,
+    header: cd.header,
+    archive: cd.archive,
+    checkpointOutHash: cd.checkpointOutHash,
+    startBlock: cd.startBlock,
+    blockCount: cd.blockCount,
+    feeAssetPriceModifier: cd.feeAssetPriceModifier,
+  };
+  if (options.includeL1PublishInfo) {
+    (response as CheckpointResponse).l1 = l1PublishInfoFromL1PublishedData(cd.l1);
+  }
+  if (options.includeAttestations) {
+    (response as CheckpointResponse).attestations = cd.attestations;
+  }
+  return response;
+}
diff --git a/yarn-project/aztec-node/src/aztec-node/public_data_overrides.test.ts b/yarn-project/aztec-node/src/aztec-node/public_data_overrides.test.ts
new file mode 100644
index 000000000000..9944b2ccc033
--- /dev/null
+++ b/yarn-project/aztec-node/src/aztec-node/public_data_overrides.test.ts
@@ -0,0 +1,84 @@
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { PublicDataWrite } from '@aztec/stdlib/avm';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { computePublicDataTreeLeafSlot } from '@aztec/stdlib/hash';
+import type { MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server';
+import { MerkleTreeId } from '@aztec/stdlib/trees';
+
+import { type MockProxy, mock } from 'jest-mock-extended';
+
+import { applyPublicDataOverrides } from './public_data_overrides.js';
+
+describe('applyPublicDataOverrides', () => {
+  let fork: MockProxy<MerkleTreeWriteOperations>;
+
+  beforeEach(() => {
+    fork = mock<MerkleTreeWriteOperations>();
+    fork.sequentialInsert.mockResolvedValue({ lowLeavesWitnesses: [], insertionWitnesses: [] } as any);
+  });
+
+  it('does nothing when overrides is undefined', async () => {
+    await applyPublicDataOverrides(fork, undefined);
+    expect(fork.sequentialInsert).not.toHaveBeenCalled();
+  });
+
+  it('does nothing when overrides is empty', async () => {
+    await applyPublicDataOverrides(fork, []);
+    expect(fork.sequentialInsert).not.toHaveBeenCalled();
+  });
+
+  it('inserts a single override at the correct leaf slot', async () => {
+    const contract = await AztecAddress.random();
+    const slot = Fr.random();
+    const value = Fr.random();
+
+    await applyPublicDataOverrides(fork, [{ contract, slot, value }]);
+
+    const expectedLeafSlot = await computePublicDataTreeLeafSlot(contract, slot);
+    const expectedWrite = new PublicDataWrite(expectedLeafSlot, value);
+
+    expect(fork.sequentialInsert).toHaveBeenCalledTimes(1);
+    expect(fork.sequentialInsert).toHaveBeenCalledWith(MerkleTreeId.PUBLIC_DATA_TREE, [expectedWrite.toBuffer()]);
+  });
+
+  it('inserts multiple overrides in a single batch call', async () => {
+    const contract = await AztecAddress.random();
+    const overrides = [
+      { contract, slot: Fr.random(), value: Fr.random() },
+      { contract, slot: Fr.random(), value: Fr.random() },
+    ];
+
+    await applyPublicDataOverrides(fork, overrides);
+
+    const expectedWrites = await Promise.all(
+      overrides.map(async o => {
+        const leafSlot = await computePublicDataTreeLeafSlot(o.contract, o.slot);
+        return new PublicDataWrite(leafSlot, o.value);
+      }),
+    );
+
+    expect(fork.sequentialInsert).toHaveBeenCalledTimes(1);
+    expect(fork.sequentialInsert).toHaveBeenCalledWith(
+      MerkleTreeId.PUBLIC_DATA_TREE,
+      expectedWrites.map(w => w.toBuffer()),
+    );
+  });
+
+  it('passes duplicate (contract, slot) writes through — last write wins via tree semantics', async () => {
+    const contract = await AztecAddress.random();
+    const slot = Fr.random();
+    const firstValue = Fr.random();
+    const secondValue = Fr.random();
+
+    await applyPublicDataOverrides(fork, [
+      { contract, slot, value: firstValue },
+      { contract, slot, value: secondValue },
+    ]);
+
+    // Both writes are passed to sequentialInsert; the tree handles last-wins ordering.
+    expect(fork.sequentialInsert).toHaveBeenCalledTimes(1);
+    const [treeId, leaves] = fork.sequentialInsert.mock.calls[0] as [MerkleTreeId, Buffer[]];
+    expect(treeId).toBe(MerkleTreeId.PUBLIC_DATA_TREE);
+    expect(leaves).toHaveLength(2);
+  });
+});
diff --git a/yarn-project/aztec-node/src/aztec-node/public_data_overrides.ts b/yarn-project/aztec-node/src/aztec-node/public_data_overrides.ts
new file mode 100644
index 000000000000..b72bc4df0695
--- /dev/null
+++ b/yarn-project/aztec-node/src/aztec-node/public_data_overrides.ts
@@ -0,0 +1,35 @@
+import { PublicDataWrite } from '@aztec/stdlib/avm';
+import { computePublicDataTreeLeafSlot } from '@aztec/stdlib/hash';
+import type { PublicStorageOverride } from '@aztec/stdlib/interfaces/client';
+import type { MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server';
+import { MerkleTreeId } from '@aztec/stdlib/trees';
+
+/**
+ * Injects public-state overrides into an (ephemeral) world-state fork before simulation.
+ *
+ * Each override is written via the same `sequentialInsert` path the public processor
+ * uses during real transaction execution, so low-leaf updates and root coherence are
+ * handled identically for both simulation and proof generation.
+ *
+ * Writes never reach committed world state — the fork is thrown away after simulation.
+ */
+export async function applyPublicDataOverrides(
+  fork: MerkleTreeWriteOperations,
+  publicStorage: PublicStorageOverride[] | undefined,
+): Promise<void> {
+  if (!publicStorage?.length) {
+    return;
+  }
+
+  const writes = await Promise.all(
+    publicStorage.map(async o => {
+      const leafSlot = await computePublicDataTreeLeafSlot(o.contract, o.slot);
+      return new PublicDataWrite(leafSlot, o.value);
+    }),
+  );
+
+  await fork.sequentialInsert(
+    MerkleTreeId.PUBLIC_DATA_TREE,
+    writes.map(w => w.toBuffer()),
+  );
+}
diff --git a/yarn-project/aztec-node/src/aztec-node/server.test.ts b/yarn-project/aztec-node/src/aztec-node/server.test.ts
index b2ce9c7db13e..855139bf8569 100644
--- a/yarn-project/aztec-node/src/aztec-node/server.test.ts
+++ b/yarn-project/aztec-node/src/aztec-node/server.test.ts
@@ -1,7 +1,13 @@
 import { TestCircuitVerifier } from '@aztec/bb-prover';
 import { EpochCache } from '@aztec/epoch-cache';
 import type { RollupContract } from '@aztec/ethereum/contracts';
-import { BlockNumber, CheckpointNumber, EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
+import {
+  BlockNumber,
+  CheckpointNumber,
+  EpochNumber,
+  IndexWithinCheckpoint,
+  SlotNumber,
+} from '@aztec/foundation/branded-types';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { BadRequestError } from '@aztec/foundation/json-rpc';
@@ -16,8 +22,14 @@ import { computeFeePayerBalanceLeafSlot } from '@aztec/protocol-contracts/fee-ju
 import type { GlobalVariableBuilder, Sequencer, SequencerClient } from '@aztec/sequencer-client';
 import type { SlasherClientInterface } from '@aztec/slasher';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { BlockHash, type BlockParameter, CheckpointedL2Block, L2Block, type L2BlockSource } from '@aztec/stdlib/block';
-import { L1PublishedData } from '@aztec/stdlib/checkpoint';
+import {
+  type BlockData,
+  BlockHash,
+  type BlockParameter,
+  type BlockQuery,
+  L2Block,
+  type L2BlockSource,
+} from '@aztec/stdlib/block';
 import type { ContractDataSource } from '@aztec/stdlib/contract';
 import { EmptyL1RollupConstants } from '@aztec/stdlib/epoch-helpers';
 import { GasFees } from '@aztec/stdlib/gas';
@@ -43,11 +55,10 @@ import { getPackageVersion } from '@aztec/stdlib/update-checker';
 import type { ValidatorClient } from '@aztec/validator-client';
 
 import { jest } from '@jest/globals';
-import { mkdtempSync, readFileSync, rmSync, writeFileSync } from 'fs';
+import { mkdtempSync, rmSync, writeFileSync } from 'fs';
 import { type MockProxy, mock } from 'jest-mock-extended';
 import { tmpdir } from 'os';
-import { dirname, join, resolve } from 'path';
-import { fileURLToPath } from 'url';
+import { join } from 'path';
 import { generatePrivateKey, privateKeyToAccount } from 'viem/accounts';
 
 import { type AztecNodeConfig, getConfigEnvVars } from './config.js';
@@ -148,8 +159,17 @@ describe('aztec node', () => {
     worldState.syncImmediate.mockImplementation(() => Promise.resolve(lastBlockNumber));
 
     l2BlockSource = mock<L2BlockSource>();
-    l2BlockSource.getBlockNumber.mockImplementation(() => Promise.resolve(lastBlockNumber));
+    l2BlockSource.getBlockNumber.mockImplementation(((query?: BlockQuery) => {
+      if (!query) {
+        return Promise.resolve(lastBlockNumber);
+      }
+      if ('number' in query) {
+        return Promise.resolve(query.number);
+      }
+      return Promise.resolve(undefined);
+    }) as L2BlockSource['getBlockNumber']);
     l2BlockSource.getL1Constants.mockResolvedValue(EmptyL1RollupConstants);
+    l2BlockSource.getGenesisBlockHash.mockReturnValue(BlockHash.random());
 
     const l2LogsSource = mock<L2LogsSource>();
 
@@ -202,7 +222,7 @@ describe('aztec node', () => {
       globalVariablesBuilder,
       feeProvider,
       epochCache,
-      getPackageVersion() ?? '',
+      getPackageVersion(),
       new TestCircuitVerifier(),
       new TestCircuitVerifier(),
     );
@@ -331,13 +351,8 @@ describe('aztec node', () => {
 
     describe('node info', () => {
       it('returns the correct node version', async () => {
-        const releasePleaseVersionFile = readFileSync(
-          resolve(dirname(fileURLToPath(import.meta.url)), '../../../../.release-please-manifest.json'),
-        ).toString();
-        const releasePleaseVersion = JSON.parse(releasePleaseVersionFile)['.'];
-
         const nodeInfo = await node.getNodeInfo();
-        expect(nodeInfo.nodeVersion).toBe(releasePleaseVersion);
+        expect(nodeInfo.nodeVersion).toBe(getPackageVersion());
       });
     });
 
@@ -355,62 +370,78 @@ describe('aztec node', () => {
         });
         header2 = BlockHeader.empty({ globalVariables: GlobalVariables.empty({ blockNumber: BlockNumber(2) }) });
 
-        merkleTreeOps.getInitialHeader.mockReturnValue(initialHeader);
+        // Archiver returns the genesis block data for block 0 queries (including {tag:'proposed'} at genesis).
+        l2BlockSource.getBlockData.mockResolvedValue({ header: initialHeader } as any);
         l2BlockSource.getBlockNumber.mockResolvedValue(BlockNumber(2));
       });
 
       it('returns requested block number', async () => {
-        l2BlockSource.getBlockHeader.mockResolvedValue(header1);
+        l2BlockSource.getBlockData.mockResolvedValue({ header: header1 } as any);
         expect(await node.getBlockHeader(BlockNumber(1))).toEqual(header1);
       });
 
       it('returns latest', async () => {
-        l2BlockSource.getBlockHeader.mockResolvedValue(header2);
+        l2BlockSource.getBlockData.mockResolvedValue({ header: header2 } as any);
         expect(await node.getBlockHeader('latest')).toEqual(header2);
       });
 
       it('returns initial header on zero', async () => {
+        // Archiver returns synthetic genesis block data when queried with block 0.
         expect(await node.getBlockHeader(BlockNumber.ZERO)).toEqual(initialHeader);
       });
 
       it('returns initial header if no blocks mined', async () => {
+        // When no blocks have been mined, {tag:'proposed'} resolves to the genesis block.
         l2BlockSource.getBlockNumber.mockResolvedValue(BlockNumber.ZERO);
         expect(await node.getBlockHeader('latest')).toEqual(initialHeader);
       });
 
       it('returns undefined for non-existent block', async () => {
-        l2BlockSource.getBlockHeader.mockResolvedValue(undefined);
+        l2BlockSource.getBlockData.mockResolvedValue(undefined);
         expect(await node.getBlockHeader(BlockNumber(3))).toEqual(undefined);
       });
     });
 
     describe('getBlock', () => {
-      let block1: L2Block;
-      let block2: L2Block;
+      let blockData1: BlockData;
+      let blockData2: BlockData;
 
       beforeEach(() => {
-        block1 = L2Block.empty();
-        block2 = L2Block.empty();
+        blockData1 = {
+          header: BlockHeader.empty({ globalVariables: GlobalVariables.empty({ blockNumber: BlockNumber(1) }) }),
+          archive: L2Block.empty().archive,
+          blockHash: BlockHash.random(),
+          checkpointNumber: CheckpointNumber(1),
+          indexWithinCheckpoint: IndexWithinCheckpoint(0),
+        };
+        blockData2 = {
+          header: BlockHeader.empty({ globalVariables: GlobalVariables.empty({ blockNumber: BlockNumber(2) }) }),
+          archive: L2Block.empty().archive,
+          blockHash: BlockHash.random(),
+          checkpointNumber: CheckpointNumber(1),
+          indexWithinCheckpoint: IndexWithinCheckpoint(1),
+        };
 
         l2BlockSource.getBlockNumber.mockResolvedValue(BlockNumber(2));
       });
 
       it('returns requested block number', async () => {
-        l2BlockSource.getL2Block.mockResolvedValue(block1);
-        expect(await node.getBlock(BlockNumber(1))).toEqual(block1);
-        expect(l2BlockSource.getL2Block).toHaveBeenCalledWith(BlockNumber(1));
+        l2BlockSource.getBlockData.mockResolvedValue(blockData1);
+        const result = await node.getBlock(BlockNumber(1));
+        expect(result?.header).toEqual(blockData1.header);
+        expect(result?.number).toEqual(BlockNumber(1));
       });
 
       it('returns latest block', async () => {
-        l2BlockSource.getL2Block.mockResolvedValue(block2);
-        expect(await node.getBlock('latest')).toEqual(block2);
-        expect(l2BlockSource.getL2Block).toHaveBeenCalledWith(2);
+        l2BlockSource.getBlockData.mockResolvedValue(blockData2);
+        const result = await node.getBlock('latest');
+        expect(result?.header).toEqual(blockData2.header);
+        expect(result?.number).toEqual(BlockNumber(2));
       });
 
       it('returns undefined for non-existent block', async () => {
-        l2BlockSource.getL2Block.mockResolvedValue(undefined);
+        l2BlockSource.getBlockData.mockResolvedValue(undefined);
         expect(await node.getBlock(BlockNumber(3))).toEqual(undefined);
-        expect(l2BlockSource.getL2Block).toHaveBeenCalledWith(3);
       });
     });
 
@@ -569,11 +600,24 @@ describe('aztec node', () => {
       let snapshotMerkleTreeOps: MockProxy<MerkleTreeReadOperations>;
       let initialHeader: BlockHeader;
 
-      beforeEach(() => {
+      beforeEach(async () => {
         lastBlockNumber = BlockNumber(5);
         initialHeader = BlockHeader.empty({
           globalVariables: GlobalVariables.empty({ blockNumber: BlockNumber.ZERO }),
         });
+        // Archiver resolves the initial block hash to block number 0 directly.
+        const initialBlockHash = await initialHeader.hash();
+        l2BlockSource.getBlockNumber.mockImplementation(((query?: BlockQuery) =>
+          Promise.resolve(
+            !query
+              ? lastBlockNumber
+              : 'number' in query
+                ? query.number
+                : 'hash' in query && query.hash.equals(initialBlockHash)
+                  ? BlockNumber.ZERO
+                  : undefined,
+          )) as L2BlockSource['getBlockNumber']);
+        // #getInitialHeaderHash still sources from worldStateSynchronizer (used in error messages).
         merkleTreeOps.getInitialHeader.mockReturnValue(initialHeader);
         snapshotMerkleTreeOps = mock<MerkleTreeReadOperations>();
         worldState.getSnapshot.mockReturnValue(snapshotMerkleTreeOps);
@@ -597,20 +641,20 @@ describe('aztec node', () => {
 
       it('throws for a block hash whose block number is beyond sync range', async () => {
         const blockHash = BlockHash.random();
-        const header = BlockHeader.empty({
-          globalVariables: GlobalVariables.empty({ blockNumber: BlockNumber(10) }),
-        });
-        l2BlockSource.getBlockHeaderByHash.mockResolvedValue(header);
+        l2BlockSource.getBlockNumber.mockImplementation(((query?: BlockQuery) =>
+          Promise.resolve(
+            query && 'hash' in query ? BlockNumber(10) : lastBlockNumber,
+          )) as L2BlockSource['getBlockNumber']);
 
         await expect(node.getWorldState(blockHash)).rejects.toThrow(/not yet synced/);
       });
 
       it('resolves block hash to block number via archiver and returns snapshot', async () => {
         const blockHash = BlockHash.random();
-        const header = BlockHeader.empty({
-          globalVariables: GlobalVariables.empty({ blockNumber: BlockNumber(3) }),
-        });
-        l2BlockSource.getBlockHeaderByHash.mockResolvedValue(header);
+        l2BlockSource.getBlockNumber.mockImplementation(((query?: BlockQuery) =>
+          Promise.resolve(
+            query && 'hash' in query ? BlockNumber(3) : lastBlockNumber,
+          )) as L2BlockSource['getBlockNumber']);
         snapshotMerkleTreeOps.getLeafValue.mockResolvedValue(blockHash);
 
         const result = await node.getWorldState(blockHash);
@@ -620,7 +664,6 @@ describe('aztec node', () => {
 
       it('throws when block hash is not found in archiver', async () => {
         const blockHash = BlockHash.random();
-        l2BlockSource.getBlockHeaderByHash.mockResolvedValue(undefined);
 
         await expect(node.getWorldState(blockHash)).rejects.toThrow(/not found when querying world state/);
       });
@@ -628,10 +671,10 @@ describe('aztec node', () => {
       it('throws when world-state block hash does not match requested hash (reorg)', async () => {
         const blockHash = BlockHash.random();
         const differentHash = BlockHash.random();
-        const header = BlockHeader.empty({
-          globalVariables: GlobalVariables.empty({ blockNumber: BlockNumber(3) }),
-        });
-        l2BlockSource.getBlockHeaderByHash.mockResolvedValue(header);
+        l2BlockSource.getBlockNumber.mockImplementation(((query?: BlockQuery) =>
+          Promise.resolve(
+            query && 'hash' in query ? BlockNumber(3) : lastBlockNumber,
+          )) as L2BlockSource['getBlockNumber']);
         // World state returns a different hash for the same block number
         snapshotMerkleTreeOps.getLeafValue.mockResolvedValue(differentHash);
 
@@ -653,23 +696,16 @@ describe('aztec node', () => {
     });
 
     describe('getBlockHashMembershipWitness', () => {
-      let initialHeader: BlockHeader;
-
-      beforeEach(() => {
-        lastBlockNumber = BlockNumber(5);
-        initialHeader = BlockHeader.empty({
+      it('returns undefined when reference block is the initial block hash', async () => {
+        // Block 0 has an empty archive — no block hashes exist in it yet.
+        // getBlockHashMembershipWitness short-circuits at block 0 and returns undefined.
+        const initialHeader = BlockHeader.empty({
           globalVariables: GlobalVariables.empty({ blockNumber: BlockNumber.ZERO }),
         });
-        merkleTreeOps.getInitialHeader.mockReturnValue(initialHeader);
-      });
-
-      it('returns undefined when reference block is the initial block hash', async () => {
-        // The initial block (block 0) has an empty archive — no block hashes exist in it.
-        // getBlockHashMembershipWitness computes referenceBlockNumber - 1, which would be 0 - 1 = -1.
-        // This should return undefined (empty archive has no witnesses) rather than crashing.
         const initialBlockHash = await initialHeader.hash();
-        const someBlockHash = BlockHash.random();
+        l2BlockSource.getBlockNumber.mockResolvedValue(BlockNumber.ZERO);
 
+        const someBlockHash = BlockHash.random();
         const result = await node.getBlockHashMembershipWitness(initialBlockHash, someBlockHash);
         expect(result).toBeUndefined();
       });
@@ -749,7 +785,7 @@ describe('aztec node', () => {
           globalVariablesBuilder,
           feeProvider,
           epochCache,
-          getPackageVersion() ?? '',
+          getPackageVersion(),
           new TestCircuitVerifier(),
           new TestCircuitVerifier(),
           undefined,
@@ -940,7 +976,7 @@ describe('aztec node', () => {
           globalVariablesBuilder,
           feeProvider,
           epochCache,
-          getPackageVersion() ?? '',
+          getPackageVersion(),
           new TestCircuitVerifier(),
           new TestCircuitVerifier(),
           undefined,
@@ -1012,7 +1048,7 @@ describe('aztec node', () => {
         globalVariablesBuilder,
         mock<FeeProvider>(),
         epochCache,
-        getPackageVersion() ?? '',
+        getPackageVersion(),
         new TestCircuitVerifier(),
         new TestCircuitVerifier(),
       );
@@ -1035,7 +1071,7 @@ describe('aztec node', () => {
   });
 
   describe('getL2ToL1Messages', () => {
-    const makeCheckpointedBlock = (slotNumber: number, l2ToL1MsgsByTx: Fr[][]): CheckpointedL2Block => {
+    const makeBlock = (slotNumber: number, l2ToL1MsgsByTx: Fr[][]): L2Block => {
       const block = L2Block.empty(
         BlockHeader.empty({
           globalVariables: GlobalVariables.empty({ slotNumber: SlotNumber(slotNumber) }),
@@ -1043,7 +1079,7 @@ describe('aztec node', () => {
       );
       // Override the body's txEffects with our custom l2ToL1Msgs
       unfreeze(block.body).txEffects = l2ToL1MsgsByTx.map(msgs => ({ l2ToL1Msgs: msgs }) as TxEffect);
-      return new CheckpointedL2Block(CheckpointNumber(0), block, new L1PublishedData(0n, 0n, '0x0'), []);
+      return block;
     };
 
     it('groups blocks by slot number into checkpoints', async () => {
@@ -1052,13 +1088,9 @@ describe('aztec node', () => {
       const msg3 = Fr.random();
 
       // Two blocks in slot 1, one block in slot 2
-      const blocks = [
-        makeCheckpointedBlock(1, [[msg1]]),
-        makeCheckpointedBlock(1, [[msg2]]),
-        makeCheckpointedBlock(2, [[msg3]]),
-      ];
+      const blocks = [makeBlock(1, [[msg1]]), makeBlock(1, [[msg2]]), makeBlock(2, [[msg3]])];
 
-      l2BlockSource.getCheckpointedBlocksForEpoch.mockResolvedValue(blocks);
+      l2BlockSource.getBlocks.mockResolvedValue(blocks);
 
       const result = await node.getL2ToL1Messages(EpochNumber(0));
 
@@ -1072,9 +1104,9 @@ describe('aztec node', () => {
       const msg2 = Fr.random();
 
       // Block in slot 0, block in slot 1
-      const blocks = [makeCheckpointedBlock(0, [[msg1]]), makeCheckpointedBlock(1, [[msg2]])];
+      const blocks = [makeBlock(0, [[msg1]]), makeBlock(1, [[msg2]])];
 
-      l2BlockSource.getCheckpointedBlocksForEpoch.mockResolvedValue(blocks);
+      l2BlockSource.getBlocks.mockResolvedValue(blocks);
 
       const result = await node.getL2ToL1Messages(EpochNumber(0));
 
diff --git a/yarn-project/aztec-node/src/aztec-node/server.ts b/yarn-project/aztec-node/src/aztec-node/server.ts
index 82dec2d5f7f3..a396db829f3d 100644
--- a/yarn-project/aztec-node/src/aztec-node/server.ts
+++ b/yarn-project/aztec-node/src/aztec-node/server.ts
@@ -50,14 +50,16 @@ import {
 import { CollectionLimitsConfig, PublicSimulatorConfig } from '@aztec/stdlib/avm';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import {
-  type BlockData,
   BlockHash,
   type BlockParameter,
+  BlockTag,
+  type CommitteeAttestation,
   type DataInBlock,
-  L2Block,
   type L2BlockSource,
+  type NormalizedBlockParameter,
+  inspectBlockParameter,
 } from '@aztec/stdlib/block';
-import type { PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
+import { L1PublishedData } from '@aztec/stdlib/checkpoint';
 import type {
   ContractClassPublic,
   ContractDataSource,
@@ -67,15 +69,22 @@ import type {
 } from '@aztec/stdlib/contract';
 import { GasFees, type ManaUsageEstimate } from '@aztec/stdlib/gas';
 import { computePublicDataTreeLeafSlot } from '@aztec/stdlib/hash';
-import {
-  type AztecNode,
-  type AztecNodeAdmin,
-  type AztecNodeAdminConfig,
-  AztecNodeAdminConfigSchema,
-  type AztecNodeDebug,
-  type GetContractClassLogsResponse,
-  type GetPublicLogsResponse,
+import type {
+  AztecNode,
+  AztecNodeAdmin,
+  AztecNodeAdminConfig,
+  AztecNodeDebug,
+  BlockIncludeOptions,
+  BlockResponse,
+  ChainTip,
+  ChainTips,
+  CheckpointIncludeOptions,
+  CheckpointParameter,
+  CheckpointResponse,
+  GetContractClassLogsResponse,
+  GetPublicLogsResponse,
 } from '@aztec/stdlib/interfaces/client';
+import { AztecNodeAdminConfigSchema } from '@aztec/stdlib/interfaces/client';
 import {
   type AllowedElement,
   type ClientProtocolCircuitVerifier,
@@ -97,6 +106,7 @@ import {
   type GlobalVariableBuilder as GlobalVariableBuilderInterface,
   type IndexedTxEffect,
   PublicSimulationOutput,
+  type SimulationOverrides,
   Tx,
   type TxHash,
   TxReceipt,
@@ -123,22 +133,27 @@ import {
   createValidatorClient,
 } from '@aztec/validator-client';
 import type { SlashingProtectionDatabase } from '@aztec/validator-ha-signer/types';
-import { createWorldStateSynchronizer } from '@aztec/world-state';
+import { createWorldState, createWorldStateSynchronizer } from '@aztec/world-state';
 
 import { createPublicClient } from 'viem';
 
 import { createSentinel } from '../sentinel/factory.js';
 import { Sentinel } from '../sentinel/sentinel.js';
+import {
+  blockResponseFromBlockData,
+  blockResponseFromL2Block,
+  checkpointResponseFromCheckpointData,
+  checkpointResponseFromPublishedCheckpoint,
+} from './block_response_helpers.js';
 import { type AztecNodeConfig, createKeyStoreForValidator } from './config.js';
 import { NodeMetrics } from './node_metrics.js';
+import { applyPublicDataOverrides } from './public_data_overrides.js';
 
 /**
  * The aztec node.
  */
 export class AztecNodeService implements AztecNode, AztecNodeAdmin, AztecNodeDebug, Traceable {
   private metrics: NodeMetrics;
-  private initialHeaderHashPromise: Promise<BlockHash> | undefined = undefined;
-
   // Prevent two snapshot operations to happen simultaneously
   private isUploadingSnapshot = false;
 
@@ -197,10 +212,245 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, AztecNodeDeb
     return status.syncSummary;
   }
 
+  public async getChainTips(): Promise<ChainTips> {
+    const { proposed, checkpointed, proven, finalized } = await this.blockSource.getL2Tips();
+    return { proposed, checkpointed, proven, finalized };
+  }
+
   public getL2Tips() {
     return this.blockSource.getL2Tips();
   }
 
+  public async getBlockHeader(number: BlockNumber | 'latest'): Promise<BlockHeader | undefined> {
+    if (number === 'latest') {
+      return (await this.blockSource.getBlockData({ tag: 'proposed' }))?.header;
+    }
+    return (await this.blockSource.getBlockData({ number }))?.header;
+  }
+
+  public async getCheckpointedBlocks(from: BlockNumber, limit: number): Promise<BlockResponse[]> {
+    const blocks = await this.blockSource.getBlocks({ from, limit, onlyCheckpointed: true });
+    const ctxByCheckpoint = await this.#getCheckpointContextsForBlocks(blocks);
+    return Promise.all(
+      blocks.map(block =>
+        blockResponseFromL2Block(
+          block,
+          { includeTransactions: true, includeL1PublishInfo: true, includeAttestations: true },
+          ctxByCheckpoint.get(block.checkpointNumber),
+        ),
+      ),
+    );
+  }
+
+  public getCheckpointsDataForEpoch(epoch: EpochNumber) {
+    return this.blockSource.getCheckpointsDataForEpoch(epoch);
+  }
+
+  public getBlockNumber(tip?: ChainTip): Promise<BlockNumber> {
+    switch (tip) {
+      case undefined:
+      case 'proposed':
+        return this.blockSource.getBlockNumber();
+      case 'checkpointed':
+        return this.blockSource.getCheckpointedL2BlockNumber();
+      case 'proven':
+        return this.blockSource.getProvenBlockNumber();
+      case 'finalized':
+        return this.blockSource.getFinalizedL2BlockNumber();
+    }
+  }
+
+  public async getCheckpointNumber(tip?: ChainTip): Promise<CheckpointNumber> {
+    switch (tip) {
+      case undefined:
+      case 'proposed':
+      case 'checkpointed':
+        return await this.blockSource.getCheckpointNumber();
+      case 'proven':
+      case 'finalized': {
+        const tips = await this.blockSource.getL2Tips();
+        return tip === 'proven' ? tips.proven.checkpoint.number : tips.finalized.checkpoint.number;
+      }
+    }
+  }
+
+  private isChainTip(value: unknown): value is ChainTip {
+    return value === 'proposed' || value === 'checkpointed' || value === 'proven' || value === 'finalized';
+  }
+
+  /**
+   * Normalizes a {@link BlockParameter} (which may be a bare value) into a
+   * {@link NormalizedBlockParameter} object form. Performs no chain-tip resolution — tag
+   * lookups are deferred to the underlying block source.
+   */
+  private normalizeBlockParameter(param: BlockParameter): NormalizedBlockParameter {
+    if (BlockHash.isBlockHash(param)) {
+      return { hash: param };
+    }
+    if (typeof param === 'number') {
+      return { number: param as BlockNumber };
+    }
+    if (typeof param === 'string') {
+      if (this.isBlockTag(param)) {
+        return { tag: param === 'latest' ? 'proposed' : param };
+      }
+      throw new BadRequestError(`Invalid BlockParameter tag: ${param}`);
+    }
+    if (typeof param === 'object' && param !== null) {
+      if ('number' in param) {
+        return { number: param.number };
+      }
+      if ('hash' in param) {
+        return { hash: param.hash };
+      }
+      if ('archive' in param) {
+        return { archive: param.archive };
+      }
+      if ('tag' in param) {
+        if (this.isBlockTag(param.tag)) {
+          return { tag: param.tag };
+        }
+        throw new BadRequestError(`Invalid BlockParameter tag: ${param.tag}`);
+      }
+    }
+    throw new BadRequestError(`Invalid BlockParameter: ${JSON.stringify(param)}`);
+  }
+
+  private isBlockTag(value: string): value is BlockTag {
+    return BlockTag.includes(value as BlockTag);
+  }
+
+  private async resolveCheckpointParameter(
+    param: CheckpointParameter,
+  ): Promise<{ number?: CheckpointNumber; slot?: SlotNumber }> {
+    if (typeof param === 'number') {
+      return { number: param as CheckpointNumber };
+    }
+    if (param === 'latest') {
+      return { number: await this.blockSource.getCheckpointNumber() };
+    }
+    if (this.isChainTip(param)) {
+      return { number: await this.getCheckpointNumber(param) };
+    }
+    if (typeof param === 'object' && param !== null) {
+      if ('number' in param) {
+        return { number: param.number };
+      }
+      if ('slot' in param) {
+        return { slot: param.slot };
+      }
+    }
+    throw new BadRequestError(`Invalid CheckpointParameter: ${JSON.stringify(param)}`);
+  }
+
+  /** Fetches checkpoint-level L1 and attestation data for use as block response context. */
+  async #getCheckpointContext(
+    checkpointNumber: CheckpointNumber,
+  ): Promise<{ l1?: L1PublishedData; attestations?: CommitteeAttestation[] } | undefined> {
+    const checkpoint = await this.blockSource.getCheckpointData(checkpointNumber);
+    if (!checkpoint) {
+      return undefined;
+    }
+    return { l1: checkpoint.l1, attestations: checkpoint.attestations };
+  }
+
+  public async getBlock<Opts extends BlockIncludeOptions = {}>(
+    param: BlockParameter,
+    options: Opts = {} as Opts,
+  ): Promise<BlockResponse<Opts> | undefined> {
+    const query = this.normalizeBlockParameter(param);
+    const wantTxs = !!options.includeTransactions;
+    const wantContext = !!options.includeL1PublishInfo || !!options.includeAttestations;
+
+    if (wantTxs) {
+      const block = await this.blockSource.getBlock(query);
+      if (!block) {
+        return undefined;
+      }
+      const ctx = wantContext ? await this.#getCheckpointContext(block.checkpointNumber) : undefined;
+      return (await blockResponseFromL2Block(block, options, ctx)) as BlockResponse<Opts>;
+    }
+    const data = await this.blockSource.getBlockData(query);
+    if (!data) {
+      return undefined;
+    }
+    const ctx = wantContext ? await this.#getCheckpointContext(data.checkpointNumber) : undefined;
+    return blockResponseFromBlockData(data, options, ctx) as BlockResponse<Opts>;
+  }
+
+  public async getBlocks<Opts extends BlockIncludeOptions = {}>(
+    from: BlockNumber,
+    limit: number,
+    options: Opts = {} as Opts,
+  ): Promise<BlockResponse<Opts>[]> {
+    const wantTxs = !!options.includeTransactions;
+    const wantContext = !!options.includeL1PublishInfo || !!options.includeAttestations;
+    if (wantTxs) {
+      const blocks = await this.blockSource.getBlocks({ from, limit });
+      const ctxByCheckpoint = await this.#getCheckpointContextsForBlocks(wantContext ? blocks : []);
+      return (await Promise.all(
+        blocks.map(block => blockResponseFromL2Block(block, options, ctxByCheckpoint.get(block.checkpointNumber))),
+      )) as BlockResponse<Opts>[];
+    }
+    const dataItems = await this.blockSource.getBlocksData({ from, limit });
+    const ctxByCheckpoint = await this.#getCheckpointContextsForBlocks(wantContext ? dataItems : []);
+    return (await Promise.all(
+      dataItems.map(data => blockResponseFromBlockData(data, options, ctxByCheckpoint.get(data.checkpointNumber))),
+    )) as BlockResponse<Opts>[];
+  }
+
+  /** Fetches checkpoint context for a set of blocks, deduplicating shared checkpoints. */
+  async #getCheckpointContextsForBlocks(
+    blocks: { checkpointNumber: CheckpointNumber }[],
+    // TODO(palla): CheckpointNumber should be accepted by this lint rule
+    // eslint-disable-next-line aztec-custom/no-non-primitive-in-collections
+  ): Promise<Map<CheckpointNumber, { l1?: L1PublishedData; attestations?: CommitteeAttestation[] } | undefined>> {
+    const unique = Array.from(new Set(blocks.map(b => b.checkpointNumber)));
+    const entries = await Promise.all(unique.map(async n => [n, await this.#getCheckpointContext(n)] as const));
+    return new Map(entries);
+  }
+
+  public async getCheckpoint<Opts extends CheckpointIncludeOptions = {}>(
+    param: CheckpointParameter,
+    options: Opts = {} as Opts,
+  ): Promise<CheckpointResponse<Opts> | undefined> {
+    const resolved = await this.resolveCheckpointParameter(param);
+    let checkpointNumber = resolved.number;
+    if (checkpointNumber === undefined && resolved.slot !== undefined) {
+      checkpointNumber = await this.blockSource.getCheckpointNumberBySlot(resolved.slot);
+    }
+    if (checkpointNumber === undefined) {
+      return undefined;
+    }
+    if (options.includeBlocks) {
+      const [checkpoint] = await this.blockSource.getCheckpoints(checkpointNumber, 1);
+      if (!checkpoint) {
+        return undefined;
+      }
+      return (await checkpointResponseFromPublishedCheckpoint(checkpoint, options)) as CheckpointResponse<Opts>;
+    }
+    const data = await this.blockSource.getCheckpointData(checkpointNumber);
+    if (!data) {
+      return undefined;
+    }
+    return checkpointResponseFromCheckpointData(data, options) as CheckpointResponse<Opts>;
+  }
+
+  public async getCheckpoints<Opts extends CheckpointIncludeOptions = {}>(
+    from: CheckpointNumber,
+    limit: number,
+    options: Opts = {} as Opts,
+  ): Promise<CheckpointResponse<Opts>[]> {
+    if (options.includeBlocks) {
+      const checkpoints = await this.blockSource.getCheckpoints(from, limit);
+      return (await Promise.all(
+        checkpoints.map(cp => checkpointResponseFromPublishedCheckpoint(cp, options)),
+      )) as CheckpointResponse<Opts>[];
+    }
+    const datas = await this.blockSource.getCheckpointDataRange(from, limit);
+    return datas.map(d => checkpointResponseFromCheckpointData(d, options)) as CheckpointResponse<Opts>[];
+  }
+
   /**
    * initializes the Aztec Node, wait for component to sync.
    * @param config - The configuration to be used by the aztec node.
@@ -225,7 +475,7 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, AztecNodeDeb
   ): Promise<AztecNodeService> {
     const config = { ...inputConfig }; // Copy the config so we dont mutate the input object
     const log = deps.logger ?? createLogger('node');
-    const packageVersion = getPackageVersion() ?? '';
+    const packageVersion = getPackageVersion();
     const telemetry = deps.telemetry ?? getTelemetryClient();
     const dateProvider = deps.dateProvider ?? new DateProvider();
     const ethereumChain = createEthereumChain(config.l1RpcUrls, config.l1ChainId);
@@ -317,15 +567,21 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, AztecNodeDeb
     // Track started resources so we can clean up on partial failure during node creation.
     const started: { stop?(): Promise<void> | void }[] = [];
     try {
+      // Create world-state first so we can retrieve the initial header before constructing the archiver.
+      const nativeWs = await createWorldState(config, options.genesis);
+      const initialHeader = nativeWs.getInitialHeader();
+      const initialBlockHash = await initialHeader.hash();
       const archiver = await createArchiver(
         config,
         { blobClient, epochCache, telemetry, dateProvider },
         { blockUntilSync: !config.skipArchiverInitialSync },
+        initialHeader,
+        initialBlockHash,
       );
       started.push(archiver);
 
-      // now create the merkle trees and the world state synchronizer
-      const worldStateSynchronizer = await createWorldStateSynchronizer(config, archiver, options.genesis, telemetry);
+      // The synchronizer takes ownership of the native world-state from here
+      const worldStateSynchronizer = await createWorldStateSynchronizer(config, archiver, nativeWs, telemetry);
       started.push(worldStateSynchronizer);
       const useRealVerifiers = config.realProofs || config.debugForceTxProofVerification;
       let peerProofVerifier: ClientProtocolCircuitVerifier;
@@ -380,6 +636,7 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, AztecNodeDeb
         dateProvider,
         telemetry,
         deps.p2pClientDeps,
+        initialBlockHash,
       );
       started.push(p2pClient);
 
@@ -736,71 +993,6 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, AztecNodeDeb
     return nodeInfo;
   }
 
-  /**
-   * Get a block specified by its block number, block hash, or 'latest'.
-   * @param block - The block parameter (block number, block hash, or 'latest').
-   * @returns The requested block.
-   */
-  public async getBlock(block: BlockParameter): Promise<L2Block | undefined> {
-    if (BlockHash.isBlockHash(block)) {
-      return this.getBlockByHash(block);
-    }
-    const blockNumber = block === 'latest' ? await this.getBlockNumber() : (block as BlockNumber);
-    if (blockNumber === BlockNumber.ZERO) {
-      return this.buildInitialBlock();
-    }
-    return await this.blockSource.getL2Block(blockNumber);
-  }
-
-  /**
-   * Get a block specified by its hash.
-   * @param blockHash - The block hash being requested.
-   * @returns The requested block.
-   */
-  public async getBlockByHash(blockHash: BlockHash): Promise<L2Block | undefined> {
-    const initialBlockHash = await this.#getInitialHeaderHash();
-    if (blockHash.equals(initialBlockHash)) {
-      return this.buildInitialBlock();
-    }
-    return await this.blockSource.getL2BlockByHash(blockHash);
-  }
-
-  private buildInitialBlock(): L2Block {
-    const initialHeader = this.worldStateSynchronizer.getCommitted().getInitialHeader();
-    return L2Block.empty(initialHeader);
-  }
-
-  /**
-   * Get a block specified by its archive root.
-   * @param archive - The archive root being requested.
-   * @returns The requested block.
-   */
-  public async getBlockByArchive(archive: Fr): Promise<L2Block | undefined> {
-    return await this.blockSource.getL2BlockByArchive(archive);
-  }
-
-  /**
-   * Method to request blocks. Will attempt to return all requested blocks but will return only those available.
-   * @param from - The start of the range of blocks to return.
-   * @param limit - The maximum number of blocks to obtain.
-   * @returns The blocks requested.
-   */
-  public async getBlocks(from: BlockNumber, limit: number): Promise<L2Block[]> {
-    return (await this.blockSource.getBlocks(from, BlockNumber(limit))) ?? [];
-  }
-
-  public async getCheckpoints(from: CheckpointNumber, limit: number): Promise<PublishedCheckpoint[]> {
-    return (await this.blockSource.getCheckpoints(from, limit)) ?? [];
-  }
-
-  public async getCheckpointedBlocks(from: BlockNumber, limit: number) {
-    return (await this.blockSource.getCheckpointedBlocks(from, limit)) ?? [];
-  }
-
-  public getCheckpointsDataForEpoch(epochNumber: EpochNumber) {
-    return this.blockSource.getCheckpointsDataForEpoch(epochNumber);
-  }
-
   public async getCurrentMinFees(): Promise<GasFees> {
     return await this.feeProvider.getCurrentMinFees();
   }
@@ -818,26 +1010,6 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, AztecNodeDeb
     return GasFees.from({ feePerDaGas: 0n, feePerL2Gas: 0n });
   }
 
-  /**
-   * Method to fetch the latest block number synchronized by the node.
-   * @returns The block number.
-   */
-  public async getBlockNumber(): Promise<BlockNumber> {
-    return await this.blockSource.getBlockNumber();
-  }
-
-  public async getProvenBlockNumber(): Promise<BlockNumber> {
-    return await this.blockSource.getProvenBlockNumber();
-  }
-
-  public async getCheckpointedBlockNumber(): Promise<BlockNumber> {
-    return await this.blockSource.getCheckpointedL2BlockNumber();
-  }
-
-  public getCheckpointNumber(): Promise<CheckpointNumber> {
-    return this.blockSource.getCheckpointNumber();
-  }
-
   /**
    * Method to fetch the version of the package.
    * @returns The node package version
@@ -877,18 +1049,13 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, AztecNodeDeb
   ): Promise<TxScopedL2Log[][]> {
     let upToBlockNumber: BlockNumber | undefined;
     if (referenceBlock) {
-      const initialBlockHash = await this.#getInitialHeaderHash();
-      if (referenceBlock.equals(initialBlockHash)) {
-        upToBlockNumber = BlockNumber(0);
-      } else {
-        const header = await this.blockSource.getBlockHeaderByHash(referenceBlock);
-        if (!header) {
-          throw new Error(
-            `Block ${referenceBlock.toString()} not found in the node. This might indicate a reorg has occurred.`,
-          );
-        }
-        upToBlockNumber = header.globalVariables.blockNumber;
+      const data = await this.blockSource.getBlockData({ hash: referenceBlock });
+      if (!data) {
+        throw new Error(
+          `Block ${referenceBlock.toString()} not found in the node. This might indicate a reorg has occurred.`,
+        );
       }
+      upToBlockNumber = data.header.globalVariables.blockNumber;
     }
     return this.logsSource.getPrivateLogsByTags(tags, page, upToBlockNumber);
   }
@@ -901,18 +1068,13 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, AztecNodeDeb
   ): Promise<TxScopedL2Log[][]> {
     let upToBlockNumber: BlockNumber | undefined;
     if (referenceBlock) {
-      const initialBlockHash = await this.#getInitialHeaderHash();
-      if (referenceBlock.equals(initialBlockHash)) {
-        upToBlockNumber = BlockNumber(0);
-      } else {
-        const header = await this.blockSource.getBlockHeaderByHash(referenceBlock);
-        if (!header) {
-          throw new Error(
-            `Block ${referenceBlock.toString()} not found in the node. This might indicate a reorg has occurred.`,
-          );
-        }
-        upToBlockNumber = header.globalVariables.blockNumber;
+      const data = await this.blockSource.getBlockData({ hash: referenceBlock });
+      if (!data) {
+        throw new Error(
+          `Block ${referenceBlock.toString()} not found in the node. This might indicate a reorg has occurred.`,
+        );
       }
+      upToBlockNumber = data.header.globalVariables.blockNumber;
     }
     return this.logsSource.getPublicLogsByTagsFromContract(contractAddress, tags, page, upToBlockNumber);
   }
@@ -955,7 +1117,13 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, AztecNodeDeb
       throw new Error(`Invalid tx: ${reason}`);
     }
 
-    await this.p2pClient!.sendTx(tx);
+    try {
+      await this.p2pClient!.sendTx(tx);
+    } catch (err) {
+      this.metrics.receivedTx(timer.ms(), false);
+      this.log.warn(`Mempool rejected tx ${txHash}: ${(err as Error).message}`, { txHash });
+      throw err;
+    }
     const duration = timer.ms();
     this.metrics.receivedTx(duration, true);
     this.log.info(`Received tx ${txHash} in ${duration}ms`, { txHash });
@@ -1194,13 +1362,10 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, AztecNodeDeb
    * @returns The L2 to L1 messages (empty array if the epoch is not found).
    */
   public async getL2ToL1Messages(epoch: EpochNumber): Promise<Fr[][][][]> {
-    // Assumes `getCheckpointedBlocksForEpoch` returns blocks in ascending order of block number.
-    const checkpointedBlocks = await this.blockSource.getCheckpointedBlocksForEpoch(epoch);
-    const blocksInCheckpoints = chunkBy(checkpointedBlocks, cb => cb.block.header.globalVariables.slotNumber).map(
-      group => group.map(cb => cb.block),
-    );
-    return blocksInCheckpoints.map(blocks =>
-      blocks.map(block => block.body.txEffects.map(txEffect => txEffect.l2ToL1Msgs)),
+    const blocks = await this.blockSource.getBlocks({ epoch, onlyCheckpointed: true });
+    const blocksInCheckpoints = chunkBy(blocks, block => block.header.globalVariables.slotNumber);
+    return blocksInCheckpoints.map(slotBlocks =>
+      slotBlocks.map(block => block.body.txEffects.map(txEffect => txEffect.l2ToL1Msgs)),
     );
   }
 
@@ -1274,49 +1439,20 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, AztecNodeDeb
     return preimage.leaf.value;
   }
 
-  public async getBlockHeader(block: BlockParameter = 'latest'): Promise<BlockHeader | undefined> {
-    if (BlockHash.isBlockHash(block)) {
-      const initialBlockHash = await this.#getInitialHeaderHash();
-      if (block.equals(initialBlockHash)) {
-        // Block source doesn't handle initial header so we need to handle the case separately.
-        return this.worldStateSynchronizer.getCommitted().getInitialHeader();
-      }
-      return this.blockSource.getBlockHeaderByHash(block);
-    } else {
-      // Block source doesn't handle initial header so we need to handle the case separately.
-      const blockNumber = block === 'latest' ? await this.getBlockNumber() : (block as BlockNumber);
-      if (blockNumber === BlockNumber.ZERO) {
-        return this.worldStateSynchronizer.getCommitted().getInitialHeader();
-      }
-      return this.blockSource.getBlockHeader(block);
-    }
-  }
-
-  /**
-   * Get a block header specified by its archive root.
-   * @param archive - The archive root being requested.
-   * @returns The requested block header.
-   */
-  public async getBlockHeaderByArchive(archive: Fr): Promise<BlockHeader | undefined> {
-    return await this.blockSource.getBlockHeaderByArchive(archive);
-  }
-
-  public getBlockData(number: BlockNumber): Promise<BlockData | undefined> {
-    return this.blockSource.getBlockData(number);
-  }
-
-  public getBlockDataByArchive(archive: Fr): Promise<BlockData | undefined> {
-    return this.blockSource.getBlockDataByArchive(archive);
-  }
-
   /**
    * Simulates the public part of a transaction with the current state.
    * @param tx - The transaction to simulate.
+   * @param skipFeeEnforcement - If true, fee enforcement is skipped.
+   * @param overrides - Optional pre-simulation overrides applied to the ephemeral fork and contract DB.
    **/
   @trackSpan('AztecNodeService.simulatePublicCalls', (tx: Tx) => ({
     [Attributes.TX_HASH]: tx.getTxHash().toString(),
   }))
-  public async simulatePublicCalls(tx: Tx, skipFeeEnforcement = false): Promise<PublicSimulationOutput> {
+  public async simulatePublicCalls(
+    tx: Tx,
+    skipFeeEnforcement = false,
+    overrides?: SimulationOverrides,
+  ): Promise<PublicSimulationOutput> {
     // Check total gas limit for simulation
     const gasSettings = tx.data.constants.txContext.gasSettings;
     const txGasLimit = gasSettings.gasLimits.l2Gas;
@@ -1361,6 +1497,7 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, AztecNodeDeb
     await this.worldStateSynchronizer.syncImmediate(latestBlockNumber);
     const merkleTreeFork = await this.worldStateSynchronizer.fork();
     try {
+      await applyPublicDataOverrides(merkleTreeFork, overrides?.publicStorage);
       const config = PublicSimulatorConfig.from({
         skipFeeEnforcement,
         collectDebugLogs: true,
@@ -1718,13 +1855,6 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, AztecNodeDeb
     }
   }
 
-  #getInitialHeaderHash(): Promise<BlockHash> {
-    if (!this.initialHeaderHashPromise) {
-      this.initialHeaderHashPromise = this.worldStateSynchronizer.getCommitted().getInitialHeader().hash();
-    }
-    return this.initialHeaderHashPromise;
-  }
-
   /**
    * Returns an instance of MerkleTreeOperations having first ensured the world state is fully synched
    * @param block - The block parameter (block number, block hash, or 'latest') at which to get the data.
@@ -1739,48 +1869,35 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, AztecNodeDeb
       this.log.error(`Error getting world state: ${err}`);
     }
 
-    if (block === 'latest') {
-      this.log.debug(`Using committed db for block 'latest', world state synced upto ${blockSyncedTo}`);
+    const query = this.normalizeBlockParameter(block);
+    if ('tag' in query && query.tag === 'proposed') {
+      this.log.debug(`Using committed db for latest block, world state synced upto ${blockSyncedTo}`);
       return this.worldStateSynchronizer.getCommitted();
     }
 
-    // Get the block number, either directly from the parameter or by quering the archiver with the block hash
-    let blockNumber: BlockNumber;
-    if (BlockHash.isBlockHash(block)) {
-      const initialBlockHash = await this.#getInitialHeaderHash();
-      if (block.equals(initialBlockHash)) {
-        // Block 0 is a first-class historical block: its state lives in the trees' persisted
-        // block-0 payload. Resolving the genesis hash to block number 0 lets the snapshot path
-        // pin reads to genesis state even after the node has advanced past it.
-        blockNumber = BlockNumber.ZERO;
-      } else {
-        const header = await this.blockSource.getBlockHeaderByHash(block);
-        if (!header) {
-          throw new Error(
-            `Block hash ${block.toString()} not found when querying world state. If the node API has been queried with anchor block hash possibly a reorg has occurred.`,
-          );
-        }
-        blockNumber = header.getBlockNumber();
-      }
-    } else {
-      blockNumber = block as BlockNumber;
-    }
+    const blockNumber = await this.resolveBlockNumber(block);
 
     // Check it's within world state sync range
     if (blockNumber > blockSyncedTo) {
-      throw new Error(`Queried block ${block} not yet synced by the node (node is synced upto ${blockSyncedTo}).`);
+      throw new Error(
+        `Queried block ${inspectBlockParameter(block)} not yet synced by the node (node is synced upto ${blockSyncedTo}).`,
+      );
     }
     this.log.debug(`Using snapshot for block ${blockNumber}, world state synced upto ${blockSyncedTo}`);
 
     const snapshot = this.worldStateSynchronizer.getSnapshot(blockNumber);
 
-    // Double-check world-state synced to the same block hash as was requested
-    if (BlockHash.isBlockHash(block)) {
+    // Double-check world-state synced to the same block hash as was requested.
+    // Block 0 is skipped: the snapshot returned by `getSnapshot(0)` is the *pre*-genesis archive
+    // (size 0), so leaf 0 is not yet inserted from that snapshot's view even though block 0's hash
+    // does live at archive index 0 in the committed tree. The genesis hash is already validated by
+    // the archiver when it resolves the hash query to block number 0.
+    const requestedHash = 'hash' in query ? query.hash : undefined;
+    if (requestedHash !== undefined && blockNumber !== BlockNumber.ZERO) {
       const blockHash = await snapshot.getLeafValue(MerkleTreeId.ARCHIVE, BigInt(blockNumber));
-      if (!blockHash || !block.equals(blockHash)) {
-        const initialBlockHash = await this.#getInitialHeaderHash();
+      if (!blockHash || !requestedHash.equals(blockHash)) {
         throw new Error(
-          `Block hash ${block.toString()} not found in world state at block number ${blockNumber} (world state has ${blockHash?.toString() ?? 'no hash'} at that index, genesis header hash is ${initialBlockHash.toString()}). If the node API has been queried with anchor block hash possibly a reorg has occurred.`,
+          `Block hash ${requestedHash.toString()} not found in world state at block number ${blockNumber} (world state has ${blockHash?.toString() ?? 'no hash'} at that index, genesis header hash is ${this.blockSource.getGenesisBlockHash().toString()}). If the node API has been queried with anchor block hash possibly a reorg has occurred.`,
         );
       }
     }
@@ -1788,23 +1905,22 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, AztecNodeDeb
     return snapshot;
   }
 
-  /** Resolves a block parameter to a block number. */
+  /** Resolves any {@link BlockParameter} variant to a concrete block number. */
   protected async resolveBlockNumber(block: BlockParameter): Promise<BlockNumber> {
-    if (block === 'latest') {
-      return BlockNumber(await this.blockSource.getBlockNumber());
-    }
-    if (BlockHash.isBlockHash(block)) {
-      const initialBlockHash = await this.#getInitialHeaderHash();
-      if (block.equals(initialBlockHash)) {
-        return BlockNumber.ZERO;
+    const query = this.normalizeBlockParameter(block);
+    const blockNumber = await this.blockSource.getBlockNumber(query);
+    if (blockNumber === undefined) {
+      if ('hash' in query) {
+        throw new Error(
+          `Block hash ${query.hash.toString()} not found when querying world state. If the node API has been queried with anchor block hash possibly a reorg has occurred.`,
+        );
       }
-      const header = await this.blockSource.getBlockHeaderByHash(block);
-      if (!header) {
-        throw new Error(`Block hash ${block.toString()} not found.`);
+      if ('archive' in query) {
+        throw new Error(`Block with archive ${query.archive.toString()} not found.`);
       }
-      return header.getBlockNumber();
+      throw new Error(`Block not found for ${inspectBlockParameter(block)}.`);
     }
-    return block as BlockNumber;
+    return blockNumber;
   }
 
   /**
diff --git a/yarn-project/aztec-node/src/sentinel/factory.ts b/yarn-project/aztec-node/src/sentinel/factory.ts
index 251b9086a627..1bec08b6a22e 100644
--- a/yarn-project/aztec-node/src/sentinel/factory.ts
+++ b/yarn-project/aztec-node/src/sentinel/factory.ts
@@ -3,6 +3,7 @@ import { createLogger } from '@aztec/foundation/log';
 import { createStore } from '@aztec/kv-store/lmdb-v2';
 import type { P2PClient } from '@aztec/p2p';
 import type { L2BlockSource } from '@aztec/stdlib/block';
+import type { ChainConfig } from '@aztec/stdlib/config';
 import type { SlasherConfig } from '@aztec/stdlib/interfaces/server';
 import type { DataStoreConfig } from '@aztec/stdlib/kv-store';
 
@@ -14,7 +15,7 @@ export async function createSentinel(
   epochCache: EpochCache,
   archiver: L2BlockSource,
   p2p: P2PClient,
-  config: SentinelConfig & DataStoreConfig & SlasherConfig,
+  config: SentinelConfig & DataStoreConfig & SlasherConfig & Pick<ChainConfig, 'l1ChainId' | 'l1Contracts'>,
   logger = createLogger('node:sentinel'),
 ): Promise<Sentinel | undefined> {
   if (!config.sentinelEnabled) {
diff --git a/yarn-project/aztec-node/src/sentinel/sentinel.test.ts b/yarn-project/aztec-node/src/sentinel/sentinel.test.ts
index b7cbd09e118c..1d745c9d4582 100644
--- a/yarn-project/aztec-node/src/sentinel/sentinel.test.ts
+++ b/yarn-project/aztec-node/src/sentinel/sentinel.test.ts
@@ -6,9 +6,9 @@ import { EthAddress } from '@aztec/foundation/eth-address';
 import { AztecLMDBStoreV2, openTmpStore } from '@aztec/kv-store/lmdb-v2';
 import type { P2PClient } from '@aztec/p2p';
 import { OffenseType, WANT_TO_SLASH_EVENT, type WantToSlashArgs } from '@aztec/slasher';
-import type { SlasherConfig } from '@aztec/slasher/config';
 import {
   CommitteeAttestation,
+  GENESIS_BLOCK_HEADER_HASH,
   L2Block,
   type L2BlockSource,
   type L2BlockStream,
@@ -18,7 +18,11 @@ import {
 import { Checkpoint, L1PublishedData, PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
 import { type L1RollupConstants, getEpochAtSlot, getSlotRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
 import type { CheckpointAttestation } from '@aztec/stdlib/p2p';
-import { makeCheckpointAttestation, makeCheckpointAttestationFromCheckpoint } from '@aztec/stdlib/testing';
+import {
+  TEST_COORDINATION_SIGNATURE_CONTEXT,
+  makeCheckpointAttestation,
+  makeCheckpointAttestationFromCheckpoint,
+} from '@aztec/stdlib/testing';
 import type {
   ValidatorStats,
   ValidatorStatusHistory,
@@ -29,7 +33,7 @@ import type {
 import { jest } from '@jest/globals';
 import { type MockProxy, mock } from 'jest-mock-extended';
 
-import { Sentinel } from './sentinel.js';
+import { Sentinel, type SentinelRuntimeConfig } from './sentinel.js';
 import { SentinelStore } from './store.js';
 
 describe('sentinel', () => {
@@ -47,18 +51,18 @@ describe('sentinel', () => {
   let epoch: EpochNumber;
   let ts: bigint;
   let l1Constants: L1RollupConstants;
-  const config: Pick<
-    SlasherConfig,
-    'slashInactivityTargetPercentage' | 'slashInactivityPenalty' | 'slashInactivityConsecutiveEpochThreshold'
-  > = {
+  const config: SentinelRuntimeConfig = {
     slashInactivityPenalty: 100n,
     slashInactivityTargetPercentage: 0.8,
     slashInactivityConsecutiveEpochThreshold: 1,
+    l1ChainId: TEST_COORDINATION_SIGNATURE_CONTEXT.chainId,
+    l1Contracts: { rollupAddress: TEST_COORDINATION_SIGNATURE_CONTEXT.rollupAddress },
   };
 
   beforeEach(async () => {
     epochCache = mock<EpochCache>();
     archiver = mock<L2BlockSource>();
+    archiver.getGenesisBlockHash.mockReturnValue(GENESIS_BLOCK_HEADER_HASH);
     p2p = mock<P2PClient>();
     blockStream = mock<L2BlockStream>();
 
@@ -168,7 +172,7 @@ describe('sentinel', () => {
       publishedCheckpoint = await emitCheckpointEvent(checkpoint, checkpointAttestations);
 
       const attestorsFromCheckpoint = compactArray(
-        getAttestationInfoFromPublishedCheckpoint(publishedCheckpoint).map(info =>
+        getAttestationInfoFromPublishedCheckpoint(publishedCheckpoint, TEST_COORDINATION_SIGNATURE_CONTEXT).map(info =>
           info.status === 'recovered-from-signature' || info.status === 'provided-as-address'
             ? info.address
             : undefined,
@@ -213,7 +217,10 @@ describe('sentinel', () => {
       // Verify that getAttestationInfoFromPublishedCheckpoint returns 4 entries total:
       // - 2 with status 'recovered-from-signature' (actual attestations with valid signatures)
       // - 2 with status 'provided-as-address' (placeholders for missing validators)
-      const attestationInfo = getAttestationInfoFromPublishedCheckpoint(publishedCheckpoint);
+      const attestationInfo = getAttestationInfoFromPublishedCheckpoint(
+        publishedCheckpoint,
+        TEST_COORDINATION_SIGNATURE_CONTEXT,
+      );
       expect(attestationInfo).toHaveLength(4);
       const recoveredSignatures = attestationInfo.filter(info => info.status === 'recovered-from-signature');
       const placeholders = attestationInfo.filter(info => info.status === 'provided-as-address');
@@ -602,7 +609,7 @@ describe('sentinel', () => {
       epochCache.getTargetSlot.mockReturnValue(slot);
       epochCache.getEpochNow.mockReturnValue(epochNumber);
       epochCache.getTargetEpoch.mockReturnValue(epochNumber);
-      archiver.getBlockHeader.calledWith(blockNumber).mockResolvedValue(mockBlock.header);
+      archiver.getBlockData.mockResolvedValue({ header: mockBlock.header } as any);
       archiver.getL1Constants.mockResolvedValue(l1Constants);
       epochCache.getL1Constants.mockReturnValue(l1Constants);
 
@@ -724,7 +731,7 @@ describe('sentinel', () => {
       const epochNumber = getEpochAtSlot(blockSlot, l1Constants);
       const validator1 = EthAddress.random();
 
-      archiver.getBlockHeader.calledWith(blockNumber).mockResolvedValue(mockBlock.header);
+      archiver.getBlockData.mockResolvedValue({ header: mockBlock.header } as any);
 
       epochCache.getCommittee.mockResolvedValue({
         committee: [validator1],
@@ -946,10 +953,7 @@ class TestSentinel extends Sentinel {
     archiver: L2BlockSource,
     p2p: P2PClient,
     store: SentinelStore,
-    config: Pick<
-      SlasherConfig,
-      'slashInactivityTargetPercentage' | 'slashInactivityPenalty' | 'slashInactivityConsecutiveEpochThreshold'
-    >,
+    config: SentinelRuntimeConfig,
     protected override blockStream: L2BlockStream,
   ) {
     super(epochCache, archiver, p2p, store, config);
diff --git a/yarn-project/aztec-node/src/sentinel/sentinel.ts b/yarn-project/aztec-node/src/sentinel/sentinel.ts
index be273b028d4f..611a67cb36bf 100644
--- a/yarn-project/aztec-node/src/sentinel/sentinel.ts
+++ b/yarn-project/aztec-node/src/sentinel/sentinel.ts
@@ -1,5 +1,11 @@
 import type { EpochCache } from '@aztec/epoch-cache';
-import { BlockNumber, CheckpointNumber, EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
+import {
+  BlockNumber,
+  CheckpointNumber,
+  CheckpointProposalHash,
+  EpochNumber,
+  SlotNumber,
+} from '@aztec/foundation/branded-types';
 import { countWhile, filterAsync, fromEntries, getEntries, mapValues } from '@aztec/foundation/collection';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { createLogger } from '@aztec/foundation/log';
@@ -21,7 +27,9 @@ import {
   type L2BlockStreamEventHandler,
   getAttestationInfoFromPublishedCheckpoint,
 } from '@aztec/stdlib/block';
+import type { ChainConfig } from '@aztec/stdlib/config';
 import { getEpochAtSlot, getSlotRangeForEpoch, getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
+import { ConsensusPayload, type CoordinationSignatureContext } from '@aztec/stdlib/p2p';
 import type {
   SingleValidatorStats,
   ValidatorStats,
@@ -36,6 +44,12 @@ import EventEmitter from 'node:events';
 
 import { SentinelStore } from './store.js';
 
+export type SentinelRuntimeConfig = Pick<
+  SlasherConfig,
+  'slashInactivityTargetPercentage' | 'slashInactivityPenalty' | 'slashInactivityConsecutiveEpochThreshold'
+> &
+  Pick<ChainConfig, 'l1ChainId' | 'l1Contracts'>;
+
 /** Maps a validator status to its category: proposer or attestation. */
 function statusToCategory(status: ValidatorStatusInSlot): ValidatorStatusType {
   switch (status) {
@@ -54,10 +68,15 @@ export class Sentinel extends (EventEmitter as new () => WatcherEmitter) impleme
 
   protected initialSlot: SlotNumber | undefined;
   protected lastProcessedSlot: SlotNumber | undefined;
-  // eslint-disable-next-line aztec-custom/no-non-primitive-in-collections
   protected slotNumberToCheckpoint: Map<
     SlotNumber,
-    { checkpointNumber: CheckpointNumber; archive: string; attestors: EthAddress[] }
+    {
+      checkpointNumber: CheckpointNumber;
+      archive: string;
+      /** Hex keccak256 of the consensus payload bytes; used to fetch matching p2p attestations. */
+      proposalPayloadHash: CheckpointProposalHash;
+      attestors: EthAddress[];
+    }
   > = new Map();
 
   constructor(
@@ -65,18 +84,22 @@ export class Sentinel extends (EventEmitter as new () => WatcherEmitter) impleme
     protected archiver: L2BlockSource,
     protected p2p: P2PClient,
     protected store: SentinelStore,
-    protected config: Pick<
-      SlasherConfig,
-      'slashInactivityTargetPercentage' | 'slashInactivityPenalty' | 'slashInactivityConsecutiveEpochThreshold'
-    >,
+    protected config: SentinelRuntimeConfig,
     protected logger = createLogger('node:sentinel'),
   ) {
     super();
-    this.l2TipsStore = new L2TipsMemoryStore();
+    this.l2TipsStore = new L2TipsMemoryStore(archiver.getGenesisBlockHash());
     const interval = (epochCache.getL1Constants().ethereumSlotDuration * 1000) / 4;
     this.runningPromise = new RunningPromise(this.work.bind(this), logger, interval);
   }
 
+  private getSignatureContext(): CoordinationSignatureContext {
+    return {
+      chainId: this.config.l1ChainId,
+      rollupAddress: this.config.l1Contracts.rollupAddress,
+    };
+  }
+
   public updateConfig(config: Partial<SlasherConfig>) {
     this.config = { ...this.config, ...config };
   }
@@ -113,11 +136,17 @@ export class Sentinel extends (EventEmitter as new () => WatcherEmitter) impleme
     }
     const checkpoint = event.checkpoint;
 
-    // Store mapping from slot to archive, checkpoint number, and attestors
+    // Store mapping from slot to archive, checkpoint number, attestors, and the consensus payload
+    // hash (used to query matching p2p attestations regardless of feeAssetPriceModifier variants).
+    const signatureContext = this.getSignatureContext();
+    const proposalPayloadHash = CheckpointProposalHash.fromBuffer(
+      ConsensusPayload.fromCheckpoint(checkpoint.checkpoint, signatureContext).getPayloadHash(),
+    );
     this.slotNumberToCheckpoint.set(checkpoint.checkpoint.header.slotNumber, {
       checkpointNumber: checkpoint.checkpoint.number,
       archive: checkpoint.checkpoint.archive.root.toString(),
-      attestors: getAttestationInfoFromPublishedCheckpoint(checkpoint)
+      proposalPayloadHash,
+      attestors: getAttestationInfoFromPublishedCheckpoint(checkpoint, signatureContext)
         .filter(a => a.status === 'recovered-from-signature')
         .map(a => a.address!),
     });
@@ -139,7 +168,7 @@ export class Sentinel extends (EventEmitter as new () => WatcherEmitter) impleme
       return;
     }
     const blockNumber = event.block.number;
-    const header = await this.archiver.getBlockHeader(blockNumber);
+    const header = (await this.archiver.getBlockData({ number: blockNumber }))?.header;
     if (!header) {
       this.logger.error(`Failed to get block header ${blockNumber}`);
       return;
@@ -361,7 +390,7 @@ export class Sentinel extends (EventEmitter as new () => WatcherEmitter) impleme
     // We gather from both p2p (contains the ones seen on the p2p layer) and archiver
     // (contains the ones synced from mined checkpoints, which we may have missed from p2p).
     const checkpoint = this.slotNumberToCheckpoint.get(slot);
-    const p2pAttested = await this.p2p.getCheckpointAttestationsForSlot(slot, checkpoint?.archive);
+    const p2pAttested = await this.p2p.getCheckpointAttestationsForSlot(slot, checkpoint?.proposalPayloadHash);
     // Filter out attestations with invalid signatures
     const p2pAttestors = p2pAttested.map(a => a.getSender()).filter((s): s is EthAddress => s !== undefined);
     const attestors = new Set(
diff --git a/yarn-project/aztec.js/src/api/contract.ts b/yarn-project/aztec.js/src/api/contract.ts
index b8cd3953e84c..d351abf2b665 100644
--- a/yarn-project/aztec.js/src/api/contract.ts
+++ b/yarn-project/aztec.js/src/api/contract.ts
@@ -64,10 +64,10 @@ export { DefaultWaitOpts, type WaitOpts } from '../contract/wait_opts.js';
 export { ContractBase, type ContractMethod, type ContractStorageLayout } from '../contract/contract_base.js';
 export { BatchCall } from '../contract/batch_call.js';
 export {
+  type DeployInstantiationOptions,
   type DeployOptions,
   type DeployResultMined,
   type DeployReturn,
-  type DeployInteractionWaitOptions,
   DeployMethod,
   type RequestDeployOptions,
   type SimulateDeployOptions,
diff --git a/yarn-project/aztec.js/src/api/wallet.ts b/yarn-project/aztec.js/src/api/wallet.ts
index db844b6f32ff..62bbb6f01696 100644
--- a/yarn-project/aztec.js/src/api/wallet.ts
+++ b/yarn-project/aztec.js/src/api/wallet.ts
@@ -78,4 +78,7 @@ export { AccountManager } from '../wallet/account_manager.js';
 
 export { TxSimulationResultWithAppOffset } from '../wallet/tx_simulation_result_with_app_offset.js';
 
+export { type PublicStorageOverride, PublicStorageOverrideSchema } from '@aztec/stdlib/interfaces/client';
+export { SimulationOverrides } from '@aztec/stdlib/tx';
+
 export { type DeployAccountOptions, DeployAccountMethod } from '../wallet/deploy_account_method.js';
diff --git a/yarn-project/aztec.js/src/contract/contract.test.ts b/yarn-project/aztec.js/src/contract/contract.test.ts
index 408322e2a7cb..09ecad876a02 100644
--- a/yarn-project/aztec.js/src/contract/contract.test.ts
+++ b/yarn-project/aztec.js/src/contract/contract.test.ts
@@ -1,6 +1,4 @@
-import { MEGA_VK_LENGTH_IN_FIELDS } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/curves/bn254';
-import { type ContractArtifact, FunctionType } from '@aztec/stdlib/abi';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import {
   CompleteAddress,
@@ -13,6 +11,7 @@ import { OFFCHAIN_MESSAGE_IDENTIFIER } from '@aztec/stdlib/tx';
 import { type MockProxy, mock } from 'jest-mock-extended';
 
 import type { Account } from '../account/account.js';
+import { testContractArtifact } from '../test/fixtures.js';
 import type { TxSimulationResultWithAppOffset } from '../wallet/tx_simulation_result_with_app_offset.js';
 import type { Wallet } from '../wallet/wallet.js';
 import { Contract } from './contract.js';
@@ -36,166 +35,12 @@ describe('Contract Class', () => {
     anchorBlockTimestamp: 0n,
   } as any as UtilityExecutionResult;
 
-  const defaultArtifact: ContractArtifact = {
-    name: 'FooContract',
-    functions: [
-      {
-        name: 'bar',
-        isInitializer: false,
-        functionType: FunctionType.PRIVATE,
-        isOnlySelf: false,
-        isStatic: false,
-        debugSymbols: '',
-        parameters: [
-          {
-            name: 'value',
-            type: {
-              kind: 'field',
-            },
-            visibility: 'public',
-          },
-          {
-            name: 'value',
-            type: {
-              kind: 'field',
-            },
-            visibility: 'private',
-          },
-        ],
-        returnTypes: [],
-        errorTypes: {},
-        bytecode: Buffer.alloc(8, 0xfa),
-        verificationKey: Buffer.alloc(MEGA_VK_LENGTH_IN_FIELDS * Fr.SIZE_IN_BYTES).toString('base64'),
-      },
-      {
-        name: 'public_dispatch',
-        isInitializer: false,
-        isStatic: false,
-        functionType: FunctionType.PUBLIC,
-        isOnlySelf: false,
-        parameters: [
-          {
-            name: 'selector',
-            type: {
-              kind: 'field',
-            },
-            visibility: 'public',
-          },
-        ],
-        returnTypes: [],
-        errorTypes: {},
-        bytecode: Buffer.alloc(8, 0xfb),
-        debugSymbols: '',
-      },
-      {
-        name: 'qux',
-        isInitializer: false,
-        isStatic: false,
-        functionType: FunctionType.UTILITY,
-        isOnlySelf: false,
-        parameters: [
-          {
-            name: 'value',
-            type: {
-              kind: 'field',
-            },
-            visibility: 'public',
-          },
-        ],
-        returnTypes: [
-          {
-            kind: 'integer',
-            sign: 'unsigned',
-            width: 32,
-          },
-        ],
-        bytecode: Buffer.alloc(8, 0xfc),
-        debugSymbols: '',
-        errorTypes: {},
-      },
-      {
-        name: 'optionEcho',
-        isInitializer: false,
-        functionType: FunctionType.PRIVATE,
-        isOnlySelf: false,
-        isStatic: false,
-        parameters: [
-          {
-            name: 'value',
-            type: {
-              kind: 'struct',
-              path: 'std::option::Option',
-              fields: [
-                {
-                  name: '_is_some',
-                  type: {
-                    kind: 'boolean',
-                  },
-                },
-                {
-                  name: '_value',
-                  type: {
-                    kind: 'field',
-                  },
-                },
-              ],
-            },
-            visibility: 'private',
-          },
-        ],
-        returnTypes: [],
-        errorTypes: {},
-        bytecode: Buffer.alloc(8, 0xfd),
-        verificationKey: Buffer.alloc(MEGA_VK_LENGTH_IN_FIELDS * Fr.SIZE_IN_BYTES).toString('base64'),
-        debugSymbols: '',
-      },
-      {
-        name: 'mixedParams',
-        isInitializer: false,
-        functionType: FunctionType.PRIVATE,
-        isOnlySelf: false,
-        isStatic: false,
-        parameters: [
-          {
-            name: 'optValue',
-            type: {
-              kind: 'struct',
-              path: 'std::option::Option',
-              fields: [
-                { name: '_is_some', type: { kind: 'boolean' } },
-                { name: '_value', type: { kind: 'field' } },
-              ],
-            },
-            visibility: 'private',
-          },
-          {
-            name: 'aField',
-            type: { kind: 'field' },
-            visibility: 'private',
-          },
-        ],
-        returnTypes: [],
-        errorTypes: {},
-        bytecode: Buffer.alloc(8, 0xfe),
-        verificationKey: Buffer.alloc(MEGA_VK_LENGTH_IN_FIELDS * Fr.SIZE_IN_BYTES).toString('base64'),
-        debugSymbols: '',
-      },
-    ],
-    nonDispatchPublicFunctions: [],
-    outputs: {
-      structs: {},
-      globals: {},
-    },
-    fileMap: {},
-    storageLayout: {},
-  };
-
   beforeEach(async () => {
     contractAddress = await AztecAddress.random();
     account = mock<Account>();
     accountAddress = await CompleteAddress.random();
     account.getCompleteAddress.mockReturnValue(accountAddress);
-    const contractClass = await getContractClassFromArtifact(defaultArtifact);
+    const contractClass = await getContractClassFromArtifact(testContractArtifact);
     contractInstance = {
       address: contractAddress,
       currentContractClassId: contractClass.id,
@@ -211,7 +56,7 @@ describe('Contract Class', () => {
   });
 
   it('should create and send a contract method tx', async () => {
-    const fooContract = Contract.at(contractAddress, defaultArtifact, wallet);
+    const fooContract = Contract.at(contractAddress, testContractArtifact, wallet);
     const param0 = 12;
     const param1 = 345n;
     const { receipt } = await fooContract.methods.bar(param0, param1).send({ from: account.getAddress() });
@@ -221,7 +66,7 @@ describe('Contract Class', () => {
   });
 
   it('should call view on a utility function', async () => {
-    const fooContract = Contract.at(contractAddress, defaultArtifact, wallet);
+    const fooContract = Contract.at(contractAddress, testContractArtifact, wallet);
     const { result } = await fooContract.methods.qux(123n).simulate({ from: account.getAddress() });
     expect(wallet.executeUtility).toHaveBeenCalledTimes(1);
     expect(wallet.executeUtility).toHaveBeenCalledWith(
@@ -254,7 +99,7 @@ describe('Contract Class', () => {
 
     wallet.simulateTx.mockResolvedValue(txSimResult);
 
-    const fooContract = Contract.at(contractAddress, defaultArtifact, wallet);
+    const fooContract = Contract.at(contractAddress, testContractArtifact, wallet);
     const result = await fooContract.methods.bar(1, 2).simulate({ from: account.getAddress() });
 
     expect(result.offchainMessages).toHaveLength(1);
@@ -288,7 +133,7 @@ describe('Contract Class', () => {
       anchorBlockTimestamp,
     } as any);
 
-    const fooContract = Contract.at(contractAddress, defaultArtifact, wallet);
+    const fooContract = Contract.at(contractAddress, testContractArtifact, wallet);
     const result = await fooContract.methods.qux(123n).simulate({ from: account.getAddress() });
 
     expect(result.offchainMessages).toHaveLength(1);
@@ -303,14 +148,14 @@ describe('Contract Class', () => {
   });
 
   it('allows nullish values for Option parameters', () => {
-    const fooContract = Contract.at(contractAddress, defaultArtifact, wallet);
+    const fooContract = Contract.at(contractAddress, testContractArtifact, wallet);
 
     expect(() => fooContract.methods.optionEcho(undefined)).not.toThrow();
     expect(() => fooContract.methods.optionEcho(null)).not.toThrow();
   });
 
   it('still rejects nullish values for non-Option parameters', () => {
-    const fooContract = Contract.at(contractAddress, defaultArtifact, wallet);
+    const fooContract = Contract.at(contractAddress, testContractArtifact, wallet);
 
     expect(() => fooContract.methods.bar(undefined, 123n)).toThrow(
       'Null or undefined arguments are only allowed for Option<T> parameters in bar(value: Field, value: Field). Received: (undefined, 123n).',
@@ -321,7 +166,7 @@ describe('Contract Class', () => {
   });
 
   it('rejects nullish non-Option param even when Option param is valid', () => {
-    const fooContract = Contract.at(contractAddress, defaultArtifact, wallet);
+    const fooContract = Contract.at(contractAddress, testContractArtifact, wallet);
 
     expect(() => fooContract.methods.mixedParams({ w: 1n }, undefined)).toThrow(
       'Null or undefined arguments are only allowed for Option<T> parameters in mixedParams(optValue: Option<Field>, aField: Field). Received: ({ w: 1n }, undefined).',
@@ -340,7 +185,7 @@ describe('Contract Class', () => {
     ['object', { a: 1n, b: 'x' }, '{ a: 1n, b: x }'],
     ['array', [1n, 2n], '[1n, 2n]'],
   ])('formats %s argument in error message', (_label, value, expectedFormatted) => {
-    const fooContract = Contract.at(contractAddress, defaultArtifact, wallet);
+    const fooContract = Contract.at(contractAddress, testContractArtifact, wallet);
 
     // pass the test value first and undefined second to trigger the error whose message we want to test for
     expect(() => fooContract.methods.bar(value, undefined)).toThrow(`Received: (${expectedFormatted}, undefined).`);
diff --git a/yarn-project/aztec.js/src/contract/contract.ts b/yarn-project/aztec.js/src/contract/contract.ts
index 01c13e31e28e..8f1c526667fb 100644
--- a/yarn-project/aztec.js/src/contract/contract.ts
+++ b/yarn-project/aztec.js/src/contract/contract.ts
@@ -1,11 +1,10 @@
 import type { ContractArtifact } from '@aztec/stdlib/abi';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
-import { PublicKeys } from '@aztec/stdlib/keys';
 
 import type { Wallet } from '../wallet/wallet.js';
 import { ContractBase } from './contract_base.js';
-import { DeployMethod } from './deploy_method.js';
+import { type DeployInstantiationOptions, DeployMethod } from './deploy_method.js';
 
 /**
  * The Contract class represents a contract and provides utility methods for interacting with it.
@@ -28,35 +27,22 @@ export class Contract extends ContractBase {
 
   /**
    * Creates a tx to deploy (initialize and/or publish) a new instance of a contract.
+   *
    * @param wallet - The wallet for executing the deployment.
    * @param artifact - Build artifact of the contract to deploy
    * @param args - Arguments for the constructor.
    * @param constructorName - The name of the constructor function to call.
+   * @param instantiation - Other address-affecting parameters (salt, deployer / universalDeploy, publicKeys).
    */
-  public static deploy(wallet: Wallet, artifact: ContractArtifact, args: any[], constructorName?: string) {
-    const postDeployCtor = (instance: ContractInstanceWithAddress, wallet: Wallet) =>
-      Contract.at(instance.address, artifact, wallet);
-    return new DeployMethod(PublicKeys.default(), wallet, artifact, postDeployCtor, args, constructorName);
-  }
-
-  /**
-   * Creates a tx to deploy (initialize and/or publish) a new instance of a contract
-   * using the specified public keys hash to derive the address.
-   * @param publicKeys - Hash of public keys to use for deriving the address.
-   * @param wallet - The wallet for executing the deployment.
-   * @param artifact - Build artifact of the contract.
-   * @param args - Arguments for the constructor.
-   * @param constructorName - The name of the constructor function to call.
-   */
-  public static deployWithPublicKeys(
-    publicKeys: PublicKeys,
+  public static deploy(
     wallet: Wallet,
     artifact: ContractArtifact,
     args: any[],
     constructorName?: string,
+    instantiation?: DeployInstantiationOptions,
   ) {
     const postDeployCtor = (instance: ContractInstanceWithAddress, wallet: Wallet) =>
       Contract.at(instance.address, artifact, wallet);
-    return new DeployMethod(publicKeys, wallet, artifact, postDeployCtor, args, constructorName);
+    return new DeployMethod(wallet, artifact, postDeployCtor, args, constructorName, instantiation);
   }
 }
diff --git a/yarn-project/aztec.js/src/contract/deploy_method.test.ts b/yarn-project/aztec.js/src/contract/deploy_method.test.ts
index 64b5fca96291..3bc8b6458fa3 100644
--- a/yarn-project/aztec.js/src/contract/deploy_method.test.ts
+++ b/yarn-project/aztec.js/src/contract/deploy_method.test.ts
@@ -1,57 +1,20 @@
-import { MEGA_VK_LENGTH_IN_FIELDS } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/curves/bn254';
-import { type ContractArtifact, FunctionType } from '@aztec/stdlib/abi';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
+import { type ContractInstanceWithAddress, getContractInstanceFromInstantiationParams } from '@aztec/stdlib/contract';
 import { Gas } from '@aztec/stdlib/gas';
-import { PublicKeys } from '@aztec/stdlib/keys';
 import { OFFCHAIN_MESSAGE_IDENTIFIER, type OffchainEffect } from '@aztec/stdlib/tx';
 
 import { type MockProxy, mock } from 'jest-mock-extended';
 
+import { testContractArtifact } from '../test/fixtures.js';
 import type { TxSimulationResultWithAppOffset } from '../wallet/tx_simulation_result_with_app_offset.js';
 import type { Wallet } from '../wallet/wallet.js';
-import type { ContractBase } from './contract_base.js';
-import { DeployMethod } from './deploy_method.js';
+import { Contract } from './contract.js';
+import { NO_FROM } from './interaction_options.js';
 
 describe('DeployMethod', () => {
   let wallet: MockProxy<Wallet>;
 
-  const artifact: ContractArtifact = {
-    name: 'TestContract',
-    functions: [
-      {
-        name: 'constructor',
-        isInitializer: true,
-        functionType: FunctionType.PRIVATE,
-        isOnlySelf: false,
-        isStatic: false,
-        debugSymbols: '',
-        parameters: [],
-        returnTypes: [],
-        errorTypes: {},
-        bytecode: Buffer.alloc(8, 0xfa),
-        verificationKey: Buffer.alloc(MEGA_VK_LENGTH_IN_FIELDS * Fr.SIZE_IN_BYTES).toString('base64'),
-      },
-      {
-        name: 'public_dispatch',
-        isInitializer: false,
-        isStatic: false,
-        functionType: FunctionType.PUBLIC,
-        isOnlySelf: false,
-        parameters: [{ name: 'selector', type: { kind: 'field' }, visibility: 'public' }],
-        returnTypes: [],
-        errorTypes: {},
-        bytecode: Buffer.alloc(8, 0xfb),
-        debugSymbols: '',
-      },
-    ],
-    nonDispatchPublicFunctions: [],
-    outputs: { structs: {}, globals: {} },
-    fileMap: {},
-    storageLayout: {},
-  };
-
   beforeEach(() => {
     wallet = mock<Wallet>();
     wallet.registerContract.mockResolvedValue({} as ContractInstanceWithAddress);
@@ -59,19 +22,8 @@ describe('DeployMethod', () => {
     wallet.getContractMetadata.mockResolvedValue({ isContractPubliclyDeployed: true } as any);
   });
 
-  it('should extract offchain messages with anchor block timestamp on simulate', async () => {
-    const recipient = await AztecAddress.random();
-    const contractAddress = await AztecAddress.random();
-    const msgPayload = [Fr.random(), Fr.random()];
-    const anchorBlockTimestamp = 42000n;
-
-    const offchainEffects: OffchainEffect[] = [
-      {
-        data: [OFFCHAIN_MESSAGE_IDENTIFIER, recipient.toField(), ...msgPayload],
-        contractAddress,
-      },
-    ];
-
+  /** Builds a `TxSimulationResultWithAppOffset` mock that satisfies what `DeployMethod.simulate` reads. */
+  const makeSimulateResult = (offchainEffects: OffchainEffect[] = [], anchorBlockTimestamp = 0n) => {
     const txSimResult = mock<TxSimulationResultWithAppOffset>();
     Object.defineProperty(txSimResult, 'offchainEffects', { value: offchainEffects });
     Object.defineProperty(txSimResult, 'publicInputs', {
@@ -83,18 +35,26 @@ describe('DeployMethod', () => {
     Object.defineProperty(txSimResult, 'gasUsed', {
       value: { totalGas: Gas.empty(), teardownGas: Gas.empty() },
     });
+    return txSimResult;
+  };
 
-    wallet.simulateTx.mockResolvedValue(txSimResult);
+  it('should extract offchain messages with anchor block timestamp on simulate', async () => {
+    const recipient = await AztecAddress.random();
+    const contractAddress = await AztecAddress.random();
+    const msgPayload = [Fr.random(), Fr.random()];
+    const anchorBlockTimestamp = 42000n;
+
+    const offchainEffects: OffchainEffect[] = [
+      {
+        data: [OFFCHAIN_MESSAGE_IDENTIFIER, recipient.toField(), ...msgPayload],
+        contractAddress,
+      },
+    ];
 
-    const deployMethod = new DeployMethod(
-      PublicKeys.default(),
-      wallet,
-      artifact,
-      (instance, w) => ({ instance, wallet: w }) as unknown as ContractBase,
-      [],
-    );
+    wallet.simulateTx.mockResolvedValue(makeSimulateResult(offchainEffects, anchorBlockTimestamp));
 
-    const result = await deployMethod.simulate({ from: await AztecAddress.random() });
+    const deploy = Contract.deploy(wallet, testContractArtifact, []);
+    const result = await deploy.simulate({ from: await AztecAddress.random() });
 
     expect(result.offchainMessages).toHaveLength(1);
     expect(result.offchainMessages[0]).toEqual({
@@ -105,4 +65,105 @@ describe('DeployMethod', () => {
     });
     expect(result.offchainEffects).toEqual([]);
   });
+
+  describe('deployer locking and address stability', () => {
+    let alice: AztecAddress;
+    let bob: AztecAddress;
+    const salt = new Fr(0x1234n);
+
+    beforeEach(async () => {
+      alice = await AztecAddress.random();
+      bob = await AztecAddress.random();
+      wallet.simulateTx.mockResolvedValue(makeSimulateResult());
+      wallet.sendTx.mockResolvedValue({
+        txHash: { hash: 'tx-hash' },
+        offchainEffects: [],
+        receipt: { txHash: { hash: 'tx-hash' } },
+      } as any);
+    });
+
+    /**
+     * Computes the expected address for our test artifact under the given deployer/salt, using
+     * the same protocol-level helper that `DeployMethod` calls internally. Tests assert against
+     * this value to confirm `DeployMethod` produces the canonical address.
+     */
+    const expectedAddress = async (deployer: AztecAddress) =>
+      (
+        await getContractInstanceFromInstantiationParams(testContractArtifact, {
+          constructorArgs: [],
+          salt,
+          deployer,
+          publicKeys: undefined,
+          constructorArtifact: undefined,
+        })
+      ).address;
+
+    it('matches the standalone instantiation helper when locked at construction with deployer', async () => {
+      const deploy = Contract.deploy(wallet, testContractArtifact, [], undefined, { salt, deployer: alice });
+      const expected = await expectedAddress(alice);
+      expect(await deploy.getAddress()).toEqual(expected);
+    });
+
+    it('matches the standalone instantiation helper when locked at construction with universalDeploy', async () => {
+      const deploy = Contract.deploy(wallet, testContractArtifact, [], undefined, { salt, universalDeploy: true });
+      const expected = await expectedAddress(AztecAddress.ZERO);
+      expect(await deploy.getAddress()).toEqual(expected);
+    });
+
+    it('keeps the address stable across simulate then send when lazy-locking from `from`', async () => {
+      const deploy = Contract.deploy(wallet, testContractArtifact, [], undefined, { salt });
+
+      const expected = await expectedAddress(alice);
+
+      await deploy.simulate({ from: alice });
+      const afterSimulate = await deploy.getAddress();
+
+      await deploy.send({ from: alice });
+      const afterSend = await deploy.getAddress();
+
+      expect(afterSimulate).toEqual(afterSend);
+      expect(afterSimulate).toEqual(expected);
+    });
+
+    it('throws on getInstance / getAddress / getPartialAddress before any send-side call when nothing is locked', async () => {
+      const deploy = Contract.deploy(wallet, testContractArtifact, [], undefined, { salt });
+      // `getInstance` throws synchronously; `getAddress` / `getPartialAddress` are async and reject.
+      expect(() => deploy.getInstance()).toThrow(/deployer is not yet locked/);
+      await expect(deploy.getAddress()).rejects.toThrow(/deployer is not yet locked/);
+      await expect(deploy.getPartialAddress()).rejects.toThrow(/deployer is not yet locked/);
+    });
+
+    it('rejects mutually exclusive `deployer` and `universalDeploy` at construction', () => {
+      expect(() =>
+        Contract.deploy(wallet, testContractArtifact, [], undefined, { salt, deployer: alice, universalDeploy: true }),
+      ).toThrow(/mutually exclusive/);
+    });
+
+    it('throws when send-time `from` would imply a different deployer than the one locked at construction', async () => {
+      const deploy = Contract.deploy(wallet, testContractArtifact, [], undefined, { salt, deployer: alice });
+      await expect(deploy.send({ from: bob })).rejects.toThrow(/Deployer for this DeployMethod is locked/);
+    });
+
+    it('allows any sender when locked to universal at construction, and the address is stable', async () => {
+      const deploy = Contract.deploy(wallet, testContractArtifact, [], undefined, { salt, universalDeploy: true });
+      const expected = await expectedAddress(AztecAddress.ZERO);
+
+      await expect(deploy.send({ from: alice })).resolves.toBeDefined();
+      expect(await deploy.getAddress()).toEqual(expected);
+      await expect(deploy.send({ from: bob })).resolves.toBeDefined();
+      expect(await deploy.getAddress()).toEqual(expected);
+    });
+
+    it('throws on a second lock `from` after lazy-locking from the first', async () => {
+      const deploy = Contract.deploy(wallet, testContractArtifact, [], undefined, { salt });
+      await deploy.simulate({ from: alice });
+      await expect(deploy.send({ from: bob })).rejects.toThrow(/Deployer for this DeployMethod is locked/);
+    });
+
+    it('locks to universal when `from` is NO_FROM', async () => {
+      const deploy = Contract.deploy(wallet, testContractArtifact, [], undefined, { salt });
+      await deploy.send({ from: NO_FROM });
+      expect(await deploy.getAddress()).toEqual(await expectedAddress(AztecAddress.ZERO));
+    });
+  });
 });
diff --git a/yarn-project/aztec.js/src/contract/deploy_method.ts b/yarn-project/aztec.js/src/contract/deploy_method.ts
index 8d062499a392..f2ed3a4c5495 100644
--- a/yarn-project/aztec.js/src/contract/deploy_method.ts
+++ b/yarn-project/aztec.js/src/contract/deploy_method.ts
@@ -8,7 +8,7 @@ import {
   getContractClassFromArtifact,
   getContractInstanceFromInstantiationParams,
 } from '@aztec/stdlib/contract';
-import type { PublicKeys } from '@aztec/stdlib/keys';
+import { PublicKeys } from '@aztec/stdlib/keys';
 import { type Capsule, HashedValues, type TxProfileResult, type TxReceipt } from '@aztec/stdlib/tx';
 import { ExecutionPayload, mergeExecutionPayloads } from '@aztec/stdlib/tx';
 
@@ -20,6 +20,7 @@ import type { ContractBase } from './contract_base.js';
 import { ContractFunctionInteraction } from './contract_function_interaction.js';
 import { getGasLimits } from './get_gas_limits.js';
 import {
+  type InteractionWaitOptions,
   NO_FROM,
   NO_WAIT,
   type NoWait,
@@ -38,26 +39,42 @@ import {
 import type { WaitOpts } from './wait_opts.js';
 
 /**
- * Type for wait options in deployment interactions.
- * - NO_WAIT symbol: Don't wait, return TxHash immediately
- * - WaitOpts: Wait with custom options
- * - undefined: Wait with default options
+ * Inputs that determine the contract's deployment address.
+ *
+ * `salt` and `publicKeys` are optional and default to a random Fr and `PublicKeys.default()` respectively.
+ *
+ * `deployer` and `universalDeploy` are mutually exclusive and both optional:
+ * - If neither is supplied, the deployer is locked lazily on the first `send` / `simulate` /
+ *   `profile` call from `options.from` (NO_FROM/undefined → universal). This preserves the
+ *   ergonomics of `MyContract.deploy(wallet, ...args).send({ from: alice })`.
+ * - If `deployer` or `universalDeploy: true` is supplied, the deployer is locked at construction.
+ *
+ * Once locked, the deployer cannot change. Subsequent calls with a `from` that would imply a different
+ * deployer throw — except when locked to `AztecAddress.ZERO` (universal), which is compatible with any
+ * sender.
  */
-export type DeployInteractionWaitOptions = NoWait | WaitOpts | undefined;
+export type DeployInstantiationOptions = {
+  /** Salt used to derive the contract address. Defaults to a random Fr. */
+  salt?: Fr;
+  /**
+   * Deployer address mixed into the address preimage. Mutually exclusive with `universalDeploy`.
+   */
+  deployer?: AztecAddress;
+  /**
+   * If true, the contract is deployed universally (deployer = AztecAddress.ZERO in the address preimage).
+   * Mutually exclusive with `deployer`.
+   */
+  universalDeploy?: boolean;
+  /** Public keys mixed into the address. Defaults to PublicKeys.default(). */
+  publicKeys?: PublicKeys;
+};
 
 /**
  * Options for deploying a contract on the Aztec network.
- * Allows specifying a contract address salt and different options to tweak contract publication
- * and initialization
+ * Controls publication and registration policy for this deployment. Address-affecting parameters
+ * (salt, deployer, publicKeys, constructor and args) are passed at construction time.
  */
 export type RequestDeployOptions = RequestInteractionOptions & {
-  /** An optional salt value used to deterministically calculate the contract address. */
-  contractAddressSalt?: Fr;
-  /**
-   * Deployer address that will be used for the deployed contract's address computation.
-   * If set to 0, the sender's address won't be mixed in
-   */
-  deployer?: AztecAddress;
   /** Skip contract class publication. */
   skipClassPublication?: boolean;
   /** Skip publication, instead just privately initialize the contract. */
@@ -71,18 +88,13 @@ export type RequestDeployOptions = RequestInteractionOptions & {
 /**
  * Base deployment options without wait parameter.
  */
-export type DeployOptionsWithoutWait = Omit<RequestDeployOptions, 'deployer'> & {
-  /**
-   * Set to true to *not* include the sender in the address computation. This option
-   * is mutually exclusive with "deployer"
-   */
-  universalDeploy?: boolean;
-} & Pick<SendInteractionOptionsWithoutWait, 'from' | 'fee' | 'additionalScopes'>;
+export type DeployOptionsWithoutWait = RequestDeployOptions &
+  Pick<SendInteractionOptionsWithoutWait, 'from' | 'fee' | 'additionalScopes'>;
 
 /**
  * Extends the deployment options with the required parameters to send the transaction.
  */
-export type DeployOptions<W extends DeployInteractionWaitOptions = undefined> = DeployOptionsWithoutWait & {
+export type DeployOptions<W extends InteractionWaitOptions = undefined> = DeployOptionsWithoutWait & {
   /**
    * Options for waiting for the transaction to be mined.
    * - undefined (default): wait with default options and return the contract instance
@@ -121,7 +133,7 @@ export type DeployResultMined<TContract extends ContractBase> = {
 } & OffchainOutput;
 
 /** Conditional return type for deploy based on wait options. */
-export type DeployReturn<TContract extends ContractBase, W extends DeployInteractionWaitOptions> = W extends NoWait
+export type DeployReturn<TContract extends ContractBase, W extends InteractionWaitOptions> = W extends NoWait
   ? TxSendResultImmediate
   : DeployResultMined<TContract>;
 
@@ -129,6 +141,18 @@ export type DeployReturn<TContract extends ContractBase, W extends DeployInterac
  * Contract interaction for deployment.
  * Handles class publication, instance publication, and initialization of the contract.
  *
+ * The deployer (and therefore the deployed address) is locked once and never changes. Locking
+ * happens either at construction (via `deployer` or `universalDeploy: true` in the instantiation
+ * options) or lazily on the first `send` / `simulate` / `profile` call, which lock from
+ * `options.from`. Once locked:
+ *
+ * - The address is stable for the lifetime of this object.
+ * - Subsequent `send` / `simulate` / `profile` calls with a `from` that would imply a different
+ *   deployer throw, to prevent silently deploying at a different address than `getAddress()`
+ *   reported.
+ * - A locked universal deployer (`AztecAddress.ZERO`) is compatible with any `from`, since the
+ *   address does not depend on the sender.
+ *
  * Note that for some contracts, a tx is not required as part of its "creation":
  * If there are no public functions, and if there are no initialization functions,
  * then technically the contract has already been "created", and all of the contract's
@@ -136,37 +160,104 @@ export type DeployReturn<TContract extends ContractBase, W extends DeployInterac
  * "deployment tx".
  */
 export class DeployMethod<TContract extends ContractBase = ContractBase> extends BaseContractInteraction {
-  /** The contract instance to be deployed. */
-  private instance?: ContractInstanceWithAddress = undefined;
+  /** Salt used in the address preimage. */
+  protected readonly salt: Fr;
+  /**
+   * Deployer mixed into the address preimage. `undefined` until locked, either by `deployer` /
+   * `universalDeploy: true` at construction, or by the first call to `request` / `send` /
+   * `simulate` / `profile` which locks it from `options.from` (NO_FROM/undefined → ZERO,
+   * AztecAddress → that address). `AztecAddress.ZERO` indicates a universal deployment. Once
+   * locked, never changes; subsequent calls with an incompatible `from` throw.
+   */
+  protected deployer: AztecAddress | undefined;
+  /** Public keys mixed into the address preimage. */
+  protected readonly publicKeys: PublicKeys;
+
+  /** Cached instance promise; resolved once after the deployer is locked. */
+  private instancePromise?: Promise<ContractInstanceWithAddress>;
+  /** Resolved value of `instancePromise`, populated synchronously once the promise settles. */
+  private resolvedInstance?: ContractInstanceWithAddress;
 
   /** Constructor function to call. */
   protected constructorArtifact: FunctionAbi | undefined;
 
   constructor(
-    protected publicKeys: PublicKeys,
     wallet: Wallet,
     protected artifact: ContractArtifact,
     protected postDeployCtor: (instance: ContractInstanceWithAddress, wallet: Wallet) => TContract,
     protected args: any[] = [],
     constructorNameOrArtifact?: string | FunctionArtifact,
+    instantiation: DeployInstantiationOptions = {},
     authWitnesses: AuthWitness[] = [],
     capsules: Capsule[] = [],
     protected extraHashedArgs: HashedValues[] = [],
   ) {
     super(wallet, authWitnesses, capsules);
     this.constructorArtifact = getInitializer(artifact, constructorNameOrArtifact);
+    this.salt = instantiation.salt ?? Fr.random();
+    this.publicKeys = instantiation.publicKeys ?? PublicKeys.default();
+    if (instantiation.deployer !== undefined && instantiation.universalDeploy) {
+      throw new Error('DeployInstantiationOptions: `deployer` and `universalDeploy` are mutually exclusive.');
+    }
+    if (instantiation.universalDeploy) {
+      this.deployer = AztecAddress.ZERO;
+    } else if (instantiation.deployer !== undefined) {
+      this.deployer = instantiation.deployer;
+    }
+  }
+
+  /**
+   * Locks the deployer from a send-time `from` value. If the deployer is already locked, this
+   * verifies that `from` is compatible with the locked value and throws otherwise. A locked
+   * universal deployer (`AztecAddress.ZERO`) is compatible with any `from`, since "universal"
+   * means the address does not depend on the sender.
+   *
+   * @param from - The send-time `from` value (AztecAddress, NO_FROM, or undefined).
+   */
+  protected lockDeployerFromSendOptions(from: SendInteractionOptionsWithoutWait['from'] | undefined): void {
+    const fromAsDeployer: AztecAddress = from === undefined || from === NO_FROM ? AztecAddress.ZERO : from;
+    if (this.deployer === undefined) {
+      this.deployer = fromAsDeployer;
+      return;
+    }
+    if (this.deployer.equals(AztecAddress.ZERO)) {
+      return;
+    }
+    if (!this.deployer.equals(fromAsDeployer)) {
+      throw new Error(
+        `Deployer for this DeployMethod is locked to ${this.deployer.toString()}; cannot send from ${fromAsDeployer.toString()} ` +
+          `because that would imply a different deployer than the one used to derive the address. ` +
+          `Pass \`deployer: ${this.deployer.toString()}\` at construction if you need a different sender.`,
+      );
+    }
   }
 
   /**
    * Returns the execution payload that allows this operation to happen on chain.
+   *
+   * Requires the deployer to be locked already (either at construction via `deployer` /
+   * `universalDeploy: true`, or as a side effect of a prior `send` / `simulate` / `profile` call,
+   * which lock from `options.from`). Throws otherwise — `request` is purely about payload
+   * construction and does not look at sender information.
+   *
    * @param options - Configuration options.
    * @returns The execution payload for this operation
    */
   public async request(options: RequestDeployOptions = {}): Promise<ExecutionPayload> {
+    if (this.deployer === undefined) {
+      throw new Error(
+        'Cannot build deploy execution payload: deployer is not yet locked. Pass `deployer: <address>` ' +
+          'or `universalDeploy: true` as the instantiation option when constructing the deploy ' +
+          '(e.g. `MyContract.deploy(wallet, ...args, { deployer: alice })`), or call `.send` / ' +
+          '`.simulate` / `.profile` first to lock the deployer from the sender. When wrapping a ' +
+          'DeployMethod inside a BatchCall, lock the deployer at construction since BatchCall ' +
+          'invokes `request()` directly.',
+      );
+    }
     const publication = await this.getPublicationExecutionPayload(options);
 
     if (!options?.skipRegistration) {
-      await this.wallet.registerContract(await this.getInstance(options), this.artifact);
+      await this.wallet.registerContract(await this.getInstance(), this.artifact);
     }
     const { authWitnesses, capsules } = options;
 
@@ -192,22 +283,11 @@ export class DeployMethod<TContract extends ContractBase = ContractBase> extends
     return finalExecutionPayload;
   }
 
-  convertDeployOptionsToRequestOptions(options: DeployOptionsWithoutWait): RequestDeployOptions {
-    const { from } = options;
-    let deployer: AztecAddress | undefined;
-    if (options?.universalDeploy) {
-      deployer = undefined;
-    } else {
-      deployer = from === NO_FROM ? AztecAddress.ZERO : from;
-    }
-    return { ...options, deployer };
-  }
-
   /**
    * Converts DeployOptions to SendOptions.
    * @param options - Deploy options with wait parameter.
    */
-  protected convertDeployOptionsToSendOptions<W extends DeployInteractionWaitOptions>(
+  protected convertDeployOptionsToSendOptions<W extends InteractionWaitOptions>(
     options: DeployOptions<W>,
   ): SendOptions<W> {
     return toSendOptions({ ...options, wait: options.wait as any }) as any;
@@ -233,10 +313,9 @@ export class DeployMethod<TContract extends ContractBase = ContractBase> extends
 
   /**
    * Adds this contract to the wallet and returns the Contract object.
-   * @param options - Deployment options.
    */
-  public async register(options?: RequestDeployOptions): Promise<TContract> {
-    const instance = await this.getInstance(options);
+  public async register(): Promise<TContract> {
+    const instance = await this.getInstance();
     await this.wallet.registerContract(instance, this.artifact);
     return this.postDeployCtor(instance, this.wallet);
   }
@@ -253,7 +332,7 @@ export class DeployMethod<TContract extends ContractBase = ContractBase> extends
     const calls: ExecutionPayload[] = [];
 
     // Set contract instance object so it's available for populating the DeploySendTx object
-    const instance = await this.getInstance(options);
+    const instance = await this.getInstance();
 
     // Obtain contract class from artifact and check it matches the reported one by the instance.
     // TODO(@spalladino): We're unnecessarily calculating the contract class multiple times here.
@@ -300,7 +379,7 @@ export class DeployMethod<TContract extends ContractBase = ContractBase> extends
   protected async getInitializationExecutionPayload(options?: RequestDeployOptions): Promise<ExecutionPayload> {
     const executionsPayloads: ExecutionPayload[] = [];
     if (this.constructorArtifact && !options?.skipInitialization) {
-      const { address } = await this.getInstance(options);
+      const { address } = await this.getInstance();
       const constructorCall = new ContractFunctionInteraction(
         this.wallet,
         address,
@@ -316,18 +395,19 @@ export class DeployMethod<TContract extends ContractBase = ContractBase> extends
    * Send a contract deployment transaction (initialize and/or publish) using the provided options.
    * By default, waits for the transaction to be mined and returns the deployed contract instance.
    *
-   * @param options - An object containing various deployment options such as contractAddressSalt and from.
+   * @param options - An object containing various deployment options such as `from` and `fee`.
    * @returns TxHash (if wait is NO_WAIT), or DeployResultMined with contract, receipt, and instance (otherwise)
    */
   // Overload for when wait is not specified at all - returns the contract
   public override send(options: DeployOptionsWithoutWait): Promise<DeployResultMined<TContract>>;
   // eslint-disable-next-line jsdoc/require-jsdoc
-  public override send<W extends DeployInteractionWaitOptions>(
+  public override send<W extends InteractionWaitOptions>(
     options: DeployOptions<W>,
   ): Promise<DeployReturn<TContract, W>>;
   // eslint-disable-next-line jsdoc/require-jsdoc
-  public override async send(options: DeployOptions<DeployInteractionWaitOptions>): Promise<any> {
-    const executionPayload = await this.request(this.convertDeployOptionsToRequestOptions(options));
+  public override async send(options: DeployOptions<InteractionWaitOptions>): Promise<any> {
+    this.lockDeployerFromSendOptions(options.from);
+    const executionPayload = await this.request(options);
     const sendOptions = this.convertDeployOptionsToSendOptions(options);
 
     if (options.wait === NO_WAIT) {
@@ -343,29 +423,47 @@ export class DeployMethod<TContract extends ContractBase = ContractBase> extends
     this.log.debug(`Deployed ${this.artifact.name} contract in tx ${receipt.txHash}`);
 
     // Attach contract instance
-    const instance = await this.getInstance(options);
+    const instance = await this.getInstance();
     const contract = this.postDeployCtor(instance, this.wallet) as TContract;
 
     return { contract, receipt, instance, ...offchainOutput };
   }
 
   /**
-   * Builds the contract instance and returns it.
+   * Builds the contract instance and returns it. The instance is computed once and cached for
+   * the lifetime of this DeployMethod; subsequent calls return the same instance.
+   *
+   * Requires the deployer to have been locked. The deployer is locked either by passing
+   * `deployer` / `universalDeploy: true` at construction, or by a prior call to
+   * `request` / `send` / `simulate` / `profile` (which lock from `options.from`). Calling
+   * `getInstance()` before the deployer is locked throws, because the address is otherwise
+   * ambiguous and would silently change once the user finally invokes a send.
    *
-   * @param options - An object containing various initialization and publication options.
    * @returns An instance object.
    */
-  public async getInstance(options?: RequestDeployOptions): Promise<ContractInstanceWithAddress> {
-    if (!this.instance) {
-      this.instance = await getContractInstanceFromInstantiationParams(this.artifact, {
+  public getInstance(): Promise<ContractInstanceWithAddress> {
+    if (this.deployer === undefined) {
+      throw new Error(
+        'Cannot resolve contract instance: deployer is not yet locked. Pass `deployer: <address>` ' +
+          'or `universalDeploy: true` as the instantiation option when constructing the deploy ' +
+          '(e.g. `MyContract.deploy(wallet, ...args, { deployer: alice })`), or call `.send` / ' +
+          '`.simulate` / `.profile` first to lock the deployer from the sender.',
+      );
+    }
+    const deployer = this.deployer;
+    if (!this.instancePromise) {
+      this.instancePromise = getContractInstanceFromInstantiationParams(this.artifact, {
         constructorArgs: this.args,
-        salt: options?.contractAddressSalt ?? Fr.random(),
+        salt: this.salt,
         publicKeys: this.publicKeys,
         constructorArtifact: this.constructorArtifact,
-        deployer: options?.deployer ? options.deployer : AztecAddress.ZERO,
+        deployer,
+      }).then(instance => {
+        this.resolvedInstance = instance;
+        return instance;
       });
     }
-    return this.instance;
+    return this.instancePromise;
   }
 
   /**
@@ -376,7 +474,8 @@ export class DeployMethod<TContract extends ContractBase = ContractBase> extends
    * estimations (if requested via options), execution statistics and emitted offchain effects
    */
   public async simulate(options: SimulateDeployOptions): Promise<SimulationResult> {
-    const executionPayload = await this.request(this.convertDeployOptionsToRequestOptions(options));
+    this.lockDeployerFromSendOptions(options.from);
+    const executionPayload = await this.request(options);
     const simulatedTx = await this.wallet.simulateTx(
       executionPayload,
       this.convertDeployOptionsToSimulateOptions(options),
@@ -404,18 +503,31 @@ export class DeployMethod<TContract extends ContractBase = ContractBase> extends
    * @returns An object containing the function return value and profile result.
    */
   public async profile(options: DeployOptionsWithoutWait & ProfileInteractionOptions): Promise<TxProfileResult> {
-    const executionPayload = await this.request(this.convertDeployOptionsToRequestOptions(options));
+    this.lockDeployerFromSendOptions(options.from);
+    const executionPayload = await this.request(options);
     return await this.wallet.profileTx(executionPayload, this.convertDeployOptionsToProfileOptions(options));
   }
 
-  /** Return this deployment address. */
-  public get address() {
-    return this.instance?.address;
+  /** Returns the deployed contract address. */
+  public async getAddress(): Promise<AztecAddress> {
+    return (await this.getInstance()).address;
   }
 
   /** Returns the partial address for this deployment. */
-  public get partialAddress() {
-    return this.instance && computePartialAddress(this.instance);
+  public async getPartialAddress(): Promise<Fr> {
+    return computePartialAddress(await this.getInstance());
+  }
+
+  /**
+   * Returns the cached resolved instance synchronously, or throws if no instance has been computed yet.
+   * Intended for subclasses that run inside a code path where `getInstance()` is guaranteed to have already
+   * been awaited (e.g. `request()` invoked it). Not part of the public API.
+   */
+  protected getCachedInstanceOrThrow(): ContractInstanceWithAddress {
+    if (!this.resolvedInstance) {
+      throw new Error('Contract instance has not been computed yet. Call getInstance() first.');
+    }
+    return this.resolvedInstance;
   }
 
   /**
@@ -436,15 +548,31 @@ export class DeployMethod<TContract extends ContractBase = ContractBase> extends
     extraHashedArgs?: HashedValues[];
   }): DeployMethod {
     return new DeployMethod(
-      this.publicKeys,
       this.wallet,
       this.artifact,
       this.postDeployCtor,
       this.args,
       this.constructorArtifact?.name,
+      this.cloneInstantiation(),
       this.authWitnesses.concat(authWitnesses),
       this.capsules.concat(capsules),
       this.extraHashedArgs.concat(extraHashedArgs),
     );
   }
+
+  /**
+   * Returns the instantiation options to pass to a freshly-constructed copy of this DeployMethod
+   * (e.g. via `with(...)`). Encodes the current locked-deployer state: a locked AztecAddress.ZERO
+   * deployer becomes `universalDeploy: true`; an undefined deployer stays unset so the new copy can
+   * still infer it from the first send.
+   */
+  protected cloneInstantiation(): DeployInstantiationOptions {
+    if (this.deployer === undefined) {
+      return { salt: this.salt, publicKeys: this.publicKeys };
+    }
+    if (this.deployer.equals(AztecAddress.ZERO)) {
+      return { salt: this.salt, publicKeys: this.publicKeys, universalDeploy: true };
+    }
+    return { salt: this.salt, publicKeys: this.publicKeys, deployer: this.deployer };
+  }
 }
diff --git a/yarn-project/aztec.js/src/contract/interaction_options.ts b/yarn-project/aztec.js/src/contract/interaction_options.ts
index 7eeee0ce8842..98583a42f52b 100644
--- a/yarn-project/aztec.js/src/contract/interaction_options.ts
+++ b/yarn-project/aztec.js/src/contract/interaction_options.ts
@@ -7,6 +7,7 @@ import {
   type Capsule,
   OFFCHAIN_MESSAGE_IDENTIFIER,
   type OffchainEffect,
+  type SimulationOverrides,
   type SimulationStats,
   type TxHash,
   type TxReceipt,
@@ -157,6 +158,8 @@ export type SimulateInteractionOptions = Omit<SendInteractionOptions, 'fee'> & {
   /** Whether to include metadata such as performance statistics (e.g. timing information of the different circuits and oracles) and gas estimation
    * in the simulation result, in addition to the return value and offchain effects */
   includeMetadata?: boolean;
+  /** Pre-simulation overrides applied to the ephemeral fork and contract DB (publicStorage writes, contract instance overrides). */
+  overrides?: SimulationOverrides;
 };
 
 /**
diff --git a/yarn-project/aztec.js/src/contract/wait_for_proven.ts b/yarn-project/aztec.js/src/contract/wait_for_proven.ts
index 2d0254aa1b63..6ae9534ee0d8 100644
--- a/yarn-project/aztec.js/src/contract/wait_for_proven.ts
+++ b/yarn-project/aztec.js/src/contract/wait_for_proven.ts
@@ -28,7 +28,7 @@ export async function waitForProven(node: AztecNode, receipt: TxReceipt, opts?:
   }
   return await retryUntil(
     async () => {
-      const provenBlock = await node.getProvenBlockNumber();
+      const provenBlock = await node.getBlockNumber('proven');
       return provenBlock >= receipt.blockNumber! ? provenBlock : undefined;
     },
     'isProven',
diff --git a/yarn-project/aztec.js/src/deployment/contract_deployer.ts b/yarn-project/aztec.js/src/deployment/contract_deployer.ts
index 5280fdd6e4e0..890b7723dd30 100644
--- a/yarn-project/aztec.js/src/deployment/contract_deployer.ts
+++ b/yarn-project/aztec.js/src/deployment/contract_deployer.ts
@@ -1,9 +1,8 @@
 import type { ContractArtifact } from '@aztec/stdlib/abi';
 import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
-import { PublicKeys } from '@aztec/stdlib/keys';
 
 import { Contract } from '../contract/contract.js';
-import { DeployMethod } from '../contract/deploy_method.js';
+import { type DeployInstantiationOptions, DeployMethod } from '../contract/deploy_method.js';
 import type { Wallet } from '../wallet/wallet.js';
 
 /**
@@ -14,29 +13,24 @@ export class ContractDeployer {
   constructor(
     private artifact: ContractArtifact,
     private wallet: Wallet,
-    private publicKeys?: PublicKeys,
     private constructorName?: string,
   ) {}
 
   /**
-   * Deploy a contract using the provided ABI and constructor arguments.
-   * This function creates a new DeployMethod instance that can be used to send deployment transactions
-   * and query deployment status. The method accepts any number of constructor arguments, which will
-   * be passed to the contract's constructor during deployment.
+   * Deploy a contract using the provided instantiation parameters and constructor arguments.
+   * Creates a new DeployMethod instance that can be used to send the deployment transaction.
    *
+   * The first argument is the {@link DeployInstantiationOptions} (salt, deployer) — pass `{}` to
+   * accept defaults (random salt, deployer = AztecAddress.ZERO). The remaining arguments are the
+   * constructor arguments for the contract.
+   *
+   * @param instantiation - Salt and deployer to mix into the address derivation.
    * @param args - The constructor arguments for the contract being deployed.
    * @returns A DeployMethod instance configured with the ABI, PXE, and constructor arguments.
    */
-  public deploy(...args: any[]) {
+  public deploy(args?: any[], instantiation?: DeployInstantiationOptions) {
     const postDeployCtor = (instance: ContractInstanceWithAddress, wallet: Wallet) =>
       Contract.at(instance.address, this.artifact, wallet);
-    return new DeployMethod(
-      this.publicKeys ?? PublicKeys.default(),
-      this.wallet,
-      this.artifact,
-      postDeployCtor,
-      args,
-      this.constructorName,
-    );
+    return new DeployMethod(this.wallet, this.artifact, postDeployCtor, args, this.constructorName, instantiation);
   }
 }
diff --git a/yarn-project/aztec.js/src/scripts/generate_protocol_contract_types.ts b/yarn-project/aztec.js/src/scripts/generate_protocol_contract_types.ts
index 6e0f31e72f49..a74e31b28b46 100644
--- a/yarn-project/aztec.js/src/scripts/generate_protocol_contract_types.ts
+++ b/yarn-project/aztec.js/src/scripts/generate_protocol_contract_types.ts
@@ -63,6 +63,7 @@ function generateProtocolContractArtifact(input: ContractArtifact): string {
 
   return `{
   name: '${input.name}',
+  aztecVersion: '${input.aztecVersion}',
   functions: [
     ${functionsArray}
   ],
diff --git a/yarn-project/aztec.js/src/test/fixtures.ts b/yarn-project/aztec.js/src/test/fixtures.ts
new file mode 100644
index 000000000000..f2f1881ecfb8
--- /dev/null
+++ b/yarn-project/aztec.js/src/test/fixtures.ts
@@ -0,0 +1,131 @@
+import { MEGA_VK_LENGTH_IN_FIELDS } from '@aztec/constants';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { type ContractArtifact, FunctionType } from '@aztec/stdlib/abi';
+import { DEV_VERSION } from '@aztec/stdlib/update-checker';
+
+/**
+ * A minimal but representative `ContractArtifact` shared by unit tests in this package. Covers
+ * every function shape the tests exercise: a private initializer (`constructor`), the standard
+ * `public_dispatch` entry, a private function with mixed-visibility params (`bar`), a utility
+ * function (`qux`), and two functions exercising Noir `Option<Field>` parameters (`optionEcho`,
+ * `mixedParams`).
+ *
+ * We deliberately do not depend on `@aztec/noir-test-contracts.js` here: that package depends on
+ * `@aztec/aztec.js`, so importing from it would create a workspace cycle.
+ */
+export const testContractArtifact: ContractArtifact = {
+  name: 'TestContract',
+  aztecVersion: DEV_VERSION,
+  functions: [
+    {
+      name: 'constructor',
+      isInitializer: true,
+      functionType: FunctionType.PRIVATE,
+      isOnlySelf: false,
+      isStatic: false,
+      debugSymbols: '',
+      parameters: [],
+      returnTypes: [],
+      errorTypes: {},
+      bytecode: Buffer.alloc(8, 0xfa),
+      verificationKey: Buffer.alloc(MEGA_VK_LENGTH_IN_FIELDS * Fr.SIZE_IN_BYTES).toString('base64'),
+    },
+    {
+      name: 'public_dispatch',
+      isInitializer: false,
+      isStatic: false,
+      functionType: FunctionType.PUBLIC,
+      isOnlySelf: false,
+      parameters: [{ name: 'selector', type: { kind: 'field' }, visibility: 'public' }],
+      returnTypes: [],
+      errorTypes: {},
+      bytecode: Buffer.alloc(8, 0xfb),
+      debugSymbols: '',
+    },
+    {
+      name: 'bar',
+      isInitializer: false,
+      functionType: FunctionType.PRIVATE,
+      isOnlySelf: false,
+      isStatic: false,
+      debugSymbols: '',
+      parameters: [
+        { name: 'value', type: { kind: 'field' }, visibility: 'public' },
+        { name: 'value', type: { kind: 'field' }, visibility: 'private' },
+      ],
+      returnTypes: [],
+      errorTypes: {},
+      bytecode: Buffer.alloc(8, 0xfa),
+      verificationKey: Buffer.alloc(MEGA_VK_LENGTH_IN_FIELDS * Fr.SIZE_IN_BYTES).toString('base64'),
+    },
+    {
+      name: 'qux',
+      isInitializer: false,
+      isStatic: false,
+      functionType: FunctionType.UTILITY,
+      isOnlySelf: false,
+      parameters: [{ name: 'value', type: { kind: 'field' }, visibility: 'public' }],
+      returnTypes: [{ kind: 'integer', sign: 'unsigned', width: 32 }],
+      bytecode: Buffer.alloc(8, 0xfc),
+      debugSymbols: '',
+      errorTypes: {},
+    },
+    {
+      name: 'optionEcho',
+      isInitializer: false,
+      functionType: FunctionType.PRIVATE,
+      isOnlySelf: false,
+      isStatic: false,
+      parameters: [
+        {
+          name: 'value',
+          type: {
+            kind: 'struct',
+            path: 'std::option::Option',
+            fields: [
+              { name: '_is_some', type: { kind: 'boolean' } },
+              { name: '_value', type: { kind: 'field' } },
+            ],
+          },
+          visibility: 'private',
+        },
+      ],
+      returnTypes: [],
+      errorTypes: {},
+      bytecode: Buffer.alloc(8, 0xfd),
+      verificationKey: Buffer.alloc(MEGA_VK_LENGTH_IN_FIELDS * Fr.SIZE_IN_BYTES).toString('base64'),
+      debugSymbols: '',
+    },
+    {
+      name: 'mixedParams',
+      isInitializer: false,
+      functionType: FunctionType.PRIVATE,
+      isOnlySelf: false,
+      isStatic: false,
+      parameters: [
+        {
+          name: 'optValue',
+          type: {
+            kind: 'struct',
+            path: 'std::option::Option',
+            fields: [
+              { name: '_is_some', type: { kind: 'boolean' } },
+              { name: '_value', type: { kind: 'field' } },
+            ],
+          },
+          visibility: 'private',
+        },
+        { name: 'aField', type: { kind: 'field' }, visibility: 'private' },
+      ],
+      returnTypes: [],
+      errorTypes: {},
+      bytecode: Buffer.alloc(8, 0xfe),
+      verificationKey: Buffer.alloc(MEGA_VK_LENGTH_IN_FIELDS * Fr.SIZE_IN_BYTES).toString('base64'),
+      debugSymbols: '',
+    },
+  ],
+  nonDispatchPublicFunctions: [],
+  outputs: { structs: {}, globals: {} },
+  fileMap: {},
+  storageLayout: {},
+};
diff --git a/yarn-project/aztec.js/src/wallet/capabilities.ts b/yarn-project/aztec.js/src/wallet/capabilities.ts
index fe015195101d..f8643faab6e3 100644
--- a/yarn-project/aztec.js/src/wallet/capabilities.ts
+++ b/yarn-project/aztec.js/src/wallet/capabilities.ts
@@ -138,23 +138,25 @@ export interface ContractsCapability {
 export interface GrantedContractsCapability extends ContractsCapability {}
 
 /**
- * Contract class capability - for querying contract class metadata.
+ * Contract class capability - for querying contract class meatadata and registering contract classes.
  *
  * Maps to wallet methods:
- * - getContractClassMetadata
+ * - getContractClassMetadata (when canGetMetadata: true)
+ * - registerContractClass (when canRegister: true)
  *
  * Contract classes are identified by their class ID (Fr), not by contract address.
  * Multiple contract instances can share the same class. This capability grants
- * permission to query metadata for specific contract classes.
+ * permission to query metadata for, and register, specific contract classes.
  *
  * Apps typically acquire this permission automatically when registering a contract
  * with an artifact (the wallet auto-grants permission for that contract's class ID).
  *
  * @example
- * // Query specific contract classes
+ * // Register and query a specific contract class
  * \{
  *   type: 'contractClasses',
- *   classes: [classId1, classId2],
+ *   classes: [classId1],
+ *   canRegister: true,
  *   canGetMetadata: true
  * \}
  *
@@ -177,6 +179,9 @@ export interface ContractClassesCapability {
    */
   classes: '*' | Fr[];
 
+  /** Can register a contract class artifact in the local PXE. Maps to: registerContractClass */
+  canRegister?: boolean;
+
   /** Can query contract class metadata. Maps to: getContractClassMetadata */
   canGetMetadata: boolean;
 }
diff --git a/yarn-project/aztec.js/src/wallet/deploy_account_method.ts b/yarn-project/aztec.js/src/wallet/deploy_account_method.ts
index a71ce42c9ae3..1d1040d0308c 100644
--- a/yarn-project/aztec.js/src/wallet/deploy_account_method.ts
+++ b/yarn-project/aztec.js/src/wallet/deploy_account_method.ts
@@ -11,7 +11,6 @@ import type { Account } from '../account/account.js';
 import type { Contract } from '../contract/contract.js';
 import type { ContractBase } from '../contract/contract_base.js';
 import {
-  type DeployInteractionWaitOptions,
   DeployMethod,
   type DeployOptions,
   type DeployOptionsWithoutWait,
@@ -22,6 +21,7 @@ import {
   type FeePaymentMethodOption,
   type InteractionWaitOptions,
   NO_FROM,
+  type NoFrom,
   type ProfileInteractionOptions,
   type SendInteractionOptionsWithoutWait,
 } from '../contract/interaction_options.js';
@@ -38,27 +38,22 @@ export type DeployAccountFeePaymentMethodOption = FeePaymentMethodOption & {
 };
 
 /**
- * The configuration options for the request method. Omits the contractAddressSalt, since
- * for account contracts that is fixed in the constructor
+ * The configuration options for the request method.
  */
-export type RequestDeployAccountOptions = Omit<RequestDeployOptions, 'contractAddressSalt' | 'fee'> & {
+export type RequestDeployAccountOptions = Omit<RequestDeployOptions, 'fee'> & {
   /** Fee options specific to account deployment */
   fee?: DeployAccountFeePaymentMethodOption;
+  /**
+   * Sender of the request. When NO_FROM, the to-be-deployed account pays for its own
+   * deployment (self-paid deploy) and the payload is wrapped through the multicall entrypoint.
+   */
+  from?: AztecAddress | NoFrom;
 };
 
 /**
- * Base configuration options for the send/prove methods without wait parameter. Omits:
- * - The contractAddressSalt, since for account contracts that is fixed in the constructor.
- * - UniversalDeployment flag, since account contracts are always deployed with it set to true
- */
-export type DeployAccountOptionsWithoutWait = Omit<DeployOptionsWithoutWait, 'contractAddressSalt' | 'universalDeploy'>;
-
-/**
- * The configuration options for the send/prove methods. Omits:
- * - The contractAddressSalt, since for account contracts that is fixed in the constructor.
- * - UniversalDeployment flag, since account contracts are always deployed with it set to true
+ * The configuration options for the send/prove methods.
  */
-export type DeployAccountOptions<W extends InteractionWaitOptions = undefined> = DeployAccountOptionsWithoutWait & {
+export type DeployAccountOptions<W extends InteractionWaitOptions = undefined> = DeployOptionsWithoutWait & {
   /**
    * Whether to wait for the transaction to be mined.
    * - undefined (default): wait with default options and return TxReceipt
@@ -69,10 +64,9 @@ export type DeployAccountOptions<W extends InteractionWaitOptions = undefined> =
 };
 
 /**
- * The configuration options for the simulate method. Omits the contractAddressSalt, since
- * for account contracts that is fixed in the constructor
+ * The configuration options for the simulate method.
  */
-export type SimulateDeployAccountOptions = Omit<SimulateDeployOptions, 'contractAddressSalt'>;
+export type SimulateDeployAccountOptions = SimulateDeployOptions;
 
 /** Fields from any interaction option shape that `DeployAccountMethod.prepareDeployOptions` reads or sets. */
 type DeployAccountInteractionOptions = Pick<
@@ -90,7 +84,7 @@ export class DeployAccountMethod<TContract extends ContractBase = Contract> exte
     wallet: Wallet,
     artifact: ContractArtifact,
     postDeployCtor: (instance: ContractInstanceWithAddress, wallet: Wallet) => TContract,
-    private salt: Fr,
+    salt: Fr,
     private account: Account,
     args: any[] = [],
     constructorNameOrArtifact?: string | FunctionArtifact,
@@ -99,12 +93,13 @@ export class DeployAccountMethod<TContract extends ContractBase = Contract> exte
     extraHashedArgs: HashedValues[] = [],
   ) {
     super(
-      publicKeys,
       wallet,
       artifact,
       postDeployCtor,
       args,
       constructorNameOrArtifact,
+      // Account contracts are always deployed universally.
+      { salt, universalDeploy: true, publicKeys },
       authWitnesses,
       capsules,
       extraHashedArgs,
@@ -123,9 +118,6 @@ export class DeployAccountMethod<TContract extends ContractBase = Contract> exte
    * @returns A FeePaymentMethod that routes the original one through the account's entrypoint (AccountEntrypointMetaPaymentMethod)
    */
   private async getSelfFeePaymentMethod(originalPaymentMethod?: FeePaymentMethod, feeEntrypointOptions?: any) {
-    if (!this.address) {
-      throw new Error('Instance is not yet constructed. This is a bug!');
-    }
     const chainInfo = await this.wallet.getChainInfo();
     return new AccountEntrypointMetaPaymentMethod(this.account, chainInfo, originalPaymentMethod, feeEntrypointOptions);
   }
@@ -140,10 +132,6 @@ export class DeployAccountMethod<TContract extends ContractBase = Contract> exte
   public override async request(opts?: RequestDeployAccountOptions): Promise<ExecutionPayload> {
     const optionsWithDefaults: RequestDeployOptions = {
       ...opts,
-      // Regardless of whom sends the transaction, account contracts
-      // are always deployed as universalDeployment: true
-      deployer: undefined,
-      contractAddressSalt: new Fr(this.salt),
       skipClassPublication: opts?.skipClassPublication ?? true,
       skipInstancePublication: opts?.skipInstancePublication ?? true,
       skipInitialization: opts?.skipInitialization ?? false,
@@ -151,8 +139,9 @@ export class DeployAccountMethod<TContract extends ContractBase = Contract> exte
     // Override the fee to undefined, since we'll replace it
     const deploymentExecutionPayload = await super.request({ ...optionsWithDefaults, fee: undefined });
     const executionPayloads = [deploymentExecutionPayload];
-    // If this is a self-deployment, manage the fee accordingly
-    if (opts?.deployer?.equals(AztecAddress.ZERO)) {
+    // If this is a self-paid deployment (the to-be-deployed account pays for its own deploy),
+    // wrap the payload through the multicall entrypoint after attaching the fee.
+    if (opts?.from === NO_FROM) {
       const feePaymentMethod = await this.getSelfFeePaymentMethod(
         opts?.fee?.paymentMethod,
         opts?.fee?.feeEntrypointOptions,
@@ -177,18 +166,7 @@ export class DeployAccountMethod<TContract extends ContractBase = Contract> exte
     }
   }
 
-  override convertDeployOptionsToRequestOptions(options: DeployAccountOptionsWithoutWait): RequestDeployAccountOptions {
-    return {
-      ...options,
-      // Deployer is handled in the request method and forcibly set to undefined,
-      // since our account contracts are created with universalDeployment: true
-      // We need to forward it though, because depending on the deployer we have to assemble
-      // The fee payment method one way or another
-      deployer: options.from === NO_FROM ? AztecAddress.ZERO : options.from,
-    };
-  }
-
-  protected override convertDeployOptionsToSendOptions<W extends DeployInteractionWaitOptions>(
+  protected override convertDeployOptionsToSendOptions<W extends InteractionWaitOptions>(
     options: DeployOptions<W>,
   ): SendOptions<W> {
     return super.convertDeployOptionsToSendOptions(this.prepareDeployOptions(options));
@@ -211,15 +189,18 @@ export class DeployAccountMethod<TContract extends ContractBase = Contract> exte
    * - When `from === NO_FROM` (self-paid deploy), supplies the to-be-deployed address as `sendMessagesAs`. Without
    *   this, fee-payment calls would have no sender for message tagging, and any private log they emit would fail
    *   the "Sender for tags is not set" assertion.
+   *
+   * Note: this reads the cached instance synchronously via `getCachedInstance()`. Because every code path that
+   * calls `prepareDeployOptions` (send/simulate/profile) flows through `request()` first, which calls
+   * `getInstance()`, the cache is always populated by the time we get here.
+   *
    * @param options - The deploy options to augment.
    */
   private prepareDeployOptions<T extends DeployAccountInteractionOptions>(options: T): T {
-    if (!this.address) {
-      throw new Error('Instance not yet constructed. This is a bug!');
-    }
+    const { address } = this.getCachedInstanceOrThrow();
     const existing = options.additionalScopes ?? [];
-    const sendMessagesAs = options.sendMessagesAs ?? (options.from === NO_FROM ? this.address : undefined);
-    return { ...options, additionalScopes: [...existing, this.address], sendMessagesAs };
+    const sendMessagesAs = options.sendMessagesAs ?? (options.from === NO_FROM ? address : undefined);
+    return { ...options, additionalScopes: [...existing, address], sendMessagesAs };
   }
 
   /**
diff --git a/yarn-project/aztec.js/src/wallet/wallet.test.ts b/yarn-project/aztec.js/src/wallet/wallet.test.ts
index 314d9e090f36..a165e8161bbd 100644
--- a/yarn-project/aztec.js/src/wallet/wallet.test.ts
+++ b/yarn-project/aztec.js/src/wallet/wallet.test.ts
@@ -18,6 +18,7 @@ import {
   TxSimulationResult,
   UtilityExecutionResult,
 } from '@aztec/stdlib/tx';
+import { DEV_VERSION } from '@aztec/stdlib/update-checker';
 
 import {
   type InteractionWaitOptions,
@@ -126,6 +127,7 @@ describe('WalletSchema', () => {
   it('registerContract', async () => {
     const mockArtifact: ContractArtifact = {
       name: 'TestContract',
+      aztecVersion: DEV_VERSION,
       functions: [],
       nonDispatchPublicFunctions: [],
       outputs: { structs: {}, globals: {} },
@@ -155,6 +157,19 @@ describe('WalletSchema', () => {
     });
   });
 
+  it('registerContractClass', async () => {
+    const mockArtifact: ContractArtifact = {
+      name: 'TestContract',
+      aztecVersion: DEV_VERSION,
+      functions: [],
+      nonDispatchPublicFunctions: [],
+      outputs: { structs: {}, globals: {} },
+      fileMap: {},
+      storageLayout: {},
+    };
+    await context.client.registerContractClass(mockArtifact);
+  });
+
   it('simulateTx', async () => {
     const exec: ExecutionPayload = {
       calls: [],
@@ -318,6 +333,7 @@ describe('WalletSchema', () => {
 
     const mockArtifact: ContractArtifact = {
       name: 'TestContract',
+      aztecVersion: DEV_VERSION,
       functions: [],
       nonDispatchPublicFunctions: [],
       outputs: { structs: {}, globals: {} },
@@ -448,6 +464,8 @@ class MockWallet implements Wallet {
     };
   }
 
+  async registerContractClass(_artifact: any): Promise<void> {}
+
   async simulateTx(_exec: ExecutionPayload, _opts: SimulateOptions): Promise<TxSimulationResultWithAppOffset> {
     return TxSimulationResultWithAppOffset.fromResultAndOffset(await TxSimulationResult.random(), 0);
   }
diff --git a/yarn-project/aztec.js/src/wallet/wallet.ts b/yarn-project/aztec.js/src/wallet/wallet.ts
index 9fd080aaec98..735794c79156 100644
--- a/yarn-project/aztec.js/src/wallet/wallet.ts
+++ b/yarn-project/aztec.js/src/wallet/wallet.ts
@@ -19,6 +19,7 @@ import type { ExecutionPayload, InTx } from '@aztec/stdlib/tx';
 import {
   Capsule,
   HashedValues,
+  SimulationOverrides,
   TxHash,
   TxProfileResult,
   TxReceipt,
@@ -271,6 +272,12 @@ export type Wallet = {
     artifact?: ContractArtifact,
     secretKey?: Fr,
   ): Promise<ContractInstanceWithAddress>;
+  /**
+   * Registers a contract class artifact in the local PXE without binding it to any instance.
+   * Useful for simulation flows that need the artifact available locally before any on-chain
+   * upgrade has taken effect. No chain check.
+   */
+  registerContractClass(artifact: ContractArtifact): Promise<void>;
   simulateTx(exec: ExecutionPayload, opts: SimulateOptions): Promise<TxSimulationResultWithAppOffset>;
   executeUtility(call: FunctionCall, opts: ExecuteUtilityOptions): Promise<UtilityExecutionResult>;
   profileTx(exec: ExecutionPayload, opts: ProfileOptions): Promise<TxProfileResult>;
@@ -335,6 +342,7 @@ export const SimulateOptionsSchema = z.object({
   skipFeeEnforcement: optional(z.boolean()),
   includeMetadata: optional(z.boolean()),
   additionalScopes: optional(z.array(schemas.AztecAddress)),
+  overrides: optional(SimulationOverrides.schema),
 });
 
 export const ProfileOptionsSchema = SimulateOptionsSchema.extend({
@@ -427,6 +435,7 @@ export const GrantedContractsCapabilitySchema = ContractsCapabilitySchema;
 export const ContractClassesCapabilitySchema = z.object({
   type: z.literal('contractClasses'),
   classes: z.union([z.literal('*'), z.array(schemas.Fr)]),
+  canRegister: optional(z.boolean()),
   canGetMetadata: z.boolean(),
 });
 
@@ -557,6 +566,7 @@ const WalletMethodSchemas = {
     .function()
     .args(ContractInstanceWithAddressSchema, optional(ContractArtifactSchema), optional(schemas.Fr))
     .returns(ContractInstanceWithAddressSchema),
+  registerContractClass: z.function().args(ContractArtifactSchema).returns(z.void()),
   simulateTx: z
     .function()
     .args(ExecutionPayloadSchema, SimulateOptionsSchema)
diff --git a/yarn-project/aztec/src/bin/index.ts b/yarn-project/aztec/src/bin/index.ts
index 55d55831457d..a47a27bf2f34 100644
--- a/yarn-project/aztec/src/bin/index.ts
+++ b/yarn-project/aztec/src/bin/index.ts
@@ -47,7 +47,7 @@ async function main() {
   await enrichEnvironmentWithNetworkConfig(networkName);
   enrichEnvironmentWithChainName(networkName);
 
-  const cliVersion = getPackageVersion() ?? 'unknown';
+  const cliVersion = getPackageVersion();
   let program = new Command('aztec');
   program.description('Aztec command line interface').version(cliVersion).enablePositionalOptions();
   program = injectAztecCommands(program, userLog, debugLogger);
diff --git a/yarn-project/aztec/src/cli/aztec_start_action.ts b/yarn-project/aztec/src/cli/aztec_start_action.ts
index bc46c50af937..856ea28b4aaf 100644
--- a/yarn-project/aztec/src/cli/aztec_start_action.ts
+++ b/yarn-project/aztec/src/cli/aztec_start_action.ts
@@ -29,7 +29,7 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
   if (options.localNetwork) {
     const localNetwork = extractNamespacedOptions(options, 'localNetwork');
     userLog(`${splash}\n${github}\n\n`);
-    userLog(`Setting up Aztec local network ${packageVersion ?? 'unknown'}, please stand by...`);
+    userLog(`Setting up Aztec local network ${packageVersion}, please stand by...`);
 
     const { node, stop } = await createLocalNetwork(
       {
@@ -67,9 +67,6 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
     } else if (options.bot) {
       const { startBot } = await import('./cmds/start_bot.js');
       await startBot(options, signalHandlers, services, userLog);
-    } else if (options.archiver) {
-      const { startArchiver } = await import('./cmds/start_archiver.js');
-      ({ config } = await startArchiver(options, signalHandlers, services));
     } else if (options.p2pBootstrap) {
       const { startP2PBootstrap } = await import('./cmds/start_p2p_bootstrap.js');
       ({ config } = await startP2PBootstrap(options, signalHandlers, services, userLog));
diff --git a/yarn-project/aztec/src/cli/aztec_start_options.ts b/yarn-project/aztec/src/cli/aztec_start_options.ts
index b4c85349f9cb..dec92e996fd7 100644
--- a/yarn-project/aztec/src/cli/aztec_start_options.ts
+++ b/yarn-project/aztec/src/cli/aztec_start_options.ts
@@ -222,12 +222,6 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
     },
   ],
   ARCHIVER: [
-    {
-      flag: '--archiver',
-      description: 'Starts Aztec Archiver with options',
-      defaultValue: undefined,
-      env: undefined,
-    },
     ...getOptions(
       'archiver',
       omitConfigMappings(archiverConfigMappings, Object.keys(l1ContractsConfigMappings) as (keyof ArchiverConfig)[]),
@@ -326,15 +320,7 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
     },
     ...getOptions('bot', botConfigMappings),
   ],
-  PXE: [
-    {
-      flag: '--pxe',
-      description: 'Starts Aztec PXE with options',
-      defaultValue: undefined,
-      env: undefined,
-    },
-    ...getOptions('pxe', allPxeConfigMappings),
-  ],
+  PXE: [...getOptions('pxe', allPxeConfigMappings)],
   TXE: [
     {
       flag: '--txe',
diff --git a/yarn-project/aztec/src/cli/cmds/compile.ts b/yarn-project/aztec/src/cli/cmds/compile.ts
index 5fc2259b2305..aa6a0b06ed19 100644
--- a/yarn-project/aztec/src/cli/cmds/compile.ts
+++ b/yarn-project/aztec/src/cli/cmds/compile.ts
@@ -1,9 +1,10 @@
 import { findBbBinary } from '@aztec/bb.js';
 import type { LogFn } from '@aztec/foundation/log';
+import { getPackageVersion } from '@aztec/stdlib/update-checker';
 
 import { execFileSync } from 'child_process';
 import type { Command } from 'commander';
-import { readFile } from 'fs/promises';
+import { readFile, writeFile } from 'fs/promises';
 import { join } from 'path';
 
 import { readArtifactFiles } from './utils/artifacts.js';
@@ -25,6 +26,17 @@ async function collectContractArtifacts(): Promise<string[]> {
   return files.filter(f => Array.isArray(f.content.functions)).map(f => f.filePath);
 }
 
+/** Stamps the Aztec stack version into the contract artifacts. */
+async function stampAztecVersion(artifactPaths: string[]): Promise<void> {
+  const version = getPackageVersion();
+  for (const path of artifactPaths) {
+    const artifact = JSON.parse(await readFile(path, 'utf-8'));
+    // eslint-disable-next-line camelcase
+    artifact.aztec_version = version;
+    await writeFile(path, JSON.stringify(artifact, null, 2) + '\n');
+  }
+}
+
 /** Returns the set of package names that are contract crates in the current workspace. */
 async function getContractPackageNames(): Promise<Set<string>> {
   const contractNames = new Set<string>();
@@ -148,6 +160,8 @@ async function compileAztecContract(nargoArgs: string[], log: LogFn): Promise<vo
     log('Postprocessing contracts...');
     const bbArgs = artifacts.flatMap(a => ['-i', a]);
     await run(bb, ['aztec_process', ...bbArgs]);
+
+    await stampAztecVersion(artifacts);
   }
 
   log('Compilation complete!');
diff --git a/yarn-project/aztec/src/cli/cmds/profile.ts b/yarn-project/aztec/src/cli/cmds/profile.ts
index d7248025074a..03854f73cd20 100644
--- a/yarn-project/aztec/src/cli/cmds/profile.ts
+++ b/yarn-project/aztec/src/cli/cmds/profile.ts
@@ -11,8 +11,9 @@ export function injectProfileCommand(program: Command, log: LogFn): Command {
   profile
     .command('gates')
     .argument('[target-dir]', 'Path to the compiled artifacts directory', './target')
+    .option('--json', 'Output gate counts as JSON instead of a table', false)
     .description('Display gate counts for all compiled Aztec artifacts in a target directory.')
-    .action((targetDir: string) => profileGates(targetDir, log));
+    .action((targetDir: string, options: { json: boolean }) => profileGates(targetDir, options.json, log));
 
   profile
     .command('flamegraph')
diff --git a/yarn-project/aztec/src/cli/cmds/profile_gates.test.ts b/yarn-project/aztec/src/cli/cmds/profile_gates.test.ts
index d933dc232f0f..8a02b526d54a 100644
--- a/yarn-project/aztec/src/cli/cmds/profile_gates.test.ts
+++ b/yarn-project/aztec/src/cli/cmds/profile_gates.test.ts
@@ -1,6 +1,7 @@
 import { afterAll, beforeAll, describe, expect, it } from '@jest/globals';
 import { execFileSync } from 'child_process';
-import { rmSync } from 'fs';
+import { mkdtempSync, rmSync } from 'fs';
+import { tmpdir } from 'os';
 import { dirname, join } from 'path';
 import { fileURLToPath } from 'url';
 
@@ -11,15 +12,20 @@ const TARGET = join(WORKSPACE, 'target');
 
 describe('aztec profile gates', () => {
   let gatesOutput: string;
+  let gatesJsonOutput: string;
+  let emptyDir: string;
 
   beforeAll(() => {
     rmSync(TARGET, { recursive: true, force: true });
     runCompile();
     gatesOutput = runProfile('gates');
+    gatesJsonOutput = runProfile('gates', '--json');
+    emptyDir = mkdtempSync(join(tmpdir(), 'aztec-profile-gates-empty-'));
   }, 300_000);
 
   afterAll(() => {
     rmSync(TARGET, { recursive: true, force: true });
+    rmSync(emptyDir, { recursive: true, force: true });
   });
 
   it('prints gate counts for both contract functions', () => {
@@ -39,6 +45,37 @@ describe('aztec profile gates', () => {
       expect(count).toBeGreaterThan(0);
     }
   });
+
+  it('emits a JSON array with name/type/gates entries with --json', () => {
+    const parsed = JSON.parse(gatesJsonOutput);
+    expect(Array.isArray(parsed)).toBe(true);
+
+    expect(parsed).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({ name: 'simple_circuit', type: 'program' }),
+        expect.objectContaining({ name: 'simple_circuit_2', type: 'program' }),
+        expect.objectContaining({
+          name: 'simple_contract-SimpleContract::private_function',
+          type: 'contract-function',
+        }),
+        expect.objectContaining({
+          name: 'simple_contract-SimpleContract::another_private_function',
+          type: 'contract-function',
+        }),
+      ]),
+    );
+
+    for (const entry of parsed) {
+      expect(typeof entry.gates).toBe('number');
+      expect(entry.gates).toBeGreaterThan(0);
+      expect(['program', 'contract-function']).toContain(entry.type);
+    }
+  });
+
+  it('emits an empty JSON array when the target directory has no artifacts', () => {
+    const output = runProfileWithTarget('gates', emptyDir, '--json');
+    expect(JSON.parse(output)).toEqual([]);
+  });
 });
 
 function runCompile() {
@@ -49,9 +86,16 @@ function runCompile() {
   }
 }
 
-function runProfile(subcommand: string) {
+function runProfile(subcommand: string, ...extraArgs: string[]) {
+  return runProfileWithTarget(subcommand, TARGET, ...extraArgs);
+}
+
+function runProfileWithTarget(subcommand: string, target: string, ...extraArgs: string[]) {
   try {
-    return execFileSync('node', [CLI, 'profile', subcommand, TARGET], { encoding: 'utf-8', stdio: 'pipe' });
+    return execFileSync('node', [CLI, 'profile', subcommand, target, ...extraArgs], {
+      encoding: 'utf-8',
+      stdio: 'pipe',
+    });
   } catch (e: any) {
     throw new Error(`profile ${subcommand} failed:\n${e.stderr?.toString() ?? e.message}`);
   }
diff --git a/yarn-project/aztec/src/cli/cmds/profile_gates.ts b/yarn-project/aztec/src/cli/cmds/profile_gates.ts
index 1e4f175d8180..8c0893ff7d80 100644
--- a/yarn-project/aztec/src/cli/cmds/profile_gates.ts
+++ b/yarn-project/aztec/src/cli/cmds/profile_gates.ts
@@ -6,12 +6,13 @@ import { execFile as execFileCb } from 'child_process';
 import { rm } from 'fs/promises';
 import { promisify } from 'util';
 
-import { MAX_CONCURRENT, discoverArtifacts } from './profile_utils.js';
+import { type DiscoveredArtifact, MAX_CONCURRENT, discoverArtifacts } from './profile_utils.js';
 
 const execFile = promisify(execFileCb);
 
 interface GateCountResult {
   name: string;
+  type: DiscoveredArtifact['type'];
   gateCount: number;
 }
 
@@ -32,24 +33,39 @@ async function getGateCount(bb: string, artifactPath: string): Promise<number> {
 }
 
 /** Profiles all compiled artifacts in a target directory and prints gate counts. */
-export async function profileGates(targetDir: string, log: LogFn): Promise<void> {
+export async function profileGates(targetDir: string, json: boolean, log: LogFn): Promise<void> {
   const bb = process.env.BB ?? findBbBinary() ?? 'bb';
   const { artifacts, tmpDir } = await discoverArtifacts(targetDir);
 
   if (artifacts.length === 0) {
-    log('No artifacts found in target directory.');
+    if (json) {
+      log('[]');
+    } else {
+      log('No artifacts found in target directory.');
+    }
     return;
   }
 
   try {
     const results: GateCountResult[] = await asyncPool(MAX_CONCURRENT, artifacts, async artifact => ({
       name: artifact.name,
+      type: artifact.type,
       gateCount: await getGateCount(bb, artifact.filePath),
     }));
     results.sort((a, b) => a.name.localeCompare(b.name));
 
     if (results.length === 0) {
-      log('No constrained circuits found.');
+      if (json) {
+        log('[]');
+      } else {
+        log('No constrained circuits found.');
+      }
+      return;
+    }
+
+    if (json) {
+      const entries = results.map(r => ({ name: r.name, type: r.type, gates: r.gateCount }));
+      log(JSON.stringify(entries, null, 2));
       return;
     }
 
diff --git a/yarn-project/aztec/src/cli/cmds/start_archiver.ts b/yarn-project/aztec/src/cli/cmds/start_archiver.ts
deleted file mode 100644
index e4bb2bd72db9..000000000000
--- a/yarn-project/aztec/src/cli/cmds/start_archiver.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { type ArchiverConfig, archiverConfigMappings, createArchiver, getArchiverConfigFromEnv } from '@aztec/archiver';
-import { createLogger } from '@aztec/aztec.js/log';
-import { type BlobClientConfig, blobClientConfigMapping, createBlobClient } from '@aztec/blob-client/client';
-import { getL1Config } from '@aztec/cli/config';
-import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
-import { ArchiverApiSchema } from '@aztec/stdlib/interfaces/server';
-import { type DataStoreConfig, dataConfigMappings } from '@aztec/stdlib/kv-store';
-import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient } from '@aztec/telemetry-client';
-
-import { extractRelevantOptions } from '../util.js';
-
-export type { ArchiverConfig, DataStoreConfig };
-
-/** Starts a standalone archiver. */
-export async function startArchiver(
-  options: any,
-  signalHandlers: (() => Promise<void>)[],
-  services: NamespacedApiHandlers,
-): Promise<{ config: ArchiverConfig & DataStoreConfig }> {
-  const envConfig = getArchiverConfigFromEnv();
-  const cliOptions = extractRelevantOptions<ArchiverConfig & DataStoreConfig & BlobClientConfig>(
-    options,
-    {
-      // dataConfigMappings must come first: its l1Contracts only maps rollupAddress,
-      // while archiverConfigMappings (spread later) maps all L1 contract addresses.
-      ...dataConfigMappings,
-      ...archiverConfigMappings,
-      ...blobClientConfigMapping,
-    },
-    'archiver',
-  );
-
-  let archiverConfig = { ...envConfig, ...cliOptions };
-  archiverConfig.dataStoreMapSizeKb = archiverConfig.archiverStoreMapSizeKb ?? archiverConfig.dataStoreMapSizeKb;
-
-  if (!archiverConfig.l1Contracts.registryAddress || archiverConfig.l1Contracts.registryAddress.isZero()) {
-    throw new Error('L1 registry address is required to start an Archiver');
-  }
-
-  const { addresses, config: l1Config } = await getL1Config(
-    archiverConfig.l1Contracts.registryAddress,
-    archiverConfig.l1RpcUrls,
-    archiverConfig.l1ChainId,
-  );
-
-  archiverConfig.l1Contracts = addresses;
-  archiverConfig = { ...archiverConfig, ...l1Config };
-
-  const telemetry = await initTelemetryClient(getTelemetryClientConfig());
-  const blobClient = createBlobClient(archiverConfig, { logger: createLogger('archiver:blob-client:client') });
-  const archiver = await createArchiver(archiverConfig, { telemetry, blobClient }, { blockUntilSync: true });
-  services.archiver = [archiver, ArchiverApiSchema];
-  signalHandlers.push(archiver.stop);
-
-  return { config: archiverConfig };
-}
diff --git a/yarn-project/aztec/src/cli/cmds/start_prover_agent.ts b/yarn-project/aztec/src/cli/cmds/start_prover_agent.ts
index 4f6814578e17..738bb7ba81db 100644
--- a/yarn-project/aztec/src/cli/cmds/start_prover_agent.ts
+++ b/yarn-project/aztec/src/cli/cmds/start_prover_agent.ts
@@ -24,8 +24,8 @@ export async function startProverAgent(
   services: NamespacedApiHandlers,
   userLog: LogFn,
 ) {
-  if (options.node || options.sequencer || options.pxe || options.p2pBootstrap || options.txe) {
-    userLog(`Starting a prover agent with --node, --sequencer, --pxe, --p2p-bootstrap, or --txe is not supported.`);
+  if (options.node || options.sequencer || options.p2pBootstrap || options.txe) {
+    userLog(`Starting a prover agent with --node, --sequencer, --p2p-bootstrap, or --txe is not supported.`);
     process.exit(1);
   }
 
diff --git a/yarn-project/aztec/src/cli/cmds/start_prover_broker.ts b/yarn-project/aztec/src/cli/cmds/start_prover_broker.ts
index 1384a2a52373..e35928714fc8 100644
--- a/yarn-project/aztec/src/cli/cmds/start_prover_broker.ts
+++ b/yarn-project/aztec/src/cli/cmds/start_prover_broker.ts
@@ -24,8 +24,8 @@ export async function startProverBroker(
   services: NamespacedApiHandlers,
   userLog: LogFn,
 ): Promise<{ broker: ProvingJobBroker; config: ProverBrokerConfig }> {
-  if (options.node || options.sequencer || options.pxe || options.p2pBootstrap || options.txe) {
-    userLog(`Starting a prover broker with --node, --sequencer, --pxe, --p2p-bootstrap, or --txe is not supported.`);
+  if (options.node || options.sequencer || options.p2pBootstrap || options.txe) {
+    userLog(`Starting a prover broker with --node, --sequencer, --p2p-bootstrap, or --txe is not supported.`);
     process.exit(1);
   }
 
diff --git a/yarn-project/aztec/src/cli/cmds/utils/warn_if_aztec_version_mismatch.test.ts b/yarn-project/aztec/src/cli/cmds/utils/warn_if_aztec_version_mismatch.test.ts
index 544e201bfc0d..5a336ccdb0ee 100644
--- a/yarn-project/aztec/src/cli/cmds/utils/warn_if_aztec_version_mismatch.test.ts
+++ b/yarn-project/aztec/src/cli/cmds/utils/warn_if_aztec_version_mismatch.test.ts
@@ -1,3 +1,5 @@
+import { DEV_VERSION } from '@aztec/stdlib/update-checker';
+
 import { afterEach, beforeEach, describe, expect, it } from '@jest/globals';
 import { mkdir, rm, writeFile } from 'fs/promises';
 import { tmpdir } from 'os';
@@ -136,13 +138,14 @@ describe('warnIfAztecVersionMismatch', () => {
     expect(logMessages.filter(m => m.includes('WARNING'))).toHaveLength(0);
   });
 
-  it('warns when the CLI version is not available', async () => {
-    await makePackage(tempDir, 'project', 'contract');
+  it('skips the check when running from a monorepo checkout', async () => {
+    await makePackage(tempDir, 'project', 'contract', {
+      aztec: '{ git = "https://github.com/AztecProtocol/aztec-nr", tag = "v1.2.3", directory = "aztec" }',
+    });
 
-    await warnIfAztecVersionMismatch(log, '');
+    await warnIfAztecVersionMismatch(log, DEV_VERSION);
 
-    expect(logMessages).toHaveLength(1);
-    expect(logMessages[0]).toContain('CLI version not found');
+    expect(logMessages).toHaveLength(0);
   });
 
   it('does not warn when the project has no aztec dependency', async () => {
diff --git a/yarn-project/aztec/src/cli/cmds/utils/warn_if_aztec_version_mismatch.ts b/yarn-project/aztec/src/cli/cmds/utils/warn_if_aztec_version_mismatch.ts
index 3cedfa39a660..7c0e2a1f664c 100644
--- a/yarn-project/aztec/src/cli/cmds/utils/warn_if_aztec_version_mismatch.ts
+++ b/yarn-project/aztec/src/cli/cmds/utils/warn_if_aztec_version_mismatch.ts
@@ -1,5 +1,5 @@
 import type { LogFn } from '@aztec/foundation/log';
-import { getPackageVersion } from '@aztec/stdlib/update-checker';
+import { DEV_VERSION, getPackageVersion } from '@aztec/stdlib/update-checker';
 
 import TOML from '@iarna/toml';
 import { readFile } from 'fs/promises';
@@ -28,8 +28,7 @@ function isAztecNrGitUrl(gitUrl: string): boolean {
 /** Warns if any aztec-nr git dependency in a crate's Nargo.toml has a tag that doesn't match the CLI version. */
 export async function warnIfAztecVersionMismatch(log: LogFn, cliVersion?: string): Promise<void> {
   const version = cliVersion ?? getPackageVersion();
-  if (!version) {
-    log(`WARNING: aztec CLI version not found. Skipping dependency compatibility check.`);
+  if (version === DEV_VERSION) {
     return;
   }
 
diff --git a/yarn-project/aztec/src/cli/util.ts b/yarn-project/aztec/src/cli/util.ts
index 1a908ab6c93a..06d91a711ae2 100644
--- a/yarn-project/aztec/src/cli/util.ts
+++ b/yarn-project/aztec/src/cli/util.ts
@@ -311,7 +311,7 @@ export async function setupVersionChecker(
   const checks: Array<VersionCheck> = [];
   checks.push({
     name: 'node',
-    currentVersion: getPackageVersion() ?? 'unknown',
+    currentVersion: getPackageVersion(),
     getLatestVersion: async () => {
       const cfg = await getNetworkConfig(network, cacheDir);
       return cfg?.nodeVersion;
diff --git a/yarn-project/aztec/src/local-network/banana_fpc.ts b/yarn-project/aztec/src/local-network/banana_fpc.ts
index e5363e0eda73..1c0c1f500b4a 100644
--- a/yarn-project/aztec/src/local-network/banana_fpc.ts
+++ b/yarn-project/aztec/src/local-network/banana_fpc.ts
@@ -49,15 +49,12 @@ export async function setupBananaFPC(initialAccounts: InitialAccountData[], wall
   const bananaCoinAddress = await getBananaCoinAddress(initialAccounts);
   const admin = getBananaAdmin(initialAccounts);
   const [{ contract: bananaCoin }, { contract: fpc }] = await Promise.all([
-    TokenContract.deploy(wallet, admin, bananaCoinArgs.name, bananaCoinArgs.symbol, bananaCoinArgs.decimal).send({
-      from: admin,
-      contractAddressSalt: BANANA_COIN_SALT,
+    TokenContract.deploy(wallet, admin, bananaCoinArgs.name, bananaCoinArgs.symbol, bananaCoinArgs.decimal, {
+      salt: BANANA_COIN_SALT,
       universalDeploy: true,
-    }),
-    FPCContract.deploy(wallet, bananaCoinAddress, admin).send({
+    }).send({ from: admin }),
+    FPCContract.deploy(wallet, bananaCoinAddress, admin, { salt: BANANA_FPC_SALT, universalDeploy: true }).send({
       from: admin,
-      contractAddressSalt: BANANA_FPC_SALT,
-      universalDeploy: true,
     }),
   ]);
 
diff --git a/yarn-project/aztec/src/testing/epoch_test_settler.ts b/yarn-project/aztec/src/testing/epoch_test_settler.ts
index c2fa06dcf024..37697b74ed29 100644
--- a/yarn-project/aztec/src/testing/epoch_test_settler.ts
+++ b/yarn-project/aztec/src/testing/epoch_test_settler.ts
@@ -31,8 +31,7 @@ export class EpochTestSettler {
   }
 
   async handleEpochReadyToProve(epoch: EpochNumber): Promise<boolean> {
-    const checkpointedBlocks = await this.l2BlockSource.getCheckpointedBlocksForEpoch(epoch);
-    const blocks = checkpointedBlocks.map(b => b.block);
+    const blocks = await this.l2BlockSource.getBlocks({ epoch, onlyCheckpointed: true });
     this.log.info(
       `Settling epoch ${epoch} with blocks ${blocks[0]?.header.getBlockNumber()} to ${blocks.at(-1)?.header.getBlockNumber()}`,
       { blocks: blocks.map(b => b.toBlockInfo()) },
@@ -58,7 +57,7 @@ export class EpochTestSettler {
       this.log.info(`No L2 to L1 messages in epoch ${epoch}`);
     }
 
-    const lastCheckpoint = checkpointedBlocks.at(-1)?.checkpointNumber;
+    const lastCheckpoint = blocks.at(-1)?.checkpointNumber;
     if (lastCheckpoint !== undefined) {
       await this.rollupCheatCodes.markAsProven(lastCheckpoint);
     } else {
diff --git a/yarn-project/bb-prover/package.json b/yarn-project/bb-prover/package.json
index 5e08beeba10c..c981776719d0 100644
--- a/yarn-project/bb-prover/package.json
+++ b/yarn-project/bb-prover/package.json
@@ -9,7 +9,8 @@
     "./client": "./dest/prover/client/bb_private_kernel_prover.js",
     "./verifier": "./dest/verifier/index.js",
     "./test": "./dest/test/index.js",
-    "./config": "./dest/config.js"
+    "./config": "./dest/config.js",
+    "./debug": "./dest/bb/bb_js_debug.js"
   },
   "bin": {
     "bb-cli": "./dest/bb/index.js"
diff --git a/yarn-project/bb-prover/src/avm_proving_tests/avm_proving_tester.ts b/yarn-project/bb-prover/src/avm_proving_tests/avm_proving_tester.ts
index 2fc15a2599a9..d0953a606e4a 100644
--- a/yarn-project/bb-prover/src/avm_proving_tests/avm_proving_tester.ts
+++ b/yarn-project/bb-prover/src/avm_proving_tests/avm_proving_tester.ts
@@ -1,4 +1,4 @@
-import type { LogFn, LogLevel, Logger } from '@aztec/foundation/log';
+import type { AvmStat } from '@aztec/bb.js';
 import { Timer } from '@aztec/foundation/timer';
 import {
   PublicTxSimulationTester,
@@ -15,77 +15,12 @@ import type { MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server'
 import type { GlobalVariables } from '@aztec/stdlib/tx';
 import { NativeWorldStateService } from '@aztec/world-state';
 
-import fs from 'node:fs/promises';
-import { tmpdir } from 'node:os';
 import path from 'path';
 
-import { type BBResult, type BBSuccess, BB_RESULT, generateAvmProof, verifyAvmProof } from '../bb/execute.js';
+import { BBJsProverFactory } from '../bb/bb_js_backend.js';
 
 const BB_PATH = path.resolve('../../barretenberg/cpp/build/bin/bb-avm');
 
-// An InterceptingLogger that records all log messages and forwards them to a wrapped logger.
-class InterceptingLogger implements Logger {
-  public readonly logs: string[] = [];
-  public level: LogLevel;
-  public module: string;
-
-  private logger: Logger;
-
-  constructor(logger: Logger) {
-    this.logger = logger;
-    this.level = logger.level;
-    this.module = logger.module;
-  }
-
-  isLevelEnabled(level: LogLevel): boolean {
-    return this.logger.isLevelEnabled(level);
-  }
-
-  createChild(_childModule: string): Logger {
-    throw new Error('Not implemented');
-  }
-
-  getBindings() {
-    return this.logger.getBindings();
-  }
-
-  private intercept(level: LogLevel, msg: string, ...args: any[]) {
-    this.logs.push(...msg.split('\n'));
-    // Forward to the wrapped logger
-    (this.logger[level] as LogFn)(msg, ...args);
-  }
-
-  // Log methods for each level
-  silent(msg: string, ...args: any[]) {
-    this.intercept('silent', msg, ...args);
-  }
-  fatal(msg: string, ...args: any[]) {
-    this.intercept('fatal', msg, ...args);
-  }
-  warn(msg: string, ...args: any[]) {
-    this.intercept('warn', msg, ...args);
-  }
-  info(msg: string, ...args: any[]) {
-    this.intercept('info', msg, ...args);
-  }
-  verbose(msg: string, ...args: any[]) {
-    this.intercept('verbose', msg, ...args);
-  }
-  debug(msg: string, ...args: any[]) {
-    this.intercept('debug', msg, ...args);
-  }
-  trace(msg: string, ...args: any[]) {
-    this.intercept('trace', msg, ...args);
-  }
-
-  // Error log function can be string or Error
-  error(err: Error | string, ...args: any[]) {
-    const msg = typeof err === 'string' ? err : err.message;
-    this.logs.push(msg);
-    this.logger.error(msg, err, ...args);
-  }
-}
-
 // Config with collectHints enabled for proving tests
 const provingConfig: PublicSimulatorConfig = PublicSimulatorConfig.from({
   skipFeeEnforcement: false,
@@ -97,7 +32,7 @@ const provingConfig: PublicSimulatorConfig = PublicSimulatorConfig.from({
 });
 
 export class AvmProvingTester extends PublicTxSimulationTester {
-  private bbWorkingDirectory: string = '';
+  private readonly bbJsFactory = new BBJsProverFactory(BB_PATH);
 
   constructor(
     private checkCircuitOnly: boolean,
@@ -121,53 +56,54 @@ export class AvmProvingTester extends PublicTxSimulationTester {
     return new AvmProvingTester(checkCircuitOnly, contractDataSource, merkleTrees, globals, metrics);
   }
 
-  async prove(avmCircuitInputs: AvmCircuitInputs, txLabel: string = 'unlabeledTx'): Promise<BBResult> {
-    // We use a new working directory for each proof.
-    this.bbWorkingDirectory = await fs.mkdtemp(path.join(tmpdir(), 'bb-'));
+  /**
+   * Generate an AVM proof (or run check-circuit if configured). Records per-stage timings in the test metrics.
+   * Returns the in-memory proof fields on success; throws via jest expect() on failure.
+   */
+  async prove(avmCircuitInputs: AvmCircuitInputs, txLabel: string = 'unlabeledTx'): Promise<Uint8Array[]> {
+    const inputsBuffer = avmCircuitInputs.serializeWithMessagePack();
 
-    const interceptingLogger = new InterceptingLogger(this.logger);
+    if (this.checkCircuitOnly) {
+      const { passed, stats } = await this.bbJsFactory.withFreshInstance(i => i.checkAvmCircuit(inputsBuffer));
+      this.recordProverMetrics(stats, txLabel);
+      expect(passed).toBe(true);
+      return [];
+    }
 
-    // Then we prove.
-    const proofRes = await generateAvmProof(
-      BB_PATH,
-      this.bbWorkingDirectory,
-      avmCircuitInputs,
-      interceptingLogger,
-      this.checkCircuitOnly,
-    );
-    if (proofRes.status === BB_RESULT.FAILURE) {
-      this.logger.error(`Proof generation failed: ${proofRes.reason}`);
+    const { proof, stats } = await this.bbJsFactory.withFreshInstance(i => i.generateAvmProof(inputsBuffer));
+    this.recordProverMetrics(stats, txLabel);
+    return proof;
+  }
+
+  async verify(proof: Uint8Array[], publicInputs: AvmCircuitPublicInputs): Promise<void> {
+    if (this.checkCircuitOnly) {
+      // Check-circuit did not generate a proof; nothing to verify.
+      return;
     }
-    expect(proofRes.status).toEqual(BB_RESULT.SUCCESS);
+    const piBuffer = publicInputs.serializeWithMessagePack();
+    const { verified } = await this.bbJsFactory.withFreshInstance(i => i.verifyAvmProof(proof, piBuffer));
+    expect(verified).toBe(true);
+  }
 
-    // Parse the logs into a structured format.
-    const logs = interceptingLogger.logs;
-    // const traceSizes: { name: string; size: number }[] = [];
-    // logs.forEach(log => {
-    //   const match = log.match(/\b(\w+): (\d+) \(~2/);
-    //   if (match) {
-    //     traceSizes.push({
-    //       name: match[1],
-    //       size: parseInt(match[2]),
-    //     });
-    //   }
-    // });
-    const times: { [key: string]: number } = {};
-    logs.forEach(log => {
-      const match = log.match(/\b([\w/]+)_ms: (\d+)/);
-      if (match) {
-        times[match[1]] = parseInt(match[2]);
-      }
-    });
+  public async proveVerify(avmCircuitInputs: AvmCircuitInputs, txLabel: string = 'unlabeledTx') {
+    const proof = await this.prove(avmCircuitInputs, txLabel);
+    await this.verify(proof, avmCircuitInputs.publicInputs);
+  }
 
-    // Throw if logs did not contain any times.
+  private recordProverMetrics(stats: AvmStat[], txLabel: string) {
+    // Build a lookup keyed on the stage name with the `_ms` suffix stripped, matching the legacy
+    // stdout-scraped shape. bb::avm2::Stats::time() stores keys with `_ms` appended.
+    const times: { [key: string]: number } = {};
+    for (const { name, valueMs } of stats) {
+      const key = name.endsWith('_ms') ? name.slice(0, -'_ms'.length) : name;
+      times[key] = valueMs;
+    }
     if (Object.keys(times).length === 0) {
-      throw new Error('AVM stdout did not contain any proving times in the stats!');
+      throw new Error('AVM response did not contain any proving-stage timings!');
     }
-
     // Hack to make labels match.
     const txLabelWithCount = `${txLabel}/${this.txCount - 1}`;
-    // I need to cast because TS doesnt realize metrics is protected not private.
+    // Cast because TS doesn't realize `metrics` is protected, not private on the parent class.
     (this as any).metrics?.recordProverMetrics(txLabelWithCount, {
       proverSimulationStepMs: times['simulation/all'],
       proverProvingStepMs: times['proving/all'],
@@ -180,26 +116,6 @@ export class AvmProvingTester extends PublicTxSimulationTester {
       provingLogDerivativeInverseCommitmentsMs: times['prove/log_derivative_inverse_commitments_round'],
       provingWireCommitmentsMs: times['prove/wire_commitments_round'],
     });
-
-    return proofRes as BBSuccess;
-  }
-
-  async verify(proofRes: BBSuccess, publicInputs: AvmCircuitPublicInputs): Promise<BBResult> {
-    if (this.checkCircuitOnly) {
-      // Skip verification if we are only checking the circuit.
-      // Check-circuit does not generate a proof to verify.
-      return proofRes;
-    }
-
-    return await verifyAvmProof(BB_PATH, this.bbWorkingDirectory, proofRes.proofPath!, publicInputs, this.logger);
-  }
-
-  public async proveVerify(avmCircuitInputs: AvmCircuitInputs, txLabel: string = 'unlabeledTx') {
-    const provingRes = await this.prove(avmCircuitInputs, txLabel);
-    expect(provingRes.status).toEqual(BB_RESULT.SUCCESS);
-
-    const verificationRes = await this.verify(provingRes as BBSuccess, avmCircuitInputs.publicInputs);
-    expect(verificationRes.status).toBe(BB_RESULT.SUCCESS);
   }
 
   public async simProveVerify(
diff --git a/yarn-project/bb-prover/src/bb/bb_js_backend.ts b/yarn-project/bb-prover/src/bb/bb_js_backend.ts
new file mode 100644
index 000000000000..fe65f91e7ff3
--- /dev/null
+++ b/yarn-project/bb-prover/src/bb/bb_js_backend.ts
@@ -0,0 +1,317 @@
+import { type AvmStat, type BackendOptions, BackendType, Barretenberg, type ChonkProof } from '@aztec/bb.js';
+import {
+  CHONK_ECCVM_PROOF_LENGTH,
+  CHONK_JOINT_PROOF_LENGTH,
+  CHONK_MERGE_PROOF_SIZE,
+  IPA_PROOF_LENGTH,
+} from '@aztec/constants';
+import type { LogFn, Logger } from '@aztec/foundation/log';
+import { Timer } from '@aztec/foundation/timer';
+
+import type { UltraHonkFlavor } from '../honk.js';
+
+/**
+ * Maps UltraHonkFlavor to the bb.js ProofSystemSettings.
+ * All server-side proofs use disableZk: true.
+ */
+function getProofSettings(flavor: UltraHonkFlavor) {
+  const base = { disableZk: true, optimizedSolidityVerifier: false };
+  switch (flavor) {
+    case 'ultra_honk':
+      return { ...base, oracleHashType: 'poseidon2' as const, ipaAccumulation: false };
+    case 'ultra_keccak_honk':
+      return { ...base, oracleHashType: 'keccak' as const, ipaAccumulation: false };
+    case 'ultra_starknet_honk':
+      return { ...base, oracleHashType: 'starknet' as const, ipaAccumulation: false };
+    case 'ultra_rollup_honk':
+      return { ...base, oracleHashType: 'poseidon2' as const, ipaAccumulation: true };
+  }
+}
+
+/** Result of a successful proof generation via bb.js. */
+export type BBJsProofResult = {
+  /** Proof fields as 32-byte Uint8Arrays. */
+  proofFields: Uint8Array[];
+  /** Public input fields as 32-byte Uint8Arrays. */
+  publicInputFields: Uint8Array[];
+  /** Duration of the proving operation in ms. */
+  durationMs: number;
+};
+
+/** Public API surface of a bb.js instance, used by the factory and debug wrapper. */
+export interface BBJsApi {
+  generateProof(
+    circuitName: string,
+    bytecode: Uint8Array,
+    verificationKey: Uint8Array,
+    witness: Uint8Array,
+    flavor: UltraHonkFlavor,
+  ): Promise<BBJsProofResult>;
+  verifyProof(
+    proofFields: Uint8Array[],
+    verificationKey: Uint8Array,
+    publicInputFields: Uint8Array[],
+    flavor: UltraHonkFlavor,
+  ): Promise<{ verified: boolean; durationMs: number }>;
+  verifyChonkProof(
+    fieldsWithPublicInputs: Uint8Array[],
+    verificationKey: Uint8Array,
+  ): Promise<{ verified: boolean; durationMs: number }>;
+  computeGateCount(
+    circuitName: string,
+    bytecode: Uint8Array,
+    flavor: UltraHonkFlavor | 'mega_honk',
+  ): Promise<{ circuitSize: number; durationMs: number }>;
+  generateContract(verificationKey: Uint8Array): Promise<{ solidityCode: string; durationMs: number }>;
+  /** Generate an AVM proof from serialized inputs. Callers should call verifyAvmProof separately. */
+  generateAvmProof(inputs: Uint8Array): Promise<{ proof: Uint8Array[]; stats: AvmStat[]; durationMs: number }>;
+  /** Verify an AVM proof against serialized public inputs. */
+  verifyAvmProof(proof: Uint8Array[], publicInputs: Uint8Array): Promise<{ verified: boolean; durationMs: number }>;
+  /** Check the AVM circuit from serialized inputs. Returns pass/fail and per-stage timings. */
+  checkAvmCircuit(inputs: Uint8Array): Promise<{ passed: boolean; stats: AvmStat[]; durationMs: number }>;
+  destroy(): Promise<void>;
+}
+
+/**
+ * Thin wrapper around a single Barretenberg instance.
+ * Each instance spawns its own bb process via the NativeUnixSocket backend.
+ */
+export class BBJsInstance implements BBJsApi {
+  private constructor(private api: Barretenberg) {}
+
+  /** Creates a new Barretenberg instance connected to a fresh bb process. */
+  static async create(bbPath: string, logger?: LogFn, threads?: number): Promise<BBJsInstance> {
+    const options: BackendOptions = {
+      bbPath,
+      backend: BackendType.NativeUnixSocket,
+      logger,
+    };
+    if (threads !== undefined) {
+      options.threads = threads;
+    }
+    const api = await Barretenberg.new(options);
+    return new BBJsInstance(api);
+  }
+
+  /**
+   * Generate an UltraHonk proof for a circuit.
+   * @param circuitName - Identifier for the circuit (used by bb internally).
+   * @param bytecode - Uncompressed ACIR bytecode.
+   * @param verificationKey - The circuit's verification key bytes.
+   * @param witness - Uncompressed witness bytes.
+   * @param flavor - The UltraHonk flavor to use.
+   */
+  async generateProof(
+    circuitName: string,
+    bytecode: Uint8Array,
+    verificationKey: Uint8Array,
+    witness: Uint8Array,
+    flavor: UltraHonkFlavor,
+  ): Promise<BBJsProofResult> {
+    const timer = new Timer();
+    const result = await this.api.circuitProve({
+      circuit: {
+        name: circuitName,
+        bytecode,
+        verificationKey,
+      },
+      witness,
+      settings: getProofSettings(flavor),
+    });
+    return {
+      proofFields: result.proof,
+      publicInputFields: result.publicInputs,
+      durationMs: timer.ms(),
+    };
+  }
+
+  /**
+   * Verify an UltraHonk proof.
+   * @param proofFields - Proof fields as 32-byte Uint8Arrays.
+   * @param verificationKey - The VK bytes.
+   * @param publicInputFields - Public input fields as 32-byte Uint8Arrays.
+   * @param flavor - The UltraHonk flavor.
+   * @returns Whether the proof is valid.
+   */
+  async verifyProof(
+    proofFields: Uint8Array[],
+    verificationKey: Uint8Array,
+    publicInputFields: Uint8Array[],
+    flavor: UltraHonkFlavor,
+  ): Promise<{ verified: boolean; durationMs: number }> {
+    const timer = new Timer();
+    const result = await this.api.circuitVerify({
+      verificationKey,
+      publicInputs: publicInputFields,
+      proof: proofFields,
+      settings: getProofSettings(flavor),
+    });
+    return { verified: result.verified, durationMs: timer.ms() };
+  }
+
+  /**
+   * Compute circuit gate count / circuit size.
+   * @param circuitName - Identifier for the circuit.
+   * @param bytecode - Uncompressed ACIR bytecode.
+   * @param flavor - 'mega_honk' for chonk circuits, or an UltraHonk flavor.
+   * @returns The dyadic circuit size (next power of 2 of gate count).
+   */
+  async computeGateCount(
+    circuitName: string,
+    bytecode: Uint8Array,
+    flavor: UltraHonkFlavor | 'mega_honk',
+  ): Promise<{ circuitSize: number; durationMs: number }> {
+    const timer = new Timer();
+    if (flavor === 'mega_honk') {
+      const result = await this.api.chonkStats({
+        circuit: { name: circuitName, bytecode },
+        includeGatesPerOpcode: false,
+      });
+      return { circuitSize: result.circuitSize, durationMs: timer.ms() };
+    }
+    const result = await this.api.circuitStats({
+      circuit: { name: circuitName, bytecode, verificationKey: new Uint8Array(0) },
+      includeGatesPerOpcode: false,
+      settings: getProofSettings(flavor),
+    });
+    return { circuitSize: result.numGatesDyadic, durationMs: timer.ms() };
+  }
+
+  /**
+   * Generate a Solidity verifier contract from a verification key.
+   * @param verificationKey - The VK bytes.
+   * @returns The Solidity source code.
+   */
+  async generateContract(verificationKey: Uint8Array): Promise<{ solidityCode: string; durationMs: number }> {
+    const timer = new Timer();
+    const result = await this.api.circuitWriteSolidityVerifier({
+      verificationKey,
+      settings: {
+        ipaAccumulation: false,
+        oracleHashType: 'poseidon2',
+        disableZk: true,
+        optimizedSolidityVerifier: false,
+      },
+    });
+    return { solidityCode: result.solidityCode, durationMs: timer.ms() };
+  }
+
+  /**
+   * Verify a Chonk (IVC) proof by splitting flat fields into the structured ChonkProof format.
+   * Mirrors C++ ChonkProof::from_field_elements() logic.
+   * @param fieldsWithPublicInputs - Flat proof fields as 32-byte Uint8Arrays (public inputs prepended).
+   * @param verificationKey - The VK bytes.
+   */
+  async verifyChonkProof(
+    fieldsWithPublicInputs: Uint8Array[],
+    verificationKey: Uint8Array,
+  ): Promise<{ verified: boolean; durationMs: number }> {
+    const timer = new Timer();
+    const proof = splitChonkProofToStructured(fieldsWithPublicInputs);
+    const result = await this.api.chonkVerify({ proof, vk: verificationKey });
+    return { verified: result.valid, durationMs: timer.ms() };
+  }
+
+  /** Generate an AVM proof from serialized inputs. */
+  async generateAvmProof(inputs: Uint8Array): Promise<{ proof: Uint8Array[]; stats: AvmStat[]; durationMs: number }> {
+    const timer = new Timer();
+    const result = await this.api.avmProve({ inputs });
+    return { proof: result.proof, stats: result.stats, durationMs: timer.ms() };
+  }
+
+  /** Verify an AVM proof against serialized public inputs. */
+  async verifyAvmProof(
+    proof: Uint8Array[],
+    publicInputs: Uint8Array,
+  ): Promise<{ verified: boolean; durationMs: number }> {
+    const timer = new Timer();
+    const result = await this.api.avmVerify({ proof, publicInputs });
+    return { verified: result.verified, durationMs: timer.ms() };
+  }
+
+  /** Check the AVM circuit from serialized inputs. */
+  async checkAvmCircuit(inputs: Uint8Array): Promise<{ passed: boolean; stats: AvmStat[]; durationMs: number }> {
+    const timer = new Timer();
+    const result = await this.api.avmCheckCircuit({ inputs });
+    return { passed: result.passed, stats: result.stats, durationMs: timer.ms() };
+  }
+
+  /** Destroy this instance and kill the underlying bb process. */
+  async destroy(): Promise<void> {
+    await this.api.destroy();
+  }
+}
+
+/**
+ * Factory for managing BBJsInstance lifecycle.
+ * Provides fresh instances for proving (each spawns a new bb process)
+ * and can pool instances for verification.
+ */
+export class BBJsProverFactory {
+  constructor(
+    private bbPath: string,
+    private logger?: Logger,
+    private threads?: number,
+    private debugDir?: string,
+  ) {}
+
+  /**
+   * Run an operation with a fresh Barretenberg instance.
+   * The instance is created before the operation and destroyed after.
+   * Suitable for proving where process startup is negligible relative to proof time.
+   */
+  async withFreshInstance<T>(fn: (instance: BBJsApi) => Promise<T>): Promise<T> {
+    const logFn = this.logger ? (msg: string) => this.logger!.verbose(`bb.js - ${msg}`) : undefined;
+    const raw = await BBJsInstance.create(this.bbPath, logFn, this.threads);
+    const instance = await this.maybeWrapDebug(raw);
+    try {
+      return await fn(instance);
+    } finally {
+      await instance.destroy();
+    }
+  }
+
+  /**
+   * Run a verification operation.
+   * Currently creates a fresh instance per call (matches current behavior of spawning bb per verification).
+   * Can be extended to use a pool if needed.
+   */
+  withVerifierInstance<T>(fn: (instance: BBJsApi) => Promise<T>): Promise<T> {
+    return this.withFreshInstance(fn);
+  }
+
+  /** Wrap the instance in a debug wrapper if debugDir is configured. */
+  private async maybeWrapDebug(instance: BBJsInstance): Promise<BBJsApi> {
+    if (this.debugDir && this.logger) {
+      const { DebugBBJsInstance } = await import('./bb_js_debug.js');
+      return new DebugBBJsInstance(instance, this.debugDir, this.bbPath, this.logger);
+    }
+    return instance;
+  }
+}
+
+/**
+ * Split a flat Chonk proof field array into the structured ChonkProof format expected by bb.js chonkVerify.
+ * Mirrors C++ ChonkProof::from_field_elements() in barretenberg/cpp/src/barretenberg/chonk/chonk_proof.cpp,
+ * which derives the hiding_oink_proof size as the remainder after subtracting the 4 fixed-size sub-proofs.
+ * This makes the split automatically adapt to any number of public inputs prepended to the oink portion.
+ */
+function splitChonkProofToStructured(fields: Uint8Array[]): ChonkProof {
+  const fixedTailSize = CHONK_MERGE_PROOF_SIZE + CHONK_ECCVM_PROOF_LENGTH + IPA_PROOF_LENGTH + CHONK_JOINT_PROOF_LENGTH;
+  if (fields.length < fixedTailSize) {
+    throw new Error(
+      `splitChonkProofToStructured: proof too short (got ${fields.length} fields, need at least ${fixedTailSize})`,
+    );
+  }
+
+  // hiding_oink_proof absorbs the leading portion (public inputs + oink payload); size is derived.
+  const oinkSize = fields.length - fixedTailSize;
+  let offset = 0;
+  const hidingOinkProof = fields.slice(offset, (offset += oinkSize));
+  const mergeProof = fields.slice(offset, (offset += CHONK_MERGE_PROOF_SIZE));
+  const eccvmProof = fields.slice(offset, (offset += CHONK_ECCVM_PROOF_LENGTH));
+  const ipaProof = fields.slice(offset, (offset += IPA_PROOF_LENGTH));
+  const jointProof = fields.slice(offset, (offset += CHONK_JOINT_PROOF_LENGTH));
+
+  return { hidingOinkProof, mergeProof, eccvmProof, ipaProof, jointProof };
+}
diff --git a/yarn-project/bb-prover/src/bb/bb_js_debug.ts b/yarn-project/bb-prover/src/bb/bb_js_debug.ts
new file mode 100644
index 000000000000..d137b5ec4f2e
--- /dev/null
+++ b/yarn-project/bb-prover/src/bb/bb_js_debug.ts
@@ -0,0 +1,227 @@
+import type { AvmStat } from '@aztec/bb.js';
+import type { Logger } from '@aztec/foundation/log';
+
+import { promises as fs } from 'fs';
+import * as path from 'path';
+import { gzipSync } from 'zlib';
+
+import type { UltraHonkFlavor } from '../honk.js';
+import type { BBJsApi, BBJsProofResult } from './bb_js_backend.js';
+
+/**
+ * Maps UltraHonk flavors to the CLI flags used by the bb binary.
+ * The CLI always uses `--scheme ultra_honk`; flavors are expressed via
+ * `--oracle_hash` and `--ipa_accumulation`.
+ */
+function getCliFlags(flavor: UltraHonkFlavor): string {
+  const base = '--scheme ultra_honk --disable_zk';
+  switch (flavor) {
+    case 'ultra_honk':
+      return `${base} --oracle_hash poseidon2`;
+    case 'ultra_keccak_honk':
+      return `${base} --oracle_hash keccak`;
+    case 'ultra_starknet_honk':
+      return `${base} --oracle_hash starknet`;
+    case 'ultra_rollup_honk':
+      return `${base} --oracle_hash poseidon2 --ipa_accumulation`;
+  }
+}
+
+/** Concatenate an array of 32-byte field elements into a single buffer. */
+function concatFields(fields: Uint8Array[]): Buffer {
+  const totalLen = fields.reduce((sum, f) => sum + f.length, 0);
+  const buf = Buffer.alloc(totalLen);
+  let offset = 0;
+  for (const f of fields) {
+    buf.set(f, offset);
+    offset += f.length;
+  }
+  return buf;
+}
+
+/**
+ * Wraps a BBJsApi instance to write debug files and log equivalent CLI commands.
+ * Activated when BB_DEBUG_OUTPUT_DIR is set. Each operation writes its inputs
+ * and outputs to a numbered subdirectory, enabling offline reproduction.
+ */
+export class DebugBBJsInstance implements BBJsApi {
+  private counter = 0;
+
+  constructor(
+    private inner: BBJsApi,
+    private debugDir: string,
+    private bbPath: string,
+    private logger: Logger,
+  ) {}
+
+  private nextDir(prefix: string): string {
+    this.counter++;
+    const padded = String(this.counter).padStart(3, '0');
+    return path.join(this.debugDir, `${prefix}-${padded}`);
+  }
+
+  /** Write a command string to both the logger and a command.sh file in the given directory. */
+  private async logCommand(dir: string, command: string): Promise<void> {
+    this.logger.info(`Executing BB with: ${command}`);
+    await fs.writeFile(path.join(dir, 'command.sh'), `#!/bin/bash\n${command}\n`, { mode: 0o755 });
+  }
+
+  async generateProof(
+    circuitName: string,
+    bytecode: Uint8Array,
+    verificationKey: Uint8Array,
+    witness: Uint8Array,
+    flavor: UltraHonkFlavor,
+  ): Promise<BBJsProofResult> {
+    const dir = this.nextDir(circuitName);
+    await fs.mkdir(dir, { recursive: true });
+
+    const bytecodePath = path.join(dir, `${circuitName}-bytecode.gz`);
+    const vkPath = path.join(dir, `${circuitName}-vk`);
+    const witnessPath = path.join(dir, 'partial-witness.gz');
+
+    await Promise.all([
+      fs.writeFile(bytecodePath, gzipSync(bytecode)),
+      fs.writeFile(vkPath, verificationKey),
+      fs.writeFile(witnessPath, gzipSync(witness)),
+    ]);
+
+    const flags = getCliFlags(flavor);
+    await this.logCommand(
+      dir,
+      `${this.bbPath} prove ${flags} -o ${dir} -b ${bytecodePath} -k ${vkPath} -w ${witnessPath}`,
+    );
+
+    const result = await this.inner.generateProof(circuitName, bytecode, verificationKey, witness, flavor);
+
+    const proofBuf = concatFields(result.proofFields);
+    const publicInputsBuf = concatFields(result.publicInputFields);
+    await Promise.all([
+      fs.writeFile(path.join(dir, 'proof'), proofBuf),
+      fs.writeFile(path.join(dir, 'public_inputs'), publicInputsBuf),
+    ]);
+
+    return result;
+  }
+
+  async verifyProof(
+    proofFields: Uint8Array[],
+    verificationKey: Uint8Array,
+    publicInputFields: Uint8Array[],
+    flavor: UltraHonkFlavor,
+  ): Promise<{ verified: boolean; durationMs: number }> {
+    const dir = this.nextDir(`verify-${flavor}`);
+    await fs.mkdir(dir, { recursive: true });
+
+    const proofPath = path.join(dir, 'proof');
+    const vkPath = path.join(dir, 'vk');
+    const publicInputsPath = path.join(dir, 'public_inputs');
+
+    const proofBuf = concatFields(proofFields);
+    const publicInputsBuf = concatFields(publicInputFields);
+    await Promise.all([
+      fs.writeFile(proofPath, proofBuf),
+      fs.writeFile(vkPath, verificationKey),
+      fs.writeFile(publicInputsPath, publicInputsBuf),
+    ]);
+
+    const flags = getCliFlags(flavor);
+    await this.logCommand(dir, `${this.bbPath} verify ${flags} -p ${proofPath} -k ${vkPath} -i ${publicInputsPath}`);
+
+    return this.inner.verifyProof(proofFields, verificationKey, publicInputFields, flavor);
+  }
+
+  async verifyChonkProof(
+    fieldsWithPublicInputs: Uint8Array[],
+    verificationKey: Uint8Array,
+  ): Promise<{ verified: boolean; durationMs: number }> {
+    const dir = this.nextDir('verify-chonk');
+    await fs.mkdir(dir, { recursive: true });
+
+    const proofPath = path.join(dir, 'proof');
+    const vkPath = path.join(dir, 'vk');
+
+    const proofBuf = concatFields(fieldsWithPublicInputs);
+    await Promise.all([fs.writeFile(proofPath, proofBuf), fs.writeFile(vkPath, verificationKey)]);
+
+    await this.logCommand(dir, `${this.bbPath} verify --scheme chonk -p ${proofPath} -k ${vkPath} -v`);
+
+    return this.inner.verifyChonkProof(fieldsWithPublicInputs, verificationKey);
+  }
+
+  async computeGateCount(
+    circuitName: string,
+    bytecode: Uint8Array,
+    flavor: UltraHonkFlavor | 'mega_honk',
+  ): Promise<{ circuitSize: number; durationMs: number }> {
+    const dir = this.nextDir(`gates-${circuitName}`);
+    await fs.mkdir(dir, { recursive: true });
+
+    const bytecodePath = path.join(dir, `${circuitName}-bytecode.gz`);
+    await fs.writeFile(bytecodePath, gzipSync(bytecode));
+
+    if (flavor === 'mega_honk') {
+      await this.logCommand(dir, `${this.bbPath} gates --scheme chonk -b ${bytecodePath}`);
+    } else {
+      const flags = getCliFlags(flavor);
+      await this.logCommand(dir, `${this.bbPath} gates ${flags} -b ${bytecodePath}`);
+    }
+
+    return this.inner.computeGateCount(circuitName, bytecode, flavor);
+  }
+
+  async generateAvmProof(inputs: Uint8Array): Promise<{ proof: Uint8Array[]; stats: AvmStat[]; durationMs: number }> {
+    const dir = this.nextDir('avm-prove');
+    await fs.mkdir(dir, { recursive: true });
+
+    const inputsPath = path.join(dir, 'avm_inputs.bin');
+    await fs.writeFile(inputsPath, inputs);
+
+    await this.logCommand(dir, `${this.bbPath} avm_prove --avm-inputs ${inputsPath} -o ${dir}`);
+
+    const result = await this.inner.generateAvmProof(inputs);
+
+    const proofBuf = concatFields(result.proof);
+    await fs.writeFile(path.join(dir, 'proof'), proofBuf);
+
+    return result;
+  }
+
+  async verifyAvmProof(
+    proof: Uint8Array[],
+    publicInputs: Uint8Array,
+  ): Promise<{ verified: boolean; durationMs: number }> {
+    const dir = this.nextDir('avm-verify');
+    await fs.mkdir(dir, { recursive: true });
+
+    const proofPath = path.join(dir, 'proof');
+    const publicInputsPath = path.join(dir, 'avm_public_inputs.bin');
+
+    const proofBuf = concatFields(proof);
+    await Promise.all([fs.writeFile(proofPath, proofBuf), fs.writeFile(publicInputsPath, publicInputs)]);
+
+    await this.logCommand(dir, `${this.bbPath} avm_verify -p ${proofPath} --avm-public-inputs ${publicInputsPath}`);
+
+    return this.inner.verifyAvmProof(proof, publicInputs);
+  }
+
+  async checkAvmCircuit(inputs: Uint8Array): Promise<{ passed: boolean; stats: AvmStat[]; durationMs: number }> {
+    const dir = this.nextDir('avm-check-circuit');
+    await fs.mkdir(dir, { recursive: true });
+
+    const inputsPath = path.join(dir, 'avm_inputs.bin');
+    await fs.writeFile(inputsPath, inputs);
+
+    await this.logCommand(dir, `${this.bbPath} avm_check_circuit --avm-inputs ${inputsPath}`);
+
+    return this.inner.checkAvmCircuit(inputs);
+  }
+
+  generateContract(verificationKey: Uint8Array): Promise<{ solidityCode: string; durationMs: number }> {
+    return this.inner.generateContract(verificationKey);
+  }
+
+  destroy(): Promise<void> {
+    return this.inner.destroy();
+  }
+}
diff --git a/yarn-project/bb-prover/src/bb/execute.ts b/yarn-project/bb-prover/src/bb/execute.ts
deleted file mode 100644
index 8bedbb98d777..000000000000
--- a/yarn-project/bb-prover/src/bb/execute.ts
+++ /dev/null
@@ -1,700 +0,0 @@
-import { sha256 } from '@aztec/foundation/crypto/sha256';
-import type { LogFn, Logger } from '@aztec/foundation/log';
-import { Timer } from '@aztec/foundation/timer';
-import type { AvmCircuitInputs, AvmCircuitPublicInputs } from '@aztec/stdlib/avm';
-
-import * as proc from 'child_process';
-import { promises as fs } from 'fs';
-import { basename, dirname, join } from 'path';
-import readline from 'readline';
-
-import type { UltraHonkFlavor } from '../honk.js';
-
-export const VK_FILENAME = 'vk';
-export const PUBLIC_INPUTS_FILENAME = 'public_inputs';
-export const PROOF_FILENAME = 'proof';
-export const AVM_INPUTS_FILENAME = 'avm_inputs.bin';
-export const AVM_BYTECODE_FILENAME = 'avm_bytecode.bin';
-export const AVM_PUBLIC_INPUTS_FILENAME = 'avm_public_inputs.bin';
-
-export enum BB_RESULT {
-  SUCCESS,
-  FAILURE,
-  ALREADY_PRESENT,
-}
-
-export type BBSuccess = {
-  status: BB_RESULT.SUCCESS | BB_RESULT.ALREADY_PRESENT;
-  durationMs: number;
-  /** Full path of the public key. */
-  pkPath?: string;
-  /** Base directory for the VKs (raw, fields). */
-  vkDirectoryPath?: string;
-  /** Full path of the proof. */
-  proofPath?: string;
-  /** Full path of the contract. */
-  contractPath?: string;
-  /** The number of gates in the circuit. */
-  circuitSize?: number;
-};
-
-export type BBFailure = {
-  status: BB_RESULT.FAILURE;
-  reason: string;
-  retry?: boolean;
-};
-
-export type BBResult = BBSuccess | BBFailure;
-
-type BBExecResult = {
-  status: BB_RESULT;
-  exitCode: number;
-  signal: string | undefined;
-};
-
-export const DEFAULT_BB_VERIFY_CONCURRENCY = 4;
-
-/**
- * Invokes the Barretenberg binary with the provided command and args
- * @param pathToBB - The path to the BB binary
- * @param command - The command to execute
- * @param args - The arguments to pass
- * @param logger - A log function
- * @param timeout - An optional timeout before killing the BB process
- * @param resultParser - An optional handler for detecting success or failure
- * @returns The completed partial witness outputted from the circuit
- */
-export function executeBB(
-  pathToBB: string,
-  command: string,
-  args: string[],
-  logger: LogFn,
-  concurrency?: number,
-  timeout?: number,
-  resultParser = (code: number) => code === 0,
-): Promise<BBExecResult> {
-  return new Promise<BBExecResult>(resolve => {
-    // spawn the bb process
-    const { HARDWARE_CONCURRENCY: _, ...envWithoutConcurrency } = process.env;
-
-    const env = envWithoutConcurrency;
-    // We prioritise the concurrency argument if provided and > 0
-    if (concurrency && concurrency > 0) {
-      env.HARDWARE_CONCURRENCY = concurrency.toString();
-    } else if (process.env.HARDWARE_CONCURRENCY) {
-      env.HARDWARE_CONCURRENCY = process.env.HARDWARE_CONCURRENCY;
-    }
-
-    logger(`BB concurrency: ${env.HARDWARE_CONCURRENCY}`);
-    logger(`Executing BB with: ${pathToBB} ${command} ${args.join(' ')}`);
-    const bb = proc.spawn(pathToBB, [command, ...args], {
-      stdio: ['ignore', 'pipe', 'pipe'],
-      env,
-    });
-
-    let timeoutId: NodeJS.Timeout | undefined;
-    if (timeout !== undefined) {
-      timeoutId = setTimeout(() => {
-        logger(`BB execution timed out after ${timeout}ms, killing process`);
-        if (bb.pid) {
-          bb.kill('SIGKILL');
-        }
-        resolve({ status: BB_RESULT.FAILURE, exitCode: -1, signal: 'TIMEOUT' });
-      }, timeout);
-    }
-
-    // Forward termination signals so bb doesn't survive as an orphan when the node parent exits.
-    const forwardSignal = (signal: NodeJS.Signals) => {
-      if (bb.pid) {
-        bb.kill(signal);
-      }
-    };
-    process.on('SIGINT', forwardSignal);
-    process.on('SIGTERM', forwardSignal);
-    process.on('SIGHUP', forwardSignal);
-
-    readline.createInterface({ input: bb.stdout }).on('line', logger);
-    readline.createInterface({ input: bb.stderr }).on('line', logger);
-
-    bb.on('close', (exitCode: number, signal?: string) => {
-      if (timeoutId) {
-        clearTimeout(timeoutId);
-      }
-      process.off('SIGINT', forwardSignal);
-      process.off('SIGTERM', forwardSignal);
-      process.off('SIGHUP', forwardSignal);
-      if (resultParser(exitCode)) {
-        resolve({ status: BB_RESULT.SUCCESS, exitCode, signal });
-      } else {
-        resolve({ status: BB_RESULT.FAILURE, exitCode, signal });
-      }
-    });
-  }).catch(_ => ({ status: BB_RESULT.FAILURE, exitCode: -1, signal: undefined }));
-}
-
-export async function executeBbChonkProof(
-  pathToBB: string,
-  workingDirectory: string,
-  inputsPath: string,
-  log: LogFn,
-  writeVk = false,
-): Promise<BBFailure | BBSuccess> {
-  // Check that the working directory exists
-  try {
-    await fs.access(workingDirectory);
-  } catch {
-    return { status: BB_RESULT.FAILURE, reason: `Working directory ${workingDirectory} does not exist` };
-  }
-
-  // The proof is written to e.g. /workingDirectory/proof
-  const outputPath = `${workingDirectory}`;
-
-  const binaryPresent = await fs
-    .access(pathToBB, fs.constants.R_OK)
-    .then(_ => true)
-    .catch(_ => false);
-  if (!binaryPresent) {
-    return { status: BB_RESULT.FAILURE, reason: `Failed to find bb binary at ${pathToBB}` };
-  }
-
-  try {
-    // Write the bytecode to the working directory
-    log(`inputsPath ${inputsPath}`);
-    const timer = new Timer();
-    const logFunction = (message: string) => {
-      log(`bb - ${message}`);
-    };
-
-    const args = ['-o', outputPath, '--ivc_inputs_path', inputsPath, '-v', '--scheme', 'chonk'];
-    if (writeVk) {
-      args.push('--write_vk');
-    }
-    const result = await executeBB(pathToBB, 'prove', args, logFunction);
-    const durationMs = timer.ms();
-
-    if (result.status == BB_RESULT.SUCCESS) {
-      return {
-        status: BB_RESULT.SUCCESS,
-        durationMs,
-        proofPath: `${outputPath}`,
-        pkPath: undefined,
-        vkDirectoryPath: `${outputPath}`,
-      };
-    }
-    // Not a great error message here but it is difficult to decipher what comes from bb
-    return {
-      status: BB_RESULT.FAILURE,
-      reason: `Failed to generate proof. Exit code ${result.exitCode}. Signal ${result.signal}.`,
-      retry: !!result.signal,
-    };
-  } catch (error) {
-    return { status: BB_RESULT.FAILURE, reason: `${error}` };
-  }
-}
-
-function getArgs(flavor: UltraHonkFlavor) {
-  switch (flavor) {
-    case 'ultra_honk': {
-      return ['--scheme', 'ultra_honk', '--oracle_hash', 'poseidon2'];
-    }
-    case 'ultra_keccak_honk': {
-      return ['--scheme', 'ultra_honk', '--oracle_hash', 'keccak'];
-    }
-    case 'ultra_starknet_honk': {
-      return ['--scheme', 'ultra_honk', '--oracle_hash', 'starknet'];
-    }
-    case 'ultra_rollup_honk': {
-      return ['--scheme', 'ultra_honk', '--oracle_hash', 'poseidon2', '--ipa_accumulation'];
-    }
-  }
-}
-
-/**
- * Used for generating proofs of noir circuits.
- * It is assumed that the working directory is a temporary and/or random directory used solely for generating this proof.
- * @param pathToBB - The full path to the bb binary
- * @param workingDirectory - A working directory for use by bb
- * @param circuitName - An identifier for the circuit
- * @param bytecode - The compiled circuit bytecode
- * @param inputWitnessFile - The circuit input witness
- * @param log - A logging function
- * @returns An object containing a result indication, the location of the proof and the duration taken
- */
-export async function generateProof(
-  pathToBB: string,
-  workingDirectory: string,
-  circuitName: string,
-  bytecode: Buffer,
-  verificationKey: Buffer,
-  inputWitnessFile: string,
-  flavor: UltraHonkFlavor,
-  log: Logger,
-): Promise<BBFailure | BBSuccess> {
-  // Check that the working directory exists
-  try {
-    await fs.access(workingDirectory);
-  } catch {
-    return { status: BB_RESULT.FAILURE, reason: `Working directory ${workingDirectory} does not exist` };
-  }
-
-  // The bytecode is written to e.g. /workingDirectory/ParityBaseArtifact-bytecode
-  const bytecodePath = `${workingDirectory}/${circuitName}-bytecode`;
-  const vkPath = `${workingDirectory}/${circuitName}-vk`;
-
-  // The proof is written to e.g. /workingDirectory/ultra_honk/proof
-  const outputPath = `${workingDirectory}`;
-
-  const binaryPresent = await fs
-    .access(pathToBB, fs.constants.R_OK)
-    .then(_ => true)
-    .catch(_ => false);
-  if (!binaryPresent) {
-    return { status: BB_RESULT.FAILURE, reason: `Failed to find bb binary at ${pathToBB}` };
-  }
-
-  try {
-    // Write the bytecode and vk to the working directory
-    await Promise.all([fs.writeFile(bytecodePath, bytecode), fs.writeFile(vkPath, verificationKey)]);
-    const args = getArgs(flavor).concat([
-      '--disable_zk',
-      '-o',
-      outputPath,
-      '-b',
-      bytecodePath,
-      '-k',
-      vkPath,
-      '-w',
-      inputWitnessFile,
-      '-v',
-    ]);
-    const loggingArg = log.level === 'debug' || log.level === 'trace' ? '-d' : log.level === 'verbose' ? '-v' : '';
-    if (loggingArg !== '') {
-      args.push(loggingArg);
-    }
-
-    const timer = new Timer();
-    const logFunction = (message: string) => {
-      log.info(`${circuitName} BB out - ${message}`);
-    };
-    const result = await executeBB(pathToBB, `prove`, args, logFunction);
-    const duration = timer.ms();
-
-    if (result.status == BB_RESULT.SUCCESS) {
-      return {
-        status: BB_RESULT.SUCCESS,
-        durationMs: duration,
-        proofPath: `${outputPath}`,
-        pkPath: undefined,
-        vkDirectoryPath: `${outputPath}`,
-      };
-    }
-    // Not a great error message here but it is difficult to decipher what comes from bb
-    return {
-      status: BB_RESULT.FAILURE,
-      reason: `Failed to generate proof. Exit code ${result.exitCode}. Signal ${result.signal}.`,
-      retry: !!result.signal,
-    };
-  } catch (error) {
-    return { status: BB_RESULT.FAILURE, reason: `${error}` };
-  }
-}
-
-/**
- * Used for generating AVM proofs.
- * It is assumed that the working directory is a temporary and/or random directory used solely for generating this proof.
- * @param pathToBB - The full path to the bb binary
- * @param workingDirectory - A working directory for use by bb
- * @param input - The inputs for the public function to be proven
- * @param logger - A logging function
- * @param checkCircuitOnly - A boolean to toggle a "check-circuit only" operation instead of proving.
- * @returns An object containing a result indication, the location of the proof and the duration taken
- */
-export async function generateAvmProof(
-  pathToBB: string,
-  workingDirectory: string,
-  input: AvmCircuitInputs,
-  logger: Logger,
-  checkCircuitOnly: boolean = false,
-): Promise<BBFailure | BBSuccess> {
-  // Check that the working directory exists
-  try {
-    await fs.access(workingDirectory);
-  } catch {
-    return { status: BB_RESULT.FAILURE, reason: `Working directory ${workingDirectory} does not exist` };
-  }
-
-  // The proof is written to e.g. /workingDirectory/proof
-  const outputPath = workingDirectory;
-
-  const filePresent = async (file: string) =>
-    await fs
-      .access(file, fs.constants.R_OK)
-      .then(_ => true)
-      .catch(_ => false);
-
-  const binaryPresent = await filePresent(pathToBB);
-  if (!binaryPresent) {
-    return { status: BB_RESULT.FAILURE, reason: `Failed to find bb binary at ${pathToBB}` };
-  }
-
-  const inputsBuffer = input.serializeWithMessagePack();
-
-  try {
-    // Write the inputs to the working directory.
-    const avmInputsPath = join(workingDirectory, AVM_INPUTS_FILENAME);
-    await fs.writeFile(avmInputsPath, inputsBuffer);
-    if (!(await filePresent(avmInputsPath))) {
-      return { status: BB_RESULT.FAILURE, reason: `Could not write avm inputs to ${avmInputsPath}` };
-    }
-
-    const args = checkCircuitOnly ? ['--avm-inputs', avmInputsPath] : ['--avm-inputs', avmInputsPath, '-o', outputPath];
-    const loggingArg =
-      logger.level === 'debug' || logger.level === 'trace' ? '-d' : logger.level === 'verbose' ? '-v' : '';
-    if (loggingArg !== '') {
-      args.push(loggingArg);
-    }
-    const timer = new Timer();
-
-    const cmd = checkCircuitOnly ? 'avm_check_circuit' : 'avm_prove';
-    const logFunction = (message: string) => {
-      logger.verbose(`AvmCircuit (${cmd}) BB out - ${message}`);
-    };
-    const result = await executeBB(pathToBB, cmd, args, logFunction);
-    const duration = timer.ms();
-
-    if (result.status == BB_RESULT.SUCCESS) {
-      return {
-        status: BB_RESULT.SUCCESS,
-        durationMs: duration,
-        proofPath: join(outputPath, PROOF_FILENAME),
-        pkPath: undefined,
-        vkDirectoryPath: undefined, // AVM VK is fixed in the binary.
-      };
-    }
-    // Not a great error message here but it is difficult to decipher what comes from bb
-    return {
-      status: BB_RESULT.FAILURE,
-      reason: `Failed to generate proof. AVM proof for TX hash ${input.hints.tx.hash}. Exit code ${result.exitCode}. Signal ${result.signal}.`,
-      retry: result.signal === 'SIGKILL', // retry on SIGKILL because the oomkiller might have stopped the process
-    };
-  } catch (error) {
-    return { status: BB_RESULT.FAILURE, reason: `${error}` };
-  }
-}
-
-/**
- * Used for verifying proofs of noir circuits
- * @param pathToBB - The full path to the bb binary
- * @param proofFullPath - The full path to the proof to be verified
- * @param verificationKeyPath - The full path to the circuit verification key
- * @param logger - A logger
- * @returns An object containing a result indication and duration taken
- */
-export async function verifyProof(
-  pathToBB: string,
-  proofFullPath: string,
-  verificationKeyPath: string,
-  ultraHonkFlavor: UltraHonkFlavor,
-  logger: Logger,
-): Promise<BBFailure | BBSuccess> {
-  // Specify the public inputs path in the case of UH verification.
-  // Take proofFullPath and remove the suffix past the / to get the directory.
-  const proofDir = proofFullPath.substring(0, proofFullPath.lastIndexOf('/'));
-  const publicInputsFullPath = join(proofDir, '/public_inputs');
-  logger.debug(`public inputs path: ${publicInputsFullPath}`);
-
-  const args = [
-    '-p',
-    proofFullPath,
-    '-k',
-    verificationKeyPath,
-    '-i',
-    publicInputsFullPath,
-    '--disable_zk',
-    ...getArgs(ultraHonkFlavor),
-  ];
-
-  let concurrency = DEFAULT_BB_VERIFY_CONCURRENCY;
-
-  if (process.env.VERIFY_HARDWARE_CONCURRENCY) {
-    concurrency = parseInt(process.env.VERIFY_HARDWARE_CONCURRENCY, 10);
-  }
-
-  return await verifyProofInternal(pathToBB, `verify`, args, logger, concurrency);
-}
-
-export async function verifyAvmProof(
-  pathToBB: string,
-  workingDirectory: string,
-  proofFullPath: string,
-  publicInputs: AvmCircuitPublicInputs,
-  logger: Logger,
-): Promise<BBFailure | BBSuccess> {
-  const inputsBuffer = publicInputs.serializeWithMessagePack();
-
-  // Write the inputs to the working directory.
-  const filePresent = async (file: string) =>
-    await fs
-      .access(file, fs.constants.R_OK)
-      .then(_ => true)
-      .catch(_ => false);
-  const avmInputsPath = join(workingDirectory, 'avm_public_inputs.bin');
-  await fs.writeFile(avmInputsPath, inputsBuffer);
-  if (!(await filePresent(avmInputsPath))) {
-    return { status: BB_RESULT.FAILURE, reason: `Could not write avm inputs to ${avmInputsPath}` };
-  }
-
-  const args = ['-p', proofFullPath, '--avm-public-inputs', avmInputsPath];
-  return await verifyProofInternal(pathToBB, 'avm_verify', args, logger);
-}
-
-/**
- * Verifies a ChonkProof
- * TODO(#7370) The verification keys should be supplied separately
- * @param pathToBB - The full path to the bb binary
- * @param targetPath - The path to the folder with the proof, accumulator, and verification keys
- * @param logger - A logger
- * @param concurrency - The number of threads to use for the verification
- * @returns An object containing a result indication and duration taken
- */
-export async function verifyChonkProof(
-  pathToBB: string,
-  proofPath: string,
-  keyPath: string,
-  logger: Logger,
-  concurrency = 1,
-): Promise<BBFailure | BBSuccess> {
-  const binaryPresent = await fs
-    .access(pathToBB, fs.constants.R_OK)
-    .then(_ => true)
-    .catch(_ => false);
-  if (!binaryPresent) {
-    return { status: BB_RESULT.FAILURE, reason: `Failed to find bb binary at ${pathToBB}` };
-  }
-
-  const args = ['--scheme', 'chonk', '-p', proofPath, '-k', keyPath, '-v'];
-  return await verifyProofInternal(pathToBB, 'verify', args, logger, concurrency);
-}
-
-/**
- * Used for verifying proofs with BB
- * @param pathToBB - The full path to the bb binary
- * @param command - The BB command to execute (verify/avm_verify)
- * @param args - The arguments to pass to the command
- * @param logger - A logger
- * @param concurrency - The number of threads to use for the verification
- * @returns An object containing a result indication and duration taken
- */
-async function verifyProofInternal(
-  pathToBB: string,
-  command: 'verify' | 'avm_verify',
-  args: string[],
-  logger: Logger,
-  concurrency?: number,
-): Promise<BBFailure | BBSuccess> {
-  const binaryPresent = await fs
-    .access(pathToBB, fs.constants.R_OK)
-    .then(_ => true)
-    .catch(_ => false);
-  if (!binaryPresent) {
-    return { status: BB_RESULT.FAILURE, reason: `Failed to find bb binary at ${pathToBB}` };
-  }
-
-  const logFunction = (message: string) => {
-    logger.verbose(`bb-prover (verify) BB out - ${message}`);
-  };
-
-  try {
-    const loggingArg =
-      logger.level === 'debug' || logger.level === 'trace' ? '-d' : logger.level === 'verbose' ? '-v' : '';
-    const finalArgs = loggingArg !== '' ? [...args, loggingArg] : args;
-
-    const timer = new Timer();
-    const result = await executeBB(pathToBB, command, finalArgs, logFunction, concurrency);
-    const duration = timer.ms();
-    if (result.status == BB_RESULT.SUCCESS) {
-      return { status: BB_RESULT.SUCCESS, durationMs: duration };
-    }
-    // Not a great error message here but it is difficult to decipher what comes from bb
-    return {
-      status: BB_RESULT.FAILURE,
-      reason: `Failed to verify proof. Exit code ${result.exitCode}. Signal ${result.signal}.`,
-      retry: !!result.signal,
-    };
-  } catch (error) {
-    return { status: BB_RESULT.FAILURE, reason: `${error}` };
-  }
-}
-
-export async function generateContractForVerificationKey(
-  pathToBB: string,
-  vkFilePath: string,
-  contractPath: string,
-  log: LogFn,
-): Promise<BBFailure | BBSuccess> {
-  const binaryPresent = await fs
-    .access(pathToBB, fs.constants.R_OK)
-    .then(_ => true)
-    .catch(_ => false);
-
-  if (!binaryPresent) {
-    return { status: BB_RESULT.FAILURE, reason: `Failed to find bb binary at ${pathToBB}` };
-  }
-
-  const outputDir = dirname(contractPath);
-  const contractName = basename(contractPath);
-  // cache contract generation based on vk file and contract name
-  const cacheKey = sha256(Buffer.concat([Buffer.from(contractName), await fs.readFile(vkFilePath)]));
-
-  await fs.mkdir(outputDir, { recursive: true });
-
-  const res = await fsCache<BBSuccess | BBFailure>(outputDir, cacheKey, log, false, async () => {
-    try {
-      const args = ['--scheme', 'ultra_honk', '-k', vkFilePath, '-o', contractPath, '-v'];
-      const timer = new Timer();
-      const result = await executeBB(pathToBB, 'contract', args, log);
-      const duration = timer.ms();
-      if (result.status == BB_RESULT.SUCCESS) {
-        return { status: BB_RESULT.SUCCESS, durationMs: duration, contractPath };
-      }
-      // Not a great error message here but it is difficult to decipher what comes from bb
-      return {
-        status: BB_RESULT.FAILURE,
-        reason: `Failed to write verifier contract. Exit code ${result.exitCode}. Signal ${result.signal}.`,
-        retry: !!result.signal,
-      };
-    } catch (error) {
-      return { status: BB_RESULT.FAILURE, reason: `${error}` };
-    }
-  });
-
-  if (!res) {
-    return {
-      status: BB_RESULT.ALREADY_PRESENT,
-      durationMs: 0,
-      contractPath,
-    };
-  }
-
-  return res;
-}
-
-/**
- * Compute bb gate count for a given circuit
- * @param pathToBB - The full path to the bb binary
- * @param workingDirectory - A temporary directory for writing the bytecode
- * @param circuitName - The name of the circuit
- * @param bytecode - The bytecode of the circuit
- * @param flavor - The flavor of the backend - mega_honk or ultra_honk variants
- * @returns An object containing the status, gate count, and time taken
- */
-export async function computeGateCountForCircuit(
-  pathToBB: string,
-  workingDirectory: string,
-  circuitName: string,
-  bytecode: Buffer,
-  flavor: UltraHonkFlavor | 'mega_honk',
-  log: LogFn,
-): Promise<BBFailure | BBSuccess> {
-  // Check that the working directory exists
-  try {
-    await fs.access(workingDirectory);
-  } catch {
-    return { status: BB_RESULT.FAILURE, reason: `Working directory ${workingDirectory} does not exist` };
-  }
-
-  // The bytecode is written to e.g. /workingDirectory/ParityBaseArtifact-bytecode
-  const bytecodePath = `${workingDirectory}/${circuitName}-bytecode`;
-
-  const binaryPresent = await fs
-    .access(pathToBB, fs.constants.R_OK)
-    .then(_ => true)
-    .catch(_ => false);
-  if (!binaryPresent) {
-    return { status: BB_RESULT.FAILURE, reason: `Failed to find bb binary at ${pathToBB}` };
-  }
-
-  // Accumulate the stdout from bb
-  let stdout = '';
-  const logHandler = (message: string) => {
-    stdout += message;
-    log(message);
-  };
-
-  try {
-    // Write the bytecode to the working directory
-    await fs.writeFile(bytecodePath, bytecode);
-    const timer = new Timer();
-
-    const result = await executeBB(
-      pathToBB,
-      'gates',
-      ['--scheme', flavor === 'mega_honk' ? 'chonk' : 'ultra_honk', '-b', bytecodePath, '-v'],
-      logHandler,
-    );
-    const duration = timer.ms();
-
-    if (result.status == BB_RESULT.SUCCESS) {
-      // Look for "circuit_size" in the stdout and parse the number
-      const circuitSizeMatch = stdout.match(/circuit_size": (\d+)/);
-      if (!circuitSizeMatch) {
-        return { status: BB_RESULT.FAILURE, reason: 'Failed to parse circuit_size from bb gates stdout.' };
-      }
-      const circuitSize = parseInt(circuitSizeMatch[1]);
-
-      return {
-        status: BB_RESULT.SUCCESS,
-        durationMs: duration,
-        circuitSize: circuitSize,
-      };
-    }
-
-    return { status: BB_RESULT.FAILURE, reason: 'Failed getting the gate count.' };
-  } catch (error) {
-    return { status: BB_RESULT.FAILURE, reason: `${error}` };
-  }
-}
-
-const CACHE_FILENAME = '.cache';
-async function fsCache<T>(
-  dir: string,
-  expectedCacheKey: Buffer,
-  logger: LogFn,
-  force: boolean,
-  action: () => Promise<T>,
-): Promise<T | undefined> {
-  const cacheFilePath = join(dir, CACHE_FILENAME);
-
-  let run: boolean;
-  if (force) {
-    run = true;
-  } else {
-    try {
-      run = !expectedCacheKey.equals(await fs.readFile(cacheFilePath));
-    } catch (err: any) {
-      if (err && 'code' in err && err.code === 'ENOENT') {
-        // cache file doesn't exist, swallow error and run
-        run = true;
-      } else {
-        throw err;
-      }
-    }
-  }
-
-  let res: T | undefined;
-  if (run) {
-    logger(`Cache miss or forced run. Running operation in ${dir}...`);
-    res = await action();
-  } else {
-    logger(`Cache hit. Skipping operation in ${dir}...`);
-  }
-
-  try {
-    await fs.writeFile(cacheFilePath, expectedCacheKey);
-  } catch {
-    logger(`Couldn't write cache data to ${cacheFilePath}. Skipping cache...`);
-    // ignore
-  }
-
-  return res;
-}
diff --git a/yarn-project/bb-prover/src/bb/file_names.ts b/yarn-project/bb-prover/src/bb/file_names.ts
new file mode 100644
index 000000000000..41d4fb692b5f
--- /dev/null
+++ b/yarn-project/bb-prover/src/bb/file_names.ts
@@ -0,0 +1,6 @@
+// File-naming conventions used by `bb` CLI output directories. Retained for consumers that still
+// read/write proofs to disk alongside bb-prover's in-memory bb.js flows.
+
+export const VK_FILENAME = 'vk';
+export const PROOF_FILENAME = 'proof';
+export const PUBLIC_INPUTS_FILENAME = 'public_inputs';
diff --git a/yarn-project/bb-prover/src/config.ts b/yarn-project/bb-prover/src/config.ts
index 19389258a3c9..fa8e6c7a3bf1 100644
--- a/yarn-project/bb-prover/src/config.ts
+++ b/yarn-project/bb-prover/src/config.ts
@@ -16,6 +16,8 @@ export interface BBConfig {
   bbChonkVerifyMaxBatch: number;
   /** Thread count for the peer batch verifier parallel reduce. Default 6 to leave cores for the rest of the node. */
   bbChonkVerifyConcurrency: number;
+  /** When set, bb.js operations write input/output files and log equivalent CLI commands to this directory. */
+  bbDebugOutputDir?: string;
 }
 
 export interface ACVMConfig {
diff --git a/yarn-project/bb-prover/src/index.ts b/yarn-project/bb-prover/src/index.ts
index 692c6007f391..6c46b78965a8 100644
--- a/yarn-project/bb-prover/src/index.ts
+++ b/yarn-project/bb-prover/src/index.ts
@@ -2,7 +2,8 @@ export * from './prover/index.js';
 export * from './test/index.js';
 export * from './verifier/index.js';
 export * from './config.js';
-export * from './bb/execute.js';
+export * from './bb/file_names.js';
+export * from './bb/bb_js_backend.js';
 export * from './honk.js';
 export * from './verification_key/verification_key_data.js';
 
diff --git a/yarn-project/bb-prover/src/prover/proof_utils.ts b/yarn-project/bb-prover/src/prover/proof_utils.ts
index 8d2e0091d2a4..6a4d0d878194 100644
--- a/yarn-project/bb-prover/src/prover/proof_utils.ts
+++ b/yarn-project/bb-prover/src/prover/proof_utils.ts
@@ -16,7 +16,7 @@ import assert from 'assert';
 import { promises as fs } from 'fs';
 import * as path from 'path';
 
-import { PROOF_FILENAME, PUBLIC_INPUTS_FILENAME } from '../bb/execute.js';
+import { PROOF_FILENAME, PUBLIC_INPUTS_FILENAME } from '../bb/file_names.js';
 
 /**
  * Create a ChonkProof proof file.
@@ -113,3 +113,43 @@ export async function readProofsFromOutputDirectory<PROOF_LENGTH extends number>
     proofLength,
   );
 }
+
+/**
+ * Construct a RecursiveProof from in-memory proof and public input field arrays
+ * returned by the bb.js circuitProve API, without reading from files.
+ *
+ * @param proofFields - Proof fields as 32-byte Uint8Arrays from circuitProve.
+ * @param publicInputFields - Public input fields as 32-byte Uint8Arrays from circuitProve.
+ * @param vkData - Verification key data for the circuit.
+ * @param proofLength - Expected proof field count.
+ */
+export function constructRecursiveProofFromBuffers<PROOF_LENGTH extends number>(
+  proofFields: Uint8Array[],
+  publicInputFields: Uint8Array[],
+  vkData: VerificationKeyData,
+  proofLength: PROOF_LENGTH,
+): RecursiveProof<PROOF_LENGTH> {
+  assert(
+    proofLength == NESTED_RECURSIVE_PROOF_LENGTH ||
+      proofLength == NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH ||
+      proofLength == ULTRA_KECCAK_PROOF_LENGTH,
+    `Proof length must be one of the expected proof lengths, received ${proofLength}`,
+  );
+
+  // Convert Uint8Array fields to Fr instances
+  const proofFieldsFr = proofFields.map(f => Fr.fromBuffer(Buffer.from(f)));
+
+  assert(
+    proofFieldsFr.length == proofLength,
+    `Proof fields length mismatch: ${proofFieldsFr.length} != ${proofLength}`,
+  );
+
+  // Reconstruct the binary proof with public inputs prepended (same format as file-based path)
+  const binaryPublicInputs = Buffer.concat(publicInputFields.map(f => Buffer.from(f)));
+  const binaryProof = Buffer.concat(proofFields.map(f => Buffer.from(f)));
+  const binaryProofWithPublicInputs = Buffer.concat([binaryPublicInputs, binaryProof]);
+
+  const numPublicInputs = getNumCustomPublicInputs(proofLength, vkData);
+
+  return new RecursiveProof(proofFieldsFr, new Proof(binaryProofWithPublicInputs, numPublicInputs), true, proofLength);
+}
diff --git a/yarn-project/bb-prover/src/prover/server/bb_prover.ts b/yarn-project/bb-prover/src/prover/server/bb_prover.ts
index 46dfc97ee6ca..1ef34221bb02 100644
--- a/yarn-project/bb-prover/src/prover/server/bb_prover.ts
+++ b/yarn-project/bb-prover/src/prover/server/bb_prover.ts
@@ -9,7 +9,6 @@ import {
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { runInDirectory } from '@aztec/foundation/fs';
 import { createLogger } from '@aztec/foundation/log';
-import { BufferReader } from '@aztec/foundation/serialize';
 import {
   type ServerProtocolArtifact,
   convertBlockMergeRollupOutputsFromWitnessMap,
@@ -88,24 +87,14 @@ import { VerificationKeyData } from '@aztec/stdlib/vks';
 import { Attributes, type TelemetryClient, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
 
 import { promises as fs } from 'fs';
+import { ungzip } from 'pako';
 import * as path from 'path';
 
-import {
-  type BBFailure,
-  type BBSuccess,
-  BB_RESULT,
-  PROOF_FILENAME,
-  PUBLIC_INPUTS_FILENAME,
-  VK_FILENAME,
-  generateAvmProof,
-  generateProof,
-  verifyAvmProof,
-  verifyProof,
-} from '../../bb/execute.js';
+import { type BBJsProofResult, BBJsProverFactory } from '../../bb/bb_js_backend.js';
 import type { ACVMConfig, BBConfig } from '../../config.js';
 import { getUltraHonkFlavorForCircuit } from '../../honk.js';
 import { ProverInstrumentation } from '../../instrumentation.js';
-import { readProofsFromOutputDirectory } from '../proof_utils.js';
+import { constructRecursiveProofFromBuffers } from '../proof_utils.js';
 
 const logger = createLogger('bb-prover');
 
@@ -119,12 +108,14 @@ export interface BBProverConfig extends BBConfig, ACVMConfig {
  */
 export class BBNativeRollupProver implements ServerCircuitProver {
   private instrumentation: ProverInstrumentation;
+  private bbJsFactory: BBJsProverFactory;
 
   constructor(
     private config: BBProverConfig,
     telemetry: TelemetryClient,
   ) {
     this.instrumentation = new ProverInstrumentation(telemetry, 'BBNativeRollupProver');
+    this.bbJsFactory = new BBJsProverFactory(config.bbBinaryPath, logger, undefined, config.bbDebugOutputDir);
   }
 
   get tracer() {
@@ -136,7 +127,7 @@ export class BBNativeRollupProver implements ServerCircuitProver {
     await fs.mkdir(config.acvmWorkingDirectory, { recursive: true });
     await fs.access(config.bbBinaryPath, fs.constants.R_OK);
     await fs.mkdir(config.bbWorkingDirectory, { recursive: true });
-    logger.info(`Using native BB at ${config.bbBinaryPath} and working directory ${config.bbWorkingDirectory}`);
+    logger.info(`Using bb.js API with binary at ${config.bbBinaryPath}`);
     logger.info(`Using native ACVM at ${config.acvmBinaryPath} and working directory ${config.acvmWorkingDirectory}`);
 
     return new BBNativeRollupProver(config, telemetry);
@@ -453,12 +444,11 @@ export class BBNativeRollupProver implements ServerCircuitProver {
     convertInput: (input: Input) => WitnessMap,
     convertOutput: (outputWitness: WitnessMap) => Output,
     workingDirectory: string,
-  ): Promise<{ circuitOutput: Output; provingResult: BBSuccess }> {
-    // Have the ACVM write the partial witness here
+  ): Promise<{ circuitOutput: Output; proofResult: BBJsProofResult }> {
+    // Have the ACVM write the partial witness here (still needs a temp directory)
     const outputWitnessFile = path.join(workingDirectory, 'partial-witness.gz');
 
     // Generate the partial witness using the ACVM
-    // A further temp directory will be created beneath ours and then cleaned up after the partial witness has been copied to our specified location
     const simulator = new NativeACVMSimulator(
       this.config.acvmWorkingDirectory,
       this.config.acvmBinaryPath,
@@ -471,7 +461,7 @@ export class BBNativeRollupProver implements ServerCircuitProver {
     logger.debug(`Generating witness data for ${circuitType}`);
 
     const inputWitness = convertInput(input);
-    const foreignCallHandler = undefined; // We don't handle foreign calls in the native ACVM simulator
+    const foreignCallHandler = undefined;
     const witnessResult = await simulator.executeProtocolCircuit(inputWitness, artifact, foreignCallHandler);
     const output = convertOutput(witnessResult.witness);
 
@@ -488,75 +478,82 @@ export class BBNativeRollupProver implements ServerCircuitProver {
       eventName: 'circuit-witness-generation',
     } satisfies CircuitWitnessGenerationStats);
 
-    // Now prove the circuit from the generated witness
-    logger.debug(`Proving ${circuitType}...`);
-
-    const provingResult = await generateProof(
-      this.config.bbBinaryPath,
-      workingDirectory,
-      circuitType,
-      Buffer.from(artifact.bytecode, 'base64'),
-      this.getVerificationKeyDataForCircuit(circuitType).keyAsBytes,
-      outputWitnessFile,
-      getUltraHonkFlavorForCircuit(circuitType),
-      logger,
-    );
-
-    if (provingResult.status === BB_RESULT.FAILURE) {
-      logger.error(`Failed to generate proof for ${circuitType}: ${provingResult.reason}`);
-      throw new ProvingError(provingResult.reason, provingResult, provingResult.retry);
+    // Read and decompress the witness for bb.js
+    const witnessGz = await fs.readFile(outputWitnessFile);
+    const witness = ungzip(witnessGz);
+
+    // Decompress bytecode for bb.js
+    const bytecode = ungzip(Buffer.from(artifact.bytecode, 'base64'));
+
+    // Prove the circuit via bb.js API (spawns a fresh bb process per proof)
+    logger.debug(`Proving ${circuitType} via bb.js...`);
+
+    let proofResult: BBJsProofResult;
+    try {
+      proofResult = await this.bbJsFactory.withFreshInstance(instance =>
+        instance.generateProof(
+          circuitType,
+          bytecode,
+          this.getVerificationKeyDataForCircuit(circuitType).keyAsBytes,
+          witness,
+          getUltraHonkFlavorForCircuit(circuitType),
+        ),
+      );
+    } catch (error) {
+      throw new ProvingError(`Failed to generate proof for ${circuitType}: ${error}`);
     }
 
     return {
       circuitOutput: output,
-      provingResult,
+      proofResult,
     };
   }
 
-  private async generateAvmProofWithBB(input: AvmCircuitInputs, workingDirectory: string): Promise<BBSuccess> {
-    logger.info(`Proving avm-circuit for TX ${input.hints.tx.hash}...`);
-
-    const provingResult = await generateAvmProof(this.config.bbBinaryPath, workingDirectory, input, logger);
-
-    if (provingResult.status === BB_RESULT.FAILURE) {
-      logger.error(`Failed to generate AVM proof for TX ${input.hints.tx.hash}: ${provingResult.reason}`);
-      throw new ProvingError(provingResult.reason, provingResult, provingResult.retry);
-    }
-
-    return provingResult;
-  }
-
   private async createAvmProof(
     input: AvmCircuitInputs,
   ): Promise<RecursiveProof<typeof AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED>> {
-    const operation = async (bbWorkingDirectory: string) => {
-      const provingResult = await this.generateAvmProofWithBB(input, bbWorkingDirectory);
+    logger.info(`Proving avm-circuit for TX ${input.hints.tx.hash}...`);
 
-      const avmProof = await this.readAvmProofAsFields(provingResult.proofPath!);
+    const inputsBuffer = input.serializeWithMessagePack();
+    const { proof: proofFieldArrays, durationMs } = await this.bbJsFactory.withFreshInstance(instance =>
+      instance.generateAvmProof(inputsBuffer),
+    );
 
-      const circuitType = 'avm-circuit' as const;
-      const appCircuitName = 'unknown' as const;
-      this.instrumentation.recordAvmDuration('provingDuration', appCircuitName, provingResult.durationMs);
-      this.instrumentation.recordAvmSize('proofSize', appCircuitName, avmProof.binaryProof.buffer.length);
+    // Convert Uint8Array[] (32-byte field elements) to Fr[]
+    const proofFields = proofFieldArrays.map(f => Fr.fromBuffer(Buffer.from(f)));
 
-      logger.info(
-        `Generated proof for ${circuitType}(${input.hints.tx.hash}) in ${Math.ceil(provingResult.durationMs)} ms`,
-        {
-          circuitName: circuitType,
-          appCircuitName: input.hints.tx.hash,
-          // does not include reading the proof from disk
-          duration: provingResult.durationMs,
-          proofSize: avmProof.binaryProof.buffer.length,
-          eventName: 'circuit-proving',
-          inputSize: input.serializeWithMessagePack().length,
-          circuitSize: 1 << 21,
-          numPublicInputs: 0,
-        } satisfies CircuitProvingStats,
+    // Pad to fixed size (during development the proof length may vary)
+    if (proofFields.length > AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED) {
+      throw new Error(
+        `Proof has ${proofFields.length} fields, expected no more than ${AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED}.`,
       );
+    }
+    const proofFieldsPadded = proofFields.concat(
+      Array(AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED - proofFields.length).fill(new Fr(0)),
+    );
 
-      return avmProof;
-    };
-    return await this.runInDirectory(operation);
+    // Build the binary proof from the raw field data
+    const rawProofBuffer = Buffer.concat(proofFieldArrays.map(f => Buffer.from(f)));
+    const binaryProof = new Proof(rawProofBuffer, /*numPublicInputs=*/ 0);
+    const avmProof = new RecursiveProof(proofFieldsPadded, binaryProof, true, AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED);
+
+    const circuitType = 'avm-circuit' as const;
+    const appCircuitName = 'unknown' as const;
+    this.instrumentation.recordAvmDuration('provingDuration', appCircuitName, durationMs);
+    this.instrumentation.recordAvmSize('proofSize', appCircuitName, avmProof.binaryProof.buffer.length);
+
+    logger.info(`Generated proof for ${circuitType}(${input.hints.tx.hash}) in ${Math.ceil(durationMs)} ms`, {
+      circuitName: circuitType,
+      appCircuitName: input.hints.tx.hash,
+      duration: durationMs,
+      proofSize: avmProof.binaryProof.buffer.length,
+      eventName: 'circuit-proving',
+      inputSize: inputsBuffer.length,
+      circuitSize: 1 << 21,
+      numPublicInputs: 0,
+    } satisfies CircuitProvingStats);
+
+    return avmProof;
   }
 
   /**
@@ -579,33 +576,38 @@ export class BBNativeRollupProver implements ServerCircuitProver {
     convertInput: (input: CircuitInputType) => WitnessMap,
     convertOutput: (outputWitness: WitnessMap) => CircuitOutputType,
   ): Promise<{ circuitOutput: CircuitOutputType; proof: RecursiveProof<PROOF_LENGTH> }> {
-    // this probably is gonna need to call chonk
-    const operation = async (bbWorkingDirectory: string) => {
-      const { provingResult, circuitOutput: output } = await this.generateProofWithBB(
+    // Still need runInDirectory for ACVM witness generation temp files
+    const operation = async (workingDirectory: string) => {
+      const { proofResult, circuitOutput: output } = await this.generateProofWithBB(
         input,
         circuitType,
         convertInput,
         convertOutput,
-        bbWorkingDirectory,
+        workingDirectory,
       );
 
       const vkData = this.getVerificationKeyDataForCircuit(circuitType);
-      // Read the proof as fields
-      const proof = await readProofsFromOutputDirectory(provingResult.proofPath!, vkData, proofLength, logger);
+      // Construct proof from in-memory buffers (no file I/O needed)
+      const proof = constructRecursiveProofFromBuffers(
+        proofResult.proofFields,
+        proofResult.publicInputFields,
+        vkData,
+        proofLength,
+      );
 
       const circuitName = mapProtocolArtifactNameToCircuitName(circuitType);
-      this.instrumentation.recordDuration('provingDuration', circuitName, provingResult.durationMs);
+      this.instrumentation.recordDuration('provingDuration', circuitName, proofResult.durationMs);
       this.instrumentation.recordSize('proofSize', circuitName, proof.binaryProof.buffer.length);
       this.instrumentation.recordSize('circuitPublicInputCount', circuitName, vkData.numPublicInputs);
       this.instrumentation.recordSize('circuitSize', circuitName, vkData.circuitSize);
       logger.info(
-        `Generated proof for ${circuitType} in ${Math.ceil(provingResult.durationMs)} ms, size: ${
+        `Generated proof for ${circuitType} in ${Math.ceil(proofResult.durationMs)} ms, size: ${
           proof.proof.length
         } fields`,
         {
           circuitName,
           circuitSize: vkData.circuitSize,
-          duration: provingResult.durationMs,
+          duration: proofResult.durationMs,
           inputSize: output.toBuffer().length,
           proofSize: proof.binaryProof.buffer.length,
           eventName: 'circuit-proving',
@@ -622,49 +624,55 @@ export class BBNativeRollupProver implements ServerCircuitProver {
   }
 
   /**
-   * Verifies a proof, will generate the verification key if one is not cached internally
+   * Verifies a proof via bb.js API (no temp files needed).
    * @param circuitType - The type of circuit whose proof is to be verified
    * @param proof - The proof to be verified
    */
   public async verifyProof(circuitType: ServerProtocolArtifact, proof: Proof) {
     const verificationKey = this.getVerificationKeyDataForCircuit(circuitType);
-    return await this.verifyInternal(proof, verificationKey, (proofPath, vkPath) =>
-      verifyProof(this.config.bbBinaryPath, proofPath, vkPath, getUltraHonkFlavorForCircuit(circuitType), logger),
-    );
+    const flavor = getUltraHonkFlavorForCircuit(circuitType);
+
+    // Split proof buffer into public input fields and proof fields (32-byte each)
+    const publicInputFields = splitBufferToFieldArrays(proof.buffer.subarray(0, proof.numPublicInputs * 32));
+    const proofFields = splitBufferToFieldArrays(proof.buffer.subarray(proof.numPublicInputs * 32));
+
+    let verified: boolean;
+    let durationMs: number;
+    try {
+      ({ verified, durationMs } = await this.bbJsFactory.withVerifierInstance(instance =>
+        instance.verifyProof(proofFields, verificationKey.keyAsBytes, publicInputFields, flavor),
+      ));
+    } catch (error) {
+      throw new ProvingError(`Failed to verify proof for ${circuitType}: ${error}`);
+    }
+
+    if (!verified) {
+      throw new ProvingError('Failed to verify proof from key!');
+    }
+
+    logger.info(`Successfully verified proof from key in ${durationMs} ms`);
   }
 
+  /** Verify an AVM proof via bb.js API. */
   public async verifyAvmProof(proof: Proof, publicInputs: AvmCircuitPublicInputs) {
-    return await this.verifyInternal(proof, /*verificationKey=*/ undefined, (proofPath, /*unused*/ _vkPath) =>
-      verifyAvmProof(this.config.bbBinaryPath, this.config.bbWorkingDirectory, proofPath, publicInputs, logger),
+    // For AVM proofs, numPublicInputs is 0, so the full buffer is the proof.
+    const proofBuffer = proof.buffer.subarray(proof.numPublicInputs * 32);
+    // Split the raw proof buffer into 32-byte field element arrays
+    const proofFields: Uint8Array[] = [];
+    for (let i = 0; i < proofBuffer.length; i += Fr.SIZE_IN_BYTES) {
+      proofFields.push(new Uint8Array(proofBuffer.subarray(i, i + Fr.SIZE_IN_BYTES)));
+    }
+    const piBuffer = publicInputs.serializeWithMessagePack();
+
+    const { verified, durationMs } = await this.bbJsFactory.withVerifierInstance(instance =>
+      instance.verifyAvmProof(proofFields, piBuffer),
     );
-  }
-  private async verifyInternal(
-    proof: Proof,
-    verificationKey: { keyAsBytes: Buffer } | undefined,
-    verificationFunction: (proofPath: string, vkPath: string) => Promise<BBFailure | BBSuccess>,
-  ) {
-    const operation = async (bbWorkingDirectory: string) => {
-      const publicInputsFileName = path.join(bbWorkingDirectory, PUBLIC_INPUTS_FILENAME);
-      const proofFileName = path.join(bbWorkingDirectory, PROOF_FILENAME);
-      const verificationKeyPath = path.join(bbWorkingDirectory, VK_FILENAME);
-      // TODO(https://github.com/AztecProtocol/aztec-packages/issues/13189): Put this proof parsing logic in the proof class.
-      await fs.writeFile(publicInputsFileName, proof.buffer.subarray(0, proof.numPublicInputs * 32));
-      await fs.writeFile(proofFileName, proof.buffer.subarray(proof.numPublicInputs * 32));
-      if (verificationKey !== undefined) {
-        await fs.writeFile(verificationKeyPath, verificationKey.keyAsBytes);
-      }
-
-      const result = await verificationFunction(proofFileName, verificationKeyPath);
-
-      if (result.status === BB_RESULT.FAILURE) {
-        const errorMessage = `Failed to verify proof from key!`;
-        throw new ProvingError(errorMessage, result, result.retry);
-      }
-
-      logger.info(`Successfully verified proof from key in ${result.durationMs} ms`);
-    };
 
-    await this.runInDirectory(operation);
+    if (!verified) {
+      throw new ProvingError('Failed to verify AVM proof!');
+    }
+
+    logger.info(`Successfully verified AVM proof in ${durationMs} ms`);
   }
 
   /**
@@ -680,29 +688,6 @@ export class BBNativeRollupProver implements ServerCircuitProver {
     return vk;
   }
 
-  private async readAvmProofAsFields(
-    proofFilename: string,
-  ): Promise<RecursiveProof<typeof AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED>> {
-    const rawProofBuffer = await fs.readFile(proofFilename);
-    const reader = BufferReader.asReader(rawProofBuffer);
-    const proofFields = reader.readArray(rawProofBuffer.length / Fr.SIZE_IN_BYTES, Fr);
-
-    // We extend to a fixed-size padded proof as during development any new AVM circuit column changes the
-    // proof length and we do not have a mechanism to feedback a cpp constant to noir/TS.
-    // TODO(#13390): Revive a non-padded AVM proof
-    if (proofFields.length > AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED) {
-      throw new Error(
-        `Proof has ${proofFields.length} fields, expected no more than ${AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED}.`,
-      );
-    }
-    const proofFieldsPadded = proofFields.concat(
-      Array(AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED - proofFields.length).fill(new Fr(0)),
-    );
-
-    const proof = new Proof(rawProofBuffer, /*numPublicInputs=*/ 0);
-    return new RecursiveProof(proofFieldsPadded, proof, true, AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED);
-  }
-
   private runInDirectory<T>(fn: (dir: string) => Promise<T>) {
     return runInDirectory(
       this.config.bbWorkingDirectory,
@@ -716,3 +701,12 @@ export class BBNativeRollupProver implements ServerCircuitProver {
     );
   }
 }
+
+/** Split a buffer into 32-byte Uint8Array field elements. */
+function splitBufferToFieldArrays(buffer: Buffer): Uint8Array[] {
+  const fields: Uint8Array[] = [];
+  for (let i = 0; i < buffer.length; i += 32) {
+    fields.push(new Uint8Array(buffer.subarray(i, i + 32)));
+  }
+  return fields;
+}
diff --git a/yarn-project/bb-prover/src/verification_key/verification_key_data.ts b/yarn-project/bb-prover/src/verification_key/verification_key_data.ts
index 0307b8316789..1d3e169511eb 100644
--- a/yarn-project/bb-prover/src/verification_key/verification_key_data.ts
+++ b/yarn-project/bb-prover/src/verification_key/verification_key_data.ts
@@ -5,7 +5,7 @@ import { VerificationKeyAsFields, VerificationKeyData } from '@aztec/stdlib/vks'
 import { promises as fs } from 'fs';
 import * as path from 'path';
 
-import { VK_FILENAME } from '../bb/execute.js';
+import { VK_FILENAME } from '../bb/file_names.js';
 
 /**
  * Reads the verification key data stored at the specified location and parses into a VerificationKeyData
diff --git a/yarn-project/bb-prover/src/verifier/bb_verifier.ts b/yarn-project/bb-prover/src/verifier/bb_verifier.ts
index 3632f30f09b5..cdeeb997eb0d 100644
--- a/yarn-project/bb-prover/src/verifier/bb_verifier.ts
+++ b/yarn-project/bb-prover/src/verifier/bb_verifier.ts
@@ -1,4 +1,3 @@
-import { runInDirectory } from '@aztec/foundation/fs';
 import { type Logger, createLogger } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
 import { ProtocolCircuitVks } from '@aztec/noir-protocol-circuits-types/server/vks';
@@ -15,25 +14,20 @@ import { Tx } from '@aztec/stdlib/tx';
 import type { VerificationKeyData } from '@aztec/stdlib/vks';
 
 import { promises as fs } from 'fs';
-import * as path from 'path';
 
-import {
-  BB_RESULT,
-  PROOF_FILENAME,
-  PUBLIC_INPUTS_FILENAME,
-  VK_FILENAME,
-  verifyChonkProof,
-  verifyProof,
-} from '../bb/execute.js';
+import { BBJsProverFactory } from '../bb/bb_js_backend.js';
 import type { BBConfig } from '../config.js';
 import { getUltraHonkFlavorForCircuit } from '../honk.js';
-import { writeChonkProofToPath } from '../prover/proof_utils.js';
 
 export class BBCircuitVerifier implements ClientProtocolCircuitVerifier {
+  private bbJsFactory: BBJsProverFactory;
+
   private constructor(
     private config: BBConfig,
     private logger: Logger,
-  ) {}
+  ) {
+    this.bbJsFactory = new BBJsProverFactory(config.bbBinaryPath, logger, undefined, config.bbDebugOutputDir);
+  }
 
   public stop(): Promise<void> {
     return Promise.resolve();
@@ -55,87 +49,74 @@ export class BBCircuitVerifier implements ClientProtocolCircuitVerifier {
     return vk;
   }
 
+  /** Verify an UltraHonk proof via bb.js API (no temp files). */
   public async verifyProofForCircuit(circuit: ServerProtocolArtifact, proof: Proof) {
-    const operation = async (bbWorkingDirectory: string) => {
-      const publicInputsFileName = path.join(bbWorkingDirectory, PUBLIC_INPUTS_FILENAME);
-      const proofFileName = path.join(bbWorkingDirectory, PROOF_FILENAME);
-      const verificationKeyPath = path.join(bbWorkingDirectory, VK_FILENAME);
-      const verificationKey = this.getVerificationKeyData(circuit);
+    const verificationKey = this.getVerificationKeyData(circuit);
+    const flavor = getUltraHonkFlavorForCircuit(circuit);
 
-      this.logger.debug(`${circuit} Verifying with key: ${verificationKey.keyAsFields.hash.toString()}`);
+    this.logger.debug(`${circuit} Verifying with key: ${verificationKey.keyAsFields.hash.toString()}`);
 
-      // TODO(https://github.com/AztecProtocol/aztec-packages/issues/13189): Put this proof parsing logic in the proof class.
-      await fs.writeFile(publicInputsFileName, proof.buffer.slice(0, proof.numPublicInputs * 32));
-      await fs.writeFile(proofFileName, proof.buffer.slice(proof.numPublicInputs * 32));
-      await fs.writeFile(verificationKeyPath, verificationKey.keyAsBytes);
+    // Split proof buffer into public input fields and proof fields (32-byte each)
+    const publicInputFields = splitBufferToFieldArrays(proof.buffer.subarray(0, proof.numPublicInputs * 32));
+    const proofFields = splitBufferToFieldArrays(proof.buffer.subarray(proof.numPublicInputs * 32));
 
-      const result = await verifyProof(
-        this.config.bbBinaryPath,
-        proofFileName,
-        verificationKeyPath!,
-        getUltraHonkFlavorForCircuit(circuit),
-        this.logger,
-      );
+    const { verified, durationMs } = await this.bbJsFactory.withVerifierInstance(instance =>
+      instance.verifyProof(proofFields, verificationKey.keyAsBytes, publicInputFields, flavor),
+    );
 
-      if (result.status === BB_RESULT.FAILURE) {
-        const errorMessage = `Failed to verify ${circuit} proof!`;
-        throw new Error(errorMessage);
-      }
+    if (!verified) {
+      throw new Error(`Failed to verify ${circuit} proof!`);
+    }
 
-      this.logger.debug(`${circuit} verification successful`, {
-        circuitName: mapProtocolArtifactNameToCircuitName(circuit),
-        duration: result.durationMs,
-        eventName: 'circuit-verification',
-        proofType: 'ultra-honk',
-      } satisfies CircuitVerificationStats);
-    };
-    await runInDirectory(this.config.bbWorkingDirectory, operation, this.config.bbSkipCleanup, this.logger);
+    this.logger.debug(`${circuit} verification successful`, {
+      circuitName: mapProtocolArtifactNameToCircuitName(circuit),
+      duration: durationMs,
+      eventName: 'circuit-verification',
+      proofType: 'ultra-honk',
+    } satisfies CircuitVerificationStats);
   }
 
+  /** Verify a Chonk (IVC) proof from a transaction via bb.js API. */
   public async verifyProof(tx: Tx): Promise<IVCProofVerificationResult> {
     const proofType = 'Chonk';
     try {
       const totalTimer = new Timer();
-      let verificationDuration = 0;
 
       const circuit: ClientProtocolArtifact = tx.data.forPublic ? 'HidingKernelToPublic' : 'HidingKernelToRollup';
+      const verificationKey = this.getVerificationKeyData(circuit);
+
+      // Reconstruct the full proof with public inputs prepended, then convert Fr[] to Uint8Array[]
+      const proofWithPubInputs = tx.chonkProof.attachPublicInputs(tx.data.publicInputs().toFields());
+      const fieldsAsBuffers = proofWithPubInputs.fieldsWithPublicInputs.map(f => new Uint8Array(f.toBuffer()));
 
-      // Block below is almost copy-pasted from verifyProofForCircuit
-      const operation = async (bbWorkingDirectory: string) => {
-        const proofPath = path.join(bbWorkingDirectory, PROOF_FILENAME);
-        await writeChonkProofToPath(tx.chonkProof.attachPublicInputs(tx.data.publicInputs().toFields()), proofPath);
-
-        const verificationKeyPath = path.join(bbWorkingDirectory, VK_FILENAME);
-        const verificationKey = this.getVerificationKeyData(circuit);
-        await fs.writeFile(verificationKeyPath, verificationKey.keyAsBytes);
-
-        const timer = new Timer();
-        const result = await verifyChonkProof(
-          this.config.bbBinaryPath,
-          proofPath,
-          verificationKeyPath,
-          this.logger,
-          this.config.bbIVCConcurrency,
-        );
-        verificationDuration = timer.ms();
-
-        if (result.status === BB_RESULT.FAILURE) {
-          const errorMessage = `Failed to verify ${proofType} proof for ${circuit}!`;
-          throw new Error(errorMessage);
-        }
-
-        this.logger.debug(`${proofType} verification successful`, {
-          circuitName: mapProtocolArtifactNameToCircuitName(circuit),
-          duration: result.durationMs,
-          eventName: 'circuit-verification',
-          proofType: 'chonk',
-        } satisfies CircuitVerificationStats);
-      };
-      await runInDirectory(this.config.bbWorkingDirectory, operation, this.config.bbSkipCleanup, this.logger);
-      return { valid: true, durationMs: verificationDuration, totalDurationMs: totalTimer.ms() };
+      const { verified, durationMs } = await this.bbJsFactory.withVerifierInstance(instance =>
+        instance.verifyChonkProof(fieldsAsBuffers, verificationKey.keyAsBytes),
+      );
+
+      if (!verified) {
+        throw new Error(`Failed to verify ${proofType} proof for ${circuit}!`);
+      }
+
+      this.logger.debug(`${proofType} verification successful`, {
+        circuitName: mapProtocolArtifactNameToCircuitName(circuit),
+        duration: durationMs,
+        eventName: 'circuit-verification',
+        proofType: 'chonk',
+      } satisfies CircuitVerificationStats);
+
+      return { valid: true, durationMs, totalDurationMs: totalTimer.ms() };
     } catch (err) {
       this.logger.warn(`Failed to verify ${proofType} proof for tx ${tx.getTxHash().toString()}: ${String(err)}`);
       return { valid: false, durationMs: 0, totalDurationMs: 0 };
     }
   }
 }
+
+/** Split a buffer into 32-byte Uint8Array field elements. */
+function splitBufferToFieldArrays(buffer: Buffer): Uint8Array[] {
+  const fields: Uint8Array[] = [];
+  for (let i = 0; i < buffer.length; i += 32) {
+    fields.push(new Uint8Array(buffer.subarray(i, i + 32)));
+  }
+  return fields;
+}
diff --git a/yarn-project/blob-client/src/client/config.ts b/yarn-project/blob-client/src/client/config.ts
index 63e48c69f013..3ca63df7d965 100644
--- a/yarn-project/blob-client/src/client/config.ts
+++ b/yarn-project/blob-client/src/client/config.ts
@@ -93,7 +93,7 @@ export const blobClientConfigMapping: ConfigMappingsType<BlobClientConfig> = {
   blobSinkMapSizeKb: {
     env: 'BLOB_SINK_MAP_SIZE_KB',
     description: 'The maximum possible size of the blob sink DB in KB. Overwrites the general dataStoreMapSizeKb.',
-    parseEnv: (val: string) => +val,
+    ...optionalNumberConfigHelper(),
   },
   blobAllowEmptySources: {
     env: 'BLOB_ALLOW_EMPTY_SOURCES',
@@ -116,7 +116,7 @@ export const blobClientConfigMapping: ConfigMappingsType<BlobClientConfig> = {
   blobHealthcheckUploadIntervalMinutes: {
     env: 'BLOB_HEALTHCHECK_UPLOAD_INTERVAL_MINUTES',
     description: 'Interval in minutes for uploading healthcheck file to file store (default: 60 = 1 hour)',
-    parseEnv: (val: string) => +val,
+    ...optionalNumberConfigHelper(),
   },
   l1HttpTimeoutMS: {
     env: 'ETHEREUM_HTTP_TIMEOUT_MS',
diff --git a/yarn-project/bootstrap.sh b/yarn-project/bootstrap.sh
index 75c3aacbce73..d263e662de9c 100755
--- a/yarn-project/bootstrap.sh
+++ b/yarn-project/bootstrap.sh
@@ -119,6 +119,9 @@ function compile_all {
     return
   fi
 
+  # Ensure the pinned version sqlite3mc-wasm upstream artifacts are present before any package builds.
+  ./sqlite3mc-wasm/scripts/vendor.sh ensure
+
   compile_project ::: constants foundation stdlib blob-lib builder ethereum l1-artifacts
 
   # Call all projects that have a generation stage.
@@ -170,7 +173,7 @@ function test_cmds {
 
   # Exclusions:
   # end-to-end: e2e tests handled separately with end-to-end/bootstrap.sh.
-  # kv-store: Uses mocha so will need different treatment.
+  # kv-store: per-file fan-out handled by kv-store/bootstrap.sh test_cmds.
   for test in !(end-to-end|kv-store|aztec)/src/**/*.test.ts; do
     # Skip benchmarks here.
     [[ "$test" =~ \.bench\.test\.ts$ ]] && continue
@@ -218,8 +221,8 @@ function test_cmds {
     echo "${prefix}${cmd_env} yarn-project/scripts/run_test.sh $test"
   done
 
-  # Uses mocha for browser tests, so we have to treat it differently.
-  echo "$hash:ISOLATE=1 cd yarn-project/kv-store && yarn test"
+  # kv-store: per-file fan-out (mocha for node tests, vitest for browser tests).
+  kv-store/bootstrap.sh test_cmds
 
   # Aztec CLI tests
   aztec/bootstrap.sh test_cmds
diff --git a/yarn-project/bot/src/factory.ts b/yarn-project/bot/src/factory.ts
index 09c84eefa2f1..aa04f1c75dbd 100644
--- a/yarn-project/bot/src/factory.ts
+++ b/yarn-project/bot/src/factory.ts
@@ -189,12 +189,8 @@ export class BotFactory {
   }
 
   private async setupTestContract(deployer: AztecAddress): Promise<TestContract> {
-    const deployOpts: DeployOptions = {
-      from: deployer,
-      contractAddressSalt: this.config.tokenSalt,
-      universalDeploy: true,
-    };
-    const deploy = TestContract.deploy(this.wallet);
+    const deployOpts: DeployOptions = { from: deployer };
+    const deploy = TestContract.deploy(this.wallet, { salt: this.config.tokenSalt, universalDeploy: true });
     const instance = await this.registerOrDeployContract('TestContract', deploy, deployOpts);
     return TestContract.at(instance.address, this.wallet);
   }
@@ -284,44 +280,38 @@ export class BotFactory {
    */
   private async setupTokenContractWithOptionalEarlyRefuel(
     deployer: AztecAddress,
-    contractAddressSalt: Fr,
+    salt: Fr,
     name: string,
     ticker: string,
     decimals = 18,
   ): Promise<TokenContract> {
-    const deployOpts: DeployOptions = { from: deployer, contractAddressSalt, universalDeploy: true };
-    const deploy = TokenContract.deploy(this.wallet, deployer, name, ticker, decimals);
-    const instance = await deploy.getInstance(deployOpts);
+    const deploy = TokenContract.deploy(this.wallet, deployer, name, ticker, decimals, { salt, universalDeploy: true });
+    const instance = await deploy.getInstance();
     const metadata = await this.wallet.getContractMetadata(instance.address);
     if (metadata.isContractPublished) {
       this.log.info(`Token ${name} at ${instance.address.toString()} already deployed, refueling before setup`);
       const token = TokenContract.at(instance.address, this.wallet);
       await this.ensureFeeJuiceBalance(deployer, token);
     }
-    return this.setupTokenContract(deployer, contractAddressSalt, name, ticker, decimals);
+    return this.setupTokenContract(deployer, salt, name, ticker, decimals);
   }
 
   private async getTokenInstance(sender: AztecAddress): Promise<TokenContract | PrivateTokenContract> {
-    const deployOpts: DeployOptions = {
-      from: sender,
-      contractAddressSalt: this.config.tokenSalt,
-      universalDeploy: true,
-    };
+    const salt = this.config.tokenSalt;
     if (this.config.contract === SupportedTokenContracts.TokenContract) {
-      const deploy = TokenContract.deploy(this.wallet, sender, 'BotToken', 'BOT', 18);
-      const instance = await deploy.getInstance(deployOpts);
+      const deploy = TokenContract.deploy(this.wallet, sender, 'BotToken', 'BOT', 18, { salt, universalDeploy: true });
+      const instance = await deploy.getInstance();
       return TokenContract.at(instance.address, this.wallet);
     }
     if (this.config.contract === SupportedTokenContracts.PrivateTokenContract) {
       const tokenSecretKey = Fr.random();
       const tokenPublicKeys = (await deriveKeys(tokenSecretKey)).publicKeys;
-      const deploy = PrivateTokenContract.deployWithPublicKeys(tokenPublicKeys, this.wallet, MINT_BALANCE, sender);
-      const instance = await deploy.getInstance({
-        ...deployOpts,
-        skipInstancePublication: true,
-        skipClassPublication: true,
-        skipInitialization: false,
+      const deploy = PrivateTokenContract.deploy(this.wallet, MINT_BALANCE, sender, {
+        salt,
+        universalDeploy: true,
+        publicKeys: tokenPublicKeys,
       });
+      const instance = await deploy.getInstance();
       return PrivateTokenContract.at(instance.address, this.wallet);
     }
     throw new Error(`Unsupported token contract type: ${this.config.contract}`);
@@ -336,27 +326,28 @@ export class BotFactory {
    */
   private async setupToken(sender: AztecAddress): Promise<TokenContract | PrivateTokenContract> {
     let deploy: DeployMethod<TokenContract | PrivateTokenContract>;
-    const deployOpts: DeployOptions = {
-      from: sender,
-      contractAddressSalt: this.config.tokenSalt,
-      universalDeploy: true,
-    };
+    const salt = this.config.tokenSalt;
+    const deployOpts: DeployOptions = { from: sender };
     let token: TokenContract | PrivateTokenContract;
     if (this.config.contract === SupportedTokenContracts.TokenContract) {
-      deploy = TokenContract.deploy(this.wallet, sender, 'BotToken', 'BOT', 18);
-      const instance = await deploy.getInstance(deployOpts);
+      deploy = TokenContract.deploy(this.wallet, sender, 'BotToken', 'BOT', 18, { salt, universalDeploy: true });
+      const instance = await deploy.getInstance();
       token = TokenContract.at(instance.address, this.wallet);
     } else if (this.config.contract === SupportedTokenContracts.PrivateTokenContract) {
       // Generate keys for the contract since PrivateToken uses SinglePrivateMutable which requires keys
       const tokenSecretKey = Fr.random();
       const tokenPublicKeys = (await deriveKeys(tokenSecretKey)).publicKeys;
-      deploy = PrivateTokenContract.deployWithPublicKeys(tokenPublicKeys, this.wallet, MINT_BALANCE, sender);
+      deploy = PrivateTokenContract.deploy(this.wallet, MINT_BALANCE, sender, {
+        salt,
+        universalDeploy: true,
+        publicKeys: tokenPublicKeys,
+      });
       deployOpts.skipInstancePublication = true;
       deployOpts.skipClassPublication = true;
       deployOpts.skipInitialization = false;
 
       // Register the contract with the secret key before deployment
-      const tokenInstance = await deploy.getInstance(deployOpts);
+      const tokenInstance = await deploy.getInstance();
       token = PrivateTokenContract.at(tokenInstance.address, this.wallet);
       await this.wallet.registerContract(tokenInstance, PrivateTokenContract.artifact, tokenSecretKey);
       // The contract constructor initializes private storage vars that need the contract's own nullifier key.
@@ -376,26 +367,29 @@ export class BotFactory {
    */
   private async setupTokenContract(
     deployer: AztecAddress,
-    contractAddressSalt: Fr,
+    salt: Fr,
     name: string,
     ticker: string,
     decimals = 18,
   ): Promise<TokenContract> {
-    const deployOpts: DeployOptions = { from: deployer, contractAddressSalt, universalDeploy: true };
-    const deploy = TokenContract.deploy(this.wallet, deployer, name, ticker, decimals);
+    const deployOpts: DeployOptions = { from: deployer };
+    const deploy = TokenContract.deploy(this.wallet, deployer, name, ticker, decimals, { salt, universalDeploy: true });
     const instance = await this.registerOrDeployContract('Token - ' + name, deploy, deployOpts);
     return TokenContract.at(instance.address, this.wallet);
   }
 
   private async setupAmmContract(
     deployer: AztecAddress,
-    contractAddressSalt: Fr,
+    salt: Fr,
     token0: TokenContract,
     token1: TokenContract,
     lpToken: TokenContract,
   ): Promise<AMMContract> {
-    const deployOpts: DeployOptions = { from: deployer, contractAddressSalt, universalDeploy: true };
-    const deploy = AMMContract.deploy(this.wallet, token0.address, token1.address, lpToken.address);
+    const deployOpts: DeployOptions = { from: deployer };
+    const deploy = AMMContract.deploy(this.wallet, token0.address, token1.address, lpToken.address, {
+      salt,
+      universalDeploy: true,
+    });
     const instance = await this.registerOrDeployContract('AMM', deploy, deployOpts);
     const amm = AMMContract.at(instance.address, this.wallet);
 
@@ -511,7 +505,7 @@ export class BotFactory {
     deploy: DeployMethod<T>,
     deployOpts: DeployOptions,
   ): Promise<ContractInstanceWithAddress> {
-    const instance = await deploy.getInstance(deployOpts);
+    const instance = await deploy.getInstance();
     const address = instance.address;
     const metadata = await this.wallet.getContractMetadata(address);
     if (metadata.isContractPublished) {
diff --git a/yarn-project/builder/src/contract-interface-gen/typescript.ts b/yarn-project/builder/src/contract-interface-gen/typescript.ts
index a8a427ab0d44..e3e47bc56b84 100644
--- a/yarn-project/builder/src/contract-interface-gen/typescript.ts
+++ b/yarn-project/builder/src/contract-interface-gen/typescript.ts
@@ -93,39 +93,37 @@ function generateMethod(entry: FunctionAbi) {
  */
 function generateDeploy(input: ContractArtifact) {
   const ctor = getDefaultInitializer(input);
-  const args = (ctor?.parameters ?? []).map(generateParameter).join(', ');
+  const ctorParams = ctor?.parameters ?? [];
+  const args = ctorParams.map(generateParameter).join(', ');
+  const argNames = ctorParams.map(p => p.name).join(', ');
+  const argsForwarding = argNames ? `[${argNames}]` : '[]';
   const contractName = `${input.name}Contract`;
   const artifactName = `${contractName}Artifact`;
 
   return `
   /**
    * Creates a tx to deploy a new instance of this contract.
+   * @param instantiation - Optional address-affecting parameters (salt, deployer / universalDeploy, publicKeys).
+   *                       Salt defaults to a random value; the deployer is locked lazily from the first send-time \`from\`.
    */
-  public static deploy(wallet: Wallet, ${args}) {
-    return new DeployMethod<${contractName}>(PublicKeys.default(), wallet, ${artifactName}, (instance, wallet) => ${contractName}.at(instance.address, wallet), Array.from(arguments).slice(1));
-  }
-
-  /**
-   * Creates a tx to deploy a new instance of this contract using the specified public keys hash to derive the address.
-   */
-  public static deployWithPublicKeys(publicKeys: PublicKeys, wallet: Wallet, ${args}) {
-    return new DeployMethod<${contractName}>(publicKeys, wallet, ${artifactName}, (instance, wallet) => ${contractName}.at(instance.address, wallet), Array.from(arguments).slice(2));
+  public static deploy(wallet: Wallet, ${args ? `${args}, ` : ''}instantiation?: DeployInstantiationOptions) {
+    return new DeployMethod<${contractName}>(wallet, ${artifactName}, (instance, wallet) => ${contractName}.at(instance.address, wallet), ${argsForwarding}, undefined, instantiation);
   }
 
   /**
    * Creates a tx to deploy a new instance of this contract using the specified constructor method.
    */
   public static deployWithOpts<M extends keyof ${contractName}['methods']>(
-    opts: { publicKeys?: PublicKeys; method?: M; wallet: Wallet },
+    opts: { method?: M; wallet: Wallet; instantiation?: DeployInstantiationOptions },
     ...args: Parameters<${contractName}['methods'][M]>
   ) {
     return new DeployMethod<${contractName}>(
-      opts.publicKeys ?? PublicKeys.default(),
       opts.wallet,
       ${artifactName},
       (instance, wallet) => ${contractName}.at(instance.address, wallet),
-      Array.from(arguments).slice(1),
+      args,
       opts.method ?? 'constructor',
+      opts.instantiation,
     );
   }
   `;
@@ -310,7 +308,7 @@ export async function generateTypescriptContractInterface(input: ContractArtifac
 /* eslint-disable */
 import { AztecAddress, CompleteAddress } from '@aztec/aztec.js/addresses';
 import { type AbiType, type AztecAddressLike, type ContractArtifact, EventSelector, decodeFromAbi, type EthAddressLike, type FieldLike, type FunctionSelectorLike, loadContractArtifact, loadContractArtifactForPublic, type NoirCompiledContract, type OptionLike, type U128Like, type WrappedFieldLike } from '@aztec/aztec.js/abi';
-import { Contract, ContractBase, ContractFunctionInteraction, type ContractMethod, type ContractStorageLayout, DeployMethod } from '@aztec/aztec.js/contracts';
+import { Contract, ContractBase, ContractFunctionInteraction, type ContractMethod, type ContractStorageLayout, type DeployInstantiationOptions, DeployMethod } from '@aztec/aztec.js/contracts';
 import { EthAddress } from '@aztec/aztec.js/addresses';
 import { Fr, Point } from '@aztec/aztec.js/fields';
 import { type PublicKey, PublicKeys } from '@aztec/aztec.js/keys';
diff --git a/yarn-project/cli-wallet/src/bin/index.ts b/yarn-project/cli-wallet/src/bin/index.ts
index 1334ad2e1c72..bef096bcb357 100644
--- a/yarn-project/cli-wallet/src/bin/index.ts
+++ b/yarn-project/cli-wallet/src/bin/index.ts
@@ -73,7 +73,7 @@ function injectInternalCommands(program: Command, log: LogFn, db: WalletDB) {
 
 /** CLI wallet main entrypoint */
 async function main() {
-  const walletVersion = getPackageVersion() ?? '0.0.0';
+  const walletVersion = getPackageVersion();
 
   const db = WalletDB.getInstance();
   const walletAndNodeWrapper = new CliWalletAndNodeWrapper();
diff --git a/yarn-project/cli-wallet/src/cmds/deploy.ts b/yarn-project/cli-wallet/src/cmds/deploy.ts
index d7f23de2b16d..67bce11bb1e5 100644
--- a/yarn-project/cli-wallet/src/cmds/deploy.ts
+++ b/yarn-project/cli-wallet/src/cmds/deploy.ts
@@ -45,12 +45,7 @@ export async function deploy(
 
   // TODO(#12081): Add contractArtifact.noirVersion and check here (via Noir.lock)?
 
-  const contractDeployer = new ContractDeployer(
-    contractArtifact,
-    wallet,
-    publicKeys ?? PublicKeys.default(),
-    initializer,
-  );
+  const contractDeployer = new ContractDeployer(contractArtifact, wallet, initializer);
 
   let args = [];
   if (rawArgs.length > 0) {
@@ -62,13 +57,11 @@ export async function deploy(
     debugLogger.debug(`Encoded arguments: ${args.join(', ')}`);
   }
 
-  const deployInteraction = contractDeployer.deploy(...args);
+  const deployInteraction = contractDeployer.deploy(args, { salt, publicKeys: publicKeys ?? PublicKeys.default() });
   const { paymentMethod, gasSettings } = await feeOpts.toUserFeeOptions(node, wallet, deployer);
   const deployOpts: DeployOptions = {
     fee: { gasSettings, paymentMethod },
     from: deployer ?? NO_FROM,
-    contractAddressSalt: salt,
-    universalDeploy: !deployer,
     skipClassPublication,
     skipInitialization,
     skipInstancePublication,
@@ -101,8 +94,9 @@ export async function deploy(
       printProfileResult(stats, log);
     }
 
-    const { address, partialAddress } = deployInteraction;
     const instance = await deployInteraction.getInstance();
+    const address = instance.address;
+    const partialAddress = await deployInteraction.getPartialAddress();
 
     const { txHash } = await deployInteraction.send({ ...deployOpts, wait: NO_WAIT });
     const localTimeMs = performance.now() - localStart;
@@ -115,8 +109,8 @@ export async function deploy(
       const nodeTimeMs = performance.now() - nodeStart;
 
       if (!json) {
-        log(`Contract deployed at ${address?.toString()}`);
-        log(`Contract partial address ${(await partialAddress)?.toString()}`);
+        log(`Contract deployed at ${address.toString()}`);
+        log(`Contract partial address ${partialAddress.toString()}`);
         log(`Contract init hash ${instance.initializationHash.toString()}`);
         log(`Deployment tx hash: ${txHash.toString()}`);
         log(`Deployment salt: ${salt.toString()}`);
@@ -126,8 +120,8 @@ export async function deploy(
         log(` Node inclusion time: ${(nodeTimeMs / 1000).toFixed(1)}s`);
       } else {
         out.contract = {
-          address: address?.toString(),
-          partialAddress: (await partialAddress)?.toString(),
+          address: address.toString(),
+          partialAddress: partialAddress.toString(),
           initializationHash: instance.initializationHash.toString(),
           salt: salt.toString(),
           transactionFee: receipt.transactionFee?.toString(),
@@ -135,16 +129,16 @@ export async function deploy(
       }
     } else {
       if (!json) {
-        log(`Contract deployed at ${address?.toString()}`);
-        log(`Contract partial address ${(await partialAddress)?.toString()}`);
+        log(`Contract deployed at ${address.toString()}`);
+        log(`Contract partial address ${partialAddress.toString()}`);
         log(`Contract init hash ${instance.initializationHash.toString()}`);
         log(`Deployment tx hash: ${txHash.toString()}`);
         log(`Deployment salt: ${salt.toString()}`);
         log(`Deployer: ${instance.deployer.toString()}`);
       } else {
         out.contract = {
-          address: address?.toString(),
-          partialAddress: (await partialAddress)?.toString(),
+          address: address.toString(),
+          partialAddress: partialAddress.toString(),
           initializationHash: instance.initializationHash.toString(),
           salt: salt.toString(),
         };
@@ -154,5 +148,5 @@ export async function deploy(
   if (json) {
     log(prettyPrintJSON(out));
   }
-  return deployInteraction.address;
+  return await deployInteraction.getAddress();
 }
diff --git a/yarn-project/cli-wallet/src/utils/wallet.ts b/yarn-project/cli-wallet/src/utils/wallet.ts
index a95a74decd83..2ace44debe9c 100644
--- a/yarn-project/cli-wallet/src/utils/wallet.ts
+++ b/yarn-project/cli-wallet/src/utils/wallet.ts
@@ -4,11 +4,7 @@ import { StubEcdsaAccountContractArtifact, createStubEcdsaAccount } from '@aztec
 import { StubSchnorrAccountContractArtifact, createStubSchnorrAccount } from '@aztec/accounts/stub/schnorr';
 import { getIdentities } from '@aztec/accounts/utils';
 import { type Account, type AccountContract, NO_FROM } from '@aztec/aztec.js/account';
-import {
-  type InteractionFeeOptions,
-  getContractInstanceFromInstantiationParams,
-  getGasLimits,
-} from '@aztec/aztec.js/contracts';
+import { type InteractionFeeOptions, getContractClassFromArtifact, getGasLimits } from '@aztec/aztec.js/contracts';
 import type { AztecNode } from '@aztec/aztec.js/node';
 import { AccountManager, type Aliased, type SimulateOptions } from '@aztec/aztec.js/wallet';
 import { TxSimulationResultWithAppOffset } from '@aztec/aztec.js/wallet';
@@ -34,6 +30,9 @@ import { printGasEstimates } from './options/fees.js';
 
 export class CLIWallet extends BaseWallet {
   private accountCache = new Map<string, Account>();
+  // Stub class ids, populated on wallet startup
+  // to avoid redundant work per simulation
+  private stubClassIds = new Map<AccountType, Fr>();
 
   constructor(
     pxe: PXE,
@@ -53,7 +52,27 @@ export class CLIWallet extends BaseWallet {
   ): Promise<CLIWallet> {
     const pxeConfig = Object.assign(getPXEConfig(), overridePXEConfig);
     const pxe = await createPXE(node, pxeConfig);
-    return new CLIWallet(pxe, node, log, db);
+    const wallet = new CLIWallet(pxe, node, log, db);
+    await wallet.initStubClasses();
+    return wallet;
+  }
+
+  /**
+   * Hashes and registers the stub class for every supported account type with PXE, populating
+   * stubClassIds. Called on wallet initialization.
+   */
+  private async initStubClasses(): Promise<void> {
+    const { id: schnorrClassId } = await getContractClassFromArtifact(StubSchnorrAccountContractArtifact);
+    await this.pxe.registerContractClass(StubSchnorrAccountContractArtifact);
+
+    // ecdsa stubs share the same class id
+    const { id: ecdsaClassId } = await getContractClassFromArtifact(StubEcdsaAccountContractArtifact);
+    await this.pxe.registerContractClass(StubEcdsaAccountContractArtifact);
+
+    this.stubClassIds.set('schnorr', schnorrClassId);
+    this.stubClassIds.set('ecdsasecp256k1', ecdsaClassId);
+    this.stubClassIds.set('ecdsasecp256r1', ecdsaClassId);
+    this.stubClassIds.set('ecdsasecp256r1ssh', ecdsaClassId);
   }
 
   override async getAccounts(): Promise<Aliased<AztecAddress>[]> {
@@ -202,11 +221,16 @@ export class CLIWallet extends BaseWallet {
       throw new Error(`No contract instance found for address: ${originalAddress.address}`);
     }
     const { type } = await this.db!.retrieveAccount(address);
-    const isSchnorr = type === 'schnorr';
-    const artifact = isSchnorr ? StubSchnorrAccountContractArtifact : StubEcdsaAccountContractArtifact;
-    const stubAccount = isSchnorr ? createStubSchnorrAccount(originalAddress) : createStubEcdsaAccount(originalAddress);
-    const instance = await getContractInstanceFromInstantiationParams(artifact, { salt: Fr.random() });
-    return { account: stubAccount, instance, artifact };
+    const stubAccount =
+      type === 'schnorr' ? createStubSchnorrAccount(originalAddress) : createStubEcdsaAccount(originalAddress);
+    const stubClassId = this.stubClassIds.get(type);
+    if (!stubClassId) {
+      throw new Error(
+        `Stub class for account type '${type}' was not registered at wallet init. This is a bug — initStubClasses should cover every supported AccountType.`,
+      );
+    }
+    const instance = { ...contractInstance, currentContractClassId: stubClassId };
+    return { account: stubAccount, instance };
   }
 
   override async simulateTx(
@@ -249,9 +273,9 @@ export class CLIWallet extends BaseWallet {
       const entrypoint = new DefaultEntrypoint();
       txRequest = await entrypoint.createTxExecutionRequest(finalExecutionPayload, feeOptions.gasSettings, chainInfo);
     } else {
-      const { account, instance, artifact } = await this.getFakeAccountDataFor(from);
+      const { account, instance } = await this.getFakeAccountDataFor(from);
       overrides = {
-        contracts: { [from.toString()]: { instance, artifact } },
+        contracts: { [from.toString()]: { instance } },
       };
       const executionOptions: DefaultAccountEntrypointOptions = {
         txNonce: Fr.random(),
diff --git a/yarn-project/cli/src/cmds/aztec_node/block_number.ts b/yarn-project/cli/src/cmds/aztec_node/block_number.ts
index c9cd69c6ba37..cc2d90dc421f 100644
--- a/yarn-project/cli/src/cmds/aztec_node/block_number.ts
+++ b/yarn-project/cli/src/cmds/aztec_node/block_number.ts
@@ -3,7 +3,7 @@ import type { LogFn } from '@aztec/foundation/log';
 
 export async function blockNumber(nodeUrl: string, log: LogFn) {
   const aztecNode = createAztecNodeClient(nodeUrl);
-  const [latestNum, provenNum] = await Promise.all([aztecNode.getBlockNumber(), aztecNode.getProvenBlockNumber()]);
+  const [latestNum, provenNum] = await Promise.all([aztecNode.getBlockNumber(), aztecNode.getBlockNumber('proven')]);
   log(`Latest block: ${latestNum}`);
   log(`Proven block: ${provenNum}`);
 }
diff --git a/yarn-project/cli/src/utils/inspect.ts b/yarn-project/cli/src/utils/inspect.ts
index 67eb46e9abc3..1943e274b408 100644
--- a/yarn-project/cli/src/utils/inspect.ts
+++ b/yarn-project/cli/src/utils/inspect.ts
@@ -9,14 +9,13 @@ export async function inspectBlock(
   log: LogFn,
   opts: { showTxs?: boolean } = {},
 ) {
-  const block = await aztecNode.getBlock(blockNumber);
+  const block = await aztecNode.getBlock(blockNumber, { includeTransactions: opts.showTxs });
   if (!block) {
     log(`No block found for block number ${blockNumber}`);
     return;
   }
 
-  const blockHash = await block.hash();
-  log(`Block ${blockNumber} (${blockHash.toString()})`);
+  log(`Block ${blockNumber} (${block.hash.toString()})`);
   log(` Total fees: ${block.header.totalFees.toBigInt()}`);
   log(` Total mana used: ${block.header.totalManaUsed.toBigInt()}`);
   log(
@@ -25,12 +24,12 @@ export async function inspectBlock(
   log(` Coinbase: ${block.header.globalVariables.coinbase}`);
   log(` Fee recipient: ${block.header.globalVariables.feeRecipient}`);
   log(` Timestamp: ${new Date(Number(block.header.globalVariables.timestamp) * 500)}`);
-  if (opts.showTxs) {
+  if (opts.showTxs && block.body) {
     log(``);
     for (const txHash of block.body.txEffects.map(tx => tx.txHash)) {
       await inspectTx(aztecNode, txHash, log, { includeBlockInfo: false });
     }
-  } else {
+  } else if (block.body) {
     log(` Transactions: ${block.body.txEffects.length}`);
   }
 }
diff --git a/yarn-project/constants/src/constants.gen.ts b/yarn-project/constants/src/constants.gen.ts
index 99e5da0c2bc4..2a0593413f9c 100644
--- a/yarn-project/constants/src/constants.gen.ts
+++ b/yarn-project/constants/src/constants.gen.ts
@@ -236,10 +236,14 @@ export const IPA_PROOF_LENGTH = 64;
 export const ULTRA_KECCAK_PROOF_LENGTH = 331;
 export const RECURSIVE_ROLLUP_HONK_PROOF_LENGTH = 480;
 export const NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH = 480;
-export const CHONK_PROOF_LENGTH = 1315;
+export const CHONK_HIDING_OINK_LENGTH = 108;
+export const CHONK_MERGE_PROOF_SIZE = 42;
+export const CHONK_ECCVM_PROOF_LENGTH = 608;
+export const CHONK_JOINT_PROOF_LENGTH = 499;
+export const CHONK_PROOF_LENGTH = 1349;
 export const ULTRA_VK_LENGTH_IN_FIELDS = 115;
-export const MEGA_VK_LENGTH_IN_FIELDS = 127;
-export const CHONK_VK_LENGTH_IN_FIELDS = 127;
+export const MEGA_VK_LENGTH_IN_FIELDS = 143;
+export const CHONK_VK_LENGTH_IN_FIELDS = 143;
 export const AVM_VERIFICATION_KEY_LENGTH_IN_FIELDS = 86;
 export const MAX_PUBLIC_BYTECODE_SIZE_IN_BYTES = 96000;
 export const MAX_PUBLIC_CALLS_TO_UNIQUE_CONTRACT_CLASS_IDS = 21;
@@ -497,6 +501,7 @@ export const GRUMPKIN_ONE_Y = 17631683881184975370165255887551781615748388533673
 export const DEFAULT_MAX_DEBUG_LOG_MEMORY_READS = 125000;
 export enum DomainSeparator {
   NOTE_HASH = 116501019,
+  PARTIAL_NOTE_COMMITMENT = 568912195,
   SILOED_NOTE_HASH = 3361878420,
   UNIQUE_NOTE_HASH = 226850429,
   NOTE_HASH_NONCE = 1721808740,
@@ -507,6 +512,7 @@ export enum DomainSeparator {
   EVENT_LOG_TAG = 926040838,
   NOTE_COMPLETION_LOG_TAG = 3372669888,
   UNCONSTRAINED_MSG_LOG_TAG = 1485357192,
+  NON_INTERACTIVE_HANDSHAKE_LOG_TAG = 4046403018,
   PRIVATE_LOG_FIRST_FIELD = 2769976252,
   PUBLIC_LEAF_SLOT = 1247650290,
   PUBLIC_STORAGE_MAP_SLOT = 4015149901,
@@ -546,6 +552,7 @@ export enum DomainSeparator {
   PUBLIC_INITIALIZATION_NULLIFIER = 3342006647,
   PRIVATE_INITIALIZATION_NULLIFIER = 3990889078,
   SECRET_HASH = 4199652938,
+  HANDSHAKE_SECRET_HASH = 3596796143,
   TX_NULLIFIER = 1025801951,
   SIGNATURE_PAYLOAD = 463525807,
   BLOCK_HEADERS_HASH = 515582467,
@@ -554,4 +561,4 @@ export enum DomainSeparator {
   BLOB_Z_ACC = 1003392952,
   BLOB_GAMMA_ACC = 855632775,
   BLOB_GAMMA_FINAL = 1755883835,
-}
\ No newline at end of file
+}
diff --git a/yarn-project/end-to-end/bootstrap.sh b/yarn-project/end-to-end/bootstrap.sh
index f89af5c66285..bbb731adaa7f 100755
--- a/yarn-project/end-to-end/bootstrap.sh
+++ b/yarn-project/end-to-end/bootstrap.sh
@@ -246,6 +246,39 @@ function avm_check_circuit {
   avm_check_circuit_cmds | parallelize
 }
 
+# Generates e2e test commands using contract artifacts from a prior release version.
+# Only includes simple (jest-based) tests since compose/docker tests don't use the legacy jest resolver.
+# Excludes prover, block_building, and epochs tests (not relevant for contract artifact compat; epochs
+# tests are known-flaky and provide no additional backwards-compat coverage). Also excludes
+# kernelless_simulation, which asserts on the exact number of nullifiers emitted and breaks whenever
+# contracts add/remove nullifier emissions across versions (unrelated to the compat contract surface).
+function compat_test_cmds {
+  local version=${1:?version is required}
+  local run_test_script="yarn-project/end-to-end/scripts/run_test.sh"
+  local prefix="$hash:ISOLATE=1"
+  local compat_env="CONTRACT_ARTIFACTS_VERSION=$version"
+
+  local tests=(
+    src/e2e_!(prover|block_building|epochs)/*.test.ts
+    src/e2e_p2p/reqresp/*.test.ts
+    src/e2e_!(block_building|prover_*|kernelless_simulation).test.ts
+  )
+  for test in "${tests[@]}"; do
+    local name=${test#*e2e_}
+    name=e2e_${name%.test.ts}
+
+    if [[ "$test" == *.parallel.test.ts ]]; then
+      while IFS= read -r test_name; do
+        local safe_test_name=$(echo "$test_name" | sed 's/ /_/g')
+        local full_name="compat_${version}_${name}_${safe_test_name}"
+        echo "$prefix:NAME=$full_name $compat_env $run_test_script simple $test \"$test_name\""
+      done < <(extract_test_names "$test")
+    else
+      echo "$prefix:NAME=compat_${version}_${name} $compat_env $run_test_script simple $test"
+    fi
+  done
+}
+
 case "$cmd" in
   "")
     build
diff --git a/yarn-project/end-to-end/src/bench/node_rpc_perf.test.ts b/yarn-project/end-to-end/src/bench/node_rpc_perf.test.ts
index 246053f17b30..788a08ef828e 100644
--- a/yarn-project/end-to-end/src/bench/node_rpc_perf.test.ts
+++ b/yarn-project/end-to-end/src/bench/node_rpc_perf.test.ts
@@ -287,7 +287,7 @@ describe('e2e_node_rpc_perf', () => {
     });
 
     it('benchmarks getProvenBlockNumber', async () => {
-      const { stats } = await benchmark('getProvenBlockNumber', () => aztecNode.getProvenBlockNumber());
+      const { stats } = await benchmark('getProvenBlockNumber', () => aztecNode.getBlockNumber('proven'));
       addResult('getProvenBlockNumber', stats);
       expect(stats.avg).toBeLessThan(1000);
     });
@@ -324,16 +324,16 @@ describe('e2e_node_rpc_perf', () => {
       expect(stats.avg).toBeLessThan(5000);
     });
 
-    it('benchmarks getBlockByArchive', async () => {
-      const { stats } = await benchmark('getBlockByArchive', () => aztecNode.getBlockByArchive(blockArchive));
+    it('benchmarks getBlock by archive', async () => {
+      const { stats } = await benchmark('getBlockByArchive', () =>
+        aztecNode.getBlock({ archive: blockArchive }, { includeTransactions: true }),
+      );
       addResult('getBlockByArchive', stats);
       expect(stats.avg).toBeLessThan(3000);
     });
 
-    it('benchmarks getBlockHeaderByArchive', async () => {
-      const { stats } = await benchmark('getBlockHeaderByArchive', () =>
-        aztecNode.getBlockHeaderByArchive(blockArchive),
-      );
+    it('benchmarks getBlock header by archive', async () => {
+      const { stats } = await benchmark('getBlockHeaderByArchive', () => aztecNode.getBlock({ archive: blockArchive }));
       addResult('getBlockHeaderByArchive', stats);
       expect(stats.avg).toBeLessThan(2000);
     });
diff --git a/yarn-project/end-to-end/src/composed/ha/e2e_ha_full.test.ts b/yarn-project/end-to-end/src/composed/ha/e2e_ha_full.test.ts
index 9ff153020606..0fb6aa174db5 100644
--- a/yarn-project/end-to-end/src/composed/ha/e2e_ha_full.test.ts
+++ b/yarn-project/end-to-end/src/composed/ha/e2e_ha_full.test.ts
@@ -26,6 +26,7 @@ import type { TestDateProvider } from '@aztec/foundation/timer';
 import { GovernanceProposerAbi } from '@aztec/l1-artifacts/GovernanceProposerAbi';
 import { StatefulTestContractArtifact } from '@aztec/noir-test-contracts.js/StatefulTest';
 import { type AttestationInfo, getAttestationInfoFromPublishedCheckpoint } from '@aztec/stdlib/block';
+import { Checkpoint } from '@aztec/stdlib/checkpoint';
 import type { GenesisData } from '@aztec/stdlib/world-state';
 import type { ValidatorClient } from '@aztec/validator-client';
 import { PostgresSlashingProtectionDatabase } from '@aztec/validator-ha-signer/db';
@@ -88,6 +89,10 @@ describe('HA Full Setup', () => {
   let governanceProposer: GovernanceProposerContract;
   /** Per-node initial keystore JSON (all 4 attesters, node's own publisher) for restore after reload test */
   let initialKeystoreJsons: string[];
+  const getSignatureContext = () => ({
+    chainId: config.l1ChainId,
+    rollupAddress: deployL1ContractsValues.l1ContractAddresses.rollupAddress,
+  });
 
   beforeAll(async () => {
     // Check required environment variables
@@ -326,9 +331,8 @@ describe('HA Full Setup', () => {
     // Deploy a contract to trigger block building
     const deployer = new ContractDeployer(StatefulTestContractArtifact, wallet);
     logger.info(`Deploying contract from ${ownerAddress}`);
-    const { receipt } = await deployer.deploy(ownerAddress, 1).send({
+    const { receipt } = await deployer.deploy([ownerAddress, 1], { salt: new Fr(BigInt(1)) }).send({
       from: ownerAddress,
-      contractAddressSalt: new Fr(BigInt(1)),
     });
 
     await waitForProven(aztecNode, receipt, {
@@ -345,12 +349,12 @@ describe('HA Full Setup', () => {
     }
 
     // Verify txs were included in the block (tests full signing path)
-    expect(block.block.body.txEffects.length).toBeGreaterThan(0);
-    logger.info(`Block contains ${block.block.body.txEffects.length} transaction(s)`);
+    expect(block.body!.txEffects.length).toBeGreaterThan(0);
+    logger.info(`Block contains ${block.body!.txEffects.length} transaction(s)`);
 
     // get attestations from checkpoint
-    const [checkpoint] = await aztecNode.getCheckpoints(block.checkpointNumber, 1);
-    const attestations = checkpoint.attestations.filter(a => !a.signature.isEmpty());
+    const [checkpoint] = await aztecNode.getCheckpoints(block.checkpointNumber, 1, { includeAttestations: true });
+    const attestations = (checkpoint.attestations ?? []).filter(a => !a.signature.isEmpty());
 
     // Should have enough attestations for quorum
     const quorum = Math.floor((COMMITTEE_SIZE * 2) / 3) + 1;
@@ -367,7 +371,7 @@ describe('HA Full Setup', () => {
     logger.info(`Verified ${attestations.length} signatures from Web3Signer`);
 
     // Query database to verify HA coordination
-    const slotNumber = BigInt(block.block.header.globalVariables.slotNumber);
+    const slotNumber = BigInt(block.header.globalVariables.slotNumber);
     logger.info(`Querying duties for slot ${slotNumber} (block ${receipt.blockNumber})`);
     const allDuties = await getValidatorDuties(mainPool, slotNumber);
     expect(allDuties.length).toBeGreaterThan(0);
@@ -444,9 +448,8 @@ describe('HA Full Setup', () => {
     // Send a transaction to trigger block building which will also trigger voting
     logger.info('Sending transaction to trigger block building...');
     const deployer = new ContractDeployer(StatefulTestContractArtifact, wallet);
-    const { receipt } = await deployer.deploy(ownerAddress, 42).send({
+    const { receipt } = await deployer.deploy([ownerAddress, 42], { salt: Fr.random() }).send({
       from: ownerAddress,
-      contractAddressSalt: Fr.random(),
     });
     expect(receipt.blockNumber).toBeDefined();
     logger.info(`Transaction mined in block ${receipt.blockNumber}`);
@@ -456,7 +459,7 @@ describe('HA Full Setup', () => {
     if (!block) {
       throw new Error(`Block ${receipt.blockNumber} not found`);
     }
-    const blockSlot = block.block.header.globalVariables.slotNumber;
+    const blockSlot = block.header.globalVariables.slotNumber;
     logger.info(`Block was built in slot ${blockSlot}`);
 
     // Compute round for governance voting from the block slot
@@ -601,14 +604,13 @@ describe('HA Full Setup', () => {
       }
 
       const deployer = new ContractDeployer(StatefulTestContractArtifact, wallet);
-      const receipt = await deployer.deploy(ownerAddress, 201).send({
+      const receipt = await deployer.deploy([ownerAddress, 201], { salt: new Fr(201) }).send({
         from: ownerAddress,
-        contractAddressSalt: new Fr(201),
       });
       expect(receipt.receipt.blockNumber).toBeDefined();
       const [block] = await aztecNode.getCheckpointedBlocks(receipt.receipt.blockNumber!, 1);
-      const [cp] = await aztecNode.getCheckpoints(block!.checkpointNumber, 1);
-      const att = cp.attestations.filter(a => !a.signature.isEmpty());
+      const [cp] = await aztecNode.getCheckpoints(block!.checkpointNumber, 1, { includeAttestations: true });
+      const att = (cp.attestations ?? []).filter(a => !a.signature.isEmpty());
       expect(att.length).toBeGreaterThanOrEqual(quorum);
       logger.info(`Phase 2: block ${receipt.receipt.blockNumber}, ${att.length} attestations (quorum ${quorum})`);
     } finally {
@@ -643,9 +645,8 @@ describe('HA Full Setup', () => {
       logger.info(`Active nodes: ${haNodeServices.length - killedNodes.length}/${NODE_COUNT}`);
 
       const deployer = new ContractDeployer(StatefulTestContractArtifact, wallet);
-      const { receipt } = await deployer.deploy(ownerAddress, i + 100).send({
+      const { receipt } = await deployer.deploy([ownerAddress, i + 100], { salt: new Fr(BigInt(i + 100)) }).send({
         from: ownerAddress,
-        contractAddressSalt: new Fr(BigInt(i + 100)),
       });
 
       expect(receipt.blockNumber).toBeDefined();
@@ -663,7 +664,7 @@ describe('HA Full Setup', () => {
       if (!block) {
         throw new Error(`Block ${receipt.blockNumber} not found`);
       }
-      const slotNumber = BigInt(block.block.header.globalVariables.slotNumber);
+      const slotNumber = BigInt(block.header.globalVariables.slotNumber);
       const duties = await getValidatorDuties(mainPool, slotNumber);
       const blockProposalDuty = duties.find(d => d.dutyType === 'BLOCK_PROPOSAL');
 
@@ -726,7 +727,7 @@ describe('HA Full Setup', () => {
       if (!block) {
         throw new Error(`Block ${receipt.blockNumber} not found`);
       }
-      const slotNumber = BigInt(block.block.header.globalVariables.slotNumber);
+      const slotNumber = BigInt(block.header.globalVariables.slotNumber);
 
       // PRIMARY CHECK: Database records show all attestation duties attempted/completed
       const duties = await getValidatorDuties(mainPool, slotNumber);
@@ -779,11 +780,22 @@ describe('HA Full Setup', () => {
       );
 
       // SECONDARY CHECK: Verify checkpoint attestations match database records
-      const [publishedCheckpoint] = await aztecNode.getCheckpoints(block.checkpointNumber, 1);
-      const attestationInfos = getAttestationInfoFromPublishedCheckpoint({
-        attestations: publishedCheckpoint.attestations,
-        checkpoint: publishedCheckpoint.checkpoint,
+      const [publishedCheckpoint] = await aztecNode.getCheckpoints(block.checkpointNumber, 1, {
+        includeAttestations: true,
       });
+      const attestationInfos = getAttestationInfoFromPublishedCheckpoint(
+        {
+          attestations: publishedCheckpoint.attestations ?? [],
+          checkpoint: new Checkpoint(
+            publishedCheckpoint.archive,
+            publishedCheckpoint.header,
+            [],
+            publishedCheckpoint.number,
+            publishedCheckpoint.feeAssetPriceModifier,
+          ),
+        },
+        getSignatureContext(),
+      );
 
       // Filter to only valid attestations with recovered addresses
       const validAttestations = attestationInfos.filter(
diff --git a/yarn-project/end-to-end/src/composed/web3signer/e2e_multi_validator_node_key_store.test.ts b/yarn-project/end-to-end/src/composed/web3signer/e2e_multi_validator_node_key_store.test.ts
index 575c10a9d5d7..6d1f29501e2e 100644
--- a/yarn-project/end-to-end/src/composed/web3signer/e2e_multi_validator_node_key_store.test.ts
+++ b/yarn-project/end-to-end/src/composed/web3signer/e2e_multi_validator_node_key_store.test.ts
@@ -324,11 +324,10 @@ describe('e2e_multi_validator_node', () => {
     await rmdir(keyStoreDirectory, { recursive: true });
   });
 
-  const sendTx = (contractAddressSalt: Fr) => {
+  const sendTx = (salt: Fr) => {
     const deployer = new ContractDeployer(artifact, wallet);
-    return deployer.deploy(ownerAddress, 1).send({
+    return deployer.deploy([ownerAddress, 1], { salt }).send({
       from: ownerAddress,
-      contractAddressSalt,
       skipClassPublication: true,
       wait: NO_WAIT,
     });
diff --git a/yarn-project/end-to-end/src/e2e_avm_simulator.test.ts b/yarn-project/end-to-end/src/e2e_avm_simulator.test.ts
index 58e7980edcea..a8b507dd21d7 100644
--- a/yarn-project/end-to-end/src/e2e_avm_simulator.test.ts
+++ b/yarn-project/end-to-end/src/e2e_avm_simulator.test.ts
@@ -1,7 +1,9 @@
 import { AztecAddress } from '@aztec/aztec.js/addresses';
 import { BatchCall, type ContractInstanceWithAddress } from '@aztec/aztec.js/contracts';
 import { Fr } from '@aztec/aztec.js/fields';
+import type { AztecNode } from '@aztec/aztec.js/node';
 import { TxExecutionResult } from '@aztec/aztec.js/tx';
+import type { PublicStorageOverride } from '@aztec/aztec.js/wallet';
 import type { Wallet } from '@aztec/aztec.js/wallet';
 import { AvmInitializerTestContract } from '@aztec/noir-test-contracts.js/AvmInitializerTest';
 import { AvmTestContract } from '@aztec/noir-test-contracts.js/AvmTest';
@@ -16,6 +18,7 @@ describe('e2e_avm_simulator', () => {
   jest.setTimeout(TIMEOUT);
 
   let wallet: Wallet;
+  let aztecNode: AztecNode;
   let defaultAccountAddress: AztecAddress;
   let teardown: () => Promise<void>;
 
@@ -23,6 +26,7 @@ describe('e2e_avm_simulator', () => {
     ({
       teardown,
       wallet,
+      aztecNode,
       accounts: [defaultAccountAddress],
     } = await setup(1));
     await ensureAccountContractsPublished(wallet, [defaultAccountAddress]);
@@ -45,9 +49,9 @@ describe('e2e_avm_simulator', () => {
     describe('Assertions & error enriching', () => {
       /**
        * Expect an error like:
-       * Assertion failed: This assertion should fail! 'not_true == true'
+       * Assertion failed: This assertion should fail! 'assert(not_true == true, "This assertion should fail!")'
        * ...
-       * at not_true == true (../../../../../../../home/aztec-dev/aztec-packages/noir-projects/noir-contracts/contracts/test/avm_test_contract/src/main.nr:223:16)
+       * at assert(not_true == true, "This assertion should fail!") (../../../../../../../home/aztec-dev/aztec-packages/noir-projects/noir-contracts/contracts/test/avm_test_contract/src/main.nr:223:5)
        * at inner_helper_with_failed_assertion() (../../../../../../../home/aztec-dev/aztec-packages/noir-projects/noir-contracts/contracts/test/avm_test_contract/src/main.nr:228:9)
        * at quote { $self } (../std/meta/expr.nr:269:9)
        * at function.name();
@@ -60,7 +64,9 @@ describe('e2e_avm_simulator', () => {
             avmContract.methods.assertion_failure().simulate({ from: defaultAccountAddress }),
           ).rejects.toThrow(
             expect.objectContaining({
-              message: expect.stringMatching(/Assertion failed: This assertion should fail! 'not_true == true'/),
+              message: expect.stringMatching(
+                /Assertion failed: This assertion should fail! 'assert\(not_true == true, "This assertion should fail!"\)'/,
+              ),
               stack: expect.stringMatching(/at inner_helper_with_failed_assertion[\s\S]*at AvmTest\..*/),
             }),
           );
@@ -249,6 +255,51 @@ describe('e2e_avm_simulator', () => {
     });
   });
 
+  describe('publicDataOverrides', () => {
+    // AvmTestContract: `single` is the first storage variable and lives at raw slot 1.
+    const SINGLE_SLOT = new Fr(1n);
+    let avmContract: AvmTestContract;
+
+    beforeEach(async () => {
+      ({ contract: avmContract } = await AvmTestContract.deploy(wallet).send({ from: defaultAccountAddress }));
+    });
+
+    it('simulated read of an unwritten slot returns the override; real storage is untouched', async () => {
+      const overrideValue = new Fr(0xdeadbeefn);
+      const publicStorage: PublicStorageOverride[] = [
+        { contract: avmContract.address, slot: SINGLE_SLOT, value: overrideValue },
+      ];
+
+      const simResult = await avmContract.methods
+        .read_storage_single()
+        .simulate({ from: defaultAccountAddress, overrides: { publicStorage } });
+      expect(simResult.result).toEqual(overrideValue.toBigInt());
+
+      // Real state is untouched — the slot was never written.
+      const realValue = await aztecNode.getPublicStorageAt('latest', avmContract.address, SINGLE_SLOT);
+      expect(realValue.toBigInt()).toEqual(0n);
+    });
+
+    it('simulated read returns the override when a slot was previously written by a real tx', async () => {
+      const realValue = new Fr(100n);
+      await avmContract.methods.set_storage_single(realValue).send({ from: defaultAccountAddress });
+
+      const overrideValue = new Fr(999n);
+      const publicStorage: PublicStorageOverride[] = [
+        { contract: avmContract.address, slot: SINGLE_SLOT, value: overrideValue },
+      ];
+
+      const simResult = await avmContract.methods
+        .read_storage_single()
+        .simulate({ from: defaultAccountAddress, overrides: { publicStorage } });
+      expect(simResult.result).toEqual(overrideValue.toBigInt());
+
+      // Real storage still holds the original written value.
+      const storedValue = await aztecNode.getPublicStorageAt('latest', avmContract.address, SINGLE_SLOT);
+      expect(storedValue.toBigInt()).toEqual(realValue.toBigInt());
+    });
+  });
+
   describe('AvmInitializerTestContract', () => {
     let avmContract: AvmInitializerTestContract;
 
diff --git a/yarn-project/end-to-end/src/e2e_block_building.test.ts b/yarn-project/end-to-end/src/e2e_block_building.test.ts
index 1904675cb6bb..0cd67c7bf181 100644
--- a/yarn-project/end-to-end/src/e2e_block_building.test.ts
+++ b/yarn-project/end-to-end/src/e2e_block_building.test.ts
@@ -151,15 +151,17 @@ describe('e2e_block_building', () => {
       // Need to have value > 0, so adding + 1
       // We need to do so, because noir currently will fail if the multiscalarmul is in an `if`
       // that we DO NOT enter. This should be fixed by https://github.com/noir-lang/noir/issues/5045.
-      const methods = times(TX_COUNT, i => StatefulTestContract.deploy(wallet, ownerAddress, i + 1));
+      const methods = times(TX_COUNT, i =>
+        StatefulTestContract.deploy(wallet, ownerAddress, i + 1, {
+          salt: new Fr(BigInt(i + 1)),
+          deployer: ownerAddress,
+        }),
+      );
       const provenTxs = [];
       const addresses = [];
       for (let i = 0; i < TX_COUNT; i++) {
-        const options: DeployOptions = {
-          from: ownerAddress,
-          contractAddressSalt: new Fr(BigInt(i + 1)),
-        };
-        const instance = await methods[i].getInstance(options);
+        const options: DeployOptions = { from: ownerAddress };
+        const instance = await methods[i].getInstance();
         addresses.push(instance.address);
         provenTxs.push(await proveInteraction(wallet, methods[i], options));
       }
@@ -251,7 +253,9 @@ describe('e2e_block_building', () => {
 
       // Deploy a contract in the first transaction
       // In the same block, call a public method on the contract
-      const deployMethod = TokenContract.deploy(wallet, ownerAddress, 'TokenName', 'TokenSymbol', 18);
+      const deployMethod = TokenContract.deploy(wallet, ownerAddress, 'TokenName', 'TokenSymbol', 18, {
+        deployer: ownerAddress,
+      });
 
       // We can't use `TokenContract.at` to call a function because it checks the contract is deployed
       // but we are in the same block as the deployment transaction
@@ -587,7 +591,7 @@ describe('e2e_block_building', () => {
       await Promise.race(txHashes.map(txHash => waitForTx(aztecNode, txHash, { timeout: 60 })));
 
       logger.warn(`At least one tx has been mined`);
-      const lastBlock = await context.aztecNode.getBlockHeader();
+      const lastBlock = await context.aztecNode.getBlockHeader('latest');
       expect(lastBlock).toBeDefined();
 
       logger.warn(`Latest block is ${lastBlock!.getBlockNumber()}`, { state: lastBlock?.state.partial });
@@ -621,7 +625,7 @@ describe('e2e_block_building', () => {
       await cheatCodes.rollup.advanceToNextEpoch();
 
       const bn = await aztecNode.getBlockNumber();
-      while ((await aztecNode.getProvenBlockNumber()) < bn) {
+      while ((await aztecNode.getBlockNumber('proven')) < bn) {
         await sleep(1000);
       }
 
diff --git a/yarn-project/end-to-end/src/e2e_bot.test.ts b/yarn-project/end-to-end/src/e2e_bot.test.ts
index f5e02398f6de..381a22dfd889 100644
--- a/yarn-project/end-to-end/src/e2e_bot.test.ts
+++ b/yarn-project/end-to-end/src/e2e_bot.test.ts
@@ -288,7 +288,7 @@ describe('e2e_bot', () => {
       expect(receipt.blockNumber).toBeDefined();
 
       // Verify L2→L1: the block should contain at least one non-zero L2→L1 message
-      const block = await aztecNode.getBlock(receipt.blockNumber!);
+      const block = await aztecNode.getBlock(receipt.blockNumber!, { includeTransactions: true });
       expect(block).toBeDefined();
       const l2ToL1Msgs = block!.body.txEffects.flatMap(e => e.l2ToL1Msgs).filter(m => !m.isZero());
       expect(l2ToL1Msgs.length).toBeGreaterThanOrEqual(1);
diff --git a/yarn-project/end-to-end/src/e2e_contract_updates.test.ts b/yarn-project/end-to-end/src/e2e_contract_updates.test.ts
index 8dad086b08f7..192930eb8888 100644
--- a/yarn-project/end-to-end/src/e2e_contract_updates.test.ts
+++ b/yarn-project/end-to-end/src/e2e_contract_updates.test.ts
@@ -101,9 +101,8 @@ describe('e2e_contract_updates', () => {
       initialFundedAccounts,
     }));
 
-    ({ contract, instance } = await UpdatableContract.deploy(wallet, constructorArgs[0]).send({
+    ({ contract, instance } = await UpdatableContract.deploy(wallet, constructorArgs[0], { salt }).send({
       from: defaultAccountAddress,
-      contractAddressSalt: salt,
     }));
 
     const registerMethod = await publishContractClass(wallet, UpdatedContractArtifact);
diff --git a/yarn-project/end-to-end/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts b/yarn-project/end-to-end/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts
index 9a5a866be510..b2e7aa800d04 100644
--- a/yarn-project/end-to-end/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts
+++ b/yarn-project/end-to-end/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts
@@ -98,7 +98,7 @@ export class CrossChainMessagingTest {
 
   async catchUpProvenChain() {
     const bn = await this.aztecNode.getBlockNumber();
-    while ((await this.aztecNode.getProvenBlockNumber()) < bn) {
+    while ((await this.aztecNode.getBlockNumber('proven')) < bn) {
       await sleep(1000);
     }
   }
diff --git a/yarn-project/end-to-end/src/e2e_cross_chain_messaging/l1_to_l2.test.ts b/yarn-project/end-to-end/src/e2e_cross_chain_messaging/l1_to_l2.test.ts
index 3f12389109ac..1f8a1ab77649 100644
--- a/yarn-project/end-to-end/src/e2e_cross_chain_messaging/l1_to_l2.test.ts
+++ b/yarn-project/end-to-end/src/e2e_cross_chain_messaging/l1_to_l2.test.ts
@@ -62,7 +62,7 @@ describe('e2e_cross_chain_messaging l1_to_l2', () => {
   const waitForBlockToCheckpoint = async (blockNumber: BlockNumber) => {
     return await retryUntil(
       async () => {
-        const checkpointedBlockNumber = await aztecNode.getCheckpointedBlockNumber();
+        const checkpointedBlockNumber = await aztecNode.getBlockNumber('checkpointed');
         const isCheckpointed = checkpointedBlockNumber >= blockNumber;
         if (!isCheckpointed) {
           return undefined;
diff --git a/yarn-project/end-to-end/src/e2e_cross_chain_messaging/l2_to_l1.test.ts b/yarn-project/end-to-end/src/e2e_cross_chain_messaging/l2_to_l1.test.ts
index 1874f64e75d0..6c123772337b 100644
--- a/yarn-project/end-to-end/src/e2e_cross_chain_messaging/l2_to_l1.test.ts
+++ b/yarn-project/end-to-end/src/e2e_cross_chain_messaging/l2_to_l1.test.ts
@@ -71,7 +71,7 @@ describe('e2e_cross_chain_messaging l2_to_l1', () => {
     await t.advanceToEpochProven(txReceipt);
 
     // Check that the block contains the 2 messages.
-    const block = (await aztecNode.getBlock(blockNumber))!;
+    const block = (await aztecNode.getBlock(blockNumber, { includeTransactions: true }))!;
     const l2ToL1Messages = block.body.txEffects.flatMap(txEffect => txEffect.l2ToL1Msgs);
     expect(l2ToL1Messages).toStrictEqual([computeMessageLeaf(messages[0]), computeMessageLeaf(messages[1])]);
 
@@ -130,7 +130,7 @@ describe('e2e_cross_chain_messaging l2_to_l1', () => {
 
     // Check that the block contains all the messages.
     {
-      const block = (await aztecNode.getBlock(blockNumber))!;
+      const block = (await aztecNode.getBlock(blockNumber, { includeTransactions: true }))!;
       const messagesForAllTxs = block.body.txEffects.map(txEffect => txEffect.l2ToL1Msgs);
       // We cannot guarantee the order of txs in a block, so we rearrange the leaves if call1 was rolled up first.
       const [firstTx, secondTx] = messagesForAllTxs[0].length === 3 ? [tx0, tx1] : [tx1, tx0];
diff --git a/yarn-project/end-to-end/src/e2e_crowdfunding_and_claim.test.ts b/yarn-project/end-to-end/src/e2e_crowdfunding_and_claim.test.ts
index 5668ba4e3e77..1fd23d78063f 100644
--- a/yarn-project/end-to-end/src/e2e_crowdfunding_and_claim.test.ts
+++ b/yarn-project/end-to-end/src/e2e_crowdfunding_and_claim.test.ts
@@ -85,12 +85,12 @@ describe('e2e_crowdfunding_and_claim', () => {
     crowdfundingSecretKey = Fr.random();
     crowdfundingPublicKeys = (await deriveKeys(crowdfundingSecretKey)).publicKeys;
 
-    const crowdfundingDeployment = CrowdfundingContract.deployWithPublicKeys(
-      crowdfundingPublicKeys,
+    const crowdfundingDeployment = CrowdfundingContract.deploy(
       wallet,
       donationToken.address,
       operatorAddress,
       deadline,
+      { publicKeys: crowdfundingPublicKeys, deployer: operatorAddress },
     );
     const crowdfundingInstance = await crowdfundingDeployment.getInstance();
     await wallet.registerContract(crowdfundingInstance, CrowdfundingContract.artifact, crowdfundingSecretKey);
@@ -226,12 +226,12 @@ describe('e2e_crowdfunding_and_claim', () => {
     // 1) Deploy another instance of the crowdfunding contract
     let otherCrowdfundingContract: CrowdfundingContract;
     {
-      const otherCrowdfundingDeployment = CrowdfundingContract.deployWithPublicKeys(
-        crowdfundingPublicKeys,
+      const otherCrowdfundingDeployment = CrowdfundingContract.deploy(
         wallet,
         donationToken.address,
         operatorAddress,
         deadline,
+        { publicKeys: crowdfundingPublicKeys, deployer: operatorAddress },
       );
 
       const otherCrowdfundingInstance = await otherCrowdfundingDeployment.getInstance();
diff --git a/yarn-project/end-to-end/src/e2e_deploy_contract/contract_class_registration.test.ts b/yarn-project/end-to-end/src/e2e_deploy_contract/contract_class_registration.test.ts
index 2585f59a5782..cb0a5b7cb54b 100644
--- a/yarn-project/end-to-end/src/e2e_deploy_contract/contract_class_registration.test.ts
+++ b/yarn-project/end-to-end/src/e2e_deploy_contract/contract_class_registration.test.ts
@@ -123,7 +123,9 @@ describe('e2e_deploy_contract contract class registration', () => {
           // Contract instance deployed event is emitted via private logs.
           const blockNumber = await aztecNode.getBlockNumber();
 
-          const logs = (await aztecNode.getBlock(blockNumber))!.getPrivateLogs();
+          const logs = (await aztecNode.getBlock(blockNumber, { includeTransactions: true }))!.body.txEffects.flatMap(
+            t => t.privateLogs,
+          );
 
           expect(logs.length).toBe(1);
 
diff --git a/yarn-project/end-to-end/src/e2e_deploy_contract/deploy_method.test.ts b/yarn-project/end-to-end/src/e2e_deploy_contract/deploy_method.test.ts
index 181302b58961..4bdf1e9fc248 100644
--- a/yarn-project/end-to-end/src/e2e_deploy_contract/deploy_method.test.ts
+++ b/yarn-project/end-to-end/src/e2e_deploy_contract/deploy_method.test.ts
@@ -119,7 +119,11 @@ describe('e2e_deploy_contract deploy method', () => {
   // because the public initializer hasn't emitted the private initialization nullifier yet.
   it('refuses to call a private init-checked function in same tx as public initialization', async () => {
     const owner = defaultAccountAddress;
-    const deployMethod = StatefulTestContract.deployWithOpts({ wallet, method: 'public_constructor' }, owner, 42);
+    const deployMethod = StatefulTestContract.deployWithOpts(
+      { wallet, method: 'public_constructor', instantiation: { deployer: defaultAccountAddress } },
+      owner,
+      42,
+    );
     const contract = await deployMethod.register();
     const batch = new BatchCall(wallet, [deployMethod, contract.methods.create_note(owner, 10)]);
     await expect(batch.send({ from: defaultAccountAddress })).rejects.toThrow(/Cannot find the leaf for nullifier/);
@@ -161,7 +165,7 @@ describe('e2e_deploy_contract deploy method', () => {
     const owner = defaultAccountAddress;
     // docs:start:deploy_batch
     // Create a contract instance and make the PXE aware of it
-    const deployMethod = StatefulTestContract.deploy(wallet, owner, 42);
+    const deployMethod = StatefulTestContract.deploy(wallet, owner, 42, { deployer: defaultAccountAddress });
     const contract = await deployMethod.register();
 
     // Batch deployment and a public call into the same transaction
@@ -172,40 +176,42 @@ describe('e2e_deploy_contract deploy method', () => {
 
   it('publicly deploys a contract in one tx and calls a public function on it later in the same block', async () => {
     await t.aztecNodeAdmin.setConfig({ minTxsPerBlock: 2 });
-
-    const owner = defaultAccountAddress;
-    logger.debug('Initializing deploy method');
-    const deployMethod = StatefulTestContract.deploy(wallet, owner, 42);
-    logger.debug('Creating request/calls to register and deploy contract');
-    const deployTx = new BatchCall(wallet, [deployMethod]);
-    logger.debug('Registering the not-yet-deployed contract to batch calls to');
-    const contract = await deployMethod.register();
-
-    logger.debug('Creating public call to run in same block as deployment');
-    const publicCall = contract.methods.increment_public_value(owner, 84);
-
-    // First send the deploy transaction
-    // Pay priority fee to ensure the deployment transaction gets processed first.
-    // Use L2 gas priority (not DA) because DA gas fees can be zero, and priority fees
-    // are capped by maxFeesPerGas, so a DA priority of 1 gets capped to min(0, 1) = 0.
-    const maxPriorityFeesPerGas = new GasFees(0n, 1n);
-    const deployTxPromise = deployTx.send({
-      from: defaultAccountAddress,
-      fee: { gasSettings: { maxPriorityFeesPerGas } },
-      wait: { timeout: 600 },
-    });
-
-    // Then send the public call transaction
-    const publicCallTxPromise = publicCall.send({ from: defaultAccountAddress, wait: { timeout: 600 } });
-
-    logger.debug('Deploying a contract and calling a public function in the same block');
-    const [{ receipt: deployTxReceipt }, { receipt: publicCallTxReceipt }] = await Promise.all([
-      deployTxPromise,
-      publicCallTxPromise,
-    ]);
-    expect(deployTxReceipt.blockNumber).toEqual(publicCallTxReceipt.blockNumber);
-
-    await t.aztecNodeAdmin.setConfig({ minTxsPerBlock: 1 });
+    try {
+      const owner = defaultAccountAddress;
+      logger.debug('Initializing deploy method');
+      const deployMethod = StatefulTestContract.deploy(wallet, owner, 42, { deployer: defaultAccountAddress });
+      logger.debug('Creating request/calls to register and deploy contract');
+      const deployTx = new BatchCall(wallet, [deployMethod]);
+      logger.debug('Registering the not-yet-deployed contract to batch calls to');
+      const contract = await deployMethod.register();
+
+      logger.debug('Creating public call to run in same block as deployment');
+      const publicCall = contract.methods.increment_public_value(owner, 84);
+
+      // First send the deploy transaction
+      // Pay priority fee to ensure the deployment transaction gets processed first.
+      // Use L2 gas priority (not DA) because DA gas fees can be zero, and priority fees
+      // are capped by maxFeesPerGas, so a DA priority of 1 gets capped to min(0, 1) = 0.
+      const maxPriorityFeesPerGas = new GasFees(0n, 1n);
+      const deployTxPromise = deployTx.send({
+        from: defaultAccountAddress,
+        fee: { gasSettings: { maxPriorityFeesPerGas } },
+        wait: { timeout: 600 },
+      });
+
+      // Then send the public call transaction
+      const publicCallTxPromise = publicCall.send({ from: defaultAccountAddress, wait: { timeout: 600 } });
+
+      logger.debug('Deploying a contract and calling a public function in the same block');
+      const [{ receipt: deployTxReceipt }, { receipt: publicCallTxReceipt }] = await Promise.all([
+        deployTxPromise,
+        publicCallTxPromise,
+      ]);
+      expect(deployTxReceipt.blockNumber).toEqual(publicCallTxReceipt.blockNumber);
+    } finally {
+      // Restore minTxsPerBlock so subsequent tests aren't blocked waiting for a second tx.
+      await t.aztecNodeAdmin.setConfig({ minTxsPerBlock: 1 });
+    }
   }, 300_000);
 
   it('reports YES for initialization status via public nullifier when instance is not registered', async () => {
diff --git a/yarn-project/end-to-end/src/e2e_deploy_contract/legacy.test.ts b/yarn-project/end-to-end/src/e2e_deploy_contract/legacy.test.ts
index 3764964f4f82..a4d1c1e0748d 100644
--- a/yarn-project/end-to-end/src/e2e_deploy_contract/legacy.test.ts
+++ b/yarn-project/end-to-end/src/e2e_deploy_contract/legacy.test.ts
@@ -35,8 +35,10 @@ describe('e2e_deploy_contract legacy', () => {
       salt,
       deployer: defaultAccountAddress,
     });
-    const deployer = new ContractDeployer(TestContractArtifact, wallet);
-    const { contract } = await deployer.deploy().send({ from: defaultAccountAddress, contractAddressSalt: salt });
+    const contractDeployer = new ContractDeployer(TestContractArtifact, wallet);
+    const { contract } = await contractDeployer
+      .deploy([], { salt, deployer: defaultAccountAddress })
+      .send({ from: defaultAccountAddress });
     expect(contract.address).toEqual(deploymentData.address);
     const { instance, isContractPublished } = await wallet.getContractMetadata(deploymentData.address);
     expect(instance).toBeDefined();
@@ -47,11 +49,11 @@ describe('e2e_deploy_contract legacy', () => {
    * Verify that we can produce multiple rollups.
    */
   it('should deploy one contract after another in consecutive rollups', async () => {
-    const deployer = new ContractDeployer(TestContractArtifact, wallet);
+    const contractDeployer = new ContractDeployer(TestContractArtifact, wallet);
 
     for (let index = 0; index < 2; index++) {
       logger.info(`Deploying contract ${index + 1}...`);
-      await deployer.deploy().send({ from: defaultAccountAddress, contractAddressSalt: Fr.random() });
+      await contractDeployer.deploy([], { salt: Fr.random() }).send({ from: defaultAccountAddress });
     }
   });
 
@@ -59,13 +61,13 @@ describe('e2e_deploy_contract legacy', () => {
    * Verify that we can deploy multiple contracts and interact with all of them.
    */
   it('should deploy multiple contracts and interact with them', async () => {
-    const deployer = new ContractDeployer(TestContractArtifact, wallet);
+    const contractDeployer = new ContractDeployer(TestContractArtifact, wallet);
 
     for (let index = 0; index < 2; index++) {
       logger.info(`Deploying contract ${index + 1}...`);
-      const { contract: deployed } = await deployer
-        .deploy()
-        .send({ from: defaultAccountAddress, contractAddressSalt: Fr.random() });
+      const { contract: deployed } = await contractDeployer
+        .deploy([], { salt: Fr.random() })
+        .send({ from: defaultAccountAddress });
       logger.info(`Sending TX to contract ${index + 1}...`);
       await deployed.methods
         .get_master_incoming_viewing_public_key(defaultAccountAddress)
@@ -78,11 +80,11 @@ describe('e2e_deploy_contract legacy', () => {
    * https://hackmd.io/-a5DjEfHTLaMBR49qy6QkA
    */
   it('should not deploy a contract with the same salt twice', async () => {
-    const contractAddressSalt = Fr.random();
-    const deployer = new ContractDeployer(TestContractArtifact, wallet);
+    const salt = Fr.random();
+    const contractDeployer = new ContractDeployer(TestContractArtifact, wallet);
 
-    await deployer.deploy().send({ from: defaultAccountAddress, contractAddressSalt });
-    await expect(deployer.deploy().send({ from: defaultAccountAddress, contractAddressSalt })).rejects.toThrow(
+    await contractDeployer.deploy([], { salt }).send({ from: defaultAccountAddress });
+    await expect(contractDeployer.deploy([], { salt }).send({ from: defaultAccountAddress })).rejects.toThrow(
       TX_ERROR_EXISTING_NULLIFIER,
     );
   });
@@ -90,9 +92,11 @@ describe('e2e_deploy_contract legacy', () => {
   it('should not deploy a contract which failed the public part of the execution', async () => {
     // This test requires at least another good transaction to go through in the same block as the bad one.
     const artifact = TokenContractArtifact;
-    const initArgs = ['TokenName', 'TKN', 18] as const;
+    const initArgs = ['TokenName', 'TKN', 18];
     const goodDeploy = StatefulTestContract.deploy(wallet, defaultAccountAddress, 42);
-    const badDeploy = new ContractDeployer(artifact, wallet).deploy(AztecAddress.ZERO, ...initArgs);
+    // The Token constructor is (admin, name, symbol, decimals); using AztecAddress.ZERO as the admin
+    // is a deliberately broken setup that fails in the public part of execution.
+    const badDeploy = new ContractDeployer(artifact, wallet).deploy([AztecAddress.ZERO, ...initArgs]);
 
     const firstOpts: DeployOptions = {
       from: defaultAccountAddress,
diff --git a/yarn-project/end-to-end/src/e2e_epochs/epochs_equivocation.test.ts b/yarn-project/end-to-end/src/e2e_epochs/epochs_equivocation.test.ts
new file mode 100644
index 000000000000..d1d5aa747698
--- /dev/null
+++ b/yarn-project/end-to-end/src/e2e_epochs/epochs_equivocation.test.ts
@@ -0,0 +1,279 @@
+import type { AztecNodeService } from '@aztec/aztec-node';
+import { EthAddress } from '@aztec/aztec.js/addresses';
+import { Fr } from '@aztec/aztec.js/fields';
+import type { Logger } from '@aztec/aztec.js/log';
+import { asyncMap } from '@aztec/foundation/async-map';
+import { CheckpointNumber, SlotNumber } from '@aztec/foundation/branded-types';
+import { times } from '@aztec/foundation/collection';
+import { SecretValue } from '@aztec/foundation/config';
+import { retryUntil } from '@aztec/foundation/retry';
+import { bufferToHex } from '@aztec/foundation/string';
+import { getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
+import { tryStop } from '@aztec/stdlib/interfaces/server';
+
+import { jest } from '@jest/globals';
+import { privateKeyToAccount } from 'viem/accounts';
+
+import { getPrivateKeyFromIndex } from '../fixtures/utils.js';
+import { EpochsTestContext } from './epochs_test.js';
+
+jest.setTimeout(1000 * 60 * 15);
+
+const NODE_COUNT = 4;
+
+/**
+ * E2E test for the equivocation recovery scenario under proposer pipelining.
+ *
+ * Two conflicting checkpoint proposals are gossiped during the same slot:
+ * - Node A (holds all 4 validator keys) publishes the "real" checkpoint to L1
+ *   but never broadcasts via gossipsub (`skipBroadcastProposals + skipIncomingProposals`).
+ * - The "X" node (B or C, whichever holds the slot proposer's key) broadcasts an
+ *   alternative checkpoint that reaches B/C/D via gossipsub but never lands on L1
+ *   (`skipPublishingCheckpointsPercent: 100`).
+ *
+ * The test verifies that L1 sync overrides the gossip-only proposal on all observer
+ * nodes (B, C, D) once A's L1-confirmed checkpoint propagates via the archiver.
+ */
+describe('e2e_epochs/epochs_equivocation', () => {
+  let logger: Logger;
+  let test: EpochsTestContext;
+  let nodes: AztecNodeService[];
+
+  afterEach(async () => {
+    jest.restoreAllMocks();
+    await test?.teardown();
+  });
+
+  it('L1-confirmed checkpoint overrides gossip-only equivocating proposal', async () => {
+    // Build 4 validators (V1..V4) using getPrivateKeyFromIndex(i+3), same convention as other epoch tests.
+    const validators = times(NODE_COUNT, i => {
+      const privateKey = bufferToHex(getPrivateKeyFromIndex(i + 3)!);
+      const attester = EthAddress.fromString(privateKeyToAccount(privateKey).address);
+      return { attester, withdrawer: attester, privateKey, bn254SecretKey: new SecretValue(Fr.random().toBigInt()) };
+    });
+
+    // Timing calculation for 3 blocks per checkpoint with 8s sub-slots:
+    // - initializationOffset = 0.5s (test mode, ethereumSlotDuration < 8)
+    // - 3 blocks x 8s = 24s
+    // - checkpointFinalization = 0.5s (assemble) + 0 (p2p in test) + 2s (L1 publish) = 2.5s
+    // - finalBlockDuration = 8s (re-execution)
+    // - Total: 0.5 + 24 + 8 + 2.5 = 35s => use 36s
+    test = await EpochsTestContext.setup({
+      numberOfAccounts: 0,
+      initialValidators: validators,
+      enableProposerPipelining: true,
+      inboxLag: 2,
+      mockGossipSubNetwork: true,
+      disableAnvilTestWatcher: true,
+      startProverNode: false,
+      aztecEpochDuration: 4,
+      aztecProofSubmissionEpochs: 1024,
+      enforceTimeTable: true,
+      ethereumSlotDuration: 6,
+      aztecSlotDuration: 36,
+      blockDurationMs: 8000,
+      attestationPropagationTime: 0.5,
+      l1PublishingTime: 2,
+      aztecTargetCommitteeSize: 4,
+      skipInitialSequencer: true,
+    });
+
+    logger = test.logger;
+
+    // We set different coinbase addresses so different nodes produce different blocks
+    const coinbaseA = EthAddress.fromNumber(0xa);
+    const coinbaseB = EthAddress.fromNumber(0xb);
+    const coinbaseC = EthAddress.fromNumber(0xc);
+
+    // The private keys held by each node:
+    // A: all 4 keys → self-attests with all validators, reaches quorum without inbound attestations
+    // B: V1 + V2
+    // C: V3 + V4
+    // D: no validator keys (RPC-only observer)
+    const keysA = validators.map(v => v.privateKey as `0x${string}`);
+    const keysB = [validators[0].privateKey, validators[1].privateKey] as `0x${string}`[];
+    const keysC = [validators[2].privateKey, validators[3].privateKey] as `0x${string}`[];
+
+    // All sequencers start with dontStartSequencer so we can warp the clock first.
+    nodes = await asyncMap(
+      [
+        {
+          keys: keysA,
+          coinbase: coinbaseA,
+          extraOpts: { skipIncomingProposals: true, skipBroadcastProposals: true },
+        },
+        {
+          keys: keysB,
+          coinbase: coinbaseB,
+          extraOpts: { skipPublishingCheckpointsPercent: 100 },
+        },
+        {
+          keys: keysC,
+          coinbase: coinbaseC,
+          extraOpts: { skipPublishingCheckpointsPercent: 100 },
+        },
+      ],
+      ({ keys, coinbase, extraOpts }) =>
+        test.createValidatorNode(keys, {
+          dontStartSequencer: true,
+          coinbase,
+          buildCheckpointIfEmpty: true,
+          minTxsPerBlock: 0,
+          ...extraOpts,
+        }),
+    );
+
+    // Node D: non-validator observer node
+    const nodeD = await test.createNonValidatorNode({ buildCheckpointIfEmpty: true, minTxsPerBlock: 0 });
+    nodes.push(nodeD);
+    const [nodeB, nodeC] = nodes.slice(1);
+
+    logger.warn('All nodes created', { nodes: nodes.length });
+
+    // Determine the next proposer slot by scanning upcoming slots.
+    // Since A holds all 4 keys and B/C each hold 2, the slot proposer is always held by A
+    // and exactly one of B or C. We identify which one (X) and use its coinbase in assertions.
+    const { slot: currentSlot } = test.epochCache.getEpochAndSlotNow();
+    // Pick a target slot 2 ahead so there's room for the pipelining build window to engage.
+    // With pipelining, the sequencer builds slot (targetSlot+1) while the clock is at targetSlot,
+    // so the proposer we care about is for targetSlot+1 (the submission slot).
+    const targetSlot = SlotNumber(currentSlot + 2);
+    const submissionSlot = SlotNumber(targetSlot + 1);
+
+    const attesterAddresses = validators.map(v => EthAddress.fromString(privateKeyToAccount(v.privateKey).address));
+    logger.warn('Validator attester addresses', {
+      V1: attesterAddresses[0],
+      V2: attesterAddresses[1],
+      V3: attesterAddresses[2],
+      V4: attesterAddresses[3],
+    });
+    logger.warn('Validator-to-node assignment', { A: 'V1,V2,V3,V4', B: 'V1,V2', C: 'V3,V4', D: 'none' });
+
+    const proposerAttester = await test.epochCache.getProposerAttesterAddressInSlot(submissionSlot);
+    if (!proposerAttester) {
+      throw new Error(`No proposer found for slot ${submissionSlot}`);
+    }
+    logger.warn(`Expected proposer for submission slot`, { submissionSlot, proposerAttester });
+
+    // Warp to one L1 slot before the target L2 slot so pipelining's build window engages.
+    const slotStartTimestamp = getTimestampForSlot(targetSlot, test.constants);
+    const warpTo = slotStartTimestamp - BigInt(test.L1_BLOCK_TIME_IN_S);
+    logger.warn(`Warping to L1 timestamp ${warpTo} (one L1 slot before L2 slot ${targetSlot})`);
+    await test.context.cheatCodes.eth.warp(Number(warpTo), { resetBlockInterval: true });
+
+    // Start all sequencers now that the clock is warped.
+    const sequencers = nodes.slice(0, 3).map(n => n.getSequencer()!);
+    const { failEvents } = test.watchSequencerEvents(sequencers, i => ({ validator: ['A', 'B', 'C'][i] }));
+    await Promise.all(sequencers.map(s => s.start()));
+    logger.warn('All sequencers started');
+
+    // Wait until each of B, C, D sees a proposed block for submissionSlot with coinbase B or C.
+    // This confirms the gossip-only equivocating proposal from B or C has propagated.
+    // REFACTOR: This is candidate for a "wait until all nodes see a block with these properties" helper in the test context.
+    const gossipTimeout = test.L2_SLOT_DURATION_IN_S * 4;
+    await Promise.all(
+      [nodeB, nodeC, nodeD].map(async (node, idx) => {
+        const nodeName = ['B', 'C', 'D'][idx];
+        let observedCoinbase: EthAddress | undefined;
+        await retryUntil(
+          async () => {
+            const block = await node.getBlock('proposed');
+            if (!block) {
+              return false;
+            }
+            const slot = block.header.globalVariables.slotNumber;
+            const cb = block.header.globalVariables.coinbase;
+            if (slot === submissionSlot && (cb.equals(coinbaseB) || cb.equals(coinbaseC))) {
+              observedCoinbase = cb;
+              return true;
+            }
+            return false;
+          },
+          `${nodeName} sees gossip-only proposed block for slot ${submissionSlot}`,
+          gossipTimeout,
+          0.5,
+        );
+        logger.warn(`Node ${nodeName} observed gossip-only coinbase for slot ${submissionSlot}`, { observedCoinbase });
+      }),
+    );
+
+    // Now wait until each of B, C, D has a checkpointed block for submissionSlot with coinbaseA.
+    // This confirms A's L1-confirmed checkpoint has overridden the gossip-only proposal.
+    // REFACTOR: This is candidate for a "wait until all nodes see a block with these properties" helper in the test context.
+    const overrideTimeout = test.L2_SLOT_DURATION_IN_S * 4;
+    logger.warn(`Waiting for L1-sync override on B, C, D (timeout=${overrideTimeout}s)`);
+    await Promise.all(
+      [nodeB, nodeC, nodeD].map(async (node, idx) => {
+        const nodeName = ['B', 'C', 'D'][idx];
+        await retryUntil(
+          async () => {
+            const block = await node.getBlock('checkpointed');
+            if (!block) {
+              return false;
+            }
+            const slot = block.header.globalVariables.slotNumber;
+            const cb = block.header.globalVariables.coinbase;
+            return slot >= submissionSlot && cb.equals(coinbaseA);
+          },
+          `${nodeName} checkpointed block for slot ${submissionSlot} with coinbaseA`,
+          overrideTimeout,
+          0.5,
+        );
+      }),
+    );
+
+    // Assert no spurious failures on B, C.
+    // Node A (index 2) generates lots of proposer-rollup-check-failed noise because it has
+    // skipIncomingProposals set and can't build a valid checkpoint for slot 2.
+    // Nodes B (index 3) and C (index 4) generate checkpoint-publish-failed at the submission slot
+    // because skipPublishingCheckpointsPercent: 100 causes their publish to be intentionally skipped.
+    const observerFailEvents = failEvents.filter(
+      e =>
+        e.sequencerIndex !== 2 && // node A
+        !(e.type === 'proposer-rollup-check-failed' && e.reason === 'Rollup contract check failed') &&
+        !(e.type === 'checkpoint-publish-failed' && e.slot === submissionSlot), // expected skip-publish from B/C
+    );
+    if (observerFailEvents.length > 0) {
+      logger.error('Unexpected fail events on observer sequencers', observerFailEvents);
+    }
+    expect(observerFailEvents).toEqual([]);
+
+    // Then heal. Stop A, re-enable checkpoint publishing on B and C, expect chain to advance.
+    logger.warn('Stopping node A and re-enabling publishing on B and C');
+    await tryStop(nodes[0], logger);
+
+    const baseline = test.monitor.checkpointNumber;
+    logger.warn(`Checkpoint baseline after equivocation: ${baseline}`);
+
+    await nodes[1].setConfig({ skipPublishingCheckpointsPercent: 0 });
+    await nodes[2].setConfig({ skipPublishingCheckpointsPercent: 0 });
+
+    const healTarget = CheckpointNumber(baseline + 2);
+    const healTimeout = test.L2_SLOT_DURATION_IN_S * 8;
+    logger.warn(`Waiting for checkpoint ${healTarget} (timeout=${healTimeout}s)`);
+    await test.waitUntilCheckpointNumber(healTarget, healTimeout);
+
+    expect(test.monitor.checkpointNumber).toBeGreaterThanOrEqual(healTarget);
+    logger.warn(`Network healed: checkpoint ${test.monitor.checkpointNumber}`);
+
+    // REFACTOR: This is candidate for a "wait until all nodes sync to a chain tip with these properties" helper in the test context.
+    await Promise.all(
+      [nodeB, nodeC, nodeD].map((node, idx) =>
+        retryUntil(
+          async () => {
+            const tips = await node.getL2Tips();
+            return tips.checkpointed.checkpoint.number >= healTarget;
+          },
+          `${'BCD'[idx]} synced to checkpoint ${healTarget}`,
+          healTimeout,
+          0.5,
+        ),
+      ),
+    );
+
+    // TODO(A-980): assert the equivocating proposer of the first slot is eventually slashed
+    // for the DUPLICATE_PROPOSAL offense. Slasher is currently disabled in the harness
+    // (slasherEnabled: false) and enabling it requires plumbing offense submission and
+    // waiting for the slasher's offense window.
+  });
+});
diff --git a/yarn-project/end-to-end/src/e2e_epochs/epochs_ha_sync.test.ts b/yarn-project/end-to-end/src/e2e_epochs/epochs_ha_sync.test.ts
index 58db53710795..938426711a38 100644
--- a/yarn-project/end-to-end/src/e2e_epochs/epochs_ha_sync.test.ts
+++ b/yarn-project/end-to-end/src/e2e_epochs/epochs_ha_sync.test.ts
@@ -191,8 +191,8 @@ describe('e2e_epochs/epochs_ha_sync', () => {
     expect(minProposed).toBeGreaterThan(initialCheckpointedBlock);
     logger.warn(`Verifying block hashes at proposed block ${minProposed}.`, { proposedNumbers });
 
-    const headers = await Promise.all(allArchivers.map(a => a.getBlockHeader(minProposed)));
-    const hashes = await Promise.all(headers.map(h => h!.hash()));
+    const blockDatas = await Promise.all(allArchivers.map(a => a.getBlockData({ number: minProposed })));
+    const hashes = await Promise.all(blockDatas.map(d => d!.header.hash()));
     for (let i = 1; i < hashes.length; i++) {
       expect(hashes[i].toString()).toBe(hashes[0].toString());
     }
diff --git a/yarn-project/end-to-end/src/e2e_epochs/epochs_high_tps_block_building.test.ts b/yarn-project/end-to-end/src/e2e_epochs/epochs_high_tps_block_building.test.ts
index 0bdcba6fee4d..303436897d52 100644
--- a/yarn-project/end-to-end/src/e2e_epochs/epochs_high_tps_block_building.test.ts
+++ b/yarn-project/end-to-end/src/e2e_epochs/epochs_high_tps_block_building.test.ts
@@ -7,11 +7,13 @@ import type { Logger } from '@aztec/aztec.js/log';
 import { waitForTx } from '@aztec/aztec.js/node';
 import type { Operator } from '@aztec/ethereum/deploy-aztec-l1-contracts';
 import { asyncMap } from '@aztec/foundation/async-map';
-import { BlockNumber } from '@aztec/foundation/branded-types';
-import { times, timesAsync } from '@aztec/foundation/collection';
+import { BlockNumber, SlotNumber } from '@aztec/foundation/branded-types';
+import { chunkBy, times, timesAsync } from '@aztec/foundation/collection';
 import { SecretValue } from '@aztec/foundation/config';
+import { sleepUntil } from '@aztec/foundation/sleep';
 import { bufferToHex } from '@aztec/foundation/string';
 import type { SpamContract } from '@aztec/noir-test-contracts.js/Spam';
+import { getSlotAtTimestamp, getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
 
 import { jest } from '@jest/globals';
 import { privateKeyToAccount } from 'viem/accounts';
@@ -24,21 +26,47 @@ jest.setTimeout(1000 * 60 * 10);
 
 const NODE_COUNT = 3;
 
-// We send 8 txs total, each taking several seconds to process (see sequencerFakeDelayPerTxMs), with a total
-// L2 slot time of 24s, with l1PublishingTime set to the full 8s L1 slot duration and attestationPropagationTime of 1s.
-// This leaves us with a few seconds for executing txs. This test will check that proposers honor the timetable
-// and do not try to include more than N txs per block. Should we ever implement preemptive block building,
-// sequencers will end up with more time, so we'll need to bump the EXPECTED_MAX_TXS_PER_BLOCK value.
-const TX_COUNT = 8;
+// Multi-block-per-slot test under pipelining. Exercises a full checkpoint (4 blocks × 2 txs) and verifies the
+// checkpoint tx lands on the 2nd L1 block of its target slot.
+//
+// Config: aztecSlotDuration=36s, ethereumSlotDuration=12s (3 L1 blocks / L2 slot), blockDuration=6s,
+//         fakeProcessingDelayPerTxMs=2500ms, attestationPropagationTime=1s, l1PublishingTime=12s,
+//         txDelayerMaxInclusionTimeIntoSlot=1s.
+//
+// Time inside a build slot (36s total):
+//   T=0-1    (1s)  init (checkpointInitializationTime)
+//   T=1-7    (6s)  block 1      ── 2 txs × 2.5s = 5s, fits in 6s block budget
+//   T=7-13   (6s)  block 2
+//   T=13-19  (6s)  block 3
+//   T=19-25  (6s)  block 4
+//   T=25-26  (1s)  checkpoint assemble
+//   T=26-27  (1s)  proposal out  (p2pPropagationTime)        ┐
+//   T=27-33  (6s)  validators re-execute last block           │ timeReservedAtEnd = 9s
+//   T=33-34  (1s)  attestations back (p2pPropagationTime)    ┘
+//   T=34-36  (2s)  slack
+//
+// At target-slot start (T=0 of target slot) the proposer submits the L1 propose tx. With
+// txDelayerMaxInclusionTimeIntoSlot=1s, it falls inside the current L1 slot window and lands in the next
+// L1 block — the 2nd L1 block of the target slot (offset=1). It can also land in the 1st L1 block (offset=0)
+// if attestations arrive fast enough that the proposer submits inside the last second of the build slot.
+// Expected mining layout for a target slot:
+//
+//        T=0                T=12                T=24                T=36
+//        ├──────────────────┼──────────────────┼──────────────────┤
+//        │ 1st L1 block     │ 2nd L1 block     │ 3rd L1 block     │
+//        │ ← fast submit    │ ← typical        │                  │
+//
+const BLOCKS_PER_CHECKPOINT = 4;
+const TXS_PER_BLOCK = 2;
+const CHECKPOINTS_TO_CHECK = 3;
+// Extra txs beyond the ones we assert on: one partial checkpoint at startup (sequencers start mid-slot with
+// only one blockDuration of slack) plus a buffer at the tail.
+const TX_COUNT = BLOCKS_PER_CHECKPOINT * TXS_PER_BLOCK * (CHECKPOINTS_TO_CHECK + 1);
 const TX_DURATION_MS = 2500;
-const EXPECTED_MAX_TXS_PER_BLOCK = 3;
-
-// Test that sequencers and validators can handle a large backlog of transactions.
-// Spawns NODE_COUNT validator nodes, connected via a mocked gossip sub network.
-// Introduces an arbitrary delay to public tx simulation to fake long processing times,
-// then spams the network with TX_COUNT transactions. In addition, uses the l1 tx
-// delayer to fake long L1 tx inclusion times, so sending a tx immediately before an L1
-// block is mined does not get it included, like in an actual network.
+const BLOCK_DURATION_MS = 6000;
+const L2_SLOT_DURATION_S = 36;
+const L1_BLOCK_TIME_S = 12;
+
 describe('e2e_epochs/epochs_high_tps_block_building', () => {
   let context: EndToEndContext;
   let logger: Logger;
@@ -56,7 +84,6 @@ describe('e2e_epochs/epochs_high_tps_block_building', () => {
       return { attester, withdrawer: attester, privateKey, bn254SecretKey: new SecretValue(Fr.random().toBigInt()) };
     });
 
-    // Setup context with the given set of validators, no reorgs, mocked gossip sub network, and no anvil test watcher.
     test = await EpochsTestContext.setup({
       numberOfAccounts: 0,
       initialValidators: validators,
@@ -65,14 +92,17 @@ describe('e2e_epochs/epochs_high_tps_block_building', () => {
       aztecProofSubmissionEpochs: 1024,
       startProverNode: false,
       enforceTimeTable: true,
-      ethereumSlotDuration: 8,
-      l1PublishingTime: 8,
-      aztecSlotDuration: 24,
+      ethereumSlotDuration: L1_BLOCK_TIME_S,
+      l1PublishingTime: L1_BLOCK_TIME_S,
+      aztecSlotDuration: L2_SLOT_DURATION_S,
+      blockDurationMs: BLOCK_DURATION_MS,
       fakeProcessingDelayPerTxMs: TX_DURATION_MS,
       attestationPropagationTime: 1,
       minTxsPerBlock: 1,
       maxTxsPerBlock: 100,
       skipInitialSequencer: true,
+      enableProposerPipelining: true,
+      inboxLag: 2,
     });
 
     ({ context, logger } = test);
@@ -98,45 +128,101 @@ describe('e2e_epochs/epochs_high_tps_block_building', () => {
   });
 
   it('builds blocks without any errors', async () => {
-    // Create and submit several txs
+    // Pre-prove and send all txs so the proposer has a full backlog ready in the pool when it starts building.
     const txs = await timesAsync(TX_COUNT, i =>
       proveInteraction(context.wallet, contract.methods.spam(i, 1n, false), { from }),
     );
     const txHashes = await Promise.all(txs.map(tx => tx.send({ wait: NO_WAIT })));
-    logger.warn(`Sent ${txHashes.length} transactions`, {
-      txs: txHashes,
-    });
+    logger.warn(`Sent ${txHashes.length} transactions`, { txs: txHashes });
 
     const sequencers = nodes.map(node => node.getSequencer()!);
     const { failEvents } = test.watchSequencerEvents(sequencers, i => ({ validator: validators[i].attester }));
 
-    // Start the sequencers!
+    // Wait until `ethereumSlotDuration + blockDuration` seconds before the L2 target slot boundary before
+    // starting the sequencers. The sequencer's timetable treats the build window for slot N as starting at
+    // `slotStart(N) - ethereumSlotDuration` (see `getSlotStartBuildTimestamp` in `stdlib/src/epoch-helpers`),
+    // so we need at least one ethereum slot of lead on top of one blockDuration to guarantee that sub-slot 1
+    // of the first build slot is reachable (and hence the first checkpoint is fully filled).
+    const leadSeconds = test.L1_BLOCK_TIME_IN_S + BLOCK_DURATION_MS / 1000;
+    const currentL1Block = await test.l1Client.getBlock({ blockTag: 'latest' });
+    const currentSlot = getSlotAtTimestamp(currentL1Block.timestamp, test.constants);
+    let targetSlot = SlotNumber(currentSlot + 1);
+    let startSequencersAt = new Date(
+      Number(getTimestampForSlot(targetSlot, test.constants)) * 1000 - leadSeconds * 1000,
+    );
+    if (startSequencersAt.getTime() <= context.dateProvider.now()) {
+      targetSlot = SlotNumber(targetSlot + 1);
+      startSequencersAt = new Date(Number(getTimestampForSlot(targetSlot, test.constants)) * 1000 - leadSeconds * 1000);
+    }
+    logger.warn(
+      `Waiting until ${startSequencersAt.toISOString()} (${leadSeconds}s before L2 slot ${targetSlot} starts)`,
+    );
+    await sleepUntil(startSequencersAt, context.dateProvider.nowAsDate());
+
     await Promise.all(sequencers.map(sequencer => sequencer.start()));
     logger.warn(`Started all sequencers`);
 
-    // Wait until all txs are mined
-    const timeout = test.L2_SLOT_DURATION_IN_S * (TX_COUNT + 3);
+    // Wait until all txs are mined.
+    const timeout = test.L2_SLOT_DURATION_IN_S * (CHECKPOINTS_TO_CHECK * 2 + 8);
     await Promise.all(txHashes.map(txHash => waitForTx(context.aztecNode, txHash, { timeout })));
     logger.warn(`All txs have been mined`);
 
-    // Check all blocks mined by the sequencers have under the expected max number of transactions.
+    // Fetch the blocks and group contiguous blocks by checkpoint number. For the first CHECKPOINTS_TO_CHECK
+    // checkpoints whose target slot is at or after the slot we waited for, assert every checkpoint is fully
+    // filled (BLOCKS_PER_CHECKPOINT blocks × TXS_PER_BLOCK txs each) and the checkpoint tx landed in the 1st
+    // or 2nd L1 block of the target slot.
     const blocks = await nodes[0].getCheckpointedBlocks(BlockNumber(1), 50);
-    for (const block of blocks) {
+    const ethereumSlotDuration = test.L1_BLOCK_TIME_IN_S;
+    const checkpoints = chunkBy(blocks, b => Number(b.checkpointNumber));
+    let checkedFullCheckpoints = 0;
+    for (const checkpointBlocks of checkpoints) {
+      const first = checkpointBlocks[0];
+      const firstSlot = first.header.globalVariables.slotNumber;
+      const slotStartTimestamp = getTimestampForSlot(firstSlot, test.constants);
+      const l1OffsetInSlot = first.l1?.published
+        ? Number(first.l1.timestamp - slotStartTimestamp) / ethereumSlotDuration
+        : undefined;
       logger.warn(
-        `Block ${block.block.number} was mined at L1 ${block.l1.blockNumber} with ${block.block.body.txEffects.length} transactions`,
-        { transactions: block.block.body.txEffects.map(tx => tx.txHash) },
+        `Checkpoint ${first.checkpointNumber} (target slot ${firstSlot}) mined at L1 block ${first.l1?.published ? first.l1.blockNumber : 'pending'} ` +
+          `(offset ${l1OffsetInSlot} into L2 slot) with ${checkpointBlocks.length} blocks`,
+        {
+          blocks: checkpointBlocks.map(b => ({ number: b.number, txs: b.body?.txEffects.length })),
+        },
       );
-    }
-    for (const block of blocks) {
-      expect(block.block.body.txEffects.length).toBeLessThanOrEqual(EXPECTED_MAX_TXS_PER_BLOCK);
+      if (firstSlot < targetSlot || checkedFullCheckpoints >= CHECKPOINTS_TO_CHECK) {
+        continue;
+      }
+
+      // We don't test for exactly BLOCKS_PER_CHECKPOINT since CI delays make this flakey
+      expect(checkpointBlocks.length).toBeGreaterThanOrEqual(BLOCKS_PER_CHECKPOINT - 1);
+
+      for (const block of checkpointBlocks) {
+        // We don't test for exactly TXS_PER_BLOCK since CI delays make this flakey
+        const txCount = block.body!.txEffects.length;
+        expect(txCount).toBeGreaterThanOrEqual(1);
+        expect(txCount).toBeLessThanOrEqual(TXS_PER_BLOCK);
+      }
+      expect([0, 1]).toContain(l1OffsetInSlot);
+      checkedFullCheckpoints++;
     }
 
-    // Expect no failures from sequencers during block building.
-    // The following error is marked as a flake on the test ignore patterns,
-    // so we can have this test run for a while before it breaks CI on a recoverable error.
-    if (failEvents.length > 0) {
-      logger.error(`Failed events from sequencers`, failEvents);
+    // Check that we've gone through all checkpoints, and at least one checkpoint reached
+    // expected number of blocks, and at least one block reached the expected number of txs.
+    expect(checkedFullCheckpoints).toBe(CHECKPOINTS_TO_CHECK);
+    expect(Math.max(...blocks.map(b => b.body!.txEffects.length))).toEqual(TXS_PER_BLOCK);
+    expect(Math.max(...checkpoints.map(c => c.length))).toEqual(BLOCKS_PER_CHECKPOINT);
+
+    // Expect no failures from sequencers during block building. Filter out the self-proposal 'Rollup contract
+    // check failed' spam: when a validator proposes two consecutive checkpoints, the archiver's sequentiality
+    // guard rejects persisting the second proposed checkpoint until the first is confirmed on L1, so the next
+    // pipelining cycle falls through without simulation overrides and canProposeAt reverts until state catches
+    // up. Tracked in A-910.
+    const significantFailEvents = failEvents.filter(
+      e => !(e.type === 'proposer-rollup-check-failed' && e.reason === 'Rollup contract check failed'),
+    );
+    if (significantFailEvents.length > 0) {
+      logger.error(`Failed events from sequencers`, significantFailEvents);
     }
-    expect(failEvents).toEqual([]);
+    expect(significantFailEvents).toEqual([]);
   });
 });
diff --git a/yarn-project/end-to-end/src/e2e_epochs/epochs_l1_reorgs.parallel.test.ts b/yarn-project/end-to-end/src/e2e_epochs/epochs_l1_reorgs.parallel.test.ts
index d140c2fdb73e..97111c2d2a6d 100644
--- a/yarn-project/end-to-end/src/e2e_epochs/epochs_l1_reorgs.parallel.test.ts
+++ b/yarn-project/end-to-end/src/e2e_epochs/epochs_l1_reorgs.parallel.test.ts
@@ -398,7 +398,7 @@ describe('e2e_epochs/epochs_l1_reorgs', () => {
 
       // Manually update the archiver's L1 syncpoint to ensure we look back when needed
       // Otherwise this test just passes because we do not update the L1 syncpoint in the archiver since there are no new blocks
-      await archiver.dataStore.setCheckpointSynchedL1BlockNumber(BigInt(archiver.getL1BlockNumber()!));
+      await archiver.dataStores.blocks.setSynchedL1BlockNumber(BigInt(archiver.getL1BlockNumber()!));
 
       // Now trigger the reorg. Note that we cannot use reorgWithReplacement here for the reorg, due to an anvil bug with
       // blob txs (now fixed, we can just update its version), so we reorg, then replay the tx, and then mine.
diff --git a/yarn-project/end-to-end/src/e2e_epochs/epochs_mbps.parallel.test.ts b/yarn-project/end-to-end/src/e2e_epochs/epochs_mbps.parallel.test.ts
index b0ba59e5624c..2ab987abc28b 100644
--- a/yarn-project/end-to-end/src/e2e_epochs/epochs_mbps.parallel.test.ts
+++ b/yarn-project/end-to-end/src/e2e_epochs/epochs_mbps.parallel.test.ts
@@ -442,15 +442,15 @@ describe('e2e_epochs/epochs_mbps', () => {
         if (tips.proposed.number <= tips.checkpointed.block.number) {
           return false;
         }
-        const header = await nonValidatorArchiver.getBlockHeader(tips.proposed.number);
-        if (!header) {
+        const blockData = await nonValidatorArchiver.getBlockData({ number: tips.proposed.number });
+        if (!blockData) {
           return false;
         }
-        const blocksInSlot = await nonValidatorArchiver.getBlocksForSlot(header.globalVariables.slotNumber);
+        const blocksInSlot = await nonValidatorArchiver.getBlocksForSlot(blockData.header.globalVariables.slotNumber);
         if (blocksInSlot.length < 2) {
           return false;
         }
-        multiBlockSlotNumber = header.globalVariables.slotNumber;
+        multiBlockSlotNumber = blockData.header.globalVariables.slotNumber;
         checkpointedBlockNumber = tips.checkpointed.block.number;
         return true;
       },
@@ -507,7 +507,7 @@ describe('e2e_epochs/epochs_mbps', () => {
     const highPriority = new GasFees(100, 100);
     const lowPriority = new GasFees(1, 1);
 
-    const deployMethod = TestContract.deploy(wallet);
+    const deployMethod = TestContract.deploy(wallet, { deployer: from });
     const deployInstance = await deployMethod.getInstance();
     logger.warn(`Will deploy TestContract at ${deployInstance.address}`);
 
diff --git a/yarn-project/end-to-end/src/e2e_epochs/epochs_missed_l1_publish.test.ts b/yarn-project/end-to-end/src/e2e_epochs/epochs_missed_l1_publish.test.ts
new file mode 100644
index 000000000000..9ab521186a71
--- /dev/null
+++ b/yarn-project/end-to-end/src/e2e_epochs/epochs_missed_l1_publish.test.ts
@@ -0,0 +1,365 @@
+import type { Archiver } from '@aztec/archiver';
+import type { AztecNodeService } from '@aztec/aztec-node';
+import { EthAddress } from '@aztec/aztec.js/addresses';
+import { Fr } from '@aztec/aztec.js/fields';
+import type { Logger } from '@aztec/aztec.js/log';
+import { waitUntilL1Timestamp } from '@aztec/ethereum/l1-tx-utils';
+import { asyncMap } from '@aztec/foundation/async-map';
+import { BlockNumber, SlotNumber } from '@aztec/foundation/branded-types';
+import { times } from '@aztec/foundation/collection';
+import { SecretValue } from '@aztec/foundation/config';
+import { retryUntil } from '@aztec/foundation/retry';
+import { bufferToHex } from '@aztec/foundation/string';
+import { timeoutPromise } from '@aztec/foundation/timer';
+import { type L2Block, L2BlockSourceEvents, type L2Tips } from '@aztec/stdlib/block';
+import { getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
+
+import { jest } from '@jest/globals';
+import { privateKeyToAccount } from 'viem/accounts';
+
+import { getPrivateKeyFromIndex } from '../fixtures/utils.js';
+import { EpochsTestContext } from './epochs_test.js';
+
+jest.setTimeout(1000 * 60 * 15);
+
+const NODE_COUNT = 4;
+
+/**
+ * E2E test for the "missed L1 publish" scenario under proposer pipelining.
+ *
+ * Each of 4 nodes holds exactly one validator key. We pick four consecutive slots
+ * (slotZero, slotOne, slotTwo, slotThree) such that the proposers for slotOne, slotTwo, and
+ * slotThree are three distinct validators, then warp to one L1 block before slotZero begins.
+ * The proposer for slotOne is configured to skip its L1 publish.
+ *
+ * With pipelining, the proposer for slot N+1 builds and gossips its checkpoint during slot N,
+ * then publishes that checkpoint to L1 during slot N+1. So gossip-driven `proposed` chain
+ * advances arrive one slot earlier than the L1-driven `checkpointed` advance.
+ *
+ * Expected behavior:
+ *  - During slotZero, the pipelined proposer for slotOne gossips its build → every node's
+ *    `proposed` tip advances to a block at slotOne.
+ *  - During slotOne, the pipelined proposer for slotTwo gossips on top of the slotOne proposal →
+ *    `proposed` advances to a block at slotTwo. Meanwhile the proposer for slotOne attempts L1
+ *    publish but is configured to skip it, so no checkpoint lands.
+ *  - When slotOne ends with no checkpoint mined, every node's archiver prunes the
+ *    uncheckpointed slotOne and slotTwo blocks; we verify rollback via the prune event.
+ *    We then re-enable publishing on the formerly suppressed node so recovery can proceed.
+ *  - During slotTwo, the pipelined proposer for slotThree builds on top of the (now genesis)
+ *    checkpointed tip → `proposed` advances again.
+ *  - During slotThree, that pipelined work is published → `checkpointed` finally advances.
+ */
+describe('e2e_epochs/epochs_missed_l1_publish', () => {
+  let logger: Logger;
+  let test: EpochsTestContext;
+  let nodes: AztecNodeService[];
+
+  afterEach(async () => {
+    jest.restoreAllMocks();
+    await test?.teardown();
+  });
+
+  it('all nodes prune and recover when proposer fails to publish to L1', async () => {
+    // Build 4 distinct validators (V1..V4). One key per node, no overlap.
+    const validators = times(NODE_COUNT, i => {
+      const privateKey = bufferToHex(getPrivateKeyFromIndex(i + 3)!);
+      const attester = EthAddress.fromString(privateKeyToAccount(privateKey).address);
+      return { attester, withdrawer: attester, privateKey, bn254SecretKey: new SecretValue(Fr.random().toBigInt()) };
+    });
+
+    test = await EpochsTestContext.setup({
+      numberOfAccounts: 0,
+      initialValidators: validators,
+      enableProposerPipelining: true,
+      inboxLag: 2,
+      mockGossipSubNetwork: true,
+      disableAnvilTestWatcher: true,
+      startProverNode: false,
+      aztecEpochDuration: 4,
+      aztecProofSubmissionEpochs: 1024,
+      enforceTimeTable: true,
+      ethereumSlotDuration: 6,
+      aztecSlotDuration: 36,
+      blockDurationMs: 8000,
+      attestationPropagationTime: 0.5,
+      l1PublishingTime: 2,
+      aztecTargetCommitteeSize: NODE_COUNT,
+      skipInitialSequencer: true,
+    });
+
+    logger = test.logger;
+
+    // One node per validator. dontStartSequencer until after the warp so timing is deterministic.
+    nodes = await asyncMap(validators, ({ privateKey }, i) =>
+      test.createValidatorNode([privateKey], {
+        dontStartSequencer: true,
+        coinbase: EthAddress.fromNumber(0xa + i),
+        buildCheckpointIfEmpty: true,
+        minTxsPerBlock: 0,
+      }),
+    );
+
+    const attesterAddresses = validators.map(v => v.attester);
+    logger.warn('Validator nodes created', {
+      validators: attesterAddresses.map((a, i) => ({ idx: i, attester: a.toString() })),
+    });
+
+    // Find slotOne (>=4 ahead) such that proposers for slotOne, slotTwo, slotThree are three
+    // distinct validators. The +4 margin (vs +2 in equivocation) gives the warp+sequencer-start
+    // path enough headroom to reach the build window for slotZero even if node creation jitters.
+    const { slot: currentSlot } = test.epochCache.getEpochAndSlotNow();
+    const scanStart = currentSlot + 4;
+    const scanEnd = currentSlot + 60;
+    let slotOne: SlotNumber | undefined;
+    let proposerOne: EthAddress | undefined;
+    let proposerTwo: EthAddress | undefined;
+    let proposerThree: EthAddress | undefined;
+    for (let candidate = scanStart; candidate <= scanEnd; candidate++) {
+      const [p1, p2, p3] = await Promise.all([
+        test.epochCache.getProposerAttesterAddressInSlot(SlotNumber(candidate)),
+        test.epochCache.getProposerAttesterAddressInSlot(SlotNumber(candidate + 1)),
+        test.epochCache.getProposerAttesterAddressInSlot(SlotNumber(candidate + 2)),
+      ]);
+      if (p1 && p2 && p3 && !p1.equals(p2) && !p1.equals(p3) && !p2.equals(p3)) {
+        slotOne = SlotNumber(candidate);
+        proposerOne = p1;
+        proposerTwo = p2;
+        proposerThree = p3;
+        break;
+      }
+    }
+    if (slotOne === undefined || !proposerOne || !proposerTwo || !proposerThree) {
+      throw new Error(`Could not find a slot in [${scanStart}, ${scanEnd}] with three distinct consecutive proposers`);
+    }
+
+    const slotZero = SlotNumber(slotOne - 1);
+    const slotTwo = SlotNumber(slotOne + 1);
+    const slotThree = SlotNumber(slotOne + 2);
+
+    const proposerOneNodeIndex = validators.findIndex(v => v.attester.equals(proposerOne!));
+    if (proposerOneNodeIndex < 0) {
+      throw new Error(`No node holds the key for proposer ${proposerOne}`);
+    }
+
+    logger.warn(`Selected target slotOne=${slotOne}`, {
+      slotOne,
+      slotZero,
+      slotTwo,
+      slotThree,
+      proposerOne: proposerOne.toString(),
+      proposerOneNodeIndex,
+      proposerTwo: proposerTwo.toString(),
+      proposerThree: proposerThree.toString(),
+    });
+
+    // Prevent the proposer for slotOne from publishing the checkpoint to L1 (build & gossip still happen).
+    await nodes[proposerOneNodeIndex].setConfig({ skipPublishingCheckpointsPercent: 100 });
+
+    // Subscribe to the prune event on every node before sequencers start, so we never miss it.
+    // We capture the L2 tips synchronously inside the handler — the archiver has already removed
+    // the pruned blocks at emit time, so this snapshot reflects the rolled-back state before any
+    // new pipelined block can be applied.
+    type PruneObservation = { slotNumber: SlotNumber; blocks: L2Block[]; tipsAtPrune: L2Tips };
+    const prunePromises: Promise<PruneObservation>[] = nodes.map(
+      (node, idx) =>
+        new Promise<PruneObservation>(resolve => {
+          const archiver = node.getBlockSource() as Archiver;
+          // eslint-disable-next-line @typescript-eslint/no-misused-promises
+          archiver.events.once(L2BlockSourceEvents.L2PruneUncheckpointed, async ev => {
+            const tipsAtPrune = await node.getL2Tips();
+            logger.warn(`Node ${idx} pruned uncheckpointed blocks`, {
+              slotNumber: ev.slotNumber,
+              blocks: ev.blocks.map(b => ({ number: b.number, slot: b.header.globalVariables.slotNumber })),
+              tipsAtPrune,
+            });
+            resolve({ slotNumber: ev.slotNumber, blocks: ev.blocks, tipsAtPrune });
+          });
+        }),
+    );
+
+    // Warp L1 to one L1 block before slotZero begins. Pipelining will then engage during slotZero.
+    const slotZeroStart = getTimestampForSlot(slotZero, test.constants);
+    const warpTo = slotZeroStart - BigInt(test.L1_BLOCK_TIME_IN_S);
+    logger.warn(`Warping L1 to timestamp ${warpTo} (one L1 block before slot ${slotZero})`);
+    await test.context.cheatCodes.eth.warp(Number(warpTo), { resetBlockInterval: true });
+
+    // Check that the chain is empty
+    const node = nodes[0];
+    const blockNumber = await node.getBlockNumber();
+    expect(blockNumber).toEqual(0);
+
+    // Start all sequencers.
+    const sequencers = nodes.map(n => n.getSequencer()!);
+    const { failEvents } = test.watchSequencerEvents(sequencers, i => ({ validator: `V${i + 1}` }));
+
+    // Subscribe to the proposerTwo pipelined-discard event — this is the most direct signal
+    // that the pipelined slotTwo work was correctly thrown away because parent slotOne did not land.
+    const proposerTwoNodeIndex = validators.findIndex(v => v.attester.equals(proposerTwo!));
+    const pipelinedDiscardEvents: { slot: SlotNumber; checkpointNumber: number; reason: string }[] = [];
+    sequencers[proposerTwoNodeIndex].getSequencer().on('pipelined-checkpoint-discarded', args => {
+      pipelinedDiscardEvents.push({ slot: args.slot, checkpointNumber: args.checkpointNumber, reason: args.reason });
+      logger.warn(`proposerTwo (node ${proposerTwoNodeIndex}) discarded pipelined work`, args);
+    });
+
+    await Promise.all(sequencers.map(s => s.start()));
+    logger.warn('All sequencers started');
+
+    const slotAdvanceTimeout = test.L2_SLOT_DURATION_IN_S * 3;
+
+    // (1) During slotZero: the pipelined proposer for slotOne broadcasts. Every node sees a proposed block at slotOne.
+    logger.warn(`Waiting for proposed chain to reach slot ${slotOne} on all nodes (build during slotZero)`);
+    await Promise.all(
+      nodes.map((node, idx) =>
+        retryUntil(
+          async () => {
+            const tips = await node.getL2Tips();
+            if (tips.proposed.number === 0) {
+              return false;
+            }
+            const block = await node.getBlock(tips.proposed.number);
+            return !!block && block.header.globalVariables.slotNumber === slotOne;
+          },
+          `node ${idx} proposed advanced to slot ${slotOne}`,
+          slotAdvanceTimeout,
+          0.5,
+        ),
+      ),
+    );
+
+    // (2) During slotOne: the pipelined proposer for slotTwo broadcasts on top of slotOne → proposed reaches slotTwo.
+    logger.warn(`Waiting for proposed chain to reach slot ${slotTwo} on all nodes (build during slotOne)`);
+    await Promise.all(
+      nodes.map((node, idx) =>
+        retryUntil(
+          async () => {
+            const tips = await node.getL2Tips();
+            if (tips.proposed.number === 0) {
+              return false;
+            }
+            const block = await node.getBlock(tips.proposed.number);
+            return !!block && block.header.globalVariables.slotNumber === slotTwo;
+          },
+          `node ${idx} proposed advanced to slot ${slotTwo}`,
+          slotAdvanceTimeout,
+          0.5,
+        ),
+      ),
+    );
+
+    // (3) Wait until slotOne has fully ended on L1 — the archiver only prunes once slotAtNextL1Block > slotOne.
+    // The end-of-slotOne timestamp equals the start-of-slotTwo timestamp.
+    const slotOneEndTimestamp = getTimestampForSlot(slotTwo, test.constants);
+    logger.warn(`Waiting until L1 timestamp ${slotOneEndTimestamp} (end of slot ${slotOne})`);
+    await waitUntilL1Timestamp(test.l1Client, slotOneEndTimestamp, undefined, test.L2_SLOT_DURATION_IN_S * 3);
+
+    // (4) After slotOne ends without a checkpoint, all nodes should prune.
+    // Verify rollback via the prune event itself: the pruned slot must equal slotOne, and the
+    // pruned blocks must include the broadcast blocks for slotOne (proposerOne) and slotTwo
+    // (pipelined proposerTwo, whose work is now invalid because parent slotOne did not land).
+    logger.warn('Waiting for L2PruneUncheckpointed on every node');
+    const pruneTimeoutMs = test.L2_SLOT_DURATION_IN_S * 2 * 1000;
+    const pruneObservations = await Promise.all(
+      prunePromises.map((p, idx) =>
+        Promise.race([p, timeoutPromise(pruneTimeoutMs, `Node ${idx} did not emit prune event in time`)]),
+      ),
+    );
+
+    logger.warn('Asserting prune event details on every node');
+    for (const [idx, obs] of pruneObservations.entries()) {
+      expect({ idx, slotNumber: obs.slotNumber }).toEqual({ idx, slotNumber: slotOne });
+      // proposerOne broadcasts during slotZero, so its block must always be in the pruned set.
+      // The pipelined slotTwo broadcast may or may not have arrived in time on every node, so
+      // we don't strictly require it here.
+      const prunedSlots = obs.blocks.map(b => b.header.globalVariables.slotNumber);
+      expect(prunedSlots).toContain(slotOne);
+    }
+
+    // (5) Allow the formerly suppressed node to publish again so the chain can recover.
+    logger.warn(`Re-enabling checkpoint publishing on node ${proposerOneNodeIndex}`);
+    await nodes[proposerOneNodeIndex].setConfig({ skipPublishingCheckpointsPercent: 0 });
+
+    // (6) During slotTwo: the pipelined proposer for slotThree builds and broadcasts → proposed advances again.
+    // The chain must have rewound past slotOne and slotTwo and now build on whatever was
+    // checkpointed before slotZero — genesis, in this test, since no checkpoints have landed yet.
+    const postPruneProposedNumbers = pruneObservations.map(o => o.tipsAtPrune.proposed.number);
+    expect(postPruneProposedNumbers[0]).toBe(0);
+
+    logger.warn(`Waiting for proposed chain to advance to slot ${slotThree} on all nodes (build during slotTwo)`);
+    await Promise.all(
+      nodes.map((node, idx) =>
+        retryUntil(
+          async () => {
+            const tips = await node.getL2Tips();
+            if (tips.proposed.number === 0) {
+              return false;
+            }
+            const block = await node.getBlock(tips.proposed.number);
+            return !!block && block.header.globalVariables.slotNumber >= slotThree;
+          },
+          `node ${idx} proposed advanced to slot >= ${slotThree}`,
+          slotAdvanceTimeout,
+          0.5,
+        ),
+      ),
+    );
+
+    // The first block in the chain after the prune must be the slotThree block — there should be
+    // nothing between genesis and the new pipelined work, since slotOne and slotTwo were pruned.
+    for (const node of nodes) {
+      const blocks = await node.getBlocks(BlockNumber(1), 50);
+      const firstSlotThreeIdx = blocks.findIndex(b => b.header.globalVariables.slotNumber === slotThree);
+      expect(firstSlotThreeIdx).toEqual(0);
+    }
+
+    // (7) During slotThree: proposerThree publishes → checkpointed advances on every node.
+    logger.warn(`Waiting for checkpointed chain to reach slot >= ${slotThree} on all nodes`);
+    await Promise.all(
+      nodes.map((node, idx) =>
+        retryUntil(
+          async () => {
+            const tips = await node.getL2Tips();
+            if (tips.checkpointed.checkpoint.number === 0) {
+              return false;
+            }
+            const block = await node.getBlock(tips.checkpointed.block.number);
+            return (
+              !!block && block.header.globalVariables.slotNumber >= slotThree && tips.checkpointed.block.number > 0
+            );
+          },
+          `node ${idx} checkpointed advanced to slot >= ${slotThree}`,
+          slotAdvanceTimeout,
+          0.5,
+        ),
+      ),
+    );
+
+    // Sanity: the only fail events we tolerate are the deliberate skip-publish on the suppressed
+    // node for slotOne, the pipelined-discard knock-on from proposerTwo (its parent slotOne
+    // never landed), and proposer-rollup-check noise that any non-proposer emits when the rollup
+    // contract rejects them.
+    const unexpectedFailEvents = failEvents.filter(e => {
+      if (
+        e.type === 'checkpoint-publish-failed' &&
+        e.sequencerIndex === proposerOneNodeIndex + 2 &&
+        e.slot === slotOne
+      ) {
+        return false;
+      }
+      if (
+        e.type === 'checkpoint-publish-failed' &&
+        e.sequencerIndex === proposerTwoNodeIndex + 2 &&
+        e.slot === slotTwo
+      ) {
+        return false;
+      }
+      if (e.type === 'proposer-rollup-check-failed') {
+        return false;
+      }
+      return true;
+    });
+    if (unexpectedFailEvents.length > 0) {
+      logger.error('Unexpected fail events from sequencers', unexpectedFailEvents);
+    }
+    expect(unexpectedFailEvents).toEqual([]);
+  });
+});
diff --git a/yarn-project/end-to-end/src/e2e_epochs/epochs_multi_proof.test.ts b/yarn-project/end-to-end/src/e2e_epochs/epochs_multi_proof.test.ts
index 91d410742e59..3edbccf56373 100644
--- a/yarn-project/end-to-end/src/e2e_epochs/epochs_multi_proof.test.ts
+++ b/yarn-project/end-to-end/src/e2e_epochs/epochs_multi_proof.test.ts
@@ -91,7 +91,7 @@ describe('e2e_epochs/epochs_multi_proof', () => {
       120,
     );
 
-    const provenBlockNumber = await context.aztecNode.getProvenBlockNumber();
+    const provenBlockNumber = await context.aztecNode.getBlockNumber('proven');
     expect(provenBlockNumber).toEqual(firstEpochLastBlockNum);
 
     logger.info(`Test succeeded`);
diff --git a/yarn-project/end-to-end/src/e2e_epochs/epochs_proof_public_cross_chain.test.ts b/yarn-project/end-to-end/src/e2e_epochs/epochs_proof_public_cross_chain.test.ts
index 4635f226abd9..0d9b27000373 100644
--- a/yarn-project/end-to-end/src/e2e_epochs/epochs_proof_public_cross_chain.test.ts
+++ b/yarn-project/end-to-end/src/e2e_epochs/epochs_proof_public_cross_chain.test.ts
@@ -78,7 +78,7 @@ describe('e2e_epochs/epochs_proof_public_cross_chain', () => {
     logger.warn(`Waiting for proof for tx ${txReceipt.txHash} mined at ${txReceipt.blockNumber!}`);
     await retryUntil(
       async () => {
-        const provenBlockNumber = await context.aztecNode.getProvenBlockNumber();
+        const provenBlockNumber = await context.aztecNode.getBlockNumber('proven');
         logger.info(`Proven block number is ${provenBlockNumber}`);
         return provenBlockNumber >= txReceipt.blockNumber!;
       },
@@ -86,7 +86,7 @@ describe('e2e_epochs/epochs_proof_public_cross_chain', () => {
       test.L2_SLOT_DURATION_IN_S * test.epochDuration * 3,
     );
 
-    const provenBlockNumber = await context.aztecNode.getProvenBlockNumber();
+    const provenBlockNumber = await context.aztecNode.getBlockNumber('proven');
     expect(provenBlockNumber).toBeGreaterThanOrEqual(txReceipt.blockNumber!);
 
     // Should not be able to consume the message again.
diff --git a/yarn-project/end-to-end/src/e2e_escrow_contract.test.ts b/yarn-project/end-to-end/src/e2e_escrow_contract.test.ts
index 949e5eb6e15c..4763abf825e0 100644
--- a/yarn-project/end-to-end/src/e2e_escrow_contract.test.ts
+++ b/yarn-project/end-to-end/src/e2e_escrow_contract.test.ts
@@ -38,7 +38,7 @@ describe('e2e_escrow_contract', () => {
     // Note that we need to register it first if we want to emit an encrypted note for it in the constructor
     escrowSecretKey = Fr.random();
     escrowPublicKeys = (await deriveKeys(escrowSecretKey)).publicKeys;
-    const escrowDeployment = EscrowContract.deployWithPublicKeys(escrowPublicKeys, wallet, owner);
+    const escrowDeployment = EscrowContract.deploy(wallet, owner, { publicKeys: escrowPublicKeys, deployer: owner });
     const escrowInstance = await escrowDeployment.getInstance();
     await wallet.registerContract(escrowInstance, EscrowContract.artifact, escrowSecretKey);
     // The contract constructor initializes private storage vars that need the contract's own nullifier key.
diff --git a/yarn-project/end-to-end/src/e2e_event_logs.test.ts b/yarn-project/end-to-end/src/e2e_event_logs.test.ts
index 1fde8fe14556..35f8a50df2a0 100644
--- a/yarn-project/end-to-end/src/e2e_event_logs.test.ts
+++ b/yarn-project/end-to-end/src/e2e_event_logs.test.ts
@@ -222,7 +222,9 @@ describe('Logs', () => {
           .send({ from: account1Address });
 
         // Fetch raw private logs for that block and check tag uniqueness
-        const logs = (await aztecNode.getBlock(tx.blockNumber!))!.getPrivateLogs().filter(l => !l.isEmpty());
+        const logs = (await aztecNode.getBlock(tx.blockNumber!, { includeTransactions: true }))!.body.txEffects
+          .flatMap(t => t.privateLogs)
+          .filter(l => !l.isEmpty());
 
         expect(logs.length).toBe(tx1NumLogs);
 
@@ -243,7 +245,9 @@ describe('Logs', () => {
         const blockNumber = tx.blockNumber!;
 
         // Fetch raw private logs for that block and check tag uniqueness
-        const logs = (await aztecNode.getBlock(blockNumber))!.getPrivateLogs().filter(l => !l.isEmpty());
+        const logs = (await aztecNode.getBlock(blockNumber, { includeTransactions: true }))!.body.txEffects
+          .flatMap(t => t.privateLogs)
+          .filter(l => !l.isEmpty());
 
         expect(logs.length).toBe(tx2NumLogs);
 
diff --git a/yarn-project/end-to-end/src/e2e_expiration_timestamp.test.ts b/yarn-project/end-to-end/src/e2e_expiration_timestamp.test.ts
index 18240f671298..8ba0b26759bd 100644
--- a/yarn-project/end-to-end/src/e2e_expiration_timestamp.test.ts
+++ b/yarn-project/end-to-end/src/e2e_expiration_timestamp.test.ts
@@ -34,7 +34,7 @@ describe('e2e_expiration_timestamp', () => {
     let expirationTimestamp: bigint;
 
     beforeEach(async () => {
-      const header = await aztecNode.getBlockHeader();
+      const header = await aztecNode.getBlockHeader('latest');
       if (!header) {
         throw new Error('Block header not found in the setup of e2e_expiration_timestamp.test.ts');
       }
@@ -87,7 +87,7 @@ describe('e2e_expiration_timestamp', () => {
     let expirationTimestamp: bigint;
 
     beforeEach(async () => {
-      const header = await aztecNode.getBlockHeader();
+      const header = await aztecNode.getBlockHeader('latest');
       if (!header) {
         throw new Error('Block header not found in the setup of e2e_expiration_timestamp.test.ts');
       }
@@ -142,7 +142,7 @@ describe('e2e_expiration_timestamp', () => {
     let expirationTimestamp: bigint;
 
     beforeEach(async () => {
-      const header = await aztecNode.getBlockHeader();
+      const header = await aztecNode.getBlockHeader('latest');
       if (!header) {
         throw new Error('Block header not found in the setup of e2e_expiration_timestamp.test.ts');
       }
diff --git a/yarn-project/end-to-end/src/e2e_fees/account_init.test.ts b/yarn-project/end-to-end/src/e2e_fees/account_init.test.ts
index 7095d43e46e1..29fc20ddd03a 100644
--- a/yarn-project/end-to-end/src/e2e_fees/account_init.test.ts
+++ b/yarn-project/end-to-end/src/e2e_fees/account_init.test.ts
@@ -179,20 +179,18 @@ describe('e2e_fees account_init', () => {
       await t.mintPrivateBananas(mintedBananas, bobsAddress);
 
       const [aliceBalanceBefore] = await t.getGasBalanceFn(aliceAddress);
-      const { receipt: tx } = await SchnorrAccountContractInterface.deployWithPublicKeys(
-        bobsPublicKeys,
+      const { receipt: tx } = await SchnorrAccountContractInterface.deploy(
         wallet,
         bobsSigningPubKey.x,
         bobsSigningPubKey.y,
+        { salt: bobsInstance.salt, universalDeploy: true, publicKeys: bobsPublicKeys },
       ).send({
         from: aliceAddress,
         // The account constructor initializes storage vars that need the contract's own nullifier key, so we need to add it to scopes.
         additionalScopes: [bobsAddress],
-        contractAddressSalt: bobsInstance.salt,
         skipClassPublication: true,
         skipInstancePublication: true,
         skipInitialization: false,
-        universalDeploy: true,
       });
 
       // alice paid in Fee Juice
diff --git a/yarn-project/end-to-end/src/e2e_fees/fee_settings.test.ts b/yarn-project/end-to-end/src/e2e_fees/fee_settings.test.ts
index c88940adcb67..2c025c2cb526 100644
--- a/yarn-project/end-to-end/src/e2e_fees/fee_settings.test.ts
+++ b/yarn-project/end-to-end/src/e2e_fees/fee_settings.test.ts
@@ -67,7 +67,7 @@ describe('e2e_fees fee settings', () => {
     const getCurrentMinFeesAfterCheckpoint = async (checkpointedBlock: BlockNumber) => {
       return await retryUntil(
         async () => {
-          const currentCheckpointedBlock = await aztecNode.getCheckpointedBlockNumber();
+          const currentCheckpointedBlock = await aztecNode.getBlockNumber('checkpointed');
           if (currentCheckpointedBlock < checkpointedBlock) {
             return undefined;
           }
diff --git a/yarn-project/end-to-end/src/e2e_fees/fees_test.ts b/yarn-project/end-to-end/src/e2e_fees/fees_test.ts
index f9ea83a93fb3..478687371913 100644
--- a/yarn-project/end-to-end/src/e2e_fees/fees_test.ts
+++ b/yarn-project/end-to-end/src/e2e_fees/fees_test.ts
@@ -134,7 +134,7 @@ export class FeesTest {
 
   async catchUpProvenChain() {
     const bn = await this.aztecNode.getBlockNumber();
-    while ((await this.aztecNode.getProvenBlockNumber()) < bn) {
+    while ((await this.aztecNode.getBlockNumber('proven')) < bn) {
       await sleep(1000);
     }
   }
diff --git a/yarn-project/end-to-end/src/e2e_kernelless_simulation.test.ts b/yarn-project/end-to-end/src/e2e_kernelless_simulation.test.ts
index ee283d050d64..9870c7cd3895 100644
--- a/yarn-project/end-to-end/src/e2e_kernelless_simulation.test.ts
+++ b/yarn-project/end-to-end/src/e2e_kernelless_simulation.test.ts
@@ -1,8 +1,13 @@
+import { EcdsaKAccountContract } from '@aztec/accounts/ecdsa';
+import { SchnorrAccountContract } from '@aztec/accounts/schnorr';
+import { NO_FROM } from '@aztec/aztec.js/account';
 import { AztecAddress } from '@aztec/aztec.js/addresses';
 import { CallAuthorizationRequest } from '@aztec/aztec.js/authorization';
 import { Fr } from '@aztec/aztec.js/fields';
 import type { Logger } from '@aztec/aztec.js/log';
 import type { AztecNode } from '@aztec/aztec.js/node';
+import { randomBytes } from '@aztec/foundation/crypto/random';
+import { Fq } from '@aztec/foundation/curves/bn254';
 import { AMMContract } from '@aztec/noir-contracts.js/AMM';
 import { type TokenContract, TokenContractArtifact } from '@aztec/noir-contracts.js/Token';
 import { AuthWitTestContract, AuthWitTestContractArtifact } from '@aztec/noir-test-contracts.js/AuthWitTest';
@@ -420,4 +425,60 @@ describe('Kernelless simulation', () => {
       noteHashMembershipWitnessSpy.mockRestore();
     });
   });
+
+  describe('account contract deployment', () => {
+    it('simulates Schnorr account deployment and gas matches with-kernels counterpart', async () => {
+      const signingKey = Fq.random();
+      const accountManager = await wallet.createAccount({
+        secret: Fr.random(),
+        salt: Fr.random(),
+        contract: new SchnorrAccountContract(signingKey),
+        type: 'schnorr',
+      });
+      const deployMethod = await accountManager.getDeployMethod();
+      const deployOptions = { from: NO_FROM, skipClassPublication: true };
+
+      wallet.setSimulationMode('kernelless-override');
+      const kernellessResult = await deployMethod.simulate(deployOptions);
+      const kernellessGas = kernellessResult.estimatedGas!;
+
+      wallet.setSimulationMode('full');
+      const withKernelsResult = await deployMethod.simulate(deployOptions);
+      const withKernelsGas = withKernelsResult.estimatedGas!;
+
+      logger.info(`Schnorr kernelless gas: L2=${kernellessGas.gasLimits.l2Gas} DA=${kernellessGas.gasLimits.daGas}`);
+      logger.info(
+        `Schnorr with kernels gas: L2=${withKernelsGas.gasLimits.l2Gas} DA=${withKernelsGas.gasLimits.daGas}`,
+      );
+
+      expect(kernellessGas.gasLimits.daGas).toEqual(withKernelsGas.gasLimits.daGas);
+      expect(kernellessGas.gasLimits.l2Gas).toEqual(withKernelsGas.gasLimits.l2Gas);
+    });
+
+    it('simulates ECDSA account deployment and gas matches with-kernels counterpart', async () => {
+      const signingKey = randomBytes(32);
+      const accountManager = await wallet.createAccount({
+        secret: Fr.random(),
+        salt: Fr.random(),
+        contract: new EcdsaKAccountContract(signingKey),
+        type: 'ecdsasecp256k1',
+      });
+      const deployMethod = await accountManager.getDeployMethod();
+      const deployOptions = { from: NO_FROM, skipClassPublication: true };
+
+      wallet.setSimulationMode('kernelless-override');
+      const kernellessResult = await deployMethod.simulate(deployOptions);
+      const kernellessGas = kernellessResult.estimatedGas!;
+
+      wallet.setSimulationMode('full');
+      const withKernelsResult = await deployMethod.simulate(deployOptions);
+      const withKernelsGas = withKernelsResult.estimatedGas!;
+
+      logger.info(`ECDSA kernelless gas: L2=${kernellessGas.gasLimits.l2Gas} DA=${kernellessGas.gasLimits.daGas}`);
+      logger.info(`ECDSA with kernels gas: L2=${withKernelsGas.gasLimits.l2Gas} DA=${withKernelsGas.gasLimits.daGas}`);
+
+      expect(kernellessGas.gasLimits.daGas).toEqual(withKernelsGas.gasLimits.daGas);
+      expect(kernellessGas.gasLimits.l2Gas).toEqual(withKernelsGas.gasLimits.l2Gas);
+    });
+  });
 });
diff --git a/yarn-project/end-to-end/src/e2e_keys.test.ts b/yarn-project/end-to-end/src/e2e_keys.test.ts
index 9e56bb423b87..c566e6ef525f 100644
--- a/yarn-project/end-to-end/src/e2e_keys.test.ts
+++ b/yarn-project/end-to-end/src/e2e_keys.test.ts
@@ -7,7 +7,6 @@ import { DomainSeparator, INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
 import { BlockNumber } from '@aztec/foundation/branded-types';
 import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto/poseidon';
 import { TestContract } from '@aztec/noir-test-contracts.js/Test';
-import type { L2Block } from '@aztec/stdlib/block';
 import { siloNullifier } from '@aztec/stdlib/hash';
 import {
   computeAppNullifierHidingKey,
@@ -90,14 +89,12 @@ describe('Keys', () => {
 
     const getNumNullifiedNotes = async (nhkApp: Fr, contractAddress: AztecAddress) => {
       // 1. Get all the note hashes
-      const blocks = await aztecNode.getBlocks(BlockNumber(INITIAL_L2_BLOCK_NUM), 1000);
-      const noteHashes = blocks.flatMap((block: L2Block) =>
-        block.body.txEffects.flatMap(txEffect => txEffect.noteHashes),
-      );
+      const blocks = await aztecNode.getBlocks(BlockNumber(INITIAL_L2_BLOCK_NUM), 1000, {
+        includeTransactions: true,
+      });
+      const noteHashes = blocks.flatMap(block => block.body.txEffects.flatMap(txEffect => txEffect.noteHashes));
       // 2. Get all the seen nullifiers
-      const nullifiers = blocks.flatMap((block: L2Block) =>
-        block.body.txEffects.flatMap(txEffect => txEffect.nullifiers),
-      );
+      const nullifiers = blocks.flatMap(block => block.body.txEffects.flatMap(txEffect => txEffect.nullifiers));
       // 3. Derive all the possible nullifiers using nhkApp
       const derivedNullifiers = await Promise.all(
         noteHashes.map(async noteHash => {
diff --git a/yarn-project/end-to-end/src/e2e_l1_publisher/e2e_l1_publisher.test.ts b/yarn-project/end-to-end/src/e2e_l1_publisher/e2e_l1_publisher.test.ts
index c16d89979900..eb25a0beed48 100644
--- a/yarn-project/end-to-end/src/e2e_l1_publisher/e2e_l1_publisher.test.ts
+++ b/yarn-project/end-to-end/src/e2e_l1_publisher/e2e_l1_publisher.test.ts
@@ -25,7 +25,13 @@ import { EthCheatCodesWithState, RollupCheatCodes, startAnvil } from '@aztec/eth
 import type { Anvil } from '@aztec/ethereum/test';
 import type { ExtendedViemWalletClient } from '@aztec/ethereum/types';
 import { range } from '@aztec/foundation/array';
-import { BlockNumber, CheckpointNumber, EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
+import {
+  BlockNumber,
+  CheckpointNumber,
+  EpochNumber,
+  IndexWithinCheckpoint,
+  SlotNumber,
+} from '@aztec/foundation/branded-types';
 import { Buffer32 } from '@aztec/foundation/buffer';
 import { times, timesParallel } from '@aztec/foundation/collection';
 import { SecretValue } from '@aztec/foundation/config';
@@ -42,10 +48,12 @@ import { ProtocolContractsList, protocolContractsHash } from '@aztec/protocol-co
 import { LightweightCheckpointBuilder } from '@aztec/prover-client/light';
 import { SequencerPublisher, SequencerPublisherMetrics } from '@aztec/sequencer-client';
 import {
-  CheckpointedL2Block,
+  type BlockData,
+  type BlockQuery,
+  type BlocksQuery,
+  Body,
   type CommitteeAttestation,
   CommitteeAttestationsAndSigners,
-  GENESIS_BLOCK_HEADER_HASH,
   L2Block,
   type L2Tips,
   Signature,
@@ -54,21 +62,18 @@ import { Checkpoint, L1PublishedData, PublishedCheckpoint } from '@aztec/stdlib/
 import { type L1RollupConstants, getSlotStartBuildTimestamp } from '@aztec/stdlib/epoch-helpers';
 import { GasFees, GasSettings } from '@aztec/stdlib/gas';
 import { tryStop } from '@aztec/stdlib/interfaces/server';
-import { orderAttestations } from '@aztec/stdlib/p2p';
-import { CheckpointHeader } from '@aztec/stdlib/rollup';
 import {
-  fr,
-  makeAndSignCommitteeAttestationsAndSigners,
-  makeCheckpointAttestationFromCheckpoint,
-  mockProcessedTx,
-} from '@aztec/stdlib/testing';
+  CheckpointProposal,
+  ConsensusPayload,
+  CheckpointAttestation as P2PCheckpointAttestation,
+  getHashedSignaturePayloadTypedData,
+  orderAttestations,
+} from '@aztec/stdlib/p2p';
+import { CheckpointHeader } from '@aztec/stdlib/rollup';
+import { fr, mockProcessedTx } from '@aztec/stdlib/testing';
+import { AppendOnlyTreeSnapshot } from '@aztec/stdlib/trees';
 import type { BlockHeader, CheckpointGlobalVariables, ProcessedTx } from '@aztec/stdlib/tx';
-import {
-  type MerkleTreeAdminDatabase,
-  NativeWorldStateService,
-  ServerWorldStateSynchronizer,
-  type WorldStateConfig,
-} from '@aztec/world-state';
+import { NativeWorldStateService, ServerWorldStateSynchronizer, type WorldStateConfig } from '@aztec/world-state';
 
 import { beforeEach, describe, expect, it, jest } from '@jest/globals';
 import { type MockProxy, mock } from 'jest-mock-extended';
@@ -109,7 +114,7 @@ describe('L1Publisher integration', () => {
 
   let publisher: SequencerPublisher;
 
-  let builderDb: MerkleTreeAdminDatabase;
+  let builderDb: NativeWorldStateService;
 
   // The header of the last block
   let prevHeader: BlockHeader;
@@ -136,6 +141,28 @@ describe('L1Publisher integration', () => {
 
   let rpcUrl: string;
   let anvil: Anvil;
+  const getSignatureContext = () => ({
+    chainId,
+    rollupAddress: l1ContractAddresses.rollupAddress,
+  });
+  const makeCheckpointAttestationForCurrentContext = (checkpoint: Checkpoint, signer: Secp256k1Signer) => {
+    const signatureContext = getSignatureContext();
+    const payload = ConsensusPayload.fromCheckpoint(checkpoint, signatureContext);
+    const attestationDigest = getHashedSignaturePayloadTypedData(payload);
+    const proposal = new CheckpointProposal(
+      checkpoint.header,
+      checkpoint.archive.root,
+      checkpoint.feeAssetPriceModifier,
+      Signature.empty(),
+      signatureContext,
+    );
+    const proposalDigest = getHashedSignaturePayloadTypedData(proposal);
+    return new P2PCheckpointAttestation(payload, signer.sign(attestationDigest), signer.sign(proposalDigest));
+  };
+  const signAttestationsAndSigners = (
+    attestationsAndSigners: CommitteeAttestationsAndSigners,
+    signer: Secp256k1Signer,
+  ) => signer.sign(getHashedSignaturePayloadTypedData(attestationsAndSigners));
 
   const progressTimeBySlot = async (slotsToJump = 1) => {
     const currentTime = (await l1Client.getBlock()).timestamp;
@@ -180,25 +207,47 @@ describe('L1Publisher integration', () => {
 
     builderDb = await NativeWorldStateService.tmp(EthAddress.fromString(rollupAddress));
     blocks = [];
+    // World-state derives block 0's hash from its initial header (which depends on prefilled state and
+    // genesisTimestamp), not from the static GENESIS_BLOCK_HEADER_HASH constant. The mock must report the
+    // same hash so L2BlockStream's reorg-search at genesis sees matching local/source hashes.
+    const initialHeader = builderDb.getInitialHeader();
+    const initialHeaderHash = (await initialHeader.hash()).toString();
+    const genesisArchiveSnapshot = new AppendOnlyTreeSnapshot(
+      deployL1ContractsArgs.genesisArchiveRoot ?? new Fr(GENESIS_ARCHIVE_ROOT),
+      1,
+    );
+    const genesisBlock = new L2Block(
+      genesisArchiveSnapshot,
+      initialHeader,
+      Body.empty(),
+      CheckpointNumber.ZERO,
+      IndexWithinCheckpoint(0),
+    );
+    const genesisBlockData: BlockData = {
+      header: initialHeader,
+      archive: genesisArchiveSnapshot,
+      blockHash: await initialHeader.hash(),
+      checkpointNumber: CheckpointNumber.ZERO,
+      indexWithinCheckpoint: IndexWithinCheckpoint(0),
+    };
     blockSource = mock<ArchiverDataSource>({
-      getBlocks(from, limit) {
-        return Promise.resolve(blocks.slice(from - 1, from - 1 + limit));
+      getBlocks(query: BlocksQuery) {
+        if (!('from' in query)) {
+          return Promise.resolve([]);
+        }
+        return Promise.resolve(blocks.slice(query.from - 1, query.from - 1 + query.limit));
       },
-      // Methods needed by L2BlockStream for world state sync
-      getCheckpointedBlocks(from, limit) {
-        const slicedBlocks = blocks.slice(from - 1, from - 1 + limit);
-        return Promise.all(
-          slicedBlocks.map(
-            async block =>
-              new CheckpointedL2Block(
-                // Test uses 1-block-per-checkpoint, so checkpoint number equals block number
-                CheckpointNumber.fromBlockNumber(block.number),
-                block,
-                new L1PublishedData(BigInt(block.number), BigInt(block.number), (await block.hash()).toString()),
-                [],
-              ),
-          ),
-        );
+      getBlock(query: BlockQuery) {
+        if ('number' in query && Number(query.number) === 0) {
+          return Promise.resolve(genesisBlock);
+        }
+        return Promise.resolve(undefined);
+      },
+      getBlockData(query: BlockQuery) {
+        if ('number' in query && Number(query.number) === 0) {
+          return Promise.resolve(genesisBlockData);
+        }
+        return Promise.resolve(undefined);
       },
       async getCheckpoints(checkpointNumber, _limit) {
         // Test uses 1-block-per-checkpoint, so we find block by checkpoint number
@@ -224,7 +273,7 @@ describe('L1Publisher integration', () => {
         const latestBlock = blocks.at(-1);
         const blockId = latestBlock
           ? { number: latestBlock.number, hash: (await latestBlock.hash()).toString() }
-          : { number: BlockNumber.ZERO, hash: GENESIS_BLOCK_HEADER_HASH.toString() };
+          : { number: BlockNumber.ZERO, hash: initialHeaderHash };
         // Test uses 1-block-per-checkpoint, so checkpoint number equals block number
         const tipId = {
           block: blockId,
@@ -481,7 +530,7 @@ describe('L1Publisher integration', () => {
 
         await publisher.enqueueProposeCheckpoint(
           checkpoint,
-          CommitteeAttestationsAndSigners.empty(),
+          CommitteeAttestationsAndSigners.empty(getSignatureContext()),
           Signature.empty(),
         );
         await publisher.sendRequests();
@@ -527,7 +576,7 @@ describe('L1Publisher integration', () => {
                 feeAssetPriceModifier: 0n,
               },
             },
-            CommitteeAttestationsAndSigners.empty().getPackedAttestations(),
+            CommitteeAttestationsAndSigners.packAttestations([]),
             [],
             Signature.empty().toViemSignature(),
             getPrefixedEthBlobCommitments(blockBlobs),
@@ -592,7 +641,7 @@ describe('L1Publisher integration', () => {
     ) => {
       await publisher.enqueueProposeCheckpoint(
         checkpoint,
-        new CommitteeAttestationsAndSigners(attestations),
+        new CommitteeAttestationsAndSigners(attestations, getSignatureContext()),
         signature,
       );
       const result = await publisher.sendRequests();
@@ -604,7 +653,7 @@ describe('L1Publisher integration', () => {
       const { checkpoint } = await buildSingleCheckpoint();
       const block = checkpoint.blocks[0];
 
-      const checkpointAttestations = validators.map(v => makeCheckpointAttestationFromCheckpoint(checkpoint, v));
+      const checkpointAttestations = validators.map(v => makeCheckpointAttestationForCurrentContext(checkpoint, v));
       const attestations = orderAttestations(checkpointAttestations, committee!);
 
       const canPropose = await publisher.canProposeAt(new Fr(GENESIS_ARCHIVE_ROOT), proposer!);
@@ -613,11 +662,8 @@ describe('L1Publisher integration', () => {
 
       const proposerSigner = validators.find(v => v.address.equals(proposer!));
 
-      const attestationsAndSigners = new CommitteeAttestationsAndSigners(attestations);
-      const attestationsAndSignersSignature = makeAndSignCommitteeAttestationsAndSigners(
-        attestationsAndSigners,
-        proposerSigner!,
-      );
+      const attestationsAndSigners = new CommitteeAttestationsAndSigners(attestations, getSignatureContext());
+      const attestationsAndSignersSignature = signAttestationsAndSigners(attestationsAndSigners, proposerSigner!);
 
       await expectPublishCheckpoint(checkpoint, attestations, attestationsAndSignersSignature);
     });
@@ -625,11 +671,11 @@ describe('L1Publisher integration', () => {
     it('fails to publish a block without the proposer attestation', async () => {
       const { checkpoint } = await buildSingleCheckpoint();
       const block = checkpoint.blocks[0];
-      const checkpointAttestations = validators.map(v => makeCheckpointAttestationFromCheckpoint(checkpoint, v));
+      const checkpointAttestations = validators.map(v => makeCheckpointAttestationForCurrentContext(checkpoint, v));
 
       // Reverse attestations to break proposer attestation
       const attestations = orderAttestations(checkpointAttestations, committee!).reverse();
-      const attestationsAndSigners = new CommitteeAttestationsAndSigners(attestations);
+      const attestationsAndSigners = new CommitteeAttestationsAndSigners(attestations, getSignatureContext());
 
       const canPropose = await publisher.canProposeAt(new Fr(GENESIS_ARCHIVE_ROOT), proposer!);
       expect(canPropose?.slot).toEqual(block.header.getSlot());
@@ -643,15 +689,15 @@ describe('L1Publisher integration', () => {
     it('rejects flipped proposer signature', async () => {
       const { checkpoint } = await buildSingleCheckpoint();
       const block = checkpoint.blocks[0];
-      const checkpointAttestations = validators.map(v => makeCheckpointAttestationFromCheckpoint(checkpoint, v));
+      const checkpointAttestations = validators.map(v => makeCheckpointAttestationForCurrentContext(checkpoint, v));
       const attestations = orderAttestations(checkpointAttestations, committee!);
 
       const canPropose = await publisher.canProposeAt(new Fr(GENESIS_ARCHIVE_ROOT), proposer!);
       expect(canPropose?.slot).toEqual(block.header.getSlot());
       await publisher.validateBlockHeader(checkpoint.header);
 
-      const attestationsAndSigners = new CommitteeAttestationsAndSigners(attestations);
-      const attestationsAndSignersSignature = makeAndSignCommitteeAttestationsAndSigners(
+      const attestationsAndSigners = new CommitteeAttestationsAndSigners(attestations, getSignatureContext());
+      const attestationsAndSignersSignature = signAttestationsAndSigners(
         attestationsAndSigners,
         validators.find(v => v.address.equals(proposer!))!,
       );
@@ -668,15 +714,15 @@ describe('L1Publisher integration', () => {
     it('rejects signature with invalid recovery value', async () => {
       const { checkpoint } = await buildSingleCheckpoint();
       const block = checkpoint.blocks[0];
-      const checkpointAttestations = validators.map(v => makeCheckpointAttestationFromCheckpoint(checkpoint, v));
+      const checkpointAttestations = validators.map(v => makeCheckpointAttestationForCurrentContext(checkpoint, v));
       const attestations = orderAttestations(checkpointAttestations, committee!);
 
       const canPropose = await publisher.canProposeAt(new Fr(GENESIS_ARCHIVE_ROOT), proposer!);
       expect(canPropose?.slot).toEqual(block.header.getSlot());
       await publisher.validateBlockHeader(checkpoint.header);
 
-      const attestationsAndSigners = new CommitteeAttestationsAndSigners(attestations);
-      const attestationsAndSignersSignature = makeAndSignCommitteeAttestationsAndSigners(
+      const attestationsAndSigners = new CommitteeAttestationsAndSigners(attestations, getSignatureContext());
+      const attestationsAndSignersSignature = signAttestationsAndSigners(
         attestationsAndSigners,
         validators.find(v => v.address.equals(proposer!))!,
       );
@@ -699,11 +745,11 @@ describe('L1Publisher integration', () => {
       // Publish the first invalid block
       const badCheckpointAttestations = validators
         .filter(v => v.address.equals(proposer!))
-        .map(v => makeCheckpointAttestationFromCheckpoint(badCheckpoint, v));
+        .map(v => makeCheckpointAttestationForCurrentContext(badCheckpoint, v));
       const badAttestations = orderAttestations(badCheckpointAttestations, committee!);
 
-      const badAttestationsAndSigners = new CommitteeAttestationsAndSigners(badAttestations);
-      const badAttestationsAndSignersSignature = makeAndSignCommitteeAttestationsAndSigners(
+      const badAttestationsAndSigners = new CommitteeAttestationsAndSigners(badAttestations, getSignatureContext());
+      const badAttestationsAndSignersSignature = signAttestationsAndSigners(
         badAttestationsAndSigners,
         validators.find(v => v.address.equals(proposer!))!,
       );
@@ -721,7 +767,7 @@ describe('L1Publisher integration', () => {
       const { checkpoint } = await buildSingleCheckpoint({ blockNumber: BlockNumber(1) });
       const block = checkpoint.blocks[0];
       expect(block.number).toEqual(badBlock.number);
-      const checkpointAttestations = validators.map(v => makeCheckpointAttestationFromCheckpoint(checkpoint, v));
+      const checkpointAttestations = validators.map(v => makeCheckpointAttestationForCurrentContext(checkpoint, v));
       const attestations = orderAttestations(checkpointAttestations, committee!);
 
       // Check we can invalidate the checkpoint
@@ -756,8 +802,8 @@ describe('L1Publisher integration', () => {
       await publisher.validateBlockHeader(checkpoint.header, invalidationSimulationOverridesPlan);
 
       // At this point I'm gonna need to propose the correct signature ye? So confused actually here.
-      const attestationsAndSigners = new CommitteeAttestationsAndSigners(attestations);
-      const attestationsAndSignersSignature = makeAndSignCommitteeAttestationsAndSigners(
+      const attestationsAndSigners = new CommitteeAttestationsAndSigners(attestations, getSignatureContext());
+      const attestationsAndSignersSignature = signAttestationsAndSigners(
         attestationsAndSigners,
         validators.find(v => v.address.equals(proposer!))!,
       );
@@ -783,7 +829,11 @@ describe('L1Publisher integration', () => {
       const { checkpoint } = await buildSingleCheckpoint();
       const block = checkpoint.blocks[0];
 
-      await publisher.enqueueProposeCheckpoint(checkpoint, CommitteeAttestationsAndSigners.empty(), Signature.empty());
+      await publisher.enqueueProposeCheckpoint(
+        checkpoint,
+        CommitteeAttestationsAndSigners.empty(getSignatureContext()),
+        Signature.empty(),
+      );
       await publisher.enqueueGovernanceCastSignal(
         l1ContractAddresses.rollupAddress,
         block.slot,
@@ -807,7 +857,11 @@ describe('L1Publisher integration', () => {
       // Expect the simulation to fail
       const loggerErrorSpy = jest.spyOn((publisher as any).log, 'error');
       await expect(
-        publisher.enqueueProposeCheckpoint(checkpoint, CommitteeAttestationsAndSigners.empty(), Signature.empty()),
+        publisher.enqueueProposeCheckpoint(
+          checkpoint,
+          CommitteeAttestationsAndSigners.empty(getSignatureContext()),
+          Signature.empty(),
+        ),
       ).rejects.toThrow(/Rollup__InvalidInHash/);
       expect(loggerErrorSpy).toHaveBeenNthCalledWith(
         2,
@@ -855,9 +909,12 @@ describe('L1Publisher integration', () => {
     };
 
     const enqueueProposeL2Checkpoint = async (checkpoint: Checkpoint) => {
-      await publisher.enqueueProposeCheckpoint(checkpoint, CommitteeAttestationsAndSigners.empty(), Signature.empty(), {
-        txTimeoutAt: getProposeTxTimeoutAt(checkpoint),
-      });
+      await publisher.enqueueProposeCheckpoint(
+        checkpoint,
+        CommitteeAttestationsAndSigners.empty(getSignatureContext()),
+        Signature.empty(),
+        { txTimeoutAt: getProposeTxTimeoutAt(checkpoint) },
+      );
     };
 
     it(`cancels block proposal when the L2 slot ends`, async () => {
diff --git a/yarn-project/end-to-end/src/e2e_multi_eoa.test.ts b/yarn-project/end-to-end/src/e2e_multi_eoa.test.ts
index 3b776cb963c4..beb0ae32e5b2 100644
--- a/yarn-project/end-to-end/src/e2e_multi_eoa.test.ts
+++ b/yarn-project/end-to-end/src/e2e_multi_eoa.test.ts
@@ -108,11 +108,11 @@ describe('e2e_multi_eoa', () => {
     // We should then see that another block is published but this time with a different expected account
     const testAccountRotation = async (expectedFirstSender: number, expectedSecondSender: number) => {
       // the L2 tx we are going to try and execute
-      const deployMethod = StatefulTestContract.deploy(wallet, defaultAccountAddress, 0);
-      const deployMethodTx = await proveInteraction(wallet, deployMethod, {
-        contractAddressSalt: Fr.random(),
-        from: defaultAccountAddress,
+      const deployMethod = StatefulTestContract.deploy(wallet, defaultAccountAddress, 0, {
+        salt: Fr.random(),
+        deployer: defaultAccountAddress,
       });
+      const deployMethodTx = await proveInteraction(wallet, deployMethod, { from: defaultAccountAddress });
 
       const l1Utils: L1TxUtils[] = (publisherManager as any).publishers;
 
diff --git a/yarn-project/end-to-end/src/e2e_multi_validator/e2e_multi_validator_node.test.ts b/yarn-project/end-to-end/src/e2e_multi_validator/e2e_multi_validator_node.test.ts
index 2244713331af..587ade1819d4 100644
--- a/yarn-project/end-to-end/src/e2e_multi_validator/e2e_multi_validator_node.test.ts
+++ b/yarn-project/end-to-end/src/e2e_multi_validator/e2e_multi_validator_node.test.ts
@@ -12,7 +12,7 @@ import { createExtendedL1Client } from '@aztec/ethereum/client';
 import { getL1ContractsConfigEnvVars } from '@aztec/ethereum/config';
 import { RollupContract } from '@aztec/ethereum/contracts';
 import type { DeployAztecL1ContractsReturnType } from '@aztec/ethereum/deploy-aztec-l1-contracts';
-import { EpochNumber } from '@aztec/foundation/branded-types';
+import { BlockNumber, EpochNumber } from '@aztec/foundation/branded-types';
 import { SecretValue } from '@aztec/foundation/config';
 import { Signature } from '@aztec/foundation/eth-signature';
 import { retryUntil } from '@aztec/foundation/retry';
@@ -113,19 +113,22 @@ describe('e2e_multi_validator_node', () => {
     const deployer = new ContractDeployer(artifact, wallet);
 
     logger.info(`Deploying contract from ${ownerAddress}`);
-    const { receipt: tx } = await deployer.deploy(ownerAddress, 1).send({
-      from: ownerAddress,
-      contractAddressSalt: new Fr(BigInt(1)),
-    });
+    const { receipt: tx } = await deployer
+      .deploy([ownerAddress, 1], { salt: new Fr(BigInt(1)) })
+      .send({ from: ownerAddress });
     await waitForProven(aztecNode, tx, {
       provenTimeout: (config.aztecProofSubmissionEpochs + 1) * config.aztecEpochDuration * config.aztecSlotDuration,
     });
     expect(tx.blockNumber).toBeDefined();
 
     const dataStore = (aztecNode as AztecNodeService).getBlockSource() as Archiver;
-    const checkpointedBlock = await dataStore.getCheckpointedBlock(tx.blockNumber!);
-    const [publishedCheckpoint] = await dataStore.getCheckpoints(checkpointedBlock!.checkpointNumber, 1);
-    const payload = ConsensusPayload.fromCheckpoint(publishedCheckpoint.checkpoint);
+    const blockData = await dataStore.getBlockData({ number: BlockNumber(tx.blockNumber!) });
+    const [publishedCheckpoint] = await dataStore.getCheckpoints(blockData!.checkpointNumber, 1);
+    const signatureContext = {
+      chainId: config.l1ChainId,
+      rollupAddress: deployL1ContractsValues.l1ContractAddresses.rollupAddress,
+    };
+    const payload = ConsensusPayload.fromCheckpoint(publishedCheckpoint.checkpoint, signatureContext);
     const attestations = publishedCheckpoint.attestations
       .filter(a => !a.signature.isEmpty())
       .map(a => new CheckpointAttestation(payload, a.signature, Signature.empty()));
@@ -171,19 +174,22 @@ describe('e2e_multi_validator_node', () => {
     // new aztec transaction
     logger.info(`Deploying contract from ${ownerAddress}`);
     const deployer = new ContractDeployer(artifact, wallet);
-    const { receipt: tx } = await deployer.deploy(ownerAddress, 1).send({
-      from: ownerAddress,
-      contractAddressSalt: new Fr(BigInt(1)),
-    });
+    const { receipt: tx } = await deployer
+      .deploy([ownerAddress, 1], { salt: new Fr(BigInt(1)) })
+      .send({ from: ownerAddress });
     await waitForProven(aztecNode, tx, {
       provenTimeout: (config.aztecProofSubmissionEpochs + 1) * config.aztecEpochDuration * config.aztecSlotDuration,
     });
     expect(tx.blockNumber).toBeDefined();
 
     const dataStore = (aztecNode as AztecNodeService).getBlockSource() as Archiver;
-    const checkpointedBlock = await dataStore.getCheckpointedBlock(tx.blockNumber!);
-    const [publishedCheckpoint] = await dataStore.getCheckpoints(checkpointedBlock!.checkpointNumber, 1);
-    const payload = ConsensusPayload.fromCheckpoint(publishedCheckpoint.checkpoint);
+    const blockData = await dataStore.getBlockData({ number: BlockNumber(tx.blockNumber!) });
+    const [publishedCheckpoint] = await dataStore.getCheckpoints(blockData!.checkpointNumber, 1);
+    const signatureContext = {
+      chainId: config.l1ChainId,
+      rollupAddress: deployL1ContractsValues.l1ContractAddresses.rollupAddress,
+    };
+    const payload = ConsensusPayload.fromCheckpoint(publishedCheckpoint.checkpoint, signatureContext);
     const attestations = publishedCheckpoint.attestations
       .filter(a => !a.signature.isEmpty())
       .map(a => new CheckpointAttestation(payload, a.signature, Signature.empty()));
diff --git a/yarn-project/end-to-end/src/e2e_multiple_blobs.test.ts b/yarn-project/end-to-end/src/e2e_multiple_blobs.test.ts
index a766ed446312..316fd63a5bba 100644
--- a/yarn-project/end-to-end/src/e2e_multiple_blobs.test.ts
+++ b/yarn-project/end-to-end/src/e2e_multiple_blobs.test.ts
@@ -10,6 +10,7 @@ import { FIELDS_PER_BLOB } from '@aztec/constants';
 import { AvmGadgetsTestContract } from '@aztec/noir-test-contracts.js/AvmGadgetsTest';
 import { AvmTestContract } from '@aztec/noir-test-contracts.js/AvmTest';
 import { TestContract } from '@aztec/noir-test-contracts.js/Test';
+import { L2Block } from '@aztec/stdlib/block';
 import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
 
 import { setup } from './fixtures/utils.js';
@@ -80,7 +81,14 @@ describe('e2e_multiple_blobs', () => {
     const blockNumber = receipts[0].blockNumber!;
     expect(receipts.every(r => r.blockNumber === blockNumber)).toBe(true);
 
-    const block = (await aztecNode.getBlock(blockNumber))!;
+    const response = (await aztecNode.getBlock(blockNumber, { includeTransactions: true }))!;
+    const block = new L2Block(
+      response.archive,
+      response.header,
+      response.body,
+      response.checkpointNumber,
+      response.indexWithinCheckpoint,
+    );
 
     const numBlobFields = encodeCheckpointBlobDataFromBlocks([block.toBlockBlobData()]).length;
     const numBlobs = Math.ceil(numBlobFields / FIELDS_PER_BLOB);
diff --git a/yarn-project/end-to-end/src/e2e_nested_utility_calls.test.ts b/yarn-project/end-to-end/src/e2e_nested_utility_calls.test.ts
new file mode 100644
index 000000000000..3d120b88e5a4
--- /dev/null
+++ b/yarn-project/end-to-end/src/e2e_nested_utility_calls.test.ts
@@ -0,0 +1,156 @@
+import type { AztecAddress } from '@aztec/aztec.js/addresses';
+import type { Wallet } from '@aztec/aztec.js/wallet';
+import { NestedUtilityContract } from '@aztec/noir-test-contracts.js/NestedUtility';
+import type { UtilityCallAuthorizationRequest } from '@aztec/pxe/server';
+
+import { jest } from '@jest/globals';
+
+import { setup } from './fixtures/utils.js';
+
+const TIMEOUT = 120_000;
+
+// Verifies nested utility calls via pow_utility(x, n) = x^n (recursive utility→utility),
+// calling it from a private function via pow_private, and the default hook behavior.
+describe('Nested utility calls', () => {
+  let contractA: NestedUtilityContract;
+  let contractB: NestedUtilityContract;
+  jest.setTimeout(TIMEOUT);
+
+  let wallet: Wallet;
+  let defaultAccountAddress: AztecAddress;
+  let teardown: () => Promise<void>;
+
+  beforeAll(async () => {
+    ({
+      teardown,
+      wallet,
+      accounts: [defaultAccountAddress],
+    } = await setup(1));
+    ({ contract: contractA } = await NestedUtilityContract.deploy(wallet).send({ from: defaultAccountAddress }));
+    ({ contract: contractB } = await NestedUtilityContract.deploy(wallet).send({ from: defaultAccountAddress }));
+  });
+
+  afterAll(() => teardown());
+
+  it('pow_utility(x, 0) returns 1 (base case, no nested call)', async () => {
+    const { result } = await contractA.methods.pow_utility(2n, 0).simulate({ from: defaultAccountAddress });
+    expect(result).toEqual(1n);
+  });
+
+  it('pow_utility(2, 10) returns 2^10 (10 levels of nesting)', async () => {
+    const { result } = await contractA.methods.pow_utility(2n, 10).simulate({ from: defaultAccountAddress });
+    expect(result).toEqual(2n ** 10n);
+  });
+
+  it('pow_private(2, 10) returns 2^10 (private function calling utility)', async () => {
+    const { result } = await contractA.methods.pow_private(2n, 10).simulate({ from: defaultAccountAddress });
+    expect(result).toEqual(2n ** 10n);
+  });
+
+  it('denies cross-contract utility call from utility context by default', async () => {
+    await expect(
+      contractA.methods.delegate_pow_utility(contractB.address, 2n, 3n).simulate({ from: defaultAccountAddress }),
+    ).rejects.toThrow('Cross-contract utility call denied');
+  });
+
+  it('denies cross-contract utility call from private function by default', async () => {
+    await expect(
+      contractA.methods.delegate_pow_private(contractB.address, 2n, 3n).simulate({ from: defaultAccountAddress }),
+    ).rejects.toThrow('Cross-contract utility call denied');
+  });
+});
+
+describe('authorizeUtilityCall hook', () => {
+  let contractA: NestedUtilityContract;
+  let contractB: NestedUtilityContract;
+  let wallet: Wallet;
+  let defaultAccountAddress: AztecAddress;
+  let teardown: () => Promise<void>;
+  jest.setTimeout(TIMEOUT);
+
+  let hookAllows = false;
+  let lastRequest: UtilityCallAuthorizationRequest | undefined;
+
+  beforeAll(async () => {
+    ({
+      teardown,
+      wallet,
+      accounts: [defaultAccountAddress],
+    } = await setup(1, {
+      pxeCreationOptions: {
+        hooks: {
+          authorizeUtilityCall: (req: UtilityCallAuthorizationRequest) => {
+            lastRequest = req;
+            return Promise.resolve({ authorized: hookAllows });
+          },
+        },
+      },
+    }));
+
+    ({ contract: contractA } = await NestedUtilityContract.deploy(wallet).send({ from: defaultAccountAddress }));
+    ({ contract: contractB } = await NestedUtilityContract.deploy(wallet).send({ from: defaultAccountAddress }));
+  });
+
+  afterAll(() => teardown());
+
+  beforeEach(() => {
+    hookAllows = false;
+    lastRequest = undefined;
+  });
+
+  it('denies cross-contract utility call from utility context when hook returns false', async () => {
+    await expect(
+      contractA.methods.delegate_pow_utility(contractB.address, 2n, 3n).simulate({ from: defaultAccountAddress }),
+    ).rejects.toThrow('Cross-contract utility call denied');
+    expect(lastRequest).toMatchObject({
+      caller: contractA.address,
+      target: contractB.address,
+      functionSelector: contractB.methods.pow_utility.selector(),
+      functionName: 'pow_utility',
+      callerContext: 'utility',
+    });
+  });
+
+  it('allows cross-contract utility call from utility context when hook returns true', async () => {
+    hookAllows = true;
+    const { result } = await contractA.methods
+      .delegate_pow_utility(contractB.address, 2n, 3n)
+      .simulate({ from: defaultAccountAddress });
+    expect(result).toEqual(8n); // 2^3
+    expect(lastRequest).toMatchObject({
+      caller: contractA.address,
+      target: contractB.address,
+      functionSelector: contractB.methods.pow_utility.selector(),
+      functionName: 'pow_utility',
+      callerContext: 'utility',
+    });
+  });
+
+  it('denies cross-contract utility call from private function when hook returns false', async () => {
+    await expect(
+      contractA.methods.delegate_pow_private(contractB.address, 2n, 3n).simulate({ from: defaultAccountAddress }),
+    ).rejects.toThrow('Cross-contract utility call denied');
+    expect(lastRequest).toMatchObject({
+      caller: contractA.address,
+      target: contractB.address,
+      functionSelector: contractB.methods.pow_utility.selector(),
+      functionName: 'pow_utility',
+      callerContext: 'private',
+    });
+  });
+
+  it('allows cross-contract utility call from private function when hook returns true', async () => {
+    hookAllows = true;
+    const { result } = await contractA.methods
+      .delegate_pow_private(contractB.address, 2n, 3n)
+      .simulate({ from: defaultAccountAddress });
+    expect(result).toEqual(8n); // 2^3
+    expect(lastRequest).toMatchObject({
+      caller: contractA.address,
+      target: contractB.address,
+      functionSelector: contractB.methods.pow_utility.selector(),
+      functionName: 'pow_utility',
+      callerContext: 'private',
+    });
+  });
+});
diff --git a/yarn-project/end-to-end/src/e2e_p2p/fee_asset_price_oracle_gossip.test.ts b/yarn-project/end-to-end/src/e2e_p2p/fee_asset_price_oracle_gossip.test.ts
index 45cb7db1756f..626b9f80da92 100644
--- a/yarn-project/end-to-end/src/e2e_p2p/fee_asset_price_oracle_gossip.test.ts
+++ b/yarn-project/end-to-end/src/e2e_p2p/fee_asset_price_oracle_gossip.test.ts
@@ -185,7 +185,11 @@ describe('e2e_p2p_network', () => {
       120,
       1,
     );
-    const payload = ConsensusPayload.fromCheckpoint(publishedCheckpoint.checkpoint);
+    const signatureContext = {
+      chainId: t.ctx.aztecNodeConfig.l1ChainId,
+      rollupAddress: t.ctx.deployL1ContractsValues.l1ContractAddresses.rollupAddress,
+    };
+    const payload = ConsensusPayload.fromCheckpoint(publishedCheckpoint.checkpoint, signatureContext);
     const attestations = publishedCheckpoint.attestations
       .filter(a => !a.signature.isEmpty())
       .map(a => new CheckpointAttestation(payload, a.signature, Signature.empty()));
diff --git a/yarn-project/end-to-end/src/e2e_p2p/gossip_network.test.ts b/yarn-project/end-to-end/src/e2e_p2p/gossip_network.test.ts
index 7cc1cfb7effa..7cedb449aa54 100644
--- a/yarn-project/end-to-end/src/e2e_p2p/gossip_network.test.ts
+++ b/yarn-project/end-to-end/src/e2e_p2p/gossip_network.test.ts
@@ -2,6 +2,7 @@ import type { Archiver } from '@aztec/archiver';
 import type { AztecNodeConfig, AztecNodeService } from '@aztec/aztec-node';
 import { waitForTx } from '@aztec/aztec.js/node';
 import { TxHash } from '@aztec/aztec.js/tx';
+import { BlockNumber } from '@aztec/foundation/branded-types';
 import { Signature } from '@aztec/foundation/eth-signature';
 import { retryUntil } from '@aztec/foundation/retry';
 import type { SequencerClient } from '@aztec/sequencer-client';
@@ -186,9 +187,13 @@ describe('e2e_p2p_network', () => {
     const receipt = await nodes[0].getTxReceipt(txsSentViaDifferentNodes[0][0]);
     const blockNumber = receipt.blockNumber!;
     const dataStore = (nodes[0] as AztecNodeService).getBlockSource() as Archiver;
-    const checkpointedBlock = await dataStore.getCheckpointedBlock(blockNumber);
-    const [publishedCheckpoint] = await dataStore.getCheckpoints(checkpointedBlock!.checkpointNumber, 1);
-    const payload = ConsensusPayload.fromCheckpoint(publishedCheckpoint.checkpoint);
+    const blockData = await dataStore.getBlockData({ number: BlockNumber(blockNumber) });
+    const [publishedCheckpoint] = await dataStore.getCheckpoints(blockData!.checkpointNumber, 1);
+    const signatureContext = {
+      chainId: t.ctx.aztecNodeConfig.l1ChainId,
+      rollupAddress: t.ctx.deployL1ContractsValues.l1ContractAddresses.rollupAddress,
+    };
+    const payload = ConsensusPayload.fromCheckpoint(publishedCheckpoint.checkpoint, signatureContext);
     const attestations = publishedCheckpoint.attestations
       .filter(a => !a.signature.isEmpty())
       .map(a => new CheckpointAttestation(payload, a.signature, Signature.empty()));
@@ -207,7 +212,7 @@ describe('e2e_p2p_network', () => {
     // Ensure prover node did its job and collected txs from p2p
     await retryUntil(
       async () => {
-        const provenBlock = await nodes[0].getProvenBlockNumber();
+        const provenBlock = await nodes[0].getBlockNumber('proven');
         return provenBlock > 0;
       },
       'proven block',
diff --git a/yarn-project/end-to-end/src/e2e_p2p/gossip_network_no_cheat.test.ts b/yarn-project/end-to-end/src/e2e_p2p/gossip_network_no_cheat.test.ts
index 2534d4dfafb9..5dc5504822ca 100644
--- a/yarn-project/end-to-end/src/e2e_p2p/gossip_network_no_cheat.test.ts
+++ b/yarn-project/end-to-end/src/e2e_p2p/gossip_network_no_cheat.test.ts
@@ -6,7 +6,7 @@ import { waitForTx } from '@aztec/aztec.js/node';
 import { TxHash } from '@aztec/aztec.js/tx';
 import { addL1Validator } from '@aztec/cli/l1/validators';
 import { RollupContract } from '@aztec/ethereum/contracts';
-import { EpochNumber } from '@aztec/foundation/branded-types';
+import { BlockNumber, EpochNumber } from '@aztec/foundation/branded-types';
 import { Signature } from '@aztec/foundation/eth-signature';
 import { retryUntil } from '@aztec/foundation/retry';
 import { sleep } from '@aztec/foundation/sleep';
@@ -206,7 +206,11 @@ describe('e2e_p2p_network', () => {
     // validator committee. If we submit txs before a checkpoint lands on L1, a failed checkpoint
     // publish can prune locally-proposed blocks, causing txs to reference pruned block headers.
     t.logger.info('Waiting for first checkpoint to be published');
-    await retryUntil(async () => (await nodes[0].getCheckpointedBlockNumber()) > 0, 'first checkpoint published', 120);
+    await retryUntil(
+      async () => (await nodes[0].getBlockNumber('checkpointed')) > 0,
+      'first checkpoint published',
+      120,
+    );
     t.logger.info('First checkpoint published');
 
     // We need to `createNodes` before we setup account, because
@@ -242,9 +246,13 @@ describe('e2e_p2p_network', () => {
     // Gather signers from attestations downloaded from L1
     const blockNumber = await nodes[0].getTxReceipt(txsSentViaDifferentNodes[0][0]).then(r => r.blockNumber!);
     const dataStore = (nodes[0] as AztecNodeService).getBlockSource() as Archiver;
-    const checkpointedBlock = await dataStore.getCheckpointedBlock(blockNumber);
-    const [publishedCheckpoint] = await dataStore.getCheckpoints(checkpointedBlock!.checkpointNumber, 1);
-    const payload = ConsensusPayload.fromCheckpoint(publishedCheckpoint.checkpoint);
+    const blockData = await dataStore.getBlockData({ number: BlockNumber(blockNumber) });
+    const [publishedCheckpoint] = await dataStore.getCheckpoints(blockData!.checkpointNumber, 1);
+    const signatureContext = {
+      chainId: t.ctx.aztecNodeConfig.l1ChainId,
+      rollupAddress: t.ctx.deployL1ContractsValues.l1ContractAddresses.rollupAddress,
+    };
+    const payload = ConsensusPayload.fromCheckpoint(publishedCheckpoint.checkpoint, signatureContext);
     const attestations = publishedCheckpoint.attestations
       .filter(a => !a.signature.isEmpty())
       .map(a => new CheckpointAttestation(payload, a.signature, Signature.empty()));
diff --git a/yarn-project/end-to-end/src/e2e_p2p/preferred_gossip_network.test.ts b/yarn-project/end-to-end/src/e2e_p2p/preferred_gossip_network.test.ts
index 49f68546e618..7e13b565cf65 100644
--- a/yarn-project/end-to-end/src/e2e_p2p/preferred_gossip_network.test.ts
+++ b/yarn-project/end-to-end/src/e2e_p2p/preferred_gossip_network.test.ts
@@ -2,6 +2,7 @@ import type { Archiver } from '@aztec/archiver';
 import type { AztecNodeConfig, AztecNodeService } from '@aztec/aztec-node';
 import { waitForTx } from '@aztec/aztec.js/node';
 import { TxHash } from '@aztec/aztec.js/tx';
+import { BlockNumber } from '@aztec/foundation/branded-types';
 import { Signature } from '@aztec/foundation/eth-signature';
 import { retryUntil } from '@aztec/foundation/retry';
 import { ENR, type P2PClient, type P2PService, type PeerId } from '@aztec/p2p';
@@ -355,9 +356,13 @@ describe('e2e_p2p_preferred_network', () => {
     // Gather signers from attestations downloaded from L1
     const blockNumber = receipts[0].blockNumber!;
     const dataStore = (nodes[0] as AztecNodeService).getBlockSource() as Archiver;
-    const checkpointedBlock = await dataStore.getCheckpointedBlock(blockNumber);
-    const [publishedCheckpoint] = await dataStore.getCheckpoints(checkpointedBlock!.checkpointNumber, 1);
-    const payload = ConsensusPayload.fromCheckpoint(publishedCheckpoint.checkpoint);
+    const blockData = await dataStore.getBlockData({ number: BlockNumber(blockNumber) });
+    const [publishedCheckpoint] = await dataStore.getCheckpoints(blockData!.checkpointNumber, 1);
+    const signatureContext = {
+      chainId: t.ctx.aztecNodeConfig.l1ChainId,
+      rollupAddress: t.ctx.deployL1ContractsValues.l1ContractAddresses.rollupAddress,
+    };
+    const payload = ConsensusPayload.fromCheckpoint(publishedCheckpoint.checkpoint, signatureContext);
     const attestations = publishedCheckpoint.attestations
       .filter(a => !a.signature.isEmpty())
       .map(a => new CheckpointAttestation(payload, a.signature, Signature.empty()));
diff --git a/yarn-project/end-to-end/src/e2e_p2p/reex.test.ts b/yarn-project/end-to-end/src/e2e_p2p/reex.test.ts
index b82db05ed56f..47f81edb57d4 100644
--- a/yarn-project/end-to-end/src/e2e_p2p/reex.test.ts
+++ b/yarn-project/end-to-end/src/e2e_p2p/reex.test.ts
@@ -129,6 +129,10 @@ describe('e2e_p2p_reex', () => {
       jest.spyOn(p2pClient, 'broadcastProposal').mockImplementation(async (...args: unknown[]) => {
         // We remove one of the transactions, therefore the block root will be different!
         const proposal = args[0] as BlockProposal;
+        const signatureContext = {
+          chainId: t.ctx.aztecNodeConfig.l1ChainId,
+          rollupAddress: t.ctx.deployL1ContractsValues.l1ContractAddresses.rollupAddress,
+        };
         const proposerAddress = proposal.getSender();
         const txHashes = proposal.txHashes;
 
@@ -146,7 +150,8 @@ describe('e2e_p2p_reex', () => {
           proposal.archiveRoot,
           proposal.txHashes,
           undefined,
-          (payload, context) => signer.signMessageWithAddress(proposerAddress!, payload, context),
+          signatureContext,
+          (typedData, context) => signer.signTypedDataWithAddress(proposerAddress!, typedData, context),
         );
 
         const p2pService = (p2pClient as any).p2pService as LibP2PService;
diff --git a/yarn-project/end-to-end/src/e2e_p2p/reqresp/utils.ts b/yarn-project/end-to-end/src/e2e_p2p/reqresp/utils.ts
index 8472e9bf2f31..71f440695add 100644
--- a/yarn-project/end-to-end/src/e2e_p2p/reqresp/utils.ts
+++ b/yarn-project/end-to-end/src/e2e_p2p/reqresp/utils.ts
@@ -194,8 +194,8 @@ export async function runReqrespTxTest(params: {
   // Wait for L1 checkpoint sync, which may lag behind P2P block propagation.
   const checkpoints = await retryUntil(
     async () => {
-      const cps = await nodes[0].getCheckpoints(CheckpointNumber(1), 50);
-      return cps.length > 0 && cps.some(cp => cp.checkpoint.blocks.length >= 2) ? cps : undefined;
+      const cps = await nodes[0].getCheckpoints(CheckpointNumber(1), 50, { includeBlocks: true });
+      return cps.length > 0 && cps.some(cp => (cp.blocks?.length ?? 0) >= 2) ? cps : undefined;
     },
     'waiting for multi-block checkpoint to sync from L1',
     30,
@@ -203,16 +203,17 @@ export async function runReqrespTxTest(params: {
   );
 
   let mbpsFound = false;
-  let expectedBlockNumber = checkpoints[0].checkpoint.blocks[0].number;
+  let expectedBlockNumber = checkpoints[0].blocks![0].number;
 
   for (const published of checkpoints) {
-    const blockCount = published.checkpoint.blocks.length;
+    const blocks = published.blocks!;
+    const blockCount = blocks.length;
     mbpsFound = mbpsFound || blockCount >= 2;
 
     for (let i = 0; i < blockCount; i++) {
-      const block = published.checkpoint.blocks[i];
+      const block = blocks[i];
       expect(block.indexWithinCheckpoint).toBe(i);
-      expect(block.checkpointNumber).toBe(published.checkpoint.number);
+      expect(block.checkpointNumber).toBe(published.number);
       expect(block.number).toBe(expectedBlockNumber);
       expectedBlockNumber++;
     }
diff --git a/yarn-project/end-to-end/src/e2e_pending_note_hashes_contract.test.ts b/yarn-project/end-to-end/src/e2e_pending_note_hashes_contract.test.ts
index e69a176d72e7..05e3086eccda 100644
--- a/yarn-project/end-to-end/src/e2e_pending_note_hashes_contract.test.ts
+++ b/yarn-project/end-to-end/src/e2e_pending_note_hashes_contract.test.ts
@@ -35,7 +35,7 @@ describe('e2e_pending_note_hashes_contract', () => {
 
   const expectNoteHashesSquashedExcept = async (exceptFirstFew: number) => {
     const blockNum = await aztecNode.getBlockNumber();
-    const block = (await aztecNode.getBlocks(blockNum, 1))[0];
+    const block = (await aztecNode.getBlocks(blockNum, 1, { includeTransactions: true }))[0];
 
     const noteHashes = block.body.txEffects.flatMap(txEffect => txEffect.noteHashes);
 
@@ -51,7 +51,7 @@ describe('e2e_pending_note_hashes_contract', () => {
 
   const expectNullifiersSquashedExcept = async (exceptFirstFew: number) => {
     const blockNum = await aztecNode.getBlockNumber();
-    const block = (await aztecNode.getBlocks(blockNum, 1))[0];
+    const block = (await aztecNode.getBlocks(blockNum, 1, { includeTransactions: true }))[0];
 
     const nullifierArray = block.body.txEffects.flatMap(txEffect => txEffect.nullifiers);
 
@@ -67,7 +67,7 @@ describe('e2e_pending_note_hashes_contract', () => {
 
   const expectNoteLogsSquashedExcept = async (exceptFirstFew: number) => {
     const blockNum = await aztecNode.getBlockNumber();
-    const block = (await aztecNode.getBlocks(blockNum, 1))[0];
+    const block = (await aztecNode.getBlocks(blockNum, 1, { includeTransactions: true }))[0];
 
     const privateLogs = block.body.txEffects.flatMap(txEffect => txEffect.privateLogs);
     expect(privateLogs.length).toBe(exceptFirstFew);
diff --git a/yarn-project/end-to-end/src/e2e_phase_check.test.ts b/yarn-project/end-to-end/src/e2e_phase_check.test.ts
index 581611cbbd71..793368f9c582 100644
--- a/yarn-project/end-to-end/src/e2e_phase_check.test.ts
+++ b/yarn-project/end-to-end/src/e2e_phase_check.test.ts
@@ -36,9 +36,10 @@ describe('Phase check', () => {
     } = await setup(1, { genesisPublicData: [genesisBalanceEntry] }));
 
     ({ contract } = await TestContract.deploy(wallet).send({ from: defaultAccountAddress }));
-    sponsoredFPC = await SponsoredFPCNoEndSetupContract.deploy(wallet).register({
-      contractAddressSalt: new Fr(SPONSORED_FPC_SALT),
-    });
+    sponsoredFPC = await SponsoredFPCNoEndSetupContract.deploy(wallet, {
+      salt: new Fr(SPONSORED_FPC_SALT),
+      universalDeploy: true,
+    }).register();
 
     // If the below fails, the registration parameters are different than the instance generation parameters that we used for funding the address.
     expect(sponsorInstance.address).toEqual(sponsoredFPC.address);
diff --git a/yarn-project/end-to-end/src/e2e_prover/full.test.ts b/yarn-project/end-to-end/src/e2e_prover/full.test.ts
index 7d70a5b443d2..0afaf59aac08 100644
--- a/yarn-project/end-to-end/src/e2e_prover/full.test.ts
+++ b/yarn-project/end-to-end/src/e2e_prover/full.test.ts
@@ -161,10 +161,11 @@ describe('full_prover', () => {
       const publishedCheckpoints = await t.aztecNode.getCheckpoints(
         CheckpointNumber(Number(oldProvenCheckpointNumber) + 1),
         numCheckpointsProven,
+        { includeBlocks: true },
       );
 
       // Extract all blocks from all proven checkpoints
-      const allBlocks = publishedCheckpoints.flatMap(pc => pc.checkpoint.blocks);
+      const allBlocks = publishedCheckpoints.flatMap(pc => pc.blocks!);
       const fees = allBlocks.map(b => b.header.totalFees.toBigInt());
 
       const totalRewards = fees.map(fee => fee + reward).reduce((acc, reward) => acc + reward, 0n);
diff --git a/yarn-project/end-to-end/src/e2e_public_testnet/e2e_public_testnet_transfer.test.ts b/yarn-project/end-to-end/src/e2e_public_testnet/e2e_public_testnet_transfer.test.ts
index 551304e259bd..bf507e00cbe2 100644
--- a/yarn-project/end-to-end/src/e2e_public_testnet/e2e_public_testnet_transfer.test.ts
+++ b/yarn-project/end-to-end/src/e2e_public_testnet/e2e_public_testnet_transfer.test.ts
@@ -52,19 +52,16 @@ describe(`deploys and transfers a private only token`, () => {
     const tokenSecretKey = Fr.random();
     const tokenPublicKeys = (await deriveKeys(tokenSecretKey)).publicKeys;
 
-    const tokenDeployment = PrivateTokenContract.deployWithPublicKeys(
-      tokenPublicKeys,
-      wallet,
-      initialBalance,
-      deployerAddress,
-    );
+    const tokenDeployment = PrivateTokenContract.deploy(wallet, initialBalance, deployerAddress, {
+      universalDeploy: true,
+      publicKeys: tokenPublicKeys,
+    });
     const tokenInstance = await tokenDeployment.getInstance();
     await wallet.registerContract(tokenInstance, PrivateTokenContract.artifact, tokenSecretKey);
     const { contract: token } = await tokenDeployment.send({
       from: deployerAddress,
       // The contract constructor initializes private storage vars that need the contract's own nullifier key.
       additionalScopes: [tokenInstance.address],
-      universalDeploy: true,
       skipInstancePublication: true,
       skipClassPublication: true,
       skipInitialization: false,
diff --git a/yarn-project/end-to-end/src/e2e_sequencer/reload_keystore.test.ts b/yarn-project/end-to-end/src/e2e_sequencer/reload_keystore.test.ts
index d846716b0384..30e71f924153 100644
--- a/yarn-project/end-to-end/src/e2e_sequencer/reload_keystore.test.ts
+++ b/yarn-project/end-to-end/src/e2e_sequencer/reload_keystore.test.ts
@@ -130,11 +130,9 @@ describe('e2e_reload_keystore', () => {
 
     // Send a tx and verify the block uses the initial coinbase
     const deployer = new ContractDeployer(artifact, wallet);
-    const { txHash: sentTx1 } = await deployer.deploy(ownerAddress, 1).send({
-      from: ownerAddress,
-      contractAddressSalt: new Fr(1),
-      wait: NO_WAIT,
-    });
+    const { txHash: sentTx1 } = await deployer
+      .deploy([ownerAddress, 1], { salt: new Fr(1) })
+      .send({ from: ownerAddress, wait: NO_WAIT });
     const receipt1 = await waitForTx(aztecNode, sentTx1);
 
     const block1 = await aztecNode.getBlock(BlockNumber(receipt1.blockNumber!));
@@ -195,11 +193,9 @@ describe('e2e_reload_keystore', () => {
     // Whichever validator is the proposer, its coinbase must be from the reloaded keystore.
     const allNewCoinbasesLower = newCoinbases.map(c => c.toString().toLowerCase());
 
-    const { txHash: sentTx2 } = await deployer.deploy(ownerAddress, 2).send({
-      from: ownerAddress,
-      contractAddressSalt: new Fr(2),
-      wait: NO_WAIT,
-    });
+    const { txHash: sentTx2 } = await deployer
+      .deploy([ownerAddress, 2], { salt: new Fr(2) })
+      .send({ from: ownerAddress, wait: NO_WAIT });
     const receipt2 = await waitForTx(aztecNode, sentTx2);
 
     const block2 = await aztecNode.getBlock(BlockNumber(receipt2.blockNumber!));
diff --git a/yarn-project/end-to-end/src/e2e_simple.test.ts b/yarn-project/end-to-end/src/e2e_simple.test.ts
index afee9d9dbd92..c235a1c892d0 100644
--- a/yarn-project/end-to-end/src/e2e_simple.test.ts
+++ b/yarn-project/end-to-end/src/e2e_simple.test.ts
@@ -56,25 +56,22 @@ describe('e2e_simple', () => {
       const initialHeader = await aztecNode.getBlockHeader(BlockNumber.ZERO);
       expect(initialHeader).toBeDefined();
       const initialHeaderHash = await initialHeader!.hash();
-      const initialBlockByHash = await aztecNode.getBlock(initialHeaderHash);
+      const initialBlockByHash = await aztecNode.getBlock(initialHeaderHash, { includeTransactions: true });
       expect(initialBlockByHash).toBeDefined();
-      const initialBlockHash = await initialBlockByHash!.hash();
-      expect(initialBlockHash.equals(initialHeaderHash)).toBeTrue();
-      expect(initialBlockByHash?.body.txEffects.length).toBe(0);
-      const initialBlockByNumber = await aztecNode.getBlock(BlockNumber.ZERO);
+      expect(initialBlockByHash!.hash.equals(initialHeaderHash)).toBeTrue();
+      expect(initialBlockByHash!.body.txEffects.length).toBe(0);
+      const initialBlockByNumber = await aztecNode.getBlock(BlockNumber.ZERO, { includeTransactions: true });
       expect(initialBlockByNumber).toBeDefined();
-      const initialBlockByNumberHash = await initialBlockByNumber!.hash();
-      expect(initialBlockByNumberHash.equals(initialHeaderHash)).toBeTrue();
-      expect(initialBlockByNumber?.body.txEffects.length).toBe(0);
+      expect(initialBlockByNumber!.hash.equals(initialHeaderHash)).toBeTrue();
+      expect(initialBlockByNumber!.body.txEffects.length).toBe(0);
     });
 
     it('deploys a contract', async () => {
       const deployer = new ContractDeployer(artifact, wallet);
 
-      const { receipt: txReceipt } = await deployer.deploy(ownerAddress, 1).send({
-        from: ownerAddress,
-        contractAddressSalt: new Fr(BigInt(1)),
-      });
+      const { receipt: txReceipt } = await deployer
+        .deploy([ownerAddress, 1], { salt: new Fr(BigInt(1)) })
+        .send({ from: ownerAddress });
       await waitForProven(aztecNode, txReceipt, {
         provenTimeout: (config.aztecProofSubmissionEpochs + 1) * config.aztecEpochDuration * config.aztecSlotDuration,
       });
diff --git a/yarn-project/end-to-end/src/e2e_snapshot_sync.test.ts b/yarn-project/end-to-end/src/e2e_snapshot_sync.test.ts
index 75a0597f34c7..818423f7b621 100644
--- a/yarn-project/end-to-end/src/e2e_snapshot_sync.test.ts
+++ b/yarn-project/end-to-end/src/e2e_snapshot_sync.test.ts
@@ -99,7 +99,7 @@ describe('e2e_snapshot_sync', () => {
 
     const block = await node.getBlock(BlockNumber(L2_TARGET_BLOCK_NUM));
     expect(block).toBeDefined();
-    const blockHash = await block!.hash();
+    const blockHash = block!.hash;
 
     log.warn(`Checking for L2 block ${L2_TARGET_BLOCK_NUM} with hash ${blockHash} on both nodes`);
     const getBlockHashLeafIndex = (node: AztecNode) =>
@@ -205,7 +205,7 @@ describe('e2e_snapshot_sync', () => {
 
     const block = await node.getBlock(BlockNumber(L2_TARGET_BLOCK_NUM));
     expect(block).toBeDefined();
-    const blockHash = await block!.hash();
+    const blockHash = block!.hash;
 
     log.warn(`Checking for L2 block ${L2_TARGET_BLOCK_NUM} with hash ${blockHash} on both nodes`);
     const getBlockHashLeafIndex = (node: AztecNode) =>
diff --git a/yarn-project/end-to-end/src/e2e_synching.test.ts b/yarn-project/end-to-end/src/e2e_synching.test.ts
index d18a36e7b742..0ac2cfc8e6de 100644
--- a/yarn-project/end-to-end/src/e2e_synching.test.ts
+++ b/yarn-project/end-to-end/src/e2e_synching.test.ts
@@ -57,10 +57,10 @@ import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { SpamContract } from '@aztec/noir-test-contracts.js/Spam';
 import { SequencerPublisher, SequencerPublisherMetrics } from '@aztec/sequencer-client';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { CommitteeAttestationsAndSigners } from '@aztec/stdlib/block';
+import { CommitteeAttestationsAndSigners, L2Block } from '@aztec/stdlib/block';
 import { Checkpoint } from '@aztec/stdlib/checkpoint';
 import { tryStop } from '@aztec/stdlib/interfaces/server';
-import { createWorldStateSynchronizer } from '@aztec/world-state';
+import { createWorldState, createWorldStateSynchronizer } from '@aztec/world-state';
 
 import * as fs from 'fs';
 import { type MockProxy, mock } from 'jest-mock-extended';
@@ -379,8 +379,20 @@ describe('e2e_synching', () => {
       }
 
       const blockNumber = await aztecNode.getBlockNumber();
-      const publishedCheckpoints = await aztecNode.getCheckpoints(CheckpointNumber(1), blockNumber);
-      const checkpoints = publishedCheckpoints.map(pc => pc.checkpoint);
+      const checkpointResponses = await aztecNode.getCheckpoints(CheckpointNumber(1), blockNumber, {
+        includeBlocks: true,
+        includeTransactions: true,
+      });
+      const checkpoints = checkpointResponses.map(
+        cr =>
+          new Checkpoint(
+            cr.archive,
+            cr.header,
+            cr.blocks!.map(b => new L2Block(b.archive, b.header, b.body!, b.checkpointNumber, b.indexWithinCheckpoint)),
+            cr.number,
+            cr.feeAssetPriceModifier,
+          ),
+      );
 
       await variant.writeCheckpoints(checkpoints);
       await teardown();
@@ -465,7 +477,14 @@ describe('e2e_synching', () => {
         await cheatCodes.eth.mine();
       }
       // If it breaks here, first place you should look is the pruning.
-      await publisher.enqueueProposeCheckpoint(checkpoint, CommitteeAttestationsAndSigners.empty(), Signature.empty());
+      await publisher.enqueueProposeCheckpoint(
+        checkpoint,
+        CommitteeAttestationsAndSigners.empty({
+          chainId: 31337,
+          rollupAddress: deployL1ContractsValues.l1ContractAddresses.rollupAddress,
+        }),
+        Signature.empty(),
+      );
 
       await cheatCodes.rollup.markAsProven(CheckpointNumber(provenThrough));
     }
@@ -576,14 +595,19 @@ describe('e2e_synching', () => {
             opts.config!,
             createLogger('test:blob-client:client'),
           );
+          const nativeWs = await createWorldState(opts.config!, opts.genesis);
+          const initialHeader = nativeWs.getInitialHeader();
+          const initialBlockHash = await initialHeader.hash();
           const archiver = await createArchiver(
             opts.config!,
             { blobClient, dateProvider: opts.dateProvider! },
             { blockUntilSync: true },
+            initialHeader,
+            initialBlockHash,
           );
           const pendingCheckpointNumber = CheckpointNumber.fromBigInt(await rollup.read.getPendingCheckpointNumber());
 
-          const worldState = await createWorldStateSynchronizer(opts.config!, archiver, opts.genesis);
+          const worldState = await createWorldStateSynchronizer(opts.config!, archiver, nativeWs);
           await worldState.start();
 
           // We prune the last token and schnorr contract
@@ -597,7 +621,7 @@ describe('e2e_synching', () => {
           await opts.cheatCodes!.eth.warp(Number(timeJumpTo), { resetBlockInterval: true });
 
           expect(await archiver.getCheckpointNumber()).toBeGreaterThan(provenThrough);
-          const blockTip = (await archiver.getBlock(await archiver.getBlockNumber()))!;
+          const blockTip = (await archiver.getBlock({ number: await archiver.getBlockNumber() }))!;
           const txHash = blockTip.body.txEffects[0].txHash;
 
           const contractClassIds = await archiver.getContractClassIds();
diff --git a/yarn-project/end-to-end/src/fixtures/setup.ts b/yarn-project/end-to-end/src/fixtures/setup.ts
index 21535e00cf4d..db1e0154288a 100644
--- a/yarn-project/end-to-end/src/fixtures/setup.ts
+++ b/yarn-project/end-to-end/src/fixtures/setup.ts
@@ -7,8 +7,8 @@ import {
   BatchCall,
   type ContractFunctionInteraction,
   type ContractMethod,
-  type DeployInteractionWaitOptions,
   type DeployOptions,
+  type InteractionWaitOptions,
   getContractClassFromArtifact,
   waitForProven,
 } from '@aztec/aztec.js/contracts';
@@ -48,8 +48,9 @@ import type { P2PClientDeps } from '@aztec/p2p';
 import { MockGossipSubNetwork, getMockPubSubP2PServiceFactory } from '@aztec/p2p/test-helpers';
 import { protocolContractsHash } from '@aztec/protocol-contracts';
 import type { ProverNodeConfig } from '@aztec/prover-node';
-import { type PXEConfig, getPXEConfig } from '@aztec/pxe/server';
+import { type PXEConfig, type PXECreationOptions, getPXEConfig } from '@aztec/pxe/server';
 import type { SequencerClient } from '@aztec/sequencer-client';
+import { ARTIFACT_VERSION_BEFORE_INJECTION } from '@aztec/stdlib/abi';
 import { type ContractInstanceWithAddress, getContractInstanceFromInstantiationParams } from '@aztec/stdlib/contract';
 import type { AztecNodeAdmin, AztecNodeDebug } from '@aztec/stdlib/interfaces/client';
 import { tryStop } from '@aztec/stdlib/interfaces/server';
@@ -212,6 +213,8 @@ export type SetupOptions = {
   /** Whether the initial node should be a lightweight RPC-only node (no sequencer, no validator).
    *  Use for tests that create their own validator nodes and don't need the initial sequencer. */
   skipInitialSequencer?: boolean;
+  /** Options forwarded to PXE creation (e.g. execution hooks). */
+  pxeCreationOptions?: PXECreationOptions;
 } & Partial<AztecNodeConfig>;
 
 /** Context for an end-to-end test as returned by the `setup` function */
@@ -270,6 +273,32 @@ export type EndToEndContext = {
   teardown: () => Promise<void>;
 };
 
+/**
+ * When CONTRACT_ARTIFACTS_VERSION is set (backwards compatibility testing), asserts that the loaded artifact's
+ * aztecVersion matches the expected version. This is a sanity check verifying that the legacy artifact resolver
+ * actually swapped in the correct version.
+ */
+function assertContractArtifactsVersion() {
+  const expected = process.env.CONTRACT_ARTIFACTS_VERSION;
+  if (!expected) {
+    return;
+  }
+  const { aztecVersion } = SponsoredFPCContract.artifact;
+  // TODO(F-557): Remove this bypass once pre-version artifacts are no longer tested.
+  if (aztecVersion === ARTIFACT_VERSION_BEFORE_INJECTION) {
+    createLogger('e2e:setup').info(
+      `Skipping artifact version check: artifact predates version injection (CONTRACT_ARTIFACTS_VERSION=${expected})`,
+    );
+    return;
+  }
+  if (aztecVersion !== expected) {
+    throw new Error(
+      `Artifact version mismatch: expected ${expected} but got ${aztecVersion}. ` +
+        `The legacy artifact resolver may not have swapped in the correct version.`,
+    );
+  }
+}
+
 /**
  * Sets up the environment for the end-to-end tests.
  * @param numberOfAccounts - The number of new accounts to be created once the PXE is initiated.
@@ -282,6 +311,7 @@ export async function setup(
   pxeOpts: Partial<PXEConfig> = {},
   chain: Chain = foundry,
 ): Promise<EndToEndContext> {
+  assertContractArtifactsVersion();
   let anvil: Anvil | undefined;
   try {
     opts.aztecTargetCommitteeSize ??= 0;
@@ -559,7 +589,10 @@ export async function setup(
     pxeConfig.dataDirectory = path.join(directoryToCleanup, randomBytes(8).toString('hex'));
     // For tests we only want proving enabled if specifically requested
     pxeConfig.proverEnabled = !!pxeOpts.proverEnabled;
-    const wallet = await TestWallet.create(aztecNodeService, pxeConfig, { loggerActorLabel: 'pxe-0' });
+    const wallet = await TestWallet.create(aztecNodeService, pxeConfig, {
+      loggerActorLabel: 'pxe-0',
+      ...opts.pxeCreationOptions,
+    });
 
     if (opts.walletMinFeePadding !== undefined) {
       wallet.setMinFeePadding(opts.walletMinFeePadding);
@@ -734,7 +767,7 @@ export async function waitForProvenChain(node: AztecNode, targetBlock?: BlockNum
   targetBlock ??= await node.getBlockNumber();
 
   await retryUntil(
-    async () => (await node.getProvenBlockNumber()) >= targetBlock,
+    async () => (await node.getBlockNumber('proven')) >= targetBlock,
     'proven chain status',
     timeoutSec,
     intervalSec,
@@ -858,7 +891,7 @@ export async function ensureAccountContractsPublished(wallet: Wallet, accountsTo
  * Returns deployed account data that can be used by tests.
  */
 export const deployAccounts =
-  (numberOfAccounts: number, logger: Logger, deployOptions?: Partial<DeployOptions<DeployInteractionWaitOptions>>) =>
+  (numberOfAccounts: number, logger: Logger, deployOptions?: Partial<DeployOptions<InteractionWaitOptions>>) =>
   async ({ wallet, initialFundedAccounts }: { wallet: TestWallet; initialFundedAccounts: InitialAccountData[] }) => {
     if (initialFundedAccounts.length < numberOfAccounts) {
       throw new Error(`Cannot deploy more than ${initialFundedAccounts.length} initial accounts.`);
diff --git a/yarn-project/end-to-end/src/install_legacy_contracts.cjs b/yarn-project/end-to-end/src/install_legacy_contracts.cjs
new file mode 100755
index 000000000000..7166d4453f45
--- /dev/null
+++ b/yarn-project/end-to-end/src/install_legacy_contracts.cjs
@@ -0,0 +1,75 @@
+#!/usr/bin/env node
+// Installs pinned legacy @aztec/* contract-artifact packages into .legacy-contracts/<version>/.
+//
+// Called from two places:
+//   - bootstrap.sh ci-compat-e2e: pre-populates the cache on the host before hermetic test
+//     containers launch. The containers run with --net=none (see ci3/docker_isolate), so on-demand
+//     installs from inside them fail with EAI_AGAIN.
+//   - legacy-jest-resolver.cjs: on-demand install for local dev, where jest runs with network.
+//
+// Idempotent: no-op when all packages are already present.
+/* eslint-disable @typescript-eslint/no-require-imports */
+
+const path = require('path');
+const fs = require('fs');
+const { execFileSync } = require('child_process');
+
+const REDIRECTED = ['@aztec/noir-contracts.js', '@aztec/noir-test-contracts.js', '@aztec/accounts'];
+
+const e2eRoot = path.resolve(__dirname, '..');
+
+function cacheRoot(version) {
+  return path.join(e2eRoot, '.legacy-contracts', version);
+}
+
+function pkgJsonPath(version, pkg) {
+  return path.join(cacheRoot(version), 'node_modules', pkg, 'package.json');
+}
+
+function installLegacyContracts(version) {
+  if (!version) {
+    throw new Error('installLegacyContracts: version is required');
+  }
+  if (REDIRECTED.every(pkg => fs.existsSync(pkgJsonPath(version, pkg)))) {
+    return;
+  }
+
+  const cacheDir = cacheRoot(version);
+  fs.mkdirSync(cacheDir, { recursive: true });
+
+  // Seed a standalone package.json so `npm install --prefix` treats cacheRoot as its own project. Without this, npm
+  // walks up and finds the yarn-project workspace root, which breaks on `workspace:` protocol deps and risks
+  // clobbering the monorepo's node_modules.
+  const seed = path.join(cacheDir, 'package.json');
+  if (!fs.existsSync(seed)) {
+    fs.writeFileSync(seed, JSON.stringify({ name: 'legacy-contracts-cache', private: true }));
+  }
+
+  const specs = REDIRECTED.map(pkg => `${pkg}@${version}`);
+  process.stderr.write(`[legacy-contracts] installing ${specs.join(' ')} into ${cacheDir}\n`);
+  // --prefix: install into cacheRoot instead of cwd, so the cache is isolated from the monorepo.
+  // --no-save: don't write the installed packages back to the seeded package.json.
+  // --ignore-scripts: skip lifecycle scripts (preinstall/postinstall) of the legacy packages and their transitive
+  //   deps; we only want the files on disk, not to run any build steps.
+  // --legacy-peer-deps: tolerate peer-dependency mismatches between the pinned legacy @aztec/* graph and whatever
+  //   current versions npm would otherwise try to reconcile.
+  execFileSync(
+    'npm',
+    ['install', '--prefix', cacheDir, '--no-save', '--ignore-scripts', '--legacy-peer-deps', ...specs],
+    { stdio: 'inherit' },
+  );
+
+  // Verify versions on disk match the requested version.
+  for (const pkg of REDIRECTED) {
+    const onDisk = JSON.parse(fs.readFileSync(pkgJsonPath(version, pkg), 'utf8')).version;
+    if (onDisk !== version) {
+      throw new Error(`[legacy-contracts] ${pkg} on disk is ${onDisk}, expected ${version}`);
+    }
+  }
+}
+
+module.exports = { installLegacyContracts, REDIRECTED, cacheRoot };
+
+if (require.main === module) {
+  installLegacyContracts(process.argv[2]);
+}
diff --git a/yarn-project/end-to-end/src/legacy-jest-resolver.cjs b/yarn-project/end-to-end/src/legacy-jest-resolver.cjs
index b35bec4b0ae2..1cd980367032 100644
--- a/yarn-project/end-to-end/src/legacy-jest-resolver.cjs
+++ b/yarn-project/end-to-end/src/legacy-jest-resolver.cjs
@@ -8,63 +8,36 @@
 // would couple this test to a moving aztec.js surface and break at import time on unrelated breaking changes; we want
 // to fail only on actual artifact-compat regressions.
 //
-// The cache is populated on demand by running `npm install` into .legacy-contracts/<version>/.
+// Cache population lives in install_legacy_contracts.cjs — invoked lazily here for local dev, and eagerly
+// by bootstrap.sh ci-compat-e2e before hermetic test containers (which run with --net=none) launch.
+//
+// Missing artifacts: legacy version directories are immutable, so an artifact missing from the cache means the
+// contract was added after the pinned release — there's nothing to compat-test. Rather than failing or silently
+// falling back to the workspace artifact (which would turn the compat run into a regular e2e run that always
+// passes), we log the miss and exit the process cleanly with code 0. The test never runs, but the per-test CI
+// log captures the explanatory line so the reason is auditable. This keeps the change scoped to this resolver,
+// avoiding a new exit-code contract in the shared ci3 test runner.
 //
 // Activated by env var; passthrough otherwise.
 /* eslint-disable @typescript-eslint/no-require-imports */
 
 const path = require('path');
 const fs = require('fs');
-const { execSync } = require('child_process');
+const { installLegacyContracts, REDIRECTED, cacheRoot } = require('./install_legacy_contracts.cjs');
 
 const version = process.env.CONTRACT_ARTIFACTS_VERSION;
-const REDIRECTED = ['@aztec/noir-contracts.js', '@aztec/noir-test-contracts.js', '@aztec/accounts'];
-
-// Jest sets rootDir to <e2e>/src; this file lives there too.
-const e2eRoot = path.resolve(__dirname, '..');
-const cacheRoot = version ? path.join(e2eRoot, '.legacy-contracts', version) : null;
+const cacheDir = version ? cacheRoot(version) : null;
 
 function pkgJsonPath(name) {
-  return path.join(cacheRoot, 'node_modules', name, 'package.json');
-}
-
-function ensureCache() {
-  const missing = REDIRECTED.some(p => !fs.existsSync(pkgJsonPath(p)));
-  if (!missing) {
-    return;
-  }
-  fs.mkdirSync(cacheRoot, { recursive: true });
-  // Seed a standalone package.json so `npm install --prefix` treats cacheRoot as its own project. Without this, npm
-  // walks up and finds the yarn-project workspace root, which breaks on `workspace:` protocol deps and risks
-  // clobbering the monorepo's node_modules.
-  const seed = path.join(cacheRoot, 'package.json');
-  if (!fs.existsSync(seed)) {
-    fs.writeFileSync(seed, JSON.stringify({ name: 'legacy-contracts-cache', private: true }));
-  }
-
-  const specs = REDIRECTED.map(p => `${p}@${version}`).join(' ');
-  process.stderr.write(`[legacy-contracts] installing ${specs} into ${cacheRoot}\n`);
-  // --prefix: install into cacheRoot instead of cwd, so the cache is isolated from the monorepo.
-  // --no-save: don't write the installed packages back to the seeded package.json.
-  // --ignore-scripts: skip lifecycle scripts (preinstall/postinstall) of the legacy packages and their transitive
-  //   deps; we only want the files on disk, not to run any build steps.
-  // --legacy-peer-deps: tolerate peer-dependency mismatches between the pinned legacy @aztec/* graph and whatever
-  //   current versions npm would otherwise try to reconcile.
-  execSync(`npm install --prefix "${cacheRoot}" --no-save --ignore-scripts --legacy-peer-deps ${specs}`, {
-    stdio: 'inherit',
-  });
-
-  // Verify versions on disk match the requested version.
-  for (const p of REDIRECTED) {
-    const onDisk = JSON.parse(fs.readFileSync(pkgJsonPath(p), 'utf8')).version;
-    if (onDisk !== version) {
-      throw new Error(`[legacy-contracts] ${p} on disk is ${onDisk}, expected ${version}`);
-    }
-  }
+  return path.join(cacheDir, 'node_modules', name, 'package.json');
 }
 
+// Kept in a separate module (not inlined) because bootstrap.sh ci-compat-e2e also calls it directly
+// via `node .../install_legacy_contracts.cjs <version>` to pre-populate the cache on the host before
+// hermetic --net=none test containers launch. Inlining here would force us to duplicate the logic
+// in bash or re-run jest just to trigger the install.
 if (version) {
-  ensureCache();
+  installLegacyContracts(version);
 }
 
 let bannerPrinted = false;
@@ -102,7 +75,7 @@ function legacyArtifactPath(resolved) {
       continue;
     }
     const basename = resolved.slice(idx + marker.length);
-    return path.join(cacheRoot, 'node_modules', pkg, 'artifacts', basename);
+    return path.join(cacheDir, 'node_modules', pkg, 'artifacts', basename);
   }
   return null;
 }
@@ -122,10 +95,14 @@ module.exports = function legacyResolver(request, options) {
     return resolved;
   }
   if (!fs.existsSync(legacy)) {
-    throw new Error(
-      `[legacy-contracts] artifact ${path.basename(legacy)} not present in legacy cache @${version}; ` +
-        `the contract may have been added after that release. Pin a newer CONTRACT_ARTIFACTS_VERSION or skip this test.`,
+    // Contract was added after this historical release, there is nothing to compat-test for it. Exit the process
+    // cleanly with code 0 so the test runner reports the run as passed.
+    fs.writeSync(
+      2,
+      `[legacy-contracts][jest] artifact ${path.basename(legacy)} not in legacy cache @${version}; ` +
+        `assumed added after this release. No compat coverage applicable for this version, treating as passed.\n`,
     );
+    process.exit(0);
   }
   if (!seen.has(resolved)) {
     seen.add(resolved);
diff --git a/yarn-project/end-to-end/src/spartan/block_capacity.test.ts b/yarn-project/end-to-end/src/spartan/block_capacity.test.ts
index f4c6b9fabd55..41f99888907a 100644
--- a/yarn-project/end-to-end/src/spartan/block_capacity.test.ts
+++ b/yarn-project/end-to-end/src/spartan/block_capacity.test.ts
@@ -281,7 +281,7 @@ describe('block capacity benchmark', () => {
           if (blockTxCounts.some(b => b.blockNumber === bn)) {
             continue;
           }
-          const block = await aztecNode.getBlock(BlockNumber(bn));
+          const block = await aztecNode.getBlock(BlockNumber(bn), { includeTransactions: true });
           if (block) {
             const txCount = block.body.txEffects.length;
             blockTxCounts.push({ blockNumber: bn, txCount });
diff --git a/yarn-project/end-to-end/src/spartan/n_tps.test.ts b/yarn-project/end-to-end/src/spartan/n_tps.test.ts
index 2840e92520e2..16bda90b2799 100644
--- a/yarn-project/end-to-end/src/spartan/n_tps.test.ts
+++ b/yarn-project/end-to-end/src/spartan/n_tps.test.ts
@@ -321,9 +321,18 @@ describe('sustained N TPS test', () => {
           salt,
         );
         const deployMethod = await manager.getDeployMethod();
+        // Explicit gas estimation: BaseWallet's fallback bakes
+        // APPROXIMATE_MAX_DA_GAS_PER_BLOCK=196_608 daGas into deploys, which exceeds
+        // the proposer's per-block fair-share daGas (~94k at 10 blocks/checkpoint
+        // with pipelining). Estimate first, send with the result. EmbeddedWallet
+        // does this automatically; TestWallet (used here via WorkerWallet) does not.
+        const deploySim = await deployMethod.simulate({
+          from: NO_FROM,
+          fee: { paymentMethod: sponsor, estimateGas: true },
+        });
         await deployMethod.send({
           from: NO_FROM,
-          fee: { paymentMethod: sponsor },
+          fee: { paymentMethod: sponsor, gasSettings: deploySim.estimatedGas },
           wait: { timeout: 2400 },
         });
         return address;
@@ -541,18 +550,25 @@ describe('sustained N TPS test', () => {
       aztecNode: highValueTestWallets[i].aztecNode,
       address: highValueAddresses[i],
     }));
+    const startedAt = new Date().toISOString();
 
     sendTxsAtTps(logger, abortController.signal, lowValueLanes, lowValueTps, lowValueSendTx);
     const sentTxHashes = sendTxsAtTps(logger, abortController.signal, highValueLanes, highValueTps, highValueSendTx);
 
     await sleep(TEST_DURATION_SECONDS * 1000);
     abortController.abort();
+    const endedAt = new Date().toISOString();
     logger.info('Stopped transaction senders', {
       lowValueTxs,
       highValueTxs,
       highValueSent: sentTxHashes.length,
     });
 
+    // metadata about the test run for the scraper script
+    const metadataPath = '/tmp/n_tps_timing_data.json';
+    await writeFile(metadataPath, JSON.stringify({ startedAt, endedAt, runId: process.env.BENCH_RUN_ID }));
+    logger.info('Wrote benchmark metadata', { path: metadataPath, startedAt, endedAt });
+
     const results: { success: boolean; txHash: string; error?: any }[] = [];
     const waitForTx = async (txHash: string, txName: string) => {
       try {
diff --git a/yarn-project/end-to-end/src/spartan/n_tps_prove.test.ts b/yarn-project/end-to-end/src/spartan/n_tps_prove.test.ts
index 7d1f5bc9a2c3..3519bdce1092 100644
--- a/yarn-project/end-to-end/src/spartan/n_tps_prove.test.ts
+++ b/yarn-project/end-to-end/src/spartan/n_tps_prove.test.ts
@@ -575,14 +575,14 @@ describe(`prove ${TARGET_TPS}TPS test`, () => {
     );
     // Poll for proof completion while detecting reorgs
     let lastBlockNumber = await aztecNode.getBlockNumber();
-    const currentProvenBlock = await aztecNode.getProvenBlockNumber();
+    const currentProvenBlock = await aztecNode.getBlockNumber('proven');
     logger.info(`Waiting for proven chain to advance ${currentProvenBlock} -> ${targetProvenBlock}...`);
     const PROOF_TIMEOUT_S = 2 * epochDurationSeconds;
     const proofTimer = new Timer();
 
     while (true) {
       const [provenBlock, currentBlockNumber] = await Promise.all([
-        aztecNode.getProvenBlockNumber(),
+        aztecNode.getBlockNumber('proven'),
         aztecNode.getBlockNumber(),
       ]);
 
@@ -622,7 +622,7 @@ describe(`prove ${TARGET_TPS}TPS test`, () => {
     metrics.recordProofDuration(proofDurationSeconds);
     logger.info(`Epoch ${targetProofEpoch} proof completed in ${proofDurationSeconds.toFixed(1)}s`);
 
-    const finalProvenBlock = await aztecNode.getProvenBlockNumber();
+    const finalProvenBlock = await aztecNode.getBlockNumber('proven');
     expect(finalProvenBlock).toBeGreaterThanOrEqual(targetProvenBlock);
 
     logger.info('Test completed successfully');
diff --git a/yarn-project/end-to-end/src/spartan/proving.test.ts b/yarn-project/end-to-end/src/spartan/proving.test.ts
index d03b13f21deb..0c3bd5aa94fa 100644
--- a/yarn-project/end-to-end/src/spartan/proving.test.ts
+++ b/yarn-project/end-to-end/src/spartan/proving.test.ts
@@ -31,7 +31,7 @@ describe('proving test', () => {
 
   it('advances the proven chain', async () => {
     let [provenBlockNumber, blockNumber] = await Promise.all([
-      aztecNode.getProvenBlockNumber(),
+      aztecNode.getBlockNumber('proven'),
       aztecNode.getBlockNumber(),
     ]);
     let ok: boolean;
@@ -41,7 +41,7 @@ describe('proving test', () => {
 
     while (true) {
       const [newProvenBlockNumber, newBlockNumber] = await Promise.all([
-        aztecNode.getProvenBlockNumber(),
+        aztecNode.getBlockNumber('proven'),
         aztecNode.getBlockNumber(),
       ]);
 
diff --git a/yarn-project/end-to-end/src/spartan/tx_metrics.ts b/yarn-project/end-to-end/src/spartan/tx_metrics.ts
index 400aafdb5edd..e027926e0f72 100644
--- a/yarn-project/end-to-end/src/spartan/tx_metrics.ts
+++ b/yarn-project/end-to-end/src/spartan/tx_metrics.ts
@@ -1,6 +1,6 @@
 import type { AztecNode } from '@aztec/aztec.js/node';
 import type { Logger } from '@aztec/foundation/log';
-import type { L2Block } from '@aztec/stdlib/block';
+import type { BlockResponse } from '@aztec/stdlib/interfaces/client';
 import type { TopicType } from '@aztec/stdlib/p2p';
 import { Tx, type TxReceipt } from '@aztec/stdlib/tx';
 
@@ -147,7 +147,7 @@ export type TxInclusionData = {
 export class TxInclusionMetrics {
   private data = new Map<string, TxInclusionData>();
   private groups = new Set<string>();
-  private blocks = new Map<number, Promise<L2Block | undefined>>();
+  private blocks = new Map<number, Promise<BlockResponse<{ includeTransactions: true }> | undefined>>();
 
   private p2pGossipLatencyByTopic: Partial<Record<TopicType, { p50: number; p95: number }>> = {};
 
@@ -198,7 +198,7 @@ export class TxInclusionMetrics {
     }
 
     if (!this.blocks.has(blockNumber)) {
-      this.blocks.set(blockNumber, this.aztecNode.getBlock(blockNumber));
+      this.blocks.set(blockNumber, this.aztecNode.getBlock(blockNumber, { includeTransactions: true }));
     }
 
     const block = await this.blocks.get(blockNumber)!;
diff --git a/yarn-project/end-to-end/src/test-wallet/test_wallet.ts b/yarn-project/end-to-end/src/test-wallet/test_wallet.ts
index c592cd2a0285..f559bdda136f 100644
--- a/yarn-project/end-to-end/src/test-wallet/test_wallet.ts
+++ b/yarn-project/end-to-end/src/test-wallet/test_wallet.ts
@@ -25,7 +25,7 @@ import { type PXEConfig, getPXEConfig } from '@aztec/pxe/config';
 import { PXE, type PXECreationOptions, createPXE } from '@aztec/pxe/server';
 import { AuthWitness } from '@aztec/stdlib/auth-witness';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { getContractInstanceFromInstantiationParams } from '@aztec/stdlib/contract';
+import { getContractClassFromArtifact } from '@aztec/stdlib/contract';
 import { deriveSigningKey } from '@aztec/stdlib/keys';
 import type { NoteDao } from '@aztec/stdlib/note';
 import {
@@ -78,7 +78,9 @@ export class TestWallet extends BaseWallet {
       ...overridePXEConfig,
     });
     const pxe = await createPXE(nodeRef, pxeConfig, options);
-    return new TestWallet(pxe, nodeRef);
+    const wallet = new TestWallet(pxe, nodeRef);
+    await wallet.initStubClasses();
+    return wallet;
   }
 
   /**
@@ -112,6 +114,27 @@ export class TestWallet extends BaseWallet {
     });
   }
 
+  // Stub class ids, populated on wallet startup
+  // to avoid redundant work per simulation
+  private stubClassIds = new Map<AccountType, Fr>();
+
+  /**
+   * Hashes and registers the stub class for every supported account type with PXE, populating
+   * stubClassIds. Called on wallet initialization.
+   */
+  private async initStubClasses(): Promise<void> {
+    const { id: schnorrClassId } = await getContractClassFromArtifact(StubSchnorrAccountContractArtifact);
+    await this.pxe.registerContractClass(StubSchnorrAccountContractArtifact);
+
+    // ecdsa stubs share the same class id
+    const { id: ecdsaClassId } = await getContractClassFromArtifact(StubEcdsaAccountContractArtifact);
+    await this.pxe.registerContractClass(StubEcdsaAccountContractArtifact);
+
+    this.stubClassIds.set('schnorr', schnorrClassId);
+    this.stubClassIds.set('ecdsasecp256k1', ecdsaClassId);
+    this.stubClassIds.set('ecdsasecp256r1', ecdsaClassId);
+  }
+
   /**
    * Builds contract overrides for all provided addresses by replacing their account contracts with stub implementations.
    */
@@ -132,17 +155,16 @@ export class TestWallet extends BaseWallet {
         );
       }
 
-      const stubArtifact = this.getStubArtifactFor(address);
-      const stubConstructorArgs =
-        this.getTypeFor(address) === 'schnorr' ? [Fr.ZERO, Fr.ZERO] : [Buffer.alloc(32), Buffer.alloc(32)];
-      const stubInstance = await getContractInstanceFromInstantiationParams(stubArtifact, {
-        salt: Fr.random(),
-        constructorArgs: stubConstructorArgs,
-      });
+      const type = this.getTypeFor(address);
+      const stubClassId = this.stubClassIds.get(type);
+      if (!stubClassId) {
+        throw new Error(
+          `Stub class for account type '${type}' was not registered at wallet init. This is a bug — initStubClasses should cover every supported AccountType.`,
+        );
+      }
 
       contracts[address.toString()] = {
-        instance: stubInstance,
-        artifact: stubArtifact,
+        instance: { ...contractInstance, currentContractClassId: stubClassId },
       };
     }
 
@@ -155,12 +177,6 @@ export class TestWallet extends BaseWallet {
     return this.accounts.get(address.toString())?.type ?? 'schnorr';
   }
 
-  private getStubArtifactFor(address: AztecAddress) {
-    return this.getTypeFor(address) === 'schnorr'
-      ? StubSchnorrAccountContractArtifact
-      : StubEcdsaAccountContractArtifact;
-  }
-
   private getStubAccountFor(address: AztecAddress, completeAddress: CompleteAddress) {
     return this.getTypeFor(address) === 'schnorr'
       ? createStubSchnorrAccount(completeAddress)
@@ -271,11 +287,14 @@ export class TestWallet extends BaseWallet {
       : executionPayload;
     const chainInfo = await this.getChainInfo();
 
-    let overrides: SimulationOverrides | undefined;
+    let overrides = opts.overrides;
     let txRequest: TxExecutionRequest;
     if (useOverride) {
       const accountOverrides = await this.buildAccountOverrides(scopes);
-      overrides = new SimulationOverrides(accountOverrides);
+      overrides = new SimulationOverrides({
+        publicStorage: overrides?.publicStorage,
+        contracts: { ...overrides?.contracts, ...accountOverrides },
+      });
     }
 
     if (from === NO_FROM) {
diff --git a/yarn-project/end-to-end/src/test-wallet/utils.ts b/yarn-project/end-to-end/src/test-wallet/utils.ts
index f75a0518492e..ec7b2554a414 100644
--- a/yarn-project/end-to-end/src/test-wallet/utils.ts
+++ b/yarn-project/end-to-end/src/test-wallet/utils.ts
@@ -65,12 +65,7 @@ export async function proveInteraction(
   interaction: ContractFunctionInteraction | DeployMethod,
   options: SendInteractionOptions | DeployOptions,
 ) {
-  let execPayload;
-  if (interaction instanceof DeployMethod) {
-    execPayload = await interaction.request(interaction.convertDeployOptionsToRequestOptions(options));
-  } else {
-    execPayload = await interaction.request(options);
-  }
+  const execPayload = await interaction.request(options);
   return wallet.proveTx(execPayload, toSendOptions(options));
 }
 
diff --git a/yarn-project/end-to-end/src/test-wallet/worker_wallet.ts b/yarn-project/end-to-end/src/test-wallet/worker_wallet.ts
index 71831476a637..dea79c32e477 100644
--- a/yarn-project/end-to-end/src/test-wallet/worker_wallet.ts
+++ b/yarn-project/end-to-end/src/test-wallet/worker_wallet.ts
@@ -166,6 +166,10 @@ export class WorkerWallet implements Wallet {
     return this.call('registerContract', instance, artifact, secretKey);
   }
 
+  registerContractClass(artifact: ContractArtifact): Promise<void> {
+    return this.call('registerContractClass', artifact);
+  }
+
   simulateTx(exec: ExecutionPayload, opts: SimulateOptions): Promise<TxSimulationResultWithAppOffset> {
     return this.call('simulateTx', exec, opts);
   }
diff --git a/yarn-project/epoch-cache/src/epoch_cache.ts b/yarn-project/epoch-cache/src/epoch_cache.ts
index 24b4b0048bb3..d3967c03979c 100644
--- a/yarn-project/epoch-cache/src/epoch_cache.ts
+++ b/yarn-project/epoch-cache/src/epoch_cache.ts
@@ -97,7 +97,6 @@ export class EpochCache implements EpochCacheInterface {
    * Single map holding both resolved entries and in-flight promises.
    * A `Promise` value means a fetch is in progress; concurrent callers await it.
    */
-  // eslint-disable-next-line aztec-custom/no-non-primitive-in-collections
   protected cache: Map<EpochNumber, CachedEpochEntry | Promise<CachedEpochEntry>> = new Map();
   private allValidators: Set<string> = new Set();
   private lastValidatorRefresh = 0;
diff --git a/yarn-project/ethereum/src/l1_reader.ts b/yarn-project/ethereum/src/l1_reader.ts
index 4d31bbd78ac4..b23ed6f1e621 100644
--- a/yarn-project/ethereum/src/l1_reader.ts
+++ b/yarn-project/ethereum/src/l1_reader.ts
@@ -30,7 +30,7 @@ export const l1ReaderConfigMappings: ConfigMappingsType<L1ReaderConfig> = {
   },
   l1ChainId: {
     env: 'L1_CHAIN_ID',
-    parseEnv: (val: string) => +val,
+    ...optionalNumberConfigHelper(),
     description: 'The chain ID of the ethereum host.',
   },
   l1RpcUrls: {
diff --git a/yarn-project/foundation/eslint-rules/no-non-primitive-in-collections.js b/yarn-project/foundation/eslint-rules/no-non-primitive-in-collections.js
index 25bae69abc41..eff593fa3d20 100644
--- a/yarn-project/foundation/eslint-rules/no-non-primitive-in-collections.js
+++ b/yarn-project/foundation/eslint-rules/no-non-primitive-in-collections.js
@@ -5,6 +5,21 @@ import * as ts from 'typescript';
  * @fileoverview Rule to disallow non-primitive types in Set<T> and Map<T, ...> collections
  */
 
+/**
+ * Branded primitive types whose underlying representation is a primitive (number/string/etc.)
+ * and are therefore safe to use as Set/Map keys. Used as a fallback when the TypeScript type
+ * checker is unavailable (AST-only mode). The type-checker path detects these structurally
+ * via the `Branded<T, Brand>` intersection encoding, so this list only needs to cover the
+ * names — not their full definitions.
+ */
+const BRANDED_PRIMITIVE_TYPES = new Set([
+  'BlockNumber',
+  'SlotNumber',
+  'CheckpointNumber',
+  'EpochNumber',
+  'IndexWithinCheckpoint',
+]);
+
 /** @type {import('eslint').Rule.RuleModule} */
 export default {
   meta: {
@@ -100,9 +115,61 @@ export default {
         }
       }
 
+      // Check for branded primitive types: T & { _branding: Brand } where T is a primitive.
+      // Permits SlotNumber, BlockNumber, etc. while still rejecting branded class types
+      // such as BlockProposalHash = Branded<BaseBuffer32, ...>.
+      if (flags & ts.TypeFlags.Intersection) {
+        if (tsType.isIntersection && tsType.isIntersection()) {
+          return isBrandedPrimitive(tsType);
+        }
+      }
+
       return false;
     }
 
+    /**
+     * Detect a Branded<Primitive, Brand> intersection. The intersection must contain
+     * at least one primitive constituent and all non-primitive constituents must be
+     * the brand marker object (a single `_branding` property and nothing else).
+     */
+    function isBrandedPrimitive(tsType) {
+      const components = tsType.types;
+      if (!components || components.length === 0) return false;
+
+      const allowedPrimitiveFlags =
+        ts.TypeFlags.String |
+        ts.TypeFlags.Number |
+        ts.TypeFlags.BigInt |
+        ts.TypeFlags.Boolean |
+        ts.TypeFlags.ESSymbol |
+        ts.TypeFlags.Literal |
+        ts.TypeFlags.TemplateLiteral |
+        ts.TypeFlags.StringMapping |
+        ts.TypeFlags.Enum |
+        ts.TypeFlags.EnumLiteral;
+
+      let hasPrimitive = false;
+      let hasBrandMarker = false;
+
+      for (const component of components) {
+        const componentFlags = component.getFlags();
+        if (componentFlags & allowedPrimitiveFlags) {
+          hasPrimitive = true;
+          continue;
+        }
+        if (componentFlags & ts.TypeFlags.Object) {
+          const props = component.getProperties ? component.getProperties() : [];
+          if (props.length === 1 && props[0].getName() === '_branding') {
+            hasBrandMarker = true;
+            continue;
+          }
+        }
+        return false;
+      }
+
+      return hasPrimitive && hasBrandMarker;
+    }
+
     /**
      * Fallback: Check if a type node represents a primitive type (AST-only)
      * This is only used if TypeScript type checker is not available
@@ -148,6 +215,11 @@ export default {
             if (primitives.includes(name)) {
               return true;
             }
+
+            // Branded primitives that wrap number/string — safe to use as keys
+            if (BRANDED_PRIMITIVE_TYPES.has(name)) {
+              return true;
+            }
           }
           return false;
 
diff --git a/yarn-project/foundation/src/branded-types/block_number.test.ts b/yarn-project/foundation/src/branded-types/block_number.test.ts
index 8002aac31223..4e78aa2bb8e3 100644
--- a/yarn-project/foundation/src/branded-types/block_number.test.ts
+++ b/yarn-project/foundation/src/branded-types/block_number.test.ts
@@ -91,6 +91,25 @@ describe('BlockNumber', () => {
     it('rejects non-integer values', () => {
       expect(() => BlockNumberSchema.parse(1.5)).toThrow();
     });
+
+    it('rejects hex strings (must not be coerced as a number)', () => {
+      expect(BlockNumberSchema.safeParse('0x1234').success).toBe(false);
+      expect(
+        BlockNumberSchema.safeParse('0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff').success,
+      ).toBe(false);
+    });
+
+    it('rejects scientific-notation strings', () => {
+      expect(BlockNumberSchema.safeParse('1e5').success).toBe(false);
+    });
+
+    it('rejects values above MAX_SAFE_INTEGER', () => {
+      expect(BlockNumberSchema.safeParse(Number.MAX_SAFE_INTEGER + 1).success).toBe(false);
+    });
+
+    it('rejects bigints above MAX_SAFE_INTEGER', () => {
+      expect(BlockNumberSchema.safeParse(BigInt(Number.MAX_SAFE_INTEGER) + 1n).success).toBe(false);
+    });
   });
 
   describe('type safety', () => {
diff --git a/yarn-project/foundation/src/branded-types/block_number.ts b/yarn-project/foundation/src/branded-types/block_number.ts
index 50de2cebb9d9..9092c5d95111 100644
--- a/yarn-project/foundation/src/branded-types/block_number.ts
+++ b/yarn-project/foundation/src/branded-types/block_number.ts
@@ -98,9 +98,27 @@ BlockNumber.add = function (bn: BlockNumber, increment: number): BlockNumber {
 BlockNumber.ZERO = BlockNumber(0);
 
 function makeBlockNumberSchema(minValue: number) {
+  const max = Number.MAX_SAFE_INTEGER;
   return z
-    .union([z.number(), z.bigint(), z.string()])
-    .pipe(z.coerce.number().int().min(minValue))
+    .union([
+      z.number().int().min(minValue).max(max),
+      z
+        .bigint()
+        .min(BigInt(minValue))
+        .max(BigInt(max))
+        .transform(v => Number(v)),
+      z
+        .string()
+        .regex(/^\d+$/, 'BlockNumber string must be a non-negative decimal integer')
+        .transform((v, ctx) => {
+          const parsed = Number(v);
+          if (!Number.isInteger(parsed) || parsed > max || parsed < minValue) {
+            ctx.addIssue({ code: z.ZodIssueCode.custom, message: `BlockNumber out of range: ${v}` });
+            return z.NEVER;
+          }
+          return parsed;
+        }),
+    ])
     .transform(value => BlockNumber(value));
 }
 
diff --git a/yarn-project/foundation/src/branded-types/buffer32_hash.ts b/yarn-project/foundation/src/branded-types/buffer32_hash.ts
index ca4baea97ab7..3de688a55ccb 100644
--- a/yarn-project/foundation/src/branded-types/buffer32_hash.ts
+++ b/yarn-project/foundation/src/branded-types/buffer32_hash.ts
@@ -1,42 +1,38 @@
-import type { BaseBuffer32 } from '../buffer/buffer32.js';
-import { Buffer32 } from '../buffer/buffer32.js';
 import type { Branded } from './types.js';
 
-/** A branded Buffer32 representing a block proposal hash, used for p2p deduplication. */
-export type BlockProposalHash = Branded<BaseBuffer32, 'BlockProposalHash'>;
-
-/** Creates a BlockProposalHash from a BaseBuffer32. */
-export function BlockProposalHash(buf: BaseBuffer32): BlockProposalHash {
-  return buf as BlockProposalHash;
+/**
+ * A branded `0x`-prefixed hex string representing a checkpoint proposal payload hash.
+ *
+ * A `CheckpointProposal` and the matching `CheckpointAttestation` sign the same
+ * `ConsensusPayload`, so they share this hash type. Used by the p2p attestation
+ * pool to dedup signed payloads and detect equivocations.
+ */
+export type CheckpointProposalHash = Branded<`0x${string}`, 'CheckpointProposalHash'>;
+
+/** Brands a `0x`-prefixed hex string as a CheckpointProposalHash. */
+export function CheckpointProposalHash(s: `0x${string}`): CheckpointProposalHash {
+  return s as CheckpointProposalHash;
 }
 
-/** Creates a BlockProposalHash from a raw Buffer. */
-BlockProposalHash.fromBuffer = function (buf: Buffer): BlockProposalHash {
-  return new Buffer32(buf) as unknown as BlockProposalHash;
-};
-
-/** A branded Buffer32 representing a checkpoint proposal hash, used for p2p deduplication. */
-export type CheckpointProposalHash = Branded<BaseBuffer32, 'CheckpointProposalHash'>;
-
-/** Creates a CheckpointProposalHash from a BaseBuffer32. */
-export function CheckpointProposalHash(buf: BaseBuffer32): CheckpointProposalHash {
-  return buf as CheckpointProposalHash;
-}
-
-/** Creates a CheckpointProposalHash from a raw Buffer. */
+/** Constructs a CheckpointProposalHash from a raw 32-byte hash buffer. */
 CheckpointProposalHash.fromBuffer = function (buf: Buffer): CheckpointProposalHash {
-  return new Buffer32(buf) as unknown as CheckpointProposalHash;
+  return `0x${buf.toString('hex')}` as CheckpointProposalHash;
 };
 
-/** A branded Buffer32 representing a checkpoint attestation hash, used for p2p deduplication. */
-export type CheckpointAttestationHash = Branded<BaseBuffer32, 'CheckpointAttestationHash'>;
-
-/** Creates a CheckpointAttestationHash from a BaseBuffer32. */
-export function CheckpointAttestationHash(buf: BaseBuffer32): CheckpointAttestationHash {
-  return buf as CheckpointAttestationHash;
+/**
+ * A branded `0x`-prefixed hex string representing a block proposal payload hash.
+ *
+ * Used by the p2p attestation pool to dedup signed payloads at a given
+ * `(slot, indexWithinCheckpoint)` and detect equivocations.
+ */
+export type BlockProposalHash = Branded<`0x${string}`, 'BlockProposalHash'>;
+
+/** Brands a `0x`-prefixed hex string as a BlockProposalHash. */
+export function BlockProposalHash(s: `0x${string}`): BlockProposalHash {
+  return s as BlockProposalHash;
 }
 
-/** Creates a CheckpointAttestationHash from a raw Buffer. */
-CheckpointAttestationHash.fromBuffer = function (buf: Buffer): CheckpointAttestationHash {
-  return new Buffer32(buf) as unknown as CheckpointAttestationHash;
+/** Constructs a BlockProposalHash from a raw 32-byte hash buffer. */
+BlockProposalHash.fromBuffer = function (buf: Buffer): BlockProposalHash {
+  return `0x${buf.toString('hex')}` as BlockProposalHash;
 };
diff --git a/yarn-project/foundation/src/branded-types/index.ts b/yarn-project/foundation/src/branded-types/index.ts
index 774680285f66..ab7ecd344073 100644
--- a/yarn-project/foundation/src/branded-types/index.ts
+++ b/yarn-project/foundation/src/branded-types/index.ts
@@ -1,5 +1,5 @@
 export { BlockNumber, BlockNumberSchema, BlockNumberPositiveSchema } from './block_number.js';
-export { BlockProposalHash, CheckpointAttestationHash, CheckpointProposalHash } from './buffer32_hash.js';
+export { BlockProposalHash, CheckpointProposalHash } from './buffer32_hash.js';
 export { CheckpointNumber, CheckpointNumberSchema, CheckpointNumberPositiveSchema } from './checkpoint_number.js';
 export { EpochNumber, EpochNumberSchema } from './epoch.js';
 export { IndexWithinCheckpoint, IndexWithinCheckpointSchema } from './index_within_checkpoint.js';
diff --git a/yarn-project/foundation/src/collection/array.test.ts b/yarn-project/foundation/src/collection/array.test.ts
index 9348a90d2191..86b19b4b32d6 100644
--- a/yarn-project/foundation/src/collection/array.test.ts
+++ b/yarn-project/foundation/src/collection/array.test.ts
@@ -13,6 +13,7 @@ import {
   stdDev,
   times,
   unique,
+  uniqueBy,
   variance,
 } from './array.js';
 
@@ -143,6 +144,24 @@ describe('unique', () => {
   });
 });
 
+describe('uniqueBy', () => {
+  it('keeps the first occurrence per key', () => {
+    const items = [
+      { id: 'a', n: 1 },
+      { id: 'b', n: 2 },
+      { id: 'a', n: 3 },
+    ];
+    expect(uniqueBy(items, x => x.id)).toEqual([
+      { id: 'a', n: 1 },
+      { id: 'b', n: 2 },
+    ]);
+  });
+
+  it('returns an empty array for an empty input', () => {
+    expect(uniqueBy([], x => x)).toEqual([]);
+  });
+});
+
 describe('maxBy', () => {
   it('returns the max value', () => {
     expect(maxBy([1, 2, 3], x => x)).toEqual(3);
diff --git a/yarn-project/foundation/src/collection/array.ts b/yarn-project/foundation/src/collection/array.ts
index e2636c27d1fc..8ce8c3f7ebbe 100644
--- a/yarn-project/foundation/src/collection/array.ts
+++ b/yarn-project/foundation/src/collection/array.ts
@@ -138,6 +138,26 @@ export function unique<T>(arr: T[]): T[] {
   return [...new Set(arr)];
 }
 
+/**
+ * Removes duplicates from the given array using a key function. The first occurrence of each key is kept.
+ * @param arr - The array.
+ * @param keyFn - A function that returns a primitive key for each element. Elements with the same key are
+ *               considered duplicates.
+ * @returns A new array.
+ */
+export function uniqueBy<T, K extends string | number | bigint>(arr: T[], keyFn: (item: T) => K): T[] {
+  const seen = new Set<K>();
+  const result: T[] = [];
+  for (const item of arr) {
+    const key = keyFn(item);
+    if (!seen.has(key)) {
+      seen.add(key);
+      result.push(item);
+    }
+  }
+  return result;
+}
+
 /**
  * Removes all undefined elements from the array.
  * @param arr - The array.
diff --git a/yarn-project/foundation/src/config/env_var.ts b/yarn-project/foundation/src/config/env_var.ts
index b4048381ecef..86f80f06a951 100644
--- a/yarn-project/foundation/src/config/env_var.ts
+++ b/yarn-project/foundation/src/config/env_var.ts
@@ -26,6 +26,7 @@ export type EnvVar =
   | 'BB_IVC_CONCURRENCY'
   | 'BB_CHONK_VERIFY_MAX_BATCH'
   | 'BB_CHONK_VERIFY_BATCH_CONCURRENCY'
+  | 'BB_DEBUG_OUTPUT_DIR'
   | 'BOOTSTRAP_NODES'
   | 'BLOB_ARCHIVE_API_URL'
   | 'BLOB_FILE_STORE_URLS'
@@ -363,6 +364,7 @@ export type EnvVar =
   | 'BLOB_FILE_STORE_TIMEOUT_MS'
   | 'FISHERMAN_MODE'
   | 'MAX_ALLOWED_ETH_CLIENT_DRIFT_SECONDS'
+  | 'MAX_BLOCKS_PER_CHECKPOINT'
   | 'LEGACY_BLS_CLI'
   | 'DEBUG_FORCE_TX_PROOF_VERIFICATION'
   | 'VALIDATOR_HA_SIGNING_ENABLED'
diff --git a/yarn-project/foundation/src/types/index.ts b/yarn-project/foundation/src/types/index.ts
index dcf7cf926d70..d8c54ad47e79 100644
--- a/yarn-project/foundation/src/types/index.ts
+++ b/yarn-project/foundation/src/types/index.ts
@@ -34,6 +34,20 @@ export type Prettify<T> = {
   [K in keyof T]: T[K];
 } & {};
 
+/** Returns a type with fields conditionally required based on a flag */
+export type IfFlag<
+  OptsSchema,
+  Opts extends OptsSchema,
+  Key extends keyof OptsSchema,
+  Field extends object,
+> = Opts extends { [K in Key]: true }
+  ? Field
+  : Opts extends { [K in Key]: false }
+    ? {}
+    : Opts extends { [K in Key]?: boolean }
+      ? Partial<Field>
+      : {};
+
 /**
  * Type-safe Event Emitter type
  * @example
diff --git a/yarn-project/ivc-integration/src/bb_js_debug.test.ts b/yarn-project/ivc-integration/src/bb_js_debug.test.ts
new file mode 100644
index 000000000000..b7d6c2c4ea1f
--- /dev/null
+++ b/yarn-project/ivc-integration/src/bb_js_debug.test.ts
@@ -0,0 +1,225 @@
+/**
+ * Tests that the bb.js debug wrapper writes files that are compatible with the bb CLI.
+ * Generates a proof via bb.js with the debug wrapper enabled, then:
+ * 1. Runs `bb prove` via CLI using the same inputs → compares proof output
+ * 2. Runs `bb verify` via CLI using the proof files → checks verification passes
+ */
+import { BBJsInstance, type BBJsProofResult } from '@aztec/bb-prover';
+import { DebugBBJsInstance } from '@aztec/bb-prover/debug';
+import { NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP } from '@aztec/constants';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { createLogger } from '@aztec/foundation/log';
+import { Noir } from '@aztec/noir-noir_js';
+import { ServerCircuitArtifacts } from '@aztec/noir-protocol-circuits-types/server';
+import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
+import { ParityBasePrivateInputs } from '@aztec/stdlib/parity';
+
+import { jest } from '@jest/globals';
+import * as proc from 'child_process';
+import * as fs from 'fs/promises';
+import { ungzip } from 'pako';
+import * as path from 'path';
+import readline from 'readline';
+
+// Spawn the bb CLI and resolve with its exit code. Inlined here (previously lived in bb-prover/bb/execute.ts)
+// because this parity test is the only remaining consumer of the bb binary spawner in the TS tree.
+function executeBB(pathToBB: string, command: string, args: string[], log: (msg: string) => void): Promise<number> {
+  return new Promise(resolve => {
+    const bb = proc.spawn(pathToBB, [command, ...args], { stdio: ['ignore', 'pipe', 'pipe'] });
+    readline.createInterface({ input: bb.stdout }).on('line', log);
+    readline.createInterface({ input: bb.stderr }).on('line', log);
+    bb.on('close', (code: number) => resolve(code ?? -1));
+  });
+}
+
+const logger = createLogger('ivc-integration:test:bb-js-debug');
+
+jest.setTimeout(120_000);
+
+const BB_PATH = path.resolve(
+  path.join(path.dirname(new URL(import.meta.url).pathname), '../../../barretenberg/cpp/build/bin/bb'),
+);
+
+describe('BB.js Debug Wrapper', () => {
+  let debugDir: string;
+  let bytecode: Uint8Array;
+  let witness: Uint8Array;
+  let vkBytes: Uint8Array;
+  let bbJsResult: BBJsProofResult;
+
+  beforeAll(async () => {
+    // Verify bb binary exists
+    await fs.access(BB_PATH);
+
+    // Create a temporary debug output directory
+    debugDir = await fs.mkdtemp(path.join(process.env.BB_WORKING_DIRECTORY || '/tmp', 'bb-debug-test-'));
+
+    // Generate base parity inputs (same approach as base_parity_inputs.test.ts)
+    const l1ToL2Messages = new Array(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP).fill(null).map(() => Fr.random());
+    const vkTreeRoot = getVKTreeRoot();
+    const baseParityInputs = ParityBasePrivateInputs.fromSlice(l1ToL2Messages, 0, vkTreeRoot, Fr.random());
+
+    const noirInputs = {
+      msgs: baseParityInputs.msgs.map(m => m.toString()),
+      // eslint-disable-next-line camelcase
+      vk_tree_root: baseParityInputs.vkTreeRoot.toString(),
+      // eslint-disable-next-line camelcase
+      prover_id: baseParityInputs.proverId.toString(),
+    };
+
+    const artifact = ServerCircuitArtifacts.ParityBaseArtifact;
+
+    // Execute circuit with Noir JS to generate witness
+    logger.info('Generating witness via Noir JS...');
+    const program = new Noir(artifact as any);
+    const { witness: compressedWitness } = await program.execute({ inputs: noirInputs });
+
+    // Decompress for bb.js (it expects raw bytes)
+    bytecode = ungzip(Buffer.from(artifact.bytecode, 'base64'));
+    witness = ungzip(compressedWitness);
+    vkBytes = Buffer.from(artifact.verificationKey!.bytes, 'hex');
+
+    // Generate proof via bb.js with debug wrapper
+    logger.info('Generating proof via bb.js with debug wrapper...');
+    const raw = await BBJsInstance.create(BB_PATH, (msg: string) => logger.verbose(`bb.js - ${msg}`));
+    const debug = new DebugBBJsInstance(raw, debugDir, BB_PATH, logger);
+
+    try {
+      bbJsResult = await debug.generateProof('ParityBase', bytecode, vkBytes, witness, 'ultra_honk');
+      logger.info(
+        `bb.js proof generated: ${bbJsResult.proofFields.length} proof fields, ${bbJsResult.publicInputFields.length} public input fields`,
+      );
+    } finally {
+      await debug.destroy();
+    }
+  });
+
+  afterAll(async () => {
+    // Clean up debug dir
+    if (debugDir) {
+      await fs.rm(debugDir, { recursive: true, force: true });
+    }
+  });
+
+  it('writes correct debug files and command.sh', async () => {
+    const opDir = path.join(debugDir, 'ParityBase-001');
+
+    // Check all expected files exist
+    const files = await fs.readdir(opDir);
+    expect(files).toContain('ParityBase-bytecode.gz');
+    expect(files).toContain('ParityBase-vk');
+    expect(files).toContain('partial-witness.gz');
+    expect(files).toContain('proof');
+    expect(files).toContain('public_inputs');
+    expect(files).toContain('command.sh');
+
+    // Check command.sh contains the expected prove command
+    const command = await fs.readFile(path.join(opDir, 'command.sh'), 'utf-8');
+    expect(command).toContain('prove');
+    expect(command).toContain('--scheme ultra_honk');
+    expect(command).toContain('--oracle_hash poseidon2');
+    expect(command).toContain('--disable_zk');
+    expect(command).toContain('-b');
+    expect(command).toContain('-k');
+    expect(command).toContain('-w');
+    expect(command).toContain('-o');
+  });
+
+  it('CLI bb prove reproduces the same proof as bb.js', async () => {
+    const opDir = path.join(debugDir, 'ParityBase-001');
+
+    // Create a separate output directory for the CLI proof
+    const cliOutputDir = path.join(debugDir, 'cli-prove-output');
+    await fs.mkdir(cliOutputDir, { recursive: true });
+
+    // Run the bb prove command using the same input files
+    const bytecodePath = path.join(opDir, 'ParityBase-bytecode.gz');
+    const vkPath = path.join(opDir, 'ParityBase-vk');
+    const witnessPath = path.join(opDir, 'partial-witness.gz');
+
+    const logFn = (msg: string) => logger.verbose(`bb-cli - ${msg}`);
+    const exitCode = await executeBB(
+      BB_PATH,
+      'prove',
+      [
+        '--scheme',
+        'ultra_honk',
+        '--oracle_hash',
+        'poseidon2',
+        '--disable_zk',
+        '-b',
+        bytecodePath,
+        '-k',
+        vkPath,
+        '-w',
+        witnessPath,
+        '-o',
+        cliOutputDir,
+      ],
+      logFn,
+    );
+
+    expect(exitCode).toBe(0);
+
+    // Read CLI proof output
+    const cliProof = await fs.readFile(path.join(cliOutputDir, 'proof'));
+    const cliPublicInputs = await fs.readFile(path.join(cliOutputDir, 'public_inputs'));
+
+    // Read bb.js proof output (written by debug wrapper)
+    const bbJsProof = await fs.readFile(path.join(opDir, 'proof'));
+    const bbJsPublicInputs = await fs.readFile(path.join(opDir, 'public_inputs'));
+
+    // With --disable_zk, proofs are deterministic — they should match exactly
+    expect(Buffer.compare(cliProof, bbJsProof)).toBe(0);
+    expect(Buffer.compare(cliPublicInputs, bbJsPublicInputs)).toBe(0);
+  });
+
+  it('CLI bb verify succeeds with debug output files', async () => {
+    const opDir = path.join(debugDir, 'ParityBase-001');
+
+    // We need the VK produced by the prover (not the input VK).
+    // The prove command writes a VK only with --write_vk. Instead, we write_vk separately
+    // then verify using those files. Or we can just use the proof + public_inputs + VK
+    // from the CLI prove output which also writes them.
+    // Actually, let's write the VK first and then verify.
+    const vkDir = path.join(debugDir, 'cli-vk-output');
+    await fs.mkdir(vkDir, { recursive: true });
+
+    const bytecodePath = path.join(opDir, 'ParityBase-bytecode.gz');
+
+    // Generate VK via CLI
+    const logFn = (msg: string) => logger.verbose(`bb-cli - ${msg}`);
+    const vkExitCode = await executeBB(
+      BB_PATH,
+      'write_vk',
+      ['--scheme', 'ultra_honk', '--oracle_hash', 'poseidon2', '--disable_zk', '-b', bytecodePath, '-o', vkDir],
+      logFn,
+    );
+    expect(vkExitCode).toBe(0);
+
+    // Verify using the proof and public_inputs written by the debug wrapper
+    const proofPath = path.join(opDir, 'proof');
+    const publicInputsPath = path.join(opDir, 'public_inputs');
+    const vkPath = path.join(vkDir, 'vk');
+
+    const verifyExitCode = await executeBB(
+      BB_PATH,
+      'verify',
+      [
+        '--scheme',
+        'ultra_honk',
+        '--oracle_hash',
+        'poseidon2',
+        '--disable_zk',
+        '-p',
+        proofPath,
+        '-k',
+        vkPath,
+        '-i',
+        publicInputsPath,
+      ],
+      logFn,
+    );
+    expect(verifyExitCode).toBe(0);
+  });
+});
diff --git a/yarn-project/ivc-integration/src/prove_native.ts b/yarn-project/ivc-integration/src/prove_native.ts
index 3aeeb260fdbe..dbf5f30d8d4f 100644
--- a/yarn-project/ivc-integration/src/prove_native.ts
+++ b/yarn-project/ivc-integration/src/prove_native.ts
@@ -1,15 +1,4 @@
-import {
-  BB_RESULT,
-  PROOF_FILENAME,
-  PUBLIC_INPUTS_FILENAME,
-  type UltraHonkFlavor,
-  VK_FILENAME,
-  generateAvmProof,
-  generateProof,
-  readProofsFromOutputDirectory,
-  verifyAvmProof,
-  verifyProof,
-} from '@aztec/bb-prover';
+import { BBJsProverFactory, type UltraHonkFlavor, constructRecursiveProofFromBuffers } from '@aztec/bb-prover';
 import {
   AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED,
   CHONK_PROOF_LENGTH,
@@ -19,14 +8,13 @@ import {
 } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import type { Logger } from '@aztec/foundation/log';
-import { BufferReader } from '@aztec/foundation/serialize';
 import type { AvmCircuitInputs, AvmCircuitPublicInputs } from '@aztec/stdlib/avm';
 import { makeProofAndVerificationKey } from '@aztec/stdlib/interfaces/server';
 import type { NoirCompiledCircuit } from '@aztec/stdlib/noir';
 import { Proof, RecursiveProof } from '@aztec/stdlib/proofs';
 import { VerificationKeyAsFields, VerificationKeyData } from '@aztec/stdlib/vks';
 
-import * as fs from 'fs/promises';
+import { ungzip } from 'pako';
 import * as path from 'path';
 
 export async function proofBytesToRecursiveProof(
@@ -49,60 +37,50 @@ export async function proofBytesToRecursiveProof(
   return new RecursiveProof(fieldsWithoutPublicInputs, proof, true, CHONK_PROOF_LENGTH);
 }
 
-async function verifyProofWithKey(
-  pathToBB: string,
-  workingDirectory: string,
-  verificationKey: VerificationKeyData,
-  proof: Proof,
-  flavor: UltraHonkFlavor,
-  logger: Logger,
-) {
-  const publicInputsFileName = path.join(workingDirectory, PUBLIC_INPUTS_FILENAME);
-  const proofFileName = path.join(workingDirectory, PROOF_FILENAME);
-  const verificationKeyPath = path.join(workingDirectory, VK_FILENAME);
-  // TODO(https://github.com/AztecProtocol/aztec-packages/issues/13189): Put this proof parsing logic in the proof class.
-  await fs.writeFile(publicInputsFileName, proof.buffer.slice(0, proof.numPublicInputs * 32));
-  await fs.writeFile(proofFileName, proof.buffer.slice(proof.numPublicInputs * 32));
-  await fs.writeFile(verificationKeyPath, verificationKey.keyAsBytes);
-
-  const result = await verifyProof(pathToBB, proofFileName, verificationKeyPath, flavor, logger);
-  if (result.status === BB_RESULT.FAILURE) {
-    throw new Error(`Failed to verify proof from key!`);
-  }
-  logger.info(`Successfully verified proof from key in ${result.durationMs} ms`);
-}
-
 async function proveRollupCircuit<T extends UltraHonkFlavor, ProofLength extends number>(
   name: string,
   pathToBB: string,
-  workingDirectory: string,
+  _workingDirectory: string,
   circuit: NoirCompiledCircuit,
   witness: Uint8Array,
   logger: Logger,
   flavor: T,
   proofLength: ProofLength,
 ) {
-  await fs.writeFile(path.join(workingDirectory, 'witness.gz'), witness);
+  const factory = new BBJsProverFactory(pathToBB, logger);
+
+  // Decompress witness and bytecode for bb.js
+  const decompressedWitness = ungzip(witness);
+  const bytecode = ungzip(Buffer.from(circuit.bytecode, 'base64'));
   const vkBuffer = Buffer.from(circuit.verificationKey.bytes, 'hex');
-  const proofResult = await generateProof(
-    pathToBB,
-    workingDirectory,
-    name,
-    Buffer.from(circuit.bytecode, 'base64'),
-    vkBuffer,
-    path.join(workingDirectory, 'witness.gz'),
-    flavor,
-    logger,
-  );
 
-  if (proofResult.status != BB_RESULT.SUCCESS) {
-    throw new Error(`Failed to generate proof for ${name} with flavor ${flavor}`);
-  }
+  // Generate proof via bb.js
+  const proofResult = await factory.withFreshInstance(instance =>
+    instance.generateProof(name, bytecode, vkBuffer, decompressedWitness, flavor),
+  );
 
   const vk = await VerificationKeyData.fromFrBuffer(vkBuffer);
-  const proof = await readProofsFromOutputDirectory(proofResult.proofPath!, vk, proofLength, logger);
 
-  await verifyProofWithKey(pathToBB, workingDirectory, vk, proof.binaryProof, flavor, logger);
+  // Construct proof from in-memory buffers
+  const proof = constructRecursiveProofFromBuffers(
+    proofResult.proofFields,
+    proofResult.publicInputFields,
+    vk,
+    proofLength,
+  );
+
+  // Verify the proof via bb.js
+  const publicInputFields = proofResult.publicInputFields;
+  const proofFields = proofResult.proofFields;
+
+  const { verified } = await factory.withVerifierInstance(instance =>
+    instance.verifyProof(proofFields, vk.keyAsBytes, publicInputFields, flavor),
+  );
+
+  if (!verified) {
+    throw new Error(`Failed to verify proof from key!`);
+  }
+  logger.info(`Successfully verified proof from key`);
 
   return makeProofAndVerificationKey(proof, vk);
 }
@@ -147,54 +125,36 @@ export function proveKeccakHonk(
   );
 }
 
+/** Generate and verify an AVM proof via bb.js. */
 export async function proveAvm(
   avmCircuitInputs: AvmCircuitInputs,
-  workingDirectory: string,
+  _workingDirectory: string,
   logger: Logger,
 ): Promise<{
   proof: Fr[];
   publicInputs: AvmCircuitPublicInputs;
 }> {
-  // The paths for the barretenberg binary and the write path are hardcoded for now.
   const bbPath = path.resolve('../../barretenberg/cpp/build/bin/bb-avm');
+  const factory = new BBJsProverFactory(bbPath, logger);
 
-  // Then we prove.
-  const proofRes = await generateAvmProof(bbPath, workingDirectory, avmCircuitInputs, logger);
-  if (proofRes.status === BB_RESULT.FAILURE) {
-    throw new Error(`AVM V2 proof generation failed: ${proofRes.reason}`);
-  } else if (proofRes.status === BB_RESULT.ALREADY_PRESENT) {
-    throw new Error(`AVM V2 proof already exists`);
-  }
-
-  const avmProofPath = proofRes.proofPath;
-  expect(avmProofPath).toBeDefined();
+  const inputsBuffer = avmCircuitInputs.serializeWithMessagePack();
+  const { proof: proofFields } = await factory.withFreshInstance(i => i.generateAvmProof(inputsBuffer));
 
-  // Read the binary proof
-  const avmProofBuffer = await fs.readFile(avmProofPath!);
-  const reader = BufferReader.asReader(avmProofBuffer);
-
-  const proof: Fr[] = [];
-  while (!reader.isEmpty()) {
-    proof.push(Fr.fromBuffer(reader));
-  }
+  // Convert Uint8Array field elements → Fr[]
+  const proof: Fr[] = proofFields.map(f => Fr.fromBuffer(Buffer.from(f)));
 
-  // We extend to a fixed-size padded proof as during development any new AVM circuit column changes the
-  // proof length and we do not have a mechanism to feedback a cpp constant to noir/TS.
+  // Extend to a fixed-size padded proof — any new AVM circuit column changes the proof length and we
+  // don't have a mechanism to feed a cpp constant into noir/TS.
   // TODO(#13390): Revive a non-padded AVM proof
   while (proof.length < AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED) {
     proof.push(new Fr(0));
   }
 
-  const verificationResult = await verifyAvmProof(
-    bbPath,
-    workingDirectory,
-    proofRes.proofPath!,
-    avmCircuitInputs.publicInputs,
-    logger,
-  );
-
-  if (verificationResult.status === BB_RESULT.FAILURE) {
-    throw new Error(`AVM V2 proof verification failed: ${verificationResult.reason}`);
+  // Explicit verify pass against the serialized public inputs (matches the legacy binary flow).
+  const piBuffer = avmCircuitInputs.publicInputs.serializeWithMessagePack();
+  const { verified: reVerified } = await factory.withFreshInstance(i => i.verifyAvmProof(proofFields, piBuffer));
+  if (!reVerified) {
+    throw new Error('AVM V2 proof verification failed');
   }
 
   return {
diff --git a/yarn-project/kv-store/bootstrap.sh b/yarn-project/kv-store/bootstrap.sh
new file mode 100755
index 000000000000..0f4d344a8812
--- /dev/null
+++ b/yarn-project/kv-store/bootstrap.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+source $(git rev-parse --show-toplevel)/ci3/source_bootstrap
+
+hash=$(../bootstrap.sh hash)
+
+function test_cmds {
+  # Node tests (mocha): files outside the browser-test and bench dirs.
+  # Mirrors .mocharc.json's spec.
+  for test in src/**/!(indexeddb|sqlite-opfs|bench)/*.test.ts; do
+    echo "$hash yarn-project/kv-store/scripts/run_test.sh $test"
+  done
+
+  # Browser tests (vitest + chromium). Each file runs in its own ISOLATE
+  # container — running multiple files in a single vitest invocation
+  # triggers a CDP teardown deadlock on the 2-CPU CI executor. See
+  # scripts/run-browser-tests.sh for the root-cause analysis.
+  for test in src/indexeddb/*.test.ts src/sqlite-opfs/*.test.ts; do
+    echo "$hash:ISOLATE=1 yarn-project/kv-store/scripts/run_test.sh $test"
+  done
+}
+
+case "$cmd" in
+  "")
+    ;;
+  *)
+    default_cmd_handler "$@"
+    ;;
+esac
diff --git a/yarn-project/kv-store/package.json b/yarn-project/kv-store/package.json
index 781fd22c1077..10c1c858e17e 100644
--- a/yarn-project/kv-store/package.json
+++ b/yarn-project/kv-store/package.json
@@ -16,9 +16,9 @@
     "build:dev": "../scripts/tsc.sh --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
     "test:node": "NODE_NO_WARNINGS=1 mocha --config ./.mocharc.json",
-    "test:browser": "vitest run --config ./vitest.config.ts",
+    "test:browser": "bash scripts/run-browser-tests.sh",
     "bench:browser": "VITE_BENCH=1 vitest run --config ./vitest.config.ts src/bench",
-    "test": "yarn test:node",
+    "test": "yarn test:node && yarn test:browser",
     "test:jest": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
   },
   "inherits": [
@@ -30,8 +30,8 @@
     "@aztec/ethereum": "workspace:^",
     "@aztec/foundation": "workspace:^",
     "@aztec/native": "workspace:^",
+    "@aztec/sqlite3mc-wasm": "workspace:^",
     "@aztec/stdlib": "workspace:^",
-    "@sqlite.org/sqlite-wasm": "3.50.4-build1",
     "idb": "^8.0.0",
     "lmdb": "^3.2.0",
     "msgpackr": "^1.11.2",
diff --git a/yarn-project/kv-store/package.local.json b/yarn-project/kv-store/package.local.json
index b430a575259d..87f59219bf36 100644
--- a/yarn-project/kv-store/package.local.json
+++ b/yarn-project/kv-store/package.local.json
@@ -1,5 +1,6 @@
 {
   "scripts": {
-    "test": "yarn test:node"
+    "test": "yarn test:node && yarn test:browser",
+    "test:browser": "bash scripts/run-browser-tests.sh"
   }
 }
diff --git a/yarn-project/kv-store/scripts/probe-test-browser.sh b/yarn-project/kv-store/scripts/probe-test-browser.sh
new file mode 100755
index 000000000000..f0cfb168159a
--- /dev/null
+++ b/yarn-project/kv-store/scripts/probe-test-browser.sh
@@ -0,0 +1,207 @@
+#!/usr/bin/env bash
+# Deep diagnostic wrapper around `yarn test:browser` for investigating
+# browser-test hangs and silent failures.
+#
+# Wraps a single vitest run with a hybrid 1s-steady / 0.1s-burst sampler
+# that captures /proc state (wchan, stack, syscall, fd), cgroup CPU/memory
+# counters, /proc/net socket state counts, and a CPU-availability
+# microbench. When vitest goes silent for >3s the sampler enters dense
+# burst mode and emits a stacks_snapshot every 1s of burst. Outer 90s
+# timeout converts a hang into a clean exit with the full diagnostic dump
+# emitted to stderr by the EXIT trap.
+#
+# Single-tenant invocation:
+#   bash yarn-project/kv-store/scripts/probe-test-browser.sh
+#
+# Parallel invocation (avoids tmp-path collisions across slots):
+#   DIAG_DIR=/tmp/diag.$$ bash yarn-project/kv-store/scripts/probe-test-browser.sh
+#
+# Was used to root-cause the kv-store CDP teardown deadlock that
+# scripts/run-browser-tests.sh now works around; kept for future regression
+# debugging. scripts/repro-browser-hang.sh runs this in a parallel grind
+# under docker_isolate constraints.
+
+cd "$(dirname "$0")/.."
+
+DIAG_DIR=${DIAG_DIR:-/tmp/diag}
+PROBE_LOG=$DIAG_DIR/probe.log
+STACKS_LOG=$DIAG_DIR/stacks.log
+VITEST_LOG=$DIAG_DIR/vitest.log
+mkdir -p "$DIAG_DIR"
+: > "$PROBE_LOG"
+: > "$STACKS_LOG"
+: > "$VITEST_LOG"
+
+echo "probe-test-browser v2: starting at $(date +%T) (pid $$)" >&2
+
+pids_of_interest() {
+  pgrep -f 'chrom|node|vitest|esbuild|yarn' 2>/dev/null
+}
+
+# Force fixed CPU demand and measure what fraction we actually got.
+# ratio = (user+sys)/real. ~1.0 = full CPU; <0.5 = heavily preempted by host.
+# Disambiguates "processes not asking for CPU" (scenario A) from "host not
+# scheduling us" (scenario B) when cgroup counters are flat.
+microbench() {
+  local TIMEFORMAT='microbench: real=%R user=%U sys=%S'
+  { time awk 'BEGIN{x=0; for(i=0;i<100000;i++) x+=i*i; print x > "/dev/null"}' \
+    </dev/null 2>/dev/null; } 2>&1
+}
+
+snapshot() {
+  local tag="$1"
+  echo "=== $(date +%T.%N | cut -c1-12) $tag ==="
+  echo "-- /tmp --"
+  df -h /tmp 2>/dev/null | tail -1
+  du -sh /tmp 2>/dev/null
+  echo "-- cgroup mem --"
+  if [ -r /sys/fs/cgroup/memory.current ]; then
+    awk '{printf "current %d bytes (%.0f MB)\n", $1, $1/1048576}' /sys/fs/cgroup/memory.current
+    cat /sys/fs/cgroup/memory.events 2>/dev/null
+  fi
+  echo "-- cgroup cpu --"
+  cat /sys/fs/cgroup/cpu.stat 2>/dev/null
+  echo "-- top by rss --"
+  ps -eo pid,ppid,stat,rss,pcpu,wchan:20,comm --sort=-rss --no-headers 2>/dev/null | head -15
+  echo "-- procs of interest --"
+  for pid in $(pids_of_interest); do
+    [ -d "/proc/$pid" ] || continue
+    local state threads rss_kb wchan cmd
+    state=$(awk '{print $3}' "/proc/$pid/stat" 2>/dev/null)
+    wchan=$(cat "/proc/$pid/wchan" 2>/dev/null)
+    rss_kb=$(awk '/^VmRSS:/{print $2}' "/proc/$pid/status" 2>/dev/null)
+    threads=$(awk '/^Threads:/{print $2}' "/proc/$pid/status" 2>/dev/null)
+    cmd=$({ tr '\0' ' ' < "/proc/$pid/cmdline"; } 2>/dev/null | cut -c1-120)
+    echo "pid=$pid state=$state threads=$threads rss=${rss_kb}kB wchan=$wchan cmd=$cmd"
+  done
+  # TCP state hex (col 4): 01=ESTABLISHED 04=FIN_WAIT1 05=FIN_WAIT2 06=TIME_WAIT
+  # 07=CLOSE 08=CLOSE_WAIT 09=LAST_ACK 0A=LISTEN 0B=CLOSING
+  echo "-- tcp4 sockets (state counts) --"
+  awk 'NR>1{print $4}' /proc/net/tcp 2>/dev/null | sort | uniq -c
+  echo "-- tcp6 sockets (state counts) --"
+  awk 'NR>1{print $4}' /proc/net/tcp6 2>/dev/null | sort | uniq -c
+  # Unix socket state (col 6): 01=SS_UNCONNECTED 02=SS_CONNECTING 03=SS_CONNECTED
+  # 04=SS_DISCONNECTING — CDP/vitest IPC is typically over SS_CONNECTED unix sockets.
+  echo "-- unix sockets (state counts) --"
+  awk 'NR>1{print $6}' /proc/net/unix 2>/dev/null | sort | uniq -c
+}
+
+stacks_snapshot() {
+  local tag="$1"
+  echo "=== $(date +%T.%N | cut -c1-12) $tag ==="
+  echo "-- lsof tcp/unix (-n -P, head -40) --"
+  lsof -n -P -i TCP 2>/dev/null | head -25
+  lsof -n -P -U 2>/dev/null | head -15
+  for pid in $(pids_of_interest); do
+    [ -d "/proc/$pid" ] || continue
+    echo "--- pid=$pid ---"
+    { tr '\0' ' ' < "/proc/$pid/cmdline"; } 2>/dev/null | cut -c1-140
+    echo ""
+    # /proc/$pid/syscall: syscall_nr arg0..arg5 sp pc (readable by process owner)
+    echo "syscall:"
+    cat "/proc/$pid/syscall" 2>/dev/null | head -1
+    # /proc/$pid/stack: may require CAP_SYS_ADMIN; print only if non-empty
+    local stack_content
+    stack_content=$(cat "/proc/$pid/stack" 2>/dev/null | head -15)
+    if [ -n "$stack_content" ]; then
+      echo "kernel stack:"
+      echo "$stack_content"
+    fi
+    # Per-thread wchan — tells us if threads are stuck on different things
+    echo "thread wchans (sorted | uniq -c):"
+    for t in /proc/$pid/task/*/wchan; do
+      cat "$t" 2>/dev/null
+      echo ""
+    done | sort | uniq -c | sort -rn | head -10
+    echo "socket/pipe fds:"
+    for fd in /proc/$pid/fd/*; do
+      local target
+      target=$(readlink "$fd" 2>/dev/null) || continue
+      case "$target" in
+        socket:*|pipe:*|anon_inode:*) echo "  $(basename "$fd") -> $target" ;;
+      esac
+    done
+  done
+}
+
+probe_loop() {
+  local last_vitest_size=0
+  local silent_since
+  silent_since=$(date +%s)
+  local burst_count=0
+  local burst_cap=200   # ~20s dense sampling at 0.1s
+  local steady_count=0  # increments once per steady iteration
+  while true; do
+    local now_s cur_size silent_for
+    now_s=$(date +%s)
+    cur_size=$(stat -c %s "$VITEST_LOG" 2>/dev/null || echo 0)
+    if [ "$cur_size" != "$last_vitest_size" ]; then
+      last_vitest_size=$cur_size
+      silent_since=$now_s
+      burst_count=0
+    fi
+    silent_for=$((now_s - silent_since))
+
+    if [ "$silent_for" -ge 3 ] && [ "$burst_count" -lt "$burst_cap" ]; then
+      {
+        snapshot "burst(${silent_for}s silent)"
+        # During a hang, microbench every burst snapshot — it's the core
+        # signal for "is the host giving us CPU?" Overhead is irrelevant
+        # since tests aren't running.
+        microbench
+      } >> "$PROBE_LOG" 2>&1
+      # Stacks every 10th burst tick (~every 1s of burst) to keep log size sane
+      if [ $((burst_count % 10)) -eq 0 ]; then
+        stacks_snapshot "burst(${silent_for}s silent)" >> "$STACKS_LOG" 2>&1
+      fi
+      burst_count=$((burst_count + 1))
+      sleep 0.1
+    else
+      {
+        snapshot "steady"
+        # Microbench every 5th steady iteration to bound CPU overhead
+        # while tests are actually running (~0.4% vs tests' CPU budget).
+        if [ $((steady_count % 5)) -eq 0 ]; then
+          microbench
+        fi
+      } >> "$PROBE_LOG" 2>&1
+      # Periodic in-flight stacks baseline — gives us a "healthy waiting"
+      # reference to diff against burst-triggered dumps during a hang.
+      if [ $((steady_count % 10)) -eq 0 ]; then
+        stacks_snapshot "steady(tick=${steady_count})" >> "$STACKS_LOG" 2>&1
+      fi
+      steady_count=$((steady_count + 1))
+      sleep 1
+    fi
+  done
+}
+
+probe_loop &
+PROBE_PID=$!
+
+cleanup() {
+  local rc=$?
+  kill "$PROBE_PID" 2>/dev/null
+  wait "$PROBE_PID" 2>/dev/null
+  # One last stacks snapshot at the moment of failure
+  stacks_snapshot "cleanup" >> "$STACKS_LOG" 2>&1
+  {
+    echo ""
+    echo "=== VITEST LOG (tail -300) ==="
+    tail -300 "$VITEST_LOG"
+    echo ""
+    echo "=== FULL PROBE LOG ($(wc -l < "$PROBE_LOG") lines) ==="
+    cat "$PROBE_LOG"
+    echo ""
+    echo "=== FULL STACKS LOG ($(wc -l < "$STACKS_LOG") lines, test exit=$rc) ==="
+    cat "$STACKS_LOG"
+    echo "=== END DIAGNOSTICS ==="
+  } >&2
+  exit "$rc"
+}
+trap cleanup EXIT
+
+# Tee vitest output to a file so the probe loop can detect silence.
+# pipefail ensures we surface timeout's exit code, not tee's.
+set -o pipefail
+timeout -v 90s yarn test:browser 2>&1 | tee "$VITEST_LOG"
diff --git a/yarn-project/kv-store/scripts/repro-browser-hang.sh b/yarn-project/kv-store/scripts/repro-browser-hang.sh
new file mode 100755
index 000000000000..84f3ff75f871
--- /dev/null
+++ b/yarn-project/kv-store/scripts/repro-browser-hang.sh
@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+# Reproduces the kv-store browser-test hang under CI3 ISOLATE constraints.
+#
+# Failure mode: CDP CLOSE_WAIT deadlock between vitest and chromium's network
+# service at test-file transitions. Vitest closes 6 of 10 CDP TCP connections
+# on file-boundary teardown; chromium's network-service event loop, starved of
+# CPU under --cpus=2, never drains the closed sockets. Vitest's teardown hangs
+# waiting for the close-handshake. Both processes end up with zero on-CPU
+# threads. Outer `timeout -v 90s` in probe-test-browser.sh fires SIGTERM after
+# 90s of silence.
+#
+# Crucially, this does NOT reproduce on unconstrained hardware — chromium has
+# enough cores to drain sockets immediately. Must run inside docker_isolate
+# (--cpus=2 --memory=8g --tmpfs /tmp:exec,size=1g) to surface the hang.
+#
+# Usage:
+#   bash yarn-project/kv-store/scripts/repro-browser-hang.sh [JOBS]
+#
+#   JOBS: parallel container count (default 8). Higher = faster repro,
+#   higher RAM/CPU ceiling on host. 8 reliably catches a hang in ~3min on
+#   a multi-core box.
+#
+# On hang: parallel halts (rc=124) and the failing job's full probe diagnostic
+# (vitest tail + probe.log + stacks.log) is dumped to this script's stderr by
+# dump_fail. Capture stderr to a file if you want to keep it.
+#
+# Example: capture both streams for later analysis
+#   bash yarn-project/kv-store/scripts/repro-browser-hang.sh 8 > /tmp/repro.log 2>&1
+
+set -uo pipefail
+
+cd "$(git rev-parse --show-toplevel)"
+
+JOBS=${1:-8}
+
+echo "=== repro-browser-hang start: $(date -Is), jobs=$JOBS ==="
+while true; do
+  echo './ci3/dump_fail "CPUS=2 MEM=8g TMPFS_SIZE=1g ./ci3/docker_isolate \"cd yarn-project/kv-store && bash scripts/probe-test-browser.sh\"" >/dev/null'
+done | parallel -j"$JOBS" --halt now,fail=1
+rc=$?
+echo "=== repro-browser-hang end (parallel rc=$rc): $(date -Is) ==="
+exit $rc
diff --git a/yarn-project/kv-store/scripts/run-browser-tests.sh b/yarn-project/kv-store/scripts/run-browser-tests.sh
new file mode 100755
index 000000000000..b13f9f662c28
--- /dev/null
+++ b/yarn-project/kv-store/scripts/run-browser-tests.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+# Local-dev entrypoint for `yarn test:browser`: runs every browser test file
+# in its own vitest process, sequentially. Delegates per-file dispatch to
+# scripts/run_test.sh (which CI also uses for per-file fan-out).
+#
+# Why not a single `vitest run` over all files: vitest+chromium have a CDP
+# teardown deadlock at test-file transitions under CPU-constrained
+# environments (CI3 ISOLATE: --cpus=2). Vitest closes a cohort of CDP TCP
+# connections when switching files; chromium's network service can't drain
+# them fast enough under contention; vitest's teardown blocks indefinitely
+# on the close-handshake. By running each file in a separate vitest process
+# the close-handshake only happens at process exit, avoiding the cross-file
+# teardown path entirely. See scripts/repro-browser-hang.sh for the repro.
+set -euo pipefail
+
+cd "$(dirname "$0")/.."
+
+files=$(find src/indexeddb src/sqlite-opfs -name '*.test.ts' 2>/dev/null | sort)
+
+if [ -z "$files" ]; then
+  echo "No test files found in src/indexeddb or src/sqlite-opfs"
+  exit 0
+fi
+
+count=$(echo "$files" | wc -l)
+echo "Running $count browser test files (one vitest process per file)"
+
+i=0
+for f in $files; do
+  i=$((i + 1))
+  echo "==> [$i/$count] $f"
+  bash scripts/run_test.sh "$f"
+done
diff --git a/yarn-project/kv-store/scripts/run_test.sh b/yarn-project/kv-store/scripts/run_test.sh
new file mode 100755
index 000000000000..999aa9dd3271
--- /dev/null
+++ b/yarn-project/kv-store/scripts/run_test.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+# Runs a single kv-store test file. Dispatches to vitest+chromium for
+# browser tests (under src/indexeddb or src/sqlite-opfs) and to mocha for
+# everything else. Emitted by yarn-project/kv-store/bootstrap.sh test_cmds
+# for CI per-file fan-out and runnable directly for local reproduction:
+#
+#   yarn-project/kv-store/scripts/run_test.sh src/lmdb-v2/store.test.ts
+source $(git rev-parse --show-toplevel)/ci3/source
+
+test=${1:?"Usage: $0 <test-file relative to kv-store/>"}
+cd ..
+
+case "$test" in
+  src/indexeddb/*|src/sqlite-opfs/*)
+    exec yarn vitest run --config ./vitest.config.ts "$test"
+    ;;
+  *)
+    NODE_NO_WARNINGS=1 exec yarn mocha --config ./.mocharc.json "$test"
+    ;;
+esac
diff --git a/yarn-project/kv-store/src/bench/sqlite-opfs-encrypted/map_bench.test.ts b/yarn-project/kv-store/src/bench/sqlite-opfs-encrypted/map_bench.test.ts
new file mode 100644
index 000000000000..04432e2f8123
--- /dev/null
+++ b/yarn-project/kv-store/src/bench/sqlite-opfs-encrypted/map_bench.test.ts
@@ -0,0 +1,36 @@
+/**
+ * Map benchmark suite for the SQLite-OPFS backend with page-level encryption
+ * enabled (sqlite3mc ChaCha20). Runs the exact same workload as
+ * `bench/sqlite-opfs/map_bench.test.ts` — the delta between the two runs is
+ * the full cost of page-level encryption on reads and writes.
+ *
+ * Uses persistent OPFS-backed stores (sqlite3mc does not support encryption
+ * on :memory: databases). Each run creates its own unique SAH Pool directory.
+ *
+ * Skipped by default; set VITE_BENCH=1 (and VITE_SQLITE_OPFS=1) to run.
+ */
+import { createLogger } from '@aztec/foundation/log';
+
+import { mockLogger } from '../../interfaces/utils.js';
+import { AztecSQLiteOPFSStore } from '../../sqlite-opfs/store.js';
+import { describeAztecMapBench } from '../shared_map_bench.js';
+
+const shouldRun = (import.meta as ImportMeta & { env?: { VITE_BENCH?: string } }).env?.VITE_BENCH === '1';
+
+if (shouldRun) {
+  describeAztecMapBench(
+    'SQLite-OPFS (chacha20)',
+    () => {
+      const key = globalThis.crypto.getRandomValues(new Uint8Array(32));
+      const name = `bench-enc-${Date.now()}`;
+      const dir = `/bench-enc-pool-${Date.now()}`;
+      return AztecSQLiteOPFSStore.open(mockLogger, name, false, dir, key);
+    },
+    createLogger('kv-store:map:benchmarks:sqlite-opfs-chacha20'),
+    () => {},
+  );
+} else {
+  describe.skip('SQLite-OPFS (chacha20) Map benchmarks (set VITE_BENCH=1 to run)', () => {
+    it('skipped', () => {});
+  });
+}
diff --git a/yarn-project/kv-store/src/interfaces/index.ts b/yarn-project/kv-store/src/interfaces/index.ts
index 4bd8e29ddc4e..7b2f8ff7752a 100644
--- a/yarn-project/kv-store/src/interfaces/index.ts
+++ b/yarn-project/kv-store/src/interfaces/index.ts
@@ -6,4 +6,4 @@ export * from './store.js';
 export * from './set.js';
 export * from './multi_map.js';
 export { mapRange } from './common.js';
-export type { CustomRange, Range, StoreSize } from './common.js';
+export type { CustomRange, Key, Range, StoreSize } from './common.js';
diff --git a/yarn-project/kv-store/src/sqlite-opfs/encrypted_store.test.ts b/yarn-project/kv-store/src/sqlite-opfs/encrypted_store.test.ts
new file mode 100644
index 000000000000..c5903d8b1820
--- /dev/null
+++ b/yarn-project/kv-store/src/sqlite-opfs/encrypted_store.test.ts
@@ -0,0 +1,89 @@
+/**
+ * Tests for sqlite3mc-backed page-level encryption.
+ * Exercises the `encryptionKey` parameter added to `AztecSQLiteOPFSStore.open()`.
+ * Mixes ephemeral and persistent stores so we cover both `:memory:` and OPFS paths.
+ */
+import { describe, expect, it } from 'vitest';
+
+import { mockLogger } from '../interfaces/utils.js';
+import { AztecSQLiteOPFSStore } from './store.js';
+
+function randomKey(): Uint8Array {
+  return globalThis.crypto.getRandomValues(new Uint8Array(32));
+}
+
+/**
+ * Clone a key into a fresh Uint8Array. `AztecSQLiteOPFSStore.open()` transfers
+ * the key's ArrayBuffer to the worker (detaching it on the caller side), so
+ * callers that open multiple stores or re-use a key must pass a copy per call.
+ */
+function cloneKey(k: Uint8Array): Uint8Array {
+  return new Uint8Array(k);
+}
+
+describe('AztecSQLiteOPFSStore with encryption', () => {
+  it('rejects keys that are not 32 bytes', async () => {
+    const short = new Uint8Array(16);
+    await expect(AztecSQLiteOPFSStore.open(mockLogger, undefined, true, undefined, short)).rejects.toThrow(
+      /encryptionKey must be 32 bytes/,
+    );
+  });
+
+  it('rejects encryption on ephemeral (:memory:) stores', async () => {
+    const key = randomKey();
+    await expect(AztecSQLiteOPFSStore.open(mockLogger, undefined, true, undefined, key)).rejects.toThrow(
+      /not supported for ephemeral/,
+    );
+  });
+
+  it('round-trips values with the same key (persistent)', async () => {
+    const key = randomKey();
+    const name = `test-enc-${Date.now()}`;
+    const dir = `/test-enc-pool-${Date.now()}`;
+    const a = await AztecSQLiteOPFSStore.open(mockLogger, name, false, dir, cloneKey(key));
+    const mapA = a.openMap<string, string>('m');
+    await mapA.set('k1', 'v1');
+    await a.close();
+
+    const b = await AztecSQLiteOPFSStore.open(mockLogger, name, false, dir, cloneKey(key));
+    const mapB = b.openMap<string, string>('m');
+    expect(await mapB.getAsync('k1')).toBe('v1');
+    await b.delete();
+  });
+
+  it('fails to open with the wrong key', async () => {
+    const key = randomKey();
+    const name = `test-wrong-${Date.now()}`;
+    const dir = `/test-wrong-pool-${Date.now()}`;
+    const a = await AztecSQLiteOPFSStore.open(mockLogger, name, false, dir, cloneKey(key));
+    await a.openMap<string, string>('m').set('k1', 'v1');
+    await a.close();
+
+    await expect(async () => {
+      const b = await AztecSQLiteOPFSStore.open(mockLogger, name, false, dir, randomKey());
+      await b.openMap<string, string>('m').getAsync('k1');
+      await b.close();
+    }).rejects.toThrow();
+
+    const c = await AztecSQLiteOPFSStore.open(mockLogger, name, false, dir, cloneKey(key));
+    await c.delete();
+  });
+
+  it('fails to open an encrypted DB without a key', async () => {
+    const key = randomKey();
+    const name = `test-nokey-${Date.now()}`;
+    const dir = `/test-nokey-pool-${Date.now()}`;
+    const a = await AztecSQLiteOPFSStore.open(mockLogger, name, false, dir, cloneKey(key));
+    await a.openMap<string, string>('m').set('k1', 'v1');
+    await a.close();
+
+    await expect(async () => {
+      const b = await AztecSQLiteOPFSStore.open(mockLogger, name, false, dir);
+      await b.openMap<string, string>('m').getAsync('k1');
+      await b.close();
+    }).rejects.toThrow();
+
+    const c = await AztecSQLiteOPFSStore.open(mockLogger, name, false, dir, cloneKey(key));
+    await c.delete();
+  });
+});
diff --git a/yarn-project/kv-store/src/sqlite-opfs/encrypted_store_smoke.test.ts b/yarn-project/kv-store/src/sqlite-opfs/encrypted_store_smoke.test.ts
new file mode 100644
index 000000000000..34e3fa396d34
--- /dev/null
+++ b/yarn-project/kv-store/src/sqlite-opfs/encrypted_store_smoke.test.ts
@@ -0,0 +1,78 @@
+/**
+ * Smoke test: runs the same basic read/write dance against every kv-store interface
+ * using an encrypted store, to verify the interfaces are oblivious to the cipher
+ * layer. Each test uses its own persistent OPFS directory because sqlite3mc does
+ * not support encryption on ephemeral (:memory:) stores.
+ */
+import { afterEach, describe, expect, it } from 'vitest';
+
+import { mockLogger } from '../interfaces/utils.js';
+import { AztecSQLiteOPFSStore } from './store.js';
+
+function randomKey(): Uint8Array {
+  return globalThis.crypto.getRandomValues(new Uint8Array(32));
+}
+
+describe('encrypted store smoke: interfaces', () => {
+  let openedStore: AztecSQLiteOPFSStore | undefined;
+
+  afterEach(async () => {
+    if (openedStore) {
+      await openedStore.delete();
+      openedStore = undefined;
+    }
+  });
+
+  async function openStore(label: string): Promise<AztecSQLiteOPFSStore> {
+    const key = randomKey();
+    const name = `smoke-${label}-${Date.now()}`;
+    const dir = `/smoke-${label}-pool-${Date.now()}`;
+    const s = await AztecSQLiteOPFSStore.open(mockLogger, name, false, dir, key);
+    openedStore = s;
+    return s;
+  }
+
+  it('AztecMap', async () => {
+    const s = await openStore('map');
+    const m = s.openMap<string, number>('m');
+    await m.set('a', 1);
+    await m.set('b', 2);
+    expect(await m.getAsync('a')).toBe(1);
+    expect(await m.getAsync('b')).toBe(2);
+  });
+
+  it('AztecSet', async () => {
+    const s = await openStore('set');
+    const set = s.openSet<string>('s');
+    await set.add('a');
+    await set.add('b');
+    expect(await set.hasAsync('a')).toBe(true);
+    expect(await set.hasAsync('z')).toBe(false);
+  });
+
+  it('AztecSingleton', async () => {
+    const s = await openStore('singleton');
+    const sing = s.openSingleton<{ n: number }>('sg');
+    await sing.set({ n: 42 });
+    expect(await sing.getAsync()).toEqual({ n: 42 });
+  });
+
+  it('AztecArray', async () => {
+    const s = await openStore('array');
+    const arr = s.openArray<string>('a');
+    await arr.push('x', 'y');
+    expect(await arr.lengthAsync()).toBe(2);
+  });
+
+  it('AztecMultiMap', async () => {
+    const s = await openStore('multimap');
+    const mm = s.openMultiMap<string, number>('mm');
+    await mm.set('k', 1);
+    await mm.set('k', 2);
+    const vals: number[] = [];
+    for await (const v of mm.getValuesAsync('k')) {
+      vals.push(v);
+    }
+    expect(vals.sort()).toEqual([1, 2]);
+  });
+});
diff --git a/yarn-project/kv-store/src/sqlite-opfs/index.ts b/yarn-project/kv-store/src/sqlite-opfs/index.ts
index 27a0dfd26c3a..18153d6439d7 100644
--- a/yarn-project/kv-store/src/sqlite-opfs/index.ts
+++ b/yarn-project/kv-store/src/sqlite-opfs/index.ts
@@ -25,3 +25,13 @@ export async function createStore(
 export function openTmpStore(ephemeral: boolean = false): Promise<AztecSQLiteOPFSStore> {
   return AztecSQLiteOPFSStore.open(createLogger('kv-store:sqlite-opfs'), undefined, ephemeral);
 }
+
+/**
+ * Convenience helper for tests and consumers that want an encrypted sqlite-opfs
+ * store without dealing with the full `open()` parameter order. Key must be 32
+ * bytes. Creates a fresh persistent store (sqlite3mc does not support encryption
+ * on ephemeral `:memory:` databases) in an auto-generated OPFS directory.
+ */
+export function openEncryptedStore(encryptionKey: Uint8Array, name?: string, poolDirectory?: string) {
+  return AztecSQLiteOPFSStore.open(createLogger('kv-store:sqlite-opfs'), name, false, poolDirectory, encryptionKey);
+}
diff --git a/yarn-project/kv-store/src/sqlite-opfs/messages.ts b/yarn-project/kv-store/src/sqlite-opfs/messages.ts
index f6229ac1d43c..98d84e9c5851 100644
--- a/yarn-project/kv-store/src/sqlite-opfs/messages.ts
+++ b/yarn-project/kv-store/src/sqlite-opfs/messages.ts
@@ -11,7 +11,7 @@ export type SqlValue = string | number | bigint | null | Uint8Array;
 export type ResultRow = SqlValue[];
 
 export type WorkerRequest =
-  | { type: 'init'; id: number; dbName: string; ephemeral: boolean; poolDirectory?: string }
+  | { type: 'init'; id: number; dbName: string; ephemeral: boolean; poolDirectory?: string; encryptionKey?: Uint8Array }
   | { type: 'close'; id: number }
   | { type: 'deleteDb'; id: number; dbName: string }
   | { type: 'run'; id: number; sql: string; bind?: SqlValue[] }
diff --git a/yarn-project/kv-store/src/sqlite-opfs/store.ts b/yarn-project/kv-store/src/sqlite-opfs/store.ts
index 4b8891782f02..195296b667c5 100644
--- a/yarn-project/kv-store/src/sqlite-opfs/store.ts
+++ b/yarn-project/kv-store/src/sqlite-opfs/store.ts
@@ -68,18 +68,48 @@ export class AztecSQLiteOPFSStore implements AztecAsyncKVStore {
    * Pass `poolDirectory` to place the SAH Pool in a non-default OPFS subdirectory —
    * required when multiple stores coexist in the same tab, because the SAH Pool holds
    * an exclusive lock on its directory.
+   *
+   * Pass `encryptionKey` (exactly 32 bytes) to enable at-rest encryption via sqlite3mc's
+   * ChaCha20 page cipher. The key buffer is **transferred** to the worker — its
+   * ArrayBuffer detaches on the caller side after `postMessage`. This is intentional:
+   * the API encodes a one-key-one-owner invariant. A caller that wants to use the same
+   * key for multiple stores must explicitly clone it per call (e.g.
+   * `new Uint8Array(savedKey)`), making the duplication a visible, deliberate decision
+   * rather than a silent structured-clone operation. The default path (one `.open()`,
+   * one consumption of the key) leaves zero key bytes on the main thread after the call.
    */
   static async open(
     log: Logger,
     name?: string,
     ephemeral: boolean = false,
     poolDirectory?: string,
+    encryptionKey?: Uint8Array,
   ): Promise<AztecSQLiteOPFSStore> {
+    if (encryptionKey !== undefined && encryptionKey.length !== 32) {
+      throw new Error(`encryptionKey must be 32 bytes (got ${encryptionKey.length})`);
+    }
+    if (encryptionKey !== undefined && ephemeral) {
+      throw new Error('encryptionKey is not supported for ephemeral (:memory:) stores');
+    }
     const dbName = name && !ephemeral ? name : `tmp-${globalThis.crypto.getRandomValues(new Uint8Array(8)).join('')}`;
-    log.debug(`Opening SQLite-OPFS ${ephemeral ? 'ephemeral ' : ''}database ${dbName}`);
+    log.debug(
+      `Opening SQLite-OPFS ${ephemeral ? 'ephemeral ' : ''}${encryptionKey ? 'encrypted ' : ''}database ${dbName}`,
+    );
     const worker = new Worker(new URL('./worker.js', import.meta.url), { type: 'module' });
     const store = new AztecSQLiteOPFSStore(worker, dbName, log, ephemeral);
-    await store.#sendRequest({ type: 'init', id: store.#allocId(), dbName, ephemeral, poolDirectory });
+    // Transfer (not clone) the key buffer to the worker so we don't leave a
+    // second copy on the main thread. Caveat: this detaches the caller's
+    // encryptionKey.buffer — subsequent reads from the same Uint8Array are empty.
+    const transfer = encryptionKey ? [encryptionKey.buffer as ArrayBuffer] : undefined;
+    try {
+      await store.#sendRequest(
+        { type: 'init', id: store.#allocId(), dbName, ephemeral, poolDirectory, encryptionKey },
+        transfer,
+      );
+    } catch (err) {
+      worker.terminate();
+      throw err;
+    }
     return store;
   }
 
@@ -230,7 +260,7 @@ export class AztecSQLiteOPFSStore implements AztecAsyncKVStore {
     this.#pending.clear();
   }
 
-  #sendRequest(req: WorkerRequest): Promise<WorkerResponse> {
+  #sendRequest(req: WorkerRequest, transfer?: Transferable[]): Promise<WorkerResponse> {
     return new Promise<WorkerResponse>((resolve, reject) => {
       this.#pending.set(req.id, {
         resolve: resp => {
@@ -242,7 +272,11 @@ export class AztecSQLiteOPFSStore implements AztecAsyncKVStore {
         },
         reject,
       });
-      this.#worker.postMessage(req);
+      if (transfer && transfer.length > 0) {
+        this.#worker.postMessage(req, transfer);
+      } else {
+        this.#worker.postMessage(req);
+      }
     });
   }
 }
diff --git a/yarn-project/kv-store/src/sqlite-opfs/worker.ts b/yarn-project/kv-store/src/sqlite-opfs/worker.ts
index 9188021db677..30ede24f3567 100644
--- a/yarn-project/kv-store/src/sqlite-opfs/worker.ts
+++ b/yarn-project/kv-store/src/sqlite-opfs/worker.ts
@@ -1,5 +1,5 @@
 /// <reference lib="webworker" />
-import sqlite3InitModule, { type Database, type SAHPoolUtil, type Sqlite3Static } from '@sqlite.org/sqlite-wasm';
+import sqlite3InitModule, { type Database, type SAHPoolUtil, type Sqlite3Static } from '@aztec/sqlite3mc-wasm';
 
 import type { ResultRow, SqlValue, WorkerRequest, WorkerResponse } from './messages.js';
 
@@ -20,6 +20,7 @@ const SCHEMA_SQL = `
 
 const DEFAULT_SAH_POOL_DIRECTORY = '.aztec-kv';
 const SAH_POOL_VFS_NAME = 'aztec-kv-opfs';
+const MC_SAH_POOL_VFS_NAME = `multipleciphers-${SAH_POOL_VFS_NAME}`;
 
 let sqlite3: Sqlite3Static | undefined;
 let pool: SAHPoolUtil | undefined;
@@ -28,24 +29,60 @@ let dbPath: string | undefined;
 
 async function ensurePool(directory: string): Promise<SAHPoolUtil> {
   sqlite3 ??= await sqlite3InitModule();
+  const s = sqlite3;
   if (!pool) {
-    pool = await sqlite3.installOpfsSAHPoolVfs({
+    pool = await s.installOpfsSAHPoolVfs({
       name: SAH_POOL_VFS_NAME,
       directory,
       initialCapacity: 8,
     });
+    // Register a sqlite3mc-wrapped VFS pointing at our SAH Pool VFS.
+    // Encrypted DBs must be opened through this wrapper so sqlite3mc can
+    // intercept file I/O; plain DBs continue using the SAH Pool VFS directly.
+    // The wrapper name is `multipleciphers-<underlying>`.
+    (s.capi as unknown as { sqlite3mc_vfs_create(name: string, makeDefault: number): number }).sqlite3mc_vfs_create(
+      SAH_POOL_VFS_NAME,
+      0,
+    );
   }
-  return pool;
+  return pool!;
 }
 
-async function handleInit(dbName: string, ephemeral: boolean, directory?: string): Promise<void> {
+/**
+ * Applies sqlite3mc's ChaCha20 page cipher using a pre-derived 32-byte key.
+ * The PRAGMAs must run before any schema DDL so sqlite3mc can decrypt existing
+ * pages and encrypt new ones. Zeroes the caller-held key array after the PRAGMA
+ * completes to minimize residency of the raw key bytes outside sqlite3mc's heap.
+ */
+function applyEncryptionKey(conn: Database, key: Uint8Array): void {
+  const hex = Array.from(key, b => b.toString(16).padStart(2, '0')).join('');
+  conn.exec(`PRAGMA cipher = 'chacha20'`);
+  conn.exec(`PRAGMA key = "x'${hex}'"`);
+  key.fill(0);
+}
+
+async function handleInit(
+  dbName: string,
+  ephemeral: boolean,
+  directory?: string,
+  encryptionKey?: Uint8Array,
+): Promise<void> {
   sqlite3 ??= await sqlite3InitModule();
+  const s = sqlite3;
+  if (encryptionKey !== undefined && ephemeral) {
+    throw new Error('encryptionKey is not supported for ephemeral (:memory:) stores');
+  }
   if (ephemeral) {
-    db = new sqlite3.oo1.DB(':memory:', 'c');
+    db = new s.oo1.DB(':memory:', 'c');
   } else {
-    const p = await ensurePool(directory ?? DEFAULT_SAH_POOL_DIRECTORY);
+    await ensurePool(directory ?? DEFAULT_SAH_POOL_DIRECTORY);
     dbPath = normalizeDbPath(dbName);
-    db = new p.OpfsSAHPoolDb(dbPath);
+    if (encryptionKey !== undefined) {
+      db = new s.oo1.DB({ filename: dbPath, flags: 'c', vfs: MC_SAH_POOL_VFS_NAME });
+      applyEncryptionKey(db, encryptionKey);
+    } else {
+      db = new pool!.OpfsSAHPoolDb(dbPath);
+    }
   }
   runSql(SCHEMA_SQL);
 }
@@ -121,7 +158,7 @@ function respond(msg: WorkerResponse): void {
   try {
     switch (req.type) {
       case 'init':
-        await handleInit(req.dbName, req.ephemeral, req.poolDirectory);
+        await handleInit(req.dbName, req.ephemeral, req.poolDirectory, req.encryptionKey);
         return respond({ type: 'ok', id: req.id });
       case 'close':
         handleClose();
diff --git a/yarn-project/kv-store/src/stores/l2_tips_store.test.ts b/yarn-project/kv-store/src/stores/l2_tips_store.test.ts
index 8480313a4c87..6bcb995b5bfd 100644
--- a/yarn-project/kv-store/src/stores/l2_tips_store.test.ts
+++ b/yarn-project/kv-store/src/stores/l2_tips_store.test.ts
@@ -1,5 +1,6 @@
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
 import { openTmpStore } from '@aztec/kv-store/lmdb-v2';
+import { GENESIS_BLOCK_HEADER_HASH } from '@aztec/stdlib/block';
 import { testL2TipsStore } from '@aztec/stdlib/block/test';
 
 import { L2TipsKVStore } from './l2_tips_store.js';
@@ -13,6 +14,6 @@ describe('L2TipsStore', () => {
 
   testL2TipsStore(async () => {
     kvStore = await openTmpStore('test', true);
-    return new L2TipsKVStore(kvStore, 'test');
+    return new L2TipsKVStore(kvStore, 'test', GENESIS_BLOCK_HEADER_HASH);
   });
 });
diff --git a/yarn-project/kv-store/src/stores/l2_tips_store.ts b/yarn-project/kv-store/src/stores/l2_tips_store.ts
index 92cf726c9f99..8d34baa72736 100644
--- a/yarn-project/kv-store/src/stores/l2_tips_store.ts
+++ b/yarn-project/kv-store/src/stores/l2_tips_store.ts
@@ -1,5 +1,5 @@
 import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
-import { type L2BlockTag, L2TipsStoreBase } from '@aztec/stdlib/block';
+import { type BlockHash, type L2BlockTag, L2TipsStoreBase } from '@aztec/stdlib/block';
 import { PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
 
 import type { AztecAsyncMap } from '../interfaces/map.js';
@@ -18,8 +18,9 @@ export class L2TipsKVStore extends L2TipsStoreBase {
   constructor(
     private store: AztecAsyncKVStore,
     namespace: string,
+    initialBlockHash: BlockHash,
   ) {
-    super();
+    super(initialBlockHash);
     this.l2TipsStore = store.openMap([namespace, 'l2_tips'].join('_'));
     this.l2BlockHashesStore = store.openMap([namespace, 'l2_block_hashes'].join('_'));
     this.l2BlockNumberToCheckpointNumberStore = store.openMap(
diff --git a/yarn-project/kv-store/tsconfig.json b/yarn-project/kv-store/tsconfig.json
index be410b72e5b7..e77afb8ea3f1 100644
--- a/yarn-project/kv-store/tsconfig.json
+++ b/yarn-project/kv-store/tsconfig.json
@@ -18,6 +18,9 @@
     {
       "path": "../native"
     },
+    {
+      "path": "../sqlite3mc-wasm"
+    },
     {
       "path": "../stdlib"
     }
diff --git a/yarn-project/kv-store/vitest.config.ts b/yarn-project/kv-store/vitest.config.ts
index cee6d7f49cd1..a1749a863e2b 100644
--- a/yarn-project/kv-store/vitest.config.ts
+++ b/yarn-project/kv-store/vitest.config.ts
@@ -43,24 +43,20 @@ export default defineConfig({
       'idb-keyval',
       'comlink',
     ],
-    // sqlite-wasm ships its own .wasm asset loader; let Vite serve it as a static asset
+    // sqlite3mc-wasm ships its own .wasm asset loader; let Vite serve it as a static asset
     // rather than pre-bundling, per the upstream docs' recommendation.
-    exclude: ['@sqlite.org/sqlite-wasm'],
+    exclude: ['@aztec/sqlite3mc-wasm'],
   },
   test: {
     globals: true,
     reporters: ['verbose'],
     include: [
       './src/indexeddb/**/*.test.ts',
-      // sqlite-opfs browser tests hang intermittently in the 2-CPU CI container
-      // (see https://github.com/AztecProtocol/aztec-packages/pull/22693). The
-      // backend is still experimental — gate these behind VITE_SQLITE_OPFS=1
-      // so they run in dev but don't block the merge-train until the hang is
-      // root-caused.
-      ...(process.env.VITE_SQLITE_OPFS === '1' ? ['./src/sqlite-opfs/**/*.test.ts'] : []),
+      './src/sqlite-opfs/**/*.test.ts',
       // Benchmarks self-skip unless VITE_BENCH=1; include so they're discoverable.
       './src/bench/indexeddb/**/*.test.ts',
       './src/bench/sqlite-opfs/**/*.test.ts',
+      './src/bench/sqlite-opfs-encrypted/**/*.test.ts',
     ],
     // Bench suites do full-population + N-iteration work; default 30s is too tight.
     testTimeout: process.env.VITE_BENCH === '1' ? 300_000 : 30_000,
diff --git a/yarn-project/node-lib/src/actions/snapshot-sync.ts b/yarn-project/node-lib/src/actions/snapshot-sync.ts
index 03775102f909..ad2e4dd9dbf7 100644
--- a/yarn-project/node-lib/src/actions/snapshot-sync.ts
+++ b/yarn-project/node-lib/src/actions/snapshot-sync.ts
@@ -1,4 +1,10 @@
-import { ARCHIVER_DB_VERSION, ARCHIVER_STORE_NAME, type ArchiverConfig, createArchiverStore } from '@aztec/archiver';
+import {
+  ARCHIVER_DB_VERSION,
+  ARCHIVER_STORE_NAME,
+  type ArchiverConfig,
+  createArchiverStore,
+  getArchiverSynchPoint,
+} from '@aztec/archiver';
 import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
 import { type EthereumClientConfig, getPublicClient } from '@aztec/ethereum/client';
 import type { L1ContractsConfig } from '@aztec/ethereum/config';
@@ -66,12 +72,12 @@ export async function trySnapshotSync(config: SnapshotSyncConfig, log: Logger) {
   let archiverL2BlockNumber: number | undefined;
   try {
     [archiverL1BlockNumber, archiverL2BlockNumber] = await Promise.all([
-      archiverStore.getSynchPoint().then(s => s.blocksSynchedTo),
-      archiverStore.getLatestBlockNumber(),
+      getArchiverSynchPoint(archiverStore).then(s => s.blocksSynchedTo),
+      archiverStore.blocks.getLatestL2BlockNumber(),
     ] as const);
   } finally {
     log.verbose(`Closing temporary archiver data store`, { archiverL1BlockNumber, archiverL2BlockNumber });
-    await archiverStore.close();
+    await archiverStore.db.close();
   }
 
   const minL1BlocksToTriggerReplace = config.minL1BlocksToTriggerReplace ?? MIN_L1_BLOCKS_TO_TRIGGER_REPLACE;
diff --git a/yarn-project/p2p/src/client/factory.ts b/yarn-project/p2p/src/client/factory.ts
index 8ad423b3c1b1..8080d68ae005 100644
--- a/yarn-project/p2p/src/client/factory.ts
+++ b/yarn-project/p2p/src/client/factory.ts
@@ -4,7 +4,7 @@ import { type Logger, createLogger } from '@aztec/foundation/log';
 import { DateProvider } from '@aztec/foundation/timer';
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
 import { AztecLMDBStoreV2, createStore } from '@aztec/kv-store/lmdb-v2';
-import type { L2BlockSource } from '@aztec/stdlib/block';
+import type { BlockHash, L2BlockSource } from '@aztec/stdlib/block';
 import type { ChainConfig } from '@aztec/stdlib/config';
 import type { ContractDataSource } from '@aztec/stdlib/contract';
 import type { BlockMinFeesProvider } from '@aztec/stdlib/gas';
@@ -58,6 +58,7 @@ export async function createP2PClient(
   dateProvider: DateProvider = new DateProvider(),
   telemetry: TelemetryClient = getTelemetryClient(),
   deps: P2PClientDeps = {},
+  initialBlockHash: BlockHash,
 ) {
   const config = await configureP2PClientAddresses({
     ...inputConfig,
@@ -76,7 +77,7 @@ export async function createP2PClient(
   const store = deps.store ?? (await createStore(P2P_STORE_NAME, 2, config, bindings));
   const archive = await createStore(P2P_ARCHIVE_STORE_NAME, 1, config, bindings);
   const peerStore = await createStore(P2P_PEER_STORE_NAME, 1, config, bindings);
-  const attestationStore = await createStore(P2P_ATTESTATION_STORE_NAME, 1, config, bindings);
+  const attestationStore = await createStore(P2P_ATTESTATION_STORE_NAME, 2, config, bindings);
   const l1Constants = await archiver.getL1Constants();
 
   const rollupAddress = inputConfig.l1Contracts.rollupAddress.toString().toLowerCase().replace(/^0x/, '');
@@ -210,6 +211,8 @@ export async function createP2PClient(
     config,
     dateProvider,
     telemetry,
+    undefined,
+    initialBlockHash,
   );
 }
 
diff --git a/yarn-project/p2p/src/client/p2p_client.test.ts b/yarn-project/p2p/src/client/p2p_client.test.ts
index e9d5f7a5ab74..12b921ca5e1b 100644
--- a/yarn-project/p2p/src/client/p2p_client.test.ts
+++ b/yarn-project/p2p/src/client/p2p_client.test.ts
@@ -58,11 +58,26 @@ describe('P2P Client', () => {
 
     mempools = { txPool, attestationPool };
     kvStore = await openTmpStore('test');
-    client = createClient();
+    client = await createClient();
   });
 
-  const createClient = (config: Partial<P2PConfig> = {}) =>
-    new P2PClient(kvStore, blockSource, mempools, p2pService, txCollection, undefined, epochCache, config);
+  const createClient = async (config: Partial<P2PConfig> = {}) => {
+    const initialBlockHash = await blockSource.getInitialHeader().hash();
+    return new P2PClient(
+      kvStore,
+      blockSource,
+      mempools,
+      p2pService,
+      txCollection,
+      undefined,
+      epochCache,
+      config,
+      undefined,
+      undefined,
+      undefined,
+      initialBlockHash,
+    );
+  };
 
   const advanceToProvenBlock = async (blockNumber: BlockNumber) => {
     blockSource.setProvenBlockNumber(blockNumber);
@@ -166,7 +181,7 @@ describe('P2P Client', () => {
     const synchedBlock = await client.getSyncedLatestBlockNum();
     await client.stop();
 
-    const client2 = createClient();
+    const client2 = await createClient();
     await expect(client2.getSyncedLatestBlockNum()).resolves.toEqual(synchedBlock);
   });
 
@@ -212,7 +227,7 @@ describe('P2P Client', () => {
 
   describe('Chain prunes', () => {
     it('detects checkpoint prune when checkpoint number stays the same', async () => {
-      client = createClient({ txPoolDeleteTxsAfterReorg: true });
+      client = await createClient({ txPoolDeleteTxsAfterReorg: true });
       blockSource.setProvenBlockNumber(0);
       // Only checkpoint up to block 90 — blocks 91-100 are proposed but not checkpointed
       blockSource.setCheckpointedBlockNumber(90);
@@ -230,7 +245,7 @@ describe('P2P Client', () => {
     });
 
     it('detects checkpoint prune when checkpoint number increases by one', async () => {
-      client = createClient({ txPoolDeleteTxsAfterReorg: true });
+      client = await createClient({ txPoolDeleteTxsAfterReorg: true });
       blockSource.setProvenBlockNumber(0);
       blockSource.setCheckpointedBlockNumber(100);
       await client.start();
@@ -254,7 +269,7 @@ describe('P2P Client', () => {
     });
 
     it('detects checkpoint prune when checkpoint number decreases by one', async () => {
-      client = createClient({ txPoolDeleteTxsAfterReorg: true });
+      client = await createClient({ txPoolDeleteTxsAfterReorg: true });
       blockSource.setProvenBlockNumber(0);
       // Checkpoint all 100 blocks — client stores checkpoint number 100
       blockSource.setCheckpointedBlockNumber(100);
@@ -272,7 +287,7 @@ describe('P2P Client', () => {
     });
 
     it('detects epoch prune when checkpoint number decreases by more than 1', async () => {
-      client = createClient({ txPoolDeleteTxsAfterReorg: true });
+      client = await createClient({ txPoolDeleteTxsAfterReorg: true });
       blockSource.setProvenBlockNumber(0);
       // Checkpoint all 100 blocks — client stores checkpoint number 100
       blockSource.setCheckpointedBlockNumber(100);
diff --git a/yarn-project/p2p/src/client/p2p_client.ts b/yarn-project/p2p/src/client/p2p_client.ts
index 9f99cd20de7a..914e08a6b08f 100644
--- a/yarn-project/p2p/src/client/p2p_client.ts
+++ b/yarn-project/p2p/src/client/p2p_client.ts
@@ -1,14 +1,20 @@
 import type { EpochCacheInterface } from '@aztec/epoch-cache';
-import { BlockNumber, CheckpointNumber, SlotNumber } from '@aztec/foundation/branded-types';
+import {
+  BlockNumber,
+  CheckpointNumber,
+  type CheckpointProposalHash,
+  SlotNumber,
+} from '@aztec/foundation/branded-types';
 import { createLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/promise';
 import { DateProvider } from '@aztec/foundation/timer';
 import type { AztecAsyncKVStore, AztecAsyncSingleton } from '@aztec/kv-store';
 import { L2TipsKVStore } from '@aztec/kv-store/stores';
 import {
+  type BlockData,
+  type BlockHash,
   type CheckpointId,
   type EthAddress,
-  GENESIS_BLOCK_HEADER_HASH,
   type L2Block,
   type L2BlockId,
   type L2BlockSource,
@@ -95,6 +101,7 @@ export class P2PClient extends WithTracer implements P2P {
     private _dateProvider: DateProvider = new DateProvider(),
     private telemetry: TelemetryClient = getTelemetryClient(),
     private log = createLogger('p2p'),
+    initialBlockHash: BlockHash,
   ) {
     super(telemetry, 'P2PClient');
 
@@ -110,7 +117,7 @@ export class P2PClient extends WithTracer implements P2P {
       this.telemetry,
     );
 
-    this.l2Tips = new L2TipsKVStore(store, 'p2p_client');
+    this.l2Tips = new L2TipsKVStore(store, 'p2p_client', initialBlockHash);
     this.synchedLatestSlot = store.openSingleton('p2p_pool_last_l2_slot');
   }
 
@@ -164,7 +171,7 @@ export class P2PClient extends WithTracer implements P2P {
         const from = BlockNumber(oldFinalizedBlockNum + 1);
         const limit = event.block.number - from + 1;
         if (limit > 0) {
-          const oldBlocks = await this.l2BlockSource.getBlocks(from, limit);
+          const oldBlocks = await this.l2BlockSource.getBlocksData({ from, limit });
           await this.handleFinalizedL2Blocks(oldBlocks);
         }
         break;
@@ -377,10 +384,10 @@ export class P2PClient extends WithTracer implements P2P {
 
   public async getCheckpointAttestationsForSlot(
     slot: SlotNumber,
-    proposalId?: string,
+    proposalPayloadHash?: CheckpointProposalHash,
   ): Promise<CheckpointAttestation[]> {
-    return await (proposalId
-      ? this.attestationPool.getCheckpointAttestationsForSlotAndProposal(slot, proposalId)
+    return await (proposalPayloadHash
+      ? this.attestationPool.getCheckpointAttestationsForSlotAndProposal(slot, proposalPayloadHash)
       : this.attestationPool.getCheckpointAttestationsForSlot(slot));
   }
 
@@ -584,13 +591,10 @@ export class P2PClient extends WithTracer implements P2P {
    */
   public async getStatus(): Promise<P2PSyncState> {
     const blockNumber = await this.getSyncedLatestBlockNum();
-    const blockHash =
-      blockNumber === 0
-        ? GENESIS_BLOCK_HEADER_HASH.toString()
-        : await this.l2BlockSource
-            .getBlockHeader(blockNumber)
-            .then(header => header?.hash())
-            .then(hash => hash?.toString());
+    const blockHash = await this.l2BlockSource
+      .getBlockData({ number: blockNumber })
+      .then(data => data?.header.hash())
+      .then(hash => hash?.toString());
 
     return {
       state: this.currentState,
@@ -660,7 +664,7 @@ export class P2PClient extends WithTracer implements P2P {
    * @param blocks - A list of finalized L2 blocks.
    * @returns Empty promise.
    */
-  private async handleFinalizedL2Blocks(blocks: L2Block[]): Promise<void> {
+  private async handleFinalizedL2Blocks(blocks: BlockData[]): Promise<void> {
     if (!blocks.length) {
       return;
     }
diff --git a/yarn-project/p2p/src/client/test/p2p_client.integration_batch_txs.test.ts b/yarn-project/p2p/src/client/test/p2p_client.integration_batch_txs.test.ts
index f6e76dbef7c8..1858f94786ac 100644
--- a/yarn-project/p2p/src/client/test/p2p_client.integration_batch_txs.test.ts
+++ b/yarn-project/p2p/src/client/test/p2p_client.integration_batch_txs.test.ts
@@ -221,7 +221,7 @@ describe('p2p client integration batch txs', () => {
     const peerIds = clients.map(client => (client as any).p2pService.node.peerId);
     connectionSampler.getPeerListSortedByConnectionCountAsc.mockReturnValue(peerIds);
 
-    attestationPool.getBlockProposal.mockResolvedValue(blockProposal);
+    attestationPool.getBlockProposalByArchive.mockResolvedValue(blockProposal);
 
     // Client 0 is missing all transactions
     const missingTxHashes = txHashes;
diff --git a/yarn-project/p2p/src/client/test/p2p_client.integration_block_txs.test.ts b/yarn-project/p2p/src/client/test/p2p_client.integration_block_txs.test.ts
index 9f8464e4dd08..50123143334d 100644
--- a/yarn-project/p2p/src/client/test/p2p_client.integration_block_txs.test.ts
+++ b/yarn-project/p2p/src/client/test/p2p_client.integration_block_txs.test.ts
@@ -108,7 +108,7 @@ describe('p2p client integration block txs protocol ', () => {
     txs = await Promise.all(times(5, i => createMockTxWithMetadata(p2pBaseConfig, i)));
     txHashes = await Promise.all(txs.map(tx => tx.getTxHash()));
     blockProposal = await createBlockProposal(BlockNumber(blockNumber), archiveRoot, txHashes);
-    attestationPool.getBlockProposal.mockResolvedValue(blockProposal);
+    attestationPool.getBlockProposalByArchive.mockResolvedValue(blockProposal);
   });
 
   afterEach(async () => {
@@ -153,7 +153,7 @@ describe('p2p client integration block txs protocol ', () => {
   };
 
   it('responds with NOT_FOUND when peer does not have the requested block proposal', async () => {
-    attestationPool.getBlockProposal.mockResolvedValue(undefined);
+    attestationPool.getBlockProposalByArchive.mockResolvedValue(undefined);
     const missing = new TxHashArray(...Array.from({ length: 4 }, () => TxHash.random()));
 
     const blockProposal = await createBlockProposal(blockNumber, Fr.random(), missing);
@@ -326,7 +326,7 @@ describe('p2p client integration block txs protocol ', () => {
 
   it('responds with txs when peer does not have proposal but has txs (includeFullTxHashes=true)', async () => {
     // Peer doesn't have the block proposal
-    attestationPool.getBlockProposal.mockResolvedValue(undefined);
+    attestationPool.getBlockProposalByArchive.mockResolvedValue(undefined);
 
     // But peer has some of the requested txs in their pool
     const availableTxs = [txs[1], txs[3]];
@@ -355,7 +355,7 @@ describe('p2p client integration block txs protocol ', () => {
 
   it('responds with partial txs when peer does not have proposal (includeFullTxHashes=true)', async () => {
     // Peer doesn't have the block proposal
-    attestationPool.getBlockProposal.mockResolvedValue(undefined);
+    attestationPool.getBlockProposalByArchive.mockResolvedValue(undefined);
 
     // Peer has only one of the requested txs
     const availableTx = txs[2];
@@ -384,7 +384,7 @@ describe('p2p client integration block txs protocol ', () => {
 
   it('responds with empty txs when peer does not have proposal or txs (includeFullTxHashes=true)', async () => {
     // Peer doesn't have the block proposal
-    attestationPool.getBlockProposal.mockResolvedValue(undefined);
+    attestationPool.getBlockProposalByArchive.mockResolvedValue(undefined);
 
     // Peer also doesn't have any of the requested txs
     txPool.getTxsByHash.mockResolvedValue([]);
@@ -403,7 +403,7 @@ describe('p2p client integration block txs protocol ', () => {
 
   it('still responds with NOT_FOUND when peer does not have proposal and includeFullTxHashes=false', async () => {
     // Peer doesn't have the block proposal
-    attestationPool.getBlockProposal.mockResolvedValue(undefined);
+    attestationPool.getBlockProposalByArchive.mockResolvedValue(undefined);
 
     // Even if peer has the txs in pool
     const hashToTx = new Map(txs.map((tx, i) => [txHashes[i].toString(), tx]));
diff --git a/yarn-project/p2p/src/client/test/tx_proposal_collector/proposal_tx_collector_worker.ts b/yarn-project/p2p/src/client/test/tx_proposal_collector/proposal_tx_collector_worker.ts
index 06cf85f91a1b..8be78d419bf5 100644
--- a/yarn-project/p2p/src/client/test/tx_proposal_collector/proposal_tx_collector_worker.ts
+++ b/yarn-project/p2p/src/client/test/tx_proposal_collector/proposal_tx_collector_worker.ts
@@ -125,6 +125,7 @@ async function startClient(config: P2PConfig, clientIndex: number) {
     new DateProvider(),
     telemetry as TelemetryClient,
     deps,
+    await l2BlockSource.getInitialHeader().hash(),
   );
 
   await client.start();
diff --git a/yarn-project/p2p/src/config.ts b/yarn-project/p2p/src/config.ts
index 6cedf8c8131e..c675e73f5284 100644
--- a/yarn-project/p2p/src/config.ts
+++ b/yarn-project/p2p/src/config.ts
@@ -6,6 +6,7 @@ import {
   getConfigFromMappings,
   getDefaultConfig,
   numberConfigHelper,
+  optionalNumberConfigHelper,
   percentageConfigHelper,
   pickConfigMappings,
   secretStringConfigHelper,
@@ -46,6 +47,7 @@ export interface P2PConfig
       | 'l1PublishingTime'
       | 'maxTxsPerBlock'
       | 'attestationPropagationTime'
+      | 'maxBlocksPerCheckpoint'
     > {
   /** Maximum transactions per block for validation. Overrides maxTxsPerBlock for gossip validation when set. */
   validateMaxTxsPerBlock?: number;
@@ -216,6 +218,9 @@ export interface P2PConfig
 
   /** Minimum percentage fee increase required to replace an existing tx via RPC (0 = no bump). */
   priceBumpPercentage: bigint;
+
+  /** Drop incoming block and checkpoint proposals at the libp2p dispatch layer (for testing only) */
+  skipIncomingProposals?: boolean;
 }
 
 export const DEFAULT_P2P_PORT = 40400;
@@ -225,23 +230,23 @@ export const p2pConfigMappings: ConfigMappingsType<P2PConfig> = {
     env: 'VALIDATOR_MAX_TX_PER_BLOCK',
     description:
       'Maximum transactions per block for validation. Overrides maxTxsPerBlock for gossip validation when set.',
-    parseEnv: (val: string) => parseInt(val, 10),
+    ...optionalNumberConfigHelper(),
   },
   validateMaxTxsPerCheckpoint: {
     env: 'VALIDATOR_MAX_TX_PER_CHECKPOINT',
     description:
       'Maximum transactions per checkpoint for validation. Used as fallback for maxTxsPerBlock when that is not set.',
-    parseEnv: (val: string) => parseInt(val, 10),
+    ...optionalNumberConfigHelper(),
   },
   validateMaxL2BlockGas: {
     env: 'VALIDATOR_MAX_L2_BLOCK_GAS',
     description: 'Maximum L2 gas per block for validation. When set, txs exceeding this limit are rejected.',
-    parseEnv: (val: string) => parseInt(val, 10),
+    ...optionalNumberConfigHelper(),
   },
   validateMaxDABlockGas: {
     env: 'VALIDATOR_MAX_DA_BLOCK_GAS',
     description: 'Maximum DA gas per block for validation. When set, txs exceeding this limit are rejected.',
-    parseEnv: (val: string) => parseInt(val, 10),
+    ...optionalNumberConfigHelper(),
   },
   p2pEnabled: {
     env: 'P2P_ENABLED',
@@ -443,7 +448,7 @@ export const p2pConfigMappings: ConfigMappingsType<P2PConfig> = {
   },
   p2pStoreMapSizeKb: {
     env: 'P2P_STORE_MAP_SIZE_KB',
-    parseEnv: (val: string) => +val,
+    ...optionalNumberConfigHelper(),
     description: 'The maximum possible size of the P2P DB in KB. Overwrites the general dataStoreMapSizeKb.',
   },
   txPublicSetupAllowListExtend: {
@@ -505,7 +510,7 @@ export const p2pConfigMappings: ConfigMappingsType<P2PConfig> = {
   l1PublishingTime: {
     env: 'SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT',
     description: 'How much time (in seconds) we allow in the slot for publishing the L1 tx (defaults to 1 L1 slot).',
-    parseEnv: (val: string) => parseInt(val, 10),
+    ...optionalNumberConfigHelper(),
   },
   fishermanMode: {
     env: 'FISHERMAN_MODE',
@@ -518,6 +523,10 @@ export const p2pConfigMappings: ConfigMappingsType<P2PConfig> = {
       'Broadcast block proposals even when a conflicting proposal for the same slot already exists in the pool (for testing purposes only).',
     ...booleanConfigHelper(false),
   },
+  skipIncomingProposals: {
+    description: 'Drop incoming block and checkpoint proposals at the libp2p dispatch layer (for testing only)',
+    ...booleanConfigHelper(false),
+  },
   minTxPoolAgeMs: {
     env: 'P2P_MIN_TX_POOL_AGE_MS',
     description: 'Minimum age (ms) a transaction must have been in the pool before it is eligible for block building.',
diff --git a/yarn-project/p2p/src/mem_pools/attestation_pool/attestation_pool.ts b/yarn-project/p2p/src/mem_pools/attestation_pool/attestation_pool.ts
index 69c2e02f8e55..109e472aa35f 100644
--- a/yarn-project/p2p/src/mem_pools/attestation_pool/attestation_pool.ts
+++ b/yarn-project/p2p/src/mem_pools/attestation_pool/attestation_pool.ts
@@ -1,5 +1,4 @@
-import { IndexWithinCheckpoint, SlotNumber } from '@aztec/foundation/branded-types';
-import { Fr } from '@aztec/foundation/curves/bn254';
+import type { BlockProposalHash, CheckpointProposalHash, SlotNumber } from '@aztec/foundation/branded-types';
 import { toArray } from '@aztec/foundation/iterable';
 import { createLogger } from '@aztec/foundation/log';
 import type { AztecAsyncKVStore, AztecAsyncMap, AztecAsyncMultiMap } from '@aztec/kv-store';
@@ -15,14 +14,14 @@ import { PoolInstrumentation, PoolName, type PoolStatsCallback } from '../instru
 
 /** Result of trying to add an item (proposal or attestation) to the pool */
 export type TryAddResult = {
-  /** Whether the item was added */
+  /** Whether the item was added to a main store. False when the slot/position/(slot,signer) already had a stored entry, even if a new equivocation hash was tracked. */
   added: boolean;
-  /** Whether the exact item already existed */
+  /** Whether the exact signed payload (matched by payload hash) already existed in the pool. */
   alreadyExists: boolean;
-  /** Count of items for the position. Meaning varies by method:
-   *  - tryAddBlockProposal: proposals at (slot, indexWithinCheckpoint)
-   *  - tryAddCheckpointProposal: proposals at slot
-   *  - tryAddCheckpointAttestation: attestations by this signer for this slot */
+  /** Number of distinct signed-payload hashes seen for the position. Meaning varies by method:
+   *  - tryAddBlockProposal: distinct payload hashes at (slot, indexWithinCheckpoint)
+   *  - tryAddCheckpointProposal: distinct payload hashes at slot
+   *  - tryAddCheckpointAttestation: distinct payload hashes by this signer for this slot */
   count: number;
 };
 
@@ -35,7 +34,7 @@ export const MAX_ATTESTATIONS_PER_SLOT_AND_SIGNER = 2;
 export type AttestationPoolApi = Pick<
   AttestationPool,
   | 'tryAddBlockProposal'
-  | 'getBlockProposal'
+  | 'getBlockProposalByArchive'
   | 'tryAddCheckpointProposal'
   | 'getCheckpointProposal'
   | 'addOwnCheckpointAttestations'
@@ -52,31 +51,46 @@ export type AttestationPoolApi = Pick<
  *
  * Attestations and proposals observed via the p2p network are stored for requests
  * from the validator to produce a block, or to serve to other peers.
+ *
+ * Equivocation detection: each main store holds at most one entry per equivocation
+ * position (one checkpoint proposal per slot, one block proposal per (slot, position),
+ * one attestation per (slot, signer)). Distinct *signed payload hashes* arriving at
+ * the same position are tracked in the matching index multimap so the equivocation
+ * count reaches 2 even when archive collides on `feeAssetPriceModifier` variants.
  */
 export class AttestationPool {
   private metrics: PoolInstrumentation<CheckpointAttestation>;
 
-  // Checkpoint attestations from attestation key (slot-proposalId-signer) to serialized CheckpointAttestation
-  // Keys are lexicographically sortable allowing range queries by slot or by (slot, proposalId)
-  private checkpointAttestations: AztecAsyncMap<string, Buffer>;
+  // Checkpoint attestations from `${paddedSlot}-${signer}` to serialized CheckpointAttestation.
+  // Stores the first attestation seen per (slot, signer); subsequent distinct payload
+  // hashes from the same signer are tracked only in `attestationHashesPerSlotAndSigner`
+  // for equivocation detection.
+  private attestationPerSlotAndSigner: AztecAsyncMap<string, Buffer>;
+
+  // Distinct payload hashes seen per (slot, signer) for tracking attestation equivocations.
+  // Key: `${paddedSlot}-${signerAddress}`, Value: CheckpointProposalHash (`0x`-prefixed hex)
+  private attestationHashesPerSlotAndSigner: AztecAsyncMultiMap<string, CheckpointProposalHash>;
 
-  // Checkpoint proposals from proposal archive to serialized CheckpointProposal
-  private checkpointProposals: AztecAsyncMap<string, Buffer>;
+  // Checkpoint proposals from slot number to serialized CheckpointProposal.
+  // Stores the first proposal seen per slot.
+  private checkpointProposalPerSlot: AztecAsyncMap<number, Buffer>;
 
-  // Checkpoint proposals indexed by slot for querying all proposals in a slot
-  // Key: slot number, Value: proposal archive strings
-  private checkpointProposalsForSlot: AztecAsyncMultiMap<number, string>;
+  // Distinct payload hashes seen per slot. Hash collision = duplicate.
+  // Hash count reaching 2 = equivocation.
+  // Key: slot number, Value: CheckpointProposalHash (`0x`-prefixed hex)
+  private checkpointProposalHashesPerSlot: AztecAsyncMultiMap<number, CheckpointProposalHash>;
 
-  // Block proposals from proposal archive to serialized BlockProposal
-  private blockProposals: AztecAsyncMap<string, Buffer>;
+  // Block proposals from positionKey to serialized BlockProposal.
+  // Stores the first proposal seen per (slot, indexWithinCheckpoint).
+  private blockProposalPerSlotAndIndex: AztecAsyncMap<number, Buffer>;
 
-  // Block proposals indexed by slot and index-within-checkpoint for duplicate detection
-  // Key: (slot << 10) | indexWithinCheckpoint, Value: archive string
-  private blockProposalsForSlotAndIndex: AztecAsyncMultiMap<number, string>;
+  // Distinct payload hashes seen per (slot, indexWithinCheckpoint).
+  // Key: slot * (1 << INDEX_BITS) + indexWithinCheckpoint, Value: BlockProposalHash (`0x`-prefixed hex)
+  private blockProposalHashesPerSlotAndIndex: AztecAsyncMultiMap<number, BlockProposalHash>;
 
-  // Checkpoint attestations indexed by (slot, signer) for tracking attestations per (slot, signer) for duplicate detection
-  // Key: `${Fr(slot).toString()}-${signerAddress}` string (padded for lexicographic ordering), Value: `proposalId` strings
-  private checkpointAttestationsPerSlotAndSigner: AztecAsyncMultiMap<string, string>;
+  // Secondary index from archive root to positionKey, so that the block-txs req/resp
+  // handler can still resolve a stored proposal by archive root.
+  private blockProposalSlotAndIndexPerArchive: AztecAsyncMap<string, number>;
 
   constructor(
     private store: AztecAsyncKVStore,
@@ -84,76 +98,65 @@ export class AttestationPool {
     private log = createLogger('aztec:attestation_pool'),
   ) {
     // Initialize block proposal storage
-    this.blockProposals = store.openMap('proposals');
-    this.blockProposalsForSlotAndIndex = store.openMultiMap('block_proposals_for_slot_and_index');
+    this.blockProposalPerSlotAndIndex = store.openMap('proposals');
+    this.blockProposalHashesPerSlotAndIndex = store.openMultiMap('block_proposals_for_slot_and_index');
+    this.blockProposalSlotAndIndexPerArchive = store.openMap('block_proposals_by_archive');
 
     // Initialize checkpoint attestations storage
-    this.checkpointAttestations = store.openMap('checkpoint_attestations');
-    this.checkpointAttestationsPerSlotAndSigner = store.openMultiMap('checkpoint_attestations_per_slot_and_signer');
+    this.attestationPerSlotAndSigner = store.openMap('checkpoint_attestations');
+    this.attestationHashesPerSlotAndSigner = store.openMultiMap('checkpoint_attestations_per_slot_and_signer');
 
     // Initialize checkpoint proposal storage
-    this.checkpointProposals = store.openMap('checkpoint_proposals');
-    this.checkpointProposalsForSlot = store.openMultiMap('checkpoint_proposals_for_slot');
+    this.checkpointProposalPerSlot = store.openMap('checkpoint_proposals');
+    this.checkpointProposalHashesPerSlot = store.openMultiMap('checkpoint_proposals_for_slot');
 
     this.metrics = new PoolInstrumentation(telemetry, PoolName.ATTESTATION_POOL, this.poolStats);
   }
 
   private poolStats: PoolStatsCallback = async () => {
     return {
-      itemCount: await this.checkpointAttestations.sizeAsync(),
+      itemCount: await this.attestationPerSlotAndSigner.sizeAsync(),
     };
   };
 
   /** Returns whether the pool is empty. */
   public async isEmpty(): Promise<boolean> {
-    for await (const _ of this.checkpointAttestations.entriesAsync()) {
+    for await (const _ of this.attestationPerSlotAndSigner.entriesAsync()) {
       return false;
     }
-    for await (const _ of this.blockProposals.entriesAsync()) {
+    for await (const _ of this.blockProposalPerSlotAndIndex.entriesAsync()) {
       return false;
     }
     return true;
   }
 
-  private getProposalKey(slot: number | bigint | Fr | string, proposalId: Fr | string | Buffer): string {
-    const slotStr = typeof slot === 'string' ? slot : new Fr(slot).toString();
-    const proposalIdStr =
-      typeof proposalId === 'string'
-        ? proposalId
-        : Buffer.isBuffer(proposalId)
-          ? Fr.fromBuffer(proposalId).toString()
-          : proposalId.toString();
+  /** Number of bits reserved for indexWithinCheckpoint in position keys. */
+  private static readonly INDEX_BITS = 10;
+  /** Maximum indexWithinCheckpoint value (2^10 - 1 = 1023). */
+  private static readonly MAX_INDEX = (1 << AttestationPool.INDEX_BITS) - 1;
+  /** Decimal digits used to left-pad slot numbers in string keys.
+   * 10 digits ≈ 3500 years at 36 s/slot, leaving ample headroom. */
+  private static readonly SLOT_PAD_DIGITS = 10;
 
-    return `${slotStr}-${proposalIdStr}`;
+  /** Fixed-width decimal slot string for use in composite string keys. */
+  private slotPaddedKey(slot: SlotNumber | number): string {
+    return slot.toString().padStart(AttestationPool.SLOT_PAD_DIGITS, '0');
   }
 
-  private getAttestationKey(slot: number | bigint | Fr | string, proposalId: Fr | string, address: string): string {
-    return `${this.getProposalKey(slot, proposalId)}-${address}`;
+  /** Key for the per-(slot, signer) attestation main store and equivocation index. */
+  private getSlotSignerKey(slot: SlotNumber, signerAddress: string): string {
+    return `${this.slotPaddedKey(slot)}-${signerAddress}`;
   }
 
-  /** Returns range bounds for querying all attestations for a given slot. */
+  /**
+   * Returns range bounds for querying all attestations for a given slot.
+   * Fixed-width padding ensures the slot prefix sorts cleanly, so using the next
+   * slot's prefix as the upper bound captures exactly the current slot's entries.
+   */
   private getAttestationKeyRangeForSlot(slot: SlotNumber): { start: string; end: string } {
-    const slotStr = new Fr(slot).toString();
-    return { start: `${slotStr}-`, end: `${slotStr}-Z` }; // 'Z' sorts after any hex character
+    return { start: `${this.slotPaddedKey(slot)}-`, end: `${this.slotPaddedKey(slot + 1)}-` };
   }
 
-  /** Returns range bounds for querying all attestations for a given (slot, proposalId). */
-  private getAttestationKeyRangeForProposal(slot: SlotNumber, proposalId: string): { start: string; end: string } {
-    const proposalKey = this.getProposalKey(slot, proposalId);
-    return { start: `${proposalKey}-`, end: `${proposalKey}-Z` };
-  }
-
-  /** Creates a key for the per-signer-per-slot attestation index. Uses padded slot for lexicographic ordering. */
-  private getSlotSignerKey(slot: SlotNumber, signerAddress: string): string {
-    const slotStr = new Fr(slot).toString();
-    return `${slotStr}-${signerAddress}`;
-  }
-
-  /** Number of bits reserved for indexWithinCheckpoint in position keys. */
-  private static readonly INDEX_BITS = 10;
-  /** Maximum indexWithinCheckpoint value (2^10 - 1 = 1023). */
-  private static readonly MAX_INDEX = (1 << AttestationPool.INDEX_BITS) - 1;
-
   /** Creates a position key for block proposals: slot * 1024 + indexWithinCheckpoint.
    * Uses multiplication instead of bit-shift to avoid 32-bit signed integer overflow
    * (bit-shift overflows after slot ~2^21, roughly 278 days of uptime). */
@@ -166,50 +169,64 @@ export class AttestationPool {
     return slot * (1 << AttestationPool.INDEX_BITS) + indexWithinCheckpoint;
   }
 
+  /** Returns true if the multimap already contains the given value for the given key. */
+  private async multimapHasValue<TKey extends number | string, TValue extends string>(
+    map: AztecAsyncMultiMap<TKey, TValue>,
+    key: TKey,
+    value: TValue,
+  ): Promise<boolean> {
+    const values = await toArray(map.getValuesAsync(key));
+    return values.includes(value);
+  }
+
   /**
    * Attempts to add a block proposal to the pool.
    *
-   * This method performs validation and addition in a single call:
-   * - Checks if the proposal already exists (returns alreadyExists: true if so)
-   * - Checks if the position has reached the proposal cap (returns added: false if so)
-   * - Adds the proposal if validation passes
+   * - Detects duplicates by signed-payload hash (not archive); a re-broadcast of the
+   *   exact same signed payload returns `alreadyExists: true`.
+   * - Distinct payload hashes at the same `(slot, indexWithinCheckpoint)` are tracked
+   *   in the equivocation index. The first hash also stores the proposal bytes; later
+   *   distinct hashes only bump `count` so libp2p can fire its duplicate callback.
    *
    * @param blockProposal - The block proposal to add
    * @returns Result indicating whether the proposal was added and duplicate detection info
    */
   public async tryAddBlockProposal(blockProposal: BlockProposal): Promise<TryAddResult> {
     return await this.store.transactionAsync(async () => {
-      const proposalId = blockProposal.archive.toString();
-
-      // Check if already exists
-      const alreadyExists = await this.blockProposals.hasAsync(proposalId);
-      if (alreadyExists) {
-        const count = await this.getBlockProposalCountForPosition(
-          blockProposal.slotNumber,
-          blockProposal.indexWithinCheckpoint,
-        );
+      const positionKey = this.getBlockPositionKey(blockProposal.slotNumber, blockProposal.indexWithinCheckpoint);
+      const payloadHash = blockProposal.getPayloadHash();
+
+      // Hash already tracked => exact same signed payload was already received.
+      if (await this.multimapHasValue(this.blockProposalHashesPerSlotAndIndex, positionKey, payloadHash)) {
+        const count = await this.blockProposalHashesPerSlotAndIndex.getValueCountAsync(positionKey);
         return { added: false, alreadyExists: true, count };
       }
 
-      // Get current count for position and check cap, do not add if exceeded
-      const count = await this.getBlockProposalCountForPosition(
-        blockProposal.slotNumber,
-        blockProposal.indexWithinCheckpoint,
-      );
-
+      // Cap reached for this position (no more new payload hashes accepted).
+      const count = await this.blockProposalHashesPerSlotAndIndex.getValueCountAsync(positionKey);
       if (count >= MAX_BLOCK_PROPOSALS_PER_POSITION) {
         return { added: false, alreadyExists: false, count };
       }
 
-      // Add the proposal
-      await this.addBlockProposal(blockProposal);
+      // Track the new payload hash for equivocation detection.
+      await this.blockProposalHashesPerSlotAndIndex.set(positionKey, payloadHash);
+
+      // Only the first distinct payload at this position is stored; later equivocations
+      // are detected via the multimap but their payload bytes are not retained.
+      const alreadyHasStored = await this.blockProposalPerSlotAndIndex.hasAsync(positionKey);
+      if (!alreadyHasStored) {
+        await this.blockProposalPerSlotAndIndex.set(positionKey, blockProposal.withoutSignedTxs().toBuffer());
+        await this.blockProposalSlotAndIndexPerArchive.set(blockProposal.archive.toString(), positionKey);
+      }
 
       this.log.debug(
         `Added block proposal for slot ${blockProposal.slotNumber} and index ${blockProposal.indexWithinCheckpoint}`,
         {
-          proposalId,
+          archive: blockProposal.archive.toString(),
+          payloadHash,
           slotNumber: blockProposal.slotNumber,
           indexWithinCheckpoint: blockProposal.indexWithinCheckpoint,
+          stored: !alreadyHasStored,
         },
       );
 
@@ -217,60 +234,60 @@ export class AttestationPool {
     });
   }
 
-  /** Gets the count of block proposals for a given position (slot, indexWithinCheckpoint). */
-  private getBlockProposalCountForPosition(
-    slot: SlotNumber,
-    indexWithinCheckpoint: IndexWithinCheckpoint,
-  ): Promise<number> {
-    const positionKey = this.getBlockPositionKey(slot, indexWithinCheckpoint);
-    return this.blockProposalsForSlotAndIndex.getValueCountAsync(positionKey);
-  }
-
-  /** Internal method - must be called within a transaction. */
-  private async addBlockProposal(blockProposal: BlockProposal): Promise<void> {
-    const proposalId = blockProposal.archive.toString();
-    // Strip signedTxs before storing to avoid persisting full tx data
-    await this.blockProposals.set(proposalId, blockProposal.withoutSignedTxs().toBuffer());
-
-    // Index by slot and position for duplicate detection
-    const positionKey = this.getBlockPositionKey(blockProposal.slotNumber, blockProposal.indexWithinCheckpoint);
-    await this.blockProposalsForSlotAndIndex.set(positionKey, proposalId);
-  }
-
   /**
-   * Get block proposal by its ID.
+   * Get block proposal by archive root.
    *
-   * @param id - The ID of the block proposal to retrieve. The ID is proposal.payload.archive
+   * Resolves the archive root to its `(slot, indexWithinCheckpoint)` via a secondary
+   * index, then fetches the stored proposal (if any). Returns the *first* proposal
+   * seen at that position, even if a later equivocating payload was tracked.
+   * Validates that the stored proposal's archive matches the requested one before
+   * returning, guarding against secondary-index corruption or position-key reuse.
    *
-   * @return The block proposal if it exists, otherwise undefined.
+   * @param archiveRoot - The archive root to look up
+   * @return The block proposal if it exists and its archive matches, otherwise undefined.
    */
-  public async getBlockProposal(id: string): Promise<BlockProposal | undefined> {
-    const buffer = await this.blockProposals.getAsync(id);
+  public async getBlockProposalByArchive(archiveRoot: string): Promise<BlockProposal | undefined> {
+    const positionKey = await this.blockProposalSlotAndIndexPerArchive.getAsync(archiveRoot);
+    if (positionKey === undefined) {
+      return undefined;
+    }
+    const buffer = await this.blockProposalPerSlotAndIndex.getAsync(positionKey);
+    if (!buffer || buffer.length === 0) {
+      return undefined;
+    }
+    let proposal: BlockProposal;
     try {
-      if (buffer && buffer.length > 0) {
-        return BlockProposal.fromBuffer(buffer);
-      }
+      proposal = BlockProposal.fromBuffer(buffer);
     } catch {
       return undefined;
     }
-
-    return undefined;
+    const storedArchive = proposal.archive.toString();
+    if (storedArchive !== archiveRoot) {
+      this.log.warn(`Stored block proposal archive does not match requested archive root`, {
+        requestedArchive: archiveRoot,
+        storedArchive,
+        positionKey,
+      });
+      return undefined;
+    }
+    return proposal;
   }
 
   /** Checks if any block proposals exist for a given slot (at index 0). */
   public async hasBlockProposalsForSlot(slot: SlotNumber): Promise<boolean> {
     const positionKey = this.getBlockPositionKey(slot, 0);
-    const count = await this.blockProposalsForSlotAndIndex.getValueCountAsync(positionKey);
+    const count = await this.blockProposalHashesPerSlotAndIndex.getValueCountAsync(positionKey);
     return count > 0;
   }
 
   /**
    * Attempts to add a checkpoint proposal to the pool.
    *
-   * This method performs validation and addition in a single call:
-   * - Checks if the proposal already exists (returns alreadyExists: true if so)
-   * - Checks if the slot has reached the proposal cap (returns added: false if so)
-   * - Adds the proposal if validation passes
+   * - Detects duplicates by signed-payload hash (not archive); a re-broadcast of the
+   *   exact same signed payload returns `alreadyExists: true`.
+   * - Distinct payload hashes at the same slot are tracked in the equivocation index.
+   *   Only the first distinct payload's bytes are stored; later distinct hashes bump
+   *   `count` so libp2p can fire its duplicate callback.
    *
    * Note: This method only handles the CheckpointProposalCore. If the original
    * CheckpointProposal contains a lastBlock, the caller should extract it via
@@ -280,56 +297,52 @@ export class AttestationPool {
    * @returns Result indicating whether the proposal was added and duplicate detection info
    */
   public async tryAddCheckpointProposal(proposal: CheckpointProposalCore): Promise<TryAddResult> {
-    const result = await this.store.transactionAsync(async () => {
-      const proposalId = proposal.archive.toString();
+    return await this.store.transactionAsync(async () => {
+      const slot = proposal.slotNumber;
+      const payloadHash = proposal.getPayloadHash();
 
-      // Check if already exists
-      const alreadyExists = await this.checkpointProposals.hasAsync(proposalId);
-      if (alreadyExists) {
-        const count = await this.checkpointProposalsForSlot.getValueCountAsync(proposal.slotNumber);
+      if (await this.multimapHasValue(this.checkpointProposalHashesPerSlot, slot, payloadHash)) {
+        const count = await this.checkpointProposalHashesPerSlot.getValueCountAsync(slot);
         return { added: false, alreadyExists: true, count };
       }
 
-      // Get current count for slot and check cap
-      const count = await this.checkpointProposalsForSlot.getValueCountAsync(proposal.slotNumber);
+      const count = await this.checkpointProposalHashesPerSlot.getValueCountAsync(slot);
       if (count >= MAX_CHECKPOINT_PROPOSALS_PER_SLOT) {
         return { added: false, alreadyExists: false, count };
       }
 
-      // Add the proposal if cap not exceeded
-      await this.addCheckpointProposal(proposal);
+      // Track the new payload hash for equivocation detection.
+      await this.checkpointProposalHashesPerSlot.set(slot, payloadHash);
+
+      // Only the first distinct payload at this slot is stored; later equivocations
+      // are detected via the multimap but their payload bytes are not retained.
+      const alreadyHasStored = await this.checkpointProposalPerSlot.hasAsync(slot);
+      if (!alreadyHasStored) {
+        await this.checkpointProposalPerSlot.set(slot, proposal.toBuffer());
+      }
 
-      this.log.debug(`Added checkpoint proposal for slot ${proposal.slotNumber}`, {
-        proposalId,
-        slotNumber: proposal.slotNumber,
+      this.log.debug(`Added checkpoint proposal for slot ${slot}`, {
+        archive: proposal.archive.toString(),
+        payloadHash,
+        slotNumber: slot,
+        stored: !alreadyHasStored,
       });
 
       return { added: true, alreadyExists: false, count: count + 1 };
     });
-
-    return result;
-  }
-
-  /** Internal method - must be called within a transaction. */
-  private async addCheckpointProposal(proposal: CheckpointProposalCore): Promise<void> {
-    const slotKey = proposal.slotNumber;
-    const proposalId = proposal.archive.toString();
-
-    await this.checkpointProposalsForSlot.set(slotKey, proposalId);
-    await this.checkpointProposals.set(proposalId, proposal.toBuffer());
   }
 
   /**
-   * Get checkpoint proposal by its ID.
+   * Get the (first) checkpoint proposal stored for the given slot.
    *
    * Returns a CheckpointProposalCore (without lastBlock info) since the lastBlock
    * is extracted and stored separately as a BlockProposal when added.
    *
-   * @param id - The ID of the checkpoint proposal to retrieve (proposal.archive)
-   * @return The checkpoint proposal core if it exists, otherwise undefined.
+   * @param slot - The slot to look up
+   * @return The checkpoint proposal core if one is stored, otherwise undefined.
    */
-  public async getCheckpointProposal(id: string): Promise<CheckpointProposalCore | undefined> {
-    const buffer = await this.checkpointProposals.getAsync(id);
+  public async getCheckpointProposal(slot: SlotNumber): Promise<CheckpointProposalCore | undefined> {
+    const buffer = await this.checkpointProposalPerSlot.getAsync(slot);
     try {
       if (buffer && buffer.length > 0) {
         return CheckpointProposal.fromBuffer(buffer);
@@ -343,13 +356,13 @@ export class AttestationPool {
 
   /**
    * Adds own checkpoint attestations to the pool.
-   * Skips validations on number of checkpoint attestations stored for the given slot.
+   * Skips per-signer cap and equivocation tracking; the caller is trusted.
+   * Each (slot, signer) gets a single stored attestation; later additions overwrite.
    */
   public async addOwnCheckpointAttestations(attestations: CheckpointAttestation[]): Promise<void> {
     await this.store.transactionAsync(async () => {
       for (const attestation of attestations) {
         const slotNumber = attestation.payload.header.slotNumber;
-        const proposalId = attestation.archive.toString();
         const sender = attestation.getSender();
 
         // Skip attestations with invalid signatures
@@ -357,22 +370,30 @@ export class AttestationPool {
           this.log.warn(`Skipping own checkpoint attestation with invalid signature for slot ${slotNumber}`, {
             signature: attestation.signature.toString(),
             slotNumber,
-            proposalId,
+            archive: attestation.archive.toString(),
           });
           continue;
         }
 
         const address = sender.toString();
-        const ownKey = this.getAttestationKey(slotNumber, proposalId, address);
+        const ownKey = this.getSlotSignerKey(slotNumber, address);
+        const payloadHash = attestation.getPayloadHash();
 
-        await this.checkpointAttestations.set(ownKey, attestation.toBuffer());
+        await this.attestationPerSlotAndSigner.set(ownKey, attestation.toBuffer());
         this.metrics.trackMempoolItemAdded(ownKey);
 
+        // Track our own payload hash so that an equivocating attestation from another
+        // peer at the same (slot, signer) is detected as a duplicate.
+        if (!(await this.multimapHasValue(this.attestationHashesPerSlotAndSigner, ownKey, payloadHash))) {
+          await this.attestationHashesPerSlotAndSigner.set(ownKey, payloadHash);
+        }
+
         this.log.debug(`Added own checkpoint attestation for slot ${slotNumber} from ${address}`, {
           signature: attestation.signature.toString(),
           slotNumber,
           address,
-          proposalId,
+          archive: attestation.archive.toString(),
+          payloadHash,
         });
       }
     });
@@ -381,6 +402,10 @@ export class AttestationPool {
   /**
    * Get all checkpoint attestations for a given slot.
    *
+   * Returns one attestation per (slot, signer) — the first seen for each signer.
+   * Later equivocating attestations from the same signer are tracked in the index
+   * but their bytes are not retained.
+   *
    * @param slot - The slot to query
    * @return CheckpointAttestations
    */
@@ -388,7 +413,7 @@ export class AttestationPool {
     const range = this.getAttestationKeyRangeForSlot(slot);
     const attestations: CheckpointAttestation[] = [];
 
-    for await (const [_, buf] of this.checkpointAttestations.entriesAsync(range)) {
+    for await (const [_, buf] of this.attestationPerSlotAndSigner.entriesAsync(range)) {
       attestations.push(CheckpointAttestation.fromBuffer(buf));
     }
 
@@ -396,24 +421,19 @@ export class AttestationPool {
   }
 
   /**
-   * Get checkpoint attestations for slot and given proposal.
+   * Get checkpoint attestations for a slot whose signed payload matches the given
+   * proposal payload hash.
    *
    * @param slot - The slot to query
-   * @param proposalId - The proposal to query
-   * @return CheckpointAttestations
+   * @param proposalPayloadHash - Hex-encoded keccak256 of the target proposal's signed payload
+   * @return CheckpointAttestations whose `getPayloadHash()` matches `proposalPayloadHash`
    */
   public async getCheckpointAttestationsForSlotAndProposal(
     slot: SlotNumber,
-    proposalId: string,
+    proposalPayloadHash: CheckpointProposalHash,
   ): Promise<CheckpointAttestation[]> {
-    const range = this.getAttestationKeyRangeForProposal(slot, proposalId);
-    const attestations: CheckpointAttestation[] = [];
-
-    for await (const [_, buf] of this.checkpointAttestations.entriesAsync(range)) {
-      attestations.push(CheckpointAttestation.fromBuffer(buf));
-    }
-
-    return attestations;
+    const all = await this.getCheckpointAttestationsForSlot(slot);
+    return all.filter(att => att.getPayloadHash() === proposalPayloadHash);
   }
 
   /**
@@ -427,43 +447,46 @@ export class AttestationPool {
     let numberOfBlockProposals = 0;
 
     await this.store.transactionAsync(async () => {
-      // Delete checkpoint attestations with slot < oldestSlot
-      // Attestation keys start with Fr(slot).toString(), so we use end bound of Fr(oldestSlot).toString()
-      const attestationEndKey = new Fr(oldestSlot).toString();
-      for await (const key of this.checkpointAttestations.keysAsync({ end: attestationEndKey })) {
-        await this.checkpointAttestations.delete(key);
+      const oldestSlotPadded = this.slotPaddedKey(oldestSlot);
+
+      // Delete checkpoint attestations whose key < `${oldestSlotPadded}-`. Fixed-width
+      // decimal padding means the slot prefix sorts strictly before any key at that slot.
+      for await (const key of this.attestationPerSlotAndSigner.keysAsync({ end: `${oldestSlotPadded}-` })) {
+        await this.attestationPerSlotAndSigner.delete(key);
         this.metrics.trackMempoolItemRemoved(key);
         numberOfAttestations++;
       }
 
-      // Clean up per-signer-per-slot index. Keys are formatted as `${Fr(slot).toString()}-${signerAddress}`.
-      // Since Fr pads to fixed-width hex, Fr(oldestSlot) is lexicographically greater than any key with
-      // a smaller slot (even with the signer suffix), so using it as the exclusive end bound is correct.
-      const slotSignerEndKey = new Fr(oldestSlot).toString();
-      for await (const key of this.checkpointAttestationsPerSlotAndSigner.keysAsync({ end: slotSignerEndKey })) {
-        await this.checkpointAttestationsPerSlotAndSigner.delete(key);
+      // Clean up per-signer-per-slot index using the same end bound.
+      for await (const key of this.attestationHashesPerSlotAndSigner.keysAsync({ end: `${oldestSlotPadded}-` })) {
+        await this.attestationHashesPerSlotAndSigner.delete(key);
       }
 
-      // Delete checkpoint proposals for slots < oldestSlot, using checkpointProposalsForSlot as index
-      for await (const slot of this.checkpointProposalsForSlot.keysAsync({ end: oldestSlot })) {
-        const proposalIds = await toArray(this.checkpointProposalsForSlot.getValuesAsync(slot));
-        for (const proposalId of proposalIds) {
-          await this.checkpointProposals.delete(proposalId);
+      // Delete checkpoint proposals for slots < oldestSlot.
+      for await (const slot of this.checkpointProposalHashesPerSlot.keysAsync({ end: oldestSlot })) {
+        await this.checkpointProposalHashesPerSlot.delete(slot);
+        if (await this.checkpointProposalPerSlot.hasAsync(slot)) {
+          await this.checkpointProposalPerSlot.delete(slot);
           numberOfCheckpointProposals++;
         }
-        await this.checkpointProposalsForSlot.delete(slot);
       }
 
-      // Delete block proposals for slots < oldestSlot, using blockProposalsForSlotAndIndex as index
-      // Key format: (slot << INDEX_BITS) | indexWithinCheckpoint
+      // Delete block proposals for slots < oldestSlot, using blockProposalHashesPerSlotAndIndex as index.
+      // Key format: slot * (1 << INDEX_BITS) + indexWithinCheckpoint
       const blockPositionEndKey = oldestSlot * (1 << AttestationPool.INDEX_BITS);
-      for await (const positionKey of this.blockProposalsForSlotAndIndex.keysAsync({ end: blockPositionEndKey })) {
-        const proposalIds = await toArray(this.blockProposalsForSlotAndIndex.getValuesAsync(positionKey));
-        for (const proposalId of proposalIds) {
-          await this.blockProposals.delete(proposalId);
+      for await (const positionKey of this.blockProposalHashesPerSlotAndIndex.keysAsync({ end: blockPositionEndKey })) {
+        await this.blockProposalHashesPerSlotAndIndex.delete(positionKey);
+        const stored = await this.blockProposalPerSlotAndIndex.getAsync(positionKey);
+        if (stored) {
+          try {
+            const proposal = BlockProposal.fromBuffer(stored);
+            await this.blockProposalSlotAndIndexPerArchive.delete(proposal.archive.toString());
+          } catch {
+            // ignore decode errors when cleaning up
+          }
+          await this.blockProposalPerSlotAndIndex.delete(positionKey);
           numberOfBlockProposals++;
         }
-        await this.blockProposalsForSlotAndIndex.delete(positionKey);
       }
     });
 
@@ -478,18 +501,19 @@ export class AttestationPool {
   /**
    * Attempts to add a checkpoint attestation to the pool.
    *
-   * This method performs validation and addition in a single call:
-   * - Checks if the attestation already exists (returns alreadyExists: true if so)
-   * - Checks if this signer has reached the per-signer attestation cap for this slot
-   * - Adds the attestation if validation passes
+   * - Detects duplicates by signed-payload hash (not archive); a re-broadcast of the
+   *   exact same signed payload from the same signer returns `alreadyExists: true`.
+   * - Distinct payload hashes from the same (slot, signer) are tracked in the
+   *   equivocation index. The first one's bytes are stored; later distinct hashes
+   *   bump `count` so libp2p can fire its duplicate callback.
    *
    * @param attestation - The checkpoint attestation to add
-   * @returns Result indicating whether the attestation was added, existence info, and count of
-   *          attestations by this signer for this slot (for equivocation detection)
+   * @returns Result indicating whether the attestation was added, existence info,
+   *          and number of distinct payload hashes by this signer for this slot
+   *          (for equivocation detection).
    */
   public async tryAddCheckpointAttestation(attestation: CheckpointAttestation): Promise<TryAddResult> {
     const slotNumber = attestation.payload.header.slotNumber;
-    const proposalId = attestation.archive.toString();
     const sender = attestation.getSender();
 
     if (!sender) {
@@ -497,28 +521,23 @@ export class AttestationPool {
     }
 
     const signerAddress = sender.toString();
+    const slotSignerKey = this.getSlotSignerKey(slotNumber, signerAddress);
+    const payloadHash = attestation.getPayloadHash();
 
     return await this.store.transactionAsync(async () => {
-      const key = this.getAttestationKey(slotNumber, proposalId, signerAddress);
-      const alreadyExists = await this.checkpointAttestations.hasAsync(key);
-
-      // Get count of attestations by this signer for this slot (for duplicate detection)
-      const signerAttestationCount = await this.getSignerAttestationCountForSlot(slotNumber, signerAddress);
-
-      if (alreadyExists) {
-        return {
-          added: false,
-          alreadyExists: true,
-          count: signerAttestationCount,
-        };
+      if (await this.multimapHasValue(this.attestationHashesPerSlotAndSigner, slotSignerKey, payloadHash)) {
+        const count = await this.attestationHashesPerSlotAndSigner.getValueCountAsync(slotSignerKey);
+        return { added: false, alreadyExists: true, count };
       }
 
-      // Check if this signer has exceeded the per-signer cap for this slot
+      const signerAttestationCount = await this.attestationHashesPerSlotAndSigner.getValueCountAsync(slotSignerKey);
+
       if (signerAttestationCount >= MAX_ATTESTATIONS_PER_SLOT_AND_SIGNER) {
         this.log.debug(`Rejecting attestation: signer ${signerAddress} exceeded per-slot cap for slot ${slotNumber}`, {
           slotNumber,
           signerAddress,
-          proposalId,
+          archive: attestation.archive.toString(),
+          payloadHash,
           signerAttestationCount,
         });
         return {
@@ -528,22 +547,26 @@ export class AttestationPool {
         };
       }
 
-      // Add the attestation
-      await this.checkpointAttestations.set(key, attestation.toBuffer());
-      this.metrics.trackMempoolItemAdded(key);
+      // Track the new payload hash for equivocation detection.
+      await this.attestationHashesPerSlotAndSigner.set(slotSignerKey, payloadHash);
 
-      // Track this attestation in the per-signer-per-slot index for duplicate detection
-      const slotSignerKey = this.getSlotSignerKey(slotNumber, signerAddress);
-      await this.checkpointAttestationsPerSlotAndSigner.set(slotSignerKey, proposalId);
+      // Only the first distinct payload at (slot, signer) is stored; later
+      // equivocations are detected via the multimap but their bytes are not retained.
+      const alreadyHasStored = await this.attestationPerSlotAndSigner.hasAsync(slotSignerKey);
+      if (!alreadyHasStored) {
+        await this.attestationPerSlotAndSigner.set(slotSignerKey, attestation.toBuffer());
+        this.metrics.trackMempoolItemAdded(slotSignerKey);
+      }
 
       this.log.debug(`Added checkpoint attestation for slot ${slotNumber} from ${signerAddress}`, {
         signature: attestation.signature.toString(),
         slotNumber,
         address: signerAddress,
-        proposalId,
+        archive: attestation.archive.toString(),
+        payloadHash,
+        stored: !alreadyHasStored,
       });
 
-      // Return the new count
       return {
         added: true,
         alreadyExists: false,
@@ -551,12 +574,6 @@ export class AttestationPool {
       };
     });
   }
-
-  /** Gets the count of attestations by a specific signer for a given slot. */
-  private async getSignerAttestationCountForSlot(slot: SlotNumber, signerAddress: string): Promise<number> {
-    const slotSignerKey = this.getSlotSignerKey(slot, signerAddress);
-    return await this.checkpointAttestationsPerSlotAndSigner.getValueCountAsync(slotSignerKey);
-  }
 }
 
 /** Creates an AttestationPool backed by a temporary store for testing. */
diff --git a/yarn-project/p2p/src/mem_pools/attestation_pool/attestation_pool_test_suite.ts b/yarn-project/p2p/src/mem_pools/attestation_pool/attestation_pool_test_suite.ts
index 02b1f1357f27..7265d2e52a42 100644
--- a/yarn-project/p2p/src/mem_pools/attestation_pool/attestation_pool_test_suite.ts
+++ b/yarn-project/p2p/src/mem_pools/attestation_pool/attestation_pool_test_suite.ts
@@ -28,9 +28,16 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
     signers = Array.from({ length: NUMBER_OF_SIGNERS_PER_TEST }, () => Secp256k1Signer.random());
   });
 
+  /**
+   * Build attestations from each signer over the *same* signed payload (same header,
+   * archive, feeAssetPriceModifier). Required by the new pool, which deduplicates by
+   * payload hash and treats attestations from different signers as distinct entries
+   * only when the payload itself matches.
+   */
   const createCheckpointAttestationsForSlot = (slotNumber: number, archive?: Fr) => {
     const archiveToUse = archive ?? Fr.random();
-    return signers.map(signer => mockCheckpointAttestation(signer, slotNumber, archiveToUse));
+    const sharedHeader = CheckpointHeader.random({ slotNumber: SlotNumber(slotNumber) });
+    return signers.map(signer => mockCheckpointAttestation(signer, slotNumber, archiveToUse, sharedHeader));
   };
 
   const mockBlockProposalForPool = (
@@ -59,13 +66,17 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
     it('should add attestations to pool', async () => {
       const slotNumber = 420;
       const archive = Fr.random();
-      const attestations = signers.slice(0, -1).map(signer => mockCheckpointAttestation(signer, slotNumber, archive));
+      const sharedHeader = CheckpointHeader.random({ slotNumber: SlotNumber(slotNumber) });
+      const attestations = signers
+        .slice(0, -1)
+        .map(signer => mockCheckpointAttestation(signer, slotNumber, archive, sharedHeader));
+      const payloadHash = attestations[0].getPayloadHash();
 
       await ap.addOwnCheckpointAttestations(attestations);
 
       const retrievedAttestations = await ap.getCheckpointAttestationsForSlotAndProposal(
         SlotNumber(slotNumber),
-        archive.toString(),
+        payloadHash,
       );
       expect(retrievedAttestations.length).toBe(attestations.length);
       compareCheckpointAttestations(retrievedAttestations, attestations);
@@ -75,11 +86,16 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
       compareCheckpointAttestations(retrievedAttestationsForSlot, attestations);
 
       // Add another one
-      const newAttestation = mockCheckpointAttestation(signers[NUMBER_OF_SIGNERS_PER_TEST - 1], slotNumber, archive);
+      const newAttestation = mockCheckpointAttestation(
+        signers[NUMBER_OF_SIGNERS_PER_TEST - 1],
+        slotNumber,
+        archive,
+        sharedHeader,
+      );
       await ap.addOwnCheckpointAttestations([newAttestation]);
       const retrievedAttestationsAfterAdd = await ap.getCheckpointAttestationsForSlotAndProposal(
         SlotNumber(slotNumber),
-        archive.toString(),
+        payloadHash,
       );
       expect(retrievedAttestationsAfterAdd.length).toBe(attestations.length + 1);
       compareCheckpointAttestations(retrievedAttestationsAfterAdd, [...attestations, newAttestation]);
@@ -92,7 +108,7 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
 
       const retreivedAttestationsAfterDelete = await ap.getCheckpointAttestationsForSlotAndProposal(
         SlotNumber(slotNumber),
-        archive.toString(),
+        payloadHash,
       );
       expect(retreivedAttestationsAfterDelete.length).toBe(0);
     });
@@ -108,13 +124,14 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
       for (let i = 0; i < NUMBER_OF_SIGNERS_PER_TEST; i++) {
         attestations.push(mockCheckpointAttestation(signer, slotNumber, archive, header));
       }
+      const payloadHash = attestations[0].getPayloadHash();
 
       // Add them to store and check we end up with only one
       await ap.addOwnCheckpointAttestations(attestations);
 
       const retreivedAttestations = await ap.getCheckpointAttestationsForSlotAndProposal(
         SlotNumber(slotNumber),
-        archive.toString(),
+        payloadHash,
       );
       expect(retreivedAttestations.length).toBe(1);
       expect(retreivedAttestations[0].toBuffer()).toEqual(attestations[0].toBuffer());
@@ -122,9 +139,7 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
 
       // Try adding them on another operation and check they are still not duplicated
       await ap.addOwnCheckpointAttestations([attestations[0]]);
-      expect(
-        await ap.getCheckpointAttestationsForSlotAndProposal(SlotNumber(slotNumber), archive.toString()),
-      ).toHaveLength(1);
+      expect(await ap.getCheckpointAttestationsForSlotAndProposal(SlotNumber(slotNumber), payloadHash)).toHaveLength(1);
     });
 
     it('should store attestations by differing slot', async () => {
@@ -135,9 +150,9 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
 
       for (const attestation of attestations) {
         const slot = attestation.payload.header.slotNumber;
-        const archive = attestation.archive.toString();
+        const payloadHash = attestation.getPayloadHash();
 
-        const retreivedAttestations = await ap.getCheckpointAttestationsForSlotAndProposal(slot, archive);
+        const retreivedAttestations = await ap.getCheckpointAttestationsForSlotAndProposal(slot, payloadHash);
         expect(retreivedAttestations.length).toBe(1);
         expect(retreivedAttestations[0].toBuffer()).toEqual(attestation.toBuffer());
         expect(retreivedAttestations[0].payload.header.slotNumber).toEqual(slot);
@@ -153,9 +168,9 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
 
       for (const attestation of attestations) {
         const slot = attestation.payload.header.slotNumber;
-        const proposalId = attestation.archive.toString();
+        const payloadHash = attestation.getPayloadHash();
 
-        const retreivedAttestations = await ap.getCheckpointAttestationsForSlotAndProposal(slot, proposalId);
+        const retreivedAttestations = await ap.getCheckpointAttestationsForSlotAndProposal(slot, payloadHash);
         expect(retreivedAttestations.length).toBe(1);
         expect(retreivedAttestations[0].toBuffer()).toEqual(attestation.toBuffer());
         expect(retreivedAttestations[0].payload.header.slotNumber).toEqual(slot);
@@ -164,21 +179,25 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
 
     it('should delete attestations older than a given slot', async () => {
       const slotNumbers = [1, 2, 3, 69, 72, 74, 88, 420];
-      const attestations = (
-        await Promise.all(slotNumbers.map(slotNumber => createCheckpointAttestationsForSlot(slotNumber)))
-      ).flat();
-      const proposalId = attestations[0].archive.toString();
+      const attestationsPerSlot = await Promise.all(
+        slotNumbers.map(slotNumber => createCheckpointAttestationsForSlot(slotNumber)),
+      );
+      const attestations = attestationsPerSlot.flat();
+      const payloadHashForSlot1 = attestationsPerSlot[0][0].getPayloadHash();
 
       await ap.addOwnCheckpointAttestations(attestations);
 
-      const attestationsForSlot1 = await ap.getCheckpointAttestationsForSlotAndProposal(SlotNumber(1), proposalId);
+      const attestationsForSlot1 = await ap.getCheckpointAttestationsForSlotAndProposal(
+        SlotNumber(1),
+        payloadHashForSlot1,
+      );
       expect(attestationsForSlot1.length).toBe(signers.length);
 
       await ap.deleteOlderThan(SlotNumber(73));
 
       const attestationsForSlot1AfterDelete = await ap.getCheckpointAttestationsForSlotAndProposal(
         SlotNumber(1),
-        proposalId,
+        payloadHashForSlot1,
       );
       expect(attestationsForSlot1AfterDelete.length).toBe(0);
     });
@@ -189,7 +208,6 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
       const slotNumber = 420;
       const archive = Fr.random();
       const proposal = await mockBlockProposalForPool(signers[0], slotNumber, archive);
-      const proposalId = proposal.archive.toString();
 
       const result = await ap.tryAddBlockProposal(proposal);
 
@@ -197,7 +215,7 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
       expect(result.alreadyExists).toBe(false);
       expect(result.count).toBe(1);
 
-      const retrievedProposal = await ap.getBlockProposal(proposalId);
+      const retrievedProposal = await ap.getBlockProposalByArchive(proposal.archive.toString());
 
       expect(retrievedProposal).toBeDefined();
       expect(retrievedProposal!).toEqual(proposal);
@@ -205,31 +223,27 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
 
     it('should return undefined for non-existent block proposal', async () => {
       const nonExistentId = Fr.random().toString();
-      const retrievedProposal = await ap.getBlockProposal(nonExistentId);
+      const retrievedProposal = await ap.getBlockProposalByArchive(nonExistentId);
       expect(retrievedProposal).toBeUndefined();
     });
 
-    it('should return alreadyExists when adding proposal with same id', async () => {
+    it('should return alreadyExists when re-adding the same signed payload', async () => {
       const slotNumber = 420;
       const archive = Fr.random();
-      const proposal1 = await mockBlockProposalForPool(signers[0], slotNumber, archive);
-      const proposalId = proposal1.archive.toString();
+      const proposal = await mockBlockProposalForPool(signers[0], slotNumber, archive);
 
-      const result1 = await ap.tryAddBlockProposal(proposal1);
+      const result1 = await ap.tryAddBlockProposal(proposal);
       expect(result1.added).toBe(true);
       expect(result1.alreadyExists).toBe(false);
 
-      // Create a new proposal with same archive but different signer
-      const proposal2 = await mockBlockProposalForPool(signers[1], slotNumber, archive);
-
-      const result2 = await ap.tryAddBlockProposal(proposal2);
+      // Re-broadcasting the exact same proposal yields alreadyExists.
+      const result2 = await ap.tryAddBlockProposal(proposal);
       expect(result2.added).toBe(false);
       expect(result2.alreadyExists).toBe(true);
 
-      // Should still have the first proposal
-      const retrievedProposal = await ap.getBlockProposal(proposalId);
+      const retrievedProposal = await ap.getBlockProposalByArchive(proposal.archive.toString());
       expect(retrievedProposal).toBeDefined();
-      expect(retrievedProposal!.toBuffer()).toEqual(proposal1.toBuffer());
+      expect(retrievedProposal!.toBuffer()).toEqual(proposal.toBuffer());
       expect(retrievedProposal!.getSender()?.toString()).toBe(signers[0].address.toString());
     });
   });
@@ -239,12 +253,13 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
       signer: Secp256k1Signer,
       slotNumber: number,
       archive: Fr = Fr.random(),
+      checkpointHeader?: CheckpointHeader,
     ): Promise<CheckpointProposalCore> => {
-      const checkpointHeader = makeCheckpointHeader(1, { slotNumber: SlotNumber(slotNumber) });
+      const headerToUse = checkpointHeader ?? makeCheckpointHeader(1, { slotNumber: SlotNumber(slotNumber) });
       const blockHeader = makeBlockHeader(1);
       const proposal = await makeCheckpointProposal({
         signer,
-        checkpointHeader,
+        checkpointHeader: headerToUse,
         archiveRoot: archive,
         lastBlock: { blockHeader },
       });
@@ -256,7 +271,6 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
       const slotNumber = 420;
       const archive = Fr.random();
       const proposal = await mockCheckpointProposalForPool(signers[0], slotNumber, archive);
-      const proposalId = proposal.archive.toString();
 
       const result = await ap.tryAddCheckpointProposal(proposal);
 
@@ -264,7 +278,7 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
       expect(result.alreadyExists).toBe(false);
       expect(result.count).toBe(1);
 
-      const retrievedProposal = await ap.getCheckpointProposal(proposalId);
+      const retrievedProposal = await ap.getCheckpointProposal(SlotNumber(slotNumber));
 
       expect(retrievedProposal).toBeDefined();
       expect(retrievedProposal!.toBuffer()).toEqual(proposal.toBuffer());
@@ -281,54 +295,100 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
         archiveRoot: archive,
         // No lastBlock
       });
-      const proposalId = proposal.archive.toString();
 
       // Add the checkpoint core - block extraction is now caller responsibility
       await ap.tryAddCheckpointProposal(proposal.toCore());
 
       // The checkpoint proposal should be stored
-      const retrievedCheckpointProposal = await ap.getCheckpointProposal(proposalId);
+      const retrievedCheckpointProposal = await ap.getCheckpointProposal(SlotNumber(slotNumber));
       expect(retrievedCheckpointProposal).toBeDefined();
 
       // No block proposal was extracted (it had none anyway)
-      const retrievedBlockProposal = await ap.getBlockProposal(proposalId);
+      const retrievedBlockProposal = await ap.getBlockProposalByArchive(proposal.archive.toString());
       expect(retrievedBlockProposal).toBeUndefined();
     });
 
     it('should return undefined for non-existent checkpoint proposal', async () => {
-      const nonExistentId = Fr.random().toString();
-      const retrievedProposal = await ap.getCheckpointProposal(nonExistentId);
+      const retrievedProposal = await ap.getCheckpointProposal(SlotNumber(99999));
       expect(retrievedProposal).toBeUndefined();
     });
 
-    it('should return alreadyExists when adding proposal with same id', async () => {
+    it('should return alreadyExists when re-adding the same signed payload', async () => {
       const slotNumber = 420;
       const archive = Fr.random();
-      const proposal1 = await mockCheckpointProposalForPool(signers[0], slotNumber, archive);
-      const proposalId = proposal1.archive.toString();
+      const proposal = await mockCheckpointProposalForPool(signers[0], slotNumber, archive);
 
-      const result1 = await ap.tryAddCheckpointProposal(proposal1);
+      const result1 = await ap.tryAddCheckpointProposal(proposal);
       expect(result1.added).toBe(true);
       expect(result1.alreadyExists).toBe(false);
 
-      // Create a new proposal with same archive but different signer
-      const proposal2 = await mockCheckpointProposalForPool(signers[1], slotNumber, archive);
-
-      const result2 = await ap.tryAddCheckpointProposal(proposal2);
+      // Re-broadcasting the exact same signed payload yields alreadyExists.
+      const result2 = await ap.tryAddCheckpointProposal(proposal);
       expect(result2.added).toBe(false);
       expect(result2.alreadyExists).toBe(true);
 
-      // Should still have the first proposal
-      const retrievedProposal = await ap.getCheckpointProposal(proposalId);
+      // Should still have the first proposal stored at the slot
+      const retrievedProposal = await ap.getCheckpointProposal(SlotNumber(slotNumber));
       expect(retrievedProposal).toBeDefined();
-      expect(retrievedProposal!.toBuffer()).toEqual(proposal1.toBuffer());
+      expect(retrievedProposal!.toBuffer()).toEqual(proposal.toBuffer());
       expect(retrievedProposal!.getSender()?.toString()).toBe(signers[0].address.toString());
     });
 
+    it('should treat distinct payloads at the same slot as equivocations (count = 2)', async () => {
+      const slotNumber = 420;
+      // Two proposals at the same slot but with different headers (distinct payloads).
+      const proposal1 = await mockCheckpointProposalForPool(signers[0], slotNumber, Fr.random());
+      const proposal2 = await mockCheckpointProposalForPool(signers[0], slotNumber, Fr.random());
+
+      const result1 = await ap.tryAddCheckpointProposal(proposal1);
+      expect(result1.added).toBe(true);
+      expect(result1.count).toBe(1);
+
+      const result2 = await ap.tryAddCheckpointProposal(proposal2);
+      // The second distinct payload is tracked as an equivocation, count goes to 2,
+      // but its bytes are not retained — the first proposal stays in the main store.
+      expect(result2.added).toBe(true);
+      expect(result2.alreadyExists).toBe(false);
+      expect(result2.count).toBe(2);
+
+      const retrievedProposal = await ap.getCheckpointProposal(SlotNumber(slotNumber));
+      expect(retrievedProposal!.toBuffer()).toEqual(proposal1.toBuffer());
+    });
+
+    it('should detect equivocation when only feeAssetPriceModifier differs', async () => {
+      const slotNumber = 420;
+      const archive = Fr.random();
+      // Same checkpoint header + archive, but two different feeAssetPriceModifier values.
+      // This is the audit-finding scenario: archive collides but the signed payload differs.
+      const sharedHeader = makeCheckpointHeader(1, { slotNumber: SlotNumber(slotNumber) });
+      const proposalA = await makeCheckpointProposal({
+        signer: signers[0],
+        checkpointHeader: sharedHeader,
+        archiveRoot: archive,
+        feeAssetPriceModifier: 50n,
+      });
+      const proposalB = await makeCheckpointProposal({
+        signer: signers[0],
+        checkpointHeader: sharedHeader,
+        archiveRoot: archive,
+        feeAssetPriceModifier: -50n,
+      });
+
+      const result1 = await ap.tryAddCheckpointProposal(proposalA.toCore());
+      expect(result1.count).toBe(1);
+
+      const result2 = await ap.tryAddCheckpointProposal(proposalB.toCore());
+      // The fix: archive collision no longer hides the equivocation; payload-hash dedup
+      // sees the distinct feeMod and bumps `count` to 2 so libp2p can fire the slash callback.
+      expect(result2.added).toBe(true);
+      expect(result2.alreadyExists).toBe(false);
+      expect(result2.count).toBe(2);
+    });
+
     it('should return added=false when exceeding capacity', async () => {
       const slotNumber = 420;
 
-      // Add MAX_CHECKPOINT_PROPOSALS_PER_SLOT proposals
+      // Add MAX_CHECKPOINT_PROPOSALS_PER_SLOT distinct proposals.
       for (let i = 0; i < MAX_CHECKPOINT_PROPOSALS_PER_SLOT; i++) {
         const proposal = await mockCheckpointProposalForPool(signers[i % NUMBER_OF_SIGNERS_PER_TEST], slotNumber);
         const result = await ap.tryAddCheckpointProposal(proposal);
@@ -336,7 +396,7 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
         expect(result.count).toBe(i + 1);
       }
 
-      // The next proposal should not be added
+      // The next proposal should not be added.
       const extraProposal = await mockCheckpointProposalForPool(signers[0], slotNumber);
       const result = await ap.tryAddCheckpointProposal(extraProposal);
       expect(result.added).toBe(false);
@@ -571,17 +631,17 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
         await ap.tryAddBlockProposal(newProposal);
 
         // Verify both proposals exist
-        expect(await ap.getBlockProposal(oldProposal.archive.toString())).toBeDefined();
-        expect(await ap.getBlockProposal(newProposal.archive.toString())).toBeDefined();
+        expect(await ap.getBlockProposalByArchive(oldProposal.archive.toString())).toBeDefined();
+        expect(await ap.getBlockProposalByArchive(newProposal.archive.toString())).toBeDefined();
 
         // Delete slots older than newSlot (should delete oldSlot)
         await ap.deleteOlderThan(SlotNumber(newSlot));
 
         // Old proposal should be deleted from storage
-        expect(await ap.getBlockProposal(oldProposal.archive.toString())).toBeUndefined();
+        expect(await ap.getBlockProposalByArchive(oldProposal.archive.toString())).toBeUndefined();
 
         // New proposal should still exist
-        expect(await ap.getBlockProposal(newProposal.archive.toString())).toBeDefined();
+        expect(await ap.getBlockProposalByArchive(newProposal.archive.toString())).toBeDefined();
       });
     });
 
@@ -590,12 +650,13 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
         signer: Secp256k1Signer,
         slotNumber: number,
         archive: Fr = Fr.random(),
+        checkpointHeader?: CheckpointHeader,
       ): Promise<CheckpointProposalCore> => {
-        const checkpointHeader = makeCheckpointHeader(1, { slotNumber: SlotNumber(slotNumber) });
+        const headerToUse = checkpointHeader ?? makeCheckpointHeader(1, { slotNumber: SlotNumber(slotNumber) });
         const blockHeader = makeBlockHeader(1);
         const proposal = await makeCheckpointProposal({
           signer,
-          checkpointHeader,
+          checkpointHeader: headerToUse,
           archiveRoot: archive,
           lastBlock: { blockHeader },
         });
diff --git a/yarn-project/p2p/src/mem_pools/attestation_pool/mocks.ts b/yarn-project/p2p/src/mem_pools/attestation_pool/mocks.ts
index 419ed432028a..6cca1f3df4e9 100644
--- a/yarn-project/p2p/src/mem_pools/attestation_pool/mocks.ts
+++ b/yarn-project/p2p/src/mem_pools/attestation_pool/mocks.ts
@@ -3,11 +3,12 @@ import type { Secp256k1Signer } from '@aztec/foundation/crypto/secp256k1-signer'
 import { Fr } from '@aztec/foundation/curves/bn254';
 import {
   CheckpointAttestation,
+  CheckpointProposal,
   ConsensusPayload,
-  SignatureDomainSeparator,
-  getHashedSignaturePayloadEthSignedMessage,
+  getHashedSignaturePayloadTypedData,
 } from '@aztec/stdlib/p2p';
 import { CheckpointHeader } from '@aztec/stdlib/rollup';
+import { TEST_COORDINATION_SIGNATURE_CONTEXT } from '@aztec/stdlib/testing';
 
 import { type LocalAccount, generatePrivateKey, privateKeyToAccount } from 'viem/accounts';
 
@@ -37,15 +38,19 @@ export const mockCheckpointAttestation = (
   feeAssetPriceModifier: bigint = 0n,
 ): CheckpointAttestation => {
   header = header ?? CheckpointHeader.random({ slotNumber: SlotNumber(slot) });
-  const payload = new ConsensusPayload(header, archive, feeAssetPriceModifier);
+  const payload = new ConsensusPayload(header, archive, feeAssetPriceModifier, TEST_COORDINATION_SIGNATURE_CONTEXT);
 
-  const attestationHash = getHashedSignaturePayloadEthSignedMessage(
-    payload,
-    SignatureDomainSeparator.checkpointAttestation,
-  );
+  const attestationHash = getHashedSignaturePayloadTypedData(payload);
   const attestationSignature = signer.sign(attestationHash);
 
-  const proposalHash = getHashedSignaturePayloadEthSignedMessage(payload, SignatureDomainSeparator.checkpointProposal);
+  const proposal = new CheckpointProposal(
+    header,
+    archive,
+    feeAssetPriceModifier,
+    attestationSignature,
+    TEST_COORDINATION_SIGNATURE_CONTEXT,
+  );
+  const proposalHash = getHashedSignaturePayloadTypedData(proposal);
   const proposerSignature = signer.sign(proposalHash);
 
   return new CheckpointAttestation(payload, attestationSignature, proposerSignature);
diff --git a/yarn-project/p2p/src/mem_pools/instrumentation.ts b/yarn-project/p2p/src/mem_pools/instrumentation.ts
index d76d2c30ad4a..57acd5d57f76 100644
--- a/yarn-project/p2p/src/mem_pools/instrumentation.ts
+++ b/yarn-project/p2p/src/mem_pools/instrumentation.ts
@@ -100,7 +100,11 @@ export class PoolInstrumentation<PoolObject extends Gossipable> {
 
     this.addObjectCounter = createUpDownCounterWithDefault(this.meter, metricsLabels.itemsAdded);
 
-    this.minedDelay = this.meter.createHistogram(metricsLabels.itemMinedDelay);
+    this.minedDelay = this.meter.createHistogram(metricsLabels.itemMinedDelay, {
+      advice: {
+        explicitBucketBoundaries: [100, 500, 1000, 5000, 10000, 30000, 60000, 300000, 600000, 1800000, 3600000],
+      },
+    });
 
     this.meter.addBatchObservableCallback(this.observeStats, [this.objectsInMempool]);
   }
diff --git a/yarn-project/p2p/src/msg_validators/attestation_validator/attestation_validator.test.ts b/yarn-project/p2p/src/msg_validators/attestation_validator/attestation_validator.test.ts
index 1c1acd16e7f2..bdb09e22be7d 100644
--- a/yarn-project/p2p/src/msg_validators/attestation_validator/attestation_validator.test.ts
+++ b/yarn-project/p2p/src/msg_validators/attestation_validator/attestation_validator.test.ts
@@ -4,7 +4,7 @@ import { EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
 import { Secp256k1Signer } from '@aztec/foundation/crypto/secp256k1-signer';
 import { PeerErrorSeverity } from '@aztec/stdlib/p2p';
 import { CheckpointHeader } from '@aztec/stdlib/rollup';
-import { makeCheckpointAttestation } from '@aztec/stdlib/testing';
+import { TEST_COORDINATION_SIGNATURE_CONTEXT, makeCheckpointAttestation } from '@aztec/stdlib/testing';
 
 import { type MockProxy, mock } from 'jest-mock-extended';
 
@@ -22,11 +22,28 @@ describe('CheckpointAttestationValidator', () => {
       slotDuration: 72,
       ethereumSlotDuration: 12,
     } as any);
-    validator = new CheckpointAttestationValidator(epochCache, { l1PublishingTime: 12 });
+    validator = new CheckpointAttestationValidator(epochCache, {
+      l1PublishingTime: 12,
+      signatureContext: TEST_COORDINATION_SIGNATURE_CONTEXT,
+    });
     proposer = Secp256k1Signer.random();
     attester = Secp256k1Signer.random();
   });
 
+  it('rejects foreign signature context with low tolerance error', async () => {
+    const mockAttestation = makeCheckpointAttestation({
+      attesterSigner: attester,
+      proposerSigner: proposer,
+      signatureContext: {
+        ...TEST_COORDINATION_SIGNATURE_CONTEXT,
+        chainId: TEST_COORDINATION_SIGNATURE_CONTEXT.chainId + 1,
+      },
+    });
+
+    const result = await validator.validate(mockAttestation);
+    expect(result).toEqual({ result: 'reject', severity: PeerErrorSeverity.LowToleranceError });
+  });
+
   it('returns high tolerance error if slot number is not current or next slot (outside clock tolerance)', async () => {
     const header = CheckpointHeader.random({ slotNumber: SlotNumber(97) });
     const mockAttestation = makeCheckpointAttestation({
@@ -78,8 +95,9 @@ describe('CheckpointAttestationValidator', () => {
     expect(result).toEqual({ result: 'ignore' });
   });
 
-  it('accepts attestation for current slot until the target-slot publish cutoff', async () => {
+  it('accepts attestation for current slot inside the straggler window', async () => {
     // Attestation is for slot 98 (current wallclock slot), but targetSlot is 99 (pipelining).
+    // attestationWindowIntoTargetSlot = 2*p2p = 4s ⇒ straggler grace 4s+500ms disparity.
     const header = CheckpointHeader.random({ slotNumber: SlotNumber(98) });
     const mockAttestation = makeCheckpointAttestation({
       header,
@@ -98,12 +116,11 @@ describe('CheckpointAttestationValidator', () => {
       ethereumSlotDuration: 12,
     } as any);
 
-    // Within attestation window: 59000ms elapsed < (slotDuration - l1PublishingTime) * 1000 = 60000ms
     epochCache.getEpochAndSlotNow.mockReturnValue({
       epoch: EpochNumber(1),
       slot: SlotNumber(98),
       ts: 1000n,
-      nowMs: 1059000n, // 59000ms elapsed
+      nowMs: 1003000n, // 3000ms elapsed, within 4500ms straggler grace
     });
     epochCache.isInCommittee.mockResolvedValue(true);
     epochCache.getProposerAttesterAddressInSlot.mockResolvedValue(proposer.address);
@@ -112,8 +129,7 @@ describe('CheckpointAttestationValidator', () => {
     expect(result).toEqual({ result: 'accept' });
   });
 
-  it('rejects attestation for current slot after the target-slot publish cutoff', async () => {
-    // Attestation is for slot 98 (one behind target slot 99), after the publish cutoff.
+  it('rejects attestation for current slot past the straggler window', async () => {
     const header = CheckpointHeader.random({ slotNumber: SlotNumber(98) });
     const mockAttestation = makeCheckpointAttestation({
       header,
@@ -133,12 +149,11 @@ describe('CheckpointAttestationValidator', () => {
       ethereumSlotDuration: 12,
     } as any);
 
-    // Outside attestation window AND outside clock tolerance: 61000ms elapsed > 60000ms cutoff
     epochCache.getEpochAndSlotNow.mockReturnValue({
       epoch: EpochNumber(1),
       slot: SlotNumber(99),
       ts: 1000n,
-      nowMs: 1061000n, // 61000ms elapsed
+      nowMs: 1005000n, // 5000ms elapsed, past 4500ms straggler cutoff
     });
     epochCache.isInCommittee.mockResolvedValue(true);
 
diff --git a/yarn-project/p2p/src/msg_validators/attestation_validator/attestation_validator.ts b/yarn-project/p2p/src/msg_validators/attestation_validator/attestation_validator.ts
index 5d84604b592a..c4d30a69adc5 100644
--- a/yarn-project/p2p/src/msg_validators/attestation_validator/attestation_validator.ts
+++ b/yarn-project/p2p/src/msg_validators/attestation_validator/attestation_validator.ts
@@ -3,9 +3,11 @@ import { NoCommitteeError } from '@aztec/ethereum/contracts';
 import { type Logger, createLogger } from '@aztec/foundation/log';
 import {
   type CheckpointAttestation,
+  type CoordinationSignatureContext,
   type P2PValidator,
   PeerErrorSeverity,
   type ValidationResult,
+  hasValidSignatureContext,
 } from '@aztec/stdlib/p2p';
 
 import { PipeliningWindow, isWithinClockTolerance } from '../clock_tolerance.js';
@@ -14,15 +16,22 @@ export class CheckpointAttestationValidator implements P2PValidator<CheckpointAt
   protected epochCache: EpochCacheInterface;
   protected logger: Logger;
   private readonly pipeliningWindow: PipeliningWindow;
+  protected readonly signatureContext: CoordinationSignatureContext;
 
   constructor(
     epochCache: EpochCacheInterface,
     opts: {
       l1PublishingTime?: number;
+      p2pPropagationTime?: number;
+      signatureContext: CoordinationSignatureContext;
     },
   ) {
     this.epochCache = epochCache;
-    this.pipeliningWindow = new PipeliningWindow(epochCache, { l1PublishingTime: opts.l1PublishingTime });
+    this.pipeliningWindow = new PipeliningWindow(epochCache, {
+      l1PublishingTime: opts.l1PublishingTime,
+      p2pPropagationTime: opts.p2pPropagationTime,
+    });
+    this.signatureContext = opts.signatureContext;
     this.logger = createLogger('p2p:checkpoint-attestation-validator');
   }
 
@@ -30,6 +39,17 @@ export class CheckpointAttestationValidator implements P2PValidator<CheckpointAt
     const slotNumber = message.payload.header.slotNumber;
 
     try {
+      // Cross-chain replay check: reject attestations that carry a foreign signing domain.
+      if (!hasValidSignatureContext(message.payload, this.signatureContext)) {
+        this.logger.warn(`Rejecting checkpoint attestation with foreign signature context for slot ${slotNumber}`, {
+          chainId: message.payload.signatureContext.chainId,
+          rollupAddress: message.payload.signatureContext.rollupAddress.toString(),
+          expectedChainId: this.signatureContext.chainId,
+          expectedRollupAddress: this.signatureContext.rollupAddress.toString(),
+        });
+        return { result: 'reject', severity: PeerErrorSeverity.LowToleranceError };
+      }
+
       // Use target slots since proposals target pipeline slots (slot + 1 when pipelining).
       const { targetSlot, nextSlot } = this.epochCache.getTargetAndNextSlot();
 
diff --git a/yarn-project/p2p/src/msg_validators/attestation_validator/fisherman_attestation_validator.test.ts b/yarn-project/p2p/src/msg_validators/attestation_validator/fisherman_attestation_validator.test.ts
index 20af0ee4cc6d..4cf3c3acab58 100644
--- a/yarn-project/p2p/src/msg_validators/attestation_validator/fisherman_attestation_validator.test.ts
+++ b/yarn-project/p2p/src/msg_validators/attestation_validator/fisherman_attestation_validator.test.ts
@@ -5,6 +5,7 @@ import { Fr } from '@aztec/foundation/curves/bn254';
 import { PeerErrorSeverity } from '@aztec/stdlib/p2p';
 import { CheckpointHeader } from '@aztec/stdlib/rollup';
 import {
+  TEST_COORDINATION_SIGNATURE_CONTEXT,
   makeBlockHeader,
   makeCheckpointAttestation,
   makeCheckpointHeader,
@@ -33,6 +34,7 @@ describe('FishermanAttestationValidator', () => {
     attestationPool = mock<AttestationPool>();
     validator = new FishermanAttestationValidator(epochCache, attestationPool, getTelemetryClient(), {
       l1PublishingTime: 12,
+      signatureContext: TEST_COORDINATION_SIGNATURE_CONTEXT,
     });
     proposer = Secp256k1Signer.random();
     attester = Secp256k1Signer.random();
@@ -146,7 +148,7 @@ describe('FishermanAttestationValidator', () => {
       const result = await validator.validate(mockAttestation);
       expect(result).toEqual({ result: 'accept' });
 
-      expect(attestationPool.getCheckpointProposal).toHaveBeenCalledWith(mockAttestation.archive.toString());
+      expect(attestationPool.getCheckpointProposal).toHaveBeenCalledWith(mockAttestation.payload.header.slotNumber);
     });
 
     it('returns low tolerance error if attestation payload does not match proposal payload', async () => {
@@ -171,7 +173,7 @@ describe('FishermanAttestationValidator', () => {
       const result = await validator.validate(mockAttestation);
       expect(result).toEqual({ result: 'reject', severity: PeerErrorSeverity.LowToleranceError });
 
-      expect(attestationPool.getCheckpointProposal).toHaveBeenCalledWith(mockAttestation.archive.toString());
+      expect(attestationPool.getCheckpointProposal).toHaveBeenCalledWith(mockAttestation.payload.header.slotNumber);
     });
 
     it('returns accept if proposal is not found yet (attestation arrived before proposal)', async () => {
@@ -187,7 +189,7 @@ describe('FishermanAttestationValidator', () => {
       const result = await validator.validate(mockAttestation);
       expect(result).toEqual({ result: 'accept' });
 
-      expect(attestationPool.getCheckpointProposal).toHaveBeenCalledWith(mockAttestation.archive.toString());
+      expect(attestationPool.getCheckpointProposal).toHaveBeenCalledWith(mockAttestation.payload.header.slotNumber);
     });
 
     it('detects payload mismatch with different archive roots', async () => {
diff --git a/yarn-project/p2p/src/msg_validators/attestation_validator/fisherman_attestation_validator.ts b/yarn-project/p2p/src/msg_validators/attestation_validator/fisherman_attestation_validator.ts
index 5a349757a3b0..5639c7e45a69 100644
--- a/yarn-project/p2p/src/msg_validators/attestation_validator/fisherman_attestation_validator.ts
+++ b/yarn-project/p2p/src/msg_validators/attestation_validator/fisherman_attestation_validator.ts
@@ -1,5 +1,10 @@
 import type { EpochCacheInterface } from '@aztec/epoch-cache';
-import { type CheckpointAttestation, PeerErrorSeverity, type ValidationResult } from '@aztec/stdlib/p2p';
+import {
+  type CheckpointAttestation,
+  type CoordinationSignatureContext,
+  PeerErrorSeverity,
+  type ValidationResult,
+} from '@aztec/stdlib/p2p';
 import { Attributes, Metrics, type TelemetryClient, createUpDownCounterWithDefault } from '@aztec/telemetry-client';
 
 import type { AttestationPoolApi } from '../../mem_pools/attestation_pool/attestation_pool.js';
@@ -22,7 +27,9 @@ export class FishermanAttestationValidator extends CheckpointAttestationValidato
     telemetryClient: TelemetryClient,
     opts: {
       l1PublishingTime?: number;
-    } = {},
+      p2pPropagationTime?: number;
+      signatureContext: CoordinationSignatureContext;
+    },
   ) {
     super(epochCache, opts);
     this.logger = this.logger.createChild('[FISHERMAN]');
@@ -57,8 +64,7 @@ export class FishermanAttestationValidator extends CheckpointAttestationValidato
       return { result: 'accept' };
     }
 
-    const proposalId = message.archive.toString();
-    const proposal = await this.attestationPool.getCheckpointProposal(proposalId);
+    const proposal = await this.attestationPool.getCheckpointProposal(message.payload.header.slotNumber);
 
     if (proposal) {
       // Compare the attestation payload with the proposal payload
@@ -87,9 +93,7 @@ export class FishermanAttestationValidator extends CheckpointAttestationValidato
       }
     } else {
       // We might receive attestations before proposals in some cases
-      this.logger.debug(
-        `Received attestation for slot ${slotNumberBigInt} but proposal not found yet. ` + `Proposal ID: ${proposalId}`,
-      );
+      this.logger.debug(`Received attestation for slot ${slotNumberBigInt} but proposal not found yet.`);
     }
 
     return { result: 'accept' };
diff --git a/yarn-project/p2p/src/msg_validators/clock_tolerance.test.ts b/yarn-project/p2p/src/msg_validators/clock_tolerance.test.ts
index f788ef041da5..57d7235c8ddc 100644
--- a/yarn-project/p2p/src/msg_validators/clock_tolerance.test.ts
+++ b/yarn-project/p2p/src/msg_validators/clock_tolerance.test.ts
@@ -206,6 +206,10 @@ describe('clock_tolerance', () => {
   });
 
   describe('PipeliningWindow.acceptsProposal', () => {
+    // Config: 72s slot, 2s p2p.
+    // Under early pipelining, proposalWindowIntoTargetSlot = 0: only the 500ms
+    // clock-disparity grace keeps old-target-slot proposals acceptable after the
+    // receiver rolls into the next slot.
     let epochCache: ReturnType<typeof mock<EpochCacheInterface>>;
     let pipeliningWindow: PipeliningWindow;
 
@@ -220,118 +224,59 @@ describe('clock_tolerance', () => {
       pipeliningWindow = new PipeliningWindow(epochCache);
     });
 
-    it('returns true when pipelining enabled, message is for current slot, and within grace period', () => {
-      // Grace period = DEFAULT_P2P_PROPAGATION_TIME * 1000 = 2000ms
+    it('accepts a current-slot proposal within clock-disparity grace', () => {
       epochCache.getEpochAndSlotNow.mockReturnValue({
         epoch: 1 as any,
         slot: SlotNumber(100),
         ts: 1000n,
-        nowMs: 1001000n, // 1000ms elapsed, within 2000ms grace period
+        nowMs: 1000400n, // 400ms elapsed, within 500ms grace
       });
 
       expect(pipeliningWindow.acceptsProposal(SlotNumber(100))).toBe(true);
     });
 
-    it('returns true at exactly 0ms elapsed', () => {
+    it('rejects a current-slot proposal past the clock-disparity grace', () => {
       epochCache.getEpochAndSlotNow.mockReturnValue({
         epoch: 1 as any,
         slot: SlotNumber(100),
         ts: 1000n,
-        nowMs: 1000000n, // 0ms elapsed
-      });
-
-      expect(pipeliningWindow.acceptsProposal(SlotNumber(100))).toBe(true);
-    });
-
-    it('returns false when elapsed time exceeds grace period', () => {
-      // 3000ms elapsed > 2000ms grace period
-      epochCache.getEpochAndSlotNow.mockReturnValue({
-        epoch: 1 as any,
-        slot: SlotNumber(100),
-        ts: 1000n,
-        nowMs: 1003000n, // 3000ms elapsed
+        nowMs: 1001000n, // 1000ms elapsed, past 500ms grace
       });
 
       expect(pipeliningWindow.acceptsProposal(SlotNumber(100))).toBe(false);
     });
 
-    it('returns true at the propagation boundary when within clock disparity allowance', () => {
-      // 2000ms elapsed = DEFAULT_P2P_PROPAGATION_TIME * 1000, still within the extra 500ms allowance
-      epochCache.getEpochAndSlotNow.mockReturnValue({
-        epoch: 1 as any,
-        slot: SlotNumber(100),
-        ts: 1000n,
-        nowMs: 1002000n, // 2000ms elapsed
-      });
-
-      expect(pipeliningWindow.acceptsProposal(SlotNumber(100))).toBe(true);
-    });
-
-    it('returns false at exactly the propagation boundary plus clock disparity allowance', () => {
-      // 2500ms elapsed = 2000ms propagation window + 500ms disparity allowance (not strictly less than)
+    it('rejects proposals for other slots regardless of elapsed time', () => {
       epochCache.getEpochAndSlotNow.mockReturnValue({
         epoch: 1 as any,
         slot: SlotNumber(100),
         ts: 1000n,
-        nowMs: 1002500n, // 2500ms elapsed
-      });
-
-      expect(pipeliningWindow.acceptsProposal(SlotNumber(100))).toBe(false);
-    });
-
-    it('returns false when pipelining is disabled', () => {
-      epochCache.isProposerPipeliningEnabled.mockReturnValue(false);
-
-      epochCache.getEpochAndSlotNow.mockReturnValue({
-        epoch: 1 as any,
-        slot: SlotNumber(100),
-        ts: 1000n,
-        nowMs: 1001000n, // 1000ms elapsed, within grace period
-      });
-
-      expect(pipeliningWindow.acceptsProposal(SlotNumber(100))).toBe(false);
-    });
-
-    it('returns false when message is not for current slot', () => {
-      epochCache.getEpochAndSlotNow.mockReturnValue({
-        epoch: 1 as any,
-        slot: SlotNumber(100),
-        ts: 1000n,
-        nowMs: 1001000n,
+        nowMs: 1000000n,
       });
 
-      // Message for slot 99, current slot is 100
       expect(pipeliningWindow.acceptsProposal(SlotNumber(99))).toBe(false);
-    });
-
-    it('returns false when message is for a future slot', () => {
-      epochCache.getEpochAndSlotNow.mockReturnValue({
-        epoch: 1 as any,
-        slot: SlotNumber(100),
-        ts: 1000n,
-        nowMs: 1001000n,
-      });
-
-      // Message for slot 101, current slot is 100
       expect(pipeliningWindow.acceptsProposal(SlotNumber(101))).toBe(false);
+      expect(pipeliningWindow.acceptsProposal(SlotNumber(102))).toBe(false);
     });
 
-    it('uses the provided propagation time instead of the default', () => {
+    it('rejects when pipelining is disabled', () => {
+      epochCache.isProposerPipeliningEnabled.mockReturnValue(false);
       epochCache.getEpochAndSlotNow.mockReturnValue({
         epoch: 1 as any,
         slot: SlotNumber(100),
         ts: 1000n,
-        nowMs: 1003000n, // 3000ms elapsed
+        nowMs: 1000000n,
       });
 
-      const longerWindow = new PipeliningWindow(epochCache, { p2pPropagationTime: 4 });
-
-      expect(longerWindow.acceptsProposal(SlotNumber(100))).toBe(true);
       expect(pipeliningWindow.acceptsProposal(SlotNumber(100))).toBe(false);
     });
   });
 
   describe('PipeliningWindow.acceptsAttestation', () => {
+    // Config: 72s slot, 2s p2p.
+    // Under early pipelining, attestationWindowIntoTargetSlot = 2*p2p = 4s,
+    // giving straggler attestations 4s+500ms grace after the receiver rolls
+    // into the next slot.
     let epochCache: ReturnType<typeof mock<EpochCacheInterface>>;
     let pipeliningWindow: PipeliningWindow;
 
@@ -346,36 +291,39 @@ describe('clock_tolerance', () => {
       pipeliningWindow = new PipeliningWindow(epochCache, { l1PublishingTime: 12 });
     });
 
-    it('returns true while still before the target-slot publish cutoff', () => {
+    it('accepts a current-slot straggler attestation within the target-slot window', () => {
       epochCache.getEpochAndSlotNow.mockReturnValue({
         epoch: 1 as any,
         slot: SlotNumber(100),
         ts: 1000n,
-        nowMs: 1059000n, // 59000ms elapsed
+        nowMs: 1003000n, // 3000ms elapsed, within 4500ms straggler grace
       });
 
       expect(pipeliningWindow.acceptsAttestation(SlotNumber(100))).toBe(true);
     });
 
-    it('returns true at the target-slot publish cutoff when within clock disparity allowance', () => {
+    it('rejects a current-slot attestation past the straggler window', () => {
       epochCache.getEpochAndSlotNow.mockReturnValue({
         epoch: 1 as any,
         slot: SlotNumber(100),
         ts: 1000n,
-        nowMs: 1060000n, // 60000ms elapsed
+        nowMs: 1005000n, // 5000ms elapsed, past 4500ms cutoff
       });
 
-      expect(pipeliningWindow.acceptsAttestation(SlotNumber(100))).toBe(true);
+      expect(pipeliningWindow.acceptsAttestation(SlotNumber(100))).toBe(false);
     });
 
-    it('returns false at the target-slot publish cutoff plus clock disparity allowance', () => {
+    it('scales the straggler window with p2pPropagationTime', () => {
+      // With p2pPropagationTime = 4, straggler window = 8s + 500ms disparity.
+      const longer = new PipeliningWindow(epochCache, { l1PublishingTime: 12, p2pPropagationTime: 4 });
       epochCache.getEpochAndSlotNow.mockReturnValue({
         epoch: 1 as any,
         slot: SlotNumber(100),
         ts: 1000n,
-        nowMs: 1060500n, // 60500ms elapsed
+        nowMs: 1007000n,
       });
 
+      expect(longer.acceptsAttestation(SlotNumber(100))).toBe(true);
       expect(pipeliningWindow.acceptsAttestation(SlotNumber(100))).toBe(false);
     });
   });
diff --git a/yarn-project/p2p/src/msg_validators/clock_tolerance.ts b/yarn-project/p2p/src/msg_validators/clock_tolerance.ts
index 6eee1f56e72e..4200d9d64449 100644
--- a/yarn-project/p2p/src/msg_validators/clock_tolerance.ts
+++ b/yarn-project/p2p/src/msg_validators/clock_tolerance.ts
@@ -53,17 +53,24 @@ export function isWithinClockTolerance(
 }
 
 /**
- * Checks if a message should be accepted under the pipelining grace period.
+ * Checks if a straggler message for the previous target slot should be accepted.
  *
- * When pipelining is enabled, `targetSlot = slotNow + 1`. A proposal built in slot N-1
- * for slot N arrives when validators are in slot N, so their `targetSlot = N+1`.
- * This function accepts proposals for the current wallclock slot if we're within the
- * first `windowSeconds` seconds of the slot (the pipelining grace period). - see stdlib/timetable/index.ts
+ * Under pipelining, proposals and attestations carry the target slot N. Most of the
+ * time the receiver is either still in the build slot N-1 (accepted via the main
+ * `slotNumber === targetSlot` match) or in the target slot N (accepted via
+ * `slotNumber === nextSlot` when pipelining is disabled, or again via `targetSlot`
+ * when the receiver itself is pipelining). Stragglers that arrive after the receiver
+ * has rolled past the target slot fall to this check: accept `messageSlot === slotNow`
+ * while we're still within the first `windowSeconds + clock-disparity` of the slot.
+ *
+ * Under the early-pipelining schedule `windowSeconds` is small (0 for proposals,
+ * `2*p2pPropagationTime` for attestations) since the proposer collects everything
+ * before the slot boundary.
  *
  * @param messageSlot - The slot number from the received message
  * @param epochCache - EpochCache to get timing and pipelining state
- * @param windowSeconds - The window grace period allowed for attestations into the next slot
- * @returns true if pipelining is enabled, the message is for the current slot, and we're within the grace period
+ * @param windowSeconds - How far into the current slot we still accept previous-target messages
+ * @returns true if pipelining is enabled, the message is for the current wallclock slot, and we're within the grace period
  */
 function isWithinPipeliningWindow(
   messageSlot: SlotNumber,
diff --git a/yarn-project/p2p/src/msg_validators/proposal_validator/block_proposal_validator.ts b/yarn-project/p2p/src/msg_validators/proposal_validator/block_proposal_validator.ts
index acd0e5bb079c..8d19408b94d1 100644
--- a/yarn-project/p2p/src/msg_validators/proposal_validator/block_proposal_validator.ts
+++ b/yarn-project/p2p/src/msg_validators/proposal_validator/block_proposal_validator.ts
@@ -1,5 +1,5 @@
 import type { EpochCacheInterface } from '@aztec/epoch-cache';
-import type { BlockProposal, P2PValidator, ValidationResult } from '@aztec/stdlib/p2p';
+import type { BlockProposal, CoordinationSignatureContext, P2PValidator, ValidationResult } from '@aztec/stdlib/p2p';
 
 import { ProposalValidator } from '../proposal_validator/proposal_validator.js';
 
@@ -8,7 +8,13 @@ export class BlockProposalValidator implements P2PValidator<BlockProposal> {
 
   constructor(
     epochCache: EpochCacheInterface,
-    opts: { txsPermitted: boolean; maxTxsPerBlock?: number; p2pPropagationTime?: number },
+    opts: {
+      txsPermitted: boolean;
+      maxTxsPerBlock?: number;
+      maxBlocksPerCheckpoint?: number;
+      p2pPropagationTime?: number;
+      signatureContext: CoordinationSignatureContext;
+    },
   ) {
     this.proposalValidator = new ProposalValidator(epochCache, opts, 'p2p:block_proposal_validator');
   }
diff --git a/yarn-project/p2p/src/msg_validators/proposal_validator/checkpoint_proposal_validator.ts b/yarn-project/p2p/src/msg_validators/proposal_validator/checkpoint_proposal_validator.ts
index 21261084defa..2a3eb9013c67 100644
--- a/yarn-project/p2p/src/msg_validators/proposal_validator/checkpoint_proposal_validator.ts
+++ b/yarn-project/p2p/src/msg_validators/proposal_validator/checkpoint_proposal_validator.ts
@@ -1,5 +1,10 @@
 import type { EpochCacheInterface } from '@aztec/epoch-cache';
-import type { CheckpointProposal, P2PValidator, ValidationResult } from '@aztec/stdlib/p2p';
+import type {
+  CheckpointProposal,
+  CoordinationSignatureContext,
+  P2PValidator,
+  ValidationResult,
+} from '@aztec/stdlib/p2p';
 
 import { ProposalValidator } from '../proposal_validator/proposal_validator.js';
 
@@ -8,7 +13,13 @@ export class CheckpointProposalValidator implements P2PValidator<CheckpointPropo
 
   constructor(
     epochCache: EpochCacheInterface,
-    opts: { txsPermitted: boolean; maxTxsPerBlock?: number; p2pPropagationTime?: number },
+    opts: {
+      txsPermitted: boolean;
+      maxTxsPerBlock?: number;
+      maxBlocksPerCheckpoint?: number;
+      p2pPropagationTime?: number;
+      signatureContext: CoordinationSignatureContext;
+    },
   ) {
     this.proposalValidator = new ProposalValidator(epochCache, opts, 'p2p:checkpoint_proposal_validator');
   }
diff --git a/yarn-project/p2p/src/msg_validators/proposal_validator/proposal_validator.test.ts b/yarn-project/p2p/src/msg_validators/proposal_validator/proposal_validator.test.ts
index 0414efbd5eb3..5a1d823436c8 100644
--- a/yarn-project/p2p/src/msg_validators/proposal_validator/proposal_validator.test.ts
+++ b/yarn-project/p2p/src/msg_validators/proposal_validator/proposal_validator.test.ts
@@ -1,10 +1,11 @@
 import type { EpochCacheInterface } from '@aztec/epoch-cache';
 import { NoCommitteeError } from '@aztec/ethereum/contracts';
-import { EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
+import { EpochNumber, IndexWithinCheckpoint, SlotNumber } from '@aztec/foundation/branded-types';
 import { Secp256k1Signer } from '@aztec/foundation/crypto/secp256k1-signer';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { PeerErrorSeverity } from '@aztec/stdlib/p2p';
 import {
+  TEST_COORDINATION_SIGNATURE_CONTEXT,
   makeBlockHeader,
   makeBlockProposal,
   makeCheckpointHeader,
@@ -21,6 +22,10 @@ describe('ProposalValidator', () => {
   const currentSlot = SlotNumber(100);
   const nextSlot = SlotNumber(101);
   const previousSlot = SlotNumber(99);
+  const foreignSignatureContext = {
+    ...TEST_COORDINATION_SIGNATURE_CONTEXT,
+    chainId: TEST_COORDINATION_SIGNATURE_CONTEXT.chainId + 1,
+  };
   let epochCache: MockProxy<EpochCacheInterface>;
   let validator: ProposalValidator;
 
@@ -47,7 +52,12 @@ describe('ProposalValidator', () => {
     } as any);
     validator = new ProposalValidator(
       epochCache,
-      { txsPermitted: true, maxTxsPerBlock: undefined, p2pPropagationTime: 2 },
+      {
+        txsPermitted: true,
+        maxTxsPerBlock: undefined,
+        p2pPropagationTime: 2,
+        signatureContext: TEST_COORDINATION_SIGNATURE_CONTEXT,
+      },
       'test',
     );
     epochCache.getEpochAndSlotNow.mockReturnValue({
@@ -68,15 +78,38 @@ describe('ProposalValidator', () => {
   describe.each([
     {
       name: 'block proposal',
-      factory: (slotNumber: SlotNumber, signer: Secp256k1Signer) =>
-        makeBlockProposal({ blockHeader: makeBlockHeader(0, { slotNumber }), signer }),
+      factory: (
+        slotNumber: SlotNumber,
+        signer: Secp256k1Signer,
+        signatureContext = TEST_COORDINATION_SIGNATURE_CONTEXT,
+      ) =>
+        makeBlockProposal({
+          blockHeader: makeBlockHeader(0, { slotNumber }),
+          signer,
+          signatureContext,
+        }),
     },
     {
       name: 'checkpoint proposal',
-      factory: (slotNumber: SlotNumber, signer: Secp256k1Signer) =>
-        makeCheckpointProposal({ checkpointHeader: makeCheckpointHeader(0, { slotNumber }), signer }),
+      factory: (
+        slotNumber: SlotNumber,
+        signer: Secp256k1Signer,
+        signatureContext = TEST_COORDINATION_SIGNATURE_CONTEXT,
+      ) =>
+        makeCheckpointProposal({
+          checkpointHeader: makeCheckpointHeader(0, { slotNumber }),
+          signer,
+          signatureContext,
+        }),
     },
   ])('validate with $name', ({ factory }) => {
+    it('rejects foreign signature context with low tolerance error', async () => {
+      const proposal = await factory(currentSlot, Secp256k1Signer.random(), foreignSignatureContext);
+
+      const result = await validator.validate(proposal);
+      expect(result).toEqual({ result: 'reject', severity: PeerErrorSeverity.LowToleranceError });
+    });
+
     it('rejects with high tolerance error if slot is outside clock tolerance', async () => {
       const proposal = await factory(previousSlot, Secp256k1Signer.random());
 
@@ -180,8 +213,9 @@ describe('ProposalValidator', () => {
       expect(result).toEqual({ result: 'accept' });
     });
 
-    it('accepts proposal for current slot within pipelining grace period', async () => {
-      // Simulate pipelining: targetSlot = 101, but proposal is for slot 100 (current wallclock slot)
+    it('accepts proposal for current slot within pipelining clock-disparity grace', async () => {
+      // Simulate pipelining: targetSlot = 101, but proposal is for slot 100 (current wallclock slot).
+      // Under early pipelining, proposalWindowIntoTargetSlot = 0, so only the 500ms clock-disparity grace applies.
       epochCache.getTargetAndNextSlot.mockReturnValue({
         targetSlot: SlotNumber(101),
         nextSlot: SlotNumber(102),
@@ -189,12 +223,11 @@ describe('ProposalValidator', () => {
       epochCache.getSlotNow.mockReturnValue(currentSlot); // slot 100
       epochCache.isProposerPipeliningEnabled.mockReturnValue(true);
 
-      // Within grace period: 1000ms elapsed < configured propagation window 2000ms
       epochCache.getEpochAndSlotNow.mockReturnValue({
         epoch: EpochNumber(1),
         slot: currentSlot,
         ts: 1000n,
-        nowMs: 1001000n, // 1000ms elapsed
+        nowMs: 1000400n, // 400ms elapsed, within 500ms grace
       });
 
       const signer = Secp256k1Signer.random();
@@ -205,8 +238,7 @@ describe('ProposalValidator', () => {
       expect(result).toEqual({ result: 'accept' });
     });
 
-    it('rejects proposal for current slot outside pipelining grace period', async () => {
-      // Simulate pipelining: targetSlot = 101, but proposal is for slot 100 (current wallclock slot)
+    it('rejects proposal for current slot outside pipelining clock-disparity grace', async () => {
       epochCache.getTargetAndNextSlot.mockReturnValue({
         targetSlot: SlotNumber(101),
         nextSlot: SlotNumber(102),
@@ -215,12 +247,11 @@ describe('ProposalValidator', () => {
       epochCache.getSlotNow.mockReturnValue(currentSlot); // slot 100
       epochCache.isProposerPipeliningEnabled.mockReturnValue(true);
 
-      // Outside grace period: 7000ms elapsed > configured propagation window 2000ms
       epochCache.getEpochAndSlotNow.mockReturnValue({
         epoch: EpochNumber(1),
         slot: currentSlot,
         ts: 1000n,
-        nowMs: 1007000n, // 7000ms elapsed
+        nowMs: 1007000n, // 7000ms elapsed, well past 500ms grace
       });
 
       const signer = Secp256k1Signer.random();
@@ -235,7 +266,15 @@ describe('ProposalValidator', () => {
   describe('validateTxs', () => {
     describe('txsPermitted', () => {
       it('rejects proposal with txHashes when txs not permitted', async () => {
-        validator = new ProposalValidator(epochCache, { txsPermitted: false, maxTxsPerBlock: undefined }, 'test');
+        validator = new ProposalValidator(
+          epochCache,
+          {
+            txsPermitted: false,
+            maxTxsPerBlock: undefined,
+            signatureContext: TEST_COORDINATION_SIGNATURE_CONTEXT,
+          },
+          'test',
+        );
 
         const proposal = await makeBlockProposal({ txHashes: [TxHash.random(), TxHash.random()] });
         const result = await validator.validateTxs(proposal);
@@ -243,7 +282,15 @@ describe('ProposalValidator', () => {
       });
 
       it('accepts proposal with no txHashes when txs not permitted', async () => {
-        validator = new ProposalValidator(epochCache, { txsPermitted: false, maxTxsPerBlock: undefined }, 'test');
+        validator = new ProposalValidator(
+          epochCache,
+          {
+            txsPermitted: false,
+            maxTxsPerBlock: undefined,
+            signatureContext: TEST_COORDINATION_SIGNATURE_CONTEXT,
+          },
+          'test',
+        );
 
         const proposal = await makeBlockProposal({ txHashes: [] });
         const result = await validator.validateTxs(proposal);
@@ -283,7 +330,15 @@ describe('ProposalValidator', () => {
 
     describe('maxTxsPerBlock', () => {
       it('rejects when txHashes exceed maxTxsPerBlock', async () => {
-        validator = new ProposalValidator(epochCache, { txsPermitted: true, maxTxsPerBlock: 2 }, 'test');
+        validator = new ProposalValidator(
+          epochCache,
+          {
+            txsPermitted: true,
+            maxTxsPerBlock: 2,
+            signatureContext: TEST_COORDINATION_SIGNATURE_CONTEXT,
+          },
+          'test',
+        );
 
         const proposal = await makeBlockProposal({ txHashes: Array.from({ length: 3 }, () => TxHash.random()) });
         const result = await validator.validateTxs(proposal);
@@ -291,7 +346,15 @@ describe('ProposalValidator', () => {
       });
 
       it('accepts when txHashes count equals maxTxsPerBlock', async () => {
-        validator = new ProposalValidator(epochCache, { txsPermitted: true, maxTxsPerBlock: 2 }, 'test');
+        validator = new ProposalValidator(
+          epochCache,
+          {
+            txsPermitted: true,
+            maxTxsPerBlock: 2,
+            signatureContext: TEST_COORDINATION_SIGNATURE_CONTEXT,
+          },
+          'test',
+        );
 
         const proposal = await makeBlockProposal({ txHashes: Array.from({ length: 2 }, () => TxHash.random()) });
         const result = await validator.validateTxs(proposal);
@@ -305,4 +368,41 @@ describe('ProposalValidator', () => {
       });
     });
   });
+
+  describe('maxBlocksPerCheckpoint', () => {
+    const signer = Secp256k1Signer.random();
+
+    beforeEach(() => {
+      validator = new ProposalValidator(
+        epochCache,
+        {
+          txsPermitted: true,
+          maxBlocksPerCheckpoint: 5,
+          signatureContext: TEST_COORDINATION_SIGNATURE_CONTEXT,
+        },
+        'test',
+      );
+      epochCache.getProposerAttesterAddressInSlot.mockResolvedValue(signer.address);
+    });
+
+    it('rejects a block proposal whose indexWithinCheckpoint equals the cap (5 >= 5)', async () => {
+      const proposal = await makeBlockProposal({
+        blockHeader: makeBlockHeader(0, { slotNumber: currentSlot }),
+        indexWithinCheckpoint: IndexWithinCheckpoint(5),
+        signer,
+      });
+      const result = await validator.validate(proposal);
+      expect(result).toEqual({ result: 'reject', severity: PeerErrorSeverity.MidToleranceError });
+    });
+
+    it('accepts a block proposal whose indexWithinCheckpoint is below the cap (4 < 5)', async () => {
+      const proposal = await makeBlockProposal({
+        blockHeader: makeBlockHeader(0, { slotNumber: currentSlot }),
+        indexWithinCheckpoint: IndexWithinCheckpoint(4),
+        signer,
+      });
+      const result = await validator.validate(proposal);
+      expect(result).toEqual({ result: 'accept' });
+    });
+  });
 });
diff --git a/yarn-project/p2p/src/msg_validators/proposal_validator/proposal_validator.ts b/yarn-project/p2p/src/msg_validators/proposal_validator/proposal_validator.ts
index 2997a71a0a12..3a34849a0812 100644
--- a/yarn-project/p2p/src/msg_validators/proposal_validator/proposal_validator.ts
+++ b/yarn-project/p2p/src/msg_validators/proposal_validator/proposal_validator.ts
@@ -4,8 +4,10 @@ import { type Logger, createLogger } from '@aztec/foundation/log';
 import {
   type BlockProposal,
   type CheckpointProposalCore,
+  type CoordinationSignatureContext,
   PeerErrorSeverity,
   type ValidationResult,
+  hasValidSignatureContext,
 } from '@aztec/stdlib/p2p';
 
 import { PipeliningWindow, isWithinClockTolerance } from '../clock_tolerance.js';
@@ -16,23 +18,44 @@ export class ProposalValidator {
   private logger: Logger;
   private txsPermitted: boolean;
   private maxTxsPerBlock?: number;
+  private maxBlocksPerCheckpoint?: number;
   private pipeliningWindow: PipeliningWindow;
+  private signatureContext: CoordinationSignatureContext;
 
   constructor(
     epochCache: EpochCacheInterface,
-    opts: { txsPermitted: boolean; maxTxsPerBlock?: number; p2pPropagationTime?: number },
+    opts: {
+      txsPermitted: boolean;
+      maxTxsPerBlock?: number;
+      maxBlocksPerCheckpoint?: number;
+      p2pPropagationTime?: number;
+      signatureContext: CoordinationSignatureContext;
+    },
     loggerName: string,
   ) {
     this.epochCache = epochCache;
     this.txsPermitted = opts.txsPermitted;
     this.maxTxsPerBlock = opts.maxTxsPerBlock;
+    this.maxBlocksPerCheckpoint = opts.maxBlocksPerCheckpoint;
     this.pipeliningWindow = new PipeliningWindow(epochCache, { p2pPropagationTime: opts.p2pPropagationTime });
+    this.signatureContext = opts.signatureContext;
     this.logger = createLogger(loggerName);
   }
 
   /** Validates header-level fields: slot, signature, and proposer. */
   public async validate(proposal: BlockProposal | CheckpointProposalCore): Promise<ValidationResult> {
     try {
+      // Cross-chain replay check: reject proposals that carry a foreign signing domain.
+      if (!hasValidSignatureContext(proposal, this.signatureContext)) {
+        this.logger.warn(`Penalizing peer for proposal with foreign signature context`, {
+          chainId: proposal.signatureContext.chainId,
+          rollupAddress: proposal.signatureContext.rollupAddress.toString(),
+          expectedChainId: this.signatureContext.chainId,
+          expectedRollupAddress: this.signatureContext.rollupAddress.toString(),
+        });
+        return { result: 'reject', severity: PeerErrorSeverity.LowToleranceError };
+      }
+
       // Slot check: use target slots since proposals target pipeline slots (slot + 1 when pipelining).
       const { targetSlot, nextSlot } = this.epochCache.getTargetAndNextSlot();
 
@@ -68,6 +91,17 @@ export class ProposalValidator {
         return { result: 'reject', severity: PeerErrorSeverity.MidToleranceError };
       }
 
+      if (
+        this.maxBlocksPerCheckpoint !== undefined &&
+        'indexWithinCheckpoint' in proposal &&
+        proposal.indexWithinCheckpoint >= this.maxBlocksPerCheckpoint
+      ) {
+        this.logger.warn(
+          `Penalizing peer for proposal with indexWithinCheckpoint ${proposal.indexWithinCheckpoint} >= max ${this.maxBlocksPerCheckpoint}`,
+        );
+        return { result: 'reject', severity: PeerErrorSeverity.MidToleranceError };
+      }
+
       return { result: 'accept' };
     } catch (e) {
       if (e instanceof NoCommitteeError) {
diff --git a/yarn-project/p2p/src/services/libp2p/libp2p_service.test.ts b/yarn-project/p2p/src/services/libp2p/libp2p_service.test.ts
index 987bf9d85a36..2dab754fe0d4 100644
--- a/yarn-project/p2p/src/services/libp2p/libp2p_service.test.ts
+++ b/yarn-project/p2p/src/services/libp2p/libp2p_service.test.ts
@@ -3,17 +3,18 @@ import { BlockNumber, IndexWithinCheckpoint, SlotNumber } from '@aztec/foundatio
 import { getDefaultConfig } from '@aztec/foundation/config';
 import { Secp256k1Signer } from '@aztec/foundation/crypto/secp256k1-signer';
 import { Fr } from '@aztec/foundation/curves/bn254';
-import { EthAddress } from '@aztec/foundation/eth-address';
 import { type Logger, createLogger } from '@aztec/foundation/log';
 import { openTmpStore } from '@aztec/kv-store/lmdb';
 import type { L2BlockSource } from '@aztec/stdlib/block';
 import type { ContractDataSource } from '@aztec/stdlib/contract';
 import { GasFees } from '@aztec/stdlib/gas';
 import type { ClientProtocolCircuitVerifier } from '@aztec/stdlib/interfaces/server';
-import { BlockProposal, PeerErrorSeverity } from '@aztec/stdlib/p2p';
+import { BlockProposal, type CheckpointAttestation, PeerErrorSeverity } from '@aztec/stdlib/p2p';
 import {
+  TEST_COORDINATION_SIGNATURE_CONTEXT,
   makeBlockHeader,
   makeBlockProposal,
+  makeCheckpointAttestation,
   makeCheckpointHeader,
   makeCheckpointProposal,
   mockTx,
@@ -327,10 +328,10 @@ describe('LibP2PService', () => {
 
     /** Sets up the mempools with a mock attestation pool that returns a proposal with given tx hashes. */
     function setProposalTxHashes(svc: TestLibP2PService, txHashes: string[]): void {
-      // Create a partial mock of the attestation pool that only implements getBlockProposal.
+      // Create a partial mock of the attestation pool that only implements getBlockProposalByArchive.
       // The validation code only accesses `txHashes` from the returned proposal.
       const mockAttestationPool: MockAttestationPoolForTests = {
-        getBlockProposal: (_: string) =>
+        getBlockProposalByArchive: (_: string) =>
           Promise.resolve({
             txHashes: txHashes.map(s => ({ toString: () => s })),
           }),
@@ -491,7 +492,7 @@ describe('LibP2PService', () => {
 
       // No proposal available - mock attestationPool to return undefined
       const mockAttestationPool: MockAttestationPoolForTests = {
-        getBlockProposal: (_: string) => Promise.resolve(undefined),
+        getBlockProposalByArchive: (_: string) => Promise.resolve(undefined),
       };
       service.setAttestationPool(mockAttestationPool);
 
@@ -557,7 +558,7 @@ describe('LibP2PService', () => {
       expect(reportMessageValidationResultSpy).toHaveBeenCalledWith('msg-1', MOCK_PEER_ID, TopicValidatorResult.Accept);
 
       // Verify block was stored in attestation pool
-      const stored = await attestationPool.getBlockProposal(proposal.archive.toString());
+      const stored = await attestationPool.getBlockProposalByArchive(proposal.archive.toString());
       expect(stored).toBeDefined();
     });
 
@@ -732,6 +733,46 @@ describe('LibP2PService', () => {
       // Verify message was rejected
       expect(reportMessageValidationResultSpy).toHaveBeenCalledWith('msg-1', MOCK_PEER_ID, TopicValidatorResult.Reject);
     });
+
+    // Regression for A-1013: payloads sharing (slot, position, archive) but differing on another
+    // signed field (e.g. inHash) used to dedup by archive only and silently drop the second one.
+    // The pool now dedups by signed-payload hash, so the equivocation surfaces.
+    it('same archive but different signed payload triggers slash callback', async () => {
+      const blockHeader = makeBlockHeader(1, { slotNumber: targetSlot });
+      const indexWithinCheckpoint = IndexWithinCheckpoint(0);
+      const sharedArchive = Fr.random();
+
+      const proposal1 = await makeBlockProposal({
+        signer,
+        blockHeader,
+        indexWithinCheckpoint,
+        inHash: Fr.fromString('0x1'),
+        archiveRoot: sharedArchive,
+      });
+      await service.processBlockFromPeer(proposal1.toBuffer(), 'msg-1', mockPeerId);
+      expect(duplicateProposalCallback).not.toHaveBeenCalled();
+
+      const proposal2 = await makeBlockProposal({
+        signer,
+        blockHeader,
+        indexWithinCheckpoint,
+        inHash: Fr.fromString('0x2'),
+        archiveRoot: sharedArchive,
+      });
+      expect(proposal2.archive.toString()).toBe(proposal1.archive.toString());
+      expect(proposal2.getPayloadHash()).not.toEqual(proposal1.getPayloadHash());
+
+      await service.processBlockFromPeer(proposal2.toBuffer(), 'msg-2', mockPeerId);
+
+      expect(reportMessageValidationResultSpy).toHaveBeenCalledWith('msg-2', MOCK_PEER_ID, TopicValidatorResult.Accept);
+      expect(blockReceivedCallback).toHaveBeenCalledTimes(1); // only the first one
+      expect(duplicateProposalCallback).toHaveBeenCalledTimes(1);
+      expect(duplicateProposalCallback).toHaveBeenCalledWith({
+        slot: targetSlot,
+        proposer: signer.address,
+        type: 'block',
+      });
+    });
   });
 
   describe('handleGossipedCheckpointProposal', () => {
@@ -796,7 +837,7 @@ describe('LibP2PService', () => {
       expect(reportMessageValidationResultSpy).toHaveBeenCalledWith('msg-1', MOCK_PEER_ID, TopicValidatorResult.Accept);
 
       // Verify checkpoint was stored in attestation pool
-      const stored = await attestationPool.getCheckpointProposal(proposal.archive.toString());
+      const stored = await attestationPool.getCheckpointProposal(proposal.slotNumber);
       expect(stored).toBeDefined();
     });
 
@@ -861,10 +902,12 @@ describe('LibP2PService', () => {
       expect(mockTxPool.protectTxs).toHaveBeenCalledTimes(1);
 
       // Verify both were stored in attestation pool
-      const storedCheckpoint = await attestationPool.getCheckpointProposal(proposal.archive.toString());
+      const storedCheckpoint = await attestationPool.getCheckpointProposal(proposal.slotNumber);
       expect(storedCheckpoint).toBeDefined();
 
-      const storedBlock = await attestationPool.getBlockProposal(proposal.getBlockProposal()!.archive.toString());
+      const storedBlock = await attestationPool.getBlockProposalByArchive(
+        proposal.getBlockProposal()!.archive.toString(),
+      );
       expect(storedBlock).toBeDefined();
     });
 
@@ -921,7 +964,9 @@ describe('LibP2PService', () => {
       expect(receivedBlock.archive.toString()).toBe(extraProposal.getBlockProposal()!.archive.toString());
 
       // The lastBlock is stored in the attestation pool
-      const storedBlock = await attestationPool.getBlockProposal(extraProposal.getBlockProposal()!.archive.toString());
+      const storedBlock = await attestationPool.getBlockProposalByArchive(
+        extraProposal.getBlockProposal()!.archive.toString(),
+      );
       expect(storedBlock).toBeDefined();
 
       // Txs were marked as non-evictable since the block was processed
@@ -991,6 +1036,147 @@ describe('LibP2PService', () => {
       expect(allNodesCheckpointReceivedCallback).toHaveBeenCalledTimes(1);
       expect(allNodesCheckpointReceivedCallback).toHaveBeenCalledWith(expect.any(Object), expect.anything());
     });
+
+    // Regression for A-1013: payloads sharing (slot, archive) but differing on feeAssetPriceModifier
+    // used to dedup by archive only and silently drop the second one. The pool now dedups by
+    // signed-payload hash, so the equivocation surfaces.
+    it('same archive but different feeAssetPriceModifier triggers slash callback', async () => {
+      const sharedHeader = makeCheckpointHeader(1, { slotNumber: targetSlot });
+      const sharedArchive = Fr.random();
+
+      const checkpoint1 = await makeCheckpointProposal({
+        signer,
+        checkpointHeader: sharedHeader,
+        archiveRoot: sharedArchive,
+        feeAssetPriceModifier: 50n,
+      });
+      await service.handleGossipedCheckpointProposal(checkpoint1.toBuffer(), 'msg-1', mockPeerId);
+      expect(duplicateProposalCallback).not.toHaveBeenCalled();
+
+      const checkpoint2 = await makeCheckpointProposal({
+        signer,
+        checkpointHeader: sharedHeader,
+        archiveRoot: sharedArchive,
+        feeAssetPriceModifier: -50n,
+      });
+      expect(checkpoint2.archive.toString()).toBe(checkpoint1.archive.toString());
+      expect(checkpoint2.getPayloadHash()).not.toEqual(checkpoint1.getPayloadHash());
+
+      await service.handleGossipedCheckpointProposal(checkpoint2.toBuffer(), 'msg-2', mockPeerId);
+
+      expect(reportMessageValidationResultSpy).toHaveBeenCalledWith('msg-2', MOCK_PEER_ID, TopicValidatorResult.Accept);
+      expect(allNodesCheckpointReceivedCallback).toHaveBeenCalledTimes(1); // only the first one
+      expect(validatorCheckpointReceivedCallback).toHaveBeenCalledTimes(1);
+      expect(duplicateProposalCallback).toHaveBeenCalledTimes(1);
+      expect(duplicateProposalCallback).toHaveBeenCalledWith({
+        slot: targetSlot,
+        proposer: signer.address,
+        type: 'checkpoint',
+      });
+    });
+  });
+
+  // Regression for A-1013
+  describe('validateAndStoreCheckpointAttestation', () => {
+    let attestationPool: AttestationPool;
+    let mockEpochCache: MockProxy<EpochCacheInterface>;
+    let proposerSigner: Secp256k1Signer;
+    let duplicateAttestationCallback: jest.Mock;
+
+    const targetSlot = SlotNumber(100);
+    const nextSlot = SlotNumber(101);
+
+    beforeEach(() => {
+      proposerSigner = Secp256k1Signer.random();
+      attestationPool = new AttestationPool(openTmpStore(true));
+      const mockTxPool = mock<TxPoolV2>();
+      mockTxPool.protectTxs.mockResolvedValue([]);
+
+      mockEpochCache = mock<EpochCacheInterface>();
+      mockEpochCache.getProposerAttesterAddressInSlot.mockResolvedValue(proposerSigner.address);
+      mockEpochCache.getTargetAndNextSlot.mockReturnValue({ targetSlot, nextSlot });
+      mockEpochCache.getTargetSlot.mockReturnValue(targetSlot);
+      mockEpochCache.isInCommittee.mockResolvedValue(true);
+
+      mockPeerManager = mock<PeerManagerInterface>();
+      reportMessageValidationResultSpy = jest.fn();
+
+      service = createTestLibP2PServiceWithPools(
+        mockPeerManager,
+        reportMessageValidationResultSpy,
+        attestationPool,
+        mockTxPool,
+        mockEpochCache,
+      );
+
+      duplicateAttestationCallback = jest.fn();
+      service.registerDuplicateAttestationCallback(duplicateAttestationCallback);
+    });
+
+    // Regression for A-1013: attestations sharing (slot, signer, archive) but differing on
+    // feeAssetPriceModifier used to dedup by archive only. The pool now dedups by signed-payload
+    // hash, so the equivocation surfaces.
+    it('same signer + same archive + different feeAssetPriceModifier triggers slash callback', async () => {
+      const attesterSigner = Secp256k1Signer.random();
+      const sharedHeader = makeCheckpointHeader(1, { slotNumber: targetSlot });
+      const sharedArchive = Fr.random();
+
+      const attestation1 = makeCheckpointAttestation({
+        header: sharedHeader,
+        archive: sharedArchive,
+        feeAssetPriceModifier: 50n,
+        attesterSigner,
+        proposerSigner,
+      });
+      await service.validateAndStoreCheckpointAttestation(mockPeerId, attestation1);
+      expect(duplicateAttestationCallback).not.toHaveBeenCalled();
+
+      const attestation2 = makeCheckpointAttestation({
+        header: sharedHeader,
+        archive: sharedArchive,
+        feeAssetPriceModifier: -50n,
+        attesterSigner,
+        proposerSigner,
+      });
+      expect(attestation2.archive.toString()).toBe(attestation1.archive.toString());
+      expect(attestation2.getPayloadHash()).not.toEqual(attestation1.getPayloadHash());
+
+      await service.validateAndStoreCheckpointAttestation(mockPeerId, attestation2);
+
+      expect(duplicateAttestationCallback).toHaveBeenCalledTimes(1);
+      expect(duplicateAttestationCallback).toHaveBeenCalledWith({
+        slot: targetSlot,
+        attester: attesterSigner.address,
+      });
+    });
+
+    it('different signers are not equivocations and do not trigger slash callback', async () => {
+      const attesterA = Secp256k1Signer.random();
+      const attesterB = Secp256k1Signer.random();
+      const sharedHeader = makeCheckpointHeader(1, { slotNumber: targetSlot });
+      const sharedArchive = Fr.random();
+
+      const attestationA = makeCheckpointAttestation({
+        header: sharedHeader,
+        archive: sharedArchive,
+        feeAssetPriceModifier: 50n,
+        attesterSigner: attesterA,
+        proposerSigner,
+      });
+      await service.validateAndStoreCheckpointAttestation(mockPeerId, attestationA);
+
+      const attestationB = makeCheckpointAttestation({
+        header: sharedHeader,
+        archive: sharedArchive,
+        feeAssetPriceModifier: -50n,
+        attesterSigner: attesterB,
+        proposerSigner,
+      });
+      await service.validateAndStoreCheckpointAttestation(mockPeerId, attestationB);
+
+      // Two distinct signers are not an equivocation; the pool tracks per-(slot, signer).
+      expect(duplicateAttestationCallback).not.toHaveBeenCalled();
+    });
   });
 });
 
@@ -1000,11 +1186,11 @@ interface MockTx {
 }
 
 /**
- * Minimal attestation pool interface for tests that only need getBlockProposal.
+ * Minimal attestation pool interface for tests that only need getBlockProposalByArchive.
  * This allows creating partial mocks without implementing the full AttestationPool interface.
  */
 interface MockAttestationPoolForTests {
-  getBlockProposal(id: string): Promise<{ txHashes: { toString(): string }[] } | undefined>;
+  getBlockProposalByArchive(id: string): Promise<{ txHashes: { toString(): string }[] } | undefined>;
 }
 
 /** Options for creating a test LibP2PService instance. */
@@ -1058,10 +1244,10 @@ class TestLibP2PService extends LibP2PService {
       seenMessageCacheSize: 1000,
       debugP2PInstrumentMessages: false,
       disableTransactions: false,
-      l1ChainId: 1,
+      l1ChainId: TEST_COORDINATION_SIGNATURE_CONTEXT.chainId,
       rollupVersion: 1,
       l1Contracts: {
-        rollupAddress: EthAddress.random(),
+        rollupAddress: TEST_COORDINATION_SIGNATURE_CONTEXT.rollupAddress,
       },
     };
 
@@ -1150,6 +1336,11 @@ class TestLibP2PService extends LibP2PService {
     return super.handleGossipedCheckpointProposal(payloadData, msgId, source);
   }
 
+  /** Exposes the protected validateAndStoreCheckpointAttestation for testing. */
+  public override validateAndStoreCheckpointAttestation(peerId: PeerId, attestation: CheckpointAttestation) {
+    return super.validateAndStoreCheckpointAttestation(peerId, attestation);
+  }
+
   /** Override to use the mock. */
   protected override async validateRequestedTx(
     tx: Tx,
diff --git a/yarn-project/p2p/src/services/libp2p/libp2p_service.ts b/yarn-project/p2p/src/services/libp2p/libp2p_service.ts
index 99679c8c730a..980d632a6d28 100644
--- a/yarn-project/p2p/src/services/libp2p/libp2p_service.ts
+++ b/yarn-project/p2p/src/services/libp2p/libp2p_service.ts
@@ -1,6 +1,6 @@
 import type { EpochCacheInterface } from '@aztec/epoch-cache';
 import { BlockNumber, type SlotNumber } from '@aztec/foundation/branded-types';
-import { maxBy } from '@aztec/foundation/collection';
+import { maxBy, merge } from '@aztec/foundation/collection';
 import { type Logger, createLibp2pComponentLogger, createLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
 import { Timer } from '@aztec/foundation/timer';
@@ -231,15 +231,23 @@ export class LibP2PService extends WithTracer implements P2PService {
     const proposalValidatorOpts = {
       txsPermitted: !config.disableTransactions,
       maxTxsPerBlock: config.validateMaxTxsPerBlock ?? config.validateMaxTxsPerCheckpoint,
+      maxBlocksPerCheckpoint: config.maxBlocksPerCheckpoint,
       p2pPropagationTime,
+      signatureContext: {
+        chainId: config.l1ChainId,
+        rollupAddress: config.l1Contracts.rollupAddress,
+      },
     };
     this.blockProposalValidator = new BlockProposalValidator(epochCache, proposalValidatorOpts);
     this.checkpointProposalValidator = new CheckpointProposalValidator(epochCache, proposalValidatorOpts);
+    const attestationValidatorOpts = {
+      l1PublishingTime: config.l1PublishingTime,
+      p2pPropagationTime,
+      signatureContext: proposalValidatorOpts.signatureContext,
+    };
     this.checkpointAttestationValidator = config.fishermanMode
-      ? new FishermanAttestationValidator(epochCache, mempools.attestationPool, telemetry, {
-          l1PublishingTime: config.l1PublishingTime,
-        })
-      : new CheckpointAttestationValidator(epochCache, { l1PublishingTime: config.l1PublishingTime });
+      ? new FishermanAttestationValidator(epochCache, mempools.attestationPool, telemetry, attestationValidatorOpts)
+      : new CheckpointAttestationValidator(epochCache, attestationValidatorOpts);
 
     this.gossipSubEventHandler = this.handleGossipSubEvent.bind(this);
 
@@ -264,8 +272,9 @@ export class LibP2PService extends WithTracer implements P2PService {
     };
   }
 
-  public updateConfig(config: Partial<P2PReqRespConfig>) {
+  public updateConfig(config: Partial<P2PReqRespConfig & Pick<P2PConfig, 'skipIncomingProposals'>>) {
     this.reqresp.updateConfig(config);
+    this.config = merge(this.config, config);
   }
 
   /**
@@ -842,6 +851,15 @@ export class LibP2PService extends WithTracer implements P2PService {
 
     // Process the message, optionally within a linked span for trace propagation
     const processMessage = async () => {
+      if (
+        this.config.skipIncomingProposals &&
+        (msg.topic === this.topicStrings[TopicType.block_proposal] ||
+          msg.topic === this.topicStrings[TopicType.checkpoint_proposal])
+      ) {
+        this.logger.warn(`Ignoring incoming proposal (skipIncomingProposals is set)`, { topic: msg.topic });
+        this.node.services.pubsub.reportMessageValidationResult(msgId, source.toString(), TopicValidatorResult.Ignore);
+        return;
+      }
       if (msg.topic === this.topicStrings[TopicType.tx]) {
         await this.handleGossipedTx(p2pMessage.payload, msgId, source);
       } else if (msg.topic === this.topicStrings[TopicType.checkpoint_attestation]) {
@@ -1517,7 +1535,7 @@ export class LibP2PService extends WithTracer implements P2PService {
       }
 
       // Given proposal (should have locally), ensure returned txs are valid subset and match request indices
-      const proposal = await this.mempools.attestationPool.getBlockProposal(request.archiveRoot.toString());
+      const proposal = await this.mempools.attestationPool.getBlockProposalByArchive(request.archiveRoot.toString());
       if (proposal) {
         // Build intersected indices
         const intersectIdx = request.txIndices.getTrueIndices().filter(i => response.txIndices.isSet(i));
diff --git a/yarn-project/p2p/src/services/reqresp/protocols/block_txs/block_txs_handler.test.ts b/yarn-project/p2p/src/services/reqresp/protocols/block_txs/block_txs_handler.test.ts
index b43fbd537613..b6cea69ac2c2 100644
--- a/yarn-project/p2p/src/services/reqresp/protocols/block_txs/block_txs_handler.test.ts
+++ b/yarn-project/p2p/src/services/reqresp/protocols/block_txs/block_txs_handler.test.ts
@@ -45,8 +45,8 @@ describe('reqRespBlockTxsHandler', () => {
     txPool = mock<TxPoolV2>();
     peerId = mock<PeerId>();
 
-    attestationPool.getBlockProposal.mockResolvedValue(undefined);
-    archiver.getL2BlockByArchive.mockResolvedValue(undefined);
+    attestationPool.getBlockProposalByArchive.mockResolvedValue(undefined);
+    archiver.getBlock.mockResolvedValue(undefined);
     txPool.getTxsByHash.mockResolvedValue([]);
     txPool.hasTxs.mockResolvedValue([]);
   });
@@ -91,7 +91,7 @@ describe('reqRespBlockTxsHandler', () => {
       const proposal = await createBlockProposal(txHashes);
       const txs = txHashes.map(h => makeTx(h));
 
-      attestationPool.getBlockProposal.mockResolvedValue(proposal);
+      attestationPool.getBlockProposalByArchive.mockResolvedValue(proposal);
       txPool.hasTxs.mockResolvedValue([true, true, true]);
       txPool.getTxsByHash.mockResolvedValue(txs);
 
@@ -107,7 +107,7 @@ describe('reqRespBlockTxsHandler', () => {
       const txHashes = [TxHash.random(), TxHash.random(), TxHash.random()];
       const proposal = await createBlockProposal(txHashes);
 
-      attestationPool.getBlockProposal.mockResolvedValue(proposal);
+      attestationPool.getBlockProposalByArchive.mockResolvedValue(proposal);
       txPool.hasTxs.mockResolvedValue([true, false, true]);
       txPool.getTxsByHash.mockResolvedValue([makeTx(txHashes[0]), undefined, makeTx(txHashes[2])]);
 
@@ -122,7 +122,7 @@ describe('reqRespBlockTxsHandler', () => {
       const txHashes = [TxHash.random(), TxHash.random()];
       const proposal = await createBlockProposal(txHashes);
 
-      attestationPool.getBlockProposal.mockResolvedValue(proposal);
+      attestationPool.getBlockProposalByArchive.mockResolvedValue(proposal);
       txPool.hasTxs.mockResolvedValue([true, false]);
       txPool.getTxsByHash.mockResolvedValue([makeTx(txHashes[0]), undefined]);
 
@@ -139,7 +139,7 @@ describe('reqRespBlockTxsHandler', () => {
       const txHashes = block.body.txEffects.map(e => e.txHash);
       const txs = txHashes.map(h => makeTx(h));
 
-      archiver.getL2BlockByArchive.mockResolvedValue(block);
+      archiver.getBlock.mockResolvedValue(block);
       txPool.hasTxs.mockResolvedValue([true, true, true]);
       txPool.getTxsByHash.mockResolvedValue(txs);
 
@@ -150,15 +150,15 @@ describe('reqRespBlockTxsHandler', () => {
       expect(response.txs.length).toBe(3);
       expect(response.txIndices.getTrueIndices()).toEqual([0, 1, 2]);
 
-      expect(attestationPool.getBlockProposal).toHaveBeenCalledWith(block.archive.root.toString());
-      expect(archiver.getL2BlockByArchive).toHaveBeenCalledWith(block.archive.root);
+      expect(attestationPool.getBlockProposalByArchive).toHaveBeenCalledWith(block.archive.root.toString());
+      expect(archiver.getBlock).toHaveBeenCalledWith({ archive: block.archive.root });
     });
 
     it('returns partial availability when some txs missing from pool', async () => {
       const block = await L2Block.random(BlockNumber(5), { txsPerBlock: 3 });
       const txHashes = block.body.txEffects.map(e => e.txHash);
 
-      archiver.getL2BlockByArchive.mockResolvedValue(block);
+      archiver.getBlock.mockResolvedValue(block);
       txPool.hasTxs.mockResolvedValue([true, false, true]);
       txPool.getTxsByHash.mockResolvedValue([makeTx(txHashes[0]), undefined, makeTx(txHashes[2])]);
 
@@ -168,8 +168,8 @@ describe('reqRespBlockTxsHandler', () => {
       expect(response.txs.length).toBe(2);
       expect(response.txIndices.getTrueIndices()).toEqual([0, 2]);
 
-      expect(attestationPool.getBlockProposal).toHaveBeenCalledWith(block.archive.root.toString());
-      expect(archiver.getL2BlockByArchive).toHaveBeenCalledWith(block.archive.root);
+      expect(attestationPool.getBlockProposalByArchive).toHaveBeenCalledWith(block.archive.root.toString());
+      expect(archiver.getBlock).toHaveBeenCalledWith({ archive: block.archive.root });
     });
 
     it('does not query archiver if attestation pool has the block', async () => {
@@ -177,15 +177,15 @@ describe('reqRespBlockTxsHandler', () => {
       const proposal = await createBlockProposal(txHashes);
       const txs = txHashes.map(h => makeTx(h));
 
-      attestationPool.getBlockProposal.mockResolvedValue(proposal);
+      attestationPool.getBlockProposalByArchive.mockResolvedValue(proposal);
       txPool.hasTxs.mockResolvedValue([true, true]);
       txPool.getTxsByHash.mockResolvedValue(txs);
 
       const request = new BlockTxsRequest(proposal.archive, new TxHashArray(), BitVector.init(2, [0, 1]));
       await callHandler(request);
 
-      expect(attestationPool.getBlockProposal).toHaveBeenCalledWith(proposal.archive.toString());
-      expect(archiver.getL2BlockByArchive).not.toHaveBeenCalled();
+      expect(attestationPool.getBlockProposalByArchive).toHaveBeenCalledWith(proposal.archive.toString());
+      expect(archiver.getBlock).not.toHaveBeenCalled();
     });
   });
 });
diff --git a/yarn-project/p2p/src/services/reqresp/protocols/block_txs/block_txs_handler.ts b/yarn-project/p2p/src/services/reqresp/protocols/block_txs/block_txs_handler.ts
index 2ac1612547f9..19cb7f29a478 100644
--- a/yarn-project/p2p/src/services/reqresp/protocols/block_txs/block_txs_handler.ts
+++ b/yarn-project/p2p/src/services/reqresp/protocols/block_txs/block_txs_handler.ts
@@ -37,9 +37,11 @@ export function reqRespBlockTxsHandler(
       throw new ReqRespStatusError(ReqRespStatus.BADLY_FORMED_REQUEST, { cause: err });
     }
     // First try attestation pool, then fall back to archiver
-    let txHashes = (await attestationPool.getBlockProposal(request.archiveRoot.toString()))?.txHashes;
+    let txHashes = (await attestationPool.getBlockProposalByArchive(request.archiveRoot.toString()))?.txHashes;
     if (!txHashes) {
-      txHashes = (await archiver.getL2BlockByArchive(request.archiveRoot))?.body.txEffects.map(effect => effect.txHash);
+      txHashes = (await archiver.getBlock({ archive: request.archiveRoot }))?.body.txEffects.map(
+        effect => effect.txHash,
+      );
     }
 
     let requestedTxsHashes;
diff --git a/yarn-project/p2p/src/test-helpers/make-test-p2p-clients.ts b/yarn-project/p2p/src/test-helpers/make-test-p2p-clients.ts
index bdfe07c00df2..2098eafeda5e 100644
--- a/yarn-project/p2p/src/test-helpers/make-test-p2p-clients.ts
+++ b/yarn-project/p2p/src/test-helpers/make-test-p2p-clients.ts
@@ -114,6 +114,7 @@ export async function makeTestP2PClient(
       logger,
       p2pServiceFactory: mockGossipSubNetwork && getMockPubSubP2PServiceFactory(mockGossipSubNetwork),
     },
+    await l2BlockSource.getInitialHeader().hash(),
   );
 
   return client;
diff --git a/yarn-project/p2p/src/test-helpers/testbench-utils.ts b/yarn-project/p2p/src/test-helpers/testbench-utils.ts
index c8d142136278..e71a879d7659 100644
--- a/yarn-project/p2p/src/test-helpers/testbench-utils.ts
+++ b/yarn-project/p2p/src/test-helpers/testbench-utils.ts
@@ -1,4 +1,5 @@
 import type { EpochCacheInterface } from '@aztec/epoch-cache';
+import type { CheckpointProposalHash } from '@aztec/foundation/branded-types';
 import { EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
 import type { Logger } from '@aztec/foundation/log';
 import type { L2Block, L2BlockId } from '@aztec/stdlib/block';
@@ -225,7 +226,7 @@ export class InMemoryAttestationPool {
     return Promise.resolve({ added: true, alreadyExists: false, count: 1 });
   }
 
-  getBlockProposal(id: string): Promise<BlockProposal | undefined> {
+  getBlockProposalByArchive(id: string): Promise<BlockProposal | undefined> {
     return Promise.resolve(this.proposals.get(id));
   }
 
@@ -233,7 +234,7 @@ export class InMemoryAttestationPool {
     return Promise.resolve({ added: true, alreadyExists: false, count: 1 });
   }
 
-  getCheckpointProposal(_id: string): Promise<CheckpointProposalCore | undefined> {
+  getCheckpointProposal(_slot: SlotNumber): Promise<CheckpointProposalCore | undefined> {
     return Promise.resolve(undefined);
   }
 
@@ -247,7 +248,7 @@ export class InMemoryAttestationPool {
 
   getCheckpointAttestationsForSlotAndProposal(
     _slot: SlotNumber,
-    _proposalId: string,
+    _proposalPayloadHash: CheckpointProposalHash,
   ): Promise<CheckpointAttestation[]> {
     return Promise.resolve([]);
   }
diff --git a/yarn-project/p2p/src/testbench/p2p_client_testbench_worker.ts b/yarn-project/p2p/src/testbench/p2p_client_testbench_worker.ts
index cbcd849954c7..a8baa387ae16 100644
--- a/yarn-project/p2p/src/testbench/p2p_client_testbench_worker.ts
+++ b/yarn-project/p2p/src/testbench/p2p_client_testbench_worker.ts
@@ -424,6 +424,7 @@ process.on('message', async msg => {
         undefined,
         telemetry as TelemetryClient,
         deps,
+        await l2BlockSource.getInitialHeader().hash(),
       );
 
       const testService = new TestLibP2PService(
diff --git a/yarn-project/p2p/src/versioning.test.ts b/yarn-project/p2p/src/versioning.test.ts
index 26e5c6a25eb6..72495d82e672 100644
--- a/yarn-project/p2p/src/versioning.test.ts
+++ b/yarn-project/p2p/src/versioning.test.ts
@@ -1,11 +1,12 @@
 import { EthAddress } from '@aztec/foundation/eth-address';
 import type { ChainConfig } from '@aztec/stdlib/config';
+import { checkCompressedComponentVersion, compressComponentVersions } from '@aztec/stdlib/versioning';
 
 import type { SignableENR } from '@nethermindeth/enr';
 import { type MockProxy, mock } from 'jest-mock-extended';
 
 import { AZTEC_ENR_KEY } from './types/index.js';
-import { checkAztecEnrVersion, setAztecEnrKey } from './versioning.js';
+import { setAztecEnrKey } from './versioning.js';
 
 describe('versioning', () => {
   let enr: MockProxy<SignableENR>;
@@ -29,14 +30,16 @@ describe('versioning', () => {
     };
   });
 
-  it.each([true, false])('sets and compares versions with xxhash=%s', (useXxHash: boolean) => {
-    const versions = setAztecEnrKey(enr, chainConfig, useXxHash);
+  it('sets and compares compressed versions on ENR', () => {
+    const versions = setAztecEnrKey(enr, chainConfig);
     expect(versions.l1ChainId).toEqual(1);
     expect(versions.rollupVersion).toEqual(3);
     expect(versions.l1RollupAddress).toEqual(chainConfig.l1Contracts.rollupAddress);
-    expect(versionSet).toHaveLength(useXxHash ? 8 : 33);
+    expect(Buffer.from(versionSet!).toString()).toEqual(compressComponentVersions(versions));
 
-    checkAztecEnrVersion(versionSet, versions);
-    expect(() => checkAztecEnrVersion(versionSet, { ...versions, l1ChainId: 3 })).toThrow();
+    checkCompressedComponentVersion(Buffer.from(versionSet!).toString(), versions);
+    expect(() =>
+      checkCompressedComponentVersion(Buffer.from(versionSet!).toString(), { ...versions, l1ChainId: 3 }),
+    ).toThrow();
   });
 });
diff --git a/yarn-project/p2p/src/versioning.ts b/yarn-project/p2p/src/versioning.ts
index 8fa00935c944..adbad28b59ae 100644
--- a/yarn-project/p2p/src/versioning.ts
+++ b/yarn-project/p2p/src/versioning.ts
@@ -1,33 +1,21 @@
-import { toBufferBE } from '@aztec/foundation/bigint-buffer';
 import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
 import { protocolContractsHash } from '@aztec/protocol-contracts';
 import type { ChainConfig } from '@aztec/stdlib/config';
-import {
-  type ComponentsVersions,
-  checkCompressedComponentVersion,
-  compressComponentVersions,
-  getComponentsVersionsFromConfig,
-} from '@aztec/stdlib/versioning';
+import { compressComponentVersions, getComponentsVersionsFromConfig } from '@aztec/stdlib/versioning';
 
 import type { SignableENR } from '@nethermindeth/enr';
-import xxhashFactory from 'xxhash-wasm';
 
 import { AZTEC_ENR_CLIENT_VERSION_KEY, AZTEC_ENR_KEY } from './types/index.js';
 
-const USE_XX_HASH = false; // Enable to reduce the size of the ENR record for production
-const XX_HASH_LEN = 8;
-const xxhash = await xxhashFactory();
-
 /** Returns the component versions based on config and this build. */
 export function getVersions(config: ChainConfig) {
   return getComponentsVersionsFromConfig(config, protocolContractsHash, getVKTreeRoot());
 }
 
 /** Sets the aztec key on the ENR record with versioning info. */
-export function setAztecEnrKey(enr: SignableENR, config: ChainConfig, useXxHash = USE_XX_HASH) {
+export function setAztecEnrKey(enr: SignableENR, config: ChainConfig) {
   const versions = getVersions(config);
-  const value = versionsToEnrValue(versions, useXxHash);
-  enr.set(AZTEC_ENR_KEY, value);
+  enr.set(AZTEC_ENR_KEY, Buffer.from(compressComponentVersions(versions)));
   return versions;
 }
 
@@ -37,21 +25,3 @@ export function setAztecClientVersionEnrKey(enr: SignableENR, clientVersion: str
     enr.set(AZTEC_ENR_CLIENT_VERSION_KEY, Buffer.from(clientVersion));
   }
 }
-
-/** Checks the given value from an ENR record against the expected versions. */
-export function checkAztecEnrVersion(enrValue: Buffer, expectedVersions: ComponentsVersions) {
-  if (enrValue.length === XX_HASH_LEN) {
-    const expected = versionsToEnrValue(expectedVersions, true);
-    if (!Buffer.from(enrValue).equals(expected)) {
-      throw new Error(`Expected ENR version ${expected.toString('hex')} but received ${enrValue.toString('hex')}`);
-    }
-  } else {
-    const actual = Buffer.from(enrValue).toString();
-    checkCompressedComponentVersion(actual, expectedVersions);
-  }
-}
-
-function versionsToEnrValue(versions: ComponentsVersions, useXxHash: boolean) {
-  const compressed = compressComponentVersions(versions);
-  return useXxHash ? toBufferBE(xxhash.h64(compressed), XX_HASH_LEN) : Buffer.from(compressed);
-}
diff --git a/yarn-project/package.json b/yarn-project/package.json
index c34862e606b3..8811c24c8ccf 100644
--- a/yarn-project/package.json
+++ b/yarn-project/package.json
@@ -55,6 +55,7 @@
     "sequencer-client",
     "simulator",
     "slasher",
+    "sqlite3mc-wasm",
     "stdlib",
     "telemetry-client",
     "txe",
diff --git a/yarn-project/prover-client/src/config.ts b/yarn-project/prover-client/src/config.ts
index 7aef9717fbe6..aa4158379388 100644
--- a/yarn-project/prover-client/src/config.ts
+++ b/yarn-project/prover-client/src/config.ts
@@ -63,6 +63,11 @@ export const bbConfigMappings: ConfigMappingsType<BBConfig & ACVMConfig> = {
     description: 'Thread count for the peer batch verifier parallel reduce. 0 = auto.',
     ...numberConfigHelper(6),
   },
+  bbDebugOutputDir: {
+    env: 'BB_DEBUG_OUTPUT_DIR',
+    description:
+      'When set, bb.js operations write input/output files and log equivalent CLI commands to this directory',
+  },
 };
 
 export const proverClientConfigMappings: ConfigMappingsType<ProverClientUserConfig> = {
diff --git a/yarn-project/prover-client/src/orchestrator/orchestrator.ts b/yarn-project/prover-client/src/orchestrator/orchestrator.ts
index 1dd893fe6af6..a74e7bb452c2 100644
--- a/yarn-project/prover-client/src/orchestrator/orchestrator.ts
+++ b/yarn-project/prover-client/src/orchestrator/orchestrator.ts
@@ -93,7 +93,6 @@ export class ProvingOrchestrator implements EpochProver {
 
   private provingPromise: Promise<ProvingResult> | undefined = undefined;
   private metrics: ProvingOrchestratorMetrics;
-  // eslint-disable-next-line aztec-custom/no-non-primitive-in-collections
   private dbs: Map<BlockNumber, MerkleTreeWriteOperations> = new Map();
   private logger: Logger;
   private deferredJobQueue = new SerialQueue();
diff --git a/yarn-project/prover-client/src/proving_broker/config.ts b/yarn-project/prover-client/src/proving_broker/config.ts
index a3f06628a89b..7b5ab7114aab 100644
--- a/yarn-project/prover-client/src/proving_broker/config.ts
+++ b/yarn-project/prover-client/src/proving_broker/config.ts
@@ -4,6 +4,7 @@ import {
   booleanConfigHelper,
   getDefaultConfig,
   numberConfigHelper,
+  optionalNumberConfigHelper,
 } from '@aztec/foundation/config';
 import { pickConfigMappings } from '@aztec/foundation/config';
 import { type ChainConfig, chainConfigMappings } from '@aztec/stdlib/config';
@@ -73,7 +74,7 @@ export const proverBrokerConfigMappings: ConfigMappingsType<ProverBrokerConfig>
   },
   proverBrokerStoreMapSizeKb: {
     env: 'PROVER_BROKER_STORE_MAP_SIZE_KB',
-    parseEnv: (val: string) => +val,
+    ...optionalNumberConfigHelper(),
     description: "The size of the prover broker's database. Will override the dataStoreMapSizeKb if set.",
   },
   proverBrokerDebugReplayEnabled: {
diff --git a/yarn-project/prover-node/src/actions/rerun-epoch-proving-job.ts b/yarn-project/prover-node/src/actions/rerun-epoch-proving-job.ts
index d0b9f80c5b76..ea0495973bca 100644
--- a/yarn-project/prover-node/src/actions/rerun-epoch-proving-job.ts
+++ b/yarn-project/prover-node/src/actions/rerun-epoch-proving-job.ts
@@ -1,4 +1,4 @@
-import { createArchiverStore } from '@aztec/archiver';
+import { createArchiverStore, createContractDataSource } from '@aztec/archiver';
 import type { L1ContractsConfig } from '@aztec/ethereum/config';
 import type { Logger } from '@aztec/foundation/log';
 import { type ProverClientConfig, createProverClient } from '@aztec/prover-client';
@@ -33,7 +33,12 @@ export async function rerunEpochProvingJob(
   const metrics = new ProverNodeJobMetrics(telemetry.getMeter('prover-job'), telemetry.getTracer('prover-job'));
   const worldState = await createWorldState(config, genesis);
   const archiver = await createArchiverStore(config);
-  const publicProcessorFactory = new PublicProcessorFactory(archiver, undefined, undefined, log.getBindings());
+  const publicProcessorFactory = new PublicProcessorFactory(
+    createContractDataSource(archiver),
+    undefined,
+    undefined,
+    log.getBindings(),
+  );
 
   const publisher = {
     submitEpochProof: () => Promise.resolve(true),
diff --git a/yarn-project/prover-node/src/job/epoch-proving-job.test.ts b/yarn-project/prover-node/src/job/epoch-proving-job.test.ts
index 80d1a8f053a3..d6b6fcd8739f 100644
--- a/yarn-project/prover-node/src/job/epoch-proving-job.test.ts
+++ b/yarn-project/prover-node/src/job/epoch-proving-job.test.ts
@@ -116,10 +116,10 @@ describe('epoch-proving-job', () => {
     const txHashes = checkpoints.map(c => c.blocks.map(b => b.body.txEffects.map(tx => tx.txHash))).flat(2);
     txs = txHashes.map(txHash => ({ txHash, getTxHash: () => txHash }) as Tx);
 
-    l2BlockSource.getBlockHeader.mockResolvedValue(initialHeader);
+    l2BlockSource.getBlockData.mockResolvedValue({ header: initialHeader } as any);
     l2BlockSource.getL1Constants.mockResolvedValue({ ethereumSlotDuration: 0.1 } as L1RollupConstants);
-    l2BlockSource.getCheckpointedBlockHeadersForEpoch.mockResolvedValue(
-      checkpoints.map(c => c.blocks.map(b => b.header)).flat(),
+    l2BlockSource.getBlocksData.mockResolvedValue(
+      checkpoints.map(c => c.blocks.map(b => ({ header: b.header }) as any)).flat(),
     );
     l2BlockSource.getCheckpoints.mockResolvedValue([
       { checkpoint: checkpoints.at(-1)!, attestations } as PublishedCheckpoint,
@@ -221,7 +221,7 @@ describe('epoch-proving-job', () => {
 
   it('halts if a new block for the epoch is found', async () => {
     const newHeaders = times(NUM_BLOCKS + 1, i => BlockHeader.random({ blockNumber: BlockNumber(i + 1) }));
-    l2BlockSource.getCheckpointedBlockHeadersForEpoch.mockResolvedValue(newHeaders);
+    l2BlockSource.getBlocksData.mockResolvedValue(newHeaders.map(h => ({ header: h }) as any));
 
     const job = createJob();
     await job.run();
diff --git a/yarn-project/prover-node/src/job/epoch-proving-job.ts b/yarn-project/prover-node/src/job/epoch-proving-job.ts
index 1349cf517df6..022fcc02289e 100644
--- a/yarn-project/prover-node/src/job/epoch-proving-job.ts
+++ b/yarn-project/prover-node/src/job/epoch-proving-job.ts
@@ -410,7 +410,9 @@ export class EpochProvingJob implements Traceable {
     const intervalMs = Math.ceil((await l2BlockSource.getL1Constants()).ethereumSlotDuration / 2) * 1000;
     this.epochCheckPromise = new RunningPromise(
       async () => {
-        const blockHeaders = await l2BlockSource.getCheckpointedBlockHeadersForEpoch(this.epochNumber);
+        const blockHeaders = (
+          await l2BlockSource.getBlocksData({ epoch: this.epochNumber, onlyCheckpointed: true })
+        ).map(d => d.header);
         const blockHashes = await Promise.all(blockHeaders.map(header => header.hash()));
         const thisBlocks = this.checkpoints.flatMap(checkpoint => checkpoint.blocks);
         const thisBlockHashes = await Promise.all(thisBlocks.map(block => block.hash()));
diff --git a/yarn-project/prover-node/src/monitors/epoch-monitor.test.ts b/yarn-project/prover-node/src/monitors/epoch-monitor.test.ts
index f60efddf4c76..a32bb5d76933 100644
--- a/yarn-project/prover-node/src/monitors/epoch-monitor.test.ts
+++ b/yarn-project/prover-node/src/monitors/epoch-monitor.test.ts
@@ -34,18 +34,15 @@ describe('EpochMonitor', () => {
       isEpochComplete(epochNumber) {
         return Promise.resolve(epochNumber <= lastEpochComplete);
       },
-      getBlockHeader(blockNumber: BlockNumber | 'latest') {
-        if (blockNumber === 'latest') {
+      getBlockData(query) {
+        if (!('number' in query)) {
           return Promise.resolve(undefined);
         }
-        const slot = blockToSlot[blockNumber];
+        const slot = blockToSlot[query.number];
         return Promise.resolve(
           slot === undefined
             ? undefined
-            : mock<BlockHeader>({
-                getSlot: () => SlotNumber.fromBigInt(slot),
-                toString: () => `0x${slot.toString(16)}`,
-              }),
+            : ({ header: { getSlot: () => SlotNumber.fromBigInt(slot) } as unknown as BlockHeader } as any),
         );
       },
       getProvenBlockNumber() {
diff --git a/yarn-project/prover-node/src/monitors/epoch-monitor.ts b/yarn-project/prover-node/src/monitors/epoch-monitor.ts
index c1c7c89ddfbf..42694d81613b 100644
--- a/yarn-project/prover-node/src/monitors/epoch-monitor.ts
+++ b/yarn-project/prover-node/src/monitors/epoch-monitor.ts
@@ -98,7 +98,7 @@ export class EpochMonitor implements Traceable {
   private async getEpochNumberToProve() {
     const lastBlockProven = await this.l2BlockSource.getProvenBlockNumber();
     const firstBlockToProve = BlockNumber(lastBlockProven + 1);
-    const firstBlockHeaderToProve = await this.l2BlockSource.getBlockHeader(firstBlockToProve);
+    const firstBlockHeaderToProve = (await this.l2BlockSource.getBlockData({ number: firstBlockToProve }))?.header;
     if (!firstBlockHeaderToProve) {
       return { epochToProve: undefined, blockNumber: firstBlockToProve };
     }
diff --git a/yarn-project/prover-node/src/prover-node-publisher.ts b/yarn-project/prover-node/src/prover-node-publisher.ts
index ac0c0c7d14ff..b045e7cd912b 100644
--- a/yarn-project/prover-node/src/prover-node-publisher.ts
+++ b/yarn-project/prover-node/src/prover-node-publisher.ts
@@ -364,9 +364,9 @@ export class ProverNodePublisher {
       end: argsArray[1],
       args: argsArray[2],
       fees: argsArray[3],
-      attestations: new CommitteeAttestationsAndSigners(
+      attestations: CommitteeAttestationsAndSigners.packAttestations(
         args.attestations.map(a => CommitteeAttestation.fromViem(a)),
-      ).getPackedAttestations(),
+      ),
       blobInputs: argsArray[4],
       proof: proofHex,
     };
diff --git a/yarn-project/prover-node/src/prover-node.test.ts b/yarn-project/prover-node/src/prover-node.test.ts
index 546c128bc234..45b09dc511a0 100644
--- a/yarn-project/prover-node/src/prover-node.test.ts
+++ b/yarn-project/prover-node/src/prover-node.test.ts
@@ -172,8 +172,12 @@ describe('prover-node', () => {
       proven: genesisTipId,
       finalized: genesisTipId,
     });
-    l2BlockSource.getBlockHeader.mockImplementation(number =>
-      Promise.resolve(number === checkpoints[0].blocks[0].number - 1 ? previousBlockHeader : undefined),
+    l2BlockSource.getBlockData.mockImplementation(query =>
+      Promise.resolve(
+        'number' in query && query.number === checkpoints[0].blocks[0].number - 1
+          ? ({ header: previousBlockHeader } as any)
+          : undefined,
+      ),
     );
 
     // L1 to L2 message source returns no messages
diff --git a/yarn-project/prover-node/src/prover-node.ts b/yarn-project/prover-node/src/prover-node.ts
index 48359691826e..9d7a4336054e 100644
--- a/yarn-project/prover-node/src/prover-node.ts
+++ b/yarn-project/prover-node/src/prover-node.ts
@@ -360,16 +360,13 @@ export class ProverNode implements EpochMonitorHandler, ProverNodeApi, Traceable
   }
 
   private async gatherPreviousBlockHeader(epochNumber: EpochNumber, previousBlockNumber: number) {
-    const header = await (previousBlockNumber === 0
-      ? this.worldState.getCommitted().getInitialHeader()
-      : this.l2BlockSource.getBlockHeader(BlockNumber(previousBlockNumber)));
-
-    if (!header) {
+    const data = await this.l2BlockSource.getBlockData({ number: BlockNumber(previousBlockNumber) });
+    if (!data?.header) {
       throw new Error(`Previous block header ${previousBlockNumber} not found for proving epoch ${epochNumber}`);
     }
 
-    this.log.verbose(`Gathered previous block header ${header.getBlockNumber()} for epoch ${epochNumber}`);
-    return header;
+    this.log.verbose(`Gathered previous block header ${data.header.getBlockNumber()} for epoch ${epochNumber}`);
+    return data.header;
   }
 
   /** Extracted for testing purposes. */
diff --git a/yarn-project/pxe/package.json b/yarn-project/pxe/package.json
index a10b2bf35c6e..0cfaf010e6e8 100644
--- a/yarn-project/pxe/package.json
+++ b/yarn-project/pxe/package.json
@@ -100,6 +100,7 @@
     "@types/node": "^22.15.17",
     "@typescript/native-preview": "7.0.0-dev.20260113.1",
     "jest": "^30.0.0",
+    "jest-file-snapshot": "^0.7.0",
     "jest-mock-extended": "^4.0.0",
     "lodash.times": "^4.3.2",
     "ts-node": "^10.9.1",
diff --git a/yarn-project/pxe/src/block_synchronizer/block_stream_source.test.ts b/yarn-project/pxe/src/block_synchronizer/block_stream_source.test.ts
new file mode 100644
index 000000000000..3a82b36a9649
--- /dev/null
+++ b/yarn-project/pxe/src/block_synchronizer/block_stream_source.test.ts
@@ -0,0 +1,85 @@
+import { BlockNumber, EpochNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { BlockHash, L2Block } from '@aztec/stdlib/block';
+import type { AztecNode } from '@aztec/stdlib/interfaces/client';
+
+import { type MockProxy, mock } from 'jest-mock-extended';
+
+import { blockStreamSourceFromAztecNode } from './block_stream_source.js';
+
+describe('blockStreamSourceFromAztecNode', () => {
+  let node: MockProxy<AztecNode>;
+  let source: ReturnType<typeof blockStreamSourceFromAztecNode>;
+
+  const buildResponse = async (block: L2Block) => ({
+    header: block.header,
+    archive: block.archive,
+    hash: await block.hash(),
+    checkpointNumber: block.checkpointNumber,
+    indexWithinCheckpoint: block.indexWithinCheckpoint,
+    number: block.number,
+  });
+
+  beforeEach(() => {
+    node = mock<AztecNode>();
+    source = blockStreamSourceFromAztecNode(node);
+  });
+
+  describe('getBlockData', () => {
+    it('forwards a number query as a {number} parameter', async () => {
+      const block = await L2Block.random(BlockNumber(7));
+      node.getBlock.mockResolvedValue((await buildResponse(block)) as any);
+
+      const result = await source.getBlockData({ number: BlockNumber(7) });
+
+      expect(node.getBlock).toHaveBeenCalledWith({ number: BlockNumber(7) });
+      expect(result?.header.equals(block.header)).toBe(true);
+    });
+
+    it('forwards a hash query as a {hash} parameter', async () => {
+      const block = await L2Block.random(BlockNumber(2));
+      const hash = await block.hash();
+      node.getBlock.mockResolvedValue((await buildResponse(block)) as any);
+
+      const result = await source.getBlockData({ hash });
+
+      expect(node.getBlock).toHaveBeenCalledWith({ hash });
+      expect(result?.blockHash.equals(hash)).toBe(true);
+    });
+
+    it('forwards an archive query as an {archive} parameter', async () => {
+      const block = await L2Block.random(BlockNumber(3));
+      const archive = Fr.random();
+      node.getBlock.mockResolvedValue((await buildResponse(block)) as any);
+
+      const result = await source.getBlockData({ archive });
+
+      expect(node.getBlock).toHaveBeenCalledWith({ archive });
+      expect(result?.header.equals(block.header)).toBe(true);
+    });
+
+    it('forwards a tag query as a {tag} parameter', async () => {
+      const block = await L2Block.random(BlockNumber(9));
+      node.getBlock.mockResolvedValue((await buildResponse(block)) as any);
+
+      const result = await source.getBlockData({ tag: 'proven' });
+
+      expect(node.getBlock).toHaveBeenCalledWith({ tag: 'proven' });
+      expect(result?.header.equals(block.header)).toBe(true);
+    });
+
+    it('returns undefined when node returns undefined', async () => {
+      node.getBlock.mockResolvedValue(undefined);
+      const result = await source.getBlockData({ hash: BlockHash.random() });
+      expect(result).toBeUndefined();
+    });
+  });
+
+  describe('getBlocks', () => {
+    it('throws on epoch query', async () => {
+      await expect(source.getBlocks({ epoch: EpochNumber(1), onlyCheckpointed: true })).rejects.toThrow(
+        /epoch query not supported/,
+      );
+    });
+  });
+});
diff --git a/yarn-project/pxe/src/block_synchronizer/block_stream_source.ts b/yarn-project/pxe/src/block_synchronizer/block_stream_source.ts
new file mode 100644
index 000000000000..eb4b2ca4bfcc
--- /dev/null
+++ b/yarn-project/pxe/src/block_synchronizer/block_stream_source.ts
@@ -0,0 +1,68 @@
+import type { CheckpointNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { type BlockData, type BlockQuery, type BlocksQuery, L2Block, type L2BlockSource } from '@aztec/stdlib/block';
+import { Checkpoint, L1PublishedData, PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
+import type { AztecNode } from '@aztec/stdlib/interfaces/client';
+
+/**
+ * Lifts an {@link AztecNode} RPC client into the shape {@link L2BlockStream} expects.
+ * `getBlocks` requests transaction bodies so that real `L2Block` instances can be constructed;
+ * `getCheckpoints` requests blocks + L1 info + attestations so that `PublishedCheckpoint`
+ * instances are fully populated.
+ */
+export function blockStreamSourceFromAztecNode(
+  node: AztecNode,
+): Pick<L2BlockSource, 'getBlocks' | 'getBlockData' | 'getL2Tips' | 'getCheckpoints'> {
+  return {
+    getL2Tips: () => node.getL2Tips(),
+
+    async getBlockData(query: BlockQuery): Promise<BlockData | undefined> {
+      const response = await node.getBlock(query);
+      if (!response) {
+        return undefined;
+      }
+      return {
+        header: response.header,
+        archive: response.archive,
+        blockHash: response.hash,
+        checkpointNumber: response.checkpointNumber,
+        indexWithinCheckpoint: response.indexWithinCheckpoint,
+      };
+    },
+
+    async getBlocks(query: BlocksQuery): Promise<L2Block[]> {
+      // Epoch lookups are not exposed on the public AztecNode RPC; only `from + limit` is.
+      if (!('from' in query)) {
+        throw new Error('getBlocks with epoch query not supported via AztecNode RPC');
+      }
+      if (query.onlyCheckpointed) {
+        throw new Error('getBlocks with onlyCheckpointed not supported via AztecNode RPC');
+      }
+      const responses = await node.getBlocks(query.from, query.limit, { includeTransactions: true });
+      return responses.map(r => new L2Block(r.archive, r.header, r.body!, r.checkpointNumber, r.indexWithinCheckpoint));
+    },
+
+    async getCheckpoints(from: CheckpointNumber, limit: number): Promise<PublishedCheckpoint[]> {
+      const responses = await node.getCheckpoints(from, limit, {
+        includeBlocks: true,
+        includeTransactions: true,
+        includeL1PublishInfo: true,
+        includeAttestations: true,
+      });
+      return responses.map(r => {
+        const checkpoint = new Checkpoint(
+          r.archive,
+          r.header,
+          r.blocks!.map(b => new L2Block(b.archive, b.header, b.body!, b.checkpointNumber, b.indexWithinCheckpoint)),
+          r.number,
+          r.feeAssetPriceModifier,
+        );
+        const l1 =
+          r.l1?.published === true
+            ? new L1PublishedData(r.l1.blockNumber, r.l1.timestamp, r.l1.blockHash)
+            : new L1PublishedData(0n, 0n, Fr.ZERO.toString());
+        return new PublishedCheckpoint(checkpoint, l1, r.attestations ?? []);
+      });
+    },
+  };
+}
diff --git a/yarn-project/pxe/src/block_synchronizer/block_synchronizer.test.ts b/yarn-project/pxe/src/block_synchronizer/block_synchronizer.test.ts
index c052adf3e163..af264b14f6de 100644
--- a/yarn-project/pxe/src/block_synchronizer/block_synchronizer.test.ts
+++ b/yarn-project/pxe/src/block_synchronizer/block_synchronizer.test.ts
@@ -4,7 +4,13 @@ import { Fr } from '@aztec/foundation/curves/bn254';
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
 import { openTmpStore } from '@aztec/kv-store/lmdb-v2';
 import { L2TipsKVStore } from '@aztec/kv-store/stores';
-import { BlockHash, GENESIS_CHECKPOINT_HEADER_HASH, L2Block, type L2BlockStream } from '@aztec/stdlib/block';
+import {
+  BlockHash,
+  GENESIS_BLOCK_HEADER_HASH,
+  GENESIS_CHECKPOINT_HEADER_HASH,
+  L2Block,
+  type L2BlockStream,
+} from '@aztec/stdlib/block';
 import { Checkpoint, L1PublishedData, PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
 import type { AztecNode } from '@aztec/stdlib/interfaces/client';
 
@@ -52,7 +58,7 @@ describe('BlockSynchronizer', () => {
     store = await openTmpStore('test');
     blockStream = mock<L2BlockStream>();
     aztecNode = mock<AztecNode>();
-    tipsStore = new L2TipsKVStore(store, 'pxe');
+    tipsStore = new L2TipsKVStore(store, 'pxe', GENESIS_BLOCK_HEADER_HASH);
     anchorBlockStore = new AnchorBlockStore(store);
     noteStore = new NoteStore(store);
     privateEventStore = new PrivateEventStore(store);
@@ -71,10 +77,17 @@ describe('BlockSynchronizer', () => {
   it('removes notes from db on a reorg', async () => {
     const rollback = jest.spyOn(noteStore, 'rollback').mockImplementation(() => Promise.resolve());
     const block3Hash = Fr.fromString('0x3');
-    aztecNode.getBlockHeader.mockImplementation(async block => {
-      // For the test, when block hash matches block 3, return block header for block 3
+    aztecNode.getBlock.mockImplementation(async (block: any) => {
       if (block instanceof BlockHash && block.equals(block3Hash)) {
-        return (await L2Block.random(BlockNumber(3))).header;
+        const b = await L2Block.random(BlockNumber(3));
+        return {
+          header: b.header,
+          archive: b.archive,
+          hash: await b.hash(),
+          checkpointNumber: b.checkpointNumber,
+          indexWithinCheckpoint: b.indexWithinCheckpoint,
+          number: b.number,
+        } as any;
       }
       return undefined;
     });
@@ -95,10 +108,17 @@ describe('BlockSynchronizer', () => {
   it('removes private events from db on a reorg', async () => {
     const rollback = jest.spyOn(privateEventStore, 'rollback').mockImplementation(() => Promise.resolve());
     const block3Hash = Fr.fromString('0x3');
-    aztecNode.getBlockHeader.mockImplementation(async block => {
-      // For the test, when block hash matches block 3, return block header for block 3
+    aztecNode.getBlock.mockImplementation(async (block: any) => {
       if (block instanceof BlockHash && block.equals(block3Hash)) {
-        return (await L2Block.random(BlockNumber(3))).header;
+        const b = await L2Block.random(BlockNumber(3));
+        return {
+          header: b.header,
+          archive: b.archive,
+          hash: await b.hash(),
+          checkpointNumber: b.checkpointNumber,
+          indexWithinCheckpoint: b.indexWithinCheckpoint,
+          number: b.number,
+        } as any;
       }
       return undefined;
     });
@@ -128,7 +148,8 @@ describe('BlockSynchronizer', () => {
         resolveSync = resolve;
       });
       blockStream.sync.mockReturnValue(syncBlocker);
-      aztecNode.getBlockHeader.mockResolvedValue((await L2Block.random(BlockNumber(0))).header);
+      const genesisBlock = await L2Block.random(BlockNumber(0));
+      aztecNode.getBlock.mockResolvedValue({ header: genesisBlock.header } as any);
 
       // Start a sync (don't await)
       const syncPromise = synchronizer.sync();
@@ -232,9 +253,9 @@ describe('BlockSynchronizer', () => {
       const initialBlock = await L2Block.random(BlockNumber(0));
       await anchorBlockStore.setHeader(initialBlock.header);
 
-      // Mock node to return block header
+      // Mock node to return block
       const provenBlock = await L2Block.random(BlockNumber(5));
-      aztecNode.getBlockHeader.mockResolvedValue(provenBlock.header);
+      aztecNode.getBlock.mockResolvedValue({ header: provenBlock.header } as any);
 
       await synchronizer.handleBlockStreamEvent({
         type: 'chain-proven',
@@ -252,9 +273,9 @@ describe('BlockSynchronizer', () => {
       const initialBlock = await L2Block.random(BlockNumber(0));
       await anchorBlockStore.setHeader(initialBlock.header);
 
-      // Mock node to return block header
+      // Mock node to return block
       const finalizedBlock = await L2Block.random(BlockNumber(10));
-      aztecNode.getBlockHeader.mockResolvedValue(finalizedBlock.header);
+      aztecNode.getBlock.mockResolvedValue({ header: finalizedBlock.header } as any);
 
       await synchronizer.handleBlockStreamEvent({
         type: 'chain-finalized',
diff --git a/yarn-project/pxe/src/block_synchronizer/block_synchronizer.ts b/yarn-project/pxe/src/block_synchronizer/block_synchronizer.ts
index ea2f889d529e..4a5d4fc15871 100644
--- a/yarn-project/pxe/src/block_synchronizer/block_synchronizer.ts
+++ b/yarn-project/pxe/src/block_synchronizer/block_synchronizer.ts
@@ -12,6 +12,7 @@ import type { ContractSyncService } from '../contract_sync/contract_sync_service
 import type { AnchorBlockStore } from '../storage/anchor_block_store/anchor_block_store.js';
 import type { NoteStore } from '../storage/note_store/note_store.js';
 import type { PrivateEventStore } from '../storage/private_event_store/private_event_store.js';
+import { blockStreamSourceFromAztecNode } from './block_stream_source.js';
 
 /**
  * The BlockSynchronizer class orchestrates synchronization between PXE and Aztec node, maintaining an up-to-date
@@ -42,7 +43,7 @@ export class BlockSynchronizer implements L2BlockStreamEventHandler {
 
   protected createBlockStream(config: Partial<BlockSynchronizerConfig>): L2BlockStream {
     return new L2BlockStream(
-      this.node,
+      blockStreamSourceFromAztecNode(this.node),
       this.l2TipsStore,
       this,
       createLogger('pxe:block_stream', this.log.getBindings()),
@@ -81,9 +82,9 @@ export class BlockSynchronizer implements L2BlockStreamEventHandler {
       }
       case 'chain-proven': {
         if (this.config.syncChainTip === 'proven') {
-          const blockHeader = await this.node.getBlockHeader(BlockNumber(event.block.number));
-          if (blockHeader) {
-            await this.updateAnchorBlockHeader(blockHeader);
+          const block = await this.node.getBlock(BlockNumber(event.block.number));
+          if (block) {
+            await this.updateAnchorBlockHeader(block.header);
           } else {
             this.log.warn(`Block header not found for proven block ${event.block.number}, skipping anchor update`);
           }
@@ -92,9 +93,9 @@ export class BlockSynchronizer implements L2BlockStreamEventHandler {
       }
       case 'chain-finalized': {
         if (this.config.syncChainTip === 'finalized') {
-          const blockHeader = await this.node.getBlockHeader(BlockNumber(event.block.number));
-          if (blockHeader) {
-            await this.updateAnchorBlockHeader(blockHeader);
+          const block = await this.node.getBlock(BlockNumber(event.block.number));
+          if (block) {
+            await this.updateAnchorBlockHeader(block.header);
           } else {
             this.log.warn(`Block header not found for finalized block ${event.block.number}, skipping anchor update`);
           }
@@ -117,7 +118,8 @@ export class BlockSynchronizer implements L2BlockStreamEventHandler {
         // Note that the following is not necessarily the anchor block that will be used in the transaction - if
         // the chain has already moved past the reorg, we'll also see blocks-added events that will push the anchor
         // forward.
-        const newAnchorBlockHeader = await this.node.getBlockHeader(BlockHash.fromString(event.block.hash));
+        const newAnchorBlock = await this.node.getBlock(BlockHash.fromString(event.block.hash));
+        const newAnchorBlockHeader = newAnchorBlock?.header;
 
         if (!newAnchorBlockHeader) {
           throw new Error(
@@ -191,7 +193,7 @@ export class BlockSynchronizer implements L2BlockStreamEventHandler {
     }
     if (!currentHeader) {
       // REFACTOR: We should know the header of the genesis block without having to request it from the node.
-      await this.anchorBlockStore.setHeader((await this.node.getBlockHeader(BlockNumber.ZERO))!);
+      await this.anchorBlockStore.setHeader((await this.node.getBlock(BlockNumber.ZERO))!.header);
     }
     await this.blockStream.sync();
   }
diff --git a/yarn-project/pxe/src/contract_function_simulator/contract_function_simulator.ts b/yarn-project/pxe/src/contract_function_simulator/contract_function_simulator.ts
index 8bcb8cdafdfc..407ec00c5d30 100644
--- a/yarn-project/pxe/src/contract_function_simulator/contract_function_simulator.ts
+++ b/yarn-project/pxe/src/contract_function_simulator/contract_function_simulator.ts
@@ -90,6 +90,7 @@ import {
 } from '@aztec/stdlib/tx';
 
 import type { ContractSyncService } from '../contract_sync/contract_sync_service.js';
+import type { ExecutionHooks } from '../hooks/index.js';
 import type { MessageContextService } from '../messages/message_context_service.js';
 import type { AddressStore } from '../storage/address_store/address_store.js';
 import { CapsuleService } from '../storage/capsule_store/capsule_service.js';
@@ -143,6 +144,7 @@ export type ContractFunctionSimulatorArgs = {
   simulator: CircuitSimulator;
   contractSyncService: ContractSyncService;
   messageContextService: MessageContextService;
+  hooks?: ExecutionHooks;
 };
 
 /**
@@ -164,6 +166,7 @@ export class ContractFunctionSimulator {
   private readonly simulator: CircuitSimulator;
   private readonly contractSyncService: ContractSyncService;
   private readonly messageContextService: MessageContextService;
+  private readonly hooks: ExecutionHooks | undefined;
 
   constructor(args: ContractFunctionSimulatorArgs) {
     this.contractStore = args.contractStore;
@@ -180,6 +183,7 @@ export class ContractFunctionSimulator {
     this.simulator = args.simulator;
     this.contractSyncService = args.contractSyncService;
     this.messageContextService = args.messageContextService;
+    this.hooks = args.hooks;
     this.log = createLogger('simulator');
   }
 
@@ -259,6 +263,7 @@ export class ContractFunctionSimulator {
       senderForTags,
       simulator: this.simulator,
       l2TipsStore: this.l2TipsStore,
+      hooks: this.hooks,
     });
 
     const setupTime = simulatorSetupTimer.ms();
@@ -350,6 +355,8 @@ export class ContractFunctionSimulator {
       l2TipsStore: this.l2TipsStore,
       jobId,
       scopes,
+      simulator: this.simulator,
+      hooks: this.hooks,
     });
 
     try {
diff --git a/yarn-project/pxe/src/contract_function_simulator/oracle/interfaces.ts b/yarn-project/pxe/src/contract_function_simulator/oracle/interfaces.ts
index c78761d5ca57..524741739c16 100644
--- a/yarn-project/pxe/src/contract_function_simulator/oracle/interfaces.ts
+++ b/yarn-project/pxe/src/contract_function_simulator/oracle/interfaces.ts
@@ -164,6 +164,11 @@ export interface IUtilityExecutionOracle {
   getSharedSecret(address: AztecAddress, ephPk: Point, contractAddress: AztecAddress): Promise<Fr>;
   setContractSyncCacheInvalid(contractAddress: AztecAddress, scopes: AztecAddress[]): void;
   emitOffchainEffect(data: Fr[]): Promise<void>;
+  callUtilityFunction(
+    targetContractAddress: AztecAddress,
+    functionSelector: FunctionSelector,
+    args: Fr[],
+  ): Promise<Fr[]>;
 
   // Ephemeral array methods
   pushEphemeral(slot: Fr, elements: Fr[]): number;
@@ -204,6 +209,11 @@ export interface IPrivateExecutionOracle {
     sideEffectCounter: number,
     isStaticCall: boolean,
   ): Promise<{ endSideEffectCounter: Fr; returnsHash: Fr }>;
+  callUtilityFunction(
+    targetContractAddress: AztecAddress,
+    functionSelector: FunctionSelector,
+    args: Fr[],
+  ): Promise<Fr[]>;
   assertValidPublicCalldata(calldataHash: Fr): Promise<void>;
   notifyRevertiblePhaseStart(minRevertibleSideEffectCounter: number): Promise<void>;
   isExecutionInRevertiblePhase(sideEffectCounter: number): Promise<boolean>;
diff --git a/yarn-project/pxe/src/contract_function_simulator/oracle/oracle.ts b/yarn-project/pxe/src/contract_function_simulator/oracle/oracle.ts
index 9e02490f6a23..64bb76053692 100644
--- a/yarn-project/pxe/src/contract_function_simulator/oracle/oracle.ts
+++ b/yarn-project/pxe/src/contract_function_simulator/oracle/oracle.ts
@@ -490,6 +490,20 @@ export class Oracle {
     return [values.map(toACVMField)];
   }
 
+  // eslint-disable-next-line camelcase
+  async aztec_utl_callUtilityFunction(
+    [contractAddress]: ACVMField[],
+    [functionSelector]: ACVMField[],
+    args: ACVMField[],
+  ): Promise<ACVMField[][]> {
+    const result = await this.handlerAsUtility().callUtilityFunction(
+      AztecAddress.fromField(Fr.fromString(contractAddress)),
+      FunctionSelector.fromField(Fr.fromString(functionSelector)),
+      args.map(Fr.fromString),
+    );
+    return [result.map(toACVMField)];
+  }
+
   // eslint-disable-next-line camelcase
   aztec_prv_notifyCreatedContractClassLog(
     [contractAddress]: ACVMField[],
diff --git a/yarn-project/pxe/src/contract_function_simulator/oracle/oracle_version_is_checked.test.ts b/yarn-project/pxe/src/contract_function_simulator/oracle/oracle_version_is_checked.test.ts
index 288ebb850175..2cf900cb5e46 100644
--- a/yarn-project/pxe/src/contract_function_simulator/oracle/oracle_version_is_checked.test.ts
+++ b/yarn-project/pxe/src/contract_function_simulator/oracle/oracle_version_is_checked.test.ts
@@ -213,6 +213,7 @@ describe('Oracle Version Check test suite', () => {
         jobId: 'test',
         scopes: [],
         l2TipsStore,
+        simulator,
       });
     });
 
diff --git a/yarn-project/pxe/src/contract_function_simulator/oracle/private_execution.test.ts b/yarn-project/pxe/src/contract_function_simulator/oracle/private_execution.test.ts
index 3abc14adf645..bcd9520144ca 100644
--- a/yarn-project/pxe/src/contract_function_simulator/oracle/private_execution.test.ts
+++ b/yarn-project/pxe/src/contract_function_simulator/oracle/private_execution.test.ts
@@ -1,4 +1,4 @@
-import { DomainSeparator, NULL_MSG_SENDER_CONTRACT_ADDRESS } from '@aztec/constants';
+import { DomainSeparator } from '@aztec/constants';
 import { asyncMap } from '@aztec/foundation/async-map';
 import { BlockNumber } from '@aztec/foundation/branded-types';
 import { times } from '@aztec/foundation/collection';
@@ -173,7 +173,7 @@ describe('Private Execution test suite', () => {
     anchorBlockHeader,
     args = [],
     /** Notice that we're defaulting to the "null" msg_sender, which many public functions will fail to unwrap, and will revert. */
-    msgSender = AztecAddress.fromBigInt(NULL_MSG_SENDER_CONTRACT_ADDRESS),
+    msgSender = AztecAddress.NULL_MSG_SENDER,
     contractAddress = undefined,
     txContext = {},
   }: {
diff --git a/yarn-project/pxe/src/contract_function_simulator/oracle/private_execution_oracle.test.ts b/yarn-project/pxe/src/contract_function_simulator/oracle/private_execution_oracle.test.ts
index e333d89ce26b..9f61d5a2bf6d 100644
--- a/yarn-project/pxe/src/contract_function_simulator/oracle/private_execution_oracle.test.ts
+++ b/yarn-project/pxe/src/contract_function_simulator/oracle/private_execution_oracle.test.ts
@@ -1,5 +1,6 @@
 import { Fr } from '@aztec/foundation/curves/bn254';
 import type { KeyStore } from '@aztec/key-store';
+import { WASMSimulator } from '@aztec/simulator/client';
 import { FunctionSelector } from '@aztec/stdlib/abi';
 import type { AuthWitness } from '@aztec/stdlib/auth-witness';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
@@ -107,6 +108,7 @@ describe('PrivateExecutionOracle', () => {
       l2TipsStore: mock<L2TipsProvider>(),
       jobId: 'test',
       scopes: [],
+      simulator: new WASMSimulator(),
       ...overrides,
     });
   };
diff --git a/yarn-project/pxe/src/contract_function_simulator/oracle/private_execution_oracle.ts b/yarn-project/pxe/src/contract_function_simulator/oracle/private_execution_oracle.ts
index 961d67009cc3..2490f9352dbe 100644
--- a/yarn-project/pxe/src/contract_function_simulator/oracle/private_execution_oracle.ts
+++ b/yarn-project/pxe/src/contract_function_simulator/oracle/private_execution_oracle.ts
@@ -2,7 +2,7 @@ import { MAX_FR_CALLDATA_TO_ALL_ENQUEUED_CALLS, PRIVATE_CONTEXT_INPUTS_LENGTH }
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { createLogger } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
-import { type CircuitSimulator, toACVMWitness } from '@aztec/simulator/client';
+import { toACVMWitness } from '@aztec/simulator/client';
 import {
   type FunctionAbi,
   type FunctionArtifact,
@@ -50,7 +50,6 @@ export type PrivateExecutionOracleArgs = Omit<UtilityExecutionOracleArgs, 'contr
   totalPublicCalldataCount?: number;
   sideEffectCounter?: number;
   senderForTags?: AztecAddress;
-  simulator?: CircuitSimulator;
 };
 
 /**
@@ -86,7 +85,6 @@ export class PrivateExecutionOracle extends UtilityExecutionOracle implements IP
   private readonly defaultSenderForTags: AztecAddress | undefined;
   /** Per-call sender-for-tags override, set by `setSenderForTags`. Takes precedence over `defaultSenderForTags`. */
   private currentSenderForTags: AztecAddress | undefined;
-  private readonly simulator?: CircuitSimulator;
 
   constructor(args: PrivateExecutionOracleArgs) {
     super({
@@ -105,7 +103,6 @@ export class PrivateExecutionOracle extends UtilityExecutionOracle implements IP
     this.totalPublicCalldataCount = args.totalPublicCalldataCount ?? 0;
     this.initialSideEffectCounter = args.sideEffectCounter ?? 0;
     this.defaultSenderForTags = args.senderForTags;
-    this.simulator = args.simulator;
   }
 
   public getPrivateContextInputs(): PrivateContextInputs {
@@ -583,14 +580,15 @@ export class PrivateExecutionOracle extends UtilityExecutionOracle implements IP
       log: this.logger,
       scopes: this.scopes,
       senderForTags: this.defaultSenderForTags,
-      simulator: this.simulator!,
+      simulator: this.simulator,
+      hooks: this.hooks,
       l2TipsStore: this.l2TipsStore,
     });
 
     const setupTime = simulatorSetupTimer.ms();
 
     const childExecutionResult = await executePrivateFunction(
-      this.simulator!,
+      this.simulator,
       privateExecutionOracle,
       targetArtifact,
       targetContractAddress,
diff --git a/yarn-project/pxe/src/contract_function_simulator/oracle/utility_execution.test.ts b/yarn-project/pxe/src/contract_function_simulator/oracle/utility_execution.test.ts
index 81a266ecd0d4..e3320b8f8e29 100644
--- a/yarn-project/pxe/src/contract_function_simulator/oracle/utility_execution.test.ts
+++ b/yarn-project/pxe/src/contract_function_simulator/oracle/utility_execution.test.ts
@@ -347,6 +347,7 @@ describe('Utility Execution test suite', () => {
         jobId: 'test-job-id',
         scopes: [scope],
         l2TipsStore,
+        simulator,
       });
     });
 
@@ -414,6 +415,7 @@ describe('Utility Execution test suite', () => {
           jobId: 'test-job-id',
           scopes: [scope],
           l2TipsStore,
+          simulator,
         });
 
         capsuleStore.getCapsule.mockResolvedValueOnce(persisted);
@@ -595,6 +597,7 @@ describe('Utility Execution test suite', () => {
             jobId: 'test-job-id',
             scopes: [],
             l2TipsStore,
+            simulator,
           });
 
         const oracleA = makeOracle(contractAddressA);
diff --git a/yarn-project/pxe/src/contract_function_simulator/oracle/utility_execution_oracle.ts b/yarn-project/pxe/src/contract_function_simulator/oracle/utility_execution_oracle.ts
index 450903a01f5f..688ae67ef1c1 100644
--- a/yarn-project/pxe/src/contract_function_simulator/oracle/utility_execution_oracle.ts
+++ b/yarn-project/pxe/src/contract_function_simulator/oracle/utility_execution_oracle.ts
@@ -1,5 +1,6 @@
 import type { ARCHIVE_HEIGHT, NOTE_HASH_TREE_HEIGHT } from '@aztec/constants';
 import type { BlockNumber } from '@aztec/foundation/branded-types';
+import { uniqueBy } from '@aztec/foundation/collection';
 import { Aes128 } from '@aztec/foundation/crypto/aes128';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { Point } from '@aztec/foundation/curves/grumpkin';
@@ -7,6 +8,15 @@ import { LogLevels, type Logger, createLogger } from '@aztec/foundation/log';
 import type { MembershipWitness } from '@aztec/foundation/trees';
 import type { KeyStore } from '@aztec/key-store';
 import { isProtocolContract } from '@aztec/protocol-contracts';
+import {
+  type CircuitSimulator,
+  ExecutionError,
+  extractCallStack,
+  resolveAssertionMessageFromError,
+  toACVMWitness,
+  witnessMapToFields,
+} from '@aztec/simulator/client';
+import { FunctionSelector } from '@aztec/stdlib/abi';
 import type { AuthWitness } from '@aztec/stdlib/auth-witness';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { BlockHash, type L2TipsProvider } from '@aztec/stdlib/block';
@@ -19,11 +29,12 @@ import { MessageContext, deriveAppSiloedSharedSecret } from '@aztec/stdlib/logs'
 import { getNonNullifiedL1ToL2MessageWitness } from '@aztec/stdlib/messaging';
 import type { NoteStatus } from '@aztec/stdlib/note';
 import { MerkleTreeId, type NullifierMembershipWitness, PublicDataWitness } from '@aztec/stdlib/trees';
-import type { BlockHeader, Capsule, OffchainEffect } from '@aztec/stdlib/tx';
+import type { BlockHeader, Capsule, IndexedTxEffect, OffchainEffect, TxHash } from '@aztec/stdlib/tx';
 
 import { createContractLogger, logContractMessage, stripAztecnrLogPrefix } from '../../contract_logging.js';
 import type { ContractSyncService } from '../../contract_sync/contract_sync_service.js';
 import { EventService } from '../../events/event_service.js';
+import type { ExecutionHooks } from '../../hooks/index.js';
 import { LogService } from '../../logs/log_service.js';
 import { MessageContextService } from '../../messages/message_context_service.js';
 import { NoteService } from '../../notes/note_service.js';
@@ -44,6 +55,7 @@ import { UtilityContext } from '../noir-structs/utility_context.js';
 import { pickNotes } from '../pick_notes.js';
 import type { IMiscOracle, IUtilityExecutionOracle, NoteData } from './interfaces.js';
 import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
+import { Oracle } from './oracle.js';
 
 /** Args for UtilityExecutionOracle constructor. */
 export type UtilityExecutionOracleArgs = {
@@ -67,6 +79,8 @@ export type UtilityExecutionOracleArgs = {
   jobId: string;
   log?: ReturnType<typeof createLogger>;
   scopes: AztecAddress[];
+  simulator: CircuitSimulator;
+  hooks?: ExecutionHooks;
 };
 
 /**
@@ -103,6 +117,8 @@ export class UtilityExecutionOracle implements IMiscOracle, IUtilityExecutionOra
   protected readonly jobId: string;
   protected logger: ReturnType<typeof createLogger>;
   protected readonly scopes: AztecAddress[];
+  protected readonly simulator: CircuitSimulator;
+  protected readonly hooks: ExecutionHooks | undefined;
 
   constructor(args: UtilityExecutionOracleArgs) {
     this.contractAddress = args.contractAddress;
@@ -124,6 +140,8 @@ export class UtilityExecutionOracle implements IMiscOracle, IUtilityExecutionOra
     this.jobId = args.jobId;
     this.logger = args.log ?? createLogger('simulator:client_view_context');
     this.scopes = args.scopes;
+    this.simulator = args.simulator;
+    this.hooks = args.hooks;
   }
 
   public assertCompatibleOracleVersion(major: number, minor: number): void {
@@ -626,36 +644,18 @@ export class UtilityExecutionOracle implements IMiscOracle, IUtilityExecutionOra
     eventValidationRequests: EventValidationRequest[],
     scope: AztecAddress,
   ) {
-    const noteService = new NoteService(this.noteStore, this.aztecNode, this.anchorBlockHeader, this.jobId);
-    const noteStorePromises = noteValidationRequests.map(request =>
-      noteService.validateAndStoreNote(
-        request.contractAddress,
-        request.owner,
-        request.storageSlot,
-        request.randomness,
-        request.noteNonce,
-        request.content,
-        request.noteHash,
-        request.nullifier,
-        request.txHash,
-        scope,
-      ),
-    );
+    const txEffects = await this.#fetchTxEffects([
+      ...noteValidationRequests.map(r => r.txHash),
+      ...eventValidationRequests.map(r => r.txHash),
+    ]);
 
+    const noteService = new NoteService(this.noteStore, this.aztecNode, this.anchorBlockHeader, this.jobId);
     const eventService = new EventService(this.anchorBlockHeader, this.aztecNode, this.privateEventStore, this.jobId);
-    const eventStorePromises = eventValidationRequests.map(request =>
-      eventService.validateAndStoreEvent(
-        request.contractAddress,
-        request.eventTypeId,
-        request.randomness,
-        request.serializedEvent,
-        request.eventCommitment,
-        request.txHash,
-        scope,
-      ),
-    );
 
-    await Promise.all([...noteStorePromises, ...eventStorePromises]);
+    await Promise.all([
+      noteService.validateAndStoreNotes(noteValidationRequests, scope, txEffects),
+      eventService.validateAndStoreEvents(eventValidationRequests, scope, txEffects),
+    ]);
   }
 
   public async getLogsByTag(
@@ -894,17 +894,112 @@ export class UtilityExecutionOracle implements IMiscOracle, IUtilityExecutionOra
     return Promise.resolve();
   }
 
+  /** Executes another utility function from within this one and returns its serialized return values. */
+  public async callUtilityFunction(
+    targetContractAddress: AztecAddress,
+    functionSelector: FunctionSelector,
+    args: Fr[],
+  ): Promise<Fr[]> {
+    const targetArtifact = await this.contractStore.getFunctionArtifactWithDebugMetadata(
+      targetContractAddress,
+      functionSelector,
+    );
+
+    if (!targetContractAddress.equals(this.contractAddress)) {
+      const request = {
+        caller: this.contractAddress,
+        target: targetContractAddress,
+        functionSelector,
+        functionName: targetArtifact.name,
+        args,
+        callerContext: ('isPrivate' in this ? 'private' : 'utility') as 'private' | 'utility',
+      };
+
+      const response = this.hooks
+        ? await this.hooks.authorizeUtilityCall(request)
+        : { authorized: false, reason: 'No execution hooks configured' };
+
+      if (!response.authorized) {
+        const reason = response.reason ? `: ${response.reason}` : '';
+        throw new Error(
+          `Cross-contract utility call denied${reason}. ${this.contractAddress} attempted to call ` +
+            `${targetContractAddress}:${functionSelector} (${targetArtifact.name}). ` +
+            `See https://docs.aztec.network/errors/11`,
+        );
+      }
+    }
+
+    this.logger.debug(
+      `Calling nested utility function ${targetContractAddress}:${functionSelector} from ${this.contractAddress}`,
+    );
+
+    const nestedOracle = new UtilityExecutionOracle({
+      contractAddress: targetContractAddress,
+      authWitnesses: this.authWitnesses,
+      capsules: this.capsules,
+      anchorBlockHeader: this.anchorBlockHeader,
+      contractStore: this.contractStore,
+      noteStore: this.noteStore,
+      keyStore: this.keyStore,
+      addressStore: this.addressStore,
+      aztecNode: this.aztecNode,
+      recipientTaggingStore: this.recipientTaggingStore,
+      senderAddressBookStore: this.senderAddressBookStore,
+      capsuleService: this.capsuleService,
+      privateEventStore: this.privateEventStore,
+      messageContextService: this.messageContextService,
+      contractSyncService: this.contractSyncService,
+      l2TipsStore: this.l2TipsStore,
+      jobId: this.jobId,
+      scopes: this.scopes,
+      simulator: this.simulator,
+      hooks: this.hooks,
+      log: this.logger,
+    });
+
+    const initialWitness = toACVMWitness(0, args);
+    const acvmCallback = new Oracle(nestedOracle);
+    const acirExecutionResult = await this.simulator
+      .executeUserCircuit(initialWitness, targetArtifact, acvmCallback.toACIRCallback())
+      .catch((err: Error) => {
+        err.message = resolveAssertionMessageFromError(err, targetArtifact);
+        throw new ExecutionError(
+          err.message,
+          { contractAddress: targetContractAddress, functionSelector },
+          extractCallStack(err, targetArtifact.debug),
+          { cause: err },
+        );
+      });
+
+    return witnessMapToFields(acirExecutionResult.returnWitness);
+  }
+
   /** Returns offchain effects collected during execution. */
   public getOffchainEffects(): OffchainEffect[] {
     return this.offchainEffects;
   }
 
+  /**
+   * Fetches tx effects for the given hashes in parallel, deduplicating repeated hashes so each tx is only requested
+   * once. Returns a map keyed by `TxHash.toString()`; hashes for which the node has no tx effect are omitted.
+   */
+  async #fetchTxEffects(txHashes: TxHash[]): Promise<Map<string, IndexedTxEffect>> {
+    const uniqueTxHashes = uniqueBy(txHashes, h => h.toString());
+    const fetched = await Promise.all(uniqueTxHashes.map(h => this.aztecNode.getTxEffect(h)));
+    return new Map(
+      uniqueTxHashes
+        .map((h, i): [string, IndexedTxEffect | undefined] => [h.toString(), fetched[i]])
+        .filter((entry): entry is [string, IndexedTxEffect] => entry[1] !== undefined),
+    );
+  }
+
   /** Runs a query concurrently with a validation that the block hash is not ahead of the anchor block. */
   async #queryWithBlockHashNotAfterAnchor<T>(blockHash: BlockHash, query: () => Promise<T>): Promise<T> {
     const [response] = await Promise.all([
       query(),
       (async () => {
-        const header = await this.aztecNode.getBlockHeader(blockHash);
+        const block = await this.aztecNode.getBlock(blockHash);
+        const header = block?.header;
         if (!header) {
           throw new Error(`Could not find block header for block hash ${blockHash}`);
         }
diff --git a/yarn-project/pxe/src/contract_function_simulator/proxied_contract_data_source.ts b/yarn-project/pxe/src/contract_function_simulator/proxied_contract_data_source.ts
index f3edf78718f8..a4c1c6e2744b 100644
--- a/yarn-project/pxe/src/contract_function_simulator/proxied_contract_data_source.ts
+++ b/yarn-project/pxe/src/contract_function_simulator/proxied_contract_data_source.ts
@@ -1,13 +1,20 @@
 import { FunctionSelector } from '@aztec/stdlib/abi';
-import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { ContractOverrides } from '@aztec/stdlib/tx';
 
 import type { ContractStore } from '../storage/contract_store/contract_store.js';
 
 /*
- * Proxy generator for a ContractStore that allows overriding contract instances and artifacts, so
- * the contract function simulator can execute different bytecode on certain addresses. An example use case
- * would be overriding your own account contract so that valid signatures don't have to be provided while simulating.
+ * Proxy generator for a ContractStore that allows overriding contract instances at given addresses,
+ * so the contract function simulator can execute different bytecode on certain addresses. An example
+ * use case would be overriding your own account contract so that valid signatures don't have to be
+ * provided while simulating.
+ *
+ * Function artifact lookups for an overridden address are routed via the override-instance's
+ * `currentContractClassId` rather than the underlying ContractStore's address→class mapping —
+ * `ContractStore.getFunctionArtifact` calls `this.getContractInstance` internally, which the proxy
+ * cannot intercept (the binding sees the raw target, not the proxy). The target class must be
+ * registered ahead of time via `pxe.registerContractClass(...)`.
  */
 export class ProxiedContractStoreFactory {
   static create(contractStore: ContractStore, overrides?: ContractOverrides) {
@@ -15,75 +22,48 @@ export class ProxiedContractStoreFactory {
       return contractStore;
     }
 
+    const findFunctionInArtifact = async (
+      artifact: { name: string; functions: { name: string; parameters: any[] }[] },
+      selector: FunctionSelector,
+      contractAddress: AztecAddress,
+    ) => {
+      for (const fn of artifact.functions) {
+        const fnSelector = await FunctionSelector.fromNameAndParameters(fn.name, fn.parameters);
+        if (fnSelector.equals(selector)) {
+          return { ...fn, contractName: artifact.name } as any;
+        }
+      }
+      throw new Error(
+        `Function with selector ${selector} not found in stub artifact for overridden contract at ${contractAddress}.`,
+      );
+    };
+
     return new Proxy(contractStore, {
       get(target, prop: keyof ContractStore) {
-        switch (prop) {
-          case 'getContractInstance': {
-            return async (address: AztecAddress) => {
-              if (overrides[address.toString()]) {
-                const { instance } = overrides[address.toString()]!;
-                instance.address = address;
-                const realInstance = await target.getContractInstance(address);
-                if (!realInstance) {
-                  throw new Error(`Contract instance not found for address: ${address}`);
-                }
-                instance.currentContractClassId = realInstance.currentContractClassId;
-                instance.originalContractClassId = realInstance.originalContractClassId;
-                instance.initializationHash = realInstance.initializationHash;
-                return instance;
-              } else {
-                return target.getContractInstance(address);
-              }
-            };
-          }
-          case 'getFunctionArtifact': {
-            return async (contractAddress: AztecAddress, selector: FunctionSelector) => {
-              if (overrides[contractAddress.toString()]) {
-                const { artifact } = overrides[contractAddress.toString()]!;
-                const functions = artifact.functions;
-                for (let i = 0; i < functions.length; i++) {
-                  const fn = functions[i];
-                  const fnSelector = await FunctionSelector.fromNameAndParameters(fn.name, fn.parameters);
-                  if (fnSelector.equals(selector)) {
-                    return fn;
-                  }
-                }
-                throw new Error(
-                  `Function with selector ${selector} not found in stub artifact for overridden contract at ${contractAddress}. The stub does not implement this function.`,
-                );
-              } else {
-                return target.getFunctionArtifact(contractAddress, selector);
-              }
-            };
-          }
-          case 'getFunctionArtifactWithDebugMetadata': {
-            return async (contractAddress: AztecAddress, selector: FunctionSelector) => {
-              if (overrides[contractAddress.toString()]) {
-                const { artifact } = overrides[contractAddress.toString()]!;
-                const functions = artifact.functions;
-                for (let i = 0; i < functions.length; i++) {
-                  const fn = functions[i];
-                  const fnSelector = await FunctionSelector.fromNameAndParameters(fn.name, fn.parameters);
-                  if (fnSelector.equals(selector)) {
-                    return fn;
-                  }
-                }
-                throw new Error(
-                  `Function with selector ${selector} not found in stub artifact for overridden contract at ${contractAddress}. The stub does not implement this function.`,
-                );
-              } else {
-                return target.getFunctionArtifactWithDebugMetadata(contractAddress, selector);
-              }
-            };
-          }
-          default: {
-            const value = Reflect.get(target, prop);
-            if (typeof value === 'function') {
-              return value.bind(target);
+        if (prop === 'getContractInstance') {
+          return (address: AztecAddress) => {
+            const override = overrides[address.toString()];
+            return override ? Promise.resolve(override.instance) : target.getContractInstance(address);
+          };
+        }
+        if (prop === 'getFunctionArtifact' || prop === 'getFunctionArtifactWithDebugMetadata') {
+          return async (contractAddress: AztecAddress, selector: FunctionSelector) => {
+            const override = overrides[contractAddress.toString()];
+            if (!override) {
+              return (target[prop] as Function).call(target, contractAddress, selector);
+            }
+            const artifact = await target.getContractArtifact(override.instance.currentContractClassId);
+            if (!artifact) {
+              throw new Error(
+                `No artifact registered for override class ${override.instance.currentContractClassId} ` +
+                  `at ${contractAddress}. Register it via pxe.registerContractClass(...) before simulating.`,
+              );
             }
-            return value;
-          }
+            return findFunctionInArtifact(artifact, selector, contractAddress);
+          };
         }
+        const value = Reflect.get(target, prop);
+        return typeof value === 'function' ? value.bind(target) : value;
       },
     }) satisfies ContractStore;
   }
diff --git a/yarn-project/pxe/src/contract_sync/contract_sync_service.test.ts b/yarn-project/pxe/src/contract_sync/contract_sync_service.test.ts
index 6e70a2b12896..ac7e194201c2 100644
--- a/yarn-project/pxe/src/contract_sync/contract_sync_service.test.ts
+++ b/yarn-project/pxe/src/contract_sync/contract_sync_service.test.ts
@@ -225,6 +225,53 @@ describe('ContractSyncService', () => {
     });
   });
 
+  describe('class ID verification deduplication', () => {
+    const contract2 = AztecAddress.fromBigInt(300n);
+
+    it('verifies class ID only once per contract across scope batches', async () => {
+      await service.ensureContractSynced(contractAddress, null, utilityExecutor, anchorBlockHeader, jobId, [scopeA]);
+      await service.ensureContractSynced(contractAddress, null, utilityExecutor, anchorBlockHeader, jobId, [scopeB]);
+      expectVerifiedContracts(contractAddress);
+    });
+
+    it('verifies class ID separately for different contracts', async () => {
+      await service.ensureContractSynced(contractAddress, null, utilityExecutor, anchorBlockHeader, jobId, [scopeA]);
+      await service.ensureContractSynced(contract2, null, utilityExecutor, anchorBlockHeader, jobId, [scopeA]);
+      expectVerifiedContracts(contractAddress, contract2);
+    });
+
+    it('re-verifies class ID after wipe', async () => {
+      await service.ensureContractSynced(contractAddress, null, utilityExecutor, anchorBlockHeader, jobId, [scopeA]);
+      service.wipe();
+      await service.ensureContractSynced(contractAddress, null, utilityExecutor, anchorBlockHeader, jobId, [scopeB]);
+      expectVerifiedContracts(contractAddress, contractAddress);
+    });
+
+    it('re-verifies class ID after discardStaged', async () => {
+      await service.ensureContractSynced(contractAddress, null, utilityExecutor, anchorBlockHeader, jobId, [scopeA]);
+      await service.discardStaged(jobId);
+      await service.ensureContractSynced(contractAddress, null, utilityExecutor, anchorBlockHeader, jobId, [scopeA]);
+      expectVerifiedContracts(contractAddress, contractAddress);
+    });
+
+    it('re-verifies class ID after verification failure', async () => {
+      contractStore.getContractInstance.mockRejectedValueOnce(new Error('node unavailable'));
+      await expect(
+        service.ensureContractSynced(contractAddress, null, utilityExecutor, anchorBlockHeader, jobId, [scopeA]),
+      ).rejects.toThrow('node unavailable');
+
+      await service.ensureContractSynced(contractAddress, null, utilityExecutor, anchorBlockHeader, jobId, [scopeA]);
+      expectVerifiedContracts(contractAddress, contractAddress);
+    });
+
+    it('does not re-verify class ID when only scope cache is invalidated', async () => {
+      await service.ensureContractSynced(contractAddress, null, utilityExecutor, anchorBlockHeader, jobId, [scopeA]);
+      service.invalidateContractForScopes(contractAddress, [scopeA]);
+      await service.ensureContractSynced(contractAddress, null, utilityExecutor, anchorBlockHeader, jobId, [scopeA]);
+      expectVerifiedContracts(contractAddress);
+    });
+  });
+
   describe('invalidateContractForScopes', () => {
     const contract2 = AztecAddress.fromBigInt(300n);
 
@@ -337,5 +384,13 @@ describe('ContractSyncService', () => {
     }
   };
 
+  /** Asserts that class ID verification was triggered for each contract address in the given sequence. */
+  const expectVerifiedContracts = (...addresses: AztecAddress[]) => {
+    expect(contractStore.getContractInstance).toHaveBeenCalledTimes(addresses.length);
+    for (let i = 0; i < addresses.length; i++) {
+      expect(contractStore.getContractInstance).toHaveBeenNthCalledWith(i + 1, addresses[i]);
+    }
+  };
+
   const expectNoSync = () => expect(utilityExecutor).not.toHaveBeenCalled();
 });
diff --git a/yarn-project/pxe/src/contract_sync/contract_sync_service.ts b/yarn-project/pxe/src/contract_sync/contract_sync_service.ts
index 61854a26ea60..39b29ee3cc92 100644
--- a/yarn-project/pxe/src/contract_sync/contract_sync_service.ts
+++ b/yarn-project/pxe/src/contract_sync/contract_sync_service.ts
@@ -27,6 +27,10 @@ export class ContractSyncService implements StagedStore {
   // The value is a promise that resolves when the contract is synced.
   private syncedContracts: Map<string, Promise<void>> = new Map();
 
+  // Tracks class ID verification per contract. Keyed by contract address only (no scope), since
+  // class ID verification is scope-independent. Cleared on wipe/discard.
+  private verifiedClassIds: Map<string, Promise<void>> = new Map();
+
   // Per-job excluded contract addresses - these contracts should not be synced.
   private excludedFromSync: Map<string, Set<string>> = new Map();
 
@@ -101,6 +105,7 @@ export class ContractSyncService implements StagedStore {
   wipe(): void {
     this.log.debug(`Wiping contract sync cache (${this.syncedContracts.size} entries)`);
     this.syncedContracts.clear();
+    this.verifiedClassIds.clear();
   }
 
   commit(jobId: string): Promise<void> {
@@ -113,6 +118,7 @@ export class ContractSyncService implements StagedStore {
     // We clear the synced contracts cache here because, when the job is discarded, any associated database writes from
     // the sync are also undone.
     this.syncedContracts.clear();
+    this.verifiedClassIds.clear();
     this.excludedFromSync.delete(jobId);
     return Promise.resolve();
   }
@@ -138,7 +144,7 @@ export class ContractSyncService implements StagedStore {
     }
 
     this.log.debug(`Syncing contract ${contractAddress} for ${scopesToSync.length} scope(s)`);
-    const verifyPromise = verifyFn();
+    const verifyPromise = this.#getOrStartVerification(contractAddress, verifyFn);
 
     for (const scope of scopesToSync) {
       const key = toKey(contractAddress, scope);
@@ -152,6 +158,21 @@ export class ContractSyncService implements StagedStore {
     }
   }
 
+  /** Returns the cached verification promise for a contract, starting a new one if needed. Evicts from cache on failure so retries re-verify. */
+  #getOrStartVerification(contractAddress: AztecAddress, verifyFn: () => Promise<void>): Promise<void> {
+    const contractKey = contractAddress.toString();
+    const cached = this.verifiedClassIds.get(contractKey);
+    if (cached) {
+      return cached;
+    }
+    const promise = verifyFn().catch(err => {
+      this.verifiedClassIds.delete(contractKey);
+      throw err;
+    });
+    this.verifiedClassIds.set(contractKey, promise);
+    return promise;
+  }
+
   /** Runs fn while holding a slot in #syncSlot, bounding total concurrent scope syncs. */
   async #runBounded<T>(fn: () => Promise<T>): Promise<T> {
     await this.#syncSlot.acquire();
diff --git a/yarn-project/pxe/src/entrypoints/client/bundle/utils.ts b/yarn-project/pxe/src/entrypoints/client/bundle/utils.ts
index d446d40bde7c..ebd772321793 100644
--- a/yarn-project/pxe/src/entrypoints/client/bundle/utils.ts
+++ b/yarn-project/pxe/src/entrypoints/client/bundle/utils.ts
@@ -59,6 +59,7 @@ export async function createPXE(
     protocolContractsProvider,
     config,
     loggerOrSuffix: pxeLogger,
+    hooks: options.hooks,
   });
   return pxe;
 }
diff --git a/yarn-project/pxe/src/entrypoints/client/lazy/utils.ts b/yarn-project/pxe/src/entrypoints/client/lazy/utils.ts
index a31fec7ba94a..43a6bdf717a7 100644
--- a/yarn-project/pxe/src/entrypoints/client/lazy/utils.ts
+++ b/yarn-project/pxe/src/entrypoints/client/lazy/utils.ts
@@ -59,6 +59,7 @@ export async function createPXE(
     protocolContractsProvider,
     config,
     loggerOrSuffix: pxeLogger,
+    hooks: options.hooks,
   });
   return pxe;
 }
diff --git a/yarn-project/pxe/src/entrypoints/pxe_creation_options.ts b/yarn-project/pxe/src/entrypoints/pxe_creation_options.ts
index 7a2b01195458..ed9c974a6ff4 100644
--- a/yarn-project/pxe/src/entrypoints/pxe_creation_options.ts
+++ b/yarn-project/pxe/src/entrypoints/pxe_creation_options.ts
@@ -4,6 +4,8 @@ import type { AztecAsyncKVStore } from '@aztec/kv-store';
 import type { CircuitSimulator } from '@aztec/simulator/client';
 import type { PrivateKernelProver } from '@aztec/stdlib/interfaces/client';
 
+import type { ExecutionHooks } from '../hooks/index.js';
+
 export type PXECreationOptions = {
   loggers?: { store?: Logger; pxe?: Logger; prover?: Logger };
   /** Actor label to include in log output (e.g., 'pxe-0', 'pxe-test'). */
@@ -11,6 +13,8 @@ export type PXECreationOptions = {
   proverOrOptions?: PrivateKernelProver | BBPrivateKernelProverOptions;
   store?: AztecAsyncKVStore;
   simulator?: CircuitSimulator;
+  /** Optional hooks to observe and influence contract execution. */
+  hooks?: ExecutionHooks;
 };
 
 /** Checks if the given value implements the PrivateKernelProver interface via duck-typing. */
diff --git a/yarn-project/pxe/src/entrypoints/server/index.ts b/yarn-project/pxe/src/entrypoints/server/index.ts
index 7fac75907e37..5597cdf7efd2 100644
--- a/yarn-project/pxe/src/entrypoints/server/index.ts
+++ b/yarn-project/pxe/src/entrypoints/server/index.ts
@@ -1,5 +1,6 @@
 export * from '../../notes_filter.js';
 export * from '../../pxe.js';
+export * from '../../hooks/index.js';
 export * from '../../config/index.js';
 export * from '../../error_enriching.js';
 export * from '../../storage/index.js';
diff --git a/yarn-project/pxe/src/entrypoints/server/utils.ts b/yarn-project/pxe/src/entrypoints/server/utils.ts
index dfec0d18613b..d5fec68be4b2 100644
--- a/yarn-project/pxe/src/entrypoints/server/utils.ts
+++ b/yarn-project/pxe/src/entrypoints/server/utils.ts
@@ -65,6 +65,7 @@ export async function createPXE(
     protocolContractsProvider,
     config: configWithContracts,
     loggerOrSuffix: pxeLogger,
+    hooks: options.hooks,
   });
   return pxe;
 }
diff --git a/yarn-project/pxe/src/events/event_service.test.ts b/yarn-project/pxe/src/events/event_service.test.ts
index 58b35009573b..643d57c2345a 100644
--- a/yarn-project/pxe/src/events/event_service.test.ts
+++ b/yarn-project/pxe/src/events/event_service.test.ts
@@ -12,10 +12,11 @@ import { type IndexedTxEffect, TxEffect } from '@aztec/stdlib/tx';
 
 import { mock } from 'jest-mock-extended';
 
+import { EventValidationRequest } from '../contract_function_simulator/noir-structs/event_validation_request.js';
 import { PrivateEventStore } from '../storage/private_event_store/private_event_store.js';
 import { EventService } from './event_service.js';
 
-describe('validateAndStoreEvent', () => {
+describe('validateAndStoreEvents', () => {
   let blockNumber: BlockNumber;
   let eventSelector: EventSelector;
   let randomness: Fr;
@@ -66,12 +67,11 @@ describe('validateAndStoreEvent', () => {
 
     /* Happy path context conditions:
      ** - PXE is sync'd to _at least_ block including tx
-     ** - Node returns the corresponding tx effect and the tx effect includes the event commitment
+     ** - Caller provides the corresponding tx effect via the prefetched map and the tx effect includes the event
+     **   commitment.
      */
     const anchorBlockHeader = makeBlockHeader(0, { blockNumber });
 
-    aztecNode.getTxEffect.mockImplementation(() => Promise.resolve(indexedTxEffect));
-
     logger = mock<Logger>();
     eventService = new EventService(anchorBlockHeader, aztecNode, privateEventStore, 'test', logger);
   });
@@ -80,34 +80,33 @@ describe('validateAndStoreEvent', () => {
     overrides: {
       eventContent?: Fr[];
       eventCommitment?: Fr;
+      txEffectsMap?: Map<string, IndexedTxEffect>;
     } = {},
   ) {
-    await eventService.validateAndStoreEvent(
+    const request = new EventValidationRequest(
       contractAddress,
       eventSelector,
       randomness,
-      overrides.eventContent || eventContent,
-      overrides.eventCommitment || eventCommitment,
+      overrides.eventContent ?? eventContent,
+      overrides.eventCommitment ?? eventCommitment,
       txEffect.txHash,
-      recipient,
     );
 
+    const map = overrides.txEffectsMap ?? defaultTxEffectsMap();
+    await eventService.validateAndStoreEvents([request], recipient, map);
+
     await privateEventStore.commit('test');
   }
 
   it('should throw when tx does not exist or has no effects', async () => {
-    aztecNode.getTxEffect.mockImplementation(() => Promise.resolve(undefined));
-    await expect(runStoreEvent).rejects.toThrow(/Could not find tx effect for tx hash/);
+    const txEffectsMap = new Map();
+    await expect(() => runStoreEvent({ txEffectsMap })).rejects.toThrow(/Could not find tx effect for tx hash/);
   });
 
   it('should throw when tx block has not yet been synchronized', async () => {
-    indexedTxEffect = {
-      ...indexedTxEffect,
-      l2BlockNumber: BlockNumber(blockNumber + 1),
-    };
-    aztecNode.getTxEffect.mockImplementation(() => Promise.resolve(indexedTxEffect));
-
-    await expect(runStoreEvent).rejects.toThrow(
+    const laterIndexedTxEffect = { ...indexedTxEffect, l2BlockNumber: BlockNumber(blockNumber + 1) };
+    const txEffectsMap = new Map([[txEffect.txHash.toString(), laterIndexedTxEffect]]);
+    await expect(() => runStoreEvent({ txEffectsMap })).rejects.toThrow(
       /Obtained a newer tx effect for .* for an event validation request than the anchor block/,
     );
   });
@@ -159,4 +158,8 @@ describe('validateAndStoreEvent', () => {
     expect(result.length).toEqual(1);
     expect(result[0].packedEvent).toEqual(eventContent);
   });
+
+  function defaultTxEffectsMap() {
+    return new Map([[txEffect.txHash.toString(), indexedTxEffect]]);
+  }
 });
diff --git a/yarn-project/pxe/src/events/event_service.ts b/yarn-project/pxe/src/events/event_service.ts
index 8ab69a80e6ba..ada53c685031 100644
--- a/yarn-project/pxe/src/events/event_service.ts
+++ b/yarn-project/pxe/src/events/event_service.ts
@@ -1,11 +1,10 @@
-import type { Fr } from '@aztec/foundation/curves/bn254';
 import { createLogger } from '@aztec/foundation/log';
-import type { EventSelector } from '@aztec/stdlib/abi';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { computePrivateEventCommitment, siloNullifier } from '@aztec/stdlib/hash';
 import type { AztecNode } from '@aztec/stdlib/interfaces/server';
-import type { BlockHeader, TxHash } from '@aztec/stdlib/tx';
+import type { BlockHeader, IndexedTxEffect } from '@aztec/stdlib/tx';
 
+import type { EventValidationRequest } from '../contract_function_simulator/noir-structs/event_validation_request.js';
 import { PrivateEventStore } from '../storage/private_event_store/private_event_store.js';
 
 export class EventService {
@@ -17,15 +16,43 @@ export class EventService {
     private readonly log = createLogger('pxe:event_service'),
   ) {}
 
-  public async validateAndStoreEvent(
-    contractAddress: AztecAddress,
-    selector: EventSelector,
-    randomness: Fr,
-    content: Fr[],
-    eventCommitment: Fr,
-    txHash: TxHash,
+  /**
+   * Validates and stores a batch of private events against pre-fetched tx effects.
+   *
+   * @param requests - The events to validate and store.
+   * @param scope - The scope under which the events are being stored.
+   * @param txEffects - Pre-fetched tx effects keyed by `TxHash.toString()`. Must contain entries for every request's
+   *                   txHash; missing entries are treated as a node bug and cause an error.
+   */
+  public async validateAndStoreEvents(
+    requests: EventValidationRequest[],
     scope: AztecAddress,
+    txEffects: Map<string, IndexedTxEffect>,
   ): Promise<void> {
+    if (requests.length === 0) {
+      return;
+    }
+
+    const anchorBlockNumber = this.anchorBlockHeader.getBlockNumber();
+
+    await Promise.all(requests.map(req => this.#validateAndStoreEvent(req, scope, txEffects, anchorBlockNumber)));
+  }
+
+  async #validateAndStoreEvent(
+    request: EventValidationRequest,
+    scope: AztecAddress,
+    txEffects: Map<string, IndexedTxEffect>,
+    anchorBlockNumber: number,
+  ): Promise<void> {
+    const {
+      contractAddress,
+      eventTypeId: selector,
+      randomness,
+      serializedEvent: content,
+      eventCommitment,
+      txHash,
+    } = request;
+
     // Defense-in-depth: the built-in private-event path derives this commitment from content before enqueueing, but
     // unconstrained PXE-side code (e.g. a custom message handler) can reach this oracle with arbitrary
     // (content, commitment) pairs. Without this check it could bind arbitrary content to a legitimate tx nullifier,
@@ -42,13 +69,9 @@ export class EventService {
     // (and thus we're less concerned about being ahead of the synced block), we use the synced block number to
     // maintain consistent behavior in the PXE. Additionally, events should never be ahead of the synced block here
     // since `fetchTaggedLogs` only processes logs up to the synced block.
-    const [siloedEventCommitment, txEffect] = await Promise.all([
-      siloNullifier(contractAddress, eventCommitment),
-      this.aztecNode.getTxEffect(txHash),
-    ]);
-
-    const anchorBlockNumber = this.anchorBlockHeader.getBlockNumber();
+    const siloedEventCommitment = await siloNullifier(contractAddress, eventCommitment);
 
+    const txEffect = txEffects.get(txHash.toString());
     if (!txEffect) {
       // We error out instead of just logging a warning and skipping the event because this would indicate a bug. This
       // is because the node has already served info about this tx either when obtaining the log (TxScopedL2Log contain
diff --git a/yarn-project/pxe/src/hooks/authorize_utility_call.ts b/yarn-project/pxe/src/hooks/authorize_utility_call.ts
new file mode 100644
index 000000000000..ae31a339726d
--- /dev/null
+++ b/yarn-project/pxe/src/hooks/authorize_utility_call.ts
@@ -0,0 +1,40 @@
+import type { Fr } from '@aztec/foundation/curves/bn254';
+import type { FunctionSelector } from '@aztec/stdlib/abi';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+
+/** Information about a cross-contract utility call that requires authorization. */
+export type UtilityCallAuthorizationRequest = {
+  /** The contract requesting the cross-contract call. */
+  caller: AztecAddress;
+  /** The target contract being called. */
+  target: AztecAddress;
+  /** The function selector being invoked on the target. */
+  functionSelector: FunctionSelector;
+  /** The name of the function being called, if known from the contract artifact. */
+  functionName?: string;
+  /** The serialized arguments passed to the function. */
+  args: Fr[];
+  /** Whether the call originates from a private or utility execution context. */
+  callerContext: 'private' | 'utility';
+};
+
+/** Authorization was granted. */
+type Authorized = { authorized: true };
+
+/** Authorization was denied. */
+type Denied = {
+  authorized: false;
+  /** Reason for denial, included in the error message. */
+  reason?: string;
+};
+
+/** Result of an authorization hook evaluation. */
+export type UtilityCallAuthorizationResponse = Authorized | Denied;
+
+/**
+ * Hook called when a utility function attempts a cross-contract call.
+ * Returns a response indicating whether the call is authorized and an optional denial reason.
+ */
+export type AuthorizeUtilityCall = (
+  request: UtilityCallAuthorizationRequest,
+) => Promise<UtilityCallAuthorizationResponse>;
diff --git a/yarn-project/pxe/src/hooks/execution_hooks.ts b/yarn-project/pxe/src/hooks/execution_hooks.ts
new file mode 100644
index 000000000000..e8ad86e762f2
--- /dev/null
+++ b/yarn-project/pxe/src/hooks/execution_hooks.ts
@@ -0,0 +1,37 @@
+import type { AuthorizeUtilityCall } from './authorize_utility_call.js';
+
+/**
+ * Hooks that PXE invokes during client-side simulation to gate operations that the protocol
+ * does not restrict on its own. They give the wallet a chance to apply custom policies (e.g.
+ * prompting the user, consulting a dynamic allowlist, or inspecting call arguments) before the
+ * execution proceeds.
+ *
+ * For example, {@link authorizeUtilityCall} is called whenever a utility function makes a
+ * cross-contract call. A call made by a malicious contract could leak private information, so the
+ * hook lets the wallet decide, per-call, whether to allow it. A static allowlist would not work
+ * here because neither the app nor the wallet can predict ahead of time which contracts will be
+ * invoked during execution.
+ *
+ * Note: hooks are unrelated to authentication witnesses (authwits). Authwits are an on-chain
+ * mechanism where a contract verifies that a caller was authorized by a specific account; hooks
+ * are a client-side PXE concern that gates execution before it proceeds.
+ *
+ * @example
+ * ```ts
+ * const pxe = await PXE.create({
+ *   // ...
+ *   hooks: {
+ *     authorizeUtilityCall: async (req) => {
+ *       // Allow calls to a known helper contract, deny everything else.
+ *       return req.target.equals(trustedHelper)
+ *         ? { authorized: true }
+ *         : { authorized: false, reason: 'Unknown target' };
+ *     },
+ *   },
+ * });
+ * ```
+ */
+export interface ExecutionHooks {
+  /** Called when a contract attempts a cross-contract utility call. */
+  authorizeUtilityCall: AuthorizeUtilityCall;
+}
diff --git a/yarn-project/pxe/src/hooks/index.ts b/yarn-project/pxe/src/hooks/index.ts
new file mode 100644
index 000000000000..77be368eb7b8
--- /dev/null
+++ b/yarn-project/pxe/src/hooks/index.ts
@@ -0,0 +1,6 @@
+export type {
+  AuthorizeUtilityCall,
+  UtilityCallAuthorizationRequest,
+  UtilityCallAuthorizationResponse,
+} from './authorize_utility_call.js';
+export type { ExecutionHooks } from './execution_hooks.js';
diff --git a/yarn-project/pxe/src/notes/note_service.test.ts b/yarn-project/pxe/src/notes/note_service.test.ts
index 667fc26f2cea..60f6dce5374c 100644
--- a/yarn-project/pxe/src/notes/note_service.test.ts
+++ b/yarn-project/pxe/src/notes/note_service.test.ts
@@ -15,6 +15,7 @@ import { type IndexedTxEffect, TxEffect, TxHash } from '@aztec/stdlib/tx';
 import { jest } from '@jest/globals';
 import { mock } from 'jest-mock-extended';
 
+import { NoteValidationRequest } from '../contract_function_simulator/noir-structs/note_validation_request.js';
 import { NoteStore } from '../storage/note_store/note_store.js';
 import { NoteService } from './note_service.js';
 
@@ -195,7 +196,7 @@ describe('NoteService', () => {
     expect(getNotesSpy).toHaveBeenCalledWith(expect.objectContaining({ contractAddress }), 'test');
   });
 
-  describe('validateAndStoreNote', () => {
+  describe('validateAndStoreNotes', () => {
     // Recipient is different from the owner because recipient refers to the
     // recipient of the message containing the note, while owner refers to the
     // owner of the note.
@@ -214,6 +215,8 @@ describe('NoteService', () => {
     let indexedTxEffect: IndexedTxEffect;
     let blockNumber: BlockNumber;
 
+    let buildRequest: (overrides?: Partial<NoteValidationRequest>) => NoteValidationRequest;
+
     // beforeEach sets up the happy path case, so error modes are tested
     // by minimally failing happy path conditions
     beforeEach(async () => {
@@ -244,34 +247,32 @@ describe('NoteService', () => {
 
       /* Happy path context conditions:
        ** - PXE is sync'd to _at least_ block including tx
-       ** - Node knows tx effect
+       ** - Node knows tx effect (passed in via the prefetched map)
        ** - Node knows unique note hash (and siloed nullifier if requested)
        */
       setSyncedBlockNumber(blockNumber);
 
-      aztecNode.getTxEffect.mockImplementation(queryTxHash =>
-        Promise.resolve(queryTxHash == txHash ? indexedTxEffect : undefined),
-      );
+      buildRequest = (overrides = {}) =>
+        new NoteValidationRequest(
+          overrides.contractAddress ?? contractAddress,
+          overrides.owner ?? owner,
+          overrides.storageSlot ?? storageSlot,
+          overrides.randomness ?? randomness,
+          overrides.noteNonce ?? noteNonce,
+          overrides.content ?? content,
+          overrides.noteHash ?? noteHash,
+          overrides.nullifier ?? nullifier,
+          overrides.txHash ?? txHash,
+        );
 
-      aztecNode.findLeavesIndexes.mockImplementation((_queryBlockParam, _treeId, _leaves) => {
-        // By default the note is not yet nullified.
-        return Promise.resolve([undefined]);
+      aztecNode.findLeavesIndexes.mockImplementation((_queryBlockParam, _treeId, leaves) => {
+        // By default the notes are not yet nullified.
+        return Promise.resolve(leaves.map(() => undefined));
       });
     });
 
     it('should store note if it exists in a tx effect', async () => {
-      await noteService.validateAndStoreNote(
-        contractAddress,
-        owner,
-        storageSlot,
-        randomness,
-        noteNonce,
-        content,
-        noteHash,
-        nullifier,
-        txHash,
-        recipient.address,
-      );
+      await noteService.validateAndStoreNotes([buildRequest()], recipient.address, defaultTxEffectsMap());
 
       // Verify note was stored
       const notes = await noteStore.getNotes({ contractAddress, scopes: [recipient.address] }, 'test');
@@ -292,34 +293,20 @@ describe('NoteService', () => {
 
     it('should throw if tx hash does not exist', async () => {
       await expect(
-        noteService.validateAndStoreNote(
-          contractAddress,
-          owner,
-          storageSlot,
-          randomness,
-          noteNonce,
-          content,
-          noteHash,
-          nullifier,
-          TxHash.random(),
+        noteService.validateAndStoreNotes(
+          [buildRequest({ txHash: TxHash.random() })],
           recipient.address,
+          defaultTxEffectsMap(),
         ),
       ).rejects.toThrow(/Could not find tx effect/);
     });
 
     it('should throw if note was not emitted in the tx', async () => {
       await expect(
-        noteService.validateAndStoreNote(
-          contractAddress,
-          owner,
-          storageSlot,
-          randomness,
-          noteNonce,
-          content,
-          Fr.random(), // note hash
-          nullifier,
-          txHash,
+        noteService.validateAndStoreNotes(
+          [buildRequest({ noteHash: Fr.random() })],
           recipient.address,
+          defaultTxEffectsMap(),
         ),
       ).rejects.toThrow(/is not present in tx/);
     });
@@ -328,45 +315,58 @@ describe('NoteService', () => {
       setSyncedBlockNumber(BlockNumber(blockNumber - 1));
 
       await expect(
-        noteService.validateAndStoreNote(
-          contractAddress,
-          owner,
-          storageSlot,
-          randomness,
-          noteNonce,
-          content,
-          noteHash,
-          nullifier,
-          txHash,
-          recipient.address,
-        ),
+        noteService.validateAndStoreNotes([buildRequest()], recipient.address, defaultTxEffectsMap()),
       ).rejects.toThrow(/Obtained a newer tx effect for .* for a note validation request than the anchor block/);
     });
 
+    it('should batch findLeavesIndexes across notes', async () => {
+      // Two notes from the same tx so we can reuse the indexedTxEffect; each carries its own unique note hash.
+      const otherNoteHash = Fr.random();
+      const otherNullifier = Fr.random();
+      const otherNoteNonce = Fr.random();
+      const otherUniqueNoteHash = await computeUniqueNoteHash(
+        otherNoteNonce,
+        await siloNoteHash(contractAddress, otherNoteHash),
+      );
+
+      const sharedTxEffect: IndexedTxEffect = {
+        ...indexedTxEffect,
+        data: TxEffect.from({
+          ...indexedTxEffect.data,
+          noteHashes: [uniqueNoteHash, otherUniqueNoteHash],
+        }),
+      };
+      const map = new Map([[txHash.toString(), sharedTxEffect]]);
+
+      await noteService.validateAndStoreNotes(
+        [
+          buildRequest(),
+          buildRequest({ noteHash: otherNoteHash, nullifier: otherNullifier, noteNonce: otherNoteNonce }),
+        ],
+        recipient.address,
+        map,
+      );
+
+      // Both notes should have been looked up in a single batched call.
+      expect(aztecNode.findLeavesIndexes).toHaveBeenCalledTimes(1);
+      const [, , leaves] = aztecNode.findLeavesIndexes.mock.calls[0];
+      expect(leaves).toHaveLength(2);
+    });
+
     it('should nullify note if nullifier index is found', async () => {
       const siloedNullifier = await siloNullifier(contractAddress, nullifier);
       const nullifierIndex = randomDataInBlock(123n);
 
       // Override the mock to return a nullifier index (indicating the note has been nullified)
       aztecNode.findLeavesIndexes.mockImplementation((_queryBlockNum, treeId, leaves) => {
-        if (treeId == MerkleTreeId.NULLIFIER_TREE && leaves[0].equals(siloedNullifier)) {
-          return Promise.resolve([nullifierIndex]);
-        }
-        return Promise.resolve([undefined]);
+        return Promise.resolve(
+          leaves.map(leaf =>
+            treeId == MerkleTreeId.NULLIFIER_TREE && leaf.equals(siloedNullifier) ? nullifierIndex : undefined,
+          ),
+        );
       });
 
-      await noteService.validateAndStoreNote(
-        contractAddress,
-        owner,
-        storageSlot,
-        randomness,
-        noteNonce,
-        content,
-        noteHash,
-        nullifier,
-        txHash,
-        recipient.address,
-      );
+      await noteService.validateAndStoreNotes([buildRequest()], recipient.address, defaultTxEffectsMap());
 
       const verifyNoteNullifiedInJobContext = async (jobId: string) => {
         // Now we verify that the note is stored as nullified by checking it can be retrieved only with
@@ -398,5 +398,9 @@ describe('NoteService', () => {
       await noteStore.commit('test');
       await verifyNoteNullifiedInJobContext('fresh-job');
     });
+
+    function defaultTxEffectsMap() {
+      return new Map([[txHash.toString(), indexedTxEffect]]);
+    }
   });
 });
diff --git a/yarn-project/pxe/src/notes/note_service.ts b/yarn-project/pxe/src/notes/note_service.ts
index bf839db370b8..7695d8614307 100644
--- a/yarn-project/pxe/src/notes/note_service.ts
+++ b/yarn-project/pxe/src/notes/note_service.ts
@@ -1,12 +1,14 @@
+import { chunk } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import type { DataInBlock } from '@aztec/stdlib/block';
+import { BlockHash, type DataInBlock } from '@aztec/stdlib/block';
 import { computeUniqueNoteHash, siloNoteHash, siloNullifier } from '@aztec/stdlib/hash';
 import { type AztecNode, MAX_RPC_LEN } from '@aztec/stdlib/interfaces/client';
 import { Note, NoteDao, NoteStatus } from '@aztec/stdlib/note';
 import { MerkleTreeId } from '@aztec/stdlib/trees';
-import type { BlockHeader, TxHash } from '@aztec/stdlib/tx';
+import type { BlockHeader, IndexedTxEffect } from '@aztec/stdlib/tx';
 
+import type { NoteValidationRequest } from '../contract_function_simulator/noir-structs/note_validation_request.js';
 import type { NoteStore } from '../storage/note_store/note_store.js';
 
 export class NoteService {
@@ -80,24 +82,7 @@ export class NoteService {
     }
 
     const nullifiersToCheck = contractNotes.map(note => note.siloedNullifier);
-    const nullifierBatches = nullifiersToCheck.reduce(
-      (acc, nullifier) => {
-        if (acc[acc.length - 1].length < MAX_RPC_LEN) {
-          acc[acc.length - 1].push(nullifier);
-        } else {
-          acc.push([nullifier]);
-        }
-        return acc;
-      },
-      [[]] as Fr[][],
-    );
-    const nullifierIndexes = (
-      await Promise.all(
-        nullifierBatches.map(batch =>
-          this.aztecNode.findLeavesIndexes(anchorBlockHash, MerkleTreeId.NULLIFIER_TREE, batch),
-        ),
-      )
-    ).flat();
+    const nullifierIndexes = await this.#findNullifierIndexes(anchorBlockHash, nullifiersToCheck);
 
     const foundNullifiers = nullifiersToCheck
       .map((nullifier, i) => {
@@ -110,30 +95,34 @@ export class NoteService {
     await this.noteStore.applyNullifiers(foundNullifiers, this.jobId);
   }
 
-  public async validateAndStoreNote(
-    contractAddress: AztecAddress,
-    owner: AztecAddress,
-    storageSlot: Fr,
-    randomness: Fr,
-    noteNonce: Fr,
-    content: Fr[],
-    noteHash: Fr,
-    nullifier: Fr,
-    txHash: TxHash,
+  /**
+   * Validates and stores a batch of notes against pre-fetched tx effects.
+   *
+   * For each request we must verify that:
+   *  - the note actually exists in the corresponding tx effect (and thus in the note hash tree), and
+   *  - the note has not already been nullified.
+   *
+   * Failing to do either would result in circuits getting either non-existent notes and failing to produce inclusion
+   * proofs for them, or getting nullified notes and producing duplicate nullifiers, both of which are catastrophic
+   * failure modes.
+   *
+   * Note that adding a note and removing it is *not* equivalent to never adding it in the first place. A nullifier
+   * emitted in a block that comes after note creation might result in the note being de-nullified by a chain reorg,
+   * so we must store both the note hash and nullifier block information.
+   *
+   * @param requests - The notes to validate and store.
+   * @param scope - The scope under which the notes are being stored.
+   * @param txEffects - Pre-fetched tx effects keyed by `TxHash.toString()`. Must contain entries for every request's
+   *                   txHash; missing entries are treated as a node bug and cause an error.
+   */
+  public async validateAndStoreNotes(
+    requests: NoteValidationRequest[],
     scope: AztecAddress,
+    txEffects: Map<string, IndexedTxEffect>,
   ): Promise<void> {
-    // We are going to store the new note in the NoteStore, which will let us later return it via `getNotes`.
-    // There's two things we need to check before we do this however:
-    //  - we must make sure the note does actually exist in the note hash tree
-    //  - we need to check if the note has already been nullified
-    //
-    // Failing to do either of the above would result in circuits getting either non-existent notes and failing to
-    // produce inclusion proofs for them, or getting nullified notes and producing duplicate nullifiers, both of which
-    // are catastrophic failure modes.
-    //
-    // Note that adding a note and removing it is *not* equivalent to never adding it in the first place. A nullifier
-    // emitted in a block that comes after note creation might result in the note being de-nullified by a chain reorg,
-    // so we must store both the note hash and nullifier block information.
+    if (requests.length === 0) {
+      return;
+    }
 
     // We avoid making node queries at 'latest' since we don't want to process notes or nullifiers that only exist ahead
     // in time of the locally synced state.
@@ -146,61 +135,96 @@ export class NoteService {
 
     // By computing siloed and unique note hashes ourselves we prevent contracts from interfering with the note storage
     // of other contracts, which would constitute a security breach.
-    const uniqueNoteHash = await computeUniqueNoteHash(noteNonce, await siloNoteHash(contractAddress, noteHash));
-    const siloedNullifier = await siloNullifier(contractAddress, nullifier);
-
-    const [txEffect, [nullifierIndex]] = await Promise.all([
-      this.aztecNode.getTxEffect(txHash),
-      this.aztecNode.findLeavesIndexes(anchorBlockHash, MerkleTreeId.NULLIFIER_TREE, [siloedNullifier]),
-    ]);
-    if (!txEffect) {
-      // We error out instead of just logging a warning and skipping the note because this would indicate a bug. This
-      // is because the node has already served info about this tx either when obtaining the log (TxScopedL2Log contain
-      // tx info) or when getting metadata for the offchain message (before the message got passed to `process_log`).
-      throw new Error(`Could not find tx effect for tx hash ${txHash} when processing a note.`);
-    }
+    const computed = await Promise.all(
+      requests.map(async ({ contractAddress, noteHash, nullifier, noteNonce }) => {
+        const [siloedNoteHash, siloedNullifier] = await Promise.all([
+          siloNoteHash(contractAddress, noteHash),
+          siloNullifier(contractAddress, nullifier),
+        ]);
+        const uniqueNoteHash = await computeUniqueNoteHash(noteNonce, siloedNoteHash);
+        return { uniqueNoteHash, siloedNullifier };
+      }),
+    );
 
-    if (txEffect.l2BlockNumber > anchorBlockNumber) {
-      // If the message was delivered onchain, this would indicate a bug: log sync should never load logs from blocks
-      // newer than the anchor block. If the note came via an offchain message, it would likely also be a bug, since we
-      // sync a new anchor block before calling `process_message`. For this not to be a bug, the message would need to
-      // come from a newer block than the anchor served by the node, implying the node isn't properly synced.
-      //     We therefore error out here rather than assuming the offchain message was constructed by a malicious
-      // sender with the intention of bricking recipient's PXE (if we assumed that we would just ignore the message).
-      throw new Error(
-        `Obtained a newer tx effect for ${txHash} for a note validation request than the anchor block ${anchorBlockNumber}. This is a bug as we should not ever be processing a note from a newer block than the anchor block.`,
+    const nullifierIndexes = await this.#findNullifierIndexes(
+      anchorBlockHash,
+      computed.map(c => c.siloedNullifier),
+    );
+
+    const noteDaos: NoteDao[] = [];
+    const foundNullifiers: DataInBlock<Fr>[] = [];
+
+    for (let i = 0; i < requests.length; i++) {
+      const { contractAddress, owner, storageSlot, randomness, noteNonce, content, noteHash, txHash } = requests[i];
+      const { uniqueNoteHash, siloedNullifier } = computed[i];
+      const nullifierIndex = nullifierIndexes[i];
+
+      const txEffect = txEffects.get(txHash.toString());
+      if (!txEffect) {
+        // We error out instead of just logging a warning and skipping the note because this would indicate a bug. This
+        // is because the node has already served info about this tx either when obtaining the log (TxScopedL2Log
+        // contain tx info) or when getting metadata for the offchain message (before the message got passed to
+        // `process_log`).
+        throw new Error(`Could not find tx effect for tx hash ${txHash} when processing a note.`);
+      }
+
+      if (txEffect.l2BlockNumber > anchorBlockNumber) {
+        // If the message was delivered onchain, this would indicate a bug: log sync should never load logs from blocks
+        // newer than the anchor block. If the note came via an offchain message, it would likely also be a bug, since
+        // we sync a new anchor block before calling `process_message`. For this not to be a bug, the message would
+        // need to come from a newer block than the anchor served by the node, implying the node isn't properly synced.
+        //     We therefore error out here rather than assuming the offchain message was constructed by a malicious
+        // sender with the intention of bricking recipient's PXE (if we assumed that we would just ignore the message).
+        throw new Error(
+          `Obtained a newer tx effect for ${txHash} for a note validation request than the anchor block ${anchorBlockNumber}. This is a bug as we should not ever be processing a note from a newer block than the anchor block.`,
+        );
+      }
+
+      // Find the index of the note hash in the noteHashes array to determine note ordering within the tx
+      const noteIndexInTx = txEffect.data.noteHashes.findIndex(nh => nh.equals(uniqueNoteHash));
+      if (noteIndexInTx === -1) {
+        // Similar to the comment above - we error out as this would indicate a bug in nonce discovery.
+        throw new Error(`Note hash ${noteHash} (uniqued as ${uniqueNoteHash}) is not present in tx ${txHash}`);
+      }
+
+      noteDaos.push(
+        new NoteDao(
+          new Note(content),
+          contractAddress,
+          owner,
+          storageSlot,
+          randomness,
+          noteNonce,
+          noteHash,
+          siloedNullifier,
+          txHash,
+          txEffect.l2BlockNumber,
+          txEffect.l2BlockHash.toString(),
+          txEffect.txIndexInBlock,
+          noteIndexInTx,
+        ),
       );
-    }
 
-    // Find the index of the note hash in the noteHashes array to determine note ordering within the tx
-    const noteIndexInTx = txEffect.data.noteHashes.findIndex(nh => nh.equals(uniqueNoteHash));
-    if (noteIndexInTx === -1) {
-      // Similar to the comment above - we error out as this would indicate a bug in nonce discovery.
-      throw new Error(`Note hash ${noteHash} (uniqued as ${uniqueNoteHash}) is not present in tx ${txHash}`);
+      if (nullifierIndex !== undefined) {
+        // We found a nullifier index which implies that the note has already been nullified.
+        const { data: _, ...blockHashAndNum } = nullifierIndex;
+        foundNullifiers.push({ data: siloedNullifier, ...blockHashAndNum });
+      }
     }
 
-    const noteDao = new NoteDao(
-      new Note(content),
-      contractAddress,
-      owner,
-      storageSlot,
-      randomness,
-      noteNonce,
-      noteHash,
-      siloedNullifier,
-      txHash,
-      txEffect.l2BlockNumber,
-      txEffect.l2BlockHash.toString(),
-      txEffect.txIndexInBlock,
-      noteIndexInTx,
-    );
-
-    await this.noteStore.addNotes([noteDao], scope, this.jobId);
+    await this.noteStore.addNotes(noteDaos, scope, this.jobId);
 
-    if (nullifierIndex !== undefined) {
-      // We found nullifier index which implies that the note has already been nullified.
-      const { data: _, ...blockHashAndNum } = nullifierIndex;
-      await this.noteStore.applyNullifiers([{ data: siloedNullifier, ...blockHashAndNum }], this.jobId);
+    if (foundNullifiers.length > 0) {
+      await this.noteStore.applyNullifiers(foundNullifiers, this.jobId);
     }
   }
+
+  async #findNullifierIndexes(anchorBlockHash: BlockHash, siloedNullifiers: Fr[]) {
+    const batches = chunk(siloedNullifiers, MAX_RPC_LEN);
+    return (
+      await Promise.all(
+        batches.map(batch => this.aztecNode.findLeavesIndexes(anchorBlockHash, MerkleTreeId.NULLIFIER_TREE, batch)),
+      )
+    ).flat();
+  }
 }
diff --git a/yarn-project/pxe/src/oracle_version.ts b/yarn-project/pxe/src/oracle_version.ts
index d4a0bfbbfc5e..58e6fed79bdc 100644
--- a/yarn-project/pxe/src/oracle_version.ts
+++ b/yarn-project/pxe/src/oracle_version.ts
@@ -11,7 +11,7 @@
 /// if AZTEC_NR_MINOR > PXE_MINOR because if a contract is updated to use a newer Aztec.nr dependency without actually
 /// using any of the new oracles then there is no reason to throw.
 export const ORACLE_VERSION_MAJOR = 22;
-export const ORACLE_VERSION_MINOR = 1;
+export const ORACLE_VERSION_MINOR = 2;
 
 /// This hash is computed from the Oracle interface and is used to detect when that interface changes. When it does,
 /// you need to either:
@@ -19,4 +19,4 @@ export const ORACLE_VERSION_MINOR = 1;
 /// - increment only `ORACLE_VERSION_MINOR` if the change is additive (a new oracle was added).
 ///
 /// These constants must be kept in sync between this file and `noir-projects/aztec-nr/aztec/src/oracle/version.nr`.
-export const ORACLE_INTERFACE_HASH = 'efafa0db2cc1f94e26d794d0079c8f71115261df0c3d0fa8cb5b64f17a12db92';
+export const ORACLE_INTERFACE_HASH = '193fe3f9fee6a84d26803e636c9746dd805a4f389d44a0618de75c2c5eb4912e';
diff --git a/yarn-project/pxe/src/pxe.test.ts b/yarn-project/pxe/src/pxe.test.ts
index b9d62d25b4bb..311716cd32e2 100644
--- a/yarn-project/pxe/src/pxe.test.ts
+++ b/yarn-project/pxe/src/pxe.test.ts
@@ -183,6 +183,7 @@ describe('PXE', () => {
         globalVariables,
       });
       node.getBlockHeader.mockResolvedValue(blockHeader);
+      node.getBlock.mockResolvedValue({ header: blockHeader } as any);
 
       // Mock getL2Tips which is needed for syncing tagged logs
       const tipId = {
diff --git a/yarn-project/pxe/src/pxe.ts b/yarn-project/pxe/src/pxe.ts
index 427587a6c693..5c678f8cacfe 100644
--- a/yarn-project/pxe/src/pxe.ts
+++ b/yarn-project/pxe/src/pxe.ts
@@ -6,7 +6,6 @@ import { SerialQueue } from '@aztec/foundation/queue';
 import { Timer } from '@aztec/foundation/timer';
 import { KeyStore } from '@aztec/key-store';
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
-import { L2TipsKVStore } from '@aztec/kv-store/stores';
 import { type ProtocolContractsProvider, protocolContractNames } from '@aztec/protocol-contracts';
 import type { CircuitSimulator } from '@aztec/simulator/client';
 import {
@@ -18,7 +17,7 @@ import {
 } from '@aztec/stdlib/abi';
 import type { AuthWitness } from '@aztec/stdlib/auth-witness';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import type { L2TipsProvider } from '@aztec/stdlib/block';
+import { GENESIS_BLOCK_HEADER_HASH, type L2TipsProvider } from '@aztec/stdlib/block';
 import {
   CompleteAddress,
   type ContractInstanceWithAddress,
@@ -67,6 +66,7 @@ import { readCurrentClassId } from './contract_sync/helpers.js';
 import { PXEDebugUtils } from './debug/pxe_debug_utils.js';
 import { enrichPublicSimulationError, enrichSimulationError } from './error_enriching.js';
 import { PrivateEventFilterValidator } from './events/private_event_filter_validator.js';
+import type { ExecutionHooks } from './hooks/index.js';
 import { JobCoordinator } from './job_coordinator/job_coordinator.js';
 import { MessageContextService } from './messages/message_context_service.js';
 import {
@@ -79,6 +79,7 @@ import { AnchorBlockStore } from './storage/anchor_block_store/anchor_block_stor
 import { CapsuleStore } from './storage/capsule_store/capsule_store.js';
 import { ContractStore } from './storage/contract_store/contract_store.js';
 import { NoteStore } from './storage/note_store/note_store.js';
+import { openPxeStores } from './storage/open_pxe_stores.js';
 import { PrivateEventStore } from './storage/private_event_store/private_event_store.js';
 import { RecipientTaggingStore } from './storage/tagging_store/recipient_tagging_store.js';
 import { SenderAddressBookStore } from './storage/tagging_store/sender_address_book_store.js';
@@ -119,7 +120,11 @@ export type SimulateTxOpts = {
   skipFeeEnforcement?: boolean;
   /** If true, kernel logic is emulated in TS for simulation */
   skipKernels?: boolean;
-  /** State overrides for the simulation, such as contract instances and artifacts. Requires skipKernels: true */
+  /**
+   * Pre-simulation overrides applied to the ephemeral fork and contract DB. Bundles publicStorage
+   * writes (no skipKernels required) and per-address (instance, artifact?) overrides used by both
+   * AVM-side public dispatch and PXE-side ACIR private dispatch (requires skipKernels: true).
+   */
   overrides?: SimulationOverrides;
   /** Addresses whose private state and keys are accessible during private execution */
   scopes: AztecAddress[];
@@ -151,6 +156,8 @@ export type PXECreateArgs = {
   config: PXEConfig;
   /** Optional logger instance or string suffix for the logger name. */
   loggerOrSuffix?: string | Logger;
+  /** Optional hooks to observe and influence contract execution. */
+  hooks?: ExecutionHooks;
 };
 
 /**
@@ -183,6 +190,7 @@ export class PXE {
     private jobQueue: SerialQueue,
     private jobCoordinator: JobCoordinator,
     public debug: PXEDebugUtils,
+    private hooks: ExecutionHooks | undefined,
   ) {}
 
   /**
@@ -200,6 +208,7 @@ export class PXE {
     protocolContractsProvider,
     config,
     loggerOrSuffix,
+    hooks,
   }: PXECreateArgs) {
     // Extract bindings from the logger, or use empty bindings if a string suffix is provided.
     const bindings: LoggerBindings | undefined =
@@ -212,18 +221,28 @@ export class PXE {
 
     const info = await node.getNodeInfo();
 
+    // Source the genesis block hash from the node so PXE's L2BlockStream agrees with the node's
+    // archiver on the dynamic initial header hash. Without this the tip store would fall back to
+    // the static `GENESIS_BLOCK_HEADER_HASH` constant, which only matches deployments with the
+    // default empty genesis (timestamp 0, no prefilled public data) and diverges otherwise — the
+    // sync at block 0 would then get stuck in `areBlockHashesEqualAt` and abort. If the node does
+    // not return a genesis block (older node or test fixture) we fall back to the static constant.
+    const initialBlockHash = (await node.getBlock(BlockNumber.ZERO))?.hash ?? GENESIS_BLOCK_HEADER_HASH;
+
     const proverEnabled = config.proverEnabled !== undefined ? config.proverEnabled : info.realProofs;
-    const addressStore = new AddressStore(store);
-    const privateEventStore = new PrivateEventStore(store);
-    const contractStore = new ContractStore(store);
-    const noteStore = new NoteStore(store);
-    const anchorBlockStore = new AnchorBlockStore(store);
-    const senderTaggingStore = new SenderTaggingStore(store);
-    const senderAddressBookStore = new SenderAddressBookStore(store);
-    const recipientTaggingStore = new RecipientTaggingStore(store);
-    const capsuleStore = new CapsuleStore(store);
-    const keyStore = new KeyStore(store);
-    const tipsStore = new L2TipsKVStore(store, 'pxe');
+    const {
+      addressStore,
+      privateEventStore,
+      contractStore,
+      noteStore,
+      anchorBlockStore,
+      senderTaggingStore,
+      senderAddressBookStore,
+      recipientTaggingStore,
+      capsuleStore,
+      keyStore,
+      l2TipsStore,
+    } = openPxeStores(store, initialBlockHash);
     const contractSyncService = new ContractSyncService(
       node,
       contractStore,
@@ -238,7 +257,7 @@ export class PXE {
       anchorBlockStore,
       noteStore,
       privateEventStore,
-      tipsStore,
+      l2TipsStore,
       contractSyncService,
       config,
       bindings,
@@ -274,7 +293,7 @@ export class PXE {
       privateEventStore,
       contractSyncService,
       messageContextService,
-      tipsStore,
+      l2TipsStore,
       simulator,
       proverEnabled,
       proofCreator,
@@ -283,6 +302,7 @@ export class PXE {
       jobQueue,
       jobCoordinator,
       debugUtils,
+      hooks,
     );
 
     debugUtils.setPXEHelpers(
@@ -318,6 +338,7 @@ export class PXE {
       simulator: this.simulator,
       contractSyncService: this.contractSyncService,
       messageContextService: this.messageContextService,
+      hooks: this.hooks,
     });
   }
 
@@ -467,11 +488,11 @@ export class PXE {
    * It can also be used for estimating gas in the future.
    * @param tx - The transaction to be simulated.
    */
-  async #simulatePublicCalls(tx: Tx, skipFeeEnforcement: boolean) {
+  async #simulatePublicCalls(tx: Tx, skipFeeEnforcement: boolean, overrides?: SimulationOverrides) {
     // Simulating public calls can throw if the TX fails in a phase that doesn't allow reverts (setup)
     // Or return as reverted if it fails in a phase that allows reverts (app logic, teardown)
     try {
-      const result = await this.node.simulatePublicCalls(tx, skipFeeEnforcement);
+      const result = await this.node.simulatePublicCalls(tx, skipFeeEnforcement, overrides);
       if (result.revertReason) {
         throw result.revertReason;
       }
@@ -1037,7 +1058,7 @@ export class PXE {
         let publicOutput: PublicSimulationOutput | undefined;
         if (simulatePublic && publicInputs.forPublic) {
           const publicSimulationTimer = new Timer();
-          publicOutput = await this.#simulatePublicCalls(simulatedTx, skipFeeEnforcement);
+          publicOutput = await this.#simulatePublicCalls(simulatedTx, skipFeeEnforcement, overrides);
           publicSimulationTime = publicSimulationTimer.ms();
           if (publicOutput?.debugLogs?.length) {
             await displayDebugLogs(publicOutput.debugLogs, addr => this.contractStore.getDebugContractName(addr));
diff --git a/yarn-project/pxe/src/storage/backwards_compatibility_tests/__snapshots__/AddressStore.json b/yarn-project/pxe/src/storage/backwards_compatibility_tests/__snapshots__/AddressStore.json
new file mode 100644
index 000000000000..f2e80f8f02f2
--- /dev/null
+++ b/yarn-project/pxe/src/storage/backwards_compatibility_tests/__snapshots__/AddressStore.json
@@ -0,0 +1,22 @@
+{
+  "complete_addresses": [
+    {
+      "index": 0,
+      "value": "0e097c323e48522fcbd592590a72a0d4e50f22b3fb1913d19c936439ab74851a214c7a24ddf501afc8734c7379ee502296289eb24cd8cd03cd435e128c06be0000987721e0963b4a5bd81ee862e2740d8849fd90537569064d3d3a4640e858d219e95c05f09cb86d1a6257572f9082ca15d4a02373c4d8c9cee23dc61a4c2a882f9017d51bca6616102d8a1d4dba89e4ce12881a2414576f01d2fec9492814a22c19ff0b089b07da436e6f7be6b26cdc17b9cee504a528c071ef6a416299683d0b369479d6e50504702d0b56bb56e4e8e0e77171429896651d0c11621e82ebc32fcdd0d194adafd753dc0ed279f5cfb54ddcce1dd581d4631cf343ba9ee6c1ab2858abca6c00da3def156b1f12a6464384e326d5fa724c2fc2ff2b7f3fc8ad5f0000000000000000000000000000000000000000000000000000000000000003"
+    },
+    {
+      "index": 1,
+      "value": "2bc83a7fe553d4b649228410040c130a782f86f9b54813f4d847d0c3eeba065a156832f7840991767f448681237ef8bce6895fc79e5d9d0dedd89dccfd9d59ce215403719ea86d38909507bba0ba2d191f72dc1991a5dfc17da8bf7e8c1f1f4f267e526a2e6e9adf6a026989be005bd50d1aea76d20816b9843bc95557696f9f16c3eb259ba3e3eb27b7fe3abc36e87923990bf5c265cb0d57790eda2a4432f1237296442bbb36cc3632af0578ad4b7d5d69d52e05937a1d3e2fe295ac9af98628737df05bb727d77dd52691d42566eb22e529f9f404a2f9bc2e1982956ba09c1df52a95111bd76680a4356951e68a20c3e51cbddb7d1536c572b416bd342e3204aa15eaf393bb18695ddee077d52be6489ed510f357a90003099ce337e6232c0000000000000000000000000000000000000000000000000000000000000007"
+    }
+  ],
+  "complete_address_index": [
+    {
+      "key": "utf8:0x0e097c323e48522fcbd592590a72a0d4e50f22b3fb1913d19c936439ab74851a",
+      "value": "num:0"
+    },
+    {
+      "key": "utf8:0x2bc83a7fe553d4b649228410040c130a782f86f9b54813f4d847d0c3eeba065a",
+      "value": "num:1"
+    }
+  ]
+}
diff --git a/yarn-project/pxe/src/storage/backwards_compatibility_tests/__snapshots__/AnchorBlockStore.json b/yarn-project/pxe/src/storage/backwards_compatibility_tests/__snapshots__/AnchorBlockStore.json
new file mode 100644
index 000000000000..2d2256e6e58b
--- /dev/null
+++ b/yarn-project/pxe/src/storage/backwards_compatibility_tests/__snapshots__/AnchorBlockStore.json
@@ -0,0 +1,3 @@
+{
+  "header": "000000000000000000000000000000000000000000000000000000000000000200000003000000000000000000000000000000000000000000000000000000000000000500000007000000000000000000000000000000000000000000000000000000000000000b0000000d00000000000000000000000000000000000000000000000000000000000000110000001300000000000000000000000000000000000000000000000000000000000000170000001d000000000000000000000000000000000000000000000000000000000000001f000000000000000000000000000000000000000000000000000000000000002500000000000000000000000000000000000000000000000000000000000000290000002b0000002f0000000000000035000000000000000000000000000000000000003b000000000000000000000000000000000000000000000000000000000000003d00000000000000000000000000000043000000000000000000000000000000470000000000000000000000000000000000000000000000000000000000000049000000000000000000000000000000000000000000000000000000000000004f"
+}
diff --git a/yarn-project/pxe/src/storage/backwards_compatibility_tests/__snapshots__/CapsuleStore.json b/yarn-project/pxe/src/storage/backwards_compatibility_tests/__snapshots__/CapsuleStore.json
new file mode 100644
index 000000000000..b0f0358fdcb9
--- /dev/null
+++ b/yarn-project/pxe/src/storage/backwards_compatibility_tests/__snapshots__/CapsuleStore.json
@@ -0,0 +1,16 @@
+{
+  "capsules": [
+    {
+      "key": "utf8:0x0000000000000000000000000000000000000000000000000000000000000002:0x0000000000000000000000000000000000000000000000000000000000000003:0x0000000000000000000000000000000000000000000000000000000000000005",
+      "value": "0000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000000b"
+    },
+    {
+      "key": "utf8:0x0000000000000000000000000000000000000000000000000000000000000002:0x0000000000000000000000000000000000000000000000000000000000000003:0x000000000000000000000000000000000000000000000000000000000000000d",
+      "value": "0000000000000000000000000000000000000000000000000000000000000011"
+    },
+    {
+      "key": "utf8:0x0000000000000000000000000000000000000000000000000000000000000002:0x0000000000000000000000000000000000000000000000000000000000000003:0x0000000000000000000000000000000000000000000000000000000000000013",
+      "value": ""
+    }
+  ]
+}
diff --git a/yarn-project/pxe/src/storage/backwards_compatibility_tests/__snapshots__/ContractStore.json b/yarn-project/pxe/src/storage/backwards_compatibility_tests/__snapshots__/ContractStore.json
new file mode 100644
index 000000000000..6de71bb8c2e4
--- /dev/null
+++ b/yarn-project/pxe/src/storage/backwards_compatibility_tests/__snapshots__/ContractStore.json
@@ -0,0 +1,28 @@
+{
+  "contract_artifacts": [
+    {
+      "key": "utf8:0x0000000000000000000000000000000000000000000000000000000000000002",
+      "value": "7b226e616d65223a22536368656d6146697874757265436f6e7472616374222c22617a74656356657273696f6e223a22736368656d612d666978747572652d76657273696f6e222c2266756e6374696f6e73223a5b7b226e616d65223a22707269766174655f666e222c2266756e6374696f6e54797065223a2270726976617465222c2269734f6e6c7953656c66223a66616c73652c226973537461746963223a66616c73652c226973496e697469616c697a6572223a747275652c22706172616d6574657273223a5b7b226e616d65223a226669727374222c2274797065223a7b226b696e64223a226669656c64227d2c227669736962696c697479223a2270726976617465227d2c7b226e616d65223a227365636f6e64222c2274797065223a7b226b696e64223a22696e7465676572222c227369676e223a22756e7369676e6564222c227769647468223a33327d2c227669736962696c697479223a227075626c6963227d5d2c2272657475726e5479706573223a5b7b226b696e64223a22626f6f6c65616e227d5d2c226572726f725479706573223a7b22736368656d615f746573745f6572726f72223a7b226572726f725f6b696e64223a22737472696e67222c22737472696e67223a22666978656420736368656d612d74657374206572726f72227d7d2c2262797465636f6465223a2241674d4642773d3d222c22646562756753796d626f6c73223a22736368656d612d666978747572652d6465627567227d5d2c226e6f6e44697370617463685075626c696346756e6374696f6e73223a5b7b226e616d65223a227075626c69635f666e222c2266756e6374696f6e54797065223a227075626c6963222c2269734f6e6c7953656c66223a747275652c226973537461746963223a747275652c226973496e697469616c697a6572223a66616c73652c22706172616d6574657273223a5b5d2c2272657475726e5479706573223a5b5d2c226572726f725479706573223a7b7d7d5d2c226f757470757473223a7b2273747275637473223a7b226d795f737472756374223a5b7b226b696e64223a226669656c64227d2c7b226b696e64223a22626f6f6c65616e227d5d7d2c22676c6f62616c73223a7b7d7d2c2273746f726167654c61796f7574223a7b226d795f6669656c64223a7b22736c6f74223a22307830303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303062227d7d2c2266696c654d6170223a7b2231223a7b22736f75726365223a22736368656d61206669787475726520736f75726365222c2270617468223a227372632f736368656d615f666978747572652e6e72222c2266756e6374696f6e5f6c6f636174696f6e73223a5b5d7d7d7d"
+    },
+    {
+      "key": "utf8:0x0000000000000000000000000000000000000000000000000000000000000017",
+      "value": "7b226e616d65223a22536368656d6146697874757265436f6e7472616374222c22617a74656356657273696f6e223a22736368656d612d666978747572652d76657273696f6e222c2266756e6374696f6e73223a5b7b226e616d65223a22707269766174655f666e222c2266756e6374696f6e54797065223a2270726976617465222c2269734f6e6c7953656c66223a66616c73652c226973537461746963223a66616c73652c226973496e697469616c697a6572223a747275652c22706172616d6574657273223a5b7b226e616d65223a226669727374222c2274797065223a7b226b696e64223a226669656c64227d2c227669736962696c697479223a2270726976617465227d2c7b226e616d65223a227365636f6e64222c2274797065223a7b226b696e64223a22696e7465676572222c227369676e223a22756e7369676e6564222c227769647468223a33327d2c227669736962696c697479223a227075626c6963227d5d2c2272657475726e5479706573223a5b7b226b696e64223a22626f6f6c65616e227d5d2c226572726f725479706573223a7b22736368656d615f746573745f6572726f72223a7b226572726f725f6b696e64223a22737472696e67222c22737472696e67223a22666978656420736368656d612d74657374206572726f72227d7d2c2262797465636f6465223a2241674d4642773d3d222c22646562756753796d626f6c73223a22736368656d612d666978747572652d6465627567227d5d2c226e6f6e44697370617463685075626c696346756e6374696f6e73223a5b7b226e616d65223a227075626c69635f666e222c2266756e6374696f6e54797065223a227075626c6963222c2269734f6e6c7953656c66223a747275652c226973537461746963223a747275652c226973496e697469616c697a6572223a66616c73652c22706172616d6574657273223a5b5d2c2272657475726e5479706573223a5b5d2c226572726f725479706573223a7b7d7d5d2c226f757470757473223a7b2273747275637473223a7b226d795f737472756374223a5b7b226b696e64223a226669656c64227d2c7b226b696e64223a22626f6f6c65616e227d5d7d2c22676c6f62616c73223a7b7d7d2c2273746f726167654c61796f7574223a7b226d795f6669656c64223a7b22736c6f74223a22307830303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303062227d7d2c2266696c654d6170223a7b2231223a7b22736f75726365223a22736368656d61206669787475726520736f75726365222c2270617468223a227372632f736368656d615f666978747572652e6e72222c2266756e6374696f6e5f6c6f636174696f6e73223a5b5d7d7d7d"
+    }
+  ],
+  "contract_classes": [
+    {
+      "key": "utf8:0x0000000000000000000000000000000000000000000000000000000000000002",
+      "value": "010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000007000000020000000b000000000000000000000000000000000000000000000000000000000000000d000000110000000000000000000000000000000000000000000000000000000000000013"
+    },
+    {
+      "key": "utf8:0x0000000000000000000000000000000000000000000000000000000000000017",
+      "value": "010000000000000000000000000000000000000000000000000000000000000017000000000000000000000000000000000000000000000000000000000000001d000000000000000000000000000000000000000000000000000000000000001f000000000000000000000000000000000000000000000000000000000000002500000000"
+    }
+  ],
+  "contracts_instances": [
+    {
+      "key": "utf8:0x0000000000000000000000000000000000000000000000000000000000000065",
+      "value": "010000000000000000000000000000000000000000000000000000000000000049000000000000000000000000000000000000000000000000000000000000004f0000000000000000000000000000000000000000000000000000000000000053000000000000000000000000000000000000000000000000000000000000005900000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000029000000000000000000000000000000000000000000000000000000000000002b000000000000000000000000000000000000000000000000000000000000002f0000000000000000000000000000000000000000000000000000000000000035000000000000000000000000000000000000000000000000000000000000003b000000000000000000000000000000000000000000000000000000000000003d00000000000000000000000000000000000000000000000000000000000000430000000000000000000000000000000000000000000000000000000000000047"
+    }
+  ]
+}
diff --git a/yarn-project/pxe/src/storage/backwards_compatibility_tests/__snapshots__/KeyStore.json b/yarn-project/pxe/src/storage/backwards_compatibility_tests/__snapshots__/KeyStore.json
new file mode 100644
index 000000000000..7164be86011a
--- /dev/null
+++ b/yarn-project/pxe/src/storage/backwards_compatibility_tests/__snapshots__/KeyStore.json
@@ -0,0 +1,52 @@
+{
+  "key_store": [
+    {
+      "key": "utf8:0x0e097c323e48522fcbd592590a72a0d4e50f22b3fb1913d19c936439ab74851a-ivpk_m",
+      "value": "19e95c05f09cb86d1a6257572f9082ca15d4a02373c4d8c9cee23dc61a4c2a882f9017d51bca6616102d8a1d4dba89e4ce12881a2414576f01d2fec9492814a2"
+    },
+    {
+      "key": "utf8:0x0e097c323e48522fcbd592590a72a0d4e50f22b3fb1913d19c936439ab74851a-ivpk_m_hash",
+      "value": "2c8a04047c06c447dcf1011ddd80c1d03dc9f70a5fa4645722d086fe82504d76"
+    },
+    {
+      "key": "utf8:0x0e097c323e48522fcbd592590a72a0d4e50f22b3fb1913d19c936439ab74851a-ivsk_m",
+      "value": "1fb01c42d1aaa2662041b899c77cb19e08192193acc5a94405f1b43c974eba7a"
+    },
+    {
+      "key": "utf8:0x0e097c323e48522fcbd592590a72a0d4e50f22b3fb1913d19c936439ab74851a-nhk_m",
+      "value": "2dd30220767969b10044b1322585bb4c4df4e0c5d9b4d7b3045a879a8e3e91d2"
+    },
+    {
+      "key": "utf8:0x0e097c323e48522fcbd592590a72a0d4e50f22b3fb1913d19c936439ab74851a-npk_m",
+      "value": "214c7a24ddf501afc8734c7379ee502296289eb24cd8cd03cd435e128c06be0000987721e0963b4a5bd81ee862e2740d8849fd90537569064d3d3a4640e858d2"
+    },
+    {
+      "key": "utf8:0x0e097c323e48522fcbd592590a72a0d4e50f22b3fb1913d19c936439ab74851a-npk_m_hash",
+      "value": "0df588690e44b50e4ca694d25b494039b60f09451eaea7aaba97bd4cf8001710"
+    },
+    {
+      "key": "utf8:0x0e097c323e48522fcbd592590a72a0d4e50f22b3fb1913d19c936439ab74851a-ovpk_m",
+      "value": "2c19ff0b089b07da436e6f7be6b26cdc17b9cee504a528c071ef6a416299683d0b369479d6e50504702d0b56bb56e4e8e0e77171429896651d0c11621e82ebc3"
+    },
+    {
+      "key": "utf8:0x0e097c323e48522fcbd592590a72a0d4e50f22b3fb1913d19c936439ab74851a-ovpk_m_hash",
+      "value": "2cbd8a987ad7dc81814feabc55abdf40b810161611ad89b705db92f32cf94603"
+    },
+    {
+      "key": "utf8:0x0e097c323e48522fcbd592590a72a0d4e50f22b3fb1913d19c936439ab74851a-ovsk_m",
+      "value": "279fe6ef7dd2477b919327b1ebab7497c41b9a7ccfa9d5d52e32698e3b85293b"
+    },
+    {
+      "key": "utf8:0x0e097c323e48522fcbd592590a72a0d4e50f22b3fb1913d19c936439ab74851a-tpk_m",
+      "value": "2fcdd0d194adafd753dc0ed279f5cfb54ddcce1dd581d4631cf343ba9ee6c1ab2858abca6c00da3def156b1f12a6464384e326d5fa724c2fc2ff2b7f3fc8ad5f"
+    },
+    {
+      "key": "utf8:0x0e097c323e48522fcbd592590a72a0d4e50f22b3fb1913d19c936439ab74851a-tpk_m_hash",
+      "value": "2a0b3526801cd5edcaf6b4ba6e1f0a378b6d78d42a62410e86202fb66b44dd53"
+    },
+    {
+      "key": "utf8:0x0e097c323e48522fcbd592590a72a0d4e50f22b3fb1913d19c936439ab74851a-tsk_m",
+      "value": "183cb61099458d1564aa57c90c7091ac623a14092ab314150c9cfbb416810320"
+    }
+  ]
+}
diff --git a/yarn-project/pxe/src/storage/backwards_compatibility_tests/__snapshots__/L2TipsKVStore.json b/yarn-project/pxe/src/storage/backwards_compatibility_tests/__snapshots__/L2TipsKVStore.json
new file mode 100644
index 000000000000..bce86863558b
--- /dev/null
+++ b/yarn-project/pxe/src/storage/backwards_compatibility_tests/__snapshots__/L2TipsKVStore.json
@@ -0,0 +1,46 @@
+{
+  "pxe_l2_tips": [
+    {
+      "key": "utf8:checkpointed",
+      "value": "num:71"
+    },
+    {
+      "key": "utf8:proposed",
+      "value": "num:179"
+    },
+    {
+      "key": "utf8:proposedCheckpoint",
+      "value": "num:71"
+    },
+    {
+      "key": "utf8:proven",
+      "value": "num:79"
+    }
+  ],
+  "pxe_l2_block_hashes": [
+    {
+      "key": "num:179",
+      "value": "utf8:0x10547c3c23be9d4208cc6d60355ca61c35bd612ace129984ed97a6cc4ec007f8"
+    },
+    {
+      "key": "num:71",
+      "value": "utf8:0x0000000000000000000000000000000000000000000000000000000000000049"
+    },
+    {
+      "key": "num:79",
+      "value": "utf8:0x0000000000000000000000000000000000000000000000000000000000000053"
+    }
+  ],
+  "pxe_l2_block_number_to_checkpoint_number": [
+    {
+      "key": "num:179",
+      "value": "num:47"
+    }
+  ],
+  "pxe_l2_checkpoint_store": [
+    {
+      "key": "num:47",
+      "value": "00000000000000000000000000000000000000000000000000000000000000020000000300000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000001100000000000000000000000000000000000000000000000000000000000000130000000000000017000000000000000000000000000000000000001d000000000000000000000000000000000000000000000000000000000000001f0000000000000000000000000000002500000000000000000000000000000029000000000000000000000000000000000000000000000000000000000000002b00000001000000000000000000000000000000000000000000000000000000000000006b0000006d00000000000000000000000000000000000000000000000000000000000000710000007f000000000000000000000000000000000000000000000000000000000000008300000089000000000000000000000000000000000000000000000000000000000000008b0000009500000000000000000000000000000000000000000000000000000000000000970000009d00000000000000000000000000000000000000000000000000000000000000a300000000000000000000000000000000000000000000000000000000000000a700000000000000000000000000000000000000000000000000000000000000ad000000b3000000b500000000000000bf00000000000000000000000000000000000000c100000000000000000000000000000000000000000000000000000000000000c5000000000000000000000000000000c7000000000000000000000000000000d300000000000000000000000000000000000000000000000000000000000000df00000000000000000000000000000000000000000000000000000000000000e3000000000000000000000000000000000000000000000000000000000000006500000067000000010100000000000000000000000000000000000000000000000000000000000000e500000000000000000000000000000000000000000000000000000000000000e90100000000000000000000000000000000000000000000000000000000000000ef0100000000000000000000000000000000000000000000000000000000000000f10100000000000000000000000000000000000000000000000000000000000000fb010000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000010701000000000000000000000000000000000000000000000000000000000000010d000000000000000000000000000000000000000000000000000000000000010f000000000000000000000000000000000000000000000000000000000000011500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000001000000020000000000000000000000000000000000000000000000000000000000000119000000000000000000000000000000000000000000000000000000000000011b000000000000000000000000000000000000000000000000000000000000012501000000000000000000000000000000000000000000000000000000000000013300000000000000000000000000000000000000000000000000000000000001370000000000000000000000000000000000000000000000000000000000000139000000000000000000000000000000000000000000000000000000000000013d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030000014b000001510000002f0000000000000000000000000000000000000000000000000000000000000035000000000000000000000000000000000000000000000000000000000000003b00000042307830303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303433000000000000000000000000000000000000000000000000000000000000003d00000000"
+    }
+  ]
+}
diff --git a/yarn-project/pxe/src/storage/backwards_compatibility_tests/__snapshots__/NoteStore.json b/yarn-project/pxe/src/storage/backwards_compatibility_tests/__snapshots__/NoteStore.json
new file mode 100644
index 000000000000..dc4a40d11227
--- /dev/null
+++ b/yarn-project/pxe/src/storage/backwards_compatibility_tests/__snapshots__/NoteStore.json
@@ -0,0 +1,36 @@
+{
+  "notes": [
+    {
+      "key": "utf8:0x000000000000000000000000000000000000000000000000000000000000002b",
+      "value": "00000003000000000000000000000000000000000000000000000000000000000000000d0000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000001300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000017000000000000000000000000000000000000000000000000000000000000001d000000000000000000000000000000000000000000000000000000000000001f00000000000000000000000000000000000000000000000000000000000000250000000000000000000000000000000000000000000000000000000000000029000000000000000000000000000000000000000000000000000000000000002b000000000000000000000000000000000000000000000000000000000000002f00000035000000000000000000000000000000000000000000000000000000000000003b0000003d0000004300000002000000423078303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030350000004230783030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303700000000"
+    },
+    {
+      "key": "utf8:0x000000000000000000000000000000000000000000000000000000000000006b",
+      "value": "0000000300000000000000000000000000000000000000000000000000000000000000470000000000000000000000000000000000000000000000000000000000000049000000000000000000000000000000000000000000000000000000000000004f000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000530000000000000000000000000000000000000000000000000000000000000059000000000000000000000000000000000000000000000000000000000000006100000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000067000000000000000000000000000000000000000000000000000000000000006b000000000000000000000000000000000000000000000000000000000000006d00000071000000000000000000000000000000000000000000000000000000000000007f0000008300000089000000010000004230783030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303500000000"
+    },
+    {
+      "key": "utf8:0x00000000000000000000000000000000000000000000000000000000000000b5",
+      "value": "00000003000000000000000000000000000000000000000000000000000000000000008b000000000000000000000000000000000000000000000000000000000000009500000000000000000000000000000000000000000000000000000000000000970000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000009d00000000000000000000000000000000000000000000000000000000000000a300000000000000000000000000000000000000000000000000000000000000a700000000000000000000000000000000000000000000000000000000000000ad00000000000000000000000000000000000000000000000000000000000000b300000000000000000000000000000000000000000000000000000000000000b500000000000000000000000000000000000000000000000000000000000000bf000000c100000000000000000000000000000000000000000000000000000000000000c5000000c7000000d30000000100000042307830303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303035000000df"
+    }
+  ],
+  "note_nullifiers_by_contract": [
+    {
+      "key": "utf8:0x0000000000000000000000000000000000000000000000000000000000000002",
+      "value": "utf8:0x000000000000000000000000000000000000000000000000000000000000002b"
+    },
+    {
+      "key": "utf8:0x0000000000000000000000000000000000000000000000000000000000000002",
+      "value": "utf8:0x000000000000000000000000000000000000000000000000000000000000006b"
+    },
+    {
+      "key": "utf8:0x0000000000000000000000000000000000000000000000000000000000000003",
+      "value": "utf8:0x00000000000000000000000000000000000000000000000000000000000000b5"
+    }
+  ],
+  "note_block_number_to_nullifier": [
+    {
+      "key": "num:223",
+      "value": "utf8:0x00000000000000000000000000000000000000000000000000000000000000b5"
+    }
+  ]
+}
diff --git a/yarn-project/pxe/src/storage/backwards_compatibility_tests/__snapshots__/PrivateEventStore.json b/yarn-project/pxe/src/storage/backwards_compatibility_tests/__snapshots__/PrivateEventStore.json
new file mode 100644
index 000000000000..9671d5fe4afe
--- /dev/null
+++ b/yarn-project/pxe/src/storage/backwards_compatibility_tests/__snapshots__/PrivateEventStore.json
@@ -0,0 +1,44 @@
+{
+  "private_event_logs": [
+    {
+      "key": "utf8:0x0000000000000000000000000000000000000000000000000000000000000017",
+      "value": "000000000000000000000000000000000000000000000000000000000000001d00000003000000000000000000000000000000000000000000000000000000000000001f0000000000000000000000000000000000000000000000000000000000000025000000000000000000000000000000000000000000000000000000000000002900000011000000000000000000000000000000000000000000000000000000000000002f000000000000000000000000000000000000000000000000000000000000002b000000350000003b000000000000000000000000000000000000000000000000000000000000000200000005000000020000004230783030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030306200000042307830303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303064"
+    },
+    {
+      "key": "utf8:0x000000000000000000000000000000000000000000000000000000000000004f",
+      "value": "000000000000000000000000000000000000000000000000000000000000003d00000003000000000000000000000000000000000000000000000000000000000000004300000000000000000000000000000000000000000000000000000000000000470000000000000000000000000000000000000000000000000000000000000049000000110000000000000000000000000000000000000000000000000000000000000059000000000000000000000000000000000000000000000000000000000000005300000061000000650000000000000000000000000000000000000000000000000000000000000002000000050000000100000042307830303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303062"
+    },
+    {
+      "key": "utf8:0x000000000000000000000000000000000000000000000000000000000000007f",
+      "value": "000000000000000000000000000000000000000000000000000000000000006700000003000000000000000000000000000000000000000000000000000000000000006b000000000000000000000000000000000000000000000000000000000000006d000000000000000000000000000000000000000000000000000000000000007100000013000000000000000000000000000000000000000000000000000000000000008900000000000000000000000000000000000000000000000000000000000000830000008b000000950000000000000000000000000000000000000000000000000000000000000003000000070000000100000042307830303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303062"
+    }
+  ],
+  "events_by_contract_selector": [
+    {
+      "key": "utf8:0x0000000000000000000000000000000000000000000000000000000000000002_0x00000005",
+      "value": "utf8:0x0000000000000000000000000000000000000000000000000000000000000017"
+    },
+    {
+      "key": "utf8:0x0000000000000000000000000000000000000000000000000000000000000002_0x00000005",
+      "value": "utf8:0x000000000000000000000000000000000000000000000000000000000000004f"
+    },
+    {
+      "key": "utf8:0x0000000000000000000000000000000000000000000000000000000000000003_0x00000007",
+      "value": "utf8:0x000000000000000000000000000000000000000000000000000000000000007f"
+    }
+  ],
+  "events_by_block_number": [
+    {
+      "key": "num:17",
+      "value": "utf8:0x0000000000000000000000000000000000000000000000000000000000000017"
+    },
+    {
+      "key": "num:17",
+      "value": "utf8:0x000000000000000000000000000000000000000000000000000000000000004f"
+    },
+    {
+      "key": "num:19",
+      "value": "utf8:0x000000000000000000000000000000000000000000000000000000000000007f"
+    }
+  ]
+}
diff --git a/yarn-project/pxe/src/storage/backwards_compatibility_tests/__snapshots__/RecipientTaggingStore.json b/yarn-project/pxe/src/storage/backwards_compatibility_tests/__snapshots__/RecipientTaggingStore.json
new file mode 100644
index 000000000000..86234edfe1fc
--- /dev/null
+++ b/yarn-project/pxe/src/storage/backwards_compatibility_tests/__snapshots__/RecipientTaggingStore.json
@@ -0,0 +1,18 @@
+{
+  "highest_aged_index": [
+    {
+      "key": "utf8:0x0000000000000000000000000000000000000000000000000000000000000002:0x0000000000000000000000000000000000000000000000000000000000000003",
+      "value": "num:13"
+    }
+  ],
+  "highest_finalized_index": [
+    {
+      "key": "utf8:0x0000000000000000000000000000000000000000000000000000000000000002:0x0000000000000000000000000000000000000000000000000000000000000003",
+      "value": "num:11"
+    },
+    {
+      "key": "utf8:0x0000000000000000000000000000000000000000000000000000000000000005:0x0000000000000000000000000000000000000000000000000000000000000007",
+      "value": "num:17"
+    }
+  ]
+}
diff --git a/yarn-project/pxe/src/storage/backwards_compatibility_tests/__snapshots__/SenderAddressBookStore.json b/yarn-project/pxe/src/storage/backwards_compatibility_tests/__snapshots__/SenderAddressBookStore.json
new file mode 100644
index 000000000000..e601b6d1ccc1
--- /dev/null
+++ b/yarn-project/pxe/src/storage/backwards_compatibility_tests/__snapshots__/SenderAddressBookStore.json
@@ -0,0 +1,16 @@
+{
+  "address_book": [
+    {
+      "key": "utf8:0x0000000000000000000000000000000000000000000000000000000000000002",
+      "value": "true"
+    },
+    {
+      "key": "utf8:0x0000000000000000000000000000000000000000000000000000000000000003",
+      "value": "true"
+    },
+    {
+      "key": "utf8:0x0000000000000000000000000000000000000000000000000000000000000005",
+      "value": "true"
+    }
+  ]
+}
diff --git a/yarn-project/pxe/src/storage/backwards_compatibility_tests/__snapshots__/SenderTaggingStore.json b/yarn-project/pxe/src/storage/backwards_compatibility_tests/__snapshots__/SenderTaggingStore.json
new file mode 100644
index 000000000000..487674b3cde4
--- /dev/null
+++ b/yarn-project/pxe/src/storage/backwards_compatibility_tests/__snapshots__/SenderTaggingStore.json
@@ -0,0 +1,22 @@
+{
+  "pending_indexes": [
+    {
+      "key": "utf8:0x0000000000000000000000000000000000000000000000000000000000000002:0x0000000000000000000000000000000000000000000000000000000000000003",
+      "value": "[{\"lowestIndex\":4,\"highestIndex\":7,\"txHash\":\"0x0000000000000000000000000000000000000000000000000000000000000013\"},{\"lowestIndex\":8,\"highestIndex\":11,\"txHash\":\"0x0000000000000000000000000000000000000000000000000000000000000017\"}]"
+    },
+    {
+      "key": "utf8:0x000000000000000000000000000000000000000000000000000000000000000b:0x000000000000000000000000000000000000000000000000000000000000000d",
+      "value": "[{\"lowestIndex\":1,\"highestIndex\":9,\"txHash\":\"0x000000000000000000000000000000000000000000000000000000000000001d\"}]"
+    }
+  ],
+  "last_finalized_indexes": [
+    {
+      "key": "utf8:0x0000000000000000000000000000000000000000000000000000000000000002:0x0000000000000000000000000000000000000000000000000000000000000003",
+      "value": "num:3"
+    },
+    {
+      "key": "utf8:0x0000000000000000000000000000000000000000000000000000000000000005:0x0000000000000000000000000000000000000000000000000000000000000007",
+      "value": "num:5"
+    }
+  ]
+}
diff --git a/yarn-project/pxe/src/storage/backwards_compatibility_tests/__snapshots__/opened_stores.json b/yarn-project/pxe/src/storage/backwards_compatibility_tests/__snapshots__/opened_stores.json
new file mode 100644
index 000000000000..2ee17beb3c62
--- /dev/null
+++ b/yarn-project/pxe/src/storage/backwards_compatibility_tests/__snapshots__/opened_stores.json
@@ -0,0 +1,97 @@
+{
+  "schemaVersion": 5,
+  "stores": [
+    {
+      "name": "address_book",
+      "kind": "map"
+    },
+    {
+      "name": "capsules",
+      "kind": "map"
+    },
+    {
+      "name": "complete_address_index",
+      "kind": "map"
+    },
+    {
+      "name": "complete_addresses",
+      "kind": "array"
+    },
+    {
+      "name": "contract_artifacts",
+      "kind": "map"
+    },
+    {
+      "name": "contract_classes",
+      "kind": "map"
+    },
+    {
+      "name": "contracts_instances",
+      "kind": "map"
+    },
+    {
+      "name": "events_by_block_number",
+      "kind": "multimap"
+    },
+    {
+      "name": "events_by_contract_selector",
+      "kind": "multimap"
+    },
+    {
+      "name": "header",
+      "kind": "singleton"
+    },
+    {
+      "name": "highest_aged_index",
+      "kind": "map"
+    },
+    {
+      "name": "highest_finalized_index",
+      "kind": "map"
+    },
+    {
+      "name": "key_store",
+      "kind": "map"
+    },
+    {
+      "name": "last_finalized_indexes",
+      "kind": "map"
+    },
+    {
+      "name": "note_block_number_to_nullifier",
+      "kind": "multimap"
+    },
+    {
+      "name": "note_nullifiers_by_contract",
+      "kind": "multimap"
+    },
+    {
+      "name": "notes",
+      "kind": "map"
+    },
+    {
+      "name": "pending_indexes",
+      "kind": "map"
+    },
+    {
+      "name": "private_event_logs",
+      "kind": "map"
+    },
+    {
+      "name": "pxe_l2_block_hashes",
+      "kind": "map"
+    },
+    {
+      "name": "pxe_l2_block_number_to_checkpoint_number",
+      "kind": "map"
+    },
+    {
+      "name": "pxe_l2_checkpoint_store",
+      "kind": "map"
+    },
+    {
+      "name": "pxe_l2_tips",
+      "kind": "map"
+    }
+  ]
+}
diff --git a/yarn-project/pxe/src/storage/backwards_compatibility_tests/kv_store_snapshot.ts b/yarn-project/pxe/src/storage/backwards_compatibility_tests/kv_store_snapshot.ts
new file mode 100644
index 000000000000..71ec575a2971
--- /dev/null
+++ b/yarn-project/pxe/src/storage/backwards_compatibility_tests/kv_store_snapshot.ts
@@ -0,0 +1,122 @@
+import type { AztecAsyncArray, AztecAsyncMap, AztecAsyncSingleton, Key } from '@aztec/kv-store';
+
+/**
+ * This file contains helpers that produce stable, snapshot-friendly text representations of our kv-stores'
+ * contents (map / multimap / array / singleton). Used by the backwards compatibility tests in this directory to
+ * fingerprint the bytes PXE persists.
+ *
+ * Each backwards compatibility schema scenario test follows the same shape:
+ *
+ * 1. drive the production write path through the store class's public API.
+ * 2. re-open the underlying kv-store by name, bypassing the store abstraction layer (eg:
+ * `kvStore.openMap<K, Buffer>('foo')`) and snapshot it via the helpers below.
+ * 3. compare fresh snapshots with committed ones.
+ *
+ * Why text rather than buffers: Jest snapshots are stored as JS literals; `Buffer` instances render as the verbose
+ * `Buffer <01 02 03>` form, which clutters `.snap` files and resists clean diffs. Each collection's contents are
+ * normalized into strings before being fed to `toMatchSnapshot()`.
+ */
+
+/** A single map/multimap entry, rendered as strings for stable snapshotting. */
+export type MapEntry = { key: string; value: string };
+
+/** A single array entry, rendered as a string for stable snapshotting. */
+export type ArrayEntry = { index: number; value: string };
+
+/**
+ * Returns every entry of the given map (or multimap), with both keys and values rendered as strings, sorted by key
+ * with value as a tiebreaker.
+ */
+export async function snapshotMap<K extends Key, V>(map: AztecAsyncMap<K, V>): Promise<MapEntry[]> {
+  const entries: MapEntry[] = [];
+  for await (const [k, v] of map.entriesAsync()) {
+    entries.push({ key: keyToString(k), value: valueToString(v) });
+  }
+  return entries.sort(compareMapEntries);
+}
+
+/**
+ * Returns the contents of `array` paired with their numeric indices, in insertion order.
+ *
+ * Unlike {@link snapshotMap}, no sort: arrays are inherently ordered by index and that order *is* part of the schema.
+ * The `index` field is preserved on each entry so any unintended reorder shows up in the diff.
+ */
+export async function snapshotArray<V>(array: AztecAsyncArray<V>): Promise<ArrayEntry[]> {
+  const entries: ArrayEntry[] = [];
+  let index = 0;
+  for await (const v of array.valuesAsync()) {
+    entries.push({ index: index++, value: valueToString(v) });
+  }
+  return entries;
+}
+
+/** Returns the singleton's value rendered as a string, or `null` if unset. */
+export async function snapshotSingleton<V>(singleton: AztecAsyncSingleton<V>): Promise<string | null> {
+  const value = await singleton.getAsync();
+  return value === undefined ? null : valueToString(value);
+}
+
+function compareMapEntries(a: MapEntry, b: MapEntry): number {
+  return a.key === b.key ? a.value.localeCompare(b.value) : a.key.localeCompare(b.key);
+}
+
+/**
+ * Renders a key as a stable string. Buffers and `Uint8Array`s become `0x`-prefixed hex (matching the canonical byte
+ * form used by `Fr.toString()`, `AztecAddress.toString()`, etc. elsewhere in the codebase); primitives carry a type
+ * prefix (`utf8:`, `num:`) so that different runtime types can't alias to the same string in a snapshot. Without the
+ * prefix, a future change that swapped a `number` key for a `string` of the same digits would be invisible in the
+ * diff.
+ */
+function keyToString(k: unknown): string {
+  if (typeof k === 'string') {
+    return `utf8:${k}`;
+  }
+  if (typeof k === 'number') {
+    return `num:${k}`;
+  }
+  if (Buffer.isBuffer(k)) {
+    return `0x${k.toString('hex')}`;
+  }
+  if (k instanceof Uint8Array) {
+    return `0x${Buffer.from(k).toString('hex')}`;
+  }
+  if (Array.isArray(k)) {
+    return `[${k.map(keyToString).join(',')}]`;
+  }
+  return JSON.stringify(k);
+}
+
+/**
+ * Renders a value for snapshotting. Same type-prefix discipline as {@link keyToString} so primitives can't
+ * accidentally render identically to buffers carrying the same bytes.
+ *
+ * Resolution order:
+ *   1. `Buffer` / `Uint8Array` -> hex. This is the on-disk byte view; the kv-store layer treats these as opaque, so
+ *      what we see here is exactly what's persisted.
+ *   2. Tagged primitives (`num:`, `big:`, `utf8:`).
+ *   3. `Bufferable` fallback: any object with a `.toBuffer()` method renders as `value.toBuffer().toString('hex')`.
+ *      Covers stdlib domain types stored without pre-serialization. The canonical byte form is what we want to
+ *      fingerprint.
+ *   4. `JSON.stringify` for plain objects, matching how the kv-store layer encodes arbitrary structures on disk.
+ */
+function valueToString(v: unknown): string {
+  if (Buffer.isBuffer(v)) {
+    return v.toString('hex');
+  }
+  if (v instanceof Uint8Array) {
+    return Buffer.from(v).toString('hex');
+  }
+  if (typeof v === 'number') {
+    return `num:${v}`;
+  }
+  if (typeof v === 'bigint') {
+    return `big:${v.toString()}`;
+  }
+  if (typeof v === 'string') {
+    return `utf8:${v}`;
+  }
+  if (v && typeof (v as { toBuffer?: unknown }).toBuffer === 'function') {
+    return (v as { toBuffer: () => Buffer }).toBuffer().toString('hex');
+  }
+  return JSON.stringify(v);
+}
diff --git a/yarn-project/pxe/src/storage/backwards_compatibility_tests/pxe_db_compatibility.test.ts b/yarn-project/pxe/src/storage/backwards_compatibility_tests/pxe_db_compatibility.test.ts
new file mode 100644
index 000000000000..ffe7d737253b
--- /dev/null
+++ b/yarn-project/pxe/src/storage/backwards_compatibility_tests/pxe_db_compatibility.test.ts
@@ -0,0 +1,218 @@
+import { openTmpStore } from '@aztec/kv-store/lmdb-v2';
+import { GENESIS_BLOCK_HEADER_HASH } from '@aztec/stdlib/block';
+
+import { toMatchFile } from 'jest-file-snapshot';
+import { dirname, join } from 'path';
+import { fileURLToPath } from 'url';
+
+import { PXE_DATA_SCHEMA_VERSION } from '../metadata.js';
+import { openPxeStores } from '../open_pxe_stores.js';
+import { SCHEMA_TESTS } from './schema_tests.js';
+import { createStoreSpy } from './store_spy.js';
+
+// These somewhat arcane lines allow us to trigger snapshot comparisons to multiple different snapshot files from this
+// single file. We could have instead had individual test files per store, but that made it harder to tie the suite
+// together: we wanted to structure this in such a way that we not only snapshot individual stores, but also so we
+// detect whether the list of stores PXE uses changed, and whether snapshot test for each element in said list exists.
+expect.extend({ toMatchFile });
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+/**
+ * Asserts that `value` matches the per-store snapshot file `__snapshots__/<name>.json`. Each store gets its own file
+ * so a `-u` regeneration produces a localized git diff: an unrelated store accidentally drifting will show up as a
+ * separately-modified file in the diff, instead of being masked inside one consolidated snapshot.
+ *
+ * On mismatch, prepends domain-specific guidance to the matcher's failure message so a developer who stumbles onto a
+ * red CI doesn't reflexively run `-u`: the "right" action depends on whether the gatekeeper or a per-store test
+ * failed, and in both cases requires a deliberate decision (add a `SCHEMA_TESTS` entry; bump
+ * `PXE_DATA_SCHEMA_VERSION`) that `-u` alone cannot make on the dev's behalf.
+ */
+function expectMatchesSnapshot(value: unknown, name: string) {
+  const snapshotPath = join(__dirname, '__snapshots__', `${name}.json`);
+  // We go through some extra ceremony here to bump `snapshotState.matched` on a successful no-op match so the test
+  // run's `Snapshots: X passed` total reflects each per-store check. `jest-file-snapshot` only increments
+  // `added`/`updated`/`unmatched`; without this bump, passing schema-compat assertions are invisible in the suite's
+  // snapshot summary, which would let a maintainer mistake a green run for "backwards compatibility tests not wired
+  // up".
+  const { snapshotState } = expect.getState();
+  const before = { added: snapshotState.added, updated: snapshotState.updated, unmatched: snapshotState.unmatched };
+  // Trailing newline matches what the project's post-edit formatter writes to JSON files. Without it, our serialized
+  // output and the on-disk file disagree by one byte after every formatter pass, producing perpetual false drift.
+  try {
+    expect(JSON.stringify(value, null, 2) + '\n').toMatchFile(snapshotPath);
+  } catch (err) {
+    if (err instanceof Error) {
+      err.message = `${compatibilityTestGuidance(name)}\n\n${err.message}`;
+    }
+    throw err;
+  }
+  if (
+    snapshotState.added === before.added &&
+    snapshotState.updated === before.updated &&
+    snapshotState.unmatched === before.unmatched
+  ) {
+    snapshotState.matched++;
+  }
+}
+
+/**
+ * Returns the actionable header to prepend to a snapshot-mismatch failure. Branches on whether the gatekeeper
+ * (`opened_stores`) or a specific store's snapshot mismatched, because the corrective actions are different: a
+ * gatekeeper failure usually means a `SCHEMA_TESTS` entry is missing for a newly-wired store; a per-store failure
+ * means the on-disk format has changed and the dev needs to decide whether the change is breaking (requires a
+ * `PXE_DATA_SCHEMA_VERSION` bump) or read-defaultable (no bump).
+ */
+function compatibilityTestGuidance(name: string): string {
+  if (name === 'opened_stores') {
+    return [
+      '=== PXE storage compatibility ===',
+      'The set of kv-stores opened by PXE has changed (stores added, removed, or renamed).',
+      '',
+      'If unexpected: investigate the diff below.',
+      '',
+      'If intentional, take these steps in order:',
+      '  1. Determine whether the change is BREAKING or READ-DEFAULTABLE:',
+      '       - If BREAKING (e.g., a sub-store was renamed or removed; existing data becomes inaccessible):',
+      '         bump PXE_DATA_SCHEMA_VERSION in pxe/src/storage/metadata.ts. DatabaseVersionManager wipes any',
+      '         DB whose stored version is below the current one when it next opens; without this bump,',
+      '         existing wallets see corrupted data with no migration path.',
+      '       - If READ-DEFAULTABLE (e.g., a new sub-store was added; existing data continues to work because',
+      '         the new sub-store starts empty for pre-existing DBs and is populated as new events arrive):',
+      '         leave PXE_DATA_SCHEMA_VERSION alone, but document the reasoning in the commit/PR description.',
+      '  2. Regenerate ONLY the inventory snapshot (opened_stores.json). From the yarn-project directory, run:',
+      "         yarn workspace @aztec/pxe test src/storage/backwards_compatibility_tests/pxe_db_compatibility.test.ts -u -t 'opens the expected set of stores'",
+      "     The `-u` flag is Jest's --updateSnapshot; the `-t '<pattern>'` flag scopes the update to the matching",
+      '     test. Without `-t`, this command would also rewrite any per-store snapshots that happened to have drifted',
+      '     in the same change, masking unrelated regressions under your intentional inventory change.',
+      '  3. Run `git status` and verify only opened_stores.json was modified (plus metadata.ts if BREAKING).',
+    ].join('\n');
+  }
+  return [
+    `=== PXE storage compatibility (${name}) ===`,
+    `The bytes ${name} writes to disk no longer match the committed snapshot ${name}.json.`,
+    '',
+    `If unintentional: the regression is in the most recent ${name} code changes. Fix the code; do NOT update`,
+    'the snapshot. The diff below tells you what changed.',
+    '',
+    'If intentional (deliberate on-disk format change):',
+    '  1. Determine whether the change is BREAKING or READ-DEFAULTABLE:',
+    '       - BREAKING: existing on-device databases become unreadable or semantically wrong under the new',
+    '         code. Examples: a renamed key, a removed field, an encoding change, a semantic change a read',
+    "         path can't transparently default.",
+    '       - READ-DEFAULTABLE: the new code reads existing data correctly because of explicit fallbacks.',
+    '         Examples: a new key whose absence resolves to a sentinel (genesis, undefined, etc.); a new',
+    '         field with a safe default. Existing wallets continue working after upgrade and the on-disk',
+    '         state self-heals as new events arrive.',
+    '  2. If BREAKING: bump PXE_DATA_SCHEMA_VERSION in pxe/src/storage/metadata.ts. DatabaseVersionManager',
+    '     wipes any DB whose stored version is below the current one when it next opens; without this bump,',
+    '     existing wallets see corrupted data with no migration path.',
+    '     If READ-DEFAULTABLE: leave PXE_DATA_SCHEMA_VERSION alone, but document the reasoning in the',
+    '     commit/PR description (which fallback applies, where, and what state pre-upgrade DBs converge to).',
+    `  3. Regenerate ONLY ${name}.json. From the yarn-project directory, run:`,
+    `         yarn workspace @aztec/pxe test src/storage/backwards_compatibility_tests/pxe_db_compatibility.test.ts -u -t '${name} compatibility test'`,
+    "     The `-u` flag is Jest's --updateSnapshot; the `-t '<pattern>'` flag scopes the update to the matching",
+    '     test. Without `-t`, the command would also rewrite any other per-store snapshots that happened to have',
+    `     drifted in the same change, masking unrelated regressions under your intentional ${name} change.`,
+    `  4. Run \`git status\` and verify only ${name}.json was modified (plus metadata.ts if BREAKING, plus`,
+    '     opened_stores.json if the inventory changed).',
+  ].join('\n');
+}
+
+/**
+ * Spies on `openPxeStores` and returns the canonical list of sub-stores PXE opens. Used by both the inventory test
+ * (to fingerprint that list) and the coverage test (to compare it against what SCHEMA_TESTS fingerprints).
+ */
+async function collectOpenedStores() {
+  const kvStore = await openTmpStore('pxe-schema-stores', true);
+  try {
+    const spy = createStoreSpy(kvStore);
+    openPxeStores(spy.store, GENESIS_BLOCK_HEADER_HASH);
+    return spy.getOpenedStores();
+  } finally {
+    await kvStore.close();
+  }
+}
+
+/**
+ * Backwards-compatibility test suite for PXE storage. The intent is to detect any change to the bytes PXE writes to
+ * disk that would render existing on-device data unreadable after a version bump. Each schema test (in
+ * `schema_tests.ts`) drives the production write path of one store class, then snapshots every sub-store the class
+ * opens.
+ *
+ * Three layers of checks run against `SCHEMA_TESTS`:
+ *
+ *   - "opens the expected set of stores" (inventory): snapshots the names PXE opens through `openPxeStores`. Adds,
+ *     removes, and renames of sub-stores fail this first.
+ *   - "every opened sub-store has SCHEMA_TESTS coverage" (coverage): every sub-store from the inventory must also
+ *     be opened by at least one `snapshotStore` callback in `SCHEMA_TESTS`. Without this, a new sub-store could be
+ *     added to PXE without any snapshot tripwire ever fingerprinting it.
+ *   - per-store compatibility (`<StoreName> compatibility test`): drives the production write path for one store
+ *     class and compares the resulting bytes to a committed per-store snapshot.
+ */
+describe('PXE storage compatibility test suite', () => {
+  it('opens the expected set of stores', async () => {
+    const openedStores = await collectOpenedStores();
+    expectMatchesSnapshot({ schemaVersion: PXE_DATA_SCHEMA_VERSION, stores: openedStores }, 'opened_stores');
+  });
+
+  it('every opened sub-store has SCHEMA_TESTS coverage', async () => {
+    const openedStores = await collectOpenedStores();
+
+    // Spy on each test's `snapshotStore` to record which sub-stores it opens.
+    const covered = new Set<string>();
+    for (const t of SCHEMA_TESTS) {
+      const kvStore = await openTmpStore(`pxe-schema-coverage-${t.name}`, true);
+      try {
+        const coverageSpy = createStoreSpy(kvStore);
+        await t.snapshotStore(coverageSpy.store);
+        coverageSpy.getOpenedStores().forEach(e => covered.add(`${e.kind}:${e.name}`));
+      } finally {
+        await kvStore.close();
+      }
+    }
+
+    const uncovered = openedStores.map(e => `${e.kind}:${e.name}`).filter(n => !covered.has(n));
+    if (uncovered.length > 0) {
+      throw new Error(
+        [
+          '=== PXE storage compatibility (coverage) ===',
+          'The following sub-stores are opened by openPxeStores but not fingerprinted by any SCHEMA_TESTS',
+          `snapshotStore callback: ${uncovered.join(', ')}.`,
+          '',
+          'Without coverage, future schema changes to these sub-stores go undetected. To fix:',
+          '  1. Find which store class opens the missing sub-store. Store classes live under',
+          '     pxe/src/storage/<store-name>/<store-name>.ts. From the yarn-project directory, grep that',
+          '     directory for the sub-store name (e.g. `grep -rn "\'last_finalized_indexes\'" pxe/src/storage`).',
+          "  2. In schema_tests.ts, find that store class's entry in the SCHEMA_TESTS array. Add a",
+          '     line to its `snapshotStore` callback that re-reads the sub-store. Look at sibling entries for the',
+          '     pattern; for example:',
+          "         last_finalized_indexes: await snapshotMap(kvStore.openMap<string, number>('last_finalized_indexes')),",
+          '     Use snapshotMap / snapshotArray / snapshotSingleton according to the sub-store',
+          '     kind shown above (`map:`, `multimap:`, `array:`, `singleton:`).',
+          '  3. Regenerate ONLY the affected per-store snapshot. From the yarn-project directory, run:',
+          "         yarn workspace @aztec/pxe test src/storage/backwards_compatibility_tests/pxe_db_compatibility.test.ts -u -t '<StoreName> compatibility test'",
+          '     (Replace <StoreName> with the store class name from step 1.) The newly-fingerprinted sub-store',
+          "     will appear as an additional key in the regenerated <StoreName>.json. The `-t '<pattern>'` flag",
+          '     keeps the update surgical so unrelated drift does not get accepted alongside your fix.',
+        ].join('\n'),
+      );
+    }
+  });
+
+  // For each `SchemaTest` entry, drive its `writeToStore` against a fresh kv-store, render the resulting bytes via
+  // its `snapshotStore`, and compare to the committed per-store snapshot file under `__snapshots__/<name>.json`.
+  for (const t of SCHEMA_TESTS) {
+    describe(t.name, () => {
+      it(`${t.name} compatibility test`, async () => {
+        const kvStore = await openTmpStore(`pxe-schema-${t.name}`, true);
+        try {
+          await t.writeToStore(kvStore);
+          const data = await t.snapshotStore(kvStore);
+          expectMatchesSnapshot(data, t.name);
+        } finally {
+          await kvStore.close();
+        }
+      });
+    });
+  }
+});
diff --git a/yarn-project/pxe/src/storage/backwards_compatibility_tests/schema_tests.ts b/yarn-project/pxe/src/storage/backwards_compatibility_tests/schema_tests.ts
new file mode 100644
index 000000000000..91b2c2d90ef1
--- /dev/null
+++ b/yarn-project/pxe/src/storage/backwards_compatibility_tests/schema_tests.ts
@@ -0,0 +1,707 @@
+/* eslint-disable camelcase */
+import { CONTRACT_CLASS_LOG_SIZE_IN_FIELDS, PRIVATE_LOG_SIZE_IN_FIELDS } from '@aztec/constants';
+import { BlockNumber, CheckpointNumber, IndexWithinCheckpoint, SlotNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { Point } from '@aztec/foundation/curves/grumpkin';
+import { EthAddress } from '@aztec/foundation/eth-address';
+import type { Tuple } from '@aztec/foundation/serialize';
+import { KeyStore } from '@aztec/key-store';
+import type { AztecAsyncKVStore } from '@aztec/kv-store';
+import { L2TipsKVStore } from '@aztec/kv-store/stores';
+import { type ContractArtifact, EventSelector, FunctionSelector, FunctionType } from '@aztec/stdlib/abi';
+import { PublicDataWrite, RevertCode } from '@aztec/stdlib/avm';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { BlockHash, Body, GENESIS_BLOCK_HEADER_HASH, L2Block } from '@aztec/stdlib/block';
+import { Checkpoint, L1PublishedData, PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
+import { CompleteAddress, SerializableContractInstance } from '@aztec/stdlib/contract';
+import { GasFees } from '@aztec/stdlib/gas';
+import { PublicKeys } from '@aztec/stdlib/keys';
+import {
+  ContractClassLog,
+  ContractClassLogFields,
+  ExtendedDirectionalAppTaggingSecret,
+  PrivateLog,
+  PublicLog,
+  type TaggingIndexRange,
+} from '@aztec/stdlib/logs';
+import { Note, NoteDao } from '@aztec/stdlib/note';
+import { CheckpointHeader } from '@aztec/stdlib/rollup';
+import { AppendOnlyTreeSnapshot } from '@aztec/stdlib/trees';
+import {
+  BlockHeader,
+  GlobalVariables,
+  PartialStateReference,
+  StateReference,
+  TxEffect,
+  TxHash,
+} from '@aztec/stdlib/tx';
+
+import { AddressStore } from '../address_store/address_store.js';
+import { AnchorBlockStore } from '../anchor_block_store/anchor_block_store.js';
+import { CapsuleStore } from '../capsule_store/capsule_store.js';
+import { ContractStore } from '../contract_store/contract_store.js';
+import { NoteStore } from '../note_store/note_store.js';
+import { PrivateEventStore } from '../private_event_store/private_event_store.js';
+import { RecipientTaggingStore, SenderAddressBookStore, SenderTaggingStore } from '../tagging_store/index.js';
+import { snapshotArray, snapshotMap, snapshotSingleton } from './kv_store_snapshot.js';
+
+/**
+ * Template of a specific store's backwards compatibility checks.
+ *
+ * 1. `name` is the store's name (`AddressStore`, `NoteStore`, etc).
+ * 2. `writeToStore` drives writes through each store's own production API (`addNote`, `setCapsule`, etc).
+ * 3. `snapshotStore` re-opens the underlying kv-stores by name (raw) and renders them as snapshots.
+ */
+export type SchemaTest = {
+  name: string;
+  writeToStore: (kvStore: AztecAsyncKVStore) => Promise<void>;
+  snapshotStore: (kvStore: AztecAsyncKVStore) => Promise<Record<string, unknown>>;
+};
+
+export const SCHEMA_TESTS: readonly SchemaTest[] = [
+  {
+    name: 'AddressStore',
+    writeToStore: async kvStore => {
+      const addressStore = new AddressStore(kvStore);
+
+      const addresses = [
+        await CompleteAddress.fromSecretKeyAndPartialAddress(new Fr(2n), new Fr(3n)),
+        await CompleteAddress.fromSecretKeyAndPartialAddress(new Fr(5n), new Fr(7n)),
+      ];
+
+      await addressStore.addCompleteAddress(addresses[0]);
+      await addressStore.addCompleteAddress(addresses[1]);
+      // Re-adding an already-registered address must be a no-op: duplicate detection should leave both sub-stores
+      // unchanged. If this regresses, the snapshot picks up an extra array entry.
+      await addressStore.addCompleteAddress(addresses[0]);
+    },
+    snapshotStore: async kvStore => ({
+      complete_addresses: await snapshotArray(kvStore.openArray<Buffer>('complete_addresses')),
+      complete_address_index: await snapshotMap(kvStore.openMap<string, number>('complete_address_index')),
+    }),
+  },
+
+  {
+    name: 'AnchorBlockStore',
+    writeToStore: async kvStore => {
+      const anchorBlockStore = new AnchorBlockStore(kvStore);
+
+      // Each primitive field gets a distinct prime so any reorder shows up in the snapshot diff. An all-zero
+      // `BlockHeader.empty()` would silently pass through same-width field swaps.
+      await anchorBlockStore.setHeader(
+        new BlockHeader(
+          new AppendOnlyTreeSnapshot(new Fr(2n), 3),
+          new StateReference(
+            new AppendOnlyTreeSnapshot(new Fr(5n), 7),
+            new PartialStateReference(
+              new AppendOnlyTreeSnapshot(new Fr(11n), 13),
+              new AppendOnlyTreeSnapshot(new Fr(17n), 19),
+              new AppendOnlyTreeSnapshot(new Fr(23n), 29),
+            ),
+          ),
+          new Fr(31n),
+          new GlobalVariables(
+            new Fr(37n),
+            new Fr(41n),
+            BlockNumber(43),
+            SlotNumber(47),
+            53n,
+            EthAddress.fromField(new Fr(59n)),
+            AztecAddress.fromBigInt(61n),
+            new GasFees(67n, 71n),
+          ),
+          new Fr(73n),
+          new Fr(79n),
+        ),
+      );
+    },
+    snapshotStore: async kvStore => ({
+      header: await snapshotSingleton(kvStore.openSingleton<Buffer>('header')),
+    }),
+  },
+
+  {
+    name: 'CapsuleStore',
+    writeToStore: async kvStore => {
+      const capsuleStore = new CapsuleStore(kvStore);
+
+      const jobId = 'fixture-job';
+      const contractAddress = AztecAddress.fromBigInt(2n);
+      const scope = AztecAddress.fromBigInt(3n);
+
+      // Three setCapsule calls (2-element, 1-element, 0-element value vector) pin every value-encoding length case.
+      capsuleStore.setCapsule(contractAddress, new Fr(5n), [new Fr(7n), new Fr(11n)], jobId, scope);
+      capsuleStore.setCapsule(contractAddress, new Fr(13n), [new Fr(17n)], jobId, scope);
+      capsuleStore.setCapsule(contractAddress, new Fr(19n), [], jobId, scope);
+      await kvStore.transactionAsync(() => capsuleStore.commit(jobId));
+    },
+    snapshotStore: async kvStore => ({
+      capsules: await snapshotMap(kvStore.openMap<string, Buffer>('capsules')),
+    }),
+  },
+
+  {
+    name: 'ContractStore',
+    writeToStore: async kvStore => {
+      const contractStore = new ContractStore(kvStore);
+
+      // Hand-rolled artifact (see `buildSchemaContractArtifact` below) instead of importing a noir-compiled fixture.
+      // The compiled fixture's JSON contains noir-compiler outputs (error-type hashes, debug symbols, struct paths)
+      // that drift across compiler versions and produce spurious ContractStore.json diffs that have nothing to do with
+      // PXE's on-disk schema. The hand-rolled artifact is small, deterministic across versions, and exercises the
+      // `addContractArtifact` write path identically.
+      const artifact = buildSchemaContractArtifact();
+
+      // Precomputed class so the `contract_classes` bytes are hardcoded by this test rather than derived from
+      // `getContractClassFromArtifact`.
+      const populatedClass = {
+        version: 1 as const,
+        id: new Fr(2n),
+        artifactHash: new Fr(3n),
+        privateFunctionsRoot: new Fr(5n),
+        publicBytecodeCommitment: new Fr(7n),
+        privateFunctions: [
+          { selector: FunctionSelector.fromField(new Fr(11n)), vkHash: new Fr(13n) },
+          { selector: FunctionSelector.fromField(new Fr(17n)), vkHash: new Fr(19n) },
+        ],
+        packedBytecode: Buffer.alloc(0),
+      };
+
+      await contractStore.addContractArtifact(artifact, populatedClass);
+
+      // Same artifact, different class with empty `privateFunctions`. Tests zero-length-vector encoding for the
+      // privateFunctions field, which the populated case can't reach.
+      await contractStore.addContractArtifact(artifact, {
+        version: 1 as const,
+        id: new Fr(23n),
+        artifactHash: new Fr(29n),
+        privateFunctionsRoot: new Fr(31n),
+        publicBytecodeCommitment: new Fr(37n),
+        privateFunctions: [],
+        packedBytecode: Buffer.alloc(0),
+      });
+
+      // Re-register the populated class: must hit the `#contractArtifactCache` short-circuit and leave both
+      // `contract_artifacts` and `contract_classes` unchanged.
+      await contractStore.addContractArtifact(artifact, populatedClass);
+
+      await contractStore.addContractInstance(
+        new SerializableContractInstance({
+          version: 1,
+          salt: new Fr(73n),
+          deployer: AztecAddress.fromBigInt(79n),
+          currentContractClassId: new Fr(83n),
+          originalContractClassId: new Fr(89n),
+          initializationHash: new Fr(97n),
+          publicKeys: new PublicKeys(
+            new Point(new Fr(41n), new Fr(43n), false),
+            new Point(new Fr(47n), new Fr(53n), false),
+            new Point(new Fr(59n), new Fr(61n), false),
+            new Point(new Fr(67n), new Fr(71n), false),
+          ),
+        }).withAddress(AztecAddress.fromBigInt(101n)),
+      );
+    },
+    snapshotStore: async kvStore => ({
+      contract_artifacts: await snapshotMap(kvStore.openMap<string, Buffer>('contract_artifacts')),
+      contract_classes: await snapshotMap(kvStore.openMap<string, Buffer>('contract_classes')),
+      contracts_instances: await snapshotMap(kvStore.openMap<string, Buffer>('contracts_instances')),
+    }),
+  },
+
+  {
+    name: 'KeyStore',
+    writeToStore: async kvStore => {
+      const keyStore = new KeyStore(kvStore);
+      await keyStore.addAccount(new Fr(2n), new Fr(3n));
+    },
+    snapshotStore: async kvStore => ({
+      key_store: await snapshotMap(kvStore.openMap<string, Buffer>('key_store')),
+    }),
+  },
+
+  {
+    name: 'L2TipsKVStore',
+    writeToStore: async kvStore => {
+      const l2TipsStore = new L2TipsKVStore(kvStore, 'pxe', GENESIS_BLOCK_HEADER_HASH);
+
+      const block = buildL2Block();
+      const publishedCheckpoint = new PublishedCheckpoint(
+        new Checkpoint(
+          new AppendOnlyTreeSnapshot(new Fr(2n), 3),
+          new CheckpointHeader(
+            new Fr(5n),
+            new Fr(7n),
+            new Fr(11n),
+            new Fr(13n),
+            new Fr(17n),
+            SlotNumber(19),
+            23n,
+            EthAddress.fromField(new Fr(29n)),
+            AztecAddress.fromBigInt(31n),
+            new GasFees(37n, 41n),
+            new Fr(43n),
+          ),
+          [block],
+          CheckpointNumber(47),
+          53n,
+        ),
+        new L1PublishedData(59n, 61n, new Fr(67n).toString()),
+        [],
+      );
+
+      // `'blocks-added'` writes to `pxe_l2_tips` (proposed tag) and `pxe_l2_block_hashes`.
+      // `'chain-checkpointed'` writes to all four sub-stores: tips ('checkpointed' and 'proposedCheckpoint' tags),
+      // block-to-checkpoint mapping, and the checkpoint store.
+      await l2TipsStore.handleBlockStreamEvent({ type: 'blocks-added', blocks: [block] });
+      await l2TipsStore.handleBlockStreamEvent({
+        type: 'chain-checkpointed',
+        block: { number: BlockNumber(71), hash: new Fr(73n).toString() },
+        checkpoint: publishedCheckpoint,
+      });
+      // `'chain-proven'` writes the 'proven' tag. `'finalized'` is omitted because its handler runs delete-before
+      // logic that would depend on the order of preceding events.
+      await l2TipsStore.handleBlockStreamEvent({
+        type: 'chain-proven',
+        block: { number: BlockNumber(79), hash: new Fr(83n).toString() },
+      });
+    },
+    snapshotStore: async kvStore => ({
+      pxe_l2_tips: await snapshotMap(kvStore.openMap<string, number>('pxe_l2_tips')),
+      pxe_l2_block_hashes: await snapshotMap(kvStore.openMap<number, string>('pxe_l2_block_hashes')),
+      pxe_l2_block_number_to_checkpoint_number: await snapshotMap(
+        kvStore.openMap<number, number>('pxe_l2_block_number_to_checkpoint_number'),
+      ),
+      pxe_l2_checkpoint_store: await snapshotMap(kvStore.openMap<number, Buffer>('pxe_l2_checkpoint_store')),
+    }),
+  },
+
+  {
+    name: 'NoteStore',
+    writeToStore: async kvStore => {
+      const noteStore = new NoteStore(kvStore);
+
+      const jobId = 'fixture-job';
+
+      // Two contracts so `note_nullifiers_by_contract` exhibits both a multi-value row (contractA → {n1, n2}) and a
+      // single-value row (contractB → {n3}).
+      const contractA = AztecAddress.fromBigInt(2n);
+      const contractB = AztecAddress.fromBigInt(3n);
+      const scopeX = AztecAddress.fromBigInt(5n);
+      const scopeY = AztecAddress.fromBigInt(7n);
+
+      // note1: active, will be added under two scopes to exercise the multi-element scopes vector encoding in
+      // `StoredNote.toBuffer`.
+      const note1 = new NoteDao(
+        new Note([new Fr(13n), new Fr(17n), new Fr(19n)]),
+        contractA,
+        AztecAddress.fromBigInt(23n),
+        new Fr(29n),
+        new Fr(31n),
+        new Fr(37n),
+        new Fr(41n),
+        new Fr(43n),
+        TxHash.fromField(new Fr(47n)),
+        BlockNumber(53),
+        new Fr(59n).toString(),
+        61,
+        67,
+      );
+
+      // note2: same contract as note1 → produces the multi-value row in `note_nullifiers_by_contract`.
+      const note2 = new NoteDao(
+        new Note([new Fr(71n), new Fr(73n), new Fr(79n)]),
+        contractA,
+        AztecAddress.fromBigInt(83n),
+        new Fr(89n),
+        new Fr(97n),
+        new Fr(101n),
+        new Fr(103n),
+        new Fr(107n),
+        TxHash.fromField(new Fr(109n)),
+        BlockNumber(113),
+        new Fr(127n).toString(),
+        131,
+        137,
+      );
+
+      // note3: different contract; will be nullified to populate `note_block_number_to_nullifier` and exercise the
+      // populated `_nullifiedAt` trailer of `StoredNote.toBuffer`.
+      const note3 = new NoteDao(
+        new Note([new Fr(139n), new Fr(149n), new Fr(151n)]),
+        contractB,
+        AztecAddress.fromBigInt(157n),
+        new Fr(163n),
+        new Fr(167n),
+        new Fr(173n),
+        new Fr(179n),
+        new Fr(181n),
+        TxHash.fromField(new Fr(191n)),
+        BlockNumber(193),
+        new Fr(197n).toString(),
+        199,
+        211,
+      );
+
+      // Adding note1 twice with different scopes triggers `addScope` on the staged StoredNote, producing a 2-element
+      // scope vector in the committed buffer.
+      await noteStore.addNotes([note1], scopeX, jobId);
+      await noteStore.addNotes([note1], scopeY, jobId);
+      await noteStore.addNotes([note2], scopeX, jobId);
+      await noteStore.addNotes([note3], scopeX, jobId);
+
+      // Nullify note3 within the same job. `applyNullifiers` reads the staged StoredNote, sets `_nullifiedAt`, and
+      // writes back to the staged map; `commit` then flushes it to disk with the populated trailer and adds the
+      // corresponding `note_block_number_to_nullifier` entry.
+      await noteStore.applyNullifiers(
+        [{ data: note3.siloedNullifier, l2BlockNumber: BlockNumber(223), l2BlockHash: BlockHash.ZERO }],
+        jobId,
+      );
+
+      await kvStore.transactionAsync(() => noteStore.commit(jobId));
+    },
+    snapshotStore: async kvStore => ({
+      notes: await snapshotMap(kvStore.openMap<string, Buffer>('notes')),
+      note_nullifiers_by_contract: await snapshotMap(
+        kvStore.openMultiMap<string, string>('note_nullifiers_by_contract'),
+      ),
+      note_block_number_to_nullifier: await snapshotMap(
+        kvStore.openMultiMap<number, string>('note_block_number_to_nullifier'),
+      ),
+    }),
+  },
+
+  {
+    name: 'PrivateEventStore',
+    writeToStore: async kvStore => {
+      const privateEventStore = new PrivateEventStore(kvStore);
+
+      const jobId = 'fixture-job';
+
+      // Two (contract, selector) pairs and two block numbers so each multimap exhibits both a multi-value row
+      // (contractA/selectorA → {e1, e2} and blockN1 → {e1, e2}) and a contrasting single-value row.
+      const contractA = AztecAddress.fromBigInt(2n);
+      const contractB = AztecAddress.fromBigInt(3n);
+      const selectorA = EventSelector.fromField(new Fr(5n));
+      const selectorB = EventSelector.fromField(new Fr(7n));
+      const scopeX = AztecAddress.fromBigInt(11n);
+      const scopeY = AztecAddress.fromBigInt(13n);
+      const blockN1 = BlockNumber(17);
+      const blockN2 = BlockNumber(19);
+
+      // event1: rich fixture. Re-stored under scopeY below to exercise the `addScope` branch and produce a 2-element
+      // scopes vector in the committed buffer.
+      const event1Commitment = new Fr(23n);
+      await privateEventStore.storePrivateEventLog(
+        selectorA,
+        new Fr(29n),
+        [new Fr(31n), new Fr(37n), new Fr(41n)],
+        event1Commitment,
+        {
+          contractAddress: contractA,
+          scope: scopeX,
+          txHash: TxHash.fromField(new Fr(43n)),
+          l2BlockNumber: blockN1,
+          l2BlockHash: new BlockHash(new Fr(47n)),
+          txIndexInBlock: 53,
+          eventIndexInTx: 59,
+        },
+        jobId,
+      );
+
+      // Same eventId, different scope: takes the `existing.addScope(...)` path in `storePrivateEventLog`.
+      await privateEventStore.storePrivateEventLog(
+        selectorA,
+        new Fr(29n),
+        [new Fr(31n), new Fr(37n), new Fr(41n)],
+        event1Commitment,
+        {
+          contractAddress: contractA,
+          scope: scopeY,
+          txHash: TxHash.fromField(new Fr(43n)),
+          l2BlockNumber: blockN1,
+          l2BlockHash: new BlockHash(new Fr(47n)),
+          txIndexInBlock: 53,
+          eventIndexInTx: 59,
+        },
+        jobId,
+      );
+
+      // event2: same (contract, selector) and same block as event1 → multi-value rows in both multimaps.
+      await privateEventStore.storePrivateEventLog(
+        selectorA,
+        new Fr(61n),
+        [new Fr(67n), new Fr(71n), new Fr(73n)],
+        new Fr(79n),
+        {
+          contractAddress: contractA,
+          scope: scopeX,
+          txHash: TxHash.fromField(new Fr(83n)),
+          l2BlockNumber: blockN1,
+          l2BlockHash: new BlockHash(new Fr(89n)),
+          txIndexInBlock: 97,
+          eventIndexInTx: 101,
+        },
+        jobId,
+      );
+
+      // event3: distinct (contract, selector) and block → contrasting single-value multimap rows.
+      await privateEventStore.storePrivateEventLog(
+        selectorB,
+        new Fr(103n),
+        [new Fr(107n), new Fr(109n), new Fr(113n)],
+        new Fr(127n),
+        {
+          contractAddress: contractB,
+          scope: scopeX,
+          txHash: TxHash.fromField(new Fr(131n)),
+          l2BlockNumber: blockN2,
+          l2BlockHash: new BlockHash(new Fr(137n)),
+          txIndexInBlock: 139,
+          eventIndexInTx: 149,
+        },
+        jobId,
+      );
+
+      await kvStore.transactionAsync(() => privateEventStore.commit(jobId));
+    },
+    snapshotStore: async kvStore => ({
+      private_event_logs: await snapshotMap(kvStore.openMap<string, Buffer>('private_event_logs')),
+      events_by_contract_selector: await snapshotMap(
+        kvStore.openMultiMap<string, string>('events_by_contract_selector'),
+      ),
+      events_by_block_number: await snapshotMap(kvStore.openMultiMap<number, string>('events_by_block_number')),
+    }),
+  },
+
+  {
+    name: 'RecipientTaggingStore',
+    writeToStore: async kvStore => {
+      const recipientTaggingStore = new RecipientTaggingStore(kvStore);
+
+      const jobId = 'fixture-job';
+      const secretA = new ExtendedDirectionalAppTaggingSecret(new Fr(2n), AztecAddress.fromBigInt(3n));
+      const secretB = new ExtendedDirectionalAppTaggingSecret(new Fr(5n), AztecAddress.fromBigInt(7n));
+
+      await recipientTaggingStore.updateHighestFinalizedIndex(secretA, 11, jobId);
+      await recipientTaggingStore.updateHighestAgedIndex(secretA, 13, jobId);
+      await recipientTaggingStore.updateHighestFinalizedIndex(secretB, 17, jobId);
+      await kvStore.transactionAsync(() => recipientTaggingStore.commit(jobId));
+    },
+    snapshotStore: async kvStore => ({
+      highest_aged_index: await snapshotMap(kvStore.openMap<string, number>('highest_aged_index')),
+      highest_finalized_index: await snapshotMap(kvStore.openMap<string, number>('highest_finalized_index')),
+    }),
+  },
+
+  {
+    name: 'SenderAddressBookStore',
+    writeToStore: async kvStore => {
+      const senderAddressBookStore = new SenderAddressBookStore(kvStore);
+
+      await senderAddressBookStore.addSender(AztecAddress.fromBigInt(2n));
+      await senderAddressBookStore.addSender(AztecAddress.fromBigInt(3n));
+      await senderAddressBookStore.addSender(AztecAddress.fromBigInt(5n));
+    },
+    snapshotStore: async kvStore => ({
+      address_book: await snapshotMap(kvStore.openMap<string, true>('address_book')),
+    }),
+  },
+
+  {
+    name: 'SenderTaggingStore',
+    writeToStore: async kvStore => {
+      const senderTaggingStore = new SenderTaggingStore(kvStore);
+
+      const jobId = 'fixture-job';
+      const secretA = new ExtendedDirectionalAppTaggingSecret(new Fr(2n), AztecAddress.fromBigInt(3n));
+      const secretB = new ExtendedDirectionalAppTaggingSecret(new Fr(5n), AztecAddress.fromBigInt(7n));
+      const secretC = new ExtendedDirectionalAppTaggingSecret(new Fr(11n), AztecAddress.fromBigInt(13n));
+      const txHashA = TxHash.fromBigInt(17n);
+      const txHashB = TxHash.fromBigInt(19n);
+      const txHashC = TxHash.fromBigInt(23n);
+      const txHashD = TxHash.fromBigInt(29n);
+
+      // secretA receives three pending ranges (one per tx); secretB receives one. After finalizing txHashA below,
+      // secretA's array shrinks to two elements (the txHashB and txHashC ranges, both with highestIndex > 3) which
+      // pins the multi-element JSON encoding of `pending_indexes`.
+      const txHashARanges: TaggingIndexRange[] = [
+        { extendedSecret: secretA, lowestIndex: 1, highestIndex: 3 },
+        { extendedSecret: secretB, lowestIndex: 1, highestIndex: 5 },
+      ];
+      await senderTaggingStore.storePendingIndexes(txHashARanges, txHashA, jobId);
+
+      await senderTaggingStore.storePendingIndexes(
+        [{ extendedSecret: secretA, lowestIndex: 4, highestIndex: 7 }],
+        txHashB,
+        jobId,
+      );
+
+      // Re-store the exact same (secret, txHash, range). Exercises the "exact duplicate — skip" branch at
+      // sender_tagging_store.ts:199. The snapshot must be unchanged by this call; it pins the no-op assumption.
+      await senderTaggingStore.storePendingIndexes(
+        [{ extendedSecret: secretA, lowestIndex: 4, highestIndex: 7 }],
+        txHashB,
+        jobId,
+      );
+
+      await senderTaggingStore.storePendingIndexes(
+        [{ extendedSecret: secretA, lowestIndex: 8, highestIndex: 11 }],
+        txHashC,
+        jobId,
+      );
+
+      // secretC's range is never finalized, so it survives commit as a single-element pending array (contrast with
+      // secretA's multi-element shape).
+      await senderTaggingStore.storePendingIndexes(
+        [{ extendedSecret: secretC, lowestIndex: 1, highestIndex: 9 }],
+        txHashD,
+        jobId,
+      );
+
+      await senderTaggingStore.finalizePendingIndexes([txHashA], jobId);
+
+      await kvStore.transactionAsync(() => senderTaggingStore.commit(jobId));
+    },
+    snapshotStore: async kvStore => ({
+      pending_indexes: await snapshotMap(kvStore.openMap<string, Buffer>('pending_indexes')),
+      last_finalized_indexes: await snapshotMap(kvStore.openMap<string, number>('last_finalized_indexes')),
+    }),
+  },
+];
+
+/**
+ * Pads an Fr array to `totalLength` with `Fr.ZERO`. Returns plain `Fr[]` rather than `Tuple<Fr, N>` so that callers
+ * with very large `totalLength` (e.g. `CONTRACT_CLASS_LOG_SIZE_IN_FIELDS = 3023`) don't trip TypeScript's recursive
+ * type instantiation depth limit on `Tuple<T, N>` — which is why we don't simply call `padArrayEnd` from foundation.
+ * Used because `ContractClassLogFields` and `PrivateLog` require fixed-length collections; populating only the leading
+ * slots is enough to detect reorders, while the trailing zeros pin each field's total width (a shrunk or grown size
+ * constant shifts the byte count and shows up in the snapshot diff).
+ */
+function paddedFrs(leading: bigint[], totalLength: number): Fr[] {
+  const out = leading.map(p => new Fr(p));
+  while (out.length < totalLength) {
+    out.push(Fr.ZERO);
+  }
+  return out;
+}
+
+/**
+ * Builds a fully-populated `L2Block` with distinct values for every primitive field that appears in `toBuffer`.
+ * We use distinct values to make a snapshot diff sensitive to regressions of specific fields, and same-width reorders.
+ */
+function buildL2Block(): L2Block {
+  const archive = new AppendOnlyTreeSnapshot(new Fr(101n), 103);
+  const header = new BlockHeader(
+    new AppendOnlyTreeSnapshot(new Fr(107n), 109),
+    new StateReference(
+      new AppendOnlyTreeSnapshot(new Fr(113n), 127),
+      new PartialStateReference(
+        new AppendOnlyTreeSnapshot(new Fr(131n), 137),
+        new AppendOnlyTreeSnapshot(new Fr(139n), 149),
+        new AppendOnlyTreeSnapshot(new Fr(151n), 157),
+      ),
+    ),
+    new Fr(163n),
+    new GlobalVariables(
+      new Fr(167n),
+      new Fr(173n),
+      BlockNumber(179),
+      SlotNumber(181),
+      191n,
+      EthAddress.fromField(new Fr(193n)),
+      AztecAddress.fromBigInt(197n),
+      new GasFees(199n, 211n),
+    ),
+    new Fr(223n),
+    new Fr(227n),
+  );
+
+  const txEffect = new TxEffect(
+    RevertCode.REVERTED,
+    TxHash.fromBigInt(229n),
+    new Fr(233n),
+    [new Fr(239n)],
+    [new Fr(241n)],
+    [new Fr(251n)],
+    [new PublicDataWrite(new Fr(257n), new Fr(263n))],
+    [
+      new PrivateLog(
+        paddedFrs([269n, 271n, 277n], PRIVATE_LOG_SIZE_IN_FIELDS) as Tuple<Fr, typeof PRIVATE_LOG_SIZE_IN_FIELDS>,
+        3,
+      ),
+    ],
+    [new PublicLog(AztecAddress.fromBigInt(281n), [new Fr(283n), new Fr(293n)])],
+    [
+      new ContractClassLog(
+        AztecAddress.fromBigInt(307n),
+        new ContractClassLogFields(paddedFrs([311n, 313n, 317n], CONTRACT_CLASS_LOG_SIZE_IN_FIELDS)),
+        3,
+      ),
+    ],
+  );
+
+  return new L2Block(archive, header, new Body([txEffect]), CheckpointNumber(331), IndexWithinCheckpoint(337));
+}
+
+/**
+ * Builds a deterministic, hand-rolled `ContractArtifact` for the ContractStore schema test. Every collection field
+ * has at least one entry so that JSON serialization branches for non-empty arrays and records are exercised; values
+ * are picked to be distinguishable so a reorder or shape change of `ContractArtifact`/`FunctionAbi` is visible in
+ * the snapshot diff.
+ *
+ * Why not import a real noir-compiled artifact? Compiled artifacts embed noir-compiler output (error-type hashes,
+ * debug symbols, struct paths) that drifts across compiler versions and produces spurious schema diffs unrelated to
+ * PXE's on-disk layout.
+ */
+function buildSchemaContractArtifact(): ContractArtifact {
+  return {
+    name: 'SchemaFixtureContract',
+    aztecVersion: 'schema-fixture-version',
+    functions: [
+      {
+        name: 'private_fn',
+        functionType: FunctionType.PRIVATE,
+        isOnlySelf: false,
+        isStatic: false,
+        isInitializer: true,
+        parameters: [
+          { name: 'first', type: { kind: 'field' }, visibility: 'private' },
+          { name: 'second', type: { kind: 'integer', sign: 'unsigned', width: 32 }, visibility: 'public' },
+        ],
+        returnTypes: [{ kind: 'boolean' }],
+        errorTypes: {
+          // Single entry. Exercises the non-empty `Record<string, AbiErrorType>` branch without depending on
+          // noir compiler output.
+          schema_test_error: { error_kind: 'string', string: 'fixed schema-test error' },
+        },
+        bytecode: Buffer.from([2, 3, 5, 7]),
+        debugSymbols: 'schema-fixture-debug',
+      },
+    ],
+    nonDispatchPublicFunctions: [
+      {
+        name: 'public_fn',
+        functionType: FunctionType.PUBLIC,
+        isOnlySelf: true,
+        isStatic: true,
+        isInitializer: false,
+        parameters: [],
+        returnTypes: [],
+        errorTypes: {},
+      },
+    ],
+    outputs: {
+      structs: { my_struct: [{ kind: 'field' }, { kind: 'boolean' }] },
+      globals: {},
+    },
+    storageLayout: { my_field: { slot: new Fr(11n) } },
+    fileMap: {
+      1: {
+        source: 'schema fixture source',
+        path: 'src/schema_fixture.nr',
+        function_locations: [],
+      },
+    },
+  };
+}
diff --git a/yarn-project/pxe/src/storage/backwards_compatibility_tests/store_spy.ts b/yarn-project/pxe/src/storage/backwards_compatibility_tests/store_spy.ts
new file mode 100644
index 000000000000..efd616681f67
--- /dev/null
+++ b/yarn-project/pxe/src/storage/backwards_compatibility_tests/store_spy.ts
@@ -0,0 +1,73 @@
+import type {
+  AztecAsyncArray,
+  AztecAsyncCounter,
+  AztecAsyncKVStore,
+  AztecAsyncMap,
+  AztecAsyncMultiMap,
+  AztecAsyncSet,
+  AztecAsyncSingleton,
+  Key,
+} from '@aztec/kv-store';
+
+type Value = NonNullable<any>;
+
+/** The kind of named sub-store opened on an `AztecAsyncKVStore`. */
+export type StoreKind = 'map' | 'multimap' | 'array' | 'singleton' | 'set' | 'counter';
+
+/** A single recorded `open*()` call against a spied store. */
+export interface OpenedStoreEntry {
+  name: string;
+  kind: StoreKind;
+}
+
+/** A spied `AztecAsyncKVStore` together with a function that returns the sorted log of `open*()` calls. */
+export interface StoreSpy {
+  store: AztecAsyncKVStore;
+  getOpenedStores: () => OpenedStoreEntry[];
+}
+
+/**
+ * Wraps an `AztecAsyncKVStore` so every `openMap`/`openMultiMap`/`openArray`/`openSingleton`/`openSet`/`openCounter`
+ * call is recorded before being delegated to the inner store.
+ */
+export function createStoreSpy(inner: AztecAsyncKVStore): StoreSpy {
+  const entries: OpenedStoreEntry[] = [];
+
+  const store: AztecAsyncKVStore = {
+    openMap<K extends Key, V extends Value>(name: string): AztecAsyncMap<K, V> {
+      entries.push({ name, kind: 'map' });
+      return inner.openMap<K, V>(name);
+    },
+    openMultiMap<K extends Key, V extends Value>(name: string): AztecAsyncMultiMap<K, V> {
+      entries.push({ name, kind: 'multimap' });
+      return inner.openMultiMap<K, V>(name);
+    },
+    openArray<T extends Value>(name: string): AztecAsyncArray<T> {
+      entries.push({ name, kind: 'array' });
+      return inner.openArray<T>(name);
+    },
+    openSingleton<T extends Value>(name: string): AztecAsyncSingleton<T> {
+      entries.push({ name, kind: 'singleton' });
+      return inner.openSingleton<T>(name);
+    },
+    openSet<K extends Key>(name: string): AztecAsyncSet<K> {
+      entries.push({ name, kind: 'set' });
+      return inner.openSet<K>(name);
+    },
+    openCounter<K extends Key>(name: string): AztecAsyncCounter<K> {
+      entries.push({ name, kind: 'counter' });
+      return inner.openCounter<K>(name);
+    },
+    transactionAsync: callback => inner.transactionAsync(callback),
+    clear: () => inner.clear(),
+    delete: () => inner.delete(),
+    estimateSize: () => inner.estimateSize(),
+    close: () => inner.close(),
+    backupTo: (dstPath, compact) => inner.backupTo(dstPath, compact),
+  };
+
+  const getOpenedStores = () =>
+    [...entries].sort((a, b) => (a.name === b.name ? a.kind.localeCompare(b.kind) : a.name.localeCompare(b.name)));
+
+  return { store, getOpenedStores };
+}
diff --git a/yarn-project/pxe/src/storage/open_pxe_stores.ts b/yarn-project/pxe/src/storage/open_pxe_stores.ts
new file mode 100644
index 000000000000..573b85a40984
--- /dev/null
+++ b/yarn-project/pxe/src/storage/open_pxe_stores.ts
@@ -0,0 +1,49 @@
+import { KeyStore } from '@aztec/key-store';
+import type { AztecAsyncKVStore } from '@aztec/kv-store';
+import { L2TipsKVStore } from '@aztec/kv-store/stores';
+import type { BlockHash } from '@aztec/stdlib/block';
+
+import { AddressStore } from './address_store/address_store.js';
+import { AnchorBlockStore } from './anchor_block_store/anchor_block_store.js';
+import { CapsuleStore } from './capsule_store/capsule_store.js';
+import { ContractStore } from './contract_store/contract_store.js';
+import { NoteStore } from './note_store/note_store.js';
+import { PrivateEventStore } from './private_event_store/private_event_store.js';
+import { RecipientTaggingStore, SenderAddressBookStore, SenderTaggingStore } from './tagging_store/index.js';
+
+/**
+ * The set of sub-stores opened against a single `AztecAsyncKVStore` to back PXE state.
+ */
+export type PxeStores = {
+  addressStore: AddressStore;
+  privateEventStore: PrivateEventStore;
+  contractStore: ContractStore;
+  noteStore: NoteStore;
+  anchorBlockStore: AnchorBlockStore;
+  senderTaggingStore: SenderTaggingStore;
+  senderAddressBookStore: SenderAddressBookStore;
+  recipientTaggingStore: RecipientTaggingStore;
+  capsuleStore: CapsuleStore;
+  keyStore: KeyStore;
+  l2TipsStore: L2TipsKVStore;
+};
+
+/**
+ * Opens every PXE sub-store against the given backing store. The `initialBlockHash` seeds the
+ * `L2TipsKVStore` so it agrees with the node's archiver on the dynamic genesis header hash.
+ */
+export function openPxeStores(store: AztecAsyncKVStore, initialBlockHash: BlockHash): PxeStores {
+  return {
+    addressStore: new AddressStore(store),
+    privateEventStore: new PrivateEventStore(store),
+    contractStore: new ContractStore(store),
+    noteStore: new NoteStore(store),
+    anchorBlockStore: new AnchorBlockStore(store),
+    senderTaggingStore: new SenderTaggingStore(store),
+    senderAddressBookStore: new SenderAddressBookStore(store),
+    recipientTaggingStore: new RecipientTaggingStore(store),
+    capsuleStore: new CapsuleStore(store),
+    keyStore: new KeyStore(store),
+    l2TipsStore: new L2TipsKVStore(store, 'pxe', initialBlockHash),
+  };
+}
diff --git a/yarn-project/sequencer-client/src/config.ts b/yarn-project/sequencer-client/src/config.ts
index 6626b8e6f324..25fd297ddbdf 100644
--- a/yarn-project/sequencer-client/src/config.ts
+++ b/yarn-project/sequencer-client/src/config.ts
@@ -5,6 +5,7 @@ import {
   booleanConfigHelper,
   getConfigFromMappings,
   numberConfigHelper,
+  optionalNumberConfigHelper,
   pickConfigMappings,
 } from '@aztec/foundation/config';
 import { EthAddress } from '@aztec/foundation/eth-address';
@@ -13,6 +14,7 @@ import { type P2PConfig, p2pConfigMappings } from '@aztec/p2p/config';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import {
   type ChainConfig,
+  DEFAULT_MAX_BLOCKS_PER_CHECKPOINT,
   type PipelineConfig,
   type SequencerConfig,
   chainConfigMappings,
@@ -58,6 +60,7 @@ export const DefaultSequencerConfig = {
   shuffleAttestationOrdering: false,
   skipPushProposedBlocksToArchiver: false,
   skipPublishingCheckpointsPercent: 0,
+  maxBlocksPerCheckpoint: DEFAULT_MAX_BLOCKS_PER_CHECKPOINT,
 } satisfies ResolvedSequencerConfig;
 
 /**
@@ -83,7 +86,7 @@ export const sequencerConfigMappings: ConfigMappingsType<SequencerConfig> = {
   maxTxsPerCheckpoint: {
     env: 'SEQ_MAX_TX_PER_CHECKPOINT',
     description: 'The maximum number of txs across all blocks in a checkpoint.',
-    parseEnv: (val: string) => parseInt(val, 10),
+    ...optionalNumberConfigHelper(),
   },
   minTxsPerBlock: {
     env: 'SEQ_MIN_TX_PER_BLOCK',
@@ -102,12 +105,12 @@ export const sequencerConfigMappings: ConfigMappingsType<SequencerConfig> = {
   maxL2BlockGas: {
     env: 'SEQ_MAX_L2_BLOCK_GAS',
     description: 'The maximum L2 block gas.',
-    parseEnv: (val: string) => parseInt(val, 10),
+    ...optionalNumberConfigHelper(),
   },
   maxDABlockGas: {
     env: 'SEQ_MAX_DA_BLOCK_GAS',
     description: 'The maximum DA block gas.',
-    parseEnv: (val: string) => parseInt(val, 10),
+    ...optionalNumberConfigHelper(),
   },
   perBlockAllocationMultiplier: {
     env: 'SEQ_PER_BLOCK_ALLOCATION_MULTIPLIER',
@@ -153,7 +156,7 @@ export const sequencerConfigMappings: ConfigMappingsType<SequencerConfig> = {
   l1PublishingTime: {
     env: 'SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT',
     description: 'How much time (in seconds) we allow in the slot for publishing the L1 tx (defaults to 1 L1 slot).',
-    parseEnv: (val: string) => parseInt(val, 10),
+    ...optionalNumberConfigHelper(),
   },
   fakeProcessingDelayPerTxMs: {
     description: 'Used for testing to introduce a fake delay after processing each tx',
@@ -228,6 +231,10 @@ export const sequencerConfigMappings: ConfigMappingsType<SequencerConfig> = {
     description: 'Percent probability (0 - 100) of sequencer skipping checkpoint publishing (testing only)',
     ...numberConfigHelper(DefaultSequencerConfig.skipPublishingCheckpointsPercent),
   },
+  skipBroadcastProposals: {
+    description: 'Skip broadcasting checkpoint and block proposals via gossipsub when proposer (for testing only)',
+    ...booleanConfigHelper(false),
+  },
   ...pickConfigMappings(p2pConfigMappings, ['txPublicSetupAllowListExtend']),
 };
 
diff --git a/yarn-project/sequencer-client/src/publisher/sequencer-publisher.test.ts b/yarn-project/sequencer-client/src/publisher/sequencer-publisher.test.ts
index f492813341b4..c565a79244c9 100644
--- a/yarn-project/sequencer-client/src/publisher/sequencer-publisher.test.ts
+++ b/yarn-project/sequencer-client/src/publisher/sequencer-publisher.test.ts
@@ -56,6 +56,10 @@ describe('compareActions sorting', () => {
 const mockRollupAddress = EthAddress.random().toString();
 const mockGovernanceProposerAddress = EthAddress.random().toString();
 const mockForwarderAddress = EthAddress.random().toString();
+const testSignatureContext = {
+  chainId: 1,
+  rollupAddress: EthAddress.fromString(mockRollupAddress),
+};
 
 describe('SequencerPublisher', () => {
   let rollup: MockProxy<RollupContract>;
@@ -207,7 +211,11 @@ describe('SequencerPublisher', () => {
   it('bundles propose and vote tx to l1', async () => {
     const checkpoint = new Checkpoint(l2Block.archive, header, [l2Block], l2Block.checkpointNumber);
     const expectedBlobs = await getBlobsPerL1Block(checkpoint.toBlobFields());
-    await publisher.enqueueProposeCheckpoint(checkpoint, CommitteeAttestationsAndSigners.empty(), Signature.empty());
+    await publisher.enqueueProposeCheckpoint(
+      checkpoint,
+      CommitteeAttestationsAndSigners.empty(testSignatureContext),
+      Signature.empty(),
+    );
 
     const { govPayload, voteSig } = mockGovernancePayload();
 
@@ -239,7 +247,7 @@ describe('SequencerPublisher', () => {
           feeAssetPriceModifier: 0n,
         },
       },
-      CommitteeAttestationsAndSigners.empty().getPackedAttestations(),
+      CommitteeAttestationsAndSigners.packAttestations([]),
       [],
       Signature.empty().toViemSignature(),
       blobInput,
@@ -290,7 +298,7 @@ describe('SequencerPublisher', () => {
 
     await publisher.enqueueProposeCheckpoint(
       new Checkpoint(l2Block.archive, header, [l2Block], l2Block.checkpointNumber),
-      CommitteeAttestationsAndSigners.empty(),
+      CommitteeAttestationsAndSigners.empty(testSignatureContext),
       Signature.empty(),
     );
     const result = await publisher.sendRequests();
@@ -351,7 +359,7 @@ describe('SequencerPublisher', () => {
 
       await rotatingPublisher.enqueueProposeCheckpoint(
         new Checkpoint(l2Block.archive, header, [l2Block], l2Block.checkpointNumber),
-        CommitteeAttestationsAndSigners.empty(),
+        CommitteeAttestationsAndSigners.empty(testSignatureContext),
         Signature.empty(),
       );
       const result = await rotatingPublisher.sendRequests();
@@ -389,7 +397,7 @@ describe('SequencerPublisher', () => {
 
       await rotatingPublisher.enqueueProposeCheckpoint(
         new Checkpoint(l2Block.archive, header, [l2Block], l2Block.checkpointNumber),
-        CommitteeAttestationsAndSigners.empty(),
+        CommitteeAttestationsAndSigners.empty(testSignatureContext),
         Signature.empty(),
       );
       // TimeoutError propagates to the outer catch in sendRequests which returns undefined
@@ -408,7 +416,7 @@ describe('SequencerPublisher', () => {
 
       await rotatingPublisher.enqueueProposeCheckpoint(
         new Checkpoint(l2Block.archive, header, [l2Block], l2Block.checkpointNumber),
-        CommitteeAttestationsAndSigners.empty(),
+        CommitteeAttestationsAndSigners.empty(testSignatureContext),
         Signature.empty(),
       );
       const result = await rotatingPublisher.sendRequests();
@@ -423,7 +431,7 @@ describe('SequencerPublisher', () => {
 
       await rotatingPublisher.enqueueProposeCheckpoint(
         new Checkpoint(l2Block.archive, header, [l2Block], l2Block.checkpointNumber),
-        CommitteeAttestationsAndSigners.empty(),
+        CommitteeAttestationsAndSigners.empty(testSignatureContext),
         Signature.empty(),
       );
       const result = await rotatingPublisher.sendRequests();
@@ -441,7 +449,7 @@ describe('SequencerPublisher', () => {
     await expect(
       publisher.enqueueProposeCheckpoint(
         new Checkpoint(l2Block.archive, header, [l2Block], l2Block.checkpointNumber),
-        CommitteeAttestationsAndSigners.empty(),
+        CommitteeAttestationsAndSigners.empty(testSignatureContext),
         Signature.empty(),
       ),
     ).rejects.toThrow();
@@ -461,7 +469,7 @@ describe('SequencerPublisher', () => {
 
     await publisher.enqueueProposeCheckpoint(
       new Checkpoint(l2Block.archive, header, [l2Block], l2Block.checkpointNumber),
-      CommitteeAttestationsAndSigners.empty(),
+      CommitteeAttestationsAndSigners.empty(testSignatureContext),
       Signature.empty(),
     );
     const result = await publisher.sendRequests();
@@ -485,7 +493,7 @@ describe('SequencerPublisher', () => {
     );
     await publisher.enqueueProposeCheckpoint(
       new Checkpoint(l2Block.archive, header, [l2Block], l2Block.checkpointNumber),
-      CommitteeAttestationsAndSigners.empty(),
+      CommitteeAttestationsAndSigners.empty(testSignatureContext),
       Signature.empty(),
     );
     publisher.interrupt();
diff --git a/yarn-project/sequencer-client/src/publisher/sequencer-publisher.ts b/yarn-project/sequencer-client/src/publisher/sequencer-publisher.ts
index 29ce86960587..b82a078112c0 100644
--- a/yarn-project/sequencer-client/src/publisher/sequencer-publisher.ts
+++ b/yarn-project/sequencer-client/src/publisher/sequencer-publisher.ts
@@ -709,7 +709,7 @@ export class SequencerPublisher {
 
     const args = [
       header.toViem(),
-      CommitteeAttestationsAndSigners.empty().getPackedAttestations(),
+      CommitteeAttestationsAndSigners.packAttestations([]),
       [], // no signers
       Signature.empty().toViemSignature(),
       `0x${'0'.repeat(64)}`, // 32 empty bytes
@@ -850,9 +850,7 @@ export class SequencerPublisher {
     const logData = { ...checkpoint, reason };
     this.log.debug(`Building invalidate checkpoint ${checkpoint.checkpointNumber} request`, logData);
 
-    const attestationsAndSigners = new CommitteeAttestationsAndSigners(
-      validationResult.attestations,
-    ).getPackedAttestations();
+    const attestationsAndSigners = CommitteeAttestationsAndSigners.packAttestations(validationResult.attestations);
 
     if (reason === 'invalid-attestation') {
       return this.rollupContract.buildInvalidateBadAttestationRequest(
diff --git a/yarn-project/sequencer-client/src/sequencer/README.md b/yarn-project/sequencer-client/src/sequencer/README.md
index cd45b846babd..324eafa13fff 100644
--- a/yarn-project/sequencer-client/src/sequencer/README.md
+++ b/yarn-project/sequencer-client/src/sequencer/README.md
@@ -48,7 +48,7 @@ In a typical configuration without pipelining, a 72-second slot contains:
 - 1 last validator re-execution sub-slot (8 seconds)
 - 1 attestation and publishing period (17 seconds)
 
-With proposer pipelining enabled, the last validator re-execution sub-slot is still reserved, but the checkpoint finalization and L1 publishing budget is no longer subtracted when deciding how many block-building sub-slots fit in the slot.
+With proposer pipelining enabled, the last validator re-execution sub-slot is still reserved, but L1 publishing is deferred to the target slot and removed from the current slot budget. Attestation collection is completed inside the build slot itself, so the proposer can send the L1 transaction immediately at the target-slot boundary.
 
 ### The Fixed Sub-Slot Model
 
@@ -89,7 +89,8 @@ timeReservedAtEnd (normal mode) = blockDuration               (last sub-slot for
                                 + checkpointFinalizationTime
 
 timeReservedAtEnd (pipelining) = assembleTime
-                               + propagationTime             (proposal must reach validators before the slot flips)
+                               + 2 * propagationTime         (proposal out + attestations back)
+                               + blockDuration               (last-block re-execution)
 
 timeAvailableForBlocks = slotDuration - initializationOffset - timeReservedAtEnd
 
@@ -110,47 +111,45 @@ This means:
 
 **The same slot with proposer pipelining enabled:**
 ```
-timeReservedAtEnd = 1s + 2s = 3s
-timeAvailableForBlocks = 72s - 2s - 3s = 67s
-numberOfBlocks = floor(67s / 8s) = 8 blocks
+timeReservedAtEnd = 1s + 2*2s + 8s = 13s
+timeAvailableForBlocks = 72s - 2s - 13s = 57s
+numberOfBlocks = floor(57s / 8s) = 7 blocks
 ```
 
-The extra two block opportunities come from not charging the current slot for checkpoint finalization and L1 publishing.
+The extra two block opportunities come from not charging the current slot for L1 publishing. The proposal broadcast, attestation round-trip, and last-block re-execution are now all reserved inside the build slot so that attestations are in hand at the slot boundary.
 
 ### Pipelining Mode
 
-When proposer pipelining is enabled, the sequencer uses the current wall-clock slot to build the checkpoint for the **next target slot**.
+When proposer pipelining is enabled, the sequencer uses the current wall-clock slot to build the checkpoint for the **next target slot**, and finishes collecting attestations before the slot boundary so that L1 publishing can happen immediately at the target-slot boundary.
 
 It helps to think in terms of two different slots:
 
-- **Wall-clock slot N-1**: The sequencer initializes checkpoint `N`, builds its blocks, and validators re-execute the last block
-- **Target slot N**: Checkpoint `N` is proposed, attestations are gathered, and the L1 transaction is submitted
+- **Wall-clock slot N-1**: The sequencer initializes checkpoint `N`, builds its blocks, validators re-execute the last block, and attestations are gathered
+- **Target slot N**: The checkpoint is submitted to L1
 
 So the work is split like this:
 
-- **During slot N-1**: Initialization, block building, and last-block re-execution
-- **Near the end of slot N-1**: The checkpoint proposal is broadcast so validators can start the last re-execution as slot `N` begins.
-- **During slot N**: Validators finish re-executing, send attestations, the proposer collects them, and the checkpoint is submitted to L1 before slot `N` reaches its publish cutoff
+- **During slot N-1**: Initialization, block building, last-block re-execution, proposal broadcast, and attestation collection
+- **At the start of slot N**: The L1 transaction is submitted — attestations are already in hand
 
-In other words, pipelining does not mean "do everything for slot N earlier". It specifically moves **block production and block re-execution** earlier, while **checkpoint proposal, attestation gathering, and L1 submission** remain aligned with slot `N`.
+In other words, pipelining moves **block production, block re-execution, proposal broadcast, and attestation collection** into the build slot, while **L1 submission** happens aligned with slot `N`. With default values (72s slot, 6s block, 2s p2p, 1s assemble), the last build-slot block finishes at `T = slotDuration - timeReservedAtEnd = 61s`, the proposer broadcasts the checkpoint at `T=62s` after `assembleTime=1s`, and attestations are in hand by `T=72s` (the slot boundary).
 
 **Example: building checkpoint 12 while wall-clock time is in slot 11**
 ```
 Slot 11 (wall clock):
 - Build blocks that will make up checkpoint 12
-- Validators re-execute the last block of checkpoint 12
 - Broadcast checkpoint 12 proposal
-- Collect checkpoint 12 attestations
+- Validators re-execute the last block of checkpoint 12
+- Collect checkpoint 12 attestations (all complete before slot 11 ends)
 
 Slot 12 (target/submission slot):
-- Collect attestations for checkpoint 12 until slot 12 reaches its L1 publish cutoff
-- Submit checkpoint 12 to L1
+- Submit checkpoint 12 to L1 at the slot boundary
 ```
 
-For timetable purposes, this changes two things:
+For timetable purposes:
 
-- `maxNumberOfBlocks` is computed by reserving only the final validator re-execution sub-slot
-- `initializeDeadline` no longer subtracts checkpoint finalization time; it only requires enough time for initialization, execution, and validator re-execution
+- `maxNumberOfBlocks` is computed by reserving assembly + round-trip p2p + last-block re-execution at the end of the slot
+- `initializeDeadline` no longer subtracts checkpoint finalization time; it only requires enough time for initialization and two execution windows
 
 In code, that means:
 
@@ -162,7 +161,7 @@ initializeDeadline (pipelining) =
   slotDuration - initializationOffset - 2 * minExecutionTime
 ```
 
-The fixed sub-slot deadlines themselves do not change. Pipelining only changes how much of the slot is considered available for block building.
+The fixed sub-slot deadlines themselves do not change. Pipelining only changes how much of the slot is considered available for block building, and when the broadcast and attestation windows close.
 
 ## The Sequencer's Work
 
diff --git a/yarn-project/sequencer-client/src/sequencer/checkpoint_proposal_job.test.ts b/yarn-project/sequencer-client/src/sequencer/checkpoint_proposal_job.test.ts
index 317ee9069c9a..059add1b4e0b 100644
--- a/yarn-project/sequencer-client/src/sequencer/checkpoint_proposal_job.test.ts
+++ b/yarn-project/sequencer-client/src/sequencer/checkpoint_proposal_job.test.ts
@@ -41,7 +41,7 @@ import {
   type WorldStateSynchronizer,
 } from '@aztec/stdlib/interfaces/server';
 import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
-import { BlockProposal, CheckpointProposal } from '@aztec/stdlib/p2p';
+import { BlockProposal, CheckpointProposal, type CoordinationSignatureContext } from '@aztec/stdlib/p2p';
 import { CheckpointHeader } from '@aztec/stdlib/rollup';
 import { AppendOnlyTreeSnapshot } from '@aztec/stdlib/trees';
 import { type FailedTx, GlobalVariables, type Tx } from '@aztec/stdlib/tx';
@@ -121,6 +121,10 @@ describe('CheckpointProposalJob', () => {
   const committee = [signer.address];
   const attestorAddress = EthAddress.random();
   const proposer = EthAddress.random();
+  const signatureContext: CoordinationSignatureContext = {
+    chainId: chainId.toNumber(),
+    rollupAddress: EthAddress.random(),
+  };
 
   const getSignatures = () => [mockedAttestation];
 
@@ -247,22 +251,36 @@ describe('CheckpointProposalJob', () => {
           archiveRoot,
           txHashes,
           mockedSig,
+          signatureContext,
         );
       },
     );
     validatorClient.createCheckpointProposal.mockImplementation(
       async (checkpointHeader, archiveRoot, _checkpointNumber, feeAssetPriceModifier, lastBlockInfo) => {
         if (!lastBlockInfo) {
-          return new CheckpointProposal(checkpointHeader, archiveRoot, feeAssetPriceModifier, mockedSig);
+          return new CheckpointProposal(
+            checkpointHeader,
+            archiveRoot,
+            feeAssetPriceModifier,
+            mockedSig,
+            signatureContext,
+          );
         }
         const txHashes = await Promise.all((lastBlockInfo.txs ?? []).map((tx: Tx) => tx.getTxHash()));
-        return new CheckpointProposal(checkpointHeader, archiveRoot, feeAssetPriceModifier, mockedSig, {
-          blockHeader: lastBlockInfo.blockHeader,
-          indexWithinCheckpoint: lastBlockInfo.indexWithinCheckpoint,
-          txHashes,
-          signature: mockedSig,
-          // Note: signedTxs omitted since publishTxsWithProposals is false in tests
-        });
+        return new CheckpointProposal(
+          checkpointHeader,
+          archiveRoot,
+          feeAssetPriceModifier,
+          mockedSig,
+          signatureContext,
+          {
+            blockHeader: lastBlockInfo.blockHeader,
+            indexWithinCheckpoint: lastBlockInfo.indexWithinCheckpoint,
+            txHashes,
+            signature: mockedSig,
+            // Note: signedTxs omitted since publishTxsWithProposals is false in tests
+          },
+        );
       },
     );
     validatorClient.signAttestationsAndSigners.mockImplementation(() => Promise.resolve(getSignatures()[0].signature));
@@ -635,6 +653,7 @@ describe('CheckpointProposalJob', () => {
       checkpointsBuilder as unknown as FullNodeCheckpointsBuilder,
       blockSink,
       l1Constants,
+      signatureContext,
       config,
       timetable,
       slasherClient,
@@ -1245,6 +1264,26 @@ describe('CheckpointProposalJob', () => {
       // waitUntilTimeInSlot should NOT be called since the only block is the last block
       expect(waitSpy).not.toHaveBeenCalled();
     });
+
+    it('stops at maxBlocksPerCheckpoint even when the timetable would allow more', async () => {
+      jest
+        .spyOn(job.getTimetable(), 'canStartNextBlock')
+        .mockReturnValueOnce({ canStart: true, deadline: 4, isLastBlock: false })
+        .mockReturnValueOnce({ canStart: true, deadline: 8, isLastBlock: false })
+        .mockReturnValueOnce({ canStart: true, deadline: 12, isLastBlock: true })
+        .mockReturnValue({ canStart: false, deadline: undefined, isLastBlock: false });
+
+      const { lastBlock } = await setupMultipleBlocks(3, 1);
+      validatorClient.collectAttestations.mockResolvedValue(getAttestations(lastBlock));
+
+      job.updateConfig({ maxBlocksPerCheckpoint: 2 });
+
+      const checkpoint = await job.executeAndAwait();
+
+      expect(checkpoint).toBeDefined();
+      expect(checkpointBuilder.buildBlockCalls).toHaveLength(2);
+      expect(publisher.enqueueProposeCheckpoint).toHaveBeenCalledTimes(1);
+    });
   });
 
   describe('build single block', () => {
@@ -1602,6 +1641,7 @@ function toCheckpointData(checkpoint: Checkpoint): CheckpointData {
     checkpointOutHash: checkpoint.getCheckpointOutHash(),
     startBlock: BlockNumber(checkpoint.blocks[0]?.number ?? 1),
     blockCount: checkpoint.blocks.length,
+    feeAssetPriceModifier: checkpoint.feeAssetPriceModifier,
     attestations: [],
     l1: L1PublishedData.random(),
   };
diff --git a/yarn-project/sequencer-client/src/sequencer/checkpoint_proposal_job.timing.test.ts b/yarn-project/sequencer-client/src/sequencer/checkpoint_proposal_job.timing.test.ts
index b08790baff3d..90f98e39cd02 100644
--- a/yarn-project/sequencer-client/src/sequencer/checkpoint_proposal_job.timing.test.ts
+++ b/yarn-project/sequencer-client/src/sequencer/checkpoint_proposal_job.timing.test.ts
@@ -20,6 +20,7 @@ import type {
   WorldStateSynchronizer,
 } from '@aztec/stdlib/interfaces/server';
 import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
+import type { CoordinationSignatureContext } from '@aztec/stdlib/p2p';
 import { type CheckpointGlobalVariables, GlobalVariables, type Tx } from '@aztec/stdlib/tx';
 import { getTelemetryClient } from '@aztec/telemetry-client';
 import type {
@@ -223,6 +224,10 @@ describe('CheckpointProposalJob Timing Tests', () => {
   const version = Fr.ZERO;
   const coinbase = EthAddress.random();
   const gasFees = GasFees.empty();
+  const signatureContext: CoordinationSignatureContext = {
+    chainId: chainId.toNumber(),
+    rollupAddress: EthAddress.random(),
+  };
   const signer = Secp256k1Signer.random();
   const mockedSig = Signature.random();
   const committee = [signer.address];
@@ -309,6 +314,7 @@ describe('CheckpointProposalJob Timing Tests', () => {
       checkpointsBuilder as unknown as FullNodeCheckpointsBuilder,
       blockSink,
       l1Constants,
+      signatureContext,
       config,
       timetable,
       slasherClient,
@@ -1054,6 +1060,7 @@ describe('CheckpointProposalJob Timing Tests', () => {
         checkpointsBuilder as unknown as FullNodeCheckpointsBuilder,
         blockSink,
         l1Constants,
+        signatureContext,
         config,
         pipeliningTimetable,
         slasherClient,
diff --git a/yarn-project/sequencer-client/src/sequencer/checkpoint_proposal_job.ts b/yarn-project/sequencer-client/src/sequencer/checkpoint_proposal_job.ts
index d880246c0024..27f16178405d 100644
--- a/yarn-project/sequencer-client/src/sequencer/checkpoint_proposal_job.ts
+++ b/yarn-project/sequencer-client/src/sequencer/checkpoint_proposal_job.ts
@@ -46,8 +46,10 @@ import { type L1ToL2MessageSource, computeInHashFromL1ToL2Messages } from '@azte
 import type {
   BlockProposal,
   BlockProposalOptions,
+  CheckpointAttestation,
   CheckpointProposal,
   CheckpointProposalOptions,
+  CoordinationSignatureContext,
 } from '@aztec/stdlib/p2p';
 import { orderAttestations, trimAttestations } from '@aztec/stdlib/p2p';
 import type { L2BlockBuiltStats } from '@aztec/stdlib/stats';
@@ -97,6 +99,7 @@ type CheckpointProposalResult = {
  */
 export class CheckpointProposalJob implements Traceable {
   protected readonly log: Logger;
+  private readonly checkpointEventLog: Logger;
 
   /** Tracks the fire-and-forget L1 submission promise so it can be awaited during shutdown. */
   private pendingL1Submission: Promise<void> | undefined;
@@ -104,6 +107,10 @@ export class CheckpointProposalJob implements Traceable {
   /** Pipelined parent chain state used while building and later submitting this checkpoint. */
   private pipelinedParentSimulationOverridesPlan?: SimulationOverridesPlan;
 
+  private getSignatureContext(): CoordinationSignatureContext {
+    return this.signatureContext;
+  }
+
   constructor(
     private readonly slotNow: SlotNumber,
     private readonly targetSlot: SlotNumber,
@@ -124,6 +131,7 @@ export class CheckpointProposalJob implements Traceable {
     private readonly checkpointsBuilder: FullNodeCheckpointsBuilder,
     private readonly blockSink: L2BlockSink,
     private readonly l1Constants: SequencerRollupConstants,
+    private readonly signatureContext: CoordinationSignatureContext,
     protected config: ResolvedSequencerConfig,
     protected timetable: SequencerTimetable,
     private readonly slasherClient: SlasherClientInterface | undefined,
@@ -141,6 +149,10 @@ export class CheckpointProposalJob implements Traceable {
       ...bindings,
       instanceId: `slot-${this.slotNow}`,
     });
+    this.checkpointEventLog = createLogger('sequencer:checkpoint-events', {
+      ...bindings,
+      instanceId: `slot-${this.slotNow}`,
+    });
   }
 
   /** Awaits the pending L1 submission if one is in progress. Call during shutdown. */
@@ -149,6 +161,13 @@ export class CheckpointProposalJob implements Traceable {
     await this.pendingL1Submission;
   }
 
+  private logCheckpointEvent(eventName: string, message: string, fields: Record<string, unknown>): void {
+    this.checkpointEventLog.debug(message, {
+      eventName: `sequencer-checkpoint-${eventName}`,
+      ...fields,
+    });
+  }
+
   /**
    * Executes the checkpoint proposal job.
    * Builds blocks, assembles checkpoint, and broadcasts the proposal (blocking).
@@ -248,10 +267,34 @@ export class CheckpointProposalJob implements Traceable {
       const l1Response = await this.publisher.sendRequestsAt(submitAfter);
       const proposedAction = l1Response?.successfulActions.find(a => a === 'propose');
       if (proposedAction) {
+        this.logCheckpointEvent('published', `Checkpoint published for slot ${this.targetSlot}`, {
+          slot: this.targetSlot,
+          checkpointNumber: this.checkpointNumber,
+          successfulActions: l1Response?.successfulActions,
+          sentActions: l1Response?.sentActions,
+        });
         this.eventEmitter.emit('checkpoint-published', { checkpoint: this.checkpointNumber, slot: this.targetSlot });
         const coinbase = checkpoint.header.coinbase;
         await this.metrics.incFilledSlot(this.publisher.getSenderAddress().toString(), coinbase);
       } else {
+        this.logCheckpointEvent('publish-failed', `Checkpoint publish failed for slot ${this.targetSlot}`, {
+          slot: this.targetSlot,
+          checkpointNumber: this.checkpointNumber,
+          successfulActions: l1Response?.successfulActions,
+          failedActions: l1Response?.failedActions,
+          sentActions: l1Response?.sentActions,
+          expiredActions: l1Response?.expiredActions,
+          reason: 'propose_action_not_successful',
+        });
+        this.log.warn(`Checkpoint publish failed for slot ${this.targetSlot}`, {
+          slot: this.targetSlot,
+          checkpointNumber: this.checkpointNumber,
+          successfulActions: l1Response?.successfulActions,
+          failedActions: l1Response?.failedActions,
+          sentActions: l1Response?.sentActions,
+          expiredActions: l1Response?.expiredActions,
+          reason: 'propose_action_not_successful',
+        });
         this.eventEmitter.emit('checkpoint-publish-failed', { ...l1Response, slot: this.targetSlot });
         if (isPipelining) {
           this.metrics.recordPipelineDiscard();
@@ -261,7 +304,16 @@ export class CheckpointProposalJob implements Traceable {
       if (err instanceof SequencerInterruptedError) {
         return;
       }
-      this.log.error(`Background attestation/L1 pipeline failed for slot ${this.targetSlot}`, err);
+      this.logCheckpointEvent('publish-failed', `Checkpoint publish failed for slot ${this.targetSlot}`, {
+        slot: this.targetSlot,
+        checkpointNumber: this.checkpointNumber,
+        reason: err instanceof Error ? err.message : String(err),
+      });
+      this.log.error(`Background attestation/L1 pipeline failed for slot ${this.targetSlot}`, err, {
+        slot: this.targetSlot,
+        checkpointNumber: this.checkpointNumber,
+        reason: err instanceof Error ? err.message : String(err),
+      });
       this.eventEmitter.emit('checkpoint-publish-failed', { slot: this.targetSlot });
       if (isPipelining) {
         this.metrics.recordPipelineDiscard();
@@ -466,11 +518,15 @@ export class CheckpointProposalJob implements Traceable {
 
       // Start the checkpoint
       this.setStateFn(SequencerState.INITIALIZING_CHECKPOINT, this.targetSlot);
-      this.log.info(`Starting checkpoint proposal`, {
+      this.logCheckpointEvent('slot-started', `Starting checkpoint proposal for slot ${this.targetSlot}`, {
         buildSlot: this.slotNow,
         submissionSlot: this.targetSlot,
+        slot: this.targetSlot,
+        checkpointNumber: this.checkpointNumber,
         pipelining: this.epochCache.isProposerPipeliningEnabled(),
         proposer: this.proposer?.toString(),
+        attestorAddress: this.attestorAddress.toString(),
+        publisherAddress: this.publisher.getSenderAddress().toString(),
         coinbase: coinbase.toString(),
       });
       this.metrics.incOpenSlot(this.targetSlot, this.proposer?.toString() ?? 'unknown');
@@ -562,16 +618,38 @@ export class CheckpointProposalJob implements Traceable {
       }
 
       if (blocksInCheckpoint.length === 0) {
-        this.log.warn(`No blocks were built for slot ${this.targetSlot}`, { slot: this.targetSlot });
+        this.logCheckpointEvent('build-failed', `Checkpoint build failed for slot ${this.targetSlot}`, {
+          slot: this.targetSlot,
+          checkpointNumber: this.checkpointNumber,
+          reason: 'no_blocks_built',
+        });
+        this.log.warn(`No blocks were built for slot ${this.targetSlot}`, {
+          slot: this.targetSlot,
+          checkpointNumber: this.checkpointNumber,
+          reason: 'no_blocks_built',
+        });
         this.eventEmitter.emit('checkpoint-empty', { slot: this.targetSlot });
         return undefined;
       }
 
       const minBlocksForCheckpoint = this.config.minBlocksForCheckpoint;
       if (minBlocksForCheckpoint !== undefined && blocksInCheckpoint.length < minBlocksForCheckpoint) {
+        this.logCheckpointEvent('build-failed', `Checkpoint build failed for slot ${this.targetSlot}`, {
+          slot: this.targetSlot,
+          checkpointNumber: this.checkpointNumber,
+          blocksBuilt: blocksInCheckpoint.length,
+          minBlocksForCheckpoint,
+          reason: 'min_blocks_not_met',
+        });
         this.log.warn(
           `Checkpoint has fewer blocks than minimum (${blocksInCheckpoint.length} < ${minBlocksForCheckpoint}), skipping proposal`,
-          { slot: this.targetSlot, blocksBuilt: blocksInCheckpoint.length, minBlocksForCheckpoint },
+          {
+            slot: this.targetSlot,
+            checkpointNumber: this.checkpointNumber,
+            blocksBuilt: blocksInCheckpoint.length,
+            minBlocksForCheckpoint,
+            reason: 'min_blocks_not_met',
+          },
         );
         return undefined;
       }
@@ -592,7 +670,18 @@ export class CheckpointProposalJob implements Traceable {
           maxTxsPerCheckpoint: this.config.maxTxsPerCheckpoint,
         });
       } catch (err) {
+        this.logCheckpointEvent('build-failed', `Checkpoint build failed for slot ${this.targetSlot}`, {
+          slot: this.targetSlot,
+          checkpointNumber: this.checkpointNumber,
+          blocksBuilt: blocksInCheckpoint.length,
+          reason: 'invalid_checkpoint',
+          checkpoint: checkpoint.header.toInspect(),
+        });
         this.log.error(`Built an invalid checkpoint at slot ${this.slotNow} (skipping proposal)`, err, {
+          slot: this.targetSlot,
+          checkpointNumber: this.checkpointNumber,
+          blocksBuilt: blocksInCheckpoint.length,
+          reason: 'invalid_checkpoint',
           checkpoint: checkpoint.header.toInspect(),
         });
         return undefined;
@@ -605,6 +694,17 @@ export class CheckpointProposalJob implements Traceable {
         checkpoint.getStats().txCount,
         Number(checkpoint.header.totalManaUsed.toBigInt()),
       );
+      this.logCheckpointEvent('built', `Checkpoint built for slot ${this.targetSlot}`, {
+        slot: this.targetSlot,
+        buildSlot: this.slotNow,
+        checkpointNumber: this.checkpointNumber,
+        proposer: this.proposer?.toString(),
+        attestorAddress: this.attestorAddress.toString(),
+        publisherAddress: this.publisher.getSenderAddress().toString(),
+        blocksBuilt: blocksInCheckpoint.length,
+        txCount: checkpoint.getStats().txCount,
+        totalMana: Number(checkpoint.header.totalManaUsed.toBigInt()),
+      });
 
       // In fisherman mode, return the checkpoint without broadcasting or collecting attestations
       if (this.config.fishermanMode) {
@@ -634,8 +734,10 @@ export class CheckpointProposalJob implements Traceable {
       );
 
       const blockProposedAt = this.dateProvider.now();
-      await this.p2pClient.broadcastCheckpointProposal(proposal);
-      this.checkpointMetrics.noteCheckpointBroadcast(this.dateProvider.now());
+      if (!this.config.skipBroadcastProposals) {
+        await this.p2pClient.broadcastCheckpointProposal(proposal);
+        this.checkpointMetrics.noteCheckpointBroadcast(this.dateProvider.now());
+      }
 
       // Return immediately after broadcast — attestation collection happens in the background
       return { checkpoint, proposal, blockProposedAt };
@@ -675,6 +777,15 @@ export class CheckpointProposalJob implements Traceable {
       const indexWithinCheckpoint = IndexWithinCheckpoint(blocksBuilt);
       const blockNumber = BlockNumber(initialBlockNumber + blocksBuilt);
 
+      if (blocksBuilt >= this.config.maxBlocksPerCheckpoint) {
+        this.log.debug(`Reached max blocks per checkpoint`, {
+          slot: this.targetSlot,
+          blocksBuilt,
+          maxBlocksPerCheckpoint: this.config.maxBlocksPerCheckpoint,
+        });
+        break;
+      }
+
       const secondsIntoSlot = this.getSecondsIntoSlot();
       const timingInfo = this.timetable.canStartNextBlock(secondsIntoSlot);
 
@@ -756,7 +867,9 @@ export class CheckpointProposalJob implements Traceable {
       }
 
       // Once we have a signed proposal and the archiver agreed with our proposed block, then we broadcast it.
-      proposal && (await this.p2pClient.broadcastProposal(proposal));
+      if (proposal && !this.config.skipBroadcastProposals) {
+        await this.p2pClient.broadcastProposal(proposal);
+      }
 
       // Wait until the next block's start time
       await this.waitUntilNextSubslot(timingInfo.deadline);
@@ -830,9 +943,26 @@ export class CheckpointProposalJob implements Traceable {
       // Wait until we have enough txs to build the block
       const { availableTxs, canStartBuilding, minTxs } = await this.waitForMinTxs(opts);
       if (!canStartBuilding) {
+        this.logCheckpointEvent('block-build-failed', `Block build failed for slot ${this.targetSlot}`, {
+          reason: 'insufficient_txs',
+          blockNumber,
+          slot: this.targetSlot,
+          checkpointNumber: this.checkpointNumber,
+          indexWithinCheckpoint,
+          availableTxs,
+          minTxs,
+        });
         this.log.warn(
           `Not enough txs to build block ${blockNumber} at index ${indexWithinCheckpoint} in slot ${this.targetSlot} (got ${availableTxs} txs but needs ${minTxs})`,
-          { blockNumber, slot: this.targetSlot, indexWithinCheckpoint },
+          {
+            reason: 'insufficient_txs',
+            blockNumber,
+            slot: this.targetSlot,
+            checkpointNumber: this.checkpointNumber,
+            indexWithinCheckpoint,
+            availableTxs,
+            minTxs,
+          },
         );
         this.eventEmitter.emit('block-tx-count-check-failed', { minTxs, availableTxs, slot: this.targetSlot });
         this.metrics.recordBlockProposalFailed('insufficient_txs');
@@ -884,10 +1014,21 @@ export class CheckpointProposalJob implements Traceable {
       await this.dropFailedTxsFromP2P(buildResult.failedTxs);
 
       if (buildResult.status === 'insufficient-valid-txs') {
+        this.logCheckpointEvent('block-build-failed', `Block build failed for slot ${this.targetSlot}`, {
+          reason: 'insufficient_valid_txs',
+          slot: this.targetSlot,
+          checkpointNumber: this.checkpointNumber,
+          blockNumber,
+          numTxs: buildResult.processedCount,
+          indexWithinCheckpoint,
+          minValidTxs,
+        });
         this.log.warn(
           `Block ${blockNumber} at index ${indexWithinCheckpoint} on slot ${this.targetSlot} has too few valid txs to be proposed`,
           {
+            reason: 'insufficient_valid_txs',
             slot: this.targetSlot,
+            checkpointNumber: this.checkpointNumber,
             blockNumber,
             numTxs: buildResult.processedCount,
             indexWithinCheckpoint,
@@ -936,7 +1077,18 @@ export class CheckpointProposalJob implements Traceable {
         reason: err.message,
         slot: this.targetSlot,
       });
-      this.log.error(`Error building block`, err, { blockNumber, slot: this.targetSlot });
+      this.logCheckpointEvent('block-build-failed', `Block build failed for slot ${this.targetSlot}`, {
+        reason: err instanceof Error ? err.message : String(err),
+        slot: this.targetSlot,
+        checkpointNumber: this.checkpointNumber,
+        blockNumber,
+      });
+      this.log.error(`Error building block`, err, {
+        reason: err instanceof Error ? err.message : String(err),
+        slot: this.targetSlot,
+        checkpointNumber: this.checkpointNumber,
+        blockNumber,
+      });
       this.metrics.recordBlockProposalFailed(err.name || 'unknown_error');
       this.metrics.recordFailedBlock();
       return { error: err };
@@ -1048,7 +1200,7 @@ export class CheckpointProposalJob implements Traceable {
   ): Promise<CommitteeAttestationsAndSigners | undefined> {
     if (this.config.fishermanMode) {
       this.log.debug('Skipping attestation collection in fisherman mode');
-      return CommitteeAttestationsAndSigners.empty();
+      return CommitteeAttestationsAndSigners.empty(this.getSignatureContext());
     }
 
     const slotNumber = proposal.slotNumber;
@@ -1058,7 +1210,7 @@ export class CheckpointProposalJob implements Traceable {
       throw new Error('No committee when collecting attestations');
     } else if (committee.length === 0) {
       this.log.verbose(`Attesting committee is empty`);
-      return CommitteeAttestationsAndSigners.empty();
+      return CommitteeAttestationsAndSigners.empty(this.getSignatureContext());
     } else {
       this.log.debug(`Attesting committee length is ${committee.length}`, { committee });
     }
@@ -1068,7 +1220,13 @@ export class CheckpointProposalJob implements Traceable {
     if (this.config.skipCollectingAttestations) {
       this.log.warn('Skipping attestation collection as per config (attesting with own keys only)');
       const attestations = await this.validatorClient?.collectOwnAttestations(proposal, this.checkpointNumber);
-      return new CommitteeAttestationsAndSigners(orderAttestations(attestations ?? [], committee));
+      this.logCheckpointAttestations('collected', committee, attestations ?? [], numberOfRequiredAttestations, {
+        reason: 'collect_own_only',
+      });
+      return new CommitteeAttestationsAndSigners(
+        orderAttestations(attestations ?? [], committee),
+        this.getSignatureContext(),
+      );
     }
 
     const attestationTimeAllowed = this.config.enforceTimeTable
@@ -1104,6 +1262,9 @@ export class CheckpointProposalJob implements Traceable {
 
       // Rollup contract requires that the signatures are provided in the order of the committee
       const sorted = orderAttestations(trimmed, committee);
+      this.logCheckpointAttestations('collected', committee, attestations, numberOfRequiredAttestations, {
+        submittedCount: trimmed.length,
+      });
 
       // Manipulate the attestations if we've been configured to do so
       if (
@@ -1115,15 +1276,23 @@ export class CheckpointProposalJob implements Traceable {
         return this.manipulateAttestations(proposal.slotNumber, epoch, seed, committee, sorted);
       }
 
-      return new CommitteeAttestationsAndSigners(sorted);
+      return new CommitteeAttestationsAndSigners(sorted, this.getSignatureContext());
     } catch (err) {
       if (err && err instanceof AttestationTimeoutError) {
         collectedAttestationsCount = err.collectedCount;
+        this.logCheckpointAttestations('failed', committee, undefined, numberOfRequiredAttestations, {
+          collectedCount: collectedAttestationsCount,
+          reason: 'timeout',
+        });
         this.log.error(
           `Timeout while waiting for attestations for checkpoint proposal at slot ${proposal.slotNumber} (collected ${collectedAttestationsCount}/${numberOfRequiredAttestations})`,
           err,
         );
       } else {
+        this.logCheckpointAttestations('failed', committee, undefined, numberOfRequiredAttestations, {
+          collectedCount: collectedAttestationsCount,
+          reason: err instanceof Error ? err.message : String(err),
+        });
         this.log.error(`Error collecting attestations for checkpoint proposal at slot ${proposal.slotNumber}`, err);
       }
       return undefined;
@@ -1132,6 +1301,31 @@ export class CheckpointProposalJob implements Traceable {
     }
   }
 
+  private logCheckpointAttestations(
+    status: 'collected' | 'failed',
+    committee: EthAddress[],
+    attestations: CheckpointAttestation[] | undefined,
+    requiredAttestations: number,
+    opts: { collectedCount?: number; submittedCount?: number; reason?: string } = {},
+  ) {
+    const signedValidators =
+      attestations
+        ?.map(attestation => attestation.getSender()?.toString())
+        .filter((address): address is `0x${string}` => address !== undefined) ?? [];
+    const collectedCount = opts.collectedCount ?? new Set(signedValidators).size;
+    const missingValidatorCount = status === 'failed' ? Math.max(0, requiredAttestations - collectedCount) : undefined;
+    this.logCheckpointEvent(`attestations-${status}`, `Checkpoint attestations ${status} for slot ${this.targetSlot}`, {
+      slot: this.targetSlot,
+      checkpointNumber: this.checkpointNumber,
+      committeeSize: committee.length,
+      requiredAttestations,
+      collectedAttestations: collectedCount,
+      ...(opts.submittedCount !== undefined && { submittedAttestations: opts.submittedCount }),
+      ...(missingValidatorCount !== undefined && { missingValidatorCount }),
+      ...(opts.reason !== undefined && { reason: opts.reason }),
+    });
+  }
+
   /** Breaks the attestations before publishing based on attack configs */
   private manipulateAttestations(
     slotNumber: SlotNumber,
@@ -1175,7 +1369,7 @@ export class CheckpointProposalJob implements Traceable {
           unfreeze(attestations[targetIndex]).signature = generateRecoverableSignature();
         }
       }
-      return new CommitteeAttestationsAndSigners(attestations);
+      return new CommitteeAttestationsAndSigners(attestations, this.getSignatureContext());
     }
 
     if (this.config.shuffleAttestationOrdering) {
@@ -1197,11 +1391,11 @@ export class CheckpointProposalJob implements Traceable {
         [shuffled[i], shuffled[j]] = [shuffled[j], shuffled[i]];
       }
 
-      const signers = new CommitteeAttestationsAndSigners(attestations).getSigners();
-      return new MaliciousCommitteeAttestationsAndSigners(shuffled, signers);
+      const signers = new CommitteeAttestationsAndSigners(attestations, this.getSignatureContext()).getSigners();
+      return new MaliciousCommitteeAttestationsAndSigners(shuffled, signers, this.getSignatureContext());
     }
 
-    return new CommitteeAttestationsAndSigners(attestations);
+    return new CommitteeAttestationsAndSigners(attestations, this.getSignatureContext());
   }
 
   private async dropFailedTxsFromP2P(failedTxs: FailedTx[]) {
diff --git a/yarn-project/sequencer-client/src/sequencer/checkpoint_voter.ha.integration.test.ts b/yarn-project/sequencer-client/src/sequencer/checkpoint_voter.ha.integration.test.ts
index f4ba1f24e434..720e699d3d96 100644
--- a/yarn-project/sequencer-client/src/sequencer/checkpoint_voter.ha.integration.test.ts
+++ b/yarn-project/sequencer-client/src/sequencer/checkpoint_voter.ha.integration.test.ts
@@ -235,6 +235,7 @@ describe('CheckpointVoter HA Integration', () => {
       disableValidator: false,
       disabledValidators: [],
       haSigningEnabled: true,
+      l1ChainId: 1,
       l1Contracts: { rollupAddress: EthAddress.fromString(rollupContract.address.toString()) },
       nodeId: config.nodeId || 'ha-node-1',
       pollingIntervalMs: 100,
diff --git a/yarn-project/sequencer-client/src/sequencer/metrics.ts b/yarn-project/sequencer-client/src/sequencer/metrics.ts
index b1d8e185faef..677f147034bf 100644
--- a/yarn-project/sequencer-client/src/sequencer/metrics.ts
+++ b/yarn-project/sequencer-client/src/sequencer/metrics.ts
@@ -26,6 +26,7 @@ export class SequencerMetrics {
   private blockBuildDuration: Histogram;
   private blockBuildManaPerSecond: Gauge;
   private stateTransitionBufferDuration: Histogram;
+  private stateDuration: Histogram;
 
   // these are gauges because for individual sequencers building a block is not something that happens often enough to warrant a histogram
   private timeToCollectAttestations: Gauge;
@@ -90,6 +91,8 @@ export class SequencerMetrics {
 
     this.stateTransitionBufferDuration = this.meter.createHistogram(Metrics.SEQUENCER_STATE_TRANSITION_BUFFER_DURATION);
 
+    this.stateDuration = this.meter.createHistogram(Metrics.SEQUENCER_STATE_DURATION);
+
     this.rewards = this.meter.createGauge(Metrics.SEQUENCER_CURRENT_SLOT_REWARDS);
 
     this.slots = createUpDownCounterWithDefault(this.meter, Metrics.SEQUENCER_SLOT_COUNT);
@@ -252,6 +255,12 @@ export class SequencerMetrics {
     });
   }
 
+  recordStateDuration(durationMs: number, state: SequencerState) {
+    this.stateDuration.record(Math.ceil(durationMs), {
+      [Attributes.SEQUENCER_STATE]: state,
+    });
+  }
+
   recordPipelineDepth(depth: number) {
     this.pipelineDepth.record(depth);
   }
diff --git a/yarn-project/sequencer-client/src/sequencer/sequencer.test.ts b/yarn-project/sequencer-client/src/sequencer/sequencer.test.ts
index 68fbe922d398..4159fd2f11f9 100644
--- a/yarn-project/sequencer-client/src/sequencer/sequencer.test.ts
+++ b/yarn-project/sequencer-client/src/sequencer/sequencer.test.ts
@@ -29,6 +29,7 @@ import {
   type ValidateCheckpointNegativeResult,
 } from '@aztec/stdlib/block';
 import { Checkpoint } from '@aztec/stdlib/checkpoint';
+import type { ChainConfig } from '@aztec/stdlib/config';
 import type { L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
 import { GasFees } from '@aztec/stdlib/gas';
 import {
@@ -76,6 +77,7 @@ describe('sequencer', () => {
   let newBlockNumber: BlockNumber;
   let newSlotNumber: number;
   let hash: string;
+  let signatureContext: { chainId: number; rollupAddress: EthAddress };
 
   let block: L2Block;
   let globalVariables: GlobalVariables;
@@ -153,7 +155,7 @@ describe('sequencer', () => {
   };
 
   const expectPublisherProposeL2Block = () => {
-    const attestationsAndSigners = new CommitteeAttestationsAndSigners(getSignatures());
+    const attestationsAndSigners = new CommitteeAttestationsAndSigners(getSignatures(), signatureContext);
     expect(publisher.enqueueProposeCheckpoint).toHaveBeenCalledTimes(1);
     expect(publisher.enqueueProposeCheckpoint).toHaveBeenCalledWith(
       expect.any(Checkpoint),
@@ -295,6 +297,10 @@ describe('sequencer', () => {
       getBlockNumber: mockFn().mockResolvedValue(lastBlockNumber),
       getL2Tips: mockFn().mockResolvedValue({
         proposed: { number: lastBlockNumber, hash },
+        proposedCheckpoint: {
+          block: { number: lastBlockNumber, hash },
+          checkpoint: { number: CheckpointNumber.ZERO, hash: GENESIS_CHECKPOINT_HEADER_HASH.toString() },
+        },
         checkpointed: {
           block: { number: lastBlockNumber, hash },
           checkpoint: { number: CheckpointNumber.ZERO, hash: GENESIS_CHECKPOINT_HEADER_HASH.toString() },
@@ -311,17 +317,20 @@ describe('sequencer', () => {
       getL1Timestamp: mockFn().mockResolvedValue(1000n),
       isPendingChainInvalid: mockFn().mockResolvedValue(false),
       getPendingChainValidationStatus: mockFn().mockResolvedValue({ valid: true }),
-      getCheckpointedBlocksForEpoch: mockFn().mockResolvedValue([]),
       getCheckpointsForEpoch: mockFn().mockResolvedValue([]),
       getCheckpointsDataForEpoch: mockFn().mockResolvedValue([]),
       getSyncedL2SlotNumber: mockFn().mockResolvedValue(SlotNumber(Number.MAX_SAFE_INTEGER)),
-      getProposedCheckpoint: mockFn().mockResolvedValue(undefined),
+      getLastCheckpoint: mockFn().mockResolvedValue(undefined),
     });
 
     l1ToL2MessageSource = mock<L1ToL2MessageSource>({
       getL1ToL2Messages: () => Promise.resolve(Array(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP).fill(Fr.ZERO)),
       getL2Tips: mockFn().mockResolvedValue({
         proposed: { number: lastBlockNumber, hash },
+        proposedCheckpoint: {
+          block: { number: lastBlockNumber, hash },
+          checkpoint: { number: CheckpointNumber.ZERO, hash: GENESIS_CHECKPOINT_HEADER_HASH.toString() },
+        },
         checkpointed: {
           block: { number: lastBlockNumber, hash },
           checkpoint: { number: CheckpointNumber.ZERO, hash: GENESIS_CHECKPOINT_HEADER_HASH.toString() },
@@ -350,7 +359,13 @@ describe('sequencer', () => {
 
     dateProvider = new TestDateProvider();
 
-    const config: SequencerConfig = { enforceTimeTable: true, maxTxsPerBlock: 4 };
+    signatureContext = { chainId: chainId.toNumber(), rollupAddress: EthAddress.random() };
+    const config: SequencerConfig & Pick<ChainConfig, 'l1ChainId' | 'l1Contracts'> = {
+      enforceTimeTable: true,
+      maxTxsPerBlock: 4,
+      l1ChainId: signatureContext.chainId,
+      l1Contracts: { rollupAddress: signatureContext.rollupAddress },
+    };
     sequencer = new TestSequencer(
       publisherFactory,
       validatorClient,
@@ -586,7 +601,7 @@ describe('sequencer', () => {
         await sequencer.work();
         await sequencer.awaitLastProposalSubmission();
 
-        const attestationsAndSigners = new CommitteeAttestationsAndSigners(getSignatures());
+        const attestationsAndSigners = new CommitteeAttestationsAndSigners(getSignatures(), signatureContext);
         expect(publishers[i].enqueueProposeCheckpoint).toHaveBeenCalledTimes(1);
         expect(publishers[i].enqueueProposeCheckpoint).toHaveBeenCalledWith(
           expect.any(Checkpoint),
@@ -1060,7 +1075,7 @@ describe('sequencer', () => {
         checkpointNumber: CheckpointNumber(1),
         indexWithinCheckpoint: IndexWithinCheckpoint(0),
       } satisfies BlockData);
-      l2BlockSource.getProposedCheckpoint.mockResolvedValue({
+      l2BlockSource.getLastCheckpoint.mockResolvedValue({
         checkpointNumber: CheckpointNumber(1),
       } as any);
 
@@ -1121,7 +1136,7 @@ describe('sequencer', () => {
         checkpointNumber: CheckpointNumber(3),
         indexWithinCheckpoint: IndexWithinCheckpoint(0),
       } satisfies BlockData);
-      l2BlockSource.getProposedCheckpoint.mockResolvedValue({
+      l2BlockSource.getLastCheckpoint.mockResolvedValue({
         checkpointNumber: CheckpointNumber(2),
       } as any);
 
diff --git a/yarn-project/sequencer-client/src/sequencer/sequencer.ts b/yarn-project/sequencer-client/src/sequencer/sequencer.ts
index 3ea6547592e2..0e7f3ab55c29 100644
--- a/yarn-project/sequencer-client/src/sequencer/sequencer.ts
+++ b/yarn-project/sequencer-client/src/sequencer/sequencer.ts
@@ -1,12 +1,11 @@
 import { getKzg } from '@aztec/blob-lib';
-import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
 import type { EpochCache } from '@aztec/epoch-cache';
 import { NoCommitteeError, type RollupContract, SimulationOverridesBuilder } from '@aztec/ethereum/contracts';
 import { BlockNumber, CheckpointNumber, EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
 import { merge, omit, pick } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { createLogger } from '@aztec/foundation/log';
+import { type Logger, createLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
 import type { DateProvider } from '@aztec/foundation/timer';
 import type { TypedEventEmitter } from '@aztec/foundation/types';
@@ -14,6 +13,7 @@ import type { P2P } from '@aztec/p2p';
 import type { SlasherClientInterface } from '@aztec/slasher';
 import type { BlockData, L2BlockSink, L2BlockSource, ValidateCheckpointResult } from '@aztec/stdlib/block';
 import type { Checkpoint, ProposedCheckpointData } from '@aztec/stdlib/checkpoint';
+import type { ChainConfig } from '@aztec/stdlib/config';
 import { getSlotStartBuildTimestamp } from '@aztec/stdlib/epoch-helpers';
 import {
   type ResolvedSequencerConfig,
@@ -22,8 +22,8 @@ import {
   type WorldStateSynchronizer,
 } from '@aztec/stdlib/interfaces/server';
 import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
+import type { CoordinationSignatureContext } from '@aztec/stdlib/p2p';
 import { pickFromSchema } from '@aztec/stdlib/schemas';
-import { MerkleTreeId } from '@aztec/stdlib/trees';
 import { Attributes, type TelemetryClient, type Tracer, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
 import { FullNodeCheckpointsBuilder, NodeKeystoreAdapter, type ValidatorClient } from '@aztec/validator-client';
 
@@ -56,8 +56,11 @@ export { SequencerState };
 export class Sequencer extends (EventEmitter as new () => TypedEventEmitter<SequencerEvents>) {
   private runningPromise?: RunningPromise;
   private state = SequencerState.STOPPED;
+  private stateSlotNumber: SlotNumber | undefined;
+  private stateEnteredAtMs = performance.now();
   private metrics: SequencerMetrics;
   private checkpointProposalJobMetrics: CheckpointProposalJobMetrics;
+  private readonly stateLog: Logger;
 
   /** The last slot for which we attempted to perform our voting duties with degraded block production */
   private lastSlotForFallbackVote: SlotNumber | undefined;
@@ -82,6 +85,7 @@ export class Sequencer extends (EventEmitter as new () => TypedEventEmitter<Sequ
 
   /** Config for the sequencer */
   protected config: ResolvedSequencerConfig = DefaultSequencerConfig;
+  private readonly signatureContext: CoordinationSignatureContext;
 
   constructor(
     protected publisherFactory: SequencerPublisherFactory,
@@ -97,17 +101,22 @@ export class Sequencer extends (EventEmitter as new () => TypedEventEmitter<Sequ
     protected dateProvider: DateProvider,
     protected epochCache: EpochCache,
     protected rollupContract: RollupContract,
-    config: SequencerConfig,
+    config: SequencerConfig & Pick<ChainConfig, 'l1ChainId' | 'l1Contracts'>,
     protected telemetry: TelemetryClient = getTelemetryClient(),
     protected log = createLogger('sequencer'),
   ) {
     super();
+    this.stateLog = log.createChild('state');
 
     // Add [FISHERMAN] prefix to logger if in fisherman mode
     if (config.fishermanMode) {
       this.log = log.createChild('[FISHERMAN]');
     }
 
+    this.signatureContext = {
+      chainId: config.l1ChainId,
+      rollupAddress: config.l1Contracts.rollupAddress,
+    };
     this.metrics = new SequencerMetrics(telemetry, this.rollupContract, 'Sequencer');
     this.checkpointProposalJobMetrics = new CheckpointProposalJobMetrics(telemetry);
     this.updateConfig(config);
@@ -377,7 +386,7 @@ export class Sequencer extends (EventEmitter as new () => TypedEventEmitter<Sequ
       // and the archive at that checkpoint so L1 simulation sees the correct chain tip.
       const parentCheckpointNumber = CheckpointNumber(checkpointNumber - 1);
       l1SimulationOverridesBuilder.forPendingCheckpoint(parentCheckpointNumber).withPendingArchive(syncedTo.archive);
-      this.metrics.recordPipelineDepth(1);
+      this.metrics.recordPipelineDepth(syncedTo.checkpointNumber - syncedTo.checkpointedCheckpointNumber);
 
       this.log.verbose(
         `Building on top of proposed checkpoint (pending=${syncedTo.proposedCheckpointData?.checkpointNumber})`,
@@ -489,6 +498,7 @@ export class Sequencer extends (EventEmitter as new () => TypedEventEmitter<Sequ
       this.checkpointsBuilder,
       this.l2BlockSource,
       this.l1Constants,
+      this.signatureContext,
       this.config,
       this.timetable,
       this.slasherClient,
@@ -536,19 +546,35 @@ export class Sequencer extends (EventEmitter as new () => TypedEventEmitter<Sequ
       this.timetable.assertTimeLeft(proposedState, secondsIntoSlot);
     }
 
+    const oldState = this.state;
+    const oldStateSlotNumber = this.stateSlotNumber;
+    const stateChanged = proposedState !== oldState;
+    const transitionAtMs = performance.now();
+    const stateDurationMs = transitionAtMs - this.stateEnteredAtMs;
+
     const boringStates = [SequencerState.IDLE, SequencerState.SYNCHRONIZING];
     const logLevel =
-      boringStates.includes(proposedState) && boringStates.includes(this.state)
-        ? ('trace' as const)
-        : ('debug' as const);
-    this.log[logLevel](`Transitioning from ${this.state} to ${proposedState}`, { slotNumber, secondsIntoSlot });
+      boringStates.includes(proposedState) && boringStates.includes(oldState) ? ('trace' as const) : ('debug' as const);
+    this.stateLog[logLevel](`Transitioning from ${oldState} to ${proposedState}`, {
+      oldState,
+      newState: proposedState,
+      slotNumber,
+      stateSlotNumber: oldStateSlotNumber,
+      secondsIntoSlot,
+      ...(stateChanged && { stateDurationMs: Math.ceil(stateDurationMs) }),
+    });
 
     this.emit('state-changed', {
-      oldState: this.state,
+      oldState,
       newState: proposedState,
       secondsIntoSlot,
       slot: slotNumber,
     });
+    if (stateChanged) {
+      this.metrics.recordStateDuration(stateDurationMs, oldState);
+      this.stateEnteredAtMs = transitionAtMs;
+      this.stateSlotNumber = slotNumber;
+    }
     this.state = proposedState;
   }
 
@@ -581,29 +607,18 @@ export class Sequencer extends (EventEmitter as new () => TypedEventEmitter<Sequ
       this.p2pClient.getStatus().then(p2p => p2p.syncedToL2Block),
       this.l1ToL2MessageSource.getL2Tips().then(t => ({ proposed: t.proposed, checkpointed: t.checkpointed })),
       this.l2BlockSource.getPendingChainValidationStatus(),
-      this.l2BlockSource.getProposedCheckpointOnly(),
+      this.l2BlockSource.getLastProposedCheckpoint(),
     ] as const);
 
     const [worldState, l2Tips, p2p, l1ToL2MessageSourceTips, pendingChainValidationStatus, proposedCheckpointData] =
       syncedBlocks;
 
-    // Handle zero as a special case, since the block hash won't match across services if we're changing the prefilled data for the genesis block,
-    // as the world state can compute the new genesis block hash, but other components use the hardcoded constant.
-    // TODO(palla/mbps): Fix the above. All components should be able to handle dynamic genesis block hashes.
     const result =
-      (l2Tips.proposed.number === 0 &&
-        l2Tips.checkpointed.block.number === 0 &&
-        l2Tips.checkpointed.checkpoint.number === 0 &&
-        worldState.number === 0 &&
-        p2p.number === 0 &&
-        l1ToL2MessageSourceTips.proposed.number === 0 &&
-        l1ToL2MessageSourceTips.checkpointed.block.number === 0 &&
-        l1ToL2MessageSourceTips.checkpointed.checkpoint.number === 0) ||
-      (worldState.hash === l2Tips.proposed.hash &&
-        p2p.hash === l2Tips.proposed.hash &&
-        l1ToL2MessageSourceTips.proposed.hash === l2Tips.proposed.hash &&
-        l1ToL2MessageSourceTips.checkpointed.block.hash === l2Tips.checkpointed.block.hash &&
-        l1ToL2MessageSourceTips.checkpointed.checkpoint.hash === l2Tips.checkpointed.checkpoint.hash);
+      worldState.hash === l2Tips.proposed.hash &&
+      p2p.hash === l2Tips.proposed.hash &&
+      l1ToL2MessageSourceTips.proposed.hash === l2Tips.proposed.hash &&
+      l1ToL2MessageSourceTips.checkpointed.block.hash === l2Tips.checkpointed.block.hash &&
+      l1ToL2MessageSourceTips.checkpointed.checkpoint.hash === l2Tips.checkpointed.checkpoint.hash;
 
     if (!result) {
       this.log.debug(`Sequencer sync check failed`, {
@@ -615,22 +630,8 @@ export class Sequencer extends (EventEmitter as new () => TypedEventEmitter<Sequ
       return undefined;
     }
 
-    // Special case for genesis state
     const blockNumber = worldState.number;
-    if (blockNumber < INITIAL_L2_BLOCK_NUM) {
-      const archive = new Fr((await this.worldState.getCommitted().getTreeInfo(MerkleTreeId.ARCHIVE)).root);
-      return {
-        checkpointNumber: CheckpointNumber.ZERO,
-        checkpointedCheckpointNumber: CheckpointNumber.ZERO,
-        blockNumber: BlockNumber.ZERO,
-        archive,
-        hasProposedCheckpoint: false,
-        syncedL2Slot,
-        pendingChainValidationStatus,
-      };
-    }
-
-    const blockData = await this.l2BlockSource.getBlockData(blockNumber);
+    const blockData = await this.l2BlockSource.getBlockData({ number: blockNumber });
     if (!blockData) {
       // this shouldn't really happen because a moment ago we checked that all components were in sync
       this.log.error(`Failed to get L2 block data ${blockNumber} from the archiver with all components in sync`);
diff --git a/yarn-project/sequencer-client/src/sequencer/timetable.test.ts b/yarn-project/sequencer-client/src/sequencer/timetable.test.ts
index a11e1653798f..eb2dbc9c1697 100644
--- a/yarn-project/sequencer-client/src/sequencer/timetable.test.ts
+++ b/yarn-project/sequencer-client/src/sequencer/timetable.test.ts
@@ -483,7 +483,7 @@ describe('sequencer-timetable', () => {
       expect((tt.maxNumberOfBlocks + 1) * blockDuration).toBeGreaterThan(timeAvailableForBlocks);
     });
 
-    it('fits 12 pipelined blocks in a 72s slot with 5.5s cadence', () => {
+    it('fits 11 pipelined blocks in a 72s slot with 5.5s cadence', () => {
       const tt = new SequencerTimetable({
         ethereumSlotDuration: ETHEREUM_SLOT_DURATION,
         aztecSlotDuration: AZTEC_SLOT_DURATION,
@@ -493,8 +493,9 @@ describe('sequencer-timetable', () => {
         pipelining: true,
       });
 
-      expect(tt.maxNumberOfBlocks).toBe(12);
-      expect(tt.pipeliningAttestationGracePeriod).toBe(BLOCK_DURATION_MS / 1000 + tt.p2pPropagationTime);
+      // reserved = assemble(1) + 2*p2p(2) + block(5.5) = 10.5; available = 72 - 1 - 10.5 = 60.5; floor(60.5/5.5) = 11
+      expect(tt.maxNumberOfBlocks).toBe(11);
+      expect(tt.pipeliningAttestationGracePeriod).toBe(0);
     });
   });
 
@@ -516,7 +517,7 @@ describe('sequencer-timetable', () => {
       expect(withPipelining.maxNumberOfBlocks).toBeGreaterThan(withoutPipelining.maxNumberOfBlocks);
     });
 
-    it('reserves time for assembly and one-way broadcast at end of slot', () => {
+    it('reserves time for assembly, round-trip broadcast, and re-execution at end of slot', () => {
       const tt = new SequencerTimetable({
         ethereumSlotDuration: ETHEREUM_SLOT_DURATION,
         aztecSlotDuration: AZTEC_SLOT_DURATION,
@@ -527,8 +528,8 @@ describe('sequencer-timetable', () => {
       });
 
       const blockDuration = BLOCK_DURATION_MS / 1000;
-      // Reserves assembleTime + p2pPropagation (one-way broadcast) at end
-      const timeReservedAtEnd = tt.checkpointAssembleTime + tt.p2pPropagationTime;
+      // Reserves assembleTime + round-trip p2p + last-block re-execution at end
+      const timeReservedAtEnd = tt.checkpointAssembleTime + 2 * tt.p2pPropagationTime + blockDuration;
       const availableTime = AZTEC_SLOT_DURATION - tt.initializationOffset - timeReservedAtEnd;
       expect(tt.maxNumberOfBlocks).toBe(Math.floor(availableTime / blockDuration));
     });
@@ -561,11 +562,11 @@ describe('sequencer-timetable', () => {
       });
 
       // With pipelining and test config (ethereumSlotDuration < 8):
-      // init=0.5, reservedAtEnd = 0.5 + 0 = 0.5, available = 36 - 0.5 - 0.5 = 35, floor(35/8) = 4
-      expect(tt.maxNumberOfBlocks).toBe(4);
+      // init=0.5, assemble=0.5, p2p=0.5, reservedAtEnd = 0.5 + 2*0.5 + 8 = 9.5, available = 36 - 0.5 - 9.5 = 26, floor(26/8) = 3
+      expect(tt.maxNumberOfBlocks).toBe(3);
     });
 
-    it('sets pipeliningAttestationGracePeriod to blockDuration + p2pPropagationTime', () => {
+    it('sets pipeliningAttestationGracePeriod to zero under early pipelining', () => {
       const tt = new SequencerTimetable({
         ethereumSlotDuration: ETHEREUM_SLOT_DURATION,
         aztecSlotDuration: AZTEC_SLOT_DURATION,
@@ -575,7 +576,7 @@ describe('sequencer-timetable', () => {
         pipelining: true,
       });
 
-      expect(tt.pipeliningAttestationGracePeriod).toBe(tt.blockDuration! + tt.p2pPropagationTime);
+      expect(tt.pipeliningAttestationGracePeriod).toBe(0);
     });
 
     it('uses separate pipelined deadlines for attestation start vs publish cutoff', () => {
diff --git a/yarn-project/sequencer-client/src/test/utils.ts b/yarn-project/sequencer-client/src/test/utils.ts
index 4da8e08e3a6a..20343e0b1608 100644
--- a/yarn-project/sequencer-client/src/test/utils.ts
+++ b/yarn-project/sequencer-client/src/test/utils.ts
@@ -10,7 +10,11 @@ import { PublicDataWrite } from '@aztec/stdlib/avm';
 import { CommitteeAttestation, L2Block } from '@aztec/stdlib/block';
 import { BlockProposal, CheckpointAttestation, CheckpointProposal, ConsensusPayload } from '@aztec/stdlib/p2p';
 import { CheckpointHeader } from '@aztec/stdlib/rollup';
-import { makeAppendOnlyTreeSnapshot, mockTxForRollup } from '@aztec/stdlib/testing';
+import {
+  TEST_COORDINATION_SIGNATURE_CONTEXT,
+  makeAppendOnlyTreeSnapshot,
+  mockTxForRollup,
+} from '@aztec/stdlib/testing';
 import { BlockHeader, GlobalVariables, type Tx, makeProcessedTxFromPrivateOnlyTx } from '@aztec/stdlib/tx';
 
 import type { MockProxy } from 'jest-mock-extended';
@@ -109,6 +113,7 @@ export function createBlockProposal(block: L2Block, signature: Signature): Block
     block.archive.root,
     txHashes,
     signature,
+    TEST_COORDINATION_SIGNATURE_CONTEXT,
   );
 }
 
@@ -123,12 +128,19 @@ export function createCheckpointProposal(
 ): CheckpointProposal {
   const txHashes = block.body.txEffects.map(tx => tx.txHash);
   const checkpointHeader = createCheckpointHeaderFromBlock(block);
-  return new CheckpointProposal(checkpointHeader, block.archive.root, feeAssetPriceModifier, checkpointSignature, {
-    blockHeader: block.header,
-    indexWithinCheckpoint: block.indexWithinCheckpoint,
-    txHashes,
-    signature: blockSignature ?? checkpointSignature, // Use checkpoint signature as block signature if not provided
-  });
+  return new CheckpointProposal(
+    checkpointHeader,
+    block.archive.root,
+    feeAssetPriceModifier,
+    checkpointSignature,
+    TEST_COORDINATION_SIGNATURE_CONTEXT,
+    {
+      blockHeader: block.header,
+      indexWithinCheckpoint: block.indexWithinCheckpoint,
+      txHashes,
+      signature: blockSignature ?? checkpointSignature, // Use checkpoint signature as block signature if not provided
+    },
+  );
 }
 
 /**
@@ -143,10 +155,16 @@ export function createCheckpointAttestation(
   feeAssetPriceModifier: bigint = 0n,
 ): CheckpointAttestation {
   const checkpointHeader = createCheckpointHeaderFromBlock(block);
-  const payload = new ConsensusPayload(checkpointHeader, block.archive.root, feeAssetPriceModifier);
+  const payload = new ConsensusPayload(
+    checkpointHeader,
+    block.archive.root,
+    feeAssetPriceModifier,
+    TEST_COORDINATION_SIGNATURE_CONTEXT,
+  );
   const attestation = new CheckpointAttestation(payload, signature, signature);
-  // Set sender directly for testing (bypasses signature recovery)
-  (attestation as any).sender = sender;
+  // Bypass signature recovery for testing since we use random signatures
+  (attestation as any).getSender = () => sender;
+  (attestation as any).getProposer = () => sender;
   return attestation;
 }
 
diff --git a/yarn-project/sqlite3mc-wasm/README.md b/yarn-project/sqlite3mc-wasm/README.md
new file mode 100644
index 000000000000..d16c3fa2c356
--- /dev/null
+++ b/yarn-project/sqlite3mc-wasm/README.md
@@ -0,0 +1,112 @@
+# @aztec/sqlite3mc-wasm
+
+SQLite3 Multiple Ciphers v2.2.4 (based on SQLite 3.50.4) packaged as a WASM
+module.
+
+Upstream: https://github.com/utelle/SQLite3MultipleCiphers
+
+Cipher schemes enabled: ChaCha20 (PRAGMA cipher = chacha20), SQLCipher v4,
+AES-256, and others. See sqlite3mc upstream docs.
+
+Usage: import sqlite3InitModule from @aztec/sqlite3mc-wasm. API is identical
+to @sqlite.org/sqlite-wasm; sqlite3mc is a strict superset.
+
+License: sqlite3mc is MIT-licensed.
+
+## How vendoring works
+
+Upstream WASM/JS artifacts under `vendor/jswasm/` are fetched at build time. The committed state of the directory is:
+
+| File                              | Why                                                                                                                                    |
+|-----------------------------------|----------------------------------------------------------------------------------------------------------------------------------------|
+| `.gitignore`                      | Allowlist that keeps the rest of `vendor/jswasm/` out of git                                                                           |
+| `SHA256SUMS`                      | Per-file integrity manifest. Pinned at vendoring time; verified at every build                                                         |
+| `sqlite3-bundler-friendly.d.mts`  | Locally-authored TypeScript declaration companion for the upstream `.mjs`. Required by TS NodeNext module resolution.                  |
+
+Everything else in `vendor/jswasm/` (the actual `.wasm`, `.mjs`, `.js`) is populated by `scripts/vendor.sh`, which is
+invoked from `yarn-project/bootstrap.sh` before any package compiles. It downloads the upstream release zip, verifies
+its SHA256 against the pinned value, extracts the WASM/JS files, and regenerates `SHA256SUMS`. On CI cache hits the
+files come back via the build cache without re-fetching from upstream.
+
+The pinned upstream version lives in `scripts/vendor.pin`:
+
+```sh
+MC_VERSION=2.2.4
+SQLITE_VERSION=3.50.4
+SHA256=e73514200d76286d7d4a239589589b4f64d24ac4f4f7b2760e1f07b14ac5f6a5
+```
+
+## Verification (full chain)
+
+Run from this package's root, after `scripts/vendor.sh ensure` has populated `vendor/jswasm/`.
+
+### Step 1: zip matches the pinned SHA
+
+The build script verifies this automatically. To check by hand:
+
+```bash
+source scripts/vendor.pin
+curl -sL "https://github.com/utelle/SQLite3MultipleCiphers/releases/download/v${MC_VERSION}/sqlite3mc-${MC_VERSION}-sqlite-${SQLITE_VERSION}-wasm.zip" \
+  | sha256sum
+# Expected: matches $SHA256 from scripts/vendor.pin
+```
+
+If this fails: upstream re-released the asset, or the artifact was tampered with in transit. Investigate before
+trusting any subsequent check.
+
+### Step 2: vendored files match the manifest
+
+```bash
+cd vendor/jswasm && sha256sum -c SHA256SUMS
+```
+
+Expected output: every file reports `OK`.
+
+If any file reports `FAILED`: the file's bytes differ from what was recorded at vendoring time. Either the file was
+modified post-fetch (via pre-commit hooks, accidental edits, etc.), or `SHA256SUMS` itself was tampered with. Both
+cases need investigation, the build should not be trusted.
+
+### Step 3 (optional, stronger): independently re-derive SHA256SUMS from the zip
+
+A reviewer who wants to prove `SHA256SUMS` itself wasn't tampered with can regenerate it from the upstream zip:
+
+```bash
+source scripts/vendor.pin
+curl -sL "https://github.com/utelle/SQLite3MultipleCiphers/releases/download/v${MC_VERSION}/sqlite3mc-${MC_VERSION}-sqlite-${SQLITE_VERSION}-wasm.zip" -o /tmp/sqlite3mc.zip
+unzip -q /tmp/sqlite3mc.zip -d /tmp/sqlite3mc-check
+
+# Compute per-file hashes from the extracted jswasm/
+(cd /tmp/sqlite3mc-check/sqlite3mc-wasm-* && cd jswasm && sha256sum -- * | sort -k2) > /tmp/upstream-sums
+
+# Compare against repo's SHA256SUMS, excluding our locally-authored d.mts
+grep -v 'sqlite3-bundler-friendly\.d\.mts' vendor/jswasm/SHA256SUMS | sort -k2 > /tmp/repo-sums
+diff /tmp/upstream-sums /tmp/repo-sums
+```
+
+Expected: empty diff. Any output means either upstream files have been modified or `SHA256SUMS` claims different hashes
+than the zip.
+
+## Bumping the pinned version
+
+1. Edit `scripts/vendor.pin` with the new `MC_VERSION`, `SQLITE_VERSION`, and the SHA256 of the new release zip (find
+   it in the upstream release notes or compute it: `curl -sL <url> | sha256sum`).
+2. Run `scripts/vendor.sh` (no args). It fetches the new release, verifies the SHA, replaces `vendor/jswasm/`, and
+   regenerates `SHA256SUMS`.
+3. Re-run kv-store tests to confirm compatibility: `yarn workspace @aztec/kv-store test:browser`
+4. Commit `scripts/vendor.pin` and `vendor/jswasm/SHA256SUMS` together.
+
+To verify a candidate release before editing the pin file:
+
+```bash
+scripts/vendor.sh <mc-version> <sqlite-version> <expected-sha256>
+```
+
+The 3-argument form overrides the pin file but does not modify it.
+
+## Why `vendor/` is excluded from prettier
+
+The repo's `.prettierignore` includes `sqlite3mc-wasm/vendor/`. Without this, pre-commit hooks would silently reformat
+the upstream `.js` / `.mjs` files between fetch and the next commit (whitespace only, semantically identical, but
+cryptographically different bytes), breaking the verification chain above.
+
+If you see prettier formatting drift in this directory, the ignore entry is missing or misconfigured.
diff --git a/yarn-project/sqlite3mc-wasm/eslint.config.js b/yarn-project/sqlite3mc-wasm/eslint.config.js
new file mode 100644
index 000000000000..a928030d8182
--- /dev/null
+++ b/yarn-project/sqlite3mc-wasm/eslint.config.js
@@ -0,0 +1,5 @@
+import config from '@aztec/foundation/eslint';
+
+import { globalIgnores } from 'eslint/config';
+
+export default [globalIgnores(['vendor/**']), ...config];
diff --git a/yarn-project/sqlite3mc-wasm/package.json b/yarn-project/sqlite3mc-wasm/package.json
new file mode 100644
index 000000000000..a7644570650b
--- /dev/null
+++ b/yarn-project/sqlite3mc-wasm/package.json
@@ -0,0 +1,77 @@
+{
+  "name": "@aztec/sqlite3mc-wasm",
+  "version": "0.1.0",
+  "type": "module",
+  "exports": {
+    ".": {
+      "types": "./dest/src/index.d.ts",
+      "import": "./dest/index.js"
+    },
+    "./vendor/jswasm/sqlite3.wasm": "./vendor/jswasm/sqlite3.wasm",
+    "./vendor/jswasm/sqlite3-opfs-async-proxy.js": "./vendor/jswasm/sqlite3-opfs-async-proxy.js"
+  },
+  "inherits": [
+    "../package.common.json",
+    "./package.local.json"
+  ],
+  "scripts": {
+    "build": "yarn clean && ../scripts/tsc.sh",
+    "clean": "rm -rf ./dest .tsbuildinfo",
+    "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}",
+    "build:dev": "../scripts/tsc.sh --watch"
+  },
+  "devDependencies": {
+    "@jest/globals": "^30.0.0",
+    "@sqlite.org/sqlite-wasm": "3.50.4-build1",
+    "@typescript/native-preview": "7.0.0-dev.20260113.1",
+    "jest": "^30.0.0",
+    "ts-node": "^10.9.1",
+    "typescript": "^5.3.3"
+  },
+  "files": [
+    "src",
+    "vendor",
+    "dest",
+    "!*.test.*"
+  ],
+  "engines": {
+    "node": ">=20.10"
+  },
+  "jest": {
+    "extensionsToTreatAsEsm": [
+      ".ts"
+    ],
+    "transform": {
+      "^.+\\.tsx?$": [
+        "@swc/jest",
+        {
+          "jsc": {
+            "parser": {
+              "syntax": "typescript",
+              "decorators": true
+            },
+            "transform": {
+              "decoratorVersion": "2022-03"
+            }
+          }
+        }
+      ]
+    },
+    "moduleNameMapper": {
+      "^(\\.{1,2}/.*)\\.[cm]?js$": "$1"
+    },
+    "reporters": [
+      "default"
+    ],
+    "testTimeout": 120000,
+    "testRegex": "./src/.*\\.test\\.(js|mjs|ts)$",
+    "rootDir": "./src",
+    "setupFiles": [
+      "../../foundation/src/jest/setup.mjs"
+    ],
+    "setupFilesAfterEnv": [
+      "../../foundation/src/jest/setupAfterEnv.mjs"
+    ],
+    "testEnvironment": "../../foundation/src/jest/env.mjs"
+  }
+}
diff --git a/yarn-project/sqlite3mc-wasm/package.local.json b/yarn-project/sqlite3mc-wasm/package.local.json
new file mode 100644
index 000000000000..0967ef424bce
--- /dev/null
+++ b/yarn-project/sqlite3mc-wasm/package.local.json
@@ -0,0 +1 @@
+{}
diff --git a/yarn-project/sqlite3mc-wasm/scripts/vendor.pin b/yarn-project/sqlite3mc-wasm/scripts/vendor.pin
new file mode 100644
index 000000000000..19366dafed9d
--- /dev/null
+++ b/yarn-project/sqlite3mc-wasm/scripts/vendor.pin
@@ -0,0 +1,12 @@
+# Pinned upstream sqlite3mc-wasm release.
+#
+# This file is the source of truth for which upstream artifact the build pulls.
+# Bump procedure:
+#   1. Edit MC_VERSION / SQLITE_VERSION / SHA256 below
+#   2. Run: yarn-project/sqlite3mc-wasm/scripts/vendor.sh
+#   3. Commit this file + the updated vendor/jswasm/SHA256SUMS together
+#
+# Format: shell-sourceable, no quoting needed for these values.
+MC_VERSION=2.2.4
+SQLITE_VERSION=3.50.4
+SHA256=e73514200d76286d7d4a239589589b4f64d24ac4f4f7b2760e1f07b14ac5f6a5
diff --git a/yarn-project/sqlite3mc-wasm/scripts/vendor.sh b/yarn-project/sqlite3mc-wasm/scripts/vendor.sh
new file mode 100755
index 000000000000..f8da2b46f383
--- /dev/null
+++ b/yarn-project/sqlite3mc-wasm/scripts/vendor.sh
@@ -0,0 +1,139 @@
+#!/usr/bin/env bash
+# Fetch the sqlite3mc WASM release into vendor/jswasm/.
+#
+# Two modes:
+#
+#   scripts/vendor.sh
+#     Fetches the version pinned in scripts/vendor.pin, replacing vendor/jswasm/
+#     with pristine upstream files and regenerating SHA256SUMS. Used at build
+#     time and when bumping the pinned version.
+#
+#   scripts/vendor.sh ensure
+#     Idempotent: if vendor/jswasm/ is already populated and verifies against
+#     SHA256SUMS, exits 0 without touching anything. Otherwise behaves like the
+#     no-arg form. Wired into yarn-project/bootstrap.sh to populate vendor files
+#     on fresh checkouts before compilation.
+#
+#   scripts/vendor.sh <mc-version> <sqlite-version> <expected-sha256>
+#     Override pin file. Used to verify a candidate release before editing the
+#     pin file. Does NOT update the pin file, that's a manual step.
+#
+# After bumping: edit scripts/vendor.pin, run scripts/vendor.sh (no args),
+# commit pin + SHA256SUMS together.
+
+set -euo pipefail
+
+# Resolve package root relative to this script so the script works from any cwd.
+SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+PKG_ROOT=$(cd "$SCRIPT_DIR/.." && pwd)
+
+LOCAL_DMTS="$PKG_ROOT/vendor/jswasm/sqlite3-bundler-friendly.d.mts"
+LOCAL_GITIGNORE="$PKG_ROOT/vendor/jswasm/.gitignore"
+SHA256SUMS="$PKG_ROOT/vendor/jswasm/SHA256SUMS"
+PIN_FILE="$SCRIPT_DIR/vendor.pin"
+
+# `ensure` mode: short-circuit if vendor files are already present and verify.
+if [[ "${1:-}" == "ensure" ]]; then
+  if [[ -f "$SHA256SUMS" ]] && (cd "$PKG_ROOT/vendor/jswasm" && sha256sum --status -c SHA256SUMS) 2>/dev/null; then
+    exit 0
+  fi
+  shift
+fi
+
+# Resolve pin: explicit args override pin file.
+if [[ $# -eq 3 ]]; then
+  MC_VERSION=$1
+  SQLITE_VERSION=$2
+  EXPECTED_SHA=$3
+elif [[ $# -eq 0 ]]; then
+  if [[ ! -f "$PIN_FILE" ]]; then
+    echo "Pin file not found at $PIN_FILE" >&2
+    exit 2
+  fi
+  # shellcheck disable=SC1090
+  source "$PIN_FILE"
+  MC_VERSION=${MC_VERSION:-}
+  SQLITE_VERSION=${SQLITE_VERSION:-}
+  EXPECTED_SHA=${SHA256:-}
+  if [[ -z "$MC_VERSION" || -z "$SQLITE_VERSION" || -z "$EXPECTED_SHA" ]]; then
+    echo "Pin file $PIN_FILE missing MC_VERSION / SQLITE_VERSION / SHA256" >&2
+    exit 2
+  fi
+else
+  echo "usage: $0 [ensure] [<mc-version> <sqlite-version> <expected-sha256>]" >&2
+  echo "  no args:   fetch the version pinned in scripts/vendor.pin" >&2
+  echo "  ensure:    no-op if files already verify; else fetch from pin" >&2
+  echo "  3 args:    override pin (used to verify a candidate release)" >&2
+  exit 2
+fi
+
+ASSET="sqlite3mc-${MC_VERSION}-sqlite-${SQLITE_VERSION}-wasm.zip"
+URL="https://github.com/utelle/SQLite3MultipleCiphers/releases/download/v${MC_VERSION}/${ASSET}"
+
+WORK_DIR=$(mktemp -d)
+trap 'rm -rf "$WORK_DIR"' EXIT
+
+echo "==> Downloading ${ASSET}"
+curl -fsSL -o "$WORK_DIR/$ASSET" "$URL"
+
+echo "==> Verifying zip SHA256"
+ACTUAL_SHA=$(sha256sum "$WORK_DIR/$ASSET" | awk '{print $1}')
+if [[ "$ACTUAL_SHA" != "$EXPECTED_SHA" ]]; then
+  echo "SHA256 mismatch!" >&2
+  echo "  expected: $EXPECTED_SHA" >&2
+  echo "  actual:   $ACTUAL_SHA"   >&2
+  echo "Either upstream re-released the asset, or the artifact was tampered with." >&2
+  echo "Investigate before updating." >&2
+  exit 1
+fi
+echo "    $ACTUAL_SHA  (match)"
+
+echo "==> Extracting"
+unzip -q "$WORK_DIR/$ASSET" -d "$WORK_DIR"
+# Extracted directory name is derived from sqlite version (e.g. sqlite3mc-wasm-3500400)
+EXTRACTED=$(find "$WORK_DIR" -maxdepth 1 -type d -name 'sqlite3mc-wasm-*' | head -n 1)
+if [[ -z "$EXTRACTED" ]]; then
+  echo "Extracted archive doesn't contain expected sqlite3mc-wasm-* directory" >&2
+  exit 1
+fi
+
+# Preserve files that aren't part of the upstream release across re-vendoring:
+#   - sqlite3-bundler-friendly.d.mts: locally-authored TypeScript declaration
+#   - .gitignore: allowlist that keeps upstream artifacts untracked
+DMTS_BACKUP=""
+if [[ -f "$LOCAL_DMTS" ]]; then
+  DMTS_BACKUP=$(mktemp)
+  cp "$LOCAL_DMTS" "$DMTS_BACKUP"
+fi
+GITIGNORE_BACKUP=""
+if [[ -f "$LOCAL_GITIGNORE" ]]; then
+  GITIGNORE_BACKUP=$(mktemp)
+  cp "$LOCAL_GITIGNORE" "$GITIGNORE_BACKUP"
+fi
+
+echo "==> Replacing vendor/jswasm/ with pristine upstream files"
+rm -rf "$PKG_ROOT/vendor/jswasm"
+mkdir -p "$PKG_ROOT/vendor/jswasm"
+cp -r "$EXTRACTED/jswasm/." "$PKG_ROOT/vendor/jswasm/"
+
+# Restore preserved files.
+if [[ -n "$DMTS_BACKUP" ]]; then
+  cp "$DMTS_BACKUP" "$LOCAL_DMTS"
+  rm "$DMTS_BACKUP"
+  echo "==> Restored locally-authored sqlite3-bundler-friendly.d.mts"
+fi
+if [[ -n "$GITIGNORE_BACKUP" ]]; then
+  cp "$GITIGNORE_BACKUP" "$LOCAL_GITIGNORE"
+  rm "$GITIGNORE_BACKUP"
+  echo "==> Restored .gitignore"
+fi
+
+echo "==> Generating vendor/jswasm/SHA256SUMS"
+(cd "$PKG_ROOT/vendor/jswasm" && sha256sum -- * 2>/dev/null | sort -k2 > SHA256SUMS)
+# Exclude SHA256SUMS from itself (sha256sum already skipped it since it didn't exist yet,
+# but guard against re-runs where it would).
+grep -v " SHA256SUMS$" "$PKG_ROOT/vendor/jswasm/SHA256SUMS" > "$PKG_ROOT/vendor/jswasm/SHA256SUMS.tmp"
+mv "$PKG_ROOT/vendor/jswasm/SHA256SUMS.tmp" "$PKG_ROOT/vendor/jswasm/SHA256SUMS"
+
+echo "==> Done. Updated files:"
+ls "$PKG_ROOT/vendor/jswasm/" | sed 's/^/    /'
diff --git a/yarn-project/sqlite3mc-wasm/src/index.ts b/yarn-project/sqlite3mc-wasm/src/index.ts
new file mode 100644
index 000000000000..cc9216895d85
--- /dev/null
+++ b/yarn-project/sqlite3mc-wasm/src/index.ts
@@ -0,0 +1,8 @@
+/**
+ * Re-exports sqlite3mc's bundler-friendly ES module default (sqlite3InitModule)
+ * and the TypeScript types expected by downstream consumers. Mirrors the
+ * `@sqlite.org/sqlite-wasm` package default export — sqlite3mc is a strict
+ * API-compatible superset, so upstream types apply unchanged.
+ */
+export { default } from '../vendor/jswasm/sqlite3-bundler-friendly.mjs';
+export type { Database, SAHPoolUtil, Sqlite3Static } from '@sqlite.org/sqlite-wasm';
diff --git a/yarn-project/sqlite3mc-wasm/tsconfig.json b/yarn-project/sqlite3mc-wasm/tsconfig.json
new file mode 100644
index 000000000000..36663dba7816
--- /dev/null
+++ b/yarn-project/sqlite3mc-wasm/tsconfig.json
@@ -0,0 +1,10 @@
+{
+  "extends": "..",
+  "compilerOptions": {
+    "outDir": "dest",
+    "rootDir": ".",
+    "tsBuildInfoFile": ".tsbuildinfo",
+    "composite": true
+  },
+  "include": ["src", "vendor/jswasm/*.d.mts"]
+}
diff --git a/yarn-project/sqlite3mc-wasm/vendor/jswasm/.gitignore b/yarn-project/sqlite3mc-wasm/vendor/jswasm/.gitignore
new file mode 100644
index 000000000000..915a8050440b
--- /dev/null
+++ b/yarn-project/sqlite3mc-wasm/vendor/jswasm/.gitignore
@@ -0,0 +1,9 @@
+# Upstream sqlite3mc-wasm release artifacts are fetched at build time by
+# scripts/vendor.sh (driven by scripts/vendor.pin). Don't commit them.
+#
+# Allowlist: keep this .gitignore, the integrity manifest, and our
+# locally-authored TypeScript declaration tracked in git.
+*
+!.gitignore
+!SHA256SUMS
+!sqlite3-bundler-friendly.d.mts
diff --git a/yarn-project/sqlite3mc-wasm/vendor/jswasm/SHA256SUMS b/yarn-project/sqlite3mc-wasm/vendor/jswasm/SHA256SUMS
new file mode 100644
index 000000000000..4eeca0da4344
--- /dev/null
+++ b/yarn-project/sqlite3mc-wasm/vendor/jswasm/SHA256SUMS
@@ -0,0 +1,11 @@
+812bca8052d0e43bd8668dbd99430ee76c1cbd1be2d42087590c5c29018083c7  sqlite3-bundler-friendly.d.mts
+85b8e8eb2b63ec08e106f82820a1942a07651c15a6204bc2c3510138a43b36bd  sqlite3-bundler-friendly.mjs
+f07714bd13b703c1917b02e73f4b3a8514c2b37e2b00afe1375d4a30faa2461d  sqlite3-node.mjs
+fc499c666c095929b5614dfa34d3f6e01cff77df2ea98abade30de97ac8db324  sqlite3-opfs-async-proxy.js
+9386ab42a3fe80fddf21e5651aa898eb1a674355b070f6d1338d93ebbc6779c6  sqlite3-worker1-bundler-friendly.mjs
+ff0581756d86ca1397ce3f53810c29af1d8db34c4814e77271f85d4d11df108f  sqlite3-worker1-promiser.js
+e1f0b46abdc61b45b9f64bc522324ccddfe385308ef772eef054e66ba3b013f8  sqlite3-worker1-promiser.mjs
+1bed25837f00f7b68943cfcabed62dfd202cae863a72af24a0d6487d7d7b0e61  sqlite3-worker1.js
+0c473584c02a07793b3c320e166c25aead8131880d5ae3e719f976ccc5081fa0  sqlite3.js
+4677d6c8e66fe99c29307fe2b782fce83272b760a3a617202fae8e3f3434dab5  sqlite3.mjs
+e0e94e4ac5221c19aefe7e59fe88ceab93bff56ec1d966c21c6cf39ac0f26735  sqlite3.wasm
diff --git a/yarn-project/sqlite3mc-wasm/vendor/jswasm/sqlite3-bundler-friendly.d.mts b/yarn-project/sqlite3mc-wasm/vendor/jswasm/sqlite3-bundler-friendly.d.mts
new file mode 100644
index 000000000000..93fa91e22d9c
--- /dev/null
+++ b/yarn-project/sqlite3mc-wasm/vendor/jswasm/sqlite3-bundler-friendly.d.mts
@@ -0,0 +1,7 @@
+// Type declaration for the sqlite3mc bundler-friendly ES module.
+// sqlite3mc is API-compatible with @sqlite.org/sqlite-wasm, so we reuse its
+// Sqlite3Static type directly.
+import type { Sqlite3Static } from '@sqlite.org/sqlite-wasm';
+
+declare function sqlite3InitModule(opts?: Record<string, unknown>): Promise<Sqlite3Static>;
+export default sqlite3InitModule;
diff --git a/yarn-project/stdlib/src/abi/abi.ts b/yarn-project/stdlib/src/abi/abi.ts
index 9efdd54e1168..631b84c0dcef 100644
--- a/yarn-project/stdlib/src/abi/abi.ts
+++ b/yarn-project/stdlib/src/abi/abi.ts
@@ -6,6 +6,7 @@ import { schemas, zodFor } from '@aztec/foundation/schemas';
 import { inflate } from 'pako';
 import { z } from 'zod';
 
+import { DEV_VERSION } from '../update-checker/dev_version.js';
 import { FunctionSelector } from './function_selector.js';
 
 /** A basic value. */
@@ -338,11 +339,17 @@ export type FieldLayout = {
   slot: Fr;
 };
 
+/** Placeholder version injected into artifacts compiled before aztecVersion was added. TODO(F-557): Remove. */
+export const ARTIFACT_VERSION_BEFORE_INJECTION = 'FROM_RELEASE_BEFORE_VERSION_INJECTION';
+
 /** Defines artifact of a contract. */
 export interface ContractArtifact {
   /** The name of the contract. */
   name: string;
 
+  /** The version of the Aztec stack that compiled this artifact. */
+  aztecVersion: string;
+
   /** The functions of the contract. Includes private and utility functions, plus the public dispatch function. */
   functions: FunctionArtifact[];
 
@@ -365,6 +372,7 @@ export interface ContractArtifact {
 export const ContractArtifactSchema = zodFor<ContractArtifact>()(
   z.object({
     name: z.string(),
+    aztecVersion: z.string().default(ARTIFACT_VERSION_BEFORE_INJECTION), // TODO(F-557): Remove default.
     functions: z.array(FunctionArtifactSchema),
     nonDispatchPublicFunctions: z.array(FunctionAbiSchema),
     outputs: z.object({
@@ -551,6 +559,7 @@ export function emptyFunctionArtifact(): FunctionArtifact {
 export function emptyContractArtifact(): ContractArtifact {
   return {
     name: '',
+    aztecVersion: DEV_VERSION,
     functions: [emptyFunctionArtifact()],
     nonDispatchPublicFunctions: [emptyFunctionAbi()],
     outputs: {
diff --git a/yarn-project/stdlib/src/abi/contract_artifact.ts b/yarn-project/stdlib/src/abi/contract_artifact.ts
index 4b20093d37d4..b3cfc0e919d2 100644
--- a/yarn-project/stdlib/src/abi/contract_artifact.ts
+++ b/yarn-project/stdlib/src/abi/contract_artifact.ts
@@ -12,6 +12,7 @@ import {
 import {
   type ABIParameter,
   type ABIParameterVisibility,
+  ARTIFACT_VERSION_BEFORE_INJECTION,
   type AbiType,
   type BasicValue,
   type ContractArtifact,
@@ -51,6 +52,10 @@ export function contractArtifactFromBuffer(buffer: Buffer): ContractArtifact {
  */
 export function loadContractArtifact(input: NoirCompiledContract): ContractArtifact {
   if (isContractArtifact(input)) {
+    // TODO(F-557): Remove this fallback once pre-version artifacts are no longer tested.
+    if (!(input as unknown as Record<string, unknown>).aztecVersion) {
+      return { ...input, aztecVersion: ARTIFACT_VERSION_BEFORE_INJECTION };
+    }
     return input;
   }
   return generateContractArtifact(input);
@@ -276,10 +281,9 @@ function getStorageLayout(input: NoirCompiledContract) {
 }
 
 /**
- * Given a Nargo output generates an Aztec-compatible contract artifact.
+ * Given a post-processed Nargo output defined as `contract` generates an Aztec-compatible contract artifact.
+ *
  * Does not include public bytecode, apart from the public_dispatch function.
- * @param compiled - Noir build output.
- * @returns Aztec contract build artifact.
  */
 function generateContractArtifact(contract: NoirCompiledContract): ContractArtifact {
   try {
@@ -288,6 +292,7 @@ function generateContractArtifact(contract: NoirCompiledContract): ContractArtif
     }
     return ContractArtifactSchema.parse({
       name: contract.name,
+      aztecVersion: contract.aztec_version,
       functions: contract.functions.filter(f => retainBytecode(f)).map(f => generateFunctionArtifact(f, contract)),
       nonDispatchPublicFunctions: contract.functions
         .filter(f => !retainBytecode(f))
@@ -302,15 +307,15 @@ function generateContractArtifact(contract: NoirCompiledContract): ContractArtif
 }
 
 /**
- * Given a Nargo output generates an Aztec-compatible contract artifact.
+ * Given a post-processed Nargo output defined as `contract` generates an Aztec-compatible contract artifact.
+ *
  * Retains all public bytecode.
- * @param compiled - Noir build output.
- * @returns Aztec contract build artifact.
  */
 function generateContractArtifactForPublic(contract: NoirCompiledContract): ContractArtifact {
   try {
     return ContractArtifactSchema.parse({
       name: contract.name,
+      aztecVersion: contract.aztec_version,
       functions: contract.functions.map(f => generateFunctionArtifact(f, contract)),
       nonDispatchPublicFunctions: contract.functions
         .filter(f => !retainBytecode(f))
diff --git a/yarn-project/stdlib/src/aztec-address/index.ts b/yarn-project/stdlib/src/aztec-address/index.ts
index b9aeaa072b71..372fe2be7c48 100644
--- a/yarn-project/stdlib/src/aztec-address/index.ts
+++ b/yarn-project/stdlib/src/aztec-address/index.ts
@@ -1,3 +1,4 @@
+import { NULL_MSG_SENDER_CONTRACT_ADDRESS } from '@aztec/constants';
 import { Fr, fromBuffer } from '@aztec/foundation/curves/bn254';
 import { Point } from '@aztec/foundation/curves/grumpkin';
 import { type ZodFor, bufferSchemaFor, hexSchemaFor } from '@aztec/foundation/schemas';
@@ -41,6 +42,9 @@ export class AztecAddress {
 
   static ZERO = new AztecAddress(Buffer.alloc(32, 0));
 
+  /** Null msg sender address. Not part of the protocol contracts tree. */
+  static NULL_MSG_SENDER = AztecAddress.fromBigInt(NULL_MSG_SENDER_CONTRACT_ADDRESS);
+
   static zero(): AztecAddress {
     return AztecAddress.ZERO;
   }
diff --git a/yarn-project/stdlib/src/block/attestation_info.ts b/yarn-project/stdlib/src/block/attestation_info.ts
index 01b4bb51b270..64657db48b89 100644
--- a/yarn-project/stdlib/src/block/attestation_info.ts
+++ b/yarn-project/stdlib/src/block/attestation_info.ts
@@ -3,7 +3,7 @@ import type { EthAddress } from '@aztec/foundation/eth-address';
 
 import { Checkpoint } from '../checkpoint/checkpoint.js';
 import { ConsensusPayload } from '../p2p/consensus_payload.js';
-import { SignatureDomainSeparator, getHashedSignaturePayloadEthSignedMessage } from '../p2p/signature_utils.js';
+import { type CoordinationSignatureContext, getHashedSignaturePayloadTypedData } from '../p2p/signature_utils.js';
 import type { CommitteeAttestation } from './proposal/committee_attestation.js';
 
 /**
@@ -32,11 +32,14 @@ export type AttestationInfo =
  * Extracts attestation information from a published checkpoint.
  * Returns info for each attestation, preserving array indices.
  */
-export function getAttestationInfoFromPublishedCheckpoint(block: {
-  attestations: CommitteeAttestation[];
-  checkpoint: Checkpoint;
-}): AttestationInfo[] {
-  const payload = ConsensusPayload.fromCheckpoint(block.checkpoint);
+export function getAttestationInfoFromPublishedCheckpoint(
+  block: {
+    attestations: CommitteeAttestation[];
+    checkpoint: Checkpoint;
+  },
+  signatureContext: CoordinationSignatureContext,
+): AttestationInfo[] {
+  const payload = ConsensusPayload.fromCheckpoint(block.checkpoint, signatureContext);
   return getAttestationInfoFromPayload(payload, block.attestations);
 }
 
@@ -44,10 +47,7 @@ export function getAttestationInfoFromPayload(
   payload: ConsensusPayload,
   attestations: CommitteeAttestation[],
 ): AttestationInfo[] {
-  const hashedPayload = getHashedSignaturePayloadEthSignedMessage(
-    payload,
-    SignatureDomainSeparator.checkpointAttestation,
-  );
+  const hashedPayload = getHashedSignaturePayloadTypedData(payload);
 
   return attestations.map(attestation => {
     // If signature is empty, check if we have an address directly
@@ -62,7 +62,7 @@ export function getAttestationInfoFromPayload(
 
     // Try to recover address from signature
     try {
-      const recoveredAddress = recoverAddress(hashedPayload, attestation.signature);
+      const recoveredAddress = recoverAddress(hashedPayload, attestation.signature, { allowYParityAsV: true });
       return { address: recoveredAddress, status: 'recovered-from-signature' as const };
     } catch {
       // Signature present but recovery failed
diff --git a/yarn-project/stdlib/src/block/block_parameter.test.ts b/yarn-project/stdlib/src/block/block_parameter.test.ts
new file mode 100644
index 000000000000..084b1a1ba1ab
--- /dev/null
+++ b/yarn-project/stdlib/src/block/block_parameter.test.ts
@@ -0,0 +1,49 @@
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
+
+import { BlockHash } from './block_hash.js';
+import { type BlockParameter, BlockParameterSchema } from './block_parameter.js';
+
+describe('BlockParameterSchema', () => {
+  it.each<[string, BlockParameter]>([
+    ['number', BlockNumber(7)],
+    ['BlockHash', BlockHash.fromBuffer(Buffer.alloc(32, 1))],
+    ['tag latest', 'latest'],
+    ['tag proposed', 'proposed'],
+    ['tag checkpointed', 'checkpointed'],
+    ['tag proven', 'proven'],
+    ['tag finalized', 'finalized'],
+    ['{ number }', { number: BlockNumber(7) }],
+    ['{ hash }', { hash: BlockHash.fromBuffer(Buffer.alloc(32, 1)) }],
+    ['{ archive }', { archive: new Fr(123) }],
+    ['{ tag }', { tag: 'proven' }],
+  ])('roundtrips %s', (_, param) => {
+    const json = JSON.parse(JSON.stringify(param));
+    const parsed = BlockParameterSchema.parse(json);
+    expect(parsed).toEqual(param);
+  });
+
+  it('parses a 32-byte hex string as a BlockHash, never coercing it to a JS number', () => {
+    const blockHash = BlockHash.fromBuffer(Buffer.alloc(32, 0x07));
+    const wire = blockHash.toString();
+    const parsed = BlockParameterSchema.parse(wire);
+    expect(BlockHash.isBlockHash(parsed)).toBe(true);
+    expect((parsed as BlockHash).toString()).toEqual(wire);
+  });
+
+  it('rejects huge JS numbers (above MAX_SAFE_INTEGER) for block-number parsing', () => {
+    expect(BlockParameterSchema.safeParse(Number.MAX_SAFE_INTEGER + 1).success).toBe(false);
+  });
+
+  it('rejects negative numbers', () => {
+    expect(BlockParameterSchema.safeParse(-1).success).toBe(false);
+  });
+
+  it('rejects non-integer numbers', () => {
+    expect(BlockParameterSchema.safeParse(1.5).success).toBe(false);
+  });
+
+  it('rejects unknown tags', () => {
+    expect(BlockParameterSchema.safeParse('not-a-tag').success).toBe(false);
+  });
+});
diff --git a/yarn-project/stdlib/src/block/block_parameter.ts b/yarn-project/stdlib/src/block/block_parameter.ts
index a97695d639fa..da4940895137 100644
--- a/yarn-project/stdlib/src/block/block_parameter.ts
+++ b/yarn-project/stdlib/src/block/block_parameter.ts
@@ -1,10 +1,78 @@
-import { BlockNumberSchema } from '@aztec/foundation/branded-types';
+import { type BlockNumber, BlockNumberSchema } from '@aztec/foundation/branded-types';
+import type { Fr } from '@aztec/foundation/curves/bn254';
+import { jsonStringify } from '@aztec/foundation/json-rpc';
+import { schemas } from '@aztec/foundation/schemas';
 
 import { z } from 'zod';
 
 import { BlockHash } from './block_hash.js';
 
-export const BlockParameterSchema = z.union([BlockHash.schema, BlockNumberSchema, z.literal('latest')]);
+export const BlockTag = ['latest', 'proposed', 'checkpointed', 'proven', 'finalized'] as const;
 
-/** Block parameter - either a specific BlockNumber, block hash (BlockHash), or 'latest' */
-export type BlockParameter = z.infer<typeof BlockParameterSchema>;
+/**
+ * Tag identifying a block by its position in the chain rather than by an absolute identifier.
+ * - `latest` / `proposed`: Latest L2 block proposed (not necessarily checkpointed/proven yet).
+ * - `checkpointed`: Latest L2 block whose enclosing checkpoint has been published on L1.
+ * - `proven`: Latest L2 block whose enclosing checkpoint has been proven on L1.
+ * - `finalized`: Latest L2 block whose proving L1 transaction has reached L1 finality.
+ */
+export type BlockTag = (typeof BlockTag)[number];
+
+export const BlockTagWithoutLatestSchema = z.union([
+  z.literal('proposed'),
+  z.literal('checkpointed'),
+  z.literal('proven'),
+  z.literal('finalized'),
+]);
+
+export const BlockTagSchema: z.ZodType<BlockTag> = z.union([z.literal('latest'), BlockTagWithoutLatestSchema]);
+
+/**
+ * Object-only form of {@link BlockParameter}. Used as the building block for {@link BlockQuery}.
+ */
+export type NormalizedBlockParameter =
+  | { number: BlockNumber }
+  | { hash: BlockHash }
+  | { archive: Fr }
+  | { tag: Exclude<BlockTag, 'latest'> };
+
+export const NormalizedBlockParameterSchema: z.ZodType<NormalizedBlockParameter, z.ZodTypeDef, unknown> = z.union([
+  z.object({ number: BlockNumberSchema }).strict(),
+  z.object({ hash: BlockHash.schema }).strict(),
+  z.object({ archive: schemas.Fr }).strict(),
+  z.object({ tag: BlockTagWithoutLatestSchema }).strict(),
+]);
+
+/**
+ * Selector for a block in RPC calls.
+ *
+ * Accepts a block number, a {@link BlockHash}, a chain-tip name (e.g. `'proven'`, `'checkpointed'`),
+ * `'latest'` (alias for `'proposed'`), or any of the {@link NormalizedBlockParameter} object variants
+ * (`{ number }`, `{ hash }`, `{ archive }`, `{ tag }`).
+ */
+export type BlockParameter = NormalizedBlockParameter | BlockNumber | BlockHash | BlockTag;
+
+export const BlockParameterSchema: z.ZodType<BlockParameter, z.ZodTypeDef, unknown> = z.union([
+  NormalizedBlockParameterSchema,
+  BlockHash.schema,
+  BlockTagSchema,
+  BlockNumberSchema,
+]);
+
+export function inspectBlockParameter(param: BlockParameter) {
+  if (typeof param === 'number') {
+    return param.toString();
+  } else if (typeof param === 'string') {
+    return param;
+  } else if ('number' in param) {
+    return `number=${param.number.toString()}`;
+  } else if ('hash' in param) {
+    return `hash=${param.hash.toString()}`;
+  } else if ('archive' in param) {
+    return `archive=${param.archive.toString()}`;
+  } else if ('tag' in param) {
+    return `tag=${param.tag}`;
+  } else {
+    return jsonStringify(param);
+  }
+}
diff --git a/yarn-project/stdlib/src/block/checkpointed_l2_block.ts b/yarn-project/stdlib/src/block/checkpointed_l2_block.ts
deleted file mode 100644
index 3313e4ead84f..000000000000
--- a/yarn-project/stdlib/src/block/checkpointed_l2_block.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-// Ignoring import issue to fix portable inferred type issue in zod schema
-import { CheckpointNumber, CheckpointNumberSchema } from '@aztec/foundation/branded-types';
-import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
-import type { FieldsOf } from '@aztec/foundation/types';
-
-import { z } from 'zod';
-
-import { L1PublishedData } from '../checkpoint/published_checkpoint.js';
-import { MAX_BLOCK_HASH_STRING_LENGTH, MAX_COMMITTEE_SIZE } from '../deserialization/index.js';
-import { L2Block } from './l2_block.js';
-import { CommitteeAttestation } from './proposal/committee_attestation.js';
-
-/**
- * Encapsulates an L2 Block along with the checkpoint data associated with it.
- */
-export class CheckpointedL2Block {
-  constructor(
-    public checkpointNumber: CheckpointNumber,
-    public block: L2Block,
-    public l1: L1PublishedData,
-    public attestations: CommitteeAttestation[],
-  ) {}
-  static get schema() {
-    return z
-      .object({
-        checkpointNumber: CheckpointNumberSchema,
-        block: L2Block.schema,
-        l1: L1PublishedData.schema,
-        attestations: z.array(CommitteeAttestation.schema),
-      })
-      .transform(obj => CheckpointedL2Block.fromFields(obj));
-  }
-
-  static fromBuffer(bufferOrReader: Buffer | BufferReader): CheckpointedL2Block {
-    const reader = BufferReader.asReader(bufferOrReader);
-    const checkpointNumber = reader.readNumber();
-    const block = reader.readObject(L2Block);
-    const l1BlockNumber = reader.readBigInt();
-    const l1BlockHash = reader.readString(MAX_BLOCK_HASH_STRING_LENGTH);
-    const l1Timestamp = reader.readBigInt();
-    const attestations = reader.readVector(CommitteeAttestation, MAX_COMMITTEE_SIZE);
-    return new CheckpointedL2Block(
-      CheckpointNumber(checkpointNumber),
-      block,
-      new L1PublishedData(l1BlockNumber, l1Timestamp, l1BlockHash),
-      attestations,
-    );
-  }
-
-  static fromFields(fields: FieldsOf<CheckpointedL2Block>) {
-    return new CheckpointedL2Block(
-      CheckpointNumber(fields.checkpointNumber),
-      fields.block,
-      fields.l1,
-      fields.attestations,
-    );
-  }
-
-  public toBuffer(): Buffer {
-    return serializeToBuffer(
-      this.checkpointNumber,
-      this.block,
-      this.l1.blockNumber,
-      this.l1.blockHash,
-      this.l1.timestamp,
-      this.attestations.length,
-      this.attestations,
-    );
-  }
-}
diff --git a/yarn-project/stdlib/src/block/index.ts b/yarn-project/stdlib/src/block/index.ts
index ded8ffecdf57..39b0960a7984 100644
--- a/yarn-project/stdlib/src/block/index.ts
+++ b/yarn-project/stdlib/src/block/index.ts
@@ -6,7 +6,6 @@ export * from './body.js';
 export * from './block_parameter.js';
 export * from './l2_block_source.js';
 export * from './block_hash.js';
-export * from './checkpointed_l2_block.js';
 export * from './proposal/index.js';
 export * from './validate_block_result.js';
 export * from './l2_block_info.js';
diff --git a/yarn-project/stdlib/src/block/l2_block_source.ts b/yarn-project/stdlib/src/block/l2_block_source.ts
index 880ffb15332a..7fd024f7e42a 100644
--- a/yarn-project/stdlib/src/block/l2_block_source.ts
+++ b/yarn-project/stdlib/src/block/l2_block_source.ts
@@ -4,10 +4,12 @@ import {
   CheckpointNumber,
   CheckpointNumberSchema,
   type EpochNumber,
+  EpochNumberSchema,
   type SlotNumber,
 } from '@aztec/foundation/branded-types';
 import type { Fr } from '@aztec/foundation/curves/bn254';
 import type { EthAddress } from '@aztec/foundation/eth-address';
+import { schemas } from '@aztec/foundation/schemas';
 import type { TypedEventEmitter } from '@aztec/foundation/types';
 
 import { z } from 'zod';
@@ -17,16 +19,43 @@ import type { CheckpointData, CommonCheckpointData, ProposedCheckpointData } fro
 import type { PublishedCheckpoint } from '../checkpoint/published_checkpoint.js';
 import type { L1RollupConstants } from '../epoch-helpers/index.js';
 import { CheckpointHeader } from '../rollup/checkpoint_header.js';
-import type { BlockHeader } from '../tx/block_header.js';
 import type { IndexedTxEffect } from '../tx/indexed_tx_effect.js';
 import type { TxHash } from '../tx/tx_hash.js';
 import type { TxReceipt } from '../tx/tx_receipt.js';
 import type { BlockData } from './block_data.js';
-import type { BlockHash } from './block_hash.js';
-import type { CheckpointedL2Block } from './checkpointed_l2_block.js';
+import { BlockHash } from './block_hash.js';
+import { BlockTagWithoutLatestSchema, type NormalizedBlockParameter } from './block_parameter.js';
 import type { L2Block } from './l2_block.js';
 import type { ValidateCheckpointNegativeResult, ValidateCheckpointResult } from './validate_block_result.js';
 
+/** Lookup a single block by block number, hash, archive root, or chain-tip tag. */
+export type BlockQuery = NormalizedBlockParameter;
+
+/**
+ * Query a range of blocks by start/limit or by epoch.
+ *
+ * The `epoch` variant requires `onlyCheckpointed: true` because epoch boundaries are only
+ * meaningful for the checkpointed chain — the proposed chain may include uncheckpointed
+ * blocks past the epoch boundary that callers should not receive.
+ */
+export type BlocksQuery =
+  | { from: BlockNumber; limit: number; onlyCheckpointed?: boolean }
+  | { epoch: EpochNumber; onlyCheckpointed: true };
+
+export const BlockQuerySchema: z.ZodType<BlockQuery, z.ZodTypeDef, unknown> = z.union([
+  z.object({ number: BlockNumberSchema }).strict(),
+  z.object({ hash: BlockHash.schema }).strict(),
+  z.object({ archive: schemas.Fr }).strict(),
+  z.object({ tag: BlockTagWithoutLatestSchema }).strict(),
+]);
+
+export const BlocksQuerySchema: z.ZodType<BlocksQuery, z.ZodTypeDef, unknown> = z.union([
+  z
+    .object({ from: BlockNumberSchema, limit: z.number().int().min(1), onlyCheckpointed: z.boolean().optional() })
+    .strict(),
+  z.object({ epoch: EpochNumberSchema, onlyCheckpointed: z.literal(true) }).strict(),
+]);
+
 /**
  * Interface of classes allowing for the retrieval of L2 blocks.
  */
@@ -49,6 +78,14 @@ export interface L2BlockSource {
    */
   getBlockNumber(): Promise<BlockNumber>;
 
+  /**
+   * Resolves a {@link BlockQuery} to its concrete L2 block number.
+   * @param query - Lookup by block number, hash, archive root, or chain-tip tag.
+   * @returns The block number, or undefined if no block matches the query.
+   */
+  getBlockNumber(query: BlockQuery): Promise<BlockNumber | undefined>;
+  getBlockNumber(query?: BlockQuery): Promise<BlockNumber | undefined>;
+
   /**
    * Gets the number of the latest L2 checkpoint processed by the block source implementation.
    * @returns The number of the latest L2 checkpoint processed by the block source implementation.
@@ -74,23 +111,6 @@ export interface L2BlockSource {
    */
   getFinalizedL2BlockNumber(): Promise<BlockNumber>;
 
-  /**
-   * Gets an l2 block header.
-   * @param number - The block number to return or 'latest' for the most recent one.
-   * @returns The requested L2 block header.
-   */
-  getBlockHeader(number: BlockNumber | 'latest'): Promise<BlockHeader | undefined>;
-
-  /**
-   * Gets a checkpointed L2 block by block number.
-   * Returns undefined if the block doesn't exist or hasn't been checkpointed yet.
-   * @param number - The block number to retrieve.
-   * @returns The requested checkpointed L2 block (or undefined if not found or not checkpointed).
-   */
-  getCheckpointedBlock(number: BlockNumber): Promise<CheckpointedL2Block | undefined>;
-
-  getCheckpointedBlocks(from: BlockNumber, limit: number): Promise<CheckpointedL2Block[]>;
-
   /**
    * Retrieves a collection of checkpoints.
    * @param checkpointNumber The first checkpoint to be retrieved.
@@ -112,53 +132,27 @@ export interface L2BlockSource {
   getCheckpointsDataForEpoch(epochNumber: EpochNumber): Promise<CheckpointData[]>;
 
   /**
-   * Gets a block header by its hash.
-   * @param blockHash - The block hash to retrieve.
-   * @returns The requested block header (or undefined if not found).
-   */
-  getBlockHeaderByHash(blockHash: BlockHash): Promise<BlockHeader | undefined>;
-
-  /**
-   * Gets a block header by its archive root.
-   * @param archive - The archive root to retrieve.
-   * @returns The requested block header (or undefined if not found).
-   */
-  getBlockHeaderByArchive(archive: Fr): Promise<BlockHeader | undefined>;
-
-  /**
-   * Gets block metadata (without tx data) by block number.
-   * @param number - The block number to retrieve.
-   * @returns The requested block data (or undefined if not found).
-   */
-  getBlockData(number: BlockNumber): Promise<BlockData | undefined>;
-
-  /**
-   * Gets block metadata (without tx data) by archive root.
-   * @param archive - The archive root to retrieve.
-   * @returns The requested block data (or undefined if not found).
-   */
-  getBlockDataByArchive(archive: Fr): Promise<BlockData | undefined>;
-
-  /**
-   * Gets an L2 block by block number.
-   * @param number - The block number to return.
-   * @returns The requested L2 block (or undefined if not found).
+   * Gets lightweight checkpoint metadata for a single checkpoint.
+   * Cheap passthrough for metadata-only queries (no block body reads).
+   * @param checkpointNumber - The checkpoint number to retrieve.
+   * @returns The requested checkpoint data (or undefined if not found).
    */
-  getL2Block(number: BlockNumber): Promise<L2Block | undefined>;
+  getCheckpointData(checkpointNumber: CheckpointNumber): Promise<CheckpointData | undefined>;
 
   /**
-   * Gets an L2 block by its hash.
-   * @param blockHash - The block hash to retrieve.
-   * @returns The requested L2 block (or undefined if not found).
+   * Gets up to `limit` amount of checkpoint metadata entries starting from `from`.
+   * Cheap passthrough for metadata-only queries (no block body reads).
+   * @param from - The first checkpoint number to return (inclusive).
+   * @param limit - The maximum number of checkpoints to return.
    */
-  getL2BlockByHash(blockHash: BlockHash): Promise<L2Block | undefined>;
+  getCheckpointDataRange(from: CheckpointNumber, limit: number): Promise<CheckpointData[]>;
 
   /**
-   * Gets an L2 block by its archive root.
-   * @param archive - The archive root to retrieve.
-   * @returns The requested L2 block (or undefined if not found).
+   * Looks up the checkpoint number that contains the given slot.
+   * @param slot - The slot number to look up.
+   * @returns The checkpoint number (or undefined if not found).
    */
-  getL2BlockByArchive(archive: Fr): Promise<L2Block | undefined>;
+  getCheckpointNumberBySlot(slot: SlotNumber): Promise<CheckpointNumber | undefined>;
 
   /**
    * Gets a tx effect.
@@ -188,13 +182,6 @@ export interface L2BlockSource {
    */
   getSyncedL2EpochNumber(): Promise<EpochNumber | undefined>;
 
-  /**
-   * Returns all checkpointed block headers for a given epoch.
-   * @dev Use this method only with recent epochs, since it walks the block list backwards.
-   * @param epochNumber - The epoch number to return headers for.
-   */
-  getCheckpointedBlockHeadersForEpoch(epochNumber: EpochNumber): Promise<BlockHeader[]>;
-
   /**
    * Returns whether the given epoch is completed on L1, based on the current L1 and L2 block numbers.
    * @param epochNumber - The epoch number to check.
@@ -214,6 +201,12 @@ export interface L2BlockSource {
   /** Returns values for the genesis block */
   getGenesisValues(): Promise<{ genesisArchiveRoot: Fr }>;
 
+  /**
+   * Returns the precomputed hash of the genesis block header. Synchronous because the hash
+   * is derived from the initial block header at construction time and cached by implementers.
+   */
+  getGenesisBlockHash(): BlockHash;
+
   /** Latest synced L1 timestamp. */
   getL1Timestamp(): Promise<bigint | undefined>;
 
@@ -230,58 +223,44 @@ export interface L2BlockSource {
   getPendingChainValidationStatus(): Promise<ValidateCheckpointResult>;
 
   /** Returns the checkpoint at the proposed chain tip. */
-  getProposedCheckpoint(): Promise<CommonCheckpointData | undefined>;
+  getLastCheckpoint(): Promise<CommonCheckpointData | undefined>;
 
   /** Returns proposed checkpoint, if set, undefined if not*/
-  getProposedCheckpointOnly(): Promise<ProposedCheckpointData | undefined>;
+  getLastProposedCheckpoint(): Promise<ProposedCheckpointData | undefined>;
 
   /** Force a sync. */
   syncImmediate(): Promise<void>;
 
-  /* Legacy APIS */
-
   /**
-   * Gets an l2 block. If a negative number is passed, the block returned is the most recent.
-   * @param number - The block number to return (inclusive).
-   * @returns The requested L2 block.
+   * Gets an L2 block matching the given query.
+   * @param query - Lookup by block number, hash, or archive root.
    */
-  getBlock(number: BlockNumber): Promise<L2Block | undefined>;
+  getBlock(query: BlockQuery): Promise<L2Block | undefined>;
 
   /**
-   * Returns all checkpointed blocks for a given epoch.
-   * @dev Use this method only with recent epochs, since it walks the block list backwards.
-   * @param epochNumber - The epoch number to return blocks for.
+   * Gets a collection of L2 blocks matching the given query.
+   * @param query - Range by start/limit or by epoch; optionally restricted to checkpointed blocks.
    */
-  getCheckpointedBlocksForEpoch(epochNumber: EpochNumber): Promise<CheckpointedL2Block[]>;
+  getBlocks(query: BlocksQuery): Promise<L2Block[]>;
 
   /**
-   * Returns all blocks for a given slot.
-   * @dev Use this method only with recent slots, since it walks the block list backwards.
-   * @param slotNumber - The slot number to return blocks for.
+   * Gets block metadata (without tx data) matching the given query.
+   * @param query - Lookup by block number, hash, or archive root.
    */
-  getBlocksForSlot(slotNumber: SlotNumber): Promise<L2Block[]>;
+  getBlockData(query: BlockQuery): Promise<BlockData | undefined>;
 
   /**
-   * Gets a checkpointed block by its block hash.
-   * @param blockHash - The block hash to retrieve.
-   * @returns The requested block (or undefined if not found).
+   * Gets a collection of block metadata entries matching the given query.
+   * @param query - Range by start/limit or by epoch; optionally restricted to checkpointed blocks.
    */
-  getCheckpointedBlockByHash(blockHash: BlockHash): Promise<CheckpointedL2Block | undefined>;
+  getBlocksData(query: BlocksQuery): Promise<BlockData[]>;
 
   /**
-   * Gets a checkpointed block by its archive root.
-   * @param archive - The archive root to retrieve.
-   * @returns The requested block (or undefined if not found).
-   */
-  getCheckpointedBlockByArchive(archive: Fr): Promise<CheckpointedL2Block | undefined>;
-
-  /**
-   * Gets up to `limit` amount of L2 blocks starting from `from`.
-   * @param from - Number of the first block to return (inclusive).
-   * @param limit - The maximum number of blocks to return.
-   * @returns The requested L2 blocks.
+   * Returns all blocks for a given slot.
+   * @dev Use this method only with recent slots, since it walks the block list backwards.
+   * @param slotNumber - The slot number to return blocks for.
    */
-  getBlocks(from: BlockNumber, limit: number): Promise<L2Block[]>;
+  getBlocksForSlot(slotNumber: SlotNumber): Promise<L2Block[]>;
 }
 
 /**
@@ -312,11 +291,18 @@ export interface L2BlockSourceEventEmitter extends L2BlockSource {
 }
 
 /**
- * Identifier for L2 block tags.
+ * Identifier for L2 block tags. Internal counterpart to {@link BlockTag} that exposes
+ * the additional `proposedCheckpoint` value (used for the optimistic chain tip on the
+ * archiver side) and omits `latest` (which is an alias for `proposed` accepted only at
+ * the public RPC surface).
+ *
  * - proposed: Latest block proposed on L2.
- * - checkpointed: Checkpointed block on L1.
- * - proven: Proven block on L1.
- * - finalized: Proven block on a finalized L1 block (not implemented, set to proven for now).
+ * - proposedCheckpoint: Latest block in the most recent proposed checkpoint (archiver-internal).
+ * - checkpointed: Latest block whose enclosing checkpoint has been published on L1.
+ * - proven: Latest block whose enclosing checkpoint has been proven on L1.
+ * - finalized: Latest block whose proving L1 transaction has reached L1 finality.
+ *
+ * TODO(palla): Remove `proposedCheckpoint` and unify with `proposed`.
  */
 export type L2BlockTag = 'proposed' | 'proposedCheckpoint' | 'checkpointed' | 'proven' | 'finalized';
 
diff --git a/yarn-project/stdlib/src/block/l2_block_stream/l2_block_stream.test.ts b/yarn-project/stdlib/src/block/l2_block_stream/l2_block_stream.test.ts
index a13ce4b8fa36..26216f7aff2b 100644
--- a/yarn-project/stdlib/src/block/l2_block_stream/l2_block_stream.test.ts
+++ b/yarn-project/stdlib/src/block/l2_block_stream/l2_block_stream.test.ts
@@ -2,15 +2,22 @@ import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
 import { compactArray } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/curves/bn254';
 
+import { jest } from '@jest/globals';
 import { type MockProxy, mock } from 'jest-mock-extended';
 import times from 'lodash.times';
 
 import type { PublishedCheckpoint } from '../../checkpoint/published_checkpoint.js';
 import type { BlockHeader } from '../../tx/block_header.js';
+import type { BlockData } from '../block_data.js';
 import { BlockHash, GENESIS_BLOCK_HEADER_HASH } from '../block_hash.js';
-import type { CheckpointedL2Block } from '../checkpointed_l2_block.js';
 import type { L2Block } from '../l2_block.js';
-import { GENESIS_CHECKPOINT_HEADER_HASH, type L2BlockId, type L2BlockSource, type L2Tips } from '../l2_block_source.js';
+import {
+  type BlocksQuery,
+  GENESIS_CHECKPOINT_HEADER_HASH,
+  type L2BlockId,
+  type L2BlockSource,
+  type L2Tips,
+} from '../l2_block_source.js';
 import type { L2BlockStreamEvent, L2BlockStreamEventHandler, L2BlockStreamLocalDataProvider } from './interfaces.js';
 import { L2BlockStream } from './l2_block_stream.js';
 import { L2TipsMemoryStore } from './l2_tips_memory_store.js';
@@ -39,11 +46,12 @@ describe('L2BlockStream', () => {
       hash: () => Promise.resolve(new BlockHash(new Fr(number))),
     }) as L2Block;
 
-  const makeCheckpointedBlock = (number: number, checkpointNum: number): CheckpointedL2Block =>
+  const makeBlockData = (number: number, checkpointNum: number): BlockData =>
     ({
-      block: makeBlock(number),
-      checkpointNumber: checkpointNum,
-    }) as CheckpointedL2Block;
+      header: makeHeader(number),
+      checkpointNumber: CheckpointNumber(checkpointNum),
+      indexWithinCheckpoint: 0,
+    }) as unknown as BlockData;
 
   const makeHeader = (number: number) =>
     ({ hash: () => Promise.resolve(new BlockHash(new Fr(number))) }) as BlockHeader;
@@ -107,27 +115,22 @@ describe('L2BlockStream', () => {
   beforeEach(() => {
     blockSource = mock<L2BlockSource>();
 
-    // Archiver returns headers with hashes equal to the block number for simplicity
-    // Note that we only return block headers for blocks that have not been pruned
-    blockSource.getBlockHeader.mockImplementation(number =>
-      Promise.resolve(
-        typeof number === 'number' && number > latest ? undefined : makeHeader(number === 'latest' ? 1 : number),
-      ),
-    );
-
     // Returns blocks up until what was reported as the latest block (for uncheckpointed blocks)
-    blockSource.getBlocks.mockImplementation((from, limit) =>
-      Promise.resolve(compactArray(times(limit, i => (from + i > latest ? undefined : makeBlock(from + i))))),
+    blockSource.getBlocks.mockImplementation((query: BlocksQuery) =>
+      'from' in query
+        ? Promise.resolve(
+            compactArray(times(query.limit, i => (query.from + i > latest ? undefined : makeBlock(query.from + i)))),
+          )
+        : Promise.resolve([]),
     );
 
-    // Returns checkpointed blocks (for blocks up to checkpointed tip)
-    blockSource.getCheckpointedBlocks.mockImplementation((from, limit) =>
-      Promise.resolve(
-        compactArray(
-          times(limit, i => (from + i > checkpointed ? undefined : makeCheckpointedBlock(from + i, from + i))),
-        ),
-      ),
-    );
+    // Returns block data for any known block that has not been pruned.
+    blockSource.getBlockData.mockImplementation(query => {
+      if (!('number' in query)) {
+        return Promise.resolve(undefined);
+      }
+      return Promise.resolve(query.number > latest ? undefined : makeBlockData(query.number, query.number));
+    });
 
     // Returns published checkpoints - each checkpoint contains just the one block for simplicity
     // Respects the limit parameter and returns up to `limit` checkpoints
@@ -179,7 +182,7 @@ describe('L2BlockStream', () => {
       localData.proposed.number = BlockNumber(10);
 
       await blockStream.work();
-      expect(blockSource.getBlocks).toHaveBeenCalledWith(BlockNumber(11), 5);
+      expect(blockSource.getBlocks).toHaveBeenCalledWith({ from: BlockNumber(11), limit: 5 });
       expect(handler.events).toEqual([
         { type: 'blocks-added', blocks: times(5, i => makeBlock(i + 11)) },
       ] satisfies L2BlockStreamEvent[]);
@@ -274,7 +277,8 @@ describe('L2BlockStream', () => {
         expectBlocksAdded([5]),
         expectCheckpointed(),
       ]);
-      expect(blockSource.getCheckpointedBlocks).toHaveBeenCalledTimes(1);
+      // 2 calls: one for block 0 in reorg detection (hash compare at genesis), one for block 1 in loop 2.
+      expect(blockSource.getBlockData).toHaveBeenCalledTimes(2);
       expect(blockSource.getBlocks).not.toHaveBeenCalled();
     });
 
@@ -294,8 +298,9 @@ describe('L2BlockStream', () => {
         expectCheckpointed(),
         expectBlocksAdded([4, 5]),
       ]);
-      expect(blockSource.getCheckpointedBlocks).toHaveBeenCalledTimes(1);
-      expect(blockSource.getBlocks).toHaveBeenCalledWith(BlockNumber(4), 2);
+      // 2 calls: one for block 0 in reorg detection (hash compare at genesis), one for block 1 in loop 2.
+      expect(blockSource.getBlockData).toHaveBeenCalledTimes(2);
+      expect(blockSource.getBlocks).toHaveBeenCalledWith({ from: BlockNumber(4), limit: 2 });
     });
 
     it('handles reorg with uncheckpointed reason when pruned to checkpointed tip', async () => {
@@ -317,6 +322,36 @@ describe('L2BlockStream', () => {
         checkpoint: makeCheckpointId(3),
       });
     });
+
+    it('throws a meaningful error when local and source disagree on the genesis hash', async () => {
+      // Source advertises blocks 1-3 with the default mock genesis hash (Fr.ZERO).
+      setRemoteTips(3);
+      localData.proposed.number = BlockNumber(3);
+      // Local store disagrees at every height including block 0 (e.g. different genesisTimestamp).
+      localData.blockHashes[0] = `0xbad0`;
+      for (let i = 1; i <= 3; i++) {
+        localData.blockHashes[i] = `0xbad${i}`;
+      }
+
+      // The reorg-search loop must NOT walk past block 0; it should throw a clear error
+      // pointing at the genesis-hash mismatch instead of cascading into "block hash not found
+      // for -1" further down. The error is caught and logged by `work` rather than rethrown,
+      // so we assert via the logged error and ensure no events were emitted.
+      const errorSpy = jest.spyOn(
+        (blockStream as unknown as { log: { error: (...args: any[]) => void } }).log,
+        'error',
+      );
+
+      await blockStream.work();
+
+      expect(handler.events).toEqual([]);
+      expect(errorSpy).toHaveBeenCalledWith(
+        expect.stringContaining('Error processing block stream'),
+        expect.objectContaining({
+          message: expect.stringContaining('Genesis block hash mismatch'),
+        }),
+      );
+    });
   });
 
   describe('with memory tips store', () => {
@@ -376,17 +411,6 @@ describe('L2BlockStream', () => {
     /** Gets the last block number in a checkpoint */
     const getLastBlockInCheckpoint = (checkpointNum: number) => checkpointNum * blocksPerCheckpoint;
 
-    /** Makes a block with correct checkpoint info */
-    const makeBlockInCheckpoint = (blockNum: number) => {
-      const checkpointNum = getCheckpointForBlock(blockNum);
-      const firstBlockInCheckpoint = getFirstBlockInCheckpoint(checkpointNum);
-      return {
-        number: BlockNumber(blockNum),
-        checkpointNumber: CheckpointNumber(checkpointNum),
-        indexWithinCheckpoint: blockNum - firstBlockInCheckpoint,
-      } as L2Block;
-    };
-
     /** Makes a block with hash method (for use in mocks that need hash) */
     const makeBlockInCheckpointWithHash = (blockNum: number) => {
       const checkpointNum = getCheckpointForBlock(blockNum);
@@ -399,12 +423,13 @@ describe('L2BlockStream', () => {
       } as L2Block;
     };
 
-    /** Makes a checkpointed block */
-    const makeCheckpointedBlockInCheckpoint = (blockNum: number): CheckpointedL2Block =>
+    /** Makes block data for a checkpointed block */
+    const makeBlockDataInCheckpoint = (blockNum: number): BlockData =>
       ({
-        block: makeBlockInCheckpoint(blockNum),
-        checkpointNumber: getCheckpointForBlock(blockNum),
-      }) as CheckpointedL2Block;
+        header: makeHeader(blockNum),
+        checkpointNumber: CheckpointNumber(getCheckpointForBlock(blockNum)),
+        indexWithinCheckpoint: blockNum - getFirstBlockInCheckpoint(getCheckpointForBlock(blockNum)),
+      }) as unknown as BlockData;
 
     /** Sets the remote tips with correct checkpoint numbers for multi-block checkpoints. */
     const setRemoteTipsMultiBlock = (
@@ -458,14 +483,13 @@ describe('L2BlockStream', () => {
       handler = new TestL2BlockStreamEventHandler();
       blockStream = new TestL2BlockStream(blockSource, localData, handler, undefined, { batchSize: 10 });
 
-      // Override the mocks to support multiple blocks per checkpoint
-      blockSource.getCheckpointedBlocks.mockImplementation((from, limit) =>
-        Promise.resolve(
-          compactArray(
-            times(limit, i => (from + i > checkpointed ? undefined : makeCheckpointedBlockInCheckpoint(from + i))),
-          ),
-        ),
-      );
+      // Override the mock to support multiple blocks per checkpoint
+      blockSource.getBlockData.mockImplementation(query => {
+        if (!('number' in query)) {
+          return Promise.resolve(undefined);
+        }
+        return Promise.resolve(query.number > latest ? undefined : makeBlockDataInCheckpoint(query.number));
+      });
 
       // Returns published checkpoints with multiple blocks each, respecting the limit parameter
       blockSource.getCheckpoints.mockImplementation((checkpointNumber: CheckpointNumber, limit: number) => {
@@ -811,8 +835,30 @@ describe('L2BlockStream', () => {
         expect(checkpointEvents).toHaveLength(5);
       });
 
-      it('does not call getCheckpointedBlocks(0) when startingBlock is 0', async () => {
-        // getCheckpointedBlocks rejects block 0
+      it('skips Loop 1 entirely when startingBlock is past the checkpointed tip', async () => {
+        // proposed=15, checkpointed=9 (ckpt 3 covers blocks 7-9). startingBlock=12 is past the
+        // checkpointed tip, in the proposed range. Loop 1 must skip without an RPC for block 12.
+        setRemoteTipsMultiBlock(15, 9);
+        blockStream = new TestL2BlockStream(blockSource, localData, handler, undefined, {
+          batchSize: 10,
+          startingBlock: 12,
+        });
+
+        await blockStream.work();
+
+        // No chain-checkpointed events because startingBlock is past the checkpointed tip.
+        const checkpointEvents = handler.events.filter(e => e.type === 'chain-checkpointed');
+        expect(checkpointEvents).toHaveLength(0);
+        // Loop 1 must not query block 12 — past-the-tip is decided from sourceTips alone.
+        const loop1Calls = blockSource.getBlockData.mock.calls.filter(
+          c => 'number' in c[0] && (c[0] as { number: number }).number === 12,
+        );
+        expect(loop1Calls).toHaveLength(0);
+      });
+
+      it('calls getBlockData for block 0 only for reorg detection, not checkpoint lookup, when startingBlock is 0', async () => {
+        // With startingBlock=0, the stream skips the checkpoint-number lookup (line 121 path)
+        // so getBlockData is called for block 0 only once: for the genesis reorg detection.
         setRemoteTipsMultiBlock(15, 15);
         blockStream = new TestL2BlockStream(blockSource, localData, handler, undefined, {
           batchSize: 10,
@@ -821,8 +867,10 @@ describe('L2BlockStream', () => {
 
         await blockStream.work();
 
-        const calls = blockSource.getCheckpointedBlocks.mock.calls;
-        expect(calls.every(([blockNum]) => blockNum >= 1)).toBe(true);
+        const calls = blockSource.getBlockData.mock.calls;
+        const block0Calls = calls.filter(c => 'number' in c[0] && (c[0] as { number: number }).number === 0);
+        // Only the genesis reorg-detection call — not an additional checkpoint-lookup call.
+        expect(block0Calls).toHaveLength(1);
       });
     });
 
@@ -1759,6 +1807,12 @@ class TestL2BlockStream extends L2BlockStream {
 }
 
 class TestL2TipsMemoryStore extends L2TipsMemoryStore {
+  constructor() {
+    // initialBlockHash must match the test mock's genesis hash (new Fr(0)) so that
+    // areBlockHashesEqualAt(0) compares matching values and finds no reorg at genesis.
+    super(new BlockHash(new Fr(0)));
+  }
+
   protected override computeBlockHash(block: L2Block): Promise<`0x${string}`> {
     return Promise.resolve(new Fr(block.number).toString());
   }
diff --git a/yarn-project/stdlib/src/block/l2_block_stream/l2_block_stream.ts b/yarn-project/stdlib/src/block/l2_block_stream/l2_block_stream.ts
index 9aac6c45b143..85bf1961bb77 100644
--- a/yarn-project/stdlib/src/block/l2_block_stream/l2_block_stream.ts
+++ b/yarn-project/stdlib/src/block/l2_block_stream/l2_block_stream.ts
@@ -17,10 +17,7 @@ export class L2BlockStream {
   private hasStarted = false;
 
   constructor(
-    private l2BlockSource: Pick<
-      L2BlockSource,
-      'getBlocks' | 'getBlockHeader' | 'getL2Tips' | 'getCheckpoints' | 'getCheckpointedBlocks'
-    >,
+    private l2BlockSource: Pick<L2BlockSource, 'getBlocks' | 'getBlockData' | 'getL2Tips' | 'getCheckpoints'>,
     private localData: L2BlockStreamLocalDataProvider,
     private handler: L2BlockStreamEventHandler,
     private readonly log = createLogger('types:block_stream'),
@@ -77,6 +74,22 @@ export class L2BlockStream {
       let latestBlockNumber = localTips.proposed.number;
       const sourceCache = new BlockHashCache([sourceTips.proposed]);
       while (!(await this.areBlockHashesEqualAt(latestBlockNumber, { sourceCache }))) {
+        if (latestBlockNumber === 0) {
+          // We walked all the way back to genesis and the hashes still differ. This means the
+          // local store and the source disagree on the genesis block itself — typically because
+          // they were configured with different `genesisTimestamp`/prefilled state. Continuing
+          // would underflow into negative block numbers and surface as "block hash not found
+          // for -1" further down. Fail loudly with a meaningful error instead.
+          this.log.error(`Genesis block hash mismatch between local store and source`, {
+            localBlockHash: await this.localData.getL2BlockHash(BlockNumber.ZERO),
+            sourceBlockHash: sourceCache.get(0) ?? (await this.getBlockHashFromSource(BlockNumber.ZERO)),
+          });
+          throw new Error(
+            'Genesis block hash mismatch between local store and source: refusing to walk past block 0. ' +
+              'This usually indicates the two sides were configured with different genesis values ' +
+              '(e.g. genesisTimestamp or prefilled public data).',
+          );
+        }
         latestBlockNumber--;
       }
 
@@ -97,8 +110,9 @@ export class L2BlockStream {
       }
 
       // If we are just starting, use the starting block number from the options.
-      if (latestBlockNumber === 0 && this.opts.startingBlock !== undefined) {
-        latestBlockNumber = BlockNumber(Math.max(this.opts.startingBlock - 1, 0));
+      const startingBlock = this.opts.startingBlock !== undefined ? BlockNumber(this.opts.startingBlock) : undefined;
+      if (latestBlockNumber === 0 && startingBlock !== undefined) {
+        latestBlockNumber = BlockNumber(Math.max(startingBlock - 1, 0));
       }
 
       // Only log this entry once (for sanity)
@@ -112,21 +126,18 @@ export class L2BlockStream {
 
       // When startingBlock is set, also skip ahead for checkpoints.
       if (
-        this.opts.startingBlock !== undefined &&
-        this.opts.startingBlock >= 1 &&
+        startingBlock !== undefined &&
+        startingBlock >= 1 &&
         nextCheckpointToEmit <= sourceTips.checkpointed.checkpoint.number
       ) {
-        const startingBlockCheckpoints = await this.l2BlockSource.getCheckpointedBlocks(
-          BlockNumber(this.opts.startingBlock),
-          1,
-        );
-        if (startingBlockCheckpoints.length > 0) {
-          nextCheckpointToEmit = CheckpointNumber(
-            Math.max(nextCheckpointToEmit, startingBlockCheckpoints[0].checkpointNumber),
-          );
-        } else {
+        if (startingBlock > sourceTips.checkpointed.block.number) {
           // startingBlock is past all checkpointed blocks; skip Loop 1 entirely.
           nextCheckpointToEmit = CheckpointNumber(sourceTips.checkpointed.checkpoint.number + 1);
+        } else {
+          const startingBlockData = await this.l2BlockSource.getBlockData({ number: startingBlock });
+          if (startingBlockData) {
+            nextCheckpointToEmit = CheckpointNumber(Math.max(nextCheckpointToEmit, startingBlockData.checkpointNumber));
+          }
         }
       }
 
@@ -184,9 +195,9 @@ export class L2BlockStream {
 
       // Find the starting checkpoint number
       if (nextBlockNumber <= sourceTips.checkpointed.block.number) {
-        const blocks = await this.l2BlockSource.getCheckpointedBlocks(BlockNumber(nextBlockNumber), 1);
-        if (blocks.length > 0) {
-          nextCheckpointNumber = blocks[0].checkpointNumber;
+        const blockData = await this.l2BlockSource.getBlockData({ number: BlockNumber(nextBlockNumber) });
+        if (blockData) {
+          nextCheckpointNumber = blockData.checkpointNumber;
         }
       }
 
@@ -234,7 +245,7 @@ export class L2BlockStream {
       while (nextBlockNumber <= sourceTips.proposed.number) {
         const limit = Math.min(this.opts.batchSize ?? 50, sourceTips.proposed.number - nextBlockNumber + 1);
         this.log.trace(`Requesting blocks from ${nextBlockNumber} limit ${limit}`);
-        const blocks = await this.l2BlockSource.getBlocks(BlockNumber(nextBlockNumber), BlockNumber(limit));
+        const blocks = await this.l2BlockSource.getBlocks({ from: BlockNumber(nextBlockNumber), limit });
         if (blocks.length === 0) {
           break;
         }
@@ -266,9 +277,6 @@ export class L2BlockStream {
    * @param args - A cache of data already requested from source, to avoid re-requesting it.
    */
   private async areBlockHashesEqualAt(blockNumber: BlockNumber, args: { sourceCache: BlockHashCache }) {
-    if (blockNumber === 0) {
-      return true;
-    }
     const localBlockHash = await this.localData.getL2BlockHash(blockNumber);
     if (!localBlockHash && this.opts.skipFinalized) {
       // Failing to find a block hash when skipping finalized blocks can be highly problematic as we'd potentially need
@@ -291,8 +299,8 @@ export class L2BlockStream {
 
   private getBlockHashFromSource(blockNumber: BlockNumber) {
     return this.l2BlockSource
-      .getBlockHeader(blockNumber)
-      .then(h => h?.hash())
+      .getBlockData({ number: blockNumber })
+      .then(d => d?.header.hash())
       .then(hash => hash?.toString());
   }
 
diff --git a/yarn-project/stdlib/src/block/l2_block_stream/l2_tips_memory_store.ts b/yarn-project/stdlib/src/block/l2_block_stream/l2_tips_memory_store.ts
index 81a316b5be58..ab5f9e5f5752 100644
--- a/yarn-project/stdlib/src/block/l2_block_stream/l2_tips_memory_store.ts
+++ b/yarn-project/stdlib/src/block/l2_block_stream/l2_tips_memory_store.ts
@@ -1,6 +1,7 @@
 import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
 
 import type { PublishedCheckpoint } from '../../checkpoint/published_checkpoint.js';
+import type { BlockHash } from '../block_hash.js';
 import type { L2BlockTag } from '../l2_block_source.js';
 import { L2TipsStoreBase } from './l2_tips_store_base.js';
 
@@ -9,6 +10,10 @@ import { L2TipsStoreBase } from './l2_tips_store_base.js';
  * @dev Tests in kv-store/src/stores/l2_tips_memory_store.test.ts
  */
 export class L2TipsMemoryStore extends L2TipsStoreBase {
+  constructor(initialBlockHash: BlockHash) {
+    super(initialBlockHash);
+  }
+
   private readonly tips = new Map<L2BlockTag, BlockNumber>();
   private readonly blockHashes = new Map<number, string>();
   private readonly blockToCheckpoint = new Map<number, CheckpointNumber>();
diff --git a/yarn-project/stdlib/src/block/l2_block_stream/l2_tips_store_base.ts b/yarn-project/stdlib/src/block/l2_block_stream/l2_tips_store_base.ts
index 0289670d056e..676e732b665b 100644
--- a/yarn-project/stdlib/src/block/l2_block_stream/l2_tips_store_base.ts
+++ b/yarn-project/stdlib/src/block/l2_block_stream/l2_tips_store_base.ts
@@ -1,7 +1,7 @@
 import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
 
 import type { PublishedCheckpoint } from '../../checkpoint/published_checkpoint.js';
-import { GENESIS_BLOCK_HEADER_HASH } from '../block_hash.js';
+import type { BlockHash } from '../block_hash.js';
 import type { L2Block } from '../l2_block.js';
 import {
   type CheckpointId,
@@ -17,6 +17,7 @@ import type { L2BlockStreamEvent, L2BlockStreamEventHandler, L2BlockStreamLocalD
  * while delegating storage operations to subclasses.
  */
 export abstract class L2TipsStoreBase implements L2BlockStreamEventHandler, L2BlockStreamLocalDataProvider {
+  constructor(protected readonly initialBlockHash: BlockHash) {}
   // Abstract storage primitives - subclasses implement these based on their backing store
 
   /** Gets the block number for a given tag. */
@@ -60,7 +61,10 @@ export abstract class L2TipsStoreBase implements L2BlockStreamEventHandler, L2Bl
 
   // Public interface implementation
 
-  public getL2BlockHash(number: BlockNumber): Promise<string | undefined> {
+  public async getL2BlockHash(number: BlockNumber): Promise<string | undefined> {
+    if (number === 0) {
+      return (await this.getStoredBlockHash(number)) ?? this.initialBlockHash.toString();
+    }
     return this.getStoredBlockHash(number);
   }
 
@@ -123,7 +127,7 @@ export abstract class L2TipsStoreBase implements L2BlockStreamEventHandler, L2Bl
   private async getBlockId(tag: L2BlockTag): Promise<L2BlockId> {
     const blockNumber = await this.getTip(tag);
     if (blockNumber === undefined || blockNumber === 0) {
-      return { number: BlockNumber.ZERO, hash: GENESIS_BLOCK_HEADER_HASH.toString() };
+      return { number: BlockNumber.ZERO, hash: this.initialBlockHash.toString() };
     }
     const blockHash = await this.getStoredBlockHash(blockNumber);
     if (!blockHash) {
@@ -139,7 +143,6 @@ export abstract class L2TipsStoreBase implements L2BlockStreamEventHandler, L2Bl
     }
     const checkpointNumber = await this.getCheckpointNumberForBlock(blockNumber);
     if (checkpointNumber === undefined) {
-      // No checkpoint associated with this block yet
       return { number: CheckpointNumber.ZERO, hash: GENESIS_CHECKPOINT_HEADER_HASH.toString() };
     }
     const checkpoint = await this.getCheckpoint(checkpointNumber);
diff --git a/yarn-project/stdlib/src/block/proposal/attestations_and_signers.ts b/yarn-project/stdlib/src/block/proposal/attestations_and_signers.ts
index c5c5a90c6426..4213fc6abfb5 100644
--- a/yarn-project/stdlib/src/block/proposal/attestations_and_signers.ts
+++ b/yarn-project/stdlib/src/block/proposal/attestations_and_signers.ts
@@ -4,26 +4,37 @@ import { hexToBuffer } from '@aztec/foundation/string';
 import { encodeAbiParameters, parseAbiParameters } from 'viem';
 import { z } from 'zod';
 
-import type { Signable, SignatureDomainSeparator } from '../../p2p/signature_utils.js';
+import {
+  type CoordinationSignatureContext,
+  type CoordinationSignatureType,
+  type Signable,
+  coordinationSignatureContextSchema,
+} from '../../p2p/signature_utils.js';
 import { CommitteeAttestation, EthAddress } from './committee_attestation.js';
 
 export class CommitteeAttestationsAndSigners implements Signable {
-  constructor(public attestations: CommitteeAttestation[]) {}
+  readonly primaryType: CoordinationSignatureType = 'AttestationsAndSigners';
+
+  constructor(
+    public attestations: CommitteeAttestation[],
+    public readonly signatureContext: CoordinationSignatureContext,
+  ) {}
 
   static get schema() {
     return z
       .object({
         attestations: CommitteeAttestation.schema.array(),
+        signatureContext: coordinationSignatureContextSchema,
       })
-      .transform(obj => new CommitteeAttestationsAndSigners(obj.attestations));
+      .transform(obj => new CommitteeAttestationsAndSigners(obj.attestations, obj.signatureContext));
   }
 
-  getPayloadToSign(domainSeparator: SignatureDomainSeparator): Buffer {
-    const abi = parseAbiParameters('uint8,(bytes,bytes),address[]');
+  getPayloadToSign(): Buffer {
+    // Matches the L1 abi.encode(attestations, signers) in AttestationLib.sol#getAttestationsAndSignersDigest.
+    const abi = parseAbiParameters('(bytes,bytes),address[]');
     const packed = this.getPackedAttestations();
 
     const encodedData = encodeAbiParameters(abi, [
-      domainSeparator,
       [packed.signatureIndices, packed.signaturesOrAddresses],
       this.getSigners().map(s => s.toString()),
     ]);
@@ -31,8 +42,8 @@ export class CommitteeAttestationsAndSigners implements Signable {
     return hexToBuffer(encodedData);
   }
 
-  static empty(): CommitteeAttestationsAndSigners {
-    return new CommitteeAttestationsAndSigners([]);
+  static empty(signatureContext: CoordinationSignatureContext): CommitteeAttestationsAndSigners {
+    return new CommitteeAttestationsAndSigners([], signatureContext);
   }
 
   toString() {
@@ -53,9 +64,9 @@ export class CommitteeAttestationsAndSigners implements Signable {
    * @param attestations - Array of committee attestations with addresses and signatures
    * @returns Packed attestations with bitmap and tightly packed signature/address data
    */
-  getPackedAttestations(): ViemCommitteeAttestations {
-    const length = this.attestations.length;
-    const attestations = this.attestations.map(a => a.toViem());
+  static packAttestations(attestations: CommitteeAttestation[]): ViemCommitteeAttestations {
+    const length = attestations.length;
+    const viemAttestations = attestations.map(a => a.toViem());
 
     // Calculate bitmap size (1 bit per attestation, rounded up to nearest byte)
     const bitmapSize = Math.ceil(length / 8);
@@ -63,8 +74,8 @@ export class CommitteeAttestationsAndSigners implements Signable {
 
     // Calculate total data size needed
     let totalDataSize = 0;
-    for (let i = 0; i < length; i++) {
-      const signature = attestations[i].signature;
+    for (const attestation of viemAttestations) {
+      const signature = attestation.signature;
       // Check if signature is empty (v = 0)
       const isEmpty = signature.v === 0;
 
@@ -79,8 +90,7 @@ export class CommitteeAttestationsAndSigners implements Signable {
     let dataIndex = 0;
 
     // Pack the data
-    for (let i = 0; i < length; i++) {
-      const attestation = attestations[i];
+    for (const [i, attestation] of viemAttestations.entries()) {
       const signature = attestation.signature;
 
       // Check if signature is empty
@@ -90,7 +100,7 @@ export class CommitteeAttestationsAndSigners implements Signable {
         // Set bit in bitmap (bit 7-0 in each byte, left to right)
         const byteIndex = Math.floor(i / 8);
         const bitIndex = 7 - (i % 8);
-        signatureIndices[byteIndex] |= 1 << bitIndex;
+        signatureIndices[byteIndex] = (signatureIndices[byteIndex] ?? 0) | (1 << bitIndex);
 
         // Pack signature: v + r + s
         signaturesOrAddresses[dataIndex] = signature.v;
@@ -118,6 +128,10 @@ export class CommitteeAttestationsAndSigners implements Signable {
       signaturesOrAddresses: `0x${Buffer.from(signaturesOrAddresses).toString('hex')}`,
     };
   }
+
+  getPackedAttestations(): ViemCommitteeAttestations {
+    return CommitteeAttestationsAndSigners.packAttestations(this.attestations);
+  }
 }
 
 /**
@@ -130,8 +144,9 @@ export class MaliciousCommitteeAttestationsAndSigners extends CommitteeAttestati
   constructor(
     attestations: CommitteeAttestation[],
     private signers: EthAddress[],
+    signatureContext: CoordinationSignatureContext,
   ) {
-    super(attestations);
+    super(attestations, signatureContext);
   }
 
   override getSigners(): EthAddress[] {
diff --git a/yarn-project/stdlib/src/checkpoint/checkpoint_data.ts b/yarn-project/stdlib/src/checkpoint/checkpoint_data.ts
index 38cd062e8b50..b8ce95fd1231 100644
--- a/yarn-project/stdlib/src/checkpoint/checkpoint_data.ts
+++ b/yarn-project/stdlib/src/checkpoint/checkpoint_data.ts
@@ -32,6 +32,8 @@ export type L1EnrichedCheckpointData = {
 export type StorageEnrichedCheckpointData = {
   archive: AppendOnlyTreeSnapshot;
   checkpointOutHash: Fr;
+  /** Fee asset price modifier in basis points. Defaults to 0 (no change) when not explicitly set. */
+  feeAssetPriceModifier: bigint;
 };
 
 /** Data stored only with proposed checkpoint data  */
@@ -70,6 +72,7 @@ export const CheckpointDataSchema = z
     checkpointOutHash: schemas.Fr,
     startBlock: BlockNumberSchema,
     blockCount: schemas.Integer,
+    feeAssetPriceModifier: schemas.BigInt,
     attestations: z.array(CommitteeAttestation.schema),
     l1: L1PublishedData.schema,
   })
@@ -81,6 +84,7 @@ export const CheckpointDataSchema = z
       checkpointOutHash: obj.checkpointOutHash,
       startBlock: obj.startBlock,
       blockCount: obj.blockCount,
+      feeAssetPriceModifier: obj.feeAssetPriceModifier,
       attestations: obj.attestations,
       l1: obj.l1,
     }),
diff --git a/yarn-project/stdlib/src/config/chain-config.ts b/yarn-project/stdlib/src/config/chain-config.ts
index 533a1e0f798b..d512d49588a3 100644
--- a/yarn-project/stdlib/src/config/chain-config.ts
+++ b/yarn-project/stdlib/src/config/chain-config.ts
@@ -1,5 +1,5 @@
 import { l1ContractAddressesMapping } from '@aztec/ethereum/l1-contract-addresses';
-import type { ConfigMappingsType } from '@aztec/foundation/config';
+import { type ConfigMappingsType, numberConfigHelper } from '@aztec/foundation/config';
 import { EthAddress } from '@aztec/foundation/eth-address';
 
 export { type SequencerConfig, SequencerConfigSchema } from '../interfaces/configs.js';
@@ -14,8 +14,7 @@ export const emptyChainConfig: ChainConfig = {
 export const chainConfigMappings: ConfigMappingsType<ChainConfig> = {
   l1ChainId: {
     env: 'L1_CHAIN_ID',
-    parseEnv: (val: string) => +val,
-    defaultValue: 31337,
+    ...numberConfigHelper(31337),
     description: 'The chain ID of the ethereum host.',
   },
   rollupVersion: {
diff --git a/yarn-project/stdlib/src/config/sequencer-config.ts b/yarn-project/stdlib/src/config/sequencer-config.ts
index 7108011f0d04..be8d1c94c475 100644
--- a/yarn-project/stdlib/src/config/sequencer-config.ts
+++ b/yarn-project/stdlib/src/config/sequencer-config.ts
@@ -1,4 +1,9 @@
-import type { ConfigMappingsType } from '@aztec/foundation/config';
+import {
+  type ConfigMappingsType,
+  floatConfigHelper,
+  numberConfigHelper,
+  optionalNumberConfigHelper,
+} from '@aztec/foundation/config';
 
 import type { SequencerConfig } from '../interfaces/configs.js';
 import { DEFAULT_P2P_PROPAGATION_TIME } from '../timetable/index.js';
@@ -6,6 +11,9 @@ import { DEFAULT_P2P_PROPAGATION_TIME } from '../timetable/index.js';
 /** Default maximum number of transactions per block. */
 export const DEFAULT_MAX_TXS_PER_BLOCK = 32;
 
+/** Default maximum number of blocks the sequencer packs into a single checkpoint. */
+export const DEFAULT_MAX_BLOCKS_PER_CHECKPOINT = 24;
+
 /**
  * Partial sequencer config mappings for fields that need to be shared across packages.
  * The full sequencer config mappings remain in sequencer-client, but shared fields
@@ -15,7 +23,11 @@ export const DEFAULT_MAX_TXS_PER_BLOCK = 32;
 export const sharedSequencerConfigMappings: ConfigMappingsType<
   Pick<
     SequencerConfig,
-    'blockDurationMs' | 'expectedBlockProposalsPerSlot' | 'maxTxsPerBlock' | 'attestationPropagationTime'
+    | 'blockDurationMs'
+    | 'expectedBlockProposalsPerSlot'
+    | 'maxTxsPerBlock'
+    | 'attestationPropagationTime'
+    | 'maxBlocksPerCheckpoint'
   >
 > = {
   blockDurationMs: {
@@ -23,25 +35,31 @@ export const sharedSequencerConfigMappings: ConfigMappingsType<
     description:
       'Duration per block in milliseconds when building multiple blocks per slot. ' +
       'If undefined (default), builds a single block per slot using the full slot duration.',
-    parseEnv: (val: string) => parseInt(val, 10),
+    ...optionalNumberConfigHelper(),
   },
   expectedBlockProposalsPerSlot: {
     env: 'SEQ_EXPECTED_BLOCK_PROPOSALS_PER_SLOT',
     description:
       'Expected number of block proposals per slot for P2P peer scoring. ' +
       '0 (default) disables block proposal scoring. Set to a positive value to enable.',
-    parseEnv: (val: string) => parseInt(val, 10),
-    defaultValue: 0,
+    ...numberConfigHelper(0),
   },
   maxTxsPerBlock: {
     env: 'SEQ_MAX_TX_PER_BLOCK',
     description: 'The maximum number of txs to include in a block.',
-    parseEnv: (val: string) => parseInt(val, 10),
+    ...optionalNumberConfigHelper(),
   },
   attestationPropagationTime: {
     env: 'SEQ_ATTESTATION_PROPAGATION_TIME',
     description: 'How many seconds it takes for proposals and attestations to travel across the p2p layer (one-way).',
-    parseEnv: (val: string) => parseFloat(val),
     defaultValue: DEFAULT_P2P_PROPAGATION_TIME,
+    ...floatConfigHelper(DEFAULT_P2P_PROPAGATION_TIME),
+  },
+  maxBlocksPerCheckpoint: {
+    env: 'MAX_BLOCKS_PER_CHECKPOINT',
+    description:
+      'Maximum number of blocks the sequencer packs into a single checkpoint, and the maximum indexWithinCheckpoint accepted on inbound block proposals.',
+    parseEnv: (val: string) => parseInt(val, 10),
+    defaultValue: DEFAULT_MAX_BLOCKS_PER_CHECKPOINT,
   },
 };
diff --git a/yarn-project/stdlib/src/contract/artifact_hash.test.ts b/yarn-project/stdlib/src/contract/artifact_hash.test.ts
index 41c6cb4e261b..ed3757a95eb8 100644
--- a/yarn-project/stdlib/src/contract/artifact_hash.test.ts
+++ b/yarn-project/stdlib/src/contract/artifact_hash.test.ts
@@ -1,5 +1,6 @@
 import type { ContractArtifact } from '../abi/index.js';
 import { getTestContractArtifact } from '../tests/fixtures.js';
+import { DEV_VERSION } from '../update-checker/dev_version.js';
 import { computeArtifactHash } from './artifact_hash.js';
 
 describe('ArtifactHash', () => {
@@ -9,6 +10,7 @@ describe('ArtifactHash', () => {
       functions: [],
       nonDispatchPublicFunctions: [],
       name: 'Test',
+      aztecVersion: DEV_VERSION,
       outputs: {
         globals: {},
         structs: {},
diff --git a/yarn-project/stdlib/src/ha-signing/local_config.ts b/yarn-project/stdlib/src/ha-signing/local_config.ts
index b28b386cc4c6..479ab4e7199e 100644
--- a/yarn-project/stdlib/src/ha-signing/local_config.ts
+++ b/yarn-project/stdlib/src/ha-signing/local_config.ts
@@ -1,4 +1,4 @@
-import { type ConfigMappingsType, getConfigFromMappings } from '@aztec/foundation/config';
+import { type ConfigMappingsType, getConfigFromMappings, optionalNumberConfigHelper } from '@aztec/foundation/config';
 import { zodFor } from '@aztec/foundation/schemas';
 import { type DataStoreConfig, dataConfigMappings } from '@aztec/stdlib/kv-store';
 
@@ -26,7 +26,7 @@ export const localSignerConfigMappings: ConfigMappingsType<LocalSignerConfig> =
     env: 'SIGNING_PROTECTION_MAP_SIZE_KB',
     description:
       'Maximum size of the local signing-protection LMDB store in KB. Overwrites the general dataStoreMapSizeKb.',
-    parseEnv: (val: string) => +val,
+    ...optionalNumberConfigHelper(),
   },
 };
 
diff --git a/yarn-project/stdlib/src/hash/hash.ts b/yarn-project/stdlib/src/hash/hash.ts
index 6efe42112a18..dd7e6d911450 100644
--- a/yarn-project/stdlib/src/hash/hash.ts
+++ b/yarn-project/stdlib/src/hash/hash.ts
@@ -1,4 +1,4 @@
-import { DomainSeparator, NULL_MSG_SENDER_CONTRACT_ADDRESS } from '@aztec/constants';
+import { DomainSeparator } from '@aztec/constants';
 import { poseidon2Hash, poseidon2HashWithSeparator } from '@aztec/foundation/crypto/poseidon';
 import { sha256ToField } from '@aztec/foundation/crypto/sha256';
 import { Fr } from '@aztec/foundation/curves/bn254';
@@ -110,7 +110,7 @@ export async function computeSiloedPublicInitializationNullifier(contract: Aztec
  * @dev Must match the implementation in noir-protocol-circuits/crates/types/src/hash.nr > compute_protocol_nullifier
  */
 export function computeProtocolNullifier(txRequestHash: Fr): Promise<Fr> {
-  return siloNullifier(AztecAddress.fromBigInt(NULL_MSG_SENDER_CONTRACT_ADDRESS), txRequestHash);
+  return siloNullifier(AztecAddress.NULL_MSG_SENDER, txRequestHash);
 }
 
 /** Domain-separates a raw log tag with the given domain separator. */
diff --git a/yarn-project/stdlib/src/interfaces/archiver.test.ts b/yarn-project/stdlib/src/interfaces/archiver.test.ts
index 961ce6d79e2d..16df1aa6f3e0 100644
--- a/yarn-project/stdlib/src/interfaces/archiver.test.ts
+++ b/yarn-project/stdlib/src/interfaces/archiver.test.ts
@@ -9,9 +9,14 @@ import omit from 'lodash.omit';
 import type { ContractArtifact } from '../abi/abi.js';
 import { FunctionSelector } from '../abi/function_selector.js';
 import { AztecAddress } from '../aztec-address/index.js';
-import { CheckpointedL2Block } from '../block/checkpointed_l2_block.js';
 import { type BlockData, BlockHash, CommitteeAttestation, L2Block } from '../block/index.js';
-import type { L2Tips } from '../block/l2_block_source.js';
+import {
+  type BlockQuery,
+  BlockQuerySchema,
+  type BlocksQuery,
+  BlocksQuerySchema,
+  type L2Tips,
+} from '../block/l2_block_source.js';
 import type { ValidateCheckpointResult } from '../block/validate_block_result.js';
 import { Checkpoint } from '../checkpoint/checkpoint.js';
 import type { CheckpointData, ProposedCheckpointData } from '../checkpoint/checkpoint_data.js';
@@ -34,7 +39,6 @@ import { CheckpointHeader } from '../rollup/checkpoint_header.js';
 import { randomTxScopedPrivateL2Log } from '../tests/factories.js';
 import { getTokenContractArtifact } from '../tests/fixtures.js';
 import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
-import { BlockHeader } from '../tx/block_header.js';
 import type { IndexedTxEffect } from '../tx/indexed_tx_effect.js';
 import { TxEffect } from '../tx/tx_effect.js';
 import { TxHash } from '../tx/tx_hash.js';
@@ -103,56 +107,6 @@ describe('ArchiverApiSchema', () => {
     expect(result).toEqual(BlockNumber(0));
   });
 
-  it('getBlock', async () => {
-    const result = await context.client.getBlock(BlockNumber(1));
-    expect(result).toBeInstanceOf(L2Block);
-  });
-
-  it('getBlockHeader', async () => {
-    const result = await context.client.getBlockHeader(BlockNumber(1));
-    expect(result).toBeInstanceOf(BlockHeader);
-  });
-
-  it('getBlockHeaderByArchive', async () => {
-    const result = await context.client.getBlockHeaderByArchive(Fr.random());
-    expect(result).toBeInstanceOf(BlockHeader);
-  });
-
-  it('getBlockData', async () => {
-    const result = await context.client.getBlockData(BlockNumber(1));
-    expect(result).toBeUndefined();
-  });
-
-  it('getBlockDataByArchive', async () => {
-    const result = await context.client.getBlockDataByArchive(Fr.random());
-    expect(result).toBeUndefined();
-  });
-
-  it('getBlockHeaderByHash', async () => {
-    const result = await context.client.getBlockHeaderByHash(BlockHash.random());
-    expect(result).toBeInstanceOf(BlockHeader);
-  });
-
-  it('getL2Block', async () => {
-    const result = await context.client.getL2Block(BlockNumber(1));
-    expect(result).toBeInstanceOf(L2Block);
-  });
-
-  it('getL2BlockByHash', async () => {
-    const result = await context.client.getL2BlockByHash(BlockHash.random());
-    expect(result).toBeInstanceOf(L2Block);
-  });
-
-  it('getL2BlockByArchive', async () => {
-    const result = await context.client.getL2BlockByArchive(Fr.random());
-    expect(result).toBeInstanceOf(L2Block);
-  });
-
-  it('getBlocks', async () => {
-    const result = await context.client.getBlocks(BlockNumber(1), BlockNumber(1));
-    expect(result).toEqual([expect.any(L2Block)]);
-  });
-
   it('getCheckpoints', async () => {
     const response = await context.client.getCheckpoints(CheckpointNumber(1), BlockNumber(1));
     expect(response).toHaveLength(1);
@@ -161,22 +115,6 @@ describe('ArchiverApiSchema', () => {
     expect(response[0].l1).toBeDefined();
   });
 
-  it('getCheckpointedBlockByArchive', async () => {
-    const result = await context.client.getCheckpointedBlockByArchive(Fr.random());
-    expect(result).toBeDefined();
-    expect(result!.block.constructor.name).toEqual('L2Block');
-    expect(result!.attestations[0]).toBeInstanceOf(CommitteeAttestation);
-    expect(result!.l1).toBeDefined();
-  });
-
-  it('getCheckpointedBlockByHash', async () => {
-    const result = await context.client.getCheckpointedBlockByHash(BlockHash.random());
-    expect(result).toBeDefined();
-    expect(result!.block.constructor.name).toEqual('L2Block');
-    expect(result!.attestations[0]).toBeInstanceOf(CommitteeAttestation);
-    expect(result!.l1).toBeDefined();
-  });
-
   it('getTxEffect', async () => {
     const result = await context.client.getTxEffect(TxHash.fromBuffer(Buffer.alloc(32, BlockNumber(1))));
     expect(result!.data).toBeInstanceOf(TxEffect);
@@ -210,38 +148,11 @@ describe('ArchiverApiSchema', () => {
     expect(result[0].attestations[0]).toBeInstanceOf(CommitteeAttestation);
   });
 
-  it('getCheckpointedBlock', async () => {
-    const result = await context.client.getCheckpointedBlock(BlockNumber(1));
-    expect(result).toBeDefined();
-    expect(result!.block.constructor.name).toEqual('L2Block');
-    expect(result!.attestations[0]).toBeInstanceOf(CommitteeAttestation);
-    expect(result!.l1).toBeDefined();
-  });
-
-  it('getCheckpointedBlocks', async () => {
-    const result = await context.client.getCheckpointedBlocks(BlockNumber(1), 10);
-    expect(result).toHaveLength(1);
-    expect(result[0].block.constructor.name).toEqual('L2Block');
-    expect(result[0].attestations[0]).toBeInstanceOf(CommitteeAttestation);
-    expect(result[0].l1).toBeDefined();
-  });
-
-  it('getCheckpointedBlocksForEpoch', async () => {
-    const result = await context.client.getCheckpointedBlocksForEpoch(EpochNumber(1));
-    expect(result).toHaveLength(1);
-    expect(result[0]).toBeInstanceOf(CheckpointedL2Block);
-  });
-
   it('getBlocksForSlot', async () => {
     const result = await context.client.getBlocksForSlot(SlotNumber(1));
     expect(result).toEqual([expect.any(L2Block)]);
   });
 
-  it('getCheckpointedBlockHeadersForEpoch', async () => {
-    const result = await context.client.getCheckpointedBlockHeadersForEpoch(EpochNumber(1));
-    expect(result).toEqual([expect.any(BlockHeader)]);
-  });
-
   it('isEpochComplete', async () => {
     const result = await context.client.isEpochComplete(EpochNumber(1));
     expect(result).toBe(true);
@@ -358,8 +269,8 @@ describe('ArchiverApiSchema', () => {
     expect(result).toBe(1n);
   });
 
-  it('getProposedCheckpoint', async () => {
-    const result = await context.client.getProposedCheckpoint();
+  it('getLastCheckpoint', async () => {
+    const result = await context.client.getLastCheckpoint();
     expect(result).toEqual({
       checkpointNumber: 1,
       header: expect.any(CheckpointHeader),
@@ -372,8 +283,8 @@ describe('ArchiverApiSchema', () => {
     });
   });
 
-  it('getProposedCheckpointOnly', async () => {
-    const result = await context.client.getProposedCheckpointOnly();
+  it('getLastProposedCheckpoint', async () => {
+    const result = await context.client.getLastProposedCheckpoint();
     expect(result).toEqual({
       checkpointNumber: 1,
       header: expect.any(CheckpointHeader),
@@ -396,14 +307,94 @@ describe('ArchiverApiSchema', () => {
     expect(result).toBe(false);
   });
 
+  it('getCheckpointData', async () => {
+    const result = await context.client.getCheckpointData(CheckpointNumber(1));
+    expect(result).toBeUndefined();
+  });
+
+  it('getCheckpointDataRange', async () => {
+    const result = await context.client.getCheckpointDataRange(CheckpointNumber(1), 10);
+    expect(result).toEqual([]);
+  });
+
+  it('getCheckpointNumberBySlot', async () => {
+    const result = await context.client.getCheckpointNumberBySlot(SlotNumber(1));
+    expect(result).toBeUndefined();
+  });
+
   it('getGenesisValues', async () => {
     const result = await context.client.getGenesisValues();
     expect(result).toEqual({ genesisArchiveRoot: expect.any(Fr) });
   });
 
-  it('getL2Block', async () => {
-    const result = await context.client.getL2Block(BlockNumber(1));
-    expect(result).toEqual(expect.any(L2Block));
+  it('getBlock', async () => {
+    const result = await context.client.getBlock({ number: BlockNumber(1) });
+    expect(result).toBeInstanceOf(L2Block);
+  });
+
+  it('getBlocks', async () => {
+    const result = await context.client.getBlocks({ from: BlockNumber(1), limit: 1 });
+    expect(result).toEqual([expect.any(L2Block)]);
+  });
+
+  it('getBlockData', async () => {
+    const result = await context.client.getBlockData({ number: BlockNumber(1) });
+    expect(result).toBeUndefined();
+  });
+
+  it('getBlocksData', async () => {
+    const result = await context.client.getBlocksData({ from: BlockNumber(1), limit: 1 });
+    expect(result).toEqual([]);
+  });
+});
+
+describe('BlockQuerySchema', () => {
+  it.each<[string, BlockQuery]>([
+    ['{ number }', { number: BlockNumber(1) }],
+    ['{ hash }', { hash: BlockHash.fromBuffer(Buffer.alloc(32, 1)) }],
+    ['{ archive }', { archive: new Fr(123) }],
+    ['{ tag: proposed }', { tag: 'proposed' }],
+    ['{ tag: checkpointed }', { tag: 'checkpointed' }],
+    ['{ tag: proven }', { tag: 'proven' }],
+    ['{ tag: finalized }', { tag: 'finalized' }],
+  ])('roundtrips %s', (_, query) => {
+    const json = JSON.parse(JSON.stringify(query));
+    const parsed = BlockQuerySchema.parse(json);
+    expect(parsed).toEqual(query);
+  });
+
+  it('rejects mixed-key inputs', () => {
+    expect(BlockQuerySchema.safeParse({ number: 1, tag: 'proven' }).success).toBe(false);
+    expect(BlockQuerySchema.safeParse({ hash: '0x1', archive: '0x2' }).success).toBe(false);
+  });
+
+  it('rejects extra keys (onlyCheckpointed is plural-only)', () => {
+    expect(BlockQuerySchema.safeParse({ number: 1, onlyCheckpointed: true }).success).toBe(false);
+    expect(BlockQuerySchema.safeParse({ tag: 'checkpointed', onlyCheckpointed: true }).success).toBe(false);
+  });
+});
+
+describe('BlocksQuerySchema', () => {
+  it.each<[string, BlocksQuery]>([
+    ['{ from, limit }', { from: BlockNumber(1), limit: 10 }],
+    ['{ from, limit, onlyCheckpointed }', { from: BlockNumber(1), limit: 10, onlyCheckpointed: true }],
+    ['{ epoch, onlyCheckpointed: true }', { epoch: EpochNumber(5), onlyCheckpointed: true }],
+  ])('roundtrips %s', (_, query) => {
+    const json = JSON.parse(JSON.stringify(query));
+    const parsed = BlocksQuerySchema.parse(json);
+    expect(parsed).toEqual(query);
+  });
+
+  it('rejects mixed-key inputs', () => {
+    expect(BlocksQuerySchema.safeParse({ from: 0, limit: 10, epoch: 5 }).success).toBe(false);
+  });
+
+  it('rejects epoch query without onlyCheckpointed', () => {
+    expect(BlocksQuerySchema.safeParse({ epoch: 1 }).success).toBe(false);
+  });
+
+  it('rejects epoch query with onlyCheckpointed: false', () => {
+    expect(BlocksQuerySchema.safeParse({ epoch: 1, onlyCheckpointed: false }).success).toBe(false);
   });
 });
 
@@ -419,10 +410,10 @@ class MockArchiver implements ArchiverApi {
   getPendingChainValidationStatus(): Promise<ValidateCheckpointResult> {
     return Promise.resolve({ valid: true });
   }
-  getProposedCheckpoint(): Promise<ProposedCheckpointData | undefined> {
-    return this.getProposedCheckpointOnly();
+  getLastCheckpoint(): Promise<ProposedCheckpointData | undefined> {
+    return this.getLastProposedCheckpoint();
   }
-  getProposedCheckpointOnly(): Promise<ProposedCheckpointData | undefined> {
+  getLastProposedCheckpoint(): Promise<ProposedCheckpointData | undefined> {
     return Promise.resolve({
       checkpointNumber: CheckpointNumber(1),
       header: CheckpointHeader.random(),
@@ -443,7 +434,9 @@ class MockArchiver implements ArchiverApi {
   getRegistryAddress(): Promise<EthAddress> {
     return Promise.resolve(EthAddress.random());
   }
-  getBlockNumber(): Promise<BlockNumber> {
+  getBlockNumber(): Promise<BlockNumber>;
+  getBlockNumber(query: BlockQuery): Promise<BlockNumber | undefined>;
+  getBlockNumber(_query?: BlockQuery): Promise<BlockNumber | undefined> {
     return Promise.resolve(BlockNumber(1));
   }
   getProvenBlockNumber(): Promise<BlockNumber> {
@@ -458,34 +451,17 @@ class MockArchiver implements ArchiverApi {
   getFinalizedL2BlockNumber(): Promise<BlockNumber> {
     return Promise.resolve(BlockNumber(0));
   }
-  getBlock(number: BlockNumber): Promise<L2Block | undefined> {
-    return L2Block.random(number);
+  getBlock(_query: BlockQuery): Promise<L2Block | undefined> {
+    return L2Block.random(BlockNumber(1));
   }
-  getBlockHeader(_number: BlockNumber | 'latest'): Promise<BlockHeader | undefined> {
-    return Promise.resolve(BlockHeader.empty());
+  async getBlocks(_query: BlocksQuery): Promise<L2Block[]> {
+    return [await L2Block.random(BlockNumber(1))];
   }
-  async getCheckpointedBlock(number: BlockNumber): Promise<CheckpointedL2Block | undefined> {
-    return Promise.resolve(
-      CheckpointedL2Block.fromFields({
-        checkpointNumber: CheckpointNumber(1),
-        block: await L2Block.random(number),
-        attestations: [CommitteeAttestation.random()],
-        l1: new L1PublishedData(1n, 0n, `0x`),
-      }),
-    );
-  }
-  async getCheckpointedBlocks(from: BlockNumber, _limit: number): Promise<CheckpointedL2Block[]> {
-    return [
-      CheckpointedL2Block.fromFields({
-        checkpointNumber: CheckpointNumber(1),
-        block: await L2Block.random(from),
-        attestations: [CommitteeAttestation.random()],
-        l1: new L1PublishedData(1n, 0n, `0x`),
-      }),
-    ];
+  getBlockData(_query: BlockQuery): Promise<BlockData | undefined> {
+    return Promise.resolve(undefined);
   }
-  async getBlocks(from: BlockNumber, _limit: number): Promise<L2Block[]> {
-    return [await L2Block.random(from)];
+  getBlocksData(_query: BlocksQuery): Promise<BlockData[]> {
+    return Promise.resolve([]);
   }
   async getCheckpoints(from: CheckpointNumber, _limit: number): Promise<PublishedCheckpoint[]> {
     return [
@@ -496,47 +472,6 @@ class MockArchiver implements ArchiverApi {
       }),
     ];
   }
-  getCheckpointByArchive(_archive: Fr): Promise<Checkpoint | undefined> {
-    return Promise.resolve(Checkpoint.random());
-  }
-
-  async getCheckpointedBlockByHash(_blockHash: BlockHash): Promise<CheckpointedL2Block | undefined> {
-    return CheckpointedL2Block.fromFields({
-      checkpointNumber: CheckpointNumber(1),
-      block: await L2Block.random(BlockNumber(1)),
-      attestations: [CommitteeAttestation.random()],
-      l1: new L1PublishedData(1n, 0n, `0x`),
-    });
-  }
-  async getCheckpointedBlockByArchive(_archive: Fr): Promise<CheckpointedL2Block | undefined> {
-    return CheckpointedL2Block.fromFields({
-      checkpointNumber: CheckpointNumber(1),
-      block: await L2Block.random(BlockNumber(1)),
-      attestations: [CommitteeAttestation.random()],
-      l1: new L1PublishedData(1n, 0n, `0x`),
-    });
-  }
-  getBlockHeaderByHash(_blockHash: BlockHash): Promise<BlockHeader | undefined> {
-    return Promise.resolve(BlockHeader.empty());
-  }
-  getBlockHeaderByArchive(_archive: Fr): Promise<BlockHeader | undefined> {
-    return Promise.resolve(BlockHeader.empty());
-  }
-  getBlockData(_number: BlockNumber): Promise<BlockData | undefined> {
-    return Promise.resolve(undefined);
-  }
-  getBlockDataByArchive(_archive: Fr): Promise<BlockData | undefined> {
-    return Promise.resolve(undefined);
-  }
-  getL2Block(number: BlockNumber): Promise<L2Block | undefined> {
-    return L2Block.random(number);
-  }
-  getL2BlockByHash(_blockHash: BlockHash): Promise<L2Block | undefined> {
-    return L2Block.random(BlockNumber(1));
-  }
-  getL2BlockByArchive(_archive: Fr): Promise<L2Block | undefined> {
-    return L2Block.random(BlockNumber(1));
-  }
   async getTxEffect(_txHash: TxHash): Promise<IndexedTxEffect | undefined> {
     expect(_txHash).toBeInstanceOf(TxHash);
     return {
@@ -571,32 +506,25 @@ class MockArchiver implements ArchiverApi {
         checkpointOutHash: checkpoint.getCheckpointOutHash(),
         startBlock: BlockNumber(1),
         blockCount: checkpoint.blocks.length,
+        feeAssetPriceModifier: 0n,
         attestations: [CommitteeAttestation.random()],
         l1: L1PublishedData.random(),
       },
     ];
   }
-  async getCheckpointedBlocksForEpoch(epochNumber: EpochNumber): Promise<CheckpointedL2Block[]> {
-    expect(epochNumber).toEqual(EpochNumber(1));
-    const block = await L2Block.random(BlockNumber(Number(epochNumber)));
-    return [
-      CheckpointedL2Block.fromFields({
-        checkpointNumber: CheckpointNumber(1),
-        block,
-        l1: new L1PublishedData(1n, 1n, `0x01`),
-        attestations: [CommitteeAttestation.random()],
-      }),
-    ];
+  getCheckpointData(_n: CheckpointNumber): Promise<CheckpointData | undefined> {
+    return Promise.resolve(undefined);
+  }
+  getCheckpointDataRange(_from: CheckpointNumber, _limit: number): Promise<CheckpointData[]> {
+    return Promise.resolve([]);
+  }
+  getCheckpointNumberBySlot(_slot: SlotNumber): Promise<CheckpointNumber | undefined> {
+    return Promise.resolve(undefined);
   }
   async getBlocksForSlot(slotNumber: SlotNumber): Promise<L2Block[]> {
     expect(slotNumber).toEqual(SlotNumber(1));
     return [await L2Block.random(BlockNumber(Number(slotNumber)))];
   }
-  async getCheckpointedBlockHeadersForEpoch(epochNumber: EpochNumber): Promise<BlockHeader[]> {
-    expect(epochNumber).toEqual(EpochNumber(1));
-    const block = await L2Block.random(BlockNumber(Number(epochNumber)));
-    return [block.header];
-  }
   isEpochComplete(epochNumber: EpochNumber): Promise<boolean> {
     expect(epochNumber).toEqual(EpochNumber(1));
     return Promise.resolve(true);
diff --git a/yarn-project/stdlib/src/interfaces/archiver.ts b/yarn-project/stdlib/src/interfaces/archiver.ts
index 43af8f6f341e..9809a2d1af15 100644
--- a/yarn-project/stdlib/src/interfaces/archiver.ts
+++ b/yarn-project/stdlib/src/interfaces/archiver.ts
@@ -5,10 +5,8 @@ import type { ApiSchemaFor } from '@aztec/foundation/schemas';
 import { z } from 'zod';
 
 import { BlockDataSchema } from '../block/block_data.js';
-import { BlockHash } from '../block/block_hash.js';
-import { CheckpointedL2Block } from '../block/checkpointed_l2_block.js';
 import { L2Block } from '../block/l2_block.js';
-import { type L2BlockSource, L2TipsSchema } from '../block/l2_block_source.js';
+import { BlockQuerySchema, BlocksQuerySchema, type L2BlockSource, L2TipsSchema } from '../block/l2_block_source.js';
 import { ValidateCheckpointResultSchema } from '../block/validate_block_result.js';
 import { Checkpoint } from '../checkpoint/checkpoint.js';
 import { CheckpointDataSchema, ProposedCheckpointDataSchema } from '../checkpoint/checkpoint_data.js';
@@ -25,7 +23,6 @@ import { Tag } from '../logs/tag.js';
 import { TxScopedL2Log } from '../logs/tx_scoped_l2_log.js';
 import type { L1ToL2MessageSource } from '../messaging/l1_to_l2_message_source.js';
 import { optional, schemas } from '../schemas/schemas.js';
-import { BlockHeader } from '../tx/block_header.js';
 import { indexedTxSchema } from '../tx/indexed_tx_effect.js';
 import { TxHash } from '../tx/tx_hash.js';
 import { TxReceipt } from '../tx/tx_receipt.js';
@@ -85,50 +82,34 @@ export const ArchiverSpecificConfigSchema = z.object({
 
 export type ArchiverApi = Omit<
   L2BlockSource & L2LogsSource & ContractDataSource & L1ToL2MessageSource,
-  'start' | 'stop'
+  'start' | 'stop' | 'getGenesisBlockHash'
 >;
 
 export const ArchiverApiSchema: ApiSchemaFor<ArchiverApi> = {
   getRollupAddress: z.function().args().returns(schemas.EthAddress),
   getRegistryAddress: z.function().args().returns(schemas.EthAddress),
-  getBlockNumber: z.function().args().returns(BlockNumberSchema),
+  getBlockNumber: z.function().args(optional(BlockQuerySchema)).returns(BlockNumberSchema.optional()),
   getProvenBlockNumber: z.function().args().returns(BlockNumberSchema),
   getCheckpointedL2BlockNumber: z.function().args().returns(BlockNumberSchema),
   getCheckpointNumber: z.function().args().returns(CheckpointNumberSchema),
   getFinalizedL2BlockNumber: z.function().args().returns(BlockNumberSchema),
-  getBlock: z.function().args(BlockNumberSchema).returns(L2Block.schema.optional()),
-  getBlockHeader: z
-    .function()
-    .args(z.union([BlockNumberSchema, z.literal('latest')]))
-    .returns(BlockHeader.schema.optional()),
-  getCheckpointedBlock: z.function().args(BlockNumberSchema).returns(CheckpointedL2Block.schema.optional()),
-  getCheckpointedBlocks: z
-    .function()
-    .args(BlockNumberSchema, schemas.Integer)
-    .returns(z.array(CheckpointedL2Block.schema)),
-  getBlocks: z.function().args(BlockNumberSchema, schemas.Integer).returns(z.array(L2Block.schema)),
   getCheckpoints: z
     .function()
     .args(CheckpointNumberSchema, schemas.Integer)
     .returns(z.array(PublishedCheckpoint.schema)),
-  getCheckpointedBlockByHash: z.function().args(BlockHash.schema).returns(CheckpointedL2Block.schema.optional()),
-  getCheckpointedBlockByArchive: z.function().args(schemas.Fr).returns(CheckpointedL2Block.schema.optional()),
-  getBlockHeaderByHash: z.function().args(BlockHash.schema).returns(BlockHeader.schema.optional()),
-  getBlockHeaderByArchive: z.function().args(schemas.Fr).returns(BlockHeader.schema.optional()),
-  getBlockData: z.function().args(BlockNumberSchema).returns(BlockDataSchema.optional()),
-  getBlockDataByArchive: z.function().args(schemas.Fr).returns(BlockDataSchema.optional()),
-  getL2Block: z.function().args(BlockNumberSchema).returns(L2Block.schema.optional()),
-  getL2BlockByHash: z.function().args(BlockHash.schema).returns(L2Block.schema.optional()),
-  getL2BlockByArchive: z.function().args(schemas.Fr).returns(L2Block.schema.optional()),
+  getCheckpointData: z.function().args(CheckpointNumberSchema).returns(CheckpointDataSchema.optional()),
+  getCheckpointDataRange: z
+    .function()
+    .args(CheckpointNumberSchema, schemas.Integer)
+    .returns(z.array(CheckpointDataSchema)),
+  getCheckpointNumberBySlot: z.function().args(schemas.SlotNumber).returns(CheckpointNumberSchema.optional()),
   getTxEffect: z.function().args(TxHash.schema).returns(indexedTxSchema().optional()),
   getSettledTxReceipt: z.function().args(TxHash.schema).returns(TxReceipt.schema.optional()),
   getSyncedL2SlotNumber: z.function().args().returns(schemas.SlotNumber.optional()),
   getSyncedL2EpochNumber: z.function().args().returns(EpochNumberSchema.optional()),
   getCheckpointsForEpoch: z.function().args(EpochNumberSchema).returns(z.array(Checkpoint.schema)),
   getCheckpointsDataForEpoch: z.function().args(EpochNumberSchema).returns(z.array(CheckpointDataSchema)),
-  getCheckpointedBlocksForEpoch: z.function().args(EpochNumberSchema).returns(z.array(CheckpointedL2Block.schema)),
   getBlocksForSlot: z.function().args(schemas.SlotNumber).returns(z.array(L2Block.schema)),
-  getCheckpointedBlockHeadersForEpoch: z.function().args(EpochNumberSchema).returns(z.array(BlockHeader.schema)),
   isEpochComplete: z.function().args(EpochNumberSchema).returns(z.boolean()),
   getL2Tips: z.function().args().returns(L2TipsSchema),
   getPrivateLogsByTags: z
@@ -158,9 +139,13 @@ export const ArchiverApiSchema: ApiSchemaFor<ArchiverApi> = {
     .args()
     .returns(z.object({ genesisArchiveRoot: schemas.Fr })),
   getL1Timestamp: z.function().args().returns(schemas.BigInt.optional()),
-  getProposedCheckpoint: z.function().args().returns(ProposedCheckpointDataSchema.optional()),
-  getProposedCheckpointOnly: z.function().args().returns(ProposedCheckpointDataSchema.optional()),
+  getLastCheckpoint: z.function().args().returns(ProposedCheckpointDataSchema.optional()),
+  getLastProposedCheckpoint: z.function().args().returns(ProposedCheckpointDataSchema.optional()),
   syncImmediate: z.function().args().returns(z.void()),
   isPendingChainInvalid: z.function().args().returns(z.boolean()),
   getPendingChainValidationStatus: z.function().args().returns(ValidateCheckpointResultSchema),
+  getBlock: z.function().args(BlockQuerySchema).returns(L2Block.schema.optional()),
+  getBlocks: z.function().args(BlocksQuerySchema).returns(z.array(L2Block.schema)),
+  getBlockData: z.function().args(BlockQuerySchema).returns(BlockDataSchema.optional()),
+  getBlocksData: z.function().args(BlocksQuerySchema).returns(z.array(BlockDataSchema)),
 };
diff --git a/yarn-project/stdlib/src/interfaces/aztec-node-admin.test.ts b/yarn-project/stdlib/src/interfaces/aztec-node-admin.test.ts
index e8533579caad..8b42f9ba73dd 100644
--- a/yarn-project/stdlib/src/interfaces/aztec-node-admin.test.ts
+++ b/yarn-project/stdlib/src/interfaces/aztec-node-admin.test.ts
@@ -135,6 +135,7 @@ class MockAztecNodeAdmin implements AztecNodeAdmin {
       signingTimeoutMs: 3000,
       maxStuckDutiesAgeMs: 72000,
       dataStoreMapSizeKb: 128 * 1024 * 1024,
+      l1ChainId: 1,
       l1Contracts: {
         rollupAddress: EthAddress.random(),
       },
diff --git a/yarn-project/stdlib/src/interfaces/aztec-node-admin.ts b/yarn-project/stdlib/src/interfaces/aztec-node-admin.ts
index 45d098d2b265..fb4e062682b9 100644
--- a/yarn-project/stdlib/src/interfaces/aztec-node-admin.ts
+++ b/yarn-project/stdlib/src/interfaces/aztec-node-admin.ts
@@ -81,6 +81,8 @@ export type AztecNodeAdminConfig = Omit<ValidatorClientFullConfig, 'l1Contracts'
     'archiverPollingIntervalMS' | 'archiverBatchSize' | 'skipValidateCheckpointAttestations'
   > & {
     maxPendingTxCount: number;
+    // Keep in sync with P2PConfig.skipIncomingProposals (circular dep prevents Pick<P2PConfig, ...> here)
+    skipIncomingProposals?: boolean;
   };
 
 export const AztecNodeAdminConfigSchema = SequencerConfigSchema.merge(ProverConfigSchema)
@@ -93,7 +95,7 @@ export const AztecNodeAdminConfigSchema = SequencerConfigSchema.merge(ProverConf
       skipValidateCheckpointAttestations: true,
     }),
   )
-  .merge(z.object({ maxPendingTxCount: z.number() }));
+  .merge(z.object({ maxPendingTxCount: z.number(), skipIncomingProposals: z.boolean().optional() }));
 
 export const AztecNodeAdminApiSchema: ApiSchemaFor<AztecNodeAdmin> = {
   getConfig: z.function().returns(AztecNodeAdminConfigSchema),
diff --git a/yarn-project/stdlib/src/interfaces/aztec-node.test.ts b/yarn-project/stdlib/src/interfaces/aztec-node.test.ts
index 26dfaef2d577..dd3cdc3fab00 100644
--- a/yarn-project/stdlib/src/interfaces/aztec-node.test.ts
+++ b/yarn-project/stdlib/src/interfaces/aztec-node.test.ts
@@ -1,8 +1,6 @@
 import { ARCHIVE_HEIGHT, L1_TO_L2_MSG_TREE_HEIGHT, NOTE_HASH_TREE_HEIGHT } from '@aztec/constants';
 import { type L1ContractAddresses, L1ContractsNames } from '@aztec/ethereum/l1-contract-addresses';
 import { BlockNumber, CheckpointNumber, EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
-import { Buffer32 } from '@aztec/foundation/buffer';
-import { timesAsync } from '@aztec/foundation/collection';
 import { randomInt } from '@aztec/foundation/crypto/random';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { memoize } from '@aztec/foundation/decorators';
@@ -16,10 +14,8 @@ import times from 'lodash.times';
 import type { ContractArtifact } from '../abi/abi.js';
 import { AztecAddress } from '../aztec-address/index.js';
 import type { DataInBlock } from '../block/in_block.js';
-import { type BlockData, BlockHash, type BlockParameter, CommitteeAttestation, L2Block } from '../block/index.js';
+import { BlockHash, type BlockParameter } from '../block/index.js';
 import type { L2Tips } from '../block/l2_block_source.js';
-import { Checkpoint } from '../checkpoint/checkpoint.js';
-import { L1PublishedData, PublishedCheckpoint } from '../checkpoint/published_checkpoint.js';
 import {
   type ContractClassPublic,
   type ContractInstanceWithAddress,
@@ -53,6 +49,10 @@ import type { SingleValidatorStats, ValidatorsStats } from '../validators/types.
 import type { AllowedElement } from './allowed_element.js';
 import { MAX_RPC_LEN } from './api_limit.js';
 import { type AztecNode, AztecNodeApiSchema } from './aztec-node.js';
+import type { BlockIncludeOptions, BlockResponse } from './block_response.js';
+import type { ChainTip, ChainTips } from './chain_tips.js';
+import type { CheckpointParameter } from './checkpoint_parameter.js';
+import type { CheckpointIncludeOptions, CheckpointResponse } from './checkpoint_response.js';
 import type { SequencerConfig } from './configs.js';
 import type { GetContractClassLogsResponse, GetPublicLogsResponse } from './get_logs_response.js';
 import type { ProverConfig } from './prover-client.js';
@@ -75,7 +75,7 @@ describe('AztecNodeApiSchema', () => {
   });
 
   afterEach(() => {
-    tested.add(/^AztecNodeApiSchema\s+([^(]+)/.exec(expect.getState().currentTestName!)![1]);
+    tested.add(/^AztecNodeApiSchema\s+([^(]+?)\s*(\(|$)/.exec(expect.getState().currentTestName!)![1]);
     context.httpServer.close();
   });
 
@@ -84,6 +84,20 @@ describe('AztecNodeApiSchema', () => {
     expect([...tested].sort()).toEqual(all.sort());
   });
 
+  it('getChainTips', async () => {
+    const result = await context.client.getChainTips();
+    const expectedTipId = {
+      block: { number: 1, hash: `0x01` },
+      checkpoint: { number: 1, hash: `0x01` },
+    };
+    expect(result).toEqual({
+      proposed: { number: 1, hash: `0x01` },
+      checkpointed: expectedTipId,
+      proven: expectedTipId,
+      finalized: expectedTipId,
+    });
+  });
+
   it('getL2Tips', async () => {
     const result = await context.client.getL2Tips();
     const expectedTipId = {
@@ -162,27 +176,22 @@ describe('AztecNodeApiSchema', () => {
 
   it('getBlock', async () => {
     const response = await context.client.getBlock(BlockNumber(1));
-    expect(response).toBeInstanceOf(L2Block);
-  });
-
-  it('getBlockByHash', async () => {
-    const response = await context.client.getBlockByHash(BlockHash.random());
-    expect(response).toBeInstanceOf(L2Block);
-  });
-
-  it('getBlockByArchive', async () => {
-    const response = await context.client.getBlockByArchive(Fr.random());
-    expect(response).toBeInstanceOf(L2Block);
+    expect(response).toBeUndefined();
   });
 
   it('getBlockHeader', async () => {
-    const response = await context.client.getBlockHeader(BlockHash.random());
+    const response = await context.client.getBlockHeader(BlockNumber(1));
     expect(response).toBeInstanceOf(BlockHeader);
   });
 
-  it('getBlockHeaderByArchive', async () => {
-    const response = await context.client.getBlockHeaderByArchive(Fr.random());
-    expect(response).toBeInstanceOf(BlockHeader);
+  it('getCheckpointedBlocks', async () => {
+    const response = await context.client.getCheckpointedBlocks(BlockNumber(1), 10);
+    expect(response).toEqual([]);
+  });
+
+  it('getCheckpoint', async () => {
+    const response = await context.client.getCheckpoint(CheckpointNumber(1));
+    expect(response).toBeUndefined();
   });
 
   it('getCurrentMinFees', async () => {
@@ -201,23 +210,14 @@ describe('AztecNodeApiSchema', () => {
   });
 
   it('getBlockNumber', async () => {
-    const response = await context.client.getBlockNumber();
-    expect(response).toBe(BlockNumber(1));
-  });
-
-  it('getProvenBlockNumber', async () => {
-    const response = await context.client.getProvenBlockNumber();
-    expect(response).toBe(BlockNumber(1));
-  });
-
-  it('getCheckpointedBlockNumber', async () => {
-    const response = await context.client.getCheckpointedBlockNumber();
-    expect(response).toBe(BlockNumber(1));
+    expect(await context.client.getBlockNumber()).toBe(BlockNumber(1));
+    expect(await context.client.getBlockNumber('proven')).toBe(BlockNumber(1));
+    expect(await context.client.getBlockNumber('checkpointed')).toBe(BlockNumber(1));
   });
 
   it('getCheckpointNumber', async () => {
-    const response = await context.client.getCheckpointNumber();
-    expect(response).toBe(CheckpointNumber(1));
+    expect(await context.client.getCheckpointNumber()).toBe(CheckpointNumber(1));
+    expect(await context.client.getCheckpointNumber('proven')).toBe(CheckpointNumber(1));
   });
 
   it('isReady', async () => {
@@ -239,9 +239,8 @@ describe('AztecNodeApiSchema', () => {
   });
 
   it('getBlocks', async () => {
-    const response = await context.client.getBlocks(BlockNumber(1), BlockNumber(1));
-    expect(response).toHaveLength(1);
-    expect(response[0]).toBeInstanceOf(L2Block);
+    const response = await context.client.getBlocks(BlockNumber(1), 1);
+    expect(response).toEqual([]);
 
     await expect(context.client.getBlocks(-1 as BlockNumber, BlockNumber(1))).rejects.toThrow();
     await expect(context.client.getBlocks(BlockNumber.ZERO, BlockNumber(1))).rejects.toThrow();
@@ -251,12 +250,6 @@ describe('AztecNodeApiSchema', () => {
 
   it('getCheckpoints', async () => {
     const response = await context.client.getCheckpoints(CheckpointNumber(1), 1);
-    expect(response).toHaveLength(1);
-    expect(response[0]).toBeInstanceOf(PublishedCheckpoint);
-  });
-
-  it('getCheckpointedBlocks', async () => {
-    const response = await context.client.getCheckpointedBlocks(BlockNumber(1), 1);
     expect(response).toEqual([]);
   });
 
@@ -354,9 +347,23 @@ describe('AztecNodeApiSchema', () => {
     expect(response).toBeInstanceOf(Fr);
   });
 
-  it('getBlockHeader', async () => {
-    const response = await context.client.getBlockHeader();
-    expect(response).toBeInstanceOf(BlockHeader);
+  it.each<[string, BlockParameter]>([
+    ['BlockNumber', BlockNumber(7)],
+    ['BlockHash', new BlockHash(new Fr(0x1234))],
+    ['{ archive }', { archive: new Fr(0x5678) }],
+    ['tag latest', 'latest'],
+    ['tag proven', 'proven'],
+  ])('getPublicStorageAt (round-trips %s)', async (_, block) => {
+    handler.lastReferenceBlock = undefined;
+    await context.client.getPublicStorageAt(block, await AztecAddress.random(), Fr.random());
+    if (typeof block === 'object' && 'archive' in block) {
+      expect(handler.lastReferenceBlock).toEqual({ archive: expect.any(Fr) });
+    } else if (BlockHash.isBlockHash(block)) {
+      expect(BlockHash.isBlockHash(handler.lastReferenceBlock)).toBe(true);
+      expect((handler.lastReferenceBlock as unknown as BlockHash).toString()).toEqual(block.toString());
+    } else {
+      expect(handler.lastReferenceBlock).toEqual(block);
+    }
   });
 
   it('getValidatorsStats', async () => {
@@ -514,6 +521,7 @@ describe('AztecNodeApiSchema', () => {
 class MockAztecNode implements AztecNode {
   public validatorStats: ValidatorsStats | undefined;
   public singleValidatorStats: SingleValidatorStats | undefined;
+  public lastReferenceBlock: BlockParameter | undefined;
 
   constructor(private artifact: ContractArtifact) {}
 
@@ -527,7 +535,7 @@ class MockAztecNode implements AztecNode {
     });
   }
 
-  getL2Tips(): Promise<L2Tips> {
+  getChainTips(): Promise<ChainTips> {
     const tipId = {
       block: { number: BlockNumber(1), hash: `0x01` },
       checkpoint: { number: CheckpointNumber(1), hash: `0x01` },
@@ -535,13 +543,38 @@ class MockAztecNode implements AztecNode {
     return Promise.resolve({
       proposed: { number: BlockNumber(1), hash: `0x01` },
       checkpointed: tipId,
-      proposedCheckpoint: tipId,
       proven: tipId,
       finalized: tipId,
     });
   }
 
-  getCheckpointedBlocks(_from: BlockNumber, _limit: number) {
+  getBlock<Opts extends BlockIncludeOptions = {}>(
+    _param: BlockParameter,
+    _options?: Opts,
+  ): Promise<BlockResponse<Opts> | undefined> {
+    return Promise.resolve(undefined);
+  }
+
+  getBlocks<Opts extends BlockIncludeOptions = {}>(
+    _from: BlockNumber,
+    _limit: number,
+    _options?: Opts,
+  ): Promise<BlockResponse<Opts>[]> {
+    return Promise.resolve([]);
+  }
+
+  getCheckpoint<Opts extends CheckpointIncludeOptions = {}>(
+    _param: CheckpointParameter,
+    _options?: Opts,
+  ): Promise<CheckpointResponse<Opts> | undefined> {
+    return Promise.resolve(undefined);
+  }
+
+  getCheckpoints<Opts extends CheckpointIncludeOptions = {}>(
+    _from: CheckpointNumber,
+    _limit: number,
+    _options?: Opts,
+  ): Promise<CheckpointResponse<Opts>[]> {
     return Promise.resolve([]);
   }
 
@@ -549,6 +582,28 @@ class MockAztecNode implements AztecNode {
     return Promise.resolve([]);
   }
 
+  getL2Tips(): Promise<L2Tips> {
+    const tipId = {
+      block: { number: BlockNumber(1), hash: `0x01` },
+      checkpoint: { number: CheckpointNumber(1), hash: `0x01` },
+    };
+    return Promise.resolve({
+      proposed: { number: BlockNumber(1), hash: `0x01` },
+      checkpointed: tipId,
+      proposedCheckpoint: tipId,
+      proven: tipId,
+      finalized: tipId,
+    });
+  }
+
+  getBlockHeader(_number: BlockNumber | 'latest'): Promise<BlockHeader | undefined> {
+    return Promise.resolve(BlockHeader.empty());
+  }
+
+  getCheckpointedBlocks(_from: BlockNumber, _limit: number): Promise<BlockResponse[]> {
+    return Promise.resolve([]);
+  }
+
   findLeavesIndexes(
     referenceBlock: BlockParameter,
     treeId: MerkleTreeId,
@@ -641,25 +696,6 @@ class MockAztecNode implements AztecNode {
     expect(leafSlot).toBeInstanceOf(Fr);
     return Promise.resolve(PublicDataWitness.random());
   }
-  getBlock(blockParameter: BlockParameter): Promise<L2Block | undefined> {
-    const blockNum = blockParameter === 'latest' ? BlockNumber(1) : (blockParameter as BlockNumber);
-    return L2Block.random(blockNum);
-  }
-  getBlockByHash(_blockHash: BlockHash): Promise<L2Block | undefined> {
-    return L2Block.random(BlockNumber(1));
-  }
-  getBlockByArchive(_archive: Fr): Promise<L2Block | undefined> {
-    return L2Block.random(BlockNumber(1));
-  }
-  getBlockHeaderByArchive(_archive: Fr): Promise<BlockHeader | undefined> {
-    return Promise.resolve(BlockHeader.empty());
-  }
-  getBlockData(_number: BlockNumber): Promise<BlockData | undefined> {
-    return Promise.resolve(undefined);
-  }
-  getBlockDataByArchive(_archive: Fr): Promise<BlockData | undefined> {
-    return Promise.resolve(undefined);
-  }
   getCurrentMinFees(): Promise<GasFees> {
     return Promise.resolve(GasFees.empty());
   }
@@ -669,16 +705,10 @@ class MockAztecNode implements AztecNode {
   getMaxPriorityFees(): Promise<GasFees> {
     return Promise.resolve(GasFees.empty());
   }
-  getBlockNumber(): Promise<BlockNumber> {
-    return Promise.resolve(BlockNumber(1));
-  }
-  getProvenBlockNumber(): Promise<BlockNumber> {
-    return Promise.resolve(BlockNumber(1));
-  }
-  getCheckpointedBlockNumber(): Promise<BlockNumber> {
+  getBlockNumber(_tip?: ChainTip): Promise<BlockNumber> {
     return Promise.resolve(BlockNumber(1));
   }
-  getCheckpointNumber(): Promise<CheckpointNumber> {
+  getCheckpointNumber(_tip?: ChainTip): Promise<CheckpointNumber> {
     return Promise.resolve(CheckpointNumber(1));
   }
   isReady(): Promise<boolean> {
@@ -700,22 +730,6 @@ class MockAztecNode implements AztecNode {
       realProofs: true,
     };
   }
-  getBlocks(from: number, limit: number): Promise<L2Block[]> {
-    return Promise.all(
-      Array(limit)
-        .fill(0)
-        .map(i => L2Block.random(BlockNumber(from + i))),
-    );
-  }
-  getCheckpoints(from: CheckpointNumber, limit: number): Promise<PublishedCheckpoint[]> {
-    return timesAsync(limit, async i =>
-      PublishedCheckpoint.from({
-        checkpoint: await Checkpoint.random(CheckpointNumber(from + i)),
-        attestations: [CommitteeAttestation.random()],
-        l1: new L1PublishedData(1n, 1n, Buffer32.random().toString()),
-      }),
-    );
-  }
   getNodeVersion(): Promise<string> {
     return Promise.resolve('1.0.0');
   }
@@ -796,14 +810,17 @@ class MockAztecNode implements AztecNode {
     return Promise.resolve([Tx.random()]);
   }
   getPublicStorageAt(block: BlockParameter, contract: AztecAddress, slot: Fr): Promise<Fr> {
-    expect(block === 'latest' || block instanceof Fr || typeof block === 'number').toBe(true);
+    expect(
+      typeof block === 'number' ||
+        typeof block === 'string' ||
+        BlockHash.isBlockHash(block) ||
+        (typeof block === 'object' && block !== null),
+    ).toBe(true);
     expect(contract).toBeInstanceOf(AztecAddress);
     expect(slot).toBeInstanceOf(Fr);
+    this.lastReferenceBlock = block;
     return Promise.resolve(Fr.random());
   }
-  getBlockHeader(_block?: BlockParameter): Promise<BlockHeader> {
-    return Promise.resolve(BlockHeader.empty());
-  }
   getValidatorsStats(): Promise<ValidatorsStats> {
     return Promise.resolve(this.validatorStats!);
   }
diff --git a/yarn-project/stdlib/src/interfaces/aztec-node.ts b/yarn-project/stdlib/src/interfaces/aztec-node.ts
index 57d2f2efd944..0488bb98c30f 100644
--- a/yarn-project/stdlib/src/interfaces/aztec-node.ts
+++ b/yarn-project/stdlib/src/interfaces/aztec-node.ts
@@ -1,13 +1,13 @@
 import { ARCHIVE_HEIGHT, L1_TO_L2_MSG_TREE_HEIGHT, NOTE_HASH_TREE_HEIGHT } from '@aztec/constants';
 import { type L1ContractAddresses, L1ContractAddressesSchema } from '@aztec/ethereum/l1-contract-addresses';
 import {
-  BlockNumber,
+  type BlockNumber,
   BlockNumberPositiveSchema,
   BlockNumberSchema,
-  CheckpointNumber,
+  type CheckpointNumber,
   CheckpointNumberPositiveSchema,
   CheckpointNumberSchema,
-  EpochNumber,
+  type EpochNumber,
   EpochNumberSchema,
   type SlotNumber,
 } from '@aztec/foundation/branded-types';
@@ -21,12 +21,9 @@ import { z } from 'zod';
 import type { AztecAddress } from '../aztec-address/index.js';
 import { BlockHash } from '../block/block_hash.js';
 import { type BlockParameter, BlockParameterSchema } from '../block/block_parameter.js';
-import { CheckpointedL2Block } from '../block/checkpointed_l2_block.js';
 import { type DataInBlock, dataInBlockSchemaFor } from '../block/in_block.js';
-import { L2Block } from '../block/l2_block.js';
-import { type L2BlockSource, type L2Tips, L2TipsSchema } from '../block/l2_block_source.js';
-import { CheckpointDataSchema } from '../checkpoint/checkpoint_data.js';
-import { PublishedCheckpoint } from '../checkpoint/published_checkpoint.js';
+import { type L2Tips, L2TipsSchema } from '../block/l2_block_source.js';
+import { type CheckpointData, CheckpointDataSchema } from '../checkpoint/checkpoint_data.js';
 import {
   type ContractClassPublic,
   ContractClassPublicSchema,
@@ -49,6 +46,7 @@ import {
   BlockHeader,
   type IndexedTxEffect,
   PublicSimulationOutput,
+  SimulationOverrides,
   Tx,
   TxHash,
   TxReceipt,
@@ -61,6 +59,20 @@ import type { SingleValidatorStats, ValidatorsStats } from '../validators/types.
 import { type ComponentsVersions, getVersioningResponseHandler } from '../versioning/index.js';
 import { type AllowedElement, AllowedElementSchema } from './allowed_element.js';
 import { MAX_RPC_BLOCKS_LEN, MAX_RPC_CHECKPOINTS_LEN, MAX_RPC_LEN, MAX_RPC_TXS_LEN } from './api_limit.js';
+import {
+  type BlockIncludeOptions,
+  BlockIncludeOptionsSchema,
+  type BlockResponse,
+  BlockResponseSchema,
+} from './block_response.js';
+import { type ChainTip, ChainTipSchema, type ChainTips, ChainTipsSchema } from './chain_tips.js';
+import { type CheckpointParameter, CheckpointParameterSchema } from './checkpoint_parameter.js';
+import {
+  type CheckpointIncludeOptions,
+  CheckpointIncludeOptionsSchema,
+  type CheckpointResponse,
+  CheckpointResponseSchema,
+} from './checkpoint_response.js';
 import {
   type GetContractClassLogsResponse,
   GetContractClassLogsResponseSchema,
@@ -73,21 +85,7 @@ import { type WorldStateSyncStatus, WorldStateSyncStatusSchema } from './world_s
  * The aztec node.
  * We will probably implement the additional interfaces by means other than Aztec Node as it's currently a privacy leak
  */
-export interface AztecNode
-  extends Pick<
-    L2BlockSource,
-    | 'getBlocks'
-    | 'getCheckpoints'
-    | 'getBlockHeader'
-    | 'getL2Tips'
-    | 'getCheckpointedBlocks'
-    | 'getCheckpointsDataForEpoch'
-  > {
-  /**
-   * Returns the tips of the L2 chain.
-   */
-  getL2Tips(): Promise<L2Tips>;
-
+export interface AztecNode {
   /**
    * Returns the sync status of the node's world state
    */
@@ -202,49 +200,76 @@ export interface AztecNode
   getL2ToL1Messages(epoch: EpochNumber): Promise<Fr[][][][]>;
 
   /**
-   * Get a block specified by its block number or 'latest'.
-   * @param blockParameter - The block parameter (block number, block hash, or 'latest').
-   * @returns The requested block.
+   * Returns the block number at a given chain tip, or the latest proposed block number when
+   * `tip` is omitted.
    */
-  getBlock(blockParameter: BlockParameter): Promise<L2Block | undefined>;
+  getBlockNumber(tip?: ChainTip): Promise<BlockNumber>;
 
   /**
-   * Get a block specified by its hash.
-   * @param blockHash - The block hash being requested.
-   * @returns The requested block.
+   * Returns the checkpoint number at a given chain tip, or the latest checkpoint number when
+   * `tip` is omitted.
+   *
+   * @remarks **Semantic foot-gun**: block-side `'proposed'` means "latest proposed block" (chain
+   * head), but checkpoint-side `'proposed'` means "latest confirmed checkpoint" — pre-L1-confirm
+   * checkpoints are not exposed over RPC. `'checkpointed'` on the checkpoint side is equivalent.
    */
-  getBlockByHash(blockHash: BlockHash): Promise<L2Block | undefined>;
+  getCheckpointNumber(tip?: ChainTip): Promise<CheckpointNumber>;
 
-  /**
-   * Get a block specified by its archive root.
-   * @param archive - The archive root being requested.
-   * @returns The requested block.
-   */
-  getBlockByArchive(archive: Fr): Promise<L2Block | undefined>;
+  /** Returns the tips of the L2 chain. */
+  getChainTips(): Promise<ChainTips>;
+
+  // TODO(spl/new-rpc-api): the following methods are kept on the interface as a stop-gap because
+  // `L2BlockStream` (used by PXE's block synchronizer) and `computeL2ToL1MembershipWitness` (used
+  // by end-to-end tests) still consume the internal archiver shapes. Remove them when those
+  // consumers are rewired to the unified `BlockResponse` / `CheckpointResponse` API.
+  /** @deprecated Scheduled for removal; use `getChainTips` for public callers. */
+  getL2Tips(): Promise<L2Tips>;
+  /** @deprecated Scheduled for removal; use `getBlock(param).then(r => r?.header)`. */
+  getBlockHeader(number: BlockNumber | 'latest'): Promise<BlockHeader | undefined>;
+  /** @deprecated Scheduled for removal; use `getBlocks(from, limit, { includeL1PublishInfo: true, includeAttestations: true })`. */
+  getCheckpointedBlocks(from: BlockNumber, limit: number): Promise<BlockResponse[]>;
+  /** @deprecated Scheduled for removal; use `getCheckpoints(from, limit)` over an explicit checkpoint range. */
+  getCheckpointsDataForEpoch(epoch: EpochNumber): Promise<CheckpointData[]>;
 
   /**
-   * Method to fetch the latest block number synchronized by the node.
-   * @returns The block number.
+   * Unified block fetch. Returns the block identified by `param`, with optional fields controlled
+   * by `options`.
+   * @param param - A block number, block hash, archive root, chain-tip name, or object variant.
+   * @param options - Narrowing options: `includeTransactions`, `includeL1PublishInfo`, `includeAttestations`.
    */
-  getBlockNumber(): Promise<BlockNumber>;
+  getBlock<Opts extends BlockIncludeOptions = {}>(
+    param: BlockParameter,
+    options?: Opts,
+  ): Promise<BlockResponse<Opts> | undefined>;
 
   /**
-   * Fetches the latest proven block number.
-   * @returns The block number.
+   * Returns up to `limit` blocks starting from `from`, projected to the {@link BlockResponse}
+   * shape determined by `options`.
    */
-  getProvenBlockNumber(): Promise<BlockNumber>;
+  getBlocks<Opts extends BlockIncludeOptions = {}>(
+    from: BlockNumber,
+    limit: number,
+    options?: Opts,
+  ): Promise<BlockResponse<Opts>[]>;
 
   /**
-   * Fetches the latest checkpointed block number.
-   * @returns The block number.
+   * Unified checkpoint fetch. Returns the checkpoint identified by `param`, with optional fields
+   * controlled by `options`.
    */
-  getCheckpointedBlockNumber(): Promise<BlockNumber>;
+  getCheckpoint<Opts extends CheckpointIncludeOptions = {}>(
+    param: CheckpointParameter,
+    options?: Opts,
+  ): Promise<CheckpointResponse<Opts> | undefined>;
 
   /**
-   * Method to fetch the latest checkpoint number synchronized by the node.
-   * @returns The checkpoint number.
+   * Returns up to `limit` checkpoints starting from `from`, projected to the
+   * {@link CheckpointResponse} shape determined by `options`.
    */
-  getCheckpointNumber(): Promise<CheckpointNumber>;
+  getCheckpoints<Opts extends CheckpointIncludeOptions = {}>(
+    from: CheckpointNumber,
+    limit: number,
+    options?: Opts,
+  ): Promise<CheckpointResponse<Opts>[]>;
 
   /**
    * Method to determine if the node is ready to accept transactions.
@@ -259,14 +284,6 @@ export interface AztecNode
    */
   getNodeInfo(): Promise<NodeInfo>;
 
-  /**
-   * Method to request blocks. Will attempt to return all requested blocks but will return only those available.
-   * @param from - The start of the range of blocks to return.
-   * @param limit - The maximum number of blocks to return.
-   * @returns The blocks requested.
-   */
-  getBlocks(from: BlockNumber, limit: number): Promise<L2Block[]>;
-
   /**
    * Method to fetch the current min fees.
    * @returns The current min fees.
@@ -434,20 +451,6 @@ export interface AztecNode
    */
   getPublicStorageAt(referenceBlock: BlockParameter, contract: AztecAddress, slot: Fr): Promise<Fr>;
 
-  /**
-   * Returns the block header for a given block number, block hash, or 'latest'.
-   * @param block - The block parameter (block number, block hash, or 'latest'). Defaults to 'latest'.
-   * @returns The requested block header.
-   */
-  getBlockHeader(block?: BlockParameter): Promise<BlockHeader | undefined>;
-
-  /**
-   * Get a block header specified by its archive root.
-   * @param archive - The archive root being requested.
-   * @returns The requested block header.
-   */
-  getBlockHeaderByArchive(archive: Fr): Promise<BlockHeader | undefined>;
-
   /** Returns stats for validators if enabled. */
   getValidatorsStats(): Promise<ValidatorsStats>;
 
@@ -462,8 +465,15 @@ export interface AztecNode
    * Simulates the public part of a transaction with the current state.
    * This currently just checks that the transaction execution succeeds.
    * @param tx - The transaction to simulate.
+   * @param skipFeeEnforcement - If true, fee enforcement is skipped.
+   * @param overrides - Optional pre-simulation overrides applied to the ephemeral fork and contract DB
+   * (publicStorage writes, contract instance overrides).
    **/
-  simulatePublicCalls(tx: Tx, skipFeeEnforcement?: boolean): Promise<PublicSimulationOutput>;
+  simulatePublicCalls(
+    tx: Tx,
+    skipFeeEnforcement?: boolean,
+    overrides?: SimulationOverrides,
+  ): Promise<PublicSimulationOutput>;
 
   /**
    * Returns true if the transaction is valid for inclusion at the current state. Valid transactions can be
@@ -503,8 +513,6 @@ const MAX_SIGNATURES_PER_REGISTER_CALL = 100;
 const MAX_SIGNATURE_LEN = 10000;
 
 export const AztecNodeApiSchema: ApiSchemaFor<AztecNode> = {
-  getL2Tips: z.function().args().returns(L2TipsSchema),
-
   getWorldStateSyncStatus: z.function().args().returns(WorldStateSyncStatusSchema),
 
   findLeavesIndexes: z
@@ -551,40 +559,53 @@ export const AztecNodeApiSchema: ApiSchemaFor<AztecNode> = {
     .args(EpochNumberSchema)
     .returns(z.array(z.array(z.array(z.array(schemas.Fr))))),
 
-  getBlock: z.function().args(BlockParameterSchema).returns(L2Block.schema.optional()),
+  getBlockNumber: z.function().args(optional(ChainTipSchema)).returns(BlockNumberSchema),
 
-  getBlockByHash: z.function().args(BlockHash.schema).returns(L2Block.schema.optional()),
+  getCheckpointNumber: z.function().args(optional(ChainTipSchema)).returns(CheckpointNumberSchema),
 
-  getBlockByArchive: z.function().args(schemas.Fr).returns(L2Block.schema.optional()),
+  getChainTips: z.function().args().returns(ChainTipsSchema),
 
-  getBlockNumber: z.function().returns(BlockNumberSchema),
-
-  getCheckpointNumber: z.function().returns(CheckpointNumberSchema),
+  getL2Tips: z.function().args().returns(L2TipsSchema),
 
-  getProvenBlockNumber: z.function().returns(BlockNumberSchema),
+  getBlockHeader: z
+    .function()
+    .args(z.union([BlockNumberSchema, z.literal('latest')]))
+    .returns(BlockHeader.schema.optional()),
 
-  getCheckpointedBlockNumber: z.function().returns(BlockNumberSchema),
+  getCheckpointedBlocks: z
+    .function()
+    .args(BlockNumberPositiveSchema, z.number().gt(0).lte(MAX_RPC_BLOCKS_LEN))
+    .returns(z.array(BlockResponseSchema)),
 
-  isReady: z.function().returns(z.boolean()),
+  getCheckpointsDataForEpoch: z.function().args(EpochNumberSchema).returns(z.array(CheckpointDataSchema)),
 
-  getNodeInfo: z.function().returns(NodeInfoSchema),
+  getBlock: z
+    .function()
+    .args(BlockParameterSchema, optional(BlockIncludeOptionsSchema))
+    .returns(BlockResponseSchema.optional()),
 
   getBlocks: z
     .function()
-    .args(BlockNumberPositiveSchema, z.number().gt(0).lte(MAX_RPC_BLOCKS_LEN))
-    .returns(z.array(L2Block.schema)),
+    .args(BlockNumberPositiveSchema, z.number().gt(0).lte(MAX_RPC_BLOCKS_LEN), optional(BlockIncludeOptionsSchema))
+    .returns(z.array(BlockResponseSchema)),
 
-  getCheckpoints: z
+  getCheckpoint: z
     .function()
-    .args(CheckpointNumberPositiveSchema, z.number().gt(0).lte(MAX_RPC_CHECKPOINTS_LEN))
-    .returns(z.array(PublishedCheckpoint.schema)),
+    .args(CheckpointParameterSchema, optional(CheckpointIncludeOptionsSchema))
+    .returns(CheckpointResponseSchema.optional()),
 
-  getCheckpointedBlocks: z
+  getCheckpoints: z
     .function()
-    .args(BlockNumberPositiveSchema, z.number().gt(0).lte(MAX_RPC_BLOCKS_LEN))
-    .returns(z.array(CheckpointedL2Block.schema)),
+    .args(
+      CheckpointNumberPositiveSchema,
+      z.number().gt(0).lte(MAX_RPC_CHECKPOINTS_LEN),
+      optional(CheckpointIncludeOptionsSchema),
+    )
+    .returns(z.array(CheckpointResponseSchema)),
 
-  getCheckpointsDataForEpoch: z.function().args(EpochNumberSchema).returns(z.array(CheckpointDataSchema)),
+  isReady: z.function().returns(z.boolean()),
+
+  getNodeInfo: z.function().returns(NodeInfoSchema),
 
   getCurrentMinFees: z.function().returns(GasFees.schema),
 
@@ -648,10 +669,6 @@ export const AztecNodeApiSchema: ApiSchemaFor<AztecNode> = {
 
   getPublicStorageAt: z.function().args(BlockParameterSchema, schemas.AztecAddress, schemas.Fr).returns(schemas.Fr),
 
-  getBlockHeader: z.function().args(optional(BlockParameterSchema)).returns(BlockHeader.schema.optional()),
-
-  getBlockHeaderByArchive: z.function().args(schemas.Fr).returns(BlockHeader.schema.optional()),
-
   getValidatorsStats: z.function().returns(ValidatorsStatsSchema),
 
   getValidatorStats: z
@@ -659,7 +676,10 @@ export const AztecNodeApiSchema: ApiSchemaFor<AztecNode> = {
     .args(schemas.EthAddress, optional(schemas.SlotNumber), optional(schemas.SlotNumber))
     .returns(SingleValidatorStatsSchema.optional()),
 
-  simulatePublicCalls: z.function().args(Tx.schema, optional(z.boolean())).returns(PublicSimulationOutput.schema),
+  simulatePublicCalls: z
+    .function()
+    .args(Tx.schema, optional(z.boolean()), optional(SimulationOverrides.schema))
+    .returns(PublicSimulationOutput.schema),
 
   isValidTx: z
     .function()
diff --git a/yarn-project/stdlib/src/interfaces/block_response.ts b/yarn-project/stdlib/src/interfaces/block_response.ts
new file mode 100644
index 000000000000..3236855cb451
--- /dev/null
+++ b/yarn-project/stdlib/src/interfaces/block_response.ts
@@ -0,0 +1,79 @@
+import {
+  BlockNumberSchema,
+  CheckpointNumberSchema,
+  IndexWithinCheckpointSchema,
+} from '@aztec/foundation/branded-types';
+import type { BlockNumber, CheckpointNumber, IndexWithinCheckpoint } from '@aztec/foundation/branded-types';
+import type { IfFlag, Prettify } from '@aztec/foundation/types';
+
+import { z } from 'zod';
+
+import { BlockHash } from '../block/block_hash.js';
+import { Body } from '../block/body.js';
+import { CommitteeAttestation } from '../block/proposal/committee_attestation.js';
+import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
+import { BlockHeader } from '../tx/block_header.js';
+import { type L1PublishInfo, L1PublishInfoSchema } from './l1_publish_info.js';
+
+/** Options for narrowing the response of `getBlock` / `getBlocks`. */
+export type BlockIncludeOptions = {
+  /** Include the block body (tx effects). Off by default. */
+  includeTransactions?: boolean;
+  /** Include L1 publish info (populated with `published: false` if not yet on L1). Off by default. */
+  includeL1PublishInfo?: boolean;
+  /** Include committee attestations. Empty array until the block's checkpoint is published. Off by default. */
+  includeAttestations?: boolean;
+};
+
+export const BlockIncludeOptionsSchema: z.ZodType<BlockIncludeOptions> = z.object({
+  includeTransactions: z.boolean().optional(),
+  includeL1PublishInfo: z.boolean().optional(),
+  includeAttestations: z.boolean().optional(),
+});
+
+/** Required metadata always present on a {@link BlockResponse}. */
+export type BlockResponseBase = {
+  /** Block header. */
+  header: BlockHeader;
+  /** Archive tree snapshot after this block. */
+  archive: AppendOnlyTreeSnapshot;
+  /** Hash of the block header. */
+  hash: BlockHash;
+  /** Checkpoint number this block belongs to. */
+  checkpointNumber: CheckpointNumber;
+  /** Position of the block within its checkpoint. */
+  indexWithinCheckpoint: IndexWithinCheckpoint;
+  /** L2 block number. */
+  number: BlockNumber;
+};
+
+/**
+ * RPC-surface representation of an L2 block.
+ *
+ * Generic over the include-options so that flagged fields become required when the caller passes a
+ * literal `true`. The default type argument ({@link BlockIncludeOptions}) yields the widest shape
+ * (all include-fields optional) — this is what the JSON-RPC wire layer validates against.
+ *
+ * @example
+ * const b: BlockResponse<{ includeTransactions: true }> = await node.getBlock(1, { includeTransactions: true });
+ * b.body; // required, not optional
+ */
+export type BlockResponse<Opts extends BlockIncludeOptions = BlockIncludeOptions> = Prettify<
+  BlockResponseBase &
+    IfFlag<BlockIncludeOptions, Opts, 'includeTransactions', { body: Body }> &
+    IfFlag<BlockIncludeOptions, Opts, 'includeL1PublishInfo', { l1: L1PublishInfo }> &
+    IfFlag<BlockIncludeOptions, Opts, 'includeAttestations', { attestations: CommitteeAttestation[] }>
+>;
+
+/** Zod schema for the widest {@link BlockResponse} shape (all include-gated fields optional). */
+export const BlockResponseSchema = z.object({
+  header: BlockHeader.schema,
+  archive: AppendOnlyTreeSnapshot.schema,
+  hash: BlockHash.schema,
+  checkpointNumber: CheckpointNumberSchema,
+  indexWithinCheckpoint: IndexWithinCheckpointSchema,
+  number: BlockNumberSchema,
+  body: Body.schema.optional(),
+  l1: L1PublishInfoSchema.optional(),
+  attestations: z.array(CommitteeAttestation.schema).optional(),
+});
diff --git a/yarn-project/stdlib/src/interfaces/chain_tips.ts b/yarn-project/stdlib/src/interfaces/chain_tips.ts
new file mode 100644
index 000000000000..fde42b09a136
--- /dev/null
+++ b/yarn-project/stdlib/src/interfaces/chain_tips.ts
@@ -0,0 +1,24 @@
+import { z } from 'zod';
+
+import { type L2BlockTag, type L2Tips, L2TipsSchema } from '../block/l2_block_source.js';
+
+/**
+ * Public chain-tip selectors usable in RPC requests.
+ * Omits internal-only tags (e.g. `proposedCheckpoint`) from {@link L2BlockTag}.
+ */
+export type ChainTip = Exclude<L2BlockTag, 'proposedCheckpoint'>;
+
+export const ChainTipSchema = z.union([
+  z.literal('proposed'),
+  z.literal('checkpointed'),
+  z.literal('proven'),
+  z.literal('finalized'),
+]) satisfies z.ZodType<ChainTip>;
+
+/**
+ * Tips of the L2 chain.
+ * Omits the sequencer-internal `proposedCheckpoint` from the public RPC surface.
+ */
+export type ChainTips = Omit<L2Tips, 'proposedCheckpoint'>;
+
+export const ChainTipsSchema = L2TipsSchema.omit({ proposedCheckpoint: true });
diff --git a/yarn-project/stdlib/src/interfaces/checkpoint_parameter.ts b/yarn-project/stdlib/src/interfaces/checkpoint_parameter.ts
new file mode 100644
index 000000000000..36725a304ecc
--- /dev/null
+++ b/yarn-project/stdlib/src/interfaces/checkpoint_parameter.ts
@@ -0,0 +1,22 @@
+import { CheckpointNumberSchema, SlotNumberSchema } from '@aztec/foundation/branded-types';
+
+import { z } from 'zod';
+
+import { ChainTipSchema } from './chain_tips.js';
+
+/**
+ * Selector for a checkpoint in RPC calls.
+ *
+ * Accepts a numeric checkpoint number (or `{ number }`), a slot number (`{ slot }`), a chain-tip
+ * name (e.g. `'proven'`), or `'latest'` (alias for `'proposed'` — on the checkpoint side, this
+ * means the most recent confirmed checkpoint).
+ */
+export const CheckpointParameterSchema = z.union([
+  z.object({ number: CheckpointNumberSchema }).strict(),
+  z.object({ slot: SlotNumberSchema }).strict(),
+  ChainTipSchema,
+  z.literal('latest'),
+  CheckpointNumberSchema,
+]);
+
+export type CheckpointParameter = z.infer<typeof CheckpointParameterSchema>;
diff --git a/yarn-project/stdlib/src/interfaces/checkpoint_response.ts b/yarn-project/stdlib/src/interfaces/checkpoint_response.ts
new file mode 100644
index 000000000000..1c127bc06be4
--- /dev/null
+++ b/yarn-project/stdlib/src/interfaces/checkpoint_response.ts
@@ -0,0 +1,84 @@
+import { BlockNumberSchema, CheckpointNumberSchema } from '@aztec/foundation/branded-types';
+import type { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { schemas } from '@aztec/foundation/schemas';
+import type { IfFlag, Prettify } from '@aztec/foundation/types';
+
+import { z } from 'zod';
+
+import { CommitteeAttestation } from '../block/proposal/committee_attestation.js';
+import { CheckpointHeader } from '../rollup/checkpoint_header.js';
+import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
+import { type BlockResponse, BlockResponseSchema } from './block_response.js';
+import { type L1PublishInfo, L1PublishInfoSchema } from './l1_publish_info.js';
+
+/** Options for narrowing the response of `getCheckpoint` / `getCheckpoints`. */
+export type CheckpointIncludeOptions = {
+  /** Include the nested blocks. Off by default. */
+  includeBlocks?: boolean;
+  /** When `includeBlocks` is true, include each block's body (tx effects). Off by default. No-op if `includeBlocks` is false. */
+  includeTransactions?: boolean;
+  /** Include L1 publish info. Off by default. */
+  includeL1PublishInfo?: boolean;
+  /** Include committee attestations. Off by default. */
+  includeAttestations?: boolean;
+};
+
+export const CheckpointIncludeOptionsSchema: z.ZodType<CheckpointIncludeOptions> = z.object({
+  includeBlocks: z.boolean().optional(),
+  includeTransactions: z.boolean().optional(),
+  includeL1PublishInfo: z.boolean().optional(),
+  includeAttestations: z.boolean().optional(),
+});
+
+/** Required metadata always present on a {@link CheckpointResponse}. */
+export type CheckpointResponseBase = {
+  /** Checkpoint number. */
+  number: CheckpointNumber;
+  /** Checkpoint header. */
+  header: CheckpointHeader;
+  /** Archive tree snapshot after this checkpoint. */
+  archive: AppendOnlyTreeSnapshot;
+  /** Hash of the checkpoint out messages. */
+  checkpointOutHash: Fr;
+  /** First block number in this checkpoint. */
+  startBlock: BlockNumber;
+  /** Number of blocks in this checkpoint. */
+  blockCount: number;
+  /** Fee asset price modifier in basis points applied during this checkpoint. */
+  feeAssetPriceModifier: bigint;
+};
+
+// Only forward `includeTransactions` to nested blocks — the other include-flags on the checkpoint
+// options do not apply to the nested block responses (those carry no independent L1 / attestations).
+type NestedBlockOpts<Opts> = Opts extends { includeTransactions: true } ? { includeTransactions: true } : {};
+
+/**
+ * RPC-surface representation of an L2 checkpoint.
+ *
+ * Generic over the include-options so that flagged fields become required when the caller passes a
+ * literal `true`. Only `includeTransactions` is forwarded to nested blocks, so
+ * `includeL1PublishInfo` / `includeAttestations` on a checkpoint request do not imply the same on
+ * its nested blocks. The default type argument ({@link CheckpointIncludeOptions}) yields the
+ * widest shape — what the JSON-RPC wire layer validates against.
+ */
+export type CheckpointResponse<Opts extends CheckpointIncludeOptions = CheckpointIncludeOptions> = Prettify<
+  CheckpointResponseBase &
+    IfFlag<CheckpointIncludeOptions, Opts, 'includeBlocks', { blocks: BlockResponse<NestedBlockOpts<Opts>>[] }> &
+    IfFlag<CheckpointIncludeOptions, Opts, 'includeL1PublishInfo', { l1: L1PublishInfo }> &
+    IfFlag<CheckpointIncludeOptions, Opts, 'includeAttestations', { attestations: CommitteeAttestation[] }>
+>;
+
+/** Zod schema for the widest {@link CheckpointResponse} shape (all include-gated fields optional). */
+export const CheckpointResponseSchema = z.object({
+  number: CheckpointNumberSchema,
+  header: CheckpointHeader.schema,
+  archive: AppendOnlyTreeSnapshot.schema,
+  checkpointOutHash: schemas.Fr,
+  startBlock: BlockNumberSchema,
+  blockCount: z.number(),
+  feeAssetPriceModifier: schemas.BigInt,
+  blocks: z.array(BlockResponseSchema).optional(),
+  l1: L1PublishInfoSchema.optional(),
+  attestations: z.array(CommitteeAttestation.schema).optional(),
+});
diff --git a/yarn-project/stdlib/src/interfaces/client.ts b/yarn-project/stdlib/src/interfaces/client.ts
index 78b3d5d82d08..88fa0f93b402 100644
--- a/yarn-project/stdlib/src/interfaces/client.ts
+++ b/yarn-project/stdlib/src/interfaces/client.ts
@@ -1,6 +1,12 @@
 export * from './aztec-node.js';
 export * from './aztec-node-admin.js';
 export * from './aztec-node-debug.js';
+export * from './block_response.js';
+export * from './chain_tips.js';
+export * from './checkpoint_parameter.js';
+export * from './checkpoint_response.js';
+export * from './l1_publish_info.js';
 export * from './private_kernel_prover.js';
 export * from './get_logs_response.js';
 export * from './api_limit.js';
+export * from './public_storage_override.js';
diff --git a/yarn-project/stdlib/src/interfaces/configs.ts b/yarn-project/stdlib/src/interfaces/configs.ts
index 55f9142aca33..efcf3942b32d 100644
--- a/yarn-project/stdlib/src/interfaces/configs.ts
+++ b/yarn-project/stdlib/src/interfaces/configs.ts
@@ -15,6 +15,8 @@ export interface SequencerConfig {
   maxTxsPerBlock?: number;
   /** The maximum number of txs across all blocks in a checkpoint. */
   maxTxsPerCheckpoint?: number;
+  /** Maximum number of blocks the sequencer packs into a single checkpoint, and the highest indexWithinCheckpoint accepted on a block proposal. */
+  maxBlocksPerCheckpoint?: number;
   /** The minimum number of txs to include in a block. */
   minTxsPerBlock?: number;
   /** The minimum number of valid txs (after execution) to include in a block. If not set, falls back to minTxsPerBlock. */
@@ -83,6 +85,8 @@ export interface SequencerConfig {
   minBlocksForCheckpoint?: number;
   /** Skip publishing checkpoint proposals probability (for testing checkpoint prunes only) */
   skipPublishingCheckpointsPercent?: number;
+  /** Skip broadcasting checkpoint and block proposals via gossipsub when proposer (for testing only) */
+  skipBroadcastProposals?: boolean;
 }
 
 export const SequencerConfigSchema = zodFor<SequencerConfig>()(
@@ -90,6 +94,7 @@ export const SequencerConfigSchema = zodFor<SequencerConfig>()(
     sequencerPollingIntervalMS: z.number().optional(),
     maxTxsPerBlock: z.number().optional(),
     maxTxsPerCheckpoint: z.number().optional(),
+    maxBlocksPerCheckpoint: z.number().positive().optional(),
     minValidTxsPerBlock: z.number().optional(),
     minTxsPerBlock: z.number().optional(),
     maxL2BlockGas: z.number().optional(),
@@ -124,6 +129,7 @@ export const SequencerConfigSchema = zodFor<SequencerConfig>()(
     skipPushProposedBlocksToArchiver: z.boolean().optional(),
     minBlocksForCheckpoint: z.number().positive().optional(),
     skipPublishingCheckpointsPercent: z.number().gte(0).lte(100).optional(),
+    skipBroadcastProposals: z.boolean().optional(),
   }),
 );
 
@@ -145,7 +151,8 @@ type SequencerConfigOptionalKeys =
   | 'maxTxsPerCheckpoint'
   | 'maxL2BlockGas'
   | 'maxDABlockGas'
-  | 'redistributeCheckpointBudget';
+  | 'redistributeCheckpointBudget'
+  | 'skipBroadcastProposals';
 
 export type ResolvedSequencerConfig = Prettify<
   Required<Omit<SequencerConfig, SequencerConfigOptionalKeys>> & Pick<SequencerConfig, SequencerConfigOptionalKeys>
diff --git a/yarn-project/stdlib/src/interfaces/l1_publish_info.ts b/yarn-project/stdlib/src/interfaces/l1_publish_info.ts
new file mode 100644
index 000000000000..b65d79b9b122
--- /dev/null
+++ b/yarn-project/stdlib/src/interfaces/l1_publish_info.ts
@@ -0,0 +1,40 @@
+import { schemas } from '@aztec/foundation/schemas';
+
+import { z } from 'zod';
+
+import { L1PublishedData } from '../checkpoint/published_checkpoint.js';
+
+/**
+ * L1 publication info for a block or checkpoint.
+ *
+ * A discriminated union over `published`: when `false`, the block/checkpoint has not yet been
+ * published to L1. When `true`, the L1 block info (number, timestamp, hash) is present.
+ *
+ * Distinct from {@link L1PublishedData}, which is always the "published" case.
+ */
+export type L1PublishInfo =
+  | { published: false }
+  | { published: true; blockNumber: bigint; timestamp: bigint; blockHash: string };
+
+export const L1PublishInfoSchema = z.union([
+  z.object({ published: z.literal(false) }),
+  z.object({
+    published: z.literal(true),
+    blockNumber: schemas.BigInt,
+    timestamp: schemas.BigInt,
+    blockHash: z.string(),
+  }),
+]);
+
+/** Projects the internal {@link L1PublishedData} (or its absence) to the public {@link L1PublishInfo} shape. */
+export function l1PublishInfoFromL1PublishedData(data: L1PublishedData | undefined): L1PublishInfo {
+  if (!data) {
+    return { published: false };
+  }
+  return {
+    published: true,
+    blockNumber: data.blockNumber,
+    timestamp: data.timestamp,
+    blockHash: data.blockHash,
+  };
+}
diff --git a/yarn-project/stdlib/src/interfaces/p2p.test.ts b/yarn-project/stdlib/src/interfaces/p2p.test.ts
index 3b03eb9158a9..37c64471ed15 100644
--- a/yarn-project/stdlib/src/interfaces/p2p.test.ts
+++ b/yarn-project/stdlib/src/interfaces/p2p.test.ts
@@ -1,4 +1,4 @@
-import { SlotNumber } from '@aztec/foundation/branded-types';
+import { CheckpointProposalHash, SlotNumber } from '@aztec/foundation/branded-types';
 import { type JsonRpcTestContext, createJsonRpcTestSetup } from '@aztec/foundation/json-rpc/test';
 
 import { CheckpointAttestation } from '../p2p/checkpoint_attestation.js';
@@ -27,7 +27,10 @@ describe('P2PApiSchema', () => {
   });
 
   it('getCheckpointAttestationsForSlot', async () => {
-    const attestations = await context.client.getCheckpointAttestationsForSlot(SlotNumber(1), 'proposalId');
+    const attestations = await context.client.getCheckpointAttestationsForSlot(
+      SlotNumber(1),
+      CheckpointProposalHash('0xdeadbeef'),
+    );
     expect(attestations).toEqual([CheckpointAttestation.empty()]);
     expect(attestations[0]).toBeInstanceOf(CheckpointAttestation);
   });
@@ -65,9 +68,12 @@ const peers: PeerInfo[] = [
 ];
 
 class MockP2P implements P2PApi {
-  getCheckpointAttestationsForSlot(slot: SlotNumber, proposalId?: string): Promise<CheckpointAttestation[]> {
+  getCheckpointAttestationsForSlot(
+    slot: SlotNumber,
+    proposalId?: CheckpointProposalHash,
+  ): Promise<CheckpointAttestation[]> {
     expect(slot).toEqual(SlotNumber(1));
-    expect(proposalId).toEqual('proposalId');
+    expect(proposalId).toEqual(CheckpointProposalHash('0xdeadbeef'));
     return Promise.resolve([CheckpointAttestation.empty()]);
   }
 
diff --git a/yarn-project/stdlib/src/interfaces/p2p.ts b/yarn-project/stdlib/src/interfaces/p2p.ts
index 301cbb4f9fee..a729ecf22938 100644
--- a/yarn-project/stdlib/src/interfaces/p2p.ts
+++ b/yarn-project/stdlib/src/interfaces/p2p.ts
@@ -1,4 +1,4 @@
-import type { SlotNumber } from '@aztec/foundation/branded-types';
+import type { CheckpointProposalHash, SlotNumber } from '@aztec/foundation/branded-types';
 
 import { z } from 'zod';
 
@@ -49,13 +49,19 @@ export interface P2PApi {
   getPeers(includePending?: boolean): Promise<PeerInfo[]>;
 
   /**
-   * Queries the Attestation pool for checkpoint attestations for the given slot
+   * Queries the Attestation pool for checkpoint attestations for the given slot.
    *
    * @param slot - the slot to query
-   * @param proposalId - the proposal id to query, or undefined to query all proposals for the slot
+   * @param proposalPayloadHash - hex-encoded keccak256 of the target proposal's signed
+   *        payload (`CheckpointProposal.getPayloadHash()`). When provided, only
+   *        attestations whose own signed payload hashes to the same value are returned.
+   *        When omitted, all attestations for the slot are returned.
    * @returns CheckpointAttestations
    */
-  getCheckpointAttestationsForSlot(slot: SlotNumber, proposalId?: string): Promise<CheckpointAttestation[]>;
+  getCheckpointAttestationsForSlot(
+    slot: SlotNumber,
+    proposalPayloadHash?: CheckpointProposalHash,
+  ): Promise<CheckpointAttestation[]>;
 }
 
 export interface P2PClient extends P2PApi {
@@ -66,7 +72,10 @@ export interface P2PClient extends P2PApi {
 export const P2PApiSchema: ApiSchemaFor<P2PApi> = {
   getCheckpointAttestationsForSlot: z
     .function()
-    .args(schemas.SlotNumber, optional(z.string()))
+    .args(
+      schemas.SlotNumber,
+      optional(z.string().regex(/^0x[0-9a-fA-F]+$/) as unknown as z.ZodType<CheckpointProposalHash>),
+    )
     .returns(z.array(CheckpointAttestation.schema)),
   getPendingTxs: z
     .function()
diff --git a/yarn-project/stdlib/src/interfaces/public_storage_override.ts b/yarn-project/stdlib/src/interfaces/public_storage_override.ts
new file mode 100644
index 000000000000..355b6f67871b
--- /dev/null
+++ b/yarn-project/stdlib/src/interfaces/public_storage_override.ts
@@ -0,0 +1,26 @@
+import type { Fr } from '@aztec/foundation/curves/bn254';
+
+import { z } from 'zod';
+
+import type { AztecAddress } from '../aztec-address/index.js';
+import { schemas } from '../schemas/schemas.js';
+
+/**
+ * A single public-storage override to inject before simulation. Identifies a slot in
+ * (contract, raw slot) space, not by leafSlot — the simulator computes the leafSlot internally
+ * via `computePublicDataTreeLeafSlot`.
+ */
+export type PublicStorageOverride = {
+  /** Contract that owns the storage slot. */
+  contract: AztecAddress;
+  /** Raw storage slot within the contract (not yet hashed into a tree key). */
+  slot: Fr;
+  /** Value to place at that slot for the duration of the simulation. */
+  value: Fr;
+};
+
+export const PublicStorageOverrideSchema = z.object({
+  contract: schemas.AztecAddress,
+  slot: schemas.Fr,
+  value: schemas.Fr,
+});
diff --git a/yarn-project/stdlib/src/interfaces/server.ts b/yarn-project/stdlib/src/interfaces/server.ts
index 439f827bd229..96b57aa4bdbb 100644
--- a/yarn-project/stdlib/src/interfaces/server.ts
+++ b/yarn-project/stdlib/src/interfaces/server.ts
@@ -2,6 +2,11 @@ export * from './allowed_element.js';
 export * from './api_limit.js';
 export * from './archiver.js';
 export * from './aztec-node.js';
+export * from './block_response.js';
+export * from './chain_tips.js';
+export * from './checkpoint_parameter.js';
+export * from './checkpoint_response.js';
+export * from './l1_publish_info.js';
 export * from './block-builder.js';
 export * from './configs.js';
 export * from './epoch-prover.js';
diff --git a/yarn-project/stdlib/src/interfaces/validator.ts b/yarn-project/stdlib/src/interfaces/validator.ts
index d16e6723be4e..71e307913785 100644
--- a/yarn-project/stdlib/src/interfaces/validator.ts
+++ b/yarn-project/stdlib/src/interfaces/validator.ts
@@ -19,6 +19,7 @@ import type { PeerId } from '@libp2p/interface';
 import { z } from 'zod';
 
 import type { CommitteeAttestationsAndSigners } from '../block/index.js';
+import type { ChainConfig } from '../config/chain-config.js';
 import {
   type LocalSignerConfig,
   LocalSignerConfigSchema,
@@ -32,6 +33,9 @@ import { AllowedElementSchema } from './allowed_element.js';
  */
 export type ValidatorClientConfig = ValidatorHASignerConfig &
   LocalSignerConfig & {
+    /** The L1 chain id used for EIP-712 proposal-path signing. */
+    l1ChainId: ChainConfig['l1ChainId'];
+
     /** The private keys of the validators participating in attestation duties */
     validatorPrivateKeys?: SecretValue<`0x${string}`[]>;
 
@@ -76,7 +80,7 @@ export type ValidatorClientConfig = ValidatorHASignerConfig &
   };
 
 export type ValidatorClientFullConfig = ValidatorClientConfig &
-  Pick<SequencerConfig, 'txPublicSetupAllowListExtend' | 'broadcastInvalidBlockProposal'> &
+  Pick<SequencerConfig, 'txPublicSetupAllowListExtend' | 'broadcastInvalidBlockProposal' | 'maxBlocksPerCheckpoint'> &
   Pick<
     SlasherConfig,
     'slashBroadcastedInvalidBlockPenalty' | 'slashDuplicateProposalPenalty' | 'slashDuplicateAttestationPenalty'
@@ -90,6 +94,7 @@ export type ValidatorClientFullConfig = ValidatorClientConfig &
 
 export const ValidatorClientConfigSchema = zodFor<Omit<ValidatorClientConfig, 'validatorPrivateKeys'>>()(
   ValidatorHASignerConfigSchema.merge(LocalSignerConfigSchema).extend({
+    l1ChainId: z.number().int().nonnegative(),
     validatorAddresses: z.array(schemas.EthAddress).optional(),
     disableValidator: z.boolean(),
     disabledValidators: z.array(schemas.EthAddress),
@@ -110,6 +115,7 @@ export const ValidatorClientFullConfigSchema = zodFor<Omit<ValidatorClientFullCo
   ValidatorClientConfigSchema.extend({
     txPublicSetupAllowListExtend: z.array(AllowedElementSchema).optional(),
     broadcastInvalidBlockProposal: z.boolean().optional(),
+    maxBlocksPerCheckpoint: z.number().positive().optional(),
     slashBroadcastedInvalidBlockPenalty: schemas.BigInt,
     slashDuplicateProposalPenalty: schemas.BigInt,
     slashDuplicateAttestationPenalty: schemas.BigInt,
diff --git a/yarn-project/stdlib/src/noir/index.ts b/yarn-project/stdlib/src/noir/index.ts
index 79084977a5e9..3e7c2ff73984 100644
--- a/yarn-project/stdlib/src/noir/index.ts
+++ b/yarn-project/stdlib/src/noir/index.ts
@@ -64,6 +64,8 @@ interface NoirFunctionEntry {
 export interface NoirCompiledContract {
   /** The name of the contract. */
   name: string;
+  /** The version of the Aztec stack that compiled this contract. */
+  aztec_version: string;
   /** Is the contract's public bytecode transpiled? */
   transpiled?: boolean;
   /** The functions of the contract. */
diff --git a/yarn-project/stdlib/src/p2p/attestation_utils.test.ts b/yarn-project/stdlib/src/p2p/attestation_utils.test.ts
index c06353f6f959..29d3dee63a95 100644
--- a/yarn-project/stdlib/src/p2p/attestation_utils.test.ts
+++ b/yarn-project/stdlib/src/p2p/attestation_utils.test.ts
@@ -5,19 +5,25 @@ import { Fr } from '@aztec/foundation/curves/bn254';
 import { jest } from '@jest/globals';
 
 import { CheckpointHeader } from '../rollup/index.js';
+import { TEST_COORDINATION_SIGNATURE_CONTEXT } from '../tests/mocks.js';
 import { trimAttestations } from './attestation_utils.js';
 import { CheckpointAttestation } from './checkpoint_attestation.js';
+import { CheckpointProposal } from './checkpoint_proposal.js';
 import { ConsensusPayload } from './consensus_payload.js';
-import { SignatureDomainSeparator, getHashedSignaturePayloadEthSignedMessage } from './signature_utils.js';
+import { getHashedSignaturePayloadTypedData } from './signature_utils.js';
 
 function makeAttestation(signer: Secp256k1Signer): CheckpointAttestation {
   const header = CheckpointHeader.random({ slotNumber: SlotNumber(0) });
-  const payload = new ConsensusPayload(header, Fr.random(), 0n);
-  const attestationHash = getHashedSignaturePayloadEthSignedMessage(
-    payload,
-    SignatureDomainSeparator.checkpointAttestation,
+  const payload = new ConsensusPayload(header, Fr.random(), 0n, TEST_COORDINATION_SIGNATURE_CONTEXT);
+  const attestationHash = getHashedSignaturePayloadTypedData(payload);
+  const proposal = new CheckpointProposal(
+    header,
+    payload.archive,
+    payload.feeAssetPriceModifier,
+    signer.sign(attestationHash),
+    TEST_COORDINATION_SIGNATURE_CONTEXT,
   );
-  const proposalHash = getHashedSignaturePayloadEthSignedMessage(payload, SignatureDomainSeparator.checkpointProposal);
+  const proposalHash = getHashedSignaturePayloadTypedData(proposal);
   return new CheckpointAttestation(payload, signer.sign(attestationHash), signer.sign(proposalHash));
 }
 
diff --git a/yarn-project/stdlib/src/p2p/block_proposal.test.ts b/yarn-project/stdlib/src/p2p/block_proposal.test.ts
index 884bac55f58c..2f6601b74506 100644
--- a/yarn-project/stdlib/src/p2p/block_proposal.test.ts
+++ b/yarn-project/stdlib/src/p2p/block_proposal.test.ts
@@ -1,9 +1,11 @@
 // Serde test for the block proposal type
 import { Secp256k1Signer } from '@aztec/foundation/crypto/secp256k1-signer';
+import { Signature } from '@aztec/foundation/eth-signature';
 
-import { makeBlockProposal } from '../tests/mocks.js';
+import { TEST_COORDINATION_SIGNATURE_CONTEXT, makeBlockProposal } from '../tests/mocks.js';
 import { Tx } from '../tx/tx.js';
 import { BlockProposal } from './block_proposal.js';
+import { SignedTxs } from './signed_txs.js';
 
 describe('Block Proposal serialization / deserialization', () => {
   const checkEquivalence = (serialized: BlockProposal, deserialized: BlockProposal) => {
@@ -66,4 +68,28 @@ describe('Block Proposal serialization / deserialization', () => {
     expect(proposal.slotNumber).toBe(proposal.blockHeader.getSlot());
     expect(proposal.blockNumber).toBe(proposal.blockHeader.getBlockNumber());
   });
+
+  it('getSender returns undefined when inner signedTxs carries a foreign signing domain', async () => {
+    const account = Secp256k1Signer.random();
+    const txs = await Promise.all([Tx.random(), Tx.random()]);
+    const proposal = await makeBlockProposal({ txs, signer: account });
+
+    const foreignContext = {
+      ...TEST_COORDINATION_SIGNATURE_CONTEXT,
+      chainId: TEST_COORDINATION_SIGNATURE_CONTEXT.chainId + 1,
+    };
+    const foreignSignedTxs = new SignedTxs(txs, Signature.random(), foreignContext);
+    const tampered = new BlockProposal(
+      proposal.blockHeader,
+      proposal.indexWithinCheckpoint,
+      proposal.inHash,
+      proposal.archiveRoot,
+      proposal.txHashes,
+      proposal.signature,
+      proposal.signatureContext,
+      foreignSignedTxs,
+    );
+
+    expect(tampered.getSender()).toBeUndefined();
+  });
 });
diff --git a/yarn-project/stdlib/src/p2p/block_proposal.ts b/yarn-project/stdlib/src/p2p/block_proposal.ts
index 3b5cd80a59a4..1d29fa05ff99 100644
--- a/yarn-project/stdlib/src/p2p/block_proposal.ts
+++ b/yarn-project/stdlib/src/p2p/block_proposal.ts
@@ -7,12 +7,13 @@ import {
 } from '@aztec/foundation/branded-types';
 import { type BaseBuffer32, Buffer32 } from '@aztec/foundation/buffer';
 import { keccak256 } from '@aztec/foundation/crypto/keccak';
-import { tryRecoverAddress } from '@aztec/foundation/crypto/secp256k1-signer';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import { Signature } from '@aztec/foundation/eth-signature';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
+import type { TypedDataDefinition } from 'viem';
+
 import type { L2Block } from '../block/l2_block.js';
 import type { L2BlockInfo } from '../block/l2_block_info.js';
 import { MAX_TXS_PER_BLOCK } from '../deserialization/index.js';
@@ -22,9 +23,15 @@ import { TxHash } from '../tx/index.js';
 import type { Tx } from '../tx/tx.js';
 import { Gossipable } from './gossipable.js';
 import {
-  SignatureDomainSeparator,
-  getHashedSignaturePayload,
-  getHashedSignaturePayloadEthSignedMessage,
+  type CoordinationSignatureContext,
+  type CoordinationSignatureType,
+  EMPTY_COORDINATION_SIGNATURE_CONTEXT,
+  type Signable,
+  coordinationSignatureContextEquals,
+  getCoordinationSignatureTypedData,
+  readCoordinationSignatureContext,
+  recoverCoordinationSigner,
+  serializeCoordinationSignatureContext,
 } from './signature_utils.js';
 import { SignedTxs } from './signed_txs.js';
 import { TopicType } from './topic_type.js';
@@ -49,10 +56,12 @@ export type BlockProposalOptions = {
  * to be included in a block within a checkpoint. This is used for non-last blocks in a slot.
  * The last block is sent as part of a CheckpointProposal.
  */
-export class BlockProposal extends Gossipable {
+export class BlockProposal extends Gossipable implements Signable {
   static override p2pTopic = TopicType.block_proposal;
 
-  private sender: EthAddress | undefined;
+  readonly primaryType: CoordinationSignatureType = 'BlockProposal';
+
+  private cachedSender: EthAddress | undefined | null = undefined;
 
   constructor(
     /** The per-block header containing block state and global variables */
@@ -73,6 +82,9 @@ export class BlockProposal extends Gossipable {
     /** The proposer's signature over the block data */
     public readonly signature: Signature,
 
+    /** The signing domain (chainId + rollupAddress) the signature is bound to */
+    public readonly signatureContext: CoordinationSignatureContext,
+
     /** The signed transactions in the block (optional, for DA guarantees) */
     public readonly signedTxs?: SignedTxs,
   ) {
@@ -80,7 +92,7 @@ export class BlockProposal extends Gossipable {
   }
 
   override generateP2PMessageIdentifier(): Promise<BaseBuffer32> {
-    return Promise.resolve(BlockProposalHash.fromBuffer(keccak256(this.signature.toBuffer())));
+    return Promise.resolve(new Buffer32(this.getPayloadHashBuffer()));
   }
 
   get archive(): Fr {
@@ -114,9 +126,8 @@ export class BlockProposal extends Gossipable {
    * Get the payload to sign for this block proposal.
    * The signature is over: blockHeader + indexWithinCheckpoint + inHash + archiveRoot + txHashes
    */
-  getPayloadToSign(domainSeparator: SignatureDomainSeparator): Buffer {
+  getPayloadToSign(): Buffer {
     return serializeToBuffer([
-      domainSeparator,
       this.blockHeader,
       this.indexWithinCheckpoint,
       this.inHash,
@@ -126,6 +137,21 @@ export class BlockProposal extends Gossipable {
     ]);
   }
 
+  private getPayloadHashBuffer(): Buffer {
+    return keccak256(this.getPayloadToSign());
+  }
+
+  /**
+   * Returns a keccak256 hash of the signed payload.
+   * Used by the attestation pool to dedup distinct signed payloads at the same
+   * (slot, indexWithinCheckpoint) regardless of archive collisions.
+   * The hash deliberately excludes the signature so non-deterministic ECDSA
+   * re-signs of the same payload do not look like equivocation.
+   */
+  getPayloadHash(): BlockProposalHash {
+    return BlockProposalHash.fromBuffer(this.getPayloadHashBuffer());
+  }
+
   static async createProposalFromSigner(
     blockHeader: BlockHeader,
     checkpointNumber: CheckpointNumber,
@@ -134,7 +160,9 @@ export class BlockProposal extends Gossipable {
     archiveRoot: Fr,
     txHashes: TxHash[],
     txs: Tx[] | undefined,
-    payloadSigner: (payload: Buffer32, context: SigningContext) => Promise<Signature>,
+    signatureContext: CoordinationSignatureContext,
+    proposalSigner: (typedData: TypedDataDefinition, context: SigningContext) => Promise<Signature>,
+    txsSigner?: (typedData: TypedDataDefinition, context: SigningContext) => Promise<Signature>,
   ): Promise<BlockProposal> {
     // Create a temporary proposal to get the payload to sign
     const tempProposal = new BlockProposal(
@@ -144,6 +172,7 @@ export class BlockProposal extends Gossipable {
       archiveRoot,
       txHashes,
       Signature.empty(),
+      signatureContext,
     );
 
     // Create the block signing context
@@ -155,47 +184,64 @@ export class BlockProposal extends Gossipable {
       dutyType: DutyType.BLOCK_PROPOSAL,
     };
 
-    const hashed = getHashedSignaturePayload(tempProposal, SignatureDomainSeparator.blockProposal);
-    const sig = await payloadSigner(hashed, blockContext);
+    const typedData = getCoordinationSignatureTypedData(tempProposal);
+    const sig = await proposalSigner(typedData, blockContext);
 
     // If txs are provided, sign them as well
     let signedTxs: SignedTxs | undefined;
     if (txs) {
       const txsSigningContext: SigningContext = { dutyType: DutyType.TXS };
-      const txsSigner = (payload: Buffer32) => payloadSigner(payload, txsSigningContext);
-      signedTxs = await SignedTxs.createFromSigner(txs, txsSigner);
+      if (!txsSigner) {
+        throw new Error('signed_txs requires a typed-data signer');
+      }
+      signedTxs = await SignedTxs.createFromSigner(txs, signatureContext, typedData =>
+        txsSigner(typedData, txsSigningContext),
+      );
     }
 
-    return new BlockProposal(blockHeader, indexWithinCheckpoint, inHash, archiveRoot, txHashes, sig, signedTxs);
+    return new BlockProposal(
+      blockHeader,
+      indexWithinCheckpoint,
+      inHash,
+      archiveRoot,
+      txHashes,
+      sig,
+      signatureContext,
+      signedTxs,
+    );
   }
 
   /**
    * Lazily evaluate the sender of the proposal; result is cached.
-   * If there's signedTxs, also verifies the signedTxs sender matches the block proposal sender.
-   * @returns The sender address, or undefined if signature recovery fails or senders don't match
+   * If there's signedTxs, also verifies that its signing domain matches this proposal's and
+   * that the signedTxs sender matches the block proposal sender. This prevents a proposer
+   * from wrapping a foreign-chain SignedTxs bundle inside a local-chain proposal.
+   * @returns The sender address, or undefined if signature recovery fails or inner/outer mismatch
    */
   getSender(): EthAddress | undefined {
-    if (!this.sender) {
-      const hashed = getHashedSignaturePayloadEthSignedMessage(this, SignatureDomainSeparator.blockProposal);
-      const blockSender = tryRecoverAddress(hashed, this.signature);
+    if (this.cachedSender === undefined) {
+      const blockSender = recoverCoordinationSigner(this, this.signature);
 
-      // If there's signedTxs, verify the sender matches
       if (blockSender && this.signedTxs) {
+        if (!coordinationSignatureContextEquals(this.signedTxs.signatureContext, this.signatureContext)) {
+          this.cachedSender = null;
+          return undefined;
+        }
         const txsSender = this.signedTxs.getSender();
         if (!txsSender || !txsSender.equals(blockSender)) {
-          return undefined; // Sender mismatch - fail
+          this.cachedSender = null;
+          return undefined;
         }
       }
 
-      // Cache the sender for later use
-      this.sender = blockSender;
+      this.cachedSender = blockSender ?? null;
     }
 
-    return this.sender;
+    return this.cachedSender ?? undefined;
   }
 
   getPayload() {
-    return this.getPayloadToSign(SignatureDomainSeparator.blockProposal);
+    return this.getPayloadToSign();
   }
 
   toBuffer(): Buffer {
@@ -205,6 +251,7 @@ export class BlockProposal extends Gossipable {
       this.inHash,
       this.archiveRoot,
       this.signature,
+      serializeCoordinationSignatureContext(this.signatureContext),
       this.txHashes.length,
       this.txHashes,
     ];
@@ -225,6 +272,7 @@ export class BlockProposal extends Gossipable {
     const inHash = reader.readObject(Fr);
     const archiveRoot = reader.readObject(Fr);
     const signature = reader.readObject(Signature);
+    const signatureContext = readCoordinationSignatureContext(reader);
     const txHashCount = reader.readNumber();
     if (txHashCount > MAX_TXS_PER_BLOCK) {
       throw new Error(`txHashes count ${txHashCount} exceeds maximum ${MAX_TXS_PER_BLOCK}`);
@@ -242,12 +290,21 @@ export class BlockProposal extends Gossipable {
           archiveRoot,
           txHashes,
           signature,
+          signatureContext,
           signedTxs,
         );
       }
     }
 
-    return new BlockProposal(blockHeader, indexWithinCheckpoint, inHash, archiveRoot, txHashes, signature);
+    return new BlockProposal(
+      blockHeader,
+      indexWithinCheckpoint,
+      inHash,
+      archiveRoot,
+      txHashes,
+      signature,
+      signatureContext,
+    );
   }
 
   getSize(): number {
@@ -257,6 +314,8 @@ export class BlockProposal extends Gossipable {
       this.inHash.size +
       this.archiveRoot.size +
       this.signature.getSize() +
+      4 /* chainId */ +
+      20 /* rollupAddress */ +
       4 /* txHashes.length */ +
       this.txHashes.length * TxHash.SIZE +
       4 /* hasSignedTxs flag */ +
@@ -265,7 +324,15 @@ export class BlockProposal extends Gossipable {
   }
 
   static empty(): BlockProposal {
-    return new BlockProposal(BlockHeader.empty(), IndexWithinCheckpoint(0), Fr.ZERO, Fr.ZERO, [], Signature.empty());
+    return new BlockProposal(
+      BlockHeader.empty(),
+      IndexWithinCheckpoint(0),
+      Fr.ZERO,
+      Fr.ZERO,
+      [],
+      Signature.empty(),
+      EMPTY_COORDINATION_SIGNATURE_CONTEXT,
+    );
   }
 
   static random(): BlockProposal {
@@ -276,6 +343,7 @@ export class BlockProposal extends Gossipable {
       Fr.random(),
       [TxHash.random(), TxHash.random()],
       Signature.random(),
+      EMPTY_COORDINATION_SIGNATURE_CONTEXT,
     );
   }
 
@@ -287,6 +355,8 @@ export class BlockProposal extends Gossipable {
       archiveRoot: this.archiveRoot.toString(),
       signature: this.signature.toString(),
       txHashes: this.txHashes.map(h => h.toString()),
+      chainId: this.signatureContext.chainId,
+      rollupAddress: this.signatureContext.rollupAddress.toString(),
     };
   }
 
@@ -312,6 +382,7 @@ export class BlockProposal extends Gossipable {
       this.archiveRoot,
       this.txHashes,
       this.signature,
+      this.signatureContext,
     );
   }
 }
diff --git a/yarn-project/stdlib/src/p2p/checkpoint_attestation.ts b/yarn-project/stdlib/src/p2p/checkpoint_attestation.ts
index c99298b34bd4..c054a6c5dc40 100644
--- a/yarn-project/stdlib/src/p2p/checkpoint_attestation.ts
+++ b/yarn-project/stdlib/src/p2p/checkpoint_attestation.ts
@@ -1,7 +1,5 @@
-import { CheckpointAttestationHash, SlotNumber } from '@aztec/foundation/branded-types';
-import type { BaseBuffer32 } from '@aztec/foundation/buffer';
-import { keccak256 } from '@aztec/foundation/crypto/keccak';
-import { tryRecoverAddress } from '@aztec/foundation/crypto/secp256k1-signer';
+import { CheckpointProposalHash, type SlotNumber } from '@aztec/foundation/branded-types';
+import { type BaseBuffer32, Buffer32 } from '@aztec/foundation/buffer';
 import type { Fr } from '@aztec/foundation/curves/bn254';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import { Signature } from '@aztec/foundation/eth-signature';
@@ -13,11 +11,9 @@ import type { ZodFor } from '../schemas/index.js';
 import { CheckpointProposal } from './checkpoint_proposal.js';
 import { ConsensusPayload } from './consensus_payload.js';
 import { Gossipable } from './gossipable.js';
-import { SignatureDomainSeparator, getHashedSignaturePayloadEthSignedMessage } from './signature_utils.js';
+import { type CoordinationSignatureContext, recoverCoordinationSigner } from './signature_utils.js';
 import { TopicType } from './topic_type.js';
 
-export type { CheckpointAttestationHash } from '@aztec/foundation/branded-types';
-
 /**
  * CheckpointAttestation
  *
@@ -27,8 +23,8 @@ export type { CheckpointAttestationHash } from '@aztec/foundation/branded-types'
 export class CheckpointAttestation extends Gossipable {
   static override p2pTopic = TopicType.checkpoint_attestation;
 
-  private sender: EthAddress | undefined;
-  private proposer: EthAddress | undefined;
+  private cachedSender: EthAddress | undefined | null = undefined;
+  private cachedProposer: EthAddress | undefined | null = undefined;
 
   constructor(
     /** The payload of the message, and what the signature is over */
@@ -54,7 +50,7 @@ export class CheckpointAttestation extends Gossipable {
   }
 
   override generateP2PMessageIdentifier(): Promise<BaseBuffer32> {
-    return Promise.resolve(CheckpointAttestationHash.fromBuffer(keccak256(this.signature.toBuffer())));
+    return Promise.resolve(new Buffer32(this.payload.getPayloadHash()));
   }
 
   get archive(): Fr {
@@ -65,22 +61,19 @@ export class CheckpointAttestation extends Gossipable {
     return this.payload.header.slotNumber;
   }
 
+  get signatureContext(): CoordinationSignatureContext {
+    return this.payload.signatureContext;
+  }
+
   /**
    * Lazily evaluate and cache the signer of the attestation
    * @returns The signer of the attestation, or undefined if signature recovery fails
    */
   getSender(): EthAddress | undefined {
-    if (!this.sender) {
-      // Recover the sender from the attestation
-      const hashed = getHashedSignaturePayloadEthSignedMessage(
-        this.payload,
-        SignatureDomainSeparator.checkpointAttestation,
-      );
-      // Cache the sender for later use
-      this.sender = tryRecoverAddress(hashed, this.signature);
+    if (this.cachedSender === undefined) {
+      this.cachedSender = recoverCoordinationSigner(this.payload, this.signature) ?? null;
     }
-
-    return this.sender;
+    return this.cachedSender ?? undefined;
   }
 
   /**
@@ -88,7 +81,7 @@ export class CheckpointAttestation extends Gossipable {
    * @returns The proposer of the checkpoint
    */
   getProposer(): EthAddress | undefined {
-    if (!this.proposer) {
+    if (this.cachedProposer === undefined) {
       // Create a temporary CheckpointProposal to recover the proposer address.
       // We need to use CheckpointProposal because it has a different getPayloadToSign()
       // implementation than ConsensusPayload (uses serializeToBuffer vs ABI encoding).
@@ -97,16 +90,23 @@ export class CheckpointAttestation extends Gossipable {
         this.payload.archive,
         this.payload.feeAssetPriceModifier,
         this.proposerSignature,
+        this.payload.signatureContext,
       );
-      // Cache the proposer for later use
-      this.proposer = proposal.getSender();
+      this.cachedProposer = proposal.getSender() ?? null;
     }
-
-    return this.proposer;
+    return this.cachedProposer ?? undefined;
   }
 
   getPayload(): Buffer {
-    return this.payload.getPayloadToSign(SignatureDomainSeparator.checkpointAttestation);
+    return this.payload.getPayloadToSign();
+  }
+
+  /**
+   * Returns a keccak256 hash of the signed consensus payload.
+   * Used to dedup distinct signed payloads. Returns same hash than the corresponding proposal.
+   */
+  getPayloadHash(): CheckpointProposalHash {
+    return CheckpointProposalHash.fromBuffer(this.payload.getPayloadHash());
   }
 
   toBuffer(): Buffer {
diff --git a/yarn-project/stdlib/src/p2p/checkpoint_proposal.ts b/yarn-project/stdlib/src/p2p/checkpoint_proposal.ts
index 91cc1b764f9d..2595068e7f6d 100644
--- a/yarn-project/stdlib/src/p2p/checkpoint_proposal.ts
+++ b/yarn-project/stdlib/src/p2p/checkpoint_proposal.ts
@@ -5,13 +5,13 @@ import {
   SlotNumber,
 } from '@aztec/foundation/branded-types';
 import { type BaseBuffer32, Buffer32 } from '@aztec/foundation/buffer';
-import { keccak256 } from '@aztec/foundation/crypto/keccak';
-import { tryRecoverAddress } from '@aztec/foundation/crypto/secp256k1-signer';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import { Signature } from '@aztec/foundation/eth-signature';
 import { BufferReader, serializeSignedBigInt, serializeToBuffer } from '@aztec/foundation/serialize';
 
+import type { TypedDataDefinition } from 'viem';
+
 import type { L2BlockInfo } from '../block/l2_block_info.js';
 import { MAX_TXS_PER_BLOCK } from '../deserialization/index.js';
 import { DutyType, type SigningContext } from '../ha-signing/index.js';
@@ -20,11 +20,17 @@ import { BlockHeader } from '../tx/block_header.js';
 import { TxHash } from '../tx/index.js';
 import type { Tx } from '../tx/tx.js';
 import { BlockProposal } from './block_proposal.js';
+import { ConsensusPayload } from './consensus_payload.js';
 import { Gossipable } from './gossipable.js';
 import {
-  SignatureDomainSeparator,
-  getHashedSignaturePayload,
-  getHashedSignaturePayloadEthSignedMessage,
+  type CoordinationSignatureContext,
+  type CoordinationSignatureType,
+  EMPTY_COORDINATION_SIGNATURE_CONTEXT,
+  type Signable,
+  getCoordinationSignatureTypedData,
+  readCoordinationSignatureContext,
+  recoverCoordinationSigner,
+  serializeCoordinationSignatureContext,
 } from './signature_utils.js';
 import { SignedTxs } from './signed_txs.js';
 import { TopicType } from './topic_type.js';
@@ -69,10 +75,12 @@ export type CheckpointLastBlock = Omit<CheckpointLastBlockData, 'txs'> & {
  * It includes the aggregated checkpoint header that validators will attest to, plus optionally
  * the last block's info for nodes to re-execute. This marks the completion of a slot's worth of blocks.
  */
-export class CheckpointProposal extends Gossipable {
+export class CheckpointProposal extends Gossipable implements Signable {
   static override p2pTopic = TopicType.checkpoint_proposal;
 
-  private sender: EthAddress | undefined;
+  readonly primaryType: CoordinationSignatureType = 'CheckpointProposal';
+
+  private cachedSender: EthAddress | undefined | null = undefined;
 
   constructor(
     /** The aggregated checkpoint header for consensus */
@@ -87,6 +95,9 @@ export class CheckpointProposal extends Gossipable {
     /** The proposer's signature over the checkpoint payload (checkpointHeader + archive + feeAssetPriceModifier) */
     public readonly signature: Signature,
 
+    /** The signing domain (chainId + rollupAddress) the signature is bound to */
+    public readonly signatureContext: CoordinationSignatureContext,
+
     /** Optional last block info, including its own signature for BlockProposal extraction */
     public readonly lastBlock?: CheckpointLastBlock,
   ) {
@@ -94,7 +105,7 @@ export class CheckpointProposal extends Gossipable {
   }
 
   override generateP2PMessageIdentifier(): Promise<BaseBuffer32> {
-    return Promise.resolve(CheckpointProposalHash.fromBuffer(keccak256(this.signature.toBuffer())));
+    return Promise.resolve(new Buffer32(this.toConsensusPayload().getPayloadHash()));
   }
 
   get slotNumber(): SlotNumber {
@@ -117,6 +128,7 @@ export class CheckpointProposal extends Gossipable {
       this.archive,
       this.lastBlock.txHashes,
       this.lastBlock.signature,
+      this.signatureContext,
       this.lastBlock.signedTxs,
     );
   }
@@ -148,13 +160,26 @@ export class CheckpointProposal extends Gossipable {
    * Get the payload to sign for this checkpoint proposal.
    * The signature is over the checkpoint header + archive root + feeAssetPriceModifier (for consensus).
    */
-  getPayloadToSign(domainSeparator: SignatureDomainSeparator): Buffer {
-    return serializeToBuffer([
-      domainSeparator,
-      this.checkpointHeader,
-      this.archive,
-      serializeSignedBigInt(this.feeAssetPriceModifier),
-    ]);
+  getPayloadToSign(): Buffer {
+    return serializeToBuffer([this.checkpointHeader, this.archive, serializeSignedBigInt(this.feeAssetPriceModifier)]);
+  }
+
+  /**
+   * Returns a content-addressed keccak256 hash of the consensus payload
+   * (header + archive + feeAssetPriceModifier + signatureContext).
+   *
+   * Used by the attestation pool to dedup distinct signed payloads at the same slot
+   * regardless of archive/header collisions on `feeAssetPriceModifier` variants.
+   * The hash deliberately excludes the signature so non-deterministic ECDSA
+   * re-signs of the same payload do not look like equivocation.
+   */
+  getPayloadHash(): CheckpointProposalHash {
+    return CheckpointProposalHash.fromBuffer(this.toConsensusPayload().getPayloadHash());
+  }
+
+  /** Returns the ConsensusPayload that an attester would sign for this proposal. */
+  toConsensusPayload(): ConsensusPayload {
+    return new ConsensusPayload(this.checkpointHeader, this.archive, this.feeAssetPriceModifier, this.signatureContext);
   }
 
   static async createProposalFromSigner(
@@ -163,7 +188,8 @@ export class CheckpointProposal extends Gossipable {
     checkpointNumber: CheckpointNumber,
     feeAssetPriceModifier: bigint,
     lastBlockProposal: BlockProposal | undefined,
-    payloadSigner: (payload: Buffer32, context: SigningContext) => Promise<Signature>,
+    signatureContext: CoordinationSignatureContext,
+    payloadSigner: (typedData: TypedDataDefinition, context: SigningContext) => Promise<Signature>,
   ): Promise<CheckpointProposal> {
     // Sign the checkpoint payload with CHECKPOINT_PROPOSAL duty type
     const tempProposal = new CheckpointProposal(
@@ -171,22 +197,23 @@ export class CheckpointProposal extends Gossipable {
       archiveRoot,
       feeAssetPriceModifier,
       Signature.empty(),
+      signatureContext,
     );
-    const checkpointHash = getHashedSignaturePayload(tempProposal, SignatureDomainSeparator.checkpointProposal);
-
     const checkpointContext: SigningContext = {
       slot: checkpointHeader.slotNumber,
       checkpointNumber,
       dutyType: DutyType.CHECKPOINT_PROPOSAL,
     };
 
-    const checkpointSignature = await payloadSigner(checkpointHash, checkpointContext);
+    const typedData = getCoordinationSignatureTypedData(tempProposal);
+    const checkpointSignature = await payloadSigner(typedData, checkpointContext);
 
     return new CheckpointProposal(
       checkpointHeader,
       archiveRoot,
       feeAssetPriceModifier,
       checkpointSignature,
+      signatureContext,
       lastBlockProposal,
     );
   }
@@ -197,28 +224,26 @@ export class CheckpointProposal extends Gossipable {
    * @returns The sender address, or undefined if signature recovery fails or senders don't match
    */
   getSender(): EthAddress | undefined {
-    if (!this.sender) {
-      const hashed = getHashedSignaturePayloadEthSignedMessage(this, SignatureDomainSeparator.checkpointProposal);
-      const checkpointSender = tryRecoverAddress(hashed, this.signature);
+    if (this.cachedSender === undefined) {
+      const checkpointSender = recoverCoordinationSigner(this, this.signature);
 
-      // If there's a lastBlock, verify the block proposal sender matches
       if (checkpointSender && this.lastBlock) {
         const blockProposal = this.getBlockProposal();
         const blockSender = blockProposal?.getSender();
         if (!blockSender || !blockSender.equals(checkpointSender)) {
-          return undefined; // Sender mismatch - fail
+          this.cachedSender = null;
+          return undefined;
         }
       }
 
-      // Cache the sender for later use
-      this.sender = checkpointSender;
+      this.cachedSender = checkpointSender ?? null;
     }
 
-    return this.sender;
+    return this.cachedSender ?? undefined;
   }
 
   getPayload() {
-    return this.getPayloadToSign(SignatureDomainSeparator.checkpointProposal);
+    return this.getPayloadToSign();
   }
 
   toBuffer(): Buffer {
@@ -227,6 +252,7 @@ export class CheckpointProposal extends Gossipable {
       this.archive,
       serializeSignedBigInt(this.feeAssetPriceModifier),
       this.signature,
+      serializeCoordinationSignatureContext(this.signatureContext),
     ];
 
     if (this.lastBlock) {
@@ -256,6 +282,7 @@ export class CheckpointProposal extends Gossipable {
     const archive = reader.readObject(Fr);
     const feeAssetPriceModifier = reader.readInt256();
     const signature = reader.readObject(Signature);
+    const signatureContext = readCoordinationSignatureContext(reader);
 
     const hasLastBlock = reader.readNumber();
 
@@ -277,7 +304,7 @@ export class CheckpointProposal extends Gossipable {
         }
       }
 
-      return new CheckpointProposal(checkpointHeader, archive, feeAssetPriceModifier, signature, {
+      return new CheckpointProposal(checkpointHeader, archive, feeAssetPriceModifier, signature, signatureContext, {
         blockHeader,
         indexWithinCheckpoint,
         txHashes,
@@ -286,7 +313,7 @@ export class CheckpointProposal extends Gossipable {
       });
     }
 
-    return new CheckpointProposal(checkpointHeader, archive, feeAssetPriceModifier, signature);
+    return new CheckpointProposal(checkpointHeader, archive, feeAssetPriceModifier, signature, signatureContext);
   }
 
   getSize(): number {
@@ -295,6 +322,8 @@ export class CheckpointProposal extends Gossipable {
       this.archive.size +
       this.signature.getSize() +
       8 /* feeAssetPriceModifier */ +
+      4 /* chainId */ +
+      20 /* rollupAddress */ +
       4; /* hasLastBlock flag */
 
     if (this.lastBlock) {
@@ -312,16 +341,29 @@ export class CheckpointProposal extends Gossipable {
   }
 
   static empty(): CheckpointProposal {
-    return new CheckpointProposal(CheckpointHeader.empty(), Fr.ZERO, 0n, Signature.empty());
+    return new CheckpointProposal(
+      CheckpointHeader.empty(),
+      Fr.ZERO,
+      0n,
+      Signature.empty(),
+      EMPTY_COORDINATION_SIGNATURE_CONTEXT,
+    );
   }
 
   static random(): CheckpointProposal {
-    return new CheckpointProposal(CheckpointHeader.random(), Fr.random(), 0n, Signature.random(), {
-      blockHeader: BlockHeader.random(),
-      indexWithinCheckpoint: IndexWithinCheckpoint(Math.floor(Math.random() * 5)),
-      txHashes: [TxHash.random(), TxHash.random()],
-      signature: Signature.random(),
-    });
+    return new CheckpointProposal(
+      CheckpointHeader.random(),
+      Fr.random(),
+      0n,
+      Signature.random(),
+      EMPTY_COORDINATION_SIGNATURE_CONTEXT,
+      {
+        blockHeader: BlockHeader.random(),
+        indexWithinCheckpoint: IndexWithinCheckpoint(Math.floor(Math.random() * 5)),
+        txHashes: [TxHash.random(), TxHash.random()],
+        signature: Signature.random(),
+      },
+    );
   }
 
   toInspect() {
@@ -330,6 +372,8 @@ export class CheckpointProposal extends Gossipable {
       archive: this.archive.toString(),
       signature: this.signature.toString(),
       feeAssetPriceModifier: this.feeAssetPriceModifier.toString(),
+      chainId: this.signatureContext.chainId,
+      rollupAddress: this.signatureContext.rollupAddress.toString(),
       lastBlock: this.lastBlock
         ? {
             blockHeader: this.lastBlock.blockHeader.toInspect(),
@@ -346,7 +390,13 @@ export class CheckpointProposal extends Gossipable {
    * Used when the lastBlock has been extracted and stored separately.
    */
   toCore(): CheckpointProposalCore {
-    return new CheckpointProposal(this.checkpointHeader, this.archive, this.feeAssetPriceModifier, this.signature);
+    return new CheckpointProposal(
+      this.checkpointHeader,
+      this.archive,
+      this.feeAssetPriceModifier,
+      this.signature,
+      this.signatureContext,
+    );
   }
 }
 
diff --git a/yarn-project/stdlib/src/p2p/consensus_payload.ts b/yarn-project/stdlib/src/p2p/consensus_payload.ts
index 35b65afba951..17b3267f2194 100644
--- a/yarn-project/stdlib/src/p2p/consensus_payload.ts
+++ b/yarn-project/stdlib/src/p2p/consensus_payload.ts
@@ -1,3 +1,4 @@
+import { keccak256 } from '@aztec/foundation/crypto/keccak';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { schemas } from '@aztec/foundation/schemas';
 import { BufferReader, serializeSignedBigInt, serializeToBuffer } from '@aztec/foundation/serialize';
@@ -10,10 +11,21 @@ import { z } from 'zod';
 import type { Checkpoint } from '../checkpoint/checkpoint.js';
 import { CheckpointHeader } from '../rollup/checkpoint_header.js';
 import type { CheckpointProposal, CheckpointProposalCore } from './checkpoint_proposal.js';
-import type { Signable, SignatureDomainSeparator } from './signature_utils.js';
+import {
+  type CoordinationSignatureContext,
+  type CoordinationSignatureType,
+  EMPTY_COORDINATION_SIGNATURE_CONTEXT,
+  type Signable,
+  coordinationSignatureContextEquals,
+  coordinationSignatureContextSchema,
+  readCoordinationSignatureContext,
+  serializeCoordinationSignatureContext,
+} from './signature_utils.js';
 
 /** Checkpoint consensus payload as signed by validators and verified on L1. */
 export class ConsensusPayload implements Signable {
+  readonly primaryType: CoordinationSignatureType = 'CheckpointAttestation';
+
   private size: number | undefined;
 
   constructor(
@@ -22,7 +34,9 @@ export class ConsensusPayload implements Signable {
     /** The archive root after the block is added */
     public readonly archive: Fr,
     /** The fee asset price modifier in basis points (from oracle) */
-    public readonly feeAssetPriceModifier: bigint = 0n,
+    public readonly feeAssetPriceModifier: bigint,
+    /** The signing domain (chainId + rollupAddress) the signature is bound to */
+    public readonly signatureContext: CoordinationSignatureContext,
   ) {}
 
   static get schema() {
@@ -31,36 +45,46 @@ export class ConsensusPayload implements Signable {
         header: CheckpointHeader.schema,
         archive: schemas.Fr,
         feeAssetPriceModifier: schemas.BigInt,
+        signatureContext: coordinationSignatureContextSchema,
       })
-      .transform(obj => new ConsensusPayload(obj.header, obj.archive, obj.feeAssetPriceModifier));
+      .transform(obj => new ConsensusPayload(obj.header, obj.archive, obj.feeAssetPriceModifier, obj.signatureContext));
   }
 
-  static getFields(fields: FieldsOf<ConsensusPayload>) {
-    return [fields.header, fields.archive, fields.feeAssetPriceModifier] as const;
+  static getFields(fields: Omit<FieldsOf<ConsensusPayload>, 'primaryType'>) {
+    return [fields.header, fields.archive, fields.feeAssetPriceModifier, fields.signatureContext] as const;
   }
 
-  getPayloadToSign(domainSeparator: SignatureDomainSeparator): Buffer {
+  getPayloadToSign(): Buffer {
+    // Matches the L1 ProposePayload struct in ProposeLib.sol.
     const abi = parseAbiParameters(
-      'uint8, ' + //domainSeperator
-        '(' +
+      '(' +
         'bytes32, ' + // archive
         '(int256), ' + // oracleInput
         'bytes32' + // headerHash
         ')',
     );
     const archiveRoot = this.archive.toString();
-
     const headerHash = this.header.hash().toString();
-    const encodedData = encodeAbiParameters(abi, [
-      domainSeparator,
-      [archiveRoot, [this.feeAssetPriceModifier], headerHash],
-    ] as const);
+    const encodedData = encodeAbiParameters(abi, [[archiveRoot, [this.feeAssetPriceModifier], headerHash]] as const);
 
     return hexToBuffer(encodedData);
   }
 
+  /**
+   * Returns a keccak256 hash of the signed payload (header + archive + feeAssetPriceModifier).
+   * Used by the attestation pool to dedup distinct signed payloads.
+   */
+  getPayloadHash(): Buffer {
+    return keccak256(this.getPayloadToSign());
+  }
+
   toBuffer(): Buffer {
-    return serializeToBuffer([this.header, this.archive, serializeSignedBigInt(this.feeAssetPriceModifier)]);
+    return serializeToBuffer([
+      this.header,
+      this.archive,
+      serializeSignedBigInt(this.feeAssetPriceModifier),
+      serializeCoordinationSignatureContext(this.signatureContext),
+    ]);
   }
 
   public equals(other: ConsensusPayload | CheckpointProposal | CheckpointProposalCore): boolean {
@@ -69,34 +93,39 @@ export class ConsensusPayload implements Signable {
     return (
       this.header.equals(otherHeader) &&
       this.archive.equals(other.archive) &&
-      this.feeAssetPriceModifier === otherModifier
+      this.feeAssetPriceModifier === otherModifier &&
+      coordinationSignatureContextEquals(this.signatureContext, other.signatureContext)
     );
   }
 
   static fromBuffer(buf: Buffer | BufferReader): ConsensusPayload {
     const reader = BufferReader.asReader(buf);
-    const payload = new ConsensusPayload(
-      reader.readObject(CheckpointHeader),
-      reader.readObject(Fr),
-      reader.readInt256(),
-    );
-    return payload;
+    const header = reader.readObject(CheckpointHeader);
+    const archive = reader.readObject(Fr);
+    const feeAssetPriceModifier = reader.readInt256();
+    const signatureContext = readCoordinationSignatureContext(reader);
+    return new ConsensusPayload(header, archive, feeAssetPriceModifier, signatureContext);
   }
 
-  static fromFields(fields: FieldsOf<ConsensusPayload>): ConsensusPayload {
-    return new ConsensusPayload(fields.header, fields.archive, fields.feeAssetPriceModifier);
+  static fromFields(fields: Omit<FieldsOf<ConsensusPayload>, 'primaryType'>): ConsensusPayload {
+    return new ConsensusPayload(fields.header, fields.archive, fields.feeAssetPriceModifier, fields.signatureContext);
   }
 
-  static fromCheckpoint(checkpoint: Checkpoint): ConsensusPayload {
-    return new ConsensusPayload(checkpoint.header, checkpoint.archive.root, checkpoint.feeAssetPriceModifier);
+  static fromCheckpoint(checkpoint: Checkpoint, signatureContext: CoordinationSignatureContext): ConsensusPayload {
+    return new ConsensusPayload(
+      checkpoint.header,
+      checkpoint.archive.root,
+      checkpoint.feeAssetPriceModifier,
+      signatureContext,
+    );
   }
 
   static empty(): ConsensusPayload {
-    return new ConsensusPayload(CheckpointHeader.empty(), Fr.ZERO, 0n);
+    return new ConsensusPayload(CheckpointHeader.empty(), Fr.ZERO, 0n, EMPTY_COORDINATION_SIGNATURE_CONTEXT);
   }
 
   static random(): ConsensusPayload {
-    return new ConsensusPayload(CheckpointHeader.random(), Fr.random(), 0n);
+    return new ConsensusPayload(CheckpointHeader.random(), Fr.random(), 0n, EMPTY_COORDINATION_SIGNATURE_CONTEXT);
   }
 
   /**
@@ -117,10 +146,12 @@ export class ConsensusPayload implements Signable {
       header: this.header.toInspect(),
       archive: this.archive.toString(),
       feeAssetPriceModifier: this.feeAssetPriceModifier.toString(),
+      chainId: this.signatureContext.chainId,
+      rollupAddress: this.signatureContext.rollupAddress.toString(),
     };
   }
 
   toString() {
-    return `header: ${this.header.toString()}, archive: ${this.archive.toString()}, feeAssetPriceModifier: ${this.feeAssetPriceModifier}}`;
+    return `header: ${this.header.toString()}, archive: ${this.archive.toString()}, feeAssetPriceModifier: ${this.feeAssetPriceModifier}, chainId: ${this.signatureContext.chainId}, rollupAddress: ${this.signatureContext.rollupAddress.toString()}`;
   }
 }
diff --git a/yarn-project/stdlib/src/p2p/signature_utils.test.ts b/yarn-project/stdlib/src/p2p/signature_utils.test.ts
new file mode 100644
index 000000000000..ef1543bee0d6
--- /dev/null
+++ b/yarn-project/stdlib/src/p2p/signature_utils.test.ts
@@ -0,0 +1,188 @@
+import { Buffer32 } from '@aztec/foundation/buffer';
+import { keccak256, keccak256String } from '@aztec/foundation/crypto/keccak';
+import { Secp256k1Signer } from '@aztec/foundation/crypto/secp256k1-signer';
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { hexToBuffer } from '@aztec/foundation/string';
+
+import { encodeAbiParameters, parseAbiParameters } from 'viem';
+
+import { CommitteeAttestationsAndSigners } from '../block/proposal/attestations_and_signers.js';
+import { CommitteeAttestation } from '../block/proposal/committee_attestation.js';
+import {
+  TEST_COORDINATION_SIGNATURE_CONTEXT,
+  makeAndSignCommitteeAttestationsAndSigners,
+  makeBlockProposal,
+  makeCheckpointAttestation,
+  makeCheckpointProposal,
+} from '../tests/mocks.js';
+import { CheckpointAttestation } from './checkpoint_attestation.js';
+import type { CoordinationSignatureType, Signable } from './signature_utils.js';
+import {
+  getHashedSignaturePayload,
+  getHashedSignaturePayloadTypedData,
+  recoverCoordinationSigner,
+} from './signature_utils.js';
+
+const DOMAIN_TYPEHASH = `0x${keccak256String(
+  'EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)',
+)}` as const;
+const NAME_HASH = `0x${keccak256String('Aztec Rollup')}` as const;
+const VERSION_HASH = `0x${keccak256String('1')}` as const;
+
+const TYPEHASHES: Record<CoordinationSignatureType, `0x${string}`> = {
+  BlockProposal: `0x${keccak256String('BlockProposal(bytes32 payloadHash)')}`,
+  CheckpointProposal: `0x${keccak256String('CheckpointProposal(bytes32 payloadHash)')}`,
+  CheckpointAttestation: `0x${keccak256String('CheckpointAttestation(bytes32 payloadHash)')}`,
+  AttestationsAndSigners: `0x${keccak256String('AttestationsAndSigners(bytes32 payloadHash)')}`,
+  SignedTxs: `0x${keccak256String('SignedTxs(bytes32 payloadHash)')}`,
+};
+
+const WRONG_CHAIN_CONTEXT = {
+  ...TEST_COORDINATION_SIGNATURE_CONTEXT,
+  chainId: TEST_COORDINATION_SIGNATURE_CONTEXT.chainId + 1,
+};
+
+const WRONG_ROLLUP_CONTEXT = {
+  ...TEST_COORDINATION_SIGNATURE_CONTEXT,
+  rollupAddress: EthAddress.fromString('0x0000000000000000000000000000000000000002'),
+};
+
+function getSolidityCoordinationDigest(signable: Signable): Buffer32 {
+  const payloadHash = getHashedSignaturePayload(signable);
+  const domainSeparatorHash = Buffer32.fromBuffer(
+    keccak256(
+      hexToBuffer(
+        encodeAbiParameters(parseAbiParameters('bytes32,bytes32,bytes32,uint256,address'), [
+          DOMAIN_TYPEHASH,
+          NAME_HASH,
+          VERSION_HASH,
+          BigInt(signable.signatureContext.chainId),
+          signable.signatureContext.rollupAddress.toString(),
+        ]),
+      ),
+    ),
+  );
+  const structHash = Buffer32.fromBuffer(
+    keccak256(
+      hexToBuffer(
+        encodeAbiParameters(parseAbiParameters('bytes32,bytes32'), [
+          TYPEHASHES[signable.primaryType],
+          payloadHash.toString() as `0x${string}`,
+        ]),
+      ),
+    ),
+  );
+
+  return Buffer32.fromBuffer(
+    keccak256(Buffer.concat([Buffer.from('1901', 'hex'), domainSeparatorHash.toBuffer(), structHash.toBuffer()])),
+  );
+}
+
+describe('coordination signature typed data', () => {
+  it('matches the Solidity EIP-712 digest for all proposal-path message types', async () => {
+    const signer = Secp256k1Signer.random();
+    const blockProposal = await makeBlockProposal({ signer });
+    const checkpointProposal = await makeCheckpointProposal({ signer });
+    const checkpointAttestation = makeCheckpointAttestation({ signer });
+    const attestationsAndSigners = new CommitteeAttestationsAndSigners(
+      [CommitteeAttestation.fromAddressAndSignature(signer.address, checkpointAttestation.signature)],
+      TEST_COORDINATION_SIGNATURE_CONTEXT,
+    );
+
+    expect(getHashedSignaturePayloadTypedData(blockProposal)).toEqual(getSolidityCoordinationDigest(blockProposal));
+    expect(getHashedSignaturePayloadTypedData(checkpointProposal)).toEqual(
+      getSolidityCoordinationDigest(checkpointProposal),
+    );
+    expect(getHashedSignaturePayloadTypedData(checkpointAttestation.payload)).toEqual(
+      getSolidityCoordinationDigest(checkpointAttestation.payload),
+    );
+    expect(getHashedSignaturePayloadTypedData(attestationsAndSigners)).toEqual(
+      getSolidityCoordinationDigest(attestationsAndSigners),
+    );
+  });
+
+  it('recovers with the right context and changes sender for the wrong domain', async () => {
+    const blockSigner = Secp256k1Signer.random();
+    const checkpointSigner = Secp256k1Signer.random();
+    const attesterSigner = Secp256k1Signer.random();
+    const proposerSigner = Secp256k1Signer.random();
+    const attestationsAndSignersSigner = Secp256k1Signer.random();
+
+    const blockProposal = await makeBlockProposal({ signer: blockSigner });
+    const checkpointProposal = await makeCheckpointProposal({
+      signer: checkpointSigner,
+    });
+    const checkpointAttestation = makeCheckpointAttestation({
+      attesterSigner,
+      proposerSigner,
+    });
+    const attestationsAndSigners = new CommitteeAttestationsAndSigners(
+      [CommitteeAttestation.fromAddressAndSignature(attesterSigner.address, checkpointAttestation.signature)],
+      TEST_COORDINATION_SIGNATURE_CONTEXT,
+    );
+    const attestationsAndSignersSignature = makeAndSignCommitteeAttestationsAndSigners(
+      attestationsAndSigners,
+      attestationsAndSignersSigner,
+    );
+
+    // Helpers to create variants of the same signables but with the wrong context baked in.
+    // Reset any memoized sender/proposer so the copy re-derives them against the altered context.
+    const withContext = <T extends { signatureContext: unknown }>(
+      signable: T,
+      ctx: typeof TEST_COORDINATION_SIGNATURE_CONTEXT,
+    ): T => {
+      const copy = Object.create(Object.getPrototypeOf(signable));
+      Object.assign(copy, signable);
+      copy.signatureContext = ctx;
+      if ('cachedSender' in copy) {
+        copy.cachedSender = undefined;
+      }
+      if ('cachedProposer' in copy) {
+        copy.cachedProposer = undefined;
+      }
+      return copy;
+    };
+
+    expect(blockProposal.getSender()).toEqual(blockSigner.address);
+    expect(withContext(blockProposal, WRONG_CHAIN_CONTEXT).getSender()).not.toEqual(blockSigner.address);
+    expect(withContext(blockProposal, WRONG_ROLLUP_CONTEXT).getSender()).not.toEqual(blockSigner.address);
+
+    expect(checkpointProposal.getSender()).toEqual(checkpointSigner.address);
+    expect(withContext(checkpointProposal, WRONG_CHAIN_CONTEXT).getSender()).not.toEqual(checkpointSigner.address);
+    expect(withContext(checkpointProposal, WRONG_ROLLUP_CONTEXT).getSender()).not.toEqual(checkpointSigner.address);
+
+    expect(checkpointAttestation.getSender()).toEqual(attesterSigner.address);
+    expect(checkpointAttestation.getProposer()).toEqual(proposerSigner.address);
+    // To change the context on a CheckpointAttestation, we need to swap the embedded payload's context.
+    const wrongChainAttestation = new CheckpointAttestation(
+      withContext(checkpointAttestation.payload, WRONG_CHAIN_CONTEXT),
+      checkpointAttestation.signature,
+      checkpointAttestation.proposerSignature,
+    );
+    const wrongRollupAttestation = new CheckpointAttestation(
+      withContext(checkpointAttestation.payload, WRONG_ROLLUP_CONTEXT),
+      checkpointAttestation.signature,
+      checkpointAttestation.proposerSignature,
+    );
+    expect(wrongChainAttestation.getSender()).not.toEqual(attesterSigner.address);
+    expect(wrongRollupAttestation.getSender()).not.toEqual(attesterSigner.address);
+    expect(wrongChainAttestation.getProposer()).not.toEqual(proposerSigner.address);
+    expect(wrongRollupAttestation.getProposer()).not.toEqual(proposerSigner.address);
+
+    expect(recoverCoordinationSigner(attestationsAndSigners, attestationsAndSignersSignature)).toEqual(
+      attestationsAndSignersSigner.address,
+    );
+    expect(
+      recoverCoordinationSigner(
+        withContext(attestationsAndSigners, WRONG_CHAIN_CONTEXT),
+        attestationsAndSignersSignature,
+      ),
+    ).not.toEqual(attestationsAndSignersSigner.address);
+    expect(
+      recoverCoordinationSigner(
+        withContext(attestationsAndSigners, WRONG_ROLLUP_CONTEXT),
+        attestationsAndSignersSignature,
+      ),
+    ).not.toEqual(attestationsAndSignersSigner.address);
+  });
+});
diff --git a/yarn-project/stdlib/src/p2p/signature_utils.ts b/yarn-project/stdlib/src/p2p/signature_utils.ts
index f50bbe82e0c0..b71c9a8b89e3 100644
--- a/yarn-project/stdlib/src/p2p/signature_utils.ts
+++ b/yarn-project/stdlib/src/p2p/signature_utils.ts
@@ -1,37 +1,122 @@
 import { Buffer32 } from '@aztec/foundation/buffer';
 import { keccak256 } from '@aztec/foundation/crypto/keccak';
-import { makeEthSignDigest } from '@aztec/foundation/crypto/secp256k1-signer';
+import { tryRecoverAddress } from '@aztec/foundation/crypto/secp256k1-signer';
+import { EthAddress } from '@aztec/foundation/eth-address';
+import type { Signature } from '@aztec/foundation/eth-signature';
+import { type BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
-export enum SignatureDomainSeparator {
-  blockProposal = 0,
-  checkpointAttestation = 1,
-  attestationsAndSigners = 2,
-  checkpointProposal = 3,
-  signedTxs = 4,
-}
+import { type TypedDataDefinition, hashTypedData } from 'viem';
+import { z } from 'zod';
+
+import type { ZodFor } from '../schemas/index.js';
+
+export type CoordinationSignatureType =
+  | 'BlockProposal'
+  | 'CheckpointProposal'
+  | 'CheckpointAttestation'
+  | 'AttestationsAndSigners'
+  | 'SignedTxs';
+
+export type CoordinationSignatureContext = {
+  chainId: number;
+  rollupAddress: EthAddress;
+};
+
+export const EMPTY_COORDINATION_SIGNATURE_CONTEXT: CoordinationSignatureContext = {
+  chainId: 0,
+  rollupAddress: EthAddress.ZERO,
+};
+
+export const coordinationSignatureContextSchema: ZodFor<CoordinationSignatureContext> = z.object({
+  chainId: z.number(),
+  rollupAddress: EthAddress.schema,
+});
 
 export interface Signable {
-  getPayloadToSign(domainSeparator: SignatureDomainSeparator): Buffer;
+  readonly primaryType: CoordinationSignatureType;
+  readonly signatureContext: CoordinationSignatureContext;
+  getPayloadToSign(): Buffer;
 }
 
-/**
- * Get the hashed payload for the signature of the `Signable`
- * @param s - The `Signable` to sign
- * @returns The hashed payload for the signature of the `Signable`
- */
-export function getHashedSignaturePayload(s: Signable, domainSeparator: SignatureDomainSeparator): Buffer32 {
-  return Buffer32.fromBuffer(keccak256(s.getPayloadToSign(domainSeparator)));
+export function coordinationSignatureContextEquals(
+  a: CoordinationSignatureContext,
+  b: CoordinationSignatureContext,
+): boolean {
+  return a.chainId === b.chainId && a.rollupAddress.equals(b.rollupAddress);
+}
+
+export function serializeCoordinationSignatureContext(ctx: CoordinationSignatureContext): Buffer {
+  return serializeToBuffer([ctx.chainId, ctx.rollupAddress]);
+}
+
+export function readCoordinationSignatureContext(reader: BufferReader): CoordinationSignatureContext {
+  const chainId = reader.readNumber();
+  const rollupAddress = reader.readObject(EthAddress);
+  return { chainId, rollupAddress };
 }
 
 /**
- * Get the hashed payload for the signature of the `Signable` as an Ethereum signed message EIP-712
- * @param s - the `Signable` to sign
- * @returns The hashed payload for the signature of the `Signable` as an Ethereum signed message
+ * Returns true if the signable carries a context matching the node's expected context.
+ * Use this at the P2P ingress boundary to reject foreign-chain messages cheaply before
+ * performing any signature recovery.
  */
-export function getHashedSignaturePayloadEthSignedMessage(
-  s: Signable,
-  domainSeparator: SignatureDomainSeparator,
-): Buffer32 {
-  const payload = getHashedSignaturePayload(s, domainSeparator);
-  return makeEthSignDigest(payload);
+export function hasValidSignatureContext(signable: Signable, expected: CoordinationSignatureContext): boolean {
+  return coordinationSignatureContextEquals(signable.signatureContext, expected);
+}
+
+const COORDINATION_SIGNATURE_NAME = 'Aztec Rollup';
+const COORDINATION_SIGNATURE_VERSION = '1';
+
+const EIP712_DOMAIN_FIELDS = [
+  { name: 'name', type: 'string' },
+  { name: 'version', type: 'string' },
+  { name: 'chainId', type: 'uint256' },
+  { name: 'verifyingContract', type: 'address' },
+] as const;
+
+const COORDINATION_SIGNATURE_TYPES = {
+  EIP712Domain: EIP712_DOMAIN_FIELDS,
+  BlockProposal: [{ name: 'payloadHash', type: 'bytes32' }],
+  CheckpointProposal: [{ name: 'payloadHash', type: 'bytes32' }],
+  CheckpointAttestation: [{ name: 'payloadHash', type: 'bytes32' }],
+  AttestationsAndSigners: [{ name: 'payloadHash', type: 'bytes32' }],
+  SignedTxs: [{ name: 'payloadHash', type: 'bytes32' }],
+} as const;
+
+export function getCoordinationSignatureTypedDataForPayloadHash(
+  payloadHash: Buffer32,
+  type: CoordinationSignatureType,
+  context: CoordinationSignatureContext,
+): TypedDataDefinition {
+  return {
+    domain: {
+      name: COORDINATION_SIGNATURE_NAME,
+      version: COORDINATION_SIGNATURE_VERSION,
+      chainId: context.chainId,
+      verifyingContract: context.rollupAddress.toString() as `0x${string}`,
+    },
+    types: COORDINATION_SIGNATURE_TYPES,
+    primaryType: type,
+    message: {
+      payloadHash: payloadHash.toString() as `0x${string}`,
+    },
+  };
+}
+
+export function getCoordinationSignatureTypedData(signable: Signable): TypedDataDefinition {
+  const payloadHash = getHashedSignaturePayload(signable);
+  return getCoordinationSignatureTypedDataForPayloadHash(payloadHash, signable.primaryType, signable.signatureContext);
+}
+
+export function getHashedSignaturePayloadTypedData(signable: Signable): Buffer32 {
+  return Buffer32.fromString(hashTypedData(getCoordinationSignatureTypedData(signable)));
+}
+
+export function recoverCoordinationSigner(signable: Signable, signature: Signature): EthAddress | undefined {
+  const digest = getHashedSignaturePayloadTypedData(signable);
+  return tryRecoverAddress(digest, signature, { allowYParityAsV: true });
+}
+
+export function getHashedSignaturePayload(s: Signable): Buffer32 {
+  return Buffer32.fromBuffer(keccak256(s.getPayloadToSign()));
 }
diff --git a/yarn-project/stdlib/src/p2p/signed_txs.ts b/yarn-project/stdlib/src/p2p/signed_txs.ts
index cd88f56aa278..17d06fcd36df 100644
--- a/yarn-project/stdlib/src/p2p/signed_txs.ts
+++ b/yarn-project/stdlib/src/p2p/signed_txs.ts
@@ -1,15 +1,20 @@
-import { Buffer32 } from '@aztec/foundation/buffer';
-import { tryRecoverAddress } from '@aztec/foundation/crypto/secp256k1-signer';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import { Signature } from '@aztec/foundation/eth-signature';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
+import type { TypedDataDefinition } from 'viem';
+
 import { MAX_TXS_PER_BLOCK } from '../deserialization/index.js';
 import { Tx } from '../tx/tx.js';
 import {
-  SignatureDomainSeparator,
-  getHashedSignaturePayload,
-  getHashedSignaturePayloadEthSignedMessage,
+  type CoordinationSignatureContext,
+  type CoordinationSignatureType,
+  EMPTY_COORDINATION_SIGNATURE_CONTEXT,
+  type Signable,
+  getCoordinationSignatureTypedData,
+  readCoordinationSignatureContext,
+  recoverCoordinationSigner,
+  serializeCoordinationSignatureContext,
 } from './signature_utils.js';
 
 /**
@@ -17,50 +22,56 @@ import {
  * The signature is over the transaction objects themselves, providing
  * data availability guarantees beyond just the transaction hashes.
  */
-export class SignedTxs {
-  private sender: EthAddress | undefined;
+export class SignedTxs implements Signable {
+  readonly primaryType: CoordinationSignatureType = 'SignedTxs';
+
+  private cachedSender: EthAddress | undefined | null = undefined;
 
   constructor(
     /** The transactions */
     public readonly txs: Tx[],
     /** The proposer's signature over the transactions */
     public readonly signature: Signature,
+    /** The signing domain (chainId + rollupAddress) the signature is bound to */
+    public readonly signatureContext: CoordinationSignatureContext,
   ) {}
 
-  /**
-   * Get the payload to sign for this signed txs.
-   */
-  getPayloadToSign(domainSeparator: SignatureDomainSeparator): Buffer {
-    return serializeToBuffer([domainSeparator, this.txs.length, this.txs]);
+  getPayloadToSign(): Buffer {
+    return serializeToBuffer([this.txs.length, this.txs]);
   }
 
   /**
-   * Lazily evaluate the sender of the signed txs; result is cached
+   * Lazily evaluate the sender of the signed txs; result is cached.
    * @returns The sender address, or undefined if signature recovery fails
    */
   getSender(): EthAddress | undefined {
-    if (!this.sender) {
-      const hashed = getHashedSignaturePayloadEthSignedMessage(this, SignatureDomainSeparator.signedTxs);
-      this.sender = tryRecoverAddress(hashed, this.signature);
+    if (this.cachedSender === undefined) {
+      this.cachedSender = recoverCoordinationSigner(this, this.signature) ?? null;
     }
-    return this.sender;
+    return this.cachedSender ?? undefined;
   }
 
   /**
-   * Create SignedTxs from a signer function
+   * Create SignedTxs from a typed-data signer function
    */
   static async createFromSigner(
     txs: Tx[],
-    payloadSigner: (payload: Buffer32) => Promise<Signature>,
+    signatureContext: CoordinationSignatureContext,
+    typedDataSigner: (typedData: TypedDataDefinition) => Promise<Signature>,
   ): Promise<SignedTxs> {
-    const tempSignedTxs = new SignedTxs(txs, Signature.empty());
-    const hashed = getHashedSignaturePayload(tempSignedTxs, SignatureDomainSeparator.signedTxs);
-    const signature = await payloadSigner(hashed);
-    return new SignedTxs(txs, signature);
+    const tempSignedTxs = new SignedTxs(txs, Signature.empty(), signatureContext);
+    const typedData = getCoordinationSignatureTypedData(tempSignedTxs);
+    const signature = await typedDataSigner(typedData);
+    return new SignedTxs(txs, signature, signatureContext);
   }
 
   toBuffer(): Buffer {
-    return serializeToBuffer([this.txs.length, this.txs, this.signature]);
+    return serializeToBuffer([
+      this.txs.length,
+      this.txs,
+      this.signature,
+      serializeCoordinationSignatureContext(this.signatureContext),
+    ]);
   }
 
   static fromBuffer(buf: Buffer | BufferReader): SignedTxs {
@@ -71,18 +82,25 @@ export class SignedTxs {
     }
     const txs = reader.readArray(txCount, Tx);
     const signature = reader.readObject(Signature);
-    return new SignedTxs(txs, signature);
+    const signatureContext = readCoordinationSignatureContext(reader);
+    return new SignedTxs(txs, signature, signatureContext);
   }
 
   getSize(): number {
-    return 4 /* txs.length */ + this.txs.reduce((acc, tx) => acc + tx.getSize(), 0) + this.signature.getSize();
+    return (
+      4 /* txs.length */ +
+      this.txs.reduce((acc, tx) => acc + tx.getSize(), 0) +
+      this.signature.getSize() +
+      4 /* chainId */ +
+      20 /* rollupAddress */
+    );
   }
 
   static empty(): SignedTxs {
-    return new SignedTxs([], Signature.empty());
+    return new SignedTxs([], Signature.empty(), EMPTY_COORDINATION_SIGNATURE_CONTEXT);
   }
 
   static random(): SignedTxs {
-    return new SignedTxs([Tx.random(), Tx.random()], Signature.random());
+    return new SignedTxs([Tx.random(), Tx.random()], Signature.random(), EMPTY_COORDINATION_SIGNATURE_CONTEXT);
   }
 }
diff --git a/yarn-project/stdlib/src/tests/mocks.ts b/yarn-project/stdlib/src/tests/mocks.ts
index a2c813434260..fb919367718f 100644
--- a/yarn-project/stdlib/src/tests/mocks.ts
+++ b/yarn-project/stdlib/src/tests/mocks.ts
@@ -14,8 +14,11 @@ import { padArrayEnd, times } from '@aztec/foundation/collection';
 import { randomBytes } from '@aztec/foundation/crypto/random';
 import { Secp256k1Signer } from '@aztec/foundation/crypto/secp256k1-signer';
 import { Fr } from '@aztec/foundation/curves/bn254';
+import { EthAddress } from '@aztec/foundation/eth-address';
 import { Signature } from '@aztec/foundation/eth-signature';
 
+import { type TypedDataDefinition, hashTypedData } from 'viem';
+
 import type { ContractArtifact } from '../abi/abi.js';
 import { PublicTxEffect } from '../avm/avm.js';
 import type { AvmAccumulatedData } from '../avm/avm_accumulated_data.js';
@@ -23,10 +26,9 @@ import { AvmCircuitPublicInputs } from '../avm/avm_circuit_public_inputs.js';
 import { PublicDataWrite } from '../avm/public_data_write.js';
 import { RevertCode } from '../avm/revert_code.js';
 import { AztecAddress } from '../aztec-address/index.js';
-import { CheckpointedL2Block, CommitteeAttestation, L2Block } from '../block/index.js';
+import { L2Block } from '../block/index.js';
 import type { CommitteeAttestationsAndSigners } from '../block/proposal/attestations_and_signers.js';
 import { Checkpoint } from '../checkpoint/checkpoint.js';
-import { L1PublishedData } from '../checkpoint/published_checkpoint.js';
 import { computeContractAddressFromInstance } from '../contract/contract_address.js';
 import { getContractClassFromArtifact } from '../contract/contract_class.js';
 import { SerializableContractInstance } from '../contract/contract_instance.js';
@@ -51,7 +53,7 @@ import { BlockProposal } from '../p2p/block_proposal.js';
 import { CheckpointAttestation } from '../p2p/checkpoint_attestation.js';
 import { CheckpointProposal } from '../p2p/checkpoint_proposal.js';
 import { ConsensusPayload } from '../p2p/consensus_payload.js';
-import { SignatureDomainSeparator, getHashedSignaturePayloadEthSignedMessage } from '../p2p/signature_utils.js';
+import { type CoordinationSignatureContext, getHashedSignaturePayloadTypedData } from '../p2p/signature_utils.js';
 import { ChonkProof } from '../proofs/chonk_proof.js';
 import { ProvingRequestType } from '../proofs/proving_request_type.js';
 import { CheckpointHeader } from '../rollup/checkpoint_header.js';
@@ -72,6 +74,7 @@ import { NestedProcessReturnValues, PublicSimulationOutput } from '../tx/public_
 import { TxSimulationResult } from '../tx/simulated_tx.js';
 import { TxEffect } from '../tx/tx_effect.js';
 import { TxHash } from '../tx/tx_hash.js';
+import { DEV_VERSION } from '../update-checker/dev_version.js';
 import {
   makeAvmCircuitInputs,
   makeAztecAddress,
@@ -86,6 +89,15 @@ import {
   makePublicDataWrite,
 } from './factories.js';
 
+export const TEST_COORDINATION_SIGNATURE_CONTEXT: CoordinationSignatureContext = {
+  chainId: 31337,
+  rollupAddress: EthAddress.fromNumber(1),
+};
+
+function signTypedData(signer: Secp256k1Signer, typedData: TypedDataDefinition): Signature {
+  return signer.sign(Buffer32.fromString(hashTypedData(typedData)));
+}
+
 export const randomTxHash = (): TxHash => TxHash.random();
 
 export const mockTx = async (
@@ -479,6 +491,7 @@ export async function mockCheckpointAndMessages(
 
 export const randomContractArtifact = (): ContractArtifact => ({
   name: randomBytes(4).toString('hex'),
+  aztecVersion: DEV_VERSION,
   functions: [],
   nonDispatchPublicFunctions: [],
   outputs: {
@@ -519,6 +532,7 @@ export interface MakeConsensusPayloadOptions {
   txHashes?: TxHash[];
   txs?: Tx[];
   feeAssetPriceModifier?: bigint;
+  signatureContext?: CoordinationSignatureContext;
 }
 
 export interface MakeBlockProposalOptions {
@@ -529,6 +543,7 @@ export interface MakeBlockProposalOptions {
   archiveRoot?: Fr;
   txHashes?: TxHash[];
   txs?: Tx[];
+  signatureContext?: CoordinationSignatureContext;
 }
 
 export interface MakeCheckpointProposalOptions {
@@ -536,6 +551,7 @@ export interface MakeCheckpointProposalOptions {
   checkpointHeader?: CheckpointHeader;
   archiveRoot?: Fr;
   feeAssetPriceModifier?: bigint;
+  signatureContext?: CoordinationSignatureContext;
   /** Options for the lastBlock - if undefined, no lastBlock is included */
   lastBlock?: {
     blockHeader?: BlockHeader;
@@ -546,10 +562,7 @@ export interface MakeCheckpointProposalOptions {
 }
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-const makeAndSignConsensusPayload = (
-  domainSeparator: SignatureDomainSeparator,
-  options?: MakeConsensusPayloadOptions,
-) => {
+const makeAndSignConsensusPayload = (options?: MakeConsensusPayloadOptions) => {
   const header = options?.header ?? makeCheckpointHeader(1);
   const { signer = Secp256k1Signer.random(), archive = Fr.random(), feeAssetPriceModifier = 0n } = options ?? {};
 
@@ -557,9 +570,10 @@ const makeAndSignConsensusPayload = (
     header,
     archive,
     feeAssetPriceModifier,
+    signatureContext: TEST_COORDINATION_SIGNATURE_CONTEXT,
   });
 
-  const hash = getHashedSignaturePayloadEthSignedMessage(payload, domainSeparator);
+  const hash = getHashedSignaturePayloadTypedData(payload);
   const signature = signer.sign(hash);
 
   return { blockNumber: header.slotNumber, payload, signature };
@@ -569,10 +583,7 @@ export const makeAndSignCommitteeAttestationsAndSigners = (
   attestationsAndSigners: CommitteeAttestationsAndSigners,
   signer: Secp256k1Signer = Secp256k1Signer.random(),
 ) => {
-  const hash = getHashedSignaturePayloadEthSignedMessage(
-    attestationsAndSigners,
-    SignatureDomainSeparator.attestationsAndSigners,
-  );
+  const hash = getHashedSignaturePayloadTypedData(attestationsAndSigners);
   return signer.sign(hash);
 };
 
@@ -584,6 +595,7 @@ export const makeBlockProposal = (options?: MakeBlockProposalOptions): Promise<B
   const txHashes = options?.txHashes ?? [0, 1, 2, 3, 4, 5].map(() => TxHash.random());
   const txs = options?.txs;
   const signer = options?.signer ?? Secp256k1Signer.random();
+  const signatureContext = options?.signatureContext ?? TEST_COORDINATION_SIGNATURE_CONTEXT;
 
   return BlockProposal.createProposalFromSigner(
     blockHeader,
@@ -593,7 +605,9 @@ export const makeBlockProposal = (options?: MakeBlockProposalOptions): Promise<B
     archiveRoot,
     txHashes,
     txs,
-    (_payload, _context) => Promise.resolve(signer.signMessage(_payload)),
+    signatureContext,
+    (typedData, _context) => Promise.resolve(signTypedData(signer, typedData)),
+    (typedData, _context) => Promise.resolve(signTypedData(signer, typedData)),
   );
 };
 
@@ -602,6 +616,7 @@ export const makeCheckpointProposal = async (options?: MakeCheckpointProposalOpt
   const archiveRoot = options?.archiveRoot ?? Fr.random();
   const feeAssetPriceModifier = options?.feeAssetPriceModifier ?? 0n;
   const signer = options?.signer ?? Secp256k1Signer.random();
+  const signatureContext = options?.signatureContext ?? TEST_COORDINATION_SIGNATURE_CONTEXT;
 
   // Build a signed block proposal if lastBlock options are provided
   const lastBlockProposal = options?.lastBlock
@@ -613,6 +628,7 @@ export const makeCheckpointProposal = async (options?: MakeCheckpointProposalOpt
         txHashes: options.lastBlock.txHashes,
         txs: options.lastBlock.txs,
         signer,
+        signatureContext,
       })
     : undefined;
 
@@ -622,7 +638,8 @@ export const makeCheckpointProposal = async (options?: MakeCheckpointProposalOpt
     CheckpointNumber(1),
     feeAssetPriceModifier,
     lastBlockProposal,
-    payload => Promise.resolve(signer.signMessage(payload)),
+    signatureContext,
+    typedData => Promise.resolve(signTypedData(signer, typedData)),
   );
 };
 
@@ -636,6 +653,7 @@ export type MakeCheckpointAttestationOptions = {
   attesterSigner?: Secp256k1Signer;
   proposerSigner?: Secp256k1Signer;
   signer?: Secp256k1Signer;
+  signatureContext?: CoordinationSignatureContext;
 };
 
 /**
@@ -645,26 +663,27 @@ export const makeCheckpointAttestation = (options: MakeCheckpointAttestationOpti
   const header = options.header ?? makeCheckpointHeader(1);
   const archive = options.archive ?? Fr.random();
   const feeAssetPriceModifier = options.feeAssetPriceModifier ?? 0n;
+  const signatureContext = options.signatureContext ?? TEST_COORDINATION_SIGNATURE_CONTEXT;
   const { signer, attesterSigner = signer, proposerSigner = signer } = options;
 
-  const payload = new ConsensusPayload(header, archive, feeAssetPriceModifier);
+  const payload = new ConsensusPayload(header, archive, feeAssetPriceModifier, signatureContext);
 
   // Sign as attester
-  const attestationHash = getHashedSignaturePayloadEthSignedMessage(
-    payload,
-    SignatureDomainSeparator.checkpointAttestation,
-  );
+  const attestationHash = getHashedSignaturePayloadTypedData(payload);
   const attestationSigner = attesterSigner ?? Secp256k1Signer.random();
   const attestationSignature = attestationSigner.sign(attestationHash);
 
   // Sign as proposer - use CheckpointProposal's payload format (serializeToBuffer)
   // This is different from ConsensusPayload's format (ABI encoding)
   const proposalSignerToUse = proposerSigner ?? Secp256k1Signer.random();
-  const tempProposal = new CheckpointProposal(header, archive, feeAssetPriceModifier, Signature.empty());
-  const proposalHash = getHashedSignaturePayloadEthSignedMessage(
-    tempProposal,
-    SignatureDomainSeparator.checkpointProposal,
+  const tempProposal = new CheckpointProposal(
+    header,
+    archive,
+    feeAssetPriceModifier,
+    Signature.empty(),
+    signatureContext,
   );
+  const proposalHash = getHashedSignaturePayloadTypedData(tempProposal);
   const proposerSignature = proposalSignerToUse.sign(proposalHash);
 
   return new CheckpointAttestation(payload, attestationSignature, proposerSignature);
@@ -677,13 +696,15 @@ export const makeCheckpointAttestationFromProposal = (
   proposal: CheckpointProposal,
   attesterSigner?: Secp256k1Signer,
 ): CheckpointAttestation => {
-  const payload = new ConsensusPayload(proposal.checkpointHeader, proposal.archive, proposal.feeAssetPriceModifier);
+  const payload = new ConsensusPayload(
+    proposal.checkpointHeader,
+    proposal.archive,
+    proposal.feeAssetPriceModifier,
+    proposal.signatureContext,
+  );
 
   // Sign as attester
-  const attestationHash = getHashedSignaturePayloadEthSignedMessage(
-    payload,
-    SignatureDomainSeparator.checkpointAttestation,
-  );
+  const attestationHash = getHashedSignaturePayloadTypedData(payload);
   const attestationSigner = attesterSigner ?? Secp256k1Signer.random();
   const attestationSignature = attestationSigner.sign(attestationHash);
 
@@ -726,32 +747,3 @@ export const makeCheckpointAttestationFromBlock = (
 
   return makeCheckpointAttestation({ header, archive, attesterSigner, proposerSigner });
 };
-
-export async function randomPublishedL2Block(
-  l2BlockNumber: number,
-  opts: { signers?: Secp256k1Signer[] } = {},
-): Promise<CheckpointedL2Block> {
-  const block = await L2Block.random(BlockNumber(l2BlockNumber));
-  const l1 = L1PublishedData.fromFields({
-    blockNumber: BigInt(block.number),
-    timestamp: block.header.globalVariables.timestamp,
-    blockHash: Buffer32.random().toString(),
-  });
-
-  const signers = opts.signers ?? times(3, () => Secp256k1Signer.random());
-  const checkpoint = await Checkpoint.random(CheckpointNumber.fromBlockNumber(BlockNumber(l2BlockNumber)), {
-    numBlocks: 0,
-  });
-  checkpoint.blocks = [block];
-  const atts = signers.map(signer =>
-    makeCheckpointAttestation({
-      signer,
-      archive: block.archive.root,
-      header: checkpoint.header,
-    }),
-  );
-  const attestations = atts.map(
-    (attestation, i) => new CommitteeAttestation(signers[i].address, attestation.signature),
-  );
-  return new CheckpointedL2Block(CheckpointNumber.fromBlockNumber(BlockNumber(l2BlockNumber)), block, l1, attestations);
-}
diff --git a/yarn-project/stdlib/src/timetable/index.test.ts b/yarn-project/stdlib/src/timetable/index.test.ts
index a3e08687e9af..f0a2ede5d718 100644
--- a/yarn-project/stdlib/src/timetable/index.test.ts
+++ b/yarn-project/stdlib/src/timetable/index.test.ts
@@ -30,9 +30,11 @@ describe('timetable validation', () => {
   });
 
   it('accepts a pipelined multi-block config that fits exactly one block', () => {
+    // timeReservedAtEnd = assemble(1) + 2*p2p(2) + blockDuration(4) = 9
+    // slotDuration(15) - init(1) - reserved(9) = 5 ≥ blockDuration(4)
     const timing = createPipelinedCheckpointTimingModel({
-      aztecSlotDuration: 12,
-      blockDuration: 8,
+      aztecSlotDuration: 15,
+      blockDuration: 4,
       checkpointInitializationTime: 1,
       checkpointAssembleTime: 1,
       p2pPropagationTime: 2,
@@ -43,10 +45,12 @@ describe('timetable validation', () => {
   });
 
   it('rejects a pipelined multi-block config that cannot fit one block', () => {
+    // timeReservedAtEnd = assemble(1) + 2*p2p(2) + blockDuration(4) = 9
+    // slotDuration(13) - init(1) - reserved(9) = 3 < blockDuration(4) → reject
     expect(() =>
       createPipelinedCheckpointTimingModel({
-        aztecSlotDuration: 11,
-        blockDuration: 8,
+        aztecSlotDuration: 13,
+        blockDuration: 4,
         checkpointInitializationTime: 1,
         checkpointAssembleTime: 1,
         p2pPropagationTime: 2,
@@ -55,6 +59,30 @@ describe('timetable validation', () => {
     ).toThrow(/less than one blockDuration/i);
   });
 
+  it('computes pipelined timing for the default 72s/6s config', () => {
+    const timing = createPipelinedCheckpointTimingModel({
+      aztecSlotDuration: 72,
+      blockDuration: 6,
+      checkpointInitializationTime: 1,
+      checkpointAssembleTime: 1,
+      p2pPropagationTime: 2,
+      l1PublishingTime: 12,
+    });
+
+    // timeReservedAtEnd = 1 + 2*2 + 6 = 11s
+    expect(timing.timeReservedAtEnd).toBe(11);
+    // available = 72 - 1 - 11 = 60s → floor(60/6) = 10 blocks
+    expect(timing.calculateMaxBlocksPerSlot()).toBe(10);
+    // Grace period is zero under early pipelining
+    expect(timing.pipeliningAttestationGracePeriod).toBe(0);
+    // Proposals no longer spill into the target slot
+    expect(timing.proposalWindowIntoTargetSlot).toBe(0);
+    // Attestation straggler grace is bounded by round-trip p2p
+    expect(timing.attestationWindowIntoTargetSlot).toBe(4);
+    // Assembly deadline sits at slot boundary
+    expect(timing.checkpointAssemblyDeadline).toBe(72);
+  });
+
   it('allows single-block mode without blockDuration', () => {
     const timing = createCheckpointTimingModel({
       aztecSlotDuration: 10,
diff --git a/yarn-project/stdlib/src/timetable/index.ts b/yarn-project/stdlib/src/timetable/index.ts
index c94dcbbecb3f..d60db923fb4f 100644
--- a/yarn-project/stdlib/src/timetable/index.ts
+++ b/yarn-project/stdlib/src/timetable/index.ts
@@ -162,23 +162,39 @@ class StandardCheckpointTimingModel extends BaseCheckpointTiming {
 /**
  * Checkpoint timing model for proposer pipelining.
  *
- * In this mode, the build work still starts in the current slot, but checkpoint
- * assembly and attestation collection can extend into the target slot. The extra
- * target-slot window getters are intended for consumers such as P2P validators
- * that need to validate pipelined messages against wallclock time.
+ * In this mode, the build work starts at the wall-clock slot boundary and the
+ * checkpoint proposal is broadcast early enough that attestations complete by
+ * the end of the build slot. L1 submission can then be sent at the boundary of
+ * the target slot. The extra target-slot window getters are intended for
+ * consumers such as P2P validators that need to validate pipelined messages
+ * against wallclock time.
  */
 class PipelinedCheckpointTimingModel extends BaseCheckpointTiming implements PipelinedCheckpointTiming {
   public get proposalWindowIntoTargetSlot(): number {
-    // Allow the p2p propagation time to receive a checkpoint proposal from leader
-    return this.p2pPropagationTime;
+    // Proposals no longer spill into the target slot: they are broadcast early
+    // enough in the build slot that attestations complete before the boundary.
+    // Any residual tolerance into the target slot is covered by clock disparity.
+    return 0;
   }
 
   public get attestationWindowIntoTargetSlot(): number {
-    return this.aztecSlotDuration - this.l1PublishingTime;
+    // Straggler grace: attestations aim to complete by build-slot end. Allow a
+    // small window into the target slot for late arrivals (round-trip p2p).
+    return 2 * this.p2pPropagationTime;
+  }
+
+  public override get pipeliningAttestationGracePeriod(): number {
+    // Under the early-pipelining regime attestations complete inside the build
+    // slot itself, so there is no extra grace into the target slot.
+    return 0;
   }
 
   public get timeReservedAtEnd(): number {
-    return this.checkpointAssembleTime + this.p2pPropagationTime;
+    // Reserve enough time at the end of the build slot for:
+    // - assembling and broadcasting the checkpoint proposal
+    // - round-trip p2p propagation (proposal out, attestations back)
+    // - validators re-executing the last block
+    return this.checkpointAssembleTime + 2 * this.p2pPropagationTime + (this.blockDuration ?? 0);
   }
 
   public get minimumBuildSlotWork(): number {
@@ -186,9 +202,8 @@ class PipelinedCheckpointTimingModel extends BaseCheckpointTiming implements Pip
   }
 
   public get checkpointAssemblyDeadline(): number {
-    // Allow enough time to
-    // - build all blocks
-    // - receive attestations
+    // Allow enough time to build all blocks and receive attestations. With
+    // `pipeliningAttestationGracePeriod = 0` this equals `aztecSlotDuration`.
     return this.aztecSlotDuration + this.pipeliningAttestationGracePeriod;
   }
 
diff --git a/yarn-project/stdlib/src/tx/profiling.ts b/yarn-project/stdlib/src/tx/profiling.ts
index d5dabb600de6..f341f5af3e2e 100644
--- a/yarn-project/stdlib/src/tx/profiling.ts
+++ b/yarn-project/stdlib/src/tx/profiling.ts
@@ -133,12 +133,12 @@ export class TxProfileResult {
       ],
       {
         nodeRPCCalls: {
-          perMethod: { getBlockHeader: { times: [1] } },
+          perMethod: { getBlock: { times: [1] } },
           roundTrips: {
             roundTrips: 1,
             totalBlockingTime: 1,
             roundTripDurations: [1],
-            roundTripMethods: [['getBlockHeader']],
+            roundTripMethods: [['getBlock']],
           },
         },
         timings: {
@@ -184,12 +184,12 @@ export class UtilityExecutionResult {
   static random(): UtilityExecutionResult {
     return new UtilityExecutionResult([Fr.random()], [], 0n, {
       nodeRPCCalls: {
-        perMethod: { getBlockHeader: { times: [1] } },
+        perMethod: { getBlock: { times: [1] } },
         roundTrips: {
           roundTrips: 1,
           totalBlockingTime: 1,
           roundTripDurations: [1],
-          roundTripMethods: [['getBlockHeader']],
+          roundTripMethods: [['getBlock']],
         },
       },
       timings: {
diff --git a/yarn-project/stdlib/src/tx/simulated_tx.ts b/yarn-project/stdlib/src/tx/simulated_tx.ts
index dba45697c964..0ffd03c5674a 100644
--- a/yarn-project/stdlib/src/tx/simulated_tx.ts
+++ b/yarn-project/stdlib/src/tx/simulated_tx.ts
@@ -3,13 +3,13 @@ import type { FieldsOf } from '@aztec/foundation/types';
 
 import { z } from 'zod';
 
-import { type ContractArtifact, ContractArtifactSchema } from '../abi/abi.js';
 import {
   type ContractInstanceWithAddress,
   ContractInstanceWithAddressSchema,
 } from '../contract/interfaces/contract_instance.js';
 import { Gas } from '../gas/gas.js';
 import type { GasUsed } from '../gas/gas_used.js';
+import { type PublicStorageOverride, PublicStorageOverrideSchema } from '../interfaces/public_storage_override.js';
 import { PrivateKernelTailCircuitPublicInputs } from '../kernel/private_kernel_tail_circuit_public_inputs.js';
 import { ChonkProof } from '../proofs/chonk_proof.js';
 import type { OffchainEffect } from './offchain_effect.js';
@@ -24,39 +24,36 @@ import { NestedProcessReturnValues, PublicSimulationOutput } from './public_simu
 import { Tx } from './tx.js';
 
 /*
- * If passed during the execution of a user circuit, the contract function simulator will replace the instance and class
- * of the contract with the one provided in the overrides for that address. An example use case
- * would be overriding your own account contract so that valid signatures don't have to be provided while simulating.
+ * If passed during the execution of a user circuit, the contract function simulator will replace
+ * the contract instance at that address with the one provided. An example use case would be
+ * overriding your own account contract so that valid signatures don't have to be provided while
+ * simulating. The override's `currentContractClassId` resolves through PXE's locally registered
+ * classes, so pre-register the target artifact via `pxe.registerContractClass(...)`.
  */
-export type ContractOverrides = Record<
-  string /* AztecAddress as string */,
-  { instance: ContractInstanceWithAddress; artifact: ContractArtifact }
->;
+export type ContractOverrides = Record<string /* AztecAddress as string */, { instance: ContractInstanceWithAddress }>;
 
 /*
- * Optional values that can be overridden during simulation. In order to simulate a transaction with these
- * set, it *must* be run without the kernel circuits, or validations will fail
+ * Optional values that can be overridden during simulation. `publicStorage` writes to the public-data
+ * tree fork. `contracts` overrides contract instances in the contract DB.
+ * In order to simulate a transaction with these set, it *must* be run without the kernel circuits,
+ * or validations will fail.
  */
 export class SimulationOverrides {
+  public publicStorage?: PublicStorageOverride[];
   public contracts?: ContractOverrides;
 
-  constructor(contracts: ContractOverrides = {}) {
-    this.contracts = Object.keys(contracts).length > 0 ? contracts : undefined;
+  constructor(args: { publicStorage?: PublicStorageOverride[]; contracts?: ContractOverrides } = {}) {
+    this.publicStorage = args.publicStorage?.length ? args.publicStorage : undefined;
+    this.contracts = args.contracts && Object.keys(args.contracts).length > 0 ? args.contracts : undefined;
   }
 
   static get schema() {
     return z
       .object({
-        contracts: optional(
-          z.record(
-            z.string(),
-            z.object({ instance: ContractInstanceWithAddressSchema, artifact: ContractArtifactSchema }),
-          ),
-        ),
+        publicStorage: optional(z.array(PublicStorageOverrideSchema)),
+        contracts: optional(z.record(z.string(), z.object({ instance: ContractInstanceWithAddressSchema }))),
       })
-      .transform(({ contracts }) => {
-        return new SimulationOverrides(contracts);
-      });
+      .transform(args => new SimulationOverrides(args));
   }
 }
 
diff --git a/yarn-project/stdlib/src/update-checker/dev_version.ts b/yarn-project/stdlib/src/update-checker/dev_version.ts
new file mode 100644
index 000000000000..56a316d55765
--- /dev/null
+++ b/yarn-project/stdlib/src/update-checker/dev_version.ts
@@ -0,0 +1,2 @@
+/** Placeholder version returned when running from a local monorepo checkout rather than an npm-installed package. */
+export const DEV_VERSION = 'dev';
diff --git a/yarn-project/stdlib/src/update-checker/index.ts b/yarn-project/stdlib/src/update-checker/index.ts
index 65d4570f3d1a..1121a0a1e4bc 100644
--- a/yarn-project/stdlib/src/update-checker/index.ts
+++ b/yarn-project/stdlib/src/update-checker/index.ts
@@ -1,2 +1,3 @@
+export * from './dev_version.js';
 export * from './package_version.js';
 export * from './version_checker.js';
diff --git a/yarn-project/stdlib/src/update-checker/package_version.ts b/yarn-project/stdlib/src/update-checker/package_version.ts
index 30a3b1d816f4..beda8da922c9 100644
--- a/yarn-project/stdlib/src/update-checker/package_version.ts
+++ b/yarn-project/stdlib/src/update-checker/package_version.ts
@@ -3,28 +3,15 @@ import { fileURLToPath } from '@aztec/foundation/url';
 import { readFileSync } from 'fs';
 import { dirname, resolve } from 'path';
 
-/** Returns the package version from the release-please manifest or the package.json, or undefined if not found. */
-export function getPackageVersion(): string | undefined {
-  const dir = dirname(fileURLToPath(import.meta.url));
-
-  // Try the release-please manifest first (works in dev/repo checkout).
-  try {
-    const releasePleaseManifestPath = resolve(dir, '../../../../.release-please-manifest.json');
-    return JSON.parse(readFileSync(releasePleaseManifestPath).toString())['.'];
-  } catch {
-    // Not in a repo checkout, fall through.
-  }
+import { DEV_VERSION } from './dev_version.js';
 
-  // Fall back to the stdlib package.json version (works in npm-installed packages).
-  try {
-    const packageJsonPath = resolve(dir, '../../package.json');
-    const version = JSON.parse(readFileSync(packageJsonPath).toString()).version;
-    if (version && version !== '0.1.0') {
-      return version;
-    }
-  } catch {
-    // No package.json found either.
-  }
-
-  return undefined;
+/**
+ * Returns the package version from the stdlib `package.json`, or `DEV_VERSION` when the version is the `0.1.0`
+ * placeholder (which indicates a local monorepo checkout rather than an npm-installed package).
+ */
+export function getPackageVersion(): string {
+  const dir = dirname(fileURLToPath(import.meta.url));
+  const packageJsonPath = resolve(dir, '../../package.json');
+  const version = JSON.parse(readFileSync(packageJsonPath).toString()).version;
+  return version === '0.1.0' ? DEV_VERSION : version;
 }
diff --git a/yarn-project/stdlib/src/world-state/genesis_data.ts b/yarn-project/stdlib/src/world-state/genesis_data.ts
index 83042b957786..2efc5c900296 100644
--- a/yarn-project/stdlib/src/world-state/genesis_data.ts
+++ b/yarn-project/stdlib/src/world-state/genesis_data.ts
@@ -13,3 +13,15 @@ export const EMPTY_GENESIS_DATA: GenesisData = {
   prefilledPublicData: [],
   genesisTimestamp: 0n,
 };
+
+/** Returns if an object looks like genesis data */
+export function isGenesisData(obj: any): obj is GenesisData {
+  return (
+    obj &&
+    typeof obj === 'object' &&
+    'prefilledPublicData' in obj &&
+    Array.isArray(obj.prefilledPublicData) &&
+    'genesisTimestamp' in obj &&
+    typeof obj.genesisTimestamp === 'bigint'
+  );
+}
diff --git a/yarn-project/telemetry-client/src/config.ts b/yarn-project/telemetry-client/src/config.ts
index 7d2c2a42e9b6..4e705c7a6fcf 100644
--- a/yarn-project/telemetry-client/src/config.ts
+++ b/yarn-project/telemetry-client/src/config.ts
@@ -1,4 +1,9 @@
-import { type ConfigMappingsType, booleanConfigHelper, getConfigFromMappings } from '@aztec/foundation/config';
+import {
+  type ConfigMappingsType,
+  booleanConfigHelper,
+  getConfigFromMappings,
+  numberConfigHelper,
+} from '@aztec/foundation/config';
 
 export interface TelemetryClientConfig {
   metricsCollectorUrl?: URL;
@@ -33,14 +38,12 @@ export const telemetryClientConfigMappings: ConfigMappingsType<TelemetryClientCo
   otelCollectIntervalMs: {
     env: 'OTEL_COLLECT_INTERVAL_MS',
     description: 'The interval at which to collect metrics',
-    defaultValue: 60000, // Default extracted from otel client
-    parseEnv: (val: string) => parseInt(val),
+    ...numberConfigHelper(60000),
   },
   otelExportTimeoutMs: {
     env: 'OTEL_EXPORT_TIMEOUT_MS',
     description: 'The timeout for exporting metrics',
-    defaultValue: 30000, // Default extracted from otel client
-    parseEnv: (val: string) => parseInt(val),
+    ...numberConfigHelper(30000),
   },
   otelExcludeMetrics: {
     env: 'OTEL_EXCLUDE_METRICS',
diff --git a/yarn-project/telemetry-client/src/metrics.ts b/yarn-project/telemetry-client/src/metrics.ts
index 563aa9455216..53feee910d90 100644
--- a/yarn-project/telemetry-client/src/metrics.ts
+++ b/yarn-project/telemetry-client/src/metrics.ts
@@ -400,6 +400,12 @@ export const SEQUENCER_STATE_TRANSITION_BUFFER_DURATION: MetricDefinition = {
   unit: 'ms',
   valueType: ValueType.INT,
 };
+export const SEQUENCER_STATE_DURATION: MetricDefinition = {
+  name: 'aztec.sequencer.state_duration',
+  description: 'Wall-clock time spent in each sequencer state, labelled by the state being left',
+  unit: 'ms',
+  valueType: ValueType.INT,
+};
 export const SEQUENCER_BLOCK_BUILD_DURATION: MetricDefinition = {
   name: 'aztec.sequencer.block.build_duration',
   description: 'Duration to build a block',
diff --git a/yarn-project/telemetry-client/src/wrappers/l2_block_stream.ts b/yarn-project/telemetry-client/src/wrappers/l2_block_stream.ts
index 665b8f83329b..90b58b6a5a62 100644
--- a/yarn-project/telemetry-client/src/wrappers/l2_block_stream.ts
+++ b/yarn-project/telemetry-client/src/wrappers/l2_block_stream.ts
@@ -11,10 +11,7 @@ import { type Traceable, type Tracer, trackSpan } from '@aztec/telemetry-client'
 /** Extends an L2BlockStream with a tracer to create a new trace per iteration. */
 export class TraceableL2BlockStream extends L2BlockStream implements Traceable {
   constructor(
-    l2BlockSource: Pick<
-      L2BlockSource,
-      'getBlocks' | 'getBlockHeader' | 'getL2Tips' | 'getCheckpoints' | 'getCheckpointedBlocks'
-    >,
+    l2BlockSource: Pick<L2BlockSource, 'getBlocks' | 'getBlockData' | 'getL2Tips' | 'getCheckpoints'>,
     localData: L2BlockStreamLocalDataProvider,
     handler: L2BlockStreamEventHandler,
     public readonly tracer: Tracer,
diff --git a/yarn-project/txe/src/oracle/interfaces.ts b/yarn-project/txe/src/oracle/interfaces.ts
index d77d3e25cc40..773e69d5a9df 100644
--- a/yarn-project/txe/src/oracle/interfaces.ts
+++ b/yarn-project/txe/src/oracle/interfaces.ts
@@ -6,6 +6,7 @@ import { BlockNumber } from '@aztec/foundation/branded-types';
 import type { Fr } from '@aztec/foundation/curves/bn254';
 import type { EventSelector, FunctionSelector } from '@aztec/stdlib/abi';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { PrivateLog } from '@aztec/stdlib/logs';
 import type { UInt64 } from '@aztec/stdlib/types';
 
 // These interfaces complement the ones defined in PXE, and combined with those contain the full list of oracles used by
@@ -58,15 +59,17 @@ export interface ITxeExecutionOracle {
     txHash: TxHash;
     noteHashes: Fr[];
     nullifiers: Fr[];
+    privateLogs: PrivateLog[];
   }>;
   getPrivateEvents(selector: EventSelector, contractAddress: AztecAddress, scope: AztecAddress): Promise<Fr[][]>;
   privateCallNewFlow(
-    from: AztecAddress,
+    from: AztecAddress | undefined,
     targetContractAddress: AztecAddress,
     functionSelector: FunctionSelector,
     args: Fr[],
     argsHash: Fr,
     isStaticCall: boolean,
+    additionalScopes: AztecAddress[],
     jobId: string,
   ): Promise<{ returnValues: Fr[]; offchainEffects: Fr[][] }>;
   executeUtilityFunction(
@@ -76,7 +79,7 @@ export interface ITxeExecutionOracle {
     jobId: string,
   ): Promise<Fr[]>;
   publicCallNewFlow(
-    from: AztecAddress,
+    from: AztecAddress | undefined,
     targetContractAddress: AztecAddress,
     calldata: Fr[],
     isStaticCall: boolean,
diff --git a/yarn-project/txe/src/oracle/txe_oracle_top_level_context.ts b/yarn-project/txe/src/oracle/txe_oracle_top_level_context.ts
index 92193552a97c..ff53702ddd8b 100644
--- a/yarn-project/txe/src/oracle/txe_oracle_top_level_context.ts
+++ b/yarn-project/txe/src/oracle/txe_oracle_top_level_context.ts
@@ -175,7 +175,7 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
 
   async getLastTxEffects() {
     const latestBlockNumber = await this.stateMachine.archiver.getBlockNumber();
-    const block = await this.stateMachine.archiver.getBlock(latestBlockNumber);
+    const block = await this.stateMachine.archiver.getBlock({ number: latestBlockNumber });
 
     if (block!.body.txEffects.length != 1) {
       // Note that calls like env.mine() will result in blocks with no transactions, hitting this
@@ -184,7 +184,12 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
 
     const txEffects = block!.body.txEffects[0];
 
-    return { txHash: txEffects.txHash, noteHashes: txEffects.noteHashes, nullifiers: txEffects.nullifiers };
+    return {
+      txHash: txEffects.txHash,
+      noteHashes: txEffects.noteHashes,
+      nullifiers: txEffects.nullifiers,
+      privateLogs: txEffects.privateLogs,
+    };
   }
 
   async syncContractNonOracleMethod(contractAddress: AztecAddress, scope: AztecAddress, jobId: string) {
@@ -313,12 +318,13 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
   }
 
   async privateCallNewFlow(
-    from: AztecAddress,
+    from: AztecAddress | undefined,
     targetContractAddress: AztecAddress = AztecAddress.zero(),
     functionSelector: FunctionSelector = FunctionSelector.empty(),
     args: Fr[],
     argsHash: Fr = Fr.zero(),
     isStaticCall: boolean = false,
+    additionalScopes: AztecAddress[] = [],
     jobId: string,
   ) {
     this.logger.verbose(
@@ -333,9 +339,7 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
       throw new Error(message);
     }
 
-    // When `from` is the zero address (e.g. when deploying a new account contract), we return an
-    // empty scope list which acts as deny-all: no notes are visible and no keys are accessible.
-    const effectiveScopes = from.isZero() ? [] : [from];
+    const scopes = from === undefined ? additionalScopes : [from, ...additionalScopes];
 
     // Sync notes before executing private function to discover notes from previous transactions
     const utilityExecutor = async (call: FunctionCall, execScopes: AztecAddress[]) => {
@@ -349,12 +353,13 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
       utilityExecutor,
       blockHeader,
       jobId,
-      effectiveScopes,
+      scopes,
     );
 
     const blockNumber = await this.getNextBlockNumber();
 
-    const callContext = new CallContext(from, targetContractAddress, functionSelector, isStaticCall);
+    const msgSender = from ?? AztecAddress.NULL_MSG_SENDER;
+    const callContext = new CallContext(msgSender, targetContractAddress, functionSelector, isStaticCall);
 
     const gasLimits = new Gas(MAX_PROCESSABLE_DA_GAS_PER_CHECKPOINT, MAX_PROCESSABLE_L2_GAS);
     const teardownGasLimits = new Gas(FALLBACK_TEARDOWN_DA_GAS_LIMIT, FALLBACK_TEARDOWN_L2_GAS_LIMIT);
@@ -392,13 +397,13 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
       senderTaggingStore: this.senderTaggingStore,
       recipientTaggingStore: this.recipientTaggingStore,
       senderAddressBookStore: this.senderAddressBookStore,
-      capsuleService: new CapsuleService(this.capsuleStore, effectiveScopes),
+      capsuleService: new CapsuleService(this.capsuleStore, scopes),
       privateEventStore: this.privateEventStore,
       contractSyncService: this.stateMachine.contractSyncService,
       jobId,
       totalPublicCalldataCount: 0,
       sideEffectCounter: minRevertibleSideEffectCounter,
-      scopes: effectiveScopes,
+      scopes,
       // In TXE, the typical transaction entrypoint is skipped, so we need to simulate the actions that such a
       // contract would perform, including setting senderForTags.
       senderForTags: from,
@@ -548,7 +553,7 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
   }
 
   async publicCallNewFlow(
-    from: AztecAddress,
+    from: AztecAddress | undefined,
     targetContractAddress: AztecAddress,
     calldata: Fr[],
     isStaticCall: boolean,
@@ -616,7 +621,7 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
     // may require producing reverts.
     const revertibleAccumulatedData = PrivateToPublicAccumulatedData.empty();
     revertibleAccumulatedData.publicCallRequests[0] = new PublicCallRequest(
-      from,
+      from ?? AztecAddress.NULL_MSG_SENDER,
       targetContractAddress,
       isStaticCall,
       calldataHash,
@@ -753,6 +758,7 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
 
     try {
       const anchorBlockHeader = await this.stateMachine.anchorBlockStore.getBlockHeader();
+      const simulator = new WASMSimulator();
       const oracle = new UtilityExecutionOracle({
         contractAddress: call.to,
         authWitnesses: [],
@@ -772,8 +778,9 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
         l2TipsStore: this.stateMachine.node,
         jobId,
         scopes,
+        simulator,
       });
-      const acirExecutionResult = await new WASMSimulator()
+      const acirExecutionResult = await simulator
         .executeUserCircuit(toACVMWitness(0, call.args), entryPointArtifact, new Oracle(oracle).toACIRCallback())
         .catch((err: Error) => {
           err.message = resolveAssertionMessageFromError(err, entryPointArtifact);
diff --git a/yarn-project/txe/src/rpc_translator.ts b/yarn-project/txe/src/rpc_translator.ts
index c53f93910885..b3ea3e915a7c 100644
--- a/yarn-project/txe/src/rpc_translator.ts
+++ b/yarn-project/txe/src/rpc_translator.ts
@@ -1,6 +1,12 @@
 import type { ContractInstanceWithAddress } from '@aztec/aztec.js/contracts';
 import { Fr, Point } from '@aztec/aztec.js/fields';
-import { MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, PRIVATE_LOG_CIPHERTEXT_LEN } from '@aztec/constants';
+import {
+  MAX_NOTE_HASHES_PER_TX,
+  MAX_NULLIFIERS_PER_TX,
+  MAX_PRIVATE_LOGS_PER_TX,
+  PRIVATE_LOG_CIPHERTEXT_LEN,
+  PRIVATE_LOG_SIZE_IN_FIELDS,
+} from '@aztec/constants';
 import { BlockNumber } from '@aztec/foundation/branded-types';
 import {
   type IMiscOracle,
@@ -289,12 +295,38 @@ export class RPCTranslator {
 
   // eslint-disable-next-line camelcase
   async aztec_txe_getLastTxEffects() {
-    const { txHash, noteHashes, nullifiers } = await this.handlerAsTxe().getLastTxEffects();
+    const { txHash, noteHashes, nullifiers, privateLogs } = await this.handlerAsTxe().getLastTxEffects();
+
+    if (privateLogs.length > MAX_PRIVATE_LOGS_PER_TX) {
+      throw new Error(`${privateLogs.length} private logs exceed max ${MAX_PRIVATE_LOGS_PER_TX}`);
+    }
+
+    // Same workaround as `aztec_txe_getPrivateEvents`: Noir cannot yet return nested structs with arrays, so we return
+    // a flat multidimensional array plus per-log lengths and the total count, and reassemble into a
+    // `BoundedVec<BoundedVec<T>>` on the Noir side. Each log contributes only its emitted fields. The rest
+    // is zero-padded to `PRIVATE_LOG_SIZE_IN_FIELDS`.
+    const emittedLogs = privateLogs.map(log => log.getEmittedFields());
+
+    const rawLogStorage = emittedLogs
+      .map(fields => fields.concat(Array(PRIVATE_LOG_SIZE_IN_FIELDS - fields.length).fill(new Fr(0))))
+      .concat(
+        Array(MAX_PRIVATE_LOGS_PER_TX - emittedLogs.length).fill(Array(PRIVATE_LOG_SIZE_IN_FIELDS).fill(new Fr(0))),
+      )
+      .flat();
+
+    const logLengths = emittedLogs
+      .map(fields => new Fr(fields.length))
+      .concat(Array(MAX_PRIVATE_LOGS_PER_TX - emittedLogs.length).fill(new Fr(0)));
+
+    const logCount = new Fr(emittedLogs.length);
 
     return toForeignCallResult([
       toSingle(txHash.hash),
       ...arrayToBoundedVec(toArray(noteHashes), MAX_NOTE_HASHES_PER_TX),
       ...arrayToBoundedVec(toArray(nullifiers), MAX_NULLIFIERS_PER_TX),
+      toArray(rawLogStorage),
+      toArray(logLengths),
+      toSingle(logCount),
     ]);
   }
 
@@ -1312,19 +1344,22 @@ export class RPCTranslator {
 
   // eslint-disable-next-line camelcase
   async aztec_txe_privateCallNewFlow(
-    foreignFrom: ForeignCallSingle,
+    foreignFromIsSome: ForeignCallSingle,
+    foreignFromValue: ForeignCallSingle,
     foreignTargetContractAddress: ForeignCallSingle,
     foreignFunctionSelector: ForeignCallSingle,
     foreignArgs: ForeignCallArray,
     foreignArgsHash: ForeignCallSingle,
     foreignIsStaticCall: ForeignCallSingle,
+    foreignAdditionalScopes: ForeignCallArray,
   ) {
-    const from = addressFromSingle(foreignFrom);
+    const from = fromSingle(foreignFromIsSome).toBool() ? addressFromSingle(foreignFromValue) : undefined;
     const targetContractAddress = addressFromSingle(foreignTargetContractAddress);
     const functionSelector = FunctionSelector.fromField(fromSingle(foreignFunctionSelector));
     const args = fromArray(foreignArgs);
     const argsHash = fromSingle(foreignArgsHash);
     const isStaticCall = fromSingle(foreignIsStaticCall).toBool();
+    const additionalScopes = fromArray(foreignAdditionalScopes).map(field => AztecAddress.fromField(field));
 
     const returnValues = await this.stateHandler.withTopLevelCallTracking(async () => {
       const { returnValues, offchainEffects } = await this.handlerAsTxe().privateCallNewFlow(
@@ -1334,6 +1369,7 @@ export class RPCTranslator {
         args,
         argsHash,
         isStaticCall,
+        additionalScopes,
         this.stateHandler.getCurrentJob(),
       );
 
@@ -1390,12 +1426,13 @@ export class RPCTranslator {
 
   // eslint-disable-next-line camelcase
   async aztec_txe_publicCallNewFlow(
-    foreignFrom: ForeignCallSingle,
+    foreignFromIsSome: ForeignCallSingle,
+    foreignFromValue: ForeignCallSingle,
     foreignAddress: ForeignCallSingle,
     foreignCalldata: ForeignCallArray,
     foreignIsStaticCall: ForeignCallSingle,
   ) {
-    const from = addressFromSingle(foreignFrom);
+    const from = fromSingle(foreignFromIsSome).toBool() ? addressFromSingle(foreignFromValue) : undefined;
     const address = addressFromSingle(foreignAddress);
     const calldata = fromArray(foreignCalldata);
     const isStaticCall = fromSingle(foreignIsStaticCall).toBool();
diff --git a/yarn-project/txe/src/state_machine/archiver.ts b/yarn-project/txe/src/state_machine/archiver.ts
index 69564f57344c..ec153566daa1 100644
--- a/yarn-project/txe/src/state_machine/archiver.ts
+++ b/yarn-project/txe/src/state_machine/archiver.ts
@@ -1,12 +1,20 @@
-import { ArchiverDataSourceBase, ArchiverDataStoreUpdater, KVArchiverDataStore } from '@aztec/archiver';
+import { ArchiverDataSourceBase, ArchiverDataStoreUpdater, createArchiverDataStores } from '@aztec/archiver';
 import { GENESIS_ARCHIVE_ROOT } from '@aztec/constants';
 import { CheckpointNumber, type EpochNumber, type SlotNumber } from '@aztec/foundation/branded-types';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
-import type { CheckpointId, L2BlockId, L2TipId, L2Tips, ValidateCheckpointResult } from '@aztec/stdlib/block';
+import {
+  type CheckpointId,
+  GENESIS_BLOCK_HEADER_HASH,
+  type L2BlockId,
+  type L2TipId,
+  type L2Tips,
+  type ValidateCheckpointResult,
+} from '@aztec/stdlib/block';
 import type { PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
 import type { L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
+import { BlockHeader } from '@aztec/stdlib/tx';
 
 /**
  * TXE Archiver implementation.
@@ -14,11 +22,16 @@ import type { L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
  * without needing any of the extra overhead that the Archiver itself requires (i.e. an L1 client).
  */
 export class TXEArchiver extends ArchiverDataSourceBase {
-  private readonly updater = new ArchiverDataStoreUpdater(this.store);
+  private readonly updater = new ArchiverDataStoreUpdater(this.stores);
 
   constructor(db: AztecAsyncKVStore) {
-    const store = new KVArchiverDataStore(db, 9999);
-    super(store);
+    super(
+      createArchiverDataStores(db, { logsMaxPageSize: 9999 }),
+      undefined,
+      BlockHeader.empty(),
+      GENESIS_BLOCK_HEADER_HASH,
+      new Fr(GENESIS_ARCHIVE_ROOT),
+    );
   }
 
   public async addCheckpoints(checkpoints: PublishedCheckpoint[], result?: ValidateCheckpointResult): Promise<void> {
@@ -48,20 +61,21 @@ export class TXEArchiver extends ArchiverDataSourceBase {
   public async getL2Tips(): Promise<L2Tips> {
     // In TXE there is no possibility of reorgs and no blocks are ever getting proven so we just set 'latest', 'proven'
     // and 'finalized' to the latest block.
-    const blockHeader = await this.getBlockHeader('latest');
-    if (!blockHeader) {
+    const latestBlockNumber = await this.stores.blocks.getLatestL2BlockNumber();
+    if (latestBlockNumber === 0) {
+      throw new Error('L2Tips requested from TXE Archiver but no block found');
+    }
+    const latestBlockData = await this.stores.blocks.getBlockData({ number: latestBlockNumber });
+    if (!latestBlockData) {
       throw new Error('L2Tips requested from TXE Archiver but no block header found');
     }
 
-    const number = blockHeader.globalVariables.blockNumber;
-    const hash = (await blockHeader.hash()).toString();
-    const checkpointedBlock = await this.getCheckpointedBlock(number);
-    if (!checkpointedBlock) {
-      throw new Error(`L2Tips requested from TXE Archiver but no checkpointed block found for block number ${number}`);
-    }
+    const number = latestBlockData.header.globalVariables.blockNumber;
+    const hash = latestBlockData.blockHash.toString();
+
     // TXE uses 1-block-per-checkpoint for testing simplicity, so we can use block number as checkpoint number.
     // This uses the deprecated fromBlockNumber method intentionally for the TXE testing environment.
-    const checkpoint = await this.store.getRangeOfCheckpoints(CheckpointNumber.fromBlockNumber(number), 1);
+    const checkpoint = await this.stores.blocks.getRangeOfCheckpoints(CheckpointNumber.fromBlockNumber(number), 1);
     if (checkpoint.length === 0) {
       throw new Error(`L2Tips requested from TXE Archiver but no checkpoint found for block number ${number}`);
     }
diff --git a/yarn-project/txe/src/state_machine/dummy_p2p_client.ts b/yarn-project/txe/src/state_machine/dummy_p2p_client.ts
index 28e9564f1a79..3990a17d12d3 100644
--- a/yarn-project/txe/src/state_machine/dummy_p2p_client.ts
+++ b/yarn-project/txe/src/state_machine/dummy_p2p_client.ts
@@ -1,4 +1,4 @@
-import type { SlotNumber } from '@aztec/foundation/branded-types';
+import type { CheckpointProposalHash, SlotNumber } from '@aztec/foundation/branded-types';
 import type {
   AuthRequest,
   ENR,
@@ -147,7 +147,10 @@ export class DummyP2P implements P2P {
     throw new Error('DummyP2P does not implement "getTxsByHash"');
   }
 
-  public getCheckpointAttestationsForSlot(_slot: SlotNumber, _proposalId?: string): Promise<CheckpointAttestation[]> {
+  public getCheckpointAttestationsForSlot(
+    _slot: SlotNumber,
+    _proposalPayloadHash?: CheckpointProposalHash,
+  ): Promise<CheckpointAttestation[]> {
     throw new Error('DummyP2P does not implement "getCheckpointAttestationsForSlot"');
   }
 
diff --git a/yarn-project/txe/src/state_machine/index.ts b/yarn-project/txe/src/state_machine/index.ts
index 2d48c09b8f53..ec00644c007e 100644
--- a/yarn-project/txe/src/state_machine/index.ts
+++ b/yarn-project/txe/src/state_machine/index.ts
@@ -59,7 +59,7 @@ export class TXEStateMachine {
       new TXEGlobalVariablesBuilder(),
       new TXEFeeProvider(),
       new MockEpochCache(),
-      getPackageVersion() ?? '',
+      getPackageVersion(),
       new TestCircuitVerifier(),
       new TestCircuitVerifier(),
       undefined,
diff --git a/yarn-project/txe/src/txe_session.ts b/yarn-project/txe/src/txe_session.ts
index da020dbb5b30..0d9278312ccf 100644
--- a/yarn-project/txe/src/txe_session.ts
+++ b/yarn-project/txe/src/txe_session.ts
@@ -478,6 +478,7 @@ export class TXESession implements TXESessionStateHandler {
       jobId: this.currentJobId,
       scopes: await this.keyStore.getAccounts(),
       messageContextService: this.stateMachine.messageContextService,
+      simulator: new WASMSimulator(),
     });
 
     // We store the note and tagging index caches fed into the PrivateExecutionOracle (along with some other auxiliary
@@ -560,6 +561,7 @@ export class TXESession implements TXESessionStateHandler {
       l2TipsStore: this.stateMachine.node,
       jobId: this.currentJobId,
       scopes: await this.keyStore.getAccounts(),
+      simulator: new WASMSimulator(),
     });
 
     this.state = { name: 'UTILITY' };
@@ -638,6 +640,7 @@ export class TXESession implements TXESessionStateHandler {
       }
 
       try {
+        const simulator = new WASMSimulator();
         const oracle = new UtilityExecutionOracle({
           contractAddress: call.to,
           authWitnesses: [],
@@ -657,8 +660,9 @@ export class TXESession implements TXESessionStateHandler {
           l2TipsStore: this.stateMachine.node,
           jobId: this.currentJobId,
           scopes,
+          simulator,
         });
-        await new WASMSimulator()
+        await simulator
           .executeUserCircuit(toACVMWitness(0, call.args), entryPointArtifact, new Oracle(oracle).toACIRCallback())
           .catch((err: Error) => {
             err.message = resolveAssertionMessageFromError(err, entryPointArtifact);
diff --git a/yarn-project/validator-client/src/config.ts b/yarn-project/validator-client/src/config.ts
index 00118695f30f..be8df0c0dd84 100644
--- a/yarn-project/validator-client/src/config.ts
+++ b/yarn-project/validator-client/src/config.ts
@@ -3,6 +3,7 @@ import {
   booleanConfigHelper,
   getConfigFromMappings,
   numberConfigHelper,
+  optionalNumberConfigHelper,
   secretValueConfigHelper,
 } from '@aztec/foundation/config';
 import { EthAddress } from '@aztec/foundation/eth-address';
@@ -30,6 +31,12 @@ export const validatorClientConfigMappings: ConfigMappingsType<ValidatorClientCo
         .map(address => EthAddress.fromString(address.trim())),
     defaultValue: [],
   },
+  l1ChainId: {
+    env: 'L1_CHAIN_ID',
+    description: 'The chain ID of the ethereum host.',
+    parseEnv: (val: string) => +val,
+    defaultValue: 31337,
+  },
   disableValidator: {
     env: 'VALIDATOR_DISABLED',
     description: 'Do not run the validator',
@@ -75,22 +82,22 @@ export const validatorClientConfigMappings: ConfigMappingsType<ValidatorClientCo
   validateMaxL2BlockGas: {
     env: 'VALIDATOR_MAX_L2_BLOCK_GAS',
     description: 'Maximum L2 block gas for validation. Proposals exceeding this limit are rejected.',
-    parseEnv: (val: string) => parseInt(val, 10),
+    ...optionalNumberConfigHelper(),
   },
   validateMaxDABlockGas: {
     env: 'VALIDATOR_MAX_DA_BLOCK_GAS',
     description: 'Maximum DA block gas for validation. Proposals exceeding this limit are rejected.',
-    parseEnv: (val: string) => parseInt(val, 10),
+    ...optionalNumberConfigHelper(),
   },
   validateMaxTxsPerBlock: {
     env: 'VALIDATOR_MAX_TX_PER_BLOCK',
     description: 'Maximum transactions per block for validation. Proposals exceeding this limit are rejected.',
-    parseEnv: (val: string) => parseInt(val, 10),
+    ...optionalNumberConfigHelper(),
   },
   validateMaxTxsPerCheckpoint: {
     env: 'VALIDATOR_MAX_TX_PER_CHECKPOINT',
     description: 'Maximum transactions per checkpoint for validation. Proposals exceeding this limit are rejected.',
-    parseEnv: (val: string) => parseInt(val, 10),
+    ...optionalNumberConfigHelper(),
   },
   ...localSignerConfigMappings,
   ...validatorHASignerConfigMappings,
diff --git a/yarn-project/validator-client/src/duties/validation_service.test.ts b/yarn-project/validator-client/src/duties/validation_service.test.ts
index 760cd1773215..1cecf73317ac 100644
--- a/yarn-project/validator-client/src/duties/validation_service.test.ts
+++ b/yarn-project/validator-client/src/duties/validation_service.test.ts
@@ -3,7 +3,12 @@ import { CheckpointNumber, IndexWithinCheckpoint } from '@aztec/foundation/brand
 import { Buffer32 } from '@aztec/foundation/buffer';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { makeBlockHeader, makeCheckpointHeader, makeCheckpointProposal } from '@aztec/stdlib/testing';
+import {
+  TEST_COORDINATION_SIGNATURE_CONTEXT,
+  makeBlockHeader,
+  makeCheckpointHeader,
+  makeCheckpointProposal,
+} from '@aztec/stdlib/testing';
 import { Tx } from '@aztec/stdlib/tx';
 import { DutyType } from '@aztec/validator-ha-signer/types';
 
@@ -22,7 +27,7 @@ describe('ValidationService', () => {
     keys = [generatePrivateKey(), generatePrivateKey()];
     addresses = keys.map(key => EthAddress.fromString(getAddressFromPrivateKey(key)));
     store = new LocalKeyStore(keys.map(key => Buffer32.fromString(key)));
-    service = new ValidationService(store);
+    service = new ValidationService(store, TEST_COORDINATION_SIGNATURE_CONTEXT);
   });
 
   it('creates a block proposal with txs appended', async () => {
@@ -101,17 +106,17 @@ describe('ValidationService', () => {
     const capturedContexts: Array<{ dutyType: DutyType; blockIndexWithinCheckpoint?: number }> = [];
     const spyStore = {
       ...store,
-      signMessageWithAddress: (address: EthAddress, message: Buffer32, context: any) => {
+      signTypedDataWithAddress: (address: EthAddress, typedData: any, context: any) => {
         capturedContexts.push({
           dutyType: context.dutyType,
           blockIndexWithinCheckpoint: context.blockIndexWithinCheckpoint,
         });
-        return store.signMessageWithAddress(address, message, context);
+        return store.signTypedDataWithAddress(address, typedData, context);
       },
       getAddress: (index: number) => store.getAddress(index),
       getAddresses: () => store.getAddresses(),
     };
-    const spyService = new ValidationService(spyStore as any);
+    const spyService = new ValidationService(spyStore as any, TEST_COORDINATION_SIGNATURE_CONTEXT);
 
     // Create checkpoint proposal with the already-signed block proposal
     const proposal = await spyService.createCheckpointProposal(
diff --git a/yarn-project/validator-client/src/duties/validation_service.ts b/yarn-project/validator-client/src/duties/validation_service.ts
index 2aaf4db496e9..958fb18851ef 100644
--- a/yarn-project/validator-client/src/duties/validation_service.ts
+++ b/yarn-project/validator-client/src/duties/validation_service.ts
@@ -1,11 +1,9 @@
 import { type CheckpointNumber, IndexWithinCheckpoint, type SlotNumber } from '@aztec/foundation/branded-types';
-import { Buffer32 } from '@aztec/foundation/buffer';
-import { keccak256 } from '@aztec/foundation/crypto/keccak';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import type { Signature } from '@aztec/foundation/eth-signature';
 import { createLogger } from '@aztec/foundation/log';
-import type { CommitteeAttestationsAndSigners } from '@aztec/stdlib/block';
+import { CommitteeAttestationsAndSigners } from '@aztec/stdlib/block';
 import {
   BlockProposal,
   type BlockProposalOptions,
@@ -14,7 +12,8 @@ import {
   type CheckpointProposalCore,
   type CheckpointProposalOptions,
   ConsensusPayload,
-  SignatureDomainSeparator,
+  type CoordinationSignatureContext,
+  getCoordinationSignatureTypedData,
 } from '@aztec/stdlib/p2p';
 import type { CheckpointHeader } from '@aztec/stdlib/rollup';
 import type { BlockHeader, Tx } from '@aztec/stdlib/tx';
@@ -26,6 +25,7 @@ import type { ValidatorKeyStore } from '../key_store/interface.js';
 export class ValidationService {
   constructor(
     private keyStore: ValidatorKeyStore,
+    private signatureContext: CoordinationSignatureContext,
     private log = createLogger('validator:validation-service'),
   ) {}
 
@@ -62,8 +62,14 @@ export class ValidationService {
 
     // Create a signer that uses the appropriate address
     const address = proposerAttesterAddress ?? this.keyStore.getAddress(0);
-    const payloadSigner = (payload: Buffer32, context: SigningContext) =>
-      this.keyStore.signMessageWithAddress(address, payload, context);
+    const payloadSigner = (
+      typedData: Parameters<ValidatorKeyStore['signTypedDataWithAddress']>[1],
+      context: SigningContext,
+    ) => this.keyStore.signTypedDataWithAddress(address, typedData, context);
+    const txsSigner = (
+      typedData: Parameters<ValidatorKeyStore['signTypedDataWithAddress']>[1],
+      context: SigningContext,
+    ) => this.keyStore.signTypedDataWithAddress(address, typedData, context);
 
     return BlockProposal.createProposalFromSigner(
       blockHeader,
@@ -73,7 +79,9 @@ export class ValidationService {
       archive,
       txs.map(tx => tx.getTxHash()),
       options.publishFullTxs ? txs : undefined,
+      this.signatureContext,
       payloadSigner,
+      txsSigner,
     );
   }
 
@@ -106,9 +114,12 @@ export class ValidationService {
     }
 
     // Create a signer that takes payload and context, and uses the appropriate address
-    const payloadSigner = (payload: Buffer32, context: SigningContext) => {
+    const payloadSigner = (
+      typedData: Parameters<ValidatorKeyStore['signTypedDataWithAddress']>[1],
+      context: SigningContext,
+    ) => {
       const address = proposerAttesterAddress ?? this.keyStore.getAddress(0);
-      return this.keyStore.signMessageWithAddress(address, payload, context);
+      return this.keyStore.signTypedDataWithAddress(address, typedData, context);
     };
 
     return CheckpointProposal.createProposalFromSigner(
@@ -117,6 +128,7 @@ export class ValidationService {
       checkpointNumber,
       feeAssetPriceModifier,
       lastBlockProposal,
+      this.signatureContext,
       payloadSigner,
     );
   }
@@ -137,10 +149,13 @@ export class ValidationService {
     checkpointNumber: CheckpointNumber,
   ): Promise<CheckpointAttestation[]> {
     // Create the attestation payload from the checkpoint proposal
-    const payload = new ConsensusPayload(proposal.checkpointHeader, proposal.archive, proposal.feeAssetPriceModifier);
-    const buf = Buffer32.fromBuffer(
-      keccak256(payload.getPayloadToSign(SignatureDomainSeparator.checkpointAttestation)),
+    const payload = new ConsensusPayload(
+      proposal.checkpointHeader,
+      proposal.archive,
+      proposal.feeAssetPriceModifier,
+      this.signatureContext,
     );
+    const typedData = getCoordinationSignatureTypedData(payload);
 
     const context: SigningContext = {
       slot: proposal.slotNumber,
@@ -151,8 +166,7 @@ export class ValidationService {
     // Sign each attestor in parallel, catching HA errors per-attestor
     const results = await Promise.allSettled(
       attestors.map(async attestor => {
-        const sig = await this.keyStore.signMessageWithAddress(attestor, buf, context);
-        // return new BlockAttestation(proposal.payload, sig, proposal.signature);
+        const sig = await this.keyStore.signTypedDataWithAddress(attestor, typedData, context);
         return new CheckpointAttestation(payload, sig, proposal.signature);
       }),
     );
@@ -199,9 +213,7 @@ export class ValidationService {
       dutyType: DutyType.ATTESTATIONS_AND_SIGNERS,
     };
 
-    const buf = Buffer32.fromBuffer(
-      keccak256(attestationsAndSigners.getPayloadToSign(SignatureDomainSeparator.attestationsAndSigners)),
-    );
-    return this.keyStore.signMessageWithAddress(proposer, buf, context);
+    const typedData = getCoordinationSignatureTypedData(attestationsAndSigners);
+    return this.keyStore.signTypedDataWithAddress(proposer, typedData, context);
   }
 }
diff --git a/yarn-project/validator-client/src/factory.ts b/yarn-project/validator-client/src/factory.ts
index 6e9c4fef8494..32a8491c24ad 100644
--- a/yarn-project/validator-client/src/factory.ts
+++ b/yarn-project/validator-client/src/factory.ts
@@ -32,6 +32,11 @@ export function createProposalHandler(
   const blockProposalValidator = new BlockProposalValidator(deps.epochCache, {
     txsPermitted: !config.disableTransactions,
     maxTxsPerBlock: config.validateMaxTxsPerBlock ?? config.validateMaxTxsPerCheckpoint,
+    maxBlocksPerCheckpoint: config.maxBlocksPerCheckpoint,
+    signatureContext: {
+      chainId: config.l1ChainId,
+      rollupAddress: config.l1Contracts.rollupAddress,
+    },
   });
   return new ProposalHandler(
     deps.checkpointsBuilder,
diff --git a/yarn-project/validator-client/src/proposal_handler.test.ts b/yarn-project/validator-client/src/proposal_handler.test.ts
index 9053fa5af58f..44a28f3d0cb4 100644
--- a/yarn-project/validator-client/src/proposal_handler.test.ts
+++ b/yarn-project/validator-client/src/proposal_handler.test.ts
@@ -5,16 +5,22 @@ import { MAX_FEE_ASSET_PRICE_MODIFIER_BPS } from '@aztec/ethereum/contracts';
 import { CheckpointNumber, SlotNumber } from '@aztec/foundation/branded-types';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { TestDateProvider } from '@aztec/foundation/timer';
-import type { FieldsOf } from '@aztec/foundation/types';
+import { type FieldsOf, unfreeze } from '@aztec/foundation/types';
 import type { P2P } from '@aztec/p2p';
 import type { BlockProposalValidator } from '@aztec/p2p/msg_validators';
-import type { L2Block, L2BlockSink, L2BlockSource } from '@aztec/stdlib/block';
+import type { BlockData, L2Block, L2BlockSink, L2BlockSource } from '@aztec/stdlib/block';
 import type { Checkpoint } from '@aztec/stdlib/checkpoint';
+import type { L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
 import type { ITxProvider, ValidatorClientFullConfig, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
 import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
 import { accumulateCheckpointOutHashes } from '@aztec/stdlib/messaging';
 import { CheckpointHeader } from '@aztec/stdlib/rollup';
-import { makeBlockHeader, makeCheckpointHeader, makeCheckpointProposal } from '@aztec/stdlib/testing';
+import {
+  TEST_COORDINATION_SIGNATURE_CONTEXT,
+  makeBlockHeader,
+  makeCheckpointHeader,
+  makeCheckpointProposal,
+} from '@aztec/stdlib/testing';
 import { AppendOnlyTreeSnapshot } from '@aztec/stdlib/trees';
 import { GlobalVariables } from '@aztec/stdlib/tx';
 
@@ -70,14 +76,17 @@ describe('ProposalHandler checkpoint validation', () => {
       l1GenesisTime: 0n,
       slotDuration: 24,
       epochDuration: 8,
-    } as any);
+    } as L1RollupConstants);
     epochCache.isProposerPipeliningEnabled.mockReturnValue(true);
     epochCache.pipeliningOffset.mockReturnValue(1);
 
     dateProvider = new TestDateProvider();
     metrics = mock<ValidatorMetrics>();
 
-    config = {} as ValidatorClientFullConfig;
+    config = {
+      l1ChainId: TEST_COORDINATION_SIGNATURE_CONTEXT.chainId,
+      l1Contracts: { rollupAddress: TEST_COORDINATION_SIGNATURE_CONTEXT.rollupAddress },
+    } as ValidatorClientFullConfig;
 
     handler = new ProposalHandler(
       checkpointsBuilder,
@@ -118,14 +127,14 @@ describe('ProposalHandler checkpoint validation', () => {
     });
 
     it('returns last_block_not_found when block is not found before timeout', async () => {
-      blockSource.getBlockHeaderByArchive.mockResolvedValue(undefined);
+      blockSource.getBlockData.mockResolvedValue(undefined);
 
       const result = await handler.handleCheckpointProposal(await makeProposal(), proposalInfo);
       expect(result).toEqual({ isValid: false, reason: 'last_block_not_found' });
     });
 
     it('returns no_blocks_for_slot when no blocks exist for the slot', async () => {
-      blockSource.getBlockHeaderByArchive.mockResolvedValue(makeBlockHeader());
+      blockSource.getBlockData.mockResolvedValue({ header: makeBlockHeader() } as BlockData);
       blockSource.getBlocksForSlot.mockResolvedValue([]);
 
       const result = await handler.handleCheckpointProposal(await makeProposal(), proposalInfo);
@@ -133,7 +142,7 @@ describe('ProposalHandler checkpoint validation', () => {
     });
 
     it('returns last_block_archive_mismatch when last block archive does not match', async () => {
-      blockSource.getBlockHeaderByArchive.mockResolvedValue(makeBlockHeader());
+      blockSource.getBlockData.mockResolvedValue({ header: makeBlockHeader() } as BlockData);
       const blocks = [
         { archive: new AppendOnlyTreeSnapshot(Fr.random(), 1), number: 1 },
         { archive: new AppendOnlyTreeSnapshot(Fr.random(), 2), number: 2 },
@@ -146,15 +155,45 @@ describe('ProposalHandler checkpoint validation', () => {
       expect(result).toEqual({ isValid: false, reason: 'last_block_archive_mismatch' });
     });
 
+    it('returns too_many_blocks_in_checkpoint when blocks exceed maxBlocksPerCheckpoint', async () => {
+      config = { ...config, maxBlocksPerCheckpoint: 2 };
+      handler = new ProposalHandler(
+        checkpointsBuilder,
+        mock<WorldStateSynchronizer>(),
+        blockSource,
+        l1ToL2MessageSource,
+        mock<ITxProvider>(),
+        mock<BlockProposalValidator>(),
+        epochCache,
+        config,
+        mock<BlobClientInterface>(),
+        metrics,
+        dateProvider,
+      );
+
+      const archiveRoot = Fr.random();
+      blockSource.getBlockData.mockResolvedValue({ header: makeBlockHeader() } as BlockData);
+      const blocks = [
+        { archive: new AppendOnlyTreeSnapshot(Fr.random(), 1), number: 1 },
+        { archive: new AppendOnlyTreeSnapshot(Fr.random(), 2), number: 2 },
+        { archive: new AppendOnlyTreeSnapshot(archiveRoot, 3), number: 3 },
+      ] as unknown as L2Block[];
+      blockSource.getBlocksForSlot.mockResolvedValue(blocks);
+
+      const proposal = await makeProposal({ archiveRoot });
+      const result = await handler.handleCheckpointProposal(proposal, proposalInfo);
+      expect(result).toEqual({ isValid: false, reason: 'too_many_blocks_in_checkpoint' });
+    });
+
     it('caches validation result and returns it on second call', async () => {
-      blockSource.getBlockHeaderByArchive.mockResolvedValue(undefined);
+      blockSource.getBlockData.mockResolvedValue(undefined);
       const proposal = await makeProposal();
 
       const result1 = await handler.handleCheckpointProposal(proposal, proposalInfo);
       expect(result1.isValid).toBe(false);
 
       // Reset mocks to verify they're NOT called again
-      blockSource.getBlockHeaderByArchive.mockClear();
+      blockSource.getBlockData.mockClear();
       blockSource.syncImmediate.mockClear();
 
       const result2 = await handler.handleCheckpointProposal(proposal, proposalInfo);
@@ -163,7 +202,7 @@ describe('ProposalHandler checkpoint validation', () => {
     });
 
     it('does not use cache for a different proposal', async () => {
-      blockSource.getBlockHeaderByArchive.mockResolvedValue(undefined);
+      blockSource.getBlockData.mockResolvedValue(undefined);
 
       await handler.handleCheckpointProposal(await makeProposal({ archiveRoot: Fr.random() }), proposalInfo);
       blockSource.syncImmediate.mockClear();
@@ -172,8 +211,32 @@ describe('ProposalHandler checkpoint validation', () => {
       expect(blockSource.syncImmediate).toHaveBeenCalled();
     });
 
-    it('returns block_fetch_error when getBlockHeaderByArchive throws', async () => {
-      blockSource.getBlockHeaderByArchive.mockRejectedValue(new Error('db connection failed'));
+    // Regression for A-1013: cache used to key by (archive, slot) which let two proposals at the
+    // same slot+archive but with a different feeAssetPriceModifier share the same cache entry.
+    it('does not cache across proposals that share archive and slot but differ in feeAssetPriceModifier', async () => {
+      blockSource.getBlockData.mockResolvedValue(undefined);
+      const sharedHeader = makeCheckpointHeader(0, { slotNumber: SlotNumber(1) });
+      const sharedArchive = Fr.random();
+
+      const proposalA = await makeProposal({
+        checkpointHeader: sharedHeader,
+        archiveRoot: sharedArchive,
+        feeAssetPriceModifier: 50n,
+      });
+      await handler.handleCheckpointProposal(proposalA, proposalInfo);
+      blockSource.syncImmediate.mockClear();
+
+      const proposalB = await makeProposal({
+        checkpointHeader: sharedHeader,
+        archiveRoot: sharedArchive,
+        feeAssetPriceModifier: -50n,
+      });
+      await handler.handleCheckpointProposal(proposalB, proposalInfo);
+      expect(blockSource.syncImmediate).toHaveBeenCalled();
+    });
+
+    it('returns block_fetch_error when getBlockData throws', async () => {
+      blockSource.getBlockData.mockRejectedValue(new Error('db connection failed'));
 
       const result = await handler.handleCheckpointProposal(await makeProposal(), proposalInfo);
       expect(result).toEqual({ isValid: false, reason: 'block_fetch_error' });
@@ -189,15 +252,15 @@ describe('ProposalHandler checkpoint validation', () => {
         checkpointHandler = handler;
       });
 
-      const archiver = mock<Pick<Archiver, 'setProposedCheckpoint' | 'getL1Constants'>>();
-      archiver.setProposedCheckpoint.mockResolvedValue(undefined);
+      const archiver = mock<Pick<Archiver, 'addProposedCheckpoint' | 'getL1Constants'>>();
+      archiver.addProposedCheckpoint.mockResolvedValue(undefined);
 
       const blockData = {
         checkpointNumber: CheckpointNumber(3),
         header: { getBlockNumber: () => 9 },
         indexWithinCheckpoint: 2,
-      } as any;
-      blockSource.getBlockDataByArchive.mockResolvedValue(blockData);
+      } as BlockData;
+      blockSource.getBlockData.mockResolvedValue(blockData);
 
       jest
         .spyOn(handler, 'handleCheckpointProposal')
@@ -206,7 +269,7 @@ describe('ProposalHandler checkpoint validation', () => {
       handler.register(p2p, true, archiver);
       await checkpointHandler!(proposal, {} as any);
 
-      expect(archiver.setProposedCheckpoint).toHaveBeenCalled();
+      expect(archiver.addProposedCheckpoint).toHaveBeenCalled();
       expect(metrics.recordCheckpointProposalToPipelinedStateDuration).toHaveBeenCalledWith(expect.any(Number));
     });
   });
@@ -227,7 +290,7 @@ describe('ProposalHandler checkpoint validation', () => {
         header: { globalVariables: GlobalVariables.empty({ slotNumber: SlotNumber(1) }) },
       } as unknown as L2Block;
 
-      blockSource.getBlockHeaderByArchive.mockResolvedValue(makeBlockHeader());
+      blockSource.getBlockData.mockResolvedValue({ header: makeBlockHeader() } as BlockData);
       blockSource.getBlocksForSlot.mockResolvedValue([block]);
 
       mockDispose = jest.fn();
@@ -322,7 +385,7 @@ describe('ProposalHandler checkpoint validation', () => {
         gasFees: header.gasFees,
         timestamp: header.timestamp,
       });
-      (blockHeader as any).lastArchive = new AppendOnlyTreeSnapshot(lastArchiveRoot, 0);
+      unfreeze(blockHeader).lastArchive = new AppendOnlyTreeSnapshot(lastArchiveRoot, 0);
 
       const minimalBlock = {
         archive: new AppendOnlyTreeSnapshot(archiveRoot, 1),
diff --git a/yarn-project/validator-client/src/proposal_handler.ts b/yarn-project/validator-client/src/proposal_handler.ts
index e7fe6624fb5a..cdf951a68b34 100644
--- a/yarn-project/validator-client/src/proposal_handler.ts
+++ b/yarn-project/validator-client/src/proposal_handler.ts
@@ -4,7 +4,12 @@ import { type Blob, encodeCheckpointBlobDataFromBlocks, getBlobsPerL1Block } fro
 import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
 import type { EpochCache } from '@aztec/epoch-cache';
 import { validateFeeAssetPriceModifier } from '@aztec/ethereum/contracts';
-import { BlockNumber, CheckpointNumber, SlotNumber } from '@aztec/foundation/branded-types';
+import {
+  BlockNumber,
+  CheckpointNumber,
+  type CheckpointProposalHash,
+  SlotNumber,
+} from '@aztec/foundation/branded-types';
 import { pick } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { TimeoutError } from '@aztec/foundation/error';
@@ -88,15 +93,16 @@ type CheckpointComputationResult =
 export class ProposalHandler {
   public readonly tracer: Tracer;
 
-  /** Cached last checkpoint validation result to avoid double-validation on validator nodes. */
+  /** Cached last checkpoint validation result to avoid double-validation on validator nodes.
+   *  Keyed by signed-payload hash so two proposals at the same (slot, archive) but with a
+   *  different `feeAssetPriceModifier` (or any other signed field) are validated independently. */
   private lastCheckpointValidationResult?: {
-    archive: Fr;
-    slotNumber: SlotNumber;
+    payloadHash: CheckpointProposalHash;
     result: CheckpointProposalValidationResult;
   };
 
   /** Archiver reference for setting proposed checkpoints (pipelining). Set via register(). */
-  private archiver?: Pick<Archiver, 'setProposedCheckpoint' | 'getL1Constants'>;
+  private archiver?: Pick<Archiver, 'addProposedCheckpoint' | 'getL1Constants'>;
 
   /** Returns current validator addresses for own-proposal detection. Set via register(). */
   private getOwnValidatorAddresses?: () => string[];
@@ -132,7 +138,7 @@ export class ProposalHandler {
   register(
     p2pClient: P2P,
     shouldReexecute: boolean,
-    archiver?: Pick<Archiver, 'setProposedCheckpoint' | 'getL1Constants'>,
+    archiver?: Pick<Archiver, 'addProposedCheckpoint' | 'getL1Constants'>,
     getOwnValidatorAddresses?: () => string[],
   ): ProposalHandler {
     this.archiver = archiver;
@@ -292,7 +298,7 @@ export class ProposalHandler {
     proposalInfo.blockNumber = blockNumber;
 
     // Check that this block number does not exist already
-    const existingBlock = await this.blockSource.getBlockHeader(blockNumber);
+    const existingBlock = await this.blockSource.getBlockData({ number: blockNumber });
     if (existingBlock) {
       this.log.warn(`Block number ${blockNumber} already exists, skipping processing`, proposalInfo);
       return { isValid: false, blockNumber, reason: 'block_number_already_exists' };
@@ -393,11 +399,12 @@ export class ProposalHandler {
 
     try {
       return (
-        (await this.blockSource.getBlockDataByArchive(parentArchive)) ??
+        (await this.blockSource.getBlockData({ archive: parentArchive })) ??
         (timeoutDurationMs <= 0
           ? undefined
           : await retryUntil(
-              () => this.blockSource.syncImmediate().then(() => this.blockSource.getBlockDataByArchive(parentArchive)),
+              () =>
+                this.blockSource.syncImmediate().then(() => this.blockSource.getBlockData({ archive: parentArchive })),
               'force archiver sync',
               timeoutDurationMs / 1000,
               0.5,
@@ -734,13 +741,10 @@ export class ProposalHandler {
     proposalInfo: LogData,
   ): Promise<CheckpointProposalValidationResult> {
     const slot = proposal.slotNumber;
+    const payloadHash = proposal.getPayloadHash();
 
-    // Check cache: same archive+slot means we already validated this proposal
-    if (
-      this.lastCheckpointValidationResult &&
-      this.lastCheckpointValidationResult.archive.equals(proposal.archive) &&
-      this.lastCheckpointValidationResult.slotNumber === slot
-    ) {
+    // Check cache: same signed-payload hash means we already validated this exact proposal.
+    if (this.lastCheckpointValidationResult && this.lastCheckpointValidationResult.payloadHash === payloadHash) {
       this.log.debug(`Returning cached validation result for checkpoint proposal at slot ${slot}`, proposalInfo);
       return this.lastCheckpointValidationResult.result;
     }
@@ -749,7 +753,7 @@ export class ProposalHandler {
     if (!proposer) {
       this.log.warn(`Received checkpoint proposal with invalid signature for slot ${proposal.slotNumber}`);
       const result: CheckpointProposalValidationResult = { isValid: false, reason: 'invalid_signature' };
-      this.lastCheckpointValidationResult = { archive: proposal.archive, slotNumber: slot, result };
+      this.lastCheckpointValidationResult = { payloadHash, result };
       return result;
     }
 
@@ -758,12 +762,12 @@ export class ProposalHandler {
         `Received checkpoint proposal with invalid feeAssetPriceModifier ${proposal.feeAssetPriceModifier} for slot ${proposal.slotNumber}`,
       );
       const result: CheckpointProposalValidationResult = { isValid: false, reason: 'invalid_fee_asset_price_modifier' };
-      this.lastCheckpointValidationResult = { archive: proposal.archive, slotNumber: slot, result };
+      this.lastCheckpointValidationResult = { payloadHash, result };
       return result;
     }
 
     const result = await this.validateCheckpointProposal(proposal, proposalInfo);
-    this.lastCheckpointValidationResult = { archive: proposal.archive, slotNumber: slot, result };
+    this.lastCheckpointValidationResult = { payloadHash, result };
 
     // Upload blobs to filestore if validation passed (fire and forget)
     if (result.isValid) {
@@ -794,7 +798,7 @@ export class ProposalHandler {
       lastBlockHeader = await retryUntil(
         async () => {
           await this.blockSource.syncImmediate();
-          return this.blockSource.getBlockHeaderByArchive(proposal.archive);
+          return (await this.blockSource.getBlockData({ archive: proposal.archive }))?.header;
         },
         `waiting for block with archive ${proposal.archive.toString()} for slot ${slot}`,
         timeoutSeconds,
@@ -827,6 +831,16 @@ export class ProposalHandler {
       return { isValid: false, reason: 'last_block_archive_mismatch' };
     }
 
+    const maxBlocksPerCheckpoint = this.config.maxBlocksPerCheckpoint;
+    if (maxBlocksPerCheckpoint !== undefined && blocks.length > maxBlocksPerCheckpoint) {
+      this.log.warn(`Checkpoint proposal exceeds maxBlocksPerCheckpoint`, {
+        ...proposalInfo,
+        blocksInProposal: blocks.length,
+        maxBlocksPerCheckpoint,
+      });
+      return { isValid: false, reason: 'too_many_blocks_in_checkpoint' };
+    }
+
     this.log.debug(`Found ${blocks.length} blocks for slot ${slot}`, {
       ...proposalInfo,
       blockNumbers: blocks.map(b => b.number),
@@ -943,7 +957,7 @@ export class ProposalHandler {
   /** Uploads blobs for a checkpoint to the filestore. */
   protected async uploadBlobsForCheckpoint(proposal: CheckpointProposalCore, proposalInfo: LogData): Promise<void> {
     try {
-      const lastBlockHeader = await this.blockSource.getBlockHeaderByArchive(proposal.archive);
+      const lastBlockHeader = (await this.blockSource.getBlockData({ archive: proposal.archive }))?.header;
       if (!lastBlockHeader) {
         this.log.warn(`Failed to get last block header for blob upload`, proposalInfo);
         return;
@@ -977,7 +991,7 @@ export class ProposalHandler {
     if (!this.archiver) {
       return false;
     }
-    const blockData = await this.blockSource.getBlockDataByArchive(proposal.archive);
+    const blockData = await this.blockSource.getBlockData({ archive: proposal.archive });
     if (!blockData) {
       this.log.debug(`Block data not found for checkpoint proposal archive, cannot set proposed checkpoint`, {
         archive: proposal.archive.toString(),
@@ -985,7 +999,7 @@ export class ProposalHandler {
       return false;
     }
 
-    await this.archiver.setProposedCheckpoint({
+    await this.archiver.addProposedCheckpoint({
       header: proposal.checkpointHeader,
       checkpointNumber: blockData.checkpointNumber,
       startBlock: BlockNumber(blockData.header.getBlockNumber() - blockData.indexWithinCheckpoint),
@@ -1005,7 +1019,7 @@ export class ProposalHandler {
     if (!this.archiver) {
       return false;
     }
-    let blockData = await this.blockSource.getBlockDataByArchive(proposal.archive);
+    let blockData = await this.blockSource.getBlockData({ archive: proposal.archive });
 
     if (!blockData) {
       // The checkpoint proposal often arrives before the last block finishes re-execution.
@@ -1015,7 +1029,7 @@ export class ProposalHandler {
       const timeoutSeconds = Math.max(1, Number(timeOfNextSlot) - Math.floor(this.dateProvider.now() / 1000));
 
       blockData = await retryUntil(
-        () => this.blockSource.getBlockDataByArchive(proposal.archive),
+        () => this.blockSource.getBlockData({ archive: proposal.archive }),
         'block data for own checkpoint proposal',
         timeoutSeconds,
         0.25,
@@ -1023,7 +1037,7 @@ export class ProposalHandler {
     }
 
     if (blockData) {
-      await this.archiver.setProposedCheckpoint({
+      await this.archiver.addProposedCheckpoint({
         header: proposal.checkpointHeader,
         checkpointNumber: blockData.checkpointNumber,
         startBlock: BlockNumber(blockData.header.getBlockNumber() - blockData.indexWithinCheckpoint),
diff --git a/yarn-project/validator-client/src/validator.ha.integration.test.ts b/yarn-project/validator-client/src/validator.ha.integration.test.ts
index 5ebe7d512bcf..e3b523d13493 100644
--- a/yarn-project/validator-client/src/validator.ha.integration.test.ts
+++ b/yarn-project/validator-client/src/validator.ha.integration.test.ts
@@ -20,7 +20,13 @@ import type { L2BlockSink, L2BlockSource } from '@aztec/stdlib/block';
 import type { SlasherConfig, ValidatorClientFullConfig, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
 import { computeInHashFromL1ToL2Messages } from '@aztec/stdlib/messaging';
 import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
-import { makeBlockHeader, makeCheckpointHeader, makeCheckpointProposal, mockTx } from '@aztec/stdlib/testing';
+import {
+  TEST_COORDINATION_SIGNATURE_CONTEXT,
+  makeBlockHeader,
+  makeCheckpointHeader,
+  makeCheckpointProposal,
+  mockTx,
+} from '@aztec/stdlib/testing';
 import { TxHash } from '@aztec/stdlib/tx';
 import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';
 import { INSERT_SCHEMA_VERSION, SCHEMA_SETUP, SCHEMA_VERSION } from '@aztec/validator-ha-signer/db';
@@ -123,7 +129,7 @@ describe('ValidatorClient HA Integration', () => {
     };
     keyStoreManager = new KeystoreManager(keyStore);
 
-    rollupAddress = EthAddress.random();
+    rollupAddress = TEST_COORDINATION_SIGNATURE_CONTEXT.rollupAddress;
 
     // Create 5 HA validator instances for use across all tests
     const baseConfig: ValidatorClientConfig &
@@ -137,6 +143,7 @@ describe('ValidatorClient HA Integration', () => {
       disabledValidators: [],
       slashBroadcastedInvalidBlockPenalty: 1n,
       l1Contracts: { rollupAddress },
+      l1ChainId: TEST_COORDINATION_SIGNATURE_CONTEXT.chainId,
       slashDuplicateProposalPenalty: 1n,
       slashDuplicateAttestationPenalty: 1n,
       haSigningEnabled: true,
@@ -200,6 +207,7 @@ describe('ValidatorClient HA Integration', () => {
     const blockProposalValidator = new BlockProposalValidator(epochCache, {
       txsPermitted: true,
       maxTxsPerBlock: undefined,
+      signatureContext: TEST_COORDINATION_SIGNATURE_CONTEXT,
     });
     const proposalHandler = new ProposalHandler(
       checkpointsBuilder,
diff --git a/yarn-project/validator-client/src/validator.integration.test.ts b/yarn-project/validator-client/src/validator.integration.test.ts
index 9c0abcdd80c7..249d6e026043 100644
--- a/yarn-project/validator-client/src/validator.integration.test.ts
+++ b/yarn-project/validator-client/src/validator.integration.test.ts
@@ -36,6 +36,7 @@ import { getGenesisValues } from '@aztec/world-state/testing';
 
 import { describe, expect, it, jest } from '@jest/globals';
 import { type MockProxy, mock } from 'jest-mock-extended';
+import { hashTypedData } from 'viem';
 import { generatePrivateKey } from 'viem/accounts';
 
 import { CheckpointBuilder, FullNodeCheckpointsBuilder } from './checkpoint_builder.js';
@@ -103,10 +104,10 @@ describe('ValidatorClient Integration', () => {
       dataStoreMapSizeKb: 1024 * 1024,
     });
     await registerProtocolContracts(archiverStore);
-    const archiver = await createNoopL1Archiver(archiverStore, { ...l1Constants, genesisArchiveRoot });
-    await archiver.start();
 
-    // Create world state synchronizer
+    // Construct world-state first so we can pass its initial header to the archiver, mirroring
+    // production wiring (see aztec-node/server.ts). Both sides must agree on the genesis hash for
+    // L2BlockStream's `areBlockHashesEqualAt` check to succeed at block 0.
     const wsConfig = {
       l1Contracts: { rollupAddress },
       worldStateBlockCheckIntervalMS: 20,
@@ -115,6 +116,14 @@ describe('ValidatorClient Integration', () => {
       worldStateCheckpointHistory: 0,
     };
     const worldStateDb = await NativeWorldStateService.tmp(rollupAddress, true, genesis);
+    const archiver = await createNoopL1Archiver(
+      archiverStore,
+      { ...l1Constants, genesisArchiveRoot },
+      undefined,
+      worldStateDb.getInitialHeader(),
+    );
+    await archiver.start();
+
     const synchronizer = new ServerWorldStateSynchronizer(worldStateDb, archiver, wsConfig);
     await synchronizer.start();
 
@@ -162,6 +171,7 @@ describe('ValidatorClient Integration', () => {
     const validator = await ValidatorClient.new(
       {
         l1Contracts: { rollupAddress },
+        l1ChainId: chainId.toNumber(),
         validatorPrivateKeys: new SecretValue([privateKey]),
         attestationPollingIntervalMs: 100,
         disableValidator: false,
@@ -404,7 +414,7 @@ describe('ValidatorClient Integration', () => {
 
       // Verify blocks are in archiver and hashes match
       await attestor.archiver.syncImmediate();
-      const attestorBlocks = await attestor.archiver.getBlocks(BlockNumber(1), 3);
+      const attestorBlocks = await attestor.archiver.getBlocks({ from: BlockNumber(1), limit: 3 });
       expect(attestorBlocks.length).toBe(3);
 
       const attestorBlockHashes = await Promise.all(attestorBlocks.map(b => b.header.hash()));
@@ -415,8 +425,8 @@ describe('ValidatorClient Integration', () => {
     it('validates and attests with txs anchored to proposed blocks and non-empty l1-to-l2 messages', async () => {
       // Create l1 to l2 messages and seed them into the archivers
       const l1ToL2Messages = makeInboxMessages(4, { messagesPerCheckpoint: 4 });
-      await proposer.archiver.dataStore.addL1ToL2Messages(l1ToL2Messages);
-      await attestor.archiver.dataStore.addL1ToL2Messages(l1ToL2Messages);
+      await proposer.archiver.dataStores.messages.addL1ToL2Messages(l1ToL2Messages);
+      await attestor.archiver.dataStores.messages.addL1ToL2Messages(l1ToL2Messages);
 
       // Build txs anchored to the previously proposed block
       const { blocks, proposal } = await buildCheckpoint(
@@ -439,7 +449,7 @@ describe('ValidatorClient Integration', () => {
 
       // Verify blocks are in archiver and hashes match
       await attestor.archiver.syncImmediate();
-      const attestorBlocks = await attestor.archiver.getBlocks(BlockNumber(1), 3);
+      const attestorBlocks = await attestor.archiver.getBlocks({ from: BlockNumber(1), limit: 3 });
       expect(attestorBlocks.length).toBe(3);
 
       const attestorBlockHashes = await Promise.all(attestorBlocks.map(b => b.header.hash()));
@@ -495,7 +505,7 @@ describe('ValidatorClient Integration', () => {
 
       // Verify all blocks are in archiver
       await attestor.archiver.syncImmediate();
-      const attestorBlocks = await attestor.archiver.getBlocks(BlockNumber(1), 4);
+      const attestorBlocks = await attestor.archiver.getBlocks({ from: BlockNumber(1), limit: 4 });
       expect(attestorBlocks.length).toBe(4);
 
       const attestorBlockHashes = await Promise.all(attestorBlocks.map(b => b.header.hash()));
@@ -545,7 +555,8 @@ describe('ValidatorClient Integration', () => {
         CheckpointNumber(1),
         0n,
         undefined,
-        payload => Promise.resolve(proposerSigner.sign(payload)),
+        { chainId: chainId.toNumber(), rollupAddress },
+        typedData => Promise.resolve(proposerSigner.sign(Buffer32.fromString(hashTypedData(typedData)))),
       );
 
       await attestorValidateBlocks(blocks);
@@ -607,10 +618,10 @@ describe('ValidatorClient Integration', () => {
 
     it('refuses block proposal with mismatching l1 to l2 messages', async () => {
       const l1ToL2Messages = makeInboxMessages(4, { messagesPerCheckpoint: 4 });
-      await proposer.archiver.dataStore.addL1ToL2Messages(l1ToL2Messages);
+      await proposer.archiver.dataStores.messages.addL1ToL2Messages(l1ToL2Messages);
 
       const otherL1ToL2Messages = makeInboxMessages(4, { messagesPerCheckpoint: 4 });
-      await attestor.archiver.dataStore.addL1ToL2Messages(otherL1ToL2Messages);
+      await attestor.archiver.dataStores.messages.addL1ToL2Messages(otherL1ToL2Messages);
 
       const { blocks } = await buildCheckpoint(
         CheckpointNumber(1),
diff --git a/yarn-project/validator-client/src/validator.test.ts b/yarn-project/validator-client/src/validator.test.ts
index c4e91904c1ef..d1286c4d086e 100644
--- a/yarn-project/validator-client/src/validator.test.ts
+++ b/yarn-project/validator-client/src/validator.test.ts
@@ -35,6 +35,7 @@ import type { SlasherConfig, WorldStateSynchronizer } from '@aztec/stdlib/interf
 import { type L1ToL2MessageSource, computeInHashFromL1ToL2Messages } from '@aztec/stdlib/messaging';
 import type { BlockProposal } from '@aztec/stdlib/p2p';
 import {
+  TEST_COORDINATION_SIGNATURE_CONTEXT,
   makeBlockHeader,
   makeBlockProposal,
   makeCheckpointAttestation,
@@ -150,7 +151,7 @@ describe('ValidatorClient', () => {
     });
 
     blockSource = mock<L2BlockSource & L2BlockSink>();
-    blockSource.getCheckpointedBlocksForEpoch.mockResolvedValue([]);
+    blockSource.getBlocks.mockResolvedValue([]);
     blockSource.getCheckpointsDataForEpoch.mockResolvedValue([]);
     blockSource.getBlocksForSlot.mockResolvedValue([]);
     blockSource.getSyncedL2SlotNumber.mockResolvedValue(SlotNumber(Number.MAX_SAFE_INTEGER));
@@ -182,7 +183,8 @@ describe('ValidatorClient', () => {
       slashDuplicateAttestationPenalty: 1n,
       disableTransactions: false,
       haSigningEnabled: false,
-      l1Contracts: { rollupAddress: EthAddress.random() },
+      l1ChainId: TEST_COORDINATION_SIGNATURE_CONTEXT.chainId,
+      l1Contracts: { rollupAddress: TEST_COORDINATION_SIGNATURE_CONTEXT.rollupAddress },
       nodeId: 'test-node-id',
       pollingIntervalMs: 1000,
       signingTimeoutMs: 1000,
@@ -259,8 +261,9 @@ describe('ValidatorClient', () => {
         makeCheckpointAttestation({ signer: attestor1, archive, header: proposal.checkpointHeader }),
         makeCheckpointAttestation({ signer: attestor2, archive, header: proposal.checkpointHeader }),
       ];
-      p2pClient.getCheckpointAttestationsForSlot.mockImplementation((slot, proposalId) => {
-        if (proposal.slotNumber === slot && proposalId === proposal.archive.toString()) {
+      const expectedPayloadHash = proposal.getPayloadHash();
+      p2pClient.getCheckpointAttestationsForSlot.mockImplementation((slot, proposalPayloadHash) => {
+        if (proposal.slotNumber === slot && proposalPayloadHash === expectedPayloadHash) {
           return Promise.resolve(expectedAttestations);
         }
         return Promise.resolve([]);
@@ -292,41 +295,36 @@ describe('ValidatorClient', () => {
       expect(addCheckpointAttestationsSpy.mock.calls[0][0]).toHaveLength(2);
     });
 
-    it('should filter out attestations with mismatched payload', async () => {
+    it('forwards the proposal payload hash to the pool so mismatched attestations are filtered out', async () => {
       const signer = Secp256k1Signer.random();
       const attestor1 = Secp256k1Signer.random();
-      const attestor2 = Secp256k1Signer.random();
 
       const archive = Fr.random();
       const txHashes = [0, 1, 2, 3, 4, 5].map(() => TxHash.random());
 
       const proposal = await makeCheckpointProposal({ signer, archiveRoot: archive, lastBlock: { txHashes } });
 
-      // Create attestations - one with matching payload, one with mismatched
+      // The pool is responsible for filtering by payload hash; the validator just forwards it.
+      // We mock the pool to return the matching attestation only when queried with the right hash.
       const validAttestation = makeCheckpointAttestation({
         signer: attestor1,
         archive,
         header: proposal.checkpointHeader,
       });
-      const invalidAttestation = makeCheckpointAttestation({
-        signer: attestor2,
-        archive: Fr.random(),
-        header: proposal.checkpointHeader,
-      });
 
-      p2pClient.getCheckpointAttestationsForSlot.mockImplementation((slot, proposalId) =>
-        proposal.slotNumber === slot && proposalId === proposal.archive.toString()
-          ? Promise.resolve([validAttestation, invalidAttestation])
+      const expectedPayloadHash = proposal.getPayloadHash();
+      p2pClient.getCheckpointAttestationsForSlot.mockImplementation((slot, proposalPayloadHash) =>
+        proposal.slotNumber === slot && proposalPayloadHash === expectedPayloadHash
+          ? Promise.resolve([validAttestation])
           : Promise.resolve([]),
       );
 
-      // Perform the query - should timeout but we're testing the filtering behavior
+      // Only one matching attestation is returned, but the validator needs 2 -> times out.
       await expect(
         validatorClient.collectAttestations(proposal, 2, new Date(dateProvider.now() + 1000), CheckpointNumber(1)),
       ).rejects.toThrow(AttestationTimeoutError);
 
-      // Verify that getCheckpointAttestationsForSlot was called (meaning the loop ran)
-      expect(p2pClient.getCheckpointAttestationsForSlot).toHaveBeenCalled();
+      expect(p2pClient.getCheckpointAttestationsForSlot).toHaveBeenCalledWith(proposal.slotNumber, expectedPayloadHash);
     });
   });
 
@@ -336,6 +334,7 @@ describe('ValidatorClient', () => {
     let sender: PeerId;
     let blockBuildResult: BuildBlockInCheckpointResult;
     let mockCheckpointBuilder: MockProxy<CheckpointBuilder>;
+    let parentBlockData: BlockData;
 
     const makeTxFromHash = (txHash: TxHash) => ({ getTxHash: () => txHash, txHash }) as Tx;
     const getExpectedWallClockDeadline = (currentSlot: SlotNumber) =>
@@ -391,9 +390,10 @@ describe('ValidatorClient', () => {
       epochCache.filterInCommittee.mockResolvedValue([EthAddress.fromString(validatorAccounts[0].address)]);
       epochCache.isEscapeHatchOpenAtSlot.mockResolvedValue(false);
 
-      // Return parent block data when requested (includes checkpoint info, avoids loading full L2Block)
+      // Return parent block data when requested by archive root (parent block lookup).
+      // Return undefined for number-based queries (existence check — the proposed block must not exist yet).
       const parentSlot = SlotNumber(Number(blockHeader.globalVariables.slotNumber) - 1);
-      blockSource.getBlockDataByArchive.mockResolvedValue({
+      parentBlockData = {
         header: {
           getBlockNumber: () => blockNumber - 1,
           getSlot: () => parentSlot,
@@ -403,7 +403,10 @@ describe('ValidatorClient', () => {
         blockHash: BlockHash.random(),
         checkpointNumber: CheckpointNumber(1),
         indexWithinCheckpoint: IndexWithinCheckpoint(0),
-      } as unknown as BlockData);
+      } as unknown as BlockData;
+      blockSource.getBlockData.mockImplementation(query =>
+        Promise.resolve('number' in query ? undefined : parentBlockData),
+      );
 
       blockSource.getGenesisValues.mockResolvedValue({ genesisArchiveRoot: new Fr(GENESIS_ARCHIVE_ROOT) });
       blockSource.syncImmediate.mockImplementation(() => Promise.resolve());
@@ -634,8 +637,8 @@ describe('ValidatorClient', () => {
         },
       });
 
-      // Mock getBlockHeaderByArchive to return a header so retryUntil succeeds
-      blockSource.getBlockHeaderByArchive.mockResolvedValue(makeBlockHeader());
+      // Mock getBlockData to return block data so retryUntil succeeds
+      blockSource.getBlockData.mockResolvedValue({ header: makeBlockHeader() } as any);
       blockSource.getBlocksForSlot.mockResolvedValue(blocks);
 
       // Checkpoint validation should fail: proposal points to block 2 but last block in slot is block 3
@@ -646,12 +649,13 @@ describe('ValidatorClient', () => {
 
     it('should wait for previous block to sync', async () => {
       epochCache.filterInCommittee.mockResolvedValue([EthAddress.fromString(validatorAccounts[0].address)]);
-      blockSource.getBlockDataByArchive.mockResolvedValueOnce(undefined);
-      blockSource.getBlockDataByArchive.mockResolvedValueOnce(undefined);
-      blockSource.getBlockDataByArchive.mockResolvedValueOnce(undefined);
+      blockSource.getBlockData.mockResolvedValueOnce(undefined);
+      blockSource.getBlockData.mockResolvedValueOnce(undefined);
+      blockSource.getBlockData.mockResolvedValueOnce(undefined);
       const isValid = await validatorClient.validateBlockProposal(proposal, sender);
-      // Direct call returns undefined, then retryUntil: 2 undefined + 1 success = 4 total
-      expect(blockSource.getBlockDataByArchive).toHaveBeenCalledTimes(4);
+      // Archive lookups: 1 direct + 2 retryUntil (undefined) + 1 retryUntil (success) = 4
+      // Plus 1 number-based existence check after parent block is found = 5 total
+      expect(blockSource.getBlockData).toHaveBeenCalledTimes(5);
       expect(isValid).toBe(true);
     });
 
@@ -692,10 +696,13 @@ describe('ValidatorClient', () => {
     });
 
     it('should not validate proposal if the proposed block number is taken', async () => {
-      blockSource.getBlockHeader.mockResolvedValue({} as BlockHeader);
+      // Parent block lookup (by archive) returns valid data; existence check (by number) also returns data → block taken.
+      blockSource.getBlockData.mockImplementation(query =>
+        Promise.resolve('number' in query ? ({ header: {} as BlockHeader } as any) : parentBlockData),
+      );
       const isValid = await validatorClient.validateBlockProposal(proposal, sender);
       expect(isValid).toBe(false);
-      expect(blockSource.getBlockHeader).toHaveBeenCalledWith(blockNumber);
+      expect(blockSource.getBlockData).toHaveBeenCalledWith({ number: blockNumber });
     });
 
     it('should not emit WANT_TO_SLASH_EVENT if slashing is disabled', async () => {
@@ -887,8 +894,8 @@ describe('ValidatorClient', () => {
           nowSeconds: 0n,
         });
 
-        // Mock parent block data returned by getBlockDataByArchive
-        blockSource.getBlockDataByArchive.mockResolvedValue({
+        // Mock parent block data returned by getBlockData
+        blockSource.getBlockData.mockResolvedValue({
           header: {
             getBlockNumber: () => BlockNumber(parentBlockNumber),
             getSlot: () => SlotNumber(parentSlotNumber),
@@ -1023,7 +1030,7 @@ describe('ValidatorClient', () => {
 
     it('should send blobs from blocks in the slot to filestore', async () => {
       const mockBlock = L2Block.empty();
-      blockSource.getBlockHeaderByArchive.mockResolvedValue(makeBlockHeader());
+      blockSource.getBlockData.mockResolvedValue({ header: makeBlockHeader() } as any);
       blockSource.getBlocksForSlot.mockResolvedValue([mockBlock]);
 
       const proposal = await makeCheckpointProposal({ lastBlock: {} });
@@ -1037,7 +1044,7 @@ describe('ValidatorClient', () => {
     });
 
     it('should not upload if last block header is not found', async () => {
-      blockSource.getBlockHeaderByArchive.mockResolvedValue(undefined);
+      blockSource.getBlockData.mockResolvedValue(undefined);
 
       const proposal = await makeCheckpointProposal({ lastBlock: {} });
       await (validatorClient.getProposalHandler() as TestProposalHandler).uploadBlobsForCheckpoint(
@@ -1050,7 +1057,7 @@ describe('ValidatorClient', () => {
 
     it('should not throw when blob upload fails', async () => {
       const mockBlock = L2Block.empty();
-      blockSource.getBlockHeaderByArchive.mockResolvedValue(makeBlockHeader());
+      blockSource.getBlockData.mockResolvedValue({ header: makeBlockHeader() } as any);
       blockSource.getBlocksForSlot.mockResolvedValue([mockBlock]);
       blobClient.sendBlobsToFilestore.mockRejectedValue(new Error('upload failed'));
 
diff --git a/yarn-project/validator-client/src/validator.ts b/yarn-project/validator-client/src/validator.ts
index 1181558d5d92..d92a51717233 100644
--- a/yarn-project/validator-client/src/validator.ts
+++ b/yarn-project/validator-client/src/validator.ts
@@ -30,6 +30,7 @@ import {
   CheckpointProposal,
   type CheckpointProposalCore,
   type CheckpointProposalOptions,
+  type CoordinationSignatureContext,
 } from '@aztec/stdlib/p2p';
 import type { CheckpointHeader } from '@aztec/stdlib/rollup';
 import type { BlockHeader, Tx } from '@aztec/stdlib/tx';
@@ -115,7 +116,11 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
     this.tracer = telemetry.getTracer('Validator');
     this.metrics = new ValidatorMetrics(telemetry);
 
-    this.validationService = new ValidationService(keyStore, this.log.createChild('validation-service'));
+    this.validationService = new ValidationService(
+      keyStore,
+      this.getSignatureContext(),
+      this.log.createChild('validation-service'),
+    );
 
     // Refresh epoch cache every second to trigger alert if participation in committee changes
     this.epochCacheUpdateLoop = new RunningPromise(this.handleEpochCommitteeUpdate.bind(this), this.log, 1000);
@@ -196,6 +201,11 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
     const blockProposalValidator = new BlockProposalValidator(epochCache, {
       txsPermitted: !config.disableTransactions,
       maxTxsPerBlock: config.validateMaxTxsPerBlock,
+      maxBlocksPerCheckpoint: config.maxBlocksPerCheckpoint,
+      signatureContext: {
+        chainId: config.l1ChainId,
+        rollupAddress: config.l1Contracts.rollupAddress,
+      },
     });
     const proposalHandler = new ProposalHandler(
       checkpointsBuilder,
@@ -275,6 +285,13 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
     return this.keyStore.signTypedDataWithAddress(addr, msg, context);
   }
 
+  private getSignatureContext(): CoordinationSignatureContext {
+    return {
+      chainId: this.config.l1ChainId,
+      rollupAddress: this.config.l1Contracts.rollupAddress,
+    };
+  }
+
   public getCoinbaseForAttestor(attestor: EthAddress): EthAddress {
     return this.keyStore.getCoinbaseAddress(attestor);
   }
@@ -294,7 +311,11 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
   public reloadKeystore(newManager: KeystoreManager): void {
     const newAdapter = NodeKeystoreAdapter.fromKeyStoreManager(newManager);
     this.keyStore = new HAKeyStore(newAdapter, this.slashingProtectionSigner);
-    this.validationService = new ValidationService(this.keyStore, this.log.createChild('validation-service'));
+    this.validationService = new ValidationService(
+      this.keyStore,
+      this.getSignatureContext(),
+      this.log.createChild('validation-service'),
+    );
   }
 
   public async start() {
@@ -624,7 +645,7 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
    */
   protected async uploadBlobsForCheckpoint(proposal: CheckpointProposalCore, proposalInfo: LogData): Promise<void> {
     try {
-      const lastBlockHeader = await this.blockSource.getBlockHeaderByArchive(proposal.archive);
+      const lastBlockHeader = (await this.blockSource.getBlockData({ archive: proposal.archive }))?.header;
       if (!lastBlockHeader) {
         this.log.warn(`Failed to get last block header for blob upload`, proposalInfo);
         return;
@@ -860,31 +881,21 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
 
     await this.collectOwnAttestations(proposal, checkpointNumber);
 
-    const proposalId = proposal.archive.toString();
+    const proposalPayloadHash = proposal.getPayloadHash();
     const myAddresses = this.getValidatorAddresses();
 
     let attestations: CheckpointAttestation[] = [];
     while (true) {
-      // Filter out attestations with a mismatching archive. This should NOT happen since we have verified
-      // the proposer signature (ie our own) before accepting the attestation into the pool via the p2p client.
-      const collectedAttestations = (await this.p2pClient.getCheckpointAttestationsForSlot(slot, proposalId)).filter(
-        attestation => {
-          if (!attestation.archive.equals(proposal.archive)) {
-            this.log.warn(
-              `Received attestation for slot ${slot} with mismatched archive from ${attestation.getSender()?.toString()}`,
-              { attestationArchive: attestation.archive.toString(), proposalArchive: proposal.archive.toString() },
-            );
-            return false;
-          }
-          return true;
-        },
-      );
+      // The pool already filters by proposal payload hash; if any attestation slips through with a
+      // mismatched payload hash, drop it defensively. Equivocations are emitted as separate slash
+      // events from libp2p_service.
+      const collectedAttestations = await this.p2pClient.getCheckpointAttestationsForSlot(slot, proposalPayloadHash);
 
       // Log new attestations we collected
       const oldSenders = attestations.map(attestation => attestation.getSender());
       for (const collected of collectedAttestations) {
         const collectedSender = collected.getSender();
-        // Skip attestations with invalid signatures
+        // Skip attestations with invalid signatures. Should not happen as we don't add invalid attestations to our pool.
         if (!collectedSender) {
           this.log.warn(`Skipping attestation with invalid signature for slot ${slot}`);
           continue;
diff --git a/yarn-project/wallet-sdk/src/base-wallet/base_wallet.ts b/yarn-project/wallet-sdk/src/base-wallet/base_wallet.ts
index e68155d67a81..0aeb23222d54 100644
--- a/yarn-project/wallet-sdk/src/base-wallet/base_wallet.ts
+++ b/yarn-project/wallet-sdk/src/base-wallet/base_wallet.ts
@@ -85,7 +85,7 @@ export type FeeOptions = {
 /** Options for `simulateViaEntrypoint`. */
 export type SimulateViaEntrypointOptions = Pick<
   SimulateOptions,
-  'from' | 'additionalScopes' | 'skipTxValidation' | 'skipFeeEnforcement' | 'sendMessagesAs'
+  'from' | 'additionalScopes' | 'skipTxValidation' | 'skipFeeEnforcement' | 'sendMessagesAs' | 'overrides'
 > & {
   /** Fee options for the entrypoint */
   feeOptions: FeeOptions;
@@ -348,6 +348,10 @@ export abstract class BaseWallet implements Wallet {
     return instance;
   }
 
+  registerContractClass(artifact: ContractArtifact): Promise<void> {
+    return this.pxe.registerContractClass(artifact);
+  }
+
   /**
    * Simulates calls through the standard PXE path (account entrypoint).
    * @param executionPayload - The execution payload to simulate.
@@ -365,6 +369,7 @@ export abstract class BaseWallet implements Wallet {
       skipFeeEnforcement: opts.skipFeeEnforcement,
       scopes: this.scopesFrom(opts.from, opts.additionalScopes),
       senderForTags: this.senderForTagsFrom(opts.from, opts.sendMessagesAs),
+      overrides: opts.overrides,
     });
     const appCallOffset = await this.computeAppCallOffset(opts.from, opts.feeOptions);
     return TxSimulationResultWithAppOffset.fromResultAndOffset(result, appCallOffset);
@@ -413,7 +418,7 @@ export abstract class BaseWallet implements Wallet {
     try {
       blockHeader = await this.pxe.getSyncedBlockHeader();
     } catch {
-      blockHeader = (await this.aztecNode.getBlockHeader())!;
+      blockHeader = (await this.aztecNode.getBlockHeader('latest'))!;
     }
 
     const simulationOrigin = opts.from === NO_FROM ? AztecAddress.ZERO : opts.from;
@@ -428,6 +433,7 @@ export abstract class BaseWallet implements Wallet {
             blockHeader,
             opts.skipFeeEnforcement ?? true,
             this.getContractName.bind(this),
+            opts.overrides,
           )
         : Promise.resolve([]),
       remainingCalls.length > 0
@@ -438,6 +444,7 @@ export abstract class BaseWallet implements Wallet {
             skipTxValidation: opts.skipTxValidation,
             skipFeeEnforcement: opts.skipFeeEnforcement ?? true,
             sendMessagesAs: opts.sendMessagesAs,
+            overrides: opts.overrides,
           })
         : Promise.resolve(null),
     ]);
diff --git a/yarn-project/wallet-sdk/src/base-wallet/utils.ts b/yarn-project/wallet-sdk/src/base-wallet/utils.ts
index 6bc1423f8aba..0a22864c4b61 100644
--- a/yarn-project/wallet-sdk/src/base-wallet/utils.ts
+++ b/yarn-project/wallet-sdk/src/base-wallet/utils.ts
@@ -25,6 +25,7 @@ import {
   PrivateCallExecutionResult,
   PrivateExecutionResult,
   PublicSimulationOutput,
+  type SimulationOverrides,
   Tx,
   TxContext,
   TxSimulationResult,
@@ -65,6 +66,8 @@ export function extractOptimizablePublicStaticCalls(payload: ExecutionPayload):
  * @param gasSettings - Gas settings for the transaction.
  * @param blockHeader - Block header to use as anchor.
  * @param skipFeeEnforcement - Whether to skip fee enforcement during simulation.
+ * @param getContractName - Resolver for contract names (used for debug log display).
+ * @param overrides - Optional pre-simulation overrides applied to the ephemeral fork and contract DB.
  * @returns TxSimulationResult with public return values.
  */
 async function simulateBatchViaNode(
@@ -76,6 +79,7 @@ async function simulateBatchViaNode(
   blockHeader: BlockHeader,
   skipFeeEnforcement: boolean,
   getContractName: ContractNameResolver,
+  overrides?: SimulationOverrides,
 ): Promise<TxSimulationResult> {
   const txContext = new TxContext(chainInfo.chainId, chainInfo.version, gasSettings);
 
@@ -143,7 +147,7 @@ async function simulateBatchViaNode(
     publicFunctionCalldata: publicFunctionCalldata,
   });
 
-  const publicOutput = await node.simulatePublicCalls(tx, skipFeeEnforcement);
+  const publicOutput = await node.simulatePublicCalls(tx, skipFeeEnforcement, overrides);
 
   if (publicOutput.revertReason) {
     throw publicOutput.revertReason;
@@ -166,6 +170,8 @@ async function simulateBatchViaNode(
  * @param gasSettings - Gas settings for the transaction.
  * @param blockHeader - Block header to use as anchor.
  * @param skipFeeEnforcement - Whether to skip fee enforcement during simulation.
+ * @param getContractName - Resolver for contract names (used for debug log display).
+ * @param overrides - Optional pre-simulation overrides applied to the ephemeral fork and contract DB.
  * @returns Array of TxSimulationResult, one per batch.
  */
 export async function simulateViaNode(
@@ -177,6 +183,7 @@ export async function simulateViaNode(
   blockHeader: BlockHeader,
   skipFeeEnforcement: boolean = true,
   getContractName: ContractNameResolver,
+  overrides?: SimulationOverrides,
 ): Promise<TxSimulationResult[]> {
   const batches: FunctionCall[][] = [];
 
@@ -196,6 +203,7 @@ export async function simulateViaNode(
       blockHeader,
       skipFeeEnforcement,
       getContractName,
+      overrides,
     );
     results.push(result);
   }
diff --git a/yarn-project/wallet-sdk/src/extension/handlers/background_connection_handler.ts b/yarn-project/wallet-sdk/src/extension/handlers/background_connection_handler.ts
index a37af4f8007d..ddb9e75ee66a 100644
--- a/yarn-project/wallet-sdk/src/extension/handlers/background_connection_handler.ts
+++ b/yarn-project/wallet-sdk/src/extension/handlers/background_connection_handler.ts
@@ -17,6 +17,7 @@ import {
   type WalletMessage,
   WalletMessageType,
   type WalletResponse,
+  type WalletSdkLogger,
 } from '../../types.js';
 import {
   type BackgroundMessage,
@@ -131,6 +132,8 @@ export interface BackgroundConnectionConfig {
   walletVersion: string;
   /** Optional wallet icon URL. */
   walletIcon?: string;
+  /** Logger used for diagnostics. */
+  logger: WalletSdkLogger;
 }
 
 /**
@@ -149,6 +152,7 @@ export interface BackgroundConnectionConfig {
  *     walletId: 'my-wallet',
  *     walletName: 'My Wallet',
  *     walletVersion: '1.0.0',
+ *     logger: console,
  *   },
  *   {
  *     sendToTab: (tabId, message) => browser.tabs.sendMessage(tabId, message),
@@ -167,12 +171,15 @@ export interface BackgroundConnectionConfig {
 export class BackgroundConnectionHandler {
   private pendingDiscoveries = new Map<string, PendingDiscovery>();
   private activeSessions = new Map<string, ActiveSession>();
+  private log: WalletSdkLogger;
 
   constructor(
     private config: BackgroundConnectionConfig,
     private transport: BackgroundTransport,
     private callbacks: BackgroundConnectionCallbacks = {},
-  ) {}
+  ) {
+    this.log = config.logger;
+  }
 
   initialize(): void {
     this.transport.addContentListener(this.handleMessage);
@@ -198,8 +205,8 @@ export class BackgroundConnectionHandler {
         break;
       case InternalMessageType.KEY_EXCHANGE_REQUEST:
         if (sessionId) {
-          this.handleKeyExchangeRequest(sessionId, content as KeyExchangeRequest).catch(() => {
-            // Key exchange failed - session won't be established
+          this.handleKeyExchangeRequest(sessionId, content as KeyExchangeRequest).catch(err => {
+            this.log.warn('Key exchange failed — session will not be established', { sessionId, err });
           });
         }
         break;
@@ -213,9 +220,31 @@ export class BackgroundConnectionHandler {
           void this.handleEncryptedMessage(sessionId, content as EncryptedPayload);
         }
         break;
+      case InternalMessageType.PING:
+        if (sessionId) {
+          this.handlePing(sessionId);
+        }
+        break;
     }
   };
 
+  /**
+   * Reply to a dApp PING with a PONG. Used as a liveness probe so the dApp can
+   * tell the difference between a slow request and a dead extension.
+   * @param sessionId - The session that sent the PING.
+   */
+  private handlePing(sessionId: string): void {
+    const session = this.activeSessions.get(sessionId);
+    if (!session) {
+      return;
+    }
+    this.transport.sendToTab(session.tabId, {
+      origin: MessageOrigin.BACKGROUND,
+      type: InternalMessageType.PONG,
+      sessionId,
+    });
+  }
+
   getWalletInfo(): WalletInfo {
     return {
       id: this.config.walletId,
@@ -315,8 +344,8 @@ export class BackgroundConnectionHandler {
       });
 
       this.callbacks.onSessionEstablished?.(session);
-    } catch {
-      // Key exchange failed silently - session won't be established
+    } catch (err) {
+      this.log.warn('Key exchange failed — session will not be established', { sessionId, err });
     }
   }
 
@@ -329,8 +358,8 @@ export class BackgroundConnectionHandler {
     try {
       const message = await decrypt<WalletMessage>(session.sharedKey, encrypted);
       this.callbacks.onWalletMessage?.(session, message);
-    } catch {
-      // Decryption failed - ignore malformed message
+    } catch (err) {
+      this.log.warn('Failed to decrypt incoming wallet message', { sessionId, err });
     }
   }
 
@@ -348,8 +377,12 @@ export class BackgroundConnectionHandler {
         sessionId,
         content: encrypted,
       });
-    } catch {
-      // Encryption failed - response won't be sent
+    } catch (err) {
+      this.log.error('Failed to encrypt wallet response — response will not be sent', {
+        sessionId,
+        messageId: response.messageId,
+        err,
+      });
     }
   }
 
diff --git a/yarn-project/wallet-sdk/src/extension/handlers/content_script_connection_handler.ts b/yarn-project/wallet-sdk/src/extension/handlers/content_script_connection_handler.ts
index 7db32b726208..e0b6ba8d9806 100644
--- a/yarn-project/wallet-sdk/src/extension/handlers/content_script_connection_handler.ts
+++ b/yarn-project/wallet-sdk/src/extension/handlers/content_script_connection_handler.ts
@@ -139,9 +139,20 @@ export class ContentScriptConnectionHandler {
       case InternalMessageType.SESSION_DISCONNECTED:
         this.handleSessionDisconnected(sessionId);
         break;
+      case InternalMessageType.PONG:
+        this.handlePong(sessionId);
+        break;
     }
   };
 
+  private handlePong(sessionId: string): void {
+    const connection = this.ports.get(sessionId);
+    if (!connection) {
+      return;
+    }
+    connection.port.postMessage({ type: WalletMessageType.PONG });
+  }
+
   private handleDiscoveryRequest(request: DiscoveryRequest): void {
     this.transport.sendToBackground({
       origin: MessageOrigin.CONTENT_SCRIPT,
@@ -178,6 +189,13 @@ export class ContentScriptConnectionHandler {
             content: data,
           });
           break;
+        case WalletMessageType.PING:
+          this.transport.sendToBackground({
+            origin: MessageOrigin.CONTENT_SCRIPT,
+            type: InternalMessageType.PING,
+            sessionId,
+          });
+          break;
         default:
           this.transport.sendToBackground({
             origin: MessageOrigin.CONTENT_SCRIPT,
diff --git a/yarn-project/wallet-sdk/src/extension/handlers/internal_message_types.ts b/yarn-project/wallet-sdk/src/extension/handlers/internal_message_types.ts
index e1e0806836f3..a60d48590a24 100644
--- a/yarn-project/wallet-sdk/src/extension/handlers/internal_message_types.ts
+++ b/yarn-project/wallet-sdk/src/extension/handlers/internal_message_types.ts
@@ -9,11 +9,13 @@ export const InternalMessageType = {
   KEY_EXCHANGE_REQUEST: 'key-exchange-request',
   SECURE_MESSAGE: 'secure-message',
   DISCONNECT_REQUEST: 'disconnect-request',
+  PING: 'ping',
   // Background → Content script
   DISCOVERY_APPROVED: 'discovery-approved',
   KEY_EXCHANGE_RESPONSE: 'key-exchange-response',
   SECURE_RESPONSE: 'secure-response',
   SESSION_DISCONNECTED: 'session-disconnected',
+  PONG: 'pong',
 } as const;
 
 /**
diff --git a/yarn-project/wallet-sdk/src/extension/provider/extension_wallet.test.ts b/yarn-project/wallet-sdk/src/extension/provider/extension_wallet.test.ts
new file mode 100644
index 000000000000..9aee036e7b64
--- /dev/null
+++ b/yarn-project/wallet-sdk/src/extension/provider/extension_wallet.test.ts
@@ -0,0 +1,153 @@
+import type { ChainInfo } from '@aztec/aztec.js/account';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { jsonStringify } from '@aztec/foundation/json-rpc';
+import { promiseWithResolvers } from '@aztec/foundation/promise';
+import { sleep } from '@aztec/foundation/sleep';
+
+import {
+  type EncryptedPayload,
+  decrypt,
+  deriveSessionKeys,
+  encrypt,
+  exportPublicKey,
+  generateKeyPair,
+  importPublicKey,
+} from '../../crypto.js';
+import { type WalletMessage, WalletMessageType, type WalletResponse } from '../../types.js';
+import { ExtensionWallet } from './extension_wallet.js';
+
+async function makeSharedKeys(): Promise<{ appKey: CryptoKey; walletKey: CryptoKey }> {
+  const appPair = await generateKeyPair();
+  const walletPair = await generateKeyPair();
+
+  const appPub = await exportPublicKey(appPair.publicKey);
+  const walletPub = await exportPublicKey(walletPair.publicKey);
+
+  const appSession = await deriveSessionKeys(appPair, await importPublicKey(walletPub), true);
+  const walletSession = await deriveSessionKeys(walletPair, await importPublicKey(appPub), false);
+
+  return { appKey: appSession.encryptionKey, walletKey: walletSession.encryptionKey };
+}
+
+const chainInfo: ChainInfo = { chainId: new Fr(1), version: new Fr(1) };
+
+// Tight heartbeat tuning so tests run quickly. Real defaults (5s/300s) would take
+// a minute per test.
+const FAST_HEARTBEAT = { intervalMs: 50, deadAfterMs: 250 };
+
+describe('ExtensionWallet heartbeat', () => {
+  it('treats PONG as proof of liveness — no false disconnect on slow but alive peer', async () => {
+    const { appKey, walletKey } = await makeSharedKeys();
+    const channel = new MessageChannel();
+    const walletId = 'test-wallet';
+
+    const requestArrived = promiseWithResolvers<WalletMessage>();
+    let pongs = 0;
+
+    channel.port2.onmessage = async (event: MessageEvent) => {
+      const data = event.data;
+      if (data?.type === WalletMessageType.PING) {
+        pongs++;
+        channel.port2.postMessage({ type: WalletMessageType.PONG });
+        return;
+      }
+      const decoded = await decrypt<WalletMessage>(walletKey, data as EncryptedPayload);
+      requestArrived.resolve(decoded);
+    };
+    channel.port2.start();
+
+    const extWallet = ExtensionWallet.create(
+      walletId,
+      channel.port1,
+      appKey,
+      chainInfo,
+      'test-app',
+      undefined,
+      FAST_HEARTBEAT,
+    );
+    const wallet = extWallet.asWallet();
+
+    const pending = wallet.getChainInfo();
+    pending.catch(() => {});
+    const message = await requestArrived.promise;
+
+    // Let several heartbeat ticks fire while the peer responds with PONGs only —
+    // no real response yet. This is the slow-but-alive-wallet scenario. Wait
+    // ~3× the dead-after window to prove that PONGs alone keep the channel alive.
+    await sleep(FAST_HEARTBEAT.deadAfterMs * 3);
+
+    expect(pongs).toBeGreaterThan(0);
+    expect(extWallet.isDisconnected()).toBe(false);
+
+    // Now have the wallet respond. The dApp must settle the promise — the channel
+    // is alive. We send an error to avoid having to construct a schema-valid
+    // result object; what matters here is that the in-flight promise *settles*
+    // rather than hanging forever after the heartbeat-eligible window passes.
+    const response: WalletResponse = {
+      messageId: message.messageId,
+      error: 'simulated wallet response',
+      walletId,
+    };
+    const encrypted = await encrypt(walletKey, jsonStringify(response));
+    // Wallet side posts on port2 so the dApp receives on port1.
+    channel.port2.postMessage(encrypted);
+
+    await expect(pending).rejects.toThrow(/simulated/);
+
+    channel.port1.close();
+    channel.port2.close();
+  });
+
+  it('declares disconnect when the channel is fully silent past the dead window', async () => {
+    const { appKey } = await makeSharedKeys();
+    const channel = new MessageChannel();
+    // Deliberately do NOT wire up port2 — peer is fully unresponsive.
+    channel.port2.start();
+
+    const extWallet = ExtensionWallet.create(
+      'dead-wallet',
+      channel.port1,
+      appKey,
+      chainInfo,
+      'test-app',
+      undefined,
+      FAST_HEARTBEAT,
+    );
+    const wallet = extWallet.asWallet();
+
+    let disconnected = false;
+    extWallet.onDisconnect(() => {
+      disconnected = true;
+    });
+
+    const pending = wallet.getChainInfo();
+
+    await expect(pending).rejects.toThrow(/disconnected/i);
+    expect(disconnected).toBe(true);
+    expect(extWallet.isDisconnected()).toBe(true);
+
+    channel.port2.close();
+  });
+
+  it('does not start a heartbeat when there are no in-flight requests', async () => {
+    const { appKey } = await makeSharedKeys();
+    const channel = new MessageChannel();
+
+    let pings = 0;
+    channel.port2.onmessage = (event: MessageEvent) => {
+      if (event.data?.type === WalletMessageType.PING) {
+        pings++;
+      }
+    };
+    channel.port2.start();
+
+    ExtensionWallet.create('idle-wallet', channel.port1, appKey, chainInfo, 'test-app', undefined, FAST_HEARTBEAT);
+
+    await sleep(150);
+
+    expect(pings).toBe(0);
+
+    channel.port1.close();
+    channel.port2.close();
+  });
+});
diff --git a/yarn-project/wallet-sdk/src/extension/provider/extension_wallet.ts b/yarn-project/wallet-sdk/src/extension/provider/extension_wallet.ts
index 35cdbf4bea68..c42ed7fa0008 100644
--- a/yarn-project/wallet-sdk/src/extension/provider/extension_wallet.ts
+++ b/yarn-project/wallet-sdk/src/extension/provider/extension_wallet.ts
@@ -6,7 +6,17 @@ import { schemaHasMethod } from '@aztec/foundation/schemas';
 import type { FunctionsOf } from '@aztec/foundation/types';
 
 import { type EncryptedPayload, decrypt, encrypt } from '../../crypto.js';
-import { type DisconnectCallback, type WalletMessage, WalletMessageType, type WalletResponse } from '../../types.js';
+import {
+  DEFAULT_HEARTBEAT_DEAD_AFTER_MS,
+  DEFAULT_HEARTBEAT_INTERVAL_MS,
+  type DisconnectCallback,
+  type HeartbeatOptions,
+  NOOP_LOGGER,
+  type WalletMessage,
+  WalletMessageType,
+  type WalletResponse,
+  type WalletSdkLogger,
+} from '../../types.js';
 
 /**
  * Internal type representing a wallet method call before encryption.
@@ -55,6 +65,11 @@ export class ExtensionWallet {
   private inFlight = new Map<string, PromiseWithResolvers<unknown>>();
   private disconnected = false;
   private disconnectCallbacks: DisconnectCallback[] = [];
+  private heartbeatTimer: ReturnType<typeof setInterval> | null = null;
+  private lastInboundAt = 0;
+  private log: WalletSdkLogger;
+  private heartbeatIntervalMs: number;
+  private heartbeatDeadAfterMs: number;
 
   /**
    * Private constructor - use {@link ExtensionWallet.create} to instantiate.
@@ -63,6 +78,8 @@ export class ExtensionWallet {
    * @param extensionId - The unique identifier of the target wallet extension
    * @param port - The MessagePort for private communication with the wallet
    * @param sharedKey - The derived AES-256-GCM shared key for encryption
+   * @param logger - Optional logger; defaults to a no-op logger
+   * @param heartbeatOptions - Optional heartbeat tuning (mostly useful for tests)
    */
   private constructor(
     private chainInfo: ChainInfo,
@@ -70,7 +87,13 @@ export class ExtensionWallet {
     private extensionId: string,
     private port: MessagePort,
     private sharedKey: CryptoKey,
-  ) {}
+    logger?: WalletSdkLogger,
+    heartbeatOptions?: HeartbeatOptions,
+  ) {
+    this.log = logger ?? NOOP_LOGGER;
+    this.heartbeatIntervalMs = heartbeatOptions?.intervalMs ?? DEFAULT_HEARTBEAT_INTERVAL_MS;
+    this.heartbeatDeadAfterMs = heartbeatOptions?.deadAfterMs ?? DEFAULT_HEARTBEAT_DEAD_AFTER_MS;
+  }
 
   /**
    * Creates a Wallet that communicates with a browser extension
@@ -81,6 +104,8 @@ export class ExtensionWallet {
    * @param sharedKey - The derived AES-256-GCM shared key for encryption
    * @param chainInfo - The chain information (chainId and version) for request context
    * @param appId - Application identifier used to identify the requesting dApp to the wallet
+   * @param logger - Optional logger; defaults to a no-op logger to keep extension/page bundles small
+   * @param heartbeatOptions - Optional override for heartbeat tuning (mostly useful for tests)
    * @returns A Wallet interface where all method calls are encrypted
    *
    * @example
@@ -104,13 +129,17 @@ export class ExtensionWallet {
     sharedKey: CryptoKey,
     chainInfo: ChainInfo,
     appId: string,
+    logger?: WalletSdkLogger,
+    heartbeatOptions?: HeartbeatOptions,
   ): ExtensionWallet {
-    const wallet = new ExtensionWallet(chainInfo, appId, extensionId, port, sharedKey);
+    const wallet = new ExtensionWallet(chainInfo, appId, extensionId, port, sharedKey, logger, heartbeatOptions);
 
     // Set up message handler for encrypted responses and unencrypted control messages
     wallet.port.onmessage = (event: MessageEvent) => {
       const data = event.data;
-      // Check for unencrypted disconnect notification
+      // Any inbound traffic counts as proof of liveness.
+      wallet.lastInboundAt = Date.now();
+
       if (data && typeof data === 'object' && 'type' in data && data.type === WalletMessageType.DISCONNECT) {
         wallet.handleDisconnect();
         return;
@@ -184,8 +213,10 @@ export class ExtensionWallet {
         resolve(result);
       }
       this.inFlight.delete(messageId);
-      // eslint-disable-next-line no-empty
-    } catch {}
+      this.maybeStopHeartbeat();
+    } catch (err) {
+      this.log.warn('Failed to decrypt wallet response', { err });
+    }
   }
 
   /**
@@ -223,9 +254,59 @@ export class ExtensionWallet {
 
     const { promise, resolve, reject } = promiseWithResolvers<unknown>();
     this.inFlight.set(messageId, { promise, resolve, reject });
+    this.startHeartbeat();
     return promise;
   }
 
+  /**
+   * Start the heartbeat probe loop while at least one request is in flight.
+   * Idempotent — calling while already running is a no-op.
+   *
+   * Heartbeat is opt-in via wire protocol: PINGs are unencrypted control messages
+   * (like DISCONNECT). Older wallets that do not understand PING simply drop it,
+   * which is safe — we only declare disconnect when **no** inbound traffic of any
+   * kind (PONG, encrypted response, DISCONNECT) arrives within the dead window.
+   * A wallet that is processing a slow request will reset the timer when it
+   * eventually responds, so this never causes false disconnects on legacy peers.
+   */
+  private startHeartbeat(): void {
+    if (this.heartbeatTimer !== null || this.disconnected) {
+      return;
+    }
+    this.lastInboundAt = Date.now();
+    this.heartbeatTimer = setInterval(() => this.heartbeatTick(), this.heartbeatIntervalMs);
+  }
+
+  private maybeStopHeartbeat(): void {
+    if (this.inFlight.size === 0 && this.heartbeatTimer !== null) {
+      clearInterval(this.heartbeatTimer);
+      this.heartbeatTimer = null;
+    }
+  }
+
+  private heartbeatTick(): void {
+    if (this.disconnected || this.inFlight.size === 0) {
+      this.maybeStopHeartbeat();
+      return;
+    }
+
+    const idleMs = Date.now() - this.lastInboundAt;
+    if (idleMs >= this.heartbeatDeadAfterMs) {
+      this.log.warn('Wallet channel unresponsive — declaring disconnect', {
+        idleMs,
+        inFlight: this.inFlight.size,
+      });
+      this.handleDisconnect();
+      return;
+    }
+
+    try {
+      this.port.postMessage({ type: WalletMessageType.PING });
+    } catch (err) {
+      this.log.warn('Failed to send heartbeat PING', { err });
+    }
+  }
+
   /**
    * Handles wallet disconnection.
    * Rejects all pending requests and notifies registered callbacks.
@@ -237,6 +318,11 @@ export class ExtensionWallet {
     }
     this.disconnected = true;
 
+    if (this.heartbeatTimer !== null) {
+      clearInterval(this.heartbeatTimer);
+      this.heartbeatTimer = null;
+    }
+
     if (this.port) {
       this.port.onmessage = null;
       this.port.close();
diff --git a/yarn-project/wallet-sdk/src/iframe/handlers/iframe_connection_handler.ts b/yarn-project/wallet-sdk/src/iframe/handlers/iframe_connection_handler.ts
index 5605206fa985..fdb53c92f67b 100644
--- a/yarn-project/wallet-sdk/src/iframe/handlers/iframe_connection_handler.ts
+++ b/yarn-project/wallet-sdk/src/iframe/handlers/iframe_connection_handler.ts
@@ -14,7 +14,6 @@
  * so the dApp knows it can send a discovery request.
  */
 import type { ChainInfo } from '@aztec/aztec.js/account';
-import { createLogger } from '@aztec/aztec.js/log';
 import type { Wallet } from '@aztec/aztec.js/wallet';
 import { WalletSchema } from '@aztec/aztec.js/wallet';
 import { jsonStringify } from '@aztec/foundation/json-rpc';
@@ -29,7 +28,7 @@ import {
   generateKeyPair,
   importPublicKey,
 } from '../../crypto.js';
-import { type WalletMessage, WalletMessageType, type WalletResponse } from '../../types.js';
+import { type WalletMessage, WalletMessageType, type WalletResponse, type WalletSdkLogger } from '../../types.js';
 
 /**
  * A pending discovery request from a dApp (before user approval).
@@ -75,6 +74,8 @@ export interface IframeConnectionConfig {
   walletIcon?: string;
   /** Origins allowed to connect. If empty or undefined, all origins are allowed (dev mode). */
   allowedOrigins?: string[];
+  /** Logger used for diagnostics. */
+  logger: WalletSdkLogger;
 }
 
 /**
@@ -105,7 +106,7 @@ export interface IframeConnectionCallbacks {
  * @example
  * ```typescript
  * const handler = new IframeConnectionHandler(
- *   { walletId: 'my-wallet', walletName: 'My Wallet', walletVersion: '1.0.0' },
+ *   { walletId: 'my-wallet', walletName: 'My Wallet', walletVersion: '1.0.0', logger: console },
  *   {
  *     onPendingDiscovery: (session) => showApprovalUI(session),
  *     getWallet: (appId, chainInfo) => createWalletForApp(appId, chainInfo),
@@ -117,12 +118,14 @@ export interface IframeConnectionCallbacks {
 export class IframeConnectionHandler {
   private pendingSessions = new Map<string, PendingSession>();
   private activeSessions = new Map<string, ActiveSession>();
-  private log = createLogger('wallet:iframe-handler');
+  private log: WalletSdkLogger;
 
   constructor(
     private config: IframeConnectionConfig,
     private callbacks: IframeConnectionCallbacks,
-  ) {}
+  ) {
+    this.log = config.logger;
+  }
 
   start(): void {
     window.addEventListener('message', this.handleMessage);
@@ -203,7 +206,18 @@ export class IframeConnectionHandler {
       case WalletMessageType.DISCONNECT:
         this.terminateSession(msg.sessionId);
         break;
+      case WalletMessageType.PING:
+        this.handlePing(msg.sessionId);
+        break;
+    }
+  }
+
+  private handlePing(sessionId: string): void {
+    const session = this.activeSessions.get(sessionId);
+    if (!session) {
+      return;
     }
+    this.postToOrigin(session.origin, { type: WalletMessageType.PONG, sessionId });
   }
 
   private handleDiscoveryRequest(msg: Record<string, unknown>, origin: string): void {
diff --git a/yarn-project/wallet-sdk/src/iframe/provider/iframe_wallet.ts b/yarn-project/wallet-sdk/src/iframe/provider/iframe_wallet.ts
index 64b496177551..47a72cf14ef2 100644
--- a/yarn-project/wallet-sdk/src/iframe/provider/iframe_wallet.ts
+++ b/yarn-project/wallet-sdk/src/iframe/provider/iframe_wallet.ts
@@ -14,7 +14,17 @@ import { schemaHasMethod } from '@aztec/foundation/schemas';
 import type { FunctionsOf } from '@aztec/foundation/types';
 
 import { type EncryptedPayload, decrypt, encrypt } from '../../crypto.js';
-import { type DisconnectCallback, type WalletMessage, WalletMessageType, type WalletResponse } from '../../types.js';
+import {
+  DEFAULT_HEARTBEAT_DEAD_AFTER_MS,
+  DEFAULT_HEARTBEAT_INTERVAL_MS,
+  type DisconnectCallback,
+  type HeartbeatOptions,
+  NOOP_LOGGER,
+  type WalletMessage,
+  WalletMessageType,
+  type WalletResponse,
+  type WalletSdkLogger,
+} from '../../types.js';
 
 /**
  * Internal type representing a wallet method call before encryption.
@@ -46,6 +56,11 @@ export class IframeWallet {
   private disconnected = false;
   private disconnectCallbacks: DisconnectCallback[] = [];
   private messageListener: ((e: MessageEvent) => void) | null = null;
+  private heartbeatTimer: ReturnType<typeof setInterval> | null = null;
+  private lastInboundAt = 0;
+  private log: WalletSdkLogger;
+  private heartbeatIntervalMs: number;
+  private heartbeatDeadAfterMs: number;
 
   private constructor(
     private chainInfo: ChainInfo,
@@ -55,7 +70,13 @@ export class IframeWallet {
     private iframeWindow: Window,
     private walletOrigin: string,
     private sharedKey: CryptoKey,
-  ) {}
+    logger?: WalletSdkLogger,
+    heartbeatOptions?: HeartbeatOptions,
+  ) {
+    this.log = logger ?? NOOP_LOGGER;
+    this.heartbeatIntervalMs = heartbeatOptions?.intervalMs ?? DEFAULT_HEARTBEAT_INTERVAL_MS;
+    this.heartbeatDeadAfterMs = heartbeatOptions?.deadAfterMs ?? DEFAULT_HEARTBEAT_DEAD_AFTER_MS;
+  }
 
   /**
    * Creates a proxied IframeWallet that implements the {@link Wallet} interface.
@@ -71,6 +92,8 @@ export class IframeWallet {
    * @param sharedKey - AES-256-GCM key derived from ECDH key exchange
    * @param chainInfo - Network information (chainId and version)
    * @param appId - Application identifier for the requesting dApp
+   * @param logger - Optional logger; defaults to a no-op logger to keep extension/page bundles small
+   * @param heartbeatOptions - Optional override for heartbeat tuning (mostly useful for tests)
    * @returns A proxied IframeWallet — call `.asWallet()` to get the typed `Wallet`
    */
   static create(
@@ -81,8 +104,20 @@ export class IframeWallet {
     sharedKey: CryptoKey,
     chainInfo: ChainInfo,
     appId: string,
+    logger?: WalletSdkLogger,
+    heartbeatOptions?: HeartbeatOptions,
   ): IframeWallet {
-    const wallet = new IframeWallet(chainInfo, appId, walletId, sessionId, iframeWindow, walletOrigin, sharedKey);
+    const wallet = new IframeWallet(
+      chainInfo,
+      appId,
+      walletId,
+      sessionId,
+      iframeWindow,
+      walletOrigin,
+      sharedKey,
+      logger,
+      heartbeatOptions,
+    );
 
     wallet.messageListener = (event: MessageEvent) => {
       if (event.origin !== walletOrigin) {
@@ -93,9 +128,16 @@ export class IframeWallet {
         return;
       }
 
-      if (msg.type === WalletMessageType.SECURE_RESPONSE && msg.sessionId === sessionId) {
+      if (msg.sessionId !== sessionId) {
+        return;
+      }
+
+      // Any inbound traffic on our session counts as proof of liveness.
+      wallet.lastInboundAt = Date.now();
+
+      if (msg.type === WalletMessageType.SECURE_RESPONSE) {
         void wallet.handleEncryptedResponse(msg.encrypted as EncryptedPayload);
-      } else if (msg.type === WalletMessageType.SESSION_DISCONNECTED && msg.sessionId === sessionId) {
+      } else if (msg.type === WalletMessageType.SESSION_DISCONNECTED) {
         wallet.handleDisconnect();
       }
     };
@@ -148,8 +190,9 @@ export class IframeWallet {
         pending.resolve(result);
       }
       this.inFlight.delete(messageId);
-    } catch {
-      // Decryption errors are silently ignored (message not for us or corrupted)
+      this.maybeStopHeartbeat();
+    } catch (err) {
+      this.log.warn('Failed to decrypt wallet response', { err });
     }
   }
 
@@ -176,15 +219,66 @@ export class IframeWallet {
 
     const { promise, resolve, reject } = promiseWithResolvers<unknown>();
     this.inFlight.set(messageId, { promise, resolve, reject });
+    this.startHeartbeat();
     return promise;
   }
 
+  /**
+   * Start liveness probing while at least one request is in flight. PINGs are
+   * unencrypted control messages — older wallet handlers that don't understand
+   * them simply drop them, but any inbound traffic (PONG, encrypted response,
+   * disconnect notice) resets the idle timer, so a slow-but-alive legacy wallet
+   * never trips a false disconnect.
+   */
+  private startHeartbeat(): void {
+    if (this.heartbeatTimer !== null || this.disconnected) {
+      return;
+    }
+    this.lastInboundAt = Date.now();
+    this.heartbeatTimer = setInterval(() => this.heartbeatTick(), this.heartbeatIntervalMs);
+  }
+
+  private maybeStopHeartbeat(): void {
+    if (this.inFlight.size === 0 && this.heartbeatTimer !== null) {
+      clearInterval(this.heartbeatTimer);
+      this.heartbeatTimer = null;
+    }
+  }
+
+  private heartbeatTick(): void {
+    if (this.disconnected || this.inFlight.size === 0) {
+      this.maybeStopHeartbeat();
+      return;
+    }
+
+    const idleMs = Date.now() - this.lastInboundAt;
+    if (idleMs >= this.heartbeatDeadAfterMs) {
+      this.log.warn('Iframe wallet channel unresponsive — declaring disconnect', {
+        idleMs,
+        inFlight: this.inFlight.size,
+      });
+      this.handleDisconnect();
+      return;
+    }
+
+    try {
+      this.iframeWindow.postMessage({ type: WalletMessageType.PING, sessionId: this.sessionId }, this.walletOrigin);
+    } catch (err) {
+      this.log.warn('Failed to send heartbeat PING', { err });
+    }
+  }
+
   private handleDisconnect(): void {
     if (this.disconnected) {
       return;
     }
     this.disconnected = true;
 
+    if (this.heartbeatTimer !== null) {
+      clearInterval(this.heartbeatTimer);
+      this.heartbeatTimer = null;
+    }
+
     if (this.messageListener) {
       window.removeEventListener('message', this.messageListener);
       this.messageListener = null;
diff --git a/yarn-project/wallet-sdk/src/types.ts b/yarn-project/wallet-sdk/src/types.ts
index bf49000b747f..8907f3697a5f 100644
--- a/yarn-project/wallet-sdk/src/types.ts
+++ b/yarn-project/wallet-sdk/src/types.ts
@@ -25,6 +25,13 @@ export enum WalletMessageType {
   SECURE_RESPONSE = 'aztec-wallet-secure-response',
   /** Session disconnected notification */
   SESSION_DISCONNECTED = 'aztec-wallet-session-disconnected',
+  /** Liveness probe sent by the dApp while a request is in flight */
+  PING = 'aztec-wallet-ping',
+  /** Liveness response from the wallet. Any inbound message (including a regular
+   * encrypted response) is treated as proof of liveness, so a missing PONG alone
+   * never trips disconnect — the dApp also resets its liveness timer on traffic.
+   */
+  PONG = 'aztec-wallet-pong',
 }
 
 /**
@@ -143,3 +150,55 @@ export interface KeyExchangeResponse {
  * Callback invoked when a wallet connection is disconnected.
  */
 export type DisconnectCallback = () => void;
+
+/**
+ * Default heartbeat tuning shared by both transports.
+ *
+ * - `intervalMs`: how often the dApp sends PING probes while a request is in flight.
+ * - `deadAfterMs`: how long the channel can stay silent (no PONG, no encrypted
+ *   response, no DISCONNECT) before the dApp declares the wallet unreachable
+ *   and rejects all in-flight requests. Generous enough that long-running
+ *   operations (proveTx, sendTx) on legacy wallets that don't reply to PING
+ *   still succeed — any inbound traffic resets the timer.
+ */
+export const DEFAULT_HEARTBEAT_INTERVAL_MS = 5_000;
+export const DEFAULT_HEARTBEAT_DEAD_AFTER_MS = 300_000;
+
+/** Override knobs for the heartbeat — mostly useful for tests. */
+export interface HeartbeatOptions {
+  /** How often to send PING probes while a request is in flight (ms). */
+  intervalMs?: number;
+  /** Idle ceiling before declaring disconnect (ms). */
+  deadAfterMs?: number;
+}
+
+/**
+ * Minimal logger surface used by the wallet SDK.
+ *
+ * Defined locally so that wallet hosts (browser extensions, iframe wallet pages)
+ * can pass a simple `console`-backed logger without pulling in the full
+ * `@aztec/foundation` logging runtime, which is non-trivial to bundle in those
+ * contexts. Structurally compatible with `Logger` from `@aztec/foundation/log`,
+ * so dApp-side callers can pass that type directly.
+ */
+export interface WalletSdkLogger {
+  /** Diagnostic messages — typically discarded in production. */
+  debug: (message: string, data?: unknown) => void;
+  /** Informational messages — significant lifecycle events. */
+  info: (message: string, data?: unknown) => void;
+  /** Recoverable problems — channel decryption failure, missed heartbeats, etc. */
+  warn: (message: string, data?: unknown) => void;
+  /** Errors that prevent normal operation. */
+  error: (message: string, errOrData?: unknown, data?: unknown) => void;
+}
+
+/**
+ * No-op logger used as the default when callers don't provide one. Discards all
+ * messages — wallet hosts that want diagnostics should pass their own logger.
+ */
+export const NOOP_LOGGER: WalletSdkLogger = {
+  debug: () => {},
+  info: () => {},
+  warn: () => {},
+  error: () => {},
+};
diff --git a/yarn-project/wallets/src/embedded/embedded_wallet.ts b/yarn-project/wallets/src/embedded/embedded_wallet.ts
index 53eb6ef5875c..bfddd9907030 100644
--- a/yarn-project/wallets/src/embedded/embedded_wallet.ts
+++ b/yarn-project/wallets/src/embedded/embedded_wallet.ts
@@ -11,7 +11,7 @@ import type { AztecAsyncKVStore } from '@aztec/kv-store';
 import type { PXEConfig, PXECreationOptions } from '@aztec/pxe/client/lazy';
 import type { PXE } from '@aztec/pxe/server';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { getContractInstanceFromInstantiationParams } from '@aztec/stdlib/contract';
+import { getContractClassFromArtifact } from '@aztec/stdlib/contract';
 import { GasSettings } from '@aztec/stdlib/gas';
 import type { AztecNode } from '@aztec/stdlib/interfaces/client';
 import { deriveSigningKey } from '@aztec/stdlib/keys';
@@ -76,6 +76,10 @@ const DEFAULT_ESTIMATED_GAS_PADDING = 0.1;
 export class EmbeddedWallet extends BaseWallet {
   protected estimatedGasPadding = DEFAULT_ESTIMATED_GAS_PADDING;
 
+  // Stub class ids, populated on wallet startup
+  // to avoid redundant work per simulation
+  protected stubClassIds = new Map<AccountType, Fr>();
+
   constructor(
     pxe: PXE,
     aztecNode: AztecNode,
@@ -192,6 +196,25 @@ export class EmbeddedWallet extends BaseWallet {
     });
   }
 
+  /**
+   * Hashes and registers the stub class for every supported account type with PXE, populating
+   * stubClassIds. Called on wallet initialization.
+   */
+  async initStubClasses(): Promise<void> {
+    const schnorrArtifact = await this.accountContracts.getStubAccountContractArtifact('schnorr');
+    const { id: schnorrClassId } = await getContractClassFromArtifact(schnorrArtifact);
+    await this.pxe.registerContractClass(schnorrArtifact);
+
+    // ecdsa stubs share the same class id
+    const ecdsaArtifact = await this.accountContracts.getStubAccountContractArtifact('ecdsasecp256r1');
+    const { id: ecdsaClassId } = await getContractClassFromArtifact(ecdsaArtifact);
+    await this.pxe.registerContractClass(ecdsaArtifact);
+
+    this.stubClassIds.set('schnorr', schnorrClassId);
+    this.stubClassIds.set('ecdsasecp256k1', ecdsaClassId);
+    this.stubClassIds.set('ecdsasecp256r1', ecdsaClassId);
+  }
+
   /**
    * Builds contract overrides for all provided addresses by replacing their account contracts with stub implementations.
    * Uses a type-specific stub artifact so that the stub's constructor selector matches the real account's constructor.
@@ -205,7 +228,12 @@ export class EmbeddedWallet extends BaseWallet {
     for (const account of filtered) {
       const address = account.item;
       const { type } = await this.walletDB.retrieveAccount(address);
-      const stubArtifact = await this.accountContracts.getStubAccountContractArtifact(type);
+      const stubClassId = this.stubClassIds.get(type);
+      if (!stubClassId) {
+        throw new Error(
+          `Stub class for account type '${type}' was not registered at wallet init. This is a bug — initStubClasses should cover every supported AccountType.`,
+        );
+      }
 
       const originalAccount = await this.getAccountFromAddress(address);
       const completeAddress = originalAccount.getCompleteAddress();
@@ -216,15 +244,8 @@ export class EmbeddedWallet extends BaseWallet {
         );
       }
 
-      const stubConstructorArgs = type === 'schnorr' ? [Fr.ZERO, Fr.ZERO] : [Buffer.alloc(32), Buffer.alloc(32)];
-      const stubInstance = await getContractInstanceFromInstantiationParams(stubArtifact, {
-        salt: Fr.random(),
-        constructorArgs: stubConstructorArgs,
-      });
-
       contracts[address.toString()] = {
-        instance: stubInstance,
-        artifact: stubArtifact,
+        instance: { ...contractInstance, currentContractClassId: stubClassId },
       };
     }
 
@@ -250,7 +271,7 @@ export class EmbeddedWallet extends BaseWallet {
     const chainInfo = await this.getChainInfo();
 
     const accountOverrides = await this.buildAccountOverrides(scopes);
-    const overrides = new SimulationOverrides(accountOverrides);
+    const overrides = new SimulationOverrides({ contracts: accountOverrides });
 
     let txRequest: TxExecutionRequest;
     if (from === NO_FROM) {
@@ -360,7 +381,8 @@ export class EmbeddedWallet extends BaseWallet {
     this.estimatedGasPadding = value ?? DEFAULT_ESTIMATED_GAS_PADDING;
   }
 
-  stop() {
-    return this.pxe.stop();
+  async stop(): Promise<void> {
+    await this.pxe.stop();
+    await this.walletDB.close();
   }
 }
diff --git a/yarn-project/wallets/src/embedded/entrypoints/browser.ts b/yarn-project/wallets/src/embedded/entrypoints/browser.ts
index a7015fdd8672..d32bdc02d957 100644
--- a/yarn-project/wallets/src/embedded/entrypoints/browser.ts
+++ b/yarn-project/wallets/src/embedded/entrypoints/browser.ts
@@ -67,9 +67,11 @@ export class BrowserEmbeddedWallet extends EmbeddedWallet {
             1,
             rootLogger.createChild('wallet:data'),
           ));
-    const walletDB = WalletDB.init(walletDBStore, rootLogger.createChild('wallet:db').info);
+    const walletDB = new WalletDB(walletDBStore, rootLogger.createChild('wallet:db').info);
 
-    return new this(pxe, aztecNode, walletDB, new LazyAccountContractsProvider(), rootLogger) as T;
+    const wallet = new this(pxe, aztecNode, walletDB, new LazyAccountContractsProvider(), rootLogger) as T;
+    await wallet.initStubClasses();
+    return wallet;
   }
 }
 
diff --git a/yarn-project/wallets/src/embedded/entrypoints/node.ts b/yarn-project/wallets/src/embedded/entrypoints/node.ts
index 15dd2c7beb6b..6417be006560 100644
--- a/yarn-project/wallets/src/embedded/entrypoints/node.ts
+++ b/yarn-project/wallets/src/embedded/entrypoints/node.ts
@@ -74,9 +74,11 @@ export class NodeEmbeddedWallet extends EmbeddedWallet {
             },
             rootLogger.createChild('wallet:data').getBindings(),
           ));
-    const walletDB = WalletDB.init(walletDBStore, rootLogger.createChild('wallet:db').info);
+    const walletDB = new WalletDB(walletDBStore, rootLogger.createChild('wallet:db').info);
 
-    return new this(pxe, aztecNode, walletDB, new BundleAccountContractsProvider(), rootLogger) as T;
+    const wallet = new this(pxe, aztecNode, walletDB, new BundleAccountContractsProvider(), rootLogger) as T;
+    await wallet.initStubClasses();
+    return wallet;
   }
 }
 
diff --git a/yarn-project/wallets/src/embedded/wallet_db.test.ts b/yarn-project/wallets/src/embedded/wallet_db.test.ts
index 50b5582c1144..a97095fa2c7d 100644
--- a/yarn-project/wallets/src/embedded/wallet_db.test.ts
+++ b/yarn-project/wallets/src/embedded/wallet_db.test.ts
@@ -10,7 +10,7 @@ describe('WalletDB', () => {
 
   beforeEach(async () => {
     const store = await openTmpStore('wallet-db-test');
-    db = WalletDB.init(store, () => {});
+    db = new WalletDB(store, () => {});
   });
 
   function makeAccountData(type: AccountType = 'schnorr', alias?: string) {
diff --git a/yarn-project/wallets/src/embedded/wallet_db.ts b/yarn-project/wallets/src/embedded/wallet_db.ts
index 74de164e0cdc..b32a84ac4d43 100644
--- a/yarn-project/wallets/src/embedded/wallet_db.ts
+++ b/yarn-project/wallets/src/embedded/wallet_db.ts
@@ -12,16 +12,15 @@ function accountKey(field: string, address: AztecAddress | string): string {
 }
 
 export class WalletDB {
-  private constructor(
-    private accounts: AztecAsyncMap<string, Buffer>,
-    private aliases: AztecAsyncMap<string, Buffer>,
-    private userLog: LogFn,
-  ) {}
+  private accounts: AztecAsyncMap<string, Buffer>;
+  private aliases: AztecAsyncMap<string, Buffer>;
 
-  static init(store: AztecAsyncKVStore, userLog: LogFn) {
-    const accounts = store.openMap<string, Buffer>('accounts');
-    const aliases = store.openMap<string, Buffer>('aliases');
-    return new WalletDB(accounts, aliases, userLog);
+  constructor(
+    private store: AztecAsyncKVStore,
+    private userLog: LogFn,
+  ) {
+    this.accounts = store.openMap<string, Buffer>('accounts');
+    this.aliases = store.openMap<string, Buffer>('aliases');
   }
 
   async storeAccount(
@@ -131,4 +130,8 @@ export class WalletDB {
       await this.aliases.delete(`accounts:${alias}`);
     }
   }
+
+  async close() {
+    await this.store.close();
+  }
 }
diff --git a/yarn-project/world-state/src/synchronizer/config.ts b/yarn-project/world-state/src/synchronizer/config.ts
index e0a08a43f82d..c4b75f07484f 100644
--- a/yarn-project/world-state/src/synchronizer/config.ts
+++ b/yarn-project/world-state/src/synchronizer/config.ts
@@ -1,4 +1,9 @@
-import { type ConfigMappingsType, getConfigFromMappings, numberConfigHelper } from '@aztec/foundation/config';
+import {
+  type ConfigMappingsType,
+  getConfigFromMappings,
+  numberConfigHelper,
+  optionalNumberConfigHelper,
+} from '@aztec/foundation/config';
 
 /** World State synchronizer configuration values. */
 export interface WorldStateConfig {
@@ -36,47 +41,46 @@ export interface WorldStateConfig {
 export const worldStateConfigMappings: ConfigMappingsType<WorldStateConfig> = {
   worldStateBlockCheckIntervalMS: {
     env: 'WS_BLOCK_CHECK_INTERVAL_MS',
-    parseEnv: (val: string) => +val,
-    defaultValue: 100,
+    ...numberConfigHelper(100),
     description: 'The frequency in which to check.',
   },
   worldStateBlockRequestBatchSize: {
     env: 'WS_BLOCK_REQUEST_BATCH_SIZE',
-    parseEnv: (val: string) => +val,
+    ...optionalNumberConfigHelper(),
     description: 'Size of the batch for each get-blocks request from the synchronizer to the archiver.',
   },
   worldStateDbMapSizeKb: {
     env: 'WS_DB_MAP_SIZE_KB',
-    parseEnv: (val: string) => +val,
+    ...optionalNumberConfigHelper(),
     description: 'The maximum possible size of the world state DB in KB. Overwrites the general dataStoreMapSizeKb.',
   },
   archiveTreeMapSizeKb: {
     env: 'ARCHIVE_TREE_MAP_SIZE_KB',
-    parseEnv: (val: string) => +val,
+    ...optionalNumberConfigHelper(),
     description:
       'The maximum possible size of the world state archive tree in KB. Overwrites the general worldStateDbMapSizeKb.',
   },
   nullifierTreeMapSizeKb: {
     env: 'NULLIFIER_TREE_MAP_SIZE_KB',
-    parseEnv: (val: string) => +val,
+    ...optionalNumberConfigHelper(),
     description:
       'The maximum possible size of the world state nullifier tree in KB. Overwrites the general worldStateDbMapSizeKb.',
   },
   noteHashTreeMapSizeKb: {
     env: 'NOTE_HASH_TREE_MAP_SIZE_KB',
-    parseEnv: (val: string) => +val,
+    ...optionalNumberConfigHelper(),
     description:
       'The maximum possible size of the world state note hash tree in KB. Overwrites the general worldStateDbMapSizeKb.',
   },
   messageTreeMapSizeKb: {
     env: 'MESSAGE_TREE_MAP_SIZE_KB',
-    parseEnv: (val: string) => +val,
+    ...optionalNumberConfigHelper(),
     description:
       'The maximum possible size of the world state message tree in KB. Overwrites the general worldStateDbMapSizeKb.',
   },
   publicDataTreeMapSizeKb: {
     env: 'PUBLIC_DATA_TREE_MAP_SIZE_KB',
-    parseEnv: (val: string) => +val,
+    ...optionalNumberConfigHelper(),
     description:
       'The maximum possible size of the world state public data tree in KB. Overwrites the general worldStateDbMapSizeKb.',
   },
diff --git a/yarn-project/world-state/src/synchronizer/factory.ts b/yarn-project/world-state/src/synchronizer/factory.ts
index 47eb9d601339..5f8c2a5f52f9 100644
--- a/yarn-project/world-state/src/synchronizer/factory.ts
+++ b/yarn-project/world-state/src/synchronizer/factory.ts
@@ -2,7 +2,7 @@ import type { LoggerBindings } from '@aztec/foundation/log';
 import type { L2BlockSource } from '@aztec/stdlib/block';
 import type { DataStoreConfig } from '@aztec/stdlib/kv-store';
 import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
-import { EMPTY_GENESIS_DATA, type GenesisData } from '@aztec/stdlib/world-state';
+import { EMPTY_GENESIS_DATA, type GenesisData, isGenesisData } from '@aztec/stdlib/world-state';
 import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';
 
 import { WorldStateInstrumentation } from '../instrumentation/instrumentation.js';
@@ -21,12 +21,14 @@ export interface WorldStateTreeMapSizes {
 export async function createWorldStateSynchronizer(
   config: WorldStateConfig & DataStoreConfig,
   l2BlockSource: L2BlockSource & L1ToL2MessageSource,
-  genesis: GenesisData = EMPTY_GENESIS_DATA,
+  genesisOrNativeWorldState: GenesisData | NativeWorldStateService,
   client: TelemetryClient = getTelemetryClient(),
   bindings?: LoggerBindings,
 ) {
   const instrumentation = new WorldStateInstrumentation(client);
-  const merkleTrees = await createWorldState(config, genesis, instrumentation, bindings);
+  const merkleTrees = isGenesisData(genesisOrNativeWorldState)
+    ? await createWorldState(config, genesisOrNativeWorldState, instrumentation, bindings)
+    : genesisOrNativeWorldState;
   return new ServerWorldStateSynchronizer(merkleTrees, l2BlockSource, config, instrumentation);
 }
 
diff --git a/yarn-project/world-state/src/synchronizer/server_world_state_synchronizer.test.ts b/yarn-project/world-state/src/synchronizer/server_world_state_synchronizer.test.ts
index fec1b9eca5f0..42f5471d609c 100644
--- a/yarn-project/world-state/src/synchronizer/server_world_state_synchronizer.test.ts
+++ b/yarn-project/world-state/src/synchronizer/server_world_state_synchronizer.test.ts
@@ -2,13 +2,7 @@ import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
 import { timesParallel } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { type Logger, createLogger } from '@aztec/foundation/log';
-import {
-  BlockHash,
-  GENESIS_BLOCK_HEADER_HASH,
-  L2Block,
-  type L2BlockSource,
-  type L2BlockStream,
-} from '@aztec/stdlib/block';
+import { BlockHash, L2Block, type L2BlockSource, type L2BlockStream } from '@aztec/stdlib/block';
 import type { Checkpoint } from '@aztec/stdlib/checkpoint';
 import { type MerkleTreeReadOperations, WorldStateRunningState } from '@aztec/stdlib/interfaces/server';
 import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
@@ -285,9 +279,9 @@ describe('ServerWorldStateSynchronizer', () => {
 });
 
 class TestWorldStateSynchronizer extends ServerWorldStateSynchronizer {
-  public latest = { number: BlockNumber.ZERO, hash: GENESIS_BLOCK_HEADER_HASH.toString() };
-  public finalized = { number: BlockNumber.ZERO, hash: GENESIS_BLOCK_HEADER_HASH.toString() };
-  public proven = { number: BlockNumber.ZERO, hash: GENESIS_BLOCK_HEADER_HASH.toString() };
+  public latest = { number: BlockNumber.ZERO, hash: BlockHash.random().toString() };
+  public finalized = { number: BlockNumber.ZERO, hash: BlockHash.random().toString() };
+  public proven = { number: BlockNumber.ZERO, hash: BlockHash.random().toString() };
 
   constructor(
     merkleTrees: MerkleTreeAdminDatabase,
diff --git a/yarn-project/world-state/src/synchronizer/server_world_state_synchronizer.ts b/yarn-project/world-state/src/synchronizer/server_world_state_synchronizer.ts
index eaf2666336de..d8e939fba8ae 100644
--- a/yarn-project/world-state/src/synchronizer/server_world_state_synchronizer.ts
+++ b/yarn-project/world-state/src/synchronizer/server_world_state_synchronizer.ts
@@ -1,4 +1,4 @@
-import { INITIAL_CHECKPOINT_NUMBER, INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
+import { INITIAL_CHECKPOINT_NUMBER } from '@aztec/constants';
 import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
 import type { Fr } from '@aztec/foundation/curves/bn254';
 import { type Logger, createLogger } from '@aztec/foundation/log';
@@ -6,7 +6,6 @@ import { promiseWithResolvers } from '@aztec/foundation/promise';
 import { elapsed } from '@aztec/foundation/timer';
 import {
   type BlockHash,
-  GENESIS_BLOCK_HEADER_HASH,
   GENESIS_CHECKPOINT_HEADER_HASH,
   type L2Block,
   type L2BlockId,
@@ -288,14 +287,15 @@ export class ServerWorldStateSynchronizer
     // but we use a block stream so we need to provide 'local' L2Tips.
     // We configure the block stream to ignore checkpoints and set checkpoint values to genesis here.
     const genesisCheckpointHeaderHash = GENESIS_CHECKPOINT_HEADER_HASH.toString();
+    const initialBlockHash = (await this.merkleTreeCommitted.getInitialHeader().hash()).toString();
     return {
       proposed: latestBlockId,
       checkpointed: {
-        block: { number: INITIAL_L2_BLOCK_NUM, hash: GENESIS_BLOCK_HEADER_HASH.toString() },
+        block: { number: BlockNumber.ZERO, hash: initialBlockHash },
         checkpoint: { number: INITIAL_CHECKPOINT_NUMBER, hash: genesisCheckpointHeaderHash },
       },
       proposedCheckpoint: {
-        block: { number: INITIAL_L2_BLOCK_NUM, hash: GENESIS_BLOCK_HEADER_HASH.toString() },
+        block: { number: BlockNumber.ZERO, hash: initialBlockHash },
         checkpoint: { number: INITIAL_CHECKPOINT_NUMBER, hash: genesisCheckpointHeaderHash },
       },
       finalized: {
@@ -409,16 +409,15 @@ export class ServerWorldStateSynchronizer
     if (this.historyToKeep === undefined) {
       return;
     }
-    // Get the checkpointed block for the finalized block number
-    const finalisedCheckpoint = await this.l2BlockSource.getCheckpointedBlock(summary.finalizedBlockNumber);
-    if (finalisedCheckpoint === undefined) {
+    const finalisedBlockData = await this.l2BlockSource.getBlockData({ number: summary.finalizedBlockNumber });
+    if (finalisedBlockData === undefined) {
       this.log.warn(
         `Failed to retrieve checkpointed block for finalized block number: ${summary.finalizedBlockNumber}`,
       );
       return;
     }
     // Compute the required historic checkpoint number
-    const newHistoricCheckpointNumber = finalisedCheckpoint.checkpointNumber - this.historyToKeep + 1;
+    const newHistoricCheckpointNumber = finalisedBlockData.checkpointNumber - this.historyToKeep + 1;
     if (newHistoricCheckpointNumber <= 1) {
       return;
     }
diff --git a/yarn-project/world-state/src/test/integration.test.ts b/yarn-project/world-state/src/test/integration.test.ts
index 893a50c8746d..a594ac0bf229 100644
--- a/yarn-project/world-state/src/test/integration.test.ts
+++ b/yarn-project/world-state/src/test/integration.test.ts
@@ -1,7 +1,8 @@
 import { MockPrefilledArchiver } from '@aztec/archiver/test';
+import { GENESIS_ARCHIVE_ROOT } from '@aztec/constants';
 import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
 import { timesAsync } from '@aztec/foundation/collection';
-import type { Fr } from '@aztec/foundation/curves/bn254';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { type Logger, createLogger } from '@aztec/foundation/log';
 import { sleep } from '@aztec/foundation/sleep';
@@ -58,6 +59,8 @@ describe('world-state integration', () => {
     archiver = new MockPrefilledArchiver(checkpoints);
 
     db = (await createWorldState(config)) as NativeWorldStateService;
+    await archiver.setInitialHeader(db.getInitialHeader());
+    archiver.setGenesisArchiveRoot(new Fr(GENESIS_ARCHIVE_ROOT));
     synchronizer = new TestWorldStateSynchronizer(db, archiver, config);
     log.info(`Created synchronizer`);
   }, 30_000);
@@ -94,7 +97,7 @@ describe('world-state integration', () => {
 
   const expectSynchedBlockHashMatches = async (number: number) => {
     const syncedBlockHash = await db.getCommitted().getLeafValue(MerkleTreeId.ARCHIVE, BigInt(number));
-    const archiverBlockHash = await (await archiver.getBlockHeader(number))?.hash();
+    const archiverBlockHash = await (await archiver.getBlockData({ number: BlockNumber(number) }))?.header.hash();
     expect(syncedBlockHash).toEqual(archiverBlockHash);
   };
 
@@ -143,8 +146,6 @@ describe('world-state integration', () => {
     });
 
     it('syncs from latest block when restarting', async () => {
-      const getBlocksSpy = jest.spyOn(archiver, 'getBlocks');
-
       await synchronizer.start();
       await archiver.createBlocks(5);
       await awaitSync(5);
@@ -160,10 +161,6 @@ describe('world-state integration', () => {
       await archiver.createBlocks(4);
       await awaitSync(12);
       await expectSynchedToBlock(12);
-
-      expect(getBlocksSpy).toHaveBeenCalledWith(1, 5);
-      expect(getBlocksSpy).toHaveBeenCalledWith(6, 3);
-      expect(getBlocksSpy).toHaveBeenCalledWith(9, 4);
     });
   });
 
diff --git a/yarn-project/yarn.lock b/yarn-project/yarn.lock
index b1dd1e006442..8ebb1f9b47db 100644
--- a/yarn-project/yarn.lock
+++ b/yarn-project/yarn.lock
@@ -1479,9 +1479,9 @@ __metadata:
     "@aztec/ethereum": "workspace:^"
     "@aztec/foundation": "workspace:^"
     "@aztec/native": "workspace:^"
+    "@aztec/sqlite3mc-wasm": "workspace:^"
     "@aztec/stdlib": "workspace:^"
     "@jest/globals": "npm:^30.0.0"
-    "@sqlite.org/sqlite-wasm": "npm:3.50.4-build1"
     "@types/chai": "npm:^5.0.1"
     "@types/chai-as-promised": "npm:^8.0.1"
     "@types/jest": "npm:^30.0.0"
@@ -1633,13 +1633,13 @@ __metadata:
 
 "@aztec/noir-noir_js@file:../noir/packages/noir_js::locator=%40aztec%2Faztec3-packages%40workspace%3A.":
   version: 1.0.0-beta.20
-  resolution: "@aztec/noir-noir_js@file:../noir/packages/noir_js#../noir/packages/noir_js::hash=f2abb5&locator=%40aztec%2Faztec3-packages%40workspace%3A."
+  resolution: "@aztec/noir-noir_js@file:../noir/packages/noir_js#../noir/packages/noir_js::hash=703deb&locator=%40aztec%2Faztec3-packages%40workspace%3A."
   dependencies:
     "@aztec/noir-acvm_js": "npm:1.0.0-beta.20"
     "@aztec/noir-noirc_abi": "npm:1.0.0-beta.20"
     "@aztec/noir-types": "npm:1.0.0-beta.20"
     pako: "npm:^2.1.0"
-  checksum: 10/c912de5a448dda5ca1b4b8ee6935c96735645c0f12c4880ea303bfbb7376f9fe0444a9bb994a16539ddf2dc346c23c5ec7951b145b5a7e9320c88f04d0d21b0c
+  checksum: 10/64b0affa6908bec76c50ac768b082e24236c1f6004087ed67f6694ea32cf1c5ed2e5e2a067e08f357850c1a3c851a31059810676f46fd18f0d8f54fc9d583974
   languageName: node
   linkType: hard
 
@@ -1908,6 +1908,7 @@ __metadata:
     "@types/node": "npm:^22.15.17"
     "@typescript/native-preview": "npm:7.0.0-dev.20260113.1"
     jest: "npm:^30.0.0"
+    jest-file-snapshot: "npm:^0.7.0"
     jest-mock-extended: "npm:^4.0.0"
     koa: "npm:^2.16.1"
     koa-router: "npm:^13.1.1"
@@ -2059,6 +2060,19 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@aztec/sqlite3mc-wasm@workspace:^, @aztec/sqlite3mc-wasm@workspace:sqlite3mc-wasm":
+  version: 0.0.0-use.local
+  resolution: "@aztec/sqlite3mc-wasm@workspace:sqlite3mc-wasm"
+  dependencies:
+    "@jest/globals": "npm:^30.0.0"
+    "@sqlite.org/sqlite-wasm": "npm:3.50.4-build1"
+    "@typescript/native-preview": "npm:7.0.0-dev.20260113.1"
+    jest: "npm:^30.0.0"
+    ts-node: "npm:^10.9.1"
+    typescript: "npm:^5.3.3"
+  languageName: unknown
+  linkType: soft
+
 "@aztec/stdlib@workspace:*, @aztec/stdlib@workspace:^, @aztec/stdlib@workspace:stdlib":
   version: 0.0.0-use.local
   resolution: "@aztec/stdlib@workspace:stdlib"
@@ -13264,6 +13278,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"filename-reserved-regex@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "filename-reserved-regex@npm:2.0.0"
+  checksum: 10/9322b45726b86c45d0b4fe91be5c51e62b2e7e63db02c4a6ff3fd499bbc134d12fbf3c8b91979440ef45b3be834698ab9c3e66cb63b79fea4817e33da237d32a
+  languageName: node
+  linkType: hard
+
 "filename-reserved-regex@npm:^3.0.0":
   version: 3.0.0
   resolution: "filename-reserved-regex@npm:3.0.0"
@@ -13271,6 +13292,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"filenamify@npm:^4.3.0":
+  version: 4.3.0
+  resolution: "filenamify@npm:4.3.0"
+  dependencies:
+    filename-reserved-regex: "npm:^2.0.0"
+    strip-outer: "npm:^1.0.1"
+    trim-repeated: "npm:^1.0.0"
+  checksum: 10/5b71a7ff8e958c8621957e6fbf7872024126d3b5da50f59b1634af3343ba1a69d4cc15cfe4ca4bbfa7c959ad4d98614ee51e6f1d9fa7326eef8ceda2da8cd74e
+  languageName: node
+  linkType: hard
+
 "filenamify@npm:^6.0.0":
   version: 6.0.0
   resolution: "filenamify@npm:6.0.0"
@@ -15427,7 +15459,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-diff@npm:^29.0.0":
+"jest-diff@npm:^29.0.0, jest-diff@npm:^29.7.0":
   version: 29.7.0
   resolution: "jest-diff@npm:29.7.0"
   dependencies:
@@ -15493,6 +15525,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jest-file-snapshot@npm:^0.7.0":
+  version: 0.7.0
+  resolution: "jest-file-snapshot@npm:0.7.0"
+  dependencies:
+    chalk: "npm:^4.1.2"
+    filenamify: "npm:^4.3.0"
+    jest-diff: "npm:^29.7.0"
+    mkdirp: "npm:^3.0.1"
+  checksum: 10/805afbda127cc2ce244eca6d7e2121a274e5dc018a5b788691304eb366da8ae48eb0e71d18366a4a367dfa81c8b33e766cafa1d0c5ad1dd6e434399546f34106
+  languageName: node
+  linkType: hard
+
 "jest-get-type@npm:^29.6.3":
   version: 29.6.3
   resolution: "jest-get-type@npm:29.6.3"
@@ -17060,6 +17104,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"mkdirp@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "mkdirp@npm:3.0.1"
+  bin:
+    mkdirp: dist/cjs/src/bin.js
+  checksum: 10/16fd79c28645759505914561e249b9a1f5fe3362279ad95487a4501e4467abeb714fd35b95307326b8fd03f3c7719065ef11a6f97b7285d7888306d1bd2232ba
+  languageName: node
+  linkType: hard
+
 "mocha-each@npm:^2.0.1":
   version: 2.0.1
   resolution: "mocha-each@npm:2.0.1"
@@ -20603,6 +20656,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"strip-outer@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "strip-outer@npm:1.0.1"
+  dependencies:
+    escape-string-regexp: "npm:^1.0.2"
+  checksum: 10/f8d65d33ca2b49aabc66bb41d689dda7b8b9959d320e3a40a2ef4d7079ff2f67ffb72db43f179f48dbf9495c2e33742863feab7a584d180fa62505439162c191
+  languageName: node
+  linkType: hard
+
 "strnum@npm:^2.1.2":
   version: 2.1.2
   resolution: "strnum@npm:2.1.2"
@@ -21122,6 +21184,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"trim-repeated@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "trim-repeated@npm:1.0.0"
+  dependencies:
+    escape-string-regexp: "npm:^1.0.2"
+  checksum: 10/e25c235305b82c43f1d64a67a71226c406b00281755e4c2c4f3b1d0b09c687a535dd3c4483327f949f28bb89dc400a0bc5e5b749054f4b99f49ebfe48ba36496
+  languageName: node
+  linkType: hard
+
 "ts-api-utils@npm:^2.1.0":
   version: 2.1.0
   resolution: "ts-api-utils@npm:2.1.0"
diff --git a/yarn.lock b/yarn.lock
new file mode 100644
index 000000000000..fb57ccd13afb
--- /dev/null
+++ b/yarn.lock
@@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+