@aztec/stdlib 0.0.0-test.1 → 0.0.1-fake-ceab37513c

package/dest/note/extended_note.js

@@ -2,7 +2,6 @@ import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
 import { z } from 'zod';
-import { NoteSelector } from '../abi/note_selector.js';
 import { AztecAddress } from '../aztec-address/index.js';
 import { schemas } from '../schemas/index.js';
 import { TxHash } from '../tx/tx_hash.js';
@@ -11,49 +10,44 @@ import { Note } from './note.js';
  * A note with contextual data.
  */ export class ExtendedNote {
     note;
-    owner;
+    recipient;
     contractAddress;
     storageSlot;
-    noteTypeId;
     txHash;
-    constructor(/** The note as emitted from the Noir contract. */ note, /** The owner whose public key was used to encrypt the note. */ owner, /** The contract address this note is created in. */ contractAddress, /** The specific storage location of the note on the contract. */ storageSlot, /** The type identifier of the note on the contract. */ noteTypeId, /** The hash of the tx the note was created in. */ txHash){
+    constructor(/** The note as emitted from the Noir contract. */ note, /** The address whose public key was used to encrypt the note. */ recipient, /** The contract address this note is created in. */ contractAddress, /** The specific storage location of the note on the contract. */ storageSlot, /** The hash of the tx the note was created in. */ txHash){
         this.note = note;
-        this.owner = owner;
+        this.recipient = recipient;
         this.contractAddress = contractAddress;
         this.storageSlot = storageSlot;
-        this.noteTypeId = noteTypeId;
         this.txHash = txHash;
     }
     toBuffer() {
         return serializeToBuffer([
             this.note,
-            this.owner,
+            this.recipient,
             this.contractAddress,
             this.storageSlot,
-            this.noteTypeId,
             this.txHash
         ]);
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
         const note = reader.readObject(Note);
-        const owner = reader.readObject(AztecAddress);
+        const recipient = reader.readObject(AztecAddress);
         const contractAddress = reader.readObject(AztecAddress);
         const storageSlot = reader.readObject(Fr);
-        const noteTypeId = reader.readObject(NoteSelector);
         const txHash = reader.readObject(TxHash);
-        return new this(note, owner, contractAddress, storageSlot, noteTypeId, txHash);
+        return new this(note, recipient, contractAddress, storageSlot, txHash);
     }
     static get schema() {
         return z.object({
             note: Note.schema,
-            owner: schemas.AztecAddress,
+            recipient: schemas.AztecAddress,
             contractAddress: schemas.AztecAddress,
             storageSlot: schemas.Fr,
-            noteTypeId: schemas.NoteSelector,
             txHash: TxHash.schema
-        }).transform(({ note, owner, contractAddress, storageSlot, noteTypeId, txHash })=>{
-            return new ExtendedNote(note, owner, contractAddress, storageSlot, noteTypeId, txHash);
+        }).transform(({ note, recipient, contractAddress, storageSlot, txHash })=>{
+            return new ExtendedNote(note, recipient, contractAddress, storageSlot, txHash);
         });
     }
     toString() {
@@ -63,51 +57,48 @@ import { Note } from './note.js';
         return ExtendedNote.fromBuffer(hexToBuffer(str));
     }
     static async random() {
-        return new ExtendedNote(Note.random(), await AztecAddress.random(), await AztecAddress.random(), Fr.random(), NoteSelector.random(), TxHash.random());
+        return new ExtendedNote(Note.random(), await AztecAddress.random(), await AztecAddress.random(), Fr.random(), TxHash.random());
     }
 }
 export class UniqueNote extends ExtendedNote {
-    nonce;
-    constructor(/** The note as emitted from the Noir contract. */ note, /** The owner whose public key was used to encrypt the note. */ owner, /** The contract address this note is created in. */ contractAddress, /** The specific storage location of the note on the contract. */ storageSlot, /** The type identifier of the note on the contract. */ noteTypeId, /** The hash of the tx the note was created in. */ txHash, /** The nonce of the note. */ nonce){
-        super(note, owner, contractAddress, storageSlot, noteTypeId, txHash), this.nonce = nonce;
+    noteNonce;
+    constructor(/** The note as emitted from the Noir contract. */ note, /** The recipient whose public key was used to encrypt the note. */ recipient, /** The contract address this note is created in. */ contractAddress, /** The specific storage location of the note on the contract. */ storageSlot, /** The hash of the tx the note was created in. */ txHash, /** The nonce that was injected into the note hash preimage in order to guarantee uniqueness. */ noteNonce){
+        super(note, recipient, contractAddress, storageSlot, txHash), this.noteNonce = noteNonce;
     }
     static get schema() {
         return z.object({
             note: Note.schema,
-            owner: schemas.AztecAddress,
+            recipient: schemas.AztecAddress,
             contractAddress: schemas.AztecAddress,
             storageSlot: schemas.Fr,
-            noteTypeId: schemas.NoteSelector,
             txHash: TxHash.schema,
-            nonce: schemas.Fr
-        }).transform(({ note, owner, contractAddress, storageSlot, noteTypeId, txHash, nonce })=>{
-            return new UniqueNote(note, owner, contractAddress, storageSlot, noteTypeId, txHash, nonce);
+            noteNonce: schemas.Fr
+        }).transform(({ note, recipient, contractAddress, storageSlot, txHash, noteNonce })=>{
+            return new UniqueNote(note, recipient, contractAddress, storageSlot, txHash, noteNonce);
         });
     }
     toBuffer() {
         return serializeToBuffer([
             this.note,
-            this.owner,
+            this.recipient,
             this.contractAddress,
             this.storageSlot,
-            this.noteTypeId,
             this.txHash,
-            this.nonce
+            this.noteNonce
         ]);
     }
     static async random() {
-        return new UniqueNote(Note.random(), await AztecAddress.random(), await AztecAddress.random(), Fr.random(), NoteSelector.random(), TxHash.random(), Fr.random());
+        return new UniqueNote(Note.random(), await AztecAddress.random(), await AztecAddress.random(), Fr.random(), TxHash.random(), Fr.random());
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
         const note = reader.readObject(Note);
-        const owner = reader.readObject(AztecAddress);
+        const recipient = reader.readObject(AztecAddress);
         const contractAddress = reader.readObject(AztecAddress);
         const storageSlot = reader.readObject(Fr);
-        const noteTypeId = reader.readObject(NoteSelector);
         const txHash = reader.readObject(TxHash);
-        const nonce = reader.readObject(Fr);
-        return new this(note, owner, contractAddress, storageSlot, noteTypeId, txHash, nonce);
+        const noteNonce = reader.readObject(Fr);
+        return new this(note, recipient, contractAddress, storageSlot, txHash, noteNonce);
     }
     static fromString(str) {
         return UniqueNote.fromBuffer(hexToBuffer(str));

package/dest/note/note.d.ts

@@ -1,9 +1,13 @@
-/// <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 { Payload } from '../logs/l1_payload/payload.js';
-export declare class Note extends Payload {
-    static get schema(): import("zod").ZodEffects<import("zod").ZodUnion<[import("zod").ZodEffects<import("zod").ZodEffects<import("zod").ZodString, string, string>, Buffer, string>, import("zod").ZodEffects<import("zod").ZodObject<{
+import { Vector } from '../types/shared.js';
+/**
+ * The Note class represents a Note emitted from a Noir contract as a vector of Fr (finite field) elements.
+ * This data also represents a preimage to a note hash.
+ */
+export declare class Note extends Vector<Fr> {
+    toJSON(): Buffer<ArrayBufferLike>;
+    static get schema(): import("zod").ZodEffects<import("zod").ZodUnion<[import("zod").ZodEffects<import("zod").ZodEffects<import("zod").ZodString, string, string>, Buffer<ArrayBuffer>, string>, import("zod").ZodEffects<import("zod").ZodObject<{
         type: import("zod").ZodLiteral<"Buffer">;
         data: import("zod").ZodArray<import("zod").ZodNumber, "many">;
     }, "strip", import("zod").ZodTypeAny, {
@@ -12,13 +16,42 @@ export declare class Note extends Payload {
     }, {
         type: "Buffer";
         data: number[];
-    }>, Buffer, {
+    }>, Buffer<ArrayBuffer>, {
         type: "Buffer";
         data: number[];
     }>]>, Note, string | {
         type: "Buffer";
         data: number[];
     }>;
+    /**
+     * Create a Note instance from a Buffer or BufferReader.
+     * The input 'buffer' can be either a Buffer containing the serialized Fr elements or a BufferReader instance.
+     * This function reads the Fr elements in the buffer and constructs a Note with them.
+     *
+     * @param buffer - The Buffer or BufferReader containing the serialized Fr elements.
+     * @returns A Note instance containing the deserialized Fr elements.
+     */
     static fromBuffer(buffer: Buffer | BufferReader): Note;
+    /**
+     * Generates a random Note instance with a variable number of items.
+     * The number of items is determined by a random value between 1 and 10 (inclusive).
+     * Each item in the Note is generated using the Fr.random() method.
+     *
+     * @returns A randomly generated Note instance.
+     */
+    static random(): Note;
+    /**
+     * Returns a hex representation of the note.
+     * @returns A hex string with the vector length as first element.
+     */
+    toString(): `0x${string}`;
+    /**
+     * Creates a new Note instance from a hex string.
+     * @param str - Hex representation.
+     * @returns A Note instance.
+     */
+    static fromString(str: string): Note;
+    get length(): number;
+    equals(other: Note): boolean;
 }
 //# sourceMappingURL=note.d.ts.map

package/dest/note/note.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"note.d.ts","sourceRoot":"","sources":["../../src/note/note.ts"],"names":[],"mappings":";;AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAExD,qBAAa,IAAK,SAAQ,OAAO;IAC/B,WAAoB,MAAM;;;;;;;;;;;;;;;OAEzB;WAEe,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;CAIzD"}
+{"version":3,"file":"note.d.ts","sourceRoot":"","sources":["../../src/note/note.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAI3D,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C;;;GAGG;AACH,qBAAa,IAAK,SAAQ,MAAM,CAAC,EAAE,CAAC;IAClC,MAAM;IAIN,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;OAEhB;IAED;;;;;;;OAOG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAK/C;;;;;;OAMG;IACH,MAAM,CAAC,MAAM;IAMb;;;OAGG;IACM,QAAQ;IAIjB;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAI7B,IAAI,MAAM,WAET;IAED,MAAM,CAAC,KAAK,EAAE,IAAI;CAGnB"}

package/dest/note/note.js

@@ -1,13 +1,60 @@
+import { randomInt } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
-import { schemas } from '@aztec/foundation/schemas';
 import { BufferReader } from '@aztec/foundation/serialize';
-import { Payload } from '../logs/l1_payload/payload.js';
-export class Note extends Payload {
+import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
+import { schemas } from '../schemas/index.js';
+import { Vector } from '../types/shared.js';
+/**
+ * The Note class represents a Note emitted from a Noir contract as a vector of Fr (finite field) elements.
+ * This data also represents a preimage to a note hash.
+ */ export class Note extends Vector {
+    toJSON() {
+        return this.toBuffer();
+    }
     static get schema() {
         return schemas.Buffer.transform(Note.fromBuffer);
     }
-    static fromBuffer(buffer) {
+    /**
+   * Create a Note instance from a Buffer or BufferReader.
+   * The input 'buffer' can be either a Buffer containing the serialized Fr elements or a BufferReader instance.
+   * This function reads the Fr elements in the buffer and constructs a Note with them.
+   *
+   * @param buffer - The Buffer or BufferReader containing the serialized Fr elements.
+   * @returns A Note instance containing the deserialized Fr elements.
+   */ static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
         return new Note(reader.readVector(Fr));
     }
+    /**
+   * Generates a random Note instance with a variable number of items.
+   * The number of items is determined by a random value between 1 and 10 (inclusive).
+   * Each item in the Note is generated using the Fr.random() method.
+   *
+   * @returns A randomly generated Note instance.
+   */ static random() {
+        const numItems = randomInt(10) + 1;
+        const items = Array.from({
+            length: numItems
+        }, ()=>Fr.random());
+        return new Note(items);
+    }
+    /**
+   * Returns a hex representation of the note.
+   * @returns A hex string with the vector length as first element.
+   */ toString() {
+        return bufferToHex(this.toBuffer());
+    }
+    /**
+   * Creates a new Note instance from a hex string.
+   * @param str - Hex representation.
+   * @returns A Note instance.
+   */ static fromString(str) {
+        return Note.fromBuffer(hexToBuffer(str));
+    }
+    get length() {
+        return this.items.length;
+    }
+    equals(other) {
+        return this.items.every((item, index)=>item.equals(other.items[index]));
+    }
 }

package/dest/note/notes_filter.d.ts

@@ -8,14 +8,17 @@ import { NoteStatus } from './note_status.js';
  * @remarks This filter is applied as an intersection of all its params.
  */
 export type NotesFilter = {
+    /**
+     * The contract address the note belongs to.
+     * @remarks Providing a contract address is required as we need that information to trigger private state sync.
+     */
+    contractAddress: AztecAddress;
     /** Hash of a transaction from which to fetch the notes. */
     txHash?: TxHash;
-    /** The contract address the note belongs to. */
-    contractAddress?: AztecAddress;
     /** The specific storage location of the note on the contract. */
     storageSlot?: Fr;
-    /** The owner of the note (whose public key was used to encrypt the note). */
-    owner?: AztecAddress;
+    /** The recipient of the note (whose public key was used to encrypt the note). */
+    recipient?: AztecAddress;
     /** The status of the note. Defaults to 'ACTIVE'. */
     status?: NoteStatus;
     /** The siloed nullifier for the note. */

package/dest/note/notes_filter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"notes_filter.d.ts","sourceRoot":"","sources":["../../src/note/notes_filter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAInD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C;;;GAGG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB,2DAA2D;IAC3D,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gDAAgD;IAChD,eAAe,CAAC,EAAE,YAAY,CAAC;IAC/B,iEAAiE;IACjE,WAAW,CAAC,EAAE,EAAE,CAAC;IACjB,6EAA6E;IAC7E,KAAK,CAAC,EAAE,YAAY,CAAC;IACrB,oDAAoD;IACpD,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,yCAAyC;IACzC,eAAe,CAAC,EAAE,EAAE,CAAC;IACrB,0EAA0E;IAC1E,MAAM,CAAC,EAAE,YAAY,EAAE,CAAC;CACzB,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,MAAM,CAAC,WAAW,CAQhD,CAAC"}
+{"version":3,"file":"notes_filter.d.ts","sourceRoot":"","sources":["../../src/note/notes_filter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAInD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C;;;GAGG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB;;;OAGG;IACH,eAAe,EAAE,YAAY,CAAC;IAC9B,2DAA2D;IAC3D,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,iEAAiE;IACjE,WAAW,CAAC,EAAE,EAAE,CAAC;IACjB,iFAAiF;IACjF,SAAS,CAAC,EAAE,YAAY,CAAC;IACzB,oDAAoD;IACpD,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,yCAAyC;IACzC,eAAe,CAAC,EAAE,EAAE,CAAC;IACrB,0EAA0E;IAC1E,MAAM,CAAC,EAAE,YAAY,EAAE,CAAC;CACzB,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,MAAM,CAAC,WAAW,CAQhD,CAAC"}

package/dest/note/notes_filter.js

@@ -3,10 +3,10 @@ import { schemas } from '../schemas/index.js';
 import { TxHash } from '../tx/tx_hash.js';
 import { NoteStatus } from './note_status.js';
 export const NotesFilterSchema = z.object({
+    contractAddress: schemas.AztecAddress,
     txHash: TxHash.schema.optional(),
-    contractAddress: schemas.AztecAddress.optional(),
     storageSlot: schemas.Fr.optional(),
-    owner: schemas.AztecAddress.optional(),
+    recipient: schemas.AztecAddress.optional(),
     status: z.nativeEnum(NoteStatus).optional(),
     siloedNullifier: schemas.Fr.optional(),
     scopes: z.array(schemas.AztecAddress).optional()

package/dest/p2p/attestation_utils.d.ts

@@ -0,0 +1,10 @@
+import type { EthAddress } from '@aztec/foundation/eth-address';
+import { CommitteeAttestation } from '../block/index.js';
+import type { BlockAttestation } from './block_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

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

@@ -0,0 +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"}

package/dest/p2p/attestation_utils.js

@@ -0,0 +1,21 @@
+import { CommitteeAttestation } from '../block/index.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 function orderAttestations(attestations, orderAddresses) {
+    // Create a map of sender addresses to BlockAttestations
+    const attestationMap = new Map();
+    for (const attestation of attestations){
+        const sender = attestation.getSender();
+        if (sender) {
+            attestationMap.set(sender.toString(), CommitteeAttestation.fromAddressAndSignature(sender, attestation.signature));
+        }
+    }
+    // Create the ordered array based on the orderAddresses, else return an empty attestation
+    const orderedAttestations = orderAddresses.map((address)=>{
+        const addressString = address.toString();
+        return attestationMap.get(addressString) || CommitteeAttestation.fromAddress(address);
+    });
+    return orderedAttestations;
+}

package/dest/p2p/block_attestation.d.ts

@@ -1,13 +1,12 @@
-/// <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';
 import { Gossipable } from './gossipable.js';
+import { TopicType } from './topic_type.js';
 export declare class BlockAttestationHash extends Buffer32 {
     constructor(hash: Buffer);
 }
@@ -22,28 +21,67 @@ export declare class BlockAttestation extends Gossipable {
     readonly payload: ConsensusPayload;
     /** The signature of the block attester */
     readonly signature: Signature;
-    static p2pTopic: string;
+    /** The signature from the block proposer */
+    readonly proposerSignature: Signature;
+    static p2pTopic: TopicType;
     private sender;
+    private proposer;
     constructor(
     /** The payload of the message, and what the signature is over */
     payload: ConsensusPayload, 
     /** The signature of the block attester */
-    signature: Signature);
+    signature: Signature, 
+    /** The signature from the block proposer */
+    proposerSignature: 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
-     * @returns The sender of the attestation
+    /**
+     * Lazily evaluate and cache the signer of the attestation
+     * @returns The signer of the attestation, or undefined if signature recovery fails
      */
-    getSender(): Promise<EthAddress>;
-    getPayload(): Promise<Buffer>;
+    getSender(): EthAddress | undefined;
+    /**
+     * Lazily evaluate and cache the proposer of the block
+     * @returns The proposer of the block
+     */
+    getProposer(): EthAddress | undefined;
+    getPayload(): Buffer;
     toBuffer(): Buffer;
     static fromBuffer(buf: Buffer | BufferReader): BlockAttestation;
     static empty(): BlockAttestation;
+    static random(): BlockAttestation;
     getSize(): number;
+    toInspect(): {
+        payload: {
+            header: {
+                lastArchive: `0x${string}`;
+                contentCommitment: {
+                    blobsHash: `0x${string}`;
+                    inHash: `0x${string}`;
+                    outHash: `0x${string}`;
+                };
+                slotNumber: bigint;
+                timestamp: bigint;
+                coinbase: `0x${string}`;
+                feeRecipient: `0x${string}`;
+                gasFees: {
+                    feePerDaGas: bigint;
+                    feePerL2Gas: bigint;
+                };
+                totalManaUsed: bigint;
+            };
+            archive: `0x${string}`;
+            stateReference: {
+                l1ToL2MessageTree: `0x${string}`;
+                noteHashTree: `0x${string}`;
+                nullifierTree: `0x${string}`;
+                publicDataTree: `0x${string}`;
+            };
+        };
+        signature: `0x${string}`;
+        proposerSignature: `0x${string}`;
+    };
 }
 //# sourceMappingURL=block_attestation.d.ts.map

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;AAI7C,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,SAAkD;IAE1E,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;IACG,SAAS,IAAI,OAAO,CAAC,UAAU,CAAC;IActC,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;IAI7B,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;IAO5C,iEAAiE;aACjD,OAAO,EAAE,gBAAgB;IAEzC,0CAA0C;aAC1B,SAAS,EAAE,SAAS;IAEpC,4CAA4C;aAC5B,iBAAiB,EAAE,SAAS;IAb9C,OAAgB,QAAQ,YAA+B;IAEvD,OAAO,CAAC,MAAM,CAAyB;IACvC,OAAO,CAAC,QAAQ,CAAyB;;IAGvC,iEAAiE;IACjD,OAAO,EAAE,gBAAgB;IAEzC,0CAA0C;IAC1B,SAAS,EAAE,SAAS;IAEpC,4CAA4C;IAC5B,iBAAiB,EAAE,SAAS;IAK9C,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;;;OAGG;IACH,SAAS,IAAI,UAAU,GAAG,SAAS;IAWnC;;;OAGG;IACH,WAAW,IAAI,UAAU,GAAG,SAAS;IAWrC,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,MAAM,CAAC,MAAM,IAAI,gBAAgB;IAIjC,OAAO,IAAI,MAAM;IAIjB,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAOV"}

package/dest/p2p/block_attestation.js

@@ -1,12 +1,12 @@
 import { Buffer32 } from '@aztec/foundation/buffer';
-import { keccak256, recoverAddress } from '@aztec/foundation/crypto';
+import { keccak256, tryRecoverAddress } from '@aztec/foundation/crypto';
 import { Signature } from '@aztec/foundation/eth-signature';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { z } from 'zod';
 import { ConsensusPayload } from './consensus_payload.js';
 import { Gossipable } from './gossipable.js';
 import { SignatureDomainSeparator, getHashedSignaturePayloadEthSignedMessage } from './signature_utils.js';
-import { TopicType, createTopicString } from './topic_type.js';
+import { TopicType } from './topic_type.js';
 export class BlockAttestationHash extends Buffer32 {
     constructor(hash){
         super(hash);
@@ -20,59 +20,81 @@ export class BlockAttestationHash extends Buffer32 {
  */ export class BlockAttestation extends Gossipable {
     payload;
     signature;
-    static p2pTopic = createTopicString(TopicType.block_attestation);
+    proposerSignature;
+    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;
+    proposer;
+    constructor(/** The payload of the message, and what the signature is over */ payload, /** The signature of the block attester */ signature, /** The signature from the block proposer */ proposerSignature){
+        super(), this.payload = payload, this.signature = signature, this.proposerSignature = proposerSignature;
     }
     static get schema() {
         return z.object({
             payload: ConsensusPayload.schema,
-            signature: Signature.schema
-        }).transform((obj)=>new BlockAttestation(obj.payload, obj.signature));
+            signature: Signature.schema,
+            proposerSignature: Signature.schema
+        }).transform((obj)=>new BlockAttestation(obj.payload, obj.signature, obj.proposerSignature));
     }
-    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;
+        return this.payload.header.slotNumber;
     }
-    get blockNumber() {
-        return this.payload.header.globalVariables.blockNumber;
-    }
-    /**Get sender
-   *
-   * Lazily evaluate and cache the sender of the attestation
-   * @returns The sender of the attestation
-   */ async getSender() {
+    /**
+   * Lazily evaluate and cache the signer of the attestation
+   * @returns The signer of the attestation, or undefined if signature recovery fails
+   */ getSender() {
         if (!this.sender) {
             // Recover the sender from the attestation
-            const hashed = await getHashedSignaturePayloadEthSignedMessage(this.payload, SignatureDomainSeparator.blockAttestation);
+            const hashed = getHashedSignaturePayloadEthSignedMessage(this.payload, SignatureDomainSeparator.blockAttestation);
             // Cache the sender for later use
-            this.sender = recoverAddress(hashed, this.signature);
+            this.sender = tryRecoverAddress(hashed, this.signature);
         }
         return this.sender;
     }
+    /**
+   * Lazily evaluate and cache the proposer of the block
+   * @returns The proposer of the block
+   */ getProposer() {
+        if (!this.proposer) {
+            // Recover the proposer from the proposal signature
+            const hashed = getHashedSignaturePayloadEthSignedMessage(this.payload, SignatureDomainSeparator.blockProposal);
+            // Cache the proposer for later use
+            this.proposer = tryRecoverAddress(hashed, this.proposerSignature);
+        }
+        return this.proposer;
+    }
     getPayload() {
         return this.payload.getPayloadToSign(SignatureDomainSeparator.blockAttestation);
     }
     toBuffer() {
         return serializeToBuffer([
             this.payload,
-            this.signature
+            this.signature,
+            this.proposerSignature
         ]);
     }
     static fromBuffer(buf) {
         const reader = BufferReader.asReader(buf);
-        return new BlockAttestation(reader.readObject(ConsensusPayload), reader.readObject(Signature));
+        return new BlockAttestation(reader.readObject(ConsensusPayload), reader.readObject(Signature), reader.readObject(Signature));
     }
     static empty() {
-        return new BlockAttestation(ConsensusPayload.empty(), Signature.empty());
+        return new BlockAttestation(ConsensusPayload.empty(), Signature.empty(), Signature.empty());
+    }
+    static random() {
+        return new BlockAttestation(ConsensusPayload.random(), Signature.random(), Signature.random());
     }
     getSize() {
-        return this.payload.getSize() + this.signature.getSize();
+        return this.payload.getSize() + this.signature.getSize() + this.proposerSignature.getSize();
+    }
+    toInspect() {
+        return {
+            payload: this.payload.toInspect(),
+            signature: this.signature.toString(),
+            proposerSignature: this.proposerSignature.toString()
+        };
     }
 }

package/dest/p2p/block_proposal.d.ts

@@ -1,15 +1,20 @@
-/// <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 { L2BlockInfo } from '../block/l2_block_info.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 { TopicType } from './topic_type.js';
 export declare class BlockProposalHash extends Buffer32 {
     constructor(hash: Buffer);
 }
+export type BlockProposalOptions = {
+    publishFullTxs: boolean;
+};
 /**
  * BlockProposal
  *
@@ -21,23 +26,32 @@ export declare class BlockProposal extends Gossipable {
     readonly payload: ConsensusPayload;
     /** The signer of the BlockProposal over the header of the new block*/
     readonly signature: Signature;
-    static p2pTopic: string;
+    /** The sequence of transactions in the block */
+    readonly txHashes: TxHash[];
+    /** The transactions in the block */
+    readonly txs?: Tx[] | 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);
-    p2pMessageIdentifier(): Promise<Buffer32>;
+    signature: Signature, 
+    /** The sequence of transactions in the block */
+    txHashes: TxHash[], 
+    /** 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>;
+    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
      */
-    getSender(): Promise<EthAddress>;
-    getPayload(): Promise<Buffer>;
+    getSender(): EthAddress | undefined;
+    getPayload(): Buffer<ArrayBufferLike>;
     toBuffer(): Buffer;
     static fromBuffer(buf: Buffer | BufferReader): BlockProposal;
     getSize(): number;