@aztec/simulator 0.0.1-commit.b6e433891 → 0.0.1-commit.b8a057fa

package/src/public/public_tx_simulator/public_tx_simulator_base.ts

@@ -0,0 +1,37 @@
+import { type Logger, type LoggerBindings, createLogger } from '@aztec/foundation/log';
+import { ProtocolContractsList } from '@aztec/protocol-contracts';
+import { PublicSimulatorConfig } from '@aztec/stdlib/avm';
+import type { GlobalVariables, ProtocolContracts, Tx } from '@aztec/stdlib/tx';
+
+import type { AvmSimulator } from '../avm_simulator.js';
+import type { PublicContractsDB } from '../public_db_sources.js';
+
+/**
+ * Shared base for public tx simulators: holds the common configuration, the {@link AvmSimulator} used
+ * to run the transaction's public calls, the contracts DB and fork id that scope the simulation's
+ * contract-data lookups, the logger, and the tx-hash helper. Concrete simulators extend this and
+ * implement `simulate`.
+ */
+export abstract class PublicTxSimulatorBase {
+  protected log: Logger;
+  protected readonly config: PublicSimulatorConfig;
+  protected readonly bindings?: LoggerBindings;
+
+  constructor(
+    protected avmSimulator: AvmSimulator,
+    protected globalVariables: GlobalVariables,
+    protected contractsDB: PublicContractsDB,
+    protected forkId: number,
+    config?: Partial<PublicSimulatorConfig>,
+    protected protocolContracts: ProtocolContracts = ProtocolContractsList,
+    bindings?: LoggerBindings,
+  ) {
+    this.config = PublicSimulatorConfig.from(config ?? {});
+    this.bindings = bindings;
+    this.log = createLogger(`simulator:public_tx_simulator`, bindings);
+  }
+
+  protected computeTxHash(tx: Tx) {
+    return tx.getTxHash();
+  }
+}

package/src/public/public_tx_simulator/public_tx_simulator_interface.ts

@@ -5,14 +5,14 @@ export interface PublicTxSimulatorInterface {
   simulate(tx: Tx): Promise<PublicTxResult>;
   /**
    * Cancel the current simulation if one is in progress.
-   * This signals the underlying simulator (e.g., C++) to stop at the next safe point.
+   * This signals the underlying simulator to stop at the next safe point.
    * Safe to call even if no simulation is in progress.
    * Optional - not all implementations support cancellation.
    *
    * @param waitTimeoutMs - If provided, wait up to this many ms for the simulation to actually stop.
-   *                        This is important because signaling cancellation doesn't immediately stop C++ -
-   *                        it only sets a flag that C++ checks at certain points. If C++ is in the middle
-   *                        of a slow operation (e.g., pad_trees), it won't stop until that completes.
+   *                        Cancellation is cooperative: signaling it only sets a flag the simulator
+   *                        checks at certain points, so if it's mid slow-operation it won't stop until
+   *                        that completes.
    * @returns Promise that resolves when cancellation is signaled (and optionally when simulation stops)
    */
   cancel?(waitTimeoutMs?: number): Promise<void>;
@@ -22,7 +22,7 @@ export interface MeasuredPublicTxSimulatorInterface {
   simulate(tx: Tx, txLabel: string): Promise<PublicTxResult>;
   /**
    * Cancel the current simulation if one is in progress.
-   * This signals the underlying simulator (e.g., C++) to stop at the next safe point.
+   * This signals the underlying simulator to stop at the next safe point.
    * Safe to call even if no simulation is in progress.
    * Optional - not all implementations support cancellation.
    *

package/src/public/test_executor_metrics.ts

@@ -21,7 +21,6 @@ export interface PublicTxMetrics {
   totalDurationMs: number;
   manaUsed: number | undefined;
   totalInstructionsExecuted: number;
-  bytecodeSizes: { contractName: string; sizeBytes: number }[];
   nonRevertiblePrivateInsertionsUs: number | undefined;
   revertiblePrivateInsertionsUs: number | undefined;
   enqueuedCalls: PublicEnqueuedCallMetrics[];
@@ -63,7 +62,6 @@ function createEmptyTxMetrics(): PublicTxMetrics {
     totalDurationMs: 0,
     manaUsed: 0,
     totalInstructionsExecuted: 0,
-    bytecodeSizes: [],
     nonRevertiblePrivateInsertionsUs: undefined,
     revertiblePrivateInsertionsUs: undefined,
     enqueuedCalls: [],
@@ -174,12 +172,6 @@ export class TestExecutorMetrics implements ExecutorMetricsInterface {
     }
   }
 
-  recordBytecodeSize(txLabel: string, contractName: string, sizeBytes: number) {
-    const txMetrics = this.txMetrics.get(txLabel);
-    assert(txMetrics, `Cannot record bytecode size for unknown tx label: ${txLabel}`);
-    txMetrics.bytecodeSizes.push({ contractName, sizeBytes });
-  }
-
   recordProverMetrics(txLabel: string, metrics: Partial<PublicTxMetrics>) {
     if (!this.txMetrics.has(txLabel)) {
       this.txMetrics.set(txLabel, createEmptyTxMetrics());
@@ -224,15 +216,6 @@ export class TestExecutorMetrics implements ExecutorMetricsInterface {
       ) {
         pretty += `${INDENT0}Total instructions executed: ${fmtNum(txMetrics.totalInstructionsExecuted)}\n`;
       }
-      if (
-        (filter === PublicTxMetricsFilter.TOTALS || filter === PublicTxMetricsFilter.ALL) &&
-        txMetrics.bytecodeSizes.length > 0
-      ) {
-        pretty += `${INDENT0}Bytecode sizes:\n`;
-        for (const { contractName, sizeBytes } of txMetrics.bytecodeSizes) {
-          pretty += `${INDENT1}${contractName}: ${fmtNum(sizeBytes, 'bytes')}\n`;
-        }
-      }
       if (filter === PublicTxMetricsFilter.DURATIONS || filter === PublicTxMetricsFilter.ALL) {
         pretty += `${INDENT0}Private insertions:\n`;
         pretty += `${INDENT1}Non-revertible: ${fmtNum(txMetrics.nonRevertiblePrivateInsertionsUs! / 1_000, 'ms')}\n`;
@@ -404,13 +387,6 @@ export class TestExecutorMetrics implements ExecutorMetricsInterface {
           });
         }
       }
-      for (const { contractName, sizeBytes } of txMetrics.bytecodeSizes) {
-        data.push({
-          name: `${txLabel}/bytecodeSizeBytes/${contractName}`,
-          value: sizeBytes,
-          unit: 'bytes',
-        });
-      }
     }
     return JSON.stringify(data, null, indent);
   }

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

@@ -1,41 +0,0 @@
-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 { 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: PublicPersistableStateManager;
-    environment: AvmExecutionEnvironment;
-    machineState: AvmMachineState;
-    /**
-     * Create a new AVM context
-     * @param persistableState - Manages world state and accrued substate during execution - (caching, fetching, tracing)
-     * @param environment - Contains constant variables provided by the kernel
-     * @param machineState - VM state that is modified on an instruction-by-instruction basis
-     * @returns new AvmContext instance
-     */
-    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
-     * - Derive a machine state from the current state
-     *   - E.g., gas metering is preserved but pc is reset
-     * - Derive an execution environment from the caller/parent
-     *   - Alter address
-     *
-     * @param address - The contract instance to initialize a context for
-     * @param calldata - Data/arguments for nested call
-     * @param allocatedGas - Gas allocated for the nested call
-     * @param callType - Type of call (CALL or STATICCALL)
-     * @returns new AvmContext instance
-     */
-    createNestedContractCallContext(address: AztecAddress, calldata: CallData, allocatedGas: Gas, callType: 'CALL' | 'STATICCALL'): Promise<AvmContext>;
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXZtX2NvbnRleHQuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9wdWJsaWMvYXZtL2F2bV9jb250ZXh0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBRWhFLE9BQU8sS0FBSyxFQUFFLDZCQUE2QixFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFDdkYsT0FBTyxLQUFLLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUM5RSxPQUFPLEVBQUUsS0FBSyxHQUFHLEVBQWdCLE1BQU0sY0FBYyxDQUFDO0FBQ3RELE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxxQkFBcUIsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQzFFLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUU5Qzs7O0dBR0c7QUFDSCxxQkFBYSxVQUFVO0lBU1osZ0JBQWdCLEVBQUUsNkJBQTZCO0lBQy9DLFdBQVcsRUFBRSx1QkFBdUI7SUFDcEMsWUFBWSxFQUFFLGVBQWU7SUFWdEM7Ozs7OztPQU1HO0lBQ0gsWUFDUyxnQkFBZ0IsRUFBRSw2QkFBNkIsRUFDL0MsV0FBVyxFQUFFLHVCQUF1QixFQUNwQyxZQUFZLEVBQUUsZUFBZSxFQUNsQztJQUlHLGdCQUFnQixDQUFDLEVBQUUsQ0FBQyxPQUFPLEVBQUUsVUFBVSxLQUFLLE9BQU8sQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDO0lBRWxGOzs7Ozs7Ozs7Ozs7O09BYUc7SUFDVSwrQkFBK0IsQ0FDMUMsT0FBTyxFQUFFLFlBQVksRUFDckIsUUFBUSxFQUFFLFFBQVEsRUFDbEIsWUFBWSxFQUFFLEdBQUcsRUFDakIsUUFBUSxFQUFFLE1BQU0sR0FBRyxZQUFZLEdBQzlCLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FTckI7Q0FDRiJ9

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

@@ -1 +0,0 @@
-{"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_context.js

@@ -1,44 +0,0 @@
-import { gasToGasLeft } from './avm_gas.js';
-import { AvmMachineState } from './avm_machine_state.js';
-/**
- * An execution context includes the information necessary to initiate AVM
- * execution along with all state maintained by the AVM throughout execution.
- */ export class AvmContext {
-    persistableState;
-    environment;
-    machineState;
-    /**
-   * Create a new AVM context
-   * @param persistableState - Manages world state and accrued substate during execution - (caching, fetching, tracing)
-   * @param environment - Contains constant variables provided by the kernel
-   * @param machineState - VM state that is modified on an instruction-by-instruction basis
-   * @returns new AvmContext instance
-   */ constructor(persistableState, environment, machineState){
-        this.persistableState = persistableState;
-        this.environment = environment;
-        this.machineState = machineState;
-    }
-    // This is needed to break a dependency cycle created by the CALL opcode,
-    // which needs to create a new simulator but cannot depend directly on AvmSimulator.
-    provideSimulator;
-    /**
-   * Prepare a new AVM context that will be ready for an external/nested call
-   * - Fork the world state journal
-   * - Derive a machine state from the current state
-   *   - E.g., gas metering is preserved but pc is reset
-   * - Derive an execution environment from the caller/parent
-   *   - Alter address
-   *
-   * @param address - The contract instance to initialize a context for
-   * @param calldata - Data/arguments for nested call
-   * @param allocatedGas - Gas allocated for the nested call
-   * @param callType - Type of call (CALL or STATICCALL)
-   * @returns new AvmContext instance
-   */ async createNestedContractCallContext(address, calldata, allocatedGas, callType) {
-        const deriveFn = callType === 'CALL' ? this.environment.deriveEnvironmentForNestedCall : this.environment.deriveEnvironmentForNestedStaticCall;
-        const newExecutionEnvironment = deriveFn.call(this.environment, address, calldata);
-        const forkedWorldState = await this.persistableState.fork();
-        const machineState = AvmMachineState.fromState(gasToGasLeft(allocatedGas));
-        return new AvmContext(forkedWorldState, newExecutionEnvironment, machineState);
-    }
-}

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

@@ -1,32 +0,0 @@
-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: ReturnData;
-    gasLeft: AvmGas;
-    revertReason?: AvmRevertReason | undefined;
-    totalInstructions: number;
-    constructor(reverted: boolean, output: ReturnData, gasLeft: AvmGas, revertReason?: AvmRevertReason | undefined, totalInstructions?: number);
-    toString(): string;
-    finalize(): AvmFinalizedCallResult;
-}
-/**
- * Similar to AvmContractCallResult, but with a SimulationError and standard Gas
- * which are useful for consumption external to core AVM simulation.
- */
-export declare class AvmFinalizedCallResult {
-    reverted: boolean;
-    output: ReturnData;
-    gasLeft: Gas;
-    revertReason?: SimulationError | undefined;
-    totalInstructions: number;
-    constructor(reverted: boolean, output: ReturnData, gasLeft: Gas, revertReason?: SimulationError | undefined, totalInstructions?: number);
-    toString(): string;
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXZtX2NvbnRyYWN0X2NhbGxfcmVzdWx0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcHVibGljL2F2bS9hdm1fY29udHJhY3RfY2FsbF9yZXN1bHQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDNUQsT0FBTyxFQUFFLEdBQUcsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBS3hDLE9BQU8sS0FBSyxFQUFFLEdBQUcsSUFBSSxNQUFNLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFDbEQsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ2hELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUVuRDs7R0FFRztBQUNILHFCQUFhLHFCQUFxQjtJQUV2QixRQUFRLEVBQUUsT0FBTztJQUNqQixNQUFNLEVBQUUsVUFBVTtJQUNsQixPQUFPLEVBQUUsTUFBTTtJQUNmLFlBQVksQ0FBQztJQUNiLGlCQUFpQixFQUFFLE1BQU07SUFMbEMsWUFDUyxRQUFRLEVBQUUsT0FBTyxFQUNqQixNQUFNLEVBQUUsVUFBVSxFQUNsQixPQUFPLEVBQUUsTUFBTSxFQUNmLFlBQVksQ0FBQyw2QkFBaUIsRUFDOUIsaUJBQWlCLEdBQUUsTUFBVSxFQUNsQztJQUVKLFFBQVEsSUFBSSxNQUFNLENBUWpCO0lBRUQsUUFBUSxJQUFJLHNCQUFzQixDQVdqQztDQUNGO0FBRUQ7OztHQUdHO0FBQ0gscUJBQWEsc0JBQXNCO0lBRXhCLFFBQVEsRUFBRSxPQUFPO0lBQ2pCLE1BQU0sRUFBRSxVQUFVO0lBQ2xCLE9BQU8sRUFBRSxHQUFHO0lBQ1osWUFBWSxDQUFDO0lBQ2IsaUJBQWlCLEVBQUUsTUFBTTtJQUxsQyxZQUNTLFFBQVEsRUFBRSxPQUFPLEVBQ2pCLE1BQU0sRUFBRSxVQUFVLEVBQ2xCLE9BQU8sRUFBRSxHQUFHLEVBQ1osWUFBWSxDQUFDLDZCQUFpQixFQUM5QixpQkFBaUIsR0FBRSxNQUFVLEVBQ2xDO0lBRUosUUFBUSxJQUFJLE1BQU0sQ0FRakI7Q0FDRiJ9

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

@@ -1 +0,0 @@
-{"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

@@ -1,54 +0,0 @@
-import { Gas } from '@aztec/stdlib/gas';
-import { inspect } from 'util';
-import { createSimulationError } from '../../common/errors.js';
-/**
- * Results of an contract call's execution in the AVM.
- */ export class AvmContractCallResult {
-    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.bestEffortReadAll(10)}${this.output.length() > 10 ? ' ...' : ''}, gasLeft: ${inspect(this.gasLeft)}, totalInstructions: ${this.totalInstructions}`;
-        if (this.revertReason) {
-            resultsStr += `, revertReason: ${this.revertReason.message}`;
-        }
-        return resultsStr;
-    }
-    finalize() {
-        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);
-    }
-}
-/**
- * Similar to AvmContractCallResult, but with a SimulationError and standard Gas
- * which are useful for consumption external to core AVM simulation.
- */ export class AvmFinalizedCallResult {
-    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.bestEffortReadAll(10)}${this.output.length() > 10 ? ' ...' : ''}, gasLeft: ${inspect(this.gasLeft)}, totalInstructions: ${this.totalInstructions}`;
-        if (this.revertReason) {
-            resultsStr += `, revertReason: ${this.revertReason.message}`;
-        }
-        return resultsStr;
-    }
-}

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

@@ -1,24 +0,0 @@
-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
- */
-export declare class AvmExecutionEnvironment {
-    readonly address: AztecAddress;
-    readonly sender: AztecAddress;
-    readonly contractCallDepth: Fr;
-    readonly transactionFee: Fr;
-    readonly globals: GlobalVariables;
-    readonly isStaticCall: boolean;
-    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: CallData): AvmExecutionEnvironment;
-    deriveEnvironmentForNestedStaticCall(targetAddress: AztecAddress, calldata: CallData): AvmExecutionEnvironment;
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXZtX2V4ZWN1dGlvbl9lbnZpcm9ubWVudC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3B1YmxpYy9hdm0vYXZtX2V4ZWN1dGlvbl9lbnZpcm9ubWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUMvRCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUV4RCxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFOUM7OztHQUdHO0FBQ0gscUJBQWEsdUJBQXVCO2FBRWhCLE9BQU8sRUFBRSxZQUFZO2FBQ3JCLE1BQU0sRUFBRSxZQUFZO2FBQ3BCLGlCQUFpQixFQUFFLEVBQUU7YUFDckIsY0FBYyxFQUFFLEVBQUU7YUFDbEIsT0FBTyxFQUFFLGVBQWU7YUFDeEIsWUFBWSxFQUFFLE9BQU87YUFDckIsUUFBUSxFQUFFLFFBQVE7YUFDbEIsTUFBTSxFQUFFLHFCQUFxQjtJQVIvQyxZQUNrQixPQUFPLEVBQUUsWUFBWSxFQUNyQixNQUFNLEVBQUUsWUFBWSxFQUNwQixpQkFBaUIsRUFBRSxFQUFFLEVBQ3JCLGNBQWMsRUFBRSxFQUFFLEVBQ2xCLE9BQU8sRUFBRSxlQUFlLEVBQ3hCLFlBQVksRUFBRSxPQUFPLEVBQ3JCLFFBQVEsRUFBRSxRQUFRLEVBQ2xCLE1BQU0sRUFBRSxxQkFBcUIsRUFDM0M7SUFFSixPQUFPLENBQUMsc0NBQXNDO0lBaUJ2Qyw4QkFBOEIsQ0FBQyxhQUFhLEVBQUUsWUFBWSxFQUFFLFFBQVEsRUFBRSxRQUFRLEdBQUcsdUJBQXVCLENBRTlHO0lBRU0sb0NBQW9DLENBQ3pDLGFBQWEsRUFBRSxZQUFZLEVBQzNCLFFBQVEsRUFBRSxRQUFRLEdBQ2pCLHVCQUF1QixDQUV6QjtDQUNGIn0=

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

@@ -1 +0,0 @@
-{"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,33 +0,0 @@
-import { Fr } from '@aztec/foundation/curves/bn254';
-/**
- * Contains variables that remain constant during AVM execution
- * These variables are provided by the public kernel circuit
- */ export class AvmExecutionEnvironment {
-    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;
-        this.transactionFee = transactionFee;
-        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, this.config);
-    }
-    deriveEnvironmentForNestedCall(targetAddress, calldata) {
-        return this.deriveEnvironmentForNestedCallInternal(targetAddress, calldata, /*isStaticCall=*/ false);
-    }
-    deriveEnvironmentForNestedStaticCall(targetAddress, calldata) {
-        return this.deriveEnvironmentForNestedCallInternal(targetAddress, calldata, /*isStaticCall=*/ true);
-    }
-}

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

@@ -1,44 +0,0 @@
-import { TypeTag } from './avm_memory_types.js';
-import { Opcode } from './serialization/instruction_serialization.js';
-/** Gas counters in L1, L2, and DA. */
-export type Gas = {
-    l2Gas: number;
-    daGas: number;
-};
-/** Maps a Gas struct to gasLeft properties. */
-export declare function gasToGasLeft(gas: Gas): {
-    l2GasLeft: number;
-    daGasLeft: number;
-};
-/** Maps gasLeft properties to a gas struct. */
-export declare function gasLeftToGas(gasLeft: {
-    l2GasLeft: number;
-    daGasLeft: number;
-}): {
-    l2Gas: number;
-    daGas: number;
-};
-/** Creates a new instance with all values set to zero except the ones set. */
-export declare function makeGas(gasCost: Partial<Gas>): {
-    l2Gas: number;
-    daGas: number;
-};
-/** Sums together multiple instances of Gas. */
-export declare function sumGas(...gases: Partial<Gas>[]): Gas;
-/** Multiplies a gas instance by a scalar. */
-export declare function mulGas(gas: Partial<Gas>, scalar: number): {
-    l2Gas: number;
-    daGas: number;
-};
-/** Zero gas across all gas dimensions. */
-export declare const EmptyGas: Gas;
-/** Dimensions of gas usage: L1, L2, and DA. */
-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 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 +0,0 @@
-{"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,195 +0,0 @@
-import * as c from '@aztec/constants';
-import { TypeTag } from './avm_memory_types.js';
-import { InstructionExecutionError } from './errors.js';
-import { Opcode } from './serialization/instruction_serialization.js';
-/** Maps a Gas struct to gasLeft properties. */ export function gasToGasLeft(gas) {
-    return {
-        l2GasLeft: gas.l2Gas,
-        daGasLeft: gas.daGas
-    };
-}
-/** Maps gasLeft properties to a gas struct. */ export function gasLeftToGas(gasLeft) {
-    return {
-        l2Gas: gasLeft.l2GasLeft,
-        daGas: gasLeft.daGasLeft
-    };
-}
-/** Creates a new instance with all values set to zero except the ones set. */ export function makeGas(gasCost) {
-    return {
-        ...EmptyGas,
-        ...gasCost
-    };
-}
-/** Sums together multiple instances of Gas. */ export function sumGas(...gases) {
-    return gases.reduce((acc, gas)=>({
-            l2Gas: acc.l2Gas + (gas.l2Gas ?? 0),
-            daGas: acc.daGas + (gas.daGas ?? 0)
-        }), EmptyGas);
-}
-/** Multiplies a gas instance by a scalar. */ export function mulGas(gas, scalar) {
-    return {
-        l2Gas: (gas.l2Gas ?? 0) * scalar,
-        daGas: (gas.daGas ?? 0) * scalar
-    };
-}
-/** Zero gas across all gas dimensions. */ export const EmptyGas = {
-    l2Gas: 0,
-    daGas: 0
-};
-function makeCost(l2Gas, daGas) {
-    return {
-        l2Gas,
-        daGas
-    };
-}
-/** Dimensions of gas usage: L1, L2, and DA. */ export const GAS_DIMENSIONS = [
-    'l2Gas',
-    'daGas'
-];
-/** Base gas costs for each instruction. Additional gas cost may be added on top due to memory or storage accesses, etc. */ const BASE_GAS_COSTS = {
-    [Opcode.ADD_8]: makeCost(c.AVM_ADD_BASE_L2_GAS, 0),
-    [Opcode.ADD_16]: makeCost(c.AVM_ADD_BASE_L2_GAS, 0),
-    [Opcode.SUB_8]: makeCost(c.AVM_SUB_BASE_L2_GAS, 0),
-    [Opcode.SUB_16]: makeCost(c.AVM_SUB_BASE_L2_GAS, 0),
-    [Opcode.MUL_8]: makeCost(c.AVM_MUL_BASE_L2_GAS, 0),
-    [Opcode.MUL_16]: makeCost(c.AVM_MUL_BASE_L2_GAS, 0),
-    [Opcode.DIV_8]: makeCost(c.AVM_DIV_BASE_L2_GAS, 0),
-    [Opcode.DIV_16]: makeCost(c.AVM_DIV_BASE_L2_GAS, 0),
-    [Opcode.FDIV_8]: makeCost(c.AVM_FDIV_BASE_L2_GAS, 0),
-    [Opcode.FDIV_16]: makeCost(c.AVM_FDIV_BASE_L2_GAS, 0),
-    [Opcode.EQ_8]: makeCost(c.AVM_EQ_BASE_L2_GAS, 0),
-    [Opcode.EQ_16]: makeCost(c.AVM_EQ_BASE_L2_GAS, 0),
-    [Opcode.LT_8]: makeCost(c.AVM_LT_BASE_L2_GAS, 0),
-    [Opcode.LT_16]: makeCost(c.AVM_LT_BASE_L2_GAS, 0),
-    [Opcode.LTE_8]: makeCost(c.AVM_LTE_BASE_L2_GAS, 0),
-    [Opcode.LTE_16]: makeCost(c.AVM_LTE_BASE_L2_GAS, 0),
-    [Opcode.AND_8]: makeCost(c.AVM_AND_BASE_L2_GAS, 0),
-    [Opcode.AND_16]: makeCost(c.AVM_AND_BASE_L2_GAS, 0),
-    [Opcode.OR_8]: makeCost(c.AVM_OR_BASE_L2_GAS, 0),
-    [Opcode.OR_16]: makeCost(c.AVM_OR_BASE_L2_GAS, 0),
-    [Opcode.XOR_8]: makeCost(c.AVM_XOR_BASE_L2_GAS, 0),
-    [Opcode.XOR_16]: makeCost(c.AVM_XOR_BASE_L2_GAS, 0),
-    [Opcode.NOT_8]: makeCost(c.AVM_NOT_BASE_L2_GAS, 0),
-    [Opcode.NOT_16]: makeCost(c.AVM_NOT_BASE_L2_GAS, 0),
-    [Opcode.SHL_8]: makeCost(c.AVM_SHL_BASE_L2_GAS, 0),
-    [Opcode.SHL_16]: makeCost(c.AVM_SHL_BASE_L2_GAS, 0),
-    [Opcode.SHR_8]: makeCost(c.AVM_SHR_BASE_L2_GAS, 0),
-    [Opcode.SHR_16]: makeCost(c.AVM_SHR_BASE_L2_GAS, 0),
-    [Opcode.CAST_8]: makeCost(c.AVM_CAST_BASE_L2_GAS, 0),
-    [Opcode.CAST_16]: makeCost(c.AVM_CAST_BASE_L2_GAS, 0),
-    [Opcode.GETENVVAR_16]: makeCost(c.AVM_GETENVVAR_BASE_L2_GAS, 0),
-    [Opcode.CALLDATACOPY]: makeCost(c.AVM_CALLDATACOPY_BASE_L2_GAS, 0),
-    [Opcode.SUCCESSCOPY]: makeCost(c.AVM_SUCCESSCOPY_BASE_L2_GAS, 0),
-    [Opcode.RETURNDATASIZE]: makeCost(c.AVM_RETURNDATASIZE_BASE_L2_GAS, 0),
-    [Opcode.RETURNDATACOPY]: makeCost(c.AVM_RETURNDATACOPY_BASE_L2_GAS, 0),
-    [Opcode.JUMP_32]: makeCost(c.AVM_JUMP_BASE_L2_GAS, 0),
-    [Opcode.JUMPI_32]: makeCost(c.AVM_JUMPI_BASE_L2_GAS, 0),
-    [Opcode.INTERNALCALL]: makeCost(c.AVM_INTERNALCALL_BASE_L2_GAS, 0),
-    [Opcode.INTERNALRETURN]: makeCost(c.AVM_INTERNALRETURN_BASE_L2_GAS, 0),
-    [Opcode.SET_8]: makeCost(c.AVM_SET_BASE_L2_GAS, 0),
-    [Opcode.SET_16]: makeCost(c.AVM_SET_BASE_L2_GAS, 0),
-    [Opcode.SET_32]: makeCost(c.AVM_SET_BASE_L2_GAS, 0),
-    [Opcode.SET_64]: makeCost(c.AVM_SET_BASE_L2_GAS, 0),
-    [Opcode.SET_128]: makeCost(c.AVM_SET_BASE_L2_GAS, 0),
-    [Opcode.SET_FF]: makeCost(c.AVM_SET_BASE_L2_GAS, 0),
-    [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, 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.EMITPUBLICLOG]: makeCost(c.AVM_EMITPUBLICLOG_BASE_L2_GAS, c.AVM_EMITPUBLICLOG_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),
-    [Opcode.STATICCALL]: makeCost(c.AVM_STATICCALL_BASE_L2_GAS, 0),
-    [Opcode.RETURN]: makeCost(c.AVM_RETURN_BASE_L2_GAS, 0),
-    [Opcode.REVERT_8]: makeCost(c.AVM_REVERT_BASE_L2_GAS, 0),
-    [Opcode.REVERT_16]: makeCost(c.AVM_REVERT_BASE_L2_GAS, 0),
-    [Opcode.DEBUGLOG]: makeCost(c.AVM_DEBUGLOG_BASE_L2_GAS, 0),
-    [Opcode.POSEIDON2]: makeCost(c.AVM_POSEIDON2_BASE_L2_GAS, 0),
-    [Opcode.SHA256COMPRESSION]: makeCost(c.AVM_SHA256COMPRESSION_BASE_L2_GAS, 0),
-    [Opcode.KECCAKF1600]: makeCost(c.AVM_KECCAKF1600_BASE_L2_GAS, 0),
-    [Opcode.ECADD]: makeCost(c.AVM_ECADD_BASE_L2_GAS, 0),
-    [Opcode.TORADIXBE]: makeCost(c.AVM_TORADIXBE_BASE_L2_GAS, 0)
-};
-const DYNAMIC_GAS_COSTS = new Map([
-    [
-        Opcode.CALLDATACOPY,
-        makeCost(c.AVM_CALLDATACOPY_DYN_L2_GAS, 0)
-    ],
-    [
-        Opcode.RETURNDATACOPY,
-        makeCost(c.AVM_RETURNDATACOPY_DYN_L2_GAS, 0)
-    ],
-    // TODO: Call and static call based on bytecode length
-    [
-        Opcode.EMITPUBLICLOG,
-        makeCost(c.AVM_EMITPUBLICLOG_DYN_L2_GAS, c.AVM_EMITPUBLICLOG_DYN_DA_GAS)
-    ],
-    [
-        Opcode.TORADIXBE,
-        makeCost(c.AVM_TORADIXBE_DYN_L2_GAS, 0)
-    ],
-    [
-        Opcode.AND_8,
-        makeCost(c.AVM_BITWISE_DYN_L2_GAS, 0)
-    ],
-    [
-        Opcode.AND_16,
-        makeCost(c.AVM_BITWISE_DYN_L2_GAS, 0)
-    ],
-    [
-        Opcode.OR_8,
-        makeCost(c.AVM_BITWISE_DYN_L2_GAS, 0)
-    ],
-    [
-        Opcode.OR_16,
-        makeCost(c.AVM_BITWISE_DYN_L2_GAS, 0)
-    ],
-    [
-        Opcode.XOR_8,
-        makeCost(c.AVM_BITWISE_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 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;
-        case TypeTag.UINT8:
-            return 1;
-        case TypeTag.UINT16:
-            return 2;
-        case TypeTag.UINT32:
-            return 4;
-        case TypeTag.UINT64:
-            return 8;
-        case TypeTag.UINT128:
-            return 16;
-        case TypeTag.FIELD:
-            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]}`);
-    }
-}