@aztec/simulator 0.0.0-test.1 → 0.0.1-commit.023c3e5

package/dest/public/avm/avm_memory_types.d.ts

@@ -1,6 +1,4 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { type Logger } from '@aztec/foundation/log';
 import type { FunctionsOf } from '@aztec/foundation/types';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
@@ -14,6 +12,7 @@ export declare abstract class MemoryValue {
     abstract lt(rhs: MemoryValue): boolean;
     abstract build(n: bigint): MemoryValue;
     abstract toBigInt(): bigint;
+    getTag(): TypeTag;
     abstract toBuffer(): Buffer;
     toFr(): Fr;
     toAztecAddress(): AztecAddress;
@@ -32,26 +31,28 @@ export declare abstract class IntegralValue extends MemoryValue {
 declare const Uint1_base: {
     new (n: number | bigint): {
         readonly n: bigint;
-        build(n: bigint): any;
-        add(rhs: any): any;
-        sub(rhs: any): any;
-        mul(rhs: any): any;
-        div(rhs: any): any;
-        shr(rhs: any): any;
-        shl(rhs: any): any;
-        and(rhs: any): any;
-        or(rhs: any): any;
-        xor(rhs: any): any;
-        not(): any;
-        equals(rhs: any): boolean;
-        lt(rhs: any): boolean;
+        build(n: bigint): /*elided*/ any;
+        add(rhs: /*elided*/ any): /*elided*/ any;
+        sub(rhs: /*elided*/ any): /*elided*/ any;
+        mul(rhs: /*elided*/ any): /*elided*/ any;
+        div(rhs: /*elided*/ any): /*elided*/ any;
+        shr(rhs: /*elided*/ any): /*elided*/ any;
+        shl(rhs: /*elided*/ any): /*elided*/ any;
+        and(rhs: /*elided*/ any): /*elided*/ any;
+        or(rhs: /*elided*/ any): /*elided*/ any;
+        xor(rhs: /*elided*/ any): /*elided*/ any;
+        not(): /*elided*/ any;
+        equals(rhs: /*elided*/ any): boolean;
+        lt(rhs: /*elided*/ any): boolean;
         toBigInt(): bigint;
-        toBuffer(): Buffer;
+        toBuffer(): Buffer<ArrayBufferLike>;
+        getTag(): TypeTag;
         toFr(): Fr;
         toAztecAddress(): AztecAddress;
         toNumber(): number;
         toString(): string;
     };
+    readonly bits: number;
     readonly mod: bigint;
     readonly bitmask: bigint;
 };
@@ -60,26 +61,28 @@ export declare class Uint1 extends Uint1_base {
 declare const Uint8_base: {
     new (n: number | bigint): {
         readonly n: bigint;
-        build(n: bigint): any;
-        add(rhs: any): any;
-        sub(rhs: any): any;
-        mul(rhs: any): any;
-        div(rhs: any): any;
-        shr(rhs: any): any;
-        shl(rhs: any): any;
-        and(rhs: any): any;
-        or(rhs: any): any;
-        xor(rhs: any): any;
-        not(): any;
-        equals(rhs: any): boolean;
-        lt(rhs: any): boolean;
+        build(n: bigint): /*elided*/ any;
+        add(rhs: /*elided*/ any): /*elided*/ any;
+        sub(rhs: /*elided*/ any): /*elided*/ any;
+        mul(rhs: /*elided*/ any): /*elided*/ any;
+        div(rhs: /*elided*/ any): /*elided*/ any;
+        shr(rhs: /*elided*/ any): /*elided*/ any;
+        shl(rhs: /*elided*/ any): /*elided*/ any;
+        and(rhs: /*elided*/ any): /*elided*/ any;
+        or(rhs: /*elided*/ any): /*elided*/ any;
+        xor(rhs: /*elided*/ any): /*elided*/ any;
+        not(): /*elided*/ any;
+        equals(rhs: /*elided*/ any): boolean;
+        lt(rhs: /*elided*/ any): boolean;
         toBigInt(): bigint;
-        toBuffer(): Buffer;
+        toBuffer(): Buffer<ArrayBufferLike>;
+        getTag(): TypeTag;
         toFr(): Fr;
         toAztecAddress(): AztecAddress;
         toNumber(): number;
         toString(): string;
     };
+    readonly bits: number;
     readonly mod: bigint;
     readonly bitmask: bigint;
 };
@@ -88,26 +91,28 @@ export declare class Uint8 extends Uint8_base {
 declare const Uint16_base: {
     new (n: number | bigint): {
         readonly n: bigint;
-        build(n: bigint): any;
-        add(rhs: any): any;
-        sub(rhs: any): any;
-        mul(rhs: any): any;
-        div(rhs: any): any;
-        shr(rhs: any): any;
-        shl(rhs: any): any;
-        and(rhs: any): any;
-        or(rhs: any): any;
-        xor(rhs: any): any;
-        not(): any;
-        equals(rhs: any): boolean;
-        lt(rhs: any): boolean;
+        build(n: bigint): /*elided*/ any;
+        add(rhs: /*elided*/ any): /*elided*/ any;
+        sub(rhs: /*elided*/ any): /*elided*/ any;
+        mul(rhs: /*elided*/ any): /*elided*/ any;
+        div(rhs: /*elided*/ any): /*elided*/ any;
+        shr(rhs: /*elided*/ any): /*elided*/ any;
+        shl(rhs: /*elided*/ any): /*elided*/ any;
+        and(rhs: /*elided*/ any): /*elided*/ any;
+        or(rhs: /*elided*/ any): /*elided*/ any;
+        xor(rhs: /*elided*/ any): /*elided*/ any;
+        not(): /*elided*/ any;
+        equals(rhs: /*elided*/ any): boolean;
+        lt(rhs: /*elided*/ any): boolean;
         toBigInt(): bigint;
-        toBuffer(): Buffer;
+        toBuffer(): Buffer<ArrayBufferLike>;
+        getTag(): TypeTag;
         toFr(): Fr;
         toAztecAddress(): AztecAddress;
         toNumber(): number;
         toString(): string;
     };
+    readonly bits: number;
     readonly mod: bigint;
     readonly bitmask: bigint;
 };
@@ -116,26 +121,28 @@ export declare class Uint16 extends Uint16_base {
 declare const Uint32_base: {
     new (n: number | bigint): {
         readonly n: bigint;
-        build(n: bigint): any;
-        add(rhs: any): any;
-        sub(rhs: any): any;
-        mul(rhs: any): any;
-        div(rhs: any): any;
-        shr(rhs: any): any;
-        shl(rhs: any): any;
-        and(rhs: any): any;
-        or(rhs: any): any;
-        xor(rhs: any): any;
-        not(): any;
-        equals(rhs: any): boolean;
-        lt(rhs: any): boolean;
+        build(n: bigint): /*elided*/ any;
+        add(rhs: /*elided*/ any): /*elided*/ any;
+        sub(rhs: /*elided*/ any): /*elided*/ any;
+        mul(rhs: /*elided*/ any): /*elided*/ any;
+        div(rhs: /*elided*/ any): /*elided*/ any;
+        shr(rhs: /*elided*/ any): /*elided*/ any;
+        shl(rhs: /*elided*/ any): /*elided*/ any;
+        and(rhs: /*elided*/ any): /*elided*/ any;
+        or(rhs: /*elided*/ any): /*elided*/ any;
+        xor(rhs: /*elided*/ any): /*elided*/ any;
+        not(): /*elided*/ any;
+        equals(rhs: /*elided*/ any): boolean;
+        lt(rhs: /*elided*/ any): boolean;
         toBigInt(): bigint;
-        toBuffer(): Buffer;
+        toBuffer(): Buffer<ArrayBufferLike>;
+        getTag(): TypeTag;
         toFr(): Fr;
         toAztecAddress(): AztecAddress;
         toNumber(): number;
         toString(): string;
     };
+    readonly bits: number;
     readonly mod: bigint;
     readonly bitmask: bigint;
 };
@@ -144,26 +151,28 @@ export declare class Uint32 extends Uint32_base {
 declare const Uint64_base: {
     new (n: number | bigint): {
         readonly n: bigint;
-        build(n: bigint): any;
-        add(rhs: any): any;
-        sub(rhs: any): any;
-        mul(rhs: any): any;
-        div(rhs: any): any;
-        shr(rhs: any): any;
-        shl(rhs: any): any;
-        and(rhs: any): any;
-        or(rhs: any): any;
-        xor(rhs: any): any;
-        not(): any;
-        equals(rhs: any): boolean;
-        lt(rhs: any): boolean;
+        build(n: bigint): /*elided*/ any;
+        add(rhs: /*elided*/ any): /*elided*/ any;
+        sub(rhs: /*elided*/ any): /*elided*/ any;
+        mul(rhs: /*elided*/ any): /*elided*/ any;
+        div(rhs: /*elided*/ any): /*elided*/ any;
+        shr(rhs: /*elided*/ any): /*elided*/ any;
+        shl(rhs: /*elided*/ any): /*elided*/ any;
+        and(rhs: /*elided*/ any): /*elided*/ any;
+        or(rhs: /*elided*/ any): /*elided*/ any;
+        xor(rhs: /*elided*/ any): /*elided*/ any;
+        not(): /*elided*/ any;
+        equals(rhs: /*elided*/ any): boolean;
+        lt(rhs: /*elided*/ any): boolean;
         toBigInt(): bigint;
-        toBuffer(): Buffer;
+        toBuffer(): Buffer<ArrayBufferLike>;
+        getTag(): TypeTag;
         toFr(): Fr;
         toAztecAddress(): AztecAddress;
         toNumber(): number;
         toString(): string;
     };
+    readonly bits: number;
     readonly mod: bigint;
     readonly bitmask: bigint;
 };
@@ -172,26 +181,28 @@ export declare class Uint64 extends Uint64_base {
 declare const Uint128_base: {
     new (n: number | bigint): {
         readonly n: bigint;
-        build(n: bigint): any;
-        add(rhs: any): any;
-        sub(rhs: any): any;
-        mul(rhs: any): any;
-        div(rhs: any): any;
-        shr(rhs: any): any;
-        shl(rhs: any): any;
-        and(rhs: any): any;
-        or(rhs: any): any;
-        xor(rhs: any): any;
-        not(): any;
-        equals(rhs: any): boolean;
-        lt(rhs: any): boolean;
+        build(n: bigint): /*elided*/ any;
+        add(rhs: /*elided*/ any): /*elided*/ any;
+        sub(rhs: /*elided*/ any): /*elided*/ any;
+        mul(rhs: /*elided*/ any): /*elided*/ any;
+        div(rhs: /*elided*/ any): /*elided*/ any;
+        shr(rhs: /*elided*/ any): /*elided*/ any;
+        shl(rhs: /*elided*/ any): /*elided*/ any;
+        and(rhs: /*elided*/ any): /*elided*/ any;
+        or(rhs: /*elided*/ any): /*elided*/ any;
+        xor(rhs: /*elided*/ any): /*elided*/ any;
+        not(): /*elided*/ any;
+        equals(rhs: /*elided*/ any): boolean;
+        lt(rhs: /*elided*/ any): boolean;
         toBigInt(): bigint;
-        toBuffer(): Buffer;
+        toBuffer(): Buffer<ArrayBufferLike>;
+        getTag(): TypeTag;
         toFr(): Fr;
         toAztecAddress(): AztecAddress;
         toNumber(): number;
         toString(): string;
     };
+    readonly bits: number;
     readonly mod: bigint;
     readonly bitmask: bigint;
 };
@@ -242,7 +253,7 @@ export declare class TaggedMemory implements TaggedMemoryInterface {
      * Check that the memory at the given offset matches the specified tag.
      */
     checkTag(tag: TypeTag, offset: number): void;
-    checkIsValidMemoryOffsetTag(offset: number): void;
+    static isValidMemoryAddressTag(tag: TypeTag): tag is TypeTag.UINT32;
     static checkIsIntegralTag(tag: TypeTag): void;
     static checkIsValidTag(tagNumber: number): void;
     /**
@@ -261,4 +272,4 @@ export declare class TaggedMemory implements TaggedMemoryInterface {
     static buildFromTagTruncating(v: bigint | number, tag: TypeTag): MemoryValue;
 }
 export {};
-//# sourceMappingURL=avm_memory_types.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXZtX21lbW9yeV90eXBlcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3B1YmxpYy9hdm0vYXZtX21lbW9yeV90eXBlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFVQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLHVCQUF1QixDQUFDO0FBQ2xFLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzNELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQU0zRCxzRUFBc0U7QUFDdEUsOEJBQXNCLFdBQVc7SUFDL0IsU0FBZ0IsR0FBRyxDQUFDLEdBQUcsRUFBRSxXQUFXLEdBQUcsV0FBVyxDQUFDO0lBQ25ELFNBQWdCLEdBQUcsQ0FBQyxHQUFHLEVBQUUsV0FBVyxHQUFHLFdBQVcsQ0FBQztJQUNuRCxTQUFnQixHQUFHLENBQUMsR0FBRyxFQUFFLFdBQVcsR0FBRyxXQUFXLENBQUM7SUFDbkQsU0FBZ0IsR0FBRyxDQUFDLEdBQUcsRUFBRSxXQUFXLEdBQUcsV0FBVyxDQUFDO0lBRW5ELFNBQWdCLE1BQU0sQ0FBQyxHQUFHLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQztJQUNsRCxTQUFnQixFQUFFLENBQUMsR0FBRyxFQUFFLFdBQVcsR0FBRyxPQUFPLENBQUM7SUFHOUMsU0FBZ0IsS0FBSyxDQUFDLENBQUMsRUFBRSxNQUFNLEdBQUcsV0FBVyxDQUFDO0lBRzlDLFNBQWdCLFFBQVEsSUFBSSxNQUFNLENBQUM7SUFDNUIsTUFBTSxJQUFJLE9BQU8sQ0FFdkI7SUFHRCxTQUFnQixRQUFRLElBQUksTUFBTSxDQUFDO0lBRzVCLElBQUksSUFBSSxFQUFFLENBRWhCO0lBRU0sY0FBYyxJQUFJLFlBQVksQ0FFcEM7SUFHTSxRQUFRLElBQUksTUFBTSxDQUV4QjtJQUVNLFFBQVEsSUFB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

package/dest/public/avm/avm_memory_types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"avm_memory_types.d.ts","sourceRoot":"","sources":["../../../src/public/avm/avm_memory_types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"avm_memory_types.d.ts","sourceRoot":"","sources":["../../../src/public/avm/avm_memory_types.ts"],"names":[],"mappings":"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"}

package/dest/public/avm/avm_memory_types.js

@@ -1,11 +1,14 @@
 import { MEM_TAG_FF, MEM_TAG_U1, MEM_TAG_U8, MEM_TAG_U16, MEM_TAG_U32, MEM_TAG_U64, MEM_TAG_U128 } from '@aztec/constants';
 import { toBufferBE } from '@aztec/foundation/bigint-buffer';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { createLogger } from '@aztec/foundation/log';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { strict as assert } from 'assert';
 import { InvalidTagValueError, MemorySliceOutOfRangeError, TagCheckError } from './errors.js';
 /** MemoryValue gathers the common operations for all memory types. */ export class MemoryValue {
+    getTag() {
+        return TaggedMemory.getTag(this);
+    }
     // To field
     toFr() {
         return new Fr(this.toBigInt());
@@ -28,12 +31,14 @@ import { InvalidTagValueError, MemorySliceOutOfRangeError, TagCheckError } from
  * In TypeScript terms, it's a class mixin.
  **/ function UnsignedIntegerClassFactory(bits) {
     return class NewUintClass extends IntegralValue {
+        static bits = bits;
         static mod = 1n << BigInt(bits);
         static bitmask = this.mod - 1n;
         n;
         constructor(n){
             super();
             this.n = BigInt(n);
+            assert(n >= 0n, `${this.constructor.name} cannot handle negative values: ${n}.`);
             assert(n < NewUintClass.mod, `Value ${n} is too large for ${this.constructor.name}.`);
         }
         build(n) {
@@ -54,11 +59,17 @@ import { InvalidTagValueError, MemorySliceOutOfRangeError, TagCheckError } from
         }
         // No sign extension.
         shr(rhs) {
-            // Note that this.n is > 0 by class invariant.
+            // Note that this.n is >= 0 by class invariant.
             return this.build(this.n >> rhs.n);
         }
         shl(rhs) {
-            return this.build(this.n << rhs.n & NewUintClass.bitmask);
+            const shiftAmount = rhs.n;
+            const bitSize = BigInt(NewUintClass.bits);
+            // Shifting by more than the bit size always results in 0
+            if (shiftAmount >= bitSize) {
+                return this.build(0n);
+            }
+            return this.build(this.n << shiftAmount & NewUintClass.bitmask);
         }
         and(rhs) {
             return this.build(this.n & rhs.n);
@@ -176,7 +187,7 @@ export class TaggedMemory {
     getAs(offset) {
         assert(Number.isInteger(offset) && offset < TaggedMemory.MAX_MEMORY_SIZE);
         const word = this._mem.get(offset);
-        //TaggedMemory.log.trace(`get(${offset}) = ${word}`);
+        //TaggedMemory.log.trace(`Memory read: ${offset} -> ${word}`);
         if (word === undefined) {
             TaggedMemory.log.debug(`WARNING: Memory at offset ${offset} is undefined!`);
             return new Field(0);
@@ -204,7 +215,7 @@ export class TaggedMemory {
     set(offset, v) {
         assert(Number.isInteger(offset) && offset < TaggedMemory.MAX_MEMORY_SIZE);
         this._mem.set(offset, v);
-    //TaggedMemory.log.trace(`set(${offset}, ${v})`);
+    //TaggedMemory.log.trace(`Memory write: ${offset} <- ${v}`);
     }
     setSlice(offset, slice) {
         assert(Number.isInteger(offset));
@@ -228,8 +239,8 @@ export class TaggedMemory {
             throw TagCheckError.forOffset(offset, TypeTag[gotTag], TypeTag[tag]);
         }
     }
-    checkIsValidMemoryOffsetTag(offset) {
-        this.checkTag(TypeTag.UINT32, offset);
+    static isValidMemoryAddressTag(tag) {
+        return tag === TypeTag.UINT32;
     }
     static checkIsIntegralTag(tag) {
         if (!INTEGRAL_TAGS.has(tag)) {
@@ -257,6 +268,9 @@ export class TaggedMemory {
     /**
    * Check tags for all memory in the specified range.
    */ checkTagsRange(tag, startOffset, size) {
+        if (startOffset + size > TaggedMemory.MAX_MEMORY_SIZE) {
+            throw new MemorySliceOutOfRangeError(startOffset, size);
+        }
         for(let offset = startOffset; offset < startOffset + size; offset++){
             this.checkTag(tag, offset);
         }

package/dest/public/avm/avm_simulator.d.ts

@@ -1,14 +1,15 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import type { PublicSimulatorConfig } from '@aztec/stdlib/avm';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { GlobalVariables } from '@aztec/stdlib/tx';
+import type { PublicPersistableStateManager } from '../state_manager/state_manager.js';
 import { AvmContext } from './avm_context.js';
 import { AvmContractCallResult } from './avm_contract_call_result.js';
 import type { Gas } from './avm_gas.js';
-import type { AvmPersistableStateManager } from './journal/journal.js';
+import type { AvmSimulatorInterface } from './avm_simulator_interface.js';
+import { type CallData } from './calldata.js';
 import { type InstructionSet } from './serialization/bytecode_serialization.js';
-export declare class AvmSimulator {
+export declare class AvmSimulator implements AvmSimulatorInterface {
     private context;
     private instructionSet;
     private log;
@@ -19,7 +20,7 @@ export declare class AvmSimulator {
     private tallyInstructionFunction;
     constructor(context: AvmContext, instructionSet?: InstructionSet, enableTallying?: boolean);
     static build(context: AvmContext): Promise<AvmSimulator>;
-    static create(stateManager: AvmPersistableStateManager, address: AztecAddress, sender: AztecAddress, transactionFee: Fr, globals: GlobalVariables, isStaticCall: boolean, calldata: Fr[], allocatedGas: Gas): Promise<AvmSimulator>;
+    static create(stateManager: PublicPersistableStateManager, address: AztecAddress, sender: AztecAddress, transactionFee: Fr, globals: GlobalVariables, isStaticCall: boolean, calldata: CallData, allocatedGas: Gas, config: PublicSimulatorConfig): Promise<AvmSimulator>;
     /**
      * Fetch the bytecode and execute it in the current context.
      */
@@ -37,4 +38,4 @@ export declare class AvmSimulator {
     private tallyInstruction;
     private printOpcodeTallies;
 }
-//# sourceMappingURL=avm_simulator.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXZtX3NpbXVsYXRvci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3B1YmxpYy9hdm0vYXZtX3NpbXVsYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFHcEQsT0FBTyxLQUFLLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUMvRCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUt4RCxPQUFPLEtBQUssRUFBRSw2QkFBNkIsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBQ3ZGLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUM5QyxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUV0RSxPQUFPLEtBQUssRUFBRSxHQUFHLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFeEMsT0FBTyxLQUFLLEVBQUUscUJBQXFCLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUMxRSxPQUFPLEVBQUUsS0FBSyxRQUFRLEVBQW1CLE1BQU0sZUFBZSxDQUFDO0FBSS9ELE9BQU8sRUFFTCxLQUFLLGNBQWMsRUFFcEIsTUFBTSwyQ0FBMkMsQ0FBQztBQU9uRCxxQkFBYSxZQUFhLFlBQVcscUJBQXFCO0lBYXRELE9BQU8sQ0FBQyxPQUFPO0lBQ2YsT0FBTyxDQUFDLGNBQWM7SUFieEIsT0FBTyxDQUFDLEdBQUcsQ0FBUztJQUNwQixPQUFPLENBQUMsUUFBUSxDQUFxQjtJQUNyQyxPQUFPLENBQUMsYUFBYSxDQUF1QztJQUU1RCxPQUFPLENBQUMsNkJBQTZCLENBQWlEO0lBRXRGLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBWTtJQUN0QyxPQUFPLENBQUMsd0JBQXdCLENBQStCO0lBSS9ELFlBQ1UsT0FBTyxFQUFFLFVBQVUsRUFDbkIsY0FBYyxHQUFFLGNBQWdDLEVBQ3hELGNBQWMsVUFBUSxFQVd2QjtJQUlELE9BQW9CLEtBQUssQ0FBQyxPQUFPLEVBQUUsVUFBVSxHQUFHLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FNcEU7SUFFRCxPQUFvQixNQUFNLENBQ3hCLFlBQVksRUFBRSw2QkFBNkIsRUFDM0MsT0FBTyxFQUFFLFlBQVksRUFDckIsTUFBTSxFQUFFLFlBQVksRUFDcEIsY0FBYyxFQUFFLEVBQUUsRUFDbEIsT0FBTyxFQUFFLGVBQWUsRUFDeEIsWUFBWSxFQUFFLE9BQU8sRUFDckIsUUFBUSxFQUFFLFFBQVEsRUFDbEIsWUFBWSxFQUFFLEdBQUcsRUFDakIsTUFBTSxFQUFFLHFCQUFxQix5QkFnQjlCO0lBRUQ7O09BRUc7SUFDVSxPQUFPLElBQUksT0FBTyxDQUFDLHFCQUFxQixDQUFDLENBWXJEO0lBRUQ7O09BRUc7SUFDSSxXQUFXLElBQUksTUFBTSxHQUFHLFNBQVMsQ0FFdkM7SUFFRDs7O09BR0c7SUFDVSxlQUFlLENBQUMsUUFBUSxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMscUJBQXFCLENBQUMsQ0ErRzdFO1lBRWEsK0JBQStCO0lBdUI3QyxPQUFPLENBQUMsZ0JBQWdCO0lBUXhCLE9BQU8sQ0FBQyxrQkFBa0I7Q0FTM0IifQ==

package/dest/public/avm/avm_simulator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"avm_simulator.d.ts","sourceRoot":"","sources":["../../../src/public/avm/avm_simulator.ts"],"names":[],"mappings":";;AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAKxD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAEtE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAUxC,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;AAEvE,OAAO,EAEL,KAAK,cAAc,EAEpB,MAAM,2CAA2C,CAAC;AAOnD,qBAAa,YAAY;IAarB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,cAAc;IAbxB,OAAO,CAAC,GAAG,CAAS;IACpB,OAAO,CAAC,QAAQ,CAAqB;IACrC,OAAO,CAAC,aAAa,CAAuC;IAE5D,OAAO,CAAC,6BAA6B,CAAiD;IAEtF,OAAO,CAAC,kBAAkB,CAAY;IACtC,OAAO,CAAC,wBAAwB,CAA+B;gBAKrD,OAAO,EAAE,UAAU,EACnB,cAAc,GAAE,cAAgC,EACxD,cAAc,UAAQ;WAmBJ,KAAK,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC;WAQjD,MAAM,CACxB,YAAY,EAAE,0BAA0B,EACxC,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,YAAY,EACpB,cAAc,EAAE,EAAE,EAClB,OAAO,EAAE,eAAe,EACxB,YAAY,EAAE,OAAO,EACrB,QAAQ,EAAE,EAAE,EAAE,EACd,YAAY,EAAE,GAAG;IAiBnB;;OAEG;IACU,OAAO,IAAI,OAAO,CAAC,qBAAqB,CAAC;IAuBtD;;OAEG;IACI,WAAW,IAAI,MAAM,GAAG,SAAS;IAIxC;;;OAGG;IACU,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC;YA2GhE,+BAA+B;IAoB7C,OAAO,CAAC,gBAAgB;IAQxB,OAAO,CAAC,kBAAkB;CAS3B"}
+{"version":3,"file":"avm_simulator.d.ts","sourceRoot":"","sources":["../../../src/public/avm/avm_simulator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAGpD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAKxD,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AACvF,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAEtE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAExC,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAAE,KAAK,QAAQ,EAAmB,MAAM,eAAe,CAAC;AAI/D,OAAO,EAEL,KAAK,cAAc,EAEpB,MAAM,2CAA2C,CAAC;AAOnD,qBAAa,YAAa,YAAW,qBAAqB;IAatD,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,cAAc;IAbxB,OAAO,CAAC,GAAG,CAAS;IACpB,OAAO,CAAC,QAAQ,CAAqB;IACrC,OAAO,CAAC,aAAa,CAAuC;IAE5D,OAAO,CAAC,6BAA6B,CAAiD;IAEtF,OAAO,CAAC,kBAAkB,CAAY;IACtC,OAAO,CAAC,wBAAwB,CAA+B;IAI/D,YACU,OAAO,EAAE,UAAU,EACnB,cAAc,GAAE,cAAgC,EACxD,cAAc,UAAQ,EAWvB;IAID,OAAoB,KAAK,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC,CAMpE;IAED,OAAoB,MAAM,CACxB,YAAY,EAAE,6BAA6B,EAC3C,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,YAAY,EACpB,cAAc,EAAE,EAAE,EAClB,OAAO,EAAE,eAAe,EACxB,YAAY,EAAE,OAAO,EACrB,QAAQ,EAAE,QAAQ,EAClB,YAAY,EAAE,GAAG,EACjB,MAAM,EAAE,qBAAqB,yBAgB9B;IAED;;OAEG;IACU,OAAO,IAAI,OAAO,CAAC,qBAAqB,CAAC,CAYrD;IAED;;OAEG;IACI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEvC;IAED;;;OAGG;IACU,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC,CA+G7E;YAEa,+BAA+B;IAuB7C,OAAO,CAAC,gBAAgB;IAQxB,OAAO,CAAC,kBAAkB;CAS3B"}

package/dest/public/avm/avm_simulator.js

@@ -1,14 +1,15 @@
-import { MAX_L2_GAS_PER_TX_PUBLIC_PORTION } from '@aztec/constants';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { createLogger } from '@aztec/foundation/log';
+import { Timer } from '@aztec/foundation/timer';
 import { strict as assert } from 'assert';
-import { SideEffectLimitReachedError } from '../side_effect_errors.js';
+import { CheckedPublicExecutionError } from '../public_errors.js';
 import { AvmContext } from './avm_context.js';
 import { AvmContractCallResult } from './avm_contract_call_result.js';
 import { AvmExecutionEnvironment } from './avm_execution_environment.js';
 import { AvmMachineState } from './avm_machine_state.js';
-import { isAvmBytecode } from './bytecode_utils.js';
-import { AvmExecutionError, AvmRevertReason, InvalidProgramCounterError, revertReasonFromExceptionalHalt, revertReasonFromExplicitRevert } from './errors.js';
+import { ReturnDataArray } from './calldata.js';
+import { AvmRevertReason, InvalidProgramCounterError } from './errors.js';
+import { revertReasonFromExceptionalHalt, revertReasonFromExplicitRevert } from './revert_reason.js';
 import { INSTRUCTION_SET, decodeInstructionFromBytecode } from './serialization/bytecode_serialization.js';
 export class AvmSimulator {
     context;
@@ -32,8 +33,7 @@ export class AvmSimulator {
         // This will be used by the CALL opcode to create a new simulator. It is required to
         // avoid a dependency cycle.
         context.provideSimulator = AvmSimulator.build;
-        assert(context.machineState.gasLeft.l2Gas <= MAX_L2_GAS_PER_TX_PUBLIC_PORTION, `Cannot allocate more than ${MAX_L2_GAS_PER_TX_PUBLIC_PORTION} to the AVM for execution.`);
-        this.log = createLogger(`simulator:avm(calldata[0]: ${context.environment.calldata[0]})`);
+        this.log = createLogger(`simulator:avm(calldata[0]: ${context.environment.calldata.read(0)})`);
         // Turn on tallying if explicitly enabled or if trace logging
         if (enableTallying || this.log.isLevelEnabled('trace')) {
             this.tallyPrintFunction = this.printOpcodeTallies;
@@ -48,8 +48,8 @@ export class AvmSimulator {
         simulator.log = createLogger(`simulator:avm(f:${fnName})`);
         return simulator;
     }
-    static async create(stateManager, address, sender, transactionFee, globals, isStaticCall, calldata, allocatedGas) {
-        const avmExecutionEnv = new AvmExecutionEnvironment(address, sender, /*contractCallDepth=*/ Fr.zero(), transactionFee, globals, isStaticCall, calldata);
+    static async create(stateManager, address, sender, transactionFee, globals, isStaticCall, calldata, allocatedGas, config) {
+        const avmExecutionEnv = new AvmExecutionEnvironment(address, sender, /*contractCallDepth=*/ Fr.zero(), transactionFee, globals, isStaticCall, calldata, config);
         const avmMachineState = new AvmMachineState(allocatedGas);
         const avmContext = new AvmContext(stateManager, avmExecutionEnv, avmMachineState);
         return await AvmSimulator.build(avmContext);
@@ -57,18 +57,11 @@ export class AvmSimulator {
     /**
    * Fetch the bytecode and execute it in the current context.
    */ async execute() {
-        let bytecode;
-        try {
-            bytecode = await this.context.persistableState.getBytecode(this.context.environment.address);
-        } catch (err) {
-            if (!(err instanceof AvmExecutionError || err instanceof SideEffectLimitReachedError)) {
-                this.log.error(`Unknown error thrown by AVM during bytecode retrieval: ${err}`);
-                throw err;
-            }
-            return await this.handleFailureToRetrieveBytecode(`Bytecode retrieval for contract '${this.context.environment.address}' failed with ${err}. Reverting...`);
-        }
+        const bytecode = await this.context.persistableState.getBytecode(this.context.environment.address);
+        // getBytecode returns undefined if bytecode is not found or if the limit of contract calls to unique class IDs is reached.
+        // If it throws an error that reaches this point, it is a bug.
         if (!bytecode) {
-            return await this.handleFailureToRetrieveBytecode(`No bytecode found at: ${this.context.environment.address}. Reverting...`);
+            return await this.handleFailureToRetrieveBytecode(`No bytecode found. Contract is not deployed, or limit encountered for max calls to unique contract class IDs. Contract address: ${this.context.environment.address}. Reverting...`);
         }
         return await this.executeBytecode(bytecode);
     }
@@ -81,16 +74,15 @@ export class AvmSimulator {
    * Executes the provided bytecode in the current context.
    * This method is useful for testing and debugging.
    */ async executeBytecode(bytecode) {
-        const startTotalTime = performance.now();
-        assert(isAvmBytecode(bytecode), "AVM simulator can't execute non-AVM bytecode");
+        const timer = new Timer();
         assert(bytecode.length > 0, "AVM simulator can't execute empty bytecode");
         this.bytecode = bytecode;
+        let instructionName = 'NONE'; // This is used for logging purposes
         const { machineState } = this.context;
         const callStartGas = machineState.gasLeft; // Save gas before executing instruction (for profiling)
         try {
             // Execute instruction pointed to by the current program counter
             // continuing until the machine state signifies a halt
-            let instrCounter = 0;
             while(!machineState.getHalted()){
                 // Get the instruction from cache, or deserialize for the first time
                 let cachedInstruction = this.deserializedInstructionsCache.get(machineState.pc);
@@ -102,10 +94,10 @@ export class AvmSimulator {
                 const instrStartGas = machineState.gasLeft; // Save gas before executing instruction (for profiling)
                 if (this.log.isLevelEnabled('trace')) {
                     // Skip this entirely to avoid toStringing etc if trace is not enabled
-                    this.log.trace(`[PC:${machineState.pc}] [IC:${instrCounter}] ${instruction.toString()} (gasLeft l2=${machineState.l2GasLeft} da=${machineState.daGasLeft})`);
+                    this.log.trace(`[PC:${machineState.pc}] [IC:${machineState.instrCounter}] ${instruction.toString()} (gasLeft l2=${machineState.l2GasLeft} da=${machineState.daGasLeft})`);
                 }
-                instrCounter++;
                 machineState.nextPc = machineState.pc + bytesRead;
+                instructionName = instruction.constructor.name;
                 // Execute the instruction.
                 // Normal returns and reverts will return normally here.
                 // "Exceptional halts" will throw.
@@ -114,6 +106,7 @@ export class AvmSimulator {
                     // Increment PC if the instruction doesn't handle it itself
                     machineState.pc += bytesRead;
                 }
+                machineState.instrCounter++;
                 // gas used by this instruction - used for profiling/tallying
                 const gasUsed = {
                     l2Gas: instrStartGas.l2Gas - machineState.l2GasLeft,
@@ -122,32 +115,28 @@ export class AvmSimulator {
                 this.tallyInstructionFunction(instruction.constructor.name, gasUsed);
                 if (machineState.pc >= bytecode.length) {
                     this.log.warn('Passed end of program');
-                    throw new InvalidProgramCounterError(machineState.pc, /*max=*/ bytecode.length);
+                    throw new InvalidProgramCounterError(machineState.pc, /*max=*/ bytecode.length - 1);
                 }
             }
             const output = machineState.getOutput();
             const reverted = machineState.getReverted();
-            const revertReason = reverted ? await revertReasonFromExplicitRevert(output, this.context) : undefined;
-            const results = new AvmContractCallResult(reverted, output, machineState.gasLeft, revertReason);
+            const revertReason = reverted ? await revertReasonFromExplicitRevert(output.bestEffortReadAll(), this.context) : undefined;
+            const results = new AvmContractCallResult(reverted, output, machineState.gasLeft, revertReason, machineState.instrCounter);
             this.log.debug(`Context execution results: ${results.toString()}`);
             const totalGasUsed = {
                 l2Gas: callStartGas.l2Gas - machineState.l2GasLeft,
                 daGas: callStartGas.daGas - machineState.daGasLeft
             };
-            this.log.debug(`Executed ${instrCounter} instructions and consumed ${totalGasUsed.l2Gas} L2 Gas`);
+            this.log.debug(`Executed ${machineState.instrCounter} instructions and consumed ${totalGasUsed.l2Gas} L2 Gas`);
             this.tallyPrintFunction();
-            const endTotalTime = performance.now();
-            const totalTime = endTotalTime - startTotalTime;
-            this.log.debug(`Core AVM simulation took ${totalTime}ms`);
+            this.log.debug(`Core AVM simulation took ${timer.ms()}ms`);
             // Return results for processing by calling context
             return results;
         } catch (err) {
-            this.log.verbose('Exceptional halt (revert by something other than REVERT opcode)');
-            // FIXME: weird that we have to do this OutOfGasError check because:
-            // 1. OutOfGasError is an AvmExecutionError, so that check should cover both
-            // 2. We should at least be able to do instanceof OutOfGasError instead of checking the constructor name
-            if (!(err.constructor.name == 'OutOfGasError' || err instanceof AvmExecutionError || err instanceof SideEffectLimitReachedError)) {
-                this.log.error(`Unknown error thrown by AVM: ${err}`);
+            this.log.info(`Exceptional halt (revert by something other than REVERT opcode) for instruction
+         ${instructionName} at pc ${machineState.pc} and instruction counter ${machineState.instrCounter}`);
+            if (!(err instanceof CheckedPublicExecutionError)) {
+                this.log.error(`Unchecked/unknown error thrown by AVM. This is a bug. Error: ${err}`);
                 throw err;
             }
             const revertReason = await revertReasonFromExceptionalHalt(err, this.context);
@@ -157,7 +146,7 @@ export class AvmSimulator {
                 daGas: 0
             };
             // Note: "exceptional halts" cannot return data, hence [].
-            const results = new AvmContractCallResult(/*reverted=*/ true, /*output=*/ [], noGasLeft, revertReason);
+            const results = new AvmContractCallResult(/*reverted=*/ true, /*output=*/ new ReturnDataArray([]), noGasLeft, revertReason, machineState.instrCounter);
             this.log.debug(`Context execution results: ${results.toString()}`);
             this.tallyPrintFunction();
             // Return results for processing by calling context
@@ -166,13 +155,14 @@ export class AvmSimulator {
     }
     async handleFailureToRetrieveBytecode(message) {
         // revert, consuming all gas
-        const fnName = await this.context.persistableState.getPublicFunctionDebugName(this.context.environment);
+        const { functionSelector, functionName } = await this.context.persistableState.getPublicFunctionSelectorAndName(this.context.environment);
         const revertReason = new AvmRevertReason(message, /*failingFunction=*/ {
             contractAddress: this.context.environment.address,
-            functionName: fnName
+            functionSelector,
+            functionName
         }, /*noirCallStack=*/ []);
         this.log.warn(message);
-        return new AvmContractCallResult(/*reverted=*/ true, /*output=*/ [], /*gasLeft=*/ {
+        return new AvmContractCallResult(/*reverted=*/ true, /*output=*/ new ReturnDataArray([]), /*gasLeft=*/ {
             l2Gas: 0,
             daGas: 0
         }, revertReason);