@aztec/stdlib 3.0.0-canary.a9708bd → 3.0.0-devnet.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/stdlib",
-  "version": "3.0.0-canary.a9708bd",
+  "version": "3.0.0-devnet.3",
   "type": "module",
   "inherits": [
     "../package.common.json",
@@ -39,6 +39,7 @@
     "./auth-witness": "./dest/auth_witness/index.js",
     "./block": "./dest/block/index.js",
     "./block/test": "./dest/block/test/index.js",
+    "./checkpoint": "./dest/checkpoint/index.js",
     "./versioning": "./dest/versioning/index.js",
     "./interfaces/client": "./dest/interfaces/client.js",
     "./interfaces/server": "./dest/interfaces/server.js",
@@ -52,7 +53,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": [
@@ -69,15 +71,16 @@
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
   },
   "dependencies": {
-    "@aztec/bb.js": "3.0.0-canary.a9708bd",
-    "@aztec/blob-lib": "3.0.0-canary.a9708bd",
-    "@aztec/constants": "3.0.0-canary.a9708bd",
-    "@aztec/ethereum": "3.0.0-canary.a9708bd",
-    "@aztec/foundation": "3.0.0-canary.a9708bd",
-    "@aztec/l1-artifacts": "3.0.0-canary.a9708bd",
-    "@aztec/noir-noirc_abi": "3.0.0-canary.a9708bd",
+    "@aws-sdk/client-s3": "^3.892.0",
+    "@aztec/bb.js": "3.0.0-devnet.3",
+    "@aztec/blob-lib": "3.0.0-devnet.3",
+    "@aztec/constants": "3.0.0-devnet.3",
+    "@aztec/ethereum": "3.0.0-devnet.3",
+    "@aztec/foundation": "3.0.0-devnet.3",
+    "@aztec/l1-artifacts": "3.0.0-devnet.3",
+    "@aztec/noir-noirc_abi": "3.0.0-devnet.3",
     "@google-cloud/storage": "^7.15.0",
-    "axios": "^1.9.0",
+    "axios": "^1.12.0",
     "json-stringify-deterministic": "1.0.12",
     "lodash.chunk": "^4.2.0",
     "lodash.isequal": "^4.5.0",
@@ -86,12 +89,13 @@
     "msgpackr": "^1.11.2",
     "pako": "^2.1.0",
     "tslib": "^2.4.0",
-    "viem": "2.23.7",
+    "viem": "npm:@spalladino/viem@2.38.2-eip7594.0",
     "zod": "^3.23.8"
   },
   "devDependencies": {
     "@jest/expect": "^30.0.0",
     "@jest/globals": "^30.0.0",
+    "@libp2p/interface": "1.3.1",
     "@types/jest": "^30.0.0",
     "@types/lodash.chunk": "^4.2.9",
     "@types/lodash.isequal": "^4.5.8",

package/src/abi/abi.ts

@@ -195,7 +195,7 @@ export const FunctionAbiSchema = z.object({
   isInitializer: z.boolean(),
   parameters: z.array(z.object({ name: z.string(), type: AbiTypeSchema, visibility: z.enum(ABIParameterVisibility) })),
   returnTypes: z.array(AbiTypeSchema),
-  errorTypes: z.record(AbiErrorTypeSchema),
+  errorTypes: z.record(z.string(), AbiErrorTypeSchema.optional()),
 }) satisfies z.ZodType<FunctionAbi>;
 
 /** Debug metadata for a function. */

package/src/abi/contract_artifact.ts

@@ -283,6 +283,9 @@ function getStorageLayout(input: NoirCompiledContract) {
  */
 function generateContractArtifact(contract: NoirCompiledContract): ContractArtifact {
   try {
+    if (!contract.transpiled) {
+      throw new Error("Contract's public bytecode has not been transpiled");
+    }
     return ContractArtifactSchema.parse({
       name: contract.name,
       functions: contract.functions.filter(f => retainBytecode(f)).map(f => generateFunctionArtifact(f, contract)),

package/src/abi/event_metadata_definition.ts

@@ -0,0 +1,8 @@
+import type { AbiType } from './abi.js';
+import type { EventSelector } from './event_selector.js';
+
+export type EventMetadataDefinition = {
+  eventSelector: EventSelector;
+  abiType: AbiType;
+  fieldNames: string[];
+};

package/src/abi/function_call.ts

@@ -5,7 +5,7 @@ import { AztecAddress } from '../aztec-address/index.js';
 import { type AbiType, FunctionType } from './abi.js';
 import { FunctionSelector } from './function_selector.js';
 
-/** A request to call a function on a contract from a given address. */
+/** A request to call a function on a contract. */
 export class FunctionCall {
   constructor(
     /** The name of the function to call */
@@ -16,6 +16,8 @@ export class FunctionCall {
     public selector: FunctionSelector,
     /** Type of the function */
     public type: FunctionType,
+    /** Only applicable for enqueued public function calls. `hideMsgSender = true` will set the msg_sender field (the caller's address) to "null", meaning the public function (and observers around the world) won't know which smart contract address made the call. */
+    public hideMsgSender: boolean,
     /** Whether this call can make modifications to state or not */
     public isStatic: boolean,
     /** The encoded args */
@@ -30,6 +32,7 @@ export class FunctionCall {
       fields.to,
       fields.selector,
       fields.type,
+      fields.hideMsgSender,
       fields.isStatic,
       fields.args,
       fields.returnTypes,
@@ -50,6 +53,7 @@ export class FunctionCall {
       to: AztecAddress.ZERO,
       selector: FunctionSelector.empty(),
       type: FunctionType.PUBLIC,
+      hideMsgSender: false,
       isStatic: false,
       args: [],
       returnTypes: [],

package/src/abi/index.ts

@@ -3,6 +3,7 @@ export * from './buffer.js';
 export * from './decoder.js';
 export * from './encoder.js';
 export * from './authorization_selector.js';
+export * from './event_metadata_definition.js';
 export * from './event_selector.js';
 export * from './function_selector.js';
 export * from './note_selector.js';

package/src/avm/avm.ts

@@ -15,7 +15,13 @@ import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
 import { MerkleTreeId } from '../trees/merkle_tree_id.js';
 import { NullifierLeafPreimage } from '../trees/nullifier_leaf.js';
 import { PublicDataTreeLeafPreimage } from '../trees/public_data_leaf.js';
-import { GlobalVariables, PublicCallRequestWithCalldata, TreeSnapshots, type Tx } from '../tx/index.js';
+import {
+  GlobalVariables,
+  ProtocolContracts,
+  PublicCallRequestWithCalldata,
+  TreeSnapshots,
+  type Tx,
+} from '../tx/index.js';
 import { AvmCircuitPublicInputs } from './avm_circuit_public_inputs.js';
 import { serializeWithMessagePack } from './message_pack.js';
 
@@ -408,15 +414,12 @@ export class AvmTxHint {
     public readonly feePayer: AztecAddress,
   ) {}
 
-  static fromTx(tx: Tx): AvmTxHint {
+  static fromTx(tx: Tx, gasFees: GasFees): AvmTxHint {
     const setupCallRequests = tx.getNonRevertiblePublicCallRequestsWithCalldata();
     const appLogicCallRequests = tx.getRevertiblePublicCallRequestsWithCalldata();
     const teardownCallRequest = tx.getTeardownPublicCallRequestWithCalldata();
     const gasSettings = tx.data.constants.txContext.gasSettings;
-    const effectiveGasFees = computeEffectiveGasFees(
-      tx.data.constants.historicalHeader.globalVariables.gasFees,
-      gasSettings,
-    );
+    const effectiveGasFees = computeEffectiveGasFees(gasFees, gasSettings);
 
     // For informational purposes. Assumed quick because it should be cached.
     const txHash = tx.getTxHash();
@@ -513,6 +516,8 @@ export class AvmExecutionHints {
   constructor(
     public readonly globalVariables: GlobalVariables,
     public tx: AvmTxHint,
+    // Protocol contracts.
+    public protocolContracts: ProtocolContracts,
     // Contract hints.
     public readonly contractInstances: AvmContractInstanceHint[] = [],
     public readonly contractClasses: AvmContractClassHint[] = [],
@@ -533,7 +538,7 @@ export class AvmExecutionHints {
   ) {}
 
   static empty() {
-    return new AvmExecutionHints(GlobalVariables.empty(), AvmTxHint.empty());
+    return new AvmExecutionHints(GlobalVariables.empty(), AvmTxHint.empty(), ProtocolContracts.empty());
   }
 
   static get schema() {
@@ -541,6 +546,7 @@ export class AvmExecutionHints {
       .object({
         globalVariables: GlobalVariables.schema,
         tx: AvmTxHint.schema,
+        protocolContracts: ProtocolContracts.schema,
         contractInstances: AvmContractInstanceHint.schema.array(),
         contractClasses: AvmContractClassHint.schema.array(),
         bytecodeCommitments: AvmBytecodeCommitmentHint.schema.array(),
@@ -561,6 +567,7 @@ export class AvmExecutionHints {
         ({
           globalVariables,
           tx,
+          protocolContracts,
           contractInstances,
           contractClasses,
           bytecodeCommitments,
@@ -580,6 +587,7 @@ export class AvmExecutionHints {
           new AvmExecutionHints(
             globalVariables,
             tx,
+            protocolContracts,
             contractInstances,
             contractClasses,
             bytecodeCommitments,

package/src/avm/avm_accumulated_data.ts

@@ -3,7 +3,6 @@ import {
   MAX_L2_TO_L1_MSGS_PER_TX,
   MAX_NOTE_HASHES_PER_TX,
   MAX_NULLIFIERS_PER_TX,
-  MAX_PUBLIC_LOGS_PER_TX,
   MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
 } from '@aztec/constants';
 import { type FieldsOf, makeTuple } from '@aztec/foundation/array';
@@ -23,7 +22,8 @@ import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
 import { inspect } from 'util';
 import { z } from 'zod';
 
-import { PublicLog } from '../logs/public_log.js';
+import { countAccumulatedItems } from '../kernel/utils/index.js';
+import { FlatPublicLogs } from '../logs/public_log.js';
 import { ScopedL2ToL1Message } from '../messaging/l2_to_l1_message.js';
 import { PublicDataWrite } from './public_data_write.js';
 
@@ -44,7 +44,7 @@ export class AvmAccumulatedData {
     /**
      * The public logs emitted from the AVM execution.
      */
-    public publicLogs: Tuple<PublicLog, typeof MAX_PUBLIC_LOGS_PER_TX>,
+    public publicLogs: FlatPublicLogs,
     /**
      * The public data writes made in the AVM execution.
      */
@@ -57,7 +57,7 @@ export class AvmAccumulatedData {
         noteHashes: schemas.Fr.array().min(MAX_NOTE_HASHES_PER_TX).max(MAX_NOTE_HASHES_PER_TX),
         nullifiers: schemas.Fr.array().min(MAX_NULLIFIERS_PER_TX).max(MAX_NULLIFIERS_PER_TX),
         l2ToL1Msgs: ScopedL2ToL1Message.schema.array().min(MAX_L2_TO_L1_MSGS_PER_TX).max(MAX_L2_TO_L1_MSGS_PER_TX),
-        publicLogs: PublicLog.schema.array().min(MAX_PUBLIC_LOGS_PER_TX).max(MAX_PUBLIC_LOGS_PER_TX),
+        publicLogs: FlatPublicLogs.schema,
         publicDataWrites: PublicDataWrite.schema
           .array()
           .min(MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX)
@@ -69,7 +69,7 @@ export class AvmAccumulatedData {
             assertLength(noteHashes, MAX_NOTE_HASHES_PER_TX),
             assertLength(nullifiers, MAX_NULLIFIERS_PER_TX),
             assertLength(l2ToL1Msgs, MAX_L2_TO_L1_MSGS_PER_TX),
-            assertLength(publicLogs, MAX_PUBLIC_LOGS_PER_TX),
+            publicLogs,
             assertLength(publicDataWrites, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX),
           ),
       );
@@ -80,7 +80,7 @@ export class AvmAccumulatedData {
       arraySerializedSizeOfNonEmpty(this.noteHashes) +
       arraySerializedSizeOfNonEmpty(this.nullifiers) +
       arraySerializedSizeOfNonEmpty(this.l2ToL1Msgs) +
-      arraySerializedSizeOfNonEmpty(this.publicLogs) +
+      this.publicLogs.toBuffer().length +
       arraySerializedSizeOfNonEmpty(this.publicDataWrites)
     );
   }
@@ -91,7 +91,7 @@ export class AvmAccumulatedData {
       reader.readArray(MAX_NOTE_HASHES_PER_TX, Fr),
       reader.readArray(MAX_NULLIFIERS_PER_TX, Fr),
       reader.readArray(MAX_L2_TO_L1_MSGS_PER_TX, ScopedL2ToL1Message),
-      reader.readArray(MAX_PUBLIC_LOGS_PER_TX, PublicLog),
+      reader.readObject(FlatPublicLogs),
       reader.readArray(MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, PublicDataWrite),
     );
   }
@@ -116,7 +116,7 @@ export class AvmAccumulatedData {
       reader.readFieldArray(MAX_NOTE_HASHES_PER_TX),
       reader.readFieldArray(MAX_NULLIFIERS_PER_TX),
       reader.readArray(MAX_L2_TO_L1_MSGS_PER_TX, ScopedL2ToL1Message),
-      reader.readArray(MAX_PUBLIC_LOGS_PER_TX, PublicLog),
+      reader.readObject(FlatPublicLogs),
       reader.readArray(MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, PublicDataWrite),
     );
   }
@@ -144,7 +144,7 @@ export class AvmAccumulatedData {
       makeTuple(MAX_NOTE_HASHES_PER_TX, Fr.zero),
       makeTuple(MAX_NULLIFIERS_PER_TX, Fr.zero),
       makeTuple(MAX_L2_TO_L1_MSGS_PER_TX, ScopedL2ToL1Message.empty),
-      makeTuple(MAX_PUBLIC_LOGS_PER_TX, PublicLog.empty),
+      FlatPublicLogs.empty(),
       makeTuple(MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, PublicDataWrite.empty),
     );
   }
@@ -154,7 +154,7 @@ export class AvmAccumulatedData {
       this.noteHashes.every(x => x.isZero()) &&
       this.nullifiers.every(x => x.isZero()) &&
       this.l2ToL1Msgs.every(x => x.isEmpty()) &&
-      this.publicLogs.every(x => x.isEmpty()) &&
+      this.publicLogs.isEmpty() &&
       this.publicDataWrites.every(x => x.isEmpty())
     );
   }
@@ -175,6 +175,7 @@ export class AvmAccumulatedData {
     .map(h => inspect(h))
     .join(', ')}],
   publicLogs: [${this.publicLogs
+    .toLogs()
     .filter(x => !x.isEmpty())
     .map(h => inspect(h))
     .join(', ')}],
@@ -184,6 +185,15 @@ export class AvmAccumulatedData {
     .join(', ')}],
 }`;
   }
+
+  getArrayLengths() {
+    return new AvmAccumulatedDataArrayLengths(
+      countAccumulatedItems(this.noteHashes),
+      countAccumulatedItems(this.nullifiers),
+      countAccumulatedItems(this.l2ToL1Msgs),
+      countAccumulatedItems(this.publicDataWrites),
+    );
+  }
 }
 
 /**
@@ -203,10 +213,6 @@ export class AvmAccumulatedDataArrayLengths {
      * Number of L2 to L1 messages
      */
     public l2ToL1Msgs: number,
-    /**
-     * Number of public logs
-     */
-    public publicLogs: number,
     /**
      * Number of public data writes
      */
@@ -219,12 +225,11 @@ export class AvmAccumulatedDataArrayLengths {
         noteHashes: z.number(),
         nullifiers: z.number(),
         l2ToL1Msgs: z.number(),
-        publicLogs: z.number(),
         publicDataWrites: z.number(),
       })
       .transform(
-        ({ noteHashes, nullifiers, l2ToL1Msgs, publicLogs, publicDataWrites }) =>
-          new AvmAccumulatedDataArrayLengths(noteHashes, nullifiers, l2ToL1Msgs, publicLogs, publicDataWrites),
+        ({ noteHashes, nullifiers, l2ToL1Msgs, publicDataWrites }) =>
+          new AvmAccumulatedDataArrayLengths(noteHashes, nullifiers, l2ToL1Msgs, publicDataWrites),
       );
   }
 
@@ -235,12 +240,11 @@ export class AvmAccumulatedDataArrayLengths {
       reader.readNumber(),
       reader.readNumber(),
       reader.readNumber(),
-      reader.readNumber(),
     );
   }
 
   toBuffer() {
-    return serializeToBuffer(this.noteHashes, this.nullifiers, this.l2ToL1Msgs, this.publicLogs, this.publicDataWrites);
+    return serializeToBuffer(this.noteHashes, this.nullifiers, this.l2ToL1Msgs, this.publicDataWrites);
   }
 
   static fromFields(fields: Fr[] | FieldReader) {
@@ -250,22 +254,15 @@ export class AvmAccumulatedDataArrayLengths {
       Number(reader.readField()),
       Number(reader.readField()),
       Number(reader.readField()),
-      Number(reader.readField()),
     );
   }
 
   toFields(): Fr[] {
-    return [
-      new Fr(this.noteHashes),
-      new Fr(this.nullifiers),
-      new Fr(this.l2ToL1Msgs),
-      new Fr(this.publicLogs),
-      new Fr(this.publicDataWrites),
-    ];
+    return [new Fr(this.noteHashes), new Fr(this.nullifiers), new Fr(this.l2ToL1Msgs), new Fr(this.publicDataWrites)];
   }
 
   static empty() {
-    return new AvmAccumulatedDataArrayLengths(0, 0, 0, 0, 0);
+    return new AvmAccumulatedDataArrayLengths(0, 0, 0, 0);
   }
 
   [inspect.custom]() {
@@ -273,7 +270,6 @@ export class AvmAccumulatedDataArrayLengths {
   noteHashes: ${this.noteHashes},
   nullifiers: ${this.nullifiers},
   l2ToL1Msgs: ${this.l2ToL1Msgs},
-  publicLogs: ${this.publicLogs},
   publicDataWrites: ${this.publicDataWrites},
 }`;
   }

package/src/avm/avm_circuit_public_inputs.ts

@@ -16,6 +16,7 @@ import {
 } from '../kernel/private_to_avm_accumulated_data.js';
 import { PublicCallRequest, PublicCallRequestArrayLengths } from '../kernel/public_call_request.js';
 import { GlobalVariables } from '../tx/global_variables.js';
+import { ProtocolContracts } from '../tx/protocol_contracts.js';
 import { TreeSnapshots } from '../tx/tree_snapshots.js';
 import { AvmAccumulatedData, AvmAccumulatedDataArrayLengths } from './avm_accumulated_data.js';
 import { serializeWithMessagePack } from './message_pack.js';
@@ -27,11 +28,13 @@ export class AvmCircuitPublicInputs {
     ///////////////////////////////////
     // Inputs.
     public globalVariables: GlobalVariables,
+    public protocolContracts: ProtocolContracts,
     public startTreeSnapshots: TreeSnapshots,
     public startGasUsed: Gas,
     public gasSettings: GasSettings,
     public effectiveGasFees: GasFees,
     public feePayer: AztecAddress,
+    public proverId: Fr,
     public publicCallRequestArrayLengths: PublicCallRequestArrayLengths,
     public publicSetupCallRequests: Tuple<PublicCallRequest, typeof MAX_ENQUEUED_CALLS_PER_TX>,
     public publicAppLogicCallRequests: Tuple<PublicCallRequest, typeof MAX_ENQUEUED_CALLS_PER_TX>,
@@ -54,11 +57,13 @@ export class AvmCircuitPublicInputs {
     return z
       .object({
         globalVariables: GlobalVariables.schema,
+        protocolContracts: ProtocolContracts.schema,
         startTreeSnapshots: TreeSnapshots.schema,
         startGasUsed: Gas.schema,
         gasSettings: GasSettings.schema,
         effectiveGasFees: GasFees.schema,
         feePayer: AztecAddress.schema,
+        proverId: Fr.schema,
         publicCallRequestArrayLengths: PublicCallRequestArrayLengths.schema,
         publicSetupCallRequests: PublicCallRequest.schema.array().max(MAX_ENQUEUED_CALLS_PER_TX),
         publicAppLogicCallRequests: PublicCallRequest.schema.array().max(MAX_ENQUEUED_CALLS_PER_TX),
@@ -77,11 +82,13 @@ export class AvmCircuitPublicInputs {
       .transform(
         ({
           globalVariables,
+          protocolContracts,
           startTreeSnapshots,
           startGasUsed,
           gasSettings,
           effectiveGasFees,
           feePayer,
+          proverId,
           publicCallRequestArrayLengths,
           publicSetupCallRequests,
           publicAppLogicCallRequests,
@@ -99,11 +106,13 @@ export class AvmCircuitPublicInputs {
         }) =>
           new AvmCircuitPublicInputs(
             globalVariables,
+            protocolContracts,
             startTreeSnapshots,
             startGasUsed,
             gasSettings,
             effectiveGasFees,
             feePayer,
+            proverId,
             publicCallRequestArrayLengths,
             assertLength(publicSetupCallRequests, MAX_ENQUEUED_CALLS_PER_TX),
             assertLength(publicAppLogicCallRequests, MAX_ENQUEUED_CALLS_PER_TX),
@@ -126,11 +135,13 @@ export class AvmCircuitPublicInputs {
     const reader = BufferReader.asReader(buffer);
     return new AvmCircuitPublicInputs(
       reader.readObject(GlobalVariables),
+      reader.readObject(ProtocolContracts),
       reader.readObject(TreeSnapshots),
       reader.readObject(Gas),
       reader.readObject(GasSettings),
       reader.readObject(GasFees),
       reader.readObject(AztecAddress),
+      reader.readObject(Fr),
       reader.readObject(PublicCallRequestArrayLengths),
       reader.readArray(MAX_ENQUEUED_CALLS_PER_TX, PublicCallRequest),
       reader.readArray(MAX_ENQUEUED_CALLS_PER_TX, PublicCallRequest),
@@ -151,11 +162,13 @@ export class AvmCircuitPublicInputs {
   toBuffer() {
     return serializeToBuffer(
       this.globalVariables,
+      this.protocolContracts,
       this.startTreeSnapshots,
       this.startGasUsed,
       this.gasSettings,
       this.effectiveGasFees,
       this.feePayer,
+      this.proverId,
       this.publicCallRequestArrayLengths,
       this.publicSetupCallRequests,
       this.publicAppLogicCallRequests,
@@ -185,11 +198,13 @@ export class AvmCircuitPublicInputs {
     const reader = FieldReader.asReader(fields);
     return new AvmCircuitPublicInputs(
       GlobalVariables.fromFields(reader),
+      ProtocolContracts.fromFields(reader),
       TreeSnapshots.fromFields(reader),
       Gas.fromFields(reader),
       GasSettings.fromFields(reader),
       GasFees.fromFields(reader),
       AztecAddress.fromFields(reader),
+      reader.readField(),
       PublicCallRequestArrayLengths.fromFields(reader),
       reader.readArray(MAX_ENQUEUED_CALLS_PER_TX, PublicCallRequest),
       reader.readArray(MAX_ENQUEUED_CALLS_PER_TX, PublicCallRequest),
@@ -210,11 +225,13 @@ export class AvmCircuitPublicInputs {
   toFields() {
     return [
       ...this.globalVariables.toFields(),
+      ...this.protocolContracts.toFields(),
       ...this.startTreeSnapshots.toFields(),
       ...this.startGasUsed.toFields(),
       ...this.gasSettings.toFields(),
       ...this.effectiveGasFees.toFields(),
       this.feePayer,
+      this.proverId,
       ...this.publicCallRequestArrayLengths.toFields(),
       ...this.publicSetupCallRequests.map(request => request.toFields()),
       ...this.publicAppLogicCallRequests.map(request => request.toFields()),
@@ -235,11 +252,13 @@ export class AvmCircuitPublicInputs {
   static empty() {
     return new AvmCircuitPublicInputs(
       GlobalVariables.empty(),
+      ProtocolContracts.empty(),
       TreeSnapshots.empty(),
       Gas.empty(),
       GasSettings.empty(),
       GasFees.empty(),
       AztecAddress.zero(),
+      Fr.zero(),
       PublicCallRequestArrayLengths.empty(),
       makeTuple(MAX_ENQUEUED_CALLS_PER_TX, PublicCallRequest.empty),
       makeTuple(MAX_ENQUEUED_CALLS_PER_TX, PublicCallRequest.empty),
@@ -264,11 +283,13 @@ export class AvmCircuitPublicInputs {
   [inspect.custom]() {
     return `AvmCircuitPublicInputs {
       globalVariables: ${inspect(this.globalVariables)},
+      protocolContracts: ${inspect(this.protocolContracts)},
       startTreeSnapshots: ${inspect(this.startTreeSnapshots)},
       startGasUsed: ${inspect(this.startGasUsed)},
       gasSettings: ${inspect(this.gasSettings)},
       effectiveGasFees: ${inspect(this.effectiveGasFees)},
       feePayer: ${inspect(this.feePayer)},
+      proverId: ${inspect(this.proverId)},
       publicCallRequestArrayLengths: ${inspect(this.publicCallRequestArrayLengths)},
       publicSetupCallRequests: [${this.publicSetupCallRequests
         .filter(x => !x.isEmpty())

package/src/avm/index.ts

@@ -3,10 +3,10 @@ export * from './avm_accumulated_data.js';
 export * from './avm_circuit_public_inputs.js';
 export * from './revert_code.js';
 export * from './public_data_write.js';
-export * from './public_data_hint.js';
 export * from './public_data_update_request.js';
 export * from './contract_storage_update_request.js';
 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;
 }