@aztec/simulator 0.43.0 → 0.44.0

package/dest/avm/journal/trace.js

@@ -1,152 +0,0 @@
-import { Fr } from '@aztec/foundation/fields';
-export class WorldStateAccessTrace {
-    //public contractCalls: TracedContractCall[] = [];
-    //public archiveChecks: TracedArchiveLeafCheck[] = [];
-    constructor(parentTrace) {
-        this.publicStorageReads = [];
-        this.publicStorageWrites = [];
-        this.noteHashChecks = [];
-        this.newNoteHashes = [];
-        this.nullifierChecks = [];
-        this.newNullifiers = [];
-        this.l1ToL2MessageChecks = [];
-        this.newLogsHashes = [];
-        this.gotContractInstances = [];
-        this.accessCounter = parentTrace ? parentTrace.accessCounter : 0;
-        // TODO(4805): consider tracking the parent's trace vector lengths so we can enforce limits
-    }
-    getAccessCounter() {
-        return this.accessCounter;
-    }
-    tracePublicStorageRead(storageAddress, slot, value, exists, cached) {
-        // 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 = {
-            //  callPointer: Fr.ZERO,
-            storageAddress,
-            slot,
-            value,
-            exists,
-            cached,
-            counter: new Fr(this.accessCounter),
-            //  endLifetime: Fr.ZERO,
-        };
-        this.publicStorageReads.push(traced);
-        this.incrementAccessCounter();
-    }
-    tracePublicStorageWrite(storageAddress, slot, value) {
-        // 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 = {
-            //  callPointer: Fr.ZERO,
-            storageAddress,
-            slot,
-            value,
-            counter: new Fr(this.accessCounter),
-            //  endLifetime: Fr.ZERO,
-        };
-        this.publicStorageWrites.push(traced);
-        this.incrementAccessCounter();
-    }
-    traceNoteHashCheck(storageAddress, noteHash, exists, leafIndex) {
-        const traced = {
-            // callPointer: Fr.ZERO,
-            storageAddress,
-            noteHash,
-            exists,
-            counter: new Fr(this.accessCounter),
-            // endLifetime: Fr.ZERO,
-            leafIndex,
-        };
-        this.noteHashChecks.push(traced);
-        this.incrementAccessCounter();
-    }
-    traceNewNoteHash(storageAddress, noteHash) {
-        // TODO(4805): check if some threshold is reached for max new note hash
-        const traced = {
-            //  callPointer: Fr.ZERO,
-            storageAddress,
-            noteHash,
-            counter: new Fr(this.accessCounter),
-            //  endLifetime: Fr.ZERO,
-        };
-        this.newNoteHashes.push(traced);
-        this.incrementAccessCounter();
-    }
-    traceNullifierCheck(storageAddress, nullifier, exists, isPending, leafIndex) {
-        // TODO(4805): check if some threshold is reached for max new nullifier
-        const traced = {
-            // callPointer: Fr.ZERO,
-            storageAddress,
-            nullifier,
-            exists,
-            counter: new Fr(this.accessCounter),
-            // endLifetime: Fr.ZERO,
-            isPending,
-            leafIndex,
-        };
-        this.nullifierChecks.push(traced);
-        this.incrementAccessCounter();
-    }
-    traceNewNullifier(storageAddress, nullifier) {
-        // TODO(4805): check if some threshold is reached for max new nullifier
-        const tracedNullifier = {
-            // callPointer: Fr.ZERO,
-            storageAddress,
-            nullifier,
-            counter: new Fr(this.accessCounter),
-            // endLifetime: Fr.ZERO,
-        };
-        this.newNullifiers.push(tracedNullifier);
-        this.incrementAccessCounter();
-    }
-    traceL1ToL2MessageCheck(msgHash, msgLeafIndex, exists) {
-        // TODO(4805): check if some threshold is reached for max message reads
-        const traced = {
-            //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();
-    }
-    traceNewLog(logHash) {
-        const traced = {
-            logHash,
-            counter: new Fr(this.accessCounter),
-        };
-        this.newLogsHashes.push(traced);
-        this.incrementAccessCounter();
-    }
-    traceGetContractInstance(instance) {
-        this.gotContractInstances.push(instance);
-        this.incrementAccessCounter();
-    }
-    incrementAccessCounter() {
-        this.accessCounter++;
-    }
-    /**
-     * Merges another trace into this one
-     *
-     * @param incomingTrace - the incoming trace to merge into this instance
-     */
-    acceptAndMerge(incomingTrace) {
-        // 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);
-        this.gotContractInstances.push(...incomingTrace.gotContractInstances);
-        // it is assumed that the incoming trace was initialized with this as parent, so accept counter
-        this.accessCounter = incomingTrace.accessCounter;
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYXZtL2pvdXJuYWwvdHJhY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBYzlDLE1BQU0sT0FBTyxxQkFBcUI7SUFjaEMsa0RBQWtEO0lBQ2xELHNEQUFzRDtJQUV0RCxZQUFZLFdBQW1DO1FBZHhDLHVCQUFrQixHQUE4QixFQUFFLENBQUM7UUFDbkQsd0JBQW1CLEdBQStCLEVBQUUsQ0FBQztRQUVyRCxtQkFBYyxHQUEwQixFQUFFLENBQUM7UUFDM0Msa0JBQWEsR0FBcUIsRUFBRSxDQUFDO1FBQ3JDLG9CQUFlLEdBQTJCLEVBQUUsQ0FBQztRQUM3QyxrQkFBYSxHQUFzQixFQUFFLENBQUM7UUFDdEMsd0JBQW1CLEdBQStCLEVBQUUsQ0FBQztRQUNyRCxrQkFBYSxHQUE2QixFQUFFLENBQUM7UUFDN0MseUJBQW9CLEdBQTZCLEVBQUUsQ0FBQztRQU16RCxJQUFJLENBQUMsYUFBYSxHQUFHLFdBQVcsQ0FBQyxDQUFDLENBQUMsV0FBVyxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQ2pFLDJGQUEyRjtJQUM3RixDQUFDO0lBRU0sZ0JBQWdCO1FBQ3JCLE9BQU8sSUFBSSxDQUFDLGFBQWEsQ0FBQztJQUM1QixDQUFDO0lBRU0sc0JBQXNCLENBQUMsY0FBa0IsRUFBRSxJQUFRLEVBQUUsS0FBUyxFQUFFLE1BQWUsRUFBRSxNQUFlO1FBQ3JHLHVFQUF1RTtRQUN2RSwwRkFBMEY7UUFDMUYsTUFBTSxNQUFNLEdBQTRCO1lBQ3RDLHlCQUF5QjtZQUN6QixjQUFjO1lBQ2QsSUFBSTtZQUNKLEtBQUs7WUFDTCxNQUFNO1lBQ04sTUFBTTtZQUNOLE9BQU8sRUFBRSxJQUFJLEVBQUUsQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDO1lBQ25DLHlCQUF5QjtTQUMxQixDQUFDO1FBQ0Ys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

package/dest/avm/journal/trace_types.d.ts

@@ -1,55 +0,0 @@
-import { type Fr } from '@aztec/foundation/fields';
-import { type ContractInstanceWithAddress } from '@aztec/types/contracts';
-export type TracedPublicStorageRead = {
-    storageAddress: Fr;
-    exists: boolean;
-    cached: boolean;
-    slot: Fr;
-    value: Fr;
-    counter: Fr;
-};
-export type TracedPublicStorageWrite = {
-    storageAddress: Fr;
-    slot: Fr;
-    value: Fr;
-    counter: Fr;
-};
-export type TracedNoteHashCheck = {
-    storageAddress: Fr;
-    leafIndex: Fr;
-    noteHash: Fr;
-    exists: boolean;
-    counter: Fr;
-};
-export type TracedNoteHash = {
-    storageAddress: Fr;
-    noteHash: Fr;
-    counter: Fr;
-};
-export type TracedNullifierCheck = {
-    storageAddress: Fr;
-    nullifier: Fr;
-    exists: boolean;
-    counter: Fr;
-    isPending: boolean;
-    leafIndex: Fr;
-};
-export type TracedNullifier = {
-    storageAddress: Fr;
-    nullifier: Fr;
-    counter: Fr;
-};
-export type TracedL1toL2MessageCheck = {
-    leafIndex: Fr;
-    msgHash: Fr;
-    exists: boolean;
-    counter: Fr;
-};
-export type TracedUnencryptedL2Log = {
-    logHash: Fr;
-    counter: Fr;
-};
-export type TracedContractInstance = {
-    exists: boolean;
-} & ContractInstanceWithAddress;
-//# sourceMappingURL=trace_types.d.ts.map

package/dest/avm/journal/trace_types.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"trace_types.d.ts","sourceRoot":"","sources":["../../../src/avm/journal/trace_types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,KAAK,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAS1E,MAAM,MAAM,uBAAuB,GAAG;IAEpC,cAAc,EAAE,EAAE,CAAC;IACnB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,EAAE,CAAC;IACT,KAAK,EAAE,EAAE,CAAC;IACV,OAAO,EAAE,EAAE,CAAC;CAEb,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IAErC,cAAc,EAAE,EAAE,CAAC;IACnB,IAAI,EAAE,EAAE,CAAC;IACT,KAAK,EAAE,EAAE,CAAC;IACV,OAAO,EAAE,EAAE,CAAC;CAEb,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAEhC,cAAc,EAAE,EAAE,CAAC;IACnB,SAAS,EAAE,EAAE,CAAC;IACd,QAAQ,EAAE,EAAE,CAAC;IACb,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,EAAE,CAAC;CAEb,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAE3B,cAAc,EAAE,EAAE,CAAC;IACnB,QAAQ,EAAE,EAAE,CAAC;IACb,OAAO,EAAE,EAAE,CAAC;CAEb,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IAEjC,cAAc,EAAE,EAAE,CAAC;IACnB,SAAS,EAAE,EAAE,CAAC;IACd,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,EAAE,CAAC;IAIZ,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,EAAE,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAE5B,cAAc,EAAE,EAAE,CAAC;IACnB,SAAS,EAAE,EAAE,CAAC;IACd,OAAO,EAAE,EAAE,CAAC;CAEb,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IAErC,SAAS,EAAE,EAAE,CAAC;IACd,OAAO,EAAE,EAAE,CAAC;IACZ,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,EAAE,CAAC;CAEb,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IAEnC,OAAO,EAAE,EAAE,CAAC;IACZ,OAAO,EAAE,EAAE,CAAC;CAEb,CAAC;AAOF,MAAM,MAAM,sBAAsB,GAAG;IAAE,MAAM,EAAE,OAAO,CAAA;CAAE,GAAG,2BAA2B,CAAC"}

package/dest/avm/journal/trace_types.js

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

package/src/avm/journal/trace.ts

@@ -1,181 +0,0 @@
-import { Fr } from '@aztec/foundation/fields';
-
-import {
-  type TracedContractInstance,
-  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 gotContractInstances: TracedContractInstance[] = [];
-
-  //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();
-  }
-
-  public traceGetContractInstance(instance: TracedContractInstance) {
-    this.gotContractInstances.push(instance);
-    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);
-    this.gotContractInstances.push(...incomingTrace.gotContractInstances);
-    // it is assumed that the incoming trace was initialized with this as parent, so accept counter
-    this.accessCounter = incomingTrace.accessCounter;
-  }
-}

package/src/avm/journal/trace_types.ts

@@ -1,91 +0,0 @@
-import { type Fr } from '@aztec/foundation/fields';
-import { type ContractInstanceWithAddress } from '@aztec/types/contracts';
-
-//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;
-//};
-
-export type TracedContractInstance = { exists: boolean } & ContractInstanceWithAddress;