@aztec/archiver 2.1.0-rc.1 → 2.1.0-rc.10

package/dest/archiver/archiver.js

@@ -21,9 +21,9 @@ import { L2BlockSourceEvents } from '@aztec/stdlib/block';
 import { computePublicBytecodeCommitment, isValidPrivateFunctionMembershipProof, isValidUtilityFunctionMembershipProof } from '@aztec/stdlib/contract';
 import { getEpochAtSlot, getEpochNumberAtTimestamp, getSlotAtTimestamp, getSlotRangeForEpoch, getTimestampRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
 import { Attributes, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
+import { createPublicClient, fallback, http } from '@spalladino/viem';
 import { EventEmitter } from 'events';
 import groupBy from 'lodash.groupby';
-import { createPublicClient, fallback, http } from 'viem';
 import { retrieveBlocksFromRollup, retrieveL1ToL2Message, retrieveL1ToL2Messages, retrievedBlockToPublishedL2Block } from './data_retrieval.js';
 import { InitialBlockNumberNotSequentialError, NoBlobBodiesFoundError } from './errors.js';
 import { ArchiverInstrumentation } from './instrumentation.js';

package/dest/archiver/data_retrieval.d.ts

@@ -7,7 +7,7 @@ import { type InboxAbi, RollupAbi } from '@aztec/l1-artifacts';
 import { Body, CommitteeAttestation, PublishedL2Block } from '@aztec/stdlib/block';
 import { Proof } from '@aztec/stdlib/proofs';
 import { ProposedBlockHeader, StateReference } from '@aztec/stdlib/tx';
-import { type GetContractReturnType, type Hex } from 'viem';
+import { type GetContractReturnType, type Hex } from '@spalladino/viem';
 import type { DataRetrieval } from './structs/data_retrieval.js';
 import type { InboxMessage } from './structs/inbox_message.js';
 import type { L1PublishedData } from './structs/published.js';

package/dest/archiver/data_retrieval.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data_retrieval.d.ts","sourceRoot":"","sources":["../../src/archiver/data_retrieval.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AACvE,OAAO,KAAK,EAEV,UAAU,EAGV,gBAAgB,EAEjB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,KAAK,QAAQ,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,IAAI,EAAE,oBAAoB,EAAW,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC5F,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAE7C,OAAO,EAAgC,mBAAmB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAErG,OAAO,EAEL,KAAK,qBAAqB,EAC1B,KAAK,GAAG,EAKT,MAAM,MAAM,CAAC;AAGd,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,MAAM,MAAM,gBAAgB,GAAG;IAC7B,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,EAAE,CAAC;IAChB,cAAc,EAAE,cAAc,CAAC;IAC/B,MAAM,EAAE,mBAAmB,CAAC;IAC5B,IAAI,EAAE,IAAI,CAAC;IACX,EAAE,EAAE,eAAe,CAAC;IACpB,OAAO,EAAE,EAAE,CAAC;IACZ,OAAO,EAAE,EAAE,CAAC;IACZ,YAAY,EAAE,oBAAoB,EAAE,CAAC;CACtC,CAAC;AAEF,wBAAgB,gCAAgC,CAAC,cAAc,EAAE,gBAAgB,GAAG,gBAAgB,CAyCnG;AAED;;;;;;;;GAQG;AACH,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,qBAAqB,CAAC,OAAO,SAAS,EAAE,gBAAgB,CAAC,EACjE,YAAY,EAAE,gBAAgB,EAC9B,cAAc,EAAE,uBAAuB,EACvC,gBAAgB,EAAE,MAAM,EACxB,cAAc,EAAE,MAAM,EACtB,MAAM,GAAE,MAAiC,GACxC,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAuD7B;AA6DD,wBAAsB,cAAc,CAAC,YAAY,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAGzG;AAqJD,iHAAiH;AACjH,wBAAsB,qBAAqB,CACzC,KAAK,EAAE,qBAAqB,CAAC,OAAO,QAAQ,EAAE,UAAU,CAAC,EACzD,IAAI,EAAE,EAAE,EACR,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC,CAKnC;AAED;;;;;;;;GAQG;AACH,wBAAsB,sBAAsB,CAC1C,KAAK,EAAE,qBAAqB,CAAC,OAAO,QAAQ,EAAE,UAAU,CAAC,EACzD,gBAAgB,EAAE,MAAM,EACxB,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,YAAY,EAAE,CAAC,CAgBzB;AAgBD,iEAAiE;AACjE,wBAAsB,6BAA6B,CACjD,YAAY,EAAE,gBAAgB,EAC9B,aAAa,EAAE,UAAU,EACzB,gBAAgB,EAAE,MAAM,EACxB,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,EAAE,CAAC;IAAC,MAAM,EAAE,GAAG,CAAA;CAAE,EAAE,CAAC,CAexF;AAED,yDAAyD;AACzD,wBAAsB,0BAA0B,CAC9C,YAAY,EAAE,gBAAgB,EAC9B,aAAa,EAAE,UAAU,EACzB,gBAAgB,EAAE,MAAM,EACxB,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,aAAa,CAAC;IAAE,KAAK,EAAE,KAAK,CAAC;IAAC,QAAQ,EAAE,EAAE,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,KAAK,MAAM,EAAE,CAAA;CAAE,CAAC,CAAC,CAatG;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,WAAW,EAAE,EAAE,CAAC;IAChB,QAAQ,EAAE,EAAE,CAAC;IACb,KAAK,EAAE,KAAK,CAAC;CACd,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAsB,yBAAyB,CAC7C,YAAY,EAAE,gBAAgB,EAC9B,MAAM,EAAE,KAAK,MAAM,EAAE,EACrB,gBAAgB,EAAE,EAAE,GACnB,OAAO,CAAC,gBAAgB,CAAC,CAmC3B"}
+{"version":3,"file":"data_retrieval.d.ts","sourceRoot":"","sources":["../../src/archiver/data_retrieval.ts"],"names":[],"mappings":"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"}

package/dest/archiver/data_retrieval.js

@@ -8,7 +8,7 @@ import { Body, CommitteeAttestation, L2Block, PublishedL2Block } from '@aztec/st
 import { Proof } from '@aztec/stdlib/proofs';
 import { AppendOnlyTreeSnapshot } from '@aztec/stdlib/trees';
 import { BlockHeader, GlobalVariables, ProposedBlockHeader, StateReference } from '@aztec/stdlib/tx';
-import { decodeFunctionData, getAbiItem, hexToBytes, multicall3Abi } from 'viem';
+import { decodeFunctionData, getAbiItem, hexToBytes, multicall3Abi } from '@spalladino/viem';
 import { NoBlobBodiesFoundError } from './errors.js';
 export function retrievedBlockToPublishedL2Block(retrievedBlock) {
     const { l2BlockNumber, archiveRoot, stateReference, header: proposedHeader, body, l1, chainId, version, attestations } = retrievedBlock;

package/dest/archiver/validation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../src/archiver/validation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,mBAAmB,EAEzB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,iBAAiB,EAAkB,MAAM,6BAA6B,CAAC;AAErF,YAAY,EAAE,mBAAmB,EAAE,CAAC;AAEpC;;;GAGG;AACH,wBAAsB,yBAAyB,CAC7C,cAAc,EAAE,gBAAgB,EAChC,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,IAAI,CAAC,iBAAiB,EAAE,eAAe,CAAC,EACnD,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,mBAAmB,CAAC,CAqE9B"}
+{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../src/archiver/validation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,mBAAmB,EAEzB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,iBAAiB,EAAkB,MAAM,6BAA6B,CAAC;AAErF,YAAY,EAAE,mBAAmB,EAAE,CAAC;AAEpC;;;GAGG;AACH,wBAAsB,yBAAyB,CAC7C,cAAc,EAAE,gBAAgB,EAChC,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,IAAI,CAAC,iBAAiB,EAAE,eAAe,CAAC,EACnD,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,mBAAmB,CAAC,CAoF9B"}

package/dest/archiver/validation.js

@@ -1,3 +1,4 @@
+import { compactArray } from '@aztec/foundation/collection';
 import { getAttestationsFromPublishedL2Block } from '@aztec/stdlib/block';
 import { getEpochAtSlot } from '@aztec/stdlib/epoch-helpers';
 /**
@@ -5,7 +6,7 @@ import { getEpochAtSlot } from '@aztec/stdlib/epoch-helpers';
  * Returns true if the attestations are valid and sufficient, false otherwise.
  */ export async function validateBlockAttestations(publishedBlock, epochCache, constants, logger) {
     const attestations = getAttestationsFromPublishedL2Block(publishedBlock);
-    const attestors = attestations.map((a)=>a.getSender());
+    const attestors = compactArray(attestations.map((a)=>a?.tryGetSender()));
     const { block } = publishedBlock;
     const blockHash = await block.hash().then((hash)=>hash.toString());
     const archiveRoot = block.archive.root.toString();
@@ -21,8 +22,9 @@ import { getEpochAtSlot } from '@aztec/stdlib/epoch-helpers';
     };
     logger?.debug(`Validating attestations for block ${block.number} at slot ${slot} in epoch ${epoch}`, {
         committee: (committee ?? []).map((member)=>member.toString()),
-        recoveredAttestors: attestations.map((a)=>a.getSender().toString()),
-        postedAttestations: publishedBlock.attestations.map((a)=>a.address.isZero() ? a.signature.toString() : a.address.toString()),
+        recoveredAttestors: attestors.map((member)=>member.toString()),
+        invalidAttestations: attestations.filter((a)=>a !== undefined && a.tryGetSender() === undefined).map((a)=>a?.toInspect()),
+        postedAttestations: publishedBlock.attestations.map((a)=>(a.address.isZero() ? a.signature : a.address).toString()),
         ...logData
     });
     if (!committee || committee.length === 0) {
@@ -35,29 +37,43 @@ import { getEpochAtSlot } from '@aztec/stdlib/epoch-helpers';
     const requiredAttestationCount = Math.floor(committee.length * 2 / 3) + 1;
     for(let i = 0; i < attestations.length; i++){
         const attestation = attestations[i];
-        const signer = attestation.getSender().toString();
-        if (!committeeSet.has(signer)) {
-            logger?.warn(`Attestation from non-committee member ${signer} at slot ${slot}`, {
-                committee
+        // Skip empty signatures (undefined entries)
+        if (attestation === undefined) {
+            continue;
+        }
+        const signer = attestation.tryGetSender()?.toString();
+        if (signer !== undefined && committeeSet.has(signer)) {
+            continue;
+        }
+        if (signer === undefined) {
+            logger?.warn(`Attestation with invalid signature at slot ${slot}`, {
+                committee,
+                ...logData
             });
-            const reason = 'invalid-attestation';
-            return {
-                valid: false,
-                reason,
-                invalidIndex: i,
-                block: publishedBlock.block.toBlockInfo(),
+        } else {
+            logger?.warn(`Attestation from non-committee member ${signer} at slot ${slot}`, {
                 committee,
-                seed,
-                epoch,
-                attestors,
-                attestations: publishedBlock.attestations
-            };
+                ...logData
+            });
         }
+        const reason = 'invalid-attestation';
+        return {
+            valid: false,
+            reason,
+            invalidIndex: i,
+            block: publishedBlock.block.toBlockInfo(),
+            committee,
+            seed,
+            epoch,
+            attestors,
+            attestations: publishedBlock.attestations
+        };
     }
-    if (attestations.length < requiredAttestationCount) {
+    const validAttestationCount = compactArray(attestations).length;
+    if (validAttestationCount < requiredAttestationCount) {
         logger?.warn(`Insufficient attestations for block at slot ${slot}`, {
             requiredAttestations: requiredAttestationCount,
-            actualAttestations: attestations.length,
+            actualAttestations: validAttestationCount,
             ...logData
         });
         const reason = 'insufficient-attestations';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/archiver",
-  "version": "2.1.0-rc.1",
+  "version": "2.1.0-rc.10",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -66,23 +66,23 @@
     ]
   },
   "dependencies": {
-    "@aztec/blob-lib": "2.1.0-rc.1",
-    "@aztec/blob-sink": "2.1.0-rc.1",
-    "@aztec/constants": "2.1.0-rc.1",
-    "@aztec/epoch-cache": "2.1.0-rc.1",
-    "@aztec/ethereum": "2.1.0-rc.1",
-    "@aztec/foundation": "2.1.0-rc.1",
-    "@aztec/kv-store": "2.1.0-rc.1",
-    "@aztec/l1-artifacts": "2.1.0-rc.1",
-    "@aztec/noir-protocol-circuits-types": "2.1.0-rc.1",
-    "@aztec/protocol-contracts": "2.1.0-rc.1",
-    "@aztec/stdlib": "2.1.0-rc.1",
-    "@aztec/telemetry-client": "2.1.0-rc.1",
+    "@aztec/blob-lib": "2.1.0-rc.10",
+    "@aztec/blob-sink": "2.1.0-rc.10",
+    "@aztec/constants": "2.1.0-rc.10",
+    "@aztec/epoch-cache": "2.1.0-rc.10",
+    "@aztec/ethereum": "2.1.0-rc.10",
+    "@aztec/foundation": "2.1.0-rc.10",
+    "@aztec/kv-store": "2.1.0-rc.10",
+    "@aztec/l1-artifacts": "2.1.0-rc.10",
+    "@aztec/noir-protocol-circuits-types": "2.1.0-rc.10",
+    "@aztec/protocol-contracts": "2.1.0-rc.10",
+    "@aztec/stdlib": "2.1.0-rc.10",
+    "@aztec/telemetry-client": "2.1.0-rc.10",
+    "@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",

package/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';

package/src/archiver/data_retrieval.ts

@@ -28,7 +28,7 @@ import {
   getAbiItem,
   hexToBytes,
   multicall3Abi,
-} from 'viem';
+} from '@spalladino/viem';
 
 import { NoBlobBodiesFoundError } from './errors.js';
 import type { DataRetrieval } from './structs/data_retrieval.js';

package/src/archiver/validation.ts

@@ -1,4 +1,5 @@
 import type { EpochCache } from '@aztec/epoch-cache';
+import { compactArray } from '@aztec/foundation/collection';
 import type { Logger } from '@aztec/foundation/log';
 import {
   type PublishedL2Block,
@@ -20,7 +21,7 @@ export async function validateBlockAttestations(
   logger?: Logger,
 ): Promise<ValidateBlockResult> {
   const attestations = getAttestationsFromPublishedL2Block(publishedBlock);
-  const attestors = attestations.map(a => a.getSender());
+  const attestors = compactArray(attestations.map(a => a?.tryGetSender()));
   const { block } = publishedBlock;
   const blockHash = await block.hash().then(hash => hash.toString());
   const archiveRoot = block.archive.root.toString();
@@ -31,10 +32,11 @@ export async function validateBlockAttestations(
 
   logger?.debug(`Validating attestations for block ${block.number} at slot ${slot} in epoch ${epoch}`, {
     committee: (committee ?? []).map(member => member.toString()),
-    recoveredAttestors: attestations.map(a => a.getSender().toString()),
-    postedAttestations: publishedBlock.attestations.map(a =>
-      a.address.isZero() ? a.signature.toString() : a.address.toString(),
-    ),
+    recoveredAttestors: attestors.map(member => member.toString()),
+    invalidAttestations: attestations
+      .filter(a => a !== undefined && a.tryGetSender() === undefined)
+      .map(a => a?.toInspect()),
+    postedAttestations: publishedBlock.attestations.map(a => (a.address.isZero() ? a.signature : a.address).toString()),
     ...logData,
   });
 
@@ -48,28 +50,42 @@ export async function validateBlockAttestations(
 
   for (let i = 0; i < attestations.length; i++) {
     const attestation = attestations[i];
-    const signer = attestation.getSender().toString();
-    if (!committeeSet.has(signer)) {
-      logger?.warn(`Attestation from non-committee member ${signer} at slot ${slot}`, { committee });
-      const reason = 'invalid-attestation';
-      return {
-        valid: false,
-        reason,
-        invalidIndex: i,
-        block: publishedBlock.block.toBlockInfo(),
-        committee,
-        seed,
-        epoch,
-        attestors,
-        attestations: publishedBlock.attestations,
-      };
+
+    // Skip empty signatures (undefined entries)
+    if (attestation === undefined) {
+      continue;
+    }
+
+    const signer = attestation.tryGetSender()?.toString();
+    if (signer !== undefined && committeeSet.has(signer)) {
+      continue;
+    }
+
+    if (signer === undefined) {
+      logger?.warn(`Attestation with invalid signature at slot ${slot}`, { committee, ...logData });
+    } else {
+      logger?.warn(`Attestation from non-committee member ${signer} at slot ${slot}`, { committee, ...logData });
     }
+
+    const reason = 'invalid-attestation';
+    return {
+      valid: false,
+      reason,
+      invalidIndex: i,
+      block: publishedBlock.block.toBlockInfo(),
+      committee,
+      seed,
+      epoch,
+      attestors,
+      attestations: publishedBlock.attestations,
+    };
   }
 
-  if (attestations.length < requiredAttestationCount) {
+  const validAttestationCount = compactArray(attestations).length;
+  if (validAttestationCount < requiredAttestationCount) {
     logger?.warn(`Insufficient attestations for block at slot ${slot}`, {
       requiredAttestations: requiredAttestationCount,
-      actualAttestations: attestations.length,
+      actualAttestations: validAttestationCount,
       ...logData,
     });
     const reason = 'insufficient-attestations';