Merge branch 'v2' into backport-to-v2-staging

Author: PhilWindle

.test_patterns.yml

@@ -252,7 +252,7 @@ tests:
     error_regex: "will propagate messages to peers at the same version"
     owners:
       - *palla
-  - regex: "p2p/src/client/test/p2p_client.integration_status_handshake.test.ts"
+  - regex: "src/client/test/p2p_client.integration_status_handshake.test.ts"
     error_regex: "Expected number of calls"
     owners:
       - *palla

spartan/scripts/setup_gcp_secrets.sh

@@ -55,12 +55,25 @@ for env_var in "${!SECRET_MAPPINGS[@]}"; do
     if grep -q "^${env_var}=REPLACE_WITH_GCP_SECRET" "$ENV_FILE"; then
         # Export the secret value
         secret_value=$(get_secret "$secret_name")
+        echo "::add-mask::$secret_value"
         export $env_var="${secret_value}"
     elif grep -q "^${env_var}=REPLACE_WITH_GCP_SECRET/" "$ENV_FILE"; then
         # Handle cases like STORE_SNAPSHOT_URL=REPLACE_WITH_GCP_SECRET/network/
         suffix=$(grep "^${env_var}=REPLACE_WITH_GCP_SECRET/" "$ENV_FILE" | cut -d'/' -f2-)
         secret_value=$(get_secret "$secret_name")
+        echo "::add-mask::$secret_value"
         export $env_var='${secret_value}/'$suffix
+    elif grep -q "^${env_var}=.*REPLACE_WITH_GCP_SECRET" "$ENV_FILE"; then
+        # Replace inline occurrences within the value, preserving surrounding content
+        full_value=$(grep "^${env_var}=" "$ENV_FILE" | cut -d'=' -f2-)
+        # Strip surrounding double quotes if present
+        if [[ "$full_value" == \"*\" && "$full_value" == *\" ]]; then
+            full_value="${full_value:1:-1}"
+        fi
+        secret_value=$(get_secret "$secret_name")
+        echo "::add-mask::$secret_value"
+        replaced_value="${full_value//REPLACE_WITH_GCP_SECRET/$secret_value}"
+        export $env_var="$replaced_value"
     fi
 done
 

spartan/terraform/deploy-aztec-infra/main.tf

@@ -198,6 +198,7 @@ locals {
         "node.env.AWS_ACCESS_KEY_ID"     = var.R2_ACCESS_KEY_ID
         "node.env.AWS_SECRET_ACCESS_KEY" = var.R2_SECRET_ACCESS_KEY
       }
+      boot_node_host_path  = "node.env.BOOT_NODE_HOST"
       bootstrap_nodes_path = "node.env.BOOTSTRAP_NODES"
       wait                 = true
     }

spartan/terraform/deploy-aztec-infra/variables.tf

@@ -446,3 +446,4 @@ variable "RPC_INGRESS_SSL_CERT_NAME" {
   type        = string
   default     = ""
 }
+

spartan/terraform/deploy-rollup-contracts/variables.tf

@@ -18,6 +18,7 @@ variable "AZTEC_DOCKER_IMAGE" {
 variable "L1_RPC_URLS" {
   description = "Comma-separated list of L1 RPC URLs"
   type        = string
+  sensitive   = true
 }
 
 variable "PRIVATE_KEY" {

yarn-project/archiver/package.json

@@ -78,11 +78,11 @@
     "@aztec/protocol-contracts": "workspace:^",
     "@aztec/stdlib": "workspace:^",
     "@aztec/telemetry-client": "workspace:^",
+    "@spalladino/viem": "2.38.2-eip7594.0",
     "lodash.groupby": "^4.6.0",
     "lodash.omit": "^4.5.0",
     "tsc-watch": "^6.0.0",
-    "tslib": "^2.5.0",
-    "viem": "2.23.7"
+    "tslib": "^2.5.0"
   },
   "devDependencies": {
     "@jest/globals": "^30.0.0",

yarn-project/archiver/src/archiver/archiver.test.ts

@@ -1,4 +1,4 @@
-import { Blob } from '@aztec/blob-lib';
+import { Blob, EMPTY_BLOB_VERSIONED_HASH } from '@aztec/blob-lib';
 import type { BlobSinkClientInterface } from '@aztec/blob-sink/client';
 import { BlobWithIndex } from '@aztec/blob-sink/types';
 import { GENESIS_ARCHIVE_ROOT } from '@aztec/constants';
@@ -16,6 +16,7 @@ import { bufferToHex, withoutHexPrefix } from '@aztec/foundation/string';
 import { openTmpStore } from '@aztec/kv-store/lmdb-v2';
 import { type InboxAbi, RollupAbi } from '@aztec/l1-artifacts';
 import {
+  Body,
   CommitteeAttestation,
   CommitteeAttestationsAndSigners,
   L2Block,
@@ -28,9 +29,16 @@ import { makeAndSignCommitteeAttestationsAndSigners, makeBlockAttestationFromBlo
 import { getTelemetryClient } from '@aztec/telemetry-client';
 
 import { jest } from '@jest/globals';
+import {
+  type FormattedBlock,
+  type Log,
+  type Transaction,
+  encodeFunctionData,
+  multicall3Abi,
+  toHex,
+} from '@spalladino/viem';
 import assert from 'assert';
 import { type MockProxy, mock } from 'jest-mock-extended';
-import { type FormattedBlock, type Log, type Transaction, encodeFunctionData, multicall3Abi, toHex } from 'viem';
 
 import { Archiver } from './archiver.js';
 import type { ArchiverDataStore } from './archiver_store.js';
@@ -919,6 +927,71 @@ describe('Archiver', () => {
     await retryUntil(async () => (await archiver.getBlockNumber()) === 3, 'resync', 10, 0.1);
   });
 
+  it('handles empty blob hash without downloading blob', async () => {
+    let latestBlockNum = await archiver.getBlockNumber();
+    expect(latestBlockNum).toEqual(0);
+
+    // Create a block with an empty body
+    const emptyBlock = blocks[0];
+    emptyBlock.body = Body.empty();
+
+    const emptyBlobHash = bufferToHex(EMPTY_BLOB_VERSIONED_HASH);
+    const rollupTx = await makeRollupTx(emptyBlock);
+
+    mockL1BlockNumbers(100n);
+
+    mockRollup.read.status.mockResolvedValue([0n, GENESIS_ROOT, 1n, emptyBlock.archive.root.toString(), GENESIS_ROOT]);
+
+    makeL2BlockProposedEvent(70n, 1n, emptyBlock.archive.root.toString(), [emptyBlobHash]);
+
+    // Mock getBlobSidecar to return empty array (simulating blob not downloaded)
+    blobSinkClient.getBlobSidecar.mockResolvedValueOnce([]);
+
+    publicClient.getTransaction.mockResolvedValueOnce(rollupTx);
+
+    await archiver.start(false);
+
+    // Wait until block 1 is processed
+    await waitUntilArchiverBlock(1);
+
+    latestBlockNum = await archiver.getBlockNumber();
+    expect(latestBlockNum).toEqual(1);
+
+    // Verify the block was synced successfully
+    const syncedBlock = await archiver.getBlock(1);
+    expect(syncedBlock).toBeDefined();
+    expect(syncedBlock!.body.txEffects.length).toEqual(0);
+  }, 10_000);
+
+  it('throws error when blob hashes and bodies mismatch (non-empty case)', async () => {
+    let latestBlockNum = await archiver.getBlockNumber();
+    expect(latestBlockNum).toEqual(0);
+
+    const block = blocks[0];
+    const blobHashes = await makeVersionedBlobHashes(block);
+    const rollupTx = await makeRollupTx(block);
+
+    mockL1BlockNumbers(100n);
+
+    mockRollup.read.status.mockResolvedValue([0n, GENESIS_ROOT, 1n, block.archive.root.toString(), GENESIS_ROOT]);
+
+    makeL2BlockProposedEvent(70n, 1n, block.archive.root.toString(), blobHashes);
+
+    // Mock getBlobSidecar to return empty array (missing blobs)
+    blobSinkClient.getBlobSidecar.mockResolvedValueOnce([]);
+
+    publicClient.getTransaction.mockResolvedValueOnce(rollupTx);
+
+    await archiver.start(false);
+
+    // Give it some time to attempt processing
+    await sleep(1000);
+
+    // Should still be at block 0 since the blob fetch failed
+    latestBlockNum = await archiver.getBlockNumber();
+    expect(latestBlockNum).toEqual(0);
+  }, 10_000);
+
   // TODO(palla/reorg): Add a unit test for the archiver handleEpochPrune
   xit('handles an upcoming L2 prune', () => {});
 

yarn-project/archiver/src/archiver/archiver.ts

@@ -72,9 +72,9 @@ import {
   trackSpan,
 } from '@aztec/telemetry-client';
 
+import { type GetContractReturnType, createPublicClient, fallback, http } from '@spalladino/viem';
 import { EventEmitter } from 'events';
 import groupBy from 'lodash.groupby';
-import { type GetContractReturnType, createPublicClient, fallback, http } from 'viem';
 
 import type { ArchiverDataStore, ArchiverL1SynchPoint } from './archiver_store.js';
 import type { ArchiverConfig } from './config.js';

yarn-project/archiver/src/archiver/data_retrieval.ts

@@ -1,4 +1,4 @@
-import { Blob, BlobDeserializationError } from '@aztec/blob-lib';
+import { Blob, BlobDeserializationError, EMPTY_BLOB_VERSIONED_HASH } from '@aztec/blob-lib';
 import type { BlobSinkClientInterface } from '@aztec/blob-sink/client';
 import type {
   EpochProofPublicInputArgs,
@@ -14,6 +14,7 @@ import type { EthAddress } from '@aztec/foundation/eth-address';
 import type { ViemSignature } from '@aztec/foundation/eth-signature';
 import { Fr } from '@aztec/foundation/fields';
 import { type Logger, createLogger } from '@aztec/foundation/log';
+import { bufferToHex } from '@aztec/foundation/string';
 import { type InboxAbi, RollupAbi } from '@aztec/l1-artifacts';
 import { Body, CommitteeAttestation, L2Block, PublishedL2Block } from '@aztec/stdlib/block';
 import { Proof } from '@aztec/stdlib/proofs';
@@ -28,7 +29,7 @@ import {
   getAbiItem,
   hexToBytes,
   multicall3Abi,
-} from 'viem';
+} from '@spalladino/viem';
 
 import { NoBlobBodiesFoundError } from './errors.js';
 import type { DataRetrieval } from './structs/data_retrieval.js';
@@ -340,38 +341,60 @@ async function getBlockFromRollupTx(
   // TODO(md): why is the proposed block header different to the actual block header?
   // This is likely going to be a footgun
   const header = ProposedBlockHeader.fromViem(decodedArgs.header);
+  const body = await getBlockBodyFromBlobs(blobSinkClient, blockHash!, blobHashes, l2BlockNumber, logger);
+
+  const archiveRoot = new Fr(Buffer.from(hexToBytes(decodedArgs.archive)));
+
+  const stateReference = StateReference.fromViem(decodedArgs.stateReference);
+
+  return {
+    l2BlockNumber,
+    archiveRoot,
+    stateReference,
+    header,
+    body,
+    attestations,
+  };
+}
+
+async function getBlockBodyFromBlobs(
+  blobSinkClient: BlobSinkClientInterface,
+  blockHash: string,
+  blobHashes: Buffer<ArrayBufferLike>[],
+  l2BlockNumber: number,
+  logger: Logger,
+) {
   const blobBodies = await blobSinkClient.getBlobSidecar(blockHash, blobHashes);
-  if (blobBodies.length === 0) {
-    throw new NoBlobBodiesFoundError(l2BlockNumber);
+  logger.trace(`Fetched ${blobBodies.length} blob bodies for L2 block ${l2BlockNumber}`, {
+    blobHashes: blobHashes.map(bufferToHex),
+    l2BlockNumber,
+  });
+
+  if (blobBodies.length !== blobHashes.length) {
+    // If there is exactly one blob hash and it is the empty blob hash, we are fine with not downloading it
+    // and just defaulting to an empty block body.
+    if (blobHashes.length === 1 && blobBodies.length === 0 && blobHashes[0].equals(EMPTY_BLOB_VERSIONED_HASH)) {
+      logger.verbose(`Ignoring error fetching blob body for block ${l2BlockNumber} as it is empty`);
+      return Body.empty();
+    } else {
+      throw new NoBlobBodiesFoundError(l2BlockNumber, blobBodies.length, blobHashes.length);
+    }
   }
 
   let blockFields: Fr[];
   try {
     blockFields = Blob.toEncodedFields(blobBodies.map(b => b.blob));
   } catch (err: any) {
     if (err instanceof BlobDeserializationError) {
-      logger.fatal(err.message);
+      logger.error(err.message);
     } else {
-      logger.fatal('Unable to sync: failed to decode fetched blob, this blob was likely not created by us');
+      logger.error('Unable to sync: failed to decode fetched blob, this blob was likely not created by us');
     }
     throw err;
   }
 
   // The blob source gives us blockFields, and we must construct the body from them:
-  const body = Body.fromBlobFields(blockFields);
-
-  const archiveRoot = new Fr(Buffer.from(hexToBytes(decodedArgs.archive)));
-
-  const stateReference = StateReference.fromViem(decodedArgs.stateReference);
-
-  return {
-    l2BlockNumber,
-    archiveRoot,
-    stateReference,
-    header,
-    body,
-    attestations,
-  };
+  return Body.fromBlobFields(blockFields);
 }
 
 /** Given an L1 to L2 message, retrieves its corresponding event from the Inbox within a specific block range. */

yarn-project/archiver/src/archiver/errors.ts

@@ -1,6 +1,6 @@
 export class NoBlobBodiesFoundError extends Error {
-  constructor(l2BlockNum: number) {
-    super(`No blob bodies found for block ${l2BlockNum}`);
+  constructor(l2BlockNum: number, found: number, expected: number) {
+    super(`No blob bodies found for block ${l2BlockNum} (expected ${expected} but found ${found})`);
   }
 }