@aztec/stdlib 0.81.0 → 0.82.1-alpha-testnet.1

package/dest/tx/tx.js

@@ -8,7 +8,8 @@ import { ContractClassLog } from '../logs/contract_class_log.js';
 import { Gossipable } from '../p2p/gossipable.js';
 import { TopicType, createTopicString } from '../p2p/topic_type.js';
 import { ClientIvcProof } from '../proofs/client_ivc_proof.js';
-import { PublicExecutionRequest } from './public_execution_request.js';
+import { HashedValues } from './hashed_values.js';
+import { PublicCallRequestWithCalldata } from './public_call_request_with_calldata.js';
 import { TxHash } from './tx_hash.js';
 /**
  * The interface of an L2 transaction.
@@ -16,25 +17,22 @@ import { TxHash } from './tx_hash.js';
     data;
     clientIvcProof;
     contractClassLogs;
-    enqueuedPublicFunctionCalls;
-    publicTeardownFunctionCall;
+    publicFunctionCalldata;
     static p2pTopic;
     // For memoization
     txHash;
+    calldataMap;
     constructor(/**
      * Output of the private kernel circuit for this tx.
      */ data, /**
      * Proof from the private kernel circuit.
      * TODO(#7368): This client IVC object currently contains various VKs that will eventually be more like static data.
-     *
      */ clientIvcProof, /**
      * Contract class logs generated by the tx.
      */ contractClassLogs, /**
-     * Enqueued public functions from the private circuit to be run by the sequencer.
-     */ enqueuedPublicFunctionCalls, /**
-     * Public function call to be run by the sequencer as part of teardown.
-     */ publicTeardownFunctionCall){
-        super(), this.data = data, this.clientIvcProof = clientIvcProof, this.contractClassLogs = contractClassLogs, this.enqueuedPublicFunctionCalls = enqueuedPublicFunctionCalls, this.publicTeardownFunctionCall = publicTeardownFunctionCall;
+     * An array of calldata for the enqueued public function calls and the teardown function call.
+     */ publicFunctionCalldata){
+        super(), this.data = data, this.clientIvcProof = clientIvcProof, this.contractClassLogs = contractClassLogs, this.publicFunctionCalldata = publicFunctionCalldata;
     }
     // Gossipable method
     static{
@@ -45,25 +43,34 @@ import { TxHash } from './tx_hash.js';
         return new Buffer32((await this.getTxHash()).toBuffer());
     }
     hasPublicCalls() {
-        return this.data.numberOfPublicCallRequests() > 0;
+        return this.numberOfPublicCalls() > 0;
     }
-    getNonRevertiblePublicExecutionRequests() {
-        const numRevertible = this.data.numberOfRevertiblePublicCallRequests();
-        return this.enqueuedPublicFunctionCalls.slice(numRevertible);
+    numberOfPublicCalls() {
+        return this.data.numberOfPublicCallRequests();
     }
-    getRevertiblePublicExecutionRequests() {
-        const numRevertible = this.data.numberOfRevertiblePublicCallRequests();
-        return this.enqueuedPublicFunctionCalls.slice(0, numRevertible);
+    getNonRevertiblePublicCallRequestsWithCalldata() {
+        return this.data.getNonRevertiblePublicCallRequests().map((r)=>this.#combinePublicCallRequestWithCallData(r));
     }
-    getPublicTeardownExecutionRequest() {
-        return this.publicTeardownFunctionCall.isEmpty() ? undefined : this.publicTeardownFunctionCall;
+    getRevertiblePublicCallRequestsWithCalldata() {
+        return this.data.getRevertiblePublicCallRequests().map((r)=>this.#combinePublicCallRequestWithCallData(r));
     }
-    getTotalPublicArgsCount() {
-        let count = this.enqueuedPublicFunctionCalls.reduce((acc, execRequest)=>acc + execRequest.args.length, 0);
-        if (!this.publicTeardownFunctionCall.isEmpty()) {
-            count += this.publicTeardownFunctionCall.args.length;
-        }
-        return count;
+    getTeardownPublicCallRequestWithCalldata() {
+        const request = this.data.getTeardownPublicCallRequest();
+        return request ? this.#combinePublicCallRequestWithCallData(request) : undefined;
+    }
+    getPublicCallRequestsWithCalldata() {
+        const teardown = this.data.getTeardownPublicCallRequest();
+        const callRequests = [
+            ...this.data.getNonRevertiblePublicCallRequests(),
+            ...this.data.getRevertiblePublicCallRequests(),
+            ...teardown ? [
+                teardown
+            ] : []
+        ];
+        return callRequests.map((r)=>this.#combinePublicCallRequestWithCallData(r));
+    }
+    getTotalPublicCalldataCount() {
+        return this.publicFunctionCalldata.reduce((accum, cd)=>accum + cd.values.length, 0);
     }
     getGasSettings() {
         return this.data.constants.txContext.gasSettings;
@@ -74,10 +81,7 @@ import { TxHash } from './tx_hash.js';
    * @returns An instance of Tx.
    */ static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new Tx(reader.readObject(PrivateKernelTailCircuitPublicInputs), reader.readObject(ClientIvcProof), reader.readVectorUint8Prefix(ContractClassLog), reader.readVectorUint8Prefix(PublicExecutionRequest), reader.readObject(PublicExecutionRequest));
-    }
-    static newWithTxData(data, publicTeardownExecutionRequest) {
-        return new Tx(data, ClientIvcProof.empty(), [], [], publicTeardownExecutionRequest ? publicTeardownExecutionRequest : PublicExecutionRequest.empty());
+        return new Tx(reader.readObject(PrivateKernelTailCircuitPublicInputs), reader.readObject(ClientIvcProof), reader.readVectorUint8Prefix(ContractClassLog), reader.readVectorUint8Prefix(HashedValues));
     }
     /**
    * Serializes the Tx object into a Buffer.
@@ -87,8 +91,7 @@ import { TxHash } from './tx_hash.js';
             this.data,
             this.clientIvcProof,
             serializeArrayOfBufferableToVector(this.contractClassLogs, 1),
-            serializeArrayOfBufferableToVector(this.enqueuedPublicFunctionCalls, 1),
-            this.publicTeardownFunctionCall
+            serializeArrayOfBufferableToVector(this.publicFunctionCalldata, 1)
         ]);
     }
     static get schema() {
@@ -96,12 +99,11 @@ import { TxHash } from './tx_hash.js';
             data: PrivateKernelTailCircuitPublicInputs.schema,
             clientIvcProof: ClientIvcProof.schema,
             contractClassLogs: z.array(ContractClassLog.schema),
-            enqueuedPublicFunctionCalls: z.array(PublicExecutionRequest.schema),
-            publicTeardownFunctionCall: PublicExecutionRequest.schema
+            publicFunctionCalldata: z.array(HashedValues.schema)
         }).transform(Tx.from);
     }
     static from(fields) {
-        return new Tx(fields.data, fields.clientIvcProof, fields.contractClassLogs, fields.enqueuedPublicFunctionCalls, fields.publicTeardownFunctionCall);
+        return new Tx(fields.data, fields.clientIvcProof, fields.contractClassLogs, fields.publicFunctionCalldata);
     }
     /**
    * Gets public logs emitted by this tx.
@@ -158,6 +160,14 @@ import { TxHash } from './tx_hash.js';
    */ setTxHash(hash) {
         this.txHash = hash;
     }
+    getCalldataMap() {
+        if (!this.calldataMap) {
+            const calldataMap = new Map();
+            this.publicFunctionCalldata.forEach((cd)=>calldataMap.set(cd.hash.toString(), cd.values));
+            this.calldataMap = calldataMap;
+        }
+        return this.calldataMap;
+    }
     /** Returns stats about this tx. */ async getStats() {
         return {
             txHash: (await this.getTxHash()).toString(),
@@ -169,13 +179,11 @@ import { TxHash } from './tx_hash.js';
             proofSize: this.clientIvcProof.clientIvcProofBuffer.length,
             size: this.toBuffer().length,
             feePaymentMethod: // needsSetup? then we pay through a fee payment contract
-            this.data.forPublic?.needsSetup ? this.data.getNonRevertiblePublicCallRequests().at(-1).functionSelector.toField().toBigInt() === 0x43417bb1n ? 'fpc_public' : 'fpc_private' : 'fee_juice'
+            this.data.forPublic?.needsSetup ? 'fpc' : 'fee_juice'
         };
     }
     getSize() {
-        return this.data.getSize() + this.clientIvcProof.clientIvcProofBuffer.length + arraySerializedSizeOfNonEmpty(this.contractClassLogs) + arraySerializedSizeOfNonEmpty(this.enqueuedPublicFunctionCalls) + arraySerializedSizeOfNonEmpty([
-            this.publicTeardownFunctionCall
-        ]);
+        return this.data.getSize() + this.clientIvcProof.clientIvcProofBuffer.length + arraySerializedSizeOfNonEmpty(this.contractClassLogs) + this.publicFunctionCalldata.reduce((accum, cd)=>accum + cd.getSize(), 0);
     }
     /**
    * Estimates the tx size based on its private effects. Note that the actual size of the tx
@@ -205,9 +213,8 @@ import { TxHash } from './tx_hash.js';
         const publicInputs = PrivateKernelTailCircuitPublicInputs.fromBuffer(tx.data.toBuffer());
         const clientIvcProof = ClientIvcProof.fromBuffer(tx.clientIvcProof.toBuffer());
         const contractClassLogs = tx.contractClassLogs.map((x)=>ContractClassLog.fromBuffer(x.toBuffer()));
-        const enqueuedPublicFunctionCalls = tx.enqueuedPublicFunctionCalls.map((x)=>PublicExecutionRequest.fromBuffer(x.toBuffer()));
-        const publicTeardownFunctionCall = PublicExecutionRequest.fromBuffer(tx.publicTeardownFunctionCall.toBuffer());
-        const clonedTx = new Tx(publicInputs, clientIvcProof, contractClassLogs, enqueuedPublicFunctionCalls, publicTeardownFunctionCall);
+        const publicFunctionCalldata = tx.publicFunctionCalldata.map((cd)=>HashedValues.fromBuffer(cd.toBuffer()));
+        const clonedTx = new Tx(publicInputs, clientIvcProof, contractClassLogs, publicFunctionCalldata);
         if (tx.txHash) {
             clonedTx.setTxHash(TxHash.fromBuffer(tx.txHash.toBuffer()));
         }
@@ -221,8 +228,8 @@ import { TxHash } from './tx_hash.js';
         return new Tx(PrivateKernelTailCircuitPublicInputs.emptyWithNullifier(), randomProof ? ClientIvcProof.random() : ClientIvcProof.empty(), [
             await ContractClassLog.random()
         ], [
-            await PublicExecutionRequest.random()
-        ], await PublicExecutionRequest.random());
+            HashedValues.random()
+        ]);
     }
     /**
    * Filters out logs from functions that are not present in the provided kernel output.
@@ -240,6 +247,13 @@ import { TxHash } from './tx_hash.js';
    */ async filterRevertedLogs() {
         this.contractClassLogs = await this.getSplitContractClassLogs(false);
     }
+    #combinePublicCallRequestWithCallData(request) {
+        const calldataMap = this.getCalldataMap();
+        // Assume empty calldata if nothing is given for the hash.
+        // The verification of calldata vs hash should be handled outside of this class.
+        const calldata = calldataMap.get(request.calldataHash.toString()) ?? [];
+        return new PublicCallRequestWithCalldata(request, calldata);
+    }
 }
 function hasHash(tx) {
     return tx.hash !== undefined;

package/dest/tx/tx_execution_request.js

@@ -108,7 +108,7 @@ import { TxRequest } from './tx_request.js';
     }
     static async random() {
         return new TxExecutionRequest(await AztecAddress.random(), FunctionSelector.random(), Fr.random(), TxContext.empty(), [
-            await HashedValues.random()
+            HashedValues.random()
         ], [
             AuthWitness.random()
         ], [

package/dest/tx/tx_receipt.d.ts

@@ -1,6 +1,4 @@
-import type { Fr } from '@aztec/foundation/fields';
 import type { FieldsOf } from '@aztec/foundation/types';
-import { PublicDataWrite } from '../avm/public_data_write.js';
 import { RevertCode } from '../avm/revert_code.js';
 import { L2BlockHash } from '../block/block_hash.js';
 import { type ZodFor } from '../schemas/schemas.js';
@@ -35,8 +33,6 @@ export declare class TxReceipt {
     blockHash?: L2BlockHash | undefined;
     /** The block number in which the transaction was included. */
     blockNumber?: number | undefined;
-    /** Information useful for testing/debugging, set when test flag is set to true in `waitOpts`. */
-    debugInfo?: DebugInfo | undefined;
     constructor(
     /** A unique identifier for a transaction. */
     txHash: TxHash, 
@@ -49,35 +45,10 @@ export declare class TxReceipt {
     /** The hash of the block containing the transaction. */
     blockHash?: L2BlockHash | undefined, 
     /** The block number in which the transaction was included. */
-    blockNumber?: number | undefined, 
-    /** Information useful for testing/debugging, set when test flag is set to true in `waitOpts`. */
-    debugInfo?: DebugInfo | undefined);
+    blockNumber?: number | undefined);
     static empty(): TxReceipt;
     static get schema(): ZodFor<TxReceipt>;
     static from(fields: FieldsOf<TxReceipt>): TxReceipt;
     static statusFromRevertCode(revertCode: RevertCode): TxStatus.SUCCESS | TxStatus.APP_LOGIC_REVERTED | TxStatus.TEARDOWN_REVERTED | TxStatus.BOTH_REVERTED;
 }
-/**
- * Information useful for debugging/testing purposes included in the receipt when the debug flag is set to true
- * in `WaitOpts`.
- */
-interface DebugInfo {
-    /**
-     * New note hashes created by the transaction.
-     */
-    noteHashes: Fr[];
-    /**
-     * New nullifiers created by the transaction.
-     */
-    nullifiers: Fr[];
-    /**
-     * New public data writes created by the transaction.
-     */
-    publicDataWrites: PublicDataWrite[];
-    /**
-     * New L2 to L1 messages created by the transaction.
-     */
-    l2ToL1Msgs: Fr[];
-}
-export {};
 //# sourceMappingURL=tx_receipt.d.ts.map

package/dest/tx/tx_receipt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tx_receipt.d.ts","sourceRoot":"","sources":["../../src/tx/tx_receipt.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAIxD,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC;;GAEG;AACH,oBAAY,QAAQ;IAClB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,kBAAkB,uBAAuB;IACzC,iBAAiB,sBAAsB;IACvC,aAAa,kBAAkB;CAChC;AAED;;;;;GAKG;AACH,qBAAa,SAAS;IAElB,6CAA6C;IACtC,MAAM,EAAE,MAAM;IACrB,gCAAgC;IACzB,MAAM,EAAE,QAAQ;IACvB,gDAAgD;IACzC,KAAK,EAAE,MAAM;IACpB,oDAAoD;IAC7C,cAAc,CAAC;IACtB,wDAAwD;IACjD,SAAS,CAAC;IACjB,8DAA8D;IACvD,WAAW,CAAC;IACnB,iGAAiG;IAC1F,SAAS,CAAC;;IAbjB,6CAA6C;IACtC,MAAM,EAAE,MAAM;IACrB,gCAAgC;IACzB,MAAM,EAAE,QAAQ;IACvB,gDAAgD;IACzC,KAAK,EAAE,MAAM;IACpB,oDAAoD;IAC7C,cAAc,CAAC,oBAAQ;IAC9B,wDAAwD;IACjD,SAAS,CAAC,yBAAa;IAC9B,8DAA8D;IACvD,WAAW,CAAC,oBAAQ;IAC3B,iGAAiG;IAC1F,SAAS,CAAC,uBAAW;IAG9B,MAAM,CAAC,KAAK;IAIZ,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,SAAS,CAAC,CAYrC;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,SAAS,CAAC;WAYzB,oBAAoB,CAAC,UAAU,EAAE,UAAU;CAa1D;AAED;;;GAGG;AACH,UAAU,SAAS;IACjB;;OAEG;IACH,UAAU,EAAE,EAAE,EAAE,CAAC;IACjB;;OAEG;IACH,UAAU,EAAE,EAAE,EAAE,CAAC;IACjB;;OAEG;IACH,gBAAgB,EAAE,eAAe,EAAE,CAAC;IACpC;;OAEG;IACH,UAAU,EAAE,EAAE,EAAE,CAAC;CAClB"}
+{"version":3,"file":"tx_receipt.d.ts","sourceRoot":"","sources":["../../src/tx/tx_receipt.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAIxD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC;;GAEG;AACH,oBAAY,QAAQ;IAClB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,kBAAkB,uBAAuB;IACzC,iBAAiB,sBAAsB;IACvC,aAAa,kBAAkB;CAChC;AAED;;;;;GAKG;AACH,qBAAa,SAAS;IAElB,6CAA6C;IACtC,MAAM,EAAE,MAAM;IACrB,gCAAgC;IACzB,MAAM,EAAE,QAAQ;IACvB,gDAAgD;IACzC,KAAK,EAAE,MAAM;IACpB,oDAAoD;IAC7C,cAAc,CAAC;IACtB,wDAAwD;IACjD,SAAS,CAAC;IACjB,8DAA8D;IACvD,WAAW,CAAC;;IAXnB,6CAA6C;IACtC,MAAM,EAAE,MAAM;IACrB,gCAAgC;IACzB,MAAM,EAAE,QAAQ;IACvB,gDAAgD;IACzC,KAAK,EAAE,MAAM;IACpB,oDAAoD;IAC7C,cAAc,CAAC,oBAAQ;IAC9B,wDAAwD;IACjD,SAAS,CAAC,yBAAa;IAC9B,8DAA8D;IACvD,WAAW,CAAC,oBAAQ;IAG7B,MAAM,CAAC,KAAK;IAIZ,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,SAAS,CAAC,CAWrC;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,SAAS,CAAC;WAWzB,oBAAoB,CAAC,UAAU,EAAE,UAAU;CAa1D"}

package/dest/tx/tx_receipt.js

@@ -1,5 +1,4 @@
 import { z } from 'zod';
-import { PublicDataWrite } from '../avm/public_data_write.js';
 import { RevertCode } from '../avm/revert_code.js';
 import { L2BlockHash } from '../block/block_hash.js';
 import { schemas } from '../schemas/schemas.js';
@@ -27,15 +26,13 @@ import { TxHash } from './tx_hash.js';
     transactionFee;
     blockHash;
     blockNumber;
-    debugInfo;
-    constructor(/** A unique identifier for a transaction. */ txHash, /** The transaction's status. */ status, /** Description of transaction error, if any. */ error, /** The transaction fee paid for the transaction. */ transactionFee, /** The hash of the block containing the transaction. */ blockHash, /** The block number in which the transaction was included. */ blockNumber, /** Information useful for testing/debugging, set when test flag is set to true in `waitOpts`. */ debugInfo){
+    constructor(/** A unique identifier for a transaction. */ txHash, /** The transaction's status. */ status, /** Description of transaction error, if any. */ error, /** The transaction fee paid for the transaction. */ transactionFee, /** The hash of the block containing the transaction. */ blockHash, /** The block number in which the transaction was included. */ blockNumber){
         this.txHash = txHash;
         this.status = status;
         this.error = error;
         this.transactionFee = transactionFee;
         this.blockHash = blockHash;
         this.blockNumber = blockNumber;
-        this.debugInfo = debugInfo;
     }
     static empty() {
         return new TxReceipt(TxHash.zero(), "dropped", '');
@@ -47,12 +44,11 @@ import { TxHash } from './tx_hash.js';
             error: z.string(),
             blockHash: L2BlockHash.schema.optional(),
             blockNumber: z.number().int().nonnegative().optional(),
-            transactionFee: schemas.BigInt.optional(),
-            debugInfo: DebugInfoSchema.optional()
+            transactionFee: schemas.BigInt.optional()
         }).transform(TxReceipt.from);
     }
     static from(fields) {
-        return new TxReceipt(fields.txHash, fields.status, fields.error, fields.transactionFee, fields.blockHash, fields.blockNumber, fields.debugInfo);
+        return new TxReceipt(fields.txHash, fields.status, fields.error, fields.transactionFee, fields.blockHash, fields.blockNumber);
     }
     static statusFromRevertCode(revertCode) {
         if (revertCode.equals(RevertCode.OK)) {
@@ -68,9 +64,3 @@ import { TxHash } from './tx_hash.js';
         }
     }
 }
-const DebugInfoSchema = z.object({
-    noteHashes: z.array(schemas.Fr),
-    nullifiers: z.array(schemas.Fr),
-    publicDataWrites: z.array(PublicDataWrite.schema),
-    l2ToL1Msgs: z.array(schemas.Fr)
-});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/stdlib",
-  "version": "0.81.0",
+  "version": "0.82.1-alpha-testnet.1",
   "type": "module",
   "inherits": [
     "../package.common.json",
@@ -13,7 +13,6 @@
     "./keys": "./dest/keys/index.js",
     "./testing": "./dest/tests/index.js",
     "./testing/fixtures": "./dest/tests/fixtures.js",
-    "./interfaces": "./dest/interfaces/index.js",
     "./network": "./dest/network/index.js",
     "./utils": "./dest/utils/index.js",
     "./types": "./dest/types/index.js",
@@ -66,11 +65,11 @@
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
   },
   "dependencies": {
-    "@aztec/bb.js": "0.81.0",
-    "@aztec/blob-lib": "0.81.0",
-    "@aztec/constants": "0.81.0",
-    "@aztec/ethereum": "0.81.0",
-    "@aztec/foundation": "0.81.0",
+    "@aztec/bb.js": "0.82.1-alpha-testnet.1",
+    "@aztec/blob-lib": "0.82.1-alpha-testnet.1",
+    "@aztec/constants": "0.82.1-alpha-testnet.1",
+    "@aztec/ethereum": "0.82.1-alpha-testnet.1",
+    "@aztec/foundation": "0.82.1-alpha-testnet.1",
     "lodash.chunk": "^4.2.0",
     "lodash.isequal": "^4.5.0",
     "lodash.omit": "^4.5.0",

package/src/abi/abi.ts

@@ -231,6 +231,11 @@ export interface FunctionArtifact extends FunctionAbi {
   debug?: FunctionDebugMetadata;
 }
 
+export interface FunctionArtifactWithContractName extends FunctionArtifact {
+  /** The name of the contract. */
+  contractName: string;
+}
+
 export const FunctionArtifactSchema = FunctionAbiSchema.and(
   z.object({
     bytecode: schemas.Buffer,
@@ -395,7 +400,7 @@ export function getFunctionArtifactByName(artifact: ContractArtifact, functionNa
 export async function getFunctionArtifact(
   artifact: ContractArtifact,
   functionNameOrSelector: string | FunctionSelector,
-): Promise<FunctionArtifact> {
+): Promise<FunctionArtifactWithContractName> {
   let functionArtifact;
   if (typeof functionNameOrSelector === 'string') {
     functionArtifact = artifact.functions.find(f => f.name === functionNameOrSelector);
@@ -416,7 +421,7 @@ export async function getFunctionArtifact(
 
   const debugMetadata = getFunctionDebugMetadata(artifact, functionArtifact);
 
-  return { ...functionArtifact, debug: debugMetadata };
+  return { ...functionArtifact, debug: debugMetadata, contractName: artifact.name };
 }
 
 /** Gets all function abis */

package/src/auth_witness/auth_witness.ts

@@ -1,7 +1,10 @@
+import { GeneratorIndex } from '@aztec/constants';
+import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
 
+import type { AztecAddress } from '../aztec-address/index.js';
 import { hexSchemaFor } from '../schemas/schemas.js';
 import { Vector } from '../types/shared.js';
 
@@ -50,3 +53,29 @@ export class AuthWitness {
     return new AuthWitness(Fr.random(), [Fr.random(), Fr.random(), Fr.random()]);
   }
 }
+
+/**
+ * Compute the inner hash for an authentication witness.
+ * This is the "intent" of the message, before siloed with the consumer.
+ * @param args - The arguments to hash
+ * @returns The inner hash for the witness
+ */
+export const computeInnerAuthWitHash = (args: Fr[]) => {
+  return poseidon2HashWithSeparator(args, GeneratorIndex.AUTHWIT_INNER);
+};
+
+/**
+ * Compute the outer hash for an authentication witness.
+ * This is the value siloed with its "consumer" and what the `on_behalf_of`
+ * should be signing.
+ * The consumer is who will be consuming the message, for token approvals it
+ * is the token contract itself (because the token makes the call to check the approval).
+ * @param consumer - The address that can "consume" the authwit
+ * @param chainId - The chain id that can "consume" the authwit
+ * @param version - The version that can "consume" the authwit
+ * @param innerHash - The inner hash for the witness
+ * @returns The outer hash for the witness
+ */
+export const computeOuterAuthWitHash = (consumer: AztecAddress, chainId: Fr, version: Fr, innerHash: Fr) => {
+  return poseidon2HashWithSeparator([consumer.toField(), chainId, version, innerHash], GeneratorIndex.AUTHWIT_OUTER);
+};

package/src/block/index.ts

@@ -1,6 +1,5 @@
 export * from './l2_block.js';
 export * from './l2_block_downloader/index.js';
-export * from './nullifier_with_block_source.js';
 export * from './in_block.js';
 export * from './body.js';
 export * from './l2_block_number.js';

package/src/block/l2_block_downloader/l2_block_stream.ts

@@ -93,8 +93,6 @@ export class L2BlockStream {
       }
 
       // Update the proven and finalized tips.
-      // TODO(palla/reorg): Should we emit this before passing the new blocks? This would allow world-state to skip
-      // building the data structures for the pending chain if it's unneeded.
       if (localTips.proven !== undefined && sourceTips.proven.number !== localTips.proven.number) {
         await this.emitEvent({ type: 'chain-proven', blockNumber: sourceTips.proven.number });
       }

package/src/block/l2_block_source.ts

@@ -97,6 +97,13 @@ export interface L2BlockSource {
    */
   getBlocksForEpoch(epochNumber: bigint): Promise<L2Block[]>;
 
+  /**
+   * Returns all block headers for a given epoch.
+   * @dev Use this method only with recent epochs, since it walks the block list backwards.
+   * @param epochNumber - The epoch number to return headers for.
+   */
+  getBlockHeadersForEpoch(epochNumber: bigint): Promise<BlockHeader[]>;
+
   /**
    * Returns whether the given epoch is completed on L1, based on the current L1 and L2 block numbers.
    * @param epochNumber - The epoch number to check.

package/src/contract/contract_class.ts

@@ -1,4 +1,3 @@
-import { PUBLIC_DISPATCH_SELECTOR } from '@aztec/constants';
 import { vkAsFieldsMegaHonk } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
 
@@ -6,7 +5,7 @@ import { type ContractArtifact, type FunctionArtifact, FunctionSelector, Functio
 import { hashVK } from '../hash/hash.js';
 import { computeArtifactHash } from './artifact_hash.js';
 import { type ContractClassIdPreimage, computeContractClassIdWithPreimage } from './contract_class_id.js';
-import type { ContractClass, ContractClassWithId, PublicFunction } from './interfaces/index.js';
+import type { ContractClass, ContractClassWithId } from './interfaces/index.js';
 
 /** Contract artifact including its artifact hash */
 type ContractArtifactWithHash = ContractArtifact & { artifactHash: Fr };
@@ -19,32 +18,16 @@ export async function getContractClassFromArtifact(
   artifact: ContractArtifact | ContractArtifactWithHash,
 ): Promise<ContractClassWithId & ContractClassIdPreimage> {
   const artifactHash = 'artifactHash' in artifact ? artifact.artifactHash : await computeArtifactHash(artifact);
-  const publicFunctions = artifact.functions.filter(f => f.functionType === FunctionType.PUBLIC);
-  // TODO(#8985): ContractArtifact.functions should ensure that the below only contains the public dispatch function
-  // So we can likely remove this and just use the below to assign the dispatch.
-  const artifactPublicFunctions: ContractClass['publicFunctions'] = await Promise.all(
-    publicFunctions.map(async f => ({
-      selector: await FunctionSelector.fromNameAndParameters(f.name, f.parameters),
-      bytecode: f.bytecode,
-    })),
-  );
-
-  artifactPublicFunctions.sort(cmpFunctionArtifacts);
 
-  let packedBytecode = Buffer.alloc(0);
-  let dispatchFunction: PublicFunction | undefined = undefined;
-  if (artifactPublicFunctions.length > 0) {
-    dispatchFunction = artifactPublicFunctions.find(f =>
-      f.selector.equals(FunctionSelector.fromField(new Fr(PUBLIC_DISPATCH_SELECTOR))),
+  const publicFunctions = artifact.functions.filter(f => f.functionType === FunctionType.PUBLIC);
+  if (publicFunctions.length > 1) {
+    throw new Error(
+      `Contract should contain at most one public function artifact. Received ${publicFunctions.length}.`,
     );
-    if (!dispatchFunction) {
-      throw new Error(
-        `A contract with public functions should define a public_dispatch(Field) function as its public entrypoint. Contract: ${artifact.name}`,
-      );
-    }
-    packedBytecode = dispatchFunction.bytecode;
   }
 
+  const packedBytecode = publicFunctions[0]?.bytecode ?? Buffer.alloc(0);
+
   const privateFunctions = artifact.functions.filter(f => f.functionType === FunctionType.PRIVATE);
   const privateArtifactFunctions: ContractClass['privateFunctions'] = await Promise.all(
     privateFunctions.map(getContractClassPrivateFunctionFromArtifact),
@@ -55,8 +38,6 @@ export async function getContractClassFromArtifact(
   const contractClass: ContractClass = {
     version: 1,
     artifactHash,
-    // TODO(https://github.com/AztecProtocol/aztec-packages/issues/8985): Remove public functions.
-    publicFunctions: dispatchFunction ? [dispatchFunction] : [],
     packedBytecode,
     privateFunctions: privateArtifactFunctions,
   };

package/src/contract/interfaces/contract_class.ts

@@ -19,9 +19,6 @@ export interface ContractClass {
   artifactHash: Fr;
   /** List of individual private functions, constructors included. */
   privateFunctions: PrivateFunction[];
-  // TODO(https://github.com/AztecProtocol/aztec-packages/issues/8985): Remove public functions.
-  /** Contains the public_dispatch function (and only that) if there's any public code in the contract. */
-  publicFunctions: PublicFunction[];
   /** Bytecode for the public_dispatch function, or empty. */
   packedBytecode: Buffer;
 }
@@ -49,19 +46,6 @@ const ExecutablePrivateFunctionSchema = PrivateFunctionSchema.and(
   z.object({ bytecode: schemas.Buffer }),
 ) satisfies ZodFor<ExecutablePrivateFunction>;
 
-/** Public function definition within a contract class. */
-export interface PublicFunction {
-  /** Selector of the function. Calculated as the hash of the method name and parameters. The specification of this is not enforced by the protocol. */
-  selector: FunctionSelector;
-  /** Public bytecode. */
-  bytecode: Buffer;
-}
-
-export const PublicFunctionSchema = z.object({
-  selector: FunctionSelector.schema,
-  bytecode: schemas.Buffer,
-}) satisfies ZodFor<PublicFunction>;
-
 /** Unconstrained function definition. */
 export interface UnconstrainedFunction {
   /** Selector of the function. Calculated as the hash of the method name and parameters. The specification of this is not enforced by the protocol. */
@@ -124,7 +108,6 @@ export const ContractClassSchema = z.object({
   version: z.literal(VERSION),
   artifactHash: schemas.Fr,
   privateFunctions: z.array(PrivateFunctionSchema),
-  publicFunctions: z.array(PublicFunctionSchema),
   packedBytecode: schemas.Buffer,
 }) satisfies ZodFor<ContractClass>;
 
@@ -151,7 +134,8 @@ export type ContractClassPublic = {
   unconstrainedFunctions: UnconstrainedFunctionWithMembershipProof[];
 } & Pick<ContractClassCommitments, 'id' | 'privateFunctionsRoot'> &
   Omit<ContractClass, 'privateFunctions'>;
-export type ContractClassWithCommitment = ContractClassPublic &
+
+export type ContractClassPublicWithCommitment = ContractClassPublic &
   Pick<ContractClassCommitments, 'publicBytecodeCommitment'>;
 
 export const ContractClassPublicSchema = z

package/src/contract/interfaces/contract_data_source.ts

@@ -1,6 +1,6 @@
 import type { Fr } from '@aztec/foundation/fields';
 
-import { FunctionSelector } from '../../abi/index.js';
+import type { FunctionSelector } from '../../abi/index.js';
 import type { AztecAddress } from '../../aztec-address/index.js';
 import type { ContractClassPublic } from './contract_class.js';
 import type { ContractInstanceWithAddress } from './contract_instance.js';
@@ -20,12 +20,6 @@ export interface ContractDataSource {
 
   getBytecodeCommitment(id: Fr): Promise<Fr | undefined>;
 
-  /**
-   * Adds a contract class to the database.
-   * TODO(#10007): Remove this method
-   */
-  addContractClass(contractClass: ContractClassPublic): Promise<void>;
-
   /**
    * Returns a publicly deployed contract instance given its address.
    * @param address - Address of the deployed contract.
@@ -38,8 +32,8 @@ export interface ContractDataSource {
    */
   getContractClassIds(): Promise<Fr[]>;
 
-  /** Returns a function's name */
-  getContractFunctionName(address: AztecAddress, selector: FunctionSelector): Promise<string | undefined>;
+  /** Returns a function's name. It's only available if provided by calling `registerContractFunctionSignatures`. */
+  getDebugFunctionName(address: AztecAddress, selector: FunctionSelector): Promise<string | undefined>;
   /** Registers a function names. Useful for debugging. */
   registerContractFunctionSignatures(address: AztecAddress, signatures: string[]): Promise<void>;
 }

package/src/database-version/version_manager.ts

@@ -3,6 +3,7 @@ import { jsonParseWithSchemaSync, jsonStringify } from '@aztec/foundation/json-r
 import { createLogger } from '@aztec/foundation/log';
 
 import fs from 'fs/promises';
+import { inspect } from 'node:util';
 import { join } from 'path';
 import { z } from 'zod';
 
@@ -59,6 +60,15 @@ export class DatabaseVersion {
       .transform(({ schemaVersion, rollupAddress }) => new DatabaseVersion(schemaVersion, rollupAddress));
   }
 
+  /** Allows for better introspection. */
+  public [inspect.custom](): string {
+    return this.toString();
+  }
+
+  public toString(): string {
+    return this.schemaVersion.toString();
+  }
+
   /**
    * Returns an empty instance
    */

package/src/hash/hash.ts

@@ -80,8 +80,9 @@ export function computePublicDataTreeLeafSlot(contractAddress: AztecAddress, sto
 
 /**
  * Computes the hash of a list of arguments.
+ * Used for input arguments or return values for private functions, or for authwit creation.
  * @param args - Arguments to hash.
- * @returns Pedersen hash of the arguments.
+ * @returns Hash of the arguments.
  */
 export function computeVarArgsHash(args: Fr[]): Promise<Fr> {
   if (args.length === 0) {
@@ -91,6 +92,19 @@ export function computeVarArgsHash(args: Fr[]): Promise<Fr> {
   return poseidon2HashWithSeparator(args, GeneratorIndex.FUNCTION_ARGS);
 }
 
+/**
+ * Computes the hash of a public function's calldata.
+ * @param calldata - Calldata to hash.
+ * @returns Hash of the calldata.
+ */
+export function computeCalldataHash(calldata: Fr[]): Promise<Fr> {
+  if (calldata.length === 0) {
+    return Promise.resolve(Fr.ZERO);
+  }
+
+  return poseidon2HashWithSeparator(calldata, GeneratorIndex.PUBLIC_CALLDATA);
+}
+
 /**
  * Computes a hash of a secret.
  * @dev This function is used to generate secrets for the L1 to L2 message flow and for the TransparentNote.