sol-dbg 0.3.7 → 0.4.1

package/dist/debug/sol_debugger.d.ts

@@ -1,166 +1,12 @@
-/// <reference types="node" />
 import { Block } from "@ethereumjs/block";
-import { Transaction } from "@ethereumjs/tx";
+import { EVMStateManagerInterface } from "@ethereumjs/common";
 import { InterpreterStep } from "@ethereumjs/evm";
-import { StateManager } from "@ethereumjs/statemanager";
+import { TypedTransaction } from "@ethereumjs/tx";
 import { RunTxResult, VM } from "@ethereumjs/vm";
-import { Address } from "ethereumjs-util";
-import { ASTNode, TypeNode } from "solc-typed-ast";
-import { DecodedBytecodeSourceMapEntry, HexString, ImmMap } from "..";
+import { ASTNode } from "solc-typed-ast";
+import { DecodedBytecodeSourceMapEntry } from "..";
 import { ContractInfo, IArtifactManager } from "./artifact_manager";
-import { EVMOpInfo } from "./opcodes";
-export declare enum FrameKind {
-    Call = "call",
-    Creation = "creation",
-    InternalCall = "internal_call"
-}
-/**
- * Base interface for Stack frames maintained by the debugger
- */
-interface BaseFrame {
-    readonly kind: FrameKind;
-    /**
-     * AST node causing the call. Note that this is not always a FunctionCall. For example this could be:
-     * 1. A contract public state var VariableDeclaration
-     * 2. Any checked arithmetic operation in sol > 0.8.0 (these are implemented as internal functions)
-     * 3. Some other random non-call AST node, that is implemented as a compiler generated function
-     */
-    readonly callee: ASTNode | undefined;
-    /**
-     * If we have a `callee` try and infer where the arguments are placed in the VM state. Some arguments may not
-     * exist in the case of msg.data generated from a fuzzer for example.
-     */
-    readonly arguments: Array<[string, DataView | undefined]> | undefined;
-    readonly startStep: number;
-}
-/**
- * Base class for a stack frame corresponding to an external call.
- */
-interface BaseExternalFrame extends BaseFrame {
-    readonly sender: HexString;
-    readonly msgData: Buffer;
-    readonly address: Address;
-}
-/**
- * Stack frame corresponding to an external call
- */
-interface CallFrame extends BaseExternalFrame {
-    readonly kind: FrameKind.Call;
-    readonly receiver: HexString;
-    readonly code: Buffer;
-    readonly info?: ContractInfo;
-}
-/**
- * Stack frame corresponding to a contract creation call
- */
-interface CreationFrame extends BaseExternalFrame {
-    readonly kind: FrameKind.Creation;
-    readonly creationCode: Buffer;
-    readonly info?: ContractInfo;
-}
-/**
- * Stack frame corresponding to an internal function call
- */
-interface InternalCallFrame extends BaseFrame {
-    readonly kind: FrameKind.InternalCall;
-    readonly nearestExtFrame: CallFrame | CreationFrame;
-    readonly offset: number;
-}
-export type ExternalFrame = CallFrame | CreationFrame;
-export type Frame = ExternalFrame | InternalCallFrame;
-export type DbgStack = Frame[];
-export declare enum DataLocationKind {
-    Stack = "stack",
-    Memory = "memory",
-    Storage = "storage",
-    CallData = "calldata"
-}
-export type MemoryLocationKind = DataLocationKind.Memory | DataLocationKind.CallData | DataLocationKind.Storage;
-export interface BaseDataLocation {
-    kind: DataLocationKind;
-}
-export interface StackLocation extends BaseDataLocation {
-    kind: DataLocationKind.Stack;
-    offsetFromTop: number;
-}
-export interface BaseMemoryLocation extends BaseDataLocation {
-    address: bigint;
-}
-export interface CalldataLocation extends BaseMemoryLocation {
-    kind: DataLocationKind.CallData;
-}
-export interface LinearMemoryLocation extends BaseMemoryLocation {
-    kind: DataLocationKind.Memory;
-}
-export interface StorageLocation extends BaseMemoryLocation {
-    kind: DataLocationKind.Storage;
-    endOffsetInWord: number;
-}
-export type ByteAddressableMemoryLocation = CalldataLocation | LinearMemoryLocation;
-export type MemoryLocation = ByteAddressableMemoryLocation | StorageLocation;
-export type DataLocation = StackLocation | MemoryLocation;
-export interface DataView {
-    type: TypeNode;
-    abiType?: TypeNode;
-    loc: DataLocation;
-}
-export type Memory = Buffer;
-export type Stack = Buffer[];
-export type Storage = ImmMap<bigint, Buffer>;
-export interface EventDesc {
-    payload: Buffer;
-    topics: bigint[];
-}
-/**
- * TODO(dimo): Make memory and storage be computed only for instructions that change them, and for all other
- * instructions alias the previous steps' memory/storage
- *
- * Low-level machine state at a given trace step. It directly mirrors the state reported from Web3
- * and doesn't include any higher-level information that requires debug info.
- */
-export interface StepVMState {
-    evmStack: Stack;
-    memory: Memory;
-    storage: Storage;
-    op: EVMOpInfo;
-    pc: number;
-    gasCost: bigint;
-    dynamicGasCost: bigint;
-    gas: bigint;
-    depth: number;
-    address: Address;
-    codeAddress: Address;
-}
-/**
- * State that the debugger maintains for each trace step.
- * It includes the basic VM state (`StepVmState`) and optionally (if we have debug info for this contract)
- * includes the decoded source location, any AST nodes that are mapped to this instruction and any events
- * that may be emitted on this step.
- */
-export interface StepState extends StepVMState {
-    code: Buffer;
-    codeMdHash: HexString | undefined;
-    stack: DbgStack;
-    src: DecodedBytecodeSourceMapEntry | undefined;
-    astNode: ASTNode | undefined;
-    emittedEvent: EventDesc | undefined;
-    contractInfo: ContractInfo | undefined;
-}
-/**
- * Trace step struct contained in the array returned by web3.debug.traceTransaction().
- * We translate this into `StepVmState`.
- */
-export interface Web3DbgState {
-    stack: HexString[];
-    memory: HexString[];
-    storage?: any;
-    op: string;
-    pc: number;
-    gasCost: string;
-    gas: string;
-    depth: number;
-    error?: any;
-}
+import { DbgStack, ExternalFrame, Frame, StepState } from "./types";
 /**
  * Give a stack or a stack frame, find the last **external** stack frame under it (include itself).
  */
@@ -219,7 +65,7 @@ export declare class SolTxDebugger {
      * @param trace - trace up to the current state
      */
     private getCodeAndMdHash;
-    processRawTraceStep(vm: VM, stateManager: StateManager, step: InterpreterStep, trace: StepState[], stack: Frame[]): Promise<StepState>;
+    processRawTraceStep(vm: VM, stateManager: EVMStateManagerInterface, step: InterpreterStep, trace: StepState[], stack: Frame[]): Promise<StepState>;
     private static getEVM;
     /**
      * Releases references to the EVM stored inside VM from the
@@ -229,10 +75,10 @@ export declare class SolTxDebugger {
      * used.
      */
     static releaseVM(vm: VM): void;
-    static createVm(stateManager: StateManager | undefined, foundryCheatcodes: boolean): Promise<VM>;
-    debugTx(tx: Transaction, block: Block | undefined, stateManager: StateManager): Promise<[StepState[], RunTxResult]>;
+    static createVm(stateManager: EVMStateManagerInterface | undefined, foundryCheatcodes: boolean): Promise<VM>;
+    debugTx(tx: TypedTransaction, block: Block | undefined, stateManager: EVMStateManagerInterface): Promise<[StepState[], RunTxResult]>;
     /**
-     * Build a `CreationFrame` from the given `sender` address, `data` `Buffer`(msg.data) and the current trace step number.
+     * Build a `CreationFrame` from the given `sender` address, `data` `Uint8Array`(msg.data) and the current trace step number.
      */
     private makeCreationFrame;
     /**
@@ -243,7 +89,7 @@ export declare class SolTxDebugger {
      */
     private findEntryPoint;
     /**
-     * Build a `CallFrame` from the given `sender` address, `receiver` address, `data` `Buffer`, (msg.data) and the current trace step number.
+     * Build a `CallFrame` from the given `sender` address, `receiver` address, `data` `Uint8Array`, (msg.data) and the current trace step number.
      */
     private makeCallFrame;
     /**
@@ -264,5 +110,4 @@ export declare class SolTxDebugger {
      */
     private decodeFunArgs;
 }
-export {};
 //# sourceMappingURL=sol_debugger.d.ts.map

package/dist/debug/sol_debugger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sol_debugger.d.ts","sourceRoot":"","sources":["../../src/debug/sol_debugger.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAI1C,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAuB,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAC7E,OAAO,EAAO,WAAW,EAAE,EAAE,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,OAAO,EAAO,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EACH,OAAO,EAGP,QAAQ,EAGX,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACH,6BAA6B,EAC7B,SAAS,EACT,MAAM,EAQT,MAAM,IAAI,CAAC;AAIZ,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAgB,MAAM,oBAAoB,CAAC;AAWlF,OAAO,EACH,SAAS,EAMZ,MAAM,WAAW,CAAC;AAEnB,oBAAY,SAAS;IACjB,IAAI,SAAS;IACb,QAAQ,aAAa;IACrB,YAAY,kBAAkB;CACjC;AAED;;GAEG;AACH,UAAU,SAAS;IACf,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IACzB;;;;;OAKG;IACH,QAAQ,CAAC,MAAM,EAAE,OAAO,GAAG,SAAS,CAAC;IACrC;;;OAGG;IACH,QAAQ,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,QAAQ,GAAG,SAAS,CAAC,CAAC,GAAG,SAAS,CAAC;IACtE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC9B;AAED;;GAEG;AACH,UAAU,iBAAkB,SAAQ,SAAS;IACzC,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;CAC7B;AAED;;GAEG;AACH,UAAU,SAAU,SAAQ,iBAAiB;IACzC,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC;IAC9B,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC;CAChC;AAED;;GAEG;AACH,UAAU,aAAc,SAAQ,iBAAiB;IAC7C,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,QAAQ,CAAC;IAClC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC;CAChC;AAED;;GAEG;AACH,UAAU,iBAAkB,SAAQ,SAAS;IACzC,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,YAAY,CAAC;IACtC,QAAQ,CAAC,eAAe,EAAE,SAAS,GAAG,aAAa,CAAC;IACpD,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,MAAM,aAAa,GAAG,SAAS,GAAG,aAAa,CAAC;AACtD,MAAM,MAAM,KAAK,GAAG,aAAa,GAAG,iBAAiB,CAAC;AACtD,MAAM,MAAM,QAAQ,GAAG,KAAK,EAAE,CAAC;AAE/B,oBAAY,gBAAgB;IACxB,KAAK,UAAU;IACf,MAAM,WAAW;IACjB,OAAO,YAAY;IACnB,QAAQ,aAAa;CACxB;AAED,MAAM,MAAM,kBAAkB,GACxB,gBAAgB,CAAC,MAAM,GACvB,gBAAgB,CAAC,QAAQ,GACzB,gBAAgB,CAAC,OAAO,CAAC;AAE/B,MAAM,WAAW,gBAAgB;IAC7B,IAAI,EAAE,gBAAgB,CAAC;CAC1B;AAED,MAAM,WAAW,aAAc,SAAQ,gBAAgB;IACnD,IAAI,EAAE,gBAAgB,CAAC,KAAK,CAAC;IAC7B,aAAa,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,kBAAmB,SAAQ,gBAAgB;IACxD,OAAO,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,gBAAiB,SAAQ,kBAAkB;IACxD,IAAI,EAAE,gBAAgB,CAAC,QAAQ,CAAC;CACnC;AAED,MAAM,WAAW,oBAAqB,SAAQ,kBAAkB;IAC5D,IAAI,EAAE,gBAAgB,CAAC,MAAM,CAAC;CACjC;AAED,MAAM,WAAW,eAAgB,SAAQ,kBAAkB;IACvD,IAAI,EAAE,gBAAgB,CAAC,OAAO,CAAC;IAC/B,eAAe,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,MAAM,6BAA6B,GAAG,gBAAgB,GAAG,oBAAoB,CAAC;AACpF,MAAM,MAAM,cAAc,GAAG,6BAA6B,GAAG,eAAe,CAAC;AAC7E,MAAM,MAAM,YAAY,GAAG,aAAa,GAAG,cAAc,CAAC;AAE1D,MAAM,WAAW,QAAQ;IACrB,IAAI,EAAE,QAAQ,CAAC;IACf,OAAO,CAAC,EAAE,QAAQ,CAAC;IACnB,GAAG,EAAE,YAAY,CAAC;CACrB;AAED,MAAM,MAAM,MAAM,GAAG,MAAM,CAAC;AAC5B,MAAM,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC;AAC7B,MAAM,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAC7C,MAAM,WAAW,SAAS;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,EAAE,CAAC;CACpB;AAED;;;;;;GAMG;AACH,MAAM,WAAW,WAAW;IACxB,QAAQ,EAAE,KAAK,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,EAAE,EAAE,SAAS,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,OAAO,CAAC;CACxB;AAED;;;;;GAKG;AACH,MAAM,WAAW,SAAU,SAAQ,WAAW;IAC1C,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,SAAS,GAAG,SAAS,CAAC;IAClC,KAAK,EAAE,QAAQ,CAAC;IAChB,GAAG,EAAE,6BAA6B,GAAG,SAAS,CAAC;IAC/C,OAAO,EAAE,OAAO,GAAG,SAAS,CAAC;IAC7B,YAAY,EAAE,SAAS,GAAG,SAAS,CAAC;IACpC,YAAY,EAAE,YAAY,GAAG,SAAS,CAAC;CAC1C;AAED;;;GAGG;AACH,MAAM,WAAW,YAAY;IACzB,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,GAAG,CAAC;CACf;AAID;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,KAAK,GAAG,QAAQ,GAAG,aAAa,CAItE;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,KAAK,GAAG,QAAQ,GAAG,YAAY,GAAG,SAAS,CAI/E;AAeD,MAAM,WAAW,iBAAiB;IAC9B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAQD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,qBAAa,aAAa;IAEtB,SAAgB,eAAe,EAAE,gBAAgB,CAAC;IAClD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IACjC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAU;gBAEhC,eAAe,EAAE,gBAAgB,EAAE,IAAI,CAAC,EAAE,iBAAiB;IAgBvE;;;;;;;;OAQG;YACW,gBAAgB;IA2K9B;;;;;;;;;;;;OAYG;YACW,gBAAgB;IAgCxB,mBAAmB,CACrB,EAAE,EAAE,EAAE,EACN,YAAY,EAAE,YAAY,EAC1B,IAAI,EAAE,eAAe,EACrB,KAAK,EAAE,SAAS,EAAE,EAClB,KAAK,EAAE,KAAK,EAAE,GACf,OAAO,CAAC,SAAS,CAAC;mBAuFA,MAAM;IAmC3B;;;;;;OAMG;IACH,MAAM,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,GAAG,IAAI;WAUjB,QAAQ,CACjB,YAAY,EAAE,YAAY,GAAG,SAAS,EACtC,iBAAiB,EAAE,OAAO,GAC3B,OAAO,CAAC,EAAE,CAAC;IA4BR,OAAO,CACT,EAAE,EAAE,WAAW,EACf,KAAK,EAAE,KAAK,GAAG,SAAS,EACxB,YAAY,EAAE,YAAY,GAC3B,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE,WAAW,CAAC,CAAC;IAwDtC;;OAEG;YACW,iBAAiB;IA0B/B;;;;;OAKG;IACH,OAAO,CAAC,cAAc;IA4CtB;;OAEG;YACW,aAAa;IAqD3B;;;;;;;;;OASG;IACH,eAAe,CACX,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,aAAa,GACnB,CAAC,6BAA6B,GAAG,SAAS,EAAE,OAAO,GAAG,SAAS,CAAC;IAiBnE;;;;OAIG;IACH,OAAO,CAAC,aAAa;CAkDxB"}
+{"version":3,"file":"sol_debugger.d.ts","sourceRoot":"","sources":["../../src/debug/sol_debugger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE1C,OAAO,EAAiB,wBAAwB,EAAY,MAAM,oBAAoB,CAAC;AACvF,OAAO,EAAO,eAAe,EAAmB,MAAM,iBAAiB,CAAC;AAGxE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAElD,OAAO,EAAE,WAAW,EAAE,EAAE,EAAE,MAAM,gBAAgB,CAAC;AAEjD,OAAO,EAAE,OAAO,EAA6D,MAAM,gBAAgB,CAAC;AACpG,OAAO,EACH,6BAA6B,EAQhC,MAAM,IAAI,CAAC;AAIZ,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAgB,MAAM,oBAAoB,CAAC;AASlF,OAAO,EAKH,QAAQ,EAGR,aAAa,EACb,KAAK,EAKL,SAAS,EAGZ,MAAM,SAAS,CAAC;AAIjB;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,KAAK,GAAG,QAAQ,GAAG,aAAa,CAItE;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,KAAK,GAAG,QAAQ,GAAG,YAAY,GAAG,SAAS,CAI/E;AAiBD,MAAM,WAAW,iBAAiB;IAC9B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAQD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,qBAAa,aAAa;IAEtB,SAAgB,eAAe,EAAE,gBAAgB,CAAC;IAClD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IACjC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAU;gBAEhC,eAAe,EAAE,gBAAgB,EAAE,IAAI,CAAC,EAAE,iBAAiB;IAgBvE;;;;;;;;OAQG;YACW,gBAAgB;IA2K9B;;;;;;;;;;;;OAYG;YACW,gBAAgB;IA8CxB,mBAAmB,CACrB,EAAE,EAAE,EAAE,EACN,YAAY,EAAE,wBAAwB,EACtC,IAAI,EAAE,eAAe,EACrB,KAAK,EAAE,SAAS,EAAE,EAClB,KAAK,EAAE,KAAK,EAAE,GACf,OAAO,CAAC,SAAS,CAAC;mBAoFA,MAAM;IA8B3B;;;;;;OAMG;IACH,MAAM,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,GAAG,IAAI;WAUjB,QAAQ,CACjB,YAAY,EAAE,wBAAwB,GAAG,SAAS,EAClD,iBAAiB,EAAE,OAAO,GAC3B,OAAO,CAAC,EAAE,CAAC;IA0BR,OAAO,CACT,EAAE,EAAE,gBAAgB,EACpB,KAAK,EAAE,KAAK,GAAG,SAAS,EACxB,YAAY,EAAE,wBAAwB,GACvC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE,WAAW,CAAC,CAAC;IA2DtC;;OAEG;YACW,iBAAiB;IA0B/B;;;;;OAKG;IACH,OAAO,CAAC,cAAc;IActB;;OAEG;YACW,aAAa;IAqD3B;;;;;;;;;OASG;IACH,eAAe,CACX,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,aAAa,GACnB,CAAC,6BAA6B,GAAG,SAAS,EAAE,OAAO,GAAG,SAAS,CAAC;IAiBnE;;;;OAIG;IACH,OAAO,CAAC,aAAa;CAoDxB"}

package/dist/debug/sol_debugger.js

@@ -1,57 +1,47 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SolTxDebugger = exports.getContractInfo = exports.lastExternalFrame = exports.DataLocationKind = exports.FrameKind = void 0;
+exports.SolTxDebugger = void 0;
+exports.lastExternalFrame = lastExternalFrame;
+exports.getContractInfo = getContractInfo;
 const blockchain_1 = require("@ethereumjs/blockchain");
 const common_1 = require("@ethereumjs/common");
-const evm_1 = require("@ethereumjs/evm/dist/evm");
+const evm_1 = require("@ethereumjs/evm");
+const rlp_1 = require("@ethereumjs/rlp");
 const statemanager_1 = require("@ethereumjs/statemanager");
+const util_1 = require("@ethereumjs/util");
 const vm_1 = require("@ethereumjs/vm");
-const ethereumjs_util_1 = require("ethereumjs-util");
+const utils_1 = require("ethereum-cryptography/utils");
 const solc_typed_ast_1 = require("solc-typed-ast");
 const __1 = require("..");
 const artifacts_1 = require("../artifacts");
+const utils_2 = require("../utils");
 const abi_1 = require("./abi");
-const utils_1 = require("../utils");
 const artifact_manager_1 = require("./artifact_manager");
 const decoding_1 = require("./decoding");
 const foundry_cheatcodes_1 = require("./foundry_cheatcodes");
-const opcodes_1 = require("@ethereumjs/evm/dist/opcodes");
 const opcode_interposing_1 = require("./opcode_interposing");
-const stream_1 = require("stream");
-const opcodes_2 = require("./opcodes");
-var FrameKind;
-(function (FrameKind) {
-    FrameKind["Call"] = "call";
-    FrameKind["Creation"] = "creation";
-    FrameKind["InternalCall"] = "internal_call";
-})(FrameKind || (exports.FrameKind = FrameKind = {}));
-var DataLocationKind;
-(function (DataLocationKind) {
-    DataLocationKind["Stack"] = "stack";
-    DataLocationKind["Memory"] = "memory";
-    DataLocationKind["Storage"] = "storage";
-    DataLocationKind["CallData"] = "calldata";
-})(DataLocationKind || (exports.DataLocationKind = DataLocationKind = {}));
+const opcodes_1 = require("./opcodes");
+const types_1 = require("./types");
 // Helper functions
 /**
  * Give a stack or a stack frame, find the last **external** stack frame under it (include itself).
  */
 function lastExternalFrame(arg) {
     const frame = arg instanceof Array ? arg[arg.length - 1] : arg;
-    return frame.kind === FrameKind.InternalCall ? frame.nearestExtFrame : frame;
+    return frame.kind === types_1.FrameKind.InternalCall ? frame.nearestExtFrame : frame;
 }
-exports.lastExternalFrame = lastExternalFrame;
 function getContractInfo(arg) {
     const frame = lastExternalFrame(arg);
     return frame.info;
 }
-exports.getContractInfo = getContractInfo;
 async function getStorage(manager, addr) {
     const rawStorage = await manager.dumpStorage(addr);
     const storageEntries = [];
     for (const [keyStr, valStr] of Object.entries(rawStorage)) {
-        const valBuf = (0, __1.padStart)(ethereumjs_util_1.rlp.decode(Buffer.from(valStr, "hex")), 32, 0);
-        storageEntries.push([BigInt("0x" + keyStr), valBuf]);
+        const decoded = rlp_1.RLP.decode((0, utils_1.hexToBytes)(valStr));
+        (0, solc_typed_ast_1.assert)(decoded instanceof Uint8Array, "");
+        const valBuf = (0, util_1.setLengthLeft)(decoded, 32);
+        storageEntries.push([BigInt(keyStr), valBuf]);
     }
     return __1.ImmMap.fromEntries(storageEntries);
 }
@@ -114,23 +104,23 @@ class SolTxDebugger {
         if (lastStep.depth !== state.depth) {
             const lastStackTop = lastStep.evmStack.length - 1;
             if (state.depth > lastStep.depth) {
-                (0, solc_typed_ast_1.assert)((0, opcodes_2.increasesDepth)(lastOp), `Unexpected depth increase on op ${lastOp.mnemonic}`);
-                if ((0, opcodes_2.createsContract)(lastOp)) {
+                (0, solc_typed_ast_1.assert)((0, opcodes_1.increasesDepth)(lastOp), `Unexpected depth increase on op ${lastOp.mnemonic}`);
+                if ((0, opcodes_1.createsContract)(lastOp)) {
                     // Contract creation call
-                    const off = (0, utils_1.bigEndianBufToNumber)(lastStep.evmStack[lastStackTop - 1]);
-                    const size = (0, utils_1.bigEndianBufToNumber)(lastStep.evmStack[lastStackTop - 2]);
+                    const off = (0, utils_2.bigEndianBufToNumber)(lastStep.evmStack[lastStackTop - 1]);
+                    const size = (0, utils_2.bigEndianBufToNumber)(lastStep.evmStack[lastStackTop - 2]);
                     const creationBytecode = lastStep.memory.slice(off, off + size);
                     const curFrame = await this.makeCreationFrame(lastExtFrame.address.toString(), creationBytecode, trace.length);
                     stack.push(curFrame);
                 }
                 else {
                     // External call
-                    const argStackOff = lastOp.opcode === opcodes_2.OPCODES.CALL || lastOp.opcode === opcodes_2.OPCODES.CALLCODE
+                    const argStackOff = lastOp.opcode === opcodes_1.OPCODES.CALL || lastOp.opcode === opcodes_1.OPCODES.CALLCODE
                         ? 3
                         : 2;
                     const argSizeStackOff = argStackOff + 1;
-                    const argOff = (0, utils_1.bigEndianBufToNumber)(lastStep.evmStack[lastStackTop - argStackOff]);
-                    const argSize = (0, utils_1.bigEndianBufToNumber)(lastStep.evmStack[lastStackTop - argSizeStackOff]);
+                    const argOff = (0, utils_2.bigEndianBufToNumber)(lastStep.evmStack[lastStackTop - argStackOff]);
+                    const argSize = (0, utils_2.bigEndianBufToNumber)(lastStep.evmStack[lastStackTop - argSizeStackOff]);
                     const receiver = (0, __1.wordToAddress)(lastStep.evmStack[lastStackTop - 1]);
                     const msgData = lastStep.memory.slice(argOff, argOff + argSize);
                     const newFrame = await this.makeCallFrame(lastExtFrame.address.toString(), receiver, msgData, code, codeHash, trace.length);
@@ -144,7 +134,7 @@ class SolTxDebugger {
                 // depth reported by web3. We need the loop since we don't count the internal frames as decreasing depth
                 while (nFramesPopped > 0 && stack.length > 0) {
                     const topFrame = stack[stack.length - 1];
-                    if (topFrame.kind === FrameKind.Creation || topFrame.kind === FrameKind.Call) {
+                    if (topFrame.kind === types_1.FrameKind.Creation || topFrame.kind === types_1.FrameKind.Call) {
                         nFramesPopped--;
                     }
                     stack.pop();
@@ -186,7 +176,7 @@ class SolTxDebugger {
                 args = this.decodeFunArgs(ast, state.evmStack, curExtFrame.info);
             }
             const newFrame = {
-                kind: FrameKind.InternalCall,
+                kind: types_1.FrameKind.InternalCall,
                 nearestExtFrame: lastExtFrame,
                 callee: ast,
                 offset: state.pc,
@@ -200,11 +190,11 @@ class SolTxDebugger {
         if (state.op.mnemonic === "JUMP" && src.jump === "o") {
             const topFrame = stack[stack.length - 1];
             if (this.strict) {
-                (0, solc_typed_ast_1.assert)(topFrame.kind === FrameKind.InternalCall, `Mismatched internal return from frame `, topFrame.kind);
+                (0, solc_typed_ast_1.assert)(topFrame.kind === types_1.FrameKind.InternalCall, `Mismatched internal return from frame `, topFrame.kind);
                 stack.pop();
             }
             else {
-                if (topFrame.kind === FrameKind.InternalCall) {
+                if (topFrame.kind === types_1.FrameKind.InternalCall) {
                     stack.pop();
                 }
                 // @todo log an error somewhere
@@ -228,36 +218,43 @@ class SolTxDebugger {
         const lastStep = trace.length > 0 ? trace[trace.length - 1] : undefined;
         let code;
         let codeMdHash;
-        if (lastStep !== undefined && (0, opcodes_2.createsContract)(lastStep.op)) {
+        const getCodeAddress = (s) => s.codeAddress !== undefined ? s.codeAddress : s.address;
+        // Case 1: First step in the trace
+        if (lastStep === undefined) {
+            const code = await vm.stateManager.getContractCode(getCodeAddress(step));
+            const codeMdHash = (0, artifacts_1.getCodeHash)(code);
+            return [code, codeMdHash];
+        }
+        // Case 2: Just entering a constructor from another contract
+        if ((0, opcodes_1.createsContract)(lastStep.op)) {
             const lastStackTop = lastStep.evmStack.length - 1;
-            const off = (0, utils_1.bigEndianBufToNumber)(lastStep.evmStack[lastStackTop - 1]);
-            const size = (0, utils_1.bigEndianBufToNumber)(lastStep.evmStack[lastStackTop - 2]);
-            code = lastStep.memory.slice(off, off + size);
-            codeMdHash = (0, artifacts_1.getCreationCodeHash)(code);
+            const off = (0, utils_2.bigEndianBufToNumber)(lastStep.evmStack[lastStackTop - 1]);
+            const size = (0, utils_2.bigEndianBufToNumber)(lastStep.evmStack[lastStackTop - 2]);
+            const code = lastStep.memory.slice(off, off + size);
+            const codeMdHash = (0, artifacts_1.getCreationCodeHash)(code);
+            return [code, codeMdHash];
         }
-        else if (lastStep === undefined || !lastStep.codeAddress.equals(step.codeAddress)) {
-            code = await vm.stateManager.getContractCode(step.codeAddress);
+        // Case 3: The code changed - either we are in a different contract or a delegate call context
+        if (!getCodeAddress(lastStep).equals(getCodeAddress(step))) {
+            // Case 3: We are changing the code address
+            code = await vm.stateManager.getContractCode(getCodeAddress(step));
             codeMdHash = (0, artifacts_1.getCodeHash)(code);
+            return [code, codeMdHash];
         }
-        else {
-            code = lastStep.code;
-            codeMdHash = lastStep.codeMdHash;
-        }
+        // Case 4: We are still in the same contract
+        code = lastStep.code;
+        codeMdHash = lastStep.codeMdHash;
         return [code, codeMdHash];
     }
     async processRawTraceStep(vm, stateManager, step, trace, stack) {
-        const evmStack = step.stack.map((word) => (0, utils_1.bigIntToBuf)(word, 32, "big"));
+        const evmStack = step.stack.map((word) => (0, utils_2.bigIntToBuf)(word, 32, "big"));
         const lastStep = trace.length > 0 ? trace[trace.length - 1] : undefined;
-        let memory;
-        if (lastStep === undefined || (0, opcodes_2.changesMemory)(lastStep.op)) {
-            memory = Buffer.from(step.memory);
-        }
-        else {
-            memory = lastStep.memory;
-        }
-        const op = (0, opcodes_2.getOpInfo)(step.opcode.name);
+        const memory = lastStep === undefined || (0, opcodes_1.changesMemory)(lastStep.op)
+            ? new Uint8Array(step.memory)
+            : lastStep.memory;
+        const op = (0, opcodes_1.getOpInfo)(step.opcode.name);
         let storage;
-        if (lastStep === undefined || lastStep.op.opcode === opcodes_2.OPCODES.SSTORE) {
+        if (lastStep === undefined || lastStep.op.opcode === opcodes_1.OPCODES.SSTORE) {
             storage = await getStorage(stateManager, step.address);
         }
         else {
@@ -293,8 +290,8 @@ class SolTxDebugger {
         let emittedEvent = undefined;
         // Finally check if an event is being emitted for this step
         if (step.opcode.name.startsWith("LOG")) {
-            const off = (0, utils_1.bigEndianBufToNumber)(evmStack[evmStack.length - 1]);
-            const size = (0, utils_1.bigEndianBufToNumber)(evmStack[evmStack.length - 2]);
+            const off = (0, utils_2.bigEndianBufToNumber)(evmStack[evmStack.length - 1]);
+            const size = (0, utils_2.bigEndianBufToNumber)(evmStack[evmStack.length - 2]);
             const nTopics = step.opcode.name[3] - "0";
             const payload = memory.slice(off, off + size);
             emittedEvent = {
@@ -321,7 +318,7 @@ class SolTxDebugger {
         if (!foundryCheatcodes) {
             return tmpEvm;
         }
-        const opcodes = (0, opcodes_1.getOpcodesForHF)(tmpEvm._common);
+        const opcodes = (0, evm_1.getOpcodesForHF)(tmpEvm.common);
         const [precompile, foundryCtx] = (0, foundry_cheatcodes_1.makeFoundryCheatcodePrecompile)();
         const optsCopy = {
             ...opts,
@@ -338,11 +335,7 @@ class SolTxDebugger {
             ]
         };
         const res = await evm_1.EVM.create(optsCopy);
-        const emitter = new stream_1.EventEmitter();
-        emitter.on("beforeInterpRun", foundryCtx.beforeInterpRunCB.bind(foundryCtx));
-        emitter.on("afterInterpRun", foundryCtx.afterInterpRunCB.bind(foundryCtx));
-        foundry_cheatcodes_1.interpRunListeners.set(res, emitter);
-        (0, foundry_cheatcodes_1.setFoundryCtx)(res, foundryCtx);
+        foundry_cheatcodes_1.foundryCtxMap.set(res, foundryCtx);
         return res;
     }
     /**
@@ -355,7 +348,7 @@ class SolTxDebugger {
     static releaseVM(vm) {
         const evm = vmToEVMMap.get(vm);
         if (evm) {
-            foundry_cheatcodes_1.interpRunListeners.delete(evm);
+            foundry_cheatcodes_1.foundryCtxMap.delete(evm);
         }
         vmToEVMMap.delete(vm);
     }
@@ -365,8 +358,7 @@ class SolTxDebugger {
         if (!stateManager) {
             stateManager = new statemanager_1.DefaultStateManager();
         }
-        const eei = new vm_1.EEI(stateManager, common, blockchain);
-        const evm = await SolTxDebugger.getEVM({ common, eei, allowUnlimitedContractSize: true }, foundryCheatcodes);
+        const evm = await SolTxDebugger.getEVM({ common, blockchain, stateManager, allowUnlimitedContractSize: true }, foundryCheatcodes);
         const vm = await vm_1.VM.create({
             common,
             blockchain,
@@ -378,7 +370,7 @@ class SolTxDebugger {
         return vm;
     }
     async debugTx(tx, block, stateManager) {
-        const vm = await SolTxDebugger.createVm(stateManager, this.foundryCheatcodes);
+        const vm = await SolTxDebugger.createVm(stateManager.shallowCopy(true), this.foundryCheatcodes);
         const sender = tx.getSenderAddress().toString();
         const receiver = tx.to === undefined ? __1.ZERO_ADDRESS_STRING : tx.to.toString();
         const isCreation = receiver === __1.ZERO_ADDRESS_STRING;
@@ -388,7 +380,7 @@ class SolTxDebugger {
             curFrame = await this.makeCreationFrame(sender, tx.data, 0);
         }
         else {
-            (0, solc_typed_ast_1.assert)(tx.to !== undefined, 'Expected "to" of tx {0} to be defined, got undefined instead', tx.hash().toString("hex"));
+            (0, solc_typed_ast_1.assert)(tx.to !== undefined, 'Expected "to" of tx {0} to be defined, got undefined instead', (0, utils_1.bytesToHex)(tx.hash()));
             const code = await vm.stateManager.getContractCode(tx.to);
             /// @todo remove - arbitrary restriction, only good for debugging
             (0, solc_typed_ast_1.assert)(code.length > 0, "Missing code for address {0}", tx.to.toString());
@@ -414,7 +406,7 @@ class SolTxDebugger {
         return [trace, txRes];
     }
     /**
-     * Build a `CreationFrame` from the given `sender` address, `data` `Buffer`(msg.data) and the current trace step number.
+     * Build a `CreationFrame` from the given `sender` address, `data` `Uint8Array`(msg.data) and the current trace step number.
      */
     async makeCreationFrame(sender, data, step) {
         const contractInfo = await this.artifactManager.getContractFromCreationBytecode(data);
@@ -424,7 +416,7 @@ class SolTxDebugger {
             // TODO: Try and find the arguments inside the creation code and decode them
         }
         return {
-            kind: FrameKind.Creation,
+            kind: types_1.FrameKind.Creation,
             sender,
             msgData: data,
             creationCode: data,
@@ -447,38 +439,16 @@ class SolTxDebugger {
         }
         const contract = info.ast;
         const infer = this.artifactManager.infer(info.artifact.compilerVersion);
-        for (const base of contract.vLinearizedBaseContracts) {
-            // Need to be defensive here, as in some cases with partial AST information the base may be missing
-            if (base === undefined) {
-                continue;
-            }
-            const matchingFuns = base.vFunctions.filter((fun) => (0, __1.getFunctionSelector)(fun, infer) === selector);
-            if (matchingFuns.length === 1) {
-                return matchingFuns[0];
-            }
-            const matchingGetters = base.vStateVariables.filter((vDef) => {
-                try {
-                    return (vDef.visibility === solc_typed_ast_1.StateVariableVisibility.Public &&
-                        infer.signatureHash(vDef));
-                }
-                catch (e) {
-                    return false;
-                }
-            });
-            if (matchingGetters.length === 1) {
-                return matchingGetters[0];
-            }
-        }
-        return undefined;
+        return (0, abi_1.findMethodBySelector)(selector, contract, infer);
     }
     /**
-     * Build a `CallFrame` from the given `sender` address, `receiver` address, `data` `Buffer`, (msg.data) and the current trace step number.
+     * Build a `CallFrame` from the given `sender` address, `receiver` address, `data` `Uint8Array`, (msg.data) and the current trace step number.
      */
     async makeCallFrame(sender, receiver, data, receiverCode, codeHash, step) {
         const contractInfo = codeHash === undefined
             ? codeHash
             : this.artifactManager.getContractFromMDHash(codeHash);
-        const selector = data.slice(0, 4).toString("hex");
+        const selector = (0, utils_1.bytesToHex)(data.slice(0, 4));
         let callee;
         let args;
         if (contractInfo && contractInfo.ast) {
@@ -487,7 +457,7 @@ class SolTxDebugger {
             callee = this.findEntryPoint(contractInfo, selector);
             if (callee !== undefined) {
                 try {
-                    args = (0, abi_1.buildMsgDataViews)(callee, data, DataLocationKind.CallData, infer, abiVersion);
+                    args = (0, abi_1.buildMsgDataViews)(callee, data, types_1.DataLocationKind.CallData, infer, abiVersion);
                 }
                 catch (e) {
                     args = undefined;
@@ -495,7 +465,7 @@ class SolTxDebugger {
             }
         }
         return {
-            kind: FrameKind.Call,
+            kind: types_1.FrameKind.Call,
             sender,
             msgData: data,
             receiver: receiver.toString(),
@@ -521,7 +491,7 @@ class SolTxDebugger {
         if (!ctx.info) {
             return [undefined, undefined];
         }
-        const bytecodeInfo = ctx.kind === FrameKind.Creation ? ctx.info.bytecode : ctx.info.deployedBytecode;
+        const bytecodeInfo = ctx.kind === types_1.FrameKind.Creation ? ctx.info.bytecode : ctx.info.deployedBytecode;
         const src = (0, artifact_manager_1.getOffsetSrc)(instrOffset, bytecodeInfo);
         const astNode = ctx.info.artifact.srcMap.get(`${src.start}:${src.length}:${src.sourceIndex}`);
         return [src, astNode];
@@ -542,7 +512,9 @@ class SolTxDebugger {
                         argDef.name,
                         infer.variableDeclarationToTypeNode(argDef)
                     ])
-                    : infer.getterArgsAndReturn(callee)[0].map((typ, i) => [`ARG_${i}`, typ]);
+                    : infer
+                        .getterArgsAndReturn(callee)[0]
+                        .map((typ, i) => [`ARG_${i}`, typ]);
         }
         catch (e) {
             // `variableDeclarationToTypeNode` may fail when referencing structs/contracts that are defined
@@ -563,7 +535,7 @@ class SolTxDebugger {
                 {
                     type: typ,
                     loc: {
-                        kind: DataLocationKind.Stack,
+                        kind: types_1.DataLocationKind.Stack,
                         offsetFromTop
                     }
                 }