@aztec/stdlib 0.0.0-test.1 → 0.0.1-commit.017a351

package/dest/p2p/block_proposal.js

@@ -1,70 +1,215 @@
+import { BlockProposalHash, IndexWithinCheckpoint } from '@aztec/foundation/branded-types';
 import { Buffer32 } from '@aztec/foundation/buffer';
-import { keccak256, recoverAddress } from '@aztec/foundation/crypto';
+import { keccak256 } from '@aztec/foundation/crypto/keccak';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { Signature } from '@aztec/foundation/eth-signature';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
-import { ConsensusPayload } from './consensus_payload.js';
+import { MAX_TXS_PER_BLOCK } from '../deserialization/index.js';
+import { DutyType } from '../ha-signing/index.js';
+import { BlockHeader } from '../tx/block_header.js';
+import { TxHash } from '../tx/index.js';
 import { Gossipable } from './gossipable.js';
-import { SignatureDomainSeparator, getHashedSignaturePayload, getHashedSignaturePayloadEthSignedMessage } from './signature_utils.js';
-import { TopicType, createTopicString } from './topic_type.js';
-export class BlockProposalHash extends Buffer32 {
-    constructor(hash){
-        super(hash);
-    }
-}
+import { EMPTY_COORDINATION_SIGNATURE_CONTEXT, coordinationSignatureContextEquals, getCoordinationSignatureTypedData, readCoordinationSignatureContext, recoverCoordinationSigner, serializeCoordinationSignatureContext } from './signature_utils.js';
+import { SignedTxs } from './signed_txs.js';
+import { TopicType } from './topic_type.js';
 /**
- * BlockProposal
- *
- * A block proposal is created by the leader of the chain proposing a sequence of transactions to
- * be included in the head of the chain
+ * A block proposal is created by the leader of the chain proposing a sequence of transactions
+ * to be included in a block within a checkpoint. This is used for non-last blocks in a slot.
+ * The last block is sent as part of a CheckpointProposal.
  */ export class BlockProposal extends Gossipable {
-    payload;
+    blockHeader;
+    indexWithinCheckpoint;
+    inHash;
+    archiveRoot;
+    txHashes;
     signature;
-    static p2pTopic = createTopicString(TopicType.block_proposal);
-    sender;
-    constructor(/** The payload of the message, and what the signature is over */ payload, /** The signer of the BlockProposal over the header of the new block*/ signature){
-        super(), this.payload = payload, this.signature = signature;
+    signatureContext;
+    signedTxs;
+    static p2pTopic = TopicType.block_proposal;
+    primaryType;
+    cachedSender;
+    constructor(/** The per-block header containing block state and global variables */ blockHeader, /** Index of this block within the checkpoint (0-indexed) */ indexWithinCheckpoint, /** Hash of L1 to L2 messages for this checkpoint (constant across all blocks in checkpoint) */ inHash, /** Archive root after this block is applied */ archiveRoot, /** The sequence of transactions in the block */ txHashes, /** The proposer's signature over the block data */ signature, /** The signing domain (chainId + rollupAddress) the signature is bound to */ signatureContext, /** The signed transactions in the block (optional, for DA guarantees) */ signedTxs){
+        super(), this.blockHeader = blockHeader, this.indexWithinCheckpoint = indexWithinCheckpoint, this.inHash = inHash, this.archiveRoot = archiveRoot, this.txHashes = txHashes, this.signature = signature, this.signatureContext = signatureContext, this.signedTxs = signedTxs, this.primaryType = 'BlockProposal', this.cachedSender = undefined;
     }
-    p2pMessageIdentifier() {
-        return Promise.resolve(new BlockProposalHash(keccak256(this.signature.toBuffer())));
+    generateP2PMessageIdentifier() {
+        return Promise.resolve(new Buffer32(this.getPayloadHashBuffer()));
     }
     get archive() {
-        return this.payload.archive;
+        return this.archiveRoot;
     }
     get slotNumber() {
-        return this.payload.header.globalVariables.slotNumber;
+        return this.blockHeader.getSlot();
     }
     get blockNumber() {
-        return this.payload.header.globalVariables.blockNumber;
-    }
-    static async createProposalFromSigner(payload, payloadSigner) {
-        const hashed = await getHashedSignaturePayload(payload, SignatureDomainSeparator.blockProposal);
-        const sig = await payloadSigner(hashed);
-        return new BlockProposal(payload, sig);
-    }
-    /**Get Sender
-   * Lazily evaluate the sender of the proposal; result is cached
-   */ async getSender() {
-        if (!this.sender) {
-            const hashed = await getHashedSignaturePayloadEthSignedMessage(this.payload, SignatureDomainSeparator.blockProposal);
-            // Cache the sender for later use
-            this.sender = recoverAddress(hashed, this.signature);
+        return this.blockHeader.getBlockNumber();
+    }
+    /** Convenience getter for txs from signedTxs */ get txs() {
+        return this.signedTxs?.txs;
+    }
+    toBlockInfo() {
+        return {
+            slotNumber: this.slotNumber,
+            lastArchive: this.blockHeader.lastArchive.root,
+            timestamp: this.blockHeader.globalVariables.timestamp,
+            archive: this.archiveRoot,
+            txCount: this.txHashes.length
+        };
+    }
+    /**
+   * Get the payload to sign for this block proposal.
+   * The signature is over: blockHeader + indexWithinCheckpoint + inHash + archiveRoot + txHashes
+   */ getPayloadToSign() {
+        return serializeToBuffer([
+            this.blockHeader,
+            this.indexWithinCheckpoint,
+            this.inHash,
+            this.archiveRoot,
+            this.txHashes.length,
+            this.txHashes
+        ]);
+    }
+    getPayloadHashBuffer() {
+        return keccak256(this.getPayloadToSign());
+    }
+    /**
+   * Returns a keccak256 hash of the signed payload.
+   * Used by the attestation pool to dedup distinct signed payloads at the same
+   * (slot, indexWithinCheckpoint) regardless of archive collisions.
+   * The hash deliberately excludes the signature so non-deterministic ECDSA
+   * re-signs of the same payload do not look like equivocation.
+   */ getPayloadHash() {
+        return BlockProposalHash.fromBuffer(this.getPayloadHashBuffer());
+    }
+    static async createProposalFromSigner(blockHeader, checkpointNumber, indexWithinCheckpoint, inHash, archiveRoot, txHashes, txs, signatureContext, proposalSigner, txsSigner) {
+        // Create a temporary proposal to get the payload to sign
+        const tempProposal = new BlockProposal(blockHeader, indexWithinCheckpoint, inHash, archiveRoot, txHashes, Signature.empty(), signatureContext);
+        // Create the block signing context
+        const blockContext = {
+            slot: blockHeader.globalVariables.slotNumber,
+            blockNumber: blockHeader.globalVariables.blockNumber,
+            checkpointNumber,
+            blockIndexWithinCheckpoint: indexWithinCheckpoint,
+            dutyType: DutyType.BLOCK_PROPOSAL
+        };
+        const typedData = getCoordinationSignatureTypedData(tempProposal);
+        const sig = await proposalSigner(typedData, blockContext);
+        // If txs are provided, sign them as well
+        let signedTxs;
+        if (txs) {
+            const txsSigningContext = {
+                dutyType: DutyType.TXS
+            };
+            if (!txsSigner) {
+                throw new Error('signed_txs requires a typed-data signer');
+            }
+            signedTxs = await SignedTxs.createFromSigner(txs, signatureContext, (typedData)=>txsSigner(typedData, txsSigningContext));
+        }
+        return new BlockProposal(blockHeader, indexWithinCheckpoint, inHash, archiveRoot, txHashes, sig, signatureContext, signedTxs);
+    }
+    /**
+   * Lazily evaluate the sender of the proposal; result is cached.
+   * If there's signedTxs, also verifies that its signing domain matches this proposal's and
+   * that the signedTxs sender matches the block proposal sender. This prevents a proposer
+   * from wrapping a foreign-chain SignedTxs bundle inside a local-chain proposal.
+   * @returns The sender address, or undefined if signature recovery fails or inner/outer mismatch
+   */ getSender() {
+        if (this.cachedSender === undefined) {
+            const blockSender = recoverCoordinationSigner(this, this.signature);
+            if (blockSender && this.signedTxs) {
+                if (!coordinationSignatureContextEquals(this.signedTxs.signatureContext, this.signatureContext)) {
+                    this.cachedSender = null;
+                    return undefined;
+                }
+                const txsSender = this.signedTxs.getSender();
+                if (!txsSender || !txsSender.equals(blockSender)) {
+                    this.cachedSender = null;
+                    return undefined;
+                }
+            }
+            this.cachedSender = blockSender ?? null;
         }
-        return this.sender;
+        return this.cachedSender ?? undefined;
     }
     getPayload() {
-        return this.payload.getPayloadToSign(SignatureDomainSeparator.blockProposal);
+        return this.getPayloadToSign();
     }
     toBuffer() {
-        return serializeToBuffer([
-            this.payload,
-            this.signature
-        ]);
+        const buffer = [
+            this.blockHeader,
+            this.indexWithinCheckpoint,
+            this.inHash,
+            this.archiveRoot,
+            this.signature,
+            serializeCoordinationSignatureContext(this.signatureContext),
+            this.txHashes.length,
+            this.txHashes
+        ];
+        if (this.signedTxs) {
+            buffer.push(1); // hasSignedTxs = true
+            buffer.push(this.signedTxs.toBuffer());
+        } else {
+            buffer.push(0); // hasSignedTxs = false
+        }
+        return serializeToBuffer(buffer);
     }
     static fromBuffer(buf) {
         const reader = BufferReader.asReader(buf);
-        return new BlockProposal(reader.readObject(ConsensusPayload), reader.readObject(Signature));
+        const blockHeader = reader.readObject(BlockHeader);
+        const indexWithinCheckpoint = IndexWithinCheckpoint(reader.readNumber());
+        const inHash = reader.readObject(Fr);
+        const archiveRoot = reader.readObject(Fr);
+        const signature = reader.readObject(Signature);
+        const signatureContext = readCoordinationSignatureContext(reader);
+        const txHashCount = reader.readNumber();
+        if (txHashCount > MAX_TXS_PER_BLOCK) {
+            throw new Error(`txHashes count ${txHashCount} exceeds maximum ${MAX_TXS_PER_BLOCK}`);
+        }
+        const txHashes = reader.readArray(txHashCount, TxHash);
+        if (!reader.isEmpty()) {
+            const hasSignedTxs = reader.readNumber();
+            if (hasSignedTxs) {
+                const signedTxs = SignedTxs.fromBuffer(reader);
+                return new BlockProposal(blockHeader, indexWithinCheckpoint, inHash, archiveRoot, txHashes, signature, signatureContext, signedTxs);
+            }
+        }
+        return new BlockProposal(blockHeader, indexWithinCheckpoint, inHash, archiveRoot, txHashes, signature, signatureContext);
     }
     getSize() {
-        return this.payload.getSize() + this.signature.getSize();
+        return this.blockHeader.getSize() + 4 /* indexWithinCheckpoint */  + this.inHash.size + this.archiveRoot.size + this.signature.getSize() + 4 /* chainId */  + 20 /* rollupAddress */  + 4 /* txHashes.length */  + this.txHashes.length * TxHash.SIZE + 4 /* hasSignedTxs flag */  + (this.signedTxs ? this.signedTxs.getSize() : 0);
+    }
+    static empty() {
+        return new BlockProposal(BlockHeader.empty(), IndexWithinCheckpoint(0), Fr.ZERO, Fr.ZERO, [], Signature.empty(), EMPTY_COORDINATION_SIGNATURE_CONTEXT);
+    }
+    static random() {
+        return new BlockProposal(BlockHeader.random(), IndexWithinCheckpoint(Math.floor(Math.random() * 5)), Fr.random(), Fr.random(), [
+            TxHash.random(),
+            TxHash.random()
+        ], Signature.random(), EMPTY_COORDINATION_SIGNATURE_CONTEXT);
+    }
+    toInspect() {
+        return {
+            blockHeader: this.blockHeader.toInspect(),
+            indexWithinCheckpoint: this.indexWithinCheckpoint,
+            inHash: this.inHash.toString(),
+            archiveRoot: this.archiveRoot.toString(),
+            signature: this.signature.toString(),
+            txHashes: this.txHashes.map((h)=>h.toString()),
+            chainId: this.signatureContext.chainId,
+            rollupAddress: this.signatureContext.rollupAddress.toString()
+        };
+    }
+    /**
+   * Check if this proposal matches the given block.
+   * Compares the archive root and block header.
+   * @param block - The L2Block to compare against
+   * @returns True if the proposal matches the block
+   */ matchesBlock(block) {
+        return this.archiveRoot.equals(block.archive.root) && this.blockHeader.equals(block.header);
+    }
+    /**
+   * Returns a copy of this proposal without signedTxs.
+   * Used when storing proposals in attestation pool to avoid storing full tx data.
+   */ withoutSignedTxs() {
+        return new BlockProposal(this.blockHeader, this.indexWithinCheckpoint, this.inHash, this.archiveRoot, this.txHashes, this.signature, this.signatureContext);
     }
 }

package/dest/p2p/checkpoint_attestation.d.ts

@@ -0,0 +1,88 @@
+import { CheckpointProposalHash, type SlotNumber } from '@aztec/foundation/branded-types';
+import { type BaseBuffer32 } from '@aztec/foundation/buffer';
+import type { Fr } from '@aztec/foundation/curves/bn254';
+import type { EthAddress } from '@aztec/foundation/eth-address';
+import { Signature } from '@aztec/foundation/eth-signature';
+import { BufferReader } from '@aztec/foundation/serialize';
+import type { ZodFor } from '../schemas/index.js';
+import { ConsensusPayload } from './consensus_payload.js';
+import { Gossipable } from './gossipable.js';
+import { type CoordinationSignatureContext } from './signature_utils.js';
+import { TopicType } from './topic_type.js';
+/**
+ * CheckpointAttestation
+ *
+ * A validator that has attested to seeing all blocks in a checkpoint
+ * will produce a checkpoint attestation over the checkpoint header.
+ */
+export declare class CheckpointAttestation extends Gossipable {
+    /** The payload of the message, and what the signature is over */
+    readonly payload: ConsensusPayload;
+    /** The signature of the checkpoint attester */
+    readonly signature: Signature;
+    /** The signature from the checkpoint proposer */
+    readonly proposerSignature: Signature;
+    static p2pTopic: TopicType;
+    private cachedSender;
+    private cachedProposer;
+    constructor(
+    /** The payload of the message, and what the signature is over */
+    payload: ConsensusPayload, 
+    /** The signature of the checkpoint attester */
+    signature: Signature, 
+    /** The signature from the checkpoint proposer */
+    proposerSignature: Signature);
+    static get schema(): ZodFor<CheckpointAttestation>;
+    generateP2PMessageIdentifier(): Promise<BaseBuffer32>;
+    get archive(): Fr;
+    get slotNumber(): SlotNumber;
+    get signatureContext(): CoordinationSignatureContext;
+    /**
+     * Lazily evaluate and cache the signer of the attestation
+     * @returns The signer of the attestation, or undefined if signature recovery fails
+     */
+    getSender(): EthAddress | undefined;
+    /**
+     * Lazily evaluate and cache the proposer of the checkpoint
+     * @returns The proposer of the checkpoint
+     */
+    getProposer(): EthAddress | undefined;
+    getPayload(): Buffer;
+    /**
+     * Returns a keccak256 hash of the signed consensus payload.
+     * Used to dedup distinct signed payloads. Returns same hash than the corresponding proposal.
+     */
+    getPayloadHash(): CheckpointProposalHash;
+    toBuffer(): Buffer;
+    static fromBuffer(buf: Buffer | BufferReader): CheckpointAttestation;
+    static empty(): CheckpointAttestation;
+    static random(): CheckpointAttestation;
+    getSize(): number;
+    toInspect(): {
+        payload: {
+            header: {
+                lastArchive: `0x${string}`;
+                blockHeadersHash: `0x${string}`;
+                blobsHash: `0x${string}`;
+                inHash: `0x${string}`;
+                epochOutHash: `0x${string}`;
+                slotNumber: SlotNumber;
+                timestamp: bigint;
+                coinbase: `0x${string}`;
+                feeRecipient: `0x${string}`;
+                gasFees: {
+                    feePerDaGas: bigint;
+                    feePerL2Gas: bigint;
+                };
+                totalManaUsed: bigint;
+            };
+            archive: `0x${string}`;
+            feeAssetPriceModifier: string;
+            chainId: number;
+            rollupAddress: `0x${string}`;
+        };
+        signature: `0x${string}`;
+        proposerSignature: `0x${string}`;
+    };
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2twb2ludF9hdHRlc3RhdGlvbi5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3AycC9jaGVja3BvaW50X2F0dGVzdGF0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxLQUFLLFVBQVUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQzFGLE9BQU8sRUFBRSxLQUFLLFlBQVksRUFBWSxNQUFNLDBCQUEwQixDQUFDO0FBQ3ZFLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3pELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQ2hFLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUM1RCxPQUFPLEVBQUUsWUFBWSxFQUFxQixNQUFNLDZCQUE2QixDQUFDO0FBSTlFLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBRWxELE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQzFELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUM3QyxPQUFPLEVBQUUsS0FBSyw0QkFBNEIsRUFBNkIsTUFBTSxzQkFBc0IsQ0FBQztBQUNwRyxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFFNUM7Ozs7O0dBS0c7QUFDSCxxQkFBYSxxQkFBc0IsU0FBUSxVQUFVO0lBT2pELGlFQUFpRTthQUNqRCxPQUFPLEVBQUUsZ0JBQWdCO0lBRXpDLCtDQUErQzthQUMvQixTQUFTLEVBQUUsU0FBUztJQUVwQyxpREFBaUQ7YUFDakMsaUJBQWlCLEVBQUUsU0FBUztJQWI5QyxPQUFnQixRQUFRLFlBQW9DO0lBRTVELE9BQU8sQ0FBQyxZQUFZLENBQTRDO0lBQ2hFLE9BQU8sQ0FBQyxjQUFjLENBQTRDO0lBRWxFO0lBQ0UsaUVBQWlFO0lBQ2pELE9BQU8sRUFBRSxnQkFBZ0I7SUFFekMsK0NBQStDO0lBQy9CLFNBQVMsRUFBRSxTQUFTO0lBRXBDLGlEQUFpRDtJQUNqQyxpQkFBaUIsRUFBRSxTQUFTLEVBRzdDO0lBRUQsTUFBTSxLQUFLLE1BQU0sSUFBSSxNQUFNLENBQUMscUJBQXFCLENBQUMsQ0FRakQ7SUFFUSw0QkFBNEIsSUFBSSxPQUFPLENBQUMsWUFBWSxDQUFDLENBRTdEO0lBRUQsSUFBSSxPQUFPLElBQUksRUFBRSxDQUVoQjtJQUVELElBQUksVUFBVSxJQUFJLFVBQVUsQ0FFM0I7SUFFRCxJQUFJLGdCQUFnQixJQUFJLDRCQUE0QixDQUVuRDtJQUVEOzs7T0FHRztJQUNILFNBQVMsSUFBSSxVQUFVLEdBQUcsU0FBUyxDQUtsQztJQUVEOzs7T0FHRztJQUNILFdBQVcsSUFBSSxVQUFVLEdBQUcsU0FBUyxDQWVwQztJQUVELFVBQVUsSUFBSSxNQUFNLENBRW5CO0lBRUQ7OztPQUdHO0lBQ0gsY0FBYyxJQUFJLHNCQUFzQixDQUV2QztJQUVELFFBQVEsSUFBSSxNQUFNLENBRWpCO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxHQUFHLEVBQUUsTUFBTSxHQUFHLFlBQVksR0FBRyxxQkFBcUIsQ0FPbkU7SUFFRCxNQUFNLENBQUMsS0FBSyxJQUFJLHFCQUFxQixDQUVwQztJQUVELE1BQU0sQ0FBQyxNQUFNLElBQUkscUJBQXFCLENBRXJDO0lBRUQsT0FBTyxJQUFJLE1BQU0sQ0FFaEI7SUFFRCxTQUFTOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O01BTVI7Q0FDRiJ9

package/dest/p2p/checkpoint_attestation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"checkpoint_attestation.d.ts","sourceRoot":"","sources":["../../src/p2p/checkpoint_attestation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,KAAK,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC1F,OAAO,EAAE,KAAK,YAAY,EAAY,MAAM,0BAA0B,CAAC;AACvE,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAI9E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAElD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,KAAK,4BAA4B,EAA6B,MAAM,sBAAsB,CAAC;AACpG,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C;;;;;GAKG;AACH,qBAAa,qBAAsB,SAAQ,UAAU;IAOjD,iEAAiE;aACjD,OAAO,EAAE,gBAAgB;IAEzC,+CAA+C;aAC/B,SAAS,EAAE,SAAS;IAEpC,iDAAiD;aACjC,iBAAiB,EAAE,SAAS;IAb9C,OAAgB,QAAQ,YAAoC;IAE5D,OAAO,CAAC,YAAY,CAA4C;IAChE,OAAO,CAAC,cAAc,CAA4C;IAElE;IACE,iEAAiE;IACjD,OAAO,EAAE,gBAAgB;IAEzC,+CAA+C;IAC/B,SAAS,EAAE,SAAS;IAEpC,iDAAiD;IACjC,iBAAiB,EAAE,SAAS,EAG7C;IAED,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,qBAAqB,CAAC,CAQjD;IAEQ,4BAA4B,IAAI,OAAO,CAAC,YAAY,CAAC,CAE7D;IAED,IAAI,OAAO,IAAI,EAAE,CAEhB;IAED,IAAI,UAAU,IAAI,UAAU,CAE3B;IAED,IAAI,gBAAgB,IAAI,4BAA4B,CAEnD;IAED;;;OAGG;IACH,SAAS,IAAI,UAAU,GAAG,SAAS,CAKlC;IAED;;;OAGG;IACH,WAAW,IAAI,UAAU,GAAG,SAAS,CAepC;IAED,UAAU,IAAI,MAAM,CAEnB;IAED;;;OAGG;IACH,cAAc,IAAI,sBAAsB,CAEvC;IAED,QAAQ,IAAI,MAAM,CAEjB;IAED,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,qBAAqB,CAOnE;IAED,MAAM,CAAC,KAAK,IAAI,qBAAqB,CAEpC;IAED,MAAM,CAAC,MAAM,IAAI,qBAAqB,CAErC;IAED,OAAO,IAAI,MAAM,CAEhB;IAED,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;MAMR;CACF"}

package/dest/p2p/checkpoint_attestation.js

@@ -0,0 +1,103 @@
+import { CheckpointProposalHash } from '@aztec/foundation/branded-types';
+import { Buffer32 } from '@aztec/foundation/buffer';
+import { Signature } from '@aztec/foundation/eth-signature';
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import { z } from 'zod';
+import { CheckpointProposal } from './checkpoint_proposal.js';
+import { ConsensusPayload } from './consensus_payload.js';
+import { Gossipable } from './gossipable.js';
+import { recoverCoordinationSigner } from './signature_utils.js';
+import { TopicType } from './topic_type.js';
+/**
+ * CheckpointAttestation
+ *
+ * A validator that has attested to seeing all blocks in a checkpoint
+ * will produce a checkpoint attestation over the checkpoint header.
+ */ export class CheckpointAttestation extends Gossipable {
+    payload;
+    signature;
+    proposerSignature;
+    static p2pTopic = TopicType.checkpoint_attestation;
+    cachedSender;
+    cachedProposer;
+    constructor(/** The payload of the message, and what the signature is over */ payload, /** The signature of the checkpoint attester */ signature, /** The signature from the checkpoint proposer */ proposerSignature){
+        super(), this.payload = payload, this.signature = signature, this.proposerSignature = proposerSignature, this.cachedSender = undefined, this.cachedProposer = undefined;
+    }
+    static get schema() {
+        return z.object({
+            payload: ConsensusPayload.schema,
+            signature: Signature.schema,
+            proposerSignature: Signature.schema
+        }).transform((obj)=>new CheckpointAttestation(obj.payload, obj.signature, obj.proposerSignature));
+    }
+    generateP2PMessageIdentifier() {
+        return Promise.resolve(new Buffer32(this.payload.getPayloadHash()));
+    }
+    get archive() {
+        return this.payload.archive;
+    }
+    get slotNumber() {
+        return this.payload.header.slotNumber;
+    }
+    get signatureContext() {
+        return this.payload.signatureContext;
+    }
+    /**
+   * Lazily evaluate and cache the signer of the attestation
+   * @returns The signer of the attestation, or undefined if signature recovery fails
+   */ getSender() {
+        if (this.cachedSender === undefined) {
+            this.cachedSender = recoverCoordinationSigner(this.payload, this.signature) ?? null;
+        }
+        return this.cachedSender ?? undefined;
+    }
+    /**
+   * Lazily evaluate and cache the proposer of the checkpoint
+   * @returns The proposer of the checkpoint
+   */ getProposer() {
+        if (this.cachedProposer === undefined) {
+            // Create a temporary CheckpointProposal to recover the proposer address.
+            // We need to use CheckpointProposal because it has a different getPayloadToSign()
+            // implementation than ConsensusPayload (uses serializeToBuffer vs ABI encoding).
+            const proposal = new CheckpointProposal(this.payload.header, this.payload.archive, this.payload.feeAssetPriceModifier, this.proposerSignature, this.payload.signatureContext);
+            this.cachedProposer = proposal.getSender() ?? null;
+        }
+        return this.cachedProposer ?? undefined;
+    }
+    getPayload() {
+        return this.payload.getPayloadToSign();
+    }
+    /**
+   * Returns a keccak256 hash of the signed consensus payload.
+   * Used to dedup distinct signed payloads. Returns same hash than the corresponding proposal.
+   */ getPayloadHash() {
+        return CheckpointProposalHash.fromBuffer(this.payload.getPayloadHash());
+    }
+    toBuffer() {
+        return serializeToBuffer([
+            this.payload,
+            this.signature,
+            this.proposerSignature
+        ]);
+    }
+    static fromBuffer(buf) {
+        const reader = BufferReader.asReader(buf);
+        return new CheckpointAttestation(reader.readObject(ConsensusPayload), reader.readObject(Signature), reader.readObject(Signature));
+    }
+    static empty() {
+        return new CheckpointAttestation(ConsensusPayload.empty(), Signature.empty(), Signature.empty());
+    }
+    static random() {
+        return new CheckpointAttestation(ConsensusPayload.random(), Signature.random(), Signature.random());
+    }
+    getSize() {
+        return this.payload.getSize() + this.signature.getSize() + this.proposerSignature.getSize();
+    }
+    toInspect() {
+        return {
+            payload: this.payload.toInspect(),
+            signature: this.signature.toString(),
+            proposerSignature: this.proposerSignature.toString()
+        };
+    }
+}

package/dest/p2p/checkpoint_proposal.d.ts

@@ -0,0 +1,193 @@
+import { type CheckpointNumber, CheckpointProposalHash, IndexWithinCheckpoint, SlotNumber } from '@aztec/foundation/branded-types';
+import { type BaseBuffer32 } from '@aztec/foundation/buffer';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import type { EthAddress } from '@aztec/foundation/eth-address';
+import { Signature } from '@aztec/foundation/eth-signature';
+import { BufferReader } from '@aztec/foundation/serialize';
+import type { TypedDataDefinition } from 'viem';
+import type { L2BlockInfo } from '../block/l2_block_info.js';
+import { type SigningContext } from '../ha-signing/index.js';
+import { CheckpointHeader } from '../rollup/checkpoint_header.js';
+import { BlockHeader } from '../tx/block_header.js';
+import { TxHash } from '../tx/index.js';
+import type { Tx } from '../tx/tx.js';
+import { BlockProposal } from './block_proposal.js';
+import { ConsensusPayload } from './consensus_payload.js';
+import { Gossipable } from './gossipable.js';
+import { type CoordinationSignatureContext, type CoordinationSignatureType, type Signable } from './signature_utils.js';
+import { SignedTxs } from './signed_txs.js';
+import { TopicType } from './topic_type.js';
+export type { CheckpointProposalHash } from '@aztec/foundation/branded-types';
+export type CheckpointProposalOptions = {
+    /**
+     * Whether to include the tx objects along with the block proposal.
+     * Dramatically increases size of the payload but eliminates failed reexecutions due to missing txs.
+     */
+    publishFullTxs?: boolean;
+    /**
+     * Whether to generate an invalid checkpoint proposal for broadcasting.
+     * Use only for testing.
+     */
+    broadcastInvalidCheckpointProposal?: boolean;
+};
+/** Data for the last block included in a checkpoint proposal */
+export type CheckpointLastBlockData = {
+    /** The per-block header for the last block in the checkpoint */
+    blockHeader: BlockHeader;
+    /** Index of this block within the checkpoint (should be the last index, e.g., numBlocks - 1) */
+    indexWithinCheckpoint: IndexWithinCheckpoint;
+    /** The sequence of transactions in the last block */
+    txHashes: TxHash[];
+    /** The tx in the last block (optional, for DA guarantees) */
+    txs?: Tx[];
+};
+/** Last block included in a checkpoint proposal */
+export type CheckpointLastBlock = Omit<CheckpointLastBlockData, 'txs'> & {
+    /** The proposer's signature over the block data (separate from checkpoint signature) */
+    signature: Signature;
+    /** The signed transactions in the last block (optional, for DA guarantees) */
+    signedTxs?: SignedTxs;
+};
+/**
+ * A checkpoint proposal is created by the leader of the chain for the last block in a checkpoint.
+ * It includes the aggregated checkpoint header that validators will attest to, plus optionally
+ * the last block's info for nodes to re-execute. This marks the completion of a slot's worth of blocks.
+ */
+export declare class CheckpointProposal extends Gossipable implements Signable {
+    /** The aggregated checkpoint header for consensus */
+    readonly checkpointHeader: CheckpointHeader;
+    /** Archive root after this checkpoint is applied */
+    readonly archive: Fr;
+    /** The fee asset price modifier in basis points (from oracle) */
+    readonly feeAssetPriceModifier: bigint;
+    /** The proposer's signature over the checkpoint payload (checkpointHeader + archive + feeAssetPriceModifier) */
+    readonly signature: Signature;
+    /** The signing domain (chainId + rollupAddress) the signature is bound to */
+    readonly signatureContext: CoordinationSignatureContext;
+    /** Optional last block info, including its own signature for BlockProposal extraction */
+    readonly lastBlock?: BlockProposal | CheckpointLastBlock | undefined;
+    static p2pTopic: TopicType;
+    readonly primaryType: CoordinationSignatureType;
+    private cachedSender;
+    constructor(
+    /** The aggregated checkpoint header for consensus */
+    checkpointHeader: CheckpointHeader, 
+    /** Archive root after this checkpoint is applied */
+    archive: Fr, 
+    /** The fee asset price modifier in basis points (from oracle) */
+    feeAssetPriceModifier: bigint, 
+    /** The proposer's signature over the checkpoint payload (checkpointHeader + archive + feeAssetPriceModifier) */
+    signature: Signature, 
+    /** The signing domain (chainId + rollupAddress) the signature is bound to */
+    signatureContext: CoordinationSignatureContext, 
+    /** Optional last block info, including its own signature for BlockProposal extraction */
+    lastBlock?: BlockProposal | CheckpointLastBlock | undefined);
+    generateP2PMessageIdentifier(): Promise<BaseBuffer32>;
+    get slotNumber(): SlotNumber;
+    /**
+     * Extract a BlockProposal from the last block info.
+     * Uses inHash from checkpointHeader.contentCommitment.inHash
+     */
+    getBlockProposal(): BlockProposal | undefined;
+    toBlockInfo(): Omit<L2BlockInfo, 'blockNumber'>;
+    toCheckpointInfo(): {
+        slotNumber: SlotNumber;
+        archive: Fr;
+        lastBlockNumber: import("@aztec/foundation/branded-types").BlockNumber | undefined;
+        lastBlockIndex: IndexWithinCheckpoint | undefined;
+        blockHeadersHash: Fr;
+    };
+    /**
+     * Get the payload to sign for this checkpoint proposal.
+     * The signature is over the checkpoint header + archive root + feeAssetPriceModifier (for consensus).
+     */
+    getPayloadToSign(): Buffer;
+    /**
+     * Returns a content-addressed keccak256 hash of the consensus payload
+     * (header + archive + feeAssetPriceModifier + signatureContext).
+     *
+     * Used by the attestation pool to dedup distinct signed payloads at the same slot
+     * regardless of archive/header collisions on `feeAssetPriceModifier` variants.
+     * The hash deliberately excludes the signature so non-deterministic ECDSA
+     * re-signs of the same payload do not look like equivocation.
+     */
+    getPayloadHash(): CheckpointProposalHash;
+    /** Returns the ConsensusPayload that an attester would sign for this proposal. */
+    toConsensusPayload(): ConsensusPayload;
+    static createProposalFromSigner(checkpointHeader: CheckpointHeader, archiveRoot: Fr, checkpointNumber: CheckpointNumber, feeAssetPriceModifier: bigint, lastBlockProposal: BlockProposal | undefined, signatureContext: CoordinationSignatureContext, payloadSigner: (typedData: TypedDataDefinition, context: SigningContext) => Promise<Signature>): Promise<CheckpointProposal>;
+    /**
+     * Lazily evaluate the sender of the proposal; result is cached.
+     * If there's a lastBlock, also verifies the block proposal sender matches the checkpoint sender.
+     * @returns The sender address, or undefined if signature recovery fails or senders don't match
+     */
+    getSender(): EthAddress | undefined;
+    getPayload(): Buffer<ArrayBufferLike>;
+    toBuffer(): Buffer;
+    static fromBuffer(buf: Buffer | BufferReader): CheckpointProposal;
+    getSize(): number;
+    static empty(): CheckpointProposal;
+    static random(): CheckpointProposal;
+    toInspect(): {
+        checkpointHeader: {
+            lastArchive: `0x${string}`;
+            blockHeadersHash: `0x${string}`;
+            blobsHash: `0x${string}`;
+            inHash: `0x${string}`;
+            epochOutHash: `0x${string}`;
+            slotNumber: SlotNumber;
+            timestamp: bigint;
+            coinbase: `0x${string}`;
+            feeRecipient: `0x${string}`;
+            gasFees: {
+                feePerDaGas: bigint;
+                feePerL2Gas: bigint;
+            };
+            totalManaUsed: bigint;
+        };
+        archive: `0x${string}`;
+        signature: `0x${string}`;
+        feeAssetPriceModifier: string;
+        chainId: number;
+        rollupAddress: `0x${string}`;
+        lastBlock: {
+            blockHeader: {
+                lastArchive: `0x${string}`;
+                state: {
+                    l1ToL2MessageTree: `0x${string}`;
+                    noteHashTree: `0x${string}`;
+                    nullifierTree: `0x${string}`;
+                    publicDataTree: `0x${string}`;
+                };
+                spongeBlobHash: bigint;
+                globalVariables: {
+                    chainId: number;
+                    version: number;
+                    blockNumber: import("@aztec/foundation/branded-types").BlockNumber;
+                    slotNumber: SlotNumber;
+                    timestamp: bigint;
+                    coinbase: `0x${string}`;
+                    feeRecipient: `0x${string}`;
+                    feePerDaGas: number;
+                    feePerL2Gas: number;
+                };
+                totalFees: bigint;
+                totalManaUsed: bigint;
+            };
+            indexWithinCheckpoint: IndexWithinCheckpoint;
+            txHashes: `0x${string}`[];
+            signature: `0x${string}`;
+        } | undefined;
+    };
+    /**
+     * Returns a copy of this proposal without lastBlock info, as a CheckpointProposalCore.
+     * Used when the lastBlock has been extracted and stored separately.
+     */
+    toCore(): CheckpointProposalCore;
+}
+/**
+ * A checkpoint proposal without the lastBlock info.
+ * Used when the lastBlock has been extracted and handled separately as a BlockProposal.
+ * This type makes it clear that lastBlock and getBlockProposal() are not available.
+ */
+export type CheckpointProposalCore = Omit<CheckpointProposal, 'lastBlock' | 'getBlockProposal' | 'toCore'>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2twb2ludF9wcm9wb3NhbC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3AycC9jaGVja3BvaW50X3Byb3Bvc2FsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxLQUFLLGdCQUFnQixFQUNyQixzQkFBc0IsRUFDdEIscUJBQXFCLEVBQ3JCLFVBQVUsRUFDWCxNQUFNLGlDQUFpQyxDQUFDO0FBQ3pDLE9BQU8sRUFBRSxLQUFLLFlBQVksRUFBWSxNQUFNLDBCQUEwQixDQUFDO0FBQ3ZFLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUNoRSxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDNUQsT0FBTyxFQUFFLFlBQVksRUFBNEMsTUFBTSw2QkFBNkIsQ0FBQztBQUVyRyxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUVoRCxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUU3RCxPQUFPLEVBQVksS0FBSyxjQUFjLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUN2RSxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNsRSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDcEQsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBQ3hDLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUN0QyxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDcEQsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDMUQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlCQUFpQixDQUFD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