@aztec/simulator 0.32.1 → 0.34.0

package/dest/avm/opcodes/environment_getters.js

@@ -1,105 +1,96 @@
 import { Field } from '../avm_memory_types.js';
-import { Opcode, OperandType } from '../serialization/instruction_serialization.js';
-import { Instruction } from './instruction.js';
-class GetterInstruction extends Instruction {
-    constructor(indirect, dstOffset) {
-        super();
-        this.indirect = indirect;
-        this.dstOffset = dstOffset;
-    }
-    async execute(context) {
-        const res = new Field(this.getIt(context.environment));
-        context.machineState.memory.set(this.dstOffset, res);
-        context.machineState.incrementPc();
+import { Opcode } from '../serialization/instruction_serialization.js';
+import { GetterInstruction } from './instruction_impl.js';
+class EnvironmentGetterInstruction extends GetterInstruction {
+    getValue(context) {
+        return new Field(this.getEnvironmentValue(context.environment));
     }
 }
-// Informs (de)serialization. See Instruction.deserialize.
-GetterInstruction.wireFormat = [OperandType.UINT8, OperandType.UINT8, OperandType.UINT32];
-export class Address extends GetterInstruction {
-    getIt(env) {
+export class Address extends EnvironmentGetterInstruction {
+    getEnvironmentValue(env) {
         return env.address;
     }
 }
 Address.type = 'ADDRESS';
 Address.opcode = Opcode.ADDRESS;
-export class StorageAddress extends GetterInstruction {
-    getIt(env) {
+export class StorageAddress extends EnvironmentGetterInstruction {
+    getEnvironmentValue(env) {
         return env.storageAddress;
     }
 }
 StorageAddress.type = 'STORAGEADDRESS';
 StorageAddress.opcode = Opcode.STORAGEADDRESS;
-export class Sender extends GetterInstruction {
-    getIt(env) {
+export class Sender extends EnvironmentGetterInstruction {
+    getEnvironmentValue(env) {
         return env.sender;
     }
 }
 Sender.type = 'SENDER';
 Sender.opcode = Opcode.SENDER;
-export class Origin extends GetterInstruction {
-    getIt(env) {
+export class Origin extends EnvironmentGetterInstruction {
+    getEnvironmentValue(env) {
         return env.origin;
     }
 }
 Origin.type = 'ORIGIN';
 Origin.opcode = Opcode.ORIGIN;
-export class FeePerL1Gas extends GetterInstruction {
-    getIt(env) {
+export class FeePerL1Gas extends EnvironmentGetterInstruction {
+    getEnvironmentValue(env) {
         return env.feePerL1Gas;
     }
 }
 FeePerL1Gas.type = 'FEEPERL1GAS';
 FeePerL1Gas.opcode = Opcode.FEEPERL1GAS;
-export class FeePerL2Gas extends GetterInstruction {
-    getIt(env) {
+export class FeePerL2Gas extends EnvironmentGetterInstruction {
+    getEnvironmentValue(env) {
         return env.feePerL2Gas;
     }
 }
 FeePerL2Gas.type = 'FEEPERL2GAS';
 FeePerL2Gas.opcode = Opcode.FEEPERL2GAS;
-export class FeePerDAGas extends GetterInstruction {
-    getIt(env) {
+export class FeePerDAGas extends EnvironmentGetterInstruction {
+    getEnvironmentValue(env) {
         return env.feePerDaGas;
     }
 }
 FeePerDAGas.type = 'FEEPERDAGAS';
 FeePerDAGas.opcode = Opcode.FEEPERDAGAS;
-export class Portal extends GetterInstruction {
-    getIt(env) {
+export class Portal extends EnvironmentGetterInstruction {
+    getEnvironmentValue(env) {
         return env.portal.toField();
     }
 }
 Portal.type = 'PORTAL';
 Portal.opcode = Opcode.PORTAL;
-export class ChainId extends GetterInstruction {
-    getIt(env) {
+export class ChainId extends EnvironmentGetterInstruction {
+    getEnvironmentValue(env) {
         return env.globals.chainId;
     }
 }
 ChainId.type = 'CHAINID';
 ChainId.opcode = Opcode.CHAINID;
-export class Version extends GetterInstruction {
-    getIt(env) {
+export class Version extends EnvironmentGetterInstruction {
+    getEnvironmentValue(env) {
         return env.globals.version;
     }
 }
 Version.type = 'VERSION';
 Version.opcode = Opcode.VERSION;
-export class BlockNumber extends GetterInstruction {
-    getIt(env) {
+export class BlockNumber extends EnvironmentGetterInstruction {
+    getEnvironmentValue(env) {
         return env.globals.blockNumber;
     }
 }
 BlockNumber.type = 'BLOCKNUMBER';
 BlockNumber.opcode = Opcode.BLOCKNUMBER;
-export class Timestamp extends GetterInstruction {
-    getIt(env) {
+export class Timestamp extends EnvironmentGetterInstruction {
+    getEnvironmentValue(env) {
         return env.globals.timestamp;
     }
 }
 Timestamp.type = 'TIMESTAMP';
 Timestamp.opcode = Opcode.TIMESTAMP;
-// export class Coinbase extends GetterInstruction {
+// export class Coinbase extends EnvironmentGetterInstruction {
 //     static type: string = 'COINBASE';
 //     static numberOfOperands = 1;
 //     constructor(private destOffset: number) {
@@ -112,7 +103,7 @@ Timestamp.opcode = Opcode.TIMESTAMP;
 //     }
 // }
 // // TODO: are these even needed within the block? (both block gas limit variables - why does the execution env care?)
-// export class BlockL1GasLimit extends GetterInstruction {
+// export class BlockL1GasLimit extends EnvironmentGetterInstruction {
 //     static type: string = 'BLOCKL1GASLIMIT';
 //     static numberOfOperands = 1;
 //     constructor(private destOffset: number) {
@@ -124,7 +115,7 @@ Timestamp.opcode = Opcode.TIMESTAMP;
 //         this.incrementPc(machineState);
 //     }
 // }
-// export class BlockL2GasLimit extends GetterInstruction {
+// export class BlockL2GasLimit extends EnvironmentGetterInstruction {
 //     static type: string = 'BLOCKL2GASLIMIT';
 //     static numberOfOperands = 1;
 //     constructor(private destOffset: number) {
@@ -136,7 +127,7 @@ Timestamp.opcode = Opcode.TIMESTAMP;
 //         this.incrementPc(machineState);
 //     }
 // }
-// export class BlockDAGasLimit extends GetterInstruction {
+// export class BlockDAGasLimit extends EnvironmentGetterInstruction {
 //     static type: string = 'BLOCKDAGASLIMIT';
 //     static numberOfOperands = 1;
 //     constructor(private destOffset: number) {
@@ -148,4 +139,4 @@ Timestamp.opcode = Opcode.TIMESTAMP;
 //         this.incrementPc(machineState);
 //     }
 // }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW52aXJvbm1lbnRfZ2V0dGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hdm0vb3Bjb2Rlcy9lbnZpcm9ubWVudF9nZXR0ZXJzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUlBLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUMvQyxPQUFPLEVBQUUsTUFBTSxFQUFFLFdBQVcsRUFBRSxNQUFNLCtDQUErQyxDQUFDO0FBQ3BGLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUUvQyxNQUFlLGlCQUFrQixTQUFRLFdBQVc7SUFJbEQsWUFBc0IsUUFBZ0IsRUFBWSxTQUFpQjtRQUNqRSxLQUFLLEVBQUUsQ0FBQztRQURZLGFBQVEsR0FBUixRQUFRLENBQVE7UUFBWSxjQUFTLEdBQVQsU0FBUyxDQUFRO0lBRW5FLENBQUM7SUFFRCxLQUFLLENBQUMsT0FBTyxDQUFDLE9BQW1CO1FBQy9CLE1BQU0sR0FBRyxHQUFHLElBQUksS0FBSyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUM7UUFDdkQsT0FBTyxDQUFDLFlBQVksQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsR0FBRyxDQUFDLENBQUM7UUFDckQsT0FBTyxDQUFDLFlBQVksQ0FBQyxXQUFXLEVBQUUsQ0FBQztJQUNyQyxDQUFDOztBQVhELDBEQUEwRDtBQUMxQyw0QkFBVSxHQUFrQixDQUFDLFdBQVcsQ0FBQyxLQUFLLEVBQUUsV0FBVyxDQUFDLEtBQUssRUFBRSxXQUFXLENBQUMsTUFBTSxDQUFDLENBQUM7QUFlekcsTUFBTSxPQUFPLE9BQVEsU0FBUSxpQkFBaUI7SUFJbEMsS0FBSyxDQUFDLEdBQTRCO1FBQzFDLE9BQU8sR0FBRyxDQUFDLE9BQU8sQ0FBQztJQUNyQixDQUFDOztBQUxNLFlBQUksR0FBVyxTQUFTLENBQUM7QUFD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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW52aXJvbm1lbnRfZ2V0dGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hdm0vb3Bjb2Rlcy9lbnZpcm9ubWVudF9nZXR0ZXJzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUlBLE9BQU8sRUFBRSxLQUFLLEVBQW9CLE1BQU0sd0JBQXdCLENBQUM7QUFDakUsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLCtDQUErQyxDQUFDO0FBQ3ZFLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRTFELE1BQWUsNEJBQTZCLFNBQVEsaUJBQWlCO0lBQ3pELFFBQVEsQ0FBQyxPQUFtQjtRQUNwQyxPQUFPLElBQUksS0FBSyxDQUFDLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQztJQUNsRSxDQUFDO0NBR0Y7QUFFRCxNQUFNLE9BQU8sT0FBUSxTQUFRLDRCQUE0QjtJQUk3QyxtQkFBbUIsQ0FBQyxHQUE0QjtRQUN4RCxPQUFPLEdBQUcsQ0FBQyxPQUFPLENBQUM7SUFDckIsQ0FBQzs7QUFMTSxZQUFJLEdBQVcsU0FBUyxDQUFDO0FBQ2hCLGNBQU0sR0FBVyxNQUFNLENBQUMsT0FBTyxDQUFDO0FBT2xELE1BQU0sT0FBTyxjQUFlLFNBQVEsNEJBQTRCO0lBSXBELG1CQUFtQixDQUFDLEdBQTRCO1FBQ3hELE9BQU8sR0FBRyxDQUFDLGNBQWMsQ0FBQztJQUM1QixDQUFDOztBQUxNLG1CQUFJLEdBQVcsZ0JBQWdCLENBQUM7QUFDdkIscUJBQU0sR0FBVyxNQUFNLENBQUMsY0FBYyxDQUFDO0FBT3pELE1BQU0sT0FBTyxNQUFPLFNBQVEsNEJBQTRCO0lBSTVDLG1CQUFtQixDQUFDLEdBQTRCO1FBQ3hELE9BQU8sR0FBRyxDQUFDLE1BQU0sQ0FBQztJQUNwQixDQUFDOztBQUxNLFdBQUksR0FBVyxRQUFRLENBQUM7QUFDZixhQUFNLEdBQVcsTUFBTSxDQUFDLE1B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

package/dest/avm/opcodes/external_calls.d.ts

@@ -1,9 +1,9 @@
 import type { AvmContext } from '../avm_context.js';
 import { Opcode, OperandType } from '../serialization/instruction_serialization.js';
 import { Instruction } from './instruction.js';
-export declare class Call extends Instruction {
+declare abstract class ExternalCall extends Instruction {
     private indirect;
-    private _gasOffset;
+    private gasOffset;
     private addrOffset;
     private argsOffset;
     private argsSize;
@@ -11,27 +11,20 @@ export declare class Call extends Instruction {
     private retSize;
     private successOffset;
     private temporaryFunctionSelectorOffset;
-    static type: string;
-    static readonly opcode: Opcode;
     static readonly wireFormat: OperandType[];
-    constructor(indirect: number, _gasOffset: number, addrOffset: number, argsOffset: number, argsSize: number, retOffset: number, retSize: number, successOffset: number, temporaryFunctionSelectorOffset: number);
+    constructor(indirect: number, gasOffset: number, addrOffset: number, argsOffset: number, argsSize: number, retOffset: number, retSize: number, successOffset: number, temporaryFunctionSelectorOffset: number);
     execute(context: AvmContext): Promise<void>;
+    abstract get type(): 'CALL' | 'STATICCALL';
 }
-export declare class StaticCall extends Instruction {
-    private indirect;
-    private _gasOffset;
-    private addrOffset;
-    private argsOffset;
-    private argsSize;
-    private retOffset;
-    private retSize;
-    private successOffset;
-    private temporaryFunctionSelectorOffset;
-    static type: string;
+export declare class Call extends ExternalCall {
+    static type: "CALL";
     static readonly opcode: Opcode;
-    static readonly wireFormat: OperandType[];
-    constructor(indirect: number, _gasOffset: number, addrOffset: number, argsOffset: number, argsSize: number, retOffset: number, retSize: number, successOffset: number, temporaryFunctionSelectorOffset: number);
-    execute(context: AvmContext): Promise<void>;
+    get type(): "CALL";
+}
+export declare class StaticCall extends ExternalCall {
+    static type: "STATICCALL";
+    static readonly opcode: Opcode;
+    get type(): "STATICCALL";
 }
 export declare class Return extends Instruction {
     private indirect;
@@ -53,4 +46,5 @@ export declare class Revert extends Instruction {
     constructor(indirect: number, returnOffset: number, retSize: number);
     execute(context: AvmContext): Promise<void>;
 }
+export {};
 //# sourceMappingURL=external_calls.d.ts.map

package/dest/avm/opcodes/external_calls.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"external_calls.d.ts","sourceRoot":"","sources":["../../../src/avm/opcodes/external_calls.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"external_calls.d.ts","sourceRoot":"","sources":["../../../src/avm/opcodes/external_calls.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAIpD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAC;AAEpF,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,uBAAe,YAAa,SAAQ,WAAW;IAiB3C,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,+BAA+B;IA1BzC,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,EAAE,CAYvC;gBAGQ,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,EAIrB,+BAA+B,EAAE,MAAM;IAKpC,OAAO,CAAC,OAAO,EAAE,UAAU;IAuExC,aAAoB,IAAI,IAAI,MAAM,GAAG,YAAY,CAAC;CACnD;AAED,qBAAa,IAAK,SAAQ,YAAY;IACpC,MAAM,CAAC,IAAI,SAAmB;IAC9B,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAe;IAE7C,IAAW,IAAI,WAEd;CACF;AAED,qBAAa,UAAW,SAAQ,YAAY;IAC1C,MAAM,CAAC,IAAI,eAAyB;IACpC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAqB;IAEnD,IAAW,IAAI,iBAEd;CACF;AAED,qBAAa,MAAO,SAAQ,WAAW;IAWzB,OAAO,CAAC,QAAQ;IAAU,OAAO,CAAC,YAAY;IAAU,OAAO,CAAC,QAAQ;IAVpF,MAAM,CAAC,IAAI,EAAE,MAAM,CAAY;IAC/B,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAiB;IAE/C,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,EAAE,CAKvC;gBAEkB,QAAQ,EAAE,MAAM,EAAU,YAAY,EAAE,MAAM,EAAU,QAAQ,EAAE,MAAM;IAI/E,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAYzD;AAED,qBAAa,MAAO,SAAQ,WAAW;IAWzB,OAAO,CAAC,QAAQ;IAAU,OAAO,CAAC,YAAY;IAAU,OAAO,CAAC,OAAO;IAVnF,MAAM,CAAC,IAAI,EAAE,MAAM,CAAY;IAC/B,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAiB;IAE/C,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,EAAE,CAKvC;gBAEkB,QAAQ,EAAE,MAAM,EAAU,YAAY,EAAE,MAAM,EAAU,OAAO,EAAE,MAAM;IAI9E,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAYzD"}

package/dest/avm/opcodes/external_calls.js

@@ -1,18 +1,21 @@
 import { FunctionSelector } from '@aztec/circuits.js';
+import { padArrayEnd } from '@aztec/foundation/collection';
+import { executePublicFunction } from '../../public/executor.js';
+import { convertPublicExecutionResult, createPublicExecutionContext, updateAvmContextFromPublicExecutionResult, } from '../../public/transitional_adaptors.js';
+import { gasLeftToGas, sumGas } from '../avm_gas.js';
 import { Field, Uint8 } from '../avm_memory_types.js';
-import { AvmSimulator } from '../avm_simulator.js';
 import { Opcode, OperandType } from '../serialization/instruction_serialization.js';
 import { Addressing } from './addressing_mode.js';
 import { Instruction } from './instruction.js';
-export class Call extends Instruction {
-    constructor(indirect, _gasOffset /* Unused due to no formal gas implementation at this moment */, addrOffset, argsOffset, argsSize, retOffset, retSize, successOffset, 
+class ExternalCall extends Instruction {
+    constructor(indirect, gasOffset /* Unused due to no formal gas implementation at this moment */, addrOffset, argsOffset, argsSize, retOffset, retSize, successOffset, 
     // Function selector is temporary since eventually public contract bytecode will be one blob
     // containing all functions, and function selector will become an application-level mechanism
     // (e.g. first few bytes of calldata + compiler-generated jump table)
     temporaryFunctionSelectorOffset) {
         super();
         this.indirect = indirect;
-        this._gasOffset = _gasOffset;
+        this.gasOffset = gasOffset;
         this.addrOffset = addrOffset;
         this.argsOffset = argsOffset;
         this.argsSize = argsSize;
@@ -21,34 +24,58 @@ export class Call extends Instruction {
         this.successOffset = successOffset;
         this.temporaryFunctionSelectorOffset = temporaryFunctionSelectorOffset;
     }
-    // TODO(https://github.com/AztecProtocol/aztec-packages/issues/3992): there is no concept of remaining / available gas at this moment
     async execute(context) {
-        const [_gasOffset, addrOffset, argsOffset, retOffset, successOffset] = Addressing.fromWire(this.indirect).resolve([this._gasOffset, this.addrOffset, this.argsOffset, this.retOffset, this.successOffset], context.machineState.memory);
-        const callAddress = context.machineState.memory.getAs(addrOffset);
-        const calldata = context.machineState.memory.getSlice(argsOffset, this.argsSize).map(f => f.toFr());
-        const functionSelector = context.machineState.memory.getAs(this.temporaryFunctionSelectorOffset).toFr();
-        const nestedContext = context.createNestedContractCallContext(callAddress.toFr(), calldata, FunctionSelector.fromField(functionSelector));
-        const nestedCallResults = await new AvmSimulator(nestedContext).execute();
+        const memory = context.machineState.memory.track(this.type);
+        const [gasOffset, addrOffset, argsOffset, retOffset, successOffset] = Addressing.fromWire(this.indirect).resolve([this.gasOffset, this.addrOffset, this.argsOffset, this.retOffset, this.successOffset], memory);
+        const callAddress = memory.getAs(addrOffset);
+        const calldata = memory.getSlice(argsOffset, this.argsSize).map(f => f.toFr());
+        const l1Gas = memory.get(gasOffset).toNumber();
+        const l2Gas = memory.getAs(gasOffset + 1).toNumber();
+        const daGas = memory.getAs(gasOffset + 2).toNumber();
+        const functionSelector = memory.getAs(this.temporaryFunctionSelectorOffset).toFr();
+        const allocatedGas = { l1Gas, l2Gas, daGas };
+        const memoryOperations = { reads: this.argsSize + 5, writes: 1 + this.retSize, indirect: this.indirect };
+        const totalGas = sumGas(this.gasCost(memoryOperations), allocatedGas);
+        context.machineState.consumeGas(totalGas);
+        // TRANSITIONAL: This should be removed once the AVM is fully operational and the public executor is gone.
+        const nestedContext = context.createNestedContractCallContext(callAddress.toFr(), calldata, allocatedGas, this.type, FunctionSelector.fromField(functionSelector));
+        const pxContext = createPublicExecutionContext(nestedContext, calldata);
+        const pxResults = await executePublicFunction(pxContext, /*nested=*/ true);
+        const nestedCallResults = convertPublicExecutionResult(pxResults);
+        updateAvmContextFromPublicExecutionResult(nestedContext, pxResults);
+        const nestedPersistableState = nestedContext.persistableState;
+        // const nestedContext = context.createNestedContractCallContext(
+        //   callAddress.toFr(),
+        //   calldata,
+        //   allocatedGas,
+        //   this.type,
+        //   FunctionSelector.fromField(functionSelector),
+        // );
+        // const nestedCallResults: AvmContractCallResults = await new AvmSimulator(nestedContext).execute();
+        // const nestedPersistableState = nestedContext.persistableState;
         const success = !nestedCallResults.reverted;
-        // We only take as much data as was specified in the return size -> TODO: should we be reverting here
+        // We only take as much data as was specified in the return size and pad with zeroes if the return data is smaller
+        // than the specified size in order to prevent that memory to be left with garbage
         const returnData = nestedCallResults.output.slice(0, this.retSize);
-        const convertedReturnData = returnData.map(f => new Field(f));
+        const convertedReturnData = padArrayEnd(returnData.map(f => new Field(f)), new Field(0), this.retSize);
         // Write our return data into memory
-        context.machineState.memory.set(successOffset, new Uint8(success ? 1 : 0));
-        context.machineState.memory.setSlice(retOffset, convertedReturnData);
+        memory.set(successOffset, new Uint8(success ? 1 : 0));
+        memory.setSlice(retOffset, convertedReturnData);
+        // Refund unused gas
+        context.machineState.refundGas(gasLeftToGas(nestedContext.machineState));
+        // TODO: Should we merge the changes from a nested call in the case of a STATIC call?
         if (success) {
-            context.persistableState.acceptNestedCallState(nestedContext.persistableState);
+            context.persistableState.acceptNestedCallState(nestedPersistableState);
         }
         else {
-            context.persistableState.rejectNestedCallState(nestedContext.persistableState);
+            context.persistableState.rejectNestedCallState(nestedPersistableState);
         }
+        memory.assert(memoryOperations);
         context.machineState.incrementPc();
     }
 }
-Call.type = 'CALL';
-Call.opcode = Opcode.CALL;
 // Informs (de)serialization. See Instruction.deserialize.
-Call.wireFormat = [
+ExternalCall.wireFormat = [
     OperandType.UINT8,
     OperandType.UINT8,
     OperandType.UINT32,
@@ -61,58 +88,20 @@ Call.wireFormat = [
     /* temporary function selector */
     OperandType.UINT32,
 ];
-export class StaticCall extends Instruction {
-    constructor(indirect, _gasOffset /* Unused due to no formal gas implementation at this moment */, addrOffset, argsOffset, argsSize, retOffset, retSize, successOffset, temporaryFunctionSelectorOffset) {
-        super();
-        this.indirect = indirect;
-        this._gasOffset = _gasOffset;
-        this.addrOffset = addrOffset;
-        this.argsOffset = argsOffset;
-        this.argsSize = argsSize;
-        this.retOffset = retOffset;
-        this.retSize = retSize;
-        this.successOffset = successOffset;
-        this.temporaryFunctionSelectorOffset = temporaryFunctionSelectorOffset;
+export class Call extends ExternalCall {
+    get type() {
+        return Call.type;
     }
-    async execute(context) {
-        const [_gasOffset, addrOffset, argsOffset, retOffset, successOffset] = Addressing.fromWire(this.indirect).resolve([this._gasOffset, this.addrOffset, this.argsOffset, this.retOffset, this.successOffset], context.machineState.memory);
-        const callAddress = context.machineState.memory.get(addrOffset);
-        const calldata = context.machineState.memory.getSlice(argsOffset, this.argsSize).map(f => f.toFr());
-        const functionSelector = context.machineState.memory.getAs(this.temporaryFunctionSelectorOffset).toFr();
-        const nestedContext = context.createNestedContractStaticCallContext(callAddress.toFr(), calldata, FunctionSelector.fromField(functionSelector));
-        const nestedCallResults = await new AvmSimulator(nestedContext).execute();
-        const success = !nestedCallResults.reverted;
-        // We only take as much data as was specified in the return size -> TODO: should we be reverting here
-        const returnData = nestedCallResults.output.slice(0, this.retSize);
-        const convertedReturnData = returnData.map(f => new Field(f));
-        // Write our return data into memory
-        context.machineState.memory.set(successOffset, new Uint8(success ? 1 : 0));
-        context.machineState.memory.setSlice(retOffset, convertedReturnData);
-        if (success) {
-            context.persistableState.acceptNestedCallState(nestedContext.persistableState);
-        }
-        else {
-            context.persistableState.rejectNestedCallState(nestedContext.persistableState);
-        }
-        context.machineState.incrementPc();
+}
+Call.type = 'CALL';
+Call.opcode = Opcode.CALL;
+export class StaticCall extends ExternalCall {
+    get type() {
+        return StaticCall.type;
     }
 }
 StaticCall.type = 'STATICCALL';
 StaticCall.opcode = Opcode.STATICCALL;
-// Informs (de)serialization. See Instruction.deserialize.
-StaticCall.wireFormat = [
-    OperandType.UINT8,
-    OperandType.UINT8,
-    OperandType.UINT32,
-    OperandType.UINT32,
-    OperandType.UINT32,
-    OperandType.UINT32,
-    OperandType.UINT32,
-    OperandType.UINT32,
-    OperandType.UINT32,
-    /* temporary function selector */
-    OperandType.UINT32,
-];
 export class Return extends Instruction {
     constructor(indirect, returnOffset, copySize) {
         super();
@@ -121,9 +110,13 @@ export class Return extends Instruction {
         this.copySize = copySize;
     }
     async execute(context) {
-        const [returnOffset] = Addressing.fromWire(this.indirect).resolve([this.returnOffset], context.machineState.memory);
-        const output = context.machineState.memory.getSlice(returnOffset, this.copySize).map(word => word.toFr());
+        const memoryOperations = { reads: this.copySize, indirect: this.indirect };
+        const memory = context.machineState.memory.track(this.type);
+        context.machineState.consumeGas(this.gasCost(memoryOperations));
+        const [returnOffset] = Addressing.fromWire(this.indirect).resolve([this.returnOffset], memory);
+        const output = memory.getSlice(returnOffset, this.copySize).map(word => word.toFr());
         context.machineState.return(output);
+        memory.assert(memoryOperations);
     }
 }
 Return.type = 'RETURN';
@@ -143,9 +136,13 @@ export class Revert extends Instruction {
         this.retSize = retSize;
     }
     async execute(context) {
-        const [returnOffset] = Addressing.fromWire(this.indirect).resolve([this.returnOffset], context.machineState.memory);
-        const output = context.machineState.memory.getSlice(returnOffset, this.retSize).map(word => word.toFr());
+        const memoryOperations = { reads: this.retSize, indirect: this.indirect };
+        const memory = context.machineState.memory.track(this.type);
+        context.machineState.consumeGas(this.gasCost(memoryOperations));
+        const [returnOffset] = Addressing.fromWire(this.indirect).resolve([this.returnOffset], memory);
+        const output = memory.getSlice(returnOffset, this.retSize).map(word => word.toFr());
         context.machineState.revert(output);
+        memory.assert(memoryOperations);
     }
 }
 Revert.type = 'REVERT';
@@ -157,4 +154,4 @@ Revert.wireFormat = [
     OperandType.UINT32,
     OperandType.UINT32,
 ];
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"external_calls.js","sourceRoot":"","sources":["../../../src/avm/opcodes/external_calls.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"external_calls.js","sourceRoot":"","sources":["../../../src/avm/opcodes/external_calls.ts"],"names":[],"mappings":"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"}

package/dest/avm/opcodes/hashing.d.ts

@@ -36,13 +36,14 @@ export declare class Sha256 extends Instruction {
 }
 export declare class Pedersen extends Instruction {
     private indirect;
+    private genIndexOffset;
     private dstOffset;
     private messageOffset;
     private messageSizeOffset;
     static type: string;
     static readonly opcode: Opcode;
     static readonly wireFormat: OperandType[];
-    constructor(indirect: number, dstOffset: number, messageOffset: number, messageSizeOffset: number);
+    constructor(indirect: number, genIndexOffset: number, dstOffset: number, messageOffset: number, messageSizeOffset: number);
     execute(context: AvmContext): Promise<void>;
 }
 //# sourceMappingURL=hashing.d.ts.map

package/dest/avm/opcodes/hashing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hashing.d.ts","sourceRoot":"","sources":["../../../src/avm/opcodes/hashing.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAC;AAEpF,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,qBAAa,SAAU,SAAQ,WAAW;IActC,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,WAAW;IAhBrB,MAAM,CAAC,IAAI,EAAE,MAAM,CAAe;IAClC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAmB;IAGjD,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,EAAE,CAMvC;gBAGQ,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM;IAKvB,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAelD;AAED,qBAAa,MAAO,SAAQ,WAAW;IAcnC,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,WAAW;IAhBrB,MAAM,CAAC,IAAI,EAAE,MAAM,CAAY;IAC/B,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAiB;IAG/C,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,EAAE,CAMvC;gBAGQ,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM;IAMvB,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAoBlD;AAED,qBAAa,MAAO,SAAQ,WAAW;IAcnC,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,WAAW;IAhBrB,MAAM,CAAC,IAAI,EAAE,MAAM,CAAY;IAC/B,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAiB;IAG/C,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,EAAE,CAMvC;gBAGQ,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM;IAMvB,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAoBlD;AAED,qBAAa,QAAS,SAAQ,WAAW;IAcrC,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,iBAAiB;IAhB3B,MAAM,CAAC,IAAI,EAAE,MAAM,CAAc;IACjC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAmB;IAGjD,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,EAAE,CAMvC;gBAGQ,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,iBAAiB,EAAE,MAAM;IAK7B,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAgBlD"}
+{"version":3,"file":"hashing.d.ts","sourceRoot":"","sources":["../../../src/avm/opcodes/hashing.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAC;AAEpF,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,qBAAa,SAAU,SAAQ,WAAW;IActC,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,WAAW;IAhBrB,MAAM,CAAC,IAAI,EAAE,MAAM,CAAe;IAClC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAmB;IAGjD,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,EAAE,CAMvC;gBAGQ,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM;IAKhB,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAoBzD;AAED,qBAAa,MAAO,SAAQ,WAAW;IAcnC,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,WAAW;IAhBrB,MAAM,CAAC,IAAI,EAAE,MAAM,CAAY;IAC/B,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAiB;IAG/C,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,EAAE,CAMvC;gBAGQ,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM;IAMhB,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAyBzD;AAED,qBAAa,MAAO,SAAQ,WAAW;IAcnC,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,WAAW;IAhBrB,MAAM,CAAC,IAAI,EAAE,MAAM,CAAY;IAC/B,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAiB;IAG/C,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,EAAE,CAMvC;gBAGQ,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM;IAMhB,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAyBzD;AAED,qBAAa,QAAS,SAAQ,WAAW;IAerC,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,iBAAiB;IAlB3B,MAAM,CAAC,IAAI,EAAE,MAAM,CAAc;IACjC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAmB;IAGjD,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,EAAE,CAOvC;gBAGQ,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,MAAM,EACtB,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,iBAAiB,EAAE,MAAM;IAKtB,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAsBzD"}