@aztec/stdlib 3.0.0-nightly.20251023 → 3.0.0-nightly.20251025

package/dest/interfaces/validator.d.ts

@@ -2,6 +2,7 @@ import type { SecretValue } from '@aztec/foundation/config';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import type { Signature } from '@aztec/foundation/eth-signature';
 import { Fr } from '@aztec/foundation/fields';
+import { type ZodFor } from '@aztec/foundation/schemas';
 import type { SequencerConfig, SlasherConfig } from '@aztec/stdlib/interfaces/server';
 import type { BlockAttestation, BlockProposal, BlockProposalOptions } from '@aztec/stdlib/p2p';
 import type { StateReference, Tx } from '@aztec/stdlib/tx';
@@ -30,7 +31,13 @@ export interface ValidatorClientConfig {
     /** Whether to always reexecute block proposals, even for non-validator nodes or when out of the currnet committee */
     alwaysReexecuteBlockProposals?: boolean;
 }
-export type ValidatorClientFullConfig = ValidatorClientConfig & Pick<SequencerConfig, 'txPublicSetupAllowList' | 'broadcastInvalidBlockProposal'> & Pick<SlasherConfig, 'slashBroadcastedInvalidBlockPenalty'>;
+export type ValidatorClientFullConfig = ValidatorClientConfig & Pick<SequencerConfig, 'txPublicSetupAllowList' | 'broadcastInvalidBlockProposal'> & Pick<SlasherConfig, 'slashBroadcastedInvalidBlockPenalty'> & {
+    /**
+     * Whether transactions are disabled for this node
+     * @remarks This should match the property in P2PConfig. It's not picked from there to avoid circular dependencies.
+     */
+    disableTransactions?: boolean;
+};
 export declare const ValidatorClientConfigSchema: z.ZodObject<{
     validatorAddresses: z.ZodOptional<z.ZodArray<z.ZodType<EthAddress, any, string>, "many">>;
     disableValidator: z.ZodBoolean;
@@ -56,6 +63,94 @@ export declare const ValidatorClientConfigSchema: z.ZodObject<{
     validatorAddresses?: string[] | undefined;
     alwaysReexecuteBlockProposals?: boolean | undefined;
 }>;
+export declare const ValidatorClientFullConfigSchema: z.ZodObject<{
+    validatorAddresses: z.ZodOptional<z.ZodArray<z.ZodType<EthAddress, any, string>, "many">>;
+    disableValidator: z.ZodBoolean;
+    disabledValidators: z.ZodArray<z.ZodType<EthAddress, any, string>, "many">;
+    attestationPollingIntervalMs: z.ZodNumber;
+    validatorReexecute: z.ZodBoolean;
+    validatorReexecuteDeadlineMs: z.ZodNumber;
+    alwaysReexecuteBlockProposals: z.ZodOptional<z.ZodBoolean>;
+} & {
+    txPublicSetupAllowList: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodObject<{
+        address: ZodFor<import("../aztec-address/index.js").AztecAddress>;
+        selector: ZodFor<import("../abi/function_selector.js").FunctionSelector>;
+    }, "strip", z.ZodTypeAny, {
+        selector: import("../abi/function_selector.js").FunctionSelector;
+        address: import("../aztec-address/index.js").AztecAddress;
+    }, {
+        selector?: any;
+        address?: any;
+    }>, z.ZodObject<{
+        address: ZodFor<import("../aztec-address/index.js").AztecAddress>;
+    }, "strip", z.ZodTypeAny, {
+        address: import("../aztec-address/index.js").AztecAddress;
+    }, {
+        address?: any;
+    }>, z.ZodObject<{
+        classId: ZodFor<Fr>;
+        selector: ZodFor<import("../abi/function_selector.js").FunctionSelector>;
+    }, "strip", z.ZodTypeAny, {
+        selector: import("../abi/function_selector.js").FunctionSelector;
+        classId: Fr;
+    }, {
+        selector?: any;
+        classId?: any;
+    }>, z.ZodObject<{
+        classId: ZodFor<Fr>;
+    }, "strip", z.ZodTypeAny, {
+        classId: Fr;
+    }, {
+        classId?: any;
+    }>]>, "many">>;
+    broadcastInvalidBlockProposal: z.ZodOptional<z.ZodBoolean>;
+    slashBroadcastedInvalidBlockPenalty: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+    disableTransactions: z.ZodOptional<z.ZodBoolean>;
+}, "strip", z.ZodTypeAny, {
+    slashBroadcastedInvalidBlockPenalty: bigint;
+    disableValidator: boolean;
+    disabledValidators: EthAddress[];
+    attestationPollingIntervalMs: number;
+    validatorReexecute: boolean;
+    validatorReexecuteDeadlineMs: number;
+    txPublicSetupAllowList?: ({
+        selector: import("../abi/function_selector.js").FunctionSelector;
+        address: import("../aztec-address/index.js").AztecAddress;
+    } | {
+        address: import("../aztec-address/index.js").AztecAddress;
+    } | {
+        selector: import("../abi/function_selector.js").FunctionSelector;
+        classId: Fr;
+    } | {
+        classId: Fr;
+    })[] | undefined;
+    broadcastInvalidBlockProposal?: boolean | undefined;
+    validatorAddresses?: EthAddress[] | undefined;
+    alwaysReexecuteBlockProposals?: boolean | undefined;
+    disableTransactions?: boolean | undefined;
+}, {
+    slashBroadcastedInvalidBlockPenalty: string | number | bigint;
+    disableValidator: boolean;
+    disabledValidators: string[];
+    attestationPollingIntervalMs: number;
+    validatorReexecute: boolean;
+    validatorReexecuteDeadlineMs: number;
+    txPublicSetupAllowList?: ({
+        selector?: any;
+        address?: any;
+    } | {
+        address?: any;
+    } | {
+        selector?: any;
+        classId?: any;
+    } | {
+        classId?: any;
+    })[] | undefined;
+    broadcastInvalidBlockProposal?: boolean | undefined;
+    validatorAddresses?: string[] | undefined;
+    alwaysReexecuteBlockProposals?: boolean | undefined;
+    disableTransactions?: boolean | undefined;
+}>;
 export interface Validator {
     start(): Promise<void>;
     updateConfig(config: Partial<ValidatorClientFullConfig>): void;

package/dest/interfaces/validator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../../src/interfaces/validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AACtF,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAC/F,OAAO,KAAK,EAAE,cAAc,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAE3D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,mBAAmB,CAAC;AACzE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAEvE;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,6EAA6E;IAC7E,oBAAoB,CAAC,EAAE,WAAW,CAAC,KAAK,MAAM,EAAE,EAAE,CAAC,CAAC;IAEpD,iEAAiE;IACjE,kBAAkB,CAAC,EAAE,UAAU,EAAE,CAAC;IAElC,+BAA+B;IAC/B,gBAAgB,EAAE,OAAO,CAAC;IAE1B,6DAA6D;IAC7D,kBAAkB,EAAE,UAAU,EAAE,CAAC;IAEjC,+DAA+D;IAC/D,4BAA4B,EAAE,MAAM,CAAC;IAErC,8EAA8E;IAC9E,kBAAkB,EAAE,OAAO,CAAC;IAE5B,wEAAwE;IACxE,4BAA4B,EAAE,MAAM,CAAC;IAErC,qHAAqH;IACrH,6BAA6B,CAAC,EAAE,OAAO,CAAC;CACzC;AAED,MAAM,MAAM,yBAAyB,GAAG,qBAAqB,GAC3D,IAAI,CAAC,eAAe,EAAE,wBAAwB,GAAG,+BAA+B,CAAC,GACjF,IAAI,CAAC,aAAa,EAAE,qCAAqC,CAAC,CAAC;AAE7D,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;;;;;;;;;;;;EAQgC,CAAC;AAEzE,MAAM,WAAW,SAAS;IACxB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,yBAAyB,CAAC,GAAG,IAAI,CAAC;IAG/D,mBAAmB,CACjB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,EAAE,EACX,cAAc,EAAE,cAAc,EAC9B,GAAG,EAAE,EAAE,EAAE,EACT,eAAe,EAAE,UAAU,GAAG,SAAS,EACvC,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAAC;IACtC,gBAAgB,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,GAAG,SAAS,CAAC,CAAC;IAEnG,sBAAsB,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/D,mBAAmB,CAAC,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAC5G,0BAA0B,CACxB,sBAAsB,EAAE,+BAA+B,EACvD,QAAQ,EAAE,UAAU,GACnB,OAAO,CAAC,SAAS,CAAC,CAAC;CACvB"}
+{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../../src/interfaces/validator.ts"],"names":[],"mappings":"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"}

package/dest/interfaces/validator.js

@@ -1,5 +1,6 @@
 import { schemas } from '@aztec/foundation/schemas';
 import { z } from 'zod';
+import { AllowedElementSchema } from './allowed_element.js';
 export const ValidatorClientConfigSchema = z.object({
     validatorAddresses: z.array(schemas.EthAddress).optional(),
     disableValidator: z.boolean(),
@@ -9,3 +10,9 @@ export const ValidatorClientConfigSchema = z.object({
     validatorReexecuteDeadlineMs: z.number().min(0),
     alwaysReexecuteBlockProposals: z.boolean().optional()
 });
+export const ValidatorClientFullConfigSchema = ValidatorClientConfigSchema.extend({
+    txPublicSetupAllowList: z.array(AllowedElementSchema).optional(),
+    broadcastInvalidBlockProposal: z.boolean().optional(),
+    slashBroadcastedInvalidBlockPenalty: schemas.BigInt,
+    disableTransactions: z.boolean().optional()
+});

package/dest/note/index.d.ts

@@ -1,5 +1,5 @@
 export * from './comparator.js';
-export * from './extended_note.js';
+export * from './unique_note.js';
 export * from './notes_filter.js';
 export * from './note_status.js';
 export * from './note.js';

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/note/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,WAAW,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/note/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,WAAW,CAAC"}

package/dest/note/index.js

@@ -1,5 +1,5 @@
 export * from './comparator.js';
-export * from './extended_note.js';
+export * from './unique_note.js';
 export * from './notes_filter.js';
 export * from './note_status.js';
 export * from './note.js';

package/dest/note/unique_note.d.ts

@@ -0,0 +1,43 @@
+import { Fr } from '@aztec/foundation/fields';
+import { BufferReader } from '@aztec/foundation/serialize';
+import { AztecAddress } from '../aztec-address/index.js';
+import { type ZodFor } from '../schemas/index.js';
+import { TxHash } from '../tx/tx_hash.js';
+import { Note } from './note.js';
+/**
+ * A note with contextual data and a nonce that makes it unique.
+ */
+export declare class UniqueNote {
+    /** The note as emitted from the Noir contract. */
+    note: Note;
+    /** The recipient whose public key was used to encrypt the note. */
+    recipient: AztecAddress;
+    /** The contract address this note is created in. */
+    contractAddress: AztecAddress;
+    /** The specific storage location of the note on the contract. */
+    storageSlot: Fr;
+    /** The hash of the tx the note was created in. */
+    txHash: TxHash;
+    /** The nonce that was injected into the note hash preimage in order to guarantee uniqueness. */
+    noteNonce: Fr;
+    constructor(
+    /** The note as emitted from the Noir contract. */
+    note: Note, 
+    /** The recipient whose public key was used to encrypt the note. */
+    recipient: AztecAddress, 
+    /** The contract address this note is created in. */
+    contractAddress: AztecAddress, 
+    /** The specific storage location of the note on the contract. */
+    storageSlot: Fr, 
+    /** The hash of the tx the note was created in. */
+    txHash: TxHash, 
+    /** The nonce that was injected into the note hash preimage in order to guarantee uniqueness. */
+    noteNonce: Fr);
+    static get schema(): ZodFor<UniqueNote>;
+    toBuffer(): Buffer;
+    static random(): Promise<UniqueNote>;
+    static fromBuffer(buffer: Buffer | BufferReader): UniqueNote;
+    static fromString(str: string): UniqueNote;
+    toString(): `0x${string}`;
+}
+//# sourceMappingURL=unique_note.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"unique_note.d.ts","sourceRoot":"","sources":["../../src/note/unique_note.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAK9E,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC;;GAEG;AACH,qBAAa,UAAU;IAEnB,kDAAkD;IAC3C,IAAI,EAAE,IAAI;IACjB,mEAAmE;IAC5D,SAAS,EAAE,YAAY;IAC9B,oDAAoD;IAC7C,eAAe,EAAE,YAAY;IACpC,iEAAiE;IAC1D,WAAW,EAAE,EAAE;IACtB,kDAAkD;IAC3C,MAAM,EAAE,MAAM;IACrB,gGAAgG;IACzF,SAAS,EAAE,EAAE;;IAXpB,kDAAkD;IAC3C,IAAI,EAAE,IAAI;IACjB,mEAAmE;IAC5D,SAAS,EAAE,YAAY;IAC9B,oDAAoD;IAC7C,eAAe,EAAE,YAAY;IACpC,iEAAiE;IAC1D,WAAW,EAAE,EAAE;IACtB,kDAAkD;IAC3C,MAAM,EAAE,MAAM;IACrB,gGAAgG;IACzF,SAAS,EAAE,EAAE;IAGtB,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,UAAU,CAAC,CAatC;IAED,QAAQ,IAAI,MAAM;WAWL,MAAM;IAWnB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAa/C,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAI7B,QAAQ;CAGT"}

package/dest/note/{extended_note.js → unique_note.js}

@@ -7,63 +7,21 @@ import { schemas } from '../schemas/index.js';
 import { TxHash } from '../tx/tx_hash.js';
 import { Note } from './note.js';
 /**
- * A note with contextual data.
- */ export class ExtendedNote {
+ * A note with contextual data and a nonce that makes it unique.
+ */ export class UniqueNote {
     note;
     recipient;
     contractAddress;
     storageSlot;
     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){
+    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){
         this.note = note;
         this.recipient = recipient;
         this.contractAddress = contractAddress;
         this.storageSlot = storageSlot;
         this.txHash = txHash;
-    }
-    toBuffer() {
-        return serializeToBuffer([
-            this.note,
-            this.recipient,
-            this.contractAddress,
-            this.storageSlot,
-            this.txHash
-        ]);
-    }
-    static fromBuffer(buffer) {
-        const reader = BufferReader.asReader(buffer);
-        const note = reader.readObject(Note);
-        const recipient = reader.readObject(AztecAddress);
-        const contractAddress = reader.readObject(AztecAddress);
-        const storageSlot = reader.readObject(Fr);
-        const txHash = reader.readObject(TxHash);
-        return new this(note, recipient, contractAddress, storageSlot, txHash);
-    }
-    static get schema() {
-        return z.object({
-            note: Note.schema,
-            recipient: schemas.AztecAddress,
-            contractAddress: schemas.AztecAddress,
-            storageSlot: schemas.Fr,
-            txHash: TxHash.schema
-        }).transform(({ note, recipient, contractAddress, storageSlot, txHash })=>{
-            return new ExtendedNote(note, recipient, contractAddress, storageSlot, txHash);
-        });
-    }
-    toString() {
-        return bufferToHex(this.toBuffer());
-    }
-    static fromString(str) {
-        return ExtendedNote.fromBuffer(hexToBuffer(str));
-    }
-    static async random() {
-        return new ExtendedNote(Note.random(), await AztecAddress.random(), await AztecAddress.random(), Fr.random(), TxHash.random());
-    }
-}
-export class UniqueNote extends ExtendedNote {
-    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;
+        this.noteNonce = noteNonce;
     }
     static get schema() {
         return z.object({
@@ -98,9 +56,12 @@ export class UniqueNote extends ExtendedNote {
         const storageSlot = reader.readObject(Fr);
         const txHash = reader.readObject(TxHash);
         const noteNonce = reader.readObject(Fr);
-        return new this(note, recipient, contractAddress, storageSlot, txHash, noteNonce);
+        return new UniqueNote(note, recipient, contractAddress, storageSlot, txHash, noteNonce);
     }
     static fromString(str) {
         return UniqueNote.fromBuffer(hexToBuffer(str));
     }
+    toString() {
+        return bufferToHex(this.toBuffer());
+    }
 }

package/dest/p2p/block_attestation.d.ts

@@ -3,8 +3,7 @@ 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 ZodFor } from '../schemas/index.js';
-import type { UInt32 } from '../types/index.js';
+import type { ZodFor } from '../schemas/index.js';
 import { ConsensusPayload } from './consensus_payload.js';
 import { Gossipable } from './gossipable.js';
 import { TopicType } from './topic_type.js';
@@ -18,8 +17,6 @@ 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: UInt32;
     /** The payload of the message, and what the signature is over */
     readonly payload: ConsensusPayload;
     /** The signature of the block attester */
@@ -30,8 +27,6 @@ export declare class BlockAttestation extends Gossipable {
     private sender;
     private proposer;
     constructor(
-    /** The block number of the attestation. */
-    blockNumber: UInt32, 
     /** The payload of the message, and what the signature is over */
     payload: ConsensusPayload, 
     /** The signature of the block attester */
@@ -51,7 +46,7 @@ export declare class BlockAttestation extends Gossipable {
      * Lazily evaluate and cache the proposer of the block
      * @returns The proposer of the block
      */
-    getProposer(): EthAddress;
+    getProposer(): EthAddress | undefined;
     getPayload(): Buffer;
     toBuffer(): Buffer;
     static fromBuffer(buf: Buffer | BufferReader): BlockAttestation;
@@ -59,7 +54,6 @@ export declare class BlockAttestation extends Gossipable {
     static random(): BlockAttestation;
     getSize(): number;
     toInspect(): {
-        blockNumber: number;
         payload: {
             header: {
                 lastArchive: `0x${string}`;

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,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAI9E,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,qBAAqB,CAAC;AAC3D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,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,2CAA2C;aAC3B,WAAW,EAAE,MAAM;IAEnC,iEAAiE;aACjD,OAAO,EAAE,gBAAgB;IAEzC,0CAA0C;aAC1B,SAAS,EAAE,SAAS;IAEpC,4CAA4C;aAC5B,iBAAiB,EAAE,SAAS;IAhB9C,OAAgB,QAAQ,YAA+B;IAEvD,OAAO,CAAC,MAAM,CAAyB;IACvC,OAAO,CAAC,QAAQ,CAAyB;;IAGvC,2CAA2C;IAC3B,WAAW,EAAE,MAAM;IAEnC,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,CAS5C;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;IAWzB,UAAU,IAAI,MAAM;IAIpB,QAAQ,IAAI,MAAM;IAIlB,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,gBAAgB;IAU/D,MAAM,CAAC,KAAK,IAAI,gBAAgB;IAIhC,MAAM,CAAC,MAAM,IAAI,gBAAgB;IASjC,OAAO,IAAI,MAAM;IAIjB,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAQV"}
+{"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

@@ -3,7 +3,6 @@ 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 { schemas } from '../schemas/index.js';
 import { ConsensusPayload } from './consensus_payload.js';
 import { Gossipable } from './gossipable.js';
 import { SignatureDomainSeparator, getHashedSignaturePayloadEthSignedMessage } from './signature_utils.js';
@@ -19,23 +18,21 @@ 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;
     proposerSignature;
     static p2pTopic = TopicType.block_attestation;
     sender;
     proposer;
-    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, /** The signature from the block proposer */ proposerSignature){
-        super(), this.blockNumber = blockNumber, this.payload = payload, this.signature = signature, this.proposerSignature = proposerSignature;
+    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({
-            blockNumber: schemas.UInt32,
             payload: ConsensusPayload.schema,
             signature: Signature.schema,
             proposerSignature: Signature.schema
-        }).transform((obj)=>new BlockAttestation(obj.blockNumber, obj.payload, obj.signature, obj.proposerSignature));
+        }).transform((obj)=>new BlockAttestation(obj.payload, obj.signature, obj.proposerSignature));
     }
     generateP2PMessageIdentifier() {
         return Promise.resolve(new BlockAttestationHash(keccak256(this.signature.toBuffer())));
@@ -75,7 +72,6 @@ export class BlockAttestationHash extends Buffer32 {
     }
     toBuffer() {
         return serializeToBuffer([
-            this.blockNumber,
             this.payload,
             this.signature,
             this.proposerSignature
@@ -83,20 +79,19 @@ export class BlockAttestationHash extends Buffer32 {
     }
     static fromBuffer(buf) {
         const reader = BufferReader.asReader(buf);
-        return new BlockAttestation(reader.readNumber(), reader.readObject(ConsensusPayload), reader.readObject(Signature), reader.readObject(Signature));
+        return new BlockAttestation(reader.readObject(ConsensusPayload), reader.readObject(Signature), reader.readObject(Signature));
     }
     static empty() {
-        return new BlockAttestation(0, ConsensusPayload.empty(), Signature.empty(), Signature.empty());
+        return new BlockAttestation(ConsensusPayload.empty(), Signature.empty(), Signature.empty());
     }
     static random() {
-        return new BlockAttestation(Math.floor(Math.random() * 1000) + 1, ConsensusPayload.random(), Signature.random(), Signature.random());
+        return new BlockAttestation(ConsensusPayload.random(), Signature.random(), Signature.random());
     }
     getSize() {
-        return 4 /* blockNumber */  + this.payload.getSize() + this.signature.getSize() + this.proposerSignature.getSize();
+        return this.payload.getSize() + this.signature.getSize() + this.proposerSignature.getSize();
     }
     toInspect() {
         return {
-            blockNumber: this.blockNumber,
             payload: this.payload.toInspect(),
             signature: this.signature.toString(),
             proposerSignature: this.proposerSignature.toString()

package/dest/p2p/block_proposal.d.ts

@@ -6,7 +6,6 @@ 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 type { UInt32 } from '../types/index.js';
 import { ConsensusPayload } from './consensus_payload.js';
 import { Gossipable } from './gossipable.js';
 import { TopicType } from './topic_type.js';
@@ -25,8 +24,6 @@ export type BlockProposalOptions = {
  * be included in the head of the chain
  */
 export declare class BlockProposal extends Gossipable {
-    /** The number of the block */
-    readonly blockNumber: UInt32;
     /** 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*/
@@ -38,8 +35,6 @@ export declare class BlockProposal extends Gossipable {
     static p2pTopic: TopicType;
     private sender;
     constructor(
-    /** The number of the block */
-    blockNumber: UInt32, 
     /** 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*/
@@ -51,8 +46,8 @@ export declare class BlockProposal extends Gossipable {
     generateP2PMessageIdentifier(): Promise<Buffer32>;
     get archive(): Fr;
     get slotNumber(): Fr;
-    toBlockInfo(): L2BlockInfo;
-    static createProposalFromSigner(blockNumber: UInt32, payload: ConsensusPayload, txHashes: TxHash[], txs: Tx[] | undefined, 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

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,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,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,8BAA8B;aACd,WAAW,EAAE,MAAM;IAEnC,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;IAnB5B,OAAgB,QAAQ,YAA4B;IAEpD,OAAO,CAAC,MAAM,CAAyB;;IAGrC,8BAA8B;IACd,WAAW,EAAE,MAAM;IAEnC,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,WAAW;WAWb,wBAAwB,CACnC,WAAW,EAAE,MAAM,EACnB,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;IAgB5D,OAAO,IAAI,MAAM;CAUlB"}
+{"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"}

package/dest/p2p/block_proposal.js

@@ -19,16 +19,15 @@ 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;
     txHashes;
     txs;
     static p2pTopic = TopicType.block_proposal;
     sender;
-    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, /** 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
+    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.blockNumber = blockNumber, this.payload = payload, this.signature = signature, this.txHashes = txHashes, this.txs = txs;
+        super(), this.payload = payload, this.signature = signature, this.txHashes = txHashes, this.txs = txs;
     }
     generateP2PMessageIdentifier() {
         return Promise.resolve(new BlockProposalHash(keccak256(this.signature.toBuffer())));
@@ -41,7 +40,6 @@ export class BlockProposalHash extends Buffer32 {
     }
     toBlockInfo() {
         return {
-            blockNumber: this.blockNumber,
             slotNumber: this.slotNumber.toNumber(),
             lastArchive: this.payload.header.lastArchiveRoot,
             timestamp: this.payload.header.timestamp,
@@ -49,11 +47,11 @@ export class BlockProposalHash extends Buffer32 {
             txCount: this.txHashes.length
         };
     }
-    static async createProposalFromSigner(blockNumber, payload, txHashes, // Note(md): Provided separately to tx hashes such that this function can be optional
+    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(blockNumber, payload, sig, txHashes, txs);
+        return new BlockProposal(payload, sig, txHashes, txs);
     }
     /**Get Sender
    * Lazily evaluate the sender of the proposal; result is cached
@@ -71,7 +69,6 @@ export class BlockProposalHash extends Buffer32 {
     }
     toBuffer() {
         const buffer = [
-            this.blockNumber,
             this.payload,
             this.signature,
             this.txHashes.length,
@@ -85,17 +82,16 @@ export class BlockProposalHash extends Buffer32 {
     }
     static fromBuffer(buf) {
         const reader = BufferReader.asReader(buf);
-        const blockNumber = reader.readNumber();
         const payload = reader.readObject(ConsensusPayload);
         const sig = reader.readObject(Signature);
         const txHashes = reader.readArray(reader.readNumber(), TxHash);
         if (!reader.isEmpty()) {
             const txs = reader.readArray(reader.readNumber(), Tx);
-            return new BlockProposal(blockNumber, payload, sig, txHashes, txs);
+            return new BlockProposal(payload, sig, txHashes, txs);
         }
-        return new BlockProposal(blockNumber, payload, sig, txHashes);
+        return new BlockProposal(payload, sig, txHashes);
     }
     getSize() {
-        return 4 /* blockNumber */  + 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.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);
     }
 }

package/dest/parity/parity_base_private_inputs.d.ts

@@ -1,4 +1,4 @@
-import { type NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, NUM_MSGS_PER_BASE_PARITY } from '@aztec/constants';
+import { NUM_MSGS_PER_BASE_PARITY } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, type Tuple } from '@aztec/foundation/serialize';
 export declare class ParityBasePrivateInputs {
@@ -11,7 +11,7 @@ export declare class ParityBasePrivateInputs {
     msgs: Tuple<Fr, typeof NUM_MSGS_PER_BASE_PARITY>, 
     /** Root of the VK tree */
     vkTreeRoot: Fr);
-    static fromSlice(array: Tuple<Fr, typeof NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP>, index: number, vkTreeRoot: Fr): ParityBasePrivateInputs;
+    static fromSlice(array: Fr[], index: number, vkTreeRoot: Fr): ParityBasePrivateInputs;
     /** Serializes the inputs to a buffer. */
     toBuffer(): Buffer<ArrayBufferLike>;
     /** Serializes the inputs to a hex string. */

package/dest/parity/parity_base_private_inputs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parity_base_private_inputs.d.ts","sourceRoot":"","sources":["../../src/parity/parity_base_private_inputs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,mCAAmC,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AACtG,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,KAAK,KAAK,EAAqB,MAAM,6BAA6B,CAAC;AAG1F,qBAAa,uBAAuB;IAEhC,6DAA6D;aAC7C,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,wBAAwB,CAAC;IAChE,0BAA0B;aACV,UAAU,EAAE,EAAE;;IAH9B,6DAA6D;IAC7C,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,wBAAwB,CAAC;IAChE,0BAA0B;IACV,UAAU,EAAE,EAAE;WAGlB,SAAS,CACrB,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,mCAAmC,CAAC,EAC5D,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,EAAE,GACb,uBAAuB;IAO1B,yCAAyC;IACzC,QAAQ;IAIR,6CAA6C;IAC7C,QAAQ;IAIR;;;OAGG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAK/C;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAI7B,8DAA8D;IAC9D,MAAM;IAIN,6CAA6C;IAC7C,MAAM,KAAK,MAAM,gEAEhB;CACF"}
+{"version":3,"file":"parity_base_private_inputs.d.ts","sourceRoot":"","sources":["../../src/parity/parity_base_private_inputs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuC,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AACjG,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,KAAK,KAAK,EAAqB,MAAM,6BAA6B,CAAC;AAG1F,qBAAa,uBAAuB;IAEhC,6DAA6D;aAC7C,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,wBAAwB,CAAC;IAChE,0BAA0B;aACV,UAAU,EAAE,EAAE;;IAH9B,6DAA6D;IAC7C,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,wBAAwB,CAAC;IAChE,0BAA0B;IACV,UAAU,EAAE,EAAE;WAGlB,SAAS,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,GAAG,uBAAuB;IAa5F,yCAAyC;IACzC,QAAQ;IAIR,6CAA6C;IAC7C,QAAQ;IAIR;;;OAGG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAK/C;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAI7B,8DAA8D;IAC9D,MAAM;IAIN,6CAA6C;IAC7C,MAAM,KAAK,MAAM,gEAEhB;CACF"}

package/dest/parity/parity_base_private_inputs.js

@@ -1,4 +1,4 @@
-import { NUM_MSGS_PER_BASE_PARITY } from '@aztec/constants';
+import { NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, NUM_MSGS_PER_BASE_PARITY } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
 import { bufferSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
@@ -11,6 +11,10 @@ export class ParityBasePrivateInputs {
         this.vkTreeRoot = vkTreeRoot;
     }
     static fromSlice(array, index, vkTreeRoot) {
+        // Can't use Tuple<Fr, typeof NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP> due to length
+        if (array.length !== NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP) {
+            throw new Error(`Msgs array length must be NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP=${NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP}`);
+        }
         const start = index * NUM_MSGS_PER_BASE_PARITY;
         const end = start + NUM_MSGS_PER_BASE_PARITY;
         const msgs = array.slice(start, end);

package/dest/rollup/block_root_rollup_private_inputs.d.ts

@@ -53,7 +53,7 @@ export declare class BlockRootFirstRollupPrivateInputs {
      */
     newArchiveSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>);
     static from(fields: FieldsOf<BlockRootFirstRollupPrivateInputs>): BlockRootFirstRollupPrivateInputs;
-    static getFields(fields: FieldsOf<BlockRootFirstRollupPrivateInputs>): readonly [UltraHonkProofData<ParityPublicInputs>, [RollupHonkProofData<TxRollupPublicInputs>, RollupHonkProofData<TxRollupPublicInputs>], AppendOnlyTreeSnapshot, [Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr], [Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr]];
+    static getFields(fields: FieldsOf<BlockRootFirstRollupPrivateInputs>): readonly [UltraHonkProofData<ParityPublicInputs>, [RollupHonkProofData<TxRollupPublicInputs>, RollupHonkProofData<TxRollupPublicInputs>], AppendOnlyTreeSnapshot, [Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr], [Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr]];
     toBuffer(): Buffer<ArrayBufferLike>;
     static fromBuffer(buffer: Buffer | BufferReader): BlockRootFirstRollupPrivateInputs;
     toJSON(): Buffer<ArrayBufferLike>;
@@ -102,7 +102,7 @@ export declare class BlockRootSingleTxFirstRollupPrivateInputs {
      */
     newArchiveSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>);
     static from(fields: FieldsOf<BlockRootSingleTxFirstRollupPrivateInputs>): BlockRootSingleTxFirstRollupPrivateInputs;
-    static getFields(fields: FieldsOf<BlockRootSingleTxFirstRollupPrivateInputs>): readonly [UltraHonkProofData<ParityPublicInputs>, RollupHonkProofData<TxRollupPublicInputs>, AppendOnlyTreeSnapshot, [Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr], [Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr]];
+    static getFields(fields: FieldsOf<BlockRootSingleTxFirstRollupPrivateInputs>): readonly [UltraHonkProofData<ParityPublicInputs>, RollupHonkProofData<TxRollupPublicInputs>, AppendOnlyTreeSnapshot, [Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr], [Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr]];
     toBuffer(): Buffer<ArrayBufferLike>;
     static fromBuffer(buffer: Buffer | BufferReader): BlockRootSingleTxFirstRollupPrivateInputs;
     toJSON(): Buffer<ArrayBufferLike>;
@@ -177,7 +177,7 @@ export declare class BlockRootEmptyTxFirstRollupPrivateInputs {
      */
     newArchiveSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>);
     static from(fields: FieldsOf<BlockRootEmptyTxFirstRollupPrivateInputs>): BlockRootEmptyTxFirstRollupPrivateInputs;
-    static getFields(fields: FieldsOf<BlockRootEmptyTxFirstRollupPrivateInputs>): readonly [UltraHonkProofData<ParityPublicInputs>, AppendOnlyTreeSnapshot, StateReference, CheckpointConstantData, SpongeBlob, bigint, [Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr], [Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr]];
+    static getFields(fields: FieldsOf<BlockRootEmptyTxFirstRollupPrivateInputs>): readonly [UltraHonkProofData<ParityPublicInputs>, AppendOnlyTreeSnapshot, StateReference, CheckpointConstantData, SpongeBlob, bigint, [Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr], [Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr]];
     toBuffer(): Buffer<ArrayBufferLike>;
     static fromBuffer(buffer: Buffer | BufferReader): BlockRootEmptyTxFirstRollupPrivateInputs;
     toJSON(): Buffer<ArrayBufferLike>;

package/dest/tests/mocks.d.ts

@@ -9,7 +9,7 @@ import { PublishedL2Block } from '../block/published_l2_block.js';
 import type { ContractInstanceWithAddress } from '../contract/index.js';
 import { Gas } from '../gas/gas.js';
 import { GasFees } from '../gas/gas_fees.js';
-import { ExtendedNote, UniqueNote } from '../note/extended_note.js';
+import { UniqueNote } from '../note/unique_note.js';
 import { BlockAttestation } from '../p2p/block_attestation.js';
 import { BlockProposal } from '../p2p/block_proposal.js';
 import { ClientIvcProof } from '../proofs/client_ivc_proof.js';
@@ -17,7 +17,6 @@ import { StateReference, Tx } from '../tx/index.js';
 import { TxSimulationResult } from '../tx/simulated_tx.js';
 import { TxHash } from '../tx/tx_hash.js';
 export declare const randomTxHash: () => TxHash;
-export declare const randomExtendedNote: ({ note, recipient, contractAddress, txHash, storageSlot, }?: Partial<ExtendedNote>) => Promise<ExtendedNote>;
 export declare const randomUniqueNote: ({ note, recipient, contractAddress, txHash, storageSlot, noteNonce, }?: Partial<UniqueNote>) => Promise<UniqueNote>;
 export declare const mockTx: (seed?: number, { numberOfNonRevertiblePublicCallRequests, numberOfRevertiblePublicCallRequests, numberOfRevertibleNullifiers, hasPublicTeardownCallRequest, publicCalldataSize, feePayer, clientIvcProof, maxPriorityFeesPerGas, gasUsed, chainId, version, vkTreeRoot, protocolContractsHash, }?: {
     numberOfNonRevertiblePublicCallRequests?: number;