sol-dbg 0.6.15 → 0.7.2

package/dist/utils/solidity.js

@@ -0,0 +1,85 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findReceiveFun = findReceiveFun;
+exports.findFallbackFun = findFallbackFun;
+exports.findContractDef = findContractDef;
+const sol = __importStar(require("solc-typed-ast"));
+/**
+ * Returns the receive function for a contract (if any). Note that it may be defined on a base class
+ */
+function findReceiveFun(contract) {
+    for (const base of contract.vLinearizedBaseContracts) {
+        if (base === undefined) {
+            continue;
+        }
+        for (const fun of base.vFunctions) {
+            if (fun.kind === sol.FunctionKind.Receive) {
+                return fun;
+            }
+        }
+    }
+    return undefined;
+}
+/**
+ * Returns the fallback function for a contract (if any). Note that it may be defined on a base class
+ */
+function findFallbackFun(contract) {
+    for (const base of contract.vLinearizedBaseContracts) {
+        if (base === undefined) {
+            continue;
+        }
+        for (const fun of base.vFunctions) {
+            if (fun.kind === sol.FunctionKind.Fallback) {
+                return fun;
+            }
+        }
+    }
+    return undefined;
+}
+function findContractDef(units, fileName, contractName) {
+    for (const unit of units) {
+        if (unit.sourceEntryKey !== fileName) {
+            continue;
+        }
+        for (const contract of unit.vContracts) {
+            if (contract.name === contractName) {
+                return contract;
+            }
+        }
+    }
+    return undefined;
+}
+//# sourceMappingURL=solidity.js.map

package/dist/utils/solidity.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"solidity.js","sourceRoot":"","sources":["../../src/utils/solidity.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAKA,wCAgBC;AAKD,0CAgBC;AAED,0CAkBC;AA9DD,oDAAsC;AAEtC;;GAEG;AACH,SAAgB,cAAc,CAC1B,QAAgC;IAEhC,KAAK,MAAM,IAAI,IAAI,QAAQ,CAAC,wBAAwB,EAAE,CAAC;QACnD,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACrB,SAAS;QACb,CAAC;QAED,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YAChC,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;gBACxC,OAAO,GAAG,CAAC;YACf,CAAC;QACL,CAAC;IACL,CAAC;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AAED;;GAEG;AACH,SAAgB,eAAe,CAC3B,QAAgC;IAEhC,KAAK,MAAM,IAAI,IAAI,QAAQ,CAAC,wBAAwB,EAAE,CAAC;QACnD,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACrB,SAAS;QACb,CAAC;QAED,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YAChC,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC;gBACzC,OAAO,GAAG,CAAC;YACf,CAAC;QACL,CAAC;IACL,CAAC;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AAED,SAAgB,eAAe,CAC3B,KAAuB,EACvB,QAAgB,EAChB,YAAoB;IAEpB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACvB,IAAI,IAAI,CAAC,cAAc,KAAK,QAAQ,EAAE,CAAC;YACnC,SAAS;QACb,CAAC;QAED,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACrC,IAAI,QAAQ,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;gBACjC,OAAO,QAAQ,CAAC;YACpB,CAAC;QACL,CAAC;IACL,CAAC;IAED,OAAO,SAAS,CAAC;AACrB,CAAC"}

package/dist/utils/test_runner.d.ts

@@ -1,9 +1,12 @@
 import { Block } from "@ethereumjs/block";
-import { Common, EVMStateManagerInterface } from "@ethereumjs/common";
+import { Common, StateManagerInterface } from "@ethereumjs/common";
 import { TypedTransaction } from "@ethereumjs/tx";
 import { Address, PrefixedHexString } from "@ethereumjs/util";
-import { HexString } from "../artifacts";
-import { BaseSolTxTracer, ContractStates, FoundryTxResult, IArtifactManager, KeccakPreimageMap } from "../debug";
+import { IArtifactManager } from "../debug/artifact_manager/artifact_manager";
+import { ContractStates } from "../debug/layout";
+import { BaseSolTxTracer, FoundryTxResult } from "../debug/tracers/base_tracer";
+import { KeccakPreimageMap } from "../debug/tracers/transformers/keccak256_invert";
+import { HexString } from "../debug";
 export interface TxDesc {
     address: HexString;
     gasLimit: HexString;
@@ -57,16 +60,16 @@ export declare class TxRunner {
     constructor(artifactManager: IArtifactManager, _foundryCheatcodes?: boolean);
     runScenario(scenario: Scenario): Promise<void>;
     private setupInitialState;
-    txDescToTx(step: TxDesc, stateManager: EVMStateManagerInterface, common: Common): Promise<TypedTransaction>;
+    txDescToTx(step: TxDesc, stateManager: StateManagerInterface, common: Common): Promise<TypedTransaction>;
     private blockFromTxDesc;
     get txs(): TypedTransaction[];
     get results(): FoundryTxResult[];
-    getStateBeforeTx(tx: TypedTransaction): EVMStateManagerInterface;
+    getStateBeforeTx(tx: TypedTransaction): StateManagerInterface;
     getBlock(tx: TypedTransaction): Block;
     getContractsBefore(tx: TypedTransaction): Set<PrefixedHexString>;
     getKeccakPreimagesBefore(tx: TypedTransaction): KeccakPreimageMap;
     getDecodedContractStatesBeforeTx(tx: TypedTransaction, contracts?: Iterable<Address>): Promise<ContractStates>;
     getDecodedContractStatesOnTxStep(tx: TypedTransaction, stepNum: number): Promise<ContractStates | undefined>;
-    debug<StepT, CtxT>(tx: TypedTransaction, tracer: BaseSolTxTracer<StepT, CtxT>, ctx: CtxT): Promise<[StepT[], FoundryTxResult, EVMStateManagerInterface, CtxT]>;
+    debug<StepT, CtxT>(tx: TypedTransaction, tracer: BaseSolTxTracer<StepT, CtxT>, ctx: CtxT): Promise<[StepT[], FoundryTxResult, StateManagerInterface, CtxT]>;
 }
 //# sourceMappingURL=test_runner.d.ts.map

package/dist/utils/test_runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test_runner.d.ts","sourceRoot":"","sources":["../../src/utils/test_runner.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"test_runner.d.ts","sourceRoot":"","sources":["../../src/utils/test_runner.ts"],"names":[],"mappings":"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"}

package/dist/utils/test_runner.js

@@ -6,8 +6,12 @@ const common_1 = require("@ethereumjs/common");
 const util_1 = require("@ethereumjs/util");
 const utils_1 = require("ethereum-cryptography/utils");
 const solc_typed_ast_1 = require("solc-typed-ast");
-const debug_1 = require("../debug");
+const layout_1 = require("../debug/layout");
+const base_tracer_1 = require("../debug/tracers/base_tracer");
 const storage_decode_tracer_1 = require("../debug/tracers/storage_decode_tracer");
+const support_tracer_1 = require("../debug/tracers/support_tracer");
+const contract_lifetime_1 = require("../debug/tracers/transformers/contract_lifetime");
+const keccak256_invert_1 = require("../debug/tracers/transformers/keccak256_invert");
 const map_1 = require("./map");
 const misc_1 = require("./misc");
 const set_1 = require("./set");
@@ -28,7 +32,7 @@ class TxRunner {
         this._stateRootBeforeTx = new Map();
         this._contractsBeforeTx = new Map();
         this._keccakPreimagesBeforeTx = new Map();
-        this.tracer = new debug_1.SupportTracer(artifactManager, {
+        this.tracer = new support_tracer_1.SupportTracer(artifactManager, {
             strict: true,
             foundryCheatcodes: this._foundryCheatcodes
         });
@@ -41,10 +45,10 @@ class TxRunner {
          * Dummy VM used just to get a StateManager and a Common instance. The actual VM used for execution is created inside
          * SupportTracer. (@todo this is kinda ugly... oh well)
          */
-        const dummyVM = await debug_1.BaseSolTxTracer.createVm(undefined, this._foundryCheatcodes);
+        const dummyVM = await base_tracer_1.BaseSolTxTracer.createVm(undefined, this._foundryCheatcodes);
         let stateManager = dummyVM.stateManager.shallowCopy();
         const common = dummyVM.common.copy();
-        debug_1.BaseSolTxTracer.releaseVM(dummyVM);
+        base_tracer_1.BaseSolTxTracer.releaseVM(dummyVM);
         const contractsBefore = await this.setupInitialState(scenario.initialState, stateManager);
         const keccakPreimages = new Map();
         for (let i = 0; i < scenario.steps.length; i++) {
@@ -59,11 +63,11 @@ class TxRunner {
             this._keccakPreimagesBeforeTx.set(txHash, new Map(keccakPreimages));
             const [trace, res, stateAfter] = await this.tracer.debugTx(tx, block, stateManager);
             await stateManager.flush();
-            const [gen, kill] = (0, debug_1.getContractGenKillSet)(trace, res);
+            const [gen, kill] = (0, contract_lifetime_1.getContractGenKillSet)(trace, res);
             (0, set_1.set_add)(contractsBefore, gen);
             (0, set_1.set_subtract)(contractsBefore, kill);
             // Update the keccak map
-            const txKeccakPreimages = (0, debug_1.getKeccakPreimages)(trace);
+            const txKeccakPreimages = (0, keccak256_invert_1.getKeccakPreimages)(trace);
             (0, map_1.map_add)(keccakPreimages, txKeccakPreimages);
             // Add results
             this._results.push(res);
@@ -75,18 +79,19 @@ class TxRunner {
         await state.checkpoint();
         for (const addressStr of Object.keys(initialState.accounts)) {
             const { nonce, balance, code, storage } = initialState.accounts[addressStr];
-            const address = util_1.Address.fromString(addressStr);
+            const address = (0, util_1.createAddressFromString)(addressStr);
             const codeBuf = (0, utils_1.hexToBytes)(code.slice(2));
-            const acct = new util_1.Account();
-            acct.nonce = BigInt(nonce);
-            acct.balance = BigInt(balance);
-            state.putAccount(address, acct);
+            const acct = (0, util_1.createAccount)({
+                nonce: BigInt(nonce),
+                balance: BigInt(balance)
+            });
+            await state.putAccount(address, acct);
             for (const [key, val] of Object.entries(storage)) {
                 const keyBuf = (0, misc_1.hexStrToBuf32)(key.slice(2));
                 const valBuf = (0, misc_1.hexStrToBuf32)(val.slice(2));
-                await state.putContractStorage(address, keyBuf, valBuf);
+                await state.putStorage(address, keyBuf, valBuf);
             }
-            await state.putContractCode(address, codeBuf);
+            await state.putCode(address, codeBuf);
             if (codeBuf.length > 0) {
                 initialContracts.add(address.toString());
             }
@@ -96,23 +101,23 @@ class TxRunner {
         return initialContracts;
     }
     async txDescToTx(step, stateManager, common) {
-        const senderAddress = util_1.Address.fromString(step.origin);
+        const senderAddress = (0, util_1.createAddressFromString)(step.origin);
         const senderAccount = await stateManager.getAccount(senderAddress);
         const senderNonce = senderAccount !== undefined ? senderAccount.nonce : 0;
         const txData = {
-            value: step.value,
-            gasLimit: step.gasLimit,
+            value: (0, util_1.hexToBigInt)(step.value),
+            gasLimit: (0, util_1.hexToBigInt)(step.gasLimit),
             gasPrice: 8,
-            data: step.input,
+            data: (0, utils_1.hexToBytes)(step.input),
             nonce: senderNonce
         };
         if (step.address !== misc_1.ZERO_ADDRESS_STRING) {
-            txData.to = step.address;
+            txData.to = (0, util_1.createAddressFromString)(step.address);
         }
         return (0, misc_1.makeFakeTransaction)(txData, step.origin, common);
     }
     blockFromTxDesc(step, common) {
-        return block_1.Block.fromBlockData({
+        return (0, block_1.createBlock)({
             header: {
                 coinbase: step.origin,
                 difficulty: common.hardfork() === common_1.Hardfork.Shanghai ? 0 : step.blockDifficulty,
@@ -158,9 +163,9 @@ class TxRunner {
         const state = this.getStateBeforeTx(tx);
         const preimages = this.getKeccakPreimagesBefore(tx);
         if (contracts === undefined) {
-            contracts = [...this.getContractsBefore(tx)].map(util_1.Address.fromString);
+            contracts = [...this.getContractsBefore(tx)].map(util_1.createAddressFromString);
         }
-        return await (0, debug_1.decodeContractStates)(this.artifactManager, contracts, state, preimages);
+        return await (0, layout_1.decodeContractStates)(this.artifactManager, contracts, state, preimages);
     }
     async getDecodedContractStatesOnTxStep(tx, stepNum) {
         const tracer = new storage_decode_tracer_1.StorageDecodeTracer(this.artifactManager, {

package/dist/utils/test_runner.js.map

@@ -1 +1 @@
-{"version":3,"file":"test_runner.js","sourceRoot":"","sources":["../../src/utils/test_runner.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"test_runner.js","sourceRoot":"","sources":["../../src/utils/test_runner.ts"],"names":[],"mappings":"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"}

package/dist/utils/trace.d.ts

@@ -1,4 +1,4 @@
-import { StepState } from "../debug";
+import { StepState } from "../debug/types";
 /**
  * Find the last step in the non-internal code, before trace step i
  */
@@ -7,6 +7,10 @@ export declare function findLastNonInternalStepBeforeStepI(trace: StepState[], i
  * Find the last step in the non-internal code, that leads to the first revert
  */
 export declare function findLastNonInternalStepBeforeRevert(trace: StepState[]): StepState | undefined;
+/**
+ * Find the last step in the non-internal code, that leads to the first revert
+ */
+export declare function findLastNonInternalStepBeforeAssert(trace: StepState[]): StepState | undefined;
 /**
  * Find the last step in the non-internal code, that leads to the last revert
  */

package/dist/utils/trace.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"trace.d.ts","sourceRoot":"","sources":["../../src/utils/trace.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAKrC;;GAEG;AACH,wBAAgB,kCAAkC,CAC9C,KAAK,EAAE,SAAS,EAAE,EAClB,CAAC,EAAE,MAAM,GACV,SAAS,GAAG,SAAS,CAcvB;AAED;;GAEG;AACH,wBAAgB,mCAAmC,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,SAAS,GAAG,SAAS,CAc7F;AAED;;GAEG;AACH,wBAAgB,uCAAuC,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,SAAS,GAAG,SAAS,CAcjG;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,SAAS,GAAG,SAAS,CAmC7E"}
+{"version":3,"file":"trace.d.ts","sourceRoot":"","sources":["../../src/utils/trace.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAI3C;;GAEG;AACH,wBAAgB,kCAAkC,CAC9C,KAAK,EAAE,SAAS,EAAE,EAClB,CAAC,EAAE,MAAM,GACV,SAAS,GAAG,SAAS,CAcvB;AAED;;GAEG;AACH,wBAAgB,mCAAmC,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,SAAS,GAAG,SAAS,CAc7F;AAED;;GAEG;AACH,wBAAgB,mCAAmC,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,SAAS,GAAG,SAAS,CAc7F;AAED;;GAEG;AACH,wBAAgB,uCAAuC,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,SAAS,GAAG,SAAS,CAcjG;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,SAAS,GAAG,SAAS,CAmC7E"}

package/dist/utils/trace.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findLastNonInternalStepBeforeStepI = findLastNonInternalStepBeforeStepI;
 exports.findLastNonInternalStepBeforeRevert = findLastNonInternalStepBeforeRevert;
+exports.findLastNonInternalStepBeforeAssert = findLastNonInternalStepBeforeAssert;
 exports.findLastNonInternalStepBeforeLastRevert = findLastNonInternalStepBeforeLastRevert;
 exports.findFirstCallToFail = findFirstCallToFail;
 const utils_1 = require("ethereum-cryptography/utils");
@@ -39,6 +40,21 @@ function findLastNonInternalStepBeforeRevert(trace) {
     }
     return findLastNonInternalStepBeforeStepI(trace, i);
 }
+/**
+ * Find the last step in the non-internal code, that leads to the first revert
+ */
+function findLastNonInternalStepBeforeAssert(trace) {
+    let i = 0;
+    for (; i < trace.length; i++) {
+        if (trace[i].op.opcode === 0xfe) {
+            break;
+        }
+    }
+    if (i === trace.length) {
+        return undefined;
+    }
+    return findLastNonInternalStepBeforeStepI(trace, i);
+}
 /**
  * Find the last step in the non-internal code, that leads to the last revert
  */

package/dist/utils/trace.js.map

@@ -1 +1 @@
-{"version":3,"file":"trace.js","sourceRoot":"","sources":["../../src/utils/trace.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"trace.js","sourceRoot":"","sources":["../../src/utils/trace.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "sol-dbg",
-    "version": "0.6.15",
+    "version": "0.7.2",
     "description": "Small (experimental) Solidity-level debugger built around EthereumJS",
     "keywords": [],
     "files": [
@@ -16,20 +16,24 @@
         "lint": "eslint src/ test/ --ext=ts",
         "lint:fix": "eslint src/ test/ --ext=ts --fix",
         "test": "NODE_OPTIONS='--max-old-space-size=2048' jest --coverage",
-        "prepare": "npm run build"
+        "prepare": "npm run build",
+        "docs:render": "typedoc",
+        "docs:clear": "rm -rf docs/",
+        "docs:refresh": "npm run docs:clear && npm run docs:render"
     },
     "dependencies": {
-        "@ethereumjs/block": "5.2.0",
-        "@ethereumjs/common": "4.3.0",
-        "@ethereumjs/evm": "3.0.0",
-        "@ethereumjs/rlp": "5.0.2",
-        "@ethereumjs/statemanager": "2.3.0",
-        "@ethereumjs/tx": "5.3.0",
-        "@ethereumjs/util": "9.0.3",
-        "@ethereumjs/vm": "8.0.0",
-        "cbor": "^9.0.2",
+        "@ethereumjs/block": "10.0.0",
+        "@ethereumjs/blockchain": "10.0.0",
+        "@ethereumjs/common": "10.0.0",
+        "@ethereumjs/evm": "10.0.0",
+        "@ethereumjs/rlp": "10.0.0",
+        "@ethereumjs/statemanager": "10.0.0",
+        "@ethereumjs/tx": "10.0.0",
+        "@ethereumjs/util": "10.0.0",
+        "@ethereumjs/vm": "10.0.0",
+        "cbor": "^10.0.3",
         "ethereum-cryptography": "2.2.1",
-        "solc-typed-ast": "^18.2.0",
+        "solc-typed-ast": "^18.2.5",
         "src-location": "^1.1.0",
         "web3-eth-abi": "^4.2.2"
     },
@@ -39,7 +43,7 @@
         "@types/fs-extra": "^11.0.4",
         "@types/jest": "^29.5.12",
         "@types/lru-cache": "^5.1.1",
-        "@types/node": "^20.11.19",
+        "@types/node": "^22.0.0",
         "@typescript-eslint/eslint-plugin": "^7.0.2",
         "@typescript-eslint/parser": "^7.0.2",
         "eslint": "^8.56.0",
@@ -50,7 +54,8 @@
         "prettier": "^3.2.5",
         "ts-jest": "^29.1.2",
         "ts-node": "^10.9.2",
-        "typescript": "^5.3.3"
+        "typescript": "^5.8.3",
+        "typedoc": "^0.28.5"
     },
     "homepage": "https://github.com/ConsenSys/sol-dbg",
     "bugs": "https://github.com/ConsenSys/sol-dbg/issues",

package/dist/debug/decoding/calldata.d.ts

@@ -1,6 +0,0 @@
-import { ArrayType, InferType, TypeNode } from "solc-typed-ast";
-import { CalldataLocation } from "..";
-import { Memory } from "../..";
-export declare function cd_decodeArrayContents(abiType: ArrayType, origType: ArrayType | undefined, arrOffset: bigint, numLen: number, calldata: Memory, infer: InferType): undefined | [any[], number];
-export declare function cd_decodeValue(abiType: TypeNode, origType: TypeNode | undefined, loc: CalldataLocation, calldata: Memory, callDataBaseOff: bigint | undefined, infer: InferType): undefined | [any, number];
-//# sourceMappingURL=calldata.d.ts.map

package/dist/debug/decoding/calldata.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"calldata.d.ts","sourceRoot":"","sources":["../../../src/debug/decoding/calldata.ts"],"names":[],"mappings":"AACA,OAAO,EAEH,SAAS,EAIT,SAAS,EAOT,QAAQ,EAGX,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACH,gBAAgB,EAKnB,MAAM,IAAI,CAAC;AACZ,OAAO,EAEH,MAAM,EAKT,MAAM,OAAO,CAAC;AAwHf,wBAAgB,sBAAsB,CAClC,OAAO,EAAE,SAAS,EAClB,QAAQ,EAAE,SAAS,GAAG,SAAS,EAC/B,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,SAAS,GACjB,SAAS,GAAG,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,CA+B7B;AAqMD,wBAAgB,cAAc,CAC1B,OAAO,EAAE,QAAQ,EACjB,QAAQ,EAAE,QAAQ,GAAG,SAAS,EAC9B,GAAG,EAAE,gBAAgB,EACrB,QAAQ,EAAE,MAAM,EAChB,eAAe,oBAAY,EAC3B,KAAK,EAAE,SAAS,GACjB,SAAS,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAsE3B"}