@aztec/stdlib 0.0.1-commit.a89ec08 → 0.0.1-commit.aa0c64f

package/dest/block/test/l2_tips_store_test_suite.js

@@ -1,10 +1,10 @@
-import { GENESIS_BLOCK_HEADER_HASH } from '@aztec/constants';
 import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
 import { times } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { GENESIS_CHECKPOINT_HEADER_HASH, L2Block } from '@aztec/stdlib/block';
 import { Checkpoint, L1PublishedData, PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
-import { jestExpect as expect } from '@jest/expect';
+import { expect } from 'vitest';
+import { GENESIS_BLOCK_HEADER_HASH } from '../block_hash.js';
 export function testL2TipsStore(makeTipsStore) {
     let tipsStore;
     // Track blocks and their hashes for test assertions
@@ -83,15 +83,19 @@ export function testL2TipsStore(makeTipsStore) {
         }
         return new PublishedCheckpoint(checkpoint, L1PublishedData.random(), []);
     };
-    /** Creates a chain-checkpointed event with the required block field */ const makeCheckpointedEvent = async (checkpoint)=>{
-        const lastBlock = checkpoint.checkpoint.blocks.at(-1);
+    /** Creates a thin chain-checkpointed event carrying the block + checkpoint ids of the checkpoint's last block. */ const makeCheckpointedEvent = async (published)=>{
+        const lastBlock = published.checkpoint.blocks.at(-1);
         const blockId = {
             number: lastBlock.number,
             hash: (await lastBlock.hash()).toString()
         };
+        const checkpointId = {
+            number: published.checkpoint.number,
+            hash: published.checkpoint.hash().toString()
+        };
         return {
             type: 'chain-checkpointed',
-            checkpoint,
+            checkpoint: checkpointId,
             block: blockId
         };
     };
@@ -110,6 +114,93 @@ export function testL2TipsStore(makeTipsStore) {
         expect(await tipsStore.getL2BlockHash(2)).toEqual(blockHashes.get(2));
         expect(await tipsStore.getL2BlockHash(3)).toEqual(blockHashes.get(3));
     });
+    it('records the proposed tip number and hash from a chain-proposed event', async ()=>{
+        // chain-proposed is the sole writer of proposed-tip history in tips-only mode: no preceding blocks-added.
+        await tipsStore.handleBlockStreamEvent({
+            type: 'chain-proposed',
+            block: {
+                number: BlockNumber(5),
+                hash: new Fr(500).toString()
+            }
+        });
+        const tips = await tipsStore.getL2Tips();
+        expect(tips.proposed).toEqual({
+            number: BlockNumber(5),
+            hash: new Fr(500).toString()
+        });
+        // The hash is recorded in the same index the walk-back reads, so it resolves as a sparse anchor.
+        expect(await tipsStore.getL2BlockHash(5)).toEqual(new Fr(500).toString());
+    });
+    it('serves sparse proposed anchors from chain-proposed events for the walk-back', async ()=>{
+        // Two tip-moving polls in tips-only mode, with no blocks in between (sparse history).
+        await tipsStore.handleBlockStreamEvent({
+            type: 'chain-proposed',
+            block: {
+                number: BlockNumber(4),
+                hash: new Fr(400).toString()
+            }
+        });
+        await tipsStore.handleBlockStreamEvent({
+            type: 'chain-proposed',
+            block: {
+                number: BlockNumber(9),
+                hash: new Fr(900).toString()
+            }
+        });
+        // Both recorded heights resolve; the heights between them were never seen and stay undefined.
+        expect(await tipsStore.getL2BlockHash(4)).toEqual(new Fr(400).toString());
+        expect(await tipsStore.getL2BlockHash(9)).toEqual(new Fr(900).toString());
+        expect(await tipsStore.getL2BlockHash(6)).toBeUndefined();
+        const tips = await tipsStore.getL2Tips();
+        expect(tips.proposed).toEqual({
+            number: BlockNumber(9),
+            hash: new Fr(900).toString()
+        });
+    });
+    it('records block-hash witnesses without moving any tip cursor', async ()=>{
+        // Establish a proposed tip at 9 in tips-only fashion (sole writer of proposed history).
+        await tipsStore.handleBlockStreamEvent({
+            type: 'chain-proposed',
+            block: {
+                number: BlockNumber(9),
+                hash: new Fr(900).toString()
+            }
+        });
+        // Record sparse witnesses at heights below the tip (e.g. a consumer materializing per-height state).
+        await tipsStore.recordBlockHashes([
+            {
+                number: BlockNumber(4),
+                hash: new Fr(404).toString()
+            },
+            {
+                number: BlockNumber(6),
+                hash: new Fr(606).toString()
+            }
+        ]);
+        // Each recorded height resolves; an unrecorded gap stays undefined.
+        expect(await tipsStore.getL2BlockHash(4)).toEqual(new Fr(404).toString());
+        expect(await tipsStore.getL2BlockHash(6)).toEqual(new Fr(606).toString());
+        expect(await tipsStore.getL2BlockHash(5)).toBeUndefined();
+        // No tip cursor moved: the proposed tip is still 9, and every other tier is at genesis.
+        const tips = await tipsStore.getL2Tips();
+        expect(tips.proposed).toEqual({
+            number: BlockNumber(9),
+            hash: new Fr(900).toString()
+        });
+        expect(tips.checkpointed.block).toEqual(makeTip(0));
+        expect(tips.proven.block).toEqual(makeTip(0));
+        expect(tips.finalized.block).toEqual(makeTip(0));
+    });
+    it('skips witnesses with no hash and tolerates an empty list', async ()=>{
+        await tipsStore.recordBlockHashes([]);
+        await tipsStore.recordBlockHashes([
+            {
+                number: BlockNumber(3),
+                hash: ''
+            }
+        ]);
+        expect(await tipsStore.getL2BlockHash(3)).toBeUndefined();
+    });
     it('checkpoints all proposed blocks', async ()=>{
         // Propose blocks 1-5
         const blocks = await Promise.all(times(5, (i)=>makeBlock(i + 1)));
@@ -138,7 +229,8 @@ export function testL2TipsStore(makeTipsStore) {
         // Prove up to block 5
         await tipsStore.handleBlockStreamEvent({
             type: 'chain-proven',
-            block: makeBlockId(5)
+            block: makeBlockId(5),
+            checkpoint: makeCheckpointIdForBlock(5)
         });
         const tips = await tipsStore.getL2Tips();
         expect(tips.proposed).toEqual(makeTip(5));
@@ -160,11 +252,13 @@ export function testL2TipsStore(makeTipsStore) {
         // Prove and finalize
         await tipsStore.handleBlockStreamEvent({
             type: 'chain-proven',
-            block: makeBlockId(5)
+            block: makeBlockId(5),
+            checkpoint: makeCheckpointIdForBlock(5)
         });
         await tipsStore.handleBlockStreamEvent({
             type: 'chain-finalized',
-            block: makeBlockId(5)
+            block: makeBlockId(5),
+            checkpoint: makeCheckpointIdForBlock(5)
         });
         const tips = await tipsStore.getL2Tips();
         expect(tips.proposed).toEqual(makeTip(5));
@@ -222,11 +316,13 @@ export function testL2TipsStore(makeTipsStore) {
         // Prove and finalize up to block 3 (checkpoint 1)
         await tipsStore.handleBlockStreamEvent({
             type: 'chain-proven',
-            block: makeBlockId(3)
+            block: makeBlockId(3),
+            checkpoint: makeCheckpointIdForBlock(3)
         });
         await tipsStore.handleBlockStreamEvent({
             type: 'chain-finalized',
-            block: makeBlockId(3)
+            block: makeBlockId(3),
+            checkpoint: makeCheckpointIdForBlock(3)
         });
         // Blocks before finalized should be cleared
         expect(await tipsStore.getL2BlockHash(1)).toBeUndefined();
@@ -246,10 +342,8 @@ export function testL2TipsStore(makeTipsStore) {
         await tipsStore.handleBlockStreamEvent({
             type: 'chain-pruned',
             block: makeBlockId(5),
-            checkpoint: {
-                number: CheckpointNumber.ZERO,
-                hash: GENESIS_CHECKPOINT_HEADER_HASH.toString()
-            }
+            checkpointed: makeTipId(0),
+            proven: makeTipId(0)
         });
         const tips = await tipsStore.getL2Tips();
         expect(tips.proposed).toEqual(makeTip(5));
@@ -271,10 +365,8 @@ export function testL2TipsStore(makeTipsStore) {
         await tipsStore.handleBlockStreamEvent({
             type: 'chain-pruned',
             block: makeTip(0),
-            checkpoint: {
-                number: CheckpointNumber.ZERO,
-                hash: GENESIS_CHECKPOINT_HEADER_HASH.toString()
-            }
+            checkpointed: makeTipId(0),
+            proven: makeTipId(0)
         });
         tips = await tipsStore.getL2Tips();
         expect(tips.proposed).toEqual(makeTip(0));
@@ -335,10 +427,8 @@ export function testL2TipsStore(makeTipsStore) {
         await tipsStore.handleBlockStreamEvent({
             type: 'chain-pruned',
             block: makeBlockId(5),
-            checkpoint: {
-                number: CheckpointNumber.ZERO,
-                hash: GENESIS_CHECKPOINT_HEADER_HASH.toString()
-            }
+            checkpointed: makeTipId(5),
+            proven: makeTipId(0)
         });
         tips = await tipsStore.getL2Tips();
         expect(tips.proposed).toEqual(makeTip(5));
@@ -398,10 +488,8 @@ export function testL2TipsStore(makeTipsStore) {
         await tipsStore.handleBlockStreamEvent({
             type: 'chain-pruned',
             block: makeBlockId(3),
-            checkpoint: {
-                number: CheckpointNumber.ZERO,
-                hash: GENESIS_CHECKPOINT_HEADER_HASH.toString()
-            }
+            checkpointed: makeTipId(3),
+            proven: makeTipId(0)
         });
         tips = await tipsStore.getL2Tips();
         expect(tips.proposed).toEqual(makeTip(3));
@@ -438,7 +526,8 @@ export function testL2TipsStore(makeTipsStore) {
         // Prove up to block 3
         await tipsStore.handleBlockStreamEvent({
             type: 'chain-proven',
-            block: makeBlockId(3)
+            block: makeBlockId(3),
+            checkpoint: makeCheckpointIdForBlock(3)
         });
         let tips = await tipsStore.getL2Tips();
         expect(tips.proposed).toEqual(makeTip(3));
@@ -478,10 +567,8 @@ export function testL2TipsStore(makeTipsStore) {
         await tipsStore.handleBlockStreamEvent({
             type: 'chain-pruned',
             block: makeBlockId(3),
-            checkpoint: {
-                number: CheckpointNumber.ZERO,
-                hash: GENESIS_CHECKPOINT_HEADER_HASH.toString()
-            }
+            checkpointed: makeTipId(3),
+            proven: makeTipId(3)
         });
         tips = await tipsStore.getL2Tips();
         expect(tips.proposed).toEqual(makeTip(3));
@@ -524,22 +611,195 @@ export function testL2TipsStore(makeTipsStore) {
         expect(await tipsStore.getL2BlockHash(6)).not.toEqual(originalHash6);
         expect(await tipsStore.getL2BlockHash(7)).not.toEqual(originalHash7);
     });
-    // Regression test for #13142
-    it('does not blow up when setting proven chain on an unseen block number', async ()=>{
+    // Regression test for #13142: proving an unseen block number (one with no local block->checkpoint
+    // mapping) must not blow up. With per-cursor checkpoint ids, the proven tip resolves to the
+    // checkpoint id carried by the event rather than falling back to checkpoint zero.
+    it('resolves the proven checkpoint from the carried id when setting proven on an unseen block number', async ()=>{
         await tipsStore.handleBlockStreamEvent({
             type: 'blocks-added',
             blocks: [
                 await makeBlock(5)
             ]
         });
+        // Block 3 has no local block->checkpoint mapping, but the event carries a real checkpoint id.
+        const carriedCheckpoint = {
+            number: CheckpointNumber(1),
+            hash: new Fr(42).toString()
+        };
         await tipsStore.handleBlockStreamEvent({
             type: 'chain-proven',
-            block: makeBlockId(3)
+            block: makeBlockId(3),
+            checkpoint: carriedCheckpoint
         });
         const tips = await tipsStore.getL2Tips();
         expect(tips.proposed).toEqual(makeTip(5));
         expect(tips.proven.block).toEqual(makeTip(3));
-        // No checkpoint for block 3 since it wasn't checkpointed
-        expect(tips.proven.checkpoint.number).toEqual(CheckpointNumber.ZERO);
+        // Resolved from the carried id, not the (missing) local mapping.
+        expect(tips.proven.checkpoint).toEqual(carriedCheckpoint);
+    });
+    // proven/finalized resolve to the carried checkpoint id even when the block has no local
+    // block->checkpoint mapping (the cursor legitimately leads the locally-checkpointed frontier).
+    it('resolves proven and finalized checkpoints from carried ids without a local mapping', async ()=>{
+        await tipsStore.handleBlockStreamEvent({
+            type: 'blocks-added',
+            blocks: [
+                await makeBlock(7)
+            ]
+        });
+        const provenCheckpoint = {
+            number: CheckpointNumber(2),
+            hash: new Fr(101).toString()
+        };
+        const finalizedCheckpoint = {
+            number: CheckpointNumber(1),
+            hash: new Fr(100).toString()
+        };
+        await tipsStore.handleBlockStreamEvent({
+            type: 'chain-proven',
+            block: makeBlockId(5),
+            checkpoint: provenCheckpoint
+        });
+        await tipsStore.handleBlockStreamEvent({
+            type: 'chain-finalized',
+            block: makeBlockId(3),
+            checkpoint: finalizedCheckpoint
+        });
+        const tips = await tipsStore.getL2Tips();
+        expect(tips.proven.checkpoint).toEqual(provenCheckpoint);
+        expect(tips.finalized.checkpoint).toEqual(finalizedCheckpoint);
+    });
+    // Genuine corruption: a cursor points at a real (non-genesis) block that has a block hash but
+    // neither a stored per-cursor checkpoint id nor a block->checkpoint mapping. getL2Tips must throw
+    // loudly rather than silently report checkpoint zero. We reach this state by reaching past the
+    // event API to place the tip directly, since the normal writers always record an id.
+    it('throws when a cursor points at a real block with neither a stored id nor a mapping', async ()=>{
+        // blocks-added records the block hash for block 5 (so getBlockId succeeds) but no checkpoint id.
+        await tipsStore.handleBlockStreamEvent({
+            type: 'blocks-added',
+            blocks: [
+                await makeBlock(5)
+            ]
+        });
+        // Corrupt the proven cursor to point at block 5 without any id or mapping.
+        const internal = tipsStore;
+        await internal.setTip('proven', BlockNumber(5));
+        await expect(tipsStore.getL2Tips()).rejects.toThrow(/checkpoint/i);
+    });
+    // Backward prune of a leading cursor: a checkpoint-bearing cursor that legitimately leads the source's
+    // confirmed checkpointed tip is clamped down to that tip, resolving to the id the prune event carries
+    // (never genesis, never a throw). This is the skipped-history shape where the cursor sits on a block
+    // ahead of the checkpointed frontier.
+    it('clamps a leading checkpoint cursor down to the source checkpointed tip carried by the prune event', async ()=>{
+        // Checkpoint blocks 1-5 (checkpointed = block 5 / ckpt 1), then add uncheckpointed blocks 6-10.
+        const blocks1to5 = await Promise.all(times(5, (i)=>makeBlock(i + 1)));
+        await tipsStore.handleBlockStreamEvent({
+            type: 'blocks-added',
+            blocks: blocks1to5
+        });
+        const checkpoint1 = await makeCheckpoint(1, blocks1to5);
+        await tipsStore.handleBlockStreamEvent(await makeCheckpointedEvent(checkpoint1));
+        const blocks6to10 = await Promise.all(times(5, (i)=>makeBlock(i + 6)));
+        await tipsStore.handleBlockStreamEvent({
+            type: 'blocks-added',
+            blocks: blocks6to10
+        });
+        // Advance the proven cursor onto an uncheckpointed block (8) via a carried id, so it LEADS the
+        // source checkpointed tip (block 5) and will be clamped down to it on prune.
+        await tipsStore.handleBlockStreamEvent({
+            type: 'chain-proven',
+            block: makeBlockId(8),
+            checkpoint: {
+                number: CheckpointNumber(2),
+                hash: new Fr(202).toString()
+            }
+        });
+        // Prune to block 7, carrying the source's confirmed checkpointed and proven tips (both block 5 / ckpt 1
+        // here, the source's proven tip having rolled back together with its checkpointed tip).
+        await tipsStore.handleBlockStreamEvent({
+            type: 'chain-pruned',
+            block: makeBlockId(7),
+            checkpointed: makeTipId(5),
+            proven: makeTipId(5)
+        });
+        // Must not throw; the proven cursor is clamped to the carried proven tip, resolving to ckpt 1.
+        const tips = await tipsStore.getL2Tips();
+        expect(tips.proposed).toEqual(makeTip(7));
+        expect(tips.proven.block).toEqual(makeTip(5));
+        expect(tips.proven.checkpoint.number).toEqual(CheckpointNumber(1));
+    });
+    it('keeps the checkpointed tip when pruning to an uncheckpointed block ahead of it', async ()=>{
+        const blocks1to5 = await Promise.all(times(5, (i)=>makeBlock(i + 1)));
+        await tipsStore.handleBlockStreamEvent({
+            type: 'blocks-added',
+            blocks: blocks1to5
+        });
+        const checkpoint1 = await makeCheckpoint(1, blocks1to5);
+        await tipsStore.handleBlockStreamEvent(await makeCheckpointedEvent(checkpoint1)); // checkpointed = block 5 / ckpt 1
+        const blocks6to7 = await Promise.all(times(2, (i)=>makeBlock(i + 6)));
+        await tipsStore.handleBlockStreamEvent({
+            type: 'blocks-added',
+            blocks: blocks6to7
+        }); // proposed = 7
+        // Prune to block 6: an uncheckpointed block AHEAD of the checkpointed tip (block 5). The source
+        // checkpointed tip is still block 5 / ckpt 1, so the checkpointed cursor must not move.
+        await tipsStore.handleBlockStreamEvent({
+            type: 'chain-pruned',
+            block: makeBlockId(6),
+            checkpointed: makeTipId(5),
+            proven: makeTipId(0)
+        });
+        const tips = await tipsStore.getL2Tips();
+        expect(tips.proposed).toEqual(makeTip(6));
+        expect(tips.checkpointed.block).toEqual(makeTip(5));
+        expect(tips.checkpointed.checkpoint.number).toEqual(CheckpointNumber(1)); // must NOT be zero
+    });
+    // Per-cursor clamping on prune: when the source rolls back its proven tip below its checkpointed tip
+    // (e.g. a proof tx dropped by an L1 reorg), the prune event carries both source tips and each local
+    // cursor must clamp to its OWN source tip. Clamping the proven cursor onto the (higher) checkpointed
+    // tip would transiently report unproven blocks as proven until the corrective chain-proven event lands.
+    it('clamps the proven cursor to the source proven tip, separately from the checkpointed cursor, on prune', async ()=>{
+        // Checkpoint blocks 1-15 across three checkpoints (ckpt 1 = 1-5, ckpt 2 = 6-10, ckpt 3 = 11-15).
+        const blocks1to5 = await Promise.all(times(5, (i)=>makeBlock(i + 1)));
+        await tipsStore.handleBlockStreamEvent({
+            type: 'blocks-added',
+            blocks: blocks1to5
+        });
+        await tipsStore.handleBlockStreamEvent(await makeCheckpointedEvent(await makeCheckpoint(1, blocks1to5)));
+        const blocks6to10 = await Promise.all(times(5, (i)=>makeBlock(i + 6)));
+        await tipsStore.handleBlockStreamEvent({
+            type: 'blocks-added',
+            blocks: blocks6to10
+        });
+        await tipsStore.handleBlockStreamEvent(await makeCheckpointedEvent(await makeCheckpoint(2, blocks6to10)));
+        const blocks11to15 = await Promise.all(times(5, (i)=>makeBlock(i + 11)));
+        await tipsStore.handleBlockStreamEvent({
+            type: 'blocks-added',
+            blocks: blocks11to15
+        });
+        await tipsStore.handleBlockStreamEvent(await makeCheckpointedEvent(await makeCheckpoint(3, blocks11to15)));
+        // Prove the whole chain up to block 15 (ckpt 3), so the local proven cursor leads both source tips below.
+        await tipsStore.handleBlockStreamEvent({
+            type: 'chain-proven',
+            block: makeBlockId(15),
+            checkpoint: makeCheckpointIdForBlock(15)
+        });
+        let tips = await tipsStore.getL2Tips();
+        expect(tips.checkpointed.block).toEqual(makeTip(15));
+        expect(tips.proven.block).toEqual(makeTip(15));
+        // Prune arrives with the source's proven tip (block 5 / ckpt 1) BELOW its checkpointed tip (block 10 /
+        // ckpt 2) and below the local proven cursor (block 15). Each cursor must clamp to its own source tip.
+        await tipsStore.handleBlockStreamEvent({
+            type: 'chain-pruned',
+            block: makeBlockId(10),
+            checkpointed: makeTipId(10),
+            proven: makeTipId(5)
+        });
+        tips = await tipsStore.getL2Tips();
+        // The proven cursor lands exactly on the source proven tip, NOT on the (higher) checkpointed tip.
+        expect(tips.proven.block).toEqual(makeTip(5));
+        expect(tips.proven.checkpoint.number).toEqual(CheckpointNumber(1));
+        // The checkpointed cursor lands on the source checkpointed tip.
+        expect(tips.checkpointed.block).toEqual(makeTip(10));
+        expect(tips.checkpointed.checkpoint.number).toEqual(CheckpointNumber(2));
     });
 }

package/dest/block/validate_block_result.d.ts

@@ -1,3 +1,4 @@
+import type { ViemCommitteeAttestations } from '@aztec/ethereum/contracts';
 import { EpochNumber } from '@aztec/foundation/branded-types';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { type ZodFor } from '@aztec/foundation/schemas';
@@ -19,6 +20,14 @@ export type ValidateCheckpointNegativeResult = {
     attestors: EthAddress[];
     /** Committee attestations for this checkpoint as they were posted to L1 */
     attestations: CommitteeAttestation[];
+    /**
+     * The exact packed `CommitteeAttestations` tuple as posted to L1 calldata, carried verbatim so the
+     * invalidation evidence is byte-faithful to the stored `attestationsHash`. A repack via
+     * `packAttestations` is not a round-trip inverse of `fromPacked`, so it would diverge from the hash
+     * and revert `invalidateBadAttestation`/`invalidateInsufficientAttestations`. Always populated on the
+     * calldata validation path, the only production source of invalidation evidence.
+     */
+    verbatimAttestations: ViemCommitteeAttestations;
     /** Reason for the checkpoint being invalid: not enough attestations were posted */
     reason: 'insufficient-attestations';
 } | {
@@ -35,6 +44,12 @@ export type ValidateCheckpointNegativeResult = {
     attestors: EthAddress[];
     /** Committee attestations for this checkpoint as they were posted to L1 */
     attestations: CommitteeAttestation[];
+    /**
+     * The exact packed `CommitteeAttestations` tuple as posted to L1 calldata, carried verbatim so the
+     * invalidation evidence is byte-faithful to the stored `attestationsHash`. See the same field on the
+     * insufficient-attestations variant for why a repack cannot be used.
+     */
+    verbatimAttestations: ViemCommitteeAttestations;
     /** Reason for the checkpoint being invalid: an invalid attestation was posted */
     reason: 'invalid-attestation';
     /** Index in the attestations array of the invalid attestation posted */
@@ -47,4 +62,4 @@ export type ValidateCheckpointResult = {
 export declare const ValidateCheckpointResultSchema: ZodFor<ValidateCheckpointResult>;
 export declare function serializeValidateCheckpointResult(result: ValidateCheckpointResult): Buffer;
 export declare function deserializeValidateCheckpointResult(bufferOrReader: Buffer | BufferReader): ValidateCheckpointResult;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdGVfYmxvY2tfcmVzdWx0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmxvY2svdmFsaWRhdGVfYmxvY2tfcmVzdWx0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQXFCLE1BQU0saUNBQWlDLENBQUM7QUFDakYsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQzNELE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBVyxNQUFNLDJCQUEyQixDQUFDO0FBQ2pFLE9BQU8sRUFBRSxZQUFZLEVBQXFCLE1BQU0sNkJBQTZCLENBQUM7QUFJOUUsT0FBTyxFQUNMLEtBQUssY0FBYyxFQUlwQixNQUFNLGtDQUFrQyxDQUFDO0FBRTFDLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBRTNFLHdEQUF3RDtBQUN4RCxNQUFNLE1BQU0sZ0NBQWdDLEdBQ3hDO0lBQ0UsS0FBSyxFQUFFLEtBQUssQ0FBQztJQUNiLDhDQUE4QztJQUM5QyxVQUFVLEVBQUUsY0FBYyxDQUFDO0lBQzNCLGtFQUFrRTtJQUNsRSxTQUFTLEVBQUUsVUFBVSxFQUFFLENBQUM7SUFDeEIsa0RBQWtEO0lBQ2xELEtBQUssRUFBRSxXQUFXLENBQUM7SUFDbkIsNENBQTRDO0lBQzVDLElBQUksRUFBRSxNQUFNLENBQUM7SUFDYixvRUFBb0U7SUFDcEUsU0FBUyxFQUFFLFVBQVUsRUFBRSxDQUFDO0lBQ3hCLDJFQUEyRTtJQUMzRSxZQUFZLEVBQUUsb0JBQW9CLEVBQUUsQ0FBQztJQUNyQyxtRkFBbUY7SUFDbkYsTUFBTSxFQUFFLDJCQUEyQixDQUFDO0NBQ3JDLEdBQ0Q7SUFDRSxLQUFLLEVBQUUsS0FBSyxDQUFDO0lBQ2IsOENBQThDO0lBQzlDLFVBQVUsRUFBRSxjQUFjLENBQUM7SUFDM0Isa0VBQWtFO0lBQ2xFLFNBQVMsRUFBRSxVQUFVLEVBQUUsQ0FBQztJQUN4QixrREFBa0Q7SUFDbEQsS0FBSyxFQUFFLFdBQVcsQ0FBQztJQUNuQiw0Q0FBNEM7SUFDNUMsSUFBSSxFQUFFLE1BQU0sQ0FBQztJQUNiLG9FQUFvRTtJQUNwRSxTQUFTLEVBQUUsVUFBVSxFQUFFLENBQUM7SUFDeEIsMkVBQTJFO0lBQzNFLFlBQVksRUFBRSxvQkFBb0IsRUFBRSxDQUFDO0lBQ3JDLGlGQUFpRjtJQUNqRixNQUFNLEVBQUUscUJBQXFCLENBQUM7SUFDOUIsd0VBQXdFO0lBQ3hFLFlBQVksRUFBRSxNQUFNLENBQUM7Q0FDdEIsQ0FBQztBQUVOLHlEQUF5RDtBQUN6RCxNQUFNLE1BQU0sd0JBQXdCLEdBQUc7SUFBRSxLQUFLLEVBQUUsSUFBSSxDQUFBO0NBQUUsR0FBRyxnQ0FBZ0MsQ0FBQztBQUUxRixlQUFPLE1BQU0sOEJBQThCLEVBQUUsTUFBTSxDQUFDLHdCQUF3QixDQXVCMUUsQ0FBQztBQUVILHdCQUFnQixpQ0FBaUMsQ0FBQyxNQUFNLEVBQUUsd0JBQXdCLEdBQUcsTUFBTSxDQXFCMUY7QUFFRCx3QkFBZ0IsbUNBQW1DLENBQUMsY0FBYyxFQUFFLE1BQU0sR0FBRyxZQUFZLEdBQUcsd0JBQXdCLENBc0JuSCJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdGVfYmxvY2tfcmVzdWx0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmxvY2svdmFsaWRhdGVfYmxvY2tfcmVzdWx0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDM0UsT0FBTyxFQUFFLFdBQVcsRUFBcUIsTUFBTSxpQ0FBaUMsQ0FBQztBQUNqRixPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDM0QsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFXLE1BQU0sMkJBQTJCLENBQUM7QUFDakUsT0FBTyxFQUFFLFlBQVksRUFBcUIsTUFBTSw2QkFBNkIsQ0FBQztBQUs5RSxPQUFPLEVBQ0wsS0FBSyxjQUFjLEVBSXBCLE1BQU0sa0NBQWtDLENBQUM7QUFFMUMsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFFM0Usd0RBQXdEO0FBQ3hELE1BQU0sTUFBTSxnQ0FBZ0MsR0FDeEM7SUFDRSxLQUFLLEVBQUUsS0FBSyxDQUFDO0lBQ2IsOENBQThDO0lBQzlDLFVBQVUsRUFBRSxjQUFjLENBQUM7SUFDM0Isa0VBQWtFO0lBQ2xFLFNBQVMsRUFBRSxVQUFVLEVBQUUsQ0FBQztJQUN4QixrREFBa0Q7SUFDbEQsS0FBSyxFQUFFLFdBQVcsQ0FBQztJQUNuQiw0Q0FBNEM7SUFDNUMsSUFBSSxFQUFFLE1BQU0sQ0FBQztJQUNiLG9FQUFvRTtJQUNwRSxTQUFTLEVBQUUsVUFBVSxFQUFFLENBQUM7SUFDeEIsMkVBQTJFO0lBQzNFLFlBQVksRUFBRSxvQkFBb0IsRUFBRSxDQUFDO0lBQ3JDOzs7Ozs7T0FNRztJQUNILG9CQUFvQixFQUFFLHlCQUF5QixDQUFDO0lBQ2hELG1GQUFtRjtJQUNuRixNQUFNLEVBQUUsMkJBQTJCLENBQUM7Q0FDckMsR0FDRDtJQUNFLEtBQUssRUFBRSxLQUFLLENBQUM7SUFDYiw4Q0FBOEM7SUFDOUMsVUFBVSxFQUFFLGNBQWMsQ0FBQztJQUMzQixrRUFBa0U7SUFDbEUsU0FBUyxFQUFFLFVBQVUsRUFBRSxDQUFDO0lBQ3hCLGtEQUFrRDtJQUNsRCxLQUFLLEVBQUUsV0FBVyxDQUFDO0lBQ25CLDRDQUE0QztJQUM1QyxJQUFJLEVBQUUsTUFBTSxDQUFDO0lBQ2Isb0VBQW9FO0lBQ3BFLFNBQVMsRUFBRSxVQUFVLEVBQUUsQ0FBQztJQUN4QiwyRUFBMkU7SUFDM0UsWUFBWSxFQUFFLG9CQUFvQixFQUFFLENBQUM7SUFDckM7Ozs7T0FJRztJQUNILG9CQUFvQixFQUFFLHlCQUF5QixDQUFDO0lBQ2hELGlGQUFpRjtJQUNqRixNQUFNLEVBQUUscUJBQXFCLENBQUM7SUFDOUIsd0VBQXdFO0lBQ3hFLFlBQVksRUFBRSxNQUFNLENBQUM7Q0FDdEIsQ0FBQztBQUVOLHlEQUF5RDtBQUN6RCxNQUFNLE1BQU0sd0JBQXdCLEdBQUc7SUFBRSxLQUFLLEVBQUUsSUFBSSxDQUFBO0NBQUUsR0FBRyxnQ0FBZ0MsQ0FBQztBQVExRixlQUFPLE1BQU0sOEJBQThCLEVBQUUsTUFBTSxDQUFDLHdCQUF3QixDQXlCMUUsQ0FBQztBQUVILHdCQUFnQixpQ0FBaUMsQ0FBQyxNQUFNLEVBQUUsd0JBQXdCLEdBQUcsTUFBTSxDQTJCMUY7QUFFRCx3QkFBZ0IsbUNBQW1DLENBQUMsY0FBYyxFQUFFLE1BQU0sR0FBRyxZQUFZLEdBQUcsd0JBQXdCLENBc0NuSCJ9

package/dest/block/validate_block_result.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validate_block_result.d.ts","sourceRoot":"","sources":["../../src/block/validate_block_result.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAqB,MAAM,iCAAiC,CAAC;AACjF,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAI9E,OAAO,EACL,KAAK,cAAc,EAIpB,MAAM,kCAAkC,CAAC;AAE1C,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAE3E,wDAAwD;AACxD,MAAM,MAAM,gCAAgC,GACxC;IACE,KAAK,EAAE,KAAK,CAAC;IACb,8CAA8C;IAC9C,UAAU,EAAE,cAAc,CAAC;IAC3B,kEAAkE;IAClE,SAAS,EAAE,UAAU,EAAE,CAAC;IACxB,kDAAkD;IAClD,KAAK,EAAE,WAAW,CAAC;IACnB,4CAA4C;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,oEAAoE;IACpE,SAAS,EAAE,UAAU,EAAE,CAAC;IACxB,2EAA2E;IAC3E,YAAY,EAAE,oBAAoB,EAAE,CAAC;IACrC,mFAAmF;IACnF,MAAM,EAAE,2BAA2B,CAAC;CACrC,GACD;IACE,KAAK,EAAE,KAAK,CAAC;IACb,8CAA8C;IAC9C,UAAU,EAAE,cAAc,CAAC;IAC3B,kEAAkE;IAClE,SAAS,EAAE,UAAU,EAAE,CAAC;IACxB,kDAAkD;IAClD,KAAK,EAAE,WAAW,CAAC;IACnB,4CAA4C;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,oEAAoE;IACpE,SAAS,EAAE,UAAU,EAAE,CAAC;IACxB,2EAA2E;IAC3E,YAAY,EAAE,oBAAoB,EAAE,CAAC;IACrC,iFAAiF;IACjF,MAAM,EAAE,qBAAqB,CAAC;IAC9B,wEAAwE;IACxE,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEN,yDAAyD;AACzD,MAAM,MAAM,wBAAwB,GAAG;IAAE,KAAK,EAAE,IAAI,CAAA;CAAE,GAAG,gCAAgC,CAAC;AAE1F,eAAO,MAAM,8BAA8B,EAAE,MAAM,CAAC,wBAAwB,CAuB1E,CAAC;AAEH,wBAAgB,iCAAiC,CAAC,MAAM,EAAE,wBAAwB,GAAG,MAAM,CAqB1F;AAED,wBAAgB,mCAAmC,CAAC,cAAc,EAAE,MAAM,GAAG,YAAY,GAAG,wBAAwB,CAsBnH"}
+{"version":3,"file":"validate_block_result.d.ts","sourceRoot":"","sources":["../../src/block/validate_block_result.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AAC3E,OAAO,EAAE,WAAW,EAAqB,MAAM,iCAAiC,CAAC;AACjF,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAK9E,OAAO,EACL,KAAK,cAAc,EAIpB,MAAM,kCAAkC,CAAC;AAE1C,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAE3E,wDAAwD;AACxD,MAAM,MAAM,gCAAgC,GACxC;IACE,KAAK,EAAE,KAAK,CAAC;IACb,8CAA8C;IAC9C,UAAU,EAAE,cAAc,CAAC;IAC3B,kEAAkE;IAClE,SAAS,EAAE,UAAU,EAAE,CAAC;IACxB,kDAAkD;IAClD,KAAK,EAAE,WAAW,CAAC;IACnB,4CAA4C;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,oEAAoE;IACpE,SAAS,EAAE,UAAU,EAAE,CAAC;IACxB,2EAA2E;IAC3E,YAAY,EAAE,oBAAoB,EAAE,CAAC;IACrC;;;;;;OAMG;IACH,oBAAoB,EAAE,yBAAyB,CAAC;IAChD,mFAAmF;IACnF,MAAM,EAAE,2BAA2B,CAAC;CACrC,GACD;IACE,KAAK,EAAE,KAAK,CAAC;IACb,8CAA8C;IAC9C,UAAU,EAAE,cAAc,CAAC;IAC3B,kEAAkE;IAClE,SAAS,EAAE,UAAU,EAAE,CAAC;IACxB,kDAAkD;IAClD,KAAK,EAAE,WAAW,CAAC;IACnB,4CAA4C;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,oEAAoE;IACpE,SAAS,EAAE,UAAU,EAAE,CAAC;IACxB,2EAA2E;IAC3E,YAAY,EAAE,oBAAoB,EAAE,CAAC;IACrC;;;;OAIG;IACH,oBAAoB,EAAE,yBAAyB,CAAC;IAChD,iFAAiF;IACjF,MAAM,EAAE,qBAAqB,CAAC;IAC9B,wEAAwE;IACxE,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEN,yDAAyD;AACzD,MAAM,MAAM,wBAAwB,GAAG;IAAE,KAAK,EAAE,IAAI,CAAA;CAAE,GAAG,gCAAgC,CAAC;AAQ1F,eAAO,MAAM,8BAA8B,EAAE,MAAM,CAAC,wBAAwB,CAyB1E,CAAC;AAEH,wBAAgB,iCAAiC,CAAC,MAAM,EAAE,wBAAwB,GAAG,MAAM,CA2B1F;AAED,wBAAgB,mCAAmC,CAAC,cAAc,EAAE,MAAM,GAAG,YAAY,GAAG,wBAAwB,CAsCnH"}

package/dest/block/validate_block_result.js

@@ -2,10 +2,15 @@ import { EpochNumber, EpochNumberSchema } from '@aztec/foundation/branded-types'
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { schemas } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
 import { z } from 'zod';
 import { CheckpointInfoSchema, deserializeCheckpointInfo, serializeCheckpointInfo } from '../checkpoint/checkpoint_info.js';
 import { MAX_COMMITTEE_SIZE } from '../deserialization/index.js';
 import { CommitteeAttestation } from './proposal/committee_attestation.js';
+/** Zod schema for the raw packed `CommitteeAttestations` viem tuple (two 0x-prefixed hex strings). */ const ViemCommitteeAttestationsSchema = z.object({
+    signatureIndices: schemas.HexStringWith0x,
+    signaturesOrAddresses: schemas.HexStringWith0x
+});
 export const ValidateCheckpointResultSchema = z.union([
     z.object({
         valid: z.literal(true)
@@ -18,6 +23,7 @@ export const ValidateCheckpointResultSchema = z.union([
         seed: schemas.BigInt,
         attestors: z.array(schemas.EthAddress),
         attestations: z.array(CommitteeAttestation.schema),
+        verbatimAttestations: ViemCommitteeAttestationsSchema,
         reason: z.literal('insufficient-attestations')
     }),
     z.object({
@@ -28,6 +34,7 @@ export const ValidateCheckpointResultSchema = z.union([
         seed: schemas.BigInt,
         attestors: z.array(schemas.EthAddress),
         attestations: z.array(CommitteeAttestation.schema),
+        verbatimAttestations: ViemCommitteeAttestationsSchema,
         reason: z.literal('invalid-attestation'),
         invalidIndex: z.number()
     })
@@ -37,7 +44,9 @@ export function serializeValidateCheckpointResult(result) {
         return serializeToBuffer(true);
     }
     const checkpointBuffer = serializeCheckpointInfo(result.checkpoint);
-    return serializeToBuffer(result.valid, result.reason, checkpointBuffer.length, checkpointBuffer, result.committee.length, result.committee, result.epoch, result.seed ?? 0n, result.attestors.length, result.attestors, result.attestations.length, result.attestations, result.reason === 'invalid-attestation' ? result.invalidIndex : 0);
+    const signatureIndices = hexToBuffer(result.verbatimAttestations.signatureIndices);
+    const signaturesOrAddresses = hexToBuffer(result.verbatimAttestations.signaturesOrAddresses);
+    return serializeToBuffer(result.valid, result.reason, checkpointBuffer.length, checkpointBuffer, result.committee.length, result.committee, result.epoch, result.seed ?? 0n, result.attestors.length, result.attestors, result.attestations.length, result.attestations, result.reason === 'invalid-attestation' ? result.invalidIndex : 0, signatureIndices.length, signatureIndices, signaturesOrAddresses.length, signaturesOrAddresses);
 }
 export function deserializeValidateCheckpointResult(bufferOrReader) {
     const reader = BufferReader.asReader(bufferOrReader);
@@ -55,6 +64,10 @@ export function deserializeValidateCheckpointResult(bufferOrReader) {
     const attestors = reader.readVector(EthAddress, MAX_COMMITTEE_SIZE);
     const attestations = reader.readVector(CommitteeAttestation, MAX_COMMITTEE_SIZE);
     const invalidIndex = reader.readNumber();
+    const verbatimAttestations = {
+        signatureIndices: bufferToHex(reader.readBuffer()),
+        signaturesOrAddresses: bufferToHex(reader.readBuffer())
+    };
     if (reason === 'insufficient-attestations') {
         return {
             valid,
@@ -64,7 +77,8 @@ export function deserializeValidateCheckpointResult(bufferOrReader) {
             epoch,
             seed,
             attestors,
-            attestations
+            attestations,
+            verbatimAttestations
         };
     } else if (reason === 'invalid-attestation') {
         return {
@@ -76,7 +90,8 @@ export function deserializeValidateCheckpointResult(bufferOrReader) {
             seed,
             attestors,
             invalidIndex,
-            attestations
+            attestations,
+            verbatimAttestations
         };
     } else {
         const _ = reason;