sol-dbg 0.6.1 → 0.6.2

package/dist/utils/index.d.ts

@@ -5,4 +5,5 @@ export * from "./pp";
 export * from "./set";
 export * from "./srcmap";
 export * from "./test_runner";
+export * from "./trace";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,OAAO,CAAC;AACtB,cAAc,QAAQ,CAAC;AACvB,cAAc,MAAM,CAAC;AACrB,cAAc,OAAO,CAAC;AACtB,cAAc,UAAU,CAAC;AACzB,cAAc,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,OAAO,CAAC;AACtB,cAAc,QAAQ,CAAC;AACvB,cAAc,MAAM,CAAC;AACrB,cAAc,OAAO,CAAC;AACtB,cAAc,UAAU,CAAC;AACzB,cAAc,eAAe,CAAC;AAC9B,cAAc,SAAS,CAAC"}

package/dist/utils/index.js

@@ -21,4 +21,5 @@ __exportStar(require("./pp"), exports);
 __exportStar(require("./set"), exports);
 __exportStar(require("./srcmap"), exports);
 __exportStar(require("./test_runner"), exports);
+__exportStar(require("./trace"), exports);
 //# sourceMappingURL=index.js.map

package/dist/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,kDAAgC;AAChC,wCAAsB;AACtB,yCAAuB;AACvB,uCAAqB;AACrB,wCAAsB;AACtB,2CAAyB;AACzB,gDAA8B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,kDAAgC;AAChC,wCAAsB;AACtB,yCAAuB;AACvB,uCAAqB;AACrB,wCAAsB;AACtB,2CAAyB;AACzB,gDAA8B;AAC9B,0CAAwB"}

package/dist/utils/trace.d.ts

@@ -0,0 +1,18 @@
+import { StepState } from "../debug";
+/**
+ * Find the last step in the non-internal code, before trace step i
+ */
+export declare function findLastNonInternalStepBeforeStepI(trace: StepState[], i: number): StepState | undefined;
+/**
+ * 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 last revert
+ */
+export declare function findLastNonInternalStepBeforeLastRevert(trace: StepState[]): StepState | undefined;
+/**
+ * Find the last step before calling the foundry cheatcode fail()
+ */
+export declare function findFirstCallToFail(trace: StepState[]): StepState | undefined;
+//# sourceMappingURL=trace.d.ts.map

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

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

package/dist/utils/trace.js

@@ -0,0 +1,87 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findLastNonInternalStepBeforeStepI = findLastNonInternalStepBeforeStepI;
+exports.findLastNonInternalStepBeforeRevert = findLastNonInternalStepBeforeRevert;
+exports.findLastNonInternalStepBeforeLastRevert = findLastNonInternalStepBeforeLastRevert;
+exports.findFirstCallToFail = findFirstCallToFail;
+const utils_1 = require("ethereum-cryptography/utils");
+const solc_typed_ast_1 = require("solc-typed-ast");
+const foundry_cheatcodes_1 = require("../debug/foundry_cheatcodes");
+const misc_1 = require("./misc");
+const pp_1 = require("./pp");
+/**
+ * Find the last step in the non-internal code, before trace step i
+ */
+function findLastNonInternalStepBeforeStepI(trace, i) {
+    const stack = (0, pp_1.flattenStack)(trace[i].stack);
+    for (let j = stack.length - 1; j >= 0; j--) {
+        if (stack[j].callee instanceof solc_typed_ast_1.FunctionDefinition) {
+            if (j === stack.length - 1) {
+                return trace[i];
+            }
+            return trace[stack[j + 1].startStep - 1];
+        }
+    }
+    return undefined;
+}
+/**
+ * Find the last step in the non-internal code, that leads to the first revert
+ */
+function findLastNonInternalStepBeforeRevert(trace) {
+    let i = 0;
+    for (; i < trace.length; i++) {
+        if (trace[i].op.opcode === 0xfd) {
+            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
+ */
+function findLastNonInternalStepBeforeLastRevert(trace) {
+    let i = trace.length - 1;
+    for (; i >= 0; i--) {
+        if (trace[i].op.opcode === 0xfd) {
+            break;
+        }
+    }
+    if (i < 0) {
+        return undefined;
+    }
+    return findLastNonInternalStepBeforeStepI(trace, i);
+}
+/**
+ * Find the last step before calling the foundry cheatcode fail()
+ */
+function findFirstCallToFail(trace) {
+    let i = 0;
+    for (; i < trace.length; i++) {
+        // Look for CALL to FoundryCheatcodesAddress with the FAIL_SELECTOR
+        if (trace[i].op.mnemonic === "CALL") {
+            const stackLen = trace[i].evmStack.length;
+            const addr = (0, misc_1.wordToAddress)(trace[i].evmStack[stackLen - 2]);
+            if (!addr.equals(foundry_cheatcodes_1.FoundryCheatcodesAddress)) {
+                continue;
+            }
+            const argOffset = (0, misc_1.bigEndianBufToNumber)(trace[i].evmStack[stackLen - 4]);
+            const argSize = (0, misc_1.bigEndianBufToNumber)(trace[i].evmStack[stackLen - 5]);
+            if (argSize < 4) {
+                continue;
+            }
+            const msgData = (0, utils_1.bytesToHex)(trace[i].memory.slice(argOffset, argOffset + argSize));
+            if (msgData === foundry_cheatcodes_1.FAIL_MSG_DATA) {
+                break;
+            }
+        }
+    }
+    if (i === trace.length) {
+        return undefined;
+    }
+    //console.error(`Error step: ${i}`);
+    return trace[i];
+}
+//# sourceMappingURL=trace.js.map

package/dist/utils/trace.js.map

@@ -0,0 +1 @@
+{"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.1",
+    "version": "0.6.2",
     "description": "Small (experimental) Solidity-level debugger built around EthereumJS",
     "keywords": [],
     "files": [