@aztec/stdlib 3.0.3 → 3.9.9-nightly.20260312

package/dest/note/note_dao.js

@@ -1,4 +1,3 @@
-import { toBigIntBE } from '@aztec/foundation/bigint-buffer';
 import { BlockNumber } from '@aztec/foundation/branded-types';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { Point } from '@aztec/foundation/curves/grumpkin';
@@ -21,7 +20,8 @@ import { TxHash } from '@aztec/stdlib/tx';
     txHash;
     l2BlockNumber;
     l2BlockHash;
-    index;
+    txIndexInBlock;
+    noteIndexInTx;
     constructor(// Note information
     /** The packed content of the note, as will be returned in the getNotes oracle. */ note, /** The address of the contract that created the note (i.e. the address used by the kernel during siloing). */ contractAddress, /** The owner of the note - generally the account that can spend the note. */ owner, /**
      * The storage location of the note. This value is not used for anything in PXE, but we do index by storage slot
@@ -40,7 +40,7 @@ import { TxHash } from '@aztec/stdlib/tx';
      *  when searching for txEffects.
      */ txHash, /** The L2 block number in which the tx with this note was included. Used for note management while processing
      * reorgs.*/ l2BlockNumber, /** The L2 block hash in which the tx with this note was included. Used for note management while processing
-     * reorgs.*/ l2BlockHash, /** The index of the leaf in the global note hash tree the note is stored at */ index){
+     * reorgs.*/ l2BlockHash, /** The index of the tx within the block, used for ordering notes. */ txIndexInBlock, /** The index of the note within the tx (based on note hash position), used for ordering notes. */ noteIndexInTx){
         this.note = note;
         this.contractAddress = contractAddress;
         this.owner = owner;
@@ -52,7 +52,8 @@ import { TxHash } from '@aztec/stdlib/tx';
         this.txHash = txHash;
         this.l2BlockNumber = l2BlockNumber;
         this.l2BlockHash = l2BlockHash;
-        this.index = index;
+        this.txIndexInBlock = txIndexInBlock;
+        this.noteIndexInTx = noteIndexInTx;
     }
     toBuffer() {
         return serializeToBuffer([
@@ -67,7 +68,8 @@ import { TxHash } from '@aztec/stdlib/tx';
             this.txHash,
             this.l2BlockNumber,
             Fr.fromHexString(this.l2BlockHash),
-            this.index
+            this.txIndexInBlock,
+            this.noteIndexInTx
         ]);
     }
     static fromBuffer(buffer) {
@@ -83,8 +85,9 @@ import { TxHash } from '@aztec/stdlib/tx';
         const txHash = reader.readObject(TxHash);
         const l2BlockNumber = BlockNumber(reader.readNumber());
         const l2BlockHash = Fr.fromBuffer(reader).toString();
-        const index = toBigIntBE(reader.readBytes(32));
-        return new NoteDao(note, contractAddress, owner, storageSlot, randomness, noteNonce, noteHash, siloedNullifier, txHash, l2BlockNumber, l2BlockHash, index);
+        const txIndexInBlock = reader.readNumber();
+        const noteIndexInTx = reader.readNumber();
+        return new NoteDao(note, contractAddress, owner, storageSlot, randomness, noteNonce, noteHash, siloedNullifier, txHash, l2BlockNumber, l2BlockHash, txIndexInBlock, noteIndexInTx);
     }
     toString() {
         return '0x' + this.toBuffer().toString('hex');
@@ -96,17 +99,17 @@ import { TxHash } from '@aztec/stdlib/tx';
     /**
    * Returns true if this note is equal to the `other` one.
    */ equals(other) {
-        return this.note.equals(other.note) && this.contractAddress.equals(other.contractAddress) && this.owner.equals(other.owner) && this.storageSlot.equals(other.storageSlot) && this.randomness.equals(other.randomness) && this.noteNonce.equals(other.noteNonce) && this.noteHash.equals(other.noteHash) && this.siloedNullifier.equals(other.siloedNullifier) && this.txHash.equals(other.txHash) && this.l2BlockNumber === other.l2BlockNumber && this.l2BlockHash === other.l2BlockHash && this.index === other.index;
+        return this.note.equals(other.note) && this.contractAddress.equals(other.contractAddress) && this.owner.equals(other.owner) && this.storageSlot.equals(other.storageSlot) && this.randomness.equals(other.randomness) && this.noteNonce.equals(other.noteNonce) && this.noteHash.equals(other.noteHash) && this.siloedNullifier.equals(other.siloedNullifier) && this.txHash.equals(other.txHash) && this.l2BlockNumber === other.l2BlockNumber && this.l2BlockHash === other.l2BlockHash && this.txIndexInBlock === other.txIndexInBlock && this.noteIndexInTx === other.noteIndexInTx;
     }
     /**
    * Returns the size in bytes of the Note Dao.
    * @returns - Its size in bytes.
    */ getSize() {
-        const indexSize = Math.ceil(Math.log2(Number(this.index)));
         const noteSize = 4 + this.note.items.length * Fr.SIZE_IN_BYTES;
-        return noteSize + AztecAddress.SIZE_IN_BYTES * 2 + Fr.SIZE_IN_BYTES * 4 + TxHash.SIZE + Point.SIZE_IN_BYTES + indexSize;
+        // 2 numbers for txIndexInBlock and noteIndexInTx (4 bytes each)
+        return noteSize + AztecAddress.SIZE_IN_BYTES * 2 + Fr.SIZE_IN_BYTES * 4 + TxHash.SIZE + Point.SIZE_IN_BYTES + 8;
     }
-    static async random({ note = Note.random(), contractAddress = undefined, owner = undefined, storageSlot = Fr.random(), randomness = Fr.random(), noteNonce = Fr.random(), noteHash = Fr.random(), siloedNullifier = Fr.random(), txHash = TxHash.random(), l2BlockNumber = BlockNumber(Math.floor(Math.random() * 1000)), l2BlockHash = Fr.random().toString(), index = Fr.random().toBigInt() } = {}) {
-        return new NoteDao(note, contractAddress ?? await AztecAddress.random(), owner ?? await AztecAddress.random(), storageSlot, randomness, noteNonce, noteHash, siloedNullifier, txHash, l2BlockNumber, l2BlockHash, index);
+    static async random({ note = Note.random(), contractAddress = undefined, owner = undefined, storageSlot = Fr.random(), randomness = Fr.random(), noteNonce = Fr.random(), noteHash = Fr.random(), siloedNullifier = Fr.random(), txHash = TxHash.random(), l2BlockNumber = BlockNumber(Math.floor(Math.random() * 1000)), l2BlockHash = Fr.random().toString(), txIndexInBlock = Math.floor(Math.random() * 100), noteIndexInTx = Math.floor(Math.random() * 100) } = {}) {
+        return new NoteDao(note, contractAddress ?? await AztecAddress.random(), owner ?? await AztecAddress.random(), storageSlot, randomness, noteNonce, noteHash, siloedNullifier, txHash, l2BlockNumber, l2BlockHash, txIndexInBlock, noteIndexInTx);
     }
 }

package/dest/p2p/attestation_utils.d.ts

@@ -1,10 +1,20 @@
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import { CommitteeAttestation } from '../block/index.js';
-import type { BlockAttestation } from './block_attestation.js';
+import type { CheckpointAttestation } from './checkpoint_attestation.js';
 /**
  * Returns attestation signatures in the order of a series of provided ethereum addresses
  * The rollup smart contract expects attestations to appear in the order of the committee
  * @todo: perform this logic within the memory attestation store instead?
  */
-export declare function orderAttestations(attestations: BlockAttestation[], orderAddresses: EthAddress[]): CommitteeAttestation[];
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXR0ZXN0YXRpb25fdXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wMnAvYXR0ZXN0YXRpb25fdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFaEUsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDekQsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUUvRDs7OztHQUlHO0FBQ0gsd0JBQWdCLGlCQUFpQixDQUMvQixZQUFZLEVBQUUsZ0JBQWdCLEVBQUUsRUFDaEMsY0FBYyxFQUFFLFVBQVUsRUFBRSxHQUMzQixvQkFBb0IsRUFBRSxDQXFCeEIifQ==
+export declare function orderAttestations(attestations: CheckpointAttestation[], orderAddresses: EthAddress[]): CommitteeAttestation[];
+/**
+ * Trims attestations to the minimum required number to save L1 calldata gas.
+ * Each signature costs 65 bytes of calldata vs 20 bytes for just an address.
+ *
+ * Priority order for keeping attestations:
+ * 1. The proposer's attestation (required by L1 contract - MissingProposerSignature revert)
+ * 2. Attestations from the local node's validator keys
+ * 3. Remaining attestations filled to reach the required count
+ */
+export declare function trimAttestations(attestations: CheckpointAttestation[], required: number, proposerAddress: EthAddress, localAddresses: EthAddress[]): CheckpointAttestation[];
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXR0ZXN0YXRpb25fdXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wMnAvYXR0ZXN0YXRpb25fdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFaEUsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDekQsT0FBTyxLQUFLLEVBQUUscUJBQXFCLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUV6RTs7OztHQUlHO0FBQ0gsd0JBQWdCLGlCQUFpQixDQUMvQixZQUFZLEVBQUUscUJBQXFCLEVBQUUsRUFDckMsY0FBYyxFQUFFLFVBQVUsRUFBRSxHQUMzQixvQkFBb0IsRUFBRSxDQXFCeEI7QUFFRDs7Ozs7Ozs7R0FRRztBQUNILHdCQUFnQixnQkFBZ0IsQ0FDOUIsWUFBWSxFQUFFLHFCQUFxQixFQUFFLEVBQ3JDLFFBQVEsRUFBRSxNQUFNLEVBQ2hCLGVBQWUsRUFBRSxVQUFVLEVBQzNCLGNBQWMsRUFBRSxVQUFVLEVBQUUsR0FDM0IscUJBQXFCLEVBQUUsQ0F3Q3pCIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"attestation_utils.d.ts","sourceRoot":"","sources":["../../src/p2p/attestation_utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE/D;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,YAAY,EAAE,gBAAgB,EAAE,EAChC,cAAc,EAAE,UAAU,EAAE,GAC3B,oBAAoB,EAAE,CAqBxB"}
+{"version":3,"file":"attestation_utils.d.ts","sourceRoot":"","sources":["../../src/p2p/attestation_utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAEzE;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,YAAY,EAAE,qBAAqB,EAAE,EACrC,cAAc,EAAE,UAAU,EAAE,GAC3B,oBAAoB,EAAE,CAqBxB;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAC9B,YAAY,EAAE,qBAAqB,EAAE,EACrC,QAAQ,EAAE,MAAM,EAChB,eAAe,EAAE,UAAU,EAC3B,cAAc,EAAE,UAAU,EAAE,GAC3B,qBAAqB,EAAE,CAwCzB"}

package/dest/p2p/attestation_utils.js

@@ -4,7 +4,7 @@ import { CommitteeAttestation } from '../block/index.js';
  * The rollup smart contract expects attestations to appear in the order of the committee
  * @todo: perform this logic within the memory attestation store instead?
  */ export function orderAttestations(attestations, orderAddresses) {
-    // Create a map of sender addresses to BlockAttestations
+    // Create a map of sender addresses to attestations
     const attestationMap = new Map();
     for (const attestation of attestations){
         const sender = attestation.getSender();
@@ -19,3 +19,48 @@ import { CommitteeAttestation } from '../block/index.js';
     });
     return orderedAttestations;
 }
+/**
+ * Trims attestations to the minimum required number to save L1 calldata gas.
+ * Each signature costs 65 bytes of calldata vs 20 bytes for just an address.
+ *
+ * Priority order for keeping attestations:
+ * 1. The proposer's attestation (required by L1 contract - MissingProposerSignature revert)
+ * 2. Attestations from the local node's validator keys
+ * 3. Remaining attestations filled to reach the required count
+ */ export function trimAttestations(attestations, required, proposerAddress, localAddresses) {
+    if (attestations.length <= required) {
+        return attestations;
+    }
+    const proposerAttestation = [];
+    const localAttestations = [];
+    const otherAttestations = [];
+    for (const attestation of attestations){
+        const sender = attestation.getSender();
+        if (!sender) {
+            continue;
+        }
+        if (sender.equals(proposerAddress)) {
+            proposerAttestation.push(attestation);
+        } else if (localAddresses.some((addr)=>addr.equals(sender))) {
+            localAttestations.push(attestation);
+        } else {
+            otherAttestations.push(attestation);
+        }
+    }
+    const result = [
+        ...proposerAttestation
+    ];
+    for (const att of localAttestations){
+        if (result.length >= required) {
+            break;
+        }
+        result.push(att);
+    }
+    for (const att of otherAttestations){
+        if (result.length >= required) {
+            break;
+        }
+        result.push(att);
+    }
+    return result;
+}

package/dest/p2p/block_proposal.d.ts

@@ -1,58 +1,137 @@
-import { SlotNumber } from '@aztec/foundation/branded-types';
+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 { L2Block } from '../block/l2_block.js';
 import type { L2BlockInfo } from '../block/l2_block_info.js';
+import { BlockHeader } from '../tx/block_header.js';
 import { TxHash } from '../tx/index.js';
-import { Tx } from '../tx/tx.js';
-import { ConsensusPayload } from './consensus_payload.js';
+import type { Tx } from '../tx/tx.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 BlockProposalHash extends Buffer32 {
     constructor(hash: Buffer);
 }
 export type BlockProposalOptions = {
-    publishFullTxs: boolean;
-    /** Whether to generate an invalid block proposal for broadcasting. Use only for testing. */
+    /**
+     * 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 block proposal for broadcasting.
+     * Use only for testing.
+     */
     broadcastInvalidBlockProposal?: boolean;
 };
 /**
- * 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 declare class BlockProposal extends Gossipable {
-    readonly payload: ConsensusPayload;
-    readonly signature: Signature;
+    /** The per-block header containing block state and global variables */
+    readonly blockHeader: BlockHeader;
+    /** Index of this block within the checkpoint (0-indexed) */
+    readonly indexWithinCheckpoint: IndexWithinCheckpoint;
+    /** Hash of L1 to L2 messages for this checkpoint (constant across all blocks in checkpoint) */
+    readonly inHash: Fr;
+    /** Archive root after this block is applied */
+    readonly archiveRoot: Fr;
+    /** The sequence of transactions in the block */
     readonly txHashes: TxHash[];
-    readonly txs?: Tx[] | undefined;
+    /** The proposer's signature over the block data */
+    readonly signature: Signature;
+    /** The signed transactions in the block (optional, for DA guarantees) */
+    readonly signedTxs?: SignedTxs | undefined;
     static p2pTopic: TopicType;
     private sender;
     constructor(
-    /** The payload of the message, and what the signature is over */
-    payload: ConsensusPayload, 
-    /** The signer of the BlockProposal over the header of the new block*/
-    signature: Signature, 
+    /** The per-block header containing block state and global variables */
+    blockHeader: BlockHeader, 
+    /** Index of this block within the checkpoint (0-indexed) */
+    indexWithinCheckpoint: IndexWithinCheckpoint, 
+    /** Hash of L1 to L2 messages for this checkpoint (constant across all blocks in checkpoint) */
+    inHash: Fr, 
+    /** Archive root after this block is applied */
+    archiveRoot: Fr, 
     /** The sequence of transactions in the block */
     txHashes: TxHash[], 
-    /** The transactions in the block */
-    txs?: Tx[] | undefined);
+    /** The proposer's signature over the block data */
+    signature: Signature, 
+    /** The signed transactions in the block (optional, for DA guarantees) */
+    signedTxs?: SignedTxs | undefined);
     generateP2PMessageIdentifier(): Promise<Buffer32>;
     get archive(): Fr;
     get slotNumber(): SlotNumber;
+    get blockNumber(): BlockNumber;
+    /** Convenience getter for txs from signedTxs */
+    get txs(): Tx[] | undefined;
     toBlockInfo(): Omit<L2BlockInfo, 'blockNumber'>;
-    static createProposalFromSigner(payload: ConsensusPayload, txHashes: TxHash[], txs: Tx[] | undefined, payloadSigner: (payload: Buffer32) => Promise<Signature>): Promise<BlockProposal>;
-    /**Get Sender
-     * Lazily evaluate the sender of the proposal; result is cached
-     * @returns The sender address, or undefined if signature recovery fails
+    /**
+     * Get the payload to sign for this block proposal.
+     * The signature is over: blockHeader + indexWithinCheckpoint + inHash + archiveRoot + txHashes
+     */
+    getPayloadToSign(domainSeparator: SignatureDomainSeparator): Buffer;
+    static createProposalFromSigner(blockHeader: BlockHeader, indexWithinCheckpoint: IndexWithinCheckpoint, inHash: Fr, archiveRoot: Fr, txHashes: TxHash[], txs: Tx[] | undefined, payloadSigner: (payload: Buffer32, context: SigningContext) => Promise<Signature>): Promise<BlockProposal>;
+    /**
+     * Lazily evaluate the sender of the proposal; result is cached.
+     * If there's signedTxs, also verifies the signedTxs sender matches the block proposal 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): BlockProposal;
     getSize(): number;
+    static empty(): BlockProposal;
+    static random(): BlockProposal;
+    toInspect(): {
+        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;
+        inHash: `0x${string}`;
+        archiveRoot: `0x${string}`;
+        signature: `0x${string}`;
+        txHashes: `0x${string}`[];
+    };
+    /**
+     * 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: L2Block): boolean;
+    /**
+     * Returns a copy of this proposal without signedTxs.
+     * Used when storing proposals in attestation pool to avoid storing full tx data.
+     */
+    withoutSignedTxs(): BlockProposal;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfcHJvcG9zYWwuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wMnAvYmxvY2tfcHJvcG9zYWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQzdELE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUdwRCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDaEUsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQzVELE9BQU8sRUFBRSxZQUFZLEVBQXFCLE1BQU0sNkJBQTZCLENBQUM7QUFFOUUsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDN0QsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBQ3hDLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFDakMsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDMUQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBTTdDLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUU1QyxxQkFBYSxpQkFBa0IsU0FBUSxRQUFRO0lBQzdDLFlBQVksSUFBSSxFQUFFLE1BQU0sRUFFdkI7Q0FDRjtBQUVELE1BQU0sTUFBTSxvQkFBb0IsR0FBRztJQUNqQyxjQUFjLEVBQUUsT0FBTyxDQUFDO0lBQ3hCLDRGQUE0RjtJQUM1Riw2QkFBNkIsQ0FBQyxFQUFFLE9BQU8sQ0FBQztDQUN6QyxDQUFDO0FBRUY7Ozs7O0dBS0c7QUFDSCxxQkFBYSxhQUFjLFNBQVEsVUFBVTthQU96QixPQUFPLEVBQUUsZ0JBQWdCO2FBR3pCLFNBQVMsRUFBRSxTQUFTO2FBR3BCLFFBQVEsRUFBRSxNQUFNLEVBQUU7YUFJbEIsR0FBRyxDQUFDO0lBaEJ0QixPQUFnQixRQUFRLFlBQTRCO0lBRXBELE9BQU8sQ0FBQyxNQUFNLENBQXlCO0lBRXZDO0lBQ0UsaUVBQWlFO0lBQ2pELE9BQU8sRUFBRSxnQkFBZ0I7SUFFekMsc0VBQXNFO0lBQ3RELFNBQVMsRUFBRSxTQUFTO0lBRXBDLGdEQUFnRDtJQUNoQyxRQUFRLEVBQUUsTUFBTSxFQUFFO0lBR2xDLG9DQUFvQztJQUNwQixHQUFHLENBQUMsa0JBQU0sRUFHM0I7SUFFUSw0QkFBNEIsSUFBSSxPQUFPLENBQUMsUUFBUSxDQUFDLENBRXpEO0lBRUQsSUFBSSxPQUFPLElBQUksRUFBRSxDQUVoQjtJQUVELElBQUksVUFBVSxJQUFJLFVBQVUsQ0FFM0I7SUFFRCxXQUFXLElBQUksSUFBSSxDQUFDLFdBQVcsRUFBRSxhQUFhLENBQUMsQ0FROUM7SUFFRCxPQUFhLHdCQUF3QixDQUNuQyxPQUFPLEVBQUUsZ0JBQWdCLEVBQ3pCLFFBQVEsRUFBRSxNQUFNLEVBQUUsRUFFbEIsR0FBRyxFQUFFLEVBQUUsRUFBRSxHQUFHLFNBQVMsRUFDckIsYUFBYSxFQUFFLENBQUMsT0FBTyxFQUFFLFFBQVEsS0FBSyxPQUFPLENBQUMsU0FBUyxDQUFDLDBCQU16RDtJQUVEOzs7T0FHRztJQUNILFNBQVMsSUFBSSxVQUFVLEdBQUcsU0FBUyxDQVFsQztJQUVELFVBQVUsNEJBRVQ7SUFFRCxRQUFRLElBQUksTUFBTSxDQU9qQjtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsR0FBRyxFQUFFLE1BQU0sR0FBRyxZQUFZLEdBQUcsYUFBYSxDQWEzRDtJQUVELE9BQU8sSUFBSSxNQUFNLENBUWhCO0NBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfcHJvcG9zYWwuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wMnAvYmxvY2tfcHJvcG9zYWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFdBQVcsRUFBRSxxQkFBcUIsRUFBRSxVQUFVLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNqRyxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFHcEQsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQ2hFLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUM1RCxPQUFPLEVBQUUsWUFBWSxFQUFxQixNQUFNLDZCQUE2QixDQUFDO0FBQzlFLE9BQU8sRUFBWSxLQUFLLGNBQWMsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBRWpGLE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3BELE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRTdELE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNwRCxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDeEMsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBQ3RDLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUM3QyxPQUFPLEVBQ0wsd0JBQXdCLEVBR3pCLE1BQU0sc0JBQXNCLENBQUM7QUFDOUIsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQzVDLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUU1QyxxQkFBYSxpQkFBa0IsU0FBUSxRQUFRO0lBQzdDLFlB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

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

@@ -1 +1 @@
-{"version":3,"file":"block_proposal.d.ts","sourceRoot":"","sources":["../../src/p2p/block_proposal.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAGpD,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,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;AAE9E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAM7C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,qBAAa,iBAAkB,SAAQ,QAAQ;IAC7C,YAAY,IAAI,EAAE,MAAM,EAEvB;CACF;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,cAAc,EAAE,OAAO,CAAC;IACxB,4FAA4F;IAC5F,6BAA6B,CAAC,EAAE,OAAO,CAAC;CACzC,CAAC;AAEF;;;;;GAKG;AACH,qBAAa,aAAc,SAAQ,UAAU;aAOzB,OAAO,EAAE,gBAAgB;aAGzB,SAAS,EAAE,SAAS;aAGpB,QAAQ,EAAE,MAAM,EAAE;aAIlB,GAAG,CAAC;IAhBtB,OAAgB,QAAQ,YAA4B;IAEpD,OAAO,CAAC,MAAM,CAAyB;IAEvC;IACE,iEAAiE;IACjD,OAAO,EAAE,gBAAgB;IAEzC,sEAAsE;IACtD,SAAS,EAAE,SAAS;IAEpC,gDAAgD;IAChC,QAAQ,EAAE,MAAM,EAAE;IAGlC,oCAAoC;IACpB,GAAG,CAAC,kBAAM,EAG3B;IAEQ,4BAA4B,IAAI,OAAO,CAAC,QAAQ,CAAC,CAEzD;IAED,IAAI,OAAO,IAAI,EAAE,CAEhB;IAED,IAAI,UAAU,IAAI,UAAU,CAE3B;IAED,WAAW,IAAI,IAAI,CAAC,WAAW,EAAE,aAAa,CAAC,CAQ9C;IAED,OAAa,wBAAwB,CACnC,OAAO,EAAE,gBAAgB,EACzB,QAAQ,EAAE,MAAM,EAAE,EAElB,GAAG,EAAE,EAAE,EAAE,GAAG,SAAS,EACrB,aAAa,EAAE,CAAC,OAAO,EAAE,QAAQ,KAAK,OAAO,CAAC,SAAS,CAAC,0BAMzD;IAED;;;OAGG;IACH,SAAS,IAAI,UAAU,GAAG,SAAS,CAQlC;IAED,UAAU,4BAET;IAED,QAAQ,IAAI,MAAM,CAOjB;IAED,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,aAAa,CAa3D;IAED,OAAO,IAAI,MAAM,CAQhB;CACF"}
+{"version":3,"file":"block_proposal.d.ts","sourceRoot":"","sources":["../../src/p2p/block_proposal.ts"],"names":[],"mappings":"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"}

package/dest/p2p/block_proposal.js

@@ -1,13 +1,17 @@
+import { 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 { BlockHeader } from '../tx/block_header.js';
 import { TxHash } from '../tx/index.js';
-import { Tx } from '../tx/tx.js';
-import { ConsensusPayload } from './consensus_payload.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';
 export class BlockProposalHash extends Buffer32 {
     constructor(hash){
@@ -15,84 +19,179 @@ export class BlockProposalHash extends Buffer32 {
     }
 }
 /**
- * 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;
-    signature;
+    blockHeader;
+    indexWithinCheckpoint;
+    inHash;
+    archiveRoot;
     txHashes;
-    txs;
+    signature;
+    signedTxs;
     static p2pTopic = 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, /** The sequence of transactions in the block */ txHashes, // Note(md): this is placed after the txs payload in order to be backwards compatible with previous versions
-    /** The transactions in the block */ txs){
-        super(), this.payload = payload, this.signature = signature, this.txHashes = txHashes, this.txs = txs;
+    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 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.signedTxs = signedTxs;
     }
     generateP2PMessageIdentifier() {
         return Promise.resolve(new BlockProposalHash(keccak256(this.signature.toBuffer())));
     }
     get archive() {
-        return this.payload.archive;
+        return this.archiveRoot;
     }
     get slotNumber() {
-        return this.payload.header.slotNumber;
+        return this.blockHeader.getSlot();
+    }
+    get blockNumber() {
+        return this.blockHeader.getBlockNumber();
+    }
+    /** Convenience getter for txs from signedTxs */ get txs() {
+        return this.signedTxs?.txs;
     }
     toBlockInfo() {
         return {
             slotNumber: this.slotNumber,
-            lastArchive: this.payload.header.lastArchiveRoot,
-            timestamp: this.payload.header.timestamp,
-            archive: this.archive,
+            lastArchive: this.blockHeader.lastArchive.root,
+            timestamp: this.blockHeader.globalVariables.timestamp,
+            archive: this.archiveRoot,
             txCount: this.txHashes.length
         };
     }
-    static async createProposalFromSigner(payload, txHashes, // Note(md): Provided separately to tx hashes such that this function can be optional
-    txs, payloadSigner) {
-        const hashed = getHashedSignaturePayload(payload, SignatureDomainSeparator.blockProposal);
-        const sig = await payloadSigner(hashed);
-        return new BlockProposal(payload, sig, txHashes, txs);
+    /**
+   * Get the payload to sign for this block proposal.
+   * The signature is over: blockHeader + indexWithinCheckpoint + inHash + archiveRoot + txHashes
+   */ getPayloadToSign(domainSeparator) {
+        return serializeToBuffer([
+            domainSeparator,
+            this.blockHeader,
+            this.indexWithinCheckpoint,
+            this.inHash,
+            this.archiveRoot,
+            this.txHashes.length,
+            this.txHashes
+        ]);
+    }
+    static async createProposalFromSigner(blockHeader, indexWithinCheckpoint, inHash, archiveRoot, txHashes, txs, payloadSigner) {
+        // Create a temporary proposal to get the payload to sign
+        const tempProposal = new BlockProposal(blockHeader, indexWithinCheckpoint, inHash, archiveRoot, txHashes, Signature.empty());
+        // Create the block signing context
+        const blockContext = {
+            slot: blockHeader.globalVariables.slotNumber,
+            blockNumber: blockHeader.globalVariables.blockNumber,
+            blockIndexWithinCheckpoint: indexWithinCheckpoint,
+            dutyType: DutyType.BLOCK_PROPOSAL
+        };
+        const hashed = getHashedSignaturePayload(tempProposal, SignatureDomainSeparator.blockProposal);
+        const sig = await payloadSigner(hashed, blockContext);
+        // If txs are provided, sign them as well
+        let signedTxs;
+        if (txs) {
+            const txsSigningContext = {
+                dutyType: DutyType.TXS
+            };
+            const txsSigner = (payload)=>payloadSigner(payload, txsSigningContext);
+            signedTxs = await SignedTxs.createFromSigner(txs, txsSigner);
+        }
+        return new BlockProposal(blockHeader, indexWithinCheckpoint, inHash, archiveRoot, txHashes, sig, signedTxs);
     }
-    /**Get Sender
-   * Lazily evaluate the sender of the proposal; result is cached
-   * @returns The sender address, or undefined if signature recovery fails
+    /**
+   * Lazily evaluate the sender of the proposal; result is cached.
+   * If there's signedTxs, also verifies the signedTxs sender matches the block proposal sender.
+   * @returns The sender address, or undefined if signature recovery fails or senders don't match
    */ getSender() {
         if (!this.sender) {
-            const hashed = getHashedSignaturePayloadEthSignedMessage(this.payload, SignatureDomainSeparator.blockProposal);
+            const hashed = getHashedSignaturePayloadEthSignedMessage(this, SignatureDomainSeparator.blockProposal);
+            const blockSender = tryRecoverAddress(hashed, this.signature);
+            // If there's signedTxs, verify the sender matches
+            if (blockSender && this.signedTxs) {
+                const txsSender = this.signedTxs.getSender();
+                if (!txsSender || !txsSender.equals(blockSender)) {
+                    return undefined; // Sender mismatch - fail
+                }
+            }
             // Cache the sender for later use
-            this.sender = tryRecoverAddress(hashed, this.signature);
+            this.sender = blockSender;
         }
         return this.sender;
     }
     getPayload() {
-        return this.payload.getPayloadToSign(SignatureDomainSeparator.blockProposal);
+        return this.getPayloadToSign(SignatureDomainSeparator.blockProposal);
     }
     toBuffer() {
         const buffer = [
-            this.payload,
+            this.blockHeader,
+            this.indexWithinCheckpoint,
+            this.inHash,
+            this.archiveRoot,
             this.signature,
             this.txHashes.length,
             this.txHashes
         ];
-        if (this.txs) {
-            buffer.push(this.txs.length);
-            buffer.push(this.txs);
+        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);
-        const payload = reader.readObject(ConsensusPayload);
-        const sig = reader.readObject(Signature);
-        const txHashes = reader.readArray(reader.readNumber(), TxHash);
+        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 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 txs = reader.readArray(reader.readNumber(), Tx);
-            return new BlockProposal(payload, sig, txHashes, txs);
+            const hasSignedTxs = reader.readNumber();
+            if (hasSignedTxs) {
+                const signedTxs = SignedTxs.fromBuffer(reader);
+                return new BlockProposal(blockHeader, indexWithinCheckpoint, inHash, archiveRoot, txHashes, signature, signedTxs);
+            }
         }
-        return new BlockProposal(payload, sig, txHashes);
+        return new BlockProposal(blockHeader, indexWithinCheckpoint, inHash, archiveRoot, txHashes, signature);
     }
     getSize() {
-        return this.payload.getSize() + this.signature.getSize() + 4 /* txHashes.length */  + this.txHashes.length * TxHash.SIZE + (this.txs ? 4 /* txs.length */  + this.txs.reduce((acc, tx)=>acc + tx.getSize(), 0) : 0);
+        return this.blockHeader.getSize() + 4 /* indexWithinCheckpoint */  + this.inHash.size + this.archiveRoot.size + this.signature.getSize() + 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());
+    }
+    static random() {
+        return new BlockProposal(BlockHeader.random(), IndexWithinCheckpoint(Math.floor(Math.random() * 5)), Fr.random(), Fr.random(), [
+            TxHash.random(),
+            TxHash.random()
+        ], Signature.random());
+    }
+    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())
+        };
+    }
+    /**
+   * 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);
     }
 }