@aztec/simulator 0.42.0 → 0.44.0

package/src/avm/journal/trace.ts

@@ -1,184 +0,0 @@
-import { AvmExecutionHints, AvmHint, Vector } from '@aztec/circuits.js';
-import { Fr } from '@aztec/foundation/fields';
-
-import {
-  type TracedL1toL2MessageCheck,
-  type TracedNoteHash,
-  type TracedNoteHashCheck,
-  type TracedNullifier,
-  type TracedNullifierCheck,
-  type TracedPublicStorageRead,
-  type TracedPublicStorageWrite,
-  type TracedUnencryptedL2Log,
-} from './trace_types.js';
-
-export class WorldStateAccessTrace {
-  public accessCounter: number;
-
-  public publicStorageReads: TracedPublicStorageRead[] = [];
-  public publicStorageWrites: TracedPublicStorageWrite[] = [];
-
-  public noteHashChecks: TracedNoteHashCheck[] = [];
-  public newNoteHashes: TracedNoteHash[] = [];
-  public nullifierChecks: TracedNullifierCheck[] = [];
-  public newNullifiers: TracedNullifier[] = [];
-  public l1ToL2MessageChecks: TracedL1toL2MessageCheck[] = [];
-  public newLogsHashes: TracedUnencryptedL2Log[] = [];
-
-  //public contractCalls: TracedContractCall[] = [];
-  //public archiveChecks: TracedArchiveLeafCheck[] = [];
-
-  constructor(parentTrace?: WorldStateAccessTrace) {
-    this.accessCounter = parentTrace ? parentTrace.accessCounter : 0;
-    // TODO(4805): consider tracking the parent's trace vector lengths so we can enforce limits
-  }
-
-  public getAccessCounter() {
-    return this.accessCounter;
-  }
-
-  public tracePublicStorageRead(storageAddress: Fr, slot: Fr, value: Fr, exists: boolean, cached: boolean) {
-    // TODO(4805): check if some threshold is reached for max storage reads
-    // (need access to parent length, or trace needs to be initialized with parent's contents)
-    const traced: TracedPublicStorageRead = {
-      //  callPointer: Fr.ZERO,
-      storageAddress,
-      slot,
-      value,
-      exists,
-      cached,
-      counter: new Fr(this.accessCounter),
-      //  endLifetime: Fr.ZERO,
-    };
-    this.publicStorageReads.push(traced);
-    this.incrementAccessCounter();
-  }
-
-  public tracePublicStorageWrite(storageAddress: Fr, slot: Fr, value: Fr) {
-    // TODO(4805): check if some threshold is reached for max storage writes
-    // (need access to parent length, or trace needs to be initialized with parent's contents)
-    const traced: TracedPublicStorageWrite = {
-      //  callPointer: Fr.ZERO,
-      storageAddress,
-      slot,
-      value,
-      counter: new Fr(this.accessCounter),
-      //  endLifetime: Fr.ZERO,
-    };
-    this.publicStorageWrites.push(traced);
-    this.incrementAccessCounter();
-  }
-
-  public traceNoteHashCheck(storageAddress: Fr, noteHash: Fr, exists: boolean, leafIndex: Fr) {
-    const traced: TracedNoteHashCheck = {
-      // callPointer: Fr.ZERO,
-      storageAddress,
-      noteHash,
-      exists,
-      counter: new Fr(this.accessCounter),
-      // endLifetime: Fr.ZERO,
-      leafIndex,
-    };
-    this.noteHashChecks.push(traced);
-    this.incrementAccessCounter();
-  }
-
-  public traceNewNoteHash(storageAddress: Fr, noteHash: Fr) {
-    // TODO(4805): check if some threshold is reached for max new note hash
-    const traced: TracedNoteHash = {
-      //  callPointer: Fr.ZERO,
-      storageAddress,
-      noteHash,
-      counter: new Fr(this.accessCounter),
-      //  endLifetime: Fr.ZERO,
-    };
-    this.newNoteHashes.push(traced);
-    this.incrementAccessCounter();
-  }
-
-  public traceNullifierCheck(storageAddress: Fr, nullifier: Fr, exists: boolean, isPending: boolean, leafIndex: Fr) {
-    // TODO(4805): check if some threshold is reached for max new nullifier
-    const traced: TracedNullifierCheck = {
-      // callPointer: Fr.ZERO,
-      storageAddress,
-      nullifier,
-      exists,
-      counter: new Fr(this.accessCounter),
-      // endLifetime: Fr.ZERO,
-      isPending,
-      leafIndex,
-    };
-    this.nullifierChecks.push(traced);
-    this.incrementAccessCounter();
-  }
-
-  public traceNewNullifier(storageAddress: Fr, nullifier: Fr) {
-    // TODO(4805): check if some threshold is reached for max new nullifier
-    const tracedNullifier: TracedNullifier = {
-      // callPointer: Fr.ZERO,
-      storageAddress,
-      nullifier,
-      counter: new Fr(this.accessCounter),
-      // endLifetime: Fr.ZERO,
-    };
-    this.newNullifiers.push(tracedNullifier);
-    this.incrementAccessCounter();
-  }
-
-  public traceL1ToL2MessageCheck(msgHash: Fr, msgLeafIndex: Fr, exists: boolean) {
-    // TODO(4805): check if some threshold is reached for max message reads
-    const traced: TracedL1toL2MessageCheck = {
-      //callPointer: Fr.ZERO, // FIXME
-      leafIndex: msgLeafIndex,
-      msgHash: msgHash,
-      exists: exists,
-      counter: new Fr(this.accessCounter),
-      //endLifetime: Fr.ZERO, // FIXME
-    };
-    this.l1ToL2MessageChecks.push(traced);
-    this.incrementAccessCounter();
-  }
-
-  public traceNewLog(logHash: Fr) {
-    const traced: TracedUnencryptedL2Log = {
-      logHash,
-      counter: new Fr(this.accessCounter),
-    };
-    this.newLogsHashes.push(traced);
-    this.incrementAccessCounter();
-  }
-
-  private incrementAccessCounter() {
-    this.accessCounter++;
-  }
-
-  /**
-   * Merges another trace into this one
-   *
-   * @param incomingTrace - the incoming trace to merge into this instance
-   */
-  public acceptAndMerge(incomingTrace: WorldStateAccessTrace) {
-    // Merge storage read and write journals
-    this.publicStorageReads.push(...incomingTrace.publicStorageReads);
-    this.publicStorageWrites.push(...incomingTrace.publicStorageWrites);
-    // Merge new note hashes and nullifiers
-    this.noteHashChecks.push(...incomingTrace.noteHashChecks);
-    this.newNoteHashes.push(...incomingTrace.newNoteHashes);
-    this.nullifierChecks.push(...incomingTrace.nullifierChecks);
-    this.newNullifiers.push(...incomingTrace.newNullifiers);
-    this.l1ToL2MessageChecks.push(...incomingTrace.l1ToL2MessageChecks);
-    this.newLogsHashes.push(...incomingTrace.newLogsHashes);
-    // it is assumed that the incoming trace was initialized with this as parent, so accept counter
-    this.accessCounter = incomingTrace.accessCounter;
-  }
-
-  // TODO(dbanks12): should only return hints for one call.... shouldn't include nested calls (merged in traces)
-  public toHints(): AvmExecutionHints {
-    return new AvmExecutionHints(
-      new Vector(this.publicStorageReads.map(read => new AvmHint(read.counter, read.value))),
-      new Vector(this.noteHashChecks.map(check => new AvmHint(check.counter, new Fr(check.exists ? 1 : 0)))),
-      new Vector(this.nullifierChecks.map(check => new AvmHint(check.counter, new Fr(check.exists ? 1 : 0)))),
-      new Vector(this.l1ToL2MessageChecks.map(check => new AvmHint(check.counter, new Fr(check.exists ? 1 : 0)))),
-    );
-  }
-}

package/src/avm/journal/trace_types.ts

@@ -1,88 +0,0 @@
-import { type Fr } from '@aztec/foundation/fields';
-
-//export type TracedContractCall = {
-//  callPointer: Fr;
-//  address: Fr;
-//  storageAddress: Fr;
-//  endLifetime: Fr;
-//};
-
-export type TracedPublicStorageRead = {
-  //  callPointer: Fr;
-  storageAddress: Fr;
-  exists: boolean;
-  cached: boolean;
-  slot: Fr;
-  value: Fr;
-  counter: Fr;
-  //  endLifetime: Fr;
-};
-
-export type TracedPublicStorageWrite = {
-  //  callPointer: Fr;
-  storageAddress: Fr;
-  slot: Fr;
-  value: Fr;
-  counter: Fr;
-  //  endLifetime: Fr;
-};
-
-export type TracedNoteHashCheck = {
-  // callPointer: Fr;
-  storageAddress: Fr;
-  leafIndex: Fr;
-  noteHash: Fr;
-  exists: boolean;
-  counter: Fr;
-  // endLifetime: Fr;
-};
-
-export type TracedNoteHash = {
-  //  callPointer: Fr;
-  storageAddress: Fr;
-  noteHash: Fr;
-  counter: Fr;
-  //  endLifetime: Fr;
-};
-
-export type TracedNullifierCheck = {
-  // callPointer: Fr;
-  storageAddress: Fr;
-  nullifier: Fr;
-  exists: boolean;
-  counter: Fr;
-  // endLifetime: Fr;
-  // the fields below are relevant only to the public kernel
-  // and are therefore omitted from VM inputs
-  isPending: boolean;
-  leafIndex: Fr;
-};
-
-export type TracedNullifier = {
-  // callPointer: Fr;
-  storageAddress: Fr;
-  nullifier: Fr;
-  counter: Fr;
-  // endLifetime: Fr;
-};
-
-export type TracedL1toL2MessageCheck = {
-  //callPointer: Fr;
-  leafIndex: Fr;
-  msgHash: Fr;
-  exists: boolean;
-  counter: Fr;
-  //endLifetime: Fr;
-};
-
-export type TracedUnencryptedL2Log = {
-  //callPointer: Fr;
-  logHash: Fr;
-  counter: Fr;
-  //endLifetime: Fr;
-};
-
-//export type TracedArchiveLeafCheck = {
-//  leafIndex: Fr;
-//  leaf: Fr;
-//};

package/src/public/utils.ts

@@ -1,39 +0,0 @@
-import { type PublicKernelCircuitPublicInputs } from '@aztec/circuits.js';
-
-/**
- * Looks at the side effects of a transaction and returns the highest counter
- * @param tx - A transaction
- * @returns The highest side effect counter in the transaction so far
- */
-export function lastSideEffectCounter(inputs: PublicKernelCircuitPublicInputs): number {
-  const sideEffectCounters = [
-    ...inputs.endNonRevertibleData.newNoteHashes,
-    ...inputs.endNonRevertibleData.newNullifiers,
-    ...inputs.endNonRevertibleData.noteEncryptedLogsHashes,
-    ...inputs.endNonRevertibleData.encryptedLogsHashes,
-    ...inputs.endNonRevertibleData.unencryptedLogsHashes,
-    ...inputs.endNonRevertibleData.publicCallStack,
-    ...inputs.endNonRevertibleData.publicDataUpdateRequests,
-    ...inputs.end.newNoteHashes,
-    ...inputs.end.newNullifiers,
-    ...inputs.end.noteEncryptedLogsHashes,
-    ...inputs.end.encryptedLogsHashes,
-    ...inputs.end.unencryptedLogsHashes,
-    ...inputs.end.publicCallStack,
-    ...inputs.end.publicDataUpdateRequests,
-  ];
-
-  let max = 0;
-  for (const sideEffect of sideEffectCounters) {
-    if ('startSideEffectCounter' in sideEffect) {
-      // look at both start and end counters because for enqueued public calls start > 0 while end === 0
-      max = Math.max(max, sideEffect.startSideEffectCounter.toNumber(), sideEffect.endSideEffectCounter.toNumber());
-    } else if ('counter' in sideEffect) {
-      max = Math.max(max, sideEffect.counter);
-    } else {
-      throw new Error('Unknown side effect type');
-    }
-  }
-
-  return max;
-}