@aztec/stdlib 0.0.1-commit.c7c42ec → 0.0.1-commit.f295ac2

package/dest/p2p/{block_attestation.js → checkpoint_attestation.js}

@@ -4,28 +4,29 @@ import { tryRecoverAddress } from '@aztec/foundation/crypto/secp256k1-signer';
 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 { SignatureDomainSeparator, getHashedSignaturePayloadEthSignedMessage } from './signature_utils.js';
 import { TopicType } from './topic_type.js';
-export class BlockAttestationHash extends Buffer32 {
+export class CheckpointAttestationHash extends Buffer32 {
     constructor(hash){
         super(hash);
     }
 }
 /**
- * BlockAttestation
+ * CheckpointAttestation
  *
- * A validator that has attested to seeing the contents of a block
- * will produce a block attestation over the header of the block
- */ export class BlockAttestation extends Gossipable {
+ * 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.block_attestation;
+    static p2pTopic = TopicType.checkpoint_attestation;
     sender;
     proposer;
-    constructor(/** The payload of the message, and what the signature is over */ payload, /** The signature of the block attester */ signature, /** The signature from the block proposer */ proposerSignature){
+    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;
     }
     static get schema() {
@@ -33,10 +34,10 @@ export class BlockAttestationHash extends Buffer32 {
             payload: ConsensusPayload.schema,
             signature: Signature.schema,
             proposerSignature: Signature.schema
-        }).transform((obj)=>new BlockAttestation(obj.payload, obj.signature, obj.proposerSignature));
+        }).transform((obj)=>new CheckpointAttestation(obj.payload, obj.signature, obj.proposerSignature));
     }
     generateP2PMessageIdentifier() {
-        return Promise.resolve(new BlockAttestationHash(keccak256(this.signature.toBuffer())));
+        return Promise.resolve(new CheckpointAttestationHash(keccak256(this.signature.toBuffer())));
     }
     get archive() {
         return this.payload.archive;
@@ -50,26 +51,28 @@ export class BlockAttestationHash extends Buffer32 {
    */ getSender() {
         if (!this.sender) {
             // Recover the sender from the attestation
-            const hashed = getHashedSignaturePayloadEthSignedMessage(this.payload, SignatureDomainSeparator.blockAttestation);
+            const hashed = getHashedSignaturePayloadEthSignedMessage(this.payload, SignatureDomainSeparator.checkpointAttestation);
             // Cache the sender for later use
             this.sender = tryRecoverAddress(hashed, this.signature);
         }
         return this.sender;
     }
     /**
-   * Lazily evaluate and cache the proposer of the block
-   * @returns The proposer of the block
+   * Lazily evaluate and cache the proposer of the checkpoint
+   * @returns The proposer of the checkpoint
    */ getProposer() {
         if (!this.proposer) {
-            // Recover the proposer from the proposal signature
-            const hashed = getHashedSignaturePayloadEthSignedMessage(this.payload, SignatureDomainSeparator.blockProposal);
+            // 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.proposerSignature);
             // Cache the proposer for later use
-            this.proposer = tryRecoverAddress(hashed, this.proposerSignature);
+            this.proposer = proposal.getSender();
         }
         return this.proposer;
     }
     getPayload() {
-        return this.payload.getPayloadToSign(SignatureDomainSeparator.blockAttestation);
+        return this.payload.getPayloadToSign(SignatureDomainSeparator.checkpointAttestation);
     }
     toBuffer() {
         return serializeToBuffer([
@@ -80,13 +83,13 @@ export class BlockAttestationHash extends Buffer32 {
     }
     static fromBuffer(buf) {
         const reader = BufferReader.asReader(buf);
-        return new BlockAttestation(reader.readObject(ConsensusPayload), reader.readObject(Signature), reader.readObject(Signature));
+        return new CheckpointAttestation(reader.readObject(ConsensusPayload), reader.readObject(Signature), reader.readObject(Signature));
     }
     static empty() {
-        return new BlockAttestation(ConsensusPayload.empty(), Signature.empty(), Signature.empty());
+        return new CheckpointAttestation(ConsensusPayload.empty(), Signature.empty(), Signature.empty());
     }
     static random() {
-        return new BlockAttestation(ConsensusPayload.random(), Signature.random(), Signature.random());
+        return new CheckpointAttestation(ConsensusPayload.random(), Signature.random(), Signature.random());
     }
     getSize() {
         return this.payload.getSize() + this.signature.getSize() + this.proposerSignature.getSize();

package/dest/p2p/checkpoint_proposal.d.ts

@@ -0,0 +1,160 @@
+import { BlockNumber, IndexWithinCheckpoint, SlotNumber } from '@aztec/foundation/branded-types';
+import { Buffer32 } 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 SigningContext } from '@aztec/validator-ha-signer/types';
+import type { L2BlockInfo } from '../block/l2_block_info.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 { Gossipable } from './gossipable.js';
+import { SignatureDomainSeparator } from './signature_utils.js';
+import { SignedTxs } from './signed_txs.js';
+import { TopicType } from './topic_type.js';
+export declare class CheckpointProposalHash extends Buffer32 {
+    constructor(hash: Buffer);
+}
+export type CheckpointProposalOptions = {
+    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 {
+    /** The aggregated checkpoint header for consensus */
+    readonly checkpointHeader: CheckpointHeader;
+    /** Archive root after this checkpoint is applied */
+    readonly archive: Fr;
+    /** The proposer's signature over the checkpoint payload (checkpointHeader + archive) */
+    readonly signature: Signature;
+    /** Optional last block info, including its own signature for BlockProposal extraction */
+    readonly lastBlock?: CheckpointLastBlock | undefined;
+    static p2pTopic: TopicType;
+    private sender;
+    constructor(
+    /** The aggregated checkpoint header for consensus */
+    checkpointHeader: CheckpointHeader, 
+    /** Archive root after this checkpoint is applied */
+    archive: Fr, 
+    /** The proposer's signature over the checkpoint payload (checkpointHeader + archive) */
+    signature: Signature, 
+    /** Optional last block info, including its own signature for BlockProposal extraction */
+    lastBlock?: CheckpointLastBlock | undefined);
+    generateP2PMessageIdentifier(): Promise<Buffer32>;
+    get slotNumber(): SlotNumber;
+    get blockNumber(): BlockNumber;
+    /** Convenience getter for txHashes from lastBlock */
+    get txHashes(): TxHash[];
+    /** Convenience getter for txs from lastBlock */
+    get txs(): Tx[] | undefined;
+    /**
+     * Extract a BlockProposal from the last block info.
+     * Uses inHash from checkpointHeader.contentCommitment.inHash
+     */
+    getBlockProposal(): BlockProposal | undefined;
+    toBlockInfo(): Omit<L2BlockInfo, 'blockNumber'>;
+    /**
+     * Get the payload to sign for this checkpoint proposal.
+     * The signature is over the checkpoint header + archive root (for consensus).
+     */
+    getPayloadToSign(domainSeparator: SignatureDomainSeparator): Buffer;
+    static createProposalFromSigner(checkpointHeader: CheckpointHeader, archiveRoot: Fr, lastBlockInfo: CheckpointLastBlockData | undefined, payloadSigner: (payload: Buffer32, 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}`;
+        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: 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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2twb2ludF9wcm9wb3NhbC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3AycC9jaGVja3BvaW50X3Byb3Bvc2FsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQUUscUJBQXFCLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDakcsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBR3BELE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUNoRSxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDNUQsT0FBTyxFQUFFLFlBQVksRUFBcUIsTUFBTSw2QkFBNkIsQ0FBQztBQUM5RSxPQUFPLEVBQVksS0FBSyxjQUFjLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUVqRixPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUU3RCxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNsRSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDcEQsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBQ3hDLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUN0QyxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDcEQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQzdDLE9BQU8sRUFDTCx3QkFBd0IsRUFHekIsTUFBTSxzQkFBc0IsQ0FBQztBQUM5QixPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDNUMsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFN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

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

@@ -0,0 +1 @@
+{"version":3,"file":"checkpoint_proposal.d.ts","sourceRoot":"","sources":["../../src/p2p/checkpoint_proposal.ts"],"names":[],"mappings":"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"}

package/dest/p2p/checkpoint_proposal.js

@@ -0,0 +1,229 @@
+import { BlockNumber, IndexWithinCheckpoint } from '@aztec/foundation/branded-types';
+import { Buffer32 } from '@aztec/foundation/buffer';
+import { keccak256 } from '@aztec/foundation/crypto/keccak';
+import { tryRecoverAddress } from '@aztec/foundation/crypto/secp256k1-signer';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { Signature } from '@aztec/foundation/eth-signature';
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import { DutyType } from '@aztec/validator-ha-signer/types';
+import { MAX_TXS_PER_BLOCK } from '../deserialization/index.js';
+import { CheckpointHeader } from '../rollup/checkpoint_header.js';
+import { BlockHeader } from '../tx/block_header.js';
+import { TxHash } from '../tx/index.js';
+import { BlockProposal } from './block_proposal.js';
+import { Gossipable } from './gossipable.js';
+import { SignatureDomainSeparator, getHashedSignaturePayload, getHashedSignaturePayloadEthSignedMessage } from './signature_utils.js';
+import { SignedTxs } from './signed_txs.js';
+import { TopicType } from './topic_type.js';
+// REFACTOR(palla): Use a branded type instead of a subclass of Buffer32
+export class CheckpointProposalHash extends Buffer32 {
+    constructor(hash){
+        super(hash);
+    }
+}
+/**
+ * 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 class CheckpointProposal extends Gossipable {
+    checkpointHeader;
+    archive;
+    signature;
+    lastBlock;
+    static p2pTopic = TopicType.checkpoint_proposal;
+    sender;
+    constructor(/** The aggregated checkpoint header for consensus */ checkpointHeader, /** Archive root after this checkpoint is applied */ archive, /** The proposer's signature over the checkpoint payload (checkpointHeader + archive) */ signature, /** Optional last block info, including its own signature for BlockProposal extraction */ lastBlock){
+        super(), this.checkpointHeader = checkpointHeader, this.archive = archive, this.signature = signature, this.lastBlock = lastBlock;
+    }
+    generateP2PMessageIdentifier() {
+        return Promise.resolve(new CheckpointProposalHash(keccak256(this.signature.toBuffer())));
+    }
+    get slotNumber() {
+        return this.checkpointHeader.slotNumber;
+    }
+    get blockNumber() {
+        if (!this.lastBlock) {
+            throw new Error('Cannot get blockNumber without lastBlock');
+        }
+        return this.lastBlock.blockHeader.getBlockNumber();
+    }
+    /** Convenience getter for txHashes from lastBlock */ get txHashes() {
+        return this.lastBlock?.txHashes ?? [];
+    }
+    /** Convenience getter for txs from lastBlock */ get txs() {
+        return this.lastBlock?.signedTxs?.txs;
+    }
+    /**
+   * Extract a BlockProposal from the last block info.
+   * Uses inHash from checkpointHeader.contentCommitment.inHash
+   */ getBlockProposal() {
+        if (!this.lastBlock) {
+            return undefined;
+        }
+        return new BlockProposal(this.lastBlock.blockHeader, this.lastBlock.indexWithinCheckpoint, this.checkpointHeader.inHash, this.archive, this.lastBlock.txHashes, this.lastBlock.signature, this.lastBlock.signedTxs);
+    }
+    toBlockInfo() {
+        if (!this.lastBlock) {
+            throw new Error('Cannot get blockInfo without lastBlock');
+        }
+        return {
+            slotNumber: this.slotNumber,
+            lastArchive: this.lastBlock.blockHeader.lastArchive.root,
+            timestamp: this.lastBlock.blockHeader.globalVariables.timestamp,
+            archive: this.archive,
+            txCount: this.lastBlock.txHashes.length
+        };
+    }
+    /**
+   * Get the payload to sign for this checkpoint proposal.
+   * The signature is over the checkpoint header + archive root (for consensus).
+   */ getPayloadToSign(domainSeparator) {
+        return serializeToBuffer([
+            domainSeparator,
+            this.checkpointHeader,
+            this.archive
+        ]);
+    }
+    static async createProposalFromSigner(checkpointHeader, archiveRoot, lastBlockInfo, payloadSigner) {
+        // Sign the checkpoint payload with CHECKPOINT_PROPOSAL duty type
+        const tempProposal = new CheckpointProposal(checkpointHeader, archiveRoot, Signature.empty(), undefined);
+        const checkpointHash = getHashedSignaturePayload(tempProposal, SignatureDomainSeparator.checkpointProposal);
+        const checkpointContext = {
+            slot: checkpointHeader.slotNumber,
+            blockNumber: lastBlockInfo?.blockHeader?.globalVariables.blockNumber ?? BlockNumber(0),
+            dutyType: DutyType.CHECKPOINT_PROPOSAL
+        };
+        const checkpointSignature = await payloadSigner(checkpointHash, checkpointContext);
+        if (!lastBlockInfo) {
+            return new CheckpointProposal(checkpointHeader, archiveRoot, checkpointSignature);
+        }
+        const lastBlockProposal = await BlockProposal.createProposalFromSigner(lastBlockInfo.blockHeader, lastBlockInfo.indexWithinCheckpoint, checkpointHeader.inHash, archiveRoot, lastBlockInfo.txHashes, lastBlockInfo.txs, payloadSigner);
+        return new CheckpointProposal(checkpointHeader, archiveRoot, checkpointSignature, {
+            blockHeader: lastBlockInfo.blockHeader,
+            indexWithinCheckpoint: lastBlockInfo.indexWithinCheckpoint,
+            txHashes: lastBlockInfo.txHashes,
+            signature: lastBlockProposal.signature,
+            signedTxs: lastBlockProposal.signedTxs
+        });
+    }
+    /**
+   * 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() {
+        if (!this.sender) {
+            const hashed = getHashedSignaturePayloadEthSignedMessage(this, SignatureDomainSeparator.checkpointProposal);
+            const checkpointSender = tryRecoverAddress(hashed, this.signature);
+            // If there's a lastBlock, verify the block proposal sender matches
+            if (checkpointSender && this.lastBlock) {
+                const blockProposal = this.getBlockProposal();
+                const blockSender = blockProposal?.getSender();
+                if (!blockSender || !blockSender.equals(checkpointSender)) {
+                    return undefined; // Sender mismatch - fail
+                }
+            }
+            // Cache the sender for later use
+            this.sender = checkpointSender;
+        }
+        return this.sender;
+    }
+    getPayload() {
+        return this.getPayloadToSign(SignatureDomainSeparator.checkpointProposal);
+    }
+    toBuffer() {
+        const buffer = [
+            this.checkpointHeader,
+            this.archive,
+            this.signature
+        ];
+        if (this.lastBlock) {
+            buffer.push(1); // hasLastBlock = true
+            buffer.push(this.lastBlock.blockHeader);
+            buffer.push(this.lastBlock.indexWithinCheckpoint);
+            buffer.push(this.lastBlock.signature);
+            buffer.push(this.lastBlock.txHashes.length);
+            buffer.push(this.lastBlock.txHashes);
+            if (this.lastBlock.signedTxs) {
+                buffer.push(1); // hasSignedTxs = true
+                buffer.push(this.lastBlock.signedTxs.toBuffer());
+            } else {
+                buffer.push(0); // hasSignedTxs = false
+            }
+        } else {
+            buffer.push(0); // hasLastBlock = false
+        }
+        return serializeToBuffer(buffer);
+    }
+    static fromBuffer(buf) {
+        const reader = BufferReader.asReader(buf);
+        const checkpointHeader = reader.readObject(CheckpointHeader);
+        const archive = reader.readObject(Fr);
+        const signature = reader.readObject(Signature);
+        const hasLastBlock = reader.readNumber();
+        if (hasLastBlock) {
+            const blockHeader = reader.readObject(BlockHeader);
+            const indexWithinCheckpoint = IndexWithinCheckpoint(reader.readNumber());
+            const blockSignature = reader.readObject(Signature);
+            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);
+            let signedTxs;
+            if (!reader.isEmpty()) {
+                const hasSignedTxs = reader.readNumber();
+                if (hasSignedTxs) {
+                    signedTxs = SignedTxs.fromBuffer(reader);
+                }
+            }
+            return new CheckpointProposal(checkpointHeader, archive, signature, {
+                blockHeader,
+                indexWithinCheckpoint,
+                txHashes,
+                signature: blockSignature,
+                signedTxs
+            });
+        }
+        return new CheckpointProposal(checkpointHeader, archive, signature);
+    }
+    getSize() {
+        let size = this.checkpointHeader.toBuffer().length + this.archive.size + this.signature.getSize() + 4; /* hasLastBlock flag */ 
+        if (this.lastBlock) {
+            size += this.lastBlock.blockHeader.getSize() + 4 /* indexWithinCheckpoint */  + this.lastBlock.signature.getSize() + 4 /* txHashes.length */  + this.lastBlock.txHashes.length * TxHash.SIZE + 4 /* hasSignedTxs flag */  + (this.lastBlock.signedTxs ? this.lastBlock.signedTxs.getSize() : 0);
+        }
+        return size;
+    }
+    static empty() {
+        return new CheckpointProposal(CheckpointHeader.empty(), Fr.ZERO, Signature.empty());
+    }
+    static random() {
+        return new CheckpointProposal(CheckpointHeader.random(), Fr.random(), Signature.random(), {
+            blockHeader: BlockHeader.random(),
+            indexWithinCheckpoint: IndexWithinCheckpoint(Math.floor(Math.random() * 5)),
+            txHashes: [
+                TxHash.random(),
+                TxHash.random()
+            ],
+            signature: Signature.random()
+        });
+    }
+    toInspect() {
+        return {
+            checkpointHeader: this.checkpointHeader.toInspect(),
+            archive: this.archive.toString(),
+            signature: this.signature.toString(),
+            lastBlock: this.lastBlock ? {
+                blockHeader: this.lastBlock.blockHeader.toInspect(),
+                indexWithinCheckpoint: this.lastBlock.indexWithinCheckpoint,
+                txHashes: this.lastBlock.txHashes.map((h)=>h.toString()),
+                signature: this.lastBlock.signature.toString()
+            } : undefined
+        };
+    }
+    /**
+   * Returns a copy of this proposal without lastBlock info, as a CheckpointProposalCore.
+   * Used when the lastBlock has been extracted and stored separately.
+   */ toCore() {
+        return new CheckpointProposal(this.checkpointHeader, this.archive, this.signature);
+    }
+}

package/dest/p2p/consensus_payload.d.ts

@@ -2,12 +2,15 @@ import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader } from '@aztec/foundation/serialize';
 import type { FieldsOf } from '@aztec/foundation/types';
 import { z } from 'zod';
-import type { L2Block } from '../block/l2_block.js';
 import type { Checkpoint } from '../checkpoint/checkpoint.js';
 import { CheckpointHeader } from '../rollup/checkpoint_header.js';
+import type { CheckpointProposal, CheckpointProposalCore } from './checkpoint_proposal.js';
 import type { Signable, SignatureDomainSeparator } from './signature_utils.js';
+/** Checkpoint consensus payload as signed by validators and verified on L1. */
 export declare class ConsensusPayload implements Signable {
+    /** The proposed block header the attestation is made over */
     readonly header: CheckpointHeader;
+    /** The archive root after the block is added */
     readonly archive: Fr;
     private size;
     constructor(
@@ -31,10 +34,9 @@ export declare class ConsensusPayload implements Signable {
     static getFields(fields: FieldsOf<ConsensusPayload>): readonly [CheckpointHeader, Fr];
     getPayloadToSign(domainSeparator: SignatureDomainSeparator): Buffer;
     toBuffer(): Buffer;
-    equals(other: ConsensusPayload): boolean;
+    equals(other: ConsensusPayload | CheckpointProposal | CheckpointProposalCore): boolean;
     static fromBuffer(buf: Buffer | BufferReader): ConsensusPayload;
     static fromFields(fields: FieldsOf<ConsensusPayload>): ConsensusPayload;
-    static fromBlock(block: L2Block): ConsensusPayload;
     static fromCheckpoint(checkpoint: Checkpoint): ConsensusPayload;
     static empty(): ConsensusPayload;
     static random(): ConsensusPayload;
@@ -47,11 +49,9 @@ export declare class ConsensusPayload implements Signable {
         header: {
             lastArchive: `0x${string}`;
             blockHeadersHash: `0x${string}`;
-            contentCommitment: {
-                blobsHash: `0x${string}`;
-                inHash: `0x${string}`;
-                outHash: `0x${string}`;
-            };
+            blobsHash: `0x${string}`;
+            inHash: `0x${string}`;
+            epochOutHash: `0x${string}`;
             slotNumber: import("@aztec/foundation/schemas").SlotNumber;
             timestamp: bigint;
             coinbase: `0x${string}`;
@@ -66,4 +66,4 @@ export declare class ConsensusPayload implements Signable {
     };
     toString(): string;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uc2Vuc3VzX3BheWxvYWQuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wMnAvY29uc2Vuc3VzX3BheWxvYWQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXBELE9BQU8sRUFBRSxZQUFZLEVBQXFCLE1BQU0sNkJBQTZCLENBQUM7QUFFOUUsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFHeEQsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLEtBQUssQ0FBQztBQUV4QixPQUFPLEtBQUssRUFBRSxPQUFPLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUNwRCxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUM5RCxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNsRSxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUUvRSxxQkFBYSxnQkFBaUIsWUFBVyxRQUFRO2FBSzdCLE1BQU0sRUFBRSxnQkFBZ0I7YUFFeEIsT0FBTyxFQUFFLEVBQUU7SUFON0IsT0FBTyxDQUFDLElBQUksQ0FBcUI7SUFFakM7SUFDRSw2REFBNkQ7SUFDN0MsTUFBTSxFQUFFLGdCQUFnQjtJQUN4QyxnREFBZ0Q7SUFDaEMsT0FBTyxFQUFFLEVBQUUsRUFDekI7SUFFSixNQUFNLEtBQUssTUFBTTs7Ozs7Ozs7Ozs7O09BT2hCO0lBRUQsTUFBTSxDQUFDLFNBQVMsQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLGdCQUFnQixDQUFDLG1DQUVsRDtJQUVELGdCQUFnQixDQUFDLGVBQWUsRUFBRSx3QkFBd0IsR0FBRyxNQUFNLENBa0JsRTtJQUVELFFBQVEsSUFBSSxNQUFNLENBRWpCO0lBRU0sTUFBTSxDQUFDLEtBQUssRUFBRSxnQkFBZ0IsR0FBRyxPQUFPLENBRTlDO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxHQUFHLEVBQUUsTUFBTSxHQUFHLFlBQVksR0FBRyxnQkFBZ0IsQ0FJOUQ7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsZ0JBQWdCLENBQUMsR0FBRyxnQkFBZ0IsQ0FFdEU7SUFFRCxNQUFNLENBQUMsU0FBUyxDQUFDLEtBQUssRUFBRSxPQUFPLEdBQUcsZ0JBQWdCLENBRWpEO0lBRUQsTUFBTSxDQUFDLGNBQWMsQ0FBQyxVQUFVLEVBQUUsVUFBVSxHQUFHLGdCQUFnQixDQUU5RDtJQUVELE1BQU0sQ0FBQyxLQUFLLElBQUksZ0JBQWdCLENBRS9CO0lBRUQsTUFBTSxDQUFDLE1BQU0sSUFBSSxnQkFBZ0IsQ0FFaEM7SUFFRDs7O09BR0c7SUFDSCxPQUFPLElBQUksTUFBTSxDQU9oQjtJQUVELFNBQVM7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O01BS1I7SUFFRCxRQUFRLFdBRVA7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uc2Vuc3VzX3BheWxvYWQuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wMnAvY29uc2Vuc3VzX3BheWxvYWQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXBELE9BQU8sRUFBRSxZQUFZLEVBQXFCLE1BQU0sNkJBQTZCLENBQUM7QUFFOUUsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFHeEQsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLEtBQUssQ0FBQztBQUV4QixPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUM5RCxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNsRSxPQUFPLEtBQUssRUFBRSxrQkFBa0IsRUFBRSxzQkFBc0IsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQzNGLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSx3QkFBd0IsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBRS9FLCtFQUErRTtBQUMvRSxxQkFBYSxnQkFBaUIsWUFBVyxRQUFRO0lBSTdDLDZEQUE2RDthQUM3QyxNQUFNLEVBQUUsZ0JBQWdCO0lBQ3hDLGdEQUFnRDthQUNoQyxPQUFPLEVBQUUsRUFBRTtJQU43QixPQUFPLENBQUMsSUFBSSxDQUFxQjtJQUVqQztJQUNFLDZEQUE2RDtJQUM3QyxNQUFNLEVBQUUsZ0JBQWdCO0lBQ3hDLGdEQUFnRDtJQUNoQyxPQUFPLEVBQUUsRUFBRSxFQUN6QjtJQUVKLE1BQU0sS0FBSyxNQUFNOzs7Ozs7Ozs7Ozs7T0FPaEI7SUFFRCxNQUFNLENBQUMsU0FBUyxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsZ0JBQWdCLENBQUMsbUNBRWxEO0lBRUQsZ0JBQWdCLENBQUMsZUFBZSxFQUFFLHdCQUF3QixHQUFHLE1BQU0sQ0FrQmxFO0lBRUQsUUFBUSxJQUFJLE1BQU0sQ0FFakI7SUFFTSxNQUFNLENBQUMsS0FBSyxFQUFFLGdCQUFnQixHQUFHLGtCQUFrQixHQUFHLHNCQUFzQixHQUFHLE9BQU8sQ0FHNUY7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLEdBQUcsRUFBRSxNQUFNLEdBQUcsWUFBWSxHQUFHLGdCQUFnQixDQUk5RDtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxnQkFBZ0IsQ0FBQyxHQUFHLGdCQUFnQixDQUV0RTtJQUVELE1BQU0sQ0FBQyxjQUFjLENBQUMsVUFBVSxFQUFFLFVBQVUsR0FBRyxnQkFBZ0IsQ0FFOUQ7SUFFRCxNQUFNLENBQUMsS0FBSyxJQUFJLGdCQUFnQixDQUUvQjtJQUVELE1BQU0sQ0FBQyxNQUFNLElBQUksZ0JBQWdCLENBRWhDO0lBRUQ7OztPQUdHO0lBQ0gsT0FBTyxJQUFJLE1BQU0sQ0FPaEI7SUFFRCxTQUFTOzs7Ozs7Ozs7Ozs7Ozs7Ozs7TUFLUjtJQUVELFFBQVEsV0FFUDtDQUNGIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"consensus_payload.d.ts","sourceRoot":"","sources":["../../src/p2p/consensus_payload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAGxD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,KAAK,EAAE,QAAQ,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAE/E,qBAAa,gBAAiB,YAAW,QAAQ;aAK7B,MAAM,EAAE,gBAAgB;aAExB,OAAO,EAAE,EAAE;IAN7B,OAAO,CAAC,IAAI,CAAqB;IAEjC;IACE,6DAA6D;IAC7C,MAAM,EAAE,gBAAgB;IACxC,gDAAgD;IAChC,OAAO,EAAE,EAAE,EACzB;IAEJ,MAAM,KAAK,MAAM;;;;;;;;;;;;OAOhB;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,gBAAgB,CAAC,mCAElD;IAED,gBAAgB,CAAC,eAAe,EAAE,wBAAwB,GAAG,MAAM,CAkBlE;IAED,QAAQ,IAAI,MAAM,CAEjB;IAEM,MAAM,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAE9C;IAED,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,gBAAgB,CAI9D;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,gBAAgB,CAAC,GAAG,gBAAgB,CAEtE;IAED,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,OAAO,GAAG,gBAAgB,CAEjD;IAED,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,UAAU,GAAG,gBAAgB,CAE9D;IAED,MAAM,CAAC,KAAK,IAAI,gBAAgB,CAE/B;IAED,MAAM,CAAC,MAAM,IAAI,gBAAgB,CAEhC;IAED;;;OAGG;IACH,OAAO,IAAI,MAAM,CAOhB;IAED,SAAS;;;;;;;;;;;;;;;;;;;;MAKR;IAED,QAAQ,WAEP;CACF"}
+{"version":3,"file":"consensus_payload.d.ts","sourceRoot":"","sources":["../../src/p2p/consensus_payload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAGxD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,KAAK,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAC3F,OAAO,KAAK,EAAE,QAAQ,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAE/E,+EAA+E;AAC/E,qBAAa,gBAAiB,YAAW,QAAQ;IAI7C,6DAA6D;aAC7C,MAAM,EAAE,gBAAgB;IACxC,gDAAgD;aAChC,OAAO,EAAE,EAAE;IAN7B,OAAO,CAAC,IAAI,CAAqB;IAEjC;IACE,6DAA6D;IAC7C,MAAM,EAAE,gBAAgB;IACxC,gDAAgD;IAChC,OAAO,EAAE,EAAE,EACzB;IAEJ,MAAM,KAAK,MAAM;;;;;;;;;;;;OAOhB;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,gBAAgB,CAAC,mCAElD;IAED,gBAAgB,CAAC,eAAe,EAAE,wBAAwB,GAAG,MAAM,CAkBlE;IAED,QAAQ,IAAI,MAAM,CAEjB;IAEM,MAAM,CAAC,KAAK,EAAE,gBAAgB,GAAG,kBAAkB,GAAG,sBAAsB,GAAG,OAAO,CAG5F;IAED,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,gBAAgB,CAI9D;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,gBAAgB,CAAC,GAAG,gBAAgB,CAEtE;IAED,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,UAAU,GAAG,gBAAgB,CAE9D;IAED,MAAM,CAAC,KAAK,IAAI,gBAAgB,CAE/B;IAED,MAAM,CAAC,MAAM,IAAI,gBAAgB,CAEhC;IAED;;;OAGG;IACH,OAAO,IAAI,MAAM,CAOhB;IAED,SAAS;;;;;;;;;;;;;;;;;;MAKR;IAED,QAAQ,WAEP;CACF"}

package/dest/p2p/consensus_payload.js

@@ -5,7 +5,7 @@ import { hexToBuffer } from '@aztec/foundation/string';
 import { encodeAbiParameters, parseAbiParameters } from 'viem';
 import { z } from 'zod';
 import { CheckpointHeader } from '../rollup/checkpoint_header.js';
-export class ConsensusPayload {
+/** Checkpoint consensus payload as signed by validators and verified on L1. */ export class ConsensusPayload {
     header;
     archive;
     size;
@@ -52,7 +52,8 @@ export class ConsensusPayload {
         ]);
     }
     equals(other) {
-        return this.header.equals(other.header) && this.archive.equals(other.archive);
+        const otherHeader = 'checkpointHeader' in other ? other.checkpointHeader : other.header;
+        return this.header.equals(otherHeader) && this.archive.equals(other.archive);
     }
     static fromBuffer(buf) {
         const reader = BufferReader.asReader(buf);
@@ -62,9 +63,6 @@ export class ConsensusPayload {
     static fromFields(fields) {
         return new ConsensusPayload(fields.header, fields.archive);
     }
-    static fromBlock(block) {
-        return new ConsensusPayload(block.header.toCheckpointHeader(), block.archive.root);
-    }
     static fromCheckpoint(checkpoint) {
         return new ConsensusPayload(checkpoint.header, checkpoint.archive.root);
     }

package/dest/p2p/gossipable.d.ts

@@ -3,8 +3,9 @@ import type { TopicType } from './topic_type.js';
 export declare class P2PMessage {
     readonly payload: Buffer;
     readonly timestamp?: Date | undefined;
-    constructor(payload: Buffer, timestamp?: Date | undefined);
-    static fromGossipable(message: Gossipable, instrumentMessages?: boolean): P2PMessage;
+    readonly traceContext?: string | undefined;
+    constructor(payload: Buffer, timestamp?: Date | undefined, traceContext?: string | undefined);
+    static fromGossipable(message: Gossipable, instrumentMessages?: boolean, traceContext?: string): P2PMessage;
     static fromMessageData(messageData: Buffer, instrumentMessages?: boolean): P2PMessage;
     toMessageData(): Buffer;
 }
@@ -31,4 +32,4 @@ export declare abstract class Gossipable {
      */
     abstract getSize(): number;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ29zc2lwYWJsZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3AycC9nb3NzaXBhYmxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUdwRCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUVqRCxxQkFBYSxVQUFVO2FBRUgsT0FBTyxFQUFFLE1BQU07YUFDZixTQUFTLENBQUM7SUFGNUIsWUFDa0IsT0FBTyxFQUFFLE1BQU0sRUFDZixTQUFTLENBQUMsa0JBQU0sRUFDOUI7SUFFSixNQUFNLENBQUMsY0FBYyxDQUFDLE9BQU8sRUFBRSxVQUFVLEVBQUUsa0JBQWtCLFVBQVEsR0FBRyxVQUFVLENBRWpGO0lBRUQsTUFBTSxDQUFDLGVBQWUsQ0FBQyxXQUFXLEVBQUUsTUFBTSxFQUFFLGtCQUFrQixVQUFRLEdBQUcsVUFBVSxDQUtsRjtJQUVELGFBQWEsSUFBSSxNQUFNLENBT3RCO0NBQ0Y7QUFFRDs7OztHQUlHO0FBQ0gsOEJBQXNCLFVBQVU7SUFDOUIsT0FBTyxDQUFDLFFBQVEsQ0FBdUI7SUFDdkMsMkVBQTJFO0lBQzNFLE1BQU0sQ0FBQyxRQUFRLEVBQUUsU0FBUyxDQUFDO0lBRTNCOzs7T0FHRztJQUNHLDJCQUEyQixJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FNckQ7SUFFRCxRQUFRLENBQUMsNEJBQTRCLElBQUksT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBRTNELFFBQVEsQ0FBQyxRQUFRLElBQUksTUFBTSxDQUFDO0lBRTVCLFNBQVMsSUFBSSxNQUFNLENBRWxCO0lBRUQ7OztPQUdHO0lBQ0gsUUFBUSxDQUFDLE9BQU8sSUFBSSxNQUFNLENBQUM7Q0FDNUIifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ29zc2lwYWJsZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3AycC9nb3NzaXBhYmxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUdwRCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUVqRCxxQkFBYSxVQUFVO2FBRUgsT0FBTyxFQUFFLE1BQU07YUFDZixTQUFTLENBQUM7YUFDVixZQUFZLENBQUM7SUFIL0IsWUFDa0IsT0FBTyxFQUFFLE1BQU0sRUFDZixTQUFTLENBQUMsa0JBQU0sRUFDaEIsWUFBWSxDQUFDLG9CQUFRLEVBQ25DO0lBRUosTUFBTSxDQUFDLGNBQWMsQ0FBQyxPQUFPLEVBQUUsVUFBVSxFQUFFLGtCQUFrQixVQUFRLEVBQUUsWUFBWSxDQUFDLEVBQUUsTUFBTSxHQUFHLFVBQVUsQ0FLeEc7SUFFRCxNQUFNLENBQUMsZUFBZSxDQUFDLFdBQVcsRUFBRSxNQUFNLEVBQUUsa0JBQWtCLFVBQVEsR0FBRyxVQUFVLENBVWxGO0lBRUQsYUFBYSxJQUFJLE1BQU0sQ0FRdEI7Q0FDRjtBQUVEOzs7O0dBSUc7QUFDSCw4QkFBc0IsVUFBVTtJQUM5QixPQUFPLENBQUMsUUFBUSxDQUF1QjtJQUN2QywyRUFBMkU7SUFDM0UsTUFBTSxDQUFDLFFBQVEsRUFBRSxTQUFTLENBQUM7SUFFM0I7OztPQUdHO0lBQ0csMkJBQTJCLElBQUksT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQU1yRDtJQUVELFFBQVEsQ0FBQyw0QkFBNEIsSUFBSSxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUM7SUFFM0QsUUFBUSxDQUFDLFFBQVEsSUFBSSxNQUFNLENBQUM7SUFFNUIsU0FBUyxJQUFJLE1BQU0sQ0FFbEI7SUFFRDs7O09BR0c7SUFDSCxRQUFRLENBQUMsT0FBTyxJQUFJLE1BQU0sQ0FBQztDQUM1QiJ9

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

@@ -1 +1 @@
-{"version":3,"file":"gossipable.d.ts","sourceRoot":"","sources":["../../src/p2p/gossipable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAGpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,qBAAa,UAAU;aAEH,OAAO,EAAE,MAAM;aACf,SAAS,CAAC;IAF5B,YACkB,OAAO,EAAE,MAAM,EACf,SAAS,CAAC,kBAAM,EAC9B;IAEJ,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,UAAU,EAAE,kBAAkB,UAAQ,GAAG,UAAU,CAEjF;IAED,MAAM,CAAC,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,kBAAkB,UAAQ,GAAG,UAAU,CAKlF;IAED,aAAa,IAAI,MAAM,CAOtB;CACF;AAED;;;;GAIG;AACH,8BAAsB,UAAU;IAC9B,OAAO,CAAC,QAAQ,CAAuB;IACvC,2EAA2E;IAC3E,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC;IAE3B;;;OAGG;IACG,2BAA2B,IAAI,OAAO,CAAC,QAAQ,CAAC,CAMrD;IAED,QAAQ,CAAC,4BAA4B,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC;IAE3D,QAAQ,CAAC,QAAQ,IAAI,MAAM,CAAC;IAE5B,SAAS,IAAI,MAAM,CAElB;IAED;;;OAGG;IACH,QAAQ,CAAC,OAAO,IAAI,MAAM,CAAC;CAC5B"}
+{"version":3,"file":"gossipable.d.ts","sourceRoot":"","sources":["../../src/p2p/gossipable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAGpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,qBAAa,UAAU;aAEH,OAAO,EAAE,MAAM;aACf,SAAS,CAAC;aACV,YAAY,CAAC;IAH/B,YACkB,OAAO,EAAE,MAAM,EACf,SAAS,CAAC,kBAAM,EAChB,YAAY,CAAC,oBAAQ,EACnC;IAEJ,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,UAAU,EAAE,kBAAkB,UAAQ,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,UAAU,CAKxG;IAED,MAAM,CAAC,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,kBAAkB,UAAQ,GAAG,UAAU,CAUlF;IAED,aAAa,IAAI,MAAM,CAQtB;CACF;AAED;;;;GAIG;AACH,8BAAsB,UAAU;IAC9B,OAAO,CAAC,QAAQ,CAAuB;IACvC,2EAA2E;IAC3E,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC;IAE3B;;;OAGG;IACG,2BAA2B,IAAI,OAAO,CAAC,QAAQ,CAAC,CAMrD;IAED,QAAQ,CAAC,4BAA4B,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC;IAE3D,QAAQ,CAAC,QAAQ,IAAI,MAAM,CAAC;IAE5B,SAAS,IAAI,MAAM,CAElB;IAED;;;OAGG;IACH,QAAQ,CAAC,OAAO,IAAI,MAAM,CAAC;CAC5B"}