@aztec/simulator 0.85.0-alpha-testnet.2 → 0.85.0-nightly.20250417

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/simulator",
-  "version": "0.85.0-alpha-testnet.2",
+  "version": "0.85.0-nightly.20250417",
   "type": "module",
   "exports": {
     "./server": "./dest/server.js",
@@ -19,8 +19,6 @@
     "build": "yarn clean && tsc -b",
     "build:dev": "tsc -b --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
-    "formatting": "run -T prettier --check ./src && run -T eslint ./src",
-    "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
   },
   "inherits": [
@@ -60,24 +58,24 @@
     ]
   },
   "dependencies": {
-    "@aztec/constants": "0.85.0-alpha-testnet.2",
-    "@aztec/foundation": "0.85.0-alpha-testnet.2",
-    "@aztec/noir-acvm_js": "0.85.0-alpha-testnet.2",
-    "@aztec/noir-noirc_abi": "0.85.0-alpha-testnet.2",
-    "@aztec/noir-protocol-circuits-types": "0.85.0-alpha-testnet.2",
-    "@aztec/noir-types": "0.85.0-alpha-testnet.2",
-    "@aztec/protocol-contracts": "0.85.0-alpha-testnet.2",
-    "@aztec/stdlib": "0.85.0-alpha-testnet.2",
-    "@aztec/telemetry-client": "0.85.0-alpha-testnet.2",
-    "@aztec/world-state": "0.85.0-alpha-testnet.2",
+    "@aztec/constants": "0.85.0-nightly.20250417",
+    "@aztec/foundation": "0.85.0-nightly.20250417",
+    "@aztec/noir-acvm_js": "0.85.0-nightly.20250417",
+    "@aztec/noir-noirc_abi": "0.85.0-nightly.20250417",
+    "@aztec/noir-protocol-circuits-types": "0.85.0-nightly.20250417",
+    "@aztec/noir-types": "0.85.0-nightly.20250417",
+    "@aztec/protocol-contracts": "0.85.0-nightly.20250417",
+    "@aztec/stdlib": "0.85.0-nightly.20250417",
+    "@aztec/telemetry-client": "0.85.0-nightly.20250417",
+    "@aztec/world-state": "0.85.0-nightly.20250417",
     "lodash.clonedeep": "^4.5.0",
     "lodash.merge": "^4.6.2",
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@aztec/kv-store": "0.85.0-alpha-testnet.2",
-    "@aztec/merkle-tree": "0.85.0-alpha-testnet.2",
-    "@aztec/noir-contracts.js": "0.85.0-alpha-testnet.2",
+    "@aztec/kv-store": "0.85.0-nightly.20250417",
+    "@aztec/merkle-tree": "0.85.0-nightly.20250417",
+    "@aztec/noir-contracts.js": "0.85.0-nightly.20250417",
     "@jest/globals": "^29.5.0",
     "@types/jest": "^29.5.0",
     "@types/lodash.clonedeep": "^4.5.7",

package/src/public/avm/fixtures/avm_simulation_tester.ts

@@ -16,11 +16,11 @@ import {
   initExecutionEnvironment,
   resolveContractAssertionMessage,
 } from '../../avm/fixtures/index.js';
+import { SimpleContractDataSource } from '../../fixtures/simple_contract_data_source.js';
 import { PublicContractsDB, PublicTreesDB } from '../../public_db_sources.js';
 import { PublicPersistableStateManager } from '../../state_manager/state_manager.js';
 import { AvmSimulator } from '../avm_simulator.js';
 import { BaseAvmSimulationTester } from './base_avm_simulation_tester.js';
-import { SimpleContractDataSource } from './simple_contract_data_source.js';
 
 const TIMESTAMP = new Fr(99833);
 const DEFAULT_GAS_FEES = new GasFees(2, 3);

package/src/public/avm/fixtures/base_avm_simulation_tester.ts

@@ -11,8 +11,8 @@ import { computePublicDataTreeLeafSlot, siloNullifier } from '@aztec/stdlib/hash
 import type { MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server';
 import { MerkleTreeId } from '@aztec/stdlib/trees';
 
+import type { SimpleContractDataSource } from '../../fixtures/simple_contract_data_source.js';
 import { createContractClassAndInstance } from './index.js';
-import type { SimpleContractDataSource } from './simple_contract_data_source.js';
 
 /**
  * An abstract test class that enables tests of real apps in the AVM without requiring e2e tests.

package/src/public/avm/index.ts

@@ -1,2 +1,2 @@
 export * from './avm_simulator.js';
-export * from './fixtures/simple_contract_data_source.js';
+export * from '../fixtures/simple_contract_data_source.js';

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

@@ -181,11 +181,7 @@ export class L1ToL2MessageExists extends Instruction {
 
     const msgHash = memory.get(msgHashOffset).toFr();
     const msgLeafIndex = memory.get(msgLeafIndexOffset).toFr();
-    const exists = await context.persistableState.checkL1ToL2MessageExists(
-      context.environment.address,
-      msgHash,
-      msgLeafIndex,
-    );
+    const exists = await context.persistableState.checkL1ToL2MessageExists(msgHash, msgLeafIndex);
     memory.set(existsOffset, exists ? new Uint1(1) : new Uint1(0));
   }
 }

package/src/{common → public}/debug_fn_name.ts

@@ -2,7 +2,7 @@ import type { Fr } from '@aztec/foundation/fields';
 import { FunctionSelector } from '@aztec/stdlib/abi';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 
-import type { PublicContractsDBInterface } from '../public/db_interfaces.js';
+import type { PublicContractsDBInterface } from './db_interfaces.js';
 
 export async function getPublicFunctionDebugName(
   db: PublicContractsDBInterface,

package/src/public/fixtures/index.ts

@@ -1,2 +1,3 @@
 export * from './public_tx_simulation_tester.js';
 export * from './utils.js';
+export * from './simple_contract_data_source.js';

package/src/public/fixtures/public_tx_simulation_tester.ts

@@ -10,11 +10,11 @@ import { NativeWorldStateService } from '@aztec/world-state';
 
 import { BaseAvmSimulationTester } from '../avm/fixtures/base_avm_simulation_tester.js';
 import { DEFAULT_BLOCK_NUMBER, getContractFunctionAbi, getFunctionSelector } from '../avm/fixtures/index.js';
-import { SimpleContractDataSource } from '../avm/fixtures/simple_contract_data_source.js';
-import { PublicContractsDB, PublicTreesDB } from '../public_db_sources.js';
+import { PublicContractsDB } from '../public_db_sources.js';
 import { MeasuredPublicTxSimulator } from '../public_tx_simulator/measured_public_tx_simulator.js';
 import type { PublicTxResult } from '../public_tx_simulator/public_tx_simulator.js';
 import { TestExecutorMetrics } from '../test_executor_metrics.js';
+import { SimpleContractDataSource } from './simple_contract_data_source.js';
 import { createTxForPublicCalls } from './utils.js';
 
 const TIMESTAMP = new Fr(99833);
@@ -47,11 +47,9 @@ export class PublicTxSimulationTester extends BaseAvmSimulationTester {
   ) {
     super(contractDataSource, merkleTree);
 
-    const treesDB = new PublicTreesDB(merkleTree);
     const contractsDB = new PublicContractsDB(contractDataSource);
-
     this.simulator = new MeasuredPublicTxSimulator(
-      treesDB,
+      merkleTree,
       contractsDB,
       globals,
       /*doMerkleOperations=*/ true,

package/src/public/{avm/fixtures → fixtures}/simple_contract_data_source.ts

@@ -4,7 +4,7 @@ import type { ContractArtifact, FunctionSelector } from '@aztec/stdlib/abi';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { ContractClassPublic, ContractDataSource, ContractInstanceWithAddress } from '@aztec/stdlib/contract';
 
-import { getFunctionSelector } from './index.js';
+import { getFunctionSelector } from '../avm/fixtures/index.js';
 
 /**
  * This class is used during public/avm testing to function as a database of

package/src/public/hinting_db_sources.ts

@@ -24,9 +24,11 @@ import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { ContractClassPublic, ContractInstanceWithAddress } from '@aztec/stdlib/contract';
 import {
   AppendOnlyTreeSnapshot,
+  type BatchInsertionResult,
   type IndexedTreeId,
   MerkleTreeId,
   type MerkleTreeLeafType,
+  type MerkleTreeWriteOperations,
   NullifierLeaf,
   NullifierLeafPreimage,
   PublicDataTreeLeaf,
@@ -35,11 +37,11 @@ import {
   getTreeName,
   merkleTreeIds,
 } from '@aztec/stdlib/trees';
+import { TreeSnapshots } from '@aztec/stdlib/tx';
 
 import { strict as assert } from 'assert';
 
 import type { PublicContractsDBInterface } from './db_interfaces.js';
-import { PublicTreesDB } from './public_db_sources.js';
 
 /**
  * A public contracts database that forwards requests and collects AVM hints.
@@ -101,10 +103,10 @@ export class HintingPublicContractsDB implements PublicContractsDBInterface {
 }
 
 /**
- * A public trees database that forwards requests and collects AVM hints.
+ * A low-level merkle DB that collects hints.
  */
-export class HintingPublicTreesDB extends PublicTreesDB {
-  private static readonly log: Logger = createLogger('HintingPublicTreesDB');
+export class HintingMerkleWriteOperations implements MerkleTreeWriteOperations {
+  private static readonly log: Logger = createLogger('simulator:hinting-merkle-db');
   // This stack is only for debugging purposes.
   // The top of the stack is the current checkpoint id.
   // We need the stack to be non-empty and use 0 as an arbitrary initial checkpoint id.
@@ -113,19 +115,31 @@ export class HintingPublicTreesDB extends PublicTreesDB {
   private nextCheckpointId: number = 1;
   private checkpointActionCounter: number = 0; // yes, a side-effect counter.
 
-  constructor(db: PublicTreesDB, private hints: AvmExecutionHints) {
-    super(db);
+  public static async create(db: MerkleTreeWriteOperations, hints: AvmExecutionHints) {
+    const hintingTreesDB = new HintingMerkleWriteOperations(db, hints);
+    const startStateReference = await db.getStateReference();
+    hints.startingTreeRoots = new TreeSnapshots(
+      startStateReference.l1ToL2MessageTree,
+      startStateReference.partial.noteHashTree,
+      startStateReference.partial.nullifierTree,
+      startStateReference.partial.publicDataTree,
+    );
+
+    return hintingTreesDB;
   }
 
+  // Use create() to instantiate.
+  private constructor(private db: MerkleTreeWriteOperations, private hints: AvmExecutionHints) {}
+
   // Getters.
-  public override async getSiblingPath<N extends number>(treeId: MerkleTreeId, index: bigint): Promise<SiblingPath<N>> {
-    const path = await super.getSiblingPath<N>(treeId, index);
+  public async getSiblingPath<N extends number>(treeId: MerkleTreeId, index: bigint): Promise<SiblingPath<N>> {
+    const path = await this.db.getSiblingPath<N>(treeId, index);
     const key = await this.getHintKey(treeId);
     this.hints.getSiblingPathHints.push(new AvmGetSiblingPathHint(key, treeId, index, path.toFields()));
     return Promise.resolve(path);
   }
 
-  public override async getPreviousValueIndex<ID extends IndexedTreeId>(
+  public async getPreviousValueIndex<ID extends IndexedTreeId>(
     treeId: ID,
     value: bigint,
   ): Promise<
@@ -135,7 +149,7 @@ export class HintingPublicTreesDB extends PublicTreesDB {
       }
     | undefined
   > {
-    const result = await super.getPreviousValueIndex(treeId, value);
+    const result = await this.db.getPreviousValueIndex(treeId, value);
     if (result === undefined) {
       throw new Error(
         `getPreviousValueIndex(${getTreeName(
@@ -150,11 +164,11 @@ export class HintingPublicTreesDB extends PublicTreesDB {
     return result;
   }
 
-  public override async getLeafPreimage<ID extends IndexedTreeId>(
+  public async getLeafPreimage<ID extends IndexedTreeId>(
     treeId: ID,
     index: bigint,
   ): Promise<IndexedTreeLeafPreimage | undefined> {
-    const preimage = await super.getLeafPreimage<ID>(treeId, index);
+    const preimage = await this.db.getLeafPreimage<ID>(treeId, index);
     if (preimage) {
       const key = await this.getHintKey(treeId);
 
@@ -179,14 +193,14 @@ export class HintingPublicTreesDB extends PublicTreesDB {
     return preimage;
   }
 
-  public override async getLeafValue<ID extends MerkleTreeId>(
+  public async getLeafValue<ID extends MerkleTreeId>(
     treeId: ID,
     index: bigint,
   ): Promise<MerkleTreeLeafType<typeof treeId> | undefined> {
     // Use getLeafPreimage for PublicDataTree and NullifierTree.
     assert(treeId == MerkleTreeId.NOTE_HASH_TREE || treeId == MerkleTreeId.L1_TO_L2_MESSAGE_TREE);
 
-    const value = await super.getLeafValue<ID>(treeId, index);
+    const value = await this.db.getLeafValue<ID>(treeId, index);
     if (value) {
       const key = await this.getHintKey(treeId);
       // We can cast to Fr because we know the type of the tree.
@@ -199,7 +213,7 @@ export class HintingPublicTreesDB extends PublicTreesDB {
   // State modification.
   // FIXME(fcarreiro): This is a horrible interface (in the merkle ops). It's receiving the leaves as buffers,
   // from a leaf class that is NOT the one that will be used to write. Make this type safe.
-  public override async sequentialInsert<TreeHeight extends number, ID extends IndexedTreeId>(
+  public async sequentialInsert<TreeHeight extends number, ID extends IndexedTreeId>(
     treeId: ID,
     leaves: Buffer[],
   ): Promise<SequentialInsertionResult<TreeHeight>> {
@@ -210,11 +224,10 @@ export class HintingPublicTreesDB extends PublicTreesDB {
 
     const beforeState = await this.getHintKey(treeId);
 
-    const result = await super.sequentialInsert<TreeHeight, ID>(treeId, leaves);
+    const result = await this.db.sequentialInsert<TreeHeight, ID>(treeId, leaves);
 
     const afterState = await this.getHintKey(treeId);
-    HintingPublicTreesDB.log.debug('[sequentialInsert] Evolved tree state.');
-    HintingPublicTreesDB.logTreeChange(beforeState, afterState, treeId);
+    HintingMerkleWriteOperations.logTreeChange('sequentialInsert', beforeState, afterState, treeId);
 
     switch (treeId) {
       case MerkleTreeId.PUBLIC_DATA_TREE:
@@ -265,10 +278,7 @@ export class HintingPublicTreesDB extends PublicTreesDB {
     return result;
   }
 
-  public override async appendLeaves<ID extends MerkleTreeId>(
-    treeId: ID,
-    leaves: MerkleTreeLeafType<ID>[],
-  ): Promise<void> {
+  public async appendLeaves<ID extends MerkleTreeId>(treeId: ID, leaves: MerkleTreeLeafType<ID>[]): Promise<void> {
     // Use sequentialInsert for PublicDataTree and NullifierTree.
     assert(treeId == MerkleTreeId.NOTE_HASH_TREE || treeId == MerkleTreeId.L1_TO_L2_MESSAGE_TREE);
 
@@ -279,39 +289,39 @@ export class HintingPublicTreesDB extends PublicTreesDB {
     }
   }
 
-  public override async createCheckpoint(): Promise<void> {
+  public async createCheckpoint(): Promise<void> {
     const actionCounter = this.checkpointActionCounter++;
     const oldCheckpointId = this.getCurrentCheckpointId();
     const treesStateHash = await this.getTreesStateHash();
 
-    await super.createCheckpoint();
+    await this.db.createCheckpoint();
     this.checkpointStack.push(this.nextCheckpointId++);
     const newCheckpointId = this.getCurrentCheckpointId();
 
     this.hints.createCheckpointHints.push(new AvmCreateCheckpointHint(actionCounter, oldCheckpointId, newCheckpointId));
 
-    HintingPublicTreesDB.log.debug(
+    HintingMerkleWriteOperations.log.trace(
       `[createCheckpoint:${actionCounter}] Checkpoint evolved ${oldCheckpointId} -> ${newCheckpointId} at trees state ${treesStateHash}.`,
     );
   }
 
-  public override async commitCheckpoint(): Promise<void> {
+  public async commitCheckpoint(): Promise<void> {
     const actionCounter = this.checkpointActionCounter++;
     const oldCheckpointId = this.getCurrentCheckpointId();
     const treesStateHash = await this.getTreesStateHash();
 
-    await super.commitCheckpoint();
+    await this.db.commitCheckpoint();
     this.checkpointStack.pop();
     const newCheckpointId = this.getCurrentCheckpointId();
 
     this.hints.commitCheckpointHints.push(new AvmCommitCheckpointHint(actionCounter, oldCheckpointId, newCheckpointId));
 
-    HintingPublicTreesDB.log.debug(
+    HintingMerkleWriteOperations.log.trace(
       `[commitCheckpoint:${actionCounter}] Checkpoint evolved ${oldCheckpointId} -> ${newCheckpointId} at trees state ${treesStateHash}.`,
     );
   }
 
-  public override async revertCheckpoint(): Promise<void> {
+  public async revertCheckpoint(): Promise<void> {
     const actionCounter = this.checkpointActionCounter++;
     const oldCheckpointId = this.getCurrentCheckpointId();
     const treesStateHash = await this.getTreesStateHash();
@@ -324,7 +334,7 @@ export class HintingPublicTreesDB extends PublicTreesDB {
       [MerkleTreeId.ARCHIVE]: await this.getHintKey(MerkleTreeId.ARCHIVE),
     };
 
-    await super.revertCheckpoint();
+    await this.db.revertCheckpoint();
     this.checkpointStack.pop();
     const newCheckpointId = this.getCurrentCheckpointId();
 
@@ -340,17 +350,17 @@ export class HintingPublicTreesDB extends PublicTreesDB {
       AvmRevertCheckpointHint.create(actionCounter, oldCheckpointId, newCheckpointId, beforeState, afterState),
     );
 
-    HintingPublicTreesDB.log.debug(
+    HintingMerkleWriteOperations.log.trace(
       `[revertCheckpoint:${actionCounter}] Checkpoint evolved ${oldCheckpointId} -> ${newCheckpointId} at trees state ${treesStateHash}.`,
     );
     for (const treeId of merkleTreeIds()) {
-      HintingPublicTreesDB.logTreeChange(beforeState[treeId], afterState[treeId], treeId);
+      HintingMerkleWriteOperations.logTreeChange('revertCheckpoint', beforeState[treeId], afterState[treeId], treeId);
     }
   }
 
   // Private methods.
   private async getHintKey(treeId: MerkleTreeId): Promise<AppendOnlyTreeSnapshot> {
-    const treeInfo = await super.getTreeInfo(treeId);
+    const treeInfo = await this.db.getTreeInfo(treeId);
     return new AppendOnlyTreeSnapshot(Fr.fromBuffer(treeInfo.root), Number(treeInfo.size));
   }
 
@@ -360,18 +370,19 @@ export class HintingPublicTreesDB extends PublicTreesDB {
 
   // For logging/debugging purposes.
   private async getTreesStateHash(): Promise<Fr> {
-    const stateReferenceFields = (await super.getStateReference()).toFields();
+    const stateReferenceFields = (await this.db.getStateReference()).toFields();
     return Fr.fromBuffer(sha256Trunc(Buffer.concat(stateReferenceFields.map(field => field.toBuffer()))));
   }
 
   private static logTreeChange(
+    action: string,
     beforeState: AppendOnlyTreeSnapshot,
     afterState: AppendOnlyTreeSnapshot,
     treeId: MerkleTreeId,
   ) {
     const treeName = getTreeName(treeId);
-    HintingPublicTreesDB.log.debug(
-      `[${treeName}] Evolved tree state: ${beforeState.root}, ${beforeState.nextAvailableLeafIndex} -> ${afterState.root}, ${afterState.nextAvailableLeafIndex}.`,
+    HintingMerkleWriteOperations.log.trace(
+      `[${action}] ${treeName} tree state: ${beforeState.root}, ${beforeState.nextAvailableLeafIndex} -> ${afterState.root}, ${afterState.nextAvailableLeafIndex}.`,
     );
   }
 
@@ -384,15 +395,69 @@ export class HintingPublicTreesDB extends PublicTreesDB {
 
     const beforeState = await this.getHintKey(treeId);
 
-    await super.appendLeaves<ID>(treeId, [leaf]);
+    await this.db.appendLeaves<ID>(treeId, [leaf]);
 
     const afterState = await this.getHintKey(treeId);
 
-    HintingPublicTreesDB.log.debug('[appendLeaves] Evolved tree state.');
-    HintingPublicTreesDB.logTreeChange(beforeState, afterState, treeId);
+    HintingMerkleWriteOperations.logTreeChange('appendLeaves', beforeState, afterState, treeId);
 
     this.hints.appendLeavesHints.push(new AvmAppendLeavesHint(beforeState, afterState, treeId, [leaf as Fr]));
 
     return await this.getSiblingPath<N>(treeId, BigInt(beforeState.nextAvailableLeafIndex));
   }
+
+  // Non-hinted required methods from MerkleTreeWriteOperations interface
+  public async getTreeInfo(treeId: MerkleTreeId) {
+    return await this.db.getTreeInfo(treeId);
+  }
+
+  public async getStateReference() {
+    return await this.db.getStateReference();
+  }
+
+  public getInitialHeader() {
+    return this.db.getInitialHeader();
+  }
+
+  public async updateArchive(header: any): Promise<void> {
+    return await this.db.updateArchive(header);
+  }
+
+  public async batchInsert<
+    TreeHeight extends number,
+    SubtreeSiblingPathHeight extends number,
+    ID extends IndexedTreeId,
+  >(
+    treeId: ID,
+    leaves: Buffer[],
+    subtreeHeight: number,
+  ): Promise<BatchInsertionResult<TreeHeight, SubtreeSiblingPathHeight>> {
+    return await this.db.batchInsert<TreeHeight, SubtreeSiblingPathHeight, ID>(treeId, leaves, subtreeHeight);
+  }
+
+  public async close(): Promise<void> {
+    return await this.db.close();
+  }
+
+  public async findLeafIndices<ID extends MerkleTreeId>(
+    treeId: ID,
+    values: MerkleTreeLeafType<ID>[],
+  ): Promise<(bigint | undefined)[]> {
+    return await this.db.findLeafIndices(treeId, values);
+  }
+
+  public async findLeafIndicesAfter<ID extends MerkleTreeId>(
+    treeId: ID,
+    values: MerkleTreeLeafType<ID>[],
+    startIndex: bigint,
+  ): Promise<(bigint | undefined)[]> {
+    return await this.db.findLeafIndicesAfter(treeId, values, startIndex);
+  }
+
+  public async getBlockNumbersForLeafIndices<ID extends MerkleTreeId>(
+    treeId: ID,
+    leafIndices: bigint[],
+  ): Promise<(bigint | undefined)[]> {
+    return await this.db.getBlockNumbersForLeafIndices(treeId, leafIndices);
+  }
 }

package/src/public/index.ts

@@ -1,8 +1,6 @@
-export * from './db_interfaces.js';
-export * from './public_tx_simulator/index.js';
-export * from './public_db_sources.js';
+export { PublicContractsDB } from './public_db_sources.js';
+export { type PublicTxResult, PublicTxSimulator, TelemetryPublicTxSimulator } from './public_tx_simulator/index.js';
 export { PublicProcessor, PublicProcessorFactory } from './public_processor/public_processor.js';
-export { SideEffectTrace } from './side_effect_trace.js';
 export { PublicTxSimulationTester } from './fixtures/index.js';
-export * from './avm/index.js';
 export { getCallRequestsWithCalldataByPhase } from './utils.js';
+export { SimpleContractDataSource } from './fixtures/simple_contract_data_source.js';