@aztec/simulator 0.0.1-commit.c949de6bc → 0.0.1-commit.cbf2c2d5d

package/dest/public/public_processor/public_processor.js

@@ -490,7 +490,7 @@ _dec = trackSpan('PublicProcessor.processTx', (tx)=>({
    * @param validator - Pre-process validator and nullifier cache to use for processing the txs.
    * @returns The list of processed txs with their circuit simulation outputs.
    */ async process(txs, limits = {}, validator = {}) {
-        const { maxTransactions, maxBlockSize, deadline, maxBlockGas, maxBlobFields } = limits;
+        const { maxTransactions, deadline, maxBlockGas, maxBlobFields, isBuildingProposal } = limits;
         const { preprocessValidator, nullifierCache } = validator;
         const result = [];
         const usedTxs = [];
@@ -513,21 +513,23 @@ _dec = trackSpan('PublicProcessor.processTx', (tx)=>({
                 this.log.warn(`Stopping tx processing due to timeout.`);
                 break;
             }
-            // Skip this tx if it'd exceed max block size
             const txHash = tx.getTxHash().toString();
-            const preTxSizeInBytes = tx.getEstimatedPrivateTxEffectsSize();
-            if (maxBlockSize !== undefined && totalSizeInBytes + preTxSizeInBytes > maxBlockSize) {
-                this.log.warn(`Skipping processing of tx ${txHash} sized ${preTxSizeInBytes} bytes due to block size limit`, {
+            // Skip this tx if its estimated blob fields would exceed the limit.
+            // Only done during proposal building: during re-execution we must process the exact txs from the proposal.
+            const txBlobFields = tx.getPrivateTxEffectsSizeInFields();
+            if (isBuildingProposal && maxBlobFields !== undefined && totalBlobFields + txBlobFields > maxBlobFields) {
+                this.log.warn(`Skipping tx ${txHash} with ${txBlobFields} fields from private side effects due to blob fields limit`, {
                     txHash,
-                    sizeInBytes: preTxSizeInBytes,
-                    totalSizeInBytes,
-                    maxBlockSize
+                    txBlobFields,
+                    totalBlobFields,
+                    maxBlobFields
                 });
                 continue;
             }
-            // Skip this tx if its gas limit would exceed the block gas limit
+            // Skip this tx if its gas limit would exceed the block gas limit (either da or l2).
+            // Only done during proposal building: during re-execution we must process the exact txs from the proposal.
             const txGasLimit = tx.data.constants.txContext.gasSettings.gasLimits;
-            if (maxBlockGas !== undefined && totalBlockGas.add(txGasLimit).gtAny(maxBlockGas)) {
+            if (isBuildingProposal && maxBlockGas !== undefined && totalBlockGas.add(txGasLimit).gtAny(maxBlockGas)) {
                 this.log.warn(`Skipping processing of tx ${txHash} due to block gas limit`, {
                     txHash,
                     txGasLimit,
@@ -574,21 +576,8 @@ _dec = trackSpan('PublicProcessor.processTx', (tx)=>({
                     throw new Error(`Fake error after processing ${fakeThrowAfter} txs`);
                 }
                 const txBlobFields = processedTx.txEffect.getNumBlobFields();
-                // If the actual size of this tx would exceed block size, skip it
                 const txSize = txBlobFields * Fr.SIZE_IN_BYTES;
-                if (maxBlockSize !== undefined && totalSizeInBytes + txSize > maxBlockSize) {
-                    this.log.debug(`Skipping processed tx ${txHash} sized ${txSize} due to max block size.`, {
-                        txHash,
-                        sizeInBytes: txSize,
-                        totalSizeInBytes,
-                        maxBlockSize
-                    });
-                    // Need to revert the checkpoint here and don't go any further
-                    await checkpoint.revert();
-                    this.contractsDB.revertCheckpoint();
-                    continue;
-                }
-                // If the actual blob fields of this tx would exceed the limit, skip it
+                // If the actual blob fields of this tx would exceed the limit, skip it.
                 // Note: maxBlobFields already accounts for block end blob fields and previous blocks in checkpoint.
                 if (maxBlobFields !== undefined && totalBlobFields + txBlobFields > maxBlobFields) {
                     this.log.debug(`Skipping processed tx ${txHash} with ${txBlobFields} blob fields due to max blob fields limit.`, {
@@ -602,6 +591,20 @@ _dec = trackSpan('PublicProcessor.processTx', (tx)=>({
                     this.contractsDB.revertCheckpoint();
                     continue;
                 }
+                // During re-execution, check if the actual gas used by this tx would push the block over the gas limit.
+                // Unlike the proposal-building check (which uses declared gas limits pessimistically before processing),
+                // this uses actual gas and stops processing when the limit is exceeded.
+                if (!isBuildingProposal && maxBlockGas !== undefined && totalBlockGas.add(processedTx.gasUsed.totalGas).gtAny(maxBlockGas)) {
+                    this.log.warn(`Stopping re-execution since tx ${txHash} would push block gas over limit`, {
+                        txHash,
+                        txGas: processedTx.gasUsed.totalGas,
+                        totalBlockGas,
+                        maxBlockGas
+                    });
+                    await checkpoint.revert();
+                    this.contractsDB.revertCheckpoint();
+                    break;
+                }
                 // FIXME(fcarreiro): it's ugly to have to notify the validator of nullifiers.
                 // I'd rather pass the validators the processedTx as well and let them deal with it.
                 nullifierCache?.addNullifiers(processedTx.txEffect.nullifiers.map((n)=>n.toBuffer()));
@@ -614,6 +617,8 @@ _dec = trackSpan('PublicProcessor.processTx', (tx)=>({
                 totalBlockGas = totalBlockGas.add(processedTx.gasUsed.totalGas);
                 totalSizeInBytes += txSize;
                 totalBlobFields += txBlobFields;
+                // Commit the tx-level contracts checkpoint on success
+                this.contractsDB.commitCheckpoint();
             } catch (err) {
                 if (err?.name === 'PublicProcessorTimeoutError') {
                     this.log.warn(`Stopping tx processing due to timeout.`);
@@ -630,22 +635,19 @@ _dec = trackSpan('PublicProcessor.processTx', (tx)=>({
                     // We now know there can't be any further access to world state. The fork is in a state where there is:
                     // 1. At least one outstanding checkpoint that has not been committed (the one created before we processed the tx).
                     // 2. Possible state updates on that checkpoint or any others created during execution.
-                    // First we revert a checkpoint as managed by the ForkCheckpoint. This will revert whatever is the current checkpoint
-                    // which may not be the one originally created by this object. But that is ok, we do this to fulfil the ForkCheckpoint
-                    // lifecycle expectations and ensure it doesn't attempt to commit later on.
-                    await checkpoint.revert();
-                    // Now we want to revert any/all remaining checkpoints, destroying any outstanding state updates.
-                    // This needs to be done directly on the underlying fork as the guarded fork has been stopped.
-                    await this.guardedMerkleTree.getUnderlyingFork().revertAllCheckpoints();
+                    // Revert all checkpoints at or above this checkpoint's depth (inclusive), destroying any outstanding state
+                    // updates from this tx and any nested checkpoints created during execution. This preserves any checkpoints
+                    // created by callers below our depth.
+                    await checkpoint.revertToCheckpoint();
                     // Revert any contracts added to the DB for the tx.
                     this.contractsDB.revertCheckpoint();
                     // Ensure we're at the same state as when we started processing this tx.
                     await this.checkWorldStateUnchanged(startStateReference, txHash, err);
                     break;
                 }
-                // Roll back state to start of TX before proceeding to next TX
-                await checkpoint.revert();
-                await this.guardedMerkleTree.getUnderlyingFork().revertAllCheckpoints();
+                // Roll back state to start of TX before proceeding to next TX.
+                // Reverts all checkpoints at or above this checkpoint's depth, preserving any caller checkpoints below.
+                await checkpoint.revertToCheckpoint();
                 this.contractsDB.revertCheckpoint();
                 const errorMessage = err instanceof Error || err instanceof AssertionError ? err.message : 'Unknown error';
                 this.log.warn(`Failed to process tx ${txHash.toString()}: ${errorMessage} ${err?.stack}`);
@@ -659,7 +661,6 @@ _dec = trackSpan('PublicProcessor.processTx', (tx)=>({
             } finally{
                 // Base case is we always commit the checkpoint. Using the ForkCheckpoint means this has no effect if the tx was previously reverted
                 await checkpoint.commit();
-                this.contractsDB.commitCheckpointOkIfNone();
             }
         }
         const duration = timer.s();
@@ -677,7 +678,6 @@ _dec = trackSpan('PublicProcessor.processTx', (tx)=>({
             failed,
             usedTxs,
             returns,
-            totalBlobFields,
             debugLogs
         ];
     }
@@ -788,7 +788,7 @@ _dec = trackSpan('PublicProcessor.processTx', (tx)=>({
         this.metrics.recordClassPublication(...tx.getContractClassLogs().filter((log)=>ContractClassPublishedEvent.isContractClassPublishedEvent(log)).map((log)=>ContractClassPublishedEvent.fromLog(log)));
         // Fee payment insertion has already been done. Do the rest.
         await this.doTreeInsertionsForPrivateOnlyTx(processedTx);
-        await this.contractsDB.addNewContracts(tx);
+        this.contractsDB.addNewContracts(tx);
         return [
             processedTx,
             undefined,

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

@@ -16,4 +16,4 @@ export declare class ContractProviderForCpp implements ContractProvider {
     commitCheckpoint: () => Promise<void>;
     revertCheckpoint: () => Promise<void>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfcHJvdmlkZXJfZm9yX2NwcC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3B1YmxpYy9wdWJsaWNfdHhfc2ltdWxhdG9yL2NvbnRyYWN0X3Byb3ZpZGVyX2Zvcl9jcHAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFlLEtBQUssY0FBYyxFQUFnQixNQUFNLHVCQUF1QixDQUFDO0FBQ3ZGLE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sZUFBZSxDQUFDO0FBS3RELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRXhELE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFakUscUJBQWEsc0JBQXVCLFlBQVcsZ0JBQWdCO0lBSTNELE9BQU8sQ0FBQyxXQUFXO0lBQ25CLE9BQU8sQ0FBQyxlQUFlO0lBSnpCLE9BQU8sQ0FBQyxHQUFHLENBQVM7SUFFcEIsWUFDVSxXQUFXLEVBQUUsaUJBQWlCLEVBQzlCLGVBQWUsRUFBRSxlQUFlLEVBQ3hDLFFBQVEsQ0FBQyxFQUFFLGNBQWMsRUFHMUI7SUFFTSxtQkFBbUIsb0VBYXhCO0lBRUssZ0JBQWdCLG9FQWVyQjtJQUVLLFlBQVksMkVBV2pCO0lBRUsscUJBQXFCLG9FQWdCMUI7SUFFSyxvQkFBb0IscUVBc0J6QjtJQUVLLGdCQUFnQixzQkFHckI7SUFFSyxnQkFBZ0Isc0JBR3JCO0lBRUssZ0JBQWdCLHNCQUdyQjtDQUNIIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfcHJvdmlkZXJfZm9yX2NwcC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3B1YmxpYy9wdWJsaWNfdHhfc2ltdWxhdG9yL2NvbnRyYWN0X3Byb3ZpZGVyX2Zvcl9jcHAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFlLEtBQUssY0FBYyxFQUFnQixNQUFNLHVCQUF1QixDQUFDO0FBQ3ZGLE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sZUFBZSxDQUFDO0FBS3RELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRXhELE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFakUscUJBQWEsc0JBQXVCLFlBQVcsZ0JBQWdCO0lBSTNELE9BQU8sQ0FBQyxXQUFXO0lBQ25CLE9BQU8sQ0FBQyxlQUFlO0lBSnpCLE9BQU8sQ0FBQyxHQUFHLENBQVM7SUFFcEIsWUFDVSxXQUFXLEVBQUUsaUJBQWlCLEVBQzlCLGVBQWUsRUFBRSxlQUFlLEVBQ3hDLFFBQVEsQ0FBQyxFQUFFLGNBQWMsRUFHMUI7SUFFTSxtQkFBbUIsb0VBYXhCO0lBRUssZ0JBQWdCLG9FQWVyQjtJQUdLLFlBQVksMkVBV2pCO0lBRUsscUJBQXFCLG9FQWdCMUI7SUFFSyxvQkFBb0IscUVBc0J6QjtJQUVLLGdCQUFnQixzQkFHckI7SUFFSyxnQkFBZ0Isc0JBR3JCO0lBRUssZ0JBQWdCLHNCQUdyQjtDQUNIIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"contract_provider_for_cpp.d.ts","sourceRoot":"","sources":["../../../src/public/public_tx_simulator/contract_provider_for_cpp.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,KAAK,cAAc,EAAgB,MAAM,uBAAuB,CAAC;AACvF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAKtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAExD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,qBAAa,sBAAuB,YAAW,gBAAgB;IAI3D,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,eAAe;IAJzB,OAAO,CAAC,GAAG,CAAS;IAEpB,YACU,WAAW,EAAE,iBAAiB,EAC9B,eAAe,EAAE,eAAe,EACxC,QAAQ,CAAC,EAAE,cAAc,EAG1B;IAEM,mBAAmB,oEAaxB;IAEK,gBAAgB,oEAerB;IAEK,YAAY,2EAWjB;IAEK,qBAAqB,oEAgB1B;IAEK,oBAAoB,qEAsBzB;IAEK,gBAAgB,sBAGrB;IAEK,gBAAgB,sBAGrB;IAEK,gBAAgB,sBAGrB;CACH"}
+{"version":3,"file":"contract_provider_for_cpp.d.ts","sourceRoot":"","sources":["../../../src/public/public_tx_simulator/contract_provider_for_cpp.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,KAAK,cAAc,EAAgB,MAAM,uBAAuB,CAAC;AACvF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAKtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAExD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,qBAAa,sBAAuB,YAAW,gBAAgB;IAI3D,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,eAAe;IAJzB,OAAO,CAAC,GAAG,CAAS;IAEpB,YACU,WAAW,EAAE,iBAAiB,EAC9B,eAAe,EAAE,eAAe,EACxC,QAAQ,CAAC,EAAE,cAAc,EAG1B;IAEM,mBAAmB,oEAaxB;IAEK,gBAAgB,oEAerB;IAGK,YAAY,2EAWjB;IAEK,qBAAqB,oEAgB1B;IAEK,oBAAoB,qEAsBzB;IAEK,gBAAgB,sBAGrB;IAEK,gBAAgB,sBAGrB;IAEK,gBAAgB,sBAGrB;CACH"}

package/dest/public/public_tx_simulator/contract_provider_for_cpp.js

@@ -40,7 +40,7 @@ export class ContractProviderForCpp {
             const contractDeploymentData = ContractDeploymentData.fromPlainObject(rawData);
             // Add contracts to the contracts DB
             this.log.trace(`Calling contractsDB.addContracts`);
-            await this.contractsDB.addContracts(contractDeploymentData);
+            this.contractsDB.addContracts(contractDeploymentData);
         };
         this.getBytecodeCommitment = async (classId)=>{
             this.log.trace(`Contract provider callback: getBytecodeCommitment(${classId})`);
@@ -89,6 +89,7 @@ export class ContractProviderForCpp {
     }
     getContractInstance;
     getContractClass;
+    // eslint-disable-next-line require-await
     addContracts;
     getBytecodeCommitment;
     getDebugFunctionName;

package/dest/public/public_tx_simulator/public_tx_simulator.js

@@ -255,7 +255,7 @@ export class PublicTxSimulator {
         // However, things work as expected because later calls to getters on the hintingContractsDB
         // will pick up the new contracts and will generate the necessary hints.
         // So, a consumer of the hints will always see the new contracts.
-        await this.contractsDB.addContracts(context.nonRevertibleContractDeploymentData);
+        this.contractsDB.addContracts(context.nonRevertibleContractDeploymentData);
     }
     /**
    * Insert the revertible accumulated data from private into the public state.
@@ -316,7 +316,7 @@ export class PublicTxSimulator {
         // However, things work as expected because later calls to getters on the hintingContractsDB
         // will pick up the new contracts and will generate the necessary hints.
         // So, a consumer of the hints will always see the new contracts.
-        await this.contractsDB.addContracts(context.revertibleContractDeploymentData);
+        this.contractsDB.addContracts(context.revertibleContractDeploymentData);
     }
     async payFee(context) {
         const txFee = context.getTransactionFee(TxExecutionPhase.TEARDOWN);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/simulator",
-  "version": "0.0.1-commit.c949de6bc",
+  "version": "0.0.1-commit.cbf2c2d5d",
   "type": "module",
   "exports": {
     "./server": "./dest/server.js",
@@ -64,26 +64,25 @@
     ]
   },
   "dependencies": {
-    "@aztec/constants": "0.0.1-commit.c949de6bc",
-    "@aztec/foundation": "0.0.1-commit.c949de6bc",
-    "@aztec/native": "0.0.1-commit.c949de6bc",
-    "@aztec/noir-acvm_js": "0.0.1-commit.c949de6bc",
-    "@aztec/noir-noirc_abi": "0.0.1-commit.c949de6bc",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.c949de6bc",
-    "@aztec/noir-types": "0.0.1-commit.c949de6bc",
-    "@aztec/protocol-contracts": "0.0.1-commit.c949de6bc",
-    "@aztec/stdlib": "0.0.1-commit.c949de6bc",
-    "@aztec/telemetry-client": "0.0.1-commit.c949de6bc",
-    "@aztec/world-state": "0.0.1-commit.c949de6bc",
+    "@aztec/constants": "0.0.1-commit.cbf2c2d5d",
+    "@aztec/foundation": "0.0.1-commit.cbf2c2d5d",
+    "@aztec/native": "0.0.1-commit.cbf2c2d5d",
+    "@aztec/noir-acvm_js": "0.0.1-commit.cbf2c2d5d",
+    "@aztec/noir-noirc_abi": "0.0.1-commit.cbf2c2d5d",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.cbf2c2d5d",
+    "@aztec/noir-types": "0.0.1-commit.cbf2c2d5d",
+    "@aztec/protocol-contracts": "0.0.1-commit.cbf2c2d5d",
+    "@aztec/stdlib": "0.0.1-commit.cbf2c2d5d",
+    "@aztec/telemetry-client": "0.0.1-commit.cbf2c2d5d",
+    "@aztec/world-state": "0.0.1-commit.cbf2c2d5d",
     "lodash.clonedeep": "^4.5.0",
     "lodash.merge": "^4.6.2",
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@aztec/kv-store": "0.0.1-commit.c949de6bc",
-    "@aztec/merkle-tree": "0.0.1-commit.c949de6bc",
-    "@aztec/noir-contracts.js": "0.0.1-commit.c949de6bc",
-    "@aztec/noir-test-contracts.js": "0.0.1-commit.c949de6bc",
+    "@aztec/kv-store": "0.0.1-commit.cbf2c2d5d",
+    "@aztec/noir-contracts.js": "0.0.1-commit.cbf2c2d5d",
+    "@aztec/noir-test-contracts.js": "0.0.1-commit.cbf2c2d5d",
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/lodash.clonedeep": "^4.5.7",

package/src/private/circuit_recording/circuit_recorder.ts

@@ -161,11 +161,11 @@ export class CircuitRecorder {
         throw new Error(`Oracle method ${name} not found when setting up recording callback`);
       }
 
-      const isExternalCall = (name as keyof ACIRCallback) === 'privateCallPrivateFunction';
+      const isExternalCall = (name as keyof ACIRCallback) === 'aztec_prv_callPrivateFunction';
 
       recordingCallback[name as keyof ACIRCallback] = (...args: ForeignCallInput[]): ReturnType<typeof fn> => {
         const timer = new Timer();
-        // If we're entering another circuit via `privateCallPrivateFunction`, we increase the stack depth and set the
+        // If we're entering another circuit via `aztec_prv_callPrivateFunction`, we increase the stack depth and set the
         // newCircuit variable to ensure we are creating a new recording object.
         if (isExternalCall) {
           this.stackDepth++;

package/src/public/avm/opcodes/external_calls.ts

@@ -14,8 +14,8 @@ abstract class ExternalCall extends Instruction {
     OperandType.UINT16, // L2 gas offset
     OperandType.UINT16, // DA gas offset
     OperandType.UINT16, // Address offset
-    OperandType.UINT16, // Args offset
     OperandType.UINT16, // Args size offset
+    OperandType.UINT16, // Args offset
   ];
 
   constructor(

package/src/public/contracts_db_checkpoint.ts

@@ -31,7 +31,7 @@ export class ContractsDbCheckpoint {
     return this.bytecodeCommitments.get(classId.toString());
   }
 
-  public deepCopy(): ContractsDbCheckpoint {
+  public fork(): ContractsDbCheckpoint {
     const copy = new ContractsDbCheckpoint();
     this.instances.forEach((value, key) => copy.instances.set(key, value));
     this.classes.forEach((value, key) => copy.classes.set(key, value));

package/src/public/fixtures/public_tx_simulation_tester.ts

@@ -117,6 +117,7 @@ export class PublicTxSimulationTester extends BaseAvmSimulationTester {
     feePayer: AztecAddress = sender,
     /* need some unique first nullifier for note-nonce computations */
     privateInsertions: TestPrivateInsertions = { nonRevertible: { nullifiers: [new Fr(420000 + this.txCount)] } },
+    gasLimits?: Gas,
   ): Promise<Tx> {
     const setupCallRequests = await asyncMap(setupCalls, call =>
       this.#createPubicCallRequestForCall(call, call.sender ?? sender),
@@ -142,6 +143,7 @@ export class PublicTxSimulationTester extends BaseAvmSimulationTester {
           )
         : new Gas(TX_DA_GAS_OVERHEAD, PUBLIC_TX_L2_GAS_OVERHEAD),
       defaultGlobals(),
+      gasLimits,
     );
   }
 
@@ -154,8 +156,9 @@ export class PublicTxSimulationTester extends BaseAvmSimulationTester {
     /* need some unique first nullifier for note-nonce computations */
     privateInsertions?: TestPrivateInsertions,
     txLabel: string = 'unlabeledTx',
+    gasLimits?: Gas,
   ): Promise<PublicTxResult> {
-    const tx = await this.createTx(sender, setupCalls, appCalls, teardownCall, feePayer, privateInsertions);
+    const tx = await this.createTx(sender, setupCalls, appCalls, teardownCall, feePayer, privateInsertions, gasLimits);
 
     await this.setFeePayerBalance(feePayer);
 
@@ -200,8 +203,18 @@ export class PublicTxSimulationTester extends BaseAvmSimulationTester {
     teardownCall?: TestEnqueuedCall,
     feePayer?: AztecAddress,
     privateInsertions?: TestPrivateInsertions,
+    gasLimits?: Gas,
   ): Promise<PublicTxResult> {
-    return await this.simulateTx(sender, setupCalls, appCalls, teardownCall, feePayer, privateInsertions, txLabel);
+    return await this.simulateTx(
+      sender,
+      setupCalls,
+      appCalls,
+      teardownCall,
+      feePayer,
+      privateInsertions,
+      txLabel,
+      gasLimits,
+    );
   }
 
   /**
@@ -219,6 +232,7 @@ export class PublicTxSimulationTester extends BaseAvmSimulationTester {
     teardownCall?: TestEnqueuedCall,
     feePayer?: AztecAddress,
     privateInsertions?: TestPrivateInsertions,
+    gasLimits?: Gas,
   ): Promise<PublicTxResult> {
     return await this.simulateTxWithLabel(
       txLabel,
@@ -228,6 +242,7 @@ export class PublicTxSimulationTester extends BaseAvmSimulationTester {
       teardownCall,
       feePayer,
       privateInsertions,
+      gasLimits,
     );
   }
 

package/src/public/fixtures/utils.ts

@@ -62,13 +62,14 @@ export async function createTxForPublicCalls(
   feePayer = AztecAddress.zero(),
   gasUsedByPrivate: Gas = Gas.empty(),
   globals: GlobalVariables = GlobalVariables.empty(),
+  gasLimits?: Gas,
 ): Promise<Tx> {
   assert(
     setupCallRequests.length > 0 || appCallRequests.length > 0 || teardownCallRequest !== undefined,
     "Can't create public tx with no enqueued calls",
   );
   // use max limits
-  const gasLimits = new Gas(DEFAULT_DA_GAS_LIMIT, DEFAULT_L2_GAS_LIMIT);
+  gasLimits = gasLimits ?? new Gas(DEFAULT_DA_GAS_LIMIT, DEFAULT_L2_GAS_LIMIT);
 
   const forPublic = PartialPrivateTailPublicInputsForPublic.empty();
 

package/src/public/hinting_db_sources.ts

@@ -410,12 +410,12 @@ export class HintingMerkleWriteOperations implements MerkleTreeWriteOperations {
     }
   }
 
-  public async createCheckpoint(): Promise<void> {
+  public async createCheckpoint(): Promise<number> {
     const actionCounter = this.checkpointActionCounter++;
     const oldCheckpointId = this.getCurrentCheckpointId();
     const treesStateHash = await this.getTreesStateHash();
 
-    await this.db.createCheckpoint();
+    const depth = await this.db.createCheckpoint();
     this.checkpointStack.push(this.nextCheckpointId++);
     const newCheckpointId = this.getCurrentCheckpointId();
 
@@ -424,14 +424,16 @@ export class HintingMerkleWriteOperations implements MerkleTreeWriteOperations {
     HintingMerkleWriteOperations.log.trace(
       `[createCheckpoint:${actionCounter}] Checkpoint evolved ${oldCheckpointId} -> ${newCheckpointId} at trees state ${treesStateHash}.`,
     );
+
+    return depth;
   }
 
-  public commitAllCheckpoints(): Promise<void> {
-    throw new Error('commitAllCheckpoints is not supported in HintingMerkleWriteOperations.');
+  public commitAllCheckpointsTo(_depth: number): Promise<void> {
+    throw new Error('commitAllCheckpointsTo is not supported in HintingMerkleWriteOperations.');
   }
 
-  public revertAllCheckpoints(): Promise<void> {
-    throw new Error('revertAllCheckpoints is not supported in HintingMerkleWriteOperations.');
+  public revertAllCheckpointsTo(_depth: number): Promise<void> {
+    throw new Error('revertAllCheckpointsTo is not supported in HintingMerkleWriteOperations.');
   }
 
   public async commitCheckpoint(): Promise<void> {

package/src/public/public_db_sources.ts

@@ -55,10 +55,10 @@ export class PublicContractsDB implements PublicContractsDBInterface {
     this.log = createLogger('simulator:contracts-data-source', bindings);
   }
 
-  public async addContracts(contractDeploymentData: ContractDeploymentData): Promise<void> {
+  public addContracts(contractDeploymentData: ContractDeploymentData): void {
     const currentState = this.getCurrentState();
 
-    await this.addContractClassesFromEvents(
+    this.addContractClassesFromEvents(
       ContractClassPublishedEvent.extractContractClassEvents(contractDeploymentData.getContractClassLogs()),
       currentState,
     );
@@ -69,10 +69,10 @@ export class PublicContractsDB implements PublicContractsDBInterface {
     );
   }
 
-  public async addNewContracts(tx: Tx): Promise<void> {
+  public addNewContracts(tx: Tx): void {
     const contractDeploymentData = AllContractDeploymentData.fromTx(tx);
-    await this.addContracts(contractDeploymentData.getNonRevertibleContractDeploymentData());
-    await this.addContracts(contractDeploymentData.getRevertibleContractDeploymentData());
+    this.addContracts(contractDeploymentData.getNonRevertibleContractDeploymentData());
+    this.addContracts(contractDeploymentData.getRevertibleContractDeploymentData());
   }
 
   /**
@@ -81,7 +81,7 @@ export class PublicContractsDB implements PublicContractsDBInterface {
    */
   public createCheckpoint(): void {
     const currentState = this.getCurrentState();
-    const newState = currentState.deepCopy();
+    const newState = currentState.fork();
     this.contractStateStack.push(newState);
   }
 
@@ -174,17 +174,15 @@ export class PublicContractsDB implements PublicContractsDBInterface {
     return await this.dataSource.getDebugFunctionName(address, selector);
   }
 
-  private async addContractClassesFromEvents(
+  private addContractClassesFromEvents(
     contractClassEvents: ContractClassPublishedEvent[],
     state: ContractsDbCheckpoint,
   ) {
-    await Promise.all(
-      contractClassEvents.map(async (event: ContractClassPublishedEvent) => {
-        this.log.debug(`Adding class ${event.contractClassId.toString()} to contract state`);
-        const contractClass = await event.toContractClassPublic();
-        state.addClass(event.contractClassId, contractClass);
-      }),
-    );
+    for (const event of contractClassEvents) {
+      this.log.debug(`Adding class ${event.contractClassId.toString()} to contract state`);
+      const contractClass = event.toContractClassPublic();
+      state.addClass(event.contractClassId, contractClass);
+    }
   }
 
   private addContractInstancesFromEvents(

package/src/public/public_processor/guarded_merkle_tree.ts

@@ -134,7 +134,7 @@ export class GuardedMerkleTreeOperations implements MerkleTreeWriteOperations {
   ): Promise<(BlockNumber | undefined)[]> {
     return this.guardAndPush(() => this.target.getBlockNumbersForLeafIndices(treeId, leafIndices));
   }
-  createCheckpoint(): Promise<void> {
+  createCheckpoint(): Promise<number> {
     return this.guardAndPush(() => this.target.createCheckpoint());
   }
   commitCheckpoint(): Promise<void> {
@@ -143,11 +143,11 @@ export class GuardedMerkleTreeOperations implements MerkleTreeWriteOperations {
   revertCheckpoint(): Promise<void> {
     return this.guardAndPush(() => this.target.revertCheckpoint());
   }
-  commitAllCheckpoints(): Promise<void> {
-    return this.guardAndPush(() => this.target.commitAllCheckpoints());
+  commitAllCheckpointsTo(depth: number): Promise<void> {
+    return this.guardAndPush(() => this.target.commitAllCheckpointsTo(depth));
   }
-  revertAllCheckpoints(): Promise<void> {
-    return this.guardAndPush(() => this.target.revertAllCheckpoints());
+  revertAllCheckpointsTo(depth: number): Promise<void> {
+    return this.guardAndPush(() => this.target.revertAllCheckpointsTo(depth));
   }
   findSiblingPaths<ID extends MerkleTreeId>(
     treeId: ID,