@aztec/simulator 0.61.0 → 0.63.0

package/src/public/transitional_adapters.ts

@@ -0,0 +1,347 @@
+import { type AvmProvingRequest, ProvingRequestType, type PublicExecutionRequest } from '@aztec/circuit-types';
+import {
+  AvmCircuitInputs,
+  AvmCircuitPublicInputs,
+  AztecAddress,
+  ContractStorageRead,
+  ContractStorageUpdateRequest,
+  Fr,
+  Gas,
+  type GasSettings,
+  type GlobalVariables,
+  type Header,
+  L2ToL1Message,
+  LogHash,
+  MAX_ENQUEUED_CALLS_PER_CALL,
+  MAX_L1_TO_L2_MSG_READ_REQUESTS_PER_CALL,
+  MAX_L2_TO_L1_MSGS_PER_CALL,
+  MAX_L2_TO_L1_MSGS_PER_TX,
+  MAX_NOTE_HASHES_PER_CALL,
+  MAX_NOTE_HASHES_PER_TX,
+  MAX_NOTE_HASH_READ_REQUESTS_PER_CALL,
+  MAX_NULLIFIERS_PER_CALL,
+  MAX_NULLIFIERS_PER_TX,
+  MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL,
+  MAX_NULLIFIER_READ_REQUESTS_PER_CALL,
+  MAX_PUBLIC_DATA_READS_PER_CALL,
+  MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL,
+  MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
+  MAX_UNENCRYPTED_LOGS_PER_CALL,
+  NoteHash,
+  Nullifier,
+  PrivateToAvmAccumulatedData,
+  PrivateToAvmAccumulatedDataArrayLengths,
+  type PrivateToPublicAccumulatedData,
+  PublicCallRequest,
+  PublicCircuitPublicInputs,
+  PublicDataWrite,
+  PublicInnerCallRequest,
+  ReadRequest,
+  RevertCode,
+  type StateReference,
+  TreeLeafReadRequest,
+  TreeSnapshots,
+  countAccumulatedItems,
+  mergeAccumulatedData,
+} from '@aztec/circuits.js';
+import { computeNoteHashNonce, computeUniqueNoteHash, computeVarArgsHash, siloNoteHash } from '@aztec/circuits.js/hash';
+import { padArrayEnd } from '@aztec/foundation/collection';
+import { assertLength } from '@aztec/foundation/serialize';
+
+import { AvmContractCallResult } from '../avm/avm_contract_call_result.js';
+import { type AvmPersistableStateManager } from '../avm/journal/journal.js';
+import { getPublicFunctionDebugName } from '../common/debug_fn_name.js';
+import { type PublicEnqueuedCallSideEffectTrace } from './enqueued_call_side_effect_trace.js';
+import { type EnqueuedPublicCallExecutionResult, type PublicFunctionCallResult } from './execution.js';
+import { createAvmExecutionEnvironment } from './executor.js';
+import { type WorldStateDB } from './public_db_sources.js';
+
+export function generateAvmCircuitPublicInputs(
+  trace: PublicEnqueuedCallSideEffectTrace,
+  globalVariables: GlobalVariables,
+  startStateReference: StateReference,
+  startGasUsed: Gas,
+  gasSettings: GasSettings,
+  setupCallRequests: PublicCallRequest[],
+  appLogicCallRequests: PublicCallRequest[],
+  teardownCallRequests: PublicCallRequest[],
+  nonRevertibleAccumulatedDataFromPrivate: PrivateToPublicAccumulatedData,
+  revertibleAccumulatedDataFromPrivate: PrivateToPublicAccumulatedData,
+  endStateReference: StateReference,
+  endGasUsed: Gas,
+  transactionFee: Fr,
+  revertCode: RevertCode,
+): AvmCircuitPublicInputs {
+  const startTreeSnapshots = new TreeSnapshots(
+    startStateReference.l1ToL2MessageTree,
+    startStateReference.partial.noteHashTree,
+    startStateReference.partial.nullifierTree,
+    startStateReference.partial.publicDataTree,
+  );
+  const endTreeSnapshots = new TreeSnapshots(
+    endStateReference.l1ToL2MessageTree,
+    endStateReference.partial.noteHashTree,
+    endStateReference.partial.nullifierTree,
+    endStateReference.partial.publicDataTree,
+  );
+
+  const avmCircuitPublicInputs = trace.toAvmCircuitPublicInputs(
+    globalVariables,
+    startTreeSnapshots,
+    startGasUsed,
+    gasSettings,
+    setupCallRequests,
+    appLogicCallRequests,
+    teardownCallRequests.length ? teardownCallRequests[0] : PublicCallRequest.empty(),
+    endTreeSnapshots,
+    endGasUsed,
+    transactionFee,
+    !revertCode.isOK(),
+  );
+
+  const getArrayLengths = (from: PrivateToPublicAccumulatedData) =>
+    new PrivateToAvmAccumulatedDataArrayLengths(
+      countAccumulatedItems(from.noteHashes),
+      countAccumulatedItems(from.nullifiers),
+      countAccumulatedItems(from.l2ToL1Msgs),
+    );
+  const convertAccumulatedData = (from: PrivateToPublicAccumulatedData) =>
+    new PrivateToAvmAccumulatedData(from.noteHashes, from.nullifiers, from.l2ToL1Msgs);
+  // Temporary overrides as these entries aren't yet populated in trace
+  avmCircuitPublicInputs.previousNonRevertibleAccumulatedDataArrayLengths = getArrayLengths(
+    nonRevertibleAccumulatedDataFromPrivate,
+  );
+  avmCircuitPublicInputs.previousRevertibleAccumulatedDataArrayLengths = getArrayLengths(
+    revertibleAccumulatedDataFromPrivate,
+  );
+  avmCircuitPublicInputs.previousNonRevertibleAccumulatedData = convertAccumulatedData(
+    nonRevertibleAccumulatedDataFromPrivate,
+  );
+  avmCircuitPublicInputs.previousRevertibleAccumulatedData = convertAccumulatedData(
+    revertibleAccumulatedDataFromPrivate,
+  );
+
+  // merge all revertible & non-revertible side effects into output accumulated data
+  const noteHashesFromPrivate = revertCode.isOK()
+    ? mergeAccumulatedData(
+        avmCircuitPublicInputs.previousNonRevertibleAccumulatedData.noteHashes,
+        avmCircuitPublicInputs.previousRevertibleAccumulatedData.noteHashes,
+      )
+    : avmCircuitPublicInputs.previousNonRevertibleAccumulatedData.noteHashes;
+  avmCircuitPublicInputs.accumulatedData.noteHashes = assertLength(
+    mergeAccumulatedData(noteHashesFromPrivate, avmCircuitPublicInputs.accumulatedData.noteHashes),
+    MAX_NOTE_HASHES_PER_TX,
+  );
+
+  const txHash = avmCircuitPublicInputs.previousNonRevertibleAccumulatedData.nullifiers[0];
+
+  const scopedNoteHashesFromPublic = trace.getSideEffects().noteHashes;
+  for (let i = 0; i < scopedNoteHashesFromPublic.length; i++) {
+    const scopedNoteHash = scopedNoteHashesFromPublic[i];
+    const noteHash = scopedNoteHash.value;
+    if (!noteHash.isZero()) {
+      const noteHashIndexInTx = i + countAccumulatedItems(noteHashesFromPrivate);
+      const nonce = computeNoteHashNonce(txHash, noteHashIndexInTx);
+      const uniqueNoteHash = computeUniqueNoteHash(nonce, noteHash);
+      const siloedNoteHash = siloNoteHash(scopedNoteHash.contractAddress, uniqueNoteHash);
+      avmCircuitPublicInputs.accumulatedData.noteHashes[noteHashIndexInTx] = siloedNoteHash;
+    }
+  }
+
+  const nullifiersFromPrivate = revertCode.isOK()
+    ? mergeAccumulatedData(
+        avmCircuitPublicInputs.previousNonRevertibleAccumulatedData.nullifiers,
+        avmCircuitPublicInputs.previousRevertibleAccumulatedData.nullifiers,
+      )
+    : avmCircuitPublicInputs.previousNonRevertibleAccumulatedData.nullifiers;
+  avmCircuitPublicInputs.accumulatedData.nullifiers = assertLength(
+    mergeAccumulatedData(nullifiersFromPrivate, avmCircuitPublicInputs.accumulatedData.nullifiers),
+    MAX_NULLIFIERS_PER_TX,
+  );
+  const msgsFromPrivate = revertCode.isOK()
+    ? mergeAccumulatedData(
+        avmCircuitPublicInputs.previousNonRevertibleAccumulatedData.l2ToL1Msgs,
+        avmCircuitPublicInputs.previousRevertibleAccumulatedData.l2ToL1Msgs,
+      )
+    : avmCircuitPublicInputs.previousNonRevertibleAccumulatedData.l2ToL1Msgs;
+  avmCircuitPublicInputs.accumulatedData.l2ToL1Msgs = assertLength(
+    mergeAccumulatedData(msgsFromPrivate, avmCircuitPublicInputs.accumulatedData.l2ToL1Msgs),
+    MAX_L2_TO_L1_MSGS_PER_TX,
+  );
+
+  const dedupedPublicDataWrites: Array<PublicDataWrite> = [];
+  const leafSlotOccurences: Map<bigint, number> = new Map();
+  for (const publicDataWrite of avmCircuitPublicInputs.accumulatedData.publicDataWrites) {
+    const slot = publicDataWrite.leafSlot.toBigInt();
+    const prevOccurrences = leafSlotOccurences.get(slot) || 0;
+    leafSlotOccurences.set(slot, prevOccurrences + 1);
+  }
+
+  for (const publicDataWrite of avmCircuitPublicInputs.accumulatedData.publicDataWrites) {
+    const slot = publicDataWrite.leafSlot.toBigInt();
+    const prevOccurrences = leafSlotOccurences.get(slot) || 0;
+    if (prevOccurrences === 1) {
+      dedupedPublicDataWrites.push(publicDataWrite);
+    } else {
+      leafSlotOccurences.set(slot, prevOccurrences - 1);
+    }
+  }
+
+  avmCircuitPublicInputs.accumulatedData.publicDataWrites = padArrayEnd(
+    dedupedPublicDataWrites,
+    PublicDataWrite.empty(),
+    MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
+  );
+  //console.log(`AvmCircuitPublicInputs:\n${inspect(avmCircuitPublicInputs)}`);
+  return avmCircuitPublicInputs;
+}
+
+export async function generateAvmProvingRequest(
+  real: boolean,
+  worldStateDB: WorldStateDB,
+  stateManager: AvmPersistableStateManager,
+  historicalHeader: Header,
+  globalVariables: GlobalVariables,
+  executionRequest: PublicExecutionRequest,
+  result: EnqueuedPublicCallExecutionResult,
+  allocatedGas: Gas,
+  transactionFee: Fr,
+): Promise<AvmProvingRequest> {
+  const fnName = await getPublicFunctionDebugName(
+    worldStateDB,
+    executionRequest.callContext.contractAddress,
+    executionRequest.callContext.functionSelector,
+    executionRequest.args,
+  );
+
+  const avmExecutionEnv = createAvmExecutionEnvironment(executionRequest, globalVariables, transactionFee);
+  const avmCallResult = new AvmContractCallResult(result.reverted, result.returnValues);
+
+  // Generate an AVM proving request
+  let avmProvingRequest: AvmProvingRequest;
+  if (real) {
+    const deprecatedFunctionCallResult = stateManager.trace.toPublicFunctionCallResult(
+      avmExecutionEnv,
+      /*startGasLeft=*/ allocatedGas,
+      /*endGasLeft=*/ Gas.from(result.endGasLeft),
+      Buffer.alloc(0),
+      avmCallResult,
+      fnName,
+    );
+    const publicInputs = getPublicCircuitPublicInputs(historicalHeader, globalVariables, deprecatedFunctionCallResult);
+    avmProvingRequest = makeAvmProvingRequest(publicInputs, deprecatedFunctionCallResult);
+  } else {
+    avmProvingRequest = emptyAvmProvingRequest();
+  }
+  return avmProvingRequest;
+}
+
+function emptyAvmProvingRequest(): AvmProvingRequest {
+  return {
+    type: ProvingRequestType.PUBLIC_VM,
+    inputs: AvmCircuitInputs.empty(),
+  };
+}
+function makeAvmProvingRequest(inputs: PublicCircuitPublicInputs, result: PublicFunctionCallResult): AvmProvingRequest {
+  return {
+    type: ProvingRequestType.PUBLIC_VM,
+    inputs: new AvmCircuitInputs(
+      result.functionName,
+      result.calldata,
+      inputs,
+      result.avmCircuitHints,
+      AvmCircuitPublicInputs.empty(),
+    ),
+  };
+}
+
+function getPublicCircuitPublicInputs(
+  historicalHeader: Header,
+  globalVariables: GlobalVariables,
+  result: PublicFunctionCallResult,
+) {
+  const header = historicalHeader.clone(); // don't modify the original
+  header.state.partial.publicDataTree.root = Fr.zero(); // AVM doesn't check this yet
+
+  return PublicCircuitPublicInputs.from({
+    callContext: result.executionRequest.callContext,
+    proverAddress: AztecAddress.ZERO,
+    argsHash: computeVarArgsHash(result.executionRequest.args),
+    noteHashes: padArrayEnd(
+      result.noteHashes,
+      NoteHash.empty(),
+      MAX_NOTE_HASHES_PER_CALL,
+      `Too many note hashes. Got ${result.noteHashes.length} with max being ${MAX_NOTE_HASHES_PER_CALL}`,
+    ),
+    nullifiers: padArrayEnd(
+      result.nullifiers,
+      Nullifier.empty(),
+      MAX_NULLIFIERS_PER_CALL,
+      `Too many nullifiers. Got ${result.nullifiers.length} with max being ${MAX_NULLIFIERS_PER_CALL}`,
+    ),
+    l2ToL1Msgs: padArrayEnd(
+      result.l2ToL1Messages,
+      L2ToL1Message.empty(),
+      MAX_L2_TO_L1_MSGS_PER_CALL,
+      `Too many L2 to L1 messages. Got ${result.l2ToL1Messages.length} with max being ${MAX_L2_TO_L1_MSGS_PER_CALL}`,
+    ),
+    startSideEffectCounter: result.startSideEffectCounter,
+    endSideEffectCounter: result.endSideEffectCounter,
+    returnsHash: computeVarArgsHash(result.returnValues),
+    noteHashReadRequests: padArrayEnd(
+      result.noteHashReadRequests,
+      TreeLeafReadRequest.empty(),
+      MAX_NOTE_HASH_READ_REQUESTS_PER_CALL,
+      `Too many note hash read requests. Got ${result.noteHashReadRequests.length} with max being ${MAX_NOTE_HASH_READ_REQUESTS_PER_CALL}`,
+    ),
+    nullifierReadRequests: padArrayEnd(
+      result.nullifierReadRequests,
+      ReadRequest.empty(),
+      MAX_NULLIFIER_READ_REQUESTS_PER_CALL,
+      `Too many nullifier read requests. Got ${result.nullifierReadRequests.length} with max being ${MAX_NULLIFIER_READ_REQUESTS_PER_CALL}`,
+    ),
+    nullifierNonExistentReadRequests: padArrayEnd(
+      result.nullifierNonExistentReadRequests,
+      ReadRequest.empty(),
+      MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL,
+      `Too many nullifier non-existent read requests. Got ${result.nullifierNonExistentReadRequests.length} with max being ${MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL}`,
+    ),
+    l1ToL2MsgReadRequests: padArrayEnd(
+      result.l1ToL2MsgReadRequests,
+      TreeLeafReadRequest.empty(),
+      MAX_L1_TO_L2_MSG_READ_REQUESTS_PER_CALL,
+      `Too many L1 to L2 message read requests. Got ${result.l1ToL2MsgReadRequests.length} with max being ${MAX_L1_TO_L2_MSG_READ_REQUESTS_PER_CALL}`,
+    ),
+    contractStorageReads: padArrayEnd(
+      result.contractStorageReads,
+      ContractStorageRead.empty(),
+      MAX_PUBLIC_DATA_READS_PER_CALL,
+      `Too many public data reads. Got ${result.contractStorageReads.length} with max being ${MAX_PUBLIC_DATA_READS_PER_CALL}`,
+    ),
+    contractStorageUpdateRequests: padArrayEnd(
+      result.contractStorageUpdateRequests,
+      ContractStorageUpdateRequest.empty(),
+      MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL,
+      `Too many public data update requests. Got ${result.contractStorageUpdateRequests.length} with max being ${MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL}`,
+    ),
+    publicCallRequests: padArrayEnd(
+      result.publicCallRequests,
+      PublicInnerCallRequest.empty(),
+      MAX_ENQUEUED_CALLS_PER_CALL,
+      `Too many public call requests. Got ${result.publicCallRequests.length} with max being ${MAX_ENQUEUED_CALLS_PER_CALL}`,
+    ),
+    unencryptedLogsHashes: padArrayEnd(
+      result.unencryptedLogsHashes,
+      LogHash.empty(),
+      MAX_UNENCRYPTED_LOGS_PER_CALL,
+      `Too many unencrypted logs. Got ${result.unencryptedLogsHashes.length} with max being ${MAX_UNENCRYPTED_LOGS_PER_CALL}`,
+    ),
+    historicalHeader: header,
+    globalVariables: globalVariables,
+    startGasLeft: Gas.from(result.startGasLeft),
+    endGasLeft: Gas.from(result.endGasLeft),
+    transactionFee: result.transactionFee,
+    // TODO(@just-mitch): need better mapping from simulator to revert code.
+    revertCode: result.reverted ? RevertCode.APP_LOGIC_REVERTED : RevertCode.OK,
+  });
+}

package/src/public/utils.ts

@@ -0,0 +1,32 @@
+import { type PublicExecutionRequest, type Tx, TxExecutionPhase } from '@aztec/circuit-types';
+import { type PublicCallRequest } from '@aztec/circuits.js';
+
+export function getExecutionRequestsByPhase(tx: Tx, phase: TxExecutionPhase): PublicExecutionRequest[] {
+  switch (phase) {
+    case TxExecutionPhase.SETUP:
+      return tx.getNonRevertiblePublicExecutionRequests();
+    case TxExecutionPhase.APP_LOGIC:
+      return tx.getRevertiblePublicExecutionRequests();
+    case TxExecutionPhase.TEARDOWN: {
+      const request = tx.getPublicTeardownExecutionRequest();
+      return request ? [request] : [];
+    }
+    default:
+      throw new Error(`Unknown phase: ${phase}`);
+  }
+}
+
+export function getCallRequestsByPhase(tx: Tx, phase: TxExecutionPhase): PublicCallRequest[] {
+  switch (phase) {
+    case TxExecutionPhase.SETUP:
+      return tx.data.getNonRevertiblePublicCallRequests();
+    case TxExecutionPhase.APP_LOGIC:
+      return tx.data.getRevertiblePublicCallRequests();
+    case TxExecutionPhase.TEARDOWN: {
+      const request = tx.data.getTeardownPublicCallRequest();
+      return request ? [request] : [];
+    }
+    default:
+      throw new Error(`Unknown phase: ${phase}`);
+  }
+}

package/src/test/utils.ts

@@ -1,5 +1,5 @@
 import { L1Actor, L1ToL2Message, L2Actor } from '@aztec/circuit-types';
-import { type AztecAddress, EthAddress, type Fr } from '@aztec/circuits.js';
+import { type AztecAddress, EthAddress, Fr } from '@aztec/circuits.js';
 import { computeSecretHash } from '@aztec/circuits.js/hash';
 import { sha256ToField } from '@aztec/foundation/crypto';
 
@@ -16,6 +16,7 @@ export const buildL1ToL2Message = (
   contentPreimage: Fr[],
   targetContract: AztecAddress,
   secret: Fr,
+  msgIndex: Fr | number,
 ) => {
   // Write the selector into a buffer.
   const selectorBuf = Buffer.from(selector, 'hex');
@@ -23,5 +24,11 @@ export const buildL1ToL2Message = (
   const content = sha256ToField([selectorBuf, ...contentPreimage]);
   const secretHash = computeSecretHash(secret);
 
-  return new L1ToL2Message(new L1Actor(EthAddress.random(), 1), new L2Actor(targetContract, 1), content, secretHash);
+  return new L1ToL2Message(
+    new L1Actor(EthAddress.random(), 1),
+    new L2Actor(targetContract, 1),
+    content,
+    secretHash,
+    new Fr(msgIndex),
+  );
 };

package/dest/public/enqueued_call_simulator.d.ts

@@ -1,43 +0,0 @@
-import { type AvmProvingRequest, NestedProcessReturnValues, type PublicExecutionRequest, PublicKernelPhase, type SimulationError, type Tx, UnencryptedFunctionL2Logs } from '@aztec/circuit-types';
-import { Fr, Gas, type GlobalVariables, type Header, type PublicCallRequest, type PublicKernelCircuitPublicInputs, VMCircuitPublicInputs } from '@aztec/circuits.js';
-import { type MerkleTreeReadOperations } from '@aztec/world-state';
-import { type PublicExecutor } from './executor.js';
-import { type PublicKernelCircuitSimulator } from './public_kernel_circuit_simulator.js';
-export type EnqueuedCallResult = {
-    /** Inputs to be used for proving */
-    avmProvingRequest: AvmProvingRequest;
-    /** The public kernel output at the end of the enqueued call */
-    kernelOutput: VMCircuitPublicInputs;
-    /** Unencrypted logs generated during the execution of this enqueued call */
-    newUnencryptedLogs: UnencryptedFunctionL2Logs;
-    /** Return values of simulating complete callstack */
-    returnValues: NestedProcessReturnValues;
-    /** Gas used during the execution this enqueued call */
-    gasUsed: Gas;
-    /** Revert reason, if any */
-    revertReason?: SimulationError;
-};
-export declare class EnqueuedCallSimulator {
-    private db;
-    private publicExecutor;
-    private publicKernelSimulator;
-    private globalVariables;
-    private historicalHeader;
-    private log;
-    constructor(db: MerkleTreeReadOperations, publicExecutor: PublicExecutor, publicKernelSimulator: PublicKernelCircuitSimulator, globalVariables: GlobalVariables, historicalHeader: Header);
-    simulate(callRequest: PublicCallRequest, executionRequest: PublicExecutionRequest, tx: Tx, previousPublicKernelOutput: PublicKernelCircuitPublicInputs, availableGas: Gas, transactionFee: Fr, phase: PublicKernelPhase): Promise<EnqueuedCallResult>;
-    private combineNestedExecutionResults;
-    /** Returns all pending private and public nullifiers. */
-    private getSiloedPendingNullifiers;
-    private runKernelCircuit;
-    /**
-     * Calculates the PublicCircuitOutput for this execution result along with its proof,
-     * and assembles a PublicCallData object from it.
-     * @param result - The execution result.
-     * @returns A corresponding PublicCallData object.
-     */
-    private getPublicCallData;
-    private getPublicCircuitPublicInputs;
-    private getBytecodeHash;
-}
-//# sourceMappingURL=enqueued_call_simulator.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"enqueued_call_simulator.d.ts","sourceRoot":"","sources":["../../src/public/enqueued_call_simulator.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,iBAAiB,EAEtB,yBAAyB,EAEzB,KAAK,sBAAsB,EAC3B,iBAAiB,EACjB,KAAK,eAAe,EACpB,KAAK,EAAE,EACP,yBAAyB,EAC1B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAKL,EAAE,EACF,GAAG,EACH,KAAK,eAAe,EACpB,KAAK,MAAM,EAsBX,KAAK,iBAAiB,EAGtB,KAAK,+BAA+B,EAQpC,qBAAqB,EAItB,MAAM,oBAAoB,CAAC;AAK5B,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AAGnE,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,KAAK,4BAA4B,EAAE,MAAM,sCAAsC,CAAC;AASzF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,oCAAoC;IACpC,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,+DAA+D;IAC/D,YAAY,EAAE,qBAAqB,CAAC;IACpC,4EAA4E;IAC5E,kBAAkB,EAAE,yBAAyB,CAAC;IAC9C,qDAAqD;IACrD,YAAY,EAAE,yBAAyB,CAAC;IACxC,uDAAuD;IACvD,OAAO,EAAE,GAAG,CAAC;IACb,4BAA4B;IAC5B,YAAY,CAAC,EAAE,eAAe,CAAC;CAChC,CAAC;AAEF,qBAAa,qBAAqB;IAG9B,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,qBAAqB;IAC7B,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,gBAAgB;IAN1B,OAAO,CAAC,GAAG,CAAc;gBAEf,EAAE,EAAE,wBAAwB,EAC5B,cAAc,EAAE,cAAc,EAC9B,qBAAqB,EAAE,4BAA4B,EACnD,eAAe,EAAE,eAAe,EAChC,gBAAgB,EAAE,MAAM;IAK5B,QAAQ,CACZ,WAAW,EAAE,iBAAiB,EAC9B,gBAAgB,EAAE,sBAAsB,EACxC,EAAE,EAAE,EAAE,EACN,0BAA0B,EAAE,+BAA+B,EAC3D,YAAY,EAAE,GAAG,EACjB,cAAc,EAAE,EAAE,EAClB,KAAK,EAAE,iBAAiB,GACvB,OAAO,CAAC,kBAAkB,CAAC;YA8DhB,6BAA6B;IAkE3C,yDAAyD;IACzD,OAAO,CAAC,0BAA0B;YAIpB,gBAAgB;IAY9B;;;;;OAKG;YACW,iBAAiB;YAMjB,4BAA4B;IAuF1C,OAAO,CAAC,eAAe;CAMxB"}

package/dest/public/enqueued_call_simulator.js

@@ -1,156 +0,0 @@
-import { MerkleTreeId, NestedProcessReturnValues, ProvingRequestType, PublicKernelPhase, UnencryptedFunctionL2Logs, } from '@aztec/circuit-types';
-import { AvmCircuitInputs, AztecAddress, ContractStorageRead, ContractStorageUpdateRequest, Fr, Gas, L2ToL1Message, LogHash, MAX_L1_TO_L2_MSG_READ_REQUESTS_PER_CALL, MAX_L2_GAS_PER_ENQUEUED_CALL, MAX_L2_TO_L1_MSGS_PER_CALL, MAX_NOTE_HASHES_PER_CALL, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, MAX_NULLIFIERS_PER_CALL, MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL, MAX_NULLIFIER_READ_REQUESTS_PER_CALL, MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL, MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX, MAX_PUBLIC_DATA_READS_PER_CALL, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL, MAX_UNENCRYPTED_LOGS_PER_CALL, NESTED_RECURSIVE_PROOF_LENGTH, NoteHash, Nullifier, PublicAccumulatedData, PublicAccumulatedDataArrayLengths, PublicCallData, PublicCircuitPublicInputs, PublicInnerCallRequest, PublicKernelInnerCircuitPrivateInputs, PublicKernelInnerData, PublicValidationRequestArrayLengths, PublicValidationRequests, ReadRequest, RevertCode, TreeLeafReadRequest, VMCircuitPublicInputs, VerificationKeyData, makeEmptyProof, makeEmptyRecursiveProof, } from '@aztec/circuits.js';
-import { computeVarArgsHash } from '@aztec/circuits.js/hash';
-import { makeTuple } from '@aztec/foundation/array';
-import { padArrayEnd } from '@aztec/foundation/collection';
-import { createDebugLogger } from '@aztec/foundation/log';
-import { accumulatePublicReturnValues, collectExecutionResults } from './execution.js';
-function makeAvmProvingRequest(inputs, result) {
-    return {
-        type: ProvingRequestType.PUBLIC_VM,
-        inputs: new AvmCircuitInputs(result.functionName, result.calldata, inputs, result.avmCircuitHints),
-    };
-}
-export class EnqueuedCallSimulator {
-    constructor(db, publicExecutor, publicKernelSimulator, globalVariables, historicalHeader) {
-        this.db = db;
-        this.publicExecutor = publicExecutor;
-        this.publicKernelSimulator = publicKernelSimulator;
-        this.globalVariables = globalVariables;
-        this.historicalHeader = historicalHeader;
-        this.log = createDebugLogger(`aztec:sequencer`);
-    }
-    async simulate(callRequest, executionRequest, tx, previousPublicKernelOutput, availableGas, transactionFee, phase) {
-        // Gas allocated to an enqueued call can be different from the available gas
-        // if there is more gas available than the max allocation per enqueued call.
-        const allocatedGas = new Gas(
-        /*daGas=*/ availableGas.daGas, 
-        /*l2Gas=*/ Math.min(availableGas.l2Gas, MAX_L2_GAS_PER_ENQUEUED_CALL));
-        const pendingNullifiers = this.getSiloedPendingNullifiers(previousPublicKernelOutput);
-        const startSideEffectCounter = previousPublicKernelOutput.endSideEffectCounter + 1;
-        const prevAccumulatedData = phase === PublicKernelPhase.SETUP
-            ? previousPublicKernelOutput.endNonRevertibleData
-            : previousPublicKernelOutput.end;
-        const previousValidationRequestArrayLengths = PublicValidationRequestArrayLengths.new(previousPublicKernelOutput.validationRequests);
-        const previousAccumulatedDataArrayLengths = PublicAccumulatedDataArrayLengths.new(prevAccumulatedData);
-        // If this is the first enqueued call in public, constants will be empty
-        // because private kernel does not expose them.
-        const constants = previousPublicKernelOutput.constants.clone();
-        constants.globalVariables = this.globalVariables;
-        const result = await this.publicExecutor.simulate(executionRequest, constants, allocatedGas, tx.data.constants.txContext, pendingNullifiers, transactionFee, startSideEffectCounter, previousValidationRequestArrayLengths, previousAccumulatedDataArrayLengths);
-        const callStack = makeTuple(MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX, PublicInnerCallRequest.empty);
-        callStack[0].item.contractAddress = callRequest.callContext.contractAddress;
-        callStack[0].item.callContext = callRequest.callContext;
-        callStack[0].item.argsHash = callRequest.argsHash;
-        const accumulatedData = PublicAccumulatedData.empty();
-        accumulatedData.publicCallStack[0] = callRequest;
-        const startVMCircuitOutput = new VMCircuitPublicInputs(previousPublicKernelOutput.constants, callRequest, callStack, previousValidationRequestArrayLengths, PublicValidationRequests.empty(), previousAccumulatedDataArrayLengths, accumulatedData, startSideEffectCounter, startSideEffectCounter, allocatedGas, result.transactionFee, result.reverted);
-        return await this.combineNestedExecutionResults(result, startVMCircuitOutput);
-    }
-    async combineNestedExecutionResults(topResult, startVMCircuitOutput) {
-        const executionResults = collectExecutionResults(topResult);
-        let avmProvingRequest;
-        let gasUsed = Gas.empty();
-        let revertReason;
-        let kernelOutput = startVMCircuitOutput;
-        for (const result of executionResults) {
-            // Accumulate gas used in this enqueued call.
-            gasUsed = gasUsed.add(Gas.from(result.startGasLeft).sub(Gas.from(result.endGasLeft)));
-            const { contractAddress, functionSelector } = result.executionRequest.callContext;
-            // Sanity check for a current upstream assumption.
-            // Consumers of the result seem to expect "reverted <=> revertReason !== undefined".
-            if (result.reverted && !result.revertReason) {
-                throw new Error(`Simulation of ${contractAddress}:${functionSelector}(${result.functionName}) reverted with no reason.`);
-            }
-            // Simulate the public kernel circuit.
-            this.log.debug(`Running public kernel inner circuit for ${contractAddress}:${functionSelector}(${result.functionName})`);
-            const callData = await this.getPublicCallData(result);
-            const { inputs, output } = await this.runKernelCircuit(kernelOutput, callData);
-            kernelOutput = output;
-            // Capture the inputs for later proving in the AVM and kernel.
-            avmProvingRequest = makeAvmProvingRequest(inputs.publicCall.publicInputs, result);
-            // Safely return the revert reason and the kernel output (which has had its revertible side effects dropped)
-            // TODO(@leila) we shouldn't drop everything when it reverts. The tail kernel needs the data to prove that it's reverted for the correct reason.
-            if (result.reverted) {
-                this.log.debug(`Reverting on ${contractAddress}:${functionSelector}(${result.functionName}) with reason: ${result.revertReason}`);
-                // TODO(@spalladino): Check gasUsed is correct. The AVM should take care of setting gasLeft to zero upon a revert.
-                return {
-                    avmProvingRequest,
-                    kernelOutput,
-                    newUnencryptedLogs: UnencryptedFunctionL2Logs.empty(),
-                    returnValues: NestedProcessReturnValues.empty(),
-                    gasUsed,
-                    revertReason: result.revertReason,
-                };
-            }
-        }
-        return {
-            avmProvingRequest: avmProvingRequest,
-            kernelOutput,
-            newUnencryptedLogs: topResult.allUnencryptedLogs,
-            returnValues: accumulatePublicReturnValues(topResult),
-            gasUsed,
-            revertReason,
-        };
-    }
-    /** Returns all pending private and public nullifiers. */
-    getSiloedPendingNullifiers(ko) {
-        return [...ko.end.nullifiers, ...ko.endNonRevertibleData.nullifiers].filter(n => !n.isEmpty());
-    }
-    async runKernelCircuit(previousOutput, callData) {
-        // The proof is not used in simulation
-        const proof = makeEmptyRecursiveProof(NESTED_RECURSIVE_PROOF_LENGTH);
-        const vk = VerificationKeyData.makeFakeHonk();
-        const previousKernel = new PublicKernelInnerData(previousOutput, proof, vk);
-        const inputs = new PublicKernelInnerCircuitPrivateInputs(previousKernel, callData);
-        return { inputs, output: await this.publicKernelSimulator.publicKernelCircuitInner(inputs) };
-    }
-    /**
-     * Calculates the PublicCircuitOutput for this execution result along with its proof,
-     * and assembles a PublicCallData object from it.
-     * @param result - The execution result.
-     * @returns A corresponding PublicCallData object.
-     */
-    async getPublicCallData(result) {
-        const bytecodeHash = await this.getBytecodeHash(result);
-        const publicInputs = await this.getPublicCircuitPublicInputs(result);
-        return new PublicCallData(publicInputs, makeEmptyProof(), bytecodeHash);
-    }
-    async getPublicCircuitPublicInputs(result) {
-        const publicDataTreeInfo = await this.db.getTreeInfo(MerkleTreeId.PUBLIC_DATA_TREE);
-        this.historicalHeader.state.partial.publicDataTree.root = Fr.fromBuffer(publicDataTreeInfo.root);
-        return PublicCircuitPublicInputs.from({
-            callContext: result.executionRequest.callContext,
-            proverAddress: AztecAddress.ZERO,
-            argsHash: computeVarArgsHash(result.executionRequest.args),
-            noteHashes: padArrayEnd(result.noteHashes, NoteHash.empty(), MAX_NOTE_HASHES_PER_CALL, `Too many note hashes. Got ${result.noteHashes.length} with max being ${MAX_NOTE_HASHES_PER_CALL}`),
-            nullifiers: padArrayEnd(result.nullifiers, Nullifier.empty(), MAX_NULLIFIERS_PER_CALL, `Too many nullifiers. Got ${result.nullifiers.length} with max being ${MAX_NULLIFIERS_PER_CALL}`),
-            l2ToL1Msgs: padArrayEnd(result.l2ToL1Messages, L2ToL1Message.empty(), MAX_L2_TO_L1_MSGS_PER_CALL, `Too many L2 to L1 messages. Got ${result.l2ToL1Messages.length} with max being ${MAX_L2_TO_L1_MSGS_PER_CALL}`),
-            startSideEffectCounter: result.startSideEffectCounter,
-            endSideEffectCounter: result.endSideEffectCounter,
-            returnsHash: computeVarArgsHash(result.returnValues),
-            noteHashReadRequests: padArrayEnd(result.noteHashReadRequests, TreeLeafReadRequest.empty(), MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, `Too many note hash read requests. Got ${result.noteHashReadRequests.length} with max being ${MAX_NOTE_HASH_READ_REQUESTS_PER_CALL}`),
-            nullifierReadRequests: padArrayEnd(result.nullifierReadRequests, ReadRequest.empty(), MAX_NULLIFIER_READ_REQUESTS_PER_CALL, `Too many nullifier read requests. Got ${result.nullifierReadRequests.length} with max being ${MAX_NULLIFIER_READ_REQUESTS_PER_CALL}`),
-            nullifierNonExistentReadRequests: padArrayEnd(result.nullifierNonExistentReadRequests, ReadRequest.empty(), MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL, `Too many nullifier non-existent read requests. Got ${result.nullifierNonExistentReadRequests.length} with max being ${MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL}`),
-            l1ToL2MsgReadRequests: padArrayEnd(result.l1ToL2MsgReadRequests, TreeLeafReadRequest.empty(), MAX_L1_TO_L2_MSG_READ_REQUESTS_PER_CALL, `Too many L1 to L2 message read requests. Got ${result.l1ToL2MsgReadRequests.length} with max being ${MAX_L1_TO_L2_MSG_READ_REQUESTS_PER_CALL}`),
-            contractStorageReads: padArrayEnd(result.contractStorageReads, ContractStorageRead.empty(), MAX_PUBLIC_DATA_READS_PER_CALL, `Too many public data reads. Got ${result.contractStorageReads.length} with max being ${MAX_PUBLIC_DATA_READS_PER_CALL}`),
-            contractStorageUpdateRequests: padArrayEnd(result.contractStorageUpdateRequests, ContractStorageUpdateRequest.empty(), MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL, `Too many public data update requests. Got ${result.contractStorageUpdateRequests.length} with max being ${MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL}`),
-            publicCallRequests: padArrayEnd(result.publicCallRequests, PublicInnerCallRequest.empty(), MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL, `Too many public call requests. Got ${result.publicCallRequests.length} with max being ${MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL}`),
-            unencryptedLogsHashes: padArrayEnd(result.unencryptedLogsHashes, LogHash.empty(), MAX_UNENCRYPTED_LOGS_PER_CALL, `Too many unencrypted logs. Got ${result.unencryptedLogsHashes.length} with max being ${MAX_UNENCRYPTED_LOGS_PER_CALL}`),
-            historicalHeader: this.historicalHeader,
-            globalVariables: this.globalVariables,
-            startGasLeft: Gas.from(result.startGasLeft),
-            endGasLeft: Gas.from(result.endGasLeft),
-            transactionFee: result.transactionFee,
-            // TODO(@just-mitch): need better mapping from simulator to revert code.
-            revertCode: result.reverted ? RevertCode.APP_LOGIC_REVERTED : RevertCode.OK,
-        });
-    }
-    getBytecodeHash(_result) {
-        // TODO: Determine how to calculate bytecode hash. Circuits just check it isn't zero for now.
-        // See https://github.com/AztecProtocol/aztec3-packages/issues/378
-        const bytecodeHash = new Fr(1n);
-        return Promise.resolve(bytecodeHash);
-    }
-}
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"enqueued_call_simulator.js","sourceRoot":"","sources":["../../src/public/enqueued_call_simulator.ts"],"names":[],"mappings":"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"}