@aztec/simulator 0.85.0 → 0.86.0

package/dest/public/public_db_sources.js

@@ -7,7 +7,8 @@ import { ContractInstanceDeployedEvent } from '@aztec/protocol-contracts/instanc
 import { PublicDataWrite } from '@aztec/stdlib/avm';
 import { computePublicBytecodeCommitment } from '@aztec/stdlib/contract';
 import { computePublicDataTreeLeafSlot } from '@aztec/stdlib/hash';
-import { MerkleTreeId, NullifierLeaf, PublicDataTreeLeaf } from '@aztec/stdlib/trees';
+import { MerkleTreeId, NullifierLeaf, PublicDataTreeLeaf, getTreeName } from '@aztec/stdlib/trees';
+import { TreeSnapshots } from '@aztec/stdlib/tx';
 import { TxContractCache } from './tx_contract_cache.js';
 /**
  * Implements the PublicContractsDBInterface using a ContractDataSource.
@@ -182,114 +183,61 @@ import { TxContractCache } from './tx_contract_cache.js';
     }
 }
 /**
- * Proxy class that forwards all merkle tree operations to the underlying object.
+ * A high-level class that provides access to the merkle trees.
  *
- * NOTE: It might be possible to prune this to just the methods used in public.
- * Then we'd need to define a new interface, instead of MerkleTreeWriteOperations,
- * to be used by all our classes (that could be PublicStateDBInterface).
- */ class ForwardMerkleTree {
-    operations;
-    constructor(operations){
-        this.operations = operations;
-    }
-    getTreeInfo(treeId) {
-        return this.operations.getTreeInfo(treeId);
-    }
-    getStateReference() {
-        return this.operations.getStateReference();
-    }
-    getInitialHeader() {
-        return this.operations.getInitialHeader();
-    }
-    getSiblingPath(treeId, index) {
-        return this.operations.getSiblingPath(treeId, index);
-    }
-    getPreviousValueIndex(treeId, value) {
-        return this.operations.getPreviousValueIndex(treeId, value);
-    }
-    getLeafPreimage(treeId, index) {
-        return this.operations.getLeafPreimage(treeId, index);
-    }
-    findLeafIndices(treeId, values) {
-        return this.operations.findLeafIndices(treeId, values);
-    }
-    findLeafIndicesAfter(treeId, values, startIndex) {
-        return this.operations.findLeafIndicesAfter(treeId, values, startIndex);
-    }
-    getLeafValue(treeId, index) {
-        return this.operations.getLeafValue(treeId, index);
-    }
-    getBlockNumbersForLeafIndices(treeId, leafIndices) {
-        return this.operations.getBlockNumbersForLeafIndices(treeId, leafIndices);
-    }
-    createCheckpoint() {
-        return this.operations.createCheckpoint();
-    }
-    commitCheckpoint() {
-        return this.operations.commitCheckpoint();
-    }
-    revertCheckpoint() {
-        return this.operations.revertCheckpoint();
-    }
-    appendLeaves(treeId, leaves) {
-        return this.operations.appendLeaves(treeId, leaves);
-    }
-    updateArchive(header) {
-        return this.operations.updateArchive(header);
-    }
-    batchInsert(treeId, leaves, subtreeHeight) {
-        return this.operations.batchInsert(treeId, leaves, subtreeHeight);
-    }
-    sequentialInsert(treeId, leaves) {
-        return this.operations.sequentialInsert(treeId, leaves);
-    }
-    close() {
-        return this.operations.close();
-    }
-}
-/**
- * A class that provides access to the merkle trees, and other helper methods.
- */ export class PublicTreesDB extends ForwardMerkleTree {
-    logger = createLogger('simulator:public-trees-db');
+ * This class is just a helper wrapper around a merkle db. Anything that you can do with it
+ * can also be done directly with the merkle db. This class should NOT be exposed or used
+ * outside of `simulator/src/public`.
+ *
+ * NOTE: This class is currently written in such a way that it would generate the
+ * necessary hints if used with a hinting merkle db. This is a bit of a leak of concepts.
+ * Eventually we can have everything depend on a config/factory at the TxSimulator level
+ * to decide whether to use hints or not (same with tracing, etc).
+ */ export class PublicTreesDB {
+    db;
+    logger;
     constructor(db){
-        super(db);
+        this.db = db;
+        this.logger = createLogger('simulator:public-trees-db');
     }
-    /**
-   * Reads a value from public storage, returning zero if none.
-   * @param contract - Owner of the storage.
-   * @param slot - Slot to read in the contract storage.
-   * @returns The current value in the storage slot.
-   */ async storageRead(contract, slot) {
+    async storageRead(contract, slot) {
+        const timer = new Timer();
         const leafSlot = (await computePublicDataTreeLeafSlot(contract, slot)).toBigInt();
-        const lowLeafResult = await this.getPreviousValueIndex(MerkleTreeId.PUBLIC_DATA_TREE, leafSlot);
+        const lowLeafResult = await this.db.getPreviousValueIndex(MerkleTreeId.PUBLIC_DATA_TREE, leafSlot);
         if (!lowLeafResult) {
             throw new Error('Low leaf not found');
         }
-        // TODO(fcarreiro): We need this for the hints. Might move it to the hinting layer.
-        await this.getSiblingPath(MerkleTreeId.PUBLIC_DATA_TREE, lowLeafResult.index);
+        // TODO: We need this for the hints. See class comment for more details.
+        await this.db.getSiblingPath(MerkleTreeId.PUBLIC_DATA_TREE, lowLeafResult.index);
         // Unconditionally fetching the preimage for the hints. Move it to the hinting layer?
-        const preimage = await this.getLeafPreimage(MerkleTreeId.PUBLIC_DATA_TREE, lowLeafResult.index);
-        return lowLeafResult.alreadyPresent ? preimage.leaf.value : Fr.ZERO;
+        const preimage = await this.db.getLeafPreimage(MerkleTreeId.PUBLIC_DATA_TREE, lowLeafResult.index);
+        const result = lowLeafResult.alreadyPresent ? preimage.leaf.value : Fr.ZERO;
+        this.logger.debug(`Storage read (contract=${contract}, slot=${slot}, value=${result})`, {
+            eventName: 'public-db-access',
+            duration: timer.ms(),
+            operation: 'storage-read'
+        });
+        return result;
     }
-    /**
-   * Records a write to public storage.
-   * @param contract - Owner of the storage.
-   * @param slot - Slot to read in the contract storage.
-   * @param newValue - The new value to store.
-   * @returns The slot of the written leaf in the public data tree.
-   */ async storageWrite(contract, slot, newValue) {
+    async storageWrite(contract, slot, newValue) {
+        const timer = new Timer();
         const leafSlot = await computePublicDataTreeLeafSlot(contract, slot);
         const publicDataWrite = new PublicDataWrite(leafSlot, newValue);
-        await this.sequentialInsert(MerkleTreeId.PUBLIC_DATA_TREE, [
+        await this.db.sequentialInsert(MerkleTreeId.PUBLIC_DATA_TREE, [
             publicDataWrite.toBuffer()
         ]);
+        this.logger.debug(`Storage write (contract=${contract}, slot=${slot}, value=${newValue})`, {
+            eventName: 'public-db-access',
+            duration: timer.ms(),
+            operation: 'storage-write'
+        });
     }
     async getL1ToL2LeafValue(leafIndex) {
         const timer = new Timer();
-        const leafValue = await this.getLeafValue(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, leafIndex);
-        // TODO(fcarreiro): We need this for the hints. Might move it to the hinting layer.
-        await this.getSiblingPath(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, leafIndex);
-        this.logger.debug(`[DB] Fetched L1 to L2 message leaf value`, {
+        const leafValue = await this.db.getLeafValue(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, leafIndex);
+        // TODO: We need this for the hints. See class comment for more details.
+        await this.db.getSiblingPath(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, leafIndex);
+        this.logger.debug(`Fetched L1 to L2 message leaf value (leafIndex=${leafIndex}, value=${leafValue})`, {
             eventName: 'public-db-access',
             duration: timer.ms(),
             operation: 'get-l1-to-l2-message-leaf-value'
@@ -298,50 +246,91 @@ import { TxContractCache } from './tx_contract_cache.js';
     }
     async getNoteHash(leafIndex) {
         const timer = new Timer();
-        const leafValue = await this.getLeafValue(MerkleTreeId.NOTE_HASH_TREE, leafIndex);
-        // TODO(fcarreiro): We need this for the hints. Might move it to the hinting layer.
-        await this.getSiblingPath(MerkleTreeId.NOTE_HASH_TREE, leafIndex);
-        this.logger.debug(`[DB] Fetched note hash leaf value`, {
+        const leafValue = await this.db.getLeafValue(MerkleTreeId.NOTE_HASH_TREE, leafIndex);
+        // TODO: We need this for the hints. See class comment for more details.
+        await this.db.getSiblingPath(MerkleTreeId.NOTE_HASH_TREE, leafIndex);
+        this.logger.debug(`Fetched note hash leaf value (leafIndex=${leafIndex}, value=${leafValue})`, {
             eventName: 'public-db-access',
             duration: timer.ms(),
             operation: 'get-note-hash'
         });
         return leafValue;
     }
+    async writeNoteHash(noteHash) {
+        const timer = new Timer();
+        await this.db.appendLeaves(MerkleTreeId.NOTE_HASH_TREE, [
+            noteHash
+        ]);
+        this.logger.debug(`Wrote note hash (noteHash=${noteHash})`, {
+            eventName: 'public-db-access',
+            duration: timer.ms(),
+            operation: 'write-note-hash'
+        });
+    }
     async checkNullifierExists(nullifier) {
         const timer = new Timer();
-        const lowLeafResult = await this.getPreviousValueIndex(MerkleTreeId.NULLIFIER_TREE, nullifier.toBigInt());
+        const lowLeafResult = await this.db.getPreviousValueIndex(MerkleTreeId.NULLIFIER_TREE, nullifier.toBigInt());
         if (!lowLeafResult) {
             throw new Error('Low leaf not found');
         }
-        // TODO(fcarreiro): We need this for the hints. Might move it to the hinting layer.
-        await this.getSiblingPath(MerkleTreeId.NULLIFIER_TREE, lowLeafResult.index);
-        // TODO(fcarreiro): We need this for the hints. Might move it to the hinting layer.
-        await this.getLeafPreimage(MerkleTreeId.NULLIFIER_TREE, lowLeafResult.index);
+        // TODO: We need this for the hints. See class comment for more details.
+        await this.db.getSiblingPath(MerkleTreeId.NULLIFIER_TREE, lowLeafResult.index);
+        // TODO: We need this for the hints. See class comment for more details.
+        await this.db.getLeafPreimage(MerkleTreeId.NULLIFIER_TREE, lowLeafResult.index);
         const exists = lowLeafResult.alreadyPresent;
-        this.logger.debug(`[DB] Checked nullifier exists`, {
+        this.logger.debug(`Checked nullifier exists (nullifier=${nullifier}, exists=${exists})`, {
             eventName: 'public-db-access',
             duration: timer.ms(),
             operation: 'check-nullifier-exists'
         });
         return exists;
     }
+    async writeNullifier(siloedNullifier) {
+        const timer = new Timer();
+        await this.db.sequentialInsert(MerkleTreeId.NULLIFIER_TREE, [
+            siloedNullifier.toBuffer()
+        ]);
+        this.logger.debug(`Wrote nullifier (nullifier=${siloedNullifier})`, {
+            eventName: 'public-db-access',
+            duration: timer.ms(),
+            operation: 'write-nullifier'
+        });
+    }
     async padTree(treeId, leavesToInsert) {
+        const timer = new Timer();
         switch(treeId){
             // Indexed trees.
             case MerkleTreeId.NULLIFIER_TREE:
-                await this.batchInsert(treeId, Array(leavesToInsert).fill(NullifierLeaf.empty().toBuffer()), NULLIFIER_SUBTREE_HEIGHT);
+                await this.db.batchInsert(treeId, Array(leavesToInsert).fill(NullifierLeaf.empty().toBuffer()), NULLIFIER_SUBTREE_HEIGHT);
                 break;
             case MerkleTreeId.PUBLIC_DATA_TREE:
-                await this.batchInsert(treeId, Array(leavesToInsert).fill(PublicDataTreeLeaf.empty().toBuffer()), PUBLIC_DATA_SUBTREE_HEIGHT);
+                await this.db.batchInsert(treeId, Array(leavesToInsert).fill(PublicDataTreeLeaf.empty().toBuffer()), PUBLIC_DATA_SUBTREE_HEIGHT);
                 break;
-            // Non-indexed trees.
+            // Append-only trees.
             case MerkleTreeId.L1_TO_L2_MESSAGE_TREE:
             case MerkleTreeId.NOTE_HASH_TREE:
-                await this.appendLeaves(treeId, Array(leavesToInsert).fill(Fr.ZERO));
+                await this.db.appendLeaves(treeId, Array(leavesToInsert).fill(Fr.ZERO));
                 break;
             default:
                 throw new Error(`Padding not supported for tree ${treeId}`);
         }
+        this.logger.debug(`Padded tree (tree=${getTreeName(treeId)}, leavesToInsert=${leavesToInsert})`, {
+            eventName: 'public-db-access',
+            duration: timer.ms(),
+            operation: 'pad-tree'
+        });
+    }
+    async createCheckpoint() {
+        await this.db.createCheckpoint();
+    }
+    async commitCheckpoint() {
+        await this.db.commitCheckpoint();
+    }
+    async revertCheckpoint() {
+        await this.db.revertCheckpoint();
+    }
+    async getTreeSnapshots() {
+        const stateReference = await this.db.getStateReference();
+        return new TreeSnapshots(stateReference.l1ToL2MessageTree, stateReference.partial.noteHashTree, stateReference.partial.nullifierTree, stateReference.partial.publicDataTree);
     }
 }

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

@@ -6,7 +6,7 @@ import { Gas } from '@aztec/stdlib/gas';
 import type { MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server';
 import { type FailedTx, GlobalVariables, NestedProcessReturnValues, type ProcessedTx, Tx, type TxValidator } from '@aztec/stdlib/tx';
 import { type TelemetryClient, type Traceable, type Tracer } from '@aztec/telemetry-client';
-import { PublicContractsDB, PublicTreesDB } from '../public_db_sources.js';
+import { PublicContractsDB } from '../public_db_sources.js';
 import { type PublicTxSimulator } from '../public_tx_simulator/index.js';
 /**
  * Creates new instances of PublicProcessor given the provided merkle tree db and contract data source.
@@ -14,7 +14,7 @@ import { type PublicTxSimulator } from '../public_tx_simulator/index.js';
 export declare class PublicProcessorFactory {
     private contractDataSource;
     private dateProvider;
-    private telemetryClient;
+    protected telemetryClient: TelemetryClient;
     constructor(contractDataSource: ContractDataSource, dateProvider: DateProvider, telemetryClient?: TelemetryClient);
     /**
      * Creates a new instance of a PublicProcessor.
@@ -24,7 +24,7 @@ export declare class PublicProcessorFactory {
      * @returns A new instance of a PublicProcessor.
      */
     create(merkleTree: MerkleTreeWriteOperations, globalVariables: GlobalVariables, skipFeeEnforcement: boolean): PublicProcessor;
-    protected createPublicTxSimulator(treesDB: PublicTreesDB, contractsDB: PublicContractsDB, globalVariables: GlobalVariables, doMerkleOperations: boolean, skipFeeEnforcement: boolean): PublicTxSimulator;
+    protected createPublicTxSimulator(merkleTree: MerkleTreeWriteOperations, contractsDB: PublicContractsDB, globalVariables: GlobalVariables, doMerkleOperations: boolean, skipFeeEnforcement: boolean): PublicTxSimulator;
 }
 /**
  * Converts Txs lifted from the P2P module into ProcessedTx objects by executing
@@ -32,13 +32,13 @@ export declare class PublicProcessorFactory {
  */
 export declare class PublicProcessor implements Traceable {
     protected globalVariables: GlobalVariables;
-    protected treesDB: PublicTreesDB;
+    private merkleTree;
     protected contractsDB: PublicContractsDB;
     protected publicTxSimulator: PublicTxSimulator;
     private dateProvider;
     private log;
     private metrics;
-    constructor(globalVariables: GlobalVariables, treesDB: PublicTreesDB, contractsDB: PublicContractsDB, publicTxSimulator: PublicTxSimulator, dateProvider: DateProvider, telemetryClient?: TelemetryClient, log?: import("@aztec/foundation/log").Logger);
+    constructor(globalVariables: GlobalVariables, merkleTree: MerkleTreeWriteOperations, contractsDB: PublicContractsDB, publicTxSimulator: PublicTxSimulator, dateProvider: DateProvider, telemetryClient?: TelemetryClient, log?: import("@aztec/foundation/log").Logger);
     get tracer(): Tracer;
     /**
      * Run each tx through the public circuit and the public kernel circuit if needed.
@@ -67,7 +67,7 @@ export declare class PublicProcessor implements Traceable {
      * This is used in private only txs, since for txs with public calls
      * the avm handles the fee payment itself.
      */
-    private getFeePaymentPublicDataWrite;
+    private performFeePaymentPublicDataWrite;
     private processPrivateOnlyTx;
     private processTxWithPublicCalls;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"public_processor.d.ts","sourceRoot":"","sources":["../../../src/public/public_processor/public_processor.ts"],"names":[],"mappings":";;AAIA,OAAO,EAAE,KAAK,YAAY,EAAkC,MAAM,yBAAyB,CAAC;AAM5F,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AAEjF,OAAO,EACL,KAAK,QAAQ,EACb,eAAe,EACf,yBAAyB,EACzB,KAAK,WAAW,EAChB,EAAE,EAEF,KAAK,WAAW,EAGjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,SAAS,EACd,KAAK,MAAM,EAGZ,MAAM,yBAAyB,CAAC;AAGjC,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC3E,OAAO,EAAE,KAAK,iBAAiB,EAA8B,MAAM,iCAAiC,CAAC;AAGrG;;GAEG;AACH,qBAAa,sBAAsB;IAE/B,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,eAAe;gBAFf,kBAAkB,EAAE,kBAAkB,EACtC,YAAY,EAAE,YAAY,EAC1B,eAAe,GAAE,eAAsC;IAGjE;;;;;;OAMG;IACI,MAAM,CACX,UAAU,EAAE,yBAAyB,EACrC,eAAe,EAAE,eAAe,EAChC,kBAAkB,EAAE,OAAO,GAC1B,eAAe;IAqBlB,SAAS,CAAC,uBAAuB,CAC/B,OAAO,EAAE,aAAa,EACtB,WAAW,EAAE,iBAAiB,EAC9B,eAAe,EAAE,eAAe,EAChC,kBAAkB,EAAE,OAAO,EAC3B,kBAAkB,EAAE,OAAO,GAC1B,iBAAiB;CAUrB;AASD;;;GAGG;AACH,qBAAa,eAAgB,YAAW,SAAS;IAG7C,SAAS,CAAC,eAAe,EAAE,eAAe;IAC1C,SAAS,CAAC,OAAO,EAAE,aAAa;IAChC,SAAS,CAAC,WAAW,EAAE,iBAAiB;IACxC,SAAS,CAAC,iBAAiB,EAAE,iBAAiB;IAC9C,OAAO,CAAC,YAAY;IAEpB,OAAO,CAAC,GAAG;IARb,OAAO,CAAC,OAAO,CAAyB;gBAE5B,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,aAAa,EACtB,WAAW,EAAE,iBAAiB,EAC9B,iBAAiB,EAAE,iBAAiB,EACtC,YAAY,EAAE,YAAY,EAClC,eAAe,GAAE,eAAsC,EAC/C,GAAG,yCAA6C;IAK1D,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED;;;;;;OAMG;IACU,OAAO,CAClB,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,EAAE,CAAC,EACrC,MAAM,GAAE;QACN,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,WAAW,CAAC,EAAE,GAAG,CAAC;QAClB,QAAQ,CAAC,EAAE,IAAI,CAAC;KACZ,EACN,SAAS,GAAE;QACT,mBAAmB,CAAC,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;QACtC,cAAc,CAAC,EAAE;YAAE,aAAa,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,IAAI,CAAA;SAAE,CAAC;KAC/D,GACL,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,EAAE,yBAAyB,EAAE,CAAC,CAAC;YAoJtD,SAAS;YA2BT,gCAAgC;IAyC9C,kFAAkF;YACpE,uBAAuB;IA+BrC;;;;OAIG;YACW,4BAA4B;YAwB5B,oBAAoB;YA6BpB,wBAAwB;CA8CvC"}
+{"version":3,"file":"public_processor.d.ts","sourceRoot":"","sources":["../../../src/public/public_processor/public_processor.ts"],"names":[],"mappings":";;AAIA,OAAO,EAAE,KAAK,YAAY,EAAkC,MAAM,yBAAyB,CAAC;AAM5F,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AAEjF,OAAO,EACL,KAAK,QAAQ,EACb,eAAe,EACf,yBAAyB,EACzB,KAAK,WAAW,EAChB,EAAE,EAEF,KAAK,WAAW,EAGjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,SAAS,EACd,KAAK,MAAM,EAGZ,MAAM,yBAAyB,CAAC;AAGjC,OAAO,EAAE,iBAAiB,EAAiB,MAAM,yBAAyB,CAAC;AAC3E,OAAO,EAAE,KAAK,iBAAiB,EAA8B,MAAM,iCAAiC,CAAC;AAGrG;;GAEG;AACH,qBAAa,sBAAsB;IAE/B,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,YAAY;IACpB,SAAS,CAAC,eAAe,EAAE,eAAe;gBAFlC,kBAAkB,EAAE,kBAAkB,EACtC,YAAY,EAAE,YAAY,EACxB,eAAe,GAAE,eAAsC;IAGnE;;;;;;OAMG;IACI,MAAM,CACX,UAAU,EAAE,yBAAyB,EACrC,eAAe,EAAE,eAAe,EAChC,kBAAkB,EAAE,OAAO,GAC1B,eAAe;IAoBlB,SAAS,CAAC,uBAAuB,CAC/B,UAAU,EAAE,yBAAyB,EACrC,WAAW,EAAE,iBAAiB,EAC9B,eAAe,EAAE,eAAe,EAChC,kBAAkB,EAAE,OAAO,EAC3B,kBAAkB,EAAE,OAAO,GAC1B,iBAAiB;CAUrB;AASD;;;GAGG;AACH,qBAAa,eAAgB,YAAW,SAAS;IAI7C,SAAS,CAAC,eAAe,EAAE,eAAe;IAC1C,OAAO,CAAC,UAAU;IAClB,SAAS,CAAC,WAAW,EAAE,iBAAiB;IACxC,SAAS,CAAC,iBAAiB,EAAE,iBAAiB;IAC9C,OAAO,CAAC,YAAY;IAEpB,OAAO,CAAC,GAAG;IATb,OAAO,CAAC,OAAO,CAAyB;gBAG5B,eAAe,EAAE,eAAe,EAClC,UAAU,EAAE,yBAAyB,EACnC,WAAW,EAAE,iBAAiB,EAC9B,iBAAiB,EAAE,iBAAiB,EACtC,YAAY,EAAE,YAAY,EAClC,eAAe,GAAE,eAAsC,EAC/C,GAAG,yCAA6C;IAK1D,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED;;;;;;OAMG;IACU,OAAO,CAClB,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,EAAE,CAAC,EACrC,MAAM,GAAE;QACN,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,WAAW,CAAC,EAAE,GAAG,CAAC;QAClB,QAAQ,CAAC,EAAE,IAAI,CAAC;KACZ,EACN,SAAS,GAAE;QACT,mBAAmB,CAAC,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;QACtC,cAAc,CAAC,EAAE;YAAE,aAAa,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,IAAI,CAAA;SAAE,CAAC;KAC/D,GACL,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,EAAE,yBAAyB,EAAE,CAAC,CAAC;YA4ItD,SAAS;YA2BT,gCAAgC;IAoC9C,kFAAkF;YACpE,uBAAuB;IA+BrC;;;;OAIG;YACW,gCAAgC;YA0BhC,oBAAoB;YAsCpB,wBAAwB;CA8CvC"}

package/dest/public/public_processor/public_processor.js

@@ -39,13 +39,12 @@ import { PublicProcessorMetrics } from './public_processor_metrics.js';
    * @param skipFeeEnforcement - Allows disabling balance checks for fee estimations.
    * @returns A new instance of a PublicProcessor.
    */ create(merkleTree, globalVariables, skipFeeEnforcement) {
-        const treesDB = new PublicTreesDB(merkleTree);
         const contractsDB = new PublicContractsDB(this.contractDataSource);
-        const publicTxSimulator = this.createPublicTxSimulator(treesDB, contractsDB, globalVariables, /*doMerkleOperations=*/ true, skipFeeEnforcement);
-        return new PublicProcessor(globalVariables, treesDB, contractsDB, publicTxSimulator, this.dateProvider, this.telemetryClient);
+        const publicTxSimulator = this.createPublicTxSimulator(merkleTree, contractsDB, globalVariables, /*doMerkleOperations=*/ true, skipFeeEnforcement);
+        return new PublicProcessor(globalVariables, merkleTree, contractsDB, publicTxSimulator, this.dateProvider, this.telemetryClient);
     }
-    createPublicTxSimulator(treesDB, contractsDB, globalVariables, doMerkleOperations, skipFeeEnforcement) {
-        return new TelemetryPublicTxSimulator(treesDB, contractsDB, globalVariables, doMerkleOperations, skipFeeEnforcement, this.telemetryClient);
+    createPublicTxSimulator(merkleTree, contractsDB, globalVariables, doMerkleOperations, skipFeeEnforcement) {
+        return new TelemetryPublicTxSimulator(merkleTree, contractsDB, globalVariables, doMerkleOperations, skipFeeEnforcement, this.telemetryClient);
     }
 }
 class PublicProcessorTimeoutError extends Error {
@@ -59,15 +58,15 @@ class PublicProcessorTimeoutError extends Error {
  * any public function calls in them. Txs with private calls only are unaffected.
  */ export class PublicProcessor {
     globalVariables;
-    treesDB;
+    merkleTree;
     contractsDB;
     publicTxSimulator;
     dateProvider;
     log;
     metrics;
-    constructor(globalVariables, treesDB, contractsDB, publicTxSimulator, dateProvider, telemetryClient = getTelemetryClient(), log = createLogger('simulator:public-processor')){
+    constructor(globalVariables, merkleTree, contractsDB, publicTxSimulator, dateProvider, telemetryClient = getTelemetryClient(), log = createLogger('simulator:public-processor')){
         this.globalVariables = globalVariables;
-        this.treesDB = treesDB;
+        this.merkleTree = merkleTree;
         this.contractsDB = contractsDB;
         this.publicTxSimulator = publicTxSimulator;
         this.dateProvider = dateProvider;
@@ -154,7 +153,7 @@ 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.treesDB);
+            const checkpoint = await ForkCheckpoint.new(this.merkleTree);
             try {
                 const [processedTx, returnValues] = await this.processTx(tx, deadline);
                 // If the actual size of this tx would exceed block size, skip it
@@ -170,15 +169,8 @@ class PublicProcessorTimeoutError extends Error {
                     await checkpoint.revert();
                     continue;
                 }
-                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.contractsDB.addNewContracts(tx);
-                    this.contractsDB.commitContractsForTx();
-                }
+                // 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);
                 returns = returns.concat(returnValues);
@@ -252,9 +244,9 @@ 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.treesDB.appendLeaves(MerkleTreeId.NOTE_HASH_TREE, padArrayEnd(processedTx.txEffect.noteHashes, Fr.ZERO, MAX_NOTE_HASHES_PER_TX));
+        await this.merkleTree.appendLeaves(MerkleTreeId.NOTE_HASH_TREE, padArrayEnd(processedTx.txEffect.noteHashes, Fr.ZERO, MAX_NOTE_HASHES_PER_TX));
         try {
-            await this.treesDB.batchInsert(MerkleTreeId.NULLIFIER_TREE, padArrayEnd(processedTx.txEffect.nullifiers, Fr.ZERO, MAX_NULLIFIERS_PER_TX).map((n)=>n.toBuffer()), NULLIFIER_SUBTREE_HEIGHT);
+            await this.merkleTree.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:
@@ -264,8 +256,6 @@ class PublicProcessorTimeoutError extends Error {
                 this.log.warn(`Detected duplicate nullifier after public processing for: ${processedTx.hash}.`);
             }
         }
-        // The only public data write should be for fee payment
-        await this.treesDB.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);
     }
@@ -290,26 +280,34 @@ 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.merkleTree);
         this.log.debug(`Deducting ${txFee.toBigInt()} balance in Fee Juice for ${feePayer}`);
-        const balance = await this.treesDB.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.treesDB.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 feePaymentPublicDataWrite = await this.performFeePaymentPublicDataWrite(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)));
+        // Fee payment insertion has already been done. Do the rest.
+        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.contractsDB.addNewContracts(tx);
+        this.contractsDB.commitContractsForTx();
         return [
             processedTx,
             undefined

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

@@ -1,9 +1,10 @@
 import type { Fr } from '@aztec/foundation/fields';
 import type { Gas } from '@aztec/stdlib/gas';
+import type { MerkleTreeWriteOperations } from '@aztec/stdlib/trees';
 import { type GlobalVariables, PublicCallRequestWithCalldata, Tx, TxExecutionPhase } from '@aztec/stdlib/tx';
 import type { AvmFinalizedCallResult } from '../avm/avm_contract_call_result.js';
 import type { ExecutorMetricsInterface } from '../executor_metrics_interface.js';
-import type { PublicContractsDB, PublicTreesDB } from '../public_db_sources.js';
+import type { PublicContractsDB } from '../public_db_sources.js';
 import type { PublicPersistableStateManager } from '../state_manager/state_manager.js';
 import { PublicTxContext } from './public_tx_context.js';
 import { type ProcessedPhase, type PublicTxResult, PublicTxSimulator } from './public_tx_simulator.js';
@@ -12,7 +13,7 @@ import { type ProcessedPhase, type PublicTxResult, PublicTxSimulator } from './p
  */
 export declare class MeasuredPublicTxSimulator extends PublicTxSimulator {
     protected readonly metrics: ExecutorMetricsInterface;
-    constructor(treesDB: PublicTreesDB, contractsDB: PublicContractsDB, globalVariables: GlobalVariables, doMerkleOperations: boolean | undefined, skipFeeEnforcement: boolean | undefined, metrics: ExecutorMetricsInterface);
+    constructor(merkleTree: MerkleTreeWriteOperations, contractsDB: PublicContractsDB, globalVariables: GlobalVariables, doMerkleOperations: boolean | undefined, skipFeeEnforcement: boolean | undefined, metrics: ExecutorMetricsInterface);
     simulate(tx: Tx, txLabel?: string): Promise<PublicTxResult>;
     protected computeTxHash(tx: Tx): Promise<import("@aztec/stdlib/tx").TxHash>;
     protected insertNonRevertiblesFromPrivate(context: PublicTxContext, tx: Tx): Promise<void>;

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

@@ -1 +1 @@
-{"version":3,"file":"measured_public_tx_simulator.d.ts","sourceRoot":"","sources":["../../../src/public/public_tx_simulator/measured_public_tx_simulator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAE7C,OAAO,EAAE,KAAK,eAAe,EAAE,6BAA6B,EAAE,EAAE,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAE7G,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AACjF,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AACjF,OAAO,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAChF,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AACvF,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,cAAc,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAEvG;;GAEG;AACH,qBAAa,yBAA0B,SAAQ,iBAAiB;IAO5D,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,wBAAwB;gBALpD,OAAO,EAAE,aAAa,EACtB,WAAW,EAAE,iBAAiB,EAC9B,eAAe,EAAE,eAAe,EAChC,kBAAkB,qBAAiB,EACnC,kBAAkB,qBAAiB,EAChB,OAAO,EAAE,wBAAwB;IAKhC,QAAQ,CAAC,EAAE,EAAE,EAAE,EAAE,OAAO,GAAE,MAAsB,GAAG,OAAO,CAAC,cAAc,CAAC;cAWvE,aAAa,CAAC,EAAE,EAAE,EAAE;cAOpB,+BAA+B,CAAC,OAAO,EAAE,eAAe,EAAE,EAAE,EAAE,EAAE;cAMhE,4BAA4B,CAAC,OAAO,EAAE,eAAe,EAAE,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;cAOhF,aAAa,CAAC,KAAK,EAAE,gBAAgB,EAAE,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC;cAOzF,4BAA4B,CACnD,YAAY,EAAE,6BAA6B,EAC3C,WAAW,EAAE,6BAA6B,EAC1C,YAAY,EAAE,GAAG,EACjB,cAAc,EAAE,EAAE,EAClB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,sBAAsB,CAAC;CAsCnC"}
+{"version":3,"file":"measured_public_tx_simulator.d.ts","sourceRoot":"","sources":["../../../src/public/public_tx_simulator/measured_public_tx_simulator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAE7C,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AACrE,OAAO,EAAE,KAAK,eAAe,EAAE,6BAA6B,EAAE,EAAE,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAE7G,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AACjF,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AACjF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AACvF,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,cAAc,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAEvG;;GAEG;AACH,qBAAa,yBAA0B,SAAQ,iBAAiB;IAO5D,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,wBAAwB;gBALpD,UAAU,EAAE,yBAAyB,EACrC,WAAW,EAAE,iBAAiB,EAC9B,eAAe,EAAE,eAAe,EAChC,kBAAkB,qBAAiB,EACnC,kBAAkB,qBAAiB,EAChB,OAAO,EAAE,wBAAwB;IAKhC,QAAQ,CAAC,EAAE,EAAE,EAAE,EAAE,OAAO,GAAE,MAAsB,GAAG,OAAO,CAAC,cAAc,CAAC;cAWvE,aAAa,CAAC,EAAE,EAAE,EAAE;cAOpB,+BAA+B,CAAC,OAAO,EAAE,eAAe,EAAE,EAAE,EAAE,EAAE;cAMhE,4BAA4B,CAAC,OAAO,EAAE,eAAe,EAAE,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;cAOhF,aAAa,CAAC,KAAK,EAAE,gBAAgB,EAAE,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC;cAOzF,4BAA4B,CACnD,YAAY,EAAE,6BAA6B,EAC3C,WAAW,EAAE,6BAA6B,EAC1C,YAAY,EAAE,GAAG,EACjB,cAAc,EAAE,EAAE,EAClB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,sBAAsB,CAAC;CAsCnC"}

package/dest/public/public_tx_simulator/measured_public_tx_simulator.js

@@ -4,8 +4,8 @@ import { PublicTxSimulator } from './public_tx_simulator.js';
  * A public tx simulator that tracks miscellaneous simulation metrics without telemetry.
  */ export class MeasuredPublicTxSimulator extends PublicTxSimulator {
     metrics;
-    constructor(treesDB, contractsDB, globalVariables, doMerkleOperations = false, skipFeeEnforcement = false, metrics){
-        super(treesDB, contractsDB, globalVariables, doMerkleOperations, skipFeeEnforcement), this.metrics = metrics;
+    constructor(merkleTree, contractsDB, globalVariables, doMerkleOperations = false, skipFeeEnforcement = false, metrics){
+        super(merkleTree, contractsDB, globalVariables, doMerkleOperations, skipFeeEnforcement), this.metrics = metrics;
     }
     async simulate(tx, txLabel = 'unlabeledTx') {
         this.metrics.startRecordingTxSimulation(txLabel);

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

@@ -1,11 +1,11 @@
 import { Fr } from '@aztec/foundation/fields';
-import { type AvmCircuitPublicInputs, AvmExecutionHints, RevertCode } from '@aztec/stdlib/avm';
+import { type AvmCircuitPublicInputs, RevertCode } from '@aztec/stdlib/avm';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { SimulationError } from '@aztec/stdlib/errors';
 import { Gas } from '@aztec/stdlib/gas';
 import { type PrivateToPublicAccumulatedData } from '@aztec/stdlib/kernel';
 import { type GlobalVariables, PublicCallRequestWithCalldata, type Tx, TxExecutionPhase, type TxHash } from '@aztec/stdlib/tx';
-import type { PublicContractsDBInterface } from '../../server.js';
+import type { PublicContractsDBInterface } from '../db_interfaces.js';
 import type { PublicTreesDB } from '../public_db_sources.js';
 import { PublicPersistableStateManager } from '../state_manager/state_manager.js';
 /**
@@ -14,8 +14,8 @@ import { PublicPersistableStateManager } from '../state_manager/state_manager.js
 export declare class PublicTxContext {
     readonly txHash: TxHash;
     readonly state: PhaseStateManager;
+    private readonly startTreeSnapshots;
     private readonly globalVariables;
-    private readonly startStateReference;
     private readonly gasSettings;
     private readonly gasUsedByPrivate;
     private readonly gasAllocatedToPublic;
@@ -26,7 +26,6 @@ export declare class PublicTxContext {
     readonly revertibleAccumulatedDataFromPrivate: PrivateToPublicAccumulatedData;
     readonly feePayer: AztecAddress;
     private readonly trace;
-    readonly hints: AvmExecutionHints;
     private log;
     private gasUsedByPublic;
     teardownGasUsed: Gas;

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

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