@aztec/archiver 3.0.0-nightly.20250910 → 3.0.0-nightly.20250911

package/src/archiver/validation.ts

@@ -20,6 +20,7 @@ export async function validateBlockAttestations(
   logger?: Logger,
 ): Promise<ValidateBlockResult> {
   const attestations = getAttestationsFromPublishedL2Block(publishedBlock);
+  const attestors = attestations.map(a => a.getSender());
   const { block } = publishedBlock;
   const blockHash = await block.hash().then(hash => hash.toString());
   const archiveRoot = block.archive.root.toString();
@@ -51,7 +52,17 @@ export async function validateBlockAttestations(
     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, committee, seed, epoch, attestations };
+      return {
+        valid: false,
+        reason,
+        invalidIndex: i,
+        block: publishedBlock.block.toBlockInfo(),
+        committee,
+        seed,
+        epoch,
+        attestors,
+        attestations: publishedBlock.attestations,
+      };
     }
   }
 
@@ -62,7 +73,16 @@ export async function validateBlockAttestations(
       ...logData,
     });
     const reason = 'insufficient-attestations';
-    return { valid: false, reason, block: publishedBlock, committee, seed, epoch, attestations };
+    return {
+      valid: false,
+      reason,
+      block: publishedBlock.block.toBlockInfo(),
+      committee,
+      seed,
+      epoch,
+      attestors,
+      attestations: publishedBlock.attestations,
+    };
   }
 
   logger?.debug(`Block attestations validated successfully for block ${block.number} at slot ${slot}`, logData);

package/src/test/mock_l2_block_source.ts

@@ -5,7 +5,14 @@ import type { Fr } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
 import type { FunctionSelector } from '@aztec/stdlib/abi';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { L2Block, L2BlockHash, type L2BlockSource, type L2Tips, type ValidateBlockResult } from '@aztec/stdlib/block';
+import {
+  L2Block,
+  L2BlockHash,
+  type L2BlockSource,
+  type L2Tips,
+  PublishedL2Block,
+  type ValidateBlockResult,
+} from '@aztec/stdlib/block';
 import type { ContractClassPublic, ContractDataSource, ContractInstanceWithAddress } from '@aztec/stdlib/contract';
 import { EmptyL1RollupConstants, type L1RollupConstants, getSlotRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
 import { type BlockHeader, TxHash, TxReceipt, TxStatus } from '@aztec/stdlib/tx';
@@ -106,15 +113,17 @@ export class MockL2BlockSource implements L2BlockSource, ContractDataSource {
 
   public async getPublishedBlocks(from: number, limit: number, proven?: boolean) {
     const blocks = await this.getBlocks(from, limit, proven);
-    return blocks.map(block => ({
-      block,
-      l1: {
-        blockNumber: BigInt(block.number),
-        blockHash: Buffer32.random().toString(),
-        timestamp: BigInt(block.number),
-      },
-      attestations: [],
-    }));
+    return blocks.map(block =>
+      PublishedL2Block.fromFields({
+        block,
+        l1: {
+          blockNumber: BigInt(block.number),
+          blockHash: Buffer32.random().toString(),
+          timestamp: BigInt(block.number),
+        },
+        attestations: [],
+      }),
+    );
   }
 
   getBlockHeader(number: number | 'latest'): Promise<BlockHeader | undefined> {