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

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=attestation_utils.d.ts.map
+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,61 +1,154 @@
-import { Buffer32 } from '@aztec/foundation/buffer';
+import { BlockNumber, BlockProposalHash, type CheckpointNumber, 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 { Fr } from '@aztec/foundation/fields';
 import { BufferReader } from '@aztec/foundation/serialize';
+import type { TypedDataDefinition } from 'viem';
+import type { L2Block } from '../block/l2_block.js';
 import type { L2BlockInfo } from '../block/l2_block_info.js';
+import { type SigningContext } from '../ha-signing/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 type { Tx } from '../tx/tx.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 declare class BlockProposalHash extends Buffer32 {
-    constructor(hash: Buffer);
-}
+export type { BlockProposalHash } from '@aztec/foundation/branded-types';
 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 {
-    /** The payload of the message, and what the signature is over */
-    readonly payload: ConsensusPayload;
-    /** The signer of the BlockProposal over the header of the new block*/
-    readonly signature: Signature;
+export declare class BlockProposal extends Gossipable implements Signable {
+    /** 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[];
-    /** The transactions in the block */
-    readonly txs?: Tx[] | undefined;
+    /** The proposer's signature over the block data */
+    readonly signature: Signature;
+    /** The signing domain (chainId + rollupAddress) the signature is bound to */
+    readonly signatureContext: CoordinationSignatureContext;
+    /** The signed transactions in the block (optional, for DA guarantees) */
+    readonly signedTxs?: SignedTxs | undefined;
     static p2pTopic: TopicType;
-    private sender;
+    readonly primaryType: CoordinationSignatureType;
+    private cachedSender;
     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);
-    generateP2PMessageIdentifier(): Promise<Buffer32>;
+    /** The proposer's signature over the block data */
+    signature: Signature, 
+    /** The signing domain (chainId + rollupAddress) the signature is bound to */
+    signatureContext: CoordinationSignatureContext, 
+    /** The signed transactions in the block (optional, for DA guarantees) */
+    signedTxs?: SignedTxs | undefined);
+    generateP2PMessageIdentifier(): Promise<BaseBuffer32>;
     get archive(): Fr;
-    get slotNumber(): 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(): Buffer;
+    private getPayloadHashBuffer;
+    /**
+     * 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(): BlockProposalHash;
+    static createProposalFromSigner(blockHeader: BlockHeader, checkpointNumber: CheckpointNumber, indexWithinCheckpoint: IndexWithinCheckpoint, inHash: Fr, archiveRoot: Fr, txHashes: TxHash[], txs: Tx[] | undefined, signatureContext: CoordinationSignatureContext, proposalSigner: (typedData: TypedDataDefinition, context: SigningContext) => Promise<Signature>, txsSigner?: (typedData: TypedDataDefinition, context: SigningContext) => Promise<Signature>): Promise<BlockProposal>;
+    /**
+     * 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(): 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}`[];
+        chainId: number;
+        rollupAddress: `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=block_proposal.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfcHJvcG9zYWwuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wMnAvYmxvY2tfcHJvcG9zYWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUNMLFdBQVcsRUFDWCxpQkFBaUIsRUFDakIsS0FBSyxnQkFBZ0IsRUFDckIscUJBQXFCLEVBQ3JCLFVBQVUsRUFDWCxNQUFNLGlDQUFpQyxDQUFDO0FBQ3pDLE9BQU8sRUFBRSxLQUFLLFlBQVksRUFBWSxNQUFNLDBCQUEwQixDQUFDO0FBRXZFLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUNoRSxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDNUQsT0FBTyxFQUFFLFlBQVksRUFBcUIsTUFBTSw2QkFBNkIsQ0FBQztBQUU5RSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUVoRCxPQUFPLEtBQUssRUFBRSxPQUFPLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUNwRCxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUU3RCxPQUFPLEVBQVksS0FBSyxjQUFjLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUN2RSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDcEQsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBQ3hDLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUN0QyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDN0MsT0FBTyxFQUNMLEtBQUssNEJBQTRCLEVBQ2pDLEtBQUsseUJBQXlCLEVBRTlCLEtBQUssUUFBUSxFQU1kLE1BQU0sc0JBQXNCLENBQUM7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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,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAEpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAC5D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,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;gBACjC,IAAI,EAAE,MAAM;CAGzB;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;IAMzC,iEAAiE;aACjD,OAAO,EAAE,gBAAgB;IAEzC,sEAAsE;aACtD,SAAS,EAAE,SAAS;IAEpC,gDAAgD;aAChC,QAAQ,EAAE,MAAM,EAAE;IAGlC,oCAAoC;aACpB,GAAG,CAAC,EAAE,EAAE,EAAE;IAhB5B,OAAgB,QAAQ,YAA4B;IAEpD,OAAO,CAAC,MAAM,CAAyB;;IAGrC,iEAAiE;IACjD,OAAO,EAAE,gBAAgB;IAEzC,sEAAsE;IACtD,SAAS,EAAE,SAAS;IAEpC,gDAAgD;IAChC,QAAQ,EAAE,MAAM,EAAE;IAGlC,oCAAoC;IACpB,GAAG,CAAC,EAAE,EAAE,EAAE,YAAA;IAKnB,4BAA4B,IAAI,OAAO,CAAC,QAAQ,CAAC;IAI1D,IAAI,OAAO,IAAI,EAAE,CAEhB;IAED,IAAI,UAAU,IAAI,EAAE,CAEnB;IAED,WAAW,IAAI,IAAI,CAAC,WAAW,EAAE,aAAa,CAAC;WAUlC,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;IAQ1D;;;OAGG;IACH,SAAS,IAAI,UAAU,GAAG,SAAS;IAUnC,UAAU;IAIV,QAAQ,IAAI,MAAM;IASlB,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,aAAa;IAe5D,OAAO,IAAI,MAAM;CASlB"}
+{"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,97 +1,215 @@
+import { BlockProposalHash, IndexWithinCheckpoint } from '@aztec/foundation/branded-types';
 import { Buffer32 } from '@aztec/foundation/buffer';
-import { keccak256, tryRecoverAddress } 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 { 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 { 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 { 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';
-export class BlockProposalHash extends Buffer32 {
-    constructor(hash){
-        super(hash);
-    }
-}
 /**
- * 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;
+    signatureContext;
+    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;
+    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;
     }
     generateP2PMessageIdentifier() {
-        return Promise.resolve(new BlockProposalHash(keccak256(this.signature.toBuffer())));
+        return Promise.resolve(new Buffer32(this.getPayloadHashBuffer()));
     }
     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.toNumber(),
-            lastArchive: this.payload.header.lastArchiveRoot,
-            timestamp: this.payload.header.timestamp,
-            archive: this.archive,
+            slotNumber: this.slotNumber,
+            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() {
+        return serializeToBuffer([
+            this.blockHeader,
+            this.indexWithinCheckpoint,
+            this.inHash,
+            this.archiveRoot,
+            this.txHashes.length,
+            this.txHashes
+        ]);
+    }
+    getPayloadHashBuffer() {
+        return keccak256(this.getPayloadToSign());
     }
-    /**Get Sender
-   * Lazily evaluate the sender of the proposal; result is cached
-   * @returns The sender address, or undefined if signature recovery fails
+    /**
+   * 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.sender) {
-            const hashed = getHashedSignaturePayloadEthSignedMessage(this.payload, SignatureDomainSeparator.blockProposal);
-            // Cache the sender for later use
-            this.sender = tryRecoverAddress(hashed, this.signature);
+        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() {
         const buffer = [
-            this.payload,
+            this.blockHeader,
+            this.indexWithinCheckpoint,
+            this.inHash,
+            this.archiveRoot,
             this.signature,
+            serializeCoordinationSignatureContext(this.signatureContext),
             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 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 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, signatureContext, signedTxs);
+            }
         }
-        return new BlockProposal(payload, sig, txHashes);
+        return new BlockProposal(blockHeader, indexWithinCheckpoint, inHash, archiveRoot, txHashes, signature, signatureContext);
     }
     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 /* 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);
     }
 }