@aztec/simulator 0.67.1 → 0.68.0

package/dest/public/public_tx_simulator.d.ts

@@ -25,9 +25,10 @@ export declare class PublicTxSimulator {
     private worldStateDB;
     private globalVariables;
     private doMerkleOperations;
+    private enforceFeePayment;
     metrics: ExecutorMetrics;
     private log;
-    constructor(db: MerkleTreeReadOperations, worldStateDB: WorldStateDB, telemetryClient: TelemetryClient, globalVariables: GlobalVariables, doMerkleOperations?: boolean);
+    constructor(db: MerkleTreeReadOperations, worldStateDB: WorldStateDB, telemetryClient: TelemetryClient, globalVariables: GlobalVariables, doMerkleOperations?: boolean, enforceFeePayment?: boolean);
     get tracer(): Tracer;
     /**
      * Simulate a transaction's public portion including all of its phases.

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

@@ -1 +1 @@
-{"version":3,"file":"public_tx_simulator.d.ts","sourceRoot":"","sources":["../../src/public/public_tx_simulator.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,OAAO,EACZ,KAAK,wBAAwB,EAC7B,yBAAyB,EAEzB,KAAK,eAAe,EACpB,KAAK,EAAE,EACP,gBAAgB,EAEjB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAqB,KAAK,eAAe,EAA0B,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAItH,OAAO,EAAc,KAAK,eAAe,EAAE,KAAK,MAAM,EAAa,MAAM,yBAAyB,CAAC;AAQnG,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAC3D,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,EAAE;IACV,OAAO,CAAC,YAAY;IAEpB,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,kBAAkB;IAT5B,OAAO,EAAE,eAAe,CAAC;IAEzB,OAAO,CAAC,GAAG,CAAS;gBAGV,EAAE,EAAE,wBAAwB,EAC5B,YAAY,EAAE,YAAY,EAClC,eAAe,EAAE,eAAe,EACxB,eAAe,EAAE,eAAe,EAChC,kBAAkB,GAAE,OAAe;IAM7C,IAAI,MAAM,IAAI,MAAM,CAEnB;IACD;;;;OAIG;IACU,QAAQ,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC;IAwEtD;;;;OAIG;YACW,kBAAkB;IAIhC;;;;OAIG;YACW,qBAAqB;IAkBnC;;;;OAIG;YACW,qBAAqB;IAoBnC;;;;;OAKG;YACW,aAAa;IA0C3B;;;;;;;OAOG;YAOW,oBAAoB;IAoClC;;;;;;;;;;;;;OAaG;YAOW,4BAA4B;IAgD1C;;OAEG;IACU,+BAA+B,CAAC,OAAO,EAAE,eAAe;IAarE;;;OAGG;IACU,4BAA4B,CAAC,OAAO,EAAE,eAAe;YAepD,MAAM;CAyBrB"}
+{"version":3,"file":"public_tx_simulator.d.ts","sourceRoot":"","sources":["../../src/public/public_tx_simulator.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,OAAO,EACZ,KAAK,wBAAwB,EAC7B,yBAAyB,EAEzB,KAAK,eAAe,EACpB,KAAK,EAAE,EACP,gBAAgB,EAEjB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAqB,KAAK,eAAe,EAA0B,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAItH,OAAO,EAAc,KAAK,eAAe,EAAE,KAAK,MAAM,EAAa,MAAM,yBAAyB,CAAC;AAQnG,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAC3D,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,EAAE;IACV,OAAO,CAAC,YAAY;IAEpB,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,iBAAiB;IAV3B,OAAO,EAAE,eAAe,CAAC;IAEzB,OAAO,CAAC,GAAG,CAAS;gBAGV,EAAE,EAAE,wBAAwB,EAC5B,YAAY,EAAE,YAAY,EAClC,eAAe,EAAE,eAAe,EACxB,eAAe,EAAE,eAAe,EAChC,kBAAkB,GAAE,OAAe,EACnC,iBAAiB,GAAE,OAAc;IAM3C,IAAI,MAAM,IAAI,MAAM,CAEnB;IACD;;;;OAIG;IACU,QAAQ,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC;IAkFtD;;;;OAIG;YACW,kBAAkB;IAIhC;;;;OAIG;YACW,qBAAqB;IAkBnC;;;;OAIG;YACW,qBAAqB;IAoBnC;;;;;OAKG;YACW,aAAa;IA0C3B;;;;;;;OAOG;YAOW,oBAAoB;IAoClC;;;;;;;;;;;;;OAaG;YAOW,4BAA4B;IAgD1C;;OAEG;IACU,+BAA+B,CAAC,OAAO,EAAE,eAAe;IAkBrE;;;OAGG;IACU,4BAA4B,CAAC,OAAO,EAAE,eAAe;YAqBpD,MAAM;CA+BrB"}

package/dest/public/public_tx_simulator.js

@@ -17,11 +17,12 @@ let PublicTxSimulator = (() => {
     let _simulateEnqueuedCall_decorators;
     let _simulateEnqueuedCallInternal_decorators;
     return _a = class PublicTxSimulator {
-            constructor(db, worldStateDB, telemetryClient, globalVariables, doMerkleOperations = false) {
+            constructor(db, worldStateDB, telemetryClient, globalVariables, doMerkleOperations = false, enforceFeePayment = true) {
                 this.db = (__runInitializers(this, _instanceExtraInitializers), db);
                 this.worldStateDB = worldStateDB;
                 this.globalVariables = globalVariables;
                 this.doMerkleOperations = doMerkleOperations;
+                this.enforceFeePayment = enforceFeePayment;
                 this.log = createLogger(`simulator:public_tx_simulator`);
                 this.metrics = new ExecutorMetrics(telemetryClient, 'PublicTxSimulator');
             }
@@ -45,13 +46,19 @@ let PublicTxSimulator = (() => {
                 // if so, this should only add contracts that were deployed during private app logic.
                 // FIXME: we shouldn't need to directly modify worldStateDb here!
                 await this.worldStateDB.addNewContracts(tx);
+                const nonRevertStart = process.hrtime.bigint();
                 await this.insertNonRevertiblesFromPrivate(context);
+                const nonRevertEnd = process.hrtime.bigint();
+                this.metrics.recordPrivateEffectsInsertion(Number(nonRevertEnd - nonRevertStart) / 1000, 'non-revertible');
                 const processedPhases = [];
                 if (context.hasPhase(TxExecutionPhase.SETUP)) {
                     const setupResult = await this.simulateSetupPhase(context);
                     processedPhases.push(setupResult);
                 }
+                const revertStart = process.hrtime.bigint();
                 await this.insertRevertiblesFromPrivate(context);
+                const revertEnd = process.hrtime.bigint();
+                this.metrics.recordPrivateEffectsInsertion(Number(revertEnd - revertStart) / 1000, 'revertible');
                 if (context.hasPhase(TxExecutionPhase.APP_LOGIC)) {
                     const appLogicResult = await this.simulateAppLogicPhase(context);
                     processedPhases.push(appLogicResult);
@@ -79,7 +86,11 @@ let PublicTxSimulator = (() => {
                 tx.unencryptedLogs.addFunctionLogs([new UnencryptedFunctionL2Logs(context.trace.getUnencryptedLogs())]);
                 return {
                     avmProvingRequest,
-                    gasUsed: { totalGas: context.getActualGasUsed(), teardownGas: context.teardownGasUsed },
+                    gasUsed: {
+                        totalGas: context.getActualGasUsed(),
+                        teardownGas: context.teardownGasUsed,
+                        publicGas: context.getActualPublicGasUsed(),
+                    },
                     revertCode,
                     revertReason: context.revertReason,
                     processedPhases: processedPhases,
@@ -222,7 +233,7 @@ let PublicTxSimulator = (() => {
                 const simulator = await AvmSimulator.create(stateManager, address, sender, transactionFee, this.globalVariables, executionRequest.callContext.isStaticCall, executionRequest.args, allocatedGas);
                 const avmCallResult = await simulator.execute();
                 const result = avmCallResult.finalize();
-                this.log.debug(result.reverted
+                this.log.verbose(result.reverted
                     ? `Simulation of enqueued public call ${fnName} reverted with reason ${result.revertReason}.`
                     : `Simulation of enqueued public call ${fnName} completed successfully.`, {
                     eventName: 'avm-simulation',
@@ -250,6 +261,11 @@ let PublicTxSimulator = (() => {
                         throw new NullifierCollisionError(`Nullifier collision encountered when inserting non-revertible nullifiers from private.\nDetails: ${e.message}\n.Stack:${e.stack}`);
                     }
                 }
+                for (const noteHash of context.nonRevertibleAccumulatedDataFromPrivate.noteHashes) {
+                    if (!noteHash.isEmpty()) {
+                        stateManager.writeUniqueNoteHash(noteHash);
+                    }
+                }
             }
             /**
              * Insert the revertible accumulated data from private into the public state.
@@ -267,6 +283,12 @@ let PublicTxSimulator = (() => {
                         throw new NullifierCollisionError(`Nullifier collision encountered when inserting revertible nullifiers from private. Details:\n${e.message}\n.Stack:${e.stack}`);
                     }
                 }
+                for (const noteHash of context.revertibleAccumulatedDataFromPrivate.noteHashes) {
+                    if (!noteHash.isEmpty()) {
+                        // Revertible note hashes from private are not hashed with nonce, since private can't know their final position, only we can.
+                        stateManager.writeSiloedNoteHash(noteHash);
+                    }
+                }
             }
             async payFee(context) {
                 const txFee = context.getTransactionFee(TxExecutionPhase.TEARDOWN);
@@ -278,9 +300,16 @@ let PublicTxSimulator = (() => {
                 const balanceSlot = computeFeePayerBalanceStorageSlot(context.feePayer);
                 this.log.debug(`Deducting ${txFee.toBigInt()} balance in Fee Juice for ${context.feePayer}`);
                 const stateManager = context.state.getActiveStateManager();
-                const currentBalance = await stateManager.readStorage(feeJuiceAddress, balanceSlot);
+                let currentBalance = await stateManager.readStorage(feeJuiceAddress, balanceSlot);
+                // We allow to fake the balance of the fee payer to allow fee estimation
+                // When mocking the balance of the fee payer, the circuit should not be able to prove the simulation
                 if (currentBalance.lt(txFee)) {
-                    throw new Error(`Not enough balance for fee payer to pay for transaction (got ${currentBalance.toBigInt()} needs ${txFee.toBigInt()})`);
+                    if (this.enforceFeePayment) {
+                        throw new Error(`Not enough balance for fee payer to pay for transaction (got ${currentBalance.toBigInt()} needs ${txFee.toBigInt()})`);
+                    }
+                    else {
+                        currentBalance = txFee;
+                    }
                 }
                 const updatedBalance = currentBalance.sub(txFee);
                 await stateManager.writeStorage(feeJuiceAddress, balanceSlot, updatedBalance, true);
@@ -304,4 +333,4 @@ let PublicTxSimulator = (() => {
         _a;
 })();
 export { PublicTxSimulator };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"public_tx_simulator.js","sourceRoot":"","sources":["../../src/public/public_tx_simulator.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"public_tx_simulator.js","sourceRoot":"","sources":["../../src/public/public_tx_simulator.ts"],"names":[],"mappings":"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"}

package/dest/public/side_effect_trace_interface.d.ts

@@ -15,7 +15,8 @@ export interface PublicSideEffectTraceInterface {
     tracePublicStorageWrite(contractAddress: AztecAddress, slot: Fr, // This is the storage slot not the computed leaf slot
     value: Fr, protocolWrite: boolean, lowLeafPreimage?: PublicDataTreeLeafPreimage, lowLeafIndex?: Fr, lowLeafPath?: Fr[], newLeafPreimage?: PublicDataTreeLeafPreimage, insertionPath?: Fr[]): void;
     traceNoteHashCheck(contractAddress: AztecAddress, noteHash: Fr, leafIndex: Fr, exists: boolean, path?: Fr[]): void;
-    traceNewNoteHash(contractAddress: AztecAddress, noteHash: Fr, leafIndex?: Fr, path?: Fr[]): void;
+    traceNewNoteHash(uniqueNoteHash: Fr, leafIndex?: Fr, path?: Fr[]): void;
+    getNoteHashCount(): number;
     traceNullifierCheck(siloedNullifier: Fr, exists: boolean, lowLeafPreimage?: NullifierLeafPreimage, lowLeafIndex?: Fr, lowLeafPath?: Fr[]): void;
     traceNewNullifier(siloedNullifier: Fr, lowLeafPreimage?: NullifierLeafPreimage, lowLeafIndex?: Fr, lowLeafPath?: Fr[], insertionPath?: Fr[]): void;
     traceL1ToL2MessageCheck(contractAddress: AztecAddress, msgHash: Fr, msgLeafIndex: Fr, exists: boolean, path?: Fr[]): void;

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

@@ -1 +1 @@
-{"version":3,"file":"side_effect_trace_interface.d.ts","sourceRoot":"","sources":["../../src/public/side_effect_trace_interface.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"side_effect_trace_interface.d.ts","sourceRoot":"","sources":["../../src/public/side_effect_trace_interface.ts"],"names":[],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"transitional_adapters.d.ts","sourceRoot":"","sources":["../../src/public/transitional_adapters.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,sBAAsB,EAC3B,KAAK,YAAY,EACjB,EAAE,EACF,KAAK,GAAG,EACR,KAAK,WAAW,EAChB,KAAK,eAAe,EAMpB,KAAK,8BAA8B,EACnC,iBAAiB,EAEjB,KAAK,UAAU,EACf,KAAK,cAAc,EACnB,aAAa,EAGd,MAAM,oBAAoB,CAAC;AAK5B,OAAO,EAAE,KAAK,iCAAiC,EAAE,MAAM,sCAAsC,CAAC;AAE9F,wBAAgB,8BAA8B,CAC5C,KAAK,EAAE,iCAAiC,EACxC,eAAe,EAAE,eAAe,EAChC,mBAAmB,EAAE,cAAc,EACnC,YAAY,EAAE,GAAG,EACjB,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,YAAY,EACtB,iBAAiB,EAAE,iBAAiB,EAAE,EACtC,oBAAoB,EAAE,iBAAiB,EAAE,EACzC,oBAAoB,EAAE,iBAAiB,EAAE,EACzC,uCAAuC,EAAE,8BAA8B,EACvE,oCAAoC,EAAE,8BAA8B,EACpE,gBAAgB,EAAE,aAAa,EAC/B,UAAU,EAAE,GAAG,EACf,cAAc,EAAE,EAAE,EAClB,UAAU,EAAE,UAAU,GACrB,sBAAsB,CAwHxB"}
+{"version":3,"file":"transitional_adapters.d.ts","sourceRoot":"","sources":["../../src/public/transitional_adapters.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,sBAAsB,EAC3B,KAAK,YAAY,EACjB,EAAE,EACF,KAAK,GAAG,EACR,KAAK,WAAW,EAChB,KAAK,eAAe,EAKpB,KAAK,8BAA8B,EACnC,iBAAiB,EAEjB,KAAK,UAAU,EACf,KAAK,cAAc,EACnB,aAAa,EAGd,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAE,KAAK,iCAAiC,EAAE,MAAM,sCAAsC,CAAC;AAE9F,wBAAgB,8BAA8B,CAC5C,KAAK,EAAE,iCAAiC,EACxC,eAAe,EAAE,eAAe,EAChC,mBAAmB,EAAE,cAAc,EACnC,YAAY,EAAE,GAAG,EACjB,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,YAAY,EACtB,iBAAiB,EAAE,iBAAiB,EAAE,EACtC,oBAAoB,EAAE,iBAAiB,EAAE,EACzC,oBAAoB,EAAE,iBAAiB,EAAE,EACzC,uCAAuC,EAAE,8BAA8B,EACvE,oCAAoC,EAAE,8BAA8B,EACpE,gBAAgB,EAAE,aAAa,EAC/B,UAAU,EAAE,GAAG,EACf,cAAc,EAAE,EAAE,EAClB,UAAU,EAAE,UAAU,GACrB,sBAAsB,CAuExB"}

package/dest/public/transitional_adapters.js

@@ -1,5 +1,4 @@
-import { Fr, MAX_L2_TO_L1_MSGS_PER_TX, MAX_NOTE_HASHES_PER_TX, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, PrivateToAvmAccumulatedData, PrivateToAvmAccumulatedDataArrayLengths, PublicCallRequest, PublicDataWrite, TreeSnapshots, countAccumulatedItems, mergeAccumulatedData, } from '@aztec/circuits.js';
-import { computeNoteHashNonce, computeUniqueNoteHash, siloNoteHash } from '@aztec/circuits.js/hash';
+import { Fr, MAX_L2_TO_L1_MSGS_PER_TX, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, PrivateToAvmAccumulatedData, PrivateToAvmAccumulatedDataArrayLengths, PublicCallRequest, PublicDataWrite, TreeSnapshots, countAccumulatedItems, mergeAccumulatedData, } from '@aztec/circuits.js';
 import { padArrayEnd } from '@aztec/foundation/collection';
 import { assertLength } from '@aztec/foundation/serialize';
 export function generateAvmCircuitPublicInputs(trace, globalVariables, startStateReference, startGasUsed, gasSettings, feePayer, setupCallRequests, appLogicCallRequests, teardownCallRequests, nonRevertibleAccumulatedDataFromPrivate, revertibleAccumulatedDataFromPrivate, endTreeSnapshots, endGasUsed, transactionFee, revertCode) {
@@ -12,38 +11,6 @@ export function generateAvmCircuitPublicInputs(trace, globalVariables, startStat
     avmCircuitPublicInputs.previousRevertibleAccumulatedDataArrayLengths = getArrayLengths(revertibleAccumulatedDataFromPrivate);
     avmCircuitPublicInputs.previousNonRevertibleAccumulatedData = convertAccumulatedData(nonRevertibleAccumulatedDataFromPrivate);
     avmCircuitPublicInputs.previousRevertibleAccumulatedData = convertAccumulatedData(revertibleAccumulatedDataFromPrivate);
-    const txHash = avmCircuitPublicInputs.previousNonRevertibleAccumulatedData.nullifiers[0];
-    // Add nonces to revertible note hashes from private. These don't have nonces since we don't know
-    // the final position in the tx until the AVM has executed.
-    // TODO: Use the final position in the tx
-    for (let revertibleIndex = 0; revertibleIndex < avmCircuitPublicInputs.previousRevertibleAccumulatedData.noteHashes.length; revertibleIndex++) {
-        const noteHash = avmCircuitPublicInputs.previousRevertibleAccumulatedData.noteHashes[revertibleIndex];
-        if (noteHash.isZero()) {
-            continue;
-        }
-        const indexInTx = revertibleIndex + avmCircuitPublicInputs.previousNonRevertibleAccumulatedDataArrayLengths.noteHashes;
-        const nonce = computeNoteHashNonce(txHash, indexInTx);
-        const uniqueNoteHash = computeUniqueNoteHash(nonce, noteHash);
-        avmCircuitPublicInputs.previousRevertibleAccumulatedData.noteHashes[revertibleIndex] = uniqueNoteHash;
-    }
-    // merge all revertible & non-revertible side effects into output accumulated data
-    const noteHashesFromPrivate = revertCode.isOK()
-        ? mergeAccumulatedData(avmCircuitPublicInputs.previousNonRevertibleAccumulatedData.noteHashes, avmCircuitPublicInputs.previousRevertibleAccumulatedData.noteHashes)
-        : avmCircuitPublicInputs.previousNonRevertibleAccumulatedData.noteHashes;
-    avmCircuitPublicInputs.accumulatedData.noteHashes = assertLength(mergeAccumulatedData(noteHashesFromPrivate, avmCircuitPublicInputs.accumulatedData.noteHashes), MAX_NOTE_HASHES_PER_TX);
-    // Silo and add nonces for note hashes emitted by the AVM
-    const scopedNoteHashesFromPublic = trace.getSideEffects().noteHashes;
-    for (let i = 0; i < scopedNoteHashesFromPublic.length; i++) {
-        const scopedNoteHash = scopedNoteHashesFromPublic[i];
-        const noteHash = scopedNoteHash.value;
-        if (!noteHash.isZero()) {
-            const noteHashIndexInTx = i + countAccumulatedItems(noteHashesFromPrivate);
-            const nonce = computeNoteHashNonce(txHash, noteHashIndexInTx);
-            const siloedNoteHash = siloNoteHash(scopedNoteHash.contractAddress, noteHash);
-            const uniqueNoteHash = computeUniqueNoteHash(nonce, siloedNoteHash);
-            avmCircuitPublicInputs.accumulatedData.noteHashes[noteHashIndexInTx] = uniqueNoteHash;
-        }
-    }
     const msgsFromPrivate = revertCode.isOK()
         ? mergeAccumulatedData(avmCircuitPublicInputs.previousNonRevertibleAccumulatedData.l2ToL1Msgs, avmCircuitPublicInputs.previousRevertibleAccumulatedData.l2ToL1Msgs)
         : avmCircuitPublicInputs.previousNonRevertibleAccumulatedData.l2ToL1Msgs;
@@ -59,4 +26,4 @@ export function generateAvmCircuitPublicInputs(trace, globalVariables, startStat
     //console.log(`AvmCircuitPublicInputs:\n${inspect(avmCircuitPublicInputs)}`);
     return avmCircuitPublicInputs;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNpdGlvbmFsX2FkYXB0ZXJzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3B1YmxpYy90cmFuc2l0aW9uYWxfYWRhcHRlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUdMLEVBQUUsRUFJRix3QkFBd0IsRUFDeEIsc0JBQXNCLEVBQ3RCLDRDQUE0QyxFQUM1QywyQkFBMkIsRUFDM0IsdUNBQXVDLEVBRXZDLGlCQUFpQixFQUNqQixlQUFlLEVBR2YsYUFBYSxFQUNiLHFCQUFxQixFQUNyQixvQkFBb0IsR0FDckIsTUFBTSxvQkFBb0IsQ0FBQztBQUM1QixPQUFPLEVBQUUsb0JBQW9CLEVBQUUscUJBQXFCLEVBQUUsWUFBWSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDcEcsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQzNELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUkzRCxNQUFNLFVBQVUsOEJBQThCLENBQzVDLEtBQXdDLEVBQ3hDLGVBQWdDLEVBQ2hDLG1CQUFtQyxFQUNuQyxZQUFpQixFQUNqQixXQUF3QixFQUN4QixRQUFzQixFQUN0QixpQkFBc0MsRUFDdEMsb0JBQXlDLEVBQ3pDLG9CQUF5QyxFQUN6Qyx1Q0FBdUUsRUFDdkUsb0NBQW9FLEVBQ3BFLGdCQUErQixFQUMvQixVQUFlLEVBQ2YsY0FBa0IsRUFDbEIsVUFBc0I7SUFFdEIsTUFBTSxrQkFBa0IsR0FBRyxJQUFJLGFBQWEsQ0FDMUMsbUJBQW1CLENBQUMsaUJBQWlCLEVBQ3JDLG1CQUFtQixDQUFDLE9BQU8sQ0FBQyxZQUFZLEVBQ3hDLG1CQUFtQixDQUFDLE9BQU8sQ0FBQyxhQUFhLEVBQ3pDLG1CQUFtQixDQUFDLE9BQU8sQ0FBQyxjQUFjLENBQzNDLENBQUM7SUFFRixNQUFNLHNCQUFzQixHQUFHLEtBQUssQ0FBQyx3QkFBd0IsQ0FDM0QsZUFBZSxFQUNmLGtCQUFrQixF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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNpdGlvbmFsX2FkYXB0ZXJzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3B1YmxpYy90cmFuc2l0aW9uYWxfYWRhcHRlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUdMLEVBQUUsRUFJRix3QkFBd0IsRUFDeEIsNENBQTRDLEVBQzVDLDJCQUEyQixFQUMzQix1Q0FBdUMsRUFFdkMsaUJBQWlCLEVBQ2pCLGVBQWUsRUFHZixhQUFhLEVBQ2IscUJBQXFCLEVBQ3JCLG9CQUFvQixHQUNyQixNQUFNLG9CQUFvQixDQUFDO0FBQzVCLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFJM0QsTUFBTSxVQUFVLDhCQUE4QixDQUM1QyxLQUF3QyxFQUN4QyxlQUFnQyxFQUNoQyxtQkFBbUMsRUFDbkMsWUFBaUIsRUFDakIsV0FBd0IsRUFDeEIsUUFBc0IsRUFDdEIsaUJBQXNDLEVBQ3RDLG9CQUF5QyxFQUN6QyxvQkFBeUMsRUFDekMsdUNBQXVFLEVBQ3ZFLG9DQUFvRSxFQUNwRSxnQkFBK0IsRUFDL0IsVUFBZSxFQUNmLGNBQWtCLEVBQ2xCLFVBQXNCO0lBRXRCLE1BQU0sa0JBQWtCLEdBQUcsSUFBSSxhQUFhLENBQzFDLG1CQUFtQixDQUFDLGlCQUFpQixFQUNyQyxtQkFBbUIsQ0FBQyxPQUFPLENBQUMsWUFBWSxFQUN4QyxtQkFBbUIsQ0FBQyxPQUFPLENBQUMsYUFBYSxFQUN6QyxtQkFBbUIsQ0FBQyxPQUFPLENBQUMsY0FBYyxDQUMzQyxDQUFDO0lBRUYsTUFBTSxzQkFBc0IsR0FBRyxLQUFLLENBQUMsd0JBQXdCLENBQzNELGVBQWUsRUFDZixrQkFBa0IsRUFDbEIsWUFBWSxFQUNaLFdBQVcsRUFDWCxRQUFRLEVBQ1IsaUJBQWlCLEVBQ2pCLG9CQUFvQixFQUNwQixvQkFBb0IsQ0FBQyxNQUFNLENB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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/simulator",
-  "version": "0.67.1",
+  "version": "0.68.0",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -22,7 +22,7 @@
     "clean": "rm -rf ./dest .tsbuildinfo",
     "formatting": "run -T prettier --check ./src && run -T eslint ./src",
     "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
-    "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests"
+    "test": "HARDWARE_CONCURRENCY=16 RAYON_NUM_THREADS=4 NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=8"
   },
   "inherits": [
     "../package.common.json"
@@ -54,9 +54,9 @@
     ],
     "reporters": [
       [
-        "default",
+        "jest-silent-reporter",
         {
-          "summaryThreshold": 9999
+          "useDots": true
         }
       ]
     ],
@@ -66,14 +66,14 @@
     ]
   },
   "dependencies": {
-    "@aztec/circuit-types": "0.67.1",
-    "@aztec/circuits.js": "0.67.1",
-    "@aztec/foundation": "0.67.1",
-    "@aztec/noir-protocol-circuits-types": "0.67.1",
-    "@aztec/protocol-contracts": "0.67.1",
-    "@aztec/telemetry-client": "0.67.1",
-    "@aztec/types": "0.67.1",
-    "@aztec/world-state": "0.67.1",
+    "@aztec/circuit-types": "0.68.0",
+    "@aztec/circuits.js": "0.68.0",
+    "@aztec/foundation": "0.68.0",
+    "@aztec/noir-protocol-circuits-types": "0.68.0",
+    "@aztec/protocol-contracts": "0.68.0",
+    "@aztec/telemetry-client": "0.68.0",
+    "@aztec/types": "0.68.0",
+    "@aztec/world-state": "0.68.0",
     "@noir-lang/acvm_js": "portal:../../noir/packages/acvm_js",
     "@noir-lang/noirc_abi": "portal:../../noir/packages/noirc_abi",
     "@noir-lang/types": "portal:../../noir/packages/types",

package/src/acvm/oracle/oracle.ts

@@ -375,8 +375,8 @@ export class Oracle {
     this.typedOracle.notifySetMinRevertibleSideEffectCounter(frToNumber(fromACVMField(minRevertibleSideEffectCounter)));
   }
 
-  async getAppTaggingSecretAsSender([sender]: ACVMField[], [recipient]: ACVMField[]): Promise<ACVMField[]> {
-    const taggingSecret = await this.typedOracle.getAppTaggingSecretAsSender(
+  async getIndexedTaggingSecretAsSender([sender]: ACVMField[], [recipient]: ACVMField[]): Promise<ACVMField[]> {
+    const taggingSecret = await this.typedOracle.getIndexedTaggingSecretAsSender(
       AztecAddress.fromString(sender),
       AztecAddress.fromString(recipient),
     );

package/src/acvm/oracle/typed_oracle.ts

@@ -237,8 +237,8 @@ export abstract class TypedOracle {
     throw new OracleMethodNotAvailableError('debugLog');
   }
 
-  getAppTaggingSecretAsSender(_sender: AztecAddress, _recipient: AztecAddress): Promise<IndexedTaggingSecret> {
-    throw new OracleMethodNotAvailableError('getAppTaggingSecretAsSender');
+  getIndexedTaggingSecretAsSender(_sender: AztecAddress, _recipient: AztecAddress): Promise<IndexedTaggingSecret> {
+    throw new OracleMethodNotAvailableError('getIndexedTaggingSecretAsSender');
   }
 
   incrementAppTaggingSecretIndexAsSender(_sender: AztecAddress, _recipient: AztecAddress): Promise<void> {

package/src/avm/avm_memory_types.ts

@@ -232,13 +232,14 @@ export class TaggedMemory implements TaggedMemoryInterface {
   // Whether to track and validate memory accesses for each instruction.
   static readonly TRACK_MEMORY_ACCESSES = process.env.NODE_ENV === 'test';
 
-  // FIXME: memory should be 2^32, but TS max array size is: 2^32 - 1
-  static readonly MAX_MEMORY_SIZE = Number((1n << 32n) - 1n);
-  private _mem: MemoryValue[];
+  // Memory is modelled by a map with key type being number.
+  // We however restrict the keys to be non-negative integers smaller than
+  // MAX_MEMORY_SIZE.
+  static readonly MAX_MEMORY_SIZE = Number(1n << 32n);
+  private _mem: Map<number, MemoryValue>;
 
   constructor() {
-    // We do not initialize memory size here because otherwise tests blow up when diffing.
-    this._mem = [];
+    this._mem = new Map<number, MemoryValue>();
   }
 
   public getMaxMemorySize(): number {
@@ -257,8 +258,9 @@ export class TaggedMemory implements TaggedMemoryInterface {
   }
 
   public getAs<T>(offset: number): T {
+    assert(Number.isInteger(offset));
     assert(offset < TaggedMemory.MAX_MEMORY_SIZE);
-    const word = this._mem[offset];
+    const word = this._mem.get(offset);
     TaggedMemory.log.trace(`get(${offset}) = ${word}`);
     if (word === undefined) {
       TaggedMemory.log.debug(`WARNING: Memory at offset ${offset} is undefined!`);
@@ -268,46 +270,46 @@ export class TaggedMemory implements TaggedMemoryInterface {
   }
 
   public getSlice(offset: number, size: number): MemoryValue[] {
+    assert(Number.isInteger(offset) && Number.isInteger(size));
     assert(offset + size <= TaggedMemory.MAX_MEMORY_SIZE);
-    const value = this._mem.slice(offset, offset + size);
-    TaggedMemory.log.trace(`getSlice(${offset}, ${size}) = ${value}`);
-    for (let i = 0; i < value.length; i++) {
-      if (value[i] === undefined) {
-        value[i] = new Field(0);
-      }
+    const slice = new Array<MemoryValue>(size);
+
+    for (let i = 0; i < size; i++) {
+      slice[i] = this._mem.get(offset + i) ?? new Field(0);
     }
-    assert(value.length === size, `Expected slice of size ${size}, got ${value.length}.`);
-    return value;
+
+    TaggedMemory.log.trace(`getSlice(${offset}, ${size}) = ${slice}`);
+    return slice;
   }
 
   public getSliceAs<T>(offset: number, size: number): T[] {
-    assert(offset + size <= TaggedMemory.MAX_MEMORY_SIZE);
     return this.getSlice(offset, size) as T[];
   }
 
   public getSliceTags(offset: number, size: number): TypeTag[] {
-    assert(offset + size <= TaggedMemory.MAX_MEMORY_SIZE);
-    return this._mem.slice(offset, offset + size).map(TaggedMemory.getTag);
+    return this.getSlice(offset, size).map(TaggedMemory.getTag);
   }
 
   public set(offset: number, v: MemoryValue) {
+    assert(Number.isInteger(offset));
     assert(offset < TaggedMemory.MAX_MEMORY_SIZE);
-    this._mem[offset] = v;
+    this._mem.set(offset, v);
     TaggedMemory.log.trace(`set(${offset}, ${v})`);
   }
 
-  public setSlice(offset: number, vs: MemoryValue[]) {
-    assert(offset + vs.length <= TaggedMemory.MAX_MEMORY_SIZE);
-    // We may need to extend the memory size, otherwise splice doesn't insert.
-    if (offset + vs.length > this._mem.length) {
-      this._mem.length = offset + vs.length;
-    }
-    this._mem.splice(offset, vs.length, ...vs);
-    TaggedMemory.log.trace(`setSlice(${offset}, ${vs})`);
+  public setSlice(offset: number, slice: MemoryValue[]) {
+    assert(Number.isInteger(offset));
+    assert(offset + slice.length <= TaggedMemory.MAX_MEMORY_SIZE);
+    slice.forEach((element, idx) => {
+      this._mem.set(offset + idx, element);
+    });
+    TaggedMemory.log.trace(`setSlice(${offset}, ${slice})`);
   }
 
   public getTag(offset: number): TypeTag {
-    return TaggedMemory.getTag(this._mem[offset]);
+    assert(Number.isInteger(offset));
+    assert(offset < TaggedMemory.MAX_MEMORY_SIZE);
+    return TaggedMemory.getTag(this._mem.get(offset));
   }
 
   /**

package/src/avm/avm_simulator.ts

@@ -114,7 +114,7 @@ export class AvmSimulator {
       return new AvmContractCallResult(
         /*reverted=*/ true,
         /*output=*/ [],
-        /*gasLeft=*/ { l2Gas: 0, daGas: 0 },
+        /*gasLeft=*/ { l2Gas: 0, daGas: 0 }, // consumes all allocated gas
         revertReason,
       );
     }
@@ -195,8 +195,10 @@ export class AvmSimulator {
       }
 
       const revertReason = await revertReasonFromExceptionalHalt(err, this.context);
+      // Exceptional halts consume all allocated gas
+      const noGasLeft = { l2Gas: 0, daGas: 0 };
       // Note: "exceptional halts" cannot return data, hence [].
-      const results = new AvmContractCallResult(/*reverted=*/ true, /*output=*/ [], machineState.gasLeft, revertReason);
+      const results = new AvmContractCallResult(/*reverted=*/ true, /*output=*/ [], noGasLeft, revertReason);
       this.log.debug(`Context execution results: ${results.toString()}`);
 
       this.tallyPrintFunction();

package/src/avm/avm_tree.ts

@@ -1,5 +1,5 @@
 import { type IndexedTreeId, MerkleTreeId, type MerkleTreeReadOperations, getTreeHeight } from '@aztec/circuit-types';
-import { NullifierLeafPreimage, PublicDataTreeLeafPreimage } from '@aztec/circuits.js';
+import { AppendOnlyTreeSnapshot, NullifierLeafPreimage, PublicDataTreeLeafPreimage } from '@aztec/circuits.js';
 import { poseidon2Hash } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
 import { type IndexedTreeLeafPreimage, type TreeLeafPreimage } from '@aztec/foundation/trees';
@@ -550,6 +550,11 @@ export class AvmEphemeralForest {
     const input = preimage.toHashInputs().map(x => Fr.fromBuffer(x));
     return poseidon2Hash(input);
   }
+
+  getTreeSnapshot(id: MerkleTreeId): AppendOnlyTreeSnapshot {
+    const tree = this.treeMap.get(id)!;
+    return new AppendOnlyTreeSnapshot(tree.getRoot(), Number(tree.leafCount));
+  }
 }
 
 /****************************************************/

package/src/avm/fixtures/index.ts

@@ -1,10 +1,10 @@
-import { isNoirCallStackUnresolved } from '@aztec/circuit-types';
+import { TxHash, isNoirCallStackUnresolved } from '@aztec/circuit-types';
 import { GasFees, GlobalVariables, MAX_L2_GAS_PER_TX_PUBLIC_PORTION } from '@aztec/circuits.js';
 import { type FunctionArtifact, FunctionSelector } from '@aztec/foundation/abi';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
-import { AvmTestContractArtifact } from '@aztec/noir-contracts.js';
+import { AvmTestContractArtifact } from '@aztec/noir-contracts.js/AvmTest';
 
 import { strict as assert } from 'assert';
 import { mock } from 'jest-mock-extended';
@@ -45,6 +45,7 @@ export function initPersistableStateManager(overrides?: {
   nullifiers?: NullifierManager;
   doMerkleOperations?: boolean;
   merkleTrees?: AvmEphemeralForest;
+  txHash?: TxHash;
 }): AvmPersistableStateManager {
   const worldStateDB = overrides?.worldStateDB || mock<WorldStateDB>();
   return new AvmPersistableStateManager(
@@ -54,6 +55,7 @@ export function initPersistableStateManager(overrides?: {
     overrides?.nullifiers || new NullifierManager(worldStateDB),
     overrides?.doMerkleOperations || false,
     overrides?.merkleTrees || mock<AvmEphemeralForest>(),
+    overrides?.txHash || new TxHash(new Fr(27).toBuffer()),
   );
 }