@aztec/simulator 0.69.1-devnet → 0.70.0

package/src/providers/index.ts

@@ -1,4 +1,4 @@
 export * from './acvm_native.js';
 export * from './acvm_wasm_with_blobs.js';
-export * from './simulation_provider.js';
+export * from '../common/simulation_provider.js';
 export * from './factory.js';

package/src/public/db_interfaces.ts

@@ -7,7 +7,7 @@ import {
 import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { type Fr } from '@aztec/foundation/fields';
 
-import { type MessageLoadOracleInputs } from '../acvm/index.js';
+import { type MessageLoadOracleInputs } from '../common/message_load_oracle_inputs.js';
 
 /**
  * Database interface for providing access to public state.

package/src/public/fixtures/index.ts

@@ -32,25 +32,26 @@ import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr, Point } from '@aztec/foundation/fields';
 import { openTmpStore } from '@aztec/kv-store/lmdb';
 import { AvmTestContractArtifact } from '@aztec/noir-contracts.js/AvmTest';
-import {
-  AvmEphemeralForest,
-  AvmSimulator,
-  PublicEnqueuedCallSideEffectTrace,
-  PublicTxSimulator,
-  WorldStateDB,
-} from '@aztec/simulator';
 import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
 import { MerkleTrees } from '@aztec/world-state';
 
 import { strict as assert } from 'assert';
 
 import { initContext, initExecutionEnvironment, initPersistableStateManager } from '../../avm/fixtures/index.js';
+import { AvmEphemeralForest, AvmSimulator } from '../../server.js';
+import { PublicEnqueuedCallSideEffectTrace } from '../enqueued_call_side_effect_trace.js';
+import { WorldStateDB } from '../public_db_sources.js';
+import { PublicTxSimulator } from '../public_tx_simulator.js';
 
 const TIMESTAMP = new Fr(99833);
 
 export async function simulateAvmTestContractGenerateCircuitInputs(
-  functionName: string,
-  args: Fr[] = [],
+  setupFunctionNames: string[],
+  setupArgs: Fr[][] = [],
+  appFunctionNames: string[],
+  appArgs: Fr[][] = [],
+  teardownFunctionName?: string,
+  teardownArgs: Fr[] = [],
   expectRevert: boolean = false,
   contractDataSource = new MockedAvmTestContractDataSource(),
   assertionErrString?: string,
@@ -71,17 +72,37 @@ export async function simulateAvmTestContractGenerateCircuitInputs(
   );
 
   const sender = AztecAddress.random();
-  const functionSelector = getAvmTestContractFunctionSelector(functionName);
-  args = [functionSelector.toField(), ...args];
   const callContext = new CallContext(
     sender,
     contractDataSource.firstContractInstance.address,
     contractDataSource.fnSelector,
     /*isStaticCall=*/ false,
   );
-  const executionRequest = new PublicExecutionRequest(callContext, args);
+  const setupExecutionRequests: PublicExecutionRequest[] = [];
+  // we reverse order because the simulator expects it to be like a "stack" of calls to pop from
+  for (let i = setupFunctionNames.length - 1; i >= 0; i--) {
+    const functionSelector = getAvmTestContractFunctionSelector(setupFunctionNames[i]);
+    const fnArgs = [functionSelector.toField(), ...setupArgs[i]];
+    const executionRequest = new PublicExecutionRequest(callContext, fnArgs);
+    setupExecutionRequests.push(executionRequest);
+  }
+  const appExecutionRequests: PublicExecutionRequest[] = [];
+  // we reverse order because the simulator expects it to be like a "stack" of calls to pop from
+  for (let i = appFunctionNames.length - 1; i >= 0; i--) {
+    const functionSelector = getAvmTestContractFunctionSelector(appFunctionNames[i]);
+    const fnArgs = [functionSelector.toField(), ...appArgs[i]];
+    const executionRequest = new PublicExecutionRequest(callContext, fnArgs);
+    appExecutionRequests.push(executionRequest);
+  }
+
+  let teardownExecutionRequest: PublicExecutionRequest | undefined = undefined;
+  if (teardownFunctionName) {
+    const functionSelector = getAvmTestContractFunctionSelector(teardownFunctionName);
+    const fnArgs = [functionSelector.toField(), ...teardownArgs];
+    teardownExecutionRequest = new PublicExecutionRequest(callContext, fnArgs);
+  }
 
-  const tx: Tx = createTxForPublicCall(executionRequest);
+  const tx: Tx = createTxForPublicCalls(setupExecutionRequests, appExecutionRequests, teardownExecutionRequest);
 
   const avmResult = await simulator.simulate(tx);
 
@@ -141,27 +162,38 @@ export async function simulateAvmTestContractCall(
 }
 
 /**
- * Craft a carrier transaction for a public call for simulation by PublicTxSimulator.
+ * Craft a carrier transaction for some public calls for simulation by PublicTxSimulator.
  */
-export function createTxForPublicCall(
-  executionRequest: PublicExecutionRequest,
+export function createTxForPublicCalls(
+  setupExecutionRequests: PublicExecutionRequest[],
+  appExecutionRequests: PublicExecutionRequest[],
+  teardownExecutionRequest?: PublicExecutionRequest,
   gasUsedByPrivate: Gas = Gas.empty(),
-  isTeardown: boolean = false,
 ): Tx {
-  const callRequest = executionRequest.toCallRequest();
+  assert(
+    setupExecutionRequests.length > 0 || appExecutionRequests.length > 0 || teardownExecutionRequest !== undefined,
+    "Can't create public tx with no enqueued calls",
+  );
+  const setupCallRequests = setupExecutionRequests.map(er => er.toCallRequest());
+  const appCallRequests = appExecutionRequests.map(er => er.toCallRequest());
   // use max limits
   const gasLimits = new Gas(DEFAULT_GAS_LIMIT, MAX_L2_GAS_PER_TX_PUBLIC_PORTION);
 
   const forPublic = PartialPrivateTailPublicInputsForPublic.empty();
   // TODO(#9269): Remove this fake nullifier method as we move away from 1st nullifier as hash.
   forPublic.nonRevertibleAccumulatedData.nullifiers[0] = Fr.random(); // fake tx nullifier
-  if (isTeardown) {
-    forPublic.publicTeardownCallRequest = callRequest;
-  } else {
-    forPublic.revertibleAccumulatedData.publicCallRequests[0] = callRequest;
+
+  for (let i = 0; i < setupExecutionRequests.length; i++) {
+    forPublic.nonRevertibleAccumulatedData.publicCallRequests[i] = setupCallRequests[i];
+  }
+  for (let i = 0; i < appCallRequests.length; i++) {
+    forPublic.revertibleAccumulatedData.publicCallRequests[i] = appCallRequests[i];
+  }
+  if (teardownExecutionRequest) {
+    forPublic.publicTeardownCallRequest = teardownExecutionRequest.toCallRequest();
   }
 
-  const teardownGasLimits = isTeardown ? gasLimits : Gas.empty();
+  const teardownGasLimits = teardownExecutionRequest ? gasLimits : Gas.empty();
   const gasSettings = new GasSettings(gasLimits, teardownGasLimits, GasFees.empty(), GasFees.empty());
   const txContext = new TxContext(Fr.zero(), Fr.zero(), gasSettings);
   const constantData = new TxConstantData(BlockHeader.empty(), txContext, Fr.zero(), Fr.zero());
@@ -173,9 +205,13 @@ export function createTxForPublicCall(
     AztecAddress.zero(),
     forPublic,
   );
-  const tx = isTeardown ? Tx.newWithTxData(txData, executionRequest) : Tx.newWithTxData(txData);
-  if (!isTeardown) {
-    tx.enqueuedPublicFunctionCalls[0] = executionRequest;
+  const tx = Tx.newWithTxData(txData, teardownExecutionRequest);
+
+  for (let i = 0; i < setupExecutionRequests.length; i++) {
+    tx.enqueuedPublicFunctionCalls.push(setupExecutionRequests[i]);
+  }
+  for (let i = 0; i < appExecutionRequests.length; i++) {
+    tx.enqueuedPublicFunctionCalls.push(appExecutionRequests[i]);
   }
 
   return tx;

package/src/public/public_db_sources.ts

@@ -24,12 +24,9 @@ import { createLogger } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
 import { ContractClassRegisteredEvent } from '@aztec/protocol-contracts/class-registerer';
 import { ContractInstanceDeployedEvent } from '@aztec/protocol-contracts/instance-deployer';
-import {
-  type CommitmentsDB,
-  MessageLoadOracleInputs,
-  type PublicContractsDB,
-  type PublicStateDB,
-} from '@aztec/simulator';
+
+import { MessageLoadOracleInputs } from '../common/message_load_oracle_inputs.js';
+import { type CommitmentsDB, type PublicContractsDB, type PublicStateDB } from './db_interfaces.js';
 
 /**
  * Implements the PublicContractsDB using a ContractDataSource.

package/src/public/public_tx_simulator.ts

@@ -294,7 +294,7 @@ export class PublicTxSimulator {
     const gasUsed = allocatedGas.sub(result.gasLeft); // by enqueued call
     context.consumeGas(phase, gasUsed);
     this.log.debug(
-      `Simulated enqueued public call consumed ${gasUsed.l2Gas} L2 gas ending with ${result.gasLeft.l2Gas} L2 gas left.`,
+      `Simulated enqueued public call (${fnName}) consumed ${gasUsed.l2Gas} L2 gas ending with ${result.gasLeft.l2Gas} L2 gas left.`,
     );
 
     stateManager.traceEnqueuedCall(callRequest, executionRequest.args, result.reverted);

package/{dest/index.d.ts → src/server.ts}

@@ -1,8 +1,5 @@
-export * from './acvm/index.js';
 export * from './avm/index.js';
-export * from './client/index.js';
 export * from './common/index.js';
 export * from './public/index.js';
 export * from './providers/index.js';
 export * from './stats/index.js';
-//# sourceMappingURL=index.d.ts.map

package/dest/common/packed_values_cache.d.ts

@@ -1,28 +0,0 @@
-import { PackedValues } from '@aztec/circuit-types';
-import { Fr } from '@aztec/circuits.js';
-/**
- * A cache for packed values (arguments, returns) during transaction execution.
- */
-export declare class PackedValuesCache {
-    private cache;
-    constructor(initialArguments?: PackedValues[]);
-    /**
-     * Creates a new packed values cache.
-     * @param initialArguments - The initial arguments to add to the cache.
-     * @returns The new packed values cache.
-     */
-    static create(initialArguments?: PackedValues[]): PackedValuesCache;
-    /**
-     * Unpacks packed values.
-     * @param hash - The hash of the packed values.
-     * @returns The unpacked values.
-     */
-    unpack(hash: Fr): Fr[];
-    /**
-     * Packs values.
-     * @param values - The values to pack.
-     * @returns The hash of the packed values.
-     */
-    pack(values: Fr[]): Fr;
-}
-//# sourceMappingURL=packed_values_cache.d.ts.map

package/dest/common/packed_values_cache.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"packed_values_cache.d.ts","sourceRoot":"","sources":["../../src/common/packed_values_cache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AAExC;;GAEG;AACH,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,KAAK,CAAoB;gBAErB,gBAAgB,GAAE,YAAY,EAAO;IAOjD;;;;OAIG;WACW,MAAM,CAAC,gBAAgB,GAAE,YAAY,EAAO;IAI1D;;;;OAIG;IACI,MAAM,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE,EAAE;IAW7B;;;;OAIG;IACI,IAAI,CAAC,MAAM,EAAE,EAAE,EAAE;CAQzB"}

package/dest/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC;AACrC,cAAc,kBAAkB,CAAC"}

package/dest/index.js

@@ -1,8 +0,0 @@
-export * from './acvm/index.js';
-export * from './avm/index.js';
-export * from './client/index.js';
-export * from './common/index.js';
-export * from './public/index.js';
-export * from './providers/index.js';
-export * from './stats/index.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxpQkFBaUIsQ0FBQztBQUNoQyxjQUFjLGdCQUFnQixDQUFDO0FBQy9CLGNBQWMsbUJBQW1CLENBQUM7QUFDbEMsY0FBYyxtQkFBbUIsQ0FBQztBQUNsQyxjQUFjLG1CQUFtQixDQUFDO0FBQ2xDLGNBQWMsc0JBQXNCLENBQUM7QUFDckMsY0FBYyxrQkFBa0IsQ0FBQyJ9

package/dest/providers/simulation_provider.d.ts

@@ -1,9 +0,0 @@
-import { type NoirCompiledCircuit } from '@aztec/types/noir';
-import { type WitnessMap } from '@noir-lang/types';
-/**
- * Low level simulation interface
- */
-export interface SimulationProvider {
-    simulateCircuit(input: WitnessMap, compiledCircuit: NoirCompiledCircuit): Promise<WitnessMap>;
-}
-//# sourceMappingURL=simulation_provider.d.ts.map

package/dest/providers/simulation_provider.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"simulation_provider.d.ts","sourceRoot":"","sources":["../../src/providers/simulation_provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAE7D,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,eAAe,CAAC,KAAK,EAAE,UAAU,EAAE,eAAe,EAAE,mBAAmB,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;CAC/F"}

package/dest/providers/simulation_provider.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2ltdWxhdGlvbl9wcm92aWRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wcm92aWRlcnMvc2ltdWxhdGlvbl9wcm92aWRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIn0=

package/src/common/packed_values_cache.ts

@@ -1,55 +0,0 @@
-import { PackedValues } from '@aztec/circuit-types';
-import { Fr } from '@aztec/circuits.js';
-
-/**
- * A cache for packed values (arguments, returns) during transaction execution.
- */
-export class PackedValuesCache {
-  private cache: Map<bigint, Fr[]>;
-
-  constructor(initialArguments: PackedValues[] = []) {
-    this.cache = new Map();
-    for (const initialArg of initialArguments) {
-      this.cache.set(initialArg.hash.toBigInt(), initialArg.values);
-    }
-  }
-
-  /**
-   * Creates a new packed values cache.
-   * @param initialArguments - The initial arguments to add to the cache.
-   * @returns The new packed values cache.
-   */
-  public static create(initialArguments: PackedValues[] = []) {
-    return new PackedValuesCache(initialArguments);
-  }
-
-  /**
-   * Unpacks packed values.
-   * @param hash - The hash of the packed values.
-   * @returns The unpacked values.
-   */
-  public unpack(hash: Fr): Fr[] {
-    if (hash.equals(Fr.ZERO)) {
-      return [];
-    }
-    const packedValues = this.cache.get(hash.value);
-    if (!packedValues) {
-      throw new Error(`Packed values for hash ${hash.toString()} not found in cache`);
-    }
-    return packedValues;
-  }
-
-  /**
-   * Packs values.
-   * @param values - The values to pack.
-   * @returns The hash of the packed values.
-   */
-  public pack(values: Fr[]) {
-    if (values.length === 0) {
-      return Fr.ZERO;
-    }
-    const packedValues = PackedValues.fromValues(values);
-    this.cache.set(packedValues.hash.value, packedValues.values);
-    return packedValues.hash;
-  }
-}

package/src/providers/simulation_provider.ts

@@ -1,10 +0,0 @@
-import { type NoirCompiledCircuit } from '@aztec/types/noir';
-
-import { type WitnessMap } from '@noir-lang/types';
-
-/**
- * Low level simulation interface
- */
-export interface SimulationProvider {
-  simulateCircuit(input: WitnessMap, compiledCircuit: NoirCompiledCircuit): Promise<WitnessMap>;
-}