@aztec/simulator 0.40.1 → 0.42.0

package/dest/public/execution.js

@@ -69,4 +69,4 @@ export function checkValidStaticCall(newNoteHashes, newNullifiers, contractStora
         throw new Error('Static call cannot update the state, emit L2->L1 messages or generate logs');
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhlY3V0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3B1YmxpYy9leGVjdXRpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQVFMLGNBQWMsRUFDZCx1QkFBdUIsR0FHeEIsTUFBTSxvQkFBb0IsQ0FBQztBQUM1QixPQUFPLEVBQUUsNkJBQTZCLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQXdFcEc7Ozs7R0FJRztBQUNILE1BQU0sVUFBVSx1QkFBdUIsQ0FDckMsS0FBOEM7SUFFOUMsT0FBTyxXQUFXLElBQUksS0FBSyxJQUFJLEtBQUssQ0FBQyxTQUFTLEtBQUssU0FBUyxDQUFDO0FBQy9ELENBQUM7QUFFRDs7Ozs7R0FLRztBQUNILE1BQU0sVUFBVSxzQkFBc0IsQ0FBQyxVQUFpQztJQUN0RSxpSEFBaUg7SUFDakgsTUFBTSx1QkFBdUIsR0FBRyxVQUFVLENBQUMsb0JBQW9CLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQ3pFLG1DQUFtQyxDQUFDLElBQUksQ0FBQyxDQUMxQyxDQUFDO0lBQ0YsTUFBTSxRQUFRLEdBQUc7UUFDZixHQUFHLHVCQUF1QjtRQUMxQixHQUFHLENBQUMsR0FBRyxVQUFVLENBQUMsZ0JBQWdCLENBQUMsQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxzQkFBc0IsQ0FBQyxNQUFNLENBQUMsQ0FBQztLQUN0RixDQUFDO0lBQ0YsT0FBTyxRQUFRLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLGlCQUFrQixHQUFHLENBQUMsQ0FBQyxpQkFBa0IsQ0FBQyxDQUFDO0FBQzlFLENBQUM7QUFFRDs7Ozs7R0FLRztBQUNILE1BQU0sVUFBVSwrQkFBK0IsQ0FBQyxVQUFpQztJQUMvRSxpSEFBaUg7SUFDakgsTUFBTSxnQ0FBZ0MsR0FBRyxVQUFVLENBQUMsNkJBQTZCLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQzdGLHFEQUFxRCxDQUFDLE1BQU0sQ0FBQyxDQUM5RCxDQUFDO0lBQ0YsTUFBTSxRQUFRLEdBQUc7UUFDZixHQUFHLGdDQUFnQztRQUNuQyxHQUFHLENBQUMsR0FBRyxVQUFVLENBQUMsZ0JBQWdCLENBQUMsQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQywrQkFBK0IsQ0FBQyxNQUFNLENBQUMsQ0FBQztLQUMvRixDQUFDO0lBQ0YsT0FBTyxRQUFRLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLGlCQUFrQixHQUFHLENBQUMsQ0FBQyxpQkFBa0IsQ0FBQyxDQUFDO0FBQzlFLENBQUM7QUFFRDs7Ozs7R0FLRztBQUNILFNBQVMsbUNBQW1DLENBQUMsSUFBeUI7SUFDcEUsT0FBTyxJQUFJLGNBQWMsQ0FDdkIsNkJBQTZCLENBQUMsSUFBSSxDQUFDLGVBQWdCLEVBQUUsSUFBSSxDQUFDLFdBQVcsQ0FBQyxFQUN0RSwwQkFBMEIsQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLEVBQzdDLElBQUksQ0FBQyxpQkFBa0IsQ0FDeEIsQ0FBQztBQUNKLENBQUM7QUFFRDs7Ozs7R0FLRztBQUNILFNBQVMscURBQXFELENBQzVELE1BQW9DO0lBRXBDLE9BQU8sSUFBSSx1QkFBdUIsQ0FDaEMsNkJBQTZCLENBQUMsTUFBTSxDQUFDLGVBQWdCLEVBQUUsTUFBTSxDQUFDLFdBQVcsQ0FBQyxFQUMxRSwwQkFBMEIsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLEVBQzNDLE1BQU0sQ0FBQyxpQkFBa0IsQ0FDMUIsQ0FBQztBQUNKLENBQUM7QUFFRDs7O0dBR0c7QUFFSCxNQUFNLFVBQVUsb0JBQW9CLENBQ2xDLGFBQXlCLEVBQ3pCLGFBQTBCLEVBQzFCLDZCQUE2RCxFQUM3RCxpQkFBa0MsRUFDbEMsZUFBMEM7SUFFMUMsSUFDRSw2QkFBNkIsQ0FBQyxNQUFNLEdBQUcsQ0FBQztRQUN4QyxhQUFhLENBQUMsTUFBTSxHQUFHLENBQUM7UUFDeEIsYUFBYSxDQUFDLE1BQU0sR0FBRyxDQUFDO1FBQ3hCLGlCQUFpQixDQUFDLE1BQU0sR0FBRyxDQUFDO1FBQzVCLGVBQWUsQ0FBQyxJQUFJLENBQUMsTUFBTSxHQUFHLENBQUMsRUFDL0IsQ0FBQztRQUNELE1BQU0sSUFBSSxLQUFLLENBQUMsNEVBQTRFLENBQUMsQ0FBQztJQUNoRyxDQUFDO0FBQ0gsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhlY3V0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3B1YmxpYy9leGVjdXRpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQVVMLGNBQWMsRUFDZCx1QkFBdUIsR0FFeEIsTUFBTSxvQkFBb0IsQ0FBQztBQUM1QixPQUFPLEVBQUUsNkJBQTZCLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQTBFcEc7Ozs7R0FJRztBQUNILE1BQU0sVUFBVSx1QkFBdUIsQ0FDckMsS0FBOEM7SUFFOUMsT0FBTyxXQUFXLElBQUksS0FBSyxJQUFJLEtBQUssQ0FBQyxTQUFTLEtBQUssU0FBUyxDQUFDO0FBQy9ELENBQUM7QUFFRDs7Ozs7R0FLRztBQUNILE1BQU0sVUFBVSxzQkFBc0IsQ0FBQyxVQUFpQztJQUN0RSxpSEFBaUg7SUFDakgsTUFBTSx1QkFBdUIsR0FBRyxVQUFVLENBQUMsb0JBQW9CLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQ3pFLG1DQUFtQyxDQUFDLElBQUksQ0FBQyxDQUMxQyxDQUFDO0lBQ0YsTUFBTSxRQUFRLEdBQUc7UUFDZixHQUFHLHVCQUF1QjtRQUMxQixHQUFHLENBQUMsR0FBRyxVQUFVLENBQUMsZ0JBQWdCLENBQUMsQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxzQkFBc0IsQ0FBQyxNQUFNLENBQUMsQ0FBQztLQUN0RixDQUFDO0lBQ0YsT0FBTyxRQUFRLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLGlCQUFrQixHQUFHLENBQUMsQ0FBQyxpQkFBa0IsQ0FBQyxDQUFDO0FBQzlFLENBQUM7QUFFRDs7Ozs7R0FLRztBQUNILE1BQU0sVUFBVSwrQkFBK0IsQ0FBQyxVQUFpQztJQUMvRSxpSEFBaUg7SUFDakgsTUFBTSxnQ0FBZ0MsR0FBRyxVQUFVLENBQUMsNkJBQTZCLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQzdGLHFEQUFxRCxDQUFDLE1BQU0sQ0FBQyxDQUM5RCxDQUFDO0lBQ0YsTUFBTSxRQUFRLEdBQUc7UUFDZixHQUFHLGdDQUFnQztRQUNuQyxHQUFHLENBQUMsR0FBRyxVQUFVLENBQUMsZ0JBQWdCLENBQUMsQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQywrQkFBK0IsQ0FBQyxNQUFNLENBQUMsQ0FBQztLQUMvRixDQUFDO0lBQ0YsT0FBTyxRQUFRLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLGlCQUFrQixHQUFHLENBQUMsQ0FBQyxpQkFBa0IsQ0FBQyxDQUFDO0FBQzlFLENBQUM7QUFFRDs7Ozs7R0FLRztBQUNILFNBQVMsbUNBQW1DLENBQUMsSUFBeUI7SUFDcEUsT0FBTyxJQUFJLGNBQWMsQ0FDdkIsNkJBQTZCLENBQUMsSUFBSSxDQUFDLGVBQWdCLEVBQUUsSUFBSSxDQUFDLFdBQVcsQ0FBQyxFQUN0RSwwQkFBMEIsQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLEVBQzdDLElBQUksQ0FBQyxpQkFBa0IsQ0FDeEIsQ0FBQztBQUNKLENBQUM7QUFFRDs7Ozs7R0FLRztBQUNILFNBQVMscURBQXFELENBQzVELE1BQW9DO0lBRXBDLE9BQU8sSUFBSSx1QkFBdUIsQ0FDaEMsNkJBQTZCLENBQUMsTUFBTSxDQUFDLGVBQWdCLEVBQUUsTUFBTSxDQUFDLFdBQVcsQ0FBQyxFQUMxRSwwQkFBMEIsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLEVBQzNDLE1BQU0sQ0FBQyxpQkFBa0IsQ0FDMUIsQ0FBQztBQUNKLENBQUM7QUFFRDs7O0dBR0c7QUFFSCxNQUFNLFVBQVUsb0JBQW9CLENBQ2xDLGFBQXlCLEVBQ3pCLGFBQTBCLEVBQzFCLDZCQUE2RCxFQUM3RCxpQkFBa0MsRUFDbEMsZUFBMEM7SUFFMUMsSUFDRSw2QkFBNkIsQ0FBQyxNQUFNLEdBQUcsQ0FBQztRQUN4QyxhQUFhLENBQUMsTUFBTSxHQUFHLENBQUM7UUFDeEIsYUFBYSxDQUFDLE1BQU0sR0FBRyxDQUFDO1FBQ3hCLGlCQUFpQixDQUFDLE1BQU0sR0FBRyxDQUFDO1FBQzVCLGVBQWUsQ0FBQyxJQUFJLENBQUMsTUFBTSxHQUFHLENBQUMsRUFDL0IsQ0FBQztRQUNELE1BQU0sSUFBSSxLQUFLLENBQUMsNEVBQTRFLENBQUMsQ0FBQztJQUNoRyxDQUFDO0FBQ0gsQ0FBQyJ9

package/dest/public/executor.d.ts

@@ -1,12 +1,6 @@
-/// <reference types="node" resolution-mode="require"/>
-import { Fr, Gas, type GlobalVariables, type Header, type Nullifier, type TxContext } from '@aztec/circuits.js';
-import { type CommitmentsDB, type PublicContractsDB, type PublicStateDB } from './db.js';
+import { Fr, type Gas, type GlobalVariables, type Header, type Nullifier, type TxContext } from '@aztec/circuits.js';
+import { type CommitmentsDB, type PublicContractsDB, type PublicStateDB } from './db_interfaces.js';
 import { type PublicExecution, type PublicExecutionResult } from './execution.js';
-import { PublicExecutionContext } from './public_execution_context.js';
-/**
- * Execute a public function and return the execution result.
- */
-export declare function executePublicFunction(context: PublicExecutionContext, nested: boolean): Promise<PublicExecutionResult>;
 /**
  * Handles execution of public functions.
  */
@@ -16,7 +10,7 @@ export declare class PublicExecutor {
     private readonly commitmentsDb;
     private readonly header;
     constructor(stateDb: PublicStateDB, contractsDb: PublicContractsDB, commitmentsDb: CommitmentsDB, header: Header);
-    private readonly log;
+    static readonly log: import("@aztec/foundation/log").Logger;
     /**
      * Executes a public execution request.
      * @param execution - The execution to run.
@@ -24,26 +18,5 @@ export declare class PublicExecutor {
      * @returns The result of the run plus all nested runs.
      */
     simulate(execution: PublicExecution, globalVariables: GlobalVariables, availableGas: Gas, txContext: TxContext, pendingNullifiers: Nullifier[], transactionFee?: Fr, sideEffectCounter?: number): Promise<PublicExecutionResult>;
-    /**
-     * These functions are currently housed in the temporary executor as it relies on access to
-     * oracles like the contractsDB and this is the least intrusive way to achieve this.
-     * When we remove this executor(tracking issue #4792) and have an interface that is compatible with the kernel circuits,
-     * this will be moved to sequencer-client/prover.
-     */
-    /**
-     * Generates a proof for an associated avm execution. This is currently only used for testing purposes,
-     * as proof generation is not fully complete in the AVM yet.
-     * @param execution - The execution to run.
-     * @returns An AVM proof and the verification key.
-     */
-    getAvmProof(avmExecution: PublicExecution): Promise<Buffer[]>;
-    /**
-     * Verifies an AVM proof. This function is currently only used for testing purposes, as verification
-     * is not fully complete in the AVM yet.
-     * @param vk - The verification key to use.
-     * @param proof - The proof to verify.
-     * @returns True if the proof is valid, false otherwise.
-     */
-    verifyAvmProof(vk: Buffer, proof: Buffer): Promise<boolean>;
 }
 //# sourceMappingURL=executor.d.ts.map

package/dest/public/executor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../src/public/executor.ts"],"names":[],"mappings":";AACA,OAAO,EACL,EAAE,EACF,GAAG,EACH,KAAK,eAAe,EACpB,KAAK,MAAM,EACX,KAAK,SAAS,EAEd,KAAK,SAAS,EACf,MAAM,oBAAoB,CAAC;AAiB5B,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,iBAAiB,EAAE,KAAK,aAAa,EAAE,MAAM,SAAS,CAAC;AACzF,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,qBAAqB,EAAwB,MAAM,gBAAgB,CAAC;AACxG,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAGvE;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,sBAAsB,EAC/B,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,qBAAqB,CAAC,CAgBhC;AAuND;;GAEG;AACH,qBAAa,cAAc;IAEvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAHN,OAAO,EAAE,aAAa,EACtB,WAAW,EAAE,iBAAiB,EAC9B,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,MAAM;IAGjC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAwD;IAC5E;;;;;OAKG;IACU,QAAQ,CACnB,SAAS,EAAE,eAAe,EAC1B,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,GAAG,EACjB,SAAS,EAAE,SAAS,EACpB,iBAAiB,EAAE,SAAS,EAAE,EAC9B,cAAc,GAAE,EAAY,EAC5B,iBAAiB,GAAE,MAAU,GAC5B,OAAO,CAAC,qBAAqB,CAAC;IAmCjC;;;;;OAKG;IAEH;;;;;OAKG;IACU,WAAW,CAAC,YAAY,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAgE1E;;;;;;OAMG;IACG,cAAc,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAgClE"}
+{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../src/public/executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,KAAK,GAAG,EAAE,KAAK,eAAe,EAAE,KAAK,MAAM,EAAE,KAAK,SAAS,EAAE,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAQrH,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,iBAAiB,EAAE,KAAK,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACpG,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,qBAAqB,EAAwB,MAAM,gBAAgB,CAAC;AAGxG;;GAEG;AACH,qBAAa,cAAc;IAEvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAHN,OAAO,EAAE,aAAa,EACtB,WAAW,EAAE,iBAAiB,EAC9B,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,MAAM;IAGjC,MAAM,CAAC,QAAQ,CAAC,GAAG,yCAAwD;IAE3E;;;;;OAKG;IACU,QAAQ,CACnB,SAAS,EAAE,eAAe,EAC1B,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,GAAG,EACjB,SAAS,EAAE,SAAS,EACpB,iBAAiB,EAAE,SAAS,EAAE,EAC9B,cAAc,GAAE,EAAY,EAC5B,iBAAiB,GAAE,MAAU,GAC5B,OAAO,CAAC,qBAAqB,CAAC;CAkElC"}

package/dest/public/executor.js

@@ -1,183 +1,12 @@
-import { UnencryptedFunctionL2Logs } from '@aztec/circuit-types';
-import { Fr, Gas, PublicCircuitPublicInputs, } from '@aztec/circuits.js';
+import { Fr } from '@aztec/circuits.js';
 import { createDebugLogger } from '@aztec/foundation/log';
-import { spawn } from 'child_process';
-import fs from 'fs/promises';
-import path from 'path';
-import { Oracle, acvm, extractCallStack, witnessMapToFields } from '../acvm/index.js';
 import { AvmContext } from '../avm/avm_context.js';
 import { AvmMachineState } from '../avm/avm_machine_state.js';
 import { AvmSimulator } from '../avm/avm_simulator.js';
 import { HostStorage } from '../avm/journal/host_storage.js';
 import { AvmPersistableStateManager } from '../avm/journal/index.js';
-import { AcirSimulator } from '../client/simulator.js';
-import { ExecutionError, createSimulationError } from '../common/errors.js';
-import { SideEffectCounter } from '../common/index.js';
-import { PackedValuesCache } from '../common/packed_values_cache.js';
 import { checkValidStaticCall } from './execution.js';
-import { PublicExecutionContext } from './public_execution_context.js';
-import { convertAvmResultsToPxResult, createAvmExecutionEnvironment, isAvmBytecode } from './transitional_adaptors.js';
-/**
- * Execute a public function and return the execution result.
- */
-export async function executePublicFunction(context, nested) {
-    const bytecode = await context.contractsDb.getBytecode(context.execution.contractAddress, context.execution.functionData.selector);
-    if (!bytecode) {
-        throw new Error(`Bytecode not found for ${context.execution.contractAddress}:${context.execution.functionData.selector}`);
-    }
-    if (isAvmBytecode(bytecode)) {
-        return await executeTopLevelPublicFunctionAvm(context, bytecode);
-    }
-    else {
-        return await executePublicFunctionAcvm(context, bytecode, nested);
-    }
-}
-/**
- * Execute a top-level public function call (the first call in an enqueued-call/execution-request) in the AVM.
- * Translate the results back to the PublicExecutionResult format.
- */
-async function executeTopLevelPublicFunctionAvm(executionContext, bytecode) {
-    const address = executionContext.execution.contractAddress;
-    const selector = executionContext.execution.functionData.selector;
-    const startGas = executionContext.availableGas;
-    const log = createDebugLogger('aztec:simulator:public_execution');
-    log.verbose(`[AVM] Executing public external function ${address.toString()}:${selector}.`);
-    // Temporary code to construct the AVM context
-    // These data structures will permeate across the simulator when the public executor is phased out
-    const hostStorage = new HostStorage(executionContext.stateDb, executionContext.contractsDb, executionContext.commitmentsDb);
-    // TODO(6207): add sideEffectCounter to persistableState construction
-    // or modify the PersistableStateManager to manage rollbacks across enqueued-calls and transactions.
-    const worldStateJournal = new AvmPersistableStateManager(hostStorage);
-    const startSideEffectCounter = executionContext.execution.callContext.sideEffectCounter;
-    for (const nullifier of executionContext.pendingNullifiers) {
-        worldStateJournal.nullifiers.cache.appendSiloed(nullifier.value);
-    }
-    worldStateJournal.trace.accessCounter = startSideEffectCounter;
-    const executionEnv = createAvmExecutionEnvironment(executionContext.execution, executionContext.header, executionContext.globalVariables, executionContext.gasSettings, executionContext.transactionFee);
-    const machineState = new AvmMachineState(startGas);
-    const avmContext = new AvmContext(worldStateJournal, executionEnv, machineState);
-    const simulator = new AvmSimulator(avmContext);
-    const avmResult = await simulator.executeBytecode(bytecode);
-    // Commit the journals state to the DBs since this is a top-level execution.
-    // Observe that this will write all the state changes to the DBs, not only the latest for each slot.
-    // However, the underlying DB keep a cache and will only write the latest state to disk.
-    await avmContext.persistableState.publicStorage.commitToDB();
-    log.verbose(`[AVM] ${address.toString()}:${selector} returned, reverted: ${avmResult.reverted}, reason: ${avmResult.revertReason}.`);
-    return convertAvmResultsToPxResult(avmResult, startSideEffectCounter, executionContext.execution, startGas, avmContext);
-}
-async function executePublicFunctionAcvm(context, acir, nested) {
-    const execution = context.execution;
-    const { contractAddress, functionData } = execution;
-    const selector = functionData.selector;
-    const log = createDebugLogger('aztec:simulator:public_execution');
-    log.verbose(`[ACVM] Executing public external function ${contractAddress.toString()}:${selector}.`);
-    const initialWitness = context.getInitialWitness();
-    const acvmCallback = new Oracle(context);
-    const { partialWitness, returnWitnessMap, reverted, revertReason } = await (async () => {
-        try {
-            const result = await acvm(await AcirSimulator.getSolver(), acir, initialWitness, acvmCallback);
-            return {
-                partialWitness: result.partialWitness,
-                returnWitnessMap: result.returnWitness,
-                reverted: false,
-                revertReason: undefined,
-            };
-        }
-        catch (err_) {
-            const err = err_;
-            const ee = new ExecutionError(err.message, {
-                contractAddress,
-                functionSelector: selector,
-            }, extractCallStack(err), { cause: err });
-            if (nested) {
-                // If we're nested, throw the error so the parent can handle it
-                throw ee;
-            }
-            else {
-                return {
-                    partialWitness: undefined,
-                    returnWitnessMap: undefined,
-                    reverted: true,
-                    revertReason: createSimulationError(ee),
-                };
-            }
-        }
-    })();
-    if (reverted) {
-        return {
-            execution,
-            returnValues: [],
-            newNoteHashes: [],
-            newL2ToL1Messages: [],
-            // TODO (side effects) get these values in the revert case from the vm
-            startSideEffectCounter: Fr.ZERO,
-            endSideEffectCounter: Fr.ZERO,
-            newNullifiers: [],
-            nullifierReadRequests: [],
-            nullifierNonExistentReadRequests: [],
-            contractStorageReads: [],
-            contractStorageUpdateRequests: [],
-            nestedExecutions: [],
-            unencryptedLogsHashes: [],
-            unencryptedLogs: UnencryptedFunctionL2Logs.empty(),
-            unencryptedLogPreimagesLength: new Fr(4n), // empty logs have len 4
-            allUnencryptedLogs: UnencryptedFunctionL2Logs.empty(),
-            reverted,
-            revertReason,
-            startGasLeft: context.availableGas,
-            endGasLeft: Gas.empty(),
-            transactionFee: context.transactionFee,
-        };
-    }
-    if (!partialWitness) {
-        throw new Error('No partial witness returned from ACVM');
-    }
-    const returnWitness = witnessMapToFields(returnWitnessMap);
-    const { returnsHash, nullifierReadRequests: nullifierReadRequestsPadded, nullifierNonExistentReadRequests: nullifierNonExistentReadRequestsPadded, newL2ToL1Msgs, newNoteHashes: newNoteHashesPadded, newNullifiers: newNullifiersPadded, startSideEffectCounter, endSideEffectCounter, unencryptedLogsHashes: unencryptedLogsHashesPadded, unencryptedLogPreimagesLength, } = PublicCircuitPublicInputs.fromFields(returnWitness);
-    const returnValues = await context.unpackReturns(returnsHash);
-    const nullifierReadRequests = nullifierReadRequestsPadded.filter(v => !v.isEmpty());
-    const nullifierNonExistentReadRequests = nullifierNonExistentReadRequestsPadded.filter(v => !v.isEmpty());
-    const newL2ToL1Messages = newL2ToL1Msgs.filter(v => !v.isEmpty());
-    const newNoteHashes = newNoteHashesPadded.filter(v => !v.isEmpty());
-    const newNullifiers = newNullifiersPadded.filter(v => !v.isEmpty());
-    const unencryptedLogsHashes = unencryptedLogsHashesPadded.filter(v => !v.isEmpty());
-    const { contractStorageReads, contractStorageUpdateRequests } = context.getStorageActionData();
-    log.debug(`Contract storage reads: ${contractStorageReads
-        .map(r => r.toFriendlyJSON() + ` - sec: ${r.sideEffectCounter}`)
-        .join(', ')}`);
-    log.debug(`Contract storage update requests: ${contractStorageUpdateRequests
-        .map(r => r.toFriendlyJSON() + ` - sec: ${r.sideEffectCounter}`)
-        .join(', ')}`);
-    const nestedExecutions = context.getNestedExecutions();
-    const unencryptedLogs = context.getUnencryptedLogs();
-    const allUnencryptedLogs = context.getAllUnencryptedLogs();
-    // TODO(palla/gas): We should be loading these values from the returned PublicCircuitPublicInputs
-    const startGasLeft = context.availableGas;
-    const endGasLeft = context.availableGas; // No gas consumption in non-AVM
-    return {
-        execution,
-        newNoteHashes,
-        newL2ToL1Messages,
-        newNullifiers,
-        startSideEffectCounter,
-        endSideEffectCounter,
-        nullifierReadRequests,
-        nullifierNonExistentReadRequests,
-        contractStorageReads,
-        contractStorageUpdateRequests,
-        returnValues,
-        nestedExecutions,
-        unencryptedLogsHashes,
-        unencryptedLogs,
-        unencryptedLogPreimagesLength,
-        allUnencryptedLogs,
-        reverted: false,
-        revertReason: undefined,
-        startGasLeft,
-        endGasLeft,
-        transactionFee: context.transactionFee,
-    };
-}
+import { convertAvmResultsToPxResult, createAvmExecutionEnvironment } from './transitional_adaptors.js';
 /**
  * Handles execution of public functions.
  */
@@ -187,7 +16,6 @@ export class PublicExecutor {
         this.contractsDb = contractsDb;
         this.commitmentsDb = commitmentsDb;
         this.header = header;
-        this.log = createDebugLogger('aztec:simulator:public_executor');
     }
     /**
      * Executes a public execution request.
@@ -196,113 +24,38 @@ export class PublicExecutor {
      * @returns The result of the run plus all nested runs.
      */
     async simulate(execution, globalVariables, availableGas, txContext, pendingNullifiers, transactionFee = Fr.ZERO, sideEffectCounter = 0) {
-        // Functions can request to pack arguments before calling other functions.
-        // We use this cache to hold the packed arguments.
-        const packedArgs = PackedValuesCache.create([]);
-        const context = new PublicExecutionContext(execution, this.header, globalVariables, packedArgs, new SideEffectCounter(sideEffectCounter), this.stateDb, this.contractsDb, this.commitmentsDb, availableGas, transactionFee, txContext.gasSettings, pendingNullifiers);
-        const executionResult = await executePublicFunction(context, /*nested=*/ false);
-        if (executionResult.execution.callContext.isStaticCall) {
+        const address = execution.contractAddress;
+        const selector = execution.functionSelector;
+        const startGas = availableGas;
+        PublicExecutor.log.verbose(`[AVM] Executing public external function ${address.toString()}:${selector}.`);
+        // Temporary code to construct the AVM context
+        // These data structures will permeate across the simulator when the public executor is phased out
+        const hostStorage = new HostStorage(this.stateDb, this.contractsDb, this.commitmentsDb);
+        const startSideEffectCounter = sideEffectCounter;
+        const worldStateJournal = new AvmPersistableStateManager(hostStorage);
+        for (const nullifier of pendingNullifiers) {
+            worldStateJournal.nullifiers.cache.appendSiloed(nullifier.value);
+        }
+        // All the subsequent side effects will have a counter larger than the call's start counter.
+        worldStateJournal.trace.accessCounter = startSideEffectCounter + 1;
+        const executionEnv = createAvmExecutionEnvironment(execution, this.header, globalVariables, txContext.gasSettings, transactionFee);
+        const machineState = new AvmMachineState(startGas);
+        const avmContext = new AvmContext(worldStateJournal, executionEnv, machineState);
+        const simulator = new AvmSimulator(avmContext);
+        const avmResult = await simulator.execute();
+        // Commit the journals state to the DBs since this is a top-level execution.
+        // Observe that this will write all the state changes to the DBs, not only the latest for each slot.
+        // However, the underlying DB keep a cache and will only write the latest state to disk.
+        await avmContext.persistableState.publicStorage.commitToDB();
+        PublicExecutor.log.verbose(`[AVM] ${address.toString()}:${selector} returned, reverted: ${avmResult.reverted}, reason: ${avmResult.revertReason}.`);
+        const executionResult = convertAvmResultsToPxResult(avmResult, startSideEffectCounter, execution, startGas, avmContext, simulator.getBytecode());
+        // TODO(https://github.com/AztecProtocol/aztec-packages/issues/5818): is this really needed?
+        // should already be handled in simulation.
+        if (execution.callContext.isStaticCall) {
             checkValidStaticCall(executionResult.newNoteHashes, executionResult.newNullifiers, executionResult.contractStorageUpdateRequests, executionResult.newL2ToL1Messages, executionResult.unencryptedLogs);
         }
         return executionResult;
     }
-    /**
-     * These functions are currently housed in the temporary executor as it relies on access to
-     * oracles like the contractsDB and this is the least intrusive way to achieve this.
-     * When we remove this executor(tracking issue #4792) and have an interface that is compatible with the kernel circuits,
-     * this will be moved to sequencer-client/prover.
-     */
-    /**
-     * Generates a proof for an associated avm execution. This is currently only used for testing purposes,
-     * as proof generation is not fully complete in the AVM yet.
-     * @param execution - The execution to run.
-     * @returns An AVM proof and the verification key.
-     */
-    async getAvmProof(avmExecution) {
-        // The paths for the barretenberg binary and the write path are hardcoded for now.
-        const bbPath = path.resolve('../../barretenberg/cpp');
-        const artifactsPath = path.resolve('target');
-        // Create the directory if it does not exist
-        await fs.rm(artifactsPath, { recursive: true, force: true });
-        await fs.mkdir(artifactsPath, { recursive: true });
-        const calldataPath = path.join(artifactsPath, 'calldata.bin');
-        const bytecodePath = path.join(artifactsPath, 'avm_bytecode.bin');
-        const proofPath = path.join(artifactsPath, 'proof');
-        const { args, functionData, contractAddress } = avmExecution;
-        const bytecode = await this.contractsDb.getBytecode(contractAddress, functionData.selector);
-        // Write call data and bytecode to files.
-        await fs.writeFile(calldataPath, args.map(c => c.toBuffer()));
-        await fs.writeFile(bytecodePath, bytecode);
-        const bbExec = path.join(bbPath, 'build', 'bin', 'bb');
-        const bbArgs = ['avm_prove', '-b', bytecodePath, '-d', calldataPath, '-o', proofPath];
-        this.log.debug(`calling '${bbExec} ${bbArgs.join(' ')}'`);
-        const bbBinary = spawn(bbExec, bbArgs);
-        // The binary writes the proof and the verification key to the write path.
-        return new Promise((resolve, reject) => {
-            let stdout = '';
-            let stderr = '';
-            bbBinary.on('close', () => {
-                this.log.verbose(`Proof generation complete. Reading proof and vk from ${proofPath}.`);
-                return resolve(Promise.all([fs.readFile(proofPath), fs.readFile(path.join(artifactsPath, 'vk'))]));
-            });
-            // Catch stdout.
-            bbBinary.stdout.on('data', (data) => {
-                stdout += data.toString();
-            });
-            bbBinary.stdout.on('end', () => {
-                if (stdout.length > 0) {
-                    this.log.debug(`stdout: ${stdout}`);
-                }
-            });
-            // Catch stderr.
-            bbBinary.stderr.on('data', (data) => {
-                stderr += data.toString();
-            });
-            bbBinary.stderr.on('end', () => {
-                if (stderr.length > 0) {
-                    this.log.warn(`stderr: ${stderr}`);
-                }
-            });
-            // Catch and propagate errors from spawning
-            bbBinary.on('error', err => {
-                reject(err);
-            });
-        });
-    }
-    /**
-     * Verifies an AVM proof. This function is currently only used for testing purposes, as verification
-     * is not fully complete in the AVM yet.
-     * @param vk - The verification key to use.
-     * @param proof - The proof to verify.
-     * @returns True if the proof is valid, false otherwise.
-     */
-    async verifyAvmProof(vk, proof) {
-        // The relative paths for the barretenberg binary and the write path are hardcoded for now.
-        const bbPath = path.resolve('../../barretenberg/cpp');
-        const artifactsPath = path.resolve('./target');
-        const vkPath = path.join(artifactsPath, 'vk');
-        const proofPath = path.join(artifactsPath, 'proof');
-        // Write the verification key and the proof to files.
-        await fs.writeFile(vkPath, vk);
-        await fs.writeFile(proofPath, proof);
-        const bbExec = path.join(bbPath, 'build', 'bin', 'bb');
-        const bbArgs = ['avm_verify', '-p', proofPath];
-        this.log.debug(`calling '${bbPath} ${bbArgs.join(' ')}'`);
-        const bbBinary = spawn(bbExec, bbArgs);
-        // The binary prints to stdout 1 if the proof is valid and 0 if it is not.
-        return new Promise((resolve, reject) => {
-            let result = Buffer.alloc(0);
-            bbBinary.stdout.on('data', data => {
-                result += data;
-            });
-            bbBinary.on('close', () => {
-                resolve(result.toString() === '1');
-            });
-            // Catch and propagate errors from spawning
-            bbBinary.on('error', err => {
-                reject(err);
-            });
-        });
-    }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../src/public/executor.ts"],"names":[],"mappings":"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"}
+PublicExecutor.log = createDebugLogger('aztec:simulator:public_executor');
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhlY3V0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHVibGljL2V4ZWN1dG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxFQUFFLEVBQStFLE1BQU0sb0JBQW9CLENBQUM7QUFDckgsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFMUQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ25ELE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUM5RCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDdkQsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQzdELE9BQU8sRUFBRSwwQkFBMEIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRXJFLE9BQU8sRUFBb0Qsb0JBQW9CLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUN4RyxPQUFPLEVBQUUsMkJBQTJCLEVBQUUsNkJBQTZCLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUV4Rzs7R0FFRztBQUNILE1BQU0sT0FBTyxjQUFjO0lBQ3pCLFlBQ21CLE9BQXNCLEVBQ3RCLFdBQThCLEVBQzlCLGFBQTRCLEVBQzVCLE1BQWM7UUFIZCxZQUFPLEdBQVAsT0FBTyxDQUFlO1FBQ3RCLGdCQUFXLEdBQVgsV0FBVyxDQUFtQjtRQUM5QixrQkFBYSxHQUFiLGFBQWEsQ0FBZTtRQUM1QixXQUFNLEdBQU4sTUFBTSxDQUFRO0lBQzlCLENBQUM7SUFJSjs7Ozs7T0FLRztJQUNJLEtBQUssQ0FBQyxRQUFRLENBQ25CLFNBQTBCLEVBQzFCLGVBQWdDLEVBQ2hDLFlBQWlCLEVBQ2pCLFNBQW9CLEVBQ3BCLGlCQUE4QixFQUM5QixpQkFBcUIsRUFBRSxDQUFDLElBQUksRUFDNUIsb0JBQTRCLENBQUM7UUFFN0IsTUFBTSxPQUFPLEdBQUcsU0FBUyxDQUFDLGVB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

package/dest/public/fee_payment.d.ts

@@ -0,0 +1,11 @@
+import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { Fr } from '@aztec/foundation/fields';
+/**
+ * Computes the storage slot within the gas token contract for the balance of the fee payer.
+ */
+export declare function computeFeePayerBalanceStorageSlot(feePayer: AztecAddress): Fr;
+/**
+ * Computes the leaf slot in the public data tree for the balance of the fee payer in the gas token.
+ */
+export declare function computeFeePayerBalanceLeafSlot(feePayer: AztecAddress): Fr;
+//# sourceMappingURL=fee_payment.d.ts.map

package/dest/public/fee_payment.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fee_payment.d.ts","sourceRoot":"","sources":["../../src/public/fee_payment.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAK9C;;GAEG;AACH,wBAAgB,iCAAiC,CAAC,QAAQ,EAAE,YAAY,MAEvE;AAED;;GAEG;AACH,wBAAgB,8BAA8B,CAAC,QAAQ,EAAE,YAAY,GAAG,EAAE,CAOzE"}

package/dest/public/fee_payment.js

@@ -0,0 +1,24 @@
+import { GAS_TOKEN_ADDRESS } from '@aztec/circuits.js';
+import { computePublicDataTreeLeafSlot } from '@aztec/circuits.js/hash';
+import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { Fr } from '@aztec/foundation/fields';
+import { GasTokenArtifact } from '@aztec/protocol-contracts/gas-token';
+import { computeSlotForMapping } from '../utils.js';
+/**
+ * Computes the storage slot within the gas token contract for the balance of the fee payer.
+ */
+export function computeFeePayerBalanceStorageSlot(feePayer) {
+    return computeSlotForMapping(GasTokenArtifact.storageLayout.balances.slot, feePayer);
+}
+/**
+ * Computes the leaf slot in the public data tree for the balance of the fee payer in the gas token.
+ */
+export function computeFeePayerBalanceLeafSlot(feePayer) {
+    if (feePayer.isZero()) {
+        return Fr.ZERO;
+    }
+    const gasToken = AztecAddress.fromBigInt(GAS_TOKEN_ADDRESS);
+    const balanceSlot = computeFeePayerBalanceStorageSlot(feePayer);
+    return computePublicDataTreeLeafSlot(gasToken, balanceSlot);
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmVlX3BheW1lbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHVibGljL2ZlZV9wYXltZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ3ZELE9BQU8sRUFBRSw2QkFBNkIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ3hFLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUMvRCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDOUMsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFFdkUsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sYUFBYSxDQUFDO0FBRXBEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLGlDQUFpQyxDQUFDLFFBQXNCO0lBQ3RFLE9BQU8scUJBQXFCLENBQUMsZ0JBQWdCLENBQUMsYUFBYSxDQUFDLFFBQVEsQ0FBQyxJQUFJLEVBQUUsUUFBUSxDQUFDLENBQUM7QUFDdkYsQ0FBQztBQUVEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLDhCQUE4QixDQUFDLFFBQXNCO0lBQ25FLElBQUksUUFBUSxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUM7UUFDdEIsT0FBTyxFQUFFLENBQUMsSUFBSSxDQUFDO0lBQ2pCLENBQUM7SUFDRCxNQUFNLFFBQVEsR0FBRyxZQUFZLENBQUMsVUFBVSxDQUFDLGlCQUFpQixDQUFDLENBQUM7SUFDNUQsTUFBTSxXQUFXLEdBQUcsaUNBQWlDLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDaEUsT0FBTyw2QkFBNkIsQ0FBQyxRQUFRLEVBQUUsV0FBVyxDQUFDLENBQUM7QUFDOUQsQ0FBQyJ9

package/dest/public/hints_builder.d.ts

@@ -1,12 +1,13 @@
-import { type Fr, type MAX_NEW_NULLIFIERS_PER_TX, type MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX, type MAX_NULLIFIER_READ_REQUESTS_PER_TX, type MAX_PUBLIC_DATA_HINTS, type MAX_PUBLIC_DATA_READS_PER_TX, type MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, MembershipWitness, type Nullifier, type PublicDataHint, type PublicDataRead, type PublicDataTreeLeafPreimage, type PublicDataUpdateRequest, type ScopedReadRequest } from '@aztec/circuits.js';
+import { type Fr, type MAX_NEW_NULLIFIERS_PER_TX, type MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX, MAX_NULLIFIER_READ_REQUESTS_PER_TX, type MAX_PUBLIC_DATA_HINTS, type MAX_PUBLIC_DATA_READS_PER_TX, type MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, MembershipWitness, type Nullifier, type PublicDataHint, type PublicDataRead, type PublicDataTreeLeafPreimage, type PublicDataUpdateRequest, type ScopedReadRequest } from '@aztec/circuits.js';
 import { type Tuple } from '@aztec/foundation/serialize';
 import { type MerkleTreeOperations } from '@aztec/world-state';
 export declare class HintsBuilder {
     private db;
     constructor(db: MerkleTreeOperations);
-    getNullifierReadRequestHints(nullifierReadRequests: Tuple<ScopedReadRequest, typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX>, pendingNullifiers: Tuple<Nullifier, typeof MAX_NEW_NULLIFIERS_PER_TX>): Promise<import("@aztec/circuits.js").NullifierReadRequestHints>;
+    getNullifierReadRequestHints(nullifierReadRequests: Tuple<ScopedReadRequest, typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX>, pendingNullifiers: Tuple<Nullifier, typeof MAX_NEW_NULLIFIERS_PER_TX>): Promise<import("@aztec/circuits.js").NullifierReadRequestHints<128, 128>>;
     getNullifierNonExistentReadRequestHints(nullifierNonExistentReadRequests: Tuple<ScopedReadRequest, typeof MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX>, pendingNullifiers: Tuple<Nullifier, typeof MAX_NEW_NULLIFIERS_PER_TX>): Promise<import("@aztec/circuits.js").NullifierNonExistentReadRequestHints>;
     getPublicDataHints(publicDataReads: Tuple<PublicDataRead, typeof MAX_PUBLIC_DATA_READS_PER_TX>, publicDataUpdateRequests: Tuple<PublicDataUpdateRequest, typeof MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX>): Promise<[PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint]>;
+    getPublicDataHint(dataAction: PublicDataRead | PublicDataUpdateRequest | bigint): Promise<PublicDataHint>;
     getPublicDataReadRequestHints(publicDataReads: Tuple<PublicDataRead, typeof MAX_PUBLIC_DATA_READS_PER_TX>, publicDataUpdateRequests: Tuple<PublicDataUpdateRequest, typeof MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX>, publicDataHints: Tuple<PublicDataHint, typeof MAX_PUBLIC_DATA_HINTS>): import("@aztec/circuits.js").PublicDataReadRequestHints;
     getNullifierMembershipWitness(nullifier: Fr): Promise<{
         membershipWitness: MembershipWitness<20>;

package/dest/public/hints_builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hints_builder.d.ts","sourceRoot":"","sources":["../../src/public/hints_builder.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,EAAE,EACP,KAAK,yBAAyB,EAC9B,KAAK,+CAA+C,EACpD,KAAK,kCAAkC,EACvC,KAAK,qBAAqB,EAC1B,KAAK,4BAA4B,EACjC,KAAK,sCAAsC,EAC3C,iBAAiB,EAEjB,KAAK,SAAS,EAEd,KAAK,cAAc,EACnB,KAAK,cAAc,EACnB,KAAK,0BAA0B,EAC/B,KAAK,uBAAuB,EAC5B,KAAK,iBAAiB,EAKvB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAsB,KAAK,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAEnF,qBAAa,YAAY;IACX,OAAO,CAAC,EAAE;gBAAF,EAAE,EAAE,oBAAoB;IAE5C,4BAA4B,CAC1B,qBAAqB,EAAE,KAAK,CAAC,iBAAiB,EAAE,OAAO,kCAAkC,CAAC,EAC1F,iBAAiB,EAAE,KAAK,CAAC,SAAS,EAAE,OAAO,yBAAyB,CAAC;IAKvE,uCAAuC,CACrC,gCAAgC,EAAE,KAAK,CAAC,iBAAiB,EAAE,OAAO,+CAA+C,CAAC,EAClH,iBAAiB,EAAE,KAAK,CAAC,SAAS,EAAE,OAAO,yBAAyB,CAAC;IAKvE,kBAAkB,CAChB,eAAe,EAAE,KAAK,CAAC,cAAc,EAAE,OAAO,4BAA4B,CAAC,EAC3E,wBAAwB,EAAE,KAAK,CAAC,uBAAuB,EAAE,OAAO,sCAAsC,CAAC;IAKzG,6BAA6B,CAC3B,eAAe,EAAE,KAAK,CAAC,cAAc,EAAE,OAAO,4BAA4B,CAAC,EAC3E,wBAAwB,EAAE,KAAK,CAAC,uBAAuB,EAAE,OAAO,sCAAsC,CAAC,EACvG,eAAe,EAAE,KAAK,CAAC,cAAc,EAAE,OAAO,qBAAqB,CAAC;IAKhE,6BAA6B,CAAC,SAAS,EAAE,EAAE;;;;IAa3C,gCAAgC,CAAC,SAAS,EAAE,EAAE;;;;IAkB9C,wCAAwC,CAAC,QAAQ,EAAE,MAAM;;;;YAcjD,gCAAgC;CAe/C"}
+{"version":3,"file":"hints_builder.d.ts","sourceRoot":"","sources":["../../src/public/hints_builder.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,EAAE,EACP,KAAK,yBAAyB,EAC9B,KAAK,+CAA+C,EACpD,kCAAkC,EAClC,KAAK,qBAAqB,EAC1B,KAAK,4BAA4B,EACjC,KAAK,sCAAsC,EAC3C,iBAAiB,EAEjB,KAAK,SAAS,EAEd,KAAK,cAAc,EACnB,KAAK,cAAc,EACnB,KAAK,0BAA0B,EAC/B,KAAK,uBAAuB,EAC5B,KAAK,iBAAiB,EAMvB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAsB,KAAK,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAEnF,qBAAa,YAAY;IACX,OAAO,CAAC,EAAE;gBAAF,EAAE,EAAE,oBAAoB;IAEtC,4BAA4B,CAChC,qBAAqB,EAAE,KAAK,CAAC,iBAAiB,EAAE,OAAO,kCAAkC,CAAC,EAC1F,iBAAiB,EAAE,KAAK,CAAC,SAAS,EAAE,OAAO,yBAAyB,CAAC;IAavE,uCAAuC,CACrC,gCAAgC,EAAE,KAAK,CAAC,iBAAiB,EAAE,OAAO,+CAA+C,CAAC,EAClH,iBAAiB,EAAE,KAAK,CAAC,SAAS,EAAE,OAAO,yBAAyB,CAAC;IAKvE,kBAAkB,CAChB,eAAe,EAAE,KAAK,CAAC,cAAc,EAAE,OAAO,4BAA4B,CAAC,EAC3E,wBAAwB,EAAE,KAAK,CAAC,uBAAuB,EAAE,OAAO,sCAAsC,CAAC;IAKzG,iBAAiB,CAAC,UAAU,EAAE,cAAc,GAAG,uBAAuB,GAAG,MAAM;IAK/E,6BAA6B,CAC3B,eAAe,EAAE,KAAK,CAAC,cAAc,EAAE,OAAO,4BAA4B,CAAC,EAC3E,wBAAwB,EAAE,KAAK,CAAC,uBAAuB,EAAE,OAAO,sCAAsC,CAAC,EACvG,eAAe,EAAE,KAAK,CAAC,cAAc,EAAE,OAAO,qBAAqB,CAAC;IAKhE,6BAA6B,CAAC,SAAS,EAAE,EAAE;;;;IAa3C,gCAAgC,CAAC,SAAS,EAAE,EAAE;;;;IAkB9C,wCAAwC,CAAC,QAAQ,EAAE,MAAM;;;;YAcjD,gCAAgC;CAe/C"}

package/dest/public/hints_builder.js

@@ -1,11 +1,11 @@
 import { MerkleTreeId } from '@aztec/circuit-types';
-import { MembershipWitness, NULLIFIER_TREE_HEIGHT, PUBLIC_DATA_TREE_HEIGHT, buildNullifierNonExistentReadRequestHints, buildPublicDataHints, buildPublicDataReadRequestHints, buildSiloedNullifierReadRequestHints, } from '@aztec/circuits.js';
+import { MAX_NULLIFIER_READ_REQUESTS_PER_TX, MembershipWitness, NULLIFIER_TREE_HEIGHT, PUBLIC_DATA_TREE_HEIGHT, buildNullifierNonExistentReadRequestHints, buildPublicDataHint, buildPublicDataHints, buildPublicDataReadRequestHints, buildSiloedNullifierReadRequestHints, } from '@aztec/circuits.js';
 export class HintsBuilder {
     constructor(db) {
         this.db = db;
     }
-    getNullifierReadRequestHints(nullifierReadRequests, pendingNullifiers) {
-        return buildSiloedNullifierReadRequestHints(this, nullifierReadRequests, pendingNullifiers);
+    async getNullifierReadRequestHints(nullifierReadRequests, pendingNullifiers) {
+        return (await buildSiloedNullifierReadRequestHints(this, nullifierReadRequests, pendingNullifiers, MAX_NULLIFIER_READ_REQUESTS_PER_TX, MAX_NULLIFIER_READ_REQUESTS_PER_TX)).hints;
     }
     getNullifierNonExistentReadRequestHints(nullifierNonExistentReadRequests, pendingNullifiers) {
         return buildNullifierNonExistentReadRequestHints(this, nullifierNonExistentReadRequests, pendingNullifiers);
@@ -13,6 +13,10 @@ export class HintsBuilder {
     getPublicDataHints(publicDataReads, publicDataUpdateRequests) {
         return buildPublicDataHints(this, publicDataReads, publicDataUpdateRequests);
     }
+    getPublicDataHint(dataAction) {
+        const slot = typeof dataAction === 'bigint' ? dataAction : dataAction.leafSlot.toBigInt();
+        return buildPublicDataHint(this, slot);
+    }
     getPublicDataReadRequestHints(publicDataReads, publicDataUpdateRequests, publicDataHints) {
         return buildPublicDataReadRequestHints(publicDataReads, publicDataUpdateRequests, publicDataHints);
     }
@@ -53,4 +57,4 @@ export class HintsBuilder {
         return { membershipWitness, leafPreimage };
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGludHNfYnVpbGRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wdWJsaWMvaGludHNfYnVpbGRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDcEQsT0FBTyxFQVFMLGlCQUFpQixFQUNqQixxQkFBcUIsRUFFckIsdUJBQXVCLEVBTXZCLHlDQUF5QyxFQUN6QyxvQkFBb0IsRUFDcEIsK0JBQStCLEVBQy9CLG9DQUFvQyxHQUNyQyxNQUFNLG9CQUFvQixDQUFDO0FBSTVCLE1BQU0sT0FBTyxZQUFZO0lBQ3ZCLFlBQW9CLEVBQXdCO1FBQXhCLE9BQUUsR0FBRixFQUFFLENBQXNCO0lBQUcsQ0FBQztJQUVoRCw0QkFBNEIsQ0FDMUIscUJBQTBGLEVBQzFGLGlCQUFxRTtRQUVyRSxPQUFPLG9DQUFvQyxDQUFDLElBQUksRUFBRSxxQkFBcUIsRUFBRSxpQkFBaUIsQ0FBQyxDQUFDO0lBQzlGLENBQUM7SUFFRCx1Q0FBdUMsQ0FDckMsZ0NBQWtILEVBQ2xILGlCQUFxRTtRQUVyRSxPQUFPLHlDQUF5QyxDQUFDLElBQUksRUFBRSxnQ0FBZ0MsRUFBRSxpQkFBaUIsQ0FBQyxDQUFDO0lBQzlHLENBQUM7SUFFRCxrQkFBa0IsQ0FDaEIsZUFBMkUsRUFDM0Usd0JBQXVHO1FBRXZHLE9BQU8sb0JBQW9CLENBQUMsSUFBSSxFQUFFLGVBQWUsRUFBRSx3QkFBd0IsQ0FBQyxDQUFDO0lBQy9FLENBQUM7SUFFRCw2QkFBNkIsQ0FDM0IsZUFBMkUsRUFDM0Usd0JBQXVHLEVBQ3ZHLGVBQW9FO1FBRXBFLE9BQU8sK0JBQStCLENBQUMsZUFBZSxFQUFFLHdCQUF3QixFQUFFLGVBQWUsQ0FBQyxDQUFDO0lBQ3JHLENBQUM7SUFFRCxLQUFLLENBQUMsNkJBQTZCLENBQUMsU0FBYTtRQUMvQyxNQUFNLEtBQUssR0FBRyxNQUFNLElBQUksQ0FBQyxFQUFFLENBQUMsYUFB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGludHNfYnVpbGRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wdWJsaWMvaGludHNfYnVpbGRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDcEQsT0FBTyxFQUlMLGtDQUFrQyxFQUlsQyxpQkFBaUIsRUFDakIscUJBQXFCLEVBRXJCLHVCQUF1QixFQU12Qix5Q0FBeUMsRUFDekMsbUJBQW1CLEVBQ25CLG9CQUFvQixFQUNwQiwrQkFBK0IsRUFDL0Isb0NBQW9DLEdBQ3JDLE1BQU0sb0JBQW9CLENBQUM7QUFJNUIsTUFBTSxPQUFPLFlBQVk7SUFDdkIsWUFBb0IsRUFBd0I7UUFBeEIsT0FBRSxHQUFGLEVBQUUsQ0FBc0I7SUFBRyxDQUFDO0lBRWhELEtBQUssQ0FBQyw0QkFBNEIsQ0FDaEMscUJBQTBGLEVBQzFGLGlCQUFxRTtRQUVyRSxPQUFPLENBQ0wsTUFBTSxvQ0FBb0MsQ0FDeEMsSUFBSSxFQUNKLHFCQUFxQixFQUNyQixpQkFBaUIsRUFDakIsa0NBQWtDLEVBQ2xDLGtDQUFrQyxDQUNuQyxDQUNGLENBQUMsS0FBSyxDQUFDO0lBQ1YsQ0FBQztJQUVELHVDQUF1QyxDQUNyQyxnQ0FBa0gsRUFDbEgsaUJBQXFFO1FBRXJFLE9BQU8seUNBQXlDLENBQUMsSUFBSSxFQUFFLGdDQUFnQyxFQUFFLGlCQUFpQixDQUFDLENBQUM7SUFDOUcsQ0FBQztJQUVELGtCQUFrQixDQUNoQixlQUEyRSxFQUMzRSx3QkFBdUc7UUFFdkcsT0FBTyxvQkFBb0IsQ0FBQyxJQUFJLEVBQUUsZUFBZSxFQUFFLHdCQUF3QixDQUFDLENBQUM7SUFDL0UsQ0FBQztJQUVELGlCQUFpQixDQUFDLFVBQTZEO1FBQzdFLE1BQU0sSUFBSSxHQUFHLE9BQU8sVUFBVSxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQyxVQUFVLENBQUMsUUFB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

package/dest/public/index.d.ts

@@ -1,9 +1,11 @@
-export * from './db.js';
+export * from './db_interfaces.js';
 export { type PublicExecution, type PublicExecutionResult, isPublicExecutionResult, collectPublicDataReads, collectPublicDataUpdateRequests, } from './execution.js';
 export { PublicExecutor } from './executor.js';
 export { PublicProcessor, PublicProcessorFactory } from './public_processor.js';
-export * from './public_executor.js';
+export * from './public_db_sources.js';
 export * from './abstract_phase_manager.js';
 export * from './public_kernel_circuit_simulator.js';
 export * from './public_kernel.js';
+export { HintsBuilder } from './hints_builder.js';
+export * from './fee_payment.js';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/public/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,qBAAqB,EAC1B,uBAAuB,EACvB,sBAAsB,EACtB,+BAA+B,GAChC,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAChF,cAAc,sBAAsB,CAAC;AACrC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,sCAAsC,CAAC;AACrD,cAAc,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/public/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,qBAAqB,EAC1B,uBAAuB,EACvB,sBAAsB,EACtB,+BAA+B,GAChC,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAChF,cAAc,wBAAwB,CAAC;AACvC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,sCAAsC,CAAC;AACrD,cAAc,oBAAoB,CAAC;AACnC,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,cAAc,kBAAkB,CAAC"}

package/dest/public/index.js

@@ -1,9 +1,11 @@
-export * from './db.js';
+export * from './db_interfaces.js';
 export { isPublicExecutionResult, collectPublicDataReads, collectPublicDataUpdateRequests, } from './execution.js';
 export { PublicExecutor } from './executor.js';
 export { PublicProcessor, PublicProcessorFactory } from './public_processor.js';
-export * from './public_executor.js';
+export * from './public_db_sources.js';
 export * from './abstract_phase_manager.js';
 export * from './public_kernel_circuit_simulator.js';
 export * from './public_kernel.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHVibGljL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsU0FBUyxDQUFDO0FBQ3hCLE9BQU8sRUFHTCx1QkFBdUIsRUFDdkIsc0JBQXNCLEVBQ3RCLCtCQUErQixHQUNoQyxNQUFNLGdCQUFnQixDQUFDO0FBQ3hCLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDL0MsT0FBTyxFQUFFLGVBQWUsRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ2hGLGNBQWMsc0JBQXNCLENBQUM7QUFDckMsY0FBYyw2QkFBNkIsQ0FBQztBQUM1QyxjQUFjLHNDQUFzQyxDQUFDO0FBQ3JELGNBQWMsb0JBQW9CLENBQUMifQ==
+export { HintsBuilder } from './hints_builder.js';
+export * from './fee_payment.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHVibGljL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsb0JBQW9CLENBQUM7QUFDbkMsT0FBTyxFQUdMLHVCQUF1QixFQUN2QixzQkFBc0IsRUFDdEIsK0JBQStCLEdBQ2hDLE1BQU0sZ0JBQWdCLENBQUM7QUFDeEIsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUMvQyxPQUFPLEVBQUUsZUFBZSxFQUFFLHNCQUFzQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDaEYsY0FBYyx3QkFBd0IsQ0FBQztBQUN2QyxjQUFjLDZCQUE2QixDQUFDO0FBQzVDLGNBQWMsc0NBQXNDLENBQUM7QUFDckQsY0FBYyxvQkFBb0IsQ0FBQztBQUNuQyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDbEQsY0FBYyxrQkFBa0IsQ0FBQyJ9

package/dest/public/phase_manager_factory.d.ts

@@ -3,7 +3,7 @@ import { type GlobalVariables, type Header, type PublicKernelCircuitPublicInputs
 import { type PublicExecutor, type PublicStateDB } from '@aztec/simulator';
 import { type MerkleTreeOperations } from '@aztec/world-state';
 import { type AbstractPhaseManager, PublicKernelPhase } from './abstract_phase_manager.js';
-import { type ContractsDataSourcePublicDB } from './public_executor.js';
+import { type ContractsDataSourcePublicDB } from './public_db_sources.js';
 import { type PublicKernelCircuitSimulator } from './public_kernel_circuit_simulator.js';
 export declare class PhaseDidNotChangeError extends Error {
     constructor(phase: PublicKernelPhase);