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

package/dest/tests/mocks.js

@@ -152,7 +152,7 @@ export const makeAndSignCommitteeAttestationsAndSigners = (attestationsAndSigner
     return signer.sign(hash);
 };
 export const makeBlockProposal = (options)=>{
-    const { blockNumber, payload, signature } = makeAndSignConsensusPayload(SignatureDomainSeparator.blockProposal, options);
+    const { payload, signature } = makeAndSignConsensusPayload(SignatureDomainSeparator.blockProposal, options);
     const txHashes = options?.txHashes ?? [
         0,
         1,
@@ -161,7 +161,7 @@ export const makeBlockProposal = (options)=>{
         4,
         5
     ].map(()=>TxHash.random());
-    return new BlockProposal(blockNumber, payload, signature, txHashes, options?.txs ?? []);
+    return new BlockProposal(payload, signature, txHashes, options?.txs ?? []);
 };
 // TODO(https://github.com/AztecProtocol/aztec-packages/issues/8028)
 export const makeBlockAttestation = (options)=>{
@@ -178,7 +178,7 @@ export const makeBlockAttestation = (options)=>{
     // Sign as proposer
     const proposalHash = getHashedSignaturePayloadEthSignedMessage(payload, SignatureDomainSeparator.blockProposal);
     const proposerSignature = proposerSigner.sign(proposalHash);
-    return new BlockAttestation(header.globalVariables.blockNumber, payload, attestationSignature, proposerSignature);
+    return new BlockAttestation(payload, attestationSignature, proposerSignature);
 };
 export const makeBlockAttestationFromBlock = (block, attesterSigner, proposerSigner)=>{
     const header = block.header;
@@ -197,7 +197,7 @@ export const makeBlockAttestationFromBlock = (block, attesterSigner, proposerSig
     const proposalHash = getHashedSignaturePayloadEthSignedMessage(payload, SignatureDomainSeparator.blockProposal);
     const proposalSignerToUse = proposerSigner ?? Secp256k1Signer.random();
     const proposerSignature = proposalSignerToUse.sign(proposalHash);
-    return new BlockAttestation(header.globalVariables.blockNumber, payload, attestationSignature, proposerSignature);
+    return new BlockAttestation(payload, attestationSignature, proposerSignature);
 };
 export async function randomPublishedL2Block(l2BlockNumber, opts = {}) {
     const block = await L2Block.random(l2BlockNumber);

package/dest/world-state/index.d.ts

@@ -0,0 +1,2 @@
+export * from './world_state_revision.js';
+//# sourceMappingURL=index.d.ts.map

package/dest/world-state/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/world-state/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC"}

package/dest/world-state/index.js

@@ -0,0 +1 @@
+export * from './world_state_revision.js';

package/dest/world-state/world_state_revision.d.ts

@@ -0,0 +1,22 @@
+import { z } from 'zod';
+export declare class WorldStateRevision {
+    readonly forkId: number;
+    readonly blockNumber: number;
+    readonly includeUncommitted: boolean;
+    constructor(forkId: number, blockNumber: number, includeUncommitted: boolean);
+    static empty(): WorldStateRevision;
+    static get schema(): z.ZodObject<{
+        forkId: z.ZodNumber;
+        blockNumber: z.ZodNumber;
+        includeUncommitted: z.ZodBoolean;
+    }, "strip", z.ZodTypeAny, {
+        blockNumber: number;
+        forkId: number;
+        includeUncommitted: boolean;
+    }, {
+        blockNumber: number;
+        forkId: number;
+        includeUncommitted: boolean;
+    }>;
+}
+//# sourceMappingURL=world_state_revision.d.ts.map

package/dest/world-state/world_state_revision.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"world_state_revision.d.ts","sourceRoot":"","sources":["../../src/world-state/world_state_revision.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,qBAAa,kBAAkB;aAEX,MAAM,EAAE,MAAM;aACd,WAAW,EAAE,MAAM;aACnB,kBAAkB,EAAE,OAAO;gBAF3B,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,kBAAkB,EAAE,OAAO;IAG7C,MAAM,CAAC,KAAK;IAIZ,MAAM,KAAK,MAAM;;;;;;;;;;;;OAMhB;CACF"}

package/dest/world-state/world_state_revision.js

@@ -0,0 +1,21 @@
+import { z } from 'zod';
+export class WorldStateRevision {
+    forkId;
+    blockNumber;
+    includeUncommitted;
+    constructor(forkId, blockNumber, includeUncommitted){
+        this.forkId = forkId;
+        this.blockNumber = blockNumber;
+        this.includeUncommitted = includeUncommitted;
+    }
+    static empty() {
+        return new WorldStateRevision(0, 0, false);
+    }
+    static get schema() {
+        return z.object({
+            forkId: z.number(),
+            blockNumber: z.number(),
+            includeUncommitted: z.boolean()
+        });
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/stdlib",
-  "version": "3.0.0-nightly.20251024",
+  "version": "3.0.0-nightly.20251025",
   "type": "module",
   "inherits": [
     "../package.common.json",
@@ -52,7 +52,8 @@
     "./update-checker": "./dest/update-checker/index.js",
     "./zkpassport": "./dest/zkpassport/index.js",
     "./slashing": "./dest/slashing/index.js",
-    "./l1-contracts": "./dest/l1-contracts/index.js"
+    "./l1-contracts": "./dest/l1-contracts/index.js",
+    "./world-state": "./dest/world-state/index.js"
   },
   "typedocOptions": {
     "entryPoints": [
@@ -70,13 +71,13 @@
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.892.0",
-    "@aztec/bb.js": "3.0.0-nightly.20251024",
-    "@aztec/blob-lib": "3.0.0-nightly.20251024",
-    "@aztec/constants": "3.0.0-nightly.20251024",
-    "@aztec/ethereum": "3.0.0-nightly.20251024",
-    "@aztec/foundation": "3.0.0-nightly.20251024",
-    "@aztec/l1-artifacts": "3.0.0-nightly.20251024",
-    "@aztec/noir-noirc_abi": "3.0.0-nightly.20251024",
+    "@aztec/bb.js": "3.0.0-nightly.20251025",
+    "@aztec/blob-lib": "3.0.0-nightly.20251025",
+    "@aztec/constants": "3.0.0-nightly.20251025",
+    "@aztec/ethereum": "3.0.0-nightly.20251025",
+    "@aztec/foundation": "3.0.0-nightly.20251025",
+    "@aztec/l1-artifacts": "3.0.0-nightly.20251025",
+    "@aztec/noir-noirc_abi": "3.0.0-nightly.20251025",
     "@google-cloud/storage": "^7.15.0",
     "axios": "^1.12.0",
     "json-stringify-deterministic": "1.0.12",

package/src/avm/index.ts

@@ -9,3 +9,4 @@ export * from './contract_storage_read.js';
 export * from './public_inner_call_request.js';
 export * from './public_call_stack_item_compressed.js';
 export * from './avm_proving_request.js';
+export * from './message_pack.js';

package/src/avm/message_pack.ts

@@ -2,7 +2,7 @@ import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fq, Fr, Point } from '@aztec/foundation/fields';
 
 import { strict as assert } from 'assert';
-import { Encoder, addExtension } from 'msgpackr';
+import { Decoder, Encoder, addExtension } from 'msgpackr';
 
 import { AztecAddress } from '../aztec-address/index.js';
 
@@ -18,6 +18,16 @@ export function serializeWithMessagePack(obj: any): Buffer {
   return encoder.encode(obj);
 }
 
+export function deserializeFromMessagePack<T>(buffer: Buffer): T {
+  setUpMessagePackExtensions();
+  const decoder = new Decoder({
+    useRecords: false,
+    int64AsType: 'bigint',
+    largeBigIntToString: true,
+  });
+  return decoder.decode(buffer);
+}
+
 let messagePackWasSetUp = false;
 function setUpMessagePackExtensions() {
   if (messagePackWasSetUp) {
@@ -27,15 +37,24 @@ function setUpMessagePackExtensions() {
   addExtension({
     Class: Fr,
     write: (fr: Fr) => fr.toBuffer(),
+    read: (data: Buffer) => Fr.fromBuffer(data),
   });
   addExtension({
     Class: Fq,
     write: (fq: Fq) => fq.toBuffer(),
+    read: (data: Buffer) => Fq.fromBuffer(data),
   });
   // AztecAddress is a class that has a field in TS, but is itself a field in C++.
   addExtension({
     Class: AztecAddress,
     write: (addr: AztecAddress) => addr.toField(),
+    read: (data: Fr | Buffer) => {
+      // If C++ sent it as Fr, wrap it. If as buffer, construct from buffer.
+      if (data instanceof Fr) {
+        return new AztecAddress(data);
+      }
+      return new AztecAddress(Fr.fromBuffer(data));
+    },
   });
   // Affine points are a mess, we do our best.
   addExtension({
@@ -45,11 +64,16 @@ function setUpMessagePackExtensions() {
       // TODO: should these be Frs?
       return { x: new Fq(p.x.toBigInt()), y: new Fq(p.y.toBigInt()) };
     },
+    read: (data: { x: Fq; y: Fq }) => {
+      // Convert Fq back to Fr for Point constructor
+      return new Point(new Fr(data.x.toBigInt()), new Fr(data.y.toBigInt()), false);
+    },
   });
   // EthAddress is a class that has a buffer in TS, but is itself just a field in C++.
   addExtension({
     Class: EthAddress,
     write: (addr: EthAddress) => addr.toField().toBuffer(),
+    read: (data: Buffer) => EthAddress.fromField(Fr.fromBuffer(data)),
   });
   messagePackWasSetUp = true;
 }

package/src/block/l2_block_source.ts

@@ -1,4 +1,5 @@
 import type { EthAddress } from '@aztec/foundation/eth-address';
+import type { Fr } from '@aztec/foundation/fields';
 import type { TypedEventEmitter } from '@aztec/foundation/types';
 
 import { z } from 'zod';
@@ -66,6 +67,34 @@ export interface L2BlockSource {
   /** Equivalent to getBlocks but includes publish data. */
   getPublishedBlocks(from: number, limit: number, proven?: boolean): Promise<PublishedL2Block[]>;
 
+  /**
+   * Gets a published block by its hash.
+   * @param blockHash - The block hash to retrieve.
+   * @returns The requested published block (or undefined if not found).
+   */
+  getPublishedBlockByHash(blockHash: Fr): Promise<PublishedL2Block | undefined>;
+
+  /**
+   * Gets a published block by its archive root.
+   * @param archive - The archive root to retrieve.
+   * @returns The requested published block (or undefined if not found).
+   */
+  getPublishedBlockByArchive(archive: Fr): Promise<PublishedL2Block | undefined>;
+
+  /**
+   * Gets a block header by its hash.
+   * @param blockHash - The block hash to retrieve.
+   * @returns The requested block header (or undefined if not found).
+   */
+  getBlockHeaderByHash(blockHash: Fr): Promise<BlockHeader | undefined>;
+
+  /**
+   * Gets a block header by its archive root.
+   * @param archive - The archive root to retrieve.
+   * @returns The requested block header (or undefined if not found).
+   */
+  getBlockHeaderByArchive(archive: Fr): Promise<BlockHeader | undefined>;
+
   /**
    * Gets a tx effect.
    * @param txHash - The hash of the tx corresponding to the tx effect.
@@ -120,6 +149,9 @@ export interface L2BlockSource {
    */
   getL1Constants(): Promise<L1RollupConstants>;
 
+  /** Returns values for the genesis block */
+  getGenesisValues(): Promise<{ genesisArchiveRoot: Fr }>;
+
   /** Latest synced L1 timestamp. */
   getL1Timestamp(): Promise<bigint>;
 

package/src/interfaces/archiver.ts

@@ -44,7 +44,7 @@ export type ArchiverSpecificConfig = {
   /** The max number of logs that can be obtained in 1 "getPublicLogs" call. */
   maxLogs?: number;
 
-  /** The maximum possible size of the archiver DB in KB. Overwrites the general dataStoreMapSizeKB. */
+  /** The maximum possible size of the archiver DB in KB. Overwrites the general dataStoreMapSizeKb. */
   archiverStoreMapSizeKb?: number;
 
   /** Whether to skip validating block attestations (use only for testing). */
@@ -83,6 +83,10 @@ export const ArchiverApiSchema: ApiSchemaFor<ArchiverApi> = {
     .function()
     .args(schemas.Integer, schemas.Integer, optional(z.boolean()))
     .returns(z.array(PublishedL2Block.schema)),
+  getPublishedBlockByHash: z.function().args(schemas.Fr).returns(PublishedL2Block.schema.optional()),
+  getPublishedBlockByArchive: z.function().args(schemas.Fr).returns(PublishedL2Block.schema.optional()),
+  getBlockHeaderByHash: z.function().args(schemas.Fr).returns(BlockHeader.schema.optional()),
+  getBlockHeaderByArchive: z.function().args(schemas.Fr).returns(BlockHeader.schema.optional()),
   getTxEffect: z.function().args(TxHash.schema).returns(indexedTxSchema().optional()),
   getSettledTxReceipt: z.function().args(TxHash.schema).returns(TxReceipt.schema.optional()),
   getL2SlotNumber: z.function().args().returns(schemas.BigInt),
@@ -110,6 +114,10 @@ export const ArchiverApiSchema: ApiSchemaFor<ArchiverApi> = {
   getL1ToL2MessageIndex: z.function().args(schemas.Fr).returns(schemas.BigInt.optional()),
   getDebugFunctionName: z.function().args(schemas.AztecAddress, schemas.FunctionSelector).returns(optional(z.string())),
   getL1Constants: z.function().args().returns(L1RollupConstantsSchema),
+  getGenesisValues: z
+    .function()
+    .args()
+    .returns(z.object({ genesisArchiveRoot: schemas.Fr })),
   getL1Timestamp: z.function().args().returns(schemas.BigInt),
   syncImmediate: z.function().args().returns(z.void()),
   isPendingChainInvalid: z.function().args().returns(z.boolean()),

package/src/interfaces/aztec-node.ts

@@ -225,6 +225,20 @@ export interface AztecNode
    */
   getBlock(number: L2BlockNumber): Promise<L2Block | undefined>;
 
+  /**
+   * Get a block specified by its hash.
+   * @param blockHash - The block hash being requested.
+   * @returns The requested block.
+   */
+  getBlockByHash(blockHash: Fr): Promise<L2Block | undefined>;
+
+  /**
+   * Get a block specified by its archive root.
+   * @param archive - The archive root being requested.
+   * @returns The requested block.
+   */
+  getBlockByArchive(archive: Fr): Promise<L2Block | undefined>;
+
   /**
    * Method to fetch the latest block number synchronized by the node.
    * @returns The block number.
@@ -400,6 +414,20 @@ export interface AztecNode
    */
   getBlockHeader(blockNumber?: L2BlockNumber): Promise<BlockHeader | undefined>;
 
+  /**
+   * Get a block header specified by its hash.
+   * @param blockHash - The block hash being requested.
+   * @returns The requested block header.
+   */
+  getBlockHeaderByHash(blockHash: Fr): Promise<BlockHeader | undefined>;
+
+  /**
+   * Get a block header specified by its archive root.
+   * @param archive - The archive root being requested.
+   * @returns The requested block header.
+   */
+  getBlockHeaderByArchive(archive: Fr): Promise<BlockHeader | undefined>;
+
   /** Returns stats for validators if enabled. */
   getValidatorsStats(): Promise<ValidatorsStats>;
 
@@ -523,6 +551,10 @@ export const AztecNodeApiSchema: ApiSchemaFor<AztecNode> = {
 
   getBlock: z.function().args(L2BlockNumberSchema).returns(L2Block.schema.optional()),
 
+  getBlockByHash: z.function().args(schemas.Fr).returns(L2Block.schema.optional()),
+
+  getBlockByArchive: z.function().args(schemas.Fr).returns(L2Block.schema.optional()),
+
   getBlockNumber: z.function().returns(z.number()),
 
   getProvenBlockNumber: z.function().returns(z.number()),
@@ -596,6 +628,10 @@ export const AztecNodeApiSchema: ApiSchemaFor<AztecNode> = {
 
   getBlockHeader: z.function().args(optional(L2BlockNumberSchema)).returns(BlockHeader.schema.optional()),
 
+  getBlockHeaderByHash: z.function().args(schemas.Fr).returns(BlockHeader.schema.optional()),
+
+  getBlockHeaderByArchive: z.function().args(schemas.Fr).returns(BlockHeader.schema.optional()),
+
   getValidatorsStats: z.function().returns(ValidatorsStatsSchema),
 
   getValidatorStats: z

package/src/interfaces/merkle_tree_operations.ts

@@ -7,6 +7,7 @@ import type { NullifierLeaf } from '../trees/nullifier_leaf.js';
 import type { PublicDataTreeLeaf } from '../trees/public_data_leaf.js';
 import type { BlockHeader } from '../tx/block_header.js';
 import type { StateReference } from '../tx/state_reference.js';
+import type { WorldStateRevision } from '../world-state/world_state_revision.js';
 
 /**
  * Type alias for the nullifier tree ID.
@@ -132,6 +133,11 @@ export interface MerkleTreeReadOperations {
    */
   getInitialHeader(): BlockHeader;
 
+  /**
+   * Gets the current revision.
+   */
+  getRevision(): WorldStateRevision;
+
   /**
    * Gets sibling path for a leaf.
    * @param treeId - The tree to be queried for a sibling path.

package/src/interfaces/tx_provider.ts

@@ -9,6 +9,7 @@ export interface ITxProvider {
 
   getTxsForBlockProposal(
     blockProposal: BlockProposal,
+    blockNumber: number,
     opts: { pinnedPeer: PeerId | undefined; deadline: Date },
   ): Promise<{ txs: Tx[]; missingTxs: TxHash[] }>;
 

package/src/p2p/block_attestation.ts

@@ -7,8 +7,7 @@ import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
 import { z } from 'zod';
 
-import { type ZodFor, schemas } 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 { SignatureDomainSeparator, getHashedSignaturePayloadEthSignedMessage } from './signature_utils.js';
@@ -33,9 +32,6 @@ export class BlockAttestation extends Gossipable {
   private proposer: EthAddress | undefined;
 
   constructor(
-    /** The block number of the attestation. */
-    public readonly blockNumber: UInt32,
-
     /** The payload of the message, and what the signature is over */
     public readonly payload: ConsensusPayload,
 
@@ -51,12 +47,11 @@ export class BlockAttestation extends Gossipable {
   static get schema(): ZodFor<BlockAttestation> {
     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));
   }
 
   override generateP2PMessageIdentifier(): Promise<Buffer32> {
@@ -90,12 +85,12 @@ export class BlockAttestation extends Gossipable {
    * Lazily evaluate and cache the proposer of the block
    * @returns The proposer of the block
    */
-  getProposer(): EthAddress {
+  getProposer(): EthAddress | undefined {
     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)!;
+      this.proposer = tryRecoverAddress(hashed, this.proposerSignature);
     }
 
     return this.proposer;
@@ -106,13 +101,12 @@ export class BlockAttestation extends Gossipable {
   }
 
   toBuffer(): Buffer {
-    return serializeToBuffer([this.blockNumber, this.payload, this.signature, this.proposerSignature]);
+    return serializeToBuffer([this.payload, this.signature, this.proposerSignature]);
   }
 
   static fromBuffer(buf: Buffer | BufferReader): BlockAttestation {
     const reader = BufferReader.asReader(buf);
     return new BlockAttestation(
-      reader.readNumber(),
       reader.readObject(ConsensusPayload),
       reader.readObject(Signature),
       reader.readObject(Signature),
@@ -120,25 +114,19 @@ export class BlockAttestation extends Gossipable {
   }
 
   static empty(): BlockAttestation {
-    return new BlockAttestation(0, ConsensusPayload.empty(), Signature.empty(), Signature.empty());
+    return new BlockAttestation(ConsensusPayload.empty(), Signature.empty(), Signature.empty());
   }
 
   static random(): BlockAttestation {
-    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(): number {
-    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/src/p2p/block_proposal.ts

@@ -8,7 +8,6 @@ import { BufferReader, serializeToBuffer } 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 {
@@ -42,9 +41,6 @@ export class BlockProposal extends Gossipable {
   private sender: EthAddress | undefined;
 
   constructor(
-    /** The number of the block */
-    public readonly blockNumber: UInt32,
-
     /** The payload of the message, and what the signature is over */
     public readonly payload: ConsensusPayload,
 
@@ -73,9 +69,8 @@ export class BlockProposal extends Gossipable {
     return this.payload.header.slotNumber;
   }
 
-  toBlockInfo(): L2BlockInfo {
+  toBlockInfo(): Omit<L2BlockInfo, 'blockNumber'> {
     return {
-      blockNumber: this.blockNumber,
       slotNumber: this.slotNumber.toNumber(),
       lastArchive: this.payload.header.lastArchiveRoot,
       timestamp: this.payload.header.timestamp,
@@ -85,7 +80,6 @@ export class BlockProposal extends Gossipable {
   }
 
   static async createProposalFromSigner(
-    blockNumber: UInt32,
     payload: ConsensusPayload,
     txHashes: TxHash[],
     // Note(md): Provided separately to tx hashes such that this function can be optional
@@ -95,7 +89,7 @@ export class BlockProposal extends Gossipable {
     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
@@ -117,7 +111,7 @@ export class BlockProposal extends Gossipable {
   }
 
   toBuffer(): Buffer {
-    const buffer: any[] = [this.blockNumber, this.payload, this.signature, this.txHashes.length, this.txHashes];
+    const buffer: any[] = [this.payload, this.signature, this.txHashes.length, this.txHashes];
     if (this.txs) {
       buffer.push(this.txs.length);
       buffer.push(this.txs);
@@ -128,22 +122,20 @@ export class BlockProposal extends Gossipable {
   static fromBuffer(buf: Buffer | BufferReader): BlockProposal {
     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(): number {
     return (
-      4 /* blockNumber */ +
       this.payload.getSize() +
       this.signature.getSize() +
       4 /* txHashes.length */ +

package/src/tests/mocks.ts

@@ -270,12 +270,9 @@ export const makeAndSignCommitteeAttestationsAndSigners = (
 };
 
 export const makeBlockProposal = (options?: MakeConsensusPayloadOptions): BlockProposal => {
-  const { blockNumber, payload, signature } = makeAndSignConsensusPayload(
-    SignatureDomainSeparator.blockProposal,
-    options,
-  );
+  const { payload, signature } = makeAndSignConsensusPayload(SignatureDomainSeparator.blockProposal, options);
   const txHashes = options?.txHashes ?? [0, 1, 2, 3, 4, 5].map(() => TxHash.random());
-  return new BlockProposal(blockNumber, payload, signature, txHashes, options?.txs ?? []);
+  return new BlockProposal(payload, signature, txHashes, options?.txs ?? []);
 };
 
 // TODO(https://github.com/AztecProtocol/aztec-packages/issues/8028)
@@ -303,7 +300,7 @@ export const makeBlockAttestation = (options?: MakeConsensusPayloadOptions): Blo
   const proposalHash = getHashedSignaturePayloadEthSignedMessage(payload, SignatureDomainSeparator.blockProposal);
   const proposerSignature = proposerSigner.sign(proposalHash);
 
-  return new BlockAttestation(header.globalVariables.blockNumber, payload, attestationSignature, proposerSignature);
+  return new BlockAttestation(payload, attestationSignature, proposerSignature);
 };
 
 export const makeBlockAttestationFromBlock = (
@@ -331,7 +328,7 @@ export const makeBlockAttestationFromBlock = (
   const proposalSignerToUse = proposerSigner ?? Secp256k1Signer.random();
   const proposerSignature = proposalSignerToUse.sign(proposalHash);
 
-  return new BlockAttestation(header.globalVariables.blockNumber, payload, attestationSignature, proposerSignature);
+  return new BlockAttestation(payload, attestationSignature, proposerSignature);
 };
 
 export async function randomPublishedL2Block(

package/src/world-state/index.ts

@@ -0,0 +1 @@
+export * from './world_state_revision.js';

package/src/world-state/world_state_revision.ts

@@ -0,0 +1,21 @@
+import { z } from 'zod';
+
+export class WorldStateRevision {
+  constructor(
+    public readonly forkId: number,
+    public readonly blockNumber: number,
+    public readonly includeUncommitted: boolean,
+  ) {}
+
+  static empty() {
+    return new WorldStateRevision(0, 0, false);
+  }
+
+  static get schema() {
+    return z.object({
+      forkId: z.number(),
+      blockNumber: z.number(),
+      includeUncommitted: z.boolean(),
+    });
+  }
+}