@aztec/stdlib 0.86.0 → 0.87.0

package/dest/p2p/block_attestation.d.ts

@@ -1,9 +1,7 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { Buffer32 } from '@aztec/foundation/buffer';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import { Signature } from '@aztec/foundation/eth-signature';
-import type { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/fields';
 import { BufferReader } from '@aztec/foundation/serialize';
 import type { ZodFor } from '../schemas/index.js';
 import { ConsensusPayload } from './consensus_payload.js';
@@ -19,6 +17,8 @@ export declare class BlockAttestationHash extends Buffer32 {
  * will produce a block attestation over the header of the block
  */
 export declare class BlockAttestation extends Gossipable {
+    /** The block number of the attestation. */
+    readonly blockNumber: Fr;
     /** The payload of the message, and what the signature is over */
     readonly payload: ConsensusPayload;
     /** The signature of the block attester */
@@ -26,15 +26,16 @@ export declare class BlockAttestation extends Gossipable {
     static p2pTopic: TopicType;
     private sender;
     constructor(
+    /** The block number of the attestation. */
+    blockNumber: Fr, 
     /** The payload of the message, and what the signature is over */
     payload: ConsensusPayload, 
     /** The signature of the block attester */
     signature: Signature);
     static get schema(): ZodFor<BlockAttestation>;
-    p2pMessageIdentifier(): Promise<Buffer32>;
+    generateP2PMessageIdentifier(): Promise<Buffer32>;
     get archive(): Fr;
     get slotNumber(): Fr;
-    get blockNumber(): Fr;
     /**Get sender
      *
      * Lazily evaluate and cache the sender of the attestation

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

@@ -1 +1 @@
-{"version":3,"file":"block_attestation.d.ts","sourceRoot":"","sources":["../../src/p2p/block_attestation.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,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAI9E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,qBAAa,oBAAqB,SAAQ,QAAQ;gBACpC,IAAI,EAAE,MAAM;CAGzB;AAED;;;;;GAKG;AACH,qBAAa,gBAAiB,SAAQ,UAAU;IAM5C,iEAAiE;aACjD,OAAO,EAAE,gBAAgB;IAEzC,0CAA0C;aAC1B,SAAS,EAAE,SAAS;IATtC,OAAgB,QAAQ,YAA+B;IAEvD,OAAO,CAAC,MAAM,CAAyB;;IAGrC,iEAAiE;IACjD,OAAO,EAAE,gBAAgB;IAEzC,0CAA0C;IAC1B,SAAS,EAAE,SAAS;IAKtC,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,gBAAgB,CAAC,CAO5C;IAEQ,oBAAoB,IAAI,OAAO,CAAC,QAAQ,CAAC;IAIlD,IAAI,OAAO,IAAI,EAAE,CAEhB;IAED,IAAI,UAAU,IAAI,EAAE,CAEnB;IAED,IAAI,WAAW,IAAI,EAAE,CAEpB;IAED;;;;OAIG;IACH,SAAS,IAAI,UAAU;IAWvB,UAAU,IAAI,MAAM;IAIpB,QAAQ,IAAI,MAAM;IAIlB,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,gBAAgB;IAK/D,MAAM,CAAC,KAAK,IAAI,gBAAgB;IAIhC,OAAO,IAAI,MAAM;CAGlB"}
+{"version":3,"file":"block_attestation.d.ts","sourceRoot":"","sources":["../../src/p2p/block_attestation.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;AAI9E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,qBAAa,oBAAqB,SAAQ,QAAQ;gBACpC,IAAI,EAAE,MAAM;CAGzB;AAED;;;;;GAKG;AACH,qBAAa,gBAAiB,SAAQ,UAAU;IAM5C,2CAA2C;aAC3B,WAAW,EAAE,EAAE;IAE/B,iEAAiE;aACjD,OAAO,EAAE,gBAAgB;IAEzC,0CAA0C;aAC1B,SAAS,EAAE,SAAS;IAZtC,OAAgB,QAAQ,YAA+B;IAEvD,OAAO,CAAC,MAAM,CAAyB;;IAGrC,2CAA2C;IAC3B,WAAW,EAAE,EAAE;IAE/B,iEAAiE;IACjD,OAAO,EAAE,gBAAgB;IAEzC,0CAA0C;IAC1B,SAAS,EAAE,SAAS;IAKtC,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,gBAAgB,CAAC,CAQ5C;IAEQ,4BAA4B,IAAI,OAAO,CAAC,QAAQ,CAAC;IAI1D,IAAI,OAAO,IAAI,EAAE,CAEhB;IAED,IAAI,UAAU,IAAI,EAAE,CAEnB;IAED;;;;OAIG;IACH,SAAS,IAAI,UAAU;IAWvB,UAAU,IAAI,MAAM;IAIpB,QAAQ,IAAI,MAAM;IAIlB,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,gBAAgB;IAS/D,MAAM,CAAC,KAAK,IAAI,gBAAgB;IAIhC,OAAO,IAAI,MAAM;CAGlB"}

package/dest/p2p/block_attestation.js

@@ -1,6 +1,7 @@
 import { Buffer32 } from '@aztec/foundation/buffer';
 import { keccak256, recoverAddress } from '@aztec/foundation/crypto';
 import { Signature } from '@aztec/foundation/eth-signature';
+import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { z } from 'zod';
 import { ConsensusPayload } from './consensus_payload.js';
@@ -18,30 +19,29 @@ export class BlockAttestationHash extends Buffer32 {
  * 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 {
+    blockNumber;
     payload;
     signature;
     static p2pTopic = TopicType.block_attestation;
     sender;
-    constructor(/** The payload of the message, and what the signature is over */ payload, /** The signature of the block attester */ signature){
-        super(), this.payload = payload, this.signature = signature;
+    constructor(/** The block number of the attestation. */ blockNumber, /** The payload of the message, and what the signature is over */ payload, /** The signature of the block attester */ signature){
+        super(), this.blockNumber = blockNumber, this.payload = payload, this.signature = signature;
     }
     static get schema() {
         return z.object({
+            blockNumber: Fr.schema,
             payload: ConsensusPayload.schema,
             signature: Signature.schema
-        }).transform((obj)=>new BlockAttestation(obj.payload, obj.signature));
+        }).transform((obj)=>new BlockAttestation(obj.blockNumber, obj.payload, obj.signature));
     }
-    p2pMessageIdentifier() {
+    generateP2PMessageIdentifier() {
         return Promise.resolve(new BlockAttestationHash(keccak256(this.signature.toBuffer())));
     }
     get archive() {
         return this.payload.archive;
     }
     get slotNumber() {
-        return this.payload.header.globalVariables.slotNumber;
-    }
-    get blockNumber() {
-        return this.payload.header.globalVariables.blockNumber;
+        return this.payload.header.slotNumber;
     }
     /**Get sender
    *
@@ -61,18 +61,19 @@ export class BlockAttestationHash extends Buffer32 {
     }
     toBuffer() {
         return serializeToBuffer([
+            this.blockNumber,
             this.payload,
             this.signature
         ]);
     }
     static fromBuffer(buf) {
         const reader = BufferReader.asReader(buf);
-        return new BlockAttestation(reader.readObject(ConsensusPayload), reader.readObject(Signature));
+        return new BlockAttestation(reader.readObject(Fr), reader.readObject(ConsensusPayload), reader.readObject(Signature));
     }
     static empty() {
-        return new BlockAttestation(ConsensusPayload.empty(), Signature.empty());
+        return new BlockAttestation(Fr.ZERO, ConsensusPayload.empty(), Signature.empty());
     }
     getSize() {
-        return this.payload.getSize() + this.signature.getSize();
+        return this.blockNumber.size + this.payload.getSize() + this.signature.getSize();
     }
 }

package/dest/p2p/block_proposal.d.ts

@@ -1,16 +1,18 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { Buffer32 } from '@aztec/foundation/buffer';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import { Signature } from '@aztec/foundation/eth-signature';
-import type { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/fields';
 import { BufferReader } from '@aztec/foundation/serialize';
+import { Tx } from '../tx/tx.js';
 import { ConsensusPayload } from './consensus_payload.js';
 import { Gossipable } from './gossipable.js';
 import { TopicType } from './topic_type.js';
 export declare class BlockProposalHash extends Buffer32 {
     constructor(hash: Buffer);
 }
+export type BlockProposalOptions = {
+    publishFullTxs: boolean;
+};
 /**
  * BlockProposal
  *
@@ -18,27 +20,34 @@ export declare class BlockProposalHash extends Buffer32 {
  * be included in the head of the chain
  */
 export declare class BlockProposal extends Gossipable {
+    /** The number of the block */
+    readonly blockNumber: Fr;
     /** 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;
+    /** The transactions in the block */
+    readonly txs?: Tx[] | undefined;
     static p2pTopic: TopicType;
     private sender;
     constructor(
+    /** The number of the block */
+    blockNumber: Fr, 
     /** 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);
-    p2pMessageIdentifier(): Promise<Buffer32>;
+    signature: Signature, 
+    /** The transactions in the block */
+    txs?: Tx[] | undefined);
+    generateP2PMessageIdentifier(): Promise<Buffer32>;
     get archive(): Fr;
     get slotNumber(): Fr;
-    get blockNumber(): Fr;
-    static createProposalFromSigner(payload: ConsensusPayload, payloadSigner: (payload: Buffer32) => Promise<Signature>): Promise<BlockProposal>;
+    static createProposalFromSigner(blockNumber: Fr, payload: ConsensusPayload, txs: Tx[] | undefined, payloadSigner: (payload: Buffer32) => Promise<Signature>): Promise<BlockProposal>;
     /**Get Sender
      * Lazily evaluate the sender of the proposal; result is cached
      */
     getSender(): EthAddress;
-    getPayload(): Buffer;
+    getPayload(): Buffer<ArrayBufferLike>;
     toBuffer(): Buffer;
     static fromBuffer(buf: Buffer | BufferReader): BlockProposal;
     getSize(): number;

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,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,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;;;;;GAKG;AACH,qBAAa,aAAc,SAAQ,UAAU;IAMzC,iEAAiE;aACjD,OAAO,EAAE,gBAAgB;IAEzC,sEAAsE;aACtD,SAAS,EAAE,SAAS;IATtC,OAAgB,QAAQ,YAA4B;IAEpD,OAAO,CAAC,MAAM,CAAyB;;IAGrC,iEAAiE;IACjD,OAAO,EAAE,gBAAgB;IAEzC,sEAAsE;IACtD,SAAS,EAAE,SAAS;IAK7B,oBAAoB,IAAI,OAAO,CAAC,QAAQ,CAAC;IAIlD,IAAI,OAAO,IAAI,EAAE,CAEhB;IAED,IAAI,UAAU,IAAI,EAAE,CAEnB;IAED,IAAI,WAAW,IAAI,EAAE,CAEpB;WAEY,wBAAwB,CACnC,OAAO,EAAE,gBAAgB,EACzB,aAAa,EAAE,CAAC,OAAO,EAAE,QAAQ,KAAK,OAAO,CAAC,SAAS,CAAC;IAQ1D;;OAEG;IACH,SAAS;IAUT,UAAU;IAIV,QAAQ,IAAI,MAAM;IAIlB,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,aAAa;IAK5D,OAAO,IAAI,MAAM;CAGlB"}
+{"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,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;CACzB,CAAC;AAEF;;;;;GAKG;AACH,qBAAa,aAAc,SAAQ,UAAU;IAMzC,8BAA8B;aACd,WAAW,EAAE,EAAE;IAE/B,iEAAiE;aACjD,OAAO,EAAE,gBAAgB;IAEzC,sEAAsE;aACtD,SAAS,EAAE,SAAS;IAGpC,oCAAoC;aACpB,GAAG,CAAC,EAAE,EAAE,EAAE;IAhB5B,OAAgB,QAAQ,YAA4B;IAEpD,OAAO,CAAC,MAAM,CAAyB;;IAGrC,8BAA8B;IACd,WAAW,EAAE,EAAE;IAE/B,iEAAiE;IACjD,OAAO,EAAE,gBAAgB;IAEzC,sEAAsE;IACtD,SAAS,EAAE,SAAS;IAGpC,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;WAEY,wBAAwB,CACnC,WAAW,EAAE,EAAE,EACf,OAAO,EAAE,gBAAgB,EAEzB,GAAG,EAAE,EAAE,EAAE,GAAG,SAAS,EACrB,aAAa,EAAE,CAAC,OAAO,EAAE,QAAQ,KAAK,OAAO,CAAC,SAAS,CAAC;IAQ1D;;OAEG;IACH,SAAS;IAUT,UAAU;IAIV,QAAQ,IAAI,MAAM;IASlB,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,aAAa;IAe5D,OAAO,IAAI,MAAM;CAQlB"}

package/dest/p2p/block_proposal.js

@@ -1,7 +1,9 @@
 import { Buffer32 } from '@aztec/foundation/buffer';
 import { keccak256, recoverAddress } from '@aztec/foundation/crypto';
 import { Signature } from '@aztec/foundation/eth-signature';
+import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+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';
@@ -17,29 +19,30 @@ export class BlockProposalHash extends Buffer32 {
  * 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
  */ export class BlockProposal extends Gossipable {
+    blockNumber;
     payload;
     signature;
+    txs;
     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){
-        super(), this.payload = payload, this.signature = signature;
+    constructor(/** The number of the block */ blockNumber, /** 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, // 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.blockNumber = blockNumber, this.payload = payload, this.signature = signature, this.txs = txs;
     }
-    p2pMessageIdentifier() {
+    generateP2PMessageIdentifier() {
         return Promise.resolve(new BlockProposalHash(keccak256(this.signature.toBuffer())));
     }
     get archive() {
         return this.payload.archive;
     }
     get slotNumber() {
-        return this.payload.header.globalVariables.slotNumber;
+        return this.payload.header.slotNumber;
     }
-    get blockNumber() {
-        return this.payload.header.globalVariables.blockNumber;
-    }
-    static async createProposalFromSigner(payload, payloadSigner) {
+    static async createProposalFromSigner(blockNumber, payload, // 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);
+        return new BlockProposal(blockNumber, payload, sig, txs);
     }
     /**Get Sender
    * Lazily evaluate the sender of the proposal; result is cached
@@ -55,16 +58,29 @@ export class BlockProposalHash extends Buffer32 {
         return this.payload.getPayloadToSign(SignatureDomainSeparator.blockProposal);
     }
     toBuffer() {
-        return serializeToBuffer([
+        const buffer = [
+            this.blockNumber,
             this.payload,
             this.signature
-        ]);
+        ];
+        if (this.txs) {
+            buffer.push(this.txs.length);
+            buffer.push(this.txs);
+        }
+        return serializeToBuffer(buffer);
     }
     static fromBuffer(buf) {
         const reader = BufferReader.asReader(buf);
-        return new BlockProposal(reader.readObject(ConsensusPayload), reader.readObject(Signature));
+        const blockNumber = reader.readObject(Fr);
+        const payload = reader.readObject(ConsensusPayload);
+        const sig = reader.readObject(Signature);
+        if (!reader.isEmpty()) {
+            const txs = reader.readArray(reader.readNumber(), Tx);
+            return new BlockProposal(blockNumber, payload, sig, txs);
+        }
+        return new BlockProposal(blockNumber, payload, sig);
     }
     getSize() {
-        return this.payload.getSize() + this.signature.getSize();
+        return this.blockNumber.size + this.payload.getSize() + this.signature.getSize() + (this.txs ? this.txs.reduce((acc, tx)=>acc + tx.getSize(), 0) : 0);
     }
 }

package/dest/p2p/consensus_payload.d.ts

@@ -1,43 +1,215 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { Fr } from '@aztec/foundation/fields';
 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 { BlockHeader } from '../tx/block_header.js';
-import { TxHash } from '../tx/tx_hash.js';
+import { ProposedBlockHeader, StateReference, TxHash } from '../tx/index.js';
 import type { Signable, SignatureDomainSeparator } from './signature_utils.js';
 export declare class ConsensusPayload implements Signable {
-    /** The block header the attestation is made over */
-    readonly header: BlockHeader;
+    /** The proposed block header the attestation is made over */
+    readonly header: ProposedBlockHeader;
+    /** The archive root after the block is added */
     readonly archive: Fr;
+    /** The state reference after the block is added */
+    readonly stateReference: StateReference;
     /** The sequence of transactions in the block */
     readonly txHashes: TxHash[];
     private size;
     constructor(
-    /** The block header the attestation is made over */
-    header: BlockHeader, archive: Fr, 
+    /** The proposed block header the attestation is made over */
+    header: ProposedBlockHeader, 
+    /** The archive root after the block is added */
+    archive: Fr, 
+    /** The state reference after the block is added */
+    stateReference: StateReference, 
     /** The sequence of transactions in the block */
     txHashes: TxHash[]);
     static get schema(): z.ZodEffects<z.ZodObject<{
-        header: import("@aztec/foundation/schemas").ZodFor<BlockHeader>;
+        header: import("@aztec/foundation/schemas").ZodFor<ProposedBlockHeader>;
         archive: z.ZodType<Fr, any, string>;
-        txHashes: z.ZodArray<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>, Buffer, string>, TxHash, string>, "many">;
+        stateReference: z.ZodEffects<z.ZodObject<{
+            l1ToL2MessageTree: z.ZodEffects<z.ZodObject<{
+                root: z.ZodType<Fr, any, string>;
+                nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
+            }, "strip", z.ZodTypeAny, {
+                root: Fr;
+                nextAvailableLeafIndex: number;
+            }, {
+                root: string;
+                nextAvailableLeafIndex: string | number | bigint;
+            }>, import("../trees/append_only_tree_snapshot.js").AppendOnlyTreeSnapshot, {
+                root: string;
+                nextAvailableLeafIndex: string | number | bigint;
+            }>;
+            partial: z.ZodEffects<z.ZodObject<{
+                noteHashTree: z.ZodEffects<z.ZodObject<{
+                    root: z.ZodType<Fr, any, string>;
+                    nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
+                }, "strip", z.ZodTypeAny, {
+                    root: Fr;
+                    nextAvailableLeafIndex: number;
+                }, {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                }>, import("../trees/append_only_tree_snapshot.js").AppendOnlyTreeSnapshot, {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                }>;
+                nullifierTree: z.ZodEffects<z.ZodObject<{
+                    root: z.ZodType<Fr, any, string>;
+                    nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
+                }, "strip", z.ZodTypeAny, {
+                    root: Fr;
+                    nextAvailableLeafIndex: number;
+                }, {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                }>, import("../trees/append_only_tree_snapshot.js").AppendOnlyTreeSnapshot, {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                }>;
+                publicDataTree: z.ZodEffects<z.ZodObject<{
+                    root: z.ZodType<Fr, any, string>;
+                    nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
+                }, "strip", z.ZodTypeAny, {
+                    root: Fr;
+                    nextAvailableLeafIndex: number;
+                }, {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                }>, import("../trees/append_only_tree_snapshot.js").AppendOnlyTreeSnapshot, {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                }>;
+            }, "strip", z.ZodTypeAny, {
+                noteHashTree: import("../trees/append_only_tree_snapshot.js").AppendOnlyTreeSnapshot;
+                nullifierTree: import("../trees/append_only_tree_snapshot.js").AppendOnlyTreeSnapshot;
+                publicDataTree: import("../trees/append_only_tree_snapshot.js").AppendOnlyTreeSnapshot;
+            }, {
+                noteHashTree: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                };
+                nullifierTree: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                };
+                publicDataTree: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                };
+            }>, import("../tx/partial_state_reference.js").PartialStateReference, {
+                noteHashTree: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                };
+                nullifierTree: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                };
+                publicDataTree: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                };
+            }>;
+        }, "strip", z.ZodTypeAny, {
+            partial: import("../tx/partial_state_reference.js").PartialStateReference;
+            l1ToL2MessageTree: import("../trees/append_only_tree_snapshot.js").AppendOnlyTreeSnapshot;
+        }, {
+            partial: {
+                noteHashTree: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                };
+                nullifierTree: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                };
+                publicDataTree: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                };
+            };
+            l1ToL2MessageTree: {
+                root: string;
+                nextAvailableLeafIndex: string | number | bigint;
+            };
+        }>, StateReference, {
+            partial: {
+                noteHashTree: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                };
+                nullifierTree: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                };
+                publicDataTree: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                };
+            };
+            l1ToL2MessageTree: {
+                root: string;
+                nextAvailableLeafIndex: string | number | bigint;
+            };
+        }>;
+        txHashes: z.ZodArray<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>, Buffer<ArrayBuffer>, string>, TxHash, string>, "many">;
     }, "strip", z.ZodTypeAny, {
         archive: Fr;
-        header: BlockHeader;
+        header: ProposedBlockHeader;
+        stateReference: StateReference;
         txHashes: TxHash[];
     }, {
         archive: string;
+        stateReference: {
+            partial: {
+                noteHashTree: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                };
+                nullifierTree: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                };
+                publicDataTree: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                };
+            };
+            l1ToL2MessageTree: {
+                root: string;
+                nextAvailableLeafIndex: string | number | bigint;
+            };
+        };
         txHashes: string[];
         header?: any;
     }>, ConsensusPayload, {
         archive: string;
+        stateReference: {
+            partial: {
+                noteHashTree: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                };
+                nullifierTree: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                };
+                publicDataTree: {
+                    root: string;
+                    nextAvailableLeafIndex: string | number | bigint;
+                };
+            };
+            l1ToL2MessageTree: {
+                root: string;
+                nextAvailableLeafIndex: string | number | bigint;
+            };
+        };
         txHashes: string[];
         header?: any;
     }>;
-    static getFields(fields: FieldsOf<ConsensusPayload>): readonly [BlockHeader, Fr, TxHash[]];
+    static getFields(fields: FieldsOf<ConsensusPayload>): readonly [ProposedBlockHeader, Fr, StateReference, TxHash[]];
     getPayloadToSign(domainSeparator: SignatureDomainSeparator): Buffer;
     toBuffer(): Buffer;
     static fromBuffer(buf: Buffer | BufferReader): ConsensusPayload;
@@ -49,5 +221,6 @@ export declare class ConsensusPayload implements Signable {
      * @returns The size of the consensus payload.
      */
     getSize(): number;
+    toString(): string;
 }
 //# sourceMappingURL=consensus_payload.d.ts.map

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,0BAA0B,CAAC;AAE9C,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,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,KAAK,EAAE,QAAQ,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAE/E,qBAAa,gBAAiB,YAAW,QAAQ;IAI7C,oDAAoD;aACpC,MAAM,EAAE,WAAW;aAEnB,OAAO,EAAE,EAAE;IAC3B,gDAAgD;aAChC,QAAQ,EAAE,MAAM,EAAE;IARpC,OAAO,CAAC,IAAI,CAAqB;;IAG/B,oDAAoD;IACpC,MAAM,EAAE,WAAW,EAEnB,OAAO,EAAE,EAAE;IAC3B,gDAAgD;IAChC,QAAQ,EAAE,MAAM,EAAE;IAGpC,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;OAQhB;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,gBAAgB,CAAC;IAInD,gBAAgB,CAAC,eAAe,EAAE,wBAAwB,GAAG,MAAM;IAWnE,QAAQ,IAAI,MAAM;IAMlB,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,gBAAgB;IAS/D,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,gBAAgB,CAAC,GAAG,gBAAgB;IAIvE,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,OAAO,GAAG,gBAAgB;IAQlD,MAAM,CAAC,KAAK,IAAI,gBAAgB;IAIhC;;;OAGG;IACH,OAAO,IAAI,MAAM;CAQlB"}
+{"version":3,"file":"consensus_payload.d.ts","sourceRoot":"","sources":["../../src/p2p/consensus_payload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,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,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAC7E,OAAO,KAAK,EAAE,QAAQ,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAE/E,qBAAa,gBAAiB,YAAW,QAAQ;IAI7C,6DAA6D;aAC7C,MAAM,EAAE,mBAAmB;IAC3C,gDAAgD;aAChC,OAAO,EAAE,EAAE;IAC3B,mDAAmD;aACnC,cAAc,EAAE,cAAc;IAC9C,gDAAgD;aAChC,QAAQ,EAAE,MAAM,EAAE;IAVpC,OAAO,CAAC,IAAI,CAAqB;;IAG/B,6DAA6D;IAC7C,MAAM,EAAE,mBAAmB;IAC3C,gDAAgD;IAChC,OAAO,EAAE,EAAE;IAC3B,mDAAmD;IACnC,cAAc,EAAE,cAAc;IAC9C,gDAAgD;IAChC,QAAQ,EAAE,MAAM,EAAE;IAGpC,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAShB;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,gBAAgB,CAAC;IAInD,gBAAgB,CAAC,eAAe,EAAE,wBAAwB,GAAG,MAAM;IAcnE,QAAQ,IAAI,MAAM;IAYlB,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,gBAAgB;IAU/D,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,gBAAgB,CAAC,GAAG,gBAAgB;IAIvE,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,OAAO,GAAG,gBAAgB;IASlD,MAAM,CAAC,KAAK,IAAI,gBAAgB;IAIhC;;;OAGG;IACH,OAAO,IAAI,MAAM;IASjB,QAAQ;CAGT"}

package/dest/p2p/consensus_payload.js

@@ -2,46 +2,52 @@ import { Fr } from '@aztec/foundation/fields';
 import { schemas } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { hexToBuffer } from '@aztec/foundation/string';
-import { encodeAbiParameters, parseAbiParameters } from 'viem';
+import { encodeAbiParameters, parseAbiParameters, toHex } from 'viem';
 import { z } from 'zod';
-import { BlockHeader } from '../tx/block_header.js';
-import { TxHash } from '../tx/tx_hash.js';
+import { ProposedBlockHeader, StateReference, TxHash } from '../tx/index.js';
 export class ConsensusPayload {
     header;
     archive;
+    stateReference;
     txHashes;
     size;
-    constructor(/** The block header the attestation is made over */ header, // TODO(https://github.com/AztecProtocol/aztec-packages/pull/7727#discussion_r1713670830): temporary
-    archive, /** The sequence of transactions in the block */ txHashes){
+    constructor(/** The proposed block header the attestation is made over */ header, /** The archive root after the block is added */ archive, /** The state reference after the block is added */ stateReference, /** The sequence of transactions in the block */ txHashes){
         this.header = header;
         this.archive = archive;
+        this.stateReference = stateReference;
         this.txHashes = txHashes;
     }
     static get schema() {
         return z.object({
-            header: BlockHeader.schema,
+            header: ProposedBlockHeader.schema,
             archive: schemas.Fr,
+            stateReference: StateReference.schema,
             txHashes: z.array(TxHash.schema)
-        }).transform((obj)=>new ConsensusPayload(obj.header, obj.archive, obj.txHashes));
+        }).transform((obj)=>new ConsensusPayload(obj.header, obj.archive, obj.stateReference, obj.txHashes));
     }
     static getFields(fields) {
         return [
             fields.header,
             fields.archive,
+            fields.stateReference,
             fields.txHashes
         ];
     }
     getPayloadToSign(domainSeparator) {
-        const abi = parseAbiParameters('uint8, (bytes32, (uint256), bytes, bytes32[])');
+        const abi = parseAbiParameters('uint8, (bytes32, bytes, (uint256), bytes32, bytes32[])');
+        const archiveRoot = this.archive.toString();
+        const stateReference = toHex(this.stateReference.toBuffer());
+        const headerHash = this.header.hash().toString();
         const txArray = this.txHashes.map((tx)=>tx.toString());
         const encodedData = encodeAbiParameters(abi, [
             domainSeparator,
             [
-                this.archive.toString(),
+                archiveRoot,
+                stateReference,
                 [
                     0n
                 ],
-                this.header.toString(),
+                headerHash,
                 txArray
             ]
         ]);
@@ -51,6 +57,7 @@ export class ConsensusPayload {
         const buffer = serializeToBuffer([
             this.header,
             this.archive,
+            this.stateReference,
             this.txHashes.length,
             this.txHashes
         ]);
@@ -59,16 +66,16 @@ export class ConsensusPayload {
     }
     static fromBuffer(buf) {
         const reader = BufferReader.asReader(buf);
-        return new ConsensusPayload(reader.readObject(BlockHeader), reader.readObject(Fr), reader.readArray(reader.readNumber(), TxHash));
+        return new ConsensusPayload(reader.readObject(ProposedBlockHeader), reader.readObject(Fr), reader.readObject(StateReference), reader.readArray(reader.readNumber(), TxHash));
     }
     static fromFields(fields) {
-        return new ConsensusPayload(fields.header, fields.archive, fields.txHashes);
+        return new ConsensusPayload(fields.header, fields.archive, fields.stateReference, fields.txHashes);
     }
     static fromBlock(block) {
-        return new ConsensusPayload(block.header, block.archive.root, block.body.txEffects.map((tx)=>tx.txHash));
+        return new ConsensusPayload(block.header.toPropose(), block.archive.root, block.header.state, block.body.txEffects.map((tx)=>tx.txHash));
     }
     static empty() {
-        return new ConsensusPayload(BlockHeader.empty(), Fr.ZERO, []);
+        return new ConsensusPayload(ProposedBlockHeader.empty(), Fr.ZERO, StateReference.empty(), []);
     }
     /**
    * Get the size of the consensus payload in bytes.
@@ -81,4 +88,7 @@ export class ConsensusPayload {
         this.size = this.toBuffer().length;
         return this.size;
     }
+    toString() {
+        return `header: ${this.header.toString()}, archive: ${this.archive.toString()}, stateReference: ${this.stateReference.l1ToL2MessageTree.root.toString()}, txHashes: ${this.txHashes.join(', ')}`;
+    }
 }

package/dest/p2p/gossipable.d.ts

@@ -1,13 +1,21 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-import type { Buffer32 } from '@aztec/foundation/buffer';
+import { Buffer32 } from '@aztec/foundation/buffer';
 import type { TopicType } from './topic_type.js';
+export declare class P2PMessage {
+    readonly publishTime: Date;
+    readonly id: Buffer32;
+    readonly payload: Buffer;
+    constructor(publishTime: Date, id: Buffer32, payload: Buffer);
+    static fromGossipable(message: Gossipable): Promise<P2PMessage>;
+    static fromMessageData(messageData: Buffer): P2PMessage;
+    toMessageData(): Buffer;
+}
 /**
  * Gossipable
  *
  * Any class which extends gossipable will be able to be Gossiped over the p2p network
  */
 export declare abstract class Gossipable {
+    private cachedId;
     /** p2p Topic
      *
      * - The p2p topic identifier, this determines how the message is handled
@@ -17,12 +25,14 @@ export declare abstract class Gossipable {
      *
      *  - A digest of the message information, this key is used for deduplication
      */
-    abstract p2pMessageIdentifier(): Promise<Buffer32>;
+    p2pMessageIdentifier(): Promise<Buffer32>;
+    abstract generateP2PMessageIdentifier(): Promise<Buffer32>;
     /** To Buffer
      *
      * - Serialization method
      */
     abstract toBuffer(): Buffer;
+    toMessage(): Buffer;
     /**
      * Get the size of the gossipable object.
      *