@aztec/simulator 0.74.0 → 0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2

package/dest/avm/opcodes/instruction.js

@@ -4,23 +4,20 @@ import { Opcode, deserialize, serializeAs } from '../serialization/instruction_s
 /**
  * Parent class for all AVM instructions.
  * It's most important aspects are execute and (de)serialize.
- */
-export class Instruction {
+ */ export class Instruction {
     /**
-     * Whether the instruction will modify the PC itself.
-     */
-    handlesPC() {
+   * Whether the instruction will modify the PC itself.
+   */ handlesPC() {
         return false;
     }
     /**
-     * Generate a string representation of the instruction including
-     * the instruction sub-class name all of its flags and operands.
-     * @returns Thee string representation.
-     */
-    toString() {
+   * Generate a string representation of the instruction including
+   * the instruction sub-class name all of its flags and operands.
+   * @returns Thee string representation.
+   */ toString() {
         let instructionStr = this.constructor.name + ': ';
         // assumes that all properties are flags or operands
-        for (const prop of Object.getOwnPropertyNames(this)) {
+        for (const prop of Object.getOwnPropertyNames(this)){
             instructionStr += `${prop}:${this[prop].toString()}, `;
         }
         return instructionStr;
@@ -37,48 +34,44 @@ export class Instruction {
         return this.as(klass.opcode, klass.wireFormat).serialize();
     }
     /**
-     * Returns a new instruction instance that can be serialized with the given opcode and wire format.
-     * @param opcode The opcode of the instruction.
-     * @param wireFormat The wire format of the instruction.
-     * @returns The new instruction instance.
-     */
-    as(opcode, wireFormat) {
+   * Returns a new instruction instance that can be serialized with the given opcode and wire format.
+   * @param opcode The opcode of the instruction.
+   * @param wireFormat The wire format of the instruction.
+   * @returns The new instruction instance.
+   */ as(opcode, wireFormat) {
         return Object.defineProperty(this, 'serialize', {
-            value: () => {
+            value: ()=>{
                 return serializeAs(wireFormat, opcode, this);
             },
-            enumerable: false,
+            enumerable: false
         });
     }
     /**
-     * Returns a new instruction class that can be deserialized with the given opcode and wire format.
-     * @param opcode The opcode of the instruction.
-     * @param wireFormat The wire format of the instruction.
-     * @returns The new instruction class.
-     */
-    static as(wireFormat) {
+   * Returns a new instruction class that can be deserialized with the given opcode and wire format.
+   * @param opcode The opcode of the instruction.
+   * @param wireFormat The wire format of the instruction.
+   * @returns The new instruction class.
+   */ static as(wireFormat) {
         return Object.assign(this, {
-            deserialize: (buf) => {
+            deserialize: (buf)=>{
                 const res = deserialize(buf, wireFormat);
                 const args = res.slice(1); // Remove opcode.
                 return new this(...args);
-            },
+            }
         });
     }
     /**
-     * Computes gas cost for the instruction based on its base cost and memory operations.
-     * @returns Gas cost.
-     */
-    gasCost(dynMultiplier = 0) {
+   * Computes gas cost for the instruction based on its base cost and memory operations.
+   * @returns Gas cost.
+   */ gasCost(dynMultiplier = 0) {
         const baseGasCost = getBaseGasCost(this.opcode);
         const dynGasCost = mulGas(getDynamicGasCost(this.opcode), dynMultiplier);
         return sumGas(baseGasCost, dynGasCost);
     }
     /**
-     * Returns the stringified type of the instruction.
-     * Instruction sub-classes should have a static `type` property.
-     */
-    get type() {
+   * Returns the stringified type of the instruction.
+   * Instruction sub-classes should have a static `type` property.
+   */ get type() {
         const type = 'type' in this.constructor && this.constructor.type;
         if (!type) {
             throw new Error(`Instruction class ${this.constructor.name} does not have a static 'type' property defined.`);
@@ -86,10 +79,9 @@ export class Instruction {
         return type;
     }
     /**
-     * Returns the opcode of the instruction.
-     * Instruction sub-classes should have a static `opcode` property.
-     */
-    get opcode() {
+   * Returns the opcode of the instruction.
+   * Instruction sub-classes should have a static `opcode` property.
+   */ get opcode() {
         const opcode = 'opcode' in this.constructor ? this.constructor.opcode : undefined;
         if (opcode === undefined || Opcode[opcode] === undefined) {
             throw new Error(`Instruction class ${this.constructor.name} does not have a static 'opcode' property defined.`);
@@ -97,4 +89,3 @@ export class Instruction {
         return opcode;
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5zdHJ1Y3Rpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYXZtL29wY29kZXMvaW5zdHJ1Y3Rpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sSUFBSSxNQUFNLEVBQUUsTUFBTSxRQUFRLENBQUM7QUFHMUMsT0FBTyxFQUFZLGNBQWMsRUFBRSxpQkFBaUIsRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRzVGLE9BQU8sRUFBRSxNQUFNLEVBQW9CLFdBQVcsRUFBRSxXQUFXLEVBQUUsTUFBTSwrQ0FBK0MsQ0FBQztBQU1uSDs7O0dBR0c7QUFDSCxNQUFNLE9BQWdCLFdBQVc7SUFRL0I7O09BRUc7SUFDSSxTQUFTO1FBQ2QsT0FBTyxLQUFLLENBQUM7SUFDZixDQUFDO0lBRUQ7Ozs7T0FJRztJQUNJLFFBQVE7UUFDYixJQUFJLGNBQWMsR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFDLElBQUksR0FBRyxJQUFJLENBQUM7UUFDbEQsb0RBQW9EO1FBQ3BELEtBQUssTUFBTSxJQUFJLElBQUksTUFBTSxDQUFDLG1CQUFtQixDQUFDLElBQUksQ0FBMEIsRUFBRSxDQUFDO1lBQzdFLGNBQWMsSUFBSSxHQUFHLElBQUksSUFBSSxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsUUFBUSxFQUFFLElBQUksQ0FBQztRQUN6RCxDQUFDO1FBQ0QsT0FBTyxjQUFjLENBQUM7SUFDeEIsQ0FBQztJQUVELHdFQUF3RTtJQUNqRSxNQUFNLENBQUMsV0FBVyxDQUV2QixHQUEwQjtRQUUxQixPQUFPLElBQUksQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUNuRCxDQUFDO0lBRUQsc0VBQXNFO0lBQy9ELFNBQVM7UUFDZCxNQUFNLEtBQUssR0FBRyxJQUFJLENBQUMsV0FBa0IsQ0FBQztRQUN0QyxNQUFNLENB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

package/dest/avm/opcodes/instruction_impl.js

@@ -1,33 +1,30 @@
 import { OperandType } from '../serialization/instruction_serialization.js';
 import { Instruction } from './instruction.js';
-/** Wire format that informs deserialization for instructions with three operands. */
-export const ThreeOperandWireFormat8 = [
-    OperandType.UINT8,
+/** Wire format that informs deserialization for instructions with three operands. */ export const ThreeOperandWireFormat8 = [
     OperandType.UINT8,
     OperandType.UINT8,
     OperandType.UINT8,
     OperandType.UINT8,
+    OperandType.UINT8
 ];
 export const ThreeOperandWireFormat16 = [
     OperandType.UINT8,
     OperandType.UINT8,
     OperandType.UINT16,
     OperandType.UINT16,
-    OperandType.UINT16,
+    OperandType.UINT16
 ];
 /**
  * Covers (de)serialization for an instruction with:
  * indirect, inTag, and three operands.
- */
-export class ThreeOperandInstruction extends Instruction {
-    constructor(indirect, aOffset, bOffset, dstOffset) {
-        super();
-        this.indirect = indirect;
-        this.aOffset = aOffset;
-        this.bOffset = bOffset;
-        this.dstOffset = dstOffset;
+ */ export class ThreeOperandInstruction extends Instruction {
+    indirect;
+    aOffset;
+    bOffset;
+    dstOffset;
+    static wireFormat8 = ThreeOperandWireFormat8;
+    static wireFormat16 = ThreeOperandWireFormat16;
+    constructor(indirect, aOffset, bOffset, dstOffset){
+        super(), this.indirect = indirect, this.aOffset = aOffset, this.bOffset = bOffset, this.dstOffset = dstOffset;
     }
 }
-ThreeOperandInstruction.wireFormat8 = ThreeOperandWireFormat8;
-ThreeOperandInstruction.wireFormat16 = ThreeOperandWireFormat16;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5zdHJ1Y3Rpb25faW1wbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hdm0vb3Bjb2Rlcy9pbnN0cnVjdGlvbl9pbXBsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSwrQ0FBK0MsQ0FBQztBQUM1RSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFL0MscUZBQXFGO0FBQ3JGLE1BQU0sQ0FBQyxNQUFNLHVCQUF1QixHQUFHO0lBQ3JDLFdBQVcsQ0FBQyxLQUFLO0lBQ2pCLFdBQVcsQ0FBQyxLQUFLO0lBQ2pCLFdBQVcsQ0FBQyxLQUFLO0lBQ2pCLFdBQVcsQ0FBQyxLQUFLO0lBQ2pCLFdBQVcsQ0FBQyxLQUFLO0NBQ2xCLENBQUM7QUFDRixNQUFNLENBQUMsTUFBTSx3QkFBd0IsR0FBRztJQUN0QyxXQUFXLENBQUMsS0FBSztJQUNqQixXQUFXLENBQUMsS0FBSztJQUNqQixXQUFXLENBQUMsTUFBTTtJQUNsQixXQUFXLENBQUMsTUFBTTtJQUNsQixXQUFXLENBQUMsTUFBTTtDQUNuQixDQUFDO0FBRUY7OztHQUdHO0FBQ0gsTUFBTSxPQUFnQix1QkFBd0IsU0FBUSxXQUFXO0lBSS9ELFlBQ1ksUUFBZ0IsRUFDaEIsT0FBZSxFQUNmLE9BQWUsRUFDZixTQUFpQjtRQUUzQixLQUFLLEVBQUUsQ0FBQztRQUxFLGFBQVEsR0FBUixRQUFRLENBQVE7UUFDaEIsWUFBTyxHQUFQLE9BQU8sQ0FBUTtRQUNmLFlBQU8sR0FBUCxPQUFPLENBQVE7UUFDZixjQUFTLEdBQVQsU0FBUyxDQUFRO0lBRzdCLENBQUM7O0FBVmUsbUNBQVcsR0FBa0IsdUJBQXVCLENBQUM7QUFDckQsb0NBQVksR0FBa0Isd0JBQXdCLENBQUMifQ==

package/dest/avm/opcodes/memory.js

@@ -3,153 +3,172 @@ import { Opcode, OperandType } from '../serialization/instruction_serialization.
 import { Addressing } from './addressing_mode.js';
 import { Instruction } from './instruction.js';
 export class Set extends Instruction {
-    constructor(indirect, dstOffset, inTag, value) {
-        super();
-        this.indirect = indirect;
-        this.dstOffset = dstOffset;
-        this.inTag = inTag;
-        this.value = value;
+    indirect;
+    dstOffset;
+    inTag;
+    value;
+    static type = 'SET';
+    // Required for gas.
+    static opcode = Opcode.SET_8;
+    static wireFormat8 = [
+        OperandType.UINT8,
+        OperandType.UINT8,
+        OperandType.UINT8,
+        OperandType.UINT8,
+        OperandType.UINT8
+    ];
+    static wireFormat16 = [
+        OperandType.UINT8,
+        OperandType.UINT8,
+        OperandType.UINT16,
+        OperandType.UINT8,
+        OperandType.UINT16
+    ];
+    static wireFormat32 = [
+        OperandType.UINT8,
+        OperandType.UINT8,
+        OperandType.UINT16,
+        OperandType.UINT8,
+        OperandType.UINT32
+    ];
+    static wireFormat64 = [
+        OperandType.UINT8,
+        OperandType.UINT8,
+        OperandType.UINT16,
+        OperandType.UINT8,
+        OperandType.UINT64
+    ];
+    static wireFormat128 = [
+        OperandType.UINT8,
+        OperandType.UINT8,
+        OperandType.UINT16,
+        OperandType.UINT8,
+        OperandType.UINT128
+    ];
+    static wireFormatFF = [
+        OperandType.UINT8,
+        OperandType.UINT8,
+        OperandType.UINT16,
+        OperandType.UINT8,
+        OperandType.FF
+    ];
+    constructor(indirect, dstOffset, inTag, value){
+        super(), this.indirect = indirect, this.dstOffset = dstOffset, this.inTag = inTag, this.value = value;
         TaggedMemory.checkIsValidTag(inTag);
     }
     async execute(context) {
         // Constructor ensured that this.inTag is a valid tag
         const res = TaggedMemory.buildFromTagTruncating(this.value, this.inTag);
-        const memory = context.machineState.memory.track(this.type);
+        const memory = context.machineState.memory;
         context.machineState.consumeGas(this.gasCost());
-        const operands = [this.dstOffset];
+        const operands = [
+            this.dstOffset
+        ];
         const addressing = Addressing.fromWire(this.indirect, operands.length);
         const [dstOffset] = addressing.resolve(operands, memory);
         memory.set(dstOffset, res);
-        memory.assert({ writes: 1, addressing });
     }
 }
-Set.type = 'SET';
-// Required for gas.
-Set.opcode = Opcode.SET_8;
-Set.wireFormat8 = [
-    OperandType.UINT8, // opcode
-    OperandType.UINT8, // indirect
-    OperandType.UINT8, // dstOffset
-    OperandType.UINT8, // tag
-    OperandType.UINT8, // const (value)
-];
-Set.wireFormat16 = [
-    OperandType.UINT8, // opcode
-    OperandType.UINT8, // indirect
-    OperandType.UINT16, // dstOffset
-    OperandType.UINT8, // tag
-    OperandType.UINT16, // const (value)
-];
-Set.wireFormat32 = [
-    OperandType.UINT8, // opcode
-    OperandType.UINT8, // indirect
-    OperandType.UINT16, // dstOffset
-    OperandType.UINT8, // tag
-    OperandType.UINT32, // const (value)
-];
-Set.wireFormat64 = [
-    OperandType.UINT8, // opcode
-    OperandType.UINT8, // indirect
-    OperandType.UINT16, // dstOffset
-    OperandType.UINT8, // tag
-    OperandType.UINT64, // const (value)
-];
-Set.wireFormat128 = [
-    OperandType.UINT8, // opcode
-    OperandType.UINT8, // indirect
-    OperandType.UINT16, // dstOffset
-    OperandType.UINT8, // tag
-    OperandType.UINT128, // const (value)
-];
-Set.wireFormatFF = [
-    OperandType.UINT8, // opcode
-    OperandType.UINT8, // indirect
-    OperandType.UINT16, // dstOffset
-    OperandType.UINT8, // tag
-    OperandType.FF, // const (value)
-];
 export class Cast extends Instruction {
-    constructor(indirect, srcOffset, dstOffset, dstTag) {
-        super();
-        this.indirect = indirect;
-        this.srcOffset = srcOffset;
-        this.dstOffset = dstOffset;
-        this.dstTag = dstTag;
+    indirect;
+    srcOffset;
+    dstOffset;
+    dstTag;
+    static type = 'CAST';
+    static opcode = Opcode.CAST_8;
+    static wireFormat8 = [
+        OperandType.UINT8,
+        OperandType.UINT8,
+        OperandType.UINT8,
+        OperandType.UINT8,
+        OperandType.UINT8
+    ];
+    static wireFormat16 = [
+        OperandType.UINT8,
+        OperandType.UINT8,
+        OperandType.UINT16,
+        OperandType.UINT16,
+        OperandType.UINT8
+    ];
+    constructor(indirect, srcOffset, dstOffset, dstTag){
+        super(), this.indirect = indirect, this.srcOffset = srcOffset, this.dstOffset = dstOffset, this.dstTag = dstTag;
         TaggedMemory.checkIsValidTag(dstTag);
     }
     async execute(context) {
-        const memory = context.machineState.memory.track(this.type);
+        const memory = context.machineState.memory;
         context.machineState.consumeGas(this.gasCost());
-        const operands = [this.srcOffset, this.dstOffset];
+        const operands = [
+            this.srcOffset,
+            this.dstOffset
+        ];
         const addressing = Addressing.fromWire(this.indirect, operands.length);
         const [srcOffset, dstOffset] = addressing.resolve(operands, memory);
         const a = memory.get(srcOffset);
         // Constructor ensured that this.dstTag is a valid tag
         const casted = TaggedMemory.buildFromTagTruncating(a.toBigInt(), this.dstTag);
         memory.set(dstOffset, casted);
-        memory.assert({ reads: 1, writes: 1, addressing });
     }
 }
-Cast.type = 'CAST';
-Cast.opcode = Opcode.CAST_8;
-Cast.wireFormat8 = [
-    OperandType.UINT8,
-    OperandType.UINT8,
-    OperandType.UINT8,
-    OperandType.UINT8,
-    OperandType.UINT8,
-];
-Cast.wireFormat16 = [
-    OperandType.UINT8,
-    OperandType.UINT8,
-    OperandType.UINT16,
-    OperandType.UINT16,
-    OperandType.UINT8,
-];
 export class Mov extends Instruction {
-    constructor(indirect, srcOffset, dstOffset) {
-        super();
-        this.indirect = indirect;
-        this.srcOffset = srcOffset;
-        this.dstOffset = dstOffset;
+    indirect;
+    srcOffset;
+    dstOffset;
+    static type = 'MOV';
+    // FIXME: This is needed for gas.
+    static opcode = Opcode.MOV_8;
+    static wireFormat8 = [
+        OperandType.UINT8,
+        OperandType.UINT8,
+        OperandType.UINT8,
+        OperandType.UINT8
+    ];
+    static wireFormat16 = [
+        OperandType.UINT8,
+        OperandType.UINT8,
+        OperandType.UINT16,
+        OperandType.UINT16
+    ];
+    constructor(indirect, srcOffset, dstOffset){
+        super(), this.indirect = indirect, this.srcOffset = srcOffset, this.dstOffset = dstOffset;
     }
     async execute(context) {
-        const memory = context.machineState.memory.track(this.type);
+        const memory = context.machineState.memory;
         context.machineState.consumeGas(this.gasCost());
-        const operands = [this.srcOffset, this.dstOffset];
+        const operands = [
+            this.srcOffset,
+            this.dstOffset
+        ];
         const addressing = Addressing.fromWire(this.indirect, operands.length);
         const [srcOffset, dstOffset] = addressing.resolve(operands, memory);
         const a = memory.get(srcOffset);
         memory.set(dstOffset, a);
-        memory.assert({ reads: 1, writes: 1, addressing });
     }
 }
-Mov.type = 'MOV';
-// FIXME: This is needed for gas.
-Mov.opcode = Opcode.MOV_8;
-Mov.wireFormat8 = [
-    OperandType.UINT8,
-    OperandType.UINT8,
-    OperandType.UINT8,
-    OperandType.UINT8,
-];
-Mov.wireFormat16 = [
-    OperandType.UINT8,
-    OperandType.UINT8,
-    OperandType.UINT16,
-    OperandType.UINT16,
-];
 export class CalldataCopy extends Instruction {
-    constructor(indirect, cdStartOffset, copySizeOffset, dstOffset) {
-        super();
-        this.indirect = indirect;
-        this.cdStartOffset = cdStartOffset;
-        this.copySizeOffset = copySizeOffset;
-        this.dstOffset = dstOffset;
+    indirect;
+    cdStartOffset;
+    copySizeOffset;
+    dstOffset;
+    static type = 'CALLDATACOPY';
+    static opcode = Opcode.CALLDATACOPY;
+    // Informs (de)serialization. See Instruction.deserialize.
+    static wireFormat = [
+        OperandType.UINT8,
+        OperandType.UINT8,
+        OperandType.UINT16,
+        OperandType.UINT16,
+        OperandType.UINT16
+    ];
+    constructor(indirect, cdStartOffset, copySizeOffset, dstOffset){
+        super(), this.indirect = indirect, this.cdStartOffset = cdStartOffset, this.copySizeOffset = copySizeOffset, this.dstOffset = dstOffset;
     }
     async execute(context) {
-        const memory = context.machineState.memory.track(this.type);
-        const operands = [this.cdStartOffset, this.copySizeOffset, this.dstOffset];
+        const memory = context.machineState.memory;
+        const operands = [
+            this.cdStartOffset,
+            this.copySizeOffset,
+            this.dstOffset
+        ];
         const addressing = Addressing.fromWire(this.indirect, operands.length);
         const [cdStartOffset, copySizeOffset, dstOffset] = addressing.resolve(operands, memory);
         memory.checkTags(TypeTag.UINT32, cdStartOffset, copySizeOffset);
@@ -157,54 +176,65 @@ export class CalldataCopy extends Instruction {
         const copySize = memory.get(copySizeOffset).toNumber();
         context.machineState.consumeGas(this.gasCost(copySize));
         // Values which are out-of-range of the calldata array will be set with Field(0);
-        const slice = context.environment.calldata.slice(cdStart, cdStart + copySize).map(f => new Field(f));
+        const slice = context.environment.calldata.slice(cdStart, cdStart + copySize).map((f)=>new Field(f));
         // slice has size = MIN(copySize, calldata.length - cdStart) as TS truncates out-of-range portion
-        const transformedData = [...slice, ...Array(copySize - slice.length).fill(new Field(0))];
+        const transformedData = [
+            ...slice,
+            ...Array(copySize - slice.length).fill(new Field(0))
+        ];
         memory.setSlice(dstOffset, transformedData);
-        memory.assert({ reads: 2, writes: copySize, addressing });
     }
 }
-CalldataCopy.type = 'CALLDATACOPY';
-CalldataCopy.opcode = Opcode.CALLDATACOPY;
-// Informs (de)serialization. See Instruction.deserialize.
-CalldataCopy.wireFormat = [
-    OperandType.UINT8,
-    OperandType.UINT8,
-    OperandType.UINT16,
-    OperandType.UINT16,
-    OperandType.UINT16,
-];
 export class ReturndataSize extends Instruction {
-    constructor(indirect, dstOffset) {
-        super();
-        this.indirect = indirect;
-        this.dstOffset = dstOffset;
+    indirect;
+    dstOffset;
+    static type = 'RETURNDATASIZE';
+    static opcode = Opcode.RETURNDATASIZE;
+    // Informs (de)serialization. See Instruction.deserialize.
+    static wireFormat = [
+        OperandType.UINT8,
+        OperandType.UINT8,
+        OperandType.UINT16
+    ];
+    constructor(indirect, dstOffset){
+        super(), this.indirect = indirect, this.dstOffset = dstOffset;
     }
     async execute(context) {
-        const memory = context.machineState.memory.track(this.type);
-        const operands = [this.dstOffset];
+        const memory = context.machineState.memory;
+        const operands = [
+            this.dstOffset
+        ];
         const addressing = Addressing.fromWire(this.indirect, operands.length);
         const [dstOffset] = addressing.resolve(operands, memory);
         context.machineState.consumeGas(this.gasCost());
         memory.set(dstOffset, new Uint32(context.machineState.nestedReturndata.length));
-        memory.assert({ writes: 1, addressing });
     }
 }
-ReturndataSize.type = 'RETURNDATASIZE';
-ReturndataSize.opcode = Opcode.RETURNDATASIZE;
-// Informs (de)serialization. See Instruction.deserialize.
-ReturndataSize.wireFormat = [OperandType.UINT8, OperandType.UINT8, OperandType.UINT16];
 export class ReturndataCopy extends Instruction {
-    constructor(indirect, rdStartOffset, copySizeOffset, dstOffset) {
-        super();
-        this.indirect = indirect;
-        this.rdStartOffset = rdStartOffset;
-        this.copySizeOffset = copySizeOffset;
-        this.dstOffset = dstOffset;
+    indirect;
+    rdStartOffset;
+    copySizeOffset;
+    dstOffset;
+    static type = 'RETURNDATACOPY';
+    static opcode = Opcode.RETURNDATACOPY;
+    // Informs (de)serialization. See Instruction.deserialize.
+    static wireFormat = [
+        OperandType.UINT8,
+        OperandType.UINT8,
+        OperandType.UINT16,
+        OperandType.UINT16,
+        OperandType.UINT16
+    ];
+    constructor(indirect, rdStartOffset, copySizeOffset, dstOffset){
+        super(), this.indirect = indirect, this.rdStartOffset = rdStartOffset, this.copySizeOffset = copySizeOffset, this.dstOffset = dstOffset;
     }
     async execute(context) {
-        const memory = context.machineState.memory.track(this.type);
-        const operands = [this.rdStartOffset, this.copySizeOffset, this.dstOffset];
+        const memory = context.machineState.memory;
+        const operands = [
+            this.rdStartOffset,
+            this.copySizeOffset,
+            this.dstOffset
+        ];
         const addressing = Addressing.fromWire(this.indirect, operands.length);
         const [rdStartOffset, copySizeOffset, dstOffset] = addressing.resolve(operands, memory);
         memory.checkTags(TypeTag.UINT32, rdStartOffset, copySizeOffset);
@@ -212,21 +242,12 @@ export class ReturndataCopy extends Instruction {
         const copySize = memory.get(copySizeOffset).toNumber();
         context.machineState.consumeGas(this.gasCost(copySize));
         // Values which are out-of-range of the returndata array will be set with Field(0);
-        const slice = context.machineState.nestedReturndata.slice(rdStart, rdStart + copySize).map(f => new Field(f));
+        const slice = context.machineState.nestedReturndata.slice(rdStart, rdStart + copySize).map((f)=>new Field(f));
         // slice has size = MIN(copySize, returndata.length - rdStart) as TS truncates out-of-range portion
-        const transformedData = [...slice, ...Array(copySize - slice.length).fill(new Field(0))];
+        const transformedData = [
+            ...slice,
+            ...Array(copySize - slice.length).fill(new Field(0))
+        ];
         memory.setSlice(dstOffset, transformedData);
-        memory.assert({ reads: 2, writes: copySize, addressing });
     }
 }
-ReturndataCopy.type = 'RETURNDATACOPY';
-ReturndataCopy.opcode = Opcode.RETURNDATACOPY;
-// Informs (de)serialization. See Instruction.deserialize.
-ReturndataCopy.wireFormat = [
-    OperandType.UINT8,
-    OperandType.UINT8,
-    OperandType.UINT16,
-    OperandType.UINT16,
-    OperandType.UINT16,
-];
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"memory.js","sourceRoot":"","sources":["../../../src/avm/opcodes/memory.ts"],"names":[],"mappings":"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"}