@aztec/stdlib 0.0.1-commit.b655e406 → 0.0.1-commit.b8a057fa

package/dest/block/l2_block_stream/l2_tips_store_base.js

@@ -0,0 +1,223 @@
+import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
+import { GENESIS_CHECKPOINT_HEADER_HASH } from '../l2_block_source.js';
+/**
+ * Abstract base class for L2 tips stores. Provides common event handling logic
+ * while delegating storage operations to subclasses.
+ */ export class L2TipsStoreBase {
+    initialBlockHash;
+    constructor(initialBlockHash){
+        this.initialBlockHash = initialBlockHash;
+    }
+    // Public interface implementation
+    async getL2BlockHash(number) {
+        if (number === 0) {
+            return await this.getStoredBlockHash(number) ?? this.initialBlockHash.toString();
+        }
+        return this.getStoredBlockHash(number);
+    }
+    getL2Tips() {
+        return this.runInTransaction(async ()=>{
+            const [proposedBlockId, finalizedBlockId, provenBlockId, checkpointedBlockId] = await Promise.all([
+                this.getBlockId('proposed'),
+                this.getBlockId('finalized'),
+                this.getBlockId('proven'),
+                this.getBlockId('checkpointed')
+            ]);
+            const [finalizedCheckpointId, provenCheckpointId, checkpointedCheckpointId] = await Promise.all([
+                this.getCheckpointId('finalized'),
+                this.getCheckpointId('proven'),
+                this.getCheckpointId('checkpointed')
+            ]);
+            return {
+                proposed: proposedBlockId,
+                finalized: {
+                    block: finalizedBlockId,
+                    checkpoint: finalizedCheckpointId
+                },
+                proven: {
+                    block: provenBlockId,
+                    checkpoint: provenCheckpointId
+                },
+                checkpointed: {
+                    block: checkpointedBlockId,
+                    checkpoint: checkpointedCheckpointId
+                }
+            };
+        });
+    }
+    /**
+   * Records `(number → hash)` witnesses into the block-hash index without moving any tip cursor. In tips-only mode
+   * the hash history is sparse (one anchor per tip-moving poll), so a consumer that materializes per-height state
+   * should witness those heights or its prunes are over-deep by the gap to the nearest anchor. Witnesses are compared
+   * against the source, not trusted, so they cannot cause under-deep prunes; this is always safe to call.
+   */ async recordBlockHashes(blocks) {
+        await this.runInTransaction(async ()=>{
+            for (const block of blocks){
+                if (block.hash) {
+                    await this.setBlockHash(block.number, block.hash);
+                }
+            }
+        });
+    }
+    async handleBlockStreamEvent(event) {
+        switch(event.type){
+            case 'blocks-added':
+                await this.handleBlocksAdded(event);
+                break;
+            case 'chain-proposed':
+                await this.handleChainProposed(event);
+                break;
+            case 'chain-checkpointed':
+                await this.handleChainCheckpointed(event);
+                break;
+            case 'chain-pruned':
+                await this.handleChainPruned(event);
+                break;
+            case 'chain-proven':
+                await this.handleChainProven(event);
+                break;
+            case 'chain-finalized':
+                await this.handleChainFinalized(event);
+                break;
+        }
+    }
+    // Protected helper that subclasses can override for block hash computation
+    computeBlockHash(block) {
+        return block.hash().then((hash)=>hash.toString());
+    }
+    // Private implementation
+    async getBlockId(tag) {
+        const blockNumber = await this.getTip(tag);
+        if (blockNumber === undefined || blockNumber === 0) {
+            return {
+                number: BlockNumber.ZERO,
+                hash: this.initialBlockHash.toString()
+            };
+        }
+        const blockHash = await this.getStoredBlockHash(blockNumber);
+        if (!blockHash) {
+            throw new Error(`Block hash not found for block number ${blockNumber}`);
+        }
+        return {
+            number: blockNumber,
+            hash: blockHash
+        };
+    }
+    async getCheckpointId(tag) {
+        const blockNumber = await this.getTip(tag);
+        if (blockNumber === undefined || blockNumber === 0) {
+            return this.genesisCheckpointId();
+        }
+        // The checkpoint id recorded for this cursor when it was last advanced is the single source of truth.
+        // The writers (handleChainCheckpointed/Proven/Finalized/Pruned) always record an id alongside any
+        // non-genesis cursor advance, so a missing id on a real block is genuine store corruption. Fail loudly
+        // rather than silently reporting checkpoint zero, which would drive a checkpoint-replay storm.
+        const storedCheckpoint = await this.getTipCheckpoint(tag);
+        if (storedCheckpoint !== undefined) {
+            return storedCheckpoint;
+        }
+        throw new Error(`No checkpoint id recorded for ${tag} tip at block ${blockNumber}; the L2 tips store is corrupted`);
+    }
+    genesisCheckpointId() {
+        return {
+            number: CheckpointNumber.ZERO,
+            hash: GENESIS_CHECKPOINT_HEADER_HASH.toString()
+        };
+    }
+    async handleBlocksAdded(event) {
+        if (event.type !== 'blocks-added') {
+            return;
+        }
+        await this.runInTransaction(async ()=>{
+            const blocks = event.blocks;
+            for (const block of blocks){
+                await this.setBlockHash(block.number, await this.computeBlockHash(block));
+            }
+            await this.setTip('proposed', blocks.at(-1).number);
+        });
+    }
+    async handleChainProposed(event) {
+        if (event.type !== 'chain-proposed') {
+            return;
+        }
+        // Records the proposed tip into the block-hash index the walk-back reads. In tips-only mode this is the sole
+        // writer of proposed-tip history, leaving one sparse anchor per tip-moving pass for reorg detection.
+        await this.runInTransaction(()=>this.saveTag('proposed', event.block));
+    }
+    async handleChainCheckpointed(event) {
+        if (event.type !== 'chain-checkpointed') {
+            return;
+        }
+        await this.runInTransaction(async ()=>{
+            await this.saveTag('checkpointed', event.block);
+            await this.setTipCheckpoint('checkpointed', event.checkpoint);
+        });
+    }
+    async handleChainPruned(event) {
+        if (event.type !== 'chain-pruned') {
+            return;
+        }
+        await this.runInTransaction(async ()=>{
+            // A prune is a rollback: the proposed tip moves to the prune target unconditionally, but checkpoint-bearing
+            // cursors may only move backward (advancing one onto an uncheckpointed block would leave it without a recorded
+            // checkpoint id, which getCheckpointId throws on).
+            await this.saveTag('proposed', event.block);
+            // Clamp each checkpoint-bearing cursor down to its OWN source tip when it leads it; the event carries a valid
+            // (block, id) pair for each. Clamping the proven cursor onto the (possibly higher) checkpointed tip instead
+            // would transiently report unproven blocks as proven. The source guarantees proven <= checkpointed, so per-tip
+            // clamping preserves the local invariant.
+            for (const { tag, sourceTip } of [
+                {
+                    tag: 'checkpointed',
+                    sourceTip: event.checkpointed
+                },
+                {
+                    tag: 'proven',
+                    sourceTip: event.proven
+                }
+            ]){
+                const current = await this.getTip(tag);
+                if (current !== undefined && current > sourceTip.block.number) {
+                    await this.saveTag(tag, sourceTip.block);
+                    await this.setTipCheckpoint(tag, sourceTip.checkpoint);
+                }
+            }
+        });
+    }
+    async handleChainProven(event) {
+        if (event.type !== 'chain-proven') {
+            return;
+        }
+        await this.runInTransaction(async ()=>{
+            await this.saveTag('proven', event.block);
+            await this.setTipCheckpoint('proven', event.checkpoint);
+        });
+    }
+    async handleChainFinalized(event) {
+        if (event.type !== 'chain-finalized') {
+            return;
+        }
+        await this.runInTransaction(async ()=>{
+            await this.saveTag('finalized', event.block);
+            await this.setTipCheckpoint('finalized', event.checkpoint);
+            // Prune block hashes below the lowest live tip. Cap the deletion bound at the lowest live tip rather
+            // than the finalized tip alone: this should always be the finalized tip, but we have hit bugs where
+            // this is not the case. Deleting the block hash for a live tip would dangle subsequent `getBlockId`
+            // lookups and lock the block stream into an error loop.
+            const tips = await Promise.all([
+                this.getTip('proposed'),
+                this.getTip('checkpointed'),
+                this.getTip('proven')
+            ]);
+            const liveTipBlocks = tips.filter((t)=>t !== undefined && t > 0);
+            const safeBlockBound = BlockNumber(Math.min(event.block.number, ...liveTipBlocks));
+            await this.deleteBlockHashesBefore(safeBlockBound);
+        });
+    }
+    async saveTag(name, block) {
+        await this.setTip(name, block.number);
+        if (block.hash) {
+            await this.setBlockHash(block.number, block.hash);
+        }
+    }
+}

package/dest/block/proposal/attestations_and_signers.d.ts

@@ -1,41 +1,29 @@
-import type { ViemCommitteeAttestations } from '@aztec/ethereum';
+import type { ViemCommitteeAttestations } from '@aztec/ethereum/contracts';
 import { z } from 'zod';
-import type { Signable, SignatureDomainSeparator } from '../../p2p/signature_utils.js';
-import { CommitteeAttestation } from './committee_attestation.js';
+import { type CoordinationSignatureContext, type CoordinationSignatureType, type Signable } from '../../p2p/signature_utils.js';
+import { CommitteeAttestation, EthAddress } from './committee_attestation.js';
 export declare class CommitteeAttestationsAndSigners implements Signable {
     attestations: CommitteeAttestation[];
-    constructor(attestations: CommitteeAttestation[]);
-    static get schema(): z.ZodEffects<z.ZodObject<{
-        attestations: z.ZodArray<z.ZodEffects<z.ZodObject<{
-            address: z.ZodType<import("./committee_attestation.js").EthAddress, any, string>;
-            signature: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, `0x${string}`, string>, `0x${string}`, string>, import("./committee_attestation.js").Signature, string>;
-        }, "strip", z.ZodTypeAny, {
-            address: import("./committee_attestation.js").EthAddress;
+    readonly signatureContext: CoordinationSignatureContext;
+    readonly primaryType: CoordinationSignatureType;
+    constructor(attestations: CommitteeAttestation[], signatureContext: CoordinationSignatureContext);
+    static get schema(): z.ZodPipe<z.ZodObject<{
+        attestations: z.ZodArray<z.ZodPipe<z.ZodObject<{
+            address: z.ZodType<EthAddress, string, z.core.$ZodTypeInternals<EthAddress, string>>;
+            signature: z.ZodPipe<z.ZodString & z.ZodType<`0x${string}`, string, z.core.$ZodTypeInternals<`0x${string}`, string>>, z.ZodTransform<import("./committee_attestation.js").Signature, `0x${string}`>>;
+        }, z.core.$strip>, z.ZodTransform<CommitteeAttestation, {
+            address: EthAddress;
             signature: import("./committee_attestation.js").Signature;
-        }, {
-            address: string;
-            signature: string;
-        }>, CommitteeAttestation, {
-            address: string;
-            signature: string;
-        }>, "many">;
-    }, "strip", z.ZodTypeAny, {
+        }>>>;
+        signatureContext: import("@aztec/foundation/schemas").ZodFor<CoordinationSignatureContext>;
+    }, z.core.$strip>, z.ZodTransform<CommitteeAttestationsAndSigners, {
         attestations: CommitteeAttestation[];
-    }, {
-        attestations: {
-            address: string;
-            signature: string;
-        }[];
-    }>, CommitteeAttestationsAndSigners, {
-        attestations: {
-            address: string;
-            signature: string;
-        }[];
-    }>;
-    getPayloadToSign(domainSeparator: SignatureDomainSeparator): Buffer;
-    static empty(): CommitteeAttestationsAndSigners;
+        signatureContext: CoordinationSignatureContext;
+    }>>;
+    getPayloadToSign(): Buffer;
+    static empty(signatureContext: CoordinationSignatureContext): CommitteeAttestationsAndSigners;
     toString(): void;
-    getSigners(): import("./committee_attestation.js").EthAddress[];
+    getSigners(): EthAddress[];
     getSignedAttestations(): CommitteeAttestation[];
     /**
      * Packs an array of committee attestations into the format expected by the Solidity contract
@@ -43,6 +31,36 @@ export declare class CommitteeAttestationsAndSigners implements Signable {
      * @param attestations - Array of committee attestations with addresses and signatures
      * @returns Packed attestations with bitmap and tightly packed signature/address data
      */
+    static packAttestations(attestations: CommitteeAttestation[]): ViemCommitteeAttestations;
     getPackedAttestations(): ViemCommitteeAttestations;
 }
-//# sourceMappingURL=attestations_and_signers.d.ts.map
+/**
+ * Malicious extension of CommitteeAttestationsAndSigners that keeps separate attestations and
+ * signers. Used for tricking the L1 contract into accepting attestations by reconstructing
+ * the correct committee commitment (which relies on the signers, ignoring the signatures)
+ * with an invalid set of attestation signatures.
+ */
+export declare class MaliciousCommitteeAttestationsAndSigners extends CommitteeAttestationsAndSigners {
+    private signers;
+    constructor(attestations: CommitteeAttestation[], signers: EthAddress[], signatureContext: CoordinationSignatureContext);
+    getSigners(): EthAddress[];
+}
+/**
+ * Malicious extension of CommitteeAttestationsAndSigners that rewrites every non-proposer signature slot's
+ * recovery byte to yParity form (v ∈ {0, 1}) in the packed output, after the honest `packAttestations` has
+ * already canonicalized it to v ∈ {27, 28}. Models a malicious selected proposer that hand-crafts
+ * `propose()` calldata L1 accepts but no honest node can byte-replay: each rewritten signature still
+ * recovers to the same member (r, s and the recovery parity are preserved), the bitmap bits stay set, and
+ * `getSigners()` stays consistent, so `propose()` does not revert `SignersSizeMismatch` -- yet the
+ * checkpoint can never be proven (`ECDSA.recover` rejects v ∉ {27, 28}). The proposer's own slot is left
+ * canonical so L1 `verifyProposer` (which recovers that slot) still accepts the checkpoint. For testing only.
+ */
+export declare class MaliciousYParityCommitteeAttestationsAndSigners extends CommitteeAttestationsAndSigners {
+    /** Committee index of the proposer's own slot, left canonical so `propose()` passes `verifyProposer`. */
+    private proposerIndex;
+    constructor(attestations: CommitteeAttestation[], 
+    /** Committee index of the proposer's own slot, left canonical so `propose()` passes `verifyProposer`. */
+    proposerIndex: number, signatureContext: CoordinationSignatureContext);
+    getPackedAttestations(): ViemCommitteeAttestations;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXR0ZXN0YXRpb25zX2FuZF9zaWduZXJzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYmxvY2svcHJvcG9zYWwvYXR0ZXN0YXRpb25zX2FuZF9zaWduZXJzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFJM0UsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLEtBQUssQ0FBQztBQUV4QixPQUFPLEVBQ0wsS0FBSyw0QkFBNEIsRUFDakMsS0FBSyx5QkFBeUIsRUFDOUIsS0FBSyxRQUFRLEVBRWQsTUFBTSw4QkFBOEIsQ0FBQztBQUN0QyxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsVUFBVSxFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFFOUUscUJBQWEsK0JBQWdDLFlBQVcsUUFBUTtJQUlyRCxZQUFZLEVBQUUsb0JBQW9CLEVBQUU7YUFDM0IsZ0JBQWdCLEVBQUUsNEJBQTRCO0lBSmhFLFFBQVEsQ0FBQyxXQUFXLEVBQUUseUJBQXlCLENBQTRCO0lBRTNFLFlBQ1MsWUFBWSxFQUFFLG9CQUFvQixFQUFFLEVBQzNCLGdCQUFnQixFQUFFLDRCQUE0QixFQUM1RDtJQUVKLE1BQU0sS0FBSyxNQUFNOzs7Ozs7Ozs7Ozs7UUFPaEI7SUFFRCxnQkFBZ0IsSUFBSSxNQUFNLENBV3pCO0lBRUQsTUFBTSxDQUFDLEtBQUssQ0FBQyxnQkFBZ0IsRUFBRSw0QkFBNEIsR0FBRywrQkFBK0IsQ0FFNUY7SUFFRCxRQUFRLFNBRVA7SUFFRCxVQUFVLGlCQUVUO0lBRUQscUJBQXFCLDJCQUVwQjtJQUVEOzs7OztPQUtHO0lBQ0gsTUFBTSxDQUFDLGdCQUFnQixDQUFDLFlBQVksRUFBRSxvQkFBb0IsRUFBRSxHQUFHLHlCQUF5QixDQW1FdkY7SUFFRCxxQkFBcUIsSUFBSSx5QkFBeUIsQ0FFakQ7Q0FDRjtBQUVEOzs7OztHQUtHO0FBQ0gscUJBQWEsd0NBQXlDLFNBQVEsK0JBQStCO0lBR3pGLE9BQU8sQ0FBQyxPQUFPO0lBRmpCLFlBQ0UsWUFBWSxFQUFFLG9CQUFvQixFQUFFLEVBQzVCLE9BQU8sRUFBRSxVQUFVLEVBQUUsRUFDN0IsZ0JBQWdCLEVBQUUsNEJBQTRCLEVBRy9DO0lBRVEsVUFBVSxJQUFJLFVBQVUsRUFBRSxDQUVsQztDQUNGO0FBRUQ7Ozs7Ozs7OztHQVNHO0FBQ0gscUJBQWEsK0NBQWdELFNBQVEsK0JBQStCO0lBR2hHLHlHQUF5RztJQUN6RyxPQUFPLENBQUMsYUFBYTtJQUh2QixZQUNFLFlBQVksRUFBRSxvQkFBb0IsRUFBRTtJQUNwQyx5R0FBeUc7SUFDakcsYUFBYSxFQUFFLE1BQU0sRUFDN0IsZ0JBQWdCLEVBQUUsNEJBQTRCLEVBRy9DO0lBRVEscUJBQXFCLElBQUkseUJBQXlCLENBbUIxRDtDQUNGIn0=

package/dest/block/proposal/attestations_and_signers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"attestations_and_signers.d.ts","sourceRoot":"","sources":["../../../src/block/proposal/attestations_and_signers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAIjE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,QAAQ,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AACvF,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAElE,qBAAa,+BAAgC,YAAW,QAAQ;IAC3C,YAAY,EAAE,oBAAoB,EAAE;gBAApC,YAAY,EAAE,oBAAoB,EAAE;IAEvD,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;OAMhB;IAED,gBAAgB,CAAC,eAAe,EAAE,wBAAwB,GAAG,MAAM;IAanE,MAAM,CAAC,KAAK,IAAI,+BAA+B;IAI/C,QAAQ;IAIR,UAAU;IAIV,qBAAqB;IAIrB;;;;;OAKG;IACH,qBAAqB,IAAI,yBAAyB;CAiEnD"}
+{"version":3,"file":"attestations_and_signers.d.ts","sourceRoot":"","sources":["../../../src/block/proposal/attestations_and_signers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AAI3E,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EACL,KAAK,4BAA4B,EACjC,KAAK,yBAAyB,EAC9B,KAAK,QAAQ,EAEd,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAE9E,qBAAa,+BAAgC,YAAW,QAAQ;IAIrD,YAAY,EAAE,oBAAoB,EAAE;aAC3B,gBAAgB,EAAE,4BAA4B;IAJhE,QAAQ,CAAC,WAAW,EAAE,yBAAyB,CAA4B;IAE3E,YACS,YAAY,EAAE,oBAAoB,EAAE,EAC3B,gBAAgB,EAAE,4BAA4B,EAC5D;IAEJ,MAAM,KAAK,MAAM;;;;;;;;;;;;QAOhB;IAED,gBAAgB,IAAI,MAAM,CAWzB;IAED,MAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE,4BAA4B,GAAG,+BAA+B,CAE5F;IAED,QAAQ,SAEP;IAED,UAAU,iBAET;IAED,qBAAqB,2BAEpB;IAED;;;;;OAKG;IACH,MAAM,CAAC,gBAAgB,CAAC,YAAY,EAAE,oBAAoB,EAAE,GAAG,yBAAyB,CAmEvF;IAED,qBAAqB,IAAI,yBAAyB,CAEjD;CACF;AAED;;;;;GAKG;AACH,qBAAa,wCAAyC,SAAQ,+BAA+B;IAGzF,OAAO,CAAC,OAAO;IAFjB,YACE,YAAY,EAAE,oBAAoB,EAAE,EAC5B,OAAO,EAAE,UAAU,EAAE,EAC7B,gBAAgB,EAAE,4BAA4B,EAG/C;IAEQ,UAAU,IAAI,UAAU,EAAE,CAElC;CACF;AAED;;;;;;;;;GASG;AACH,qBAAa,+CAAgD,SAAQ,+BAA+B;IAGhG,yGAAyG;IACzG,OAAO,CAAC,aAAa;IAHvB,YACE,YAAY,EAAE,oBAAoB,EAAE;IACpC,yGAAyG;IACjG,aAAa,EAAE,MAAM,EAC7B,gBAAgB,EAAE,4BAA4B,EAG/C;IAEQ,qBAAqB,IAAI,yBAAyB,CAmB1D;CACF"}

package/dest/block/proposal/attestations_and_signers.js

@@ -1,22 +1,28 @@
-import { hexToBuffer } from '@aztec/foundation/string';
+import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
 import { encodeAbiParameters, parseAbiParameters } from 'viem';
 import { z } from 'zod';
+import { coordinationSignatureContextSchema } from '../../p2p/signature_utils.js';
 import { CommitteeAttestation } from './committee_attestation.js';
 export class CommitteeAttestationsAndSigners {
     attestations;
-    constructor(attestations){
+    signatureContext;
+    primaryType;
+    constructor(attestations, signatureContext){
         this.attestations = attestations;
+        this.signatureContext = signatureContext;
+        this.primaryType = 'AttestationsAndSigners';
     }
     static get schema() {
         return z.object({
-            attestations: CommitteeAttestation.schema.array()
-        }).transform((obj)=>new CommitteeAttestationsAndSigners(obj.attestations));
+            attestations: CommitteeAttestation.schema.array(),
+            signatureContext: coordinationSignatureContextSchema
+        }).transform((obj)=>new CommitteeAttestationsAndSigners(obj.attestations, obj.signatureContext));
     }
-    getPayloadToSign(domainSeparator) {
-        const abi = parseAbiParameters('uint8,(bytes,bytes),address[]');
+    getPayloadToSign() {
+        // Matches the L1 abi.encode(attestations, signers) in AttestationLib.sol#getAttestationsAndSignersDigest.
+        const abi = parseAbiParameters('(bytes,bytes),address[]');
         const packed = this.getPackedAttestations();
         const encodedData = encodeAbiParameters(abi, [
-            domainSeparator,
             [
                 packed.signatureIndices,
                 packed.signaturesOrAddresses
@@ -25,8 +31,8 @@ export class CommitteeAttestationsAndSigners {
         ]);
         return hexToBuffer(encodedData);
     }
-    static empty() {
-        return new CommitteeAttestationsAndSigners([]);
+    static empty(signatureContext) {
+        return new CommitteeAttestationsAndSigners([], signatureContext);
     }
     toString() {
         throw new Error('Not implemented');
@@ -42,18 +48,20 @@ export class CommitteeAttestationsAndSigners {
    *
    * @param attestations - Array of committee attestations with addresses and signatures
    * @returns Packed attestations with bitmap and tightly packed signature/address data
-   */ getPackedAttestations() {
-        const length = this.attestations.length;
-        const attestations = this.attestations.map((a)=>a.toViem());
+   */ static packAttestations(attestations) {
+        const length = attestations.length;
+        const viemAttestations = attestations.map((a)=>a.toViem());
         // Calculate bitmap size (1 bit per attestation, rounded up to nearest byte)
         const bitmapSize = Math.ceil(length / 8);
         const signatureIndices = new Uint8Array(bitmapSize);
         // Calculate total data size needed
         let totalDataSize = 0;
-        for(let i = 0; i < length; i++){
-            const signature = attestations[i].signature;
-            // Check if signature is empty (v = 0)
-            const isEmpty = signature.v === 0;
+        for (const attestation of viemAttestations){
+            const signature = attestation.signature;
+            // A slot is empty (a non-signing member, packed as its address) only when r, s and v are all zero
+            // — matching Signature.isEmpty() and getSigners(), so the bitmap popcount and the signers list can
+            // never disagree (which would revert propose() with SignersSizeMismatch).
+            const isEmpty = signature.v === 0 && BigInt(signature.r) === 0n && BigInt(signature.s) === 0n;
             if (!isEmpty) {
                 totalDataSize += 65; // v (1) + r (32) + s (32)
             } else {
@@ -63,18 +71,19 @@ export class CommitteeAttestationsAndSigners {
         const signaturesOrAddresses = new Uint8Array(totalDataSize);
         let dataIndex = 0;
         // Pack the data
-        for(let i = 0; i < length; i++){
-            const attestation = attestations[i];
+        for (const [i, attestation] of viemAttestations.entries()){
             const signature = attestation.signature;
-            // Check if signature is empty
-            const isEmpty = signature.v === 0;
+            // Empty iff r, s and v are all zero (see the size-tally loop above).
+            const isEmpty = signature.v === 0 && BigInt(signature.r) === 0n && BigInt(signature.s) === 0n;
             if (!isEmpty) {
                 // Set bit in bitmap (bit 7-0 in each byte, left to right)
                 const byteIndex = Math.floor(i / 8);
                 const bitIndex = 7 - i % 8;
-                signatureIndices[byteIndex] |= 1 << bitIndex;
-                // Pack signature: v + r + s
-                signaturesOrAddresses[dataIndex] = signature.v;
+                signatureIndices[byteIndex] = (signatureIndices[byteIndex] ?? 0) | 1 << bitIndex;
+                // Pack signature: v + r + s. Canonicalize a yParity recovery byte (v = 0/1) to 27/28 — it
+                // recovers to the same signer, but L1 ECDSA.recover only accepts 27/28. Any other value is left
+                // as-is so a genuinely malformed signature still fails on L1 rather than being silently rewritten.
+                signaturesOrAddresses[dataIndex] = signature.v === 0 || signature.v === 1 ? signature.v + 27 : signature.v;
                 dataIndex++;
                 // Pack r (32 bytes)
                 const rBytes = Buffer.from(signature.r.slice(2), 'hex');
@@ -96,4 +105,57 @@ export class CommitteeAttestationsAndSigners {
             signaturesOrAddresses: `0x${Buffer.from(signaturesOrAddresses).toString('hex')}`
         };
     }
+    getPackedAttestations() {
+        return CommitteeAttestationsAndSigners.packAttestations(this.attestations);
+    }
+}
+/**
+ * Malicious extension of CommitteeAttestationsAndSigners that keeps separate attestations and
+ * signers. Used for tricking the L1 contract into accepting attestations by reconstructing
+ * the correct committee commitment (which relies on the signers, ignoring the signatures)
+ * with an invalid set of attestation signatures.
+ */ export class MaliciousCommitteeAttestationsAndSigners extends CommitteeAttestationsAndSigners {
+    signers;
+    constructor(attestations, signers, signatureContext){
+        super(attestations, signatureContext), this.signers = signers;
+    }
+    getSigners() {
+        return this.signers;
+    }
+}
+/**
+ * Malicious extension of CommitteeAttestationsAndSigners that rewrites every non-proposer signature slot's
+ * recovery byte to yParity form (v ∈ {0, 1}) in the packed output, after the honest `packAttestations` has
+ * already canonicalized it to v ∈ {27, 28}. Models a malicious selected proposer that hand-crafts
+ * `propose()` calldata L1 accepts but no honest node can byte-replay: each rewritten signature still
+ * recovers to the same member (r, s and the recovery parity are preserved), the bitmap bits stay set, and
+ * `getSigners()` stays consistent, so `propose()` does not revert `SignersSizeMismatch` -- yet the
+ * checkpoint can never be proven (`ECDSA.recover` rejects v ∉ {27, 28}). The proposer's own slot is left
+ * canonical so L1 `verifyProposer` (which recovers that slot) still accepts the checkpoint. For testing only.
+ */ export class MaliciousYParityCommitteeAttestationsAndSigners extends CommitteeAttestationsAndSigners {
+    proposerIndex;
+    constructor(attestations, /** Committee index of the proposer's own slot, left canonical so `propose()` passes `verifyProposer`. */ proposerIndex, signatureContext){
+        super(attestations, signatureContext), this.proposerIndex = proposerIndex;
+    }
+    getPackedAttestations() {
+        const packed = super.getPackedAttestations();
+        const data = hexToBuffer(packed.signaturesOrAddresses);
+        // Walk the packed byte-vector and rewrite every non-proposer signed slot's v-byte to yParity form. A
+        // signed slot occupies 65 bytes (v, r, s); an empty slot occupies 20 bytes (address only).
+        let offset = 0;
+        for(let i = 0; i < this.attestations.length; i++){
+            const isSigned = !this.attestations[i].signature.isEmpty();
+            if (isSigned && i !== this.proposerIndex) {
+                // `packAttestations` canonicalized v to 27/28; rewrite back to the equivalent yParity byte (0/1),
+                // preserving the recovery parity so the signature still recovers to the same member.
+                const v = data[offset];
+                data[offset] = v >= 27 ? v - 27 : v;
+            }
+            offset += isSigned ? 65 : 20;
+        }
+        return {
+            signatureIndices: packed.signatureIndices,
+            signaturesOrAddresses: bufferToHex(data)
+        };
+    }
 }

package/dest/block/proposal/committee_attestation.d.ts

@@ -1,4 +1,4 @@
-import type { ViemCommitteeAttestation, ViemCommitteeAttestations } from '@aztec/ethereum';
+import type { ViemCommitteeAttestation, ViemCommitteeAttestations } from '@aztec/ethereum/contracts';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Signature } from '@aztec/foundation/eth-signature';
 import { BufferReader } from '@aztec/foundation/serialize';
@@ -8,19 +8,13 @@ export declare class CommitteeAttestation {
     readonly address: EthAddress;
     readonly signature: Signature;
     constructor(address: EthAddress, signature: Signature);
-    static get schema(): z.ZodEffects<z.ZodObject<{
-        address: z.ZodType<EthAddress, any, string>;
-        signature: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, `0x${string}`, string>, `0x${string}`, string>, Signature, string>;
-    }, "strip", z.ZodTypeAny, {
+    static get schema(): z.ZodPipe<z.ZodObject<{
+        address: z.ZodType<EthAddress, string, z.core.$ZodTypeInternals<EthAddress, string>>;
+        signature: z.ZodPipe<z.ZodString & z.ZodType<`0x${string}`, string, z.core.$ZodTypeInternals<`0x${string}`, string>>, z.ZodTransform<Signature, `0x${string}`>>;
+    }, z.core.$strip>, z.ZodTransform<CommitteeAttestation, {
         address: EthAddress;
         signature: Signature;
-    }, {
-        address: string;
-        signature: string;
-    }>, CommitteeAttestation, {
-        address: string;
-        signature: string;
-    }>;
+    }>>;
     static fromAddress(address: EthAddress): CommitteeAttestation;
     static fromAddressAndSignature(address: EthAddress, signature: Signature): CommitteeAttestation;
     static fromSignature(signature: Signature): CommitteeAttestation;
@@ -33,4 +27,4 @@ export declare class CommitteeAttestation {
     equals(other: CommitteeAttestation): boolean;
     toViem(): ViemCommitteeAttestation;
 }
-//# sourceMappingURL=committee_attestation.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tbWl0dGVlX2F0dGVzdGF0aW9uLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYmxvY2svcHJvcG9zYWwvY29tbWl0dGVlX2F0dGVzdGF0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLHdCQUF3QixFQUFFLHlCQUF5QixFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDckcsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQzNELE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUM1RCxPQUFPLEVBQUUsWUFBWSxFQUFxQixNQUFNLDZCQUE2QixDQUFDO0FBRTlFLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsT0FBTyxFQUFFLFVBQVUsRUFBRSxTQUFTLEVBQUUsQ0FBQztBQUVqQyxxQkFBYSxvQkFBb0I7YUFFYixPQUFPLEVBQUUsVUFBVTthQUNuQixTQUFTLEVBQUUsU0FBUztJQUZ0QyxZQUNrQixPQUFPLEVBQUUsVUFBVSxFQUNuQixTQUFTLEVBQUUsU0FBUyxFQUNsQztJQUVKLE1BQU0sS0FBSyxNQUFNOzs7Ozs7UUFPaEI7SUFHRCxNQUFNLENBQUMsV0FBVyxDQUFDLE9BQU8sRUFBRSxVQUFVLEdBQUcsb0JBQW9CLENBRTVEO0lBR0QsTUFBTSxDQUFDLHVCQUF1QixDQUFDLE9BQU8sRUFBRSxVQUFVLEVBQUUsU0FBUyxFQUFFLFNBQVMsR0FBRyxvQkFBb0IsQ0FFOUY7SUFFRCxNQUFNLENBQUMsYUFBYSxDQUFDLFNBQVMsRUFBRSxTQUFTLEdBQUcsb0JBQW9CLENBRS9EO0lBRUQsTUFBTSxDQUFDLFFBQVEsQ0FBQyxJQUFJLEVBQUUsd0JBQXdCLEdBQUcsb0JBQW9CLENBRXBFO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksR0FBRyxvQkFBb0IsQ0FLckU7SUFFRCxNQUFNLENBQUMsTUFBTSxJQUFJLG9CQUFvQixDQUdwQztJQUVELE1BQU0sQ0FBQyxLQUFLLElBQUksb0JBQW9CLENBRW5DO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUseUJBQXlCLEVBQUUsYUFBYSxFQUFFLE1BQU0sR0FBRyxvQkFBb0IsRUFBRSxDQTZDbEc7SUFFRCxRQUFRLElBQUksTUFBTSxDQUVqQjtJQUVELE1BQU0sQ0FBQyxLQUFLLEVBQUUsb0JBQW9CLEdBQUcsT0FBTyxDQUUzQztJQUVELE1BQU0sSUFBSSx3QkFBd0IsQ0FLakM7Q0FDRiJ9

package/dest/block/proposal/committee_attestation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"committee_attestation.d.ts","sourceRoot":"","sources":["../../../src/block/proposal/committee_attestation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAC3F,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC;AAEjC,qBAAa,oBAAoB;aAEb,OAAO,EAAE,UAAU;aACnB,SAAS,EAAE,SAAS;gBADpB,OAAO,EAAE,UAAU,EACnB,SAAS,EAAE,SAAS;IAGtC,MAAM,KAAK,MAAM;;;;;;;;;;;;OAOhB;IAGD,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,UAAU,GAAG,oBAAoB;IAK7D,MAAM,CAAC,uBAAuB,CAAC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,GAAG,oBAAoB;IAI/F,MAAM,CAAC,aAAa,CAAC,SAAS,EAAE,SAAS,GAAG,oBAAoB;IAIhE,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,wBAAwB,GAAG,oBAAoB;IAIrE,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,oBAAoB;IAOtE,MAAM,CAAC,MAAM,IAAI,oBAAoB;IAKrC,MAAM,CAAC,KAAK,IAAI,oBAAoB;IAIpC,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,yBAAyB,EAAE,aAAa,EAAE,MAAM,GAAG,oBAAoB,EAAE;IA+CnG,QAAQ,IAAI,MAAM;IAIlB,MAAM,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO;IAI5C,MAAM,IAAI,wBAAwB;CAMnC"}
+{"version":3,"file":"committee_attestation.d.ts","sourceRoot":"","sources":["../../../src/block/proposal/committee_attestation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AACrG,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC;AAEjC,qBAAa,oBAAoB;aAEb,OAAO,EAAE,UAAU;aACnB,SAAS,EAAE,SAAS;IAFtC,YACkB,OAAO,EAAE,UAAU,EACnB,SAAS,EAAE,SAAS,EAClC;IAEJ,MAAM,KAAK,MAAM;;;;;;QAOhB;IAGD,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,UAAU,GAAG,oBAAoB,CAE5D;IAGD,MAAM,CAAC,uBAAuB,CAAC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,GAAG,oBAAoB,CAE9F;IAED,MAAM,CAAC,aAAa,CAAC,SAAS,EAAE,SAAS,GAAG,oBAAoB,CAE/D;IAED,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,wBAAwB,GAAG,oBAAoB,CAEpE;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,oBAAoB,CAKrE;IAED,MAAM,CAAC,MAAM,IAAI,oBAAoB,CAGpC;IAED,MAAM,CAAC,KAAK,IAAI,oBAAoB,CAEnC;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,yBAAyB,EAAE,aAAa,EAAE,MAAM,GAAG,oBAAoB,EAAE,CA6ClG;IAED,QAAQ,IAAI,MAAM,CAEjB;IAED,MAAM,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAE3C;IAED,MAAM,IAAI,wBAAwB,CAKjC;CACF"}

package/dest/block/proposal/index.d.ts

@@ -1,3 +1,3 @@
 export * from './committee_attestation.js';
 export * from './attestations_and_signers.js';
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9ibG9jay9wcm9wb3NhbC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLDRCQUE0QixDQUFDO0FBQzNDLGNBQWMsK0JBQStCLENBQUMifQ==

package/dest/block/test/index.d.ts

@@ -1,2 +1,2 @@
 export * from './l2_tips_store_test_suite.js';
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9ibG9jay90ZXN0L2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsK0JBQStCLENBQUMifQ==

package/dest/block/test/l2_tips_store_test_suite.d.ts

@@ -1,3 +1,3 @@
 import type { L2TipsStore } from '../l2_block_stream/index.js';
 export declare function testL2TipsStore(makeTipsStore: () => Promise<L2TipsStore>): void;
-//# sourceMappingURL=l2_tips_store_test_suite.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfdGlwc19zdG9yZV90ZXN0X3N1aXRlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYmxvY2svdGVzdC9sMl90aXBzX3N0b3JlX3Rlc3Rfc3VpdGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBZ0JBLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBRS9ELHdCQUFnQixlQUFlLENBQUMsYUFBYSxFQUFFLE1BQU0sT0FBTyxDQUFDLFdBQVcsQ0FBQyxRQSt2QnhFIn0=

package/dest/block/test/l2_tips_store_test_suite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"l2_tips_store_test_suite.d.ts","sourceRoot":"","sources":["../../../src/block/test/l2_tips_store_test_suite.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAE/D,wBAAgB,eAAe,CAAC,aAAa,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,QA8ExE"}
+{"version":3,"file":"l2_tips_store_test_suite.d.ts","sourceRoot":"","sources":["../../../src/block/test/l2_tips_store_test_suite.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAE/D,wBAAgB,eAAe,CAAC,aAAa,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,QA+vBxE"}