@aztec/simulator 0.0.0-test.1 → 0.0.1-commit.24de95ac

package/dest/public/avm/avm_gas.js

@@ -1,7 +1,6 @@
 import * as c from '@aztec/constants';
 import { TypeTag } from './avm_memory_types.js';
 import { InstructionExecutionError } from './errors.js';
-import { Addressing, AddressingMode } from './opcodes/addressing_mode.js';
 import { Opcode } from './serialization/instruction_serialization.js';
 /** Maps a Gas struct to gasLeft properties. */ export function gasToGasLeft(gas) {
     return {
@@ -96,13 +95,13 @@ function makeCost(l2Gas, daGas) {
     [Opcode.MOV_8]: makeCost(c.AVM_MOV_BASE_L2_GAS, 0),
     [Opcode.MOV_16]: makeCost(c.AVM_MOV_BASE_L2_GAS, 0),
     [Opcode.SLOAD]: makeCost(c.AVM_SLOAD_BASE_L2_GAS, 0),
-    [Opcode.SSTORE]: makeCost(c.AVM_SSTORE_BASE_L2_GAS, c.AVM_SSTORE_BASE_DA_GAS),
+    [Opcode.SSTORE]: makeCost(c.AVM_SSTORE_BASE_L2_GAS, 0),
     [Opcode.NOTEHASHEXISTS]: makeCost(c.AVM_NOTEHASHEXISTS_BASE_L2_GAS, 0),
     [Opcode.EMITNOTEHASH]: makeCost(c.AVM_EMITNOTEHASH_BASE_L2_GAS, c.AVM_EMITNOTEHASH_BASE_DA_GAS),
     [Opcode.NULLIFIEREXISTS]: makeCost(c.AVM_NULLIFIEREXISTS_BASE_L2_GAS, 0),
     [Opcode.EMITNULLIFIER]: makeCost(c.AVM_EMITNULLIFIER_BASE_L2_GAS, c.AVM_EMITNULLIFIER_BASE_DA_GAS),
     [Opcode.L1TOL2MSGEXISTS]: makeCost(c.AVM_L1TOL2MSGEXISTS_BASE_L2_GAS, 0),
-    [Opcode.EMITUNENCRYPTEDLOG]: makeCost(c.AVM_EMITUNENCRYPTEDLOG_BASE_L2_GAS, 0),
+    [Opcode.EMITUNENCRYPTEDLOG]: makeCost(c.AVM_EMITUNENCRYPTEDLOG_BASE_L2_GAS, c.AVM_EMITUNENCRYPTEDLOG_BASE_DA_GAS),
     [Opcode.SENDL2TOL1MSG]: makeCost(c.AVM_SENDL2TOL1MSG_BASE_L2_GAS, c.AVM_SENDL2TOL1MSG_BASE_DA_GAS),
     [Opcode.GETCONTRACTINSTANCE]: makeCost(c.AVM_GETCONTRACTINSTANCE_BASE_L2_GAS, 0),
     [Opcode.CALL]: makeCost(c.AVM_CALL_BASE_L2_GAS, 0),
@@ -126,62 +125,55 @@ const DYNAMIC_GAS_COSTS = new Map([
         Opcode.RETURNDATACOPY,
         makeCost(c.AVM_RETURNDATACOPY_DYN_L2_GAS, 0)
     ],
+    // TODO: Call and static call based on bytecode length
     [
         Opcode.EMITUNENCRYPTEDLOG,
         makeCost(c.AVM_EMITUNENCRYPTEDLOG_DYN_L2_GAS, c.AVM_EMITUNENCRYPTEDLOG_DYN_DA_GAS)
     ],
     [
-        Opcode.CALL,
-        makeCost(c.AVM_CALL_DYN_L2_GAS, 0)
+        Opcode.TORADIXBE,
+        makeCost(c.AVM_TORADIXBE_DYN_L2_GAS, 0)
     ],
     [
-        Opcode.STATICCALL,
-        makeCost(c.AVM_STATICCALL_DYN_L2_GAS, 0)
+        Opcode.AND_8,
+        makeCost(c.AVM_BITWISE_DYN_L2_GAS, 0)
     ],
     [
-        Opcode.RETURN,
-        makeCost(c.AVM_RETURN_DYN_L2_GAS, 0)
+        Opcode.AND_16,
+        makeCost(c.AVM_BITWISE_DYN_L2_GAS, 0)
     ],
     [
-        Opcode.REVERT_8,
-        makeCost(c.AVM_REVERT_DYN_L2_GAS, 0)
+        Opcode.OR_8,
+        makeCost(c.AVM_BITWISE_DYN_L2_GAS, 0)
     ],
     [
-        Opcode.REVERT_16,
-        makeCost(c.AVM_REVERT_DYN_L2_GAS, 0)
+        Opcode.OR_16,
+        makeCost(c.AVM_BITWISE_DYN_L2_GAS, 0)
     ],
     [
-        Opcode.DEBUGLOG,
-        makeCost(c.AVM_DEBUGLOG_DYN_L2_GAS, 0)
+        Opcode.XOR_8,
+        makeCost(c.AVM_BITWISE_DYN_L2_GAS, 0)
     ],
     [
-        Opcode.TORADIXBE,
-        makeCost(c.AVM_TORADIXBE_DYN_L2_GAS, 0)
+        Opcode.XOR_16,
+        makeCost(c.AVM_BITWISE_DYN_L2_GAS, 0)
+    ],
+    [
+        Opcode.SSTORE,
+        makeCost(0, c.AVM_SSTORE_DYN_DA_GAS)
     ]
 ]);
 /** Returns the fixed base gas cost for a given opcode. */ export function getBaseGasCost(opcode) {
     return BASE_GAS_COSTS[opcode];
 }
+export function computeAddressingCost(indirectOperandsCount, relativeOperandsCount) {
+    return makeCost((relativeOperandsCount !== 0 ? c.AVM_ADDRESSING_BASE_RESOLUTION_L2_GAS : 0) + indirectOperandsCount * c.AVM_ADDRESSING_INDIRECT_L2_GAS + relativeOperandsCount * c.AVM_ADDRESSING_RELATIVE_L2_GAS, 0);
+}
 export function getDynamicGasCost(opcode) {
     return DYNAMIC_GAS_COSTS.has(opcode) ? DYNAMIC_GAS_COSTS.get(opcode) : makeCost(0, 0);
 }
-/** Returns the gas cost associated with the memory operations performed. */ export function getMemoryGasCost(args) {
-    const { reads, writes, indirect } = args;
-    const indirectCount = Addressing.fromWire(indirect ?? 0).count(AddressingMode.INDIRECT);
-    const l2MemoryGasCost = (reads ?? 0) * GAS_COST_CONSTANTS.MEMORY_READ + (writes ?? 0) * GAS_COST_CONSTANTS.MEMORY_WRITE + indirectCount * GAS_COST_CONSTANTS.MEMORY_INDIRECT_READ_PENALTY;
-    return makeGas({
-        l2Gas: l2MemoryGasCost
-    });
-}
-/** Constants used in base cost calculations. */ export const GAS_COST_CONSTANTS = {
-    MEMORY_READ: 10,
-    MEMORY_INDIRECT_READ_PENALTY: 10,
-    MEMORY_WRITE: 100
-};
-/** Returns gas cost for an operation on a given type tag based on the base cost per byte. */ export function getGasCostForTypeTag(tag, baseCost) {
-    return mulGas(baseCost, getGasCostMultiplierFromTypeTag(tag));
-}
-/** Returns a multiplier based on the size of the type represented by the tag. Throws on uninitialized or invalid. */ function getGasCostMultiplierFromTypeTag(tag) {
+/** Returns a multiplier based on the byte size of the type represented by the integer tag.
+ * Used to account for necessary rows in the bitwise trace. Throws on invalid. */ export function getBitwiseDynamicGasMultiplier(tag) {
     switch(tag){
         case TypeTag.UINT1:
             return 1;
@@ -196,7 +188,7 @@ export function getDynamicGasCost(opcode) {
         case TypeTag.UINT128:
             return 16;
         case TypeTag.FIELD:
-            return 32;
+            return 0; // Field is not allowed for bitwise operations. However we don't fail in gas, since we'll fail in bitwise.
         case TypeTag.INVALID:
             throw new InstructionExecutionError(`Invalid tag type for gas cost multiplier: ${TypeTag[tag]}`);
     }

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

@@ -59,6 +59,8 @@ export declare class AvmMachineState {
     private reverted;
     /** Output data must NOT be modified once it is set */
     private output;
+    /** instruction counter, including nested calls */
+    instrCounter: number;
     constructor(gasLeft: Gas);
     constructor(l2GasLeft: number, daGasLeft: number);
     get gasLeft(): Gas;

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

@@ -1 +1 @@
-{"version":3,"file":"avm_machine_state.d.ts","sourceRoot":"","sources":["../../../src/public/avm/avm_machine_state.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,KAAK,eAAe,EAAiB,MAAM,aAAa,CAAC;AAElE;;GAEG;AACH,MAAM,MAAM,sBAAsB,GAAG;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF;;;;GAIG;AACH,KAAK,iBAAiB,GAAG;IACvB,wBAAwB,EAAE,EAAE,EAAE,CAAC;IAC/B,qBAAqB,EAAE,eAAe,CAAC;CACxC,CAAC;AAEF,KAAK,cAAc,GAAG;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF;;GAEG;AACH,qBAAa,eAAe;IAC1B,6DAA6D;IACtD,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IACzB,kCAAkC;IAC3B,EAAE,EAAE,MAAM,CAAK;IACtB,0DAA0D;IACnD,MAAM,EAAE,MAAM,CAAK;IAC1B,iDAAiD;IAC1C,gBAAgB,EAAE,EAAE,EAAE,CAAM;IACnC,2DAA2D;IACpD,iBAAiB,EAAE,OAAO,CAAS;IAC1C;;;;OAIG;IACI,mBAAmB,EAAE,iBAAiB,GAAG,SAAS,CAAC;IAE1D;;;OAGG;IACI,iBAAiB,EAAE,cAAc,EAAE,CAAM;IAEhD,qCAAqC;IACrC,SAAgB,MAAM,EAAE,YAAY,CAAsB;IAE1D;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAkB;IAChC,2FAA2F;IAC3F,OAAO,CAAC,QAAQ,CAAkB;IAClC,sDAAsD;IACtD,OAAO,CAAC,MAAM,CAAY;gBAEd,OAAO,EAAE,GAAG;gBACZ,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAUhD,IAAW,OAAO,IAAI,GAAG,CAExB;WAEa,SAAS,CAAC,KAAK,EAAE,sBAAsB,GAAG,eAAe;IAIvE;;;;OAIG;IACI,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC;IAqBvC,uDAAuD;IAChD,SAAS,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC;IAKxC;;;;OAIG;IACI,MAAM,CAAC,MAAM,EAAE,EAAE,EAAE;IAK1B;;;;OAIG;IACI,MAAM,CAAC,MAAM,EAAE,EAAE,EAAE;IAMnB,SAAS,IAAI,OAAO;IAIpB,WAAW,IAAI,OAAO;IAItB,SAAS,IAAI,EAAE,EAAE;IAIxB;;OAEG;IACH,OAAO,CAAC,eAAe;CAMxB"}
+{"version":3,"file":"avm_machine_state.d.ts","sourceRoot":"","sources":["../../../src/public/avm/avm_machine_state.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,KAAK,eAAe,EAAiB,MAAM,aAAa,CAAC;AAElE;;GAEG;AACH,MAAM,MAAM,sBAAsB,GAAG;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF;;;;GAIG;AACH,KAAK,iBAAiB,GAAG;IACvB,wBAAwB,EAAE,EAAE,EAAE,CAAC;IAC/B,qBAAqB,EAAE,eAAe,CAAC;CACxC,CAAC;AAEF,KAAK,cAAc,GAAG;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF;;GAEG;AACH,qBAAa,eAAe;IAC1B,6DAA6D;IACtD,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IACzB,kCAAkC;IAC3B,EAAE,EAAE,MAAM,CAAK;IACtB,0DAA0D;IACnD,MAAM,EAAE,MAAM,CAAK;IAC1B,iDAAiD;IAC1C,gBAAgB,EAAE,EAAE,EAAE,CAAM;IACnC,2DAA2D;IACpD,iBAAiB,EAAE,OAAO,CAAS;IAC1C;;;;OAIG;IACI,mBAAmB,EAAE,iBAAiB,GAAG,SAAS,CAAC;IAE1D;;;OAGG;IACI,iBAAiB,EAAE,cAAc,EAAE,CAAM;IAEhD,qCAAqC;IACrC,SAAgB,MAAM,EAAE,YAAY,CAAsB;IAE1D;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAkB;IAChC,2FAA2F;IAC3F,OAAO,CAAC,QAAQ,CAAkB;IAClC,sDAAsD;IACtD,OAAO,CAAC,MAAM,CAAY;IAG1B,kDAAkD;IAC3C,YAAY,EAAE,MAAM,CAAK;gBAGpB,OAAO,EAAE,GAAG;gBACZ,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAUhD,IAAW,OAAO,IAAI,GAAG,CAExB;WAEa,SAAS,CAAC,KAAK,EAAE,sBAAsB,GAAG,eAAe;IAIvE;;;;OAIG;IACI,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC;IAqBvC,uDAAuD;IAChD,SAAS,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC;IAKxC;;;;OAIG;IACI,MAAM,CAAC,MAAM,EAAE,EAAE,EAAE;IAK1B;;;;OAIG;IACI,MAAM,CAAC,MAAM,EAAE,EAAE,EAAE;IAMnB,SAAS,IAAI,OAAO;IAIpB,WAAW,IAAI,OAAO;IAItB,SAAS,IAAI,EAAE,EAAE;IAIxB;;OAEG;IACH,OAAO,CAAC,eAAe;CAMxB"}

package/dest/public/avm/avm_machine_state.js

@@ -25,6 +25,8 @@ import { OutOfGasError } from './errors.js';
    */ halted = false;
     /** Signals that execution has reverted normally (this does not cover exceptional halts) */ reverted = false;
     /** Output data must NOT be modified once it is set */ output = [];
+    // Metrics only - not needed for execution
+    /** instruction counter, including nested calls */ instrCounter = 0;
     constructor(gasLeftOrL2GasLeft, daGasLeft){
         if (typeof gasLeftOrL2GasLeft === 'object') {
             ({ l2Gas: this.l2GasLeft, daGas: this.daGasLeft } = gasLeftOrL2GasLeft);

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

@@ -1,5 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { Fr } from '@aztec/foundation/fields';
 import { type Logger } from '@aztec/foundation/log';
 import type { FunctionsOf } from '@aztec/foundation/types';
@@ -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;
@@ -30,168 +29,180 @@ export declare abstract class IntegralValue extends MemoryValue {
     abstract not(): IntegralValue;
 }
 declare const Uint1_base: {
-    new (n: number | bigint): {
+    new (n: bigint | number): {
         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;
+        getTag(): TypeTag;
         toFr(): Fr;
         toAztecAddress(): AztecAddress;
         toNumber(): number;
         toString(): string;
     };
+    readonly bits: number;
     readonly mod: bigint;
     readonly bitmask: bigint;
 };
 export declare class Uint1 extends Uint1_base {
 }
 declare const Uint8_base: {
-    new (n: number | bigint): {
+    new (n: bigint | number): {
         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;
+        getTag(): TypeTag;
         toFr(): Fr;
         toAztecAddress(): AztecAddress;
         toNumber(): number;
         toString(): string;
     };
+    readonly bits: number;
     readonly mod: bigint;
     readonly bitmask: bigint;
 };
 export declare class Uint8 extends Uint8_base {
 }
 declare const Uint16_base: {
-    new (n: number | bigint): {
+    new (n: bigint | number): {
         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;
+        getTag(): TypeTag;
         toFr(): Fr;
         toAztecAddress(): AztecAddress;
         toNumber(): number;
         toString(): string;
     };
+    readonly bits: number;
     readonly mod: bigint;
     readonly bitmask: bigint;
 };
 export declare class Uint16 extends Uint16_base {
 }
 declare const Uint32_base: {
-    new (n: number | bigint): {
+    new (n: bigint | number): {
         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;
+        getTag(): TypeTag;
         toFr(): Fr;
         toAztecAddress(): AztecAddress;
         toNumber(): number;
         toString(): string;
     };
+    readonly bits: number;
     readonly mod: bigint;
     readonly bitmask: bigint;
 };
 export declare class Uint32 extends Uint32_base {
 }
 declare const Uint64_base: {
-    new (n: number | bigint): {
+    new (n: bigint | number): {
         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;
+        getTag(): TypeTag;
         toFr(): Fr;
         toAztecAddress(): AztecAddress;
         toNumber(): number;
         toString(): string;
     };
+    readonly bits: number;
     readonly mod: bigint;
     readonly bitmask: bigint;
 };
 export declare class Uint64 extends Uint64_base {
 }
 declare const Uint128_base: {
-    new (n: number | bigint): {
+    new (n: bigint | number): {
         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;
+        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;
     /**

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

@@ -6,6 +6,9 @@ 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)) {

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

@@ -1,14 +1,13 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { Fr } from '@aztec/foundation/fields';
 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 InstructionSet } from './serialization/bytecode_serialization.js';
-export declare class AvmSimulator {
+export declare class AvmSimulator implements AvmSimulatorInterface {
     private context;
     private instructionSet;
     private log;
@@ -19,7 +18,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: Fr[], allocatedGas: Gas, clientInitiatedSimulation?: boolean, maxDebugLogMemoryReads?: number): Promise<AvmSimulator>;
     /**
      * Fetch the bytecode and execute it in the current context.
      */

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,0BAA0B,CAAC;AAG9C,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;AAI1E,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;gBAKrD,OAAO,EAAE,UAAU,EACnB,cAAc,GAAE,cAAgC,EACxD,cAAc,UAAQ;WAeJ,KAAK,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC;WAQjD,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,EAAE,EAAE,EACd,YAAY,EAAE,GAAG,EACjB,yBAAyB,GAAE,OAAe,EAC1C,sBAAsB,CAAC,EAAE,MAAM;IAmBjC;;OAEG;IACU,OAAO,IAAI,OAAO,CAAC,qBAAqB,CAAC;IActD;;OAEG;IACI,WAAW,IAAI,MAAM,GAAG,SAAS;IAIxC;;;OAGG;IACU,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC;YA+GhE,+BAA+B;IAoB7C,OAAO,CAAC,gBAAgB;IAQxB,OAAO,CAAC,kBAAkB;CAS3B"}