@aztec/simulator 0.27.2 → 0.28.1

package/src/public/executor.ts

@@ -1,5 +1,5 @@
 import { FunctionL2Logs } from '@aztec/circuit-types';
-import { GlobalVariables, Header, PublicCircuitPublicInputs } from '@aztec/circuits.js';
+import { Fr, GlobalVariables, Header, PublicCircuitPublicInputs } from '@aztec/circuits.js';
 import { createDebugLogger } from '@aztec/foundation/log';
 
 import { spawn } from 'child_process';
@@ -83,6 +83,9 @@ export async function executePublicFunction(
       returnValues: [],
       newNoteHashes: [],
       newL2ToL1Messages: [],
+      // TODO (side effects) get these values in the revert case from the vm
+      startSideEffectCounter: Fr.ZERO,
+      endSideEffectCounter: Fr.ZERO,
       newNullifiers: [],
       nullifierReadRequests: [],
       nullifierNonExistentReadRequests: [],
@@ -107,6 +110,8 @@ export async function executePublicFunction(
     newL2ToL1Msgs,
     newNoteHashes: newNoteHashesPadded,
     newNullifiers: newNullifiersPadded,
+    startSideEffectCounter,
+    endSideEffectCounter,
   } = PublicCircuitPublicInputs.fromFields(returnWitness);
 
   const nullifierReadRequests = nullifierReadRequestsPadded.filter(v => !v.isEmpty());
@@ -136,6 +141,8 @@ export async function executePublicFunction(
     newNoteHashes,
     newL2ToL1Messages,
     newNullifiers,
+    startSideEffectCounter,
+    endSideEffectCounter,
     nullifierReadRequests,
     nullifierNonExistentReadRequests,
     contractStorageReads,
@@ -165,7 +172,11 @@ export class PublicExecutor {
    * @param globalVariables - The global variables to use.
    * @returns The result of the run plus all nested runs.
    */
-  public async simulate(execution: PublicExecution, globalVariables: GlobalVariables): Promise<PublicExecutionResult> {
+  public async simulate(
+    execution: PublicExecution,
+    globalVariables: GlobalVariables,
+    sideEffectCounter: number = 0,
+  ): Promise<PublicExecutionResult> {
     const selector = execution.functionData.selector;
     const acir = await this.contractsDb.getBytecode(execution.contractAddress, selector);
     if (!acir) {
@@ -176,14 +187,12 @@ export class PublicExecutor {
     // We use this cache to hold the packed arguments.
     const packedArgs = PackedArgsCache.create([]);
 
-    const sideEffectCounter = new SideEffectCounter();
-
     const context = new PublicExecutionContext(
       execution,
       this.header,
       globalVariables,
       packedArgs,
-      sideEffectCounter,
+      new SideEffectCounter(sideEffectCounter),
       this.stateDb,
       this.contractsDb,
       this.commitmentsDb,
@@ -213,9 +222,10 @@ export class PublicExecutor {
   public async simulateAvm(
     execution: PublicExecution,
     globalVariables: GlobalVariables,
+    _sideEffectCounter = 0,
   ): Promise<PublicExecutionResult> {
     // Temporary code to construct the AVM context
-    // These data structures will permiate across the simulator when the public executor is phased out
+    // These data structures will permeate across the simulator when the public executor is phased out
     const hostStorage = new HostStorage(this.stateDb, this.contractsDb, this.commitmentsDb);
     const worldStateJournal = new AvmPersistableStateManager(hostStorage);
     const executionEnv = temporaryCreateAvmExecutionEnvironment(execution, globalVariables);
@@ -244,8 +254,6 @@ export class PublicExecutor {
    */
   public async getAvmProof(avmExecution: PublicExecution): Promise<Buffer[]> {
     // The paths for the barretenberg binary and the write path are hardcoded for now.
-    // We additionally need the path to a valid crs for proof generation.
-    // const bbPath = '../../barretenberg/cpp';
     const bbPath = path.resolve('../../barretenberg/cpp');
     const artifactsPath = path.resolve('target');
 
@@ -273,8 +281,6 @@ export class PublicExecutor {
       bytecodePath,
       '-d',
       calldataPath,
-      '-c',
-      path.join(bbPath, 'srs_db', 'ignition'),
       '-o',
       proofPath,
     ]);

package/src/public/public_execution_context.ts

@@ -50,7 +50,13 @@ export class PublicExecutionContext extends TypedOracle {
    */
   public getInitialWitness(witnessStartIndex = 0) {
     const { callContext, args } = this.execution;
-    const fields = [...callContext.toFields(), ...this.header.toFields(), ...this.globalVariables.toFields(), ...args];
+    const fields = [
+      ...callContext.toFields(),
+      ...this.header.toFields(),
+      ...this.globalVariables.toFields(),
+      new Fr(this.sideEffectCounter.current()),
+      ...args,
+    ];
 
     return toACVMWitness(witnessStartIndex, fields);
   }
@@ -161,6 +167,7 @@ export class PublicExecutionContext extends TypedOracle {
     targetContractAddress: AztecAddress,
     functionSelector: FunctionSelector,
     argsHash: Fr,
+    sideEffectCounter: number,
     isStaticCall: boolean,
     isDelegateCall: boolean,
   ) {
@@ -189,7 +196,7 @@ export class PublicExecutionContext extends TypedOracle {
       functionSelector,
       isDelegateCall,
       isStaticCall,
-      startSideEffectCounter: 0, // TODO use counters in public execution
+      sideEffectCounter,
     });
 
     const nestedExecution: PublicExecution = {