feat: merge-train/spartan (#22814)

BEGIN_COMMIT_OVERRIDE
chore: pass through p2p tx pool size (#22804)
feat: track sequencer state time (#22800)
feat(rpc)!: updated rpc api for blocks and checkpoints (#22781)
feat(pipelining): complete attestations by build-slot end (#22735)
feat(archiver): handle multiple proposed checkpoints (#22784)
feat: scrape bench-10tps (#22803)
feat!: make proposals EIP-712 (#22531)
chore: remove default env (#22837)
chore: remove default env (#22839)
chore: grafana provisioning (#22843)
feat: add extra getters (#22563)
fix: use number config helper for NaN protection (#22598)
test(e2e): relax blocks per checkpoint in high tps e2e (#22846)
test(e2e): equivocation recovery under proposer pipelining (#22831)
feat: scrape metrics data (#22840)
END_COMMIT_OVERRIDE

Author: alexghr

.github/workflows/metrics-deploy.yml

@@ -129,10 +129,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:

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}"

ci.sh

@@ -268,7 +268,7 @@ 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 INSTANCE_POSTFIX="n-bench-10tps"

docs/docs-developers/docs/resources/migration_notes.md

@@ -36,6 +36,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
 

docs/examples/ts/aave_bridge/index.ts

@@ -258,13 +258,13 @@ 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");
 

docs/examples/ts/example_swap/index.ts

@@ -384,13 +384,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");

docs/examples/ts/token_bridge/index.ts

@@ -289,15 +289,15 @@ 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!) {
   console.log(
     `   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");

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
+

l1-contracts/gas_benchmark_results.json

@@ -2,62 +2,62 @@
   "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
     }
   },
   "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
     }
   }
-}
+}

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();
   }