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

package/dest/public/public_tx_simulator/public_tx_context.js

@@ -14,7 +14,7 @@ import { inspect } from 'util';
 import { AvmPersistableStateManager } from '../avm/index.js';
 import { HintingPublicContractsDB } from '../hinting_db_sources.js';
 import { SideEffectArrayLengths, SideEffectTrace } from '../side_effect_trace.js';
-import { getCallRequestsByPhase, getExecutionRequestsByPhase } from '../utils.js';
+import { getCallRequestsWithCalldataByPhase } from '../utils.js';
 /**
  * The transaction-level context for public execution.
  */ export class PublicTxContext {
@@ -28,9 +28,6 @@ import { getCallRequestsByPhase, getExecutionRequestsByPhase } from '../utils.js
     setupCallRequests;
     appLogicCallRequests;
     teardownCallRequests;
-    setupExecutionRequests;
-    appLogicExecutionRequests;
-    teardownExecutionRequests;
     nonRevertibleAccumulatedDataFromPrivate;
     revertibleAccumulatedDataFromPrivate;
     feePayer;
@@ -42,7 +39,7 @@ import { getCallRequestsByPhase, getExecutionRequestsByPhase } from '../utils.js
     /* Entire transaction execution is done. */ halted;
     /* Where did reverts happen (if at all)? */ revertCode;
     /* What caused a revert (if one occurred)? */ revertReason;
-    constructor(txHash, state, globalVariables, startStateReference, gasSettings, gasUsedByPrivate, gasAllocatedToPublic, setupCallRequests, appLogicCallRequests, teardownCallRequests, setupExecutionRequests, appLogicExecutionRequests, teardownExecutionRequests, nonRevertibleAccumulatedDataFromPrivate, revertibleAccumulatedDataFromPrivate, feePayer, trace, hints){
+    constructor(txHash, state, globalVariables, startStateReference, gasSettings, gasUsedByPrivate, gasAllocatedToPublic, setupCallRequests, appLogicCallRequests, teardownCallRequests, nonRevertibleAccumulatedDataFromPrivate, revertibleAccumulatedDataFromPrivate, feePayer, trace, hints){
         this.txHash = txHash;
         this.state = state;
         this.globalVariables = globalVariables;
@@ -53,9 +50,6 @@ import { getCallRequestsByPhase, getExecutionRequestsByPhase } from '../utils.js
         this.setupCallRequests = setupCallRequests;
         this.appLogicCallRequests = appLogicCallRequests;
         this.teardownCallRequests = teardownCallRequests;
-        this.setupExecutionRequests = setupExecutionRequests;
-        this.appLogicExecutionRequests = appLogicExecutionRequests;
-        this.teardownExecutionRequests = teardownExecutionRequests;
         this.nonRevertibleAccumulatedDataFromPrivate = nonRevertibleAccumulatedDataFromPrivate;
         this.revertibleAccumulatedDataFromPrivate = revertibleAccumulatedDataFromPrivate;
         this.feePayer = feePayer;
@@ -82,7 +76,7 @@ import { getCallRequestsByPhase, getExecutionRequestsByPhase } from '../utils.js
         const gasUsedByPrivate = tx.data.gasUsed;
         // Gas allocated to public is "whatever's left" after private, but with some max applied.
         const gasAllocatedToPublic = applyMaxToAvailableGas(gasSettings.gasLimits.sub(gasUsedByPrivate));
-        return new PublicTxContext(await tx.getTxHash(), new PhaseStateManager(txStateManager), globalVariables, await treesDB.getStateReference(), gasSettings, gasUsedByPrivate, gasAllocatedToPublic, getCallRequestsByPhase(tx, TxExecutionPhase.SETUP), getCallRequestsByPhase(tx, TxExecutionPhase.APP_LOGIC), getCallRequestsByPhase(tx, TxExecutionPhase.TEARDOWN), getExecutionRequestsByPhase(tx, TxExecutionPhase.SETUP), getExecutionRequestsByPhase(tx, TxExecutionPhase.APP_LOGIC), getExecutionRequestsByPhase(tx, TxExecutionPhase.TEARDOWN), tx.data.forPublic.nonRevertibleAccumulatedData, tx.data.forPublic.revertibleAccumulatedData, tx.data.feePayer, trace, hints);
+        return new PublicTxContext(await tx.getTxHash(), new PhaseStateManager(txStateManager), globalVariables, await treesDB.getStateReference(), gasSettings, gasUsedByPrivate, gasAllocatedToPublic, getCallRequestsWithCalldataByPhase(tx, TxExecutionPhase.SETUP), getCallRequestsWithCalldataByPhase(tx, TxExecutionPhase.APP_LOGIC), getCallRequestsWithCalldataByPhase(tx, TxExecutionPhase.TEARDOWN), tx.data.forPublic.nonRevertibleAccumulatedData, tx.data.forPublic.revertibleAccumulatedData, tx.data.feePayer, trace, hints);
     }
     /**
    * Signal that the entire transaction execution is done.
@@ -154,18 +148,6 @@ import { getCallRequestsByPhase, getExecutionRequestsByPhase } from '../utils.js
         }
     }
     /**
-   * Get the call requests for the specified phase (including actual args).
-   */ getExecutionRequestsForPhase(phase) {
-        switch(phase){
-            case TxExecutionPhase.SETUP:
-                return this.setupExecutionRequests;
-            case TxExecutionPhase.APP_LOGIC:
-                return this.appLogicExecutionRequests;
-            case TxExecutionPhase.TEARDOWN:
-                return this.teardownExecutionRequests;
-        }
-    }
-    /**
    * How much gas is left as of the specified phase?
    */ getGasLeftAtPhase(phase) {
         if (phase === TxExecutionPhase.TEARDOWN) {
@@ -239,7 +221,7 @@ import { getCallRequestsByPhase, getExecutionRequestsByPhase } from '../utils.js
         const startTreeSnapshots = new TreeSnapshots(this.startStateReference.l1ToL2MessageTree, this.startStateReference.partial.noteHashTree, this.startStateReference.partial.nullifierTree, this.startStateReference.partial.publicDataTree);
         // Will be patched/padded at the end of this fn
         const endTreeSnapshots = new TreeSnapshots(endStateReference.l1ToL2MessageTree, endStateReference.partial.noteHashTree, endStateReference.partial.nullifierTree, endStateReference.partial.publicDataTree);
-        const avmCircuitPublicInputs = this.trace.toAvmCircuitPublicInputs(this.globalVariables, startTreeSnapshots, /*startGasUsed=*/ this.gasUsedByPrivate, this.gasSettings, this.feePayer, this.setupCallRequests, this.appLogicCallRequests, /*teardownCallRequest=*/ this.teardownCallRequests.length ? this.teardownCallRequests[0] : PublicCallRequest.empty(), endTreeSnapshots, /*endGasUsed=*/ this.getTotalGasUsed(), /*transactionFee=*/ this.getTransactionFeeUnsafe(), /*reverted=*/ !this.revertCode.isOK());
+        const avmCircuitPublicInputs = this.trace.toAvmCircuitPublicInputs(this.globalVariables, startTreeSnapshots, /*startGasUsed=*/ this.gasUsedByPrivate, this.gasSettings, this.feePayer, this.setupCallRequests.map((r)=>r.request), this.appLogicCallRequests.map((r)=>r.request), /*teardownCallRequest=*/ this.teardownCallRequests.length ? this.teardownCallRequests[0].request : PublicCallRequest.empty(), endTreeSnapshots, /*endGasUsed=*/ this.getTotalGasUsed(), /*transactionFee=*/ this.getTransactionFeeUnsafe(), /*reverted=*/ !this.revertCode.isOK());
         const getArrayLengths = (from)=>new PrivateToAvmAccumulatedDataArrayLengths(countAccumulatedItems(from.noteHashes), countAccumulatedItems(from.nullifiers), countAccumulatedItems(from.l2ToL1Msgs));
         const convertAccumulatedData = (from)=>new PrivateToAvmAccumulatedData(from.noteHashes, from.nullifiers, from.l2ToL1Msgs);
         // Temporary overrides as these entries aren't yet populated in trace

package/dest/public/public_tx_simulator/public_tx_simulator.d.ts

@@ -67,8 +67,7 @@ export declare class PublicTxSimulator {
      * Simulate an enqueued public call.
      * @param phase - The current phase of public execution
      * @param context - WILL BE MUTATED. The context of the currently executing public transaction portion
-     * @param callRequest - The enqueued call to execute
-     * @param executionRequest - The execution request (includes args)
+     * @param callRequest - The public function call request, including the calldata.
      * @returns The result of execution.
      */
     private simulateEnqueuedCall;
@@ -81,7 +80,7 @@ export declare class PublicTxSimulator {
      *
      * @param stateManager - The state manager for AvmSimulation
      * @param context - The context of the currently executing public transaction portion
-     * @param executionRequest - The execution request (includes args)
+     * @param callRequest - The public function call request, including the calldata.
      * @param allocatedGas - The gas allocated to the enqueued call
      * @param fnName - The name of the function
      * @returns The result of execution.

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

@@ -1 +1 @@
-{"version":3,"file":"public_tx_simulator.d.ts","sourceRoot":"","sources":["../../../src/public/public_tx_simulator/public_tx_simulator.ts"],"names":[],"mappings":"AAKA,OAAO,EAKL,KAAK,iBAAiB,EACtB,KAAK,UAAU,EAChB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,KAAK,EAAO,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAItD,OAAO,EACL,KAAK,eAAe,EACpB,yBAAyB,EAEzB,EAAE,EACF,gBAAgB,EACjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAc,KAAK,eAAe,EAAE,KAAK,MAAM,EAAiC,MAAM,yBAAyB,CAAC;AAQvH,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,MAAM,MAAM,cAAc,GAAG;IAC3B,KAAK,EAAE,gBAAgB,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,yBAAyB,EAAE,CAAC;IAC1C,QAAQ,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,eAAe,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,+CAA+C;IAC/C,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,UAAU,CAAC;IACvB,4BAA4B;IAC5B,YAAY,CAAC,EAAE,eAAe,CAAC;IAC/B,eAAe,EAAE,cAAc,EAAE,CAAC;CACnC,CAAC;AAEF,qBAAa,iBAAiB;IAM1B,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,kBAAkB;IAT5B,OAAO,EAAE,eAAe,CAAC;IAEzB,OAAO,CAAC,GAAG,CAAS;gBAGV,OAAO,EAAE,aAAa,EACtB,WAAW,EAAE,iBAAiB,EAC9B,eAAe,EAAE,eAAe,EAChC,kBAAkB,GAAE,OAAe,EACnC,kBAAkB,GAAE,OAAe,EAC3C,eAAe,GAAE,eAAsC;IAMzD,IAAI,MAAM,IAAI,MAAM,CAEnB;IACD;;;;OAIG;IACU,QAAQ,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC;IAyFtD;;;;OAIG;YACW,kBAAkB;IAIhC;;;;OAIG;YACW,qBAAqB;IAkBnC;;;;OAIG;YACW,qBAAqB;IAoBnC;;;;;OAKG;YACW,aAAa;IA0C3B;;;;;;;OAOG;YAOW,oBAAoB;IA+ClC;;;;;;;;;;;;;OAaG;YAOW,4BAA4B;IAgD1C;;OAEG;IACU,+BAA+B,CAAC,OAAO,EAAE,eAAe;IAkBrE;;;OAGG;IACU,4BAA4B,CAAC,OAAO,EAAE,eAAe,GAAgB,OAAO,CAAC,OAAO,CAAC;YA+BpF,MAAM;IAgCpB;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,sBAAsB;CAStC"}
+{"version":3,"file":"public_tx_simulator.d.ts","sourceRoot":"","sources":["../../../src/public/public_tx_simulator/public_tx_simulator.ts"],"names":[],"mappings":"AAKA,OAAO,EAKL,KAAK,iBAAiB,EACtB,KAAK,UAAU,EAChB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,KAAK,EAAO,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAGtD,OAAO,EACL,KAAK,eAAe,EACpB,yBAAyB,EAEzB,EAAE,EACF,gBAAgB,EACjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAc,KAAK,eAAe,EAAE,KAAK,MAAM,EAAiC,MAAM,yBAAyB,CAAC;AAQvH,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,MAAM,MAAM,cAAc,GAAG;IAC3B,KAAK,EAAE,gBAAgB,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,yBAAyB,EAAE,CAAC;IAC1C,QAAQ,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,eAAe,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,+CAA+C;IAC/C,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,UAAU,CAAC;IACvB,4BAA4B;IAC5B,YAAY,CAAC,EAAE,eAAe,CAAC;IAC/B,eAAe,EAAE,cAAc,EAAE,CAAC;CACnC,CAAC;AAEF,qBAAa,iBAAiB;IAM1B,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,kBAAkB;IAT5B,OAAO,EAAE,eAAe,CAAC;IAEzB,OAAO,CAAC,GAAG,CAAS;gBAGV,OAAO,EAAE,aAAa,EACtB,WAAW,EAAE,iBAAiB,EAC9B,eAAe,EAAE,eAAe,EAChC,kBAAkB,GAAE,OAAe,EACnC,kBAAkB,GAAE,OAAe,EAC3C,eAAe,GAAE,eAAsC;IAMzD,IAAI,MAAM,IAAI,MAAM,CAEnB;IACD;;;;OAIG;IACU,QAAQ,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC;IAyFtD;;;;OAIG;YACW,kBAAkB;IAIhC;;;;OAIG;YACW,qBAAqB;IAkBnC;;;;OAIG;YACW,qBAAqB;IAoBnC;;;;;OAKG;YACW,aAAa;IAuC3B;;;;;;OAMG;YAOW,oBAAoB;IA8ClC;;;;;;;;;;;;;OAaG;YAOW,4BAA4B;IAgD1C;;OAEG;IACU,+BAA+B,CAAC,OAAO,EAAE,eAAe;IAkBrE;;;OAGG;IACU,4BAA4B,CAAC,OAAO,EAAE,eAAe,GAAgB,OAAO,CAAC,OAAO,CAAC;YA+BpF,MAAM;IAgCpB;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,sBAAsB;CAStC"}

package/dest/public/public_tx_simulator/public_tx_simulator.js

@@ -47,7 +47,7 @@ export class PublicTxSimulator {
         try {
             const startTime = process.hrtime.bigint();
             const txHash = await tx.getTxHash();
-            this.log.debug(`Simulating ${tx.enqueuedPublicFunctionCalls.length} public calls for tx ${txHash}`, {
+            this.log.debug(`Simulating ${tx.publicFunctionCalldata.length} public calls for tx ${txHash}`, {
                 txHash
             });
             const context = await PublicTxContext.create(this.treesDB, this.contractsDB, tx, this.globalVariables, this.doMerkleOperations);
@@ -166,12 +166,10 @@ export class PublicTxSimulator {
    * @returns The phase result.
    */ async simulatePhase(phase, context) {
         const callRequests = context.getCallRequestsForPhase(phase);
-        const executionRequests = context.getExecutionRequestsForPhase(phase);
         this.log.debug(`Processing phase ${TxExecutionPhase[phase]} for tx ${context.txHash}`, {
             txHash: context.txHash.toString(),
             phase: TxExecutionPhase[phase],
-            callRequests: callRequests.length,
-            executionRequests: executionRequests.length
+            callRequests: callRequests.length
         });
         const returnValues = [];
         let reverted = false;
@@ -182,8 +180,7 @@ export class PublicTxSimulator {
                 break;
             }
             const callRequest = callRequests[i];
-            const executionRequest = executionRequests[i];
-            const enqueuedCallResult = await this.simulateEnqueuedCall(phase, context, callRequest, executionRequest);
+            const enqueuedCallResult = await this.simulateEnqueuedCall(phase, context, callRequest);
             returnValues.push(new NestedProcessReturnValues(enqueuedCallResult.output));
             if (enqueuedCallResult.reverted) {
                 reverted = true;
@@ -202,25 +199,24 @@ export class PublicTxSimulator {
    * Simulate an enqueued public call.
    * @param phase - The current phase of public execution
    * @param context - WILL BE MUTATED. The context of the currently executing public transaction portion
-   * @param callRequest - The enqueued call to execute
-   * @param executionRequest - The execution request (includes args)
+   * @param callRequest - The public function call request, including the calldata.
    * @returns The result of execution.
-   */ async simulateEnqueuedCall(phase, context, callRequest, executionRequest) {
+   */ async simulateEnqueuedCall(phase, context, callRequest) {
         const stateManager = context.state.getActiveStateManager();
-        const address = executionRequest.callContext.contractAddress;
-        const fnName = await getPublicFunctionDebugName(this.contractsDB, address, executionRequest.args);
+        const contractAddress = callRequest.request.contractAddress;
+        const fnName = await getPublicFunctionDebugName(this.contractsDB, contractAddress, callRequest.calldata);
         const allocatedGas = context.getGasLeftAtPhase(phase);
         // The reason we need enqueued hints at all (and cannot just use the public inputs) is
         // because they don't have the actual calldata, just the hash of it.
         // If/when we pass the whole TX to C++, we can remove this class of hints.
-        stateManager.traceEnqueuedCall(callRequest);
-        context.hints.enqueuedCalls.push(new AvmEnqueuedCallHint(executionRequest.callContext.msgSender, executionRequest.callContext.contractAddress, executionRequest.args, executionRequest.callContext.isStaticCall));
-        const result = await this.simulateEnqueuedCallInternal(context.state.getActiveStateManager(), executionRequest, allocatedGas, /*transactionFee=*/ context.getTransactionFee(phase), fnName);
+        stateManager.traceEnqueuedCall(callRequest.request);
+        context.hints.enqueuedCalls.push(new AvmEnqueuedCallHint(callRequest.request.msgSender, contractAddress, callRequest.calldata, callRequest.request.isStaticCall));
+        const result = await this.simulateEnqueuedCallInternal(context.state.getActiveStateManager(), callRequest, allocatedGas, /*transactionFee=*/ context.getTransactionFee(phase), fnName);
         const gasUsed = allocatedGas.sub(result.gasLeft); // by enqueued call
         context.consumeGas(phase, gasUsed);
         this.log.debug(`Simulated enqueued public call (${fnName}) consumed ${gasUsed.l2Gas} L2 gas ending with ${result.gasLeft.l2Gas} L2 gas left.`);
         if (result.reverted) {
-            const culprit = `${executionRequest.callContext.contractAddress}:${executionRequest.callContext.functionSelector}`;
+            const culprit = `${contractAddress}:${callRequest.functionSelector}`;
             context.revert(phase, result.revertReason, culprit); // throws if in setup (non-revertible) phase
         }
         return result;
@@ -234,16 +230,16 @@ export class PublicTxSimulator {
    *
    * @param stateManager - The state manager for AvmSimulation
    * @param context - The context of the currently executing public transaction portion
-   * @param executionRequest - The execution request (includes args)
+   * @param callRequest - The public function call request, including the calldata.
    * @param allocatedGas - The gas allocated to the enqueued call
    * @param fnName - The name of the function
    * @returns The result of execution.
-   */ async simulateEnqueuedCallInternal(stateManager, executionRequest, allocatedGas, transactionFee, fnName) {
-        const address = executionRequest.callContext.contractAddress;
-        const sender = executionRequest.callContext.msgSender;
+   */ async simulateEnqueuedCallInternal(stateManager, { request, calldata }, allocatedGas, transactionFee, fnName) {
+        const address = request.contractAddress;
+        const sender = request.msgSender;
         this.log.debug(`Executing enqueued public call to external function ${fnName}@${address} with ${allocatedGas.l2Gas} allocated L2 gas.`);
         const timer = new Timer();
-        const simulator = await AvmSimulator.create(stateManager, address, sender, transactionFee, this.globalVariables, executionRequest.callContext.isStaticCall, executionRequest.args, allocatedGas);
+        const simulator = await AvmSimulator.create(stateManager, address, sender, transactionFee, this.globalVariables, request.isStaticCall, calldata, allocatedGas);
         const avmCallResult = await simulator.execute();
         const result = avmCallResult.finalize();
         this.log.verbose(result.reverted ? `Simulation of enqueued public call ${fnName} reverted with reason ${result.revertReason}.` : `Simulation of enqueued public call ${fnName} completed successfully.`, {
@@ -334,15 +330,15 @@ export class PublicTxSimulator {
     }
 }
 _ts_decorate([
-    trackSpan('PublicTxSimulator.simulateEnqueuedCall', (phase, context, _callRequest, executionRequest)=>({
+    trackSpan('PublicTxSimulator.simulateEnqueuedCall', (phase, context, callRequest)=>({
             [Attributes.TX_HASH]: context.txHash.toString(),
-            [Attributes.TARGET_ADDRESS]: executionRequest.callContext.contractAddress.toString(),
-            [Attributes.SENDER_ADDRESS]: executionRequest.callContext.msgSender.toString(),
+            [Attributes.TARGET_ADDRESS]: callRequest.request.contractAddress.toString(),
+            [Attributes.SENDER_ADDRESS]: callRequest.request.msgSender.toString(),
             [Attributes.SIMULATOR_PHASE]: TxExecutionPhase[phase].toString()
         }))
 ], PublicTxSimulator.prototype, "simulateEnqueuedCall", null);
 _ts_decorate([
-    trackSpan('PublicTxSimulator.simulateEnqueuedCallInternal', (_stateManager, _executionRequest, _allocatedGas, _transactionFee, fnName)=>({
+    trackSpan('PublicTxSimulator.simulateEnqueuedCallInternal', (_stateManager, _callRequest, _allocatedGas, _transactionFee, fnName)=>({
             [Attributes.APP_CIRCUIT_NAME]: fnName
         }))
 ], PublicTxSimulator.prototype, "simulateEnqueuedCallInternal", null);

package/dest/public/utils.d.ts

@@ -1,5 +1,3 @@
-import type { PublicCallRequest } from '@aztec/stdlib/kernel';
-import { type PublicExecutionRequest, type Tx, TxExecutionPhase } from '@aztec/stdlib/tx';
-export declare function getExecutionRequestsByPhase(tx: Tx, phase: TxExecutionPhase): PublicExecutionRequest[];
-export declare function getCallRequestsByPhase(tx: Tx, phase: TxExecutionPhase): PublicCallRequest[];
+import { PublicCallRequestWithCalldata, type Tx, TxExecutionPhase } from '@aztec/stdlib/tx';
+export declare function getCallRequestsWithCalldataByPhase(tx: Tx, phase: TxExecutionPhase): PublicCallRequestWithCalldata[];
 //# sourceMappingURL=utils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/public/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,KAAK,sBAAsB,EAAE,KAAK,EAAE,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAE1F,wBAAgB,2BAA2B,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,gBAAgB,GAAG,sBAAsB,EAAE,CAarG;AAED,wBAAgB,sBAAsB,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,gBAAgB,GAAG,iBAAiB,EAAE,CAa3F"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/public/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,6BAA6B,EAAE,KAAK,EAAE,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAE5F,wBAAgB,kCAAkC,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,gBAAgB,GAAG,6BAA6B,EAAE,CAanH"}

package/dest/public/utils.js

@@ -1,30 +1,13 @@
 import { TxExecutionPhase } from '@aztec/stdlib/tx';
-export function getExecutionRequestsByPhase(tx, phase) {
+export function getCallRequestsWithCalldataByPhase(tx, phase) {
     switch(phase){
         case TxExecutionPhase.SETUP:
-            return tx.getNonRevertiblePublicExecutionRequests();
+            return tx.getNonRevertiblePublicCallRequestsWithCalldata();
         case TxExecutionPhase.APP_LOGIC:
-            return tx.getRevertiblePublicExecutionRequests();
+            return tx.getRevertiblePublicCallRequestsWithCalldata();
         case TxExecutionPhase.TEARDOWN:
             {
-                const request = tx.getPublicTeardownExecutionRequest();
-                return request ? [
-                    request
-                ] : [];
-            }
-        default:
-            throw new Error(`Unknown phase: ${phase}`);
-    }
-}
-export function getCallRequestsByPhase(tx, phase) {
-    switch(phase){
-        case TxExecutionPhase.SETUP:
-            return tx.data.getNonRevertiblePublicCallRequests();
-        case TxExecutionPhase.APP_LOGIC:
-            return tx.data.getRevertiblePublicCallRequests();
-        case TxExecutionPhase.TEARDOWN:
-            {
-                const request = tx.data.getTeardownPublicCallRequest();
+                const request = tx.getTeardownPublicCallRequestWithCalldata();
                 return request ? [
                     request
                 ] : [];

package/dest/testing.d.ts

@@ -0,0 +1,2 @@
+export { SimulationProviderRecorderWrapper } from './private/providers/circuit_recording/simulation_provider_recorder_wrapper.js';
+//# sourceMappingURL=testing.d.ts.map

package/dest/testing.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../src/testing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iCAAiC,EAAE,MAAM,+EAA+E,CAAC"}

package/dest/testing.js

@@ -0,0 +1 @@
+export { SimulationProviderRecorderWrapper } from './private/providers/circuit_recording/simulation_provider_recorder_wrapper.js';

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@aztec/simulator",
-  "version": "0.81.0",
+  "version": "0.82.1-alpha-testnet.1",
   "type": "module",
   "exports": {
     "./server": "./dest/server.js",
     "./client": "./dest/client.js",
+    "./testing": "./dest/testing.js",
     "./public/fixtures": "./dest/public/fixtures/index.js"
   },
   "typedocOptions": {
@@ -59,16 +60,16 @@
     ]
   },
   "dependencies": {
-    "@aztec/constants": "0.81.0",
-    "@aztec/foundation": "0.81.0",
-    "@aztec/noir-acvm_js": "0.81.0",
-    "@aztec/noir-noirc_abi": "0.81.0",
-    "@aztec/noir-protocol-circuits-types": "0.81.0",
-    "@aztec/noir-types": "0.81.0",
-    "@aztec/protocol-contracts": "0.81.0",
-    "@aztec/stdlib": "0.81.0",
-    "@aztec/telemetry-client": "0.81.0",
-    "@aztec/world-state": "0.81.0",
+    "@aztec/constants": "0.82.1-alpha-testnet.1",
+    "@aztec/foundation": "0.82.1-alpha-testnet.1",
+    "@aztec/noir-acvm_js": "0.82.1-alpha-testnet.1",
+    "@aztec/noir-noirc_abi": "0.82.1-alpha-testnet.1",
+    "@aztec/noir-protocol-circuits-types": "0.82.1-alpha-testnet.1",
+    "@aztec/noir-types": "0.82.1-alpha-testnet.1",
+    "@aztec/protocol-contracts": "0.82.1-alpha-testnet.1",
+    "@aztec/stdlib": "0.82.1-alpha-testnet.1",
+    "@aztec/telemetry-client": "0.82.1-alpha-testnet.1",
+    "@aztec/world-state": "0.82.1-alpha-testnet.1",
     "levelup": "^5.1.1",
     "lodash.clonedeep": "^4.5.0",
     "lodash.merge": "^4.6.2",
@@ -76,9 +77,9 @@
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@aztec/kv-store": "0.81.0",
-    "@aztec/merkle-tree": "0.81.0",
-    "@aztec/noir-contracts.js": "0.81.0",
+    "@aztec/kv-store": "0.82.1-alpha-testnet.1",
+    "@aztec/merkle-tree": "0.82.1-alpha-testnet.1",
+    "@aztec/noir-contracts.js": "0.82.1-alpha-testnet.1",
     "@jest/globals": "^29.5.0",
     "@types/jest": "^29.5.0",
     "@types/levelup": "^5.1.3",

package/src/common/db_interfaces.ts

@@ -63,7 +63,7 @@ export interface PublicContractsDBInterface {
   getDebugFunctionName(contractAddress: AztecAddress, selector: FunctionSelector): Promise<string | undefined>;
 }
 
-/** Database interface for providing access to commitment tree, l1 to l2 message tree, and nullifier tree. */
+/** Database interface for providing access to note hash tree, l1 to l2 message tree, and nullifier tree. */
 export interface CommitmentsDBInterface {
   /**
    * Fetches a message from the db, given its key.
@@ -81,23 +81,16 @@ export interface CommitmentsDBInterface {
 
   /**
    * @param leafIndex the leaf to look up
-   * @returns The l1 to l2 leaf value or undefined if not found.
+   * @returns The l1 to l2 leaf message hash or undefined if not found.
    */
-  getL1ToL2LeafValue(leafIndex: bigint): Promise<Fr | undefined>;
+  getL1ToL2MessageHash(leafIndex: bigint): Promise<Fr | undefined>;
 
   /**
-   * Gets the index of a commitment in the note hash tree.
-   * @param commitment - The commitment.
-   * @returns - The index of the commitment. Undefined if it does not exist in the tree.
-   */
-  getCommitmentIndex(commitment: Fr): Promise<bigint | undefined>;
-
-  /**
-   * Gets commitment in the note hash tree given a leaf index.
+   * Gets note hash in the note hash tree at the given leaf index.
    * @param leafIndex - the leaf to look up.
-   * @returns - The commitment at that index. Undefined if leaf index is not found.
+   * @returns - The note hash at that index. Undefined if leaf index is not found.
    */
-  getCommitmentValue(leafIndex: bigint): Promise<Fr | undefined>;
+  getNoteHash(leafIndex: bigint): Promise<Fr | undefined>;
 
   /**
    * Gets the index of a nullifier in the nullifier tree.

package/src/common/debug_fn_name.ts

@@ -10,9 +10,9 @@ export async function getPublicFunctionDebugName(
   calldata: Fr[],
 ): Promise<string> {
   // Public function is dispatched and therefore the target function is passed in the first argument.
-  const targetFunction =
-    calldata[0] !== undefined
-      ? await db.getDebugFunctionName(contractAddress, FunctionSelector.fromField(calldata[0]))
-      : `<calldata[0] undefined> (Contract Address: ${contractAddress})`;
-  return `${targetFunction}`;
+  if (!calldata[0]) {
+    return `<calldata[0] undefined> (Contract Address: ${contractAddress})`;
+  }
+  const selector = FunctionSelector.fromField(calldata[0]);
+  return (await db.getDebugFunctionName(contractAddress, selector)) ?? selector.toString();
 }

package/src/common/message_load_oracle_inputs.ts

@@ -12,4 +12,12 @@ export class MessageLoadOracleInputs<N extends number> {
   toFields(): Fr[] {
     return [new Fr(this.index), ...this.siblingPath.toFields()];
   }
+
+  /**
+   * Returns a representation of the public data witness as expected by intrinsic Noir deserialization.
+   */
+  public toNoirRepresentation(): (string | string[])[] {
+    // TODO(#12874): remove the stupid as string conversion by modifying ForeignCallOutput type in acvm.js
+    return [new Fr(this.index).toString() as string, this.siblingPath.toFields().map(fr => fr.toString()) as string[]];
+  }
 }

package/src/private/acvm/acvm.ts

@@ -15,18 +15,7 @@ import type { ORACLE_NAMES } from './oracle/index.js';
 /**
  * The callback interface for the ACIR.
  */
-export type ACIRCallback = Record<
-  ORACLE_NAMES,
-  (
-    ...args: ForeignCallInput[]
-  ) =>
-    | void
-    | Promise<void>
-    | ForeignCallOutput
-    | ForeignCallOutput[]
-    | Promise<ForeignCallOutput>
-    | Promise<ForeignCallOutput[]>
->;
+export type ACIRCallback = Record<ORACLE_NAMES, (...args: ForeignCallInput[]) => Promise<ForeignCallOutput[]>>;
 
 /**
  * The result of executing an ACIR.
@@ -43,6 +32,11 @@ export interface ACIRExecutionResult {
 
 /**
  * The function call that executes an ACIR.
+ * @param acir - The ACIR circuit bytecode to execute.
+ * @param initialWitness - The initial witness map defining all of the inputs to `circuit`.
+ * @param callback - A callback to process any foreign calls from the circuit.
+ * @returns The solved witness calculated by executing the circuit on the provided inputs, as well as the return
+ * witness indices as specified by the circuit.
  */
 export async function acvm(
   acir: Buffer,
@@ -54,7 +48,7 @@ export async function acvm(
   const solvedAndReturnWitness = await executeCircuitWithReturnWitness(
     acir,
     initialWitness,
-    async (name: string, args: ForeignCallInput[]) => {
+    (name: string, args: ForeignCallInput[]) => {
       try {
         logger.debug(`Oracle callback ${name}`);
         const oracleFunction = callback[name as ORACLE_NAMES];
@@ -62,17 +56,7 @@ export async function acvm(
           throw new Error(`Oracle callback ${name} not found`);
         }
 
-        const result = await oracleFunction.call(callback, ...args);
-
-        if (typeof result === 'undefined') {
-          return [];
-        } else if (result instanceof Array && !result.every(item => typeof item === 'string')) {
-          // We are dealing with a nested array which means that we do not need it wrap it in another array as to have
-          // the nested array structure it is already "wrapped".
-          return result;
-        } else {
-          return [result] as ForeignCallOutput[];
-        }
+        return oracleFunction.call(callback, ...args);
       } catch (err) {
         let typedError: Error;
         if (err instanceof Error) {

package/src/private/acvm/deserialize.ts

@@ -3,33 +3,6 @@ import { hexToBuffer } from '@aztec/foundation/string';
 
 import type { ACVMField, ACVMWitness } from './acvm_types.js';
 
-/**
- * Converts an ACVM field to a Fr.
- * @param field - The ACVM field to convert.
- * @returns The Fr.
- */
-export function fromACVMField(field: ACVMField): Fr {
-  return Fr.fromBuffer(Buffer.from(field.slice(2), 'hex'));
-}
-
-/**
- * Converts a field to a number.
- * @param fr - The field to convert.
- * @returns The number.
- * TODO(#4102): Nuke this once block number is big int.
- */
-export function frToNumber(fr: Fr): number {
-  return Number(fr.value);
-}
-
-/**
- * Converts a field to a boolean.
- * @param fr - The field to convert.
- */
-export function frToBoolean(fr: Fr): boolean {
-  return fr.toBigInt() === BigInt(1);
-}
-
 /**
  * Converts a Noir BoundedVec of Fields into an Fr array. Note that BoundedVecs are structs, and therefore translated as
  * two separate ACVMField values (an array and a single field).
@@ -39,7 +12,7 @@ export function frToBoolean(fr: Fr): boolean {
  * @returns An array with the same content as the Noir version. Elements past the length are discarded.
  */
 export function fromBoundedVec(storage: ACVMField[], length: ACVMField): Fr[] {
-  return storage.slice(0, frToNumber(fromACVMField(length))).map(fromACVMField);
+  return storage.slice(0, Fr.fromString(length).toNumber()).map(Fr.fromString);
 }
 
 /**
@@ -56,7 +29,7 @@ export function fromUintBoundedVec(storage: ACVMField[], length: ACVMField, uint
     throw new Error(`u${uintBitSize} is not a supported type in Noir`);
   }
   const uintByteSize = uintBitSize / 8;
-  const boundedStorage = storage.slice(0, frToNumber(fromACVMField(length)));
+  const boundedStorage = storage.slice(0, Fr.fromString(length).toNumber());
   return Buffer.concat(boundedStorage.map(str => hexToBuffer(str).subarray(-uintByteSize)));
 }
 
@@ -67,7 +40,7 @@ export function fromUintBoundedVec(storage: ACVMField[], length: ACVMField, uint
  */
 export function witnessMapToFields(witness: ACVMWitness): Fr[] {
   const sortedKeys = [...witness.keys()].sort((a, b) => a - b);
-  return sortedKeys.map(key => witness.get(key)!).map(fromACVMField);
+  return sortedKeys.map(key => witness.get(key)!).map(Fr.fromString);
 }
 
 /**