@aztec/simulator 0.0.0-test.0 → 0.0.1-commit.03f7ef2

package/dest/public/public_processor/public_processor.js

@@ -6,20 +6,25 @@ function _ts_decorate(decorators, target, key, desc) {
 }
 import { MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, NULLIFIER_SUBTREE_HEIGHT } from '@aztec/constants';
 import { padArrayEnd } from '@aztec/foundation/collection';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { createLogger } from '@aztec/foundation/log';
-import { Timer, elapsed, executeTimeout } from '@aztec/foundation/timer';
+import { sleep } from '@aztec/foundation/sleep';
+import { DateProvider, Timer, elapsed, executeTimeout } from '@aztec/foundation/timer';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
-import { ContractClassRegisteredEvent } from '@aztec/protocol-contracts/class-registerer';
+import { ContractClassPublishedEvent } from '@aztec/protocol-contracts/class-registry';
 import { computeFeePayerBalanceLeafSlot, computeFeePayerBalanceStorageSlot } from '@aztec/protocol-contracts/fee-juice';
-import { PublicDataWrite } from '@aztec/stdlib/avm';
+import { AvmCircuitInputs, AvmExecutionHints, PublicDataWrite } from '@aztec/stdlib/avm';
+import { computeTransactionFee } from '@aztec/stdlib/fees';
 import { Gas } from '@aztec/stdlib/gas';
+import { ProvingRequestType } from '@aztec/stdlib/proofs';
 import { MerkleTreeId } from '@aztec/stdlib/trees';
-import { NestedProcessReturnValues, Tx, TxExecutionPhase, makeProcessedTxFromPrivateOnlyTx, makeProcessedTxFromTxWithPublicCalls } from '@aztec/stdlib/tx';
+import { NestedProcessReturnValues, makeProcessedTxFromPrivateOnlyTx, makeProcessedTxFromTxWithPublicCalls } from '@aztec/stdlib/tx';
 import { Attributes, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
 import { ForkCheckpoint } from '@aztec/world-state/native';
-import { WorldStateDB } from '../public_db_sources.js';
-import { PublicTxSimulator } from '../public_tx_simulator/public_tx_simulator.js';
+import { AssertionError } from 'assert';
+import { PublicContractsDB, PublicTreesDB } from '../public_db_sources.js';
+import { TelemetryCppPublicTxSimulator } from '../public_tx_simulator/index.js';
+import { GuardedMerkleTreeOperations } from './guarded_merkle_tree.js';
 import { PublicProcessorMetrics } from './public_processor_metrics.js';
 /**
  * Creates new instances of PublicProcessor given the provided merkle tree db and contract data source.
@@ -27,24 +32,24 @@ import { PublicProcessorMetrics } from './public_processor_metrics.js';
     contractDataSource;
     dateProvider;
     telemetryClient;
-    constructor(contractDataSource, dateProvider, telemetryClient = getTelemetryClient()){
+    constructor(contractDataSource, dateProvider = new DateProvider(), telemetryClient = getTelemetryClient()){
         this.contractDataSource = contractDataSource;
         this.dateProvider = dateProvider;
         this.telemetryClient = telemetryClient;
     }
     /**
    * Creates a new instance of a PublicProcessor.
-   * @param historicalHeader - The header of a block previous to the one in which the tx is included.
    * @param globalVariables - The global variables for the block being processed.
    * @param skipFeeEnforcement - Allows disabling balance checks for fee estimations.
    * @returns A new instance of a PublicProcessor.
-   */ create(merkleTree, globalVariables, skipFeeEnforcement) {
-        const worldStateDB = new WorldStateDB(merkleTree, this.contractDataSource);
-        const publicTxSimulator = this.createPublicTxSimulator(merkleTree, worldStateDB, globalVariables, /*doMerkleOperations=*/ true, skipFeeEnforcement, this.telemetryClient);
-        return new PublicProcessor(merkleTree, globalVariables, worldStateDB, publicTxSimulator, this.dateProvider, this.telemetryClient);
+   */ create(merkleTree, globalVariables, config) {
+        const contractsDB = new PublicContractsDB(this.contractDataSource);
+        const guardedFork = new GuardedMerkleTreeOperations(merkleTree);
+        const publicTxSimulator = this.createPublicTxSimulator(guardedFork, contractsDB, globalVariables, config);
+        return new PublicProcessor(globalVariables, guardedFork, contractsDB, publicTxSimulator, this.dateProvider, this.telemetryClient);
     }
-    createPublicTxSimulator(db, worldStateDB, globalVariables, doMerkleOperations, skipFeeEnforcement, telemetryClient) {
-        return new PublicTxSimulator(db, worldStateDB, globalVariables, doMerkleOperations, skipFeeEnforcement, telemetryClient);
+    createPublicTxSimulator(merkleTree, contractsDB, globalVariables, config) {
+        return new TelemetryCppPublicTxSimulator(merkleTree, contractsDB, globalVariables, this.telemetryClient, config);
     }
 }
 class PublicProcessorTimeoutError extends Error {
@@ -57,20 +62,22 @@ class PublicProcessorTimeoutError extends Error {
  * Converts Txs lifted from the P2P module into ProcessedTx objects by executing
  * any public function calls in them. Txs with private calls only are unaffected.
  */ export class PublicProcessor {
-    db;
     globalVariables;
-    worldStateDB;
+    guardedMerkleTree;
+    contractsDB;
     publicTxSimulator;
     dateProvider;
     log;
+    opts;
     metrics;
-    constructor(db, globalVariables, worldStateDB, publicTxSimulator, dateProvider, telemetryClient = getTelemetryClient(), log = createLogger('simulator:public-processor')){
-        this.db = db;
+    constructor(globalVariables, guardedMerkleTree, contractsDB, publicTxSimulator, dateProvider, telemetryClient = getTelemetryClient(), log = createLogger('simulator:public-processor'), opts = {}){
         this.globalVariables = globalVariables;
-        this.worldStateDB = worldStateDB;
+        this.guardedMerkleTree = guardedMerkleTree;
+        this.contractsDB = contractsDB;
         this.publicTxSimulator = publicTxSimulator;
         this.dateProvider = dateProvider;
         this.log = log;
+        this.opts = opts;
         this.metrics = new PublicProcessorMetrics(telemetryClient, 'PublicProcessor');
     }
     get tracer() {
@@ -79,19 +86,22 @@ class PublicProcessorTimeoutError extends Error {
     /**
    * Run each tx through the public circuit and the public kernel circuit if needed.
    * @param txs - Txs to process.
-   * @param processedTxHandler - Handler for processed txs in the context of block building or proving.
+   * @param limits - Limits for processing the txs.
+   * @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 = {}, validators = {}) {
-        const { maxTransactions, maxBlockSize, deadline, maxBlockGas } = limits;
-        const { preprocessValidator, postprocessValidator, nullifierCache } = validators;
+   */ async process(txs, limits = {}, validator = {}) {
+        const { maxTransactions, maxBlockSize, deadline, maxBlockGas, maxBlobFields } = limits;
+        const { preprocessValidator, nullifierCache } = validator;
         const result = [];
+        const usedTxs = [];
         const failed = [];
         const timer = new Timer();
         let totalSizeInBytes = 0;
         let returns = [];
         let totalPublicGas = new Gas(0, 0);
         let totalBlockGas = new Gas(0, 0);
-        for await (const origTx of txs){
+        let totalBlobFields = 0;
+        for await (const tx of txs){
             // Only process up to the max tx limit
             if (maxTransactions !== undefined && result.length >= maxTransactions) {
                 this.log.debug(`Stopping tx processing due to reaching the max tx limit.`);
@@ -103,8 +113,8 @@ class PublicProcessorTimeoutError extends Error {
                 break;
             }
             // Skip this tx if it'd exceed max block size
-            const txHash = (await origTx.getTxHash()).toString();
-            const preTxSizeInBytes = origTx.getEstimatedPrivateTxEffectsSize();
+            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`, {
                     txHash,
@@ -115,7 +125,7 @@ class PublicProcessorTimeoutError extends Error {
                 continue;
             }
             // Skip this tx if its gas limit would exceed the block gas limit
-            const txGasLimit = origTx.data.constants.txContext.gasSettings.gasLimits;
+            const txGasLimit = tx.data.constants.txContext.gasSettings.gasLimits;
             if (maxBlockGas !== undefined && totalBlockGas.add(txGasLimit).gtAny(maxBlockGas)) {
                 this.log.warn(`Skipping processing of tx ${txHash} due to block gas limit`, {
                     txHash,
@@ -125,15 +135,13 @@ class PublicProcessorTimeoutError extends Error {
                 });
                 continue;
             }
-            // The processor modifies the tx objects in place, so we need to clone them.
-            const tx = Tx.clone(origTx);
             // We validate the tx before processing it, to avoid unnecessary work.
             if (preprocessValidator) {
                 const result = await preprocessValidator.validateTx(tx);
-                const txHash = await tx.getTxHash();
+                const txHash = tx.getTxHash();
                 if (result.result === 'invalid') {
                     const reason = result.reason.join(', ');
-                    this.log.warn(`Rejecting tx ${txHash.toString()} due to pre-process validation fail: ${reason}`);
+                    this.log.debug(`Rejecting tx ${txHash.toString()} due to pre-process validation fail: ${reason}`);
                     failed.push({
                         tx,
                         error: new Error(`Tx failed preprocess validation: ${reason}`)
@@ -142,7 +150,7 @@ class PublicProcessorTimeoutError extends Error {
                     continue;
                 } else if (result.result === 'skipped') {
                     const reason = result.reason.join(', ');
-                    this.log.warn(`Skipping tx ${txHash.toString()} due to pre-process validation: ${reason}`);
+                    this.log.debug(`Skipping tx ${txHash.toString()} due to pre-process validation: ${reason}`);
                     returns.push(new NestedProcessReturnValues([]));
                     continue;
                 } else {
@@ -152,13 +160,23 @@ class PublicProcessorTimeoutError extends Error {
             // We checkpoint the transaction here, then within the try/catch we
             // 1. Revert the checkpoint if the tx fails or needs to be discarded for any reason
             // 2. Commit the transaction in the finally block. Note that by using the ForkCheckpoint lifecycle only the first commit/revert takes effect
-            const checkpoint = await ForkCheckpoint.new(this.worldStateDB);
+            // By doing this, every transaction starts on a fresh checkpoint and it's state updates only make it to the fork if this checkpoint is committed.
+            // Note: We use the underlying fork here not the guarded one, this ensures that it's not impacted by stopping the guarded version
+            const checkpoint = await ForkCheckpoint.new(this.guardedMerkleTree.getUnderlyingFork());
+            const startStateReference = await this.guardedMerkleTree.getUnderlyingFork().getStateReference();
+            this.contractsDB.createCheckpoint();
             try {
                 const [processedTx, returnValues] = await this.processTx(tx, deadline);
+                // Inject a fake processing failure after N txs if requested
+                const fakeThrowAfter = this.opts.fakeThrowAfterProcessingTxCount;
+                if (fakeThrowAfter !== undefined && result.length + failed.length + 1 >= fakeThrowAfter) {
+                    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 = processedTx.txEffect.getDASize();
+                const txSize = txBlobFields * Fr.SIZE_IN_BYTES;
                 if (maxBlockSize !== undefined && totalSizeInBytes + txSize > maxBlockSize) {
-                    this.log.warn(`Skipping processed tx ${txHash} sized ${txSize} due to max block size.`, {
+                    this.log.debug(`Skipping processed tx ${txHash} sized ${txSize} due to max block size.`, {
                         txHash,
                         sizeInBytes: txSize,
                         totalSizeInBytes,
@@ -166,64 +184,78 @@ class PublicProcessorTimeoutError extends Error {
                     });
                     // Need to revert the checkpoint here and don't go any further
                     await checkpoint.revert();
+                    this.contractsDB.revertCheckpoint();
                     continue;
                 }
-                // Re-validate the transaction
-                if (postprocessValidator) {
-                    // Only accept processed transactions that are not double-spends,
-                    // public functions emitting nullifiers would pass earlier check but fail here.
-                    // Note that we're checking all nullifiers generated in the private execution twice,
-                    // we could store the ones already checked and skip them here as an optimization.
-                    // TODO(palla/txs): Can we get into this case? AVM validates this. We should be able to remove it.
-                    const result = await postprocessValidator.validateTx(processedTx);
-                    if (result.result !== 'valid') {
-                        const reason = result.reason.join(', ');
-                        this.log.error(`Rejecting tx ${processedTx.hash} after processing: ${reason}.`);
-                        failed.push({
-                            tx,
-                            error: new Error(`Tx failed post-process validation: ${reason}`)
-                        });
-                        // Need to revert the checkpoint here and don't go any further
-                        await checkpoint.revert();
-                        continue;
-                    } else {
-                        this.log.trace(`Tx ${txHash.toString()} is valid post processing.`);
-                    }
-                }
-                if (!tx.hasPublicCalls()) {
-                    // If there are no public calls, perform all tree insertions for side effects from private
-                    // When there are public calls, the PublicTxSimulator & AVM handle tree insertions.
-                    await this.doTreeInsertionsForPrivateOnlyTx(processedTx);
-                    // Add any contracts registered/deployed in this private-only tx to the block-level cache
-                    // (add to tx-level cache and then commit to block-level cache)
-                    await this.worldStateDB.addNewContracts(tx);
-                    this.worldStateDB.commitContractsForTx();
+                // If the actual blob fields of this tx would exceed the limit, skip it
+                if (maxBlobFields !== undefined && totalBlobFields + txBlobFields > maxBlobFields) {
+                    this.log.debug(`Skipping processed tx ${txHash} with ${txBlobFields} blob fields due to max blob fields limit.`, {
+                        txHash,
+                        txBlobFields,
+                        totalBlobFields,
+                        maxBlobFields
+                    });
+                    // Need to revert the checkpoint here and don't go any further
+                    await checkpoint.revert();
+                    this.contractsDB.revertCheckpoint();
+                    continue;
                 }
+                // 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()));
                 result.push(processedTx);
+                usedTxs.push(tx);
                 returns = returns.concat(returnValues);
                 totalPublicGas = totalPublicGas.add(processedTx.gasUsed.publicGas);
                 totalBlockGas = totalBlockGas.add(processedTx.gasUsed.totalGas);
                 totalSizeInBytes += txSize;
+                totalBlobFields += txBlobFields;
             } catch (err) {
-                // Roll back state to start of TX before proceeding to next TX
-                await checkpoint.revert();
                 if (err?.name === 'PublicProcessorTimeoutError') {
                     this.log.warn(`Stopping tx processing due to timeout.`);
+                    // We hit the transaction execution deadline.
+                    // There may still be a transaction executing on a worker thread (C++ via NAPI).
+                    // Signal cancellation AND WAIT for the simulation to actually stop.
+                    // This is critical because C++ might be in the middle of a slow operation (e.g., pad_trees)
+                    // and won't check the cancellation flag until that operation completes.
+                    // Without waiting, we'd proceed to revert checkpoints while C++ is still writing to state.
+                    // Wait for C++ to stop gracefully.
+                    await this.publicTxSimulator.cancel?.();
+                    // Now stop the guarded fork to prevent any further TS-side access to the world state.
+                    await this.guardedMerkleTree.stop();
+                    // 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 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;
                 }
-                const errorMessage = err instanceof Error ? err.message : 'Unknown error';
+                // Roll back state to start of TX before proceeding to next TX
+                await checkpoint.revert();
+                await this.guardedMerkleTree.getUnderlyingFork().revertAllCheckpoints();
+                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}`);
                 failed.push({
                     tx,
                     error: err instanceof Error ? err : new Error(errorMessage)
                 });
                 returns.push(new NestedProcessReturnValues([]));
+                // Ensure we're at the same state as when we started processing this tx.
+                await this.checkWorldStateUnchanged(startStateReference, txHash, err);
             } finally{
-                // Base case is we always commit the checkpoint. Using the ForkCheckpoint means this has no effect if the tx was reverted
+                // 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();
-                // The tx-level contracts cache should not live on to the next tx
-                this.worldStateDB.clearContractsForTx();
+                this.contractsDB.commitCheckpointOkIfNone();
             }
         }
         const duration = timer.s();
@@ -239,12 +271,26 @@ class PublicProcessorTimeoutError extends Error {
         return [
             result,
             failed,
+            usedTxs,
             returns
         ];
     }
+    async checkWorldStateUnchanged(startStateReference, txHash, cause) {
+        const endStateReference = await this.guardedMerkleTree.getUnderlyingFork().getStateReference();
+        if (!startStateReference.equals(endStateReference)) {
+            this.log.warn(`Fork state reference changed by tx ${txHash} after error in public processor`, {
+                expected: startStateReference.toInspect(),
+                actual: endStateReference.toInspect(),
+                cause
+            });
+            throw new Error(`Fork state reference changed by tx ${txHash} after error in public processor`, {
+                cause
+            });
+        }
+    }
     async processTx(tx, deadline) {
         const [time, [processedTx, returnValues]] = await elapsed(()=>this.processTxWithinDeadline(tx, deadline));
-        this.log.verbose(!tx.hasPublicCalls() ? `Processed tx ${processedTx.hash} with no public calls in ${time}ms` : `Processed tx ${processedTx.hash} with ${tx.enqueuedPublicFunctionCalls.length} public calls in ${time}ms`, {
+        this.log.verbose(!tx.hasPublicCalls() ? `Processed tx ${processedTx.hash} with no public calls in ${time}ms` : `Processed tx ${processedTx.hash} with ${tx.numberOfPublicCalls()} public calls in ${time}ms`, {
             txHash: processedTx.hash,
             txFee: processedTx.txEffect.transactionFee.toBigInt(),
             revertCode: processedTx.txEffect.revertCode.getCode(),
@@ -264,7 +310,7 @@ class PublicProcessorTimeoutError extends Error {
             returnValues ?? []
         ];
     }
-    async doTreeInsertionsForPrivateOnlyTx(processedTx, txValidator) {
+    async doTreeInsertionsForPrivateOnlyTx(processedTx) {
         const treeInsertionStart = process.hrtime.bigint();
         // Update the state so that the next tx in the loop has the correct .startState
         // NB: before this change, all .startStates were actually incorrect, but the issue was never caught because we either:
@@ -272,29 +318,31 @@ class PublicProcessorTimeoutError extends Error {
         // b) always had a txHandler with the same db passed to it as this.db, which updated the db in buildBaseRollupHints in this loop
         // To see how this ^ happens, move back to one shared db in test_context and run orchestrator_multi_public_functions.test.ts
         // The below is taken from buildBaseRollupHints:
-        await this.db.appendLeaves(MerkleTreeId.NOTE_HASH_TREE, padArrayEnd(processedTx.txEffect.noteHashes, Fr.ZERO, MAX_NOTE_HASHES_PER_TX));
+        await this.guardedMerkleTree.appendLeaves(MerkleTreeId.NOTE_HASH_TREE, padArrayEnd(processedTx.txEffect.noteHashes, Fr.ZERO, MAX_NOTE_HASHES_PER_TX));
         try {
-            await this.db.batchInsert(MerkleTreeId.NULLIFIER_TREE, padArrayEnd(processedTx.txEffect.nullifiers, Fr.ZERO, MAX_NULLIFIERS_PER_TX).map((n)=>n.toBuffer()), NULLIFIER_SUBTREE_HEIGHT);
-        } catch (error) {
-            if (txValidator) {
-                // Ideally the validator has already caught this above, but just in case:
-                throw new Error(`Transaction ${processedTx.hash} invalid after processing public functions`);
-            } else {
-                // We have no validator and assume this call should blindly process txs with duplicates being caught later
-                this.log.warn(`Detected duplicate nullifier after public processing for: ${processedTx.hash}.`);
-            }
+            await this.guardedMerkleTree.batchInsert(MerkleTreeId.NULLIFIER_TREE, padArrayEnd(processedTx.txEffect.nullifiers, Fr.ZERO, MAX_NULLIFIERS_PER_TX).map((n)=>n.toBuffer()), NULLIFIER_SUBTREE_HEIGHT);
+        } catch (cause) {
+            throw new Error(`Transaction ${processedTx.hash} failed with duplicate nullifiers`, {
+                cause
+            });
         }
-        // The only public data write should be for fee payment
-        await this.db.sequentialInsert(MerkleTreeId.PUBLIC_DATA_TREE, processedTx.txEffect.publicDataWrites.map((x)=>x.toBuffer()));
         const treeInsertionEnd = process.hrtime.bigint();
         this.metrics.recordTreeInsertions(Number(treeInsertionEnd - treeInsertionStart) / 1_000);
     }
     /** Processes the given tx within deadline. Returns timeout if deadline is hit. */ async processTxWithinDeadline(tx, deadline) {
-        const processFn = tx.hasPublicCalls() ? ()=>this.processTxWithPublicCalls(tx) : ()=>this.processPrivateOnlyTx(tx);
+        const innerProcessFn = tx.hasPublicCalls() ? ()=>this.processTxWithPublicCalls(tx) : ()=>this.processPrivateOnlyTx(tx);
+        // Fake a delay per tx if instructed (used for tests)
+        const fakeDelayPerTxMs = this.opts.fakeProcessingDelayPerTxMs;
+        const processFn = fakeDelayPerTxMs && fakeDelayPerTxMs > 0 ? async ()=>{
+            const result = await innerProcessFn();
+            this.log.warn(`Sleeping ${fakeDelayPerTxMs}ms after processing tx ${tx.getTxHash().toString()}`);
+            await sleep(fakeDelayPerTxMs);
+            return result;
+        } : innerProcessFn;
         if (!deadline) {
             return await processFn();
         }
-        const txHash = await tx.getTxHash();
+        const txHash = tx.getTxHash();
         const timeout = +deadline - this.dateProvider.now();
         if (timeout <= 0) {
             throw new PublicProcessorTimeoutError();
@@ -310,26 +358,30 @@ class PublicProcessorTimeoutError extends Error {
    * Creates the public data write for paying the tx fee.
    * This is used in private only txs, since for txs with public calls
    * the avm handles the fee payment itself.
-   */ async getFeePaymentPublicDataWrite(txFee, feePayer) {
+   */ async performFeePaymentPublicDataWrite(txFee, feePayer) {
         const feeJuiceAddress = ProtocolContractAddress.FeeJuice;
         const balanceSlot = await computeFeePayerBalanceStorageSlot(feePayer);
         const leafSlot = await computeFeePayerBalanceLeafSlot(feePayer);
+        // This high-level db is used as a convenient helper. It could be done with the merkleTree directly.
+        const treesDB = new PublicTreesDB(this.guardedMerkleTree);
         this.log.debug(`Deducting ${txFee.toBigInt()} balance in Fee Juice for ${feePayer}`);
-        const balance = await this.worldStateDB.storageRead(feeJuiceAddress, balanceSlot);
+        const balance = await treesDB.storageRead(feeJuiceAddress, balanceSlot);
         if (balance.lt(txFee)) {
             throw new Error(`Not enough balance for fee payer to pay for transaction (got ${balance.toBigInt()} needs ${txFee.toBigInt()})`);
         }
         const updatedBalance = balance.sub(txFee);
-        await this.worldStateDB.storageWrite(feeJuiceAddress, balanceSlot, updatedBalance);
+        await treesDB.storageWrite(feeJuiceAddress, balanceSlot, updatedBalance);
         return new PublicDataWrite(leafSlot, updatedBalance);
     }
     async processPrivateOnlyTx(tx) {
         const gasFees = this.globalVariables.gasFees;
-        const transactionFee = tx.data.gasUsed.computeFee(gasFees);
-        const feePaymentPublicDataWrite = await this.getFeePaymentPublicDataWrite(transactionFee, tx.data.feePayer);
-        const processedTx = await makeProcessedTxFromPrivateOnlyTx(tx, transactionFee, feePaymentPublicDataWrite, this.globalVariables);
-        const siloedContractClassLogs = await tx.filterContractClassLogs(tx.data.getNonEmptyContractClassLogsHashes(), true);
-        this.metrics.recordClassRegistration(...siloedContractClassLogs.filter((log)=>ContractClassRegisteredEvent.isContractClassRegisteredEvent(log)).map((log)=>ContractClassRegisteredEvent.fromLog(log)));
+        const transactionFee = computeTransactionFee(gasFees, tx.data.constants.txContext.gasSettings, tx.data.gasUsed);
+        const feePaymentPublicDataWrite = await this.performFeePaymentPublicDataWrite(transactionFee, tx.data.feePayer);
+        const processedTx = makeProcessedTxFromPrivateOnlyTx(tx, transactionFee, feePaymentPublicDataWrite, this.globalVariables);
+        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);
         return [
             processedTx,
             undefined
@@ -337,43 +389,47 @@ class PublicProcessorTimeoutError extends Error {
     }
     async processTxWithPublicCalls(tx) {
         const timer = new Timer();
-        const { avmProvingRequest, gasUsed, revertCode, revertReason, processedPhases } = await this.publicTxSimulator.simulate(tx);
-        if (!avmProvingRequest) {
-            this.metrics.recordFailedTx();
-            throw new Error('Avm proving result was not generated.');
-        }
-        processedPhases.forEach((phase)=>{
-            if (phase.reverted) {
-                this.metrics.recordRevertedPhase(phase.phase);
-            } else {
-                this.metrics.recordPhaseDuration(phase.phase, phase.durationMs);
-            }
-        });
-        const siloedContractClassLogs = await tx.filterContractClassLogs(tx.data.getNonEmptyContractClassLogsHashes(), true);
-        this.metrics.recordClassRegistration(...siloedContractClassLogs.filter((log)=>ContractClassRegisteredEvent.isContractClassRegisteredEvent(log)).map((log)=>ContractClassRegisteredEvent.fromLog(log)));
-        const phaseCount = processedPhases.length;
+        const result = await this.publicTxSimulator.simulate(tx);
+        // TODO: use the callStackMetadata here to extract more data about public execution
+        const { hints, publicInputs, publicTxEffect, gasUsed, revertCode/*callStackMetadata*/  } = result;
+        const contractClassLogs = revertCode.isOK() ? tx.getContractClassLogs() : tx.getSplitContractClassLogs(false);
+        this.metrics.recordClassPublication(...contractClassLogs.filter((log)=>ContractClassPublishedEvent.isContractClassPublishedEvent(log)).map((log)=>ContractClassPublishedEvent.fromLog(log)));
+        // TODO(fcarreiro): remove phase count metric.
         const durationMs = timer.ms();
-        this.metrics.recordTx(phaseCount, durationMs, gasUsed.publicGas);
-        const processedTx = await makeProcessedTxFromTxWithPublicCalls(tx, avmProvingRequest, gasUsed, revertCode, revertReason);
-        const returnValues = processedPhases.find(({ phase })=>phase === TxExecutionPhase.APP_LOGIC)?.returnValues ?? [];
+        this.metrics.recordTx(/*phaseCount=*/ 1, durationMs, gasUsed.publicGas);
+        // Extract the return values from the call stack metadata.
+        const appLogicReturnValues = result.getAppLogicReturnValues();
+        // Extract the revert reason from the call stack metadata.
+        const revertReason = result.findRevertReason();
+        // Create proving request if we have hints and public inputs.
+        const avmProvingRequest = hints && publicInputs ? PublicProcessor.generateProvingRequest(publicInputs, hints) : undefined;
+        const processedTx = makeProcessedTxFromTxWithPublicCalls(tx, this.globalVariables, avmProvingRequest, publicTxEffect, gasUsed, revertCode, revertReason);
         return [
             processedTx,
-            returnValues
+            appLogicReturnValues
         ];
     }
+    /**
+   * Generate the proving request for the AVM circuit.
+   */ static generateProvingRequest(publicInputs, hints = AvmExecutionHints.empty()) {
+        return {
+            type: ProvingRequestType.PUBLIC_VM,
+            inputs: new AvmCircuitInputs(hints, publicInputs)
+        };
+    }
 }
 _ts_decorate([
-    trackSpan('PublicProcessor.processTx', async (tx)=>({
-            [Attributes.TX_HASH]: (await tx.getTxHash()).toString()
+    trackSpan('PublicProcessor.processTx', (tx)=>({
+            [Attributes.TX_HASH]: tx.getTxHash().toString()
         }))
 ], PublicProcessor.prototype, "processTx", null);
 _ts_decorate([
-    trackSpan('PublicProcessor.processPrivateOnlyTx', async (tx)=>({
-            [Attributes.TX_HASH]: (await tx.getTxHash()).toString()
+    trackSpan('PublicProcessor.processPrivateOnlyTx', (tx)=>({
+            [Attributes.TX_HASH]: tx.getTxHash().toString()
         }))
 ], PublicProcessor.prototype, "processPrivateOnlyTx", null);
 _ts_decorate([
-    trackSpan('PublicProcessor.processTxWithPublicCalls', async (tx)=>({
-            [Attributes.TX_HASH]: (await tx.getTxHash()).toString()
+    trackSpan('PublicProcessor.processTxWithPublicCalls', (tx)=>({
+            [Attributes.TX_HASH]: tx.getTxHash().toString()
         }))
 ], PublicProcessor.prototype, "processTxWithPublicCalls", null);

package/dest/public/public_processor/public_processor_metrics.d.ts

@@ -1,4 +1,4 @@
-import type { ContractClassRegisteredEvent } from '@aztec/protocol-contracts/class-registerer';
+import type { ContractClassPublishedEvent } from '@aztec/protocol-contracts/class-registry';
 import type { Gas } from '@aztec/stdlib/gas';
 import type { TxExecutionPhase } from '@aztec/stdlib/tx';
 import { type TelemetryClient, type Tracer } from '@aztec/telemetry-client';
@@ -21,7 +21,7 @@ export declare class PublicProcessorMetrics {
     recordAllTxs(totalGas: Gas, gasRate: number): void;
     recordFailedTx(): void;
     recordRevertedPhase(phaseName: TxExecutionPhase): void;
-    recordClassRegistration(...events: ContractClassRegisteredEvent[]): void;
+    recordClassPublication(...events: ContractClassPublishedEvent[]): void;
     recordTreeInsertions(durationUs: number): void;
 }
-//# sourceMappingURL=public_processor_metrics.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljX3Byb2Nlc3Nvcl9tZXRyaWNzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcHVibGljL3B1YmxpY19wcm9jZXNzb3IvcHVibGljX3Byb2Nlc3Nvcl9tZXRyaWNzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLDJCQUEyQixFQUFFLE1BQU0sMENBQTBDLENBQUM7QUFDNUYsT0FBTyxLQUFLLEVBQUUsR0FBRyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDN0MsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUN6RCxPQUFPLEVBS0wsS0FBSyxlQUFlLEVBQ3BCLEtBQUssTUFBTSxFQUdaLE1BQU0seUJBQXlCLENBQUM7QUFFakMscUJBQWEsc0JBQXNCO0lBQ2pDLFNBQWdCLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFFL0IsT0FBTyxDQUFDLFVBQVUsQ0FBWTtJQUM5QixPQUFPLENBQUMsT0FBTyxDQUFnQjtJQUMvQixPQUFPLENBQUMsWUFBWSxDQUFnQjtJQUVwQyxPQUFPLENBQUMsYUFBYSxDQUFZO0lBQ2pDLE9BQU8sQ0FBQyxVQUFVLENBQWdCO0lBRWxDLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBWTtJQUNwQyxPQUFPLENBQUMsUUFBUSxDQUFRO0lBQ3hCLE9BQU8sQ0FBQyxpQkFBaUIsQ0FBWTtJQUNyQyxPQUFPLENBQUMsT0FBTyxDQUFZO0lBQzNCLE9BQU8sQ0FBQyxLQUFLLENBQVk7SUFFekIsT0FBTyxDQUFDLHFCQUFxQixDQUFZO0lBRXpDLFlBQVksTUFBTSxFQUFFLGVBQWUsRUFBRSxJQUFJLFNBQW9CLEVBMEQ1RDtJQUVELG1CQUFtQixDQUFDLFNBQVMsRUFBRSxnQkFBZ0IsRUFBRSxVQUFVLEVBQUUsTUFBTSxRQUdsRTtJQUVELFFBQVEsQ0FBQyxVQUFVLEVBQUUsTUFBTSxFQUFFLFVBQVUsRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFFLEdBQUcsUUFZNUQ7SUFFRCxZQUFZLENBQUMsUUFBUSxFQUFFLEdBQUcsRUFBRSxPQUFPLEVBQUUsTUFBTSxRQWdCMUM7SUFFRCxjQUFjLFNBSWI7SUFFRCxtQkFBbUIsQ0FBQyxTQUFTLEVBQUUsZ0JBQWdCLFFBRTlDO0lBRUQsc0JBQXNCLENBQUMsR0FBRyxNQUFNLEVBQUUsMkJBQTJCLEVBQUUsUUFTOUQ7SUFFRCxvQkFBb0IsQ0FBQyxVQUFVLEVBQUUsTUFBTSxRQUV0QztDQUNGIn0=

package/dest/public/public_processor/public_processor_metrics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"public_processor_metrics.d.ts","sourceRoot":"","sources":["../../../src/public/public_processor/public_processor_metrics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,4CAA4C,CAAC;AAC/F,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAKL,KAAK,eAAe,EACpB,KAAK,MAAM,EAGZ,MAAM,yBAAyB,CAAC;AAEjC,qBAAa,sBAAsB;IACjC,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,UAAU,CAAY;IAC9B,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,YAAY,CAAgB;IAEpC,OAAO,CAAC,aAAa,CAAY;IACjC,OAAO,CAAC,UAAU,CAAgB;IAElC,OAAO,CAAC,gBAAgB,CAAY;IACpC,OAAO,CAAC,QAAQ,CAAQ;IACxB,OAAO,CAAC,iBAAiB,CAAY;IACrC,OAAO,CAAC,OAAO,CAAY;IAC3B,OAAO,CAAC,KAAK,CAAY;IAEzB,OAAO,CAAC,qBAAqB,CAAY;gBAE7B,MAAM,EAAE,eAAe,EAAE,IAAI,SAAoB;IA4D7D,mBAAmB,CAAC,SAAS,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM;IAKnE,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG;IAc7D,YAAY,CAAC,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM;IAkB3C,cAAc;IAMd,mBAAmB,CAAC,SAAS,EAAE,gBAAgB;IAI/C,uBAAuB,CAAC,GAAG,MAAM,EAAE,4BAA4B,EAAE;IAWjE,oBAAoB,CAAC,UAAU,EAAE,MAAM;CAGxC"}
+{"version":3,"file":"public_processor_metrics.d.ts","sourceRoot":"","sources":["../../../src/public/public_processor/public_processor_metrics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,0CAA0C,CAAC;AAC5F,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAKL,KAAK,eAAe,EACpB,KAAK,MAAM,EAGZ,MAAM,yBAAyB,CAAC;AAEjC,qBAAa,sBAAsB;IACjC,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,UAAU,CAAY;IAC9B,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,YAAY,CAAgB;IAEpC,OAAO,CAAC,aAAa,CAAY;IACjC,OAAO,CAAC,UAAU,CAAgB;IAElC,OAAO,CAAC,gBAAgB,CAAY;IACpC,OAAO,CAAC,QAAQ,CAAQ;IACxB,OAAO,CAAC,iBAAiB,CAAY;IACrC,OAAO,CAAC,OAAO,CAAY;IAC3B,OAAO,CAAC,KAAK,CAAY;IAEzB,OAAO,CAAC,qBAAqB,CAAY;IAEzC,YAAY,MAAM,EAAE,eAAe,EAAE,IAAI,SAAoB,EA0D5D;IAED,mBAAmB,CAAC,SAAS,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,QAGlE;IAED,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,QAY5D;IAED,YAAY,CAAC,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,QAgB1C;IAED,cAAc,SAIb;IAED,mBAAmB,CAAC,SAAS,EAAE,gBAAgB,QAE9C;IAED,sBAAsB,CAAC,GAAG,MAAM,EAAE,2BAA2B,EAAE,QAS9D;IAED,oBAAoB,CAAC,UAAU,EAAE,MAAM,QAEtC;CACF"}

package/dest/public/public_processor/public_processor_metrics.js

@@ -110,7 +110,7 @@ export class PublicProcessorMetrics {
             [Attributes.OK]: false
         });
     }
-    recordClassRegistration(...events) {
+    recordClassPublication(...events) {
         let totalBytecode = 0;
         for (const event of events){
             totalBytecode += event.packedPublicBytecode.length;

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

@@ -0,0 +1,18 @@
+import type { ContractProvider } from '@aztec/native';
+import type { GlobalVariables } from '@aztec/stdlib/tx';
+import type { PublicContractsDB } from '../public_db_sources.js';
+export declare class ContractProviderForCpp implements ContractProvider {
+    private contractsDB;
+    private globalVariables;
+    private log;
+    constructor(contractsDB: PublicContractsDB, globalVariables: GlobalVariables);
+    getContractInstance: (address: string) => Promise<Buffer<ArrayBufferLike> | undefined>;
+    getContractClass: (classId: string) => Promise<Buffer<ArrayBufferLike> | undefined>;
+    addContracts: (contractDeploymentDataBuffer: Buffer<ArrayBufferLike>) => Promise<void>;
+    getBytecodeCommitment: (classId: string) => Promise<Buffer<ArrayBufferLike> | undefined>;
+    getDebugFunctionName: (address: string, selector: string) => Promise<string | undefined>;
+    createCheckpoint: () => Promise<void>;
+    commitCheckpoint: () => Promise<void>;
+    revertCheckpoint: () => Promise<void>;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfcHJvdmlkZXJfZm9yX2NwcC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3B1YmxpYy9wdWJsaWNfdHhfc2ltdWxhdG9yL2NvbnRyYWN0X3Byb3ZpZGVyX2Zvcl9jcHAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFLdEQsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFeEQsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUVqRSxxQkFBYSxzQkFBdUIsWUFBVyxnQkFBZ0I7SUFJM0QsT0FBTyxDQUFDLFdBQVc7SUFDbkIsT0FBTyxDQUFDLGVBQWU7SUFKekIsT0FBTyxDQUFDLEdBQUcsQ0FBK0Q7SUFFMUUsWUFDVSxXQUFXLEVBQUUsaUJBQWlCLEVBQzlCLGVBQWUsRUFBRSxlQUFlLEVBQ3RDO0lBRUcsbUJBQW1CLG9FQWF4QjtJQUVLLGdCQUFnQixvRUFlckI7SUFFSyxZQUFZLDJFQVdqQjtJQUVLLHFCQUFxQixvRUFnQjFCO0lBRUssb0JBQW9CLHFFQXNCekI7SUFFSyxnQkFBZ0Isc0JBR3JCO0lBRUssZ0JBQWdCLHNCQUdyQjtJQUVLLGdCQUFnQixzQkFHckI7Q0FDSCJ9

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

@@ -0,0 +1 @@
+{"version":3,"file":"contract_provider_for_cpp.d.ts","sourceRoot":"","sources":["../../../src/public/public_tx_simulator/contract_provider_for_cpp.ts"],"names":[],"mappings":"AAEA,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,CAA+D;IAE1E,YACU,WAAW,EAAE,iBAAiB,EAC9B,eAAe,EAAE,eAAe,EACtC;IAEG,mBAAmB,oEAaxB;IAEK,gBAAgB,oEAerB;IAEK,YAAY,2EAWjB;IAEK,qBAAqB,oEAgB1B;IAEK,oBAAoB,qEAsBzB;IAEK,gBAAgB,sBAGrB;IAEK,gBAAgB,sBAGrB;IAEK,gBAAgB,sBAGrB;CACH"}