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

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

@@ -1,16 +1,16 @@
-import type { Fr } from '@aztec/foundation/fields';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { PublicPersistableStateManager } from '../state_manager/state_manager.js';
 import type { AvmExecutionEnvironment } from './avm_execution_environment.js';
 import { type Gas } from './avm_gas.js';
 import { AvmMachineState } from './avm_machine_state.js';
-import type { AvmSimulator } from './avm_simulator.js';
-import type { AvmPersistableStateManager } from './journal/journal.js';
+import type { AvmSimulatorInterface } from './avm_simulator_interface.js';
+import type { CallData } from './calldata.js';
 /**
  * An execution context includes the information necessary to initiate AVM
  * execution along with all state maintained by the AVM throughout execution.
  */
 export declare class AvmContext {
-    persistableState: AvmPersistableStateManager;
+    persistableState: PublicPersistableStateManager;
     environment: AvmExecutionEnvironment;
     machineState: AvmMachineState;
     /**
@@ -20,8 +20,8 @@ export declare class AvmContext {
      * @param machineState - VM state that is modified on an instruction-by-instruction basis
      * @returns new AvmContext instance
      */
-    constructor(persistableState: AvmPersistableStateManager, environment: AvmExecutionEnvironment, machineState: AvmMachineState);
-    provideSimulator?: (ctx: this) => Promise<AvmSimulator>;
+    constructor(persistableState: PublicPersistableStateManager, environment: AvmExecutionEnvironment, machineState: AvmMachineState);
+    provideSimulator?: (context: AvmContext) => Promise<AvmSimulatorInterface>;
     /**
      * Prepare a new AVM context that will be ready for an external/nested call
      * - Fork the world state journal
@@ -36,6 +36,6 @@ export declare class AvmContext {
      * @param callType - Type of call (CALL or STATICCALL)
      * @returns new AvmContext instance
      */
-    createNestedContractCallContext(address: AztecAddress, calldata: Fr[], allocatedGas: Gas, callType: 'CALL' | 'STATICCALL'): Promise<AvmContext>;
+    createNestedContractCallContext(address: AztecAddress, calldata: CallData, allocatedGas: Gas, callType: 'CALL' | 'STATICCALL'): Promise<AvmContext>;
 }
-//# sourceMappingURL=avm_context.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXZtX2NvbnRleHQuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9wdWJsaWMvYXZtL2F2bV9jb250ZXh0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBRWhFLE9BQU8sS0FBSyxFQUFFLDZCQUE2QixFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFDdkYsT0FBTyxLQUFLLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUM5RSxPQUFPLEVBQUUsS0FBSyxHQUFHLEVBQWdCLE1BQU0sY0FBYyxDQUFDO0FBQ3RELE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxxQkFBcUIsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQzFFLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUU5Qzs7O0dBR0c7QUFDSCxxQkFBYSxVQUFVO0lBU1osZ0JBQWdCLEVBQUUsNkJBQTZCO0lBQy9DLFdBQVcsRUFBRSx1QkFBdUI7SUFDcEMsWUFBWSxFQUFFLGVBQWU7SUFWdEM7Ozs7OztPQU1HO0lBQ0gsWUFDUyxnQkFBZ0IsRUFBRSw2QkFBNkIsRUFDL0MsV0FBVyxFQUFFLHVCQUF1QixFQUNwQyxZQUFZLEVBQUUsZUFBZSxFQUNsQztJQUlHLGdCQUFnQixDQUFDLEVBQUUsQ0FBQyxPQUFPLEVBQUUsVUFBVSxLQUFLLE9BQU8sQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDO0lBRWxGOzs7Ozs7Ozs7Ozs7O09BYUc7SUFDVSwrQkFBK0IsQ0FDMUMsT0FBTyxFQUFFLFlBQVksRUFDckIsUUFBUSxFQUFFLFFBQVEsRUFDbEIsWUFBWSxFQUFFLEdBQUcsRUFDakIsUUFBUSxFQUFFLE1BQU0sR0FBRyxZQUFZLEdBQzlCLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FTckI7Q0FDRiJ9

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

@@ -1 +1 @@
-{"version":3,"file":"avm_context.d.ts","sourceRoot":"","sources":["../../../src/public/avm/avm_context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAC9E,OAAO,EAAE,KAAK,GAAG,EAAgB,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;AAEvE;;;GAGG;AACH,qBAAa,UAAU;IASZ,gBAAgB,EAAE,0BAA0B;IAC5C,WAAW,EAAE,uBAAuB;IACpC,YAAY,EAAE,eAAe;IAVtC;;;;;;OAMG;gBAEM,gBAAgB,EAAE,0BAA0B,EAC5C,WAAW,EAAE,uBAAuB,EACpC,YAAY,EAAE,eAAe;IAK/B,gBAAgB,CAAC,EAAE,CAAC,GAAG,EAAE,IAAI,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC;IAE/D;;;;;;;;;;;;;OAaG;IACU,+BAA+B,CAC1C,OAAO,EAAE,YAAY,EACrB,QAAQ,EAAE,EAAE,EAAE,EACd,YAAY,EAAE,GAAG,EACjB,QAAQ,EAAE,MAAM,GAAG,YAAY,GAC9B,OAAO,CAAC,UAAU,CAAC;CAUvB"}
+{"version":3,"file":"avm_context.d.ts","sourceRoot":"","sources":["../../../src/public/avm/avm_context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AACvF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAC9E,OAAO,EAAE,KAAK,GAAG,EAAgB,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAE9C;;;GAGG;AACH,qBAAa,UAAU;IASZ,gBAAgB,EAAE,6BAA6B;IAC/C,WAAW,EAAE,uBAAuB;IACpC,YAAY,EAAE,eAAe;IAVtC;;;;;;OAMG;IACH,YACS,gBAAgB,EAAE,6BAA6B,EAC/C,WAAW,EAAE,uBAAuB,EACpC,YAAY,EAAE,eAAe,EAClC;IAIG,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,KAAK,OAAO,CAAC,qBAAqB,CAAC,CAAC;IAElF;;;;;;;;;;;;;OAaG;IACU,+BAA+B,CAC1C,OAAO,EAAE,YAAY,EACrB,QAAQ,EAAE,QAAQ,EAClB,YAAY,EAAE,GAAG,EACjB,QAAQ,EAAE,MAAM,GAAG,YAAY,GAC9B,OAAO,CAAC,UAAU,CAAC,CASrB;CACF"}

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

@@ -1,17 +1,18 @@
-import type { Fr } from '@aztec/foundation/fields';
 import type { SimulationError } from '@aztec/stdlib/errors';
 import { Gas } from '@aztec/stdlib/gas';
 import type { Gas as AvmGas } from './avm_gas.js';
+import type { ReturnData } from './calldata.js';
 import type { AvmRevertReason } from './errors.js';
 /**
  * Results of an contract call's execution in the AVM.
  */
 export declare class AvmContractCallResult {
     reverted: boolean;
-    output: Fr[];
+    output: ReturnData;
     gasLeft: AvmGas;
     revertReason?: AvmRevertReason | undefined;
-    constructor(reverted: boolean, output: Fr[], gasLeft: AvmGas, revertReason?: AvmRevertReason | undefined);
+    totalInstructions: number;
+    constructor(reverted: boolean, output: ReturnData, gasLeft: AvmGas, revertReason?: AvmRevertReason | undefined, totalInstructions?: number);
     toString(): string;
     finalize(): AvmFinalizedCallResult;
 }
@@ -21,10 +22,11 @@ export declare class AvmContractCallResult {
  */
 export declare class AvmFinalizedCallResult {
     reverted: boolean;
-    output: Fr[];
+    output: ReturnData;
     gasLeft: Gas;
     revertReason?: SimulationError | undefined;
-    constructor(reverted: boolean, output: Fr[], gasLeft: Gas, revertReason?: SimulationError | undefined);
+    totalInstructions: number;
+    constructor(reverted: boolean, output: ReturnData, gasLeft: Gas, revertReason?: SimulationError | undefined, totalInstructions?: number);
     toString(): string;
 }
-//# sourceMappingURL=avm_contract_call_result.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXZtX2NvbnRyYWN0X2NhbGxfcmVzdWx0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcHVibGljL2F2bS9hdm1fY29udHJhY3RfY2FsbF9yZXN1bHQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDNUQsT0FBTyxFQUFFLEdBQUcsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBS3hDLE9BQU8sS0FBSyxFQUFFLEdBQUcsSUFBSSxNQUFNLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFDbEQsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ2hELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUVuRDs7R0FFRztBQUNILHFCQUFhLHFCQUFxQjtJQUV2QixRQUFRLEVBQUUsT0FBTztJQUNqQixNQUFNLEVBQUUsVUFBVTtJQUNsQixPQUFPLEVBQUUsTUFBTTtJQUNmLFlBQVksQ0FBQztJQUNiLGlCQUFpQixFQUFFLE1BQU07SUFMbEMsWUFDUyxRQUFRLEVBQUUsT0FBTyxFQUNqQixNQUFNLEVBQUUsVUFBVSxFQUNsQixPQUFPLEVBQUUsTUFBTSxFQUNmLFlBQVksQ0FBQyw2QkFBaUIsRUFDOUIsaUJBQWlCLEdBQUUsTUFBVSxFQUNsQztJQUVKLFFBQVEsSUFBSSxNQUFNLENBUWpCO0lBRUQsUUFBUSxJQUFJLHNCQUFzQixDQVdqQztDQUNGO0FBRUQ7OztHQUdHO0FBQ0gscUJBQWEsc0JBQXNCO0lBRXhCLFFBQVEsRUFBRSxPQUFPO0lBQ2pCLE1BQU0sRUFBRSxVQUFVO0lBQ2xCLE9BQU8sRUFBRSxHQUFHO0lBQ1osWUFBWSxDQUFDO0lBQ2IsaUJBQWlCLEVBQUUsTUFBTTtJQUxsQyxZQUNTLFFBQVEsRUFBRSxPQUFPLEVBQ2pCLE1BQU0sRUFBRSxVQUFVLEVBQ2xCLE9BQU8sRUFBRSxHQUFHLEVBQ1osWUFBWSxDQUFDLDZCQUFpQixFQUM5QixpQkFBaUIsR0FBRSxNQUFVLEVBQ2xDO0lBRUosUUFBUSxJQUFJLE1BQU0sQ0FRakI7Q0FDRiJ9

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

@@ -1 +1 @@
-{"version":3,"file":"avm_contract_call_result.d.ts","sourceRoot":"","sources":["../../../src/public/avm/avm_contract_call_result.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAKxC,OAAO,KAAK,EAAE,GAAG,IAAI,MAAM,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD;;GAEG;AACH,qBAAa,qBAAqB;IAEvB,QAAQ,EAAE,OAAO;IACjB,MAAM,EAAE,EAAE,EAAE;IACZ,OAAO,EAAE,MAAM;IACf,YAAY,CAAC;gBAHb,QAAQ,EAAE,OAAO,EACjB,MAAM,EAAE,EAAE,EAAE,EACZ,OAAO,EAAE,MAAM,EACf,YAAY,CAAC,6BAAiB;IAGvC,QAAQ,IAAI,MAAM;IAQlB,QAAQ,IAAI,sBAAsB;CAInC;AAED;;;GAGG;AACH,qBAAa,sBAAsB;IAExB,QAAQ,EAAE,OAAO;IACjB,MAAM,EAAE,EAAE,EAAE;IACZ,OAAO,EAAE,GAAG;IACZ,YAAY,CAAC;gBAHb,QAAQ,EAAE,OAAO,EACjB,MAAM,EAAE,EAAE,EAAE,EACZ,OAAO,EAAE,GAAG,EACZ,YAAY,CAAC,6BAAiB;IAGvC,QAAQ,IAAI,MAAM;CAOnB"}
+{"version":3,"file":"avm_contract_call_result.d.ts","sourceRoot":"","sources":["../../../src/public/avm/avm_contract_call_result.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAKxC,OAAO,KAAK,EAAE,GAAG,IAAI,MAAM,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD;;GAEG;AACH,qBAAa,qBAAqB;IAEvB,QAAQ,EAAE,OAAO;IACjB,MAAM,EAAE,UAAU;IAClB,OAAO,EAAE,MAAM;IACf,YAAY,CAAC;IACb,iBAAiB,EAAE,MAAM;IALlC,YACS,QAAQ,EAAE,OAAO,EACjB,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,MAAM,EACf,YAAY,CAAC,6BAAiB,EAC9B,iBAAiB,GAAE,MAAU,EAClC;IAEJ,QAAQ,IAAI,MAAM,CAQjB;IAED,QAAQ,IAAI,sBAAsB,CAWjC;CACF;AAED;;;GAGG;AACH,qBAAa,sBAAsB;IAExB,QAAQ,EAAE,OAAO;IACjB,MAAM,EAAE,UAAU;IAClB,OAAO,EAAE,GAAG;IACZ,YAAY,CAAC;IACb,iBAAiB,EAAE,MAAM;IALlC,YACS,QAAQ,EAAE,OAAO,EACjB,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,GAAG,EACZ,YAAY,CAAC,6BAAiB,EAC9B,iBAAiB,GAAE,MAAU,EAClC;IAEJ,QAAQ,IAAI,MAAM,CAQjB;CACF"}

package/dest/public/avm/avm_contract_call_result.js

@@ -8,22 +8,24 @@ import { createSimulationError } from '../../common/errors.js';
     output;
     gasLeft;
     revertReason;
-    constructor(reverted, output, gasLeft, revertReason){
+    totalInstructions;
+    constructor(reverted, output, gasLeft, revertReason, totalInstructions = 0){
         this.reverted = reverted;
         this.output = output;
         this.gasLeft = gasLeft;
         this.revertReason = revertReason;
+        this.totalInstructions = totalInstructions;
     }
     toString() {
-        let resultsStr = `reverted: ${this.reverted}, output: ${this.output}, gasLeft: ${inspect(this.gasLeft)}`;
+        let resultsStr = `reverted: ${this.reverted}, output: ${this.output.bestEffortReadAll(10)}${this.output.length() > 10 ? ' ...' : ''}, gasLeft: ${inspect(this.gasLeft)}, totalInstructions: ${this.totalInstructions}`;
         if (this.revertReason) {
-            resultsStr += `, revertReason: ${this.revertReason}`;
+            resultsStr += `, revertReason: ${this.revertReason.message}`;
         }
         return resultsStr;
     }
     finalize() {
-        const revertReason = this.revertReason ? createSimulationError(this.revertReason, this.output) : undefined;
-        return new AvmFinalizedCallResult(this.reverted, this.output, Gas.from(this.gasLeft), revertReason);
+        const revertReason = this.revertReason ? createSimulationError(this.revertReason, this.output.bestEffortReadAll()) : undefined;
+        return new AvmFinalizedCallResult(this.reverted, this.output, Gas.from(this.gasLeft), revertReason, this.totalInstructions);
     }
 }
 /**
@@ -34,16 +36,18 @@ import { createSimulationError } from '../../common/errors.js';
     output;
     gasLeft;
     revertReason;
-    constructor(reverted, output, gasLeft, revertReason){
+    totalInstructions;
+    constructor(reverted, output, gasLeft, revertReason, totalInstructions = 0){
         this.reverted = reverted;
         this.output = output;
         this.gasLeft = gasLeft;
         this.revertReason = revertReason;
+        this.totalInstructions = totalInstructions;
     }
     toString() {
-        let resultsStr = `reverted: ${this.reverted}, output: ${this.output}, gasLeft: ${inspect(this.gasLeft)}`;
+        let resultsStr = `reverted: ${this.reverted}, output: ${this.output.bestEffortReadAll(10)}${this.output.length() > 10 ? ' ...' : ''}, gasLeft: ${inspect(this.gasLeft)}, totalInstructions: ${this.totalInstructions}`;
         if (this.revertReason) {
-            resultsStr += `, revertReason: ${this.revertReason}`;
+            resultsStr += `, revertReason: ${this.revertReason.message}`;
         }
         return resultsStr;
     }

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

@@ -1,6 +1,8 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import type { PublicSimulatorConfig } from '@aztec/stdlib/avm';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { GlobalVariables } from '@aztec/stdlib/tx';
+import type { CallData } from './calldata.js';
 /**
  * Contains variables that remain constant during AVM execution
  * These variables are provided by the public kernel circuit
@@ -12,10 +14,11 @@ export declare class AvmExecutionEnvironment {
     readonly transactionFee: Fr;
     readonly globals: GlobalVariables;
     readonly isStaticCall: boolean;
-    readonly calldata: Fr[];
-    constructor(address: AztecAddress, sender: AztecAddress, contractCallDepth: Fr, transactionFee: Fr, globals: GlobalVariables, isStaticCall: boolean, calldata: Fr[]);
+    readonly calldata: CallData;
+    readonly config: PublicSimulatorConfig;
+    constructor(address: AztecAddress, sender: AztecAddress, contractCallDepth: Fr, transactionFee: Fr, globals: GlobalVariables, isStaticCall: boolean, calldata: CallData, config: PublicSimulatorConfig);
     private deriveEnvironmentForNestedCallInternal;
-    deriveEnvironmentForNestedCall(targetAddress: AztecAddress, calldata: Fr[]): AvmExecutionEnvironment;
-    deriveEnvironmentForNestedStaticCall(targetAddress: AztecAddress, calldata: Fr[]): AvmExecutionEnvironment;
+    deriveEnvironmentForNestedCall(targetAddress: AztecAddress, calldata: CallData): AvmExecutionEnvironment;
+    deriveEnvironmentForNestedStaticCall(targetAddress: AztecAddress, calldata: CallData): AvmExecutionEnvironment;
 }
-//# sourceMappingURL=avm_execution_environment.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXZtX2V4ZWN1dGlvbl9lbnZpcm9ubWVudC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3B1YmxpYy9hdm0vYXZtX2V4ZWN1dGlvbl9lbnZpcm9ubWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUMvRCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUV4RCxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFOUM7OztHQUdHO0FBQ0gscUJBQWEsdUJBQXVCO2FBRWhCLE9BQU8sRUFBRSxZQUFZO2FBQ3JCLE1BQU0sRUFBRSxZQUFZO2FBQ3BCLGlCQUFpQixFQUFFLEVBQUU7YUFDckIsY0FBYyxFQUFFLEVBQUU7YUFDbEIsT0FBTyxFQUFFLGVBQWU7YUFDeEIsWUFBWSxFQUFFLE9BQU87YUFDckIsUUFBUSxFQUFFLFFBQVE7YUFDbEIsTUFBTSxFQUFFLHFCQUFxQjtJQVIvQyxZQUNrQixPQUFPLEVBQUUsWUFBWSxFQUNyQixNQUFNLEVBQUUsWUFBWSxFQUNwQixpQkFBaUIsRUFBRSxFQUFFLEVBQ3JCLGNBQWMsRUFBRSxFQUFFLEVBQ2xCLE9BQU8sRUFBRSxlQUFlLEVBQ3hCLFlBQVksRUFBRSxPQUFPLEVBQ3JCLFFBQVEsRUFBRSxRQUFRLEVBQ2xCLE1BQU0sRUFBRSxxQkFBcUIsRUFDM0M7SUFFSixPQUFPLENBQUMsc0NBQXNDO0lBaUJ2Qyw4QkFBOEIsQ0FBQyxhQUFhLEVBQUUsWUFBWSxFQUFFLFFBQVEsRUFBRSxRQUFRLEdBQUcsdUJBQXVCLENBRTlHO0lBRU0sb0NBQW9DLENBQ3pDLGFBQWEsRUFBRSxZQUFZLEVBQzNCLFFBQVEsRUFBRSxRQUFRLEdBQ2pCLHVCQUF1QixDQUV6QjtDQUNGIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"avm_execution_environment.d.ts","sourceRoot":"","sources":["../../../src/public/avm/avm_execution_environment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAExD;;;GAGG;AACH,qBAAa,uBAAuB;aAEhB,OAAO,EAAE,YAAY;aACrB,MAAM,EAAE,YAAY;aACpB,iBAAiB,EAAE,EAAE;aACrB,cAAc,EAAE,EAAE;aAClB,OAAO,EAAE,eAAe;aACxB,YAAY,EAAE,OAAO;aACrB,QAAQ,EAAE,EAAE,EAAE;gBANd,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,YAAY,EACpB,iBAAiB,EAAE,EAAE,EACrB,cAAc,EAAE,EAAE,EAClB,OAAO,EAAE,eAAe,EACxB,YAAY,EAAE,OAAO,EACrB,QAAQ,EAAE,EAAE,EAAE;IAGhC,OAAO,CAAC,sCAAsC;IAYvC,8BAA8B,CAAC,aAAa,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,EAAE,GAAG,uBAAuB;IAIpG,oCAAoC,CAAC,aAAa,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,EAAE,GAAG,uBAAuB;CAGlH"}
+{"version":3,"file":"avm_execution_environment.d.ts","sourceRoot":"","sources":["../../../src/public/avm/avm_execution_environment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAExD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAE9C;;;GAGG;AACH,qBAAa,uBAAuB;aAEhB,OAAO,EAAE,YAAY;aACrB,MAAM,EAAE,YAAY;aACpB,iBAAiB,EAAE,EAAE;aACrB,cAAc,EAAE,EAAE;aAClB,OAAO,EAAE,eAAe;aACxB,YAAY,EAAE,OAAO;aACrB,QAAQ,EAAE,QAAQ;aAClB,MAAM,EAAE,qBAAqB;IAR/C,YACkB,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,YAAY,EACpB,iBAAiB,EAAE,EAAE,EACrB,cAAc,EAAE,EAAE,EAClB,OAAO,EAAE,eAAe,EACxB,YAAY,EAAE,OAAO,EACrB,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,qBAAqB,EAC3C;IAEJ,OAAO,CAAC,sCAAsC;IAiBvC,8BAA8B,CAAC,aAAa,EAAE,YAAY,EAAE,QAAQ,EAAE,QAAQ,GAAG,uBAAuB,CAE9G;IAEM,oCAAoC,CACzC,aAAa,EAAE,YAAY,EAC3B,QAAQ,EAAE,QAAQ,GACjB,uBAAuB,CAEzB;CACF"}

package/dest/public/avm/avm_execution_environment.js

@@ -1,4 +1,4 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 /**
  * Contains variables that remain constant during AVM execution
  * These variables are provided by the public kernel circuit
@@ -10,7 +10,8 @@ import { Fr } from '@aztec/foundation/fields';
     globals;
     isStaticCall;
     calldata;
-    constructor(address, sender, contractCallDepth, transactionFee, globals, isStaticCall, calldata){
+    config;
+    constructor(address, sender, contractCallDepth, transactionFee, globals, isStaticCall, calldata, config){
         this.address = address;
         this.sender = sender;
         this.contractCallDepth = contractCallDepth;
@@ -18,9 +19,10 @@ import { Fr } from '@aztec/foundation/fields';
         this.globals = globals;
         this.isStaticCall = isStaticCall;
         this.calldata = calldata;
+        this.config = config;
     }
     deriveEnvironmentForNestedCallInternal(targetAddress, calldata, isStaticCall) {
-        return new AvmExecutionEnvironment(/*address=*/ targetAddress, /*sender=*/ this.address, this.contractCallDepth.add(Fr.ONE), this.transactionFee, this.globals, isStaticCall, calldata);
+        return new AvmExecutionEnvironment(/*address=*/ targetAddress, /*sender=*/ this.address, this.contractCallDepth.add(Fr.ONE), this.transactionFee, this.globals, isStaticCall, calldata, this.config);
     }
     deriveEnvironmentForNestedCall(targetAddress, calldata) {
         return this.deriveEnvironmentForNestedCallInternal(targetAddress, calldata, /*isStaticCall=*/ false);

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

@@ -36,25 +36,9 @@ export declare const EmptyGas: Gas;
 export declare const GAS_DIMENSIONS: readonly ["l2Gas", "daGas"];
 /** Returns the fixed base gas cost for a given opcode. */
 export declare function getBaseGasCost(opcode: Opcode): Gas;
+export declare function computeAddressingCost(indirectOperandsCount: number, relativeOperandsCount: number): Gas;
 export declare function getDynamicGasCost(opcode: Opcode): Gas;
-/** Returns the gas cost associated with the memory operations performed. */
-export declare function getMemoryGasCost(args: {
-    reads?: number;
-    writes?: number;
-    indirect?: number;
-}): {
-    l2Gas: number;
-    daGas: number;
-};
-/** Constants used in base cost calculations. */
-export declare const GAS_COST_CONSTANTS: {
-    MEMORY_READ: number;
-    MEMORY_INDIRECT_READ_PENALTY: number;
-    MEMORY_WRITE: number;
-};
-/** Returns gas cost for an operation on a given type tag based on the base cost per byte. */
-export declare function getGasCostForTypeTag(tag: TypeTag, baseCost: Gas): {
-    l2Gas: number;
-    daGas: number;
-};
-//# sourceMappingURL=avm_gas.d.ts.map
+/** Returns a multiplier based on the byte size of the type represented by the integer tag.
+ * Used to account for necessary rows in the bitwise trace. Throws on invalid. */
+export declare function getBitwiseDynamicGasMultiplier(tag: TypeTag): 0 | 1 | 2 | 4 | 8 | 16;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXZtX2dhcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3B1YmxpYy9hdm0vYXZtX2dhcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFaEQsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLDhDQUE4QyxDQUFDO0FBRXRFLHNDQUFzQztBQUN0QyxNQUFNLE1BQU0sR0FBRyxHQUFHO0lBQ2hCLEtBQUssRUFBRSxNQUFNLENBQUM7SUFDZCxLQUFLLEVBQUUsTUFBTSxDQUFDO0NBQ2YsQ0FBQztBQUVGLCtDQUErQztBQUMvQyx3QkFBZ0IsWUFBWSxDQUFDLEdBQUcsRUFBRSxHQUFHOzs7RUFFcEM7QUFFRCwrQ0FBK0M7QUFDL0Msd0JBQWdCLFlBQVksQ0FBQyxPQUFPLEVBQUU7SUFBRSxTQUFTLEVBQUUsTUFBTSxDQUFDO0lBQUMsU0FBUyxFQUFFLE1BQU0sQ0FBQTtDQUFFOzs7RUFFN0U7QUFFRCw4RUFBOEU7QUFDOUUsd0JBQWdCLE9BQU8sQ0FBQyxPQUFPLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQzs7O0VBRTVDO0FBRUQsK0NBQStDO0FBQy9DLHdCQUFnQixNQUFNLENBQUMsR0FBRyxLQUFLLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxFQUFFLEdBQUcsR0FBRyxDQVFwRDtBQUVELDZDQUE2QztBQUM3Qyx3QkFBZ0IsTUFBTSxDQUFDLEdBQUcsRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLEVBQUUsTUFBTSxFQUFFLE1BQU07OztFQUV2RDtBQUVELDBDQUEwQztBQUMxQyxlQUFPLE1BQU0sUUFBUSxFQUFFLEdBR3RCLENBQUM7QUFNRiwrQ0FBK0M7QUFDL0MsZUFBTyxNQUFNLGNBQWMsNkJBQThCLENBQUM7QUF5RjFELDBEQUEwRDtBQUMxRCx3QkFBZ0IsY0FBYyxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsR0FBRyxDQUVsRDtBQUVELHdCQUFnQixxQkFBcUIsQ0FBQyxxQkFBcUIsRUFBRSxNQUFNLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxHQUFHLEdBQUcsQ0FPdkc7QUFFRCx3QkFBZ0IsaUJBQWlCLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxHQUFHLENBRXJEO0FBRUQ7aUZBQ2lGO0FBQ2pGLHdCQUFnQiw4QkFBOEIsQ0FBQyxHQUFHLEVBQUUsT0FBTywwQkFtQjFEIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"avm_gas.d.ts","sourceRoot":"","sources":["../../../src/public/avm/avm_gas.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAGhD,OAAO,EAAE,MAAM,EAAE,MAAM,8CAA8C,CAAC;AAEtE,sCAAsC;AACtC,MAAM,MAAM,GAAG,GAAG;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,+CAA+C;AAC/C,wBAAgB,YAAY,CAAC,GAAG,EAAE,GAAG;;;EAEpC;AAED,+CAA+C;AAC/C,wBAAgB,YAAY,CAAC,OAAO,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE;;;EAE7E;AAED,8EAA8E;AAC9E,wBAAgB,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC;;;EAE5C;AAED,+CAA+C;AAC/C,wBAAgB,MAAM,CAAC,GAAG,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,OAQ9C;AAED,6CAA6C;AAC7C,wBAAgB,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,MAAM;;;EAEvD;AAED,0CAA0C;AAC1C,eAAO,MAAM,QAAQ,EAAE,GAGtB,CAAC;AAMF,+CAA+C;AAC/C,eAAO,MAAM,cAAc,6BAA8B,CAAC;AAuF1D,0DAA0D;AAC1D,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,CAElD;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,CAErD;AAED,4EAA4E;AAC5E,wBAAgB,gBAAgB,CAAC,IAAI,EAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE;;;EAQ5F;AAED,gDAAgD;AAChD,eAAO,MAAM,kBAAkB;;;;CAI9B,CAAC;AAEF,6FAA6F;AAC7F,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG;;;EAE/D"}
+{"version":3,"file":"avm_gas.d.ts","sourceRoot":"","sources":["../../../src/public/avm/avm_gas.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAEhD,OAAO,EAAE,MAAM,EAAE,MAAM,8CAA8C,CAAC;AAEtE,sCAAsC;AACtC,MAAM,MAAM,GAAG,GAAG;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,+CAA+C;AAC/C,wBAAgB,YAAY,CAAC,GAAG,EAAE,GAAG;;;EAEpC;AAED,+CAA+C;AAC/C,wBAAgB,YAAY,CAAC,OAAO,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE;;;EAE7E;AAED,8EAA8E;AAC9E,wBAAgB,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC;;;EAE5C;AAED,+CAA+C;AAC/C,wBAAgB,MAAM,CAAC,GAAG,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,CAQpD;AAED,6CAA6C;AAC7C,wBAAgB,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,MAAM;;;EAEvD;AAED,0CAA0C;AAC1C,eAAO,MAAM,QAAQ,EAAE,GAGtB,CAAC;AAMF,+CAA+C;AAC/C,eAAO,MAAM,cAAc,6BAA8B,CAAC;AAyF1D,0DAA0D;AAC1D,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,CAElD;AAED,wBAAgB,qBAAqB,CAAC,qBAAqB,EAAE,MAAM,EAAE,qBAAqB,EAAE,MAAM,GAAG,GAAG,CAOvG;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,CAErD;AAED;iFACiF;AACjF,wBAAgB,8BAA8B,CAAC,GAAG,EAAE,OAAO,0BAmB1D"}

package/dest/public/avm/avm_gas.js

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

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

@@ -1,6 +1,7 @@
-import type { Fr } from '@aztec/foundation/fields';
+import type { Fr } from '@aztec/foundation/curves/bn254';
 import type { Gas } from './avm_gas.js';
 import { TaggedMemory } from './avm_memory_types.js';
+import { type ReturnData } from './calldata.js';
 import { type AvmRevertReason } from './errors.js';
 /**
  * A few fields of machine state are initialized from AVM session inputs or call instruction arguments
@@ -34,7 +35,7 @@ export declare class AvmMachineState {
     /** program counter of the next instruction, byte based */
     nextPc: number;
     /** return/revertdata of the last nested call. */
-    nestedReturndata: Fr[];
+    nestedReturndata: ReturnData;
     /** Tracks whether the last external call was successful */
     nestedCallSuccess: boolean;
     /**
@@ -59,6 +60,8 @@ export declare class AvmMachineState {
     private reverted;
     /** Output data must NOT be modified once it is set */
     private output;
+    /** instruction counter, including nested calls */
+    instrCounter: number;
     constructor(gasLeft: Gas);
     constructor(l2GasLeft: number, daGasLeft: number);
     get gasLeft(): Gas;
@@ -76,20 +79,20 @@ export declare class AvmMachineState {
      * Output data must NOT be modified once it is set
      * @param output
      */
-    return(output: Fr[]): void;
+    return(output: ReturnData): void;
     /**
      * Halt as reverted
      * Output data must NOT be modified once it is set
      * @param output
      */
-    revert(output: Fr[]): void;
+    revert(output: ReturnData): void;
     getHalted(): boolean;
     getReverted(): boolean;
-    getOutput(): Fr[];
+    getOutput(): ReturnData;
     /**
      * Flag an exceptional halt. Clears gas left and sets the reverted flag. No output data.
      */
     private exceptionalHalt;
 }
 export {};
-//# sourceMappingURL=avm_machine_state.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXZtX21hY2hpbmVfc3RhdGUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9wdWJsaWMvYXZtL2F2bV9tYWNoaW5lX3N0YXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXpELE9BQU8sS0FBSyxFQUFFLEdBQUcsRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUN4QyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDckQsT0FBTyxFQUFFLEtBQUssVUFBVSxFQUFtQixNQUFNLGVBQWUsQ0FBQztBQUNqRSxPQUFPLEVBQUUsS0FBSyxlQUFlLEVBQWlCLE1BQU0sYUFBYSxDQUFDO0FBRWxFOztHQUVHO0FBQ0gsTUFBTSxNQUFNLHNCQUFzQixHQUFHO0lBQ25DLFNBQVMsRUFBRSxNQUFNLENBQUM7SUFDbEIsU0FBUyxFQUFFLE1BQU0sQ0FBQztDQUNuQixDQUFDO0FBRUY7Ozs7R0FJRztBQUNILEtBQUssaUJBQWlCLEdBQUc7SUFDdkIsd0JBQXdCLEVBQUUsRUFBRSxFQUFFLENBQUM7SUFDL0IscUJBQXFCLEVBQUUsZUFBZSxDQUFDO0NBQ3hDLENBQUM7QUFFRixLQUFLLGNBQWMsR0FBRztJQUNwQixNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQ2YsUUFBUSxFQUFFLE1BQU0sQ0FBQztDQUNsQixDQUFDO0FBRUY7O0dBRUc7QUFDSCxxQkFBYSxlQUFlO0lBQzFCLDZEQUE2RDtJQUN0RCxTQUFTLEVBQUUsTUFBTSxDQUFDO0lBQ2xCLFNBQVMsRUFBRSxNQUFNLENBQUM7SUFDekIsa0NBQWtDO0lBQzNCLEVBQUUsRUFBRSxNQUFNLENBQUs7SUFDdEIsMERBQTBEO0lBQ25ELE1BQU0sRUFBRSxNQUFNLENBQUs7SUFDMUIsaURBQWlEO0lBQzFDLGdCQUFnQixFQUFFLFVBQVUsQ0FBMkI7SUFDOUQsMkRBQTJEO0lBQ3BELGlCQUFpQixFQUFFLE9BQU8sQ0FBUztJQUMxQzs7OztPQUlHO0lBQ0ksbUJBQW1CLEVBQUUsaUJBQWlCLEdBQUcsU0FBUyxDQUFDO0lBRTFEOzs7T0FHRztJQUNJLGlCQUFpQixFQUFFLGNBQWMsRUFBRSxDQUFNO0lBRWhELHFDQUFxQztJQUNyQyxTQUFnQixNQUFNLEVBQUUsWUFBWSxDQUFzQjtJQUUxRDs7O09BR0c7SUFDSCxPQUFPLENBQUMsTUFBTSxDQUFrQjtJQUNoQywyRkFBMkY7SUFDM0YsT0FBTyxDQUFDLFFBQVEsQ0FBa0I7SUFDbEMsc0RBQXNEO0lBQ3RELE9BQU8sQ0FBQyxNQUFNLENBQXVDO0lBR3JELGtEQUFrRDtJQUMzQyxZQUFZLEVBQUUsTUFBTSxDQUFLO0lBR2hDLFlBQVksT0FBTyxFQUFFLEdBQUcsRUFBRTtJQUMxQixZQUFZLFNBQVMsRUFBRSxNQUFNLEVBQUUsU0FBUyxFQUFFLE1BQU0sRUFBRTtJQVVsRCxJQUFXLE9BQU8sSUFBSSxHQUFHLENBRXhCO0lBRUQsT0FBYyxTQUFTLENBQUMsS0FBSyxFQUFFLHNCQUFzQixHQUFHLGVBQWUsQ0FFdEU7SUFFRDs7OztPQUlHO0lBQ0ksVUFBVSxDQUFDLE9BQU8sRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLFFBbUJ0QztJQUVELHVEQUF1RDtJQUNoRCxTQUFTLENBQUMsU0FBUyxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFHdkM7SUFFRDs7OztPQUlHO0lBQ0ksTUFBTSxDQUFDLE1BQU0sRUFBRSxVQUFVLFFBRy9CO0lBRUQ7Ozs7T0FJRztJQUNJLE1BQU0sQ0FBQyxNQUFNLEVBQUUsVUFBVSxRQUkvQjtJQUVNLFNBQVMsSUFBSSxPQUFPLENBRTFCO0lBRU0sV0FBVyxJQUFJLE9BQU8sQ0FFNUI7SUFFTSxTQUFTLElBQUksVUFBVSxDQUU3QjtJQUVEOztPQUVHO0lBQ0gsT0FBTyxDQUFDLGVBQWU7Q0FNeEIifQ==

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

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

package/dest/public/avm/avm_machine_state.js

@@ -1,4 +1,5 @@
 import { TaggedMemory } from './avm_memory_types.js';
+import { ReturnDataArray } from './calldata.js';
 import { OutOfGasError } from './errors.js';
 /**
  * Avm state modified on an instruction-per-instruction basis.
@@ -7,7 +8,7 @@ import { OutOfGasError } from './errors.js';
     daGasLeft;
     /** program counter, byte based */ pc = 0;
     /** program counter of the next instruction, byte based */ nextPc = 0;
-    /** return/revertdata of the last nested call. */ nestedReturndata = [];
+    /** return/revertdata of the last nested call. */ nestedReturndata = new ReturnDataArray([]);
     /** Tracks whether the last external call was successful */ nestedCallSuccess = false;
     /**
    * Used to track the call stack and revert data of nested calls.
@@ -24,7 +25,9 @@ import { OutOfGasError } from './errors.js';
    * AvmContext execution continues executing instructions until the machine state signals "halted"
    */ halted = false;
     /** Signals that execution has reverted normally (this does not cover exceptional halts) */ reverted = false;
-    /** Output data must NOT be modified once it is set */ output = [];
+    /** Output data must NOT be modified once it is set */ output = new ReturnDataArray([]);
+    // Metrics only - not needed for execution
+    /** instruction counter, including nested calls */ instrCounter = 0;
     constructor(gasLeftOrL2GasLeft, daGasLeft){
         if (typeof gasLeftOrL2GasLeft === 'object') {
             ({ l2Gas: this.l2GasLeft, daGas: this.daGasLeft } = gasLeftOrL2GasLeft);