@aztec/stdlib 0.85.0 → 0.86.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/stdlib",
-  "version": "0.85.0",
+  "version": "0.86.0",
   "type": "module",
   "inherits": [
     "../package.common.json",
@@ -63,16 +63,15 @@
     "generate": "./scripts/copy-contracts.sh",
     "build:dev": "tsc -b --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
-    "formatting": "run -T prettier --check ./src && run -T eslint ./src",
-    "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
   },
   "dependencies": {
-    "@aztec/bb.js": "0.85.0",
-    "@aztec/blob-lib": "0.85.0",
-    "@aztec/constants": "0.85.0",
-    "@aztec/ethereum": "0.85.0",
-    "@aztec/foundation": "0.85.0",
+    "@aztec/bb.js": "0.86.0",
+    "@aztec/blob-lib": "0.86.0",
+    "@aztec/constants": "0.86.0",
+    "@aztec/ethereum": "0.86.0",
+    "@aztec/foundation": "0.86.0",
+    "@aztec/noir-noirc_abi": "0.86.0",
     "@google-cloud/storage": "^7.15.0",
     "lodash.chunk": "^4.2.0",
     "lodash.isequal": "^4.5.0",

package/src/block/l2_block.ts

@@ -106,7 +106,7 @@ export class L2Block {
   }
 
   get number(): number {
-    return Number(this.header.globalVariables.blockNumber.toBigInt());
+    return this.header.getBlockNumber();
   }
 
   /**

package/src/interfaces/aztec-node-admin.ts

@@ -15,7 +15,7 @@ export interface AztecNodeAdmin {
    * Updates the configuration of this node.
    * @param config - Updated configuration to be merged with the current one.
    */
-  setConfig(config: Partial<SequencerConfig & ProverConfig>): Promise<void>;
+  setConfig(config: Partial<SequencerConfig & ProverConfig & { maxTxPoolSize: number }>): Promise<void>;
 
   /**
    * Forces the next block to be built bypassing all time and pending checks.

package/src/interfaces/aztec-node.ts

@@ -56,7 +56,6 @@ import {
   type GetPublicLogsResponse,
   GetPublicLogsResponseSchema,
 } from './get_logs_response.js';
-import type { ProverCoordination } from './prover-coordination.js';
 import { type WorldStateSyncStatus, WorldStateSyncStatusSchema } from './world_state.js';
 
 /**
@@ -64,8 +63,7 @@ import { type WorldStateSyncStatus, WorldStateSyncStatusSchema } from './world_s
  * We will probably implement the additional interfaces by means other than Aztec Node as it's currently a privacy leak
  */
 export interface AztecNode
-  extends ProverCoordination,
-    Pick<L2BlockSource, 'getBlocks' | 'getPublishedBlocks' | 'getBlockHeader' | 'getL2Tips'> {
+  extends Pick<L2BlockSource, 'getBlocks' | 'getPublishedBlocks' | 'getBlockHeader' | 'getL2Tips'> {
   /**
    * Returns the tips of the L2 chain.
    */

package/src/interfaces/prover-coordination.ts

@@ -1,27 +1,17 @@
-import { z } from 'zod';
-
-import type { ApiSchemaFor } from '../schemas/index.js';
 import { Tx } from '../tx/tx.js';
 import { TxHash } from '../tx/tx_hash.js';
+import type { P2PClient } from './p2p.js';
 
 /** Provides basic operations for ProverNodes to interact with other nodes in the network. */
 export interface ProverCoordination {
-  /**
-   * Returns a transaction given its hash if available.
-   * @param txHash - The hash of the transaction, used as an ID.
-   * @returns The transaction, if found, 'undefined' otherwise.
-   */
-  getTxByHash(txHash: TxHash): Promise<Tx | undefined>;
-
   /**
    * Returns a set of transactions given their hashes if available.
    * @param txHashes - The hashes of the transactions, used as an ID.
-   * @returns The transactions, if found, 'undefined' otherwise.
+   * @returns The transactions found, no necessarily in the same order as the hashes.
    */
   getTxsByHash(txHashes: TxHash[]): Promise<Tx[]>;
-}
 
-export const ProverCoordinationApiSchema: ApiSchemaFor<ProverCoordination> = {
-  getTxByHash: z.function().args(TxHash.schema).returns(Tx.schema.optional()),
-  getTxsByHash: z.function().args(z.array(TxHash.schema)).returns(z.array(Tx.schema)),
-};
+  gatherTxs(txHashes: TxHash[]): Promise<void>;
+
+  getP2PClient(): P2PClient | undefined;
+}

package/src/kernel/private_kernel_data.ts

@@ -1,10 +1,10 @@
-import { CLIENT_IVC_VERIFICATION_KEY_LENGTH_IN_FIELDS, VK_TREE_HEIGHT } from '@aztec/constants';
+import { VK_TREE_HEIGHT } from '@aztec/constants';
 import { makeTuple } from '@aztec/foundation/array';
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, type Tuple, serializeToBuffer } from '@aztec/foundation/serialize';
 
 import type { UInt32 } from '../types/shared.js';
-import { VerificationKeyAsFields } from '../vks/verification_key.js';
+import { VerificationKeyData } from '../vks/verification_key.js';
 import { PrivateKernelCircuitPublicInputs } from './private_kernel_circuit_public_inputs.js';
 
 /**
@@ -21,7 +21,7 @@ export class PrivateKernelData {
     /**
      * Verification key of the previous kernel.
      */
-    public vk: VerificationKeyAsFields,
+    public verificationKey: VerificationKeyData,
     /**
      * Index of the previous kernel's vk in a tree of vks.
      */
@@ -37,14 +37,14 @@ export class PrivateKernelData {
    * @returns The buffer.
    */
   toBuffer() {
-    return serializeToBuffer(this.publicInputs, this.vk, this.vkIndex, this.vkPath);
+    return serializeToBuffer(this.publicInputs, this.verificationKey, this.vkIndex, this.vkPath);
   }
 
   static fromBuffer(buffer: Buffer | BufferReader): PrivateKernelData {
     const reader = BufferReader.asReader(buffer);
     return new this(
       reader.readObject(PrivateKernelCircuitPublicInputs),
-      reader.readObject(VerificationKeyAsFields),
+      reader.readObject(VerificationKeyData),
       reader.readNumber(),
       reader.readArray(VK_TREE_HEIGHT, Fr),
     );
@@ -53,7 +53,7 @@ export class PrivateKernelData {
   static empty(): PrivateKernelData {
     return new PrivateKernelData(
       PrivateKernelCircuitPublicInputs.empty(),
-      VerificationKeyAsFields.makeFake(CLIENT_IVC_VERIFICATION_KEY_LENGTH_IN_FIELDS),
+      VerificationKeyData.empty(),
       0,
       makeTuple(VK_TREE_HEIGHT, Fr.zero),
     );

package/src/kernel/private_kernel_prover_output.ts

@@ -1,10 +1,11 @@
 import { bufferSchema, mapSchema } from '@aztec/foundation/schemas';
 import type { WitnessMap } from '@aztec/noir-acvm_js';
+import { serializeWitness } from '@aztec/noir-noirc_abi';
 
+import { Encoder } from 'msgpackr';
 import { z } from 'zod';
 
 import type { ClientIvcProof } from '../proofs/client_ivc_proof.js';
-import type { VerificationKeyAsFields } from '../vks/verification_key.js';
 import type { PrivateKernelCircuitPublicInputs } from './private_kernel_circuit_public_inputs.js';
 import type { PrivateKernelTailCircuitPublicInputs } from './private_kernel_tail_circuit_public_inputs.js';
 
@@ -13,6 +14,7 @@ export const PrivateExecutionStepSchema = z.object({
   gateCount: z.number().optional(),
   bytecode: bufferSchema,
   witness: mapSchema(z.number(), z.string()),
+  vk: bufferSchema,
 });
 
 /**
@@ -23,6 +25,8 @@ export interface PrivateExecutionStep {
   gateCount?: number;
   bytecode: Buffer;
   witness: WitnessMap;
+  /* TODO(https://github.com/AztecProtocol/barretenberg/issues/1328) this should get its own proper class. */
+  vk: Buffer;
 }
 
 /** Represents the output of proven PrivateKernelSimulateOutput.*/
@@ -34,7 +38,7 @@ export interface PrivateKernelExecutionProofOutput<
   /** The private IVC proof optimized for user devices. It will be consumed by an Aztec prover,
    * which recursively verifies it through the "tube" circuit.*/
   clientIvcProof: ClientIvcProof;
-  verificationKey: VerificationKeyAsFields;
+  vk: Buffer;
   /**
    * The trace the clientIvcProof corresponds to.
    * A trace of app circuits interleaved with private kernel circuits.
@@ -42,3 +46,15 @@ export interface PrivateKernelExecutionProofOutput<
    */
   executionSteps: PrivateExecutionStep[];
 }
+
+export function serializePrivateExecutionSteps(steps: PrivateExecutionStep[]) {
+  const stepToStruct = (step: PrivateExecutionStep) => {
+    return {
+      bytecode: step.bytecode,
+      witness: serializeWitness(step.witness),
+      vk: step.vk,
+      functionName: step.functionName,
+    };
+  };
+  return new Encoder({ useRecords: false }).pack(steps.map(stepToStruct));
+}

package/src/kernel/private_kernel_simulated_output.ts

@@ -1,6 +1,6 @@
 import type { WitnessMap } from '@aztec/noir-acvm_js';
 
-import type { VerificationKeyAsFields } from '../vks/verification_key.js';
+import type { VerificationKeyData } from '../vks/verification_key.js';
 import type { PrivateKernelCircuitPublicInputs } from './private_kernel_circuit_public_inputs.js';
 import type { PrivateKernelTailCircuitPublicInputs } from './private_kernel_tail_circuit_public_inputs.js';
 
@@ -14,7 +14,7 @@ export interface PrivateKernelSimulateOutput<
   /** The public inputs required for the proof generation process. */
   publicInputs: PublicInputsType;
   outputWitness: WitnessMap;
-  verificationKey: VerificationKeyAsFields;
+  verificationKey: VerificationKeyData;
   bytecode: Buffer;
 }
 
@@ -22,5 +22,5 @@ export interface PrivateKernelSimulateOutput<
  * Represents the output of the circuit simulation process for init and inner private kernel circuit.
  */
 export type AppCircuitSimulateOutput = {
-  verificationKey: VerificationKeyAsFields;
+  verificationKey: VerificationKeyData;
 };

package/src/p2p/block_attestation.ts

@@ -11,7 +11,7 @@ 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';
-import { TopicType, createTopicString } from './topic_type.js';
+import { TopicType } from './topic_type.js';
 
 export class BlockAttestationHash extends Buffer32 {
   constructor(hash: Buffer) {
@@ -26,7 +26,7 @@ export class BlockAttestationHash extends Buffer32 {
  * will produce a block attestation over the header of the block
  */
 export class BlockAttestation extends Gossipable {
-  static override p2pTopic = createTopicString(TopicType.block_attestation);
+  static override p2pTopic = TopicType.block_attestation;
 
   private sender: EthAddress | undefined;
 
@@ -70,13 +70,10 @@ export class BlockAttestation extends Gossipable {
    * Lazily evaluate and cache the sender of the attestation
    * @returns The sender of the attestation
    */
-  async getSender(): Promise<EthAddress> {
+  getSender(): EthAddress {
     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);
     }
@@ -84,7 +81,7 @@ export class BlockAttestation extends Gossipable {
     return this.sender;
   }
 
-  getPayload(): Promise<Buffer> {
+  getPayload(): Buffer {
     return this.payload.getPayloadToSign(SignatureDomainSeparator.blockAttestation);
   }
 

package/src/p2p/block_proposal.ts

@@ -12,7 +12,7 @@ import {
   getHashedSignaturePayload,
   getHashedSignaturePayloadEthSignedMessage,
 } from './signature_utils.js';
-import { TopicType, createTopicString } from './topic_type.js';
+import { TopicType } from './topic_type.js';
 
 export class BlockProposalHash extends Buffer32 {
   constructor(hash: Buffer) {
@@ -27,7 +27,7 @@ export class BlockProposalHash extends Buffer32 {
  * be included in the head of the chain
  */
 export class BlockProposal extends Gossipable {
-  static override p2pTopic = createTopicString(TopicType.block_proposal);
+  static override p2pTopic = TopicType.block_proposal;
 
   private sender: EthAddress | undefined;
 
@@ -61,7 +61,7 @@ export class BlockProposal extends Gossipable {
     payload: ConsensusPayload,
     payloadSigner: (payload: Buffer32) => Promise<Signature>,
   ) {
-    const hashed = await getHashedSignaturePayload(payload, SignatureDomainSeparator.blockProposal);
+    const hashed = getHashedSignaturePayload(payload, SignatureDomainSeparator.blockProposal);
     const sig = await payloadSigner(hashed);
 
     return new BlockProposal(payload, sig);
@@ -70,12 +70,9 @@ export class BlockProposal extends Gossipable {
   /**Get Sender
    * Lazily evaluate the sender of the proposal; result is cached
    */
-  async getSender() {
+  getSender() {
     if (!this.sender) {
-      const hashed = await getHashedSignaturePayloadEthSignedMessage(
-        this.payload,
-        SignatureDomainSeparator.blockProposal,
-      );
+      const hashed = getHashedSignaturePayloadEthSignedMessage(this.payload, SignatureDomainSeparator.blockProposal);
       // Cache the sender for later use
       this.sender = recoverAddress(hashed, this.signature);
     }

package/src/p2p/consensus_payload.ts

@@ -38,18 +38,12 @@ export class ConsensusPayload implements Signable {
     return [fields.header, fields.archive, fields.txHashes] as const;
   }
 
-  async getPayloadToSign(domainSeparator: SignatureDomainSeparator): Promise<Buffer> {
-    const abi = parseAbiParameters('uint8, (bytes32, bytes32, (uint256), bytes, bytes32[])');
+  getPayloadToSign(domainSeparator: SignatureDomainSeparator): Buffer {
+    const abi = parseAbiParameters('uint8, (bytes32, (uint256), bytes, bytes32[])');
     const txArray = this.txHashes.map(tx => tx.toString());
     const encodedData = encodeAbiParameters(abi, [
       domainSeparator,
-      [
-        this.archive.toString(),
-        (await this.header.hash()).toString(),
-        [0n] /* @todo See #9963 */,
-        this.header.toString(),
-        txArray,
-      ],
+      [this.archive.toString(), [0n] /* @todo See #9963 */, this.header.toString(), txArray],
     ] as const);
 
     return hexToBuffer(encodedData);

package/src/p2p/gossipable.ts

@@ -1,5 +1,7 @@
 import type { Buffer32 } from '@aztec/foundation/buffer';
 
+import type { TopicType } from './topic_type.js';
+
 /**
  * Gossipable
  *
@@ -10,7 +12,7 @@ export abstract class Gossipable {
    *
    * - The p2p topic identifier, this determines how the message is handled
    */
-  static p2pTopic: string;
+  static p2pTopic: TopicType;
 
   /** p2p Message Identifier
    *

package/src/p2p/interface.ts

@@ -1,28 +1,4 @@
-import { Tx } from '../tx/tx.js';
-import { BlockAttestation } from './block_attestation.js';
-import { BlockProposal } from './block_proposal.js';
-import type { Gossipable } from './gossipable.js';
-import { TopicType } from './topic_type.js';
-
 export interface RawGossipMessage {
   topic: string;
   data: Uint8Array;
 }
-
-// Force casts as we know that each field here extends Gossipable, and we just want types from Gossipable
-export const TopicTypeMap: Record<string, typeof Gossipable> = {
-  [TopicType.tx]: Tx as unknown as typeof Gossipable,
-  [TopicType.block_proposal]: BlockProposal as unknown as typeof Gossipable,
-  [TopicType.block_attestation]: BlockAttestation as unknown as typeof Gossipable,
-};
-
-/**
- * Map from topic to deserialiser
- *
- * Used in msgIdFn libp2p to get the p2pMessageIdentifier from a message
- */
-export const TopicToDeserializer = {
-  [Tx.p2pTopic]: Tx.fromBuffer,
-  [BlockProposal.p2pTopic]: BlockProposal.fromBuffer,
-  [BlockAttestation.p2pTopic]: BlockAttestation.fromBuffer,
-};

package/src/p2p/signature_utils.ts

@@ -7,7 +7,7 @@ export enum SignatureDomainSeparator {
 }
 
 export interface Signable {
-  getPayloadToSign(domainSeparator: SignatureDomainSeparator): Promise<Buffer>;
+  getPayloadToSign(domainSeparator: SignatureDomainSeparator): Buffer;
 }
 
 /**
@@ -15,11 +15,8 @@ export interface Signable {
  * @param s - The `Signable` to sign
  * @returns The hashed payload for the signature of the `Signable`
  */
-export async function getHashedSignaturePayload(
-  s: Signable,
-  domainSeparator: SignatureDomainSeparator,
-): Promise<Buffer32> {
-  return Buffer32.fromBuffer(keccak256(await s.getPayloadToSign(domainSeparator)));
+export function getHashedSignaturePayload(s: Signable, domainSeparator: SignatureDomainSeparator): Buffer32 {
+  return Buffer32.fromBuffer(keccak256(s.getPayloadToSign(domainSeparator)));
 }
 
 /**
@@ -27,10 +24,10 @@ export async function getHashedSignaturePayload(
  * @param s - the `Signable` to sign
  * @returns The hashed payload for the signature of the `Signable` as an Ethereum signed message
  */
-export async function getHashedSignaturePayloadEthSignedMessage(
+export function getHashedSignaturePayloadEthSignedMessage(
   s: Signable,
   domainSeparator: SignatureDomainSeparator,
-): Promise<Buffer32> {
-  const payload = await getHashedSignaturePayload(s, domainSeparator);
+): Buffer32 {
+  const payload = getHashedSignaturePayload(s, domainSeparator);
   return makeEthSignDigest(payload);
 }

package/src/p2p/topic_type.ts

@@ -6,8 +6,8 @@ import { P2PClientType } from './client_type.js';
  * @param topicType
  * @returns
  */
-export function createTopicString(topicType: TopicType) {
-  return '/aztec/' + topicType + '/0.1.0';
+export function createTopicString(topicType: TopicType, protocolVersion: string) {
+  return `/aztec/${TopicType[topicType]}/${protocolVersion}`;
 }
 
 /**
@@ -35,10 +35,10 @@ export function getTopicTypeForClientType(clientType: P2PClientType) {
  *  ...
  * }
  */
-export function metricsTopicStrToLabels() {
+export function metricsTopicStrToLabels(protocolVersion: string) {
   const topicStrToLabel = new Map<string, string>();
   for (const topic in TopicType) {
-    topicStrToLabel.set(createTopicString(TopicType[topic as keyof typeof TopicType]), topic);
+    topicStrToLabel.set(createTopicString(TopicType[topic as keyof typeof TopicType], protocolVersion), topic);
   }
 
   return topicStrToLabel;

package/src/rollup/block_root_or_block_merge_public_inputs.ts

@@ -23,14 +23,6 @@ export class BlockRootOrBlockMergePublicInputs {
      * Archive tree after adding this block range.
      */
     public newArchive: AppendOnlyTreeSnapshot,
-    /**
-     * Identifier of the previous block before the range.
-     */
-    public previousBlockHash: Fr,
-    /**
-     * Identifier of the last block in the range.
-     */
-    public endBlockHash: Fr,
     /**
      * Global variables for the first block in the range.
      */
@@ -76,8 +68,6 @@ export class BlockRootOrBlockMergePublicInputs {
     return new BlockRootOrBlockMergePublicInputs(
       reader.readObject(AppendOnlyTreeSnapshot),
       reader.readObject(AppendOnlyTreeSnapshot),
-      Fr.fromBuffer(reader),
-      Fr.fromBuffer(reader),
       reader.readObject(GlobalVariables),
       reader.readObject(GlobalVariables),
       Fr.fromBuffer(reader),
@@ -97,8 +87,6 @@ export class BlockRootOrBlockMergePublicInputs {
     return serializeToBuffer(
       this.previousArchive,
       this.newArchive,
-      this.previousBlockHash,
-      this.endBlockHash,
       this.startGlobalVariables,
       this.endGlobalVariables,
       this.outHash,

package/src/rollup/block_root_rollup.ts

@@ -25,6 +25,10 @@ export class BlockRootRollupData {
      * Hint for inserting the new l1 to l2 message subtree.
      */
     public l1ToL2MessageSubtreeSiblingPath: Tuple<Fr, typeof L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH>,
+    /**
+     * Hint for checking the hash of previous_block_header is the last leaf of the previous archive.
+     */
+    public previousArchiveSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>,
     /**
      * Hint for inserting the new block hash to the last archive.
      */
@@ -73,6 +77,7 @@ export class BlockRootRollupData {
     return [
       fields.l1ToL2Roots,
       fields.l1ToL2MessageSubtreeSiblingPath,
+      fields.previousArchiveSiblingPath,
       fields.newArchiveSiblingPath,
       fields.previousBlockHeader,
       fields.proverId,
@@ -90,6 +95,7 @@ export class BlockRootRollupData {
       RootParityInput.fromBuffer(reader, NESTED_RECURSIVE_PROOF_LENGTH),
       reader.readArray(L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH, Fr),
       reader.readArray(ARCHIVE_HEIGHT, Fr),
+      reader.readArray(ARCHIVE_HEIGHT, Fr),
       BlockHeader.fromBuffer(reader),
       Fr.fromBuffer(reader),
     );

package/src/rollup/root_rollup.ts

@@ -103,8 +103,6 @@ export class RootRollupPublicInputs {
     /** Snapshot of archive tree before/after this rollup been processed */
     public previousArchive: AppendOnlyTreeSnapshot,
     public endArchive: AppendOnlyTreeSnapshot,
-    public previousBlockHash: Fr,
-    public endBlockHash: Fr,
     // This is a u64 in nr, but GlobalVariables contains this as a u64 and is mapped to ts as a field, so I'm doing the same here
     public endTimestamp: Fr,
     public endBlockNumber: Fr,
@@ -120,8 +118,6 @@ export class RootRollupPublicInputs {
     return [
       fields.previousArchive,
       fields.endArchive,
-      fields.previousBlockHash,
-      fields.endBlockHash,
       fields.endTimestamp,
       fields.endBlockNumber,
       fields.outHash,
@@ -158,8 +154,6 @@ export class RootRollupPublicInputs {
       Fr.fromBuffer(reader),
       Fr.fromBuffer(reader),
       Fr.fromBuffer(reader),
-      Fr.fromBuffer(reader),
-      Fr.fromBuffer(reader),
       reader.readArray(AZTEC_MAX_EPOCH_DURATION, FeeRecipient),
       Fr.fromBuffer(reader),
       Fr.fromBuffer(reader),
@@ -194,8 +188,6 @@ export class RootRollupPublicInputs {
       Fr.random(),
       Fr.random(),
       Fr.random(),
-      Fr.random(),
-      Fr.random(),
       makeTuple(AZTEC_MAX_EPOCH_DURATION, FeeRecipient.random),
       Fr.random(),
       Fr.random(),

package/src/tests/factories.ts

@@ -713,10 +713,8 @@ export function makeBlockRootOrBlockMergeRollupPublicInputs(
   return new BlockRootOrBlockMergePublicInputs(
     makeAppendOnlyTreeSnapshot(seed + 0x200),
     makeAppendOnlyTreeSnapshot(seed + 0x300),
-    fr(seed + 0x400),
-    fr(seed + 0x500),
-    globalVariables ?? makeGlobalVariables(seed + 0x501),
-    globalVariables ?? makeGlobalVariables(seed + 0x502),
+    globalVariables ?? makeGlobalVariables(seed + 0x400),
+    globalVariables ?? makeGlobalVariables(seed + 0x500),
     fr(seed + 0x600),
     makeTuple(AZTEC_MAX_EPOCH_DURATION, () => makeFeeRecipient(seed), 0x700),
     fr(seed + 0x800),
@@ -786,8 +784,9 @@ function makeBlockRootRollupData(seed = 0) {
     makeRootParityInput<typeof NESTED_RECURSIVE_PROOF_LENGTH>(NESTED_RECURSIVE_PROOF_LENGTH, seed + 0x2000),
     makeTuple(L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH, fr, 0x2100),
     makeTuple(ARCHIVE_HEIGHT, fr, 0x2200),
-    makeHeader(seed + 0x2300),
-    fr(seed + 0x2400),
+    makeTuple(ARCHIVE_HEIGHT, fr, 0x2300),
+    makeHeader(seed + 0x2400),
+    fr(seed + 0x2500),
   );
 }
 
@@ -880,18 +879,16 @@ export function makeRootParityInputs(seed = 0): RootParityInputs {
  */
 export function makeRootRollupPublicInputs(seed = 0): RootRollupPublicInputs {
   return new RootRollupPublicInputs(
+    makeAppendOnlyTreeSnapshot(seed + 0x100),
     makeAppendOnlyTreeSnapshot(seed + 0x200),
-    makeAppendOnlyTreeSnapshot(seed + 0x300),
+    fr(seed + 0x300),
     fr(seed + 0x400),
     fr(seed + 0x500),
-    fr(seed + 0x600),
+    makeTuple(AZTEC_MAX_EPOCH_DURATION, () => makeFeeRecipient(seed), 0x600),
     fr(seed + 0x700),
-    fr(seed + 0x800),
-    makeTuple(AZTEC_MAX_EPOCH_DURATION, () => makeFeeRecipient(seed), 0x900),
-    fr(seed + 0x100),
-    fr(seed + 0x101),
-    fr(seed + 0x200),
-    makeTuple(AZTEC_MAX_EPOCH_DURATION, () => makeBlockBlobPublicInputs(seed), 0x300),
+    fr(seed + 0x701),
+    fr(seed + 0x702),
+    makeTuple(AZTEC_MAX_EPOCH_DURATION, () => makeBlockBlobPublicInputs(seed), 0x800),
   );
 }
 

package/src/tests/mocks.ts

@@ -221,7 +221,7 @@ export interface MakeConsensusPayloadOptions {
   txHashes?: TxHash[];
 }
 
-const makeAndSignConsensusPayload = async (
+const makeAndSignConsensusPayload = (
   domainSeparator: SignatureDomainSeparator,
   options?: MakeConsensusPayloadOptions,
 ) => {
@@ -238,19 +238,19 @@ const makeAndSignConsensusPayload = async (
     txHashes,
   });
 
-  const hash = await getHashedSignaturePayloadEthSignedMessage(payload, domainSeparator);
+  const hash = getHashedSignaturePayloadEthSignedMessage(payload, domainSeparator);
   const signature = signer.sign(hash);
 
   return { payload, signature };
 };
 
-export const makeBlockProposal = async (options?: MakeConsensusPayloadOptions): Promise<BlockProposal> => {
-  const { payload, signature } = await makeAndSignConsensusPayload(SignatureDomainSeparator.blockProposal, options);
+export const makeBlockProposal = (options?: MakeConsensusPayloadOptions): BlockProposal => {
+  const { payload, signature } = makeAndSignConsensusPayload(SignatureDomainSeparator.blockProposal, options);
   return new BlockProposal(payload, signature);
 };
 
 // TODO(https://github.com/AztecProtocol/aztec-packages/issues/8028)
-export const makeBlockAttestation = async (options?: MakeConsensusPayloadOptions): Promise<BlockAttestation> => {
-  const { payload, signature } = await makeAndSignConsensusPayload(SignatureDomainSeparator.blockAttestation, options);
+export const makeBlockAttestation = (options?: MakeConsensusPayloadOptions): BlockAttestation => {
+  const { payload, signature } = makeAndSignConsensusPayload(SignatureDomainSeparator.blockAttestation, options);
   return new BlockAttestation(payload, signature);
 };

package/src/tx/block_header.ts

@@ -64,6 +64,10 @@ export class BlockHeader {
     return this.globalVariables.slotNumber.toBigInt();
   }
 
+  getBlockNumber(): number {
+    return Number(this.globalVariables.blockNumber.toBigInt());
+  }
+
   getSize() {
     return (
       this.lastArchive.getSize() +

package/src/tx/profiled_tx.ts

@@ -21,6 +21,7 @@ export class TxProfileResult {
         functionName: 'random',
         bytecode: Buffer.from('random'),
         witness: new Map([[1, 'random']]),
+        vk: Buffer.from('random'),
       },
     ]);
   }