@aztec/simulator 0.0.0-test.1 → 0.0.1-commit.017a351

package/dest/public/avm/opcodes/accrued_substate.js

@@ -1,11 +1,12 @@
+import { MAX_ETH_ADDRESS_VALUE } from '@aztec/constants';
+import { NullifierCollisionError } from '../../side_effect_errors.js';
 import { TypeTag, Uint1 } from '../avm_memory_types.js';
 import { InstructionExecutionError, StaticCallAlterationError } from '../errors.js';
-import { NullifierCollisionError } from '../journal/nullifiers.js';
 import { Opcode, OperandType } from '../serialization/instruction_serialization.js';
 import { Addressing } from './addressing_mode.js';
 import { Instruction } from './instruction.js';
 export class NoteHashExists extends Instruction {
-    indirect;
+    addressingMode;
     noteHashOffset;
     leafIndexOffset;
     existsOffset;
@@ -19,29 +20,30 @@ export class NoteHashExists extends Instruction {
         OperandType.UINT16,
         OperandType.UINT16
     ];
-    constructor(indirect, noteHashOffset, leafIndexOffset, existsOffset){
-        super(), this.indirect = indirect, this.noteHashOffset = noteHashOffset, this.leafIndexOffset = leafIndexOffset, this.existsOffset = existsOffset;
+    constructor(addressingMode, noteHashOffset, leafIndexOffset, existsOffset){
+        super(), this.addressingMode = addressingMode, this.noteHashOffset = noteHashOffset, this.leafIndexOffset = leafIndexOffset, this.existsOffset = existsOffset;
     }
     async execute(context) {
         const memory = context.machineState.memory;
-        context.machineState.consumeGas(this.gasCost());
+        const addressing = Addressing.fromWire(this.addressingMode);
+        context.machineState.consumeGas(this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()));
         const operands = [
             this.noteHashOffset,
             this.leafIndexOffset,
             this.existsOffset
         ];
-        const addressing = Addressing.fromWire(this.indirect, operands.length);
         const [noteHashOffset, leafIndexOffset, existsOffset] = addressing.resolve(operands, memory);
-        memory.checkTags(TypeTag.FIELD, noteHashOffset, leafIndexOffset);
+        memory.checkTag(TypeTag.FIELD, noteHashOffset);
+        memory.checkTag(TypeTag.UINT64, leafIndexOffset);
         // Note that this instruction accepts any type in memory, and converts to Field.
         const noteHash = memory.get(noteHashOffset).toFr();
-        const leafIndex = memory.get(leafIndexOffset).toFr();
+        const leafIndex = memory.get(leafIndexOffset).toBigInt();
         const exists = await context.persistableState.checkNoteHashExists(context.environment.address, noteHash, leafIndex);
         memory.set(existsOffset, exists ? new Uint1(1) : new Uint1(0));
     }
 }
 export class EmitNoteHash extends Instruction {
-    indirect;
+    addressingMode;
     noteHashOffset;
     static type = 'EMITNOTEHASH';
     static opcode = Opcode.EMITNOTEHASH;
@@ -51,16 +53,16 @@ export class EmitNoteHash extends Instruction {
         OperandType.UINT8,
         OperandType.UINT16
     ];
-    constructor(indirect, noteHashOffset){
-        super(), this.indirect = indirect, this.noteHashOffset = noteHashOffset;
+    constructor(addressingMode, noteHashOffset){
+        super(), this.addressingMode = addressingMode, this.noteHashOffset = noteHashOffset;
     }
     async execute(context) {
         const memory = context.machineState.memory;
-        context.machineState.consumeGas(this.gasCost());
+        const addressing = Addressing.fromWire(this.addressingMode);
+        context.machineState.consumeGas(this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()));
         const operands = [
             this.noteHashOffset
         ];
-        const addressing = Addressing.fromWire(this.indirect, operands.length);
         const [noteHashOffset] = addressing.resolve(operands, memory);
         memory.checkTag(TypeTag.FIELD, noteHashOffset);
         if (context.environment.isStaticCall) {
@@ -71,9 +73,8 @@ export class EmitNoteHash extends Instruction {
     }
 }
 export class NullifierExists extends Instruction {
-    indirect;
-    nullifierOffset;
-    addressOffset;
+    addressingMode;
+    siloedNullifierOffset;
     existsOffset;
     static type = 'NULLIFIEREXISTS';
     static opcode = Opcode.NULLIFIEREXISTS;
@@ -82,31 +83,28 @@ export class NullifierExists extends Instruction {
         OperandType.UINT8,
         OperandType.UINT8,
         OperandType.UINT16,
-        OperandType.UINT16,
         OperandType.UINT16
     ];
-    constructor(indirect, nullifierOffset, addressOffset, existsOffset){
-        super(), this.indirect = indirect, this.nullifierOffset = nullifierOffset, this.addressOffset = addressOffset, this.existsOffset = existsOffset;
+    constructor(addressingMode, siloedNullifierOffset, existsOffset){
+        super(), this.addressingMode = addressingMode, this.siloedNullifierOffset = siloedNullifierOffset, this.existsOffset = existsOffset;
     }
     async execute(context) {
         const memory = context.machineState.memory;
-        context.machineState.consumeGas(this.gasCost());
+        const addressing = Addressing.fromWire(this.addressingMode);
+        context.machineState.consumeGas(this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()));
         const operands = [
-            this.nullifierOffset,
-            this.addressOffset,
+            this.siloedNullifierOffset,
             this.existsOffset
         ];
-        const addressing = Addressing.fromWire(this.indirect, operands.length);
-        const [nullifierOffset, addressOffset, existsOffset] = addressing.resolve(operands, memory);
-        memory.checkTags(TypeTag.FIELD, nullifierOffset, addressOffset);
-        const nullifier = memory.get(nullifierOffset).toFr();
-        const address = memory.get(addressOffset).toAztecAddress();
-        const exists = await context.persistableState.checkNullifierExists(address, nullifier);
+        const [siloedNullifierOffset, existsOffset] = addressing.resolve(operands, memory);
+        memory.checkTag(TypeTag.FIELD, siloedNullifierOffset);
+        const siloedNullifier = memory.get(siloedNullifierOffset).toFr();
+        const exists = await context.persistableState.checkSiloedNullifierExists(siloedNullifier);
         memory.set(existsOffset, exists ? new Uint1(1) : new Uint1(0));
     }
 }
 export class EmitNullifier extends Instruction {
-    indirect;
+    addressingMode;
     nullifierOffset;
     static type = 'EMITNULLIFIER';
     static opcode = Opcode.EMITNULLIFIER;
@@ -116,19 +114,19 @@ export class EmitNullifier extends Instruction {
         OperandType.UINT8,
         OperandType.UINT16
     ];
-    constructor(indirect, nullifierOffset){
-        super(), this.indirect = indirect, this.nullifierOffset = nullifierOffset;
+    constructor(addressingMode, nullifierOffset){
+        super(), this.addressingMode = addressingMode, this.nullifierOffset = nullifierOffset;
     }
     async execute(context) {
         if (context.environment.isStaticCall) {
             throw new StaticCallAlterationError();
         }
         const memory = context.machineState.memory;
-        context.machineState.consumeGas(this.gasCost());
+        const addressing = Addressing.fromWire(this.addressingMode);
+        context.machineState.consumeGas(this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()));
         const operands = [
             this.nullifierOffset
         ];
-        const addressing = Addressing.fromWire(this.indirect, operands.length);
         const [nullifierOffset] = addressing.resolve(operands, memory);
         memory.checkTag(TypeTag.FIELD, nullifierOffset);
         const nullifier = memory.get(nullifierOffset).toFr();
@@ -145,7 +143,7 @@ export class EmitNullifier extends Instruction {
     }
 }
 export class L1ToL2MessageExists extends Instruction {
-    indirect;
+    addressingMode;
     msgHashOffset;
     msgLeafIndexOffset;
     existsOffset;
@@ -159,33 +157,33 @@ export class L1ToL2MessageExists extends Instruction {
         OperandType.UINT16,
         OperandType.UINT16
     ];
-    constructor(indirect, msgHashOffset, msgLeafIndexOffset, existsOffset){
-        super(), this.indirect = indirect, this.msgHashOffset = msgHashOffset, this.msgLeafIndexOffset = msgLeafIndexOffset, this.existsOffset = existsOffset;
+    constructor(addressingMode, msgHashOffset, msgLeafIndexOffset, existsOffset){
+        super(), this.addressingMode = addressingMode, this.msgHashOffset = msgHashOffset, this.msgLeafIndexOffset = msgLeafIndexOffset, this.existsOffset = existsOffset;
     }
     async execute(context) {
         const memory = context.machineState.memory;
-        context.machineState.consumeGas(this.gasCost());
+        const addressing = Addressing.fromWire(this.addressingMode);
+        context.machineState.consumeGas(this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()));
         const operands = [
             this.msgHashOffset,
             this.msgLeafIndexOffset,
             this.existsOffset
         ];
-        const addressing = Addressing.fromWire(this.indirect, operands.length);
         const [msgHashOffset, msgLeafIndexOffset, existsOffset] = addressing.resolve(operands, memory);
-        memory.checkTags(TypeTag.FIELD, msgHashOffset, msgLeafIndexOffset);
+        memory.checkTag(TypeTag.FIELD, msgHashOffset);
+        memory.checkTag(TypeTag.UINT64, msgLeafIndexOffset);
         const msgHash = memory.get(msgHashOffset).toFr();
         const msgLeafIndex = memory.get(msgLeafIndexOffset).toFr();
-        const exists = await context.persistableState.checkL1ToL2MessageExists(context.environment.address, msgHash, msgLeafIndex);
+        const exists = await context.persistableState.checkL1ToL2MessageExists(msgHash, msgLeafIndex);
         memory.set(existsOffset, exists ? new Uint1(1) : new Uint1(0));
     }
 }
-export class EmitUnencryptedLog extends Instruction {
-    indirect;
-    logOffset;
+export class EmitPublicLog extends Instruction {
+    addressingMode;
     logSizeOffset;
-    // TODO(#11124): rename unencrypted -> public
-    static type = 'EMITUNENCRYPTEDLOG';
-    static opcode = Opcode.EMITUNENCRYPTEDLOG;
+    logOffset;
+    static type = 'EMITPUBLICLOG';
+    static opcode = Opcode.EMITPUBLICLOG;
     // Informs (de)serialization. See Instruction.deserialize.
     static wireFormat = [
         OperandType.UINT8,
@@ -193,31 +191,32 @@ export class EmitUnencryptedLog extends Instruction {
         OperandType.UINT16,
         OperandType.UINT16
     ];
-    constructor(indirect, logOffset, logSizeOffset){
-        super(), this.indirect = indirect, this.logOffset = logOffset, this.logSizeOffset = logSizeOffset;
+    constructor(addressingMode, logSizeOffset, logOffset){
+        super(), this.addressingMode = addressingMode, this.logSizeOffset = logSizeOffset, this.logOffset = logOffset;
     }
     async execute(context) {
         if (context.environment.isStaticCall) {
             throw new StaticCallAlterationError();
         }
         const memory = context.machineState.memory;
+        const addressing = Addressing.fromWire(this.addressingMode);
+        context.machineState.consumeGas(this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()));
         const operands = [
-            this.logOffset,
-            this.logSizeOffset
+            this.logSizeOffset,
+            this.logOffset
         ];
-        const addressing = Addressing.fromWire(this.indirect, operands.length);
-        const [logOffset, logSizeOffset] = addressing.resolve(operands, memory);
+        const [logSizeOffset, logOffset] = addressing.resolve(operands, memory);
         memory.checkTag(TypeTag.UINT32, logSizeOffset);
         const logSize = memory.get(logSizeOffset).toNumber();
-        memory.checkTagsRange(TypeTag.FIELD, logOffset, logSize);
         const contractAddress = context.environment.address;
-        context.machineState.consumeGas(this.gasCost(logSize));
+        context.machineState.consumeGas(this.dynamicGasCost(logSize));
+        memory.checkTagsRange(TypeTag.FIELD, logOffset, logSize);
         const log = memory.getSlice(logOffset, logSize).map((f)=>f.toFr());
         context.persistableState.writePublicLog(contractAddress, log);
     }
 }
 export class SendL2ToL1Message extends Instruction {
-    indirect;
+    addressingMode;
     recipientOffset;
     contentOffset;
     static type = 'SENDL2TOL1MSG';
@@ -229,23 +228,26 @@ export class SendL2ToL1Message extends Instruction {
         OperandType.UINT16,
         OperandType.UINT16
     ];
-    constructor(indirect, recipientOffset, contentOffset){
-        super(), this.indirect = indirect, this.recipientOffset = recipientOffset, this.contentOffset = contentOffset;
+    constructor(addressingMode, recipientOffset, contentOffset){
+        super(), this.addressingMode = addressingMode, this.recipientOffset = recipientOffset, this.contentOffset = contentOffset;
     }
     async execute(context) {
         if (context.environment.isStaticCall) {
             throw new StaticCallAlterationError();
         }
         const memory = context.machineState.memory;
-        context.machineState.consumeGas(this.gasCost());
+        const addressing = Addressing.fromWire(this.addressingMode);
+        context.machineState.consumeGas(this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()));
         const operands = [
             this.recipientOffset,
             this.contentOffset
         ];
-        const addressing = Addressing.fromWire(this.indirect, operands.length);
         const [recipientOffset, contentOffset] = addressing.resolve(operands, memory);
         memory.checkTags(TypeTag.FIELD, recipientOffset, contentOffset);
         const recipient = memory.get(recipientOffset).toFr();
+        if (recipient.toBigInt() > MAX_ETH_ADDRESS_VALUE) {
+            throw new InstructionExecutionError(`SENDL2TOL1MSG: Recipient address is too large`);
+        }
         const content = memory.get(contentOffset).toFr();
         context.persistableState.writeL2ToL1Message(context.environment.address, recipient, content);
     }

package/dest/public/avm/opcodes/addressing_mode.d.ts

@@ -1,3 +1,5 @@
+import { AVM_MAX_OPERANDS } from '@aztec/constants';
+import type { Tuple } from '@aztec/foundation/serialize';
 import { type TaggedMemoryInterface } from '../avm_memory_types.js';
 export declare enum AddressingMode {
     DIRECT = 0,
@@ -7,21 +9,23 @@ export declare enum AddressingMode {
 }
 /** A class to represent the addressing mode of an instruction. */
 export declare class Addressing {
-    /** The addressing mode for each operand. The length of this array is the number of operands of the instruction. */
+    /** The addressing mode for each possible operand. */
     private readonly modePerOperand;
     constructor(
-    /** The addressing mode for each operand. The length of this array is the number of operands of the instruction. */
-    modePerOperand: AddressingMode[]);
-    static fromWire(wireModes: number, numOperands?: number): Addressing;
+    /** The addressing mode for each possible operand. */
+    modePerOperand: Tuple<AddressingMode, typeof AVM_MAX_OPERANDS>);
+    static fromModes(modes: AddressingMode[]): Addressing;
+    static fromWire(wireModes: number): Addressing;
     toWire(): number;
-    /** Returns how many operands use the given addressing mode. */
-    count(mode: AddressingMode): number;
+    indirectOperandsCount(): number;
+    relativeOperandsCount(): number;
     /**
      * Resolves the offsets using the addressing mode.
      * @param offsets The offsets to resolve.
      * @param mem The memory to use for resolution.
-     * @returns The resolved offsets. The length of the returned array is the same as the length of the input array.
+     * @returns The resolved offsets. The length of the returned array is the same as the length of the input array and the resolved offsets are guaranteed to be valid addresses.
+     * @throws An error if any step failed. Should be treated as a black box.
      */
     resolve(offsets: number[], mem: TaggedMemoryInterface): number[];
 }
-//# sourceMappingURL=addressing_mode.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWRkcmVzc2luZ19tb2RlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvcHVibGljL2F2bS9vcGNvZGVzL2FkZHJlc3NpbmdfbW9kZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUVwRCxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUl6RCxPQUFPLEVBQTZCLEtBQUsscUJBQXFCLEVBQVcsTUFBTSx3QkFBd0IsQ0FBQztBQUd4RyxvQkFBWSxjQUFjO0lBQ3hCLE1BQU0sSUFBSTtJQUNWLFFBQVEsSUFBSTtJQUNaLFFBQVEsSUFBSTtJQUNaLGlCQUFpQixJQUFJO0NBQ3RCO0FBRUQsa0VBQWtFO0FBQ2xFLHFCQUFhLFVBQVU7SUFFbkIscURBQXFEO0lBQ3JELE9BQU8sQ0FBQyxRQUFRLENBQUMsY0FBYztJQUZqQztJQUNFLHFEQUFxRDtJQUNwQyxjQUFjLEVBQUUsS0FBSyxDQUFDLGNBQWMsRUFBRSxPQUFPLGdCQUFnQixDQUFDLEVBQzdFO0lBRUosT0FBYyxTQUFTLENBQUMsS0FBSyxFQUFFLGNBQWMsRUFBRSxHQUFHLFVBQVUsQ0FHM0Q7SUFFRCxPQUFjLFFBQVEsQ0FBQyxTQUFTLEVBQUUsTUFBTSxHQUFHLFVBQVUsQ0FXcEQ7SUFFTSxNQUFNLElBQUksTUFBTSxDQWF0QjtJQUVNLHFCQUFxQixJQUFJLE1BQU0sQ0FFckM7SUFFTSxxQkFBcUIsSUFBSSxNQUFNLENBRXJDO0lBRUQ7Ozs7OztPQU1HO0lBQ0ksT0FBTyxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFBRSxHQUFHLEVBQUUscUJBQXFCLEdBQUcsTUFBTSxFQUFFLENBc0N0RTtDQUNGIn0=

package/dest/public/avm/opcodes/addressing_mode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"addressing_mode.d.ts","sourceRoot":"","sources":["../../../../src/public/avm/opcodes/addressing_mode.ts"],"names":[],"mappings":"AAEA,OAAO,EAAgB,KAAK,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAGlF,oBAAY,cAAc;IACxB,MAAM,IAAI;IACV,QAAQ,IAAI;IACZ,QAAQ,IAAI;IACZ,iBAAiB,IAAI;CACtB;AAED,kEAAkE;AAClE,qBAAa,UAAU;IAEnB,mHAAmH;IACnH,OAAO,CAAC,QAAQ,CAAC,cAAc;;IAD/B,mHAAmH;IAClG,cAAc,EAAE,cAAc,EAAE;WAIrC,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,GAAE,MAAU,GAAG,UAAU;IAYvE,MAAM,IAAI,MAAM;IAevB,+DAA+D;IACxD,KAAK,CAAC,IAAI,EAAE,cAAc,GAAG,MAAM;IAI1C;;;;;OAKG;IACI,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,qBAAqB,GAAG,MAAM,EAAE;CA4BxE"}
+{"version":3,"file":"addressing_mode.d.ts","sourceRoot":"","sources":["../../../../src/public/avm/opcodes/addressing_mode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAIzD,OAAO,EAA6B,KAAK,qBAAqB,EAAW,MAAM,wBAAwB,CAAC;AAGxG,oBAAY,cAAc;IACxB,MAAM,IAAI;IACV,QAAQ,IAAI;IACZ,QAAQ,IAAI;IACZ,iBAAiB,IAAI;CACtB;AAED,kEAAkE;AAClE,qBAAa,UAAU;IAEnB,qDAAqD;IACrD,OAAO,CAAC,QAAQ,CAAC,cAAc;IAFjC;IACE,qDAAqD;IACpC,cAAc,EAAE,KAAK,CAAC,cAAc,EAAE,OAAO,gBAAgB,CAAC,EAC7E;IAEJ,OAAc,SAAS,CAAC,KAAK,EAAE,cAAc,EAAE,GAAG,UAAU,CAG3D;IAED,OAAc,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,UAAU,CAWpD;IAEM,MAAM,IAAI,MAAM,CAatB;IAEM,qBAAqB,IAAI,MAAM,CAErC;IAEM,qBAAqB,IAAI,MAAM,CAErC;IAED;;;;;;OAMG;IACI,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,qBAAqB,GAAG,MAAM,EAAE,CAsCtE;CACF"}

package/dest/public/avm/opcodes/addressing_mode.js

@@ -1,6 +1,8 @@
+import { AVM_MAX_OPERANDS } from '@aztec/constants';
+import { padArrayEnd } from '@aztec/foundation/collection';
 import { strict as assert } from 'assert';
-import { TaggedMemory } from '../avm_memory_types.js';
-import { RelativeAddressOutOfRangeError } from '../errors.js';
+import { TaggedMemory, TypeTag } from '../avm_memory_types.js';
+import { RelativeAddressOutOfRangeError, TagCheckError } from '../errors.js';
 export var AddressingMode = /*#__PURE__*/ function(AddressingMode) {
     AddressingMode[AddressingMode["DIRECT"] = 0] = "DIRECT";
     AddressingMode[AddressingMode["INDIRECT"] = 1] = "INDIRECT";
@@ -10,17 +12,21 @@ export var AddressingMode = /*#__PURE__*/ function(AddressingMode) {
 }({});
 /** A class to represent the addressing mode of an instruction. */ export class Addressing {
     modePerOperand;
-    constructor(/** The addressing mode for each operand. The length of this array is the number of operands of the instruction. */ modePerOperand){
+    constructor(/** The addressing mode for each possible operand. */ modePerOperand){
         this.modePerOperand = modePerOperand;
     }
-    // TODO(facundo): 8 for backwards compatibility.
-    static fromWire(wireModes, numOperands = 8) {
-        // The modes are stored in the wire format as a byte, with each bit representing the mode for an operand.
-        // The least significant bit represents the zeroth operand, and the most significant bit represents the last operand.
-        const modes = new Array(numOperands);
-        for(let i = 0; i < numOperands; i++){
-            modes[i] = (wireModes >> i & 1) * 1 | (wireModes >> i + numOperands & 1) * 2;
+    static fromModes(modes) {
+        assert(modes.length <= AVM_MAX_OPERANDS, 'Too many operands for addressing mode');
+        return new Addressing(padArrayEnd(modes, 0, AVM_MAX_OPERANDS));
+    }
+    static fromWire(wireModes) {
+        // The modes are stored in the wire format as one or two bytes, with each two bits representing the modes for an operand.
+        // Even bits are indirect, odd bits are relative.
+        const modes = new Array(AVM_MAX_OPERANDS);
+        for(let i = 0; i < AVM_MAX_OPERANDS; i++){
+            modes[i] = (wireModes >> i * 2 & 1) * 1 | (wireModes >> i * 2 + 1 & 1) * 2;
         }
+        // Casting the array to tuple since it should be more performant than using makeTuple
         return new Addressing(modes);
     }
     toWire() {
@@ -29,44 +35,58 @@ export var AddressingMode = /*#__PURE__*/ function(AddressingMode) {
         let wire = 0;
         for(let i = 0; i < this.modePerOperand.length; i++){
             if (this.modePerOperand[i] & 1) {
-                wire |= 1 << i;
+                wire |= 1 << i * 2;
             }
             if (this.modePerOperand[i] & 2) {
-                wire |= 1 << this.modePerOperand.length + i;
+                wire |= 1 << i * 2 + 1;
             }
         }
         return wire;
     }
-    /** Returns how many operands use the given addressing mode. */ count(mode) {
-        return this.modePerOperand.filter((m)=>(m & mode) !== 0).length;
+    indirectOperandsCount() {
+        return this.modePerOperand.filter((mode)=>mode & 1).length;
+    }
+    relativeOperandsCount() {
+        return this.modePerOperand.filter((mode)=>mode & 2).length;
     }
     /**
    * Resolves the offsets using the addressing mode.
    * @param offsets The offsets to resolve.
    * @param mem The memory to use for resolution.
-   * @returns The resolved offsets. The length of the returned array is the same as the length of the input array.
+   * @returns The resolved offsets. The length of the returned array is the same as the length of the input array and the resolved offsets are guaranteed to be valid addresses.
+   * @throws An error if any step failed. Should be treated as a black box.
    */ resolve(offsets, mem) {
-        assert(offsets.length <= this.modePerOperand.length);
         const resolved = new Array(offsets.length);
-        let didRelativeOnce = false;
-        let baseAddr = 0;
+        // These will be read (once) if we have any relative operands.
+        let baseAddr;
         for (const [i, offset] of offsets.entries()){
             const mode = this.modePerOperand[i];
+            // The given offsets are assumed to be valid addresses.
             resolved[i] = offset;
             if (mode & 2) {
-                if (!didRelativeOnce) {
-                    mem.checkIsValidMemoryOffsetTag(0);
-                    baseAddr = Number(mem.get(0).toBigInt());
-                    didRelativeOnce = true;
+                if (!baseAddr) {
+                    baseAddr = mem.get(0);
+                    const baseAddrTag = baseAddr.getTag();
+                    if (!TaggedMemory.isValidMemoryAddressTag(baseAddrTag)) {
+                        throw TagCheckError.forBaseAddress(TypeTag[baseAddrTag]);
+                    }
                 }
-                resolved[i] += baseAddr;
+                // Here we know that resolved[i] is at most 32 bits and baseAddr is at most 32 bits.
+                // Therefore, the addition is safe since the `number` type fits more than 33 bits.
+                resolved[i] += Number(baseAddr.toBigInt());
                 if (resolved[i] >= TaggedMemory.MAX_MEMORY_SIZE) {
-                    throw new RelativeAddressOutOfRangeError(baseAddr, offset);
+                    throw new RelativeAddressOutOfRangeError(Number(baseAddr.toBigInt()), offset);
                 }
             }
             if (mode & 1) {
-                mem.checkIsValidMemoryOffsetTag(resolved[i]);
-                resolved[i] = Number(mem.get(resolved[i]).toBigInt());
+                // At this point we know that resolved[i] is a valid memory address.
+                const resolvedValue = mem.get(resolved[i]);
+                const resolvedTag = resolvedValue.getTag();
+                // Final check.
+                if (!TaggedMemory.isValidMemoryAddressTag(resolvedTag)) {
+                    throw TagCheckError.forIndirectAddress(resolved[i], TypeTag[resolvedTag]);
+                }
+                resolved[i] = Number(resolvedValue.toBigInt());
             }
         }
         return resolved;

package/dest/public/avm/opcodes/arithmetic.d.ts

@@ -1,5 +1,5 @@
 import type { AvmContext } from '../avm_context.js';
-import { type Field, type MemoryValue, type TaggedMemoryInterface } from '../avm_memory_types.js';
+import { type Field, type IntegralValue, type MemoryValue, type TaggedMemoryInterface } from '../avm_memory_types.js';
 import { Opcode } from '../serialization/instruction_serialization.js';
 import { ThreeOperandInstruction } from './instruction_impl.js';
 export declare abstract class ThreeOperandArithmeticInstruction extends ThreeOperandInstruction {
@@ -34,4 +34,16 @@ export declare class FieldDiv extends ThreeOperandArithmeticInstruction {
     protected compute(a: Field, b: Field): Field;
     protected checkTags(memory: TaggedMemoryInterface, aOffset: number, bOffset: number): void;
 }
-//# sourceMappingURL=arithmetic.d.ts.map
+export declare class Shl extends ThreeOperandArithmeticInstruction {
+    static readonly type: string;
+    static readonly opcode = Opcode.SHL_8;
+    protected compute(a: IntegralValue, b: IntegralValue): IntegralValue;
+    protected checkTags(memory: TaggedMemoryInterface, aOffset: number, bOffset: number): void;
+}
+export declare class Shr extends ThreeOperandArithmeticInstruction {
+    static readonly type: string;
+    static readonly opcode = Opcode.SHR_8;
+    protected compute(a: IntegralValue, b: IntegralValue): IntegralValue;
+    protected checkTags(memory: TaggedMemoryInterface, aOffset: number, bOffset: number): void;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXJpdGhtZXRpYy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3B1YmxpYy9hdm0vb3Bjb2Rlcy9hcml0aG1ldGljLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3BELE9BQU8sRUFDTCxLQUFLLEtBQUssRUFDVixLQUFLLGFBQWEsRUFDbEIsS0FBSyxXQUFXLEVBRWhCLEtBQUsscUJBQXFCLEVBRTNCLE1BQU0sd0JBQXdCLENBQUM7QUFFaEMsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLCtDQUErQyxDQUFDO0FBRXZFLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRWhFLDhCQUFzQixpQ0FBa0MsU0FBUSx1QkFBdUI7SUFDeEUsT0FBTyxDQUFDLE9BQU8sRUFBRSxVQUFVLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQWlCdkQ7SUFFRCxTQUFTLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDLEVBQUUsV0FBVyxFQUFFLENBQUMsRUFBRSxXQUFXLEdBQUcsV0FBVyxDQUFDO0lBQ3hFLFNBQVMsQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFLHFCQUFxQixFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFFLE1BQU0sUUFFbEY7Q0FDRjtBQUVELHFCQUFhLEdBQUksU0FBUSxpQ0FBaUM7SUFDeEQsTUFBTSxDQUFDLFFBQVEsQ0FBQyxJQUFJLEVBQUUsTUFBTSxDQUFTO0lBQ3JDLE1BQU0sQ0FBQyxRQUFRLENBQUMsTUFBTSxnQkFBZ0I7SUFFdEMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxDQUFDLEVBQUUsV0FBVyxFQUFFLENBQUMsRUFBRSxXQUFXLEdBQUcsV0FBVyxDQUU3RDtDQUNGO0FBRUQscUJBQWEsR0FBSSxTQUFRLGlDQUFpQztJQUN4RCxNQUFNLENBQUMsUUFBUSxDQUFDLElBQUksRUFBRSxNQUFNLENBQVM7SUFDckMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxNQUFNLGdCQUFnQjtJQUV0QyxTQUFTLENBQUMsT0FBTyxDQUFDLENBQUMsRUFBRSxXQUFXLEVBQUUsQ0FBQyxFQUFFLFdBQVcsR0FBRyxXQUFXLENBRTdEO0NBQ0Y7QUFFRCxxQkFBYSxHQUFJLFNBQVEsaUNBQWlDO0lBQ3hELE1BQU0sQ0FBQyxJQUFJLEVBQUUsTUFBTSxDQUFTO0lBQzVCLE1BQU0sQ0FBQyxRQUFRLENBQUMsTUFBTSxnQkFBZ0I7SUFFdEMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxDQUFDLEVBQUUsV0FBVyxFQUFFLENBQUMsRUFBRSxXQUFXLEdBQUcsV0FBVyxDQUU3RDtDQUNGO0FBRUQscUJBQWEsR0FBSSxTQUFRLGlDQUFpQztJQUN4RCxNQUFNLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBUztJQUM1QixNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sZ0JBQWdCO0lBRXRDLFNBQVMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxFQUFFLFdBQVcsRUFBRSxDQUFDLEVBQUUsV0FBVyxHQUFHLFdBQVcsQ0FNN0Q7SUFFRCxVQUFtQixTQUFTLENBQUMsTUFBTSxFQUFFLHFCQUFxQixFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFFLE1BQU0sUUFHM0Y7Q0FDRjtBQUVELHFCQUFhLFFBQVMsU0FBUSxpQ0FBaUM7SUFDN0QsTUFBTSxDQUFDLElBQUksRUFBRSxNQUFNLENBQVU7SUFDN0IsTUFBTSxDQUFDLFFBQVEsQ0FBQyxNQUFNLGlCQUFpQjtJQUV2QyxTQUFTLENBQUMsT0FBTyxDQUFDLENBQUMsRUFBRSxLQUFLLEVBQUUsQ0FBQyxFQUFFLEtBQUssR0FBRyxLQUFLLENBSzNDO0lBRUQsVUFBbUIsU0FBUyxDQUFDLE1BQU0sRUFBRSxxQkFBcUIsRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLE9BQU8sRUFBRSxNQUFNLFFBRzNGO0NBQ0Y7QUFFRCxxQkFBYSxHQUFJLFNBQVEsaUNBQWlDO0lBQ3hELE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBUztJQUNyQyxNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sZ0JBQWdCO0lBRXRDLFVBQW1CLE9BQU8sQ0FBQyxDQUFDLEVBQUUsYUFBYSxFQUFFLENBQUMsRUFBRSxhQUFhLEdBQUcsYUFBYSxDQUU1RTtJQUVELFVBQW1CLFNBQVMsQ0FBQyxNQUFNLEVBQUUscUJBQXFCLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUUsTUFBTSxRQUczRjtDQUNGO0FBRUQscUJBQWEsR0FBSSxTQUFRLGlDQUFpQztJQUN4RCxNQUFNLENBQUMsUUFBUSxDQUFDLElBQUksRUFBRSxNQUFNLENBQVM7SUFDckMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxNQUFNLGdCQUFnQjtJQUV0QyxVQUFtQixPQUFPLENBQUMsQ0FBQyxFQUFFLGFBQWEsRUFBRSxDQUFDLEVBQUUsYUFBYSxHQUFHLGFBQWEsQ0FFNUU7SUFFRCxVQUFtQixTQUFTLENBQUMsTUFBTSxFQUFFLHFCQUFxQixFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFFLE1BQU0sUUFHM0Y7Q0FDRiJ9

package/dest/public/avm/opcodes/arithmetic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"arithmetic.d.ts","sourceRoot":"","sources":["../../../../src/public/avm/opcodes/arithmetic.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EACL,KAAK,KAAK,EACV,KAAK,WAAW,EAEhB,KAAK,qBAAqB,EAE3B,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,MAAM,EAAE,MAAM,+CAA+C,CAAC;AAEvE,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAEhE,8BAAsB,iCAAkC,SAAQ,uBAAuB;IACxE,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBxD,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,WAAW,GAAG,WAAW;IACvE,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,qBAAqB,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;CAGpF;AAED,qBAAa,GAAI,SAAQ,iCAAiC;IACxD,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAS;IACrC,MAAM,CAAC,QAAQ,CAAC,MAAM,gBAAgB;IAEtC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,WAAW,GAAG,WAAW;CAG/D;AAED,qBAAa,GAAI,SAAQ,iCAAiC;IACxD,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAS;IACrC,MAAM,CAAC,QAAQ,CAAC,MAAM,gBAAgB;IAEtC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,WAAW,GAAG,WAAW;CAG/D;AAED,qBAAa,GAAI,SAAQ,iCAAiC;IACxD,MAAM,CAAC,IAAI,EAAE,MAAM,CAAS;IAC5B,MAAM,CAAC,QAAQ,CAAC,MAAM,gBAAgB;IAEtC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,WAAW,GAAG,WAAW;CAG/D;AAED,qBAAa,GAAI,SAAQ,iCAAiC;IACxD,MAAM,CAAC,IAAI,EAAE,MAAM,CAAS;IAC5B,MAAM,CAAC,QAAQ,CAAC,MAAM,gBAAgB;IAEtC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,WAAW,GAAG,WAAW;cAQ3C,SAAS,CAAC,MAAM,EAAE,qBAAqB,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;CAI7F;AAED,qBAAa,QAAS,SAAQ,iCAAiC;IAC7D,MAAM,CAAC,IAAI,EAAE,MAAM,CAAU;IAC7B,MAAM,CAAC,QAAQ,CAAC,MAAM,iBAAiB;IAEvC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,GAAG,KAAK;cAKzB,SAAS,CAAC,MAAM,EAAE,qBAAqB,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;CAI7F"}
+{"version":3,"file":"arithmetic.d.ts","sourceRoot":"","sources":["../../../../src/public/avm/opcodes/arithmetic.ts"],"names":[],"mappings":"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"}

package/dest/public/avm/opcodes/arithmetic.js

@@ -6,13 +6,13 @@ import { ThreeOperandInstruction } from './instruction_impl.js';
 export class ThreeOperandArithmeticInstruction extends ThreeOperandInstruction {
     async execute(context) {
         const memory = context.machineState.memory;
-        context.machineState.consumeGas(this.gasCost());
+        const addressing = Addressing.fromWire(this.addressingMode);
+        context.machineState.consumeGas(this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()));
         const operands = [
             this.aOffset,
             this.bOffset,
             this.dstOffset
         ];
-        const addressing = Addressing.fromWire(this.indirect, operands.length);
         const [aOffset, bOffset, dstOffset] = addressing.resolve(operands, memory);
         this.checkTags(memory, aOffset, bOffset);
         const a = memory.get(aOffset);
@@ -63,7 +63,9 @@ export class FieldDiv extends ThreeOperandArithmeticInstruction {
     static type = 'FDIV';
     static opcode = Opcode.FDIV_8;
     compute(a, b) {
-        // return (a as Field).fdiv(b as Field);
+        if (b.toBigInt() === 0n) {
+            throw new ArithmeticError('Division by zero');
+        }
         return a.fdiv(b);
     }
     checkTags(memory, aOffset, bOffset) {
@@ -71,3 +73,25 @@ export class FieldDiv extends ThreeOperandArithmeticInstruction {
         memory.checkTag(TypeTag.FIELD, aOffset); // Follows that bOffset has also tag of type Field
     }
 }
+export class Shl extends ThreeOperandArithmeticInstruction {
+    static type = 'SHL';
+    static opcode = Opcode.SHL_8;
+    compute(a, b) {
+        return a.shl(b);
+    }
+    checkTags(memory, aOffset, bOffset) {
+        memory.checkTagsAreSame(aOffset, bOffset);
+        TaggedMemory.checkIsIntegralTag(memory.getTag(aOffset)); // Follows that bOffset tag is also of integral type
+    }
+}
+export class Shr extends ThreeOperandArithmeticInstruction {
+    static type = 'SHR';
+    static opcode = Opcode.SHR_8;
+    compute(a, b) {
+        return a.shr(b);
+    }
+    checkTags(memory, aOffset, bOffset) {
+        memory.checkTagsAreSame(aOffset, bOffset);
+        TaggedMemory.checkIsIntegralTag(memory.getTag(aOffset)); // Follows that bOffset tag is also of integral type
+    }
+}

package/dest/public/avm/opcodes/bitwise.d.ts

@@ -1,5 +1,5 @@
 import type { AvmContext } from '../avm_context.js';
-import { type IntegralValue, type TaggedMemoryInterface } from '../avm_memory_types.js';
+import { type IntegralValue, type TaggedMemoryInterface, TypeTag } from '../avm_memory_types.js';
 import { Opcode, OperandType } from '../serialization/instruction_serialization.js';
 import { Instruction } from './instruction.js';
 import { ThreeOperandInstruction } from './instruction_impl.js';
@@ -7,44 +7,36 @@ declare abstract class ThreeOperandBitwiseInstruction extends ThreeOperandInstru
     execute(context: AvmContext): Promise<void>;
     protected abstract compute(a: IntegralValue, b: IntegralValue): IntegralValue;
     protected checkTags(memory: TaggedMemoryInterface, aOffset: number, bOffset: number): void;
+    protected getDynamicMultiplier(_lhsTag: TypeTag): number;
 }
 export declare class And extends ThreeOperandBitwiseInstruction {
     static readonly type: string;
     static readonly opcode = Opcode.AND_8;
     protected compute(a: IntegralValue, b: IntegralValue): IntegralValue;
+    protected getDynamicMultiplier(lhsTag: TypeTag): number;
 }
 export declare class Or extends ThreeOperandBitwiseInstruction {
     static readonly type: string;
     static readonly opcode = Opcode.OR_8;
     protected compute(a: IntegralValue, b: IntegralValue): IntegralValue;
+    protected getDynamicMultiplier(lhsTag: TypeTag): number;
 }
 export declare class Xor extends ThreeOperandBitwiseInstruction {
     static readonly type: string;
     static readonly opcode = Opcode.XOR_8;
     protected compute(a: IntegralValue, b: IntegralValue): IntegralValue;
-}
-export declare class Shl extends ThreeOperandBitwiseInstruction {
-    static readonly type: string;
-    static readonly opcode = Opcode.SHL_8;
-    protected compute(a: IntegralValue, b: IntegralValue): IntegralValue;
-    protected checkTags(memory: TaggedMemoryInterface, aOffset: number, bOffset: number): void;
-}
-export declare class Shr extends ThreeOperandBitwiseInstruction {
-    static readonly type: string;
-    static readonly opcode = Opcode.SHR_8;
-    protected compute(a: IntegralValue, b: IntegralValue): IntegralValue;
-    protected checkTags(memory: TaggedMemoryInterface, aOffset: number, bOffset: number): void;
+    protected getDynamicMultiplier(lhsTag: TypeTag): number;
 }
 export declare class Not extends Instruction {
-    private indirect;
+    private addressingMode;
     private srcOffset;
     private dstOffset;
     static readonly type: string;
     static readonly opcode = Opcode.NOT_8;
     static readonly wireFormat8: OperandType[];
     static readonly wireFormat16: OperandType[];
-    constructor(indirect: number, srcOffset: number, dstOffset: number);
+    constructor(addressingMode: number, srcOffset: number, dstOffset: number);
     execute(context: AvmContext): Promise<void>;
 }
 export {};
-//# sourceMappingURL=bitwise.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYml0d2lzZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3B1YmxpYy9hdm0vb3Bjb2Rlcy9iaXR3aXNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRXBELE9BQU8sRUFBRSxLQUFLLGFBQWEsRUFBZ0IsS0FBSyxxQkFBcUIsRUFBRSxPQUFPLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUMvRyxPQUFPLEVBQUUsTUFBTSxFQUFFLFdBQVcsRUFBRSxNQUFNLCtDQUErQyxDQUFDO0FBRXBGLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUMvQyxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVoRSx1QkFBZSw4QkFBK0IsU0FBUSx1QkFBdUI7SUFDOUQsT0FBTyxDQUFDLE9BQU8sRUFBRSxVQUFVLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQW9CdkQ7SUFFRCxTQUFTLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDLEVBQUUsYUFBYSxFQUFFLENBQUMsRUFBRSxhQUFhLEdBQUcsYUFBYSxDQUFDO0lBQzlFLFNBQVMsQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFLHFCQUFxQixFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFFLE1BQU0sUUFHbEY7SUFFRCxTQUFTLENBQUMsb0JBQW9CLENBQUMsT0FBTyxFQUFFLE9BQU8sR0FBRyxNQUFNLENBRXZEO0NBQ0Y7QUFFRCxxQkFBYSxHQUFJLFNBQVEsOEJBQThCO0lBQ3JELE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBUztJQUNyQyxNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sZ0JBQWdCO0lBRXRDLFVBQW1CLE9BQU8sQ0FBQyxDQUFDLEVBQUUsYUFBYSxFQUFFLENBQUMsRUFBRSxhQUFhLEdBQUcsYUFBYSxDQUU1RTtJQUVELFVBQW1CLG9CQUFvQixDQUFDLE1BQU0sRUFBRSxPQUFPLEdBQUcsTUFBTSxDQUUvRDtDQUNGO0FBRUQscUJBQWEsRUFBRyxTQUFRLDhCQUE4QjtJQUNwRCxNQUFNLENBQUMsUUFBUSxDQUFDLElBQUksRUFBRSxNQUFNLENBQVE7SUFDcEMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxNQUFNLGVBQWU7SUFFckMsVUFBbUIsT0FBTyxDQUFDLENBQUMsRUFBRSxhQUFhLEVBQUUsQ0FBQyxFQUFFLGFBQWEsR0FBRyxhQUFhLENBRTVFO0lBRUQsVUFBbUIsb0JBQW9CLENBQUMsTUFBTSxFQUFFLE9BQU8sR0FBRyxNQUFNLENBRS9EO0NBQ0Y7QUFFRCxxQkFBYSxHQUFJLFNBQVEsOEJBQThCO0lBQ3JELE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBUztJQUNyQyxNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sZ0JBQWdCO0lBRXRDLFVBQW1CLE9BQU8sQ0FBQyxDQUFDLEVBQUUsYUFBYSxFQUFFLENBQUMsRUFBRSxhQUFhLEdBQUcsYUFBYSxDQUU1RTtJQUVELFVBQW1CLG9CQUFvQixDQUFDLE1BQU0sRUFBRSxPQUFPLEdBQUcsTUFBTSxDQUUvRDtDQUNGO0FBRUQscUJBQWEsR0FBSSxTQUFRLFdBQVc7SUFRaEMsT0FBTyxDQUFDLGNBQWM7SUFDdEIsT0FBTyxDQUFDLFNBQVM7SUFDakIsT0FBTyxDQUFDLFNBQVM7SUFUbkIsTUFBTSxDQUFDLFFBQVEsQ0FBQyxJQUFJLEVBQUUsTUFBTSxDQUFTO0lBQ3JDLE1BQU0sQ0FBQyxRQUFRLENBQUMsTUFBTSxnQkFBZ0I7SUFFdEMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxXQUFXLGdCQUFnRjtJQUMzRyxNQUFNLENBQUMsUUFBUSxDQUFDLFlBQVksZ0JBQWtGO0lBRTlHLFlBQ1UsY0FBYyxFQUFFLE1BQU0sRUFDdEIsU0FBUyxFQUFFLE1BQU0sRUFDakIsU0FBUyxFQUFFLE1BQU0sRUFHMUI7SUFFWSxPQUFPLENBQUMsT0FBTyxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBZXZEO0NBQ0YifQ==

package/dest/public/avm/opcodes/bitwise.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bitwise.d.ts","sourceRoot":"","sources":["../../../../src/public/avm/opcodes/bitwise.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,KAAK,aAAa,EAAgB,KAAK,qBAAqB,EAAW,MAAM,wBAAwB,CAAC;AAC/G,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAC;AAEpF,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAEhE,uBAAe,8BAA+B,SAAQ,uBAAuB;IAC9D,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBxD,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,GAAG,aAAa;IAC7E,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,qBAAqB,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;CAIpF;AAED,qBAAa,GAAI,SAAQ,8BAA8B;IACrD,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAS;IACrC,MAAM,CAAC,QAAQ,CAAC,MAAM,gBAAgB;cAEnB,OAAO,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,GAAG,aAAa;CAG9E;AAED,qBAAa,EAAG,SAAQ,8BAA8B;IACpD,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAQ;IACpC,MAAM,CAAC,QAAQ,CAAC,MAAM,eAAe;cAElB,OAAO,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,GAAG,aAAa;CAG9E;AAED,qBAAa,GAAI,SAAQ,8BAA8B;IACrD,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAS;IACrC,MAAM,CAAC,QAAQ,CAAC,MAAM,gBAAgB;cAEnB,OAAO,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,GAAG,aAAa;CAG9E;AAED,qBAAa,GAAI,SAAQ,8BAA8B;IACrD,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAS;IACrC,MAAM,CAAC,QAAQ,CAAC,MAAM,gBAAgB;cAEnB,OAAO,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,GAAG,aAAa;cAG1D,SAAS,CAAC,MAAM,EAAE,qBAAqB,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;CAI7F;AAED,qBAAa,GAAI,SAAQ,8BAA8B;IACrD,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAS;IACrC,MAAM,CAAC,QAAQ,CAAC,MAAM,gBAAgB;cAEnB,OAAO,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,GAAG,aAAa;cAG1D,SAAS,CAAC,MAAM,EAAE,qBAAqB,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;CAI7F;AAED,qBAAa,GAAI,SAAQ,WAAW;IAOtB,OAAO,CAAC,QAAQ;IAAU,OAAO,CAAC,SAAS;IAAU,OAAO,CAAC,SAAS;IANlF,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAS;IACrC,MAAM,CAAC,QAAQ,CAAC,MAAM,gBAAgB;IAEtC,MAAM,CAAC,QAAQ,CAAC,WAAW,gBAAgF;IAC3G,MAAM,CAAC,QAAQ,CAAC,YAAY,gBAAkF;gBAE1F,QAAQ,EAAE,MAAM,EAAU,SAAS,EAAE,MAAM,EAAU,SAAS,EAAE,MAAM;IAI7E,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAazD"}
+{"version":3,"file":"bitwise.d.ts","sourceRoot":"","sources":["../../../../src/public/avm/opcodes/bitwise.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,KAAK,aAAa,EAAgB,KAAK,qBAAqB,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAC/G,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAC;AAEpF,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAEhE,uBAAe,8BAA+B,SAAQ,uBAAuB;IAC9D,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAoBvD;IAED,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,GAAG,aAAa,CAAC;IAC9E,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,qBAAqB,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,QAGlF;IAED,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAEvD;CACF;AAED,qBAAa,GAAI,SAAQ,8BAA8B;IACrD,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAS;IACrC,MAAM,CAAC,QAAQ,CAAC,MAAM,gBAAgB;IAEtC,UAAmB,OAAO,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,GAAG,aAAa,CAE5E;IAED,UAAmB,oBAAoB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAE/D;CACF;AAED,qBAAa,EAAG,SAAQ,8BAA8B;IACpD,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAQ;IACpC,MAAM,CAAC,QAAQ,CAAC,MAAM,eAAe;IAErC,UAAmB,OAAO,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,GAAG,aAAa,CAE5E;IAED,UAAmB,oBAAoB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAE/D;CACF;AAED,qBAAa,GAAI,SAAQ,8BAA8B;IACrD,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAS;IACrC,MAAM,CAAC,QAAQ,CAAC,MAAM,gBAAgB;IAEtC,UAAmB,OAAO,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,GAAG,aAAa,CAE5E;IAED,UAAmB,oBAAoB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAE/D;CACF;AAED,qBAAa,GAAI,SAAQ,WAAW;IAQhC,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,SAAS;IATnB,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAS;IACrC,MAAM,CAAC,QAAQ,CAAC,MAAM,gBAAgB;IAEtC,MAAM,CAAC,QAAQ,CAAC,WAAW,gBAAgF;IAC3G,MAAM,CAAC,QAAQ,CAAC,YAAY,gBAAkF;IAE9G,YACU,cAAc,EAAE,MAAM,EACtB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EAG1B;IAEY,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAevD;CACF"}