sol-dbg 0.7.17 → 0.8.1

package/dist/debug/abi.d.ts

@@ -1,12 +1,19 @@
-import { FunctionDefinition, VariableDeclaration, InferType, TypeNode } from "solc-typed-ast";
+import { FunctionDefinition, VariableDeclaration, InferType } from "solc-typed-ast";
 import { View } from "./decoding/view";
 import { DecodedEventDesc, EventDefInfo, EventDesc, Memory } from "./types";
 import { Value } from "./decoding/value";
 import { IArtifactManager } from "./artifact_manager";
+import { BaseRuntimeType } from "./runtime_types";
+/**
+ * Return true if the given callee requires a selector
+ * @param callee
+ * @returns
+ */
+export declare function hasSelector(callee: FunctionDefinition | VariableDeclaration): boolean;
 export declare function buildMsgViews(callee: FunctionDefinition | VariableDeclaration, infer: InferType): Array<[string, View<Memory>]>;
-declare abstract class BaseEventView<V extends Value, L, T extends TypeNode> extends View<EventDesc, V, L, T> {
+declare abstract class BaseEventView<V extends Value, L, T extends BaseRuntimeType> extends View<EventDesc, V, L, T> {
 }
-type GenEventView = BaseEventView<Value, any, TypeNode>;
+type GenEventView = BaseEventView<Value, any, BaseRuntimeType>;
 export declare function buildEventViews(evtDef: EventDefInfo, infer: InferType): Array<[string, GenEventView]>;
 /**
  * Decode a raw event. Currently only supports non-anonmyous events.

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

@@ -1 +1 @@
-{"version":3,"file":"abi.d.ts","sourceRoot":"","sources":["../../src/debug/abi.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,kBAAkB,EAClB,mBAAmB,EACnB,SAAS,EAET,QAAQ,EAMX,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAG5E,OAAO,EAAmB,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAiCtD,wBAAgB,aAAa,CACzB,MAAM,EAAE,kBAAkB,GAAG,mBAAmB,EAChD,KAAK,EAAE,SAAS,GACjB,KAAK,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAiC/B;AAED,uBAAe,aAAa,CAAC,CAAC,SAAS,KAAK,EAAE,CAAC,EAAE,CAAC,SAAS,QAAQ,CAAE,SAAQ,IAAI,CAC7E,SAAS,EACT,CAAC,EACD,CAAC,EACD,CAAC,CACJ;CAAG;AA+BJ,KAAK,YAAY,GAAG,aAAa,CAAC,KAAK,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;AACxD,wBAAgB,eAAe,CAC3B,MAAM,EAAE,YAAY,EACpB,KAAK,EAAE,SAAS,GACjB,KAAK,CAAC,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAgC/B;AAED;;GAEG;AACH,wBAAgB,WAAW,CACvB,eAAe,EAAE,gBAAgB,EACjC,GAAG,EAAE,SAAS,GACf,gBAAgB,GAAG,SAAS,CAmB9B"}
+{"version":3,"file":"abi.d.ts","sourceRoot":"","sources":["../../src/debug/abi.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,kBAAkB,EAClB,mBAAmB,EACnB,SAAS,EAQZ,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAG5E,OAAO,EAAmB,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAoB,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAEpE;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,kBAAkB,GAAG,mBAAmB,GAAG,OAAO,CAcrF;AAYD,wBAAgB,aAAa,CACzB,MAAM,EAAE,kBAAkB,GAAG,mBAAmB,EAChD,KAAK,EAAE,SAAS,GACjB,KAAK,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAiC/B;AAED,uBAAe,aAAa,CAAC,CAAC,SAAS,KAAK,EAAE,CAAC,EAAE,CAAC,SAAS,eAAe,CAAE,SAAQ,IAAI,CACpF,SAAS,EACT,CAAC,EACD,CAAC,EACD,CAAC,CACJ;CAAG;AA+BJ,KAAK,YAAY,GAAG,aAAa,CAAC,KAAK,EAAE,GAAG,EAAE,eAAe,CAAC,CAAC;AAC/D,wBAAgB,eAAe,CAC3B,MAAM,EAAE,YAAY,EACpB,KAAK,EAAE,SAAS,GACjB,KAAK,CAAC,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAgC/B;AAED;;GAEG;AACH,wBAAgB,WAAW,CACvB,eAAe,EAAE,gBAAgB,EACjC,GAAG,EAAE,SAAS,GACf,gBAAgB,GAAG,SAAS,CAmB9B"}

package/dist/debug/abi.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.hasSelector = hasSelector;
 exports.buildMsgViews = buildMsgViews;
 exports.buildEventViews = buildEventViews;
 exports.decodeEvent = decodeEvent;
@@ -8,7 +9,7 @@ const view_1 = require("./decoding/view");
 const utils_1 = require("../utils");
 const view_2 = require("./decoding/calldata/view");
 const value_1 = require("./decoding/value");
-const decoding_1 = require("./decoding");
+const runtime_types_1 = require("./runtime_types");
 /**
  * Return true if the given callee requires a selector
  * @param callee
@@ -49,7 +50,7 @@ function buildMsgViews(callee, infer) {
         : infer
             .getterArgsAndReturn(callee)[0]
             .map((typ, i) => [`ARG_${i}`, typ]);
-    const views = (0, view_2.makeCalldataViews)(formals.map((x) => (0, decoding_1.simplifyType)(x[1], infer, solc_typed_ast_1.DataLocation.CallData)), base);
+    const views = (0, view_2.makeCalldataViews)(formals.map((x) => (0, runtime_types_1.astToRuntimeType)(x[1], infer, solc_typed_ast_1.DataLocation.CallData)), base);
     res.push(...(0, utils_1.zip)(formals.map((x) => x[0]), views));
     return res;
 }
@@ -78,8 +79,8 @@ class TopicPayloadView extends BaseEventView {
 function buildEventViews(evtDef, infer) {
     const [indexedArgs, nonIndexedArgs] = (0, utils_1.split)(evtDef.args.map((x, i) => [i, x]), ([, [, , indexed]]) => indexed);
     let topicIdx = evtDef.definition.anonymous ? 0 : 1;
-    const indexedViews = indexedArgs.map(([, [, type]]) => new TopicPayloadView((0, decoding_1.simplifyType)(type, infer, solc_typed_ast_1.DataLocation.CallData), topicIdx++));
-    const nonIndexedViews = (0, view_2.makeCalldataViews)(nonIndexedArgs.map(([, [, type]]) => (0, decoding_1.simplifyType)(type, infer, solc_typed_ast_1.DataLocation.CallData)), 0n).map((v) => new EventPayloadView(v.type, v));
+    const indexedViews = indexedArgs.map(([, [, type]]) => new TopicPayloadView((0, runtime_types_1.astToRuntimeType)(type, infer, solc_typed_ast_1.DataLocation.CallData), topicIdx++));
+    const nonIndexedViews = (0, view_2.makeCalldataViews)(nonIndexedArgs.map(([, [, type]]) => (0, runtime_types_1.astToRuntimeType)(type, infer, solc_typed_ast_1.DataLocation.CallData)), 0n).map((v) => new EventPayloadView(v.type, v));
     const allArgDesc = [
         ...indexedViews.map((view, i) => [
             indexedArgs[i][0],

package/dist/debug/abi.js.map

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

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

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

package/dist/debug/artifact_manager/artifact_manager.js

@@ -106,7 +106,8 @@ class ArtifactManager {
                 compilerVersion,
                 abiEncoderVersion,
                 fileMap,
-                srcMap
+                srcMap,
+                codegen: "old"
             });
         }
         for (const artifactInfo of this._artifacts) {
@@ -166,12 +167,14 @@ class ArtifactManager {
                         bytecode: {
                             generatedFileMap,
                             srcMap: (0, srcmap_1.fastParseBytecodeSourceMapping)(contractArtifact.evm.bytecode.sourceMap),
-                            offsetToIndexMap: buildOffsetToIndexMap(contractArtifact.evm.bytecode.object)
+                            offsetToIndexMap: buildOffsetToIndexMap(contractArtifact.evm.bytecode.object),
+                            bytecode: (0, utils_1.hexToBytes)(contractArtifact.evm.bytecode.object)
                         },
                         deployedBytecode: {
                             generatedFileMap: deployedGeneratedFileMap,
                             srcMap: (0, srcmap_1.fastParseBytecodeSourceMapping)(contractArtifact.evm.deployedBytecode.sourceMap),
-                            offsetToIndexMap: buildOffsetToIndexMap(contractArtifact.evm.deployedBytecode.object)
+                            offsetToIndexMap: buildOffsetToIndexMap(contractArtifact.evm.deployedBytecode.object),
+                            bytecode: (0, utils_1.hexToBytes)(contractArtifact.evm.bytecode.object)
                         },
                         mdHash: hash
                     };

package/dist/debug/artifact_manager/artifact_manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"artifact_manager.js","sourceRoot":"","sources":["../../../src/debug/artifact_manager/artifact_manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"artifact_manager.js","sourceRoot":"","sources":["../../../src/debug/artifact_manager/artifact_manager.ts"],"names":[],"mappings":";;;AA+EA,oCAUC;AAzFD,2CAAiD;AACjD,yDAAyD;AACzD,uDAAkF;AAClF,mDAcwB;AACxB,uDAA0F;AAC1F,qDAIiC;AAEjC,2CAA6D;AAC7D,mDAAwF;AACxF,+CAAmG;AACnG,wCAAwC;AAExC,6DAAuF;AACvF,mCAAmG;AAsBnG;;;;;;;GAOG;AACH,SAAS,qBAAqB,CAAC,QAA0C;IACrE,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;QAC/B,QAAQ,GAAG,IAAA,kBAAU,EAAC,QAAQ,CAAC,CAAC;IACpC,CAAC;IAED,MAAM,GAAG,GAAG,IAAI,GAAG,EAAkB,CAAC;IAEtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,CAAC,EAAE,GAAG,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAClD,MAAM,EAAE,GAAG,oBAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;QAErC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QAEhB,GAAG,IAAI,EAAE,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,OAAO,GAAG,CAAC;AACf,CAAC;AAED,SAAgB,YAAY,CAAC,GAAW,EAAE,QAAsB;IAC5D,MAAM,GAAG,GAAG,QAAQ,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAE/C,IAAA,uBAAM,EAAC,GAAG,KAAK,SAAS,EAAE,4BAA4B,GAAG,EAAE,CAAC,CAAC;IAC7D,IAAA,uBAAM,EACF,GAAG,IAAI,CAAC,IAAI,GAAG,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EACxC,qBAAqB,GAAG,6BAA6B,QAAQ,CAAC,MAAM,CAAC,MAAM,GAAG,CACjF,CAAC;IAEF,OAAO,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;AAChC,CAAC;AAED;;;GAGG;AACH,MAAa,eAAe;IAYxB;;;;OAIG;IACK,qBAAqB,CAAC,KAAmB,EAAE,eAAuB;QACtE,MAAM,QAAQ,GAAG,IAAI,GAAG,CACpB,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,qCAAoB,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC,CACnE,CAAC;QAEF,IAAI,QAAQ,CAAC,GAAG,CAAC,uBAAiB,CAAC,EAAE,CAAC,EAAE,CAAC;YACrC,OAAO,uBAAiB,CAAC,EAAE,CAAC;QAChC,CAAC;QAED,OAAO,uBAAiB,CAAC,EAAE,CAAC;IAChC,CAAC;IAED,YAAY,SAAiE;QAzBrE,gBAAW,GAAG,IAAI,GAAG,EAAqB,CAAC;QA0B/C,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;QACrB,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;QACrB,IAAI,CAAC,qBAAqB,GAAG,IAAI,GAAG,EAAwB,CAAC;QAC7D,IAAI,CAAC,0BAA0B,GAAG,EAAE,CAAC;QACrC,IAAI,CAAC,0BAA0B,GAAG,EAAE,CAAC;QACrC,IAAI,CAAC,iBAAiB,GAAG,IAAI,GAAG,EAAE,CAAC;QAEnC,KAAK,MAAM,GAAG,IAAI,SAAS,EAAE,CAAC;YAC1B,MAAM,MAAM,GAAG,IAAI,0BAAS,EAAE,CAAC;YAC/B,IAAI,QAA2B,CAAC;YAChC,IAAI,eAAuB,CAAC;YAE5B,IAAI,GAAG,YAAY,KAAK,EAAE,CAAC;gBACvB,CAAC,QAAQ,EAAE,eAAe,CAAC,GAAG,GAAG,CAAC;YACtC,CAAC;iBAAM,CAAC;gBACJ,QAAQ,GAAG,GAAG,CAAC;gBACf,MAAM,oBAAoB,GAAG,IAAA,uCAA6B,EAAC,QAAQ,CAAC,CAAC;gBACrE,IAAA,uBAAM,EACF,oBAAoB,KAAK,SAAS,EAClC,6CAA6C,CAChD,CAAC;gBAEF,eAAe,GAAG,oBAAoB,CAAC;YAC3C,CAAC;YAED,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACpC,MAAM,iBAAiB,GAAG,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;YAC7E,MAAM,OAAO,GAAG,IAAI,GAAG,EAA0B,CAAC;YAClD,MAAM,OAAO,GAAG,IAAI,GAAG,CAAqB,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;YAElF,KAAK,MAAM,QAAQ,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;gBACtC,MAAM,UAAU,GAAG,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;gBAC9C,qEAAqE;gBACrE,MAAM,OAAO,GACT,UAAU,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC;gBAE9E,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE;oBACjB,QAAQ,EAAE,UAAU,CAAC,QAAQ;oBAC7B,MAAM,EAAE,UAAU,CAAC,GAAG;oBACtB,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;oBACnC,IAAI,EAAE,QAAQ;oBACd,SAAS,EAAE,OAAO;oBAClB,IAAI,EAAE,sBAAc,CAAC,QAAQ;iBAChC,CAAC,CAAC;YACP,CAAC;YAED,MAAM,MAAM,GAAG,IAAI,GAAG,EAAmB,CAAC;YAE1C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACvB,IAAI,CAAC,YAAY,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;YAC/D,CAAC;YAED,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;gBACjB,QAAQ;gBACR,KAAK;gBACL,GAAG,EAAE,MAAM,CAAC,OAAO;gBACnB,eAAe;gBACf,iBAAiB;gBACjB,OAAO;gBACP,MAAM;gBACN,OAAO,EAAE,KAAK;aACjB,CAAC,CAAC;QACP,CAAC;QAED,KAAK,MAAM,YAAY,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACzC,MAAM,QAAQ,GAAG,YAAY,CAAC,QAAQ,CAAC;YAEvC,0CAA0C;YAC1C,KAAK,MAAM,IAAI,IAAI,YAAY,CAAC,KAAK,EAAE,CAAC;gBACpC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;gBAEvD,IAAI,CAAC,YAAY,CAAC,CAAC,UAAU,EAAE,EAAE;oBAC7B,yCAAyC;oBACzC,IAAI,UAAU,YAAY,gCAAe,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC;wBACjE,MAAM,OAAO,GAAG,KAAK,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;wBAEjD,MAAM,IAAI,GAAuC,IAAA,WAAI,EACjD,UAAU,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EACrD,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAC9B,KAAK,CAAC,gBAAgB,CAAC,MAAM,EAAE,YAAY,CAAC,iBAAiB,CAAC,CACjE,EACD,UAAU,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAC3D,CAAC;wBAEF,MAAM,KAAK,GAAG,IAAA,oBAAa,EACvB,IAAA,kBAAS,EACL,IAAA,mBAAW,EACP,GAAG,UAAU,CAAC,IAAI,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,4BAAsB,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CACnF,CACJ,CACJ,CAAC;wBAEF,MAAM,IAAI,GAAiB;4BACvB,UAAU;4BACV,QAAQ,EAAE,YAAY;4BACtB,IAAI;yBACP,CAAC;wBAEF,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;oBAC5C,CAAC;gBACL,CAAC,CAAC,CAAC;YACP,CAAC;YAED,KAAK,MAAM,QAAQ,IAAI,QAAQ,CAAC,SAAS,EAAE,CAAC;gBACxC,KAAK,MAAM,YAAY,IAAI,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;oBACtD,MAAM,WAAW,GAAG,IAAA,0BAAe,EAAC,YAAY,CAAC,KAAK,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC;oBAChF,MAAM,gBAAgB,GAAG,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,YAAY,CAAC,CAAC;oBACpE,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAA0B,CAAC;oBAC3D,MAAM,wBAAwB,GAAG,IAAI,GAAG,EAA0B,CAAC;oBAEnE,IAAI,gBAAgB,CAAC,GAAG,CAAC,gBAAgB,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;wBAC5D,SAAS;oBACb,CAAC;oBAED,KAAK,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,IAAI;wBACjC,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC;wBACjD,CAAC,wBAAwB,EAAE,gBAAgB,CAAC,GAAG,CAAC,gBAAgB,CAAC;qBACA,EAAE,CAAC;wBACpE,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE,CAAC;4BACjC,SAAS;wBACb,CAAC;wBAED,KAAK,MAAM,GAAG,IAAI,YAAY,CAAC,gBAAgB,EAAE,CAAC;4BAC9C,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE;gCACf,MAAM,EAAE,GAAG,CAAC,GAAG;gCACf,GAAG,EAAE,SAAS;gCACd,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;gCAC9B,QAAQ,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;gCACjD,IAAI,EAAE,sBAAc,CAAC,WAAW;gCAChC,SAAS,EAAE,GAAG,CAAC,EAAE;6BACpB,CAAC,CAAC;wBACP,CAAC;oBACL,CAAC;oBAED,MAAM,IAAI,GAAG,IAAA,qBAAW,EAAC,gBAAgB,CAAC,GAAG,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;oBAEvE,MAAM,YAAY,GAAiB;wBAC/B,QAAQ,EAAE,YAAY;wBACtB,gBAAgB,EAAE,gBAAgB;wBAClC,QAAQ;wBACR,YAAY;wBACZ,GAAG,EAAE,WAAW;wBAChB,QAAQ,EAAE;4BACN,gBAAgB;4BAChB,MAAM,EAAE,IAAA,uCAA8B,EAClC,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,SAAS,CAC1C;4BACD,gBAAgB,EAAE,qBAAqB,CACnC,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CACvC;4BACD,QAAQ,EAAE,IAAA,kBAAU,EAAC,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC;yBAC7D;wBACD,gBAAgB,EAAE;4BACd,gBAAgB,EAAE,wBAAwB;4BAC1C,MAAM,EAAE,IAAA,uCAA8B,EAClC,gBAAgB,CAAC,GAAG,CAAC,gBAAgB,CAAC,SAAS,CAClD;4BACD,gBAAgB,EAAE,qBAAqB,CACnC,gBAAgB,CAAC,GAAG,CAAC,gBAAgB,CAAC,MAAM,CAC/C;4BACD,QAAQ,EAAE,IAAA,kBAAU,EAAC,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC;yBAC7D;wBACD,MAAM,EAAE,IAAI;qBACf,CAAC;oBAEF,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;oBAEnC,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;wBACrB,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;oBACvD,CAAC;oBAED,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAChC,IAAA,iCAAY,EAAC,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAC9C,CAAC;oBAEF,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAChC,IAAA,iCAAY,EAAC,gBAAgB,CAAC,GAAG,CAAC,gBAAgB,CAAC,CACtD,CAAC;gBACN,CAAC;YACL,CAAC;QACL,CAAC;QAED,IAAI,CAAC,eAAe,GAAG,IAAI,GAAG,EAAE,CAAC;QACjC,IAAI,CAAC,eAAe,GAAG,IAAI,GAAG,EAAE,CAAC;QAEjC,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACrC,KAAK,MAAM,IAAI,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;gBAChC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAC7C,CAAC;QACL,CAAC;QAED,KAAK,MAAM,YAAY,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACzC,IAAI,YAAY,CAAC,GAAG,KAAK,SAAS,EAAE,CAAC;gBACjC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;YAC7D,CAAC;QACL,CAAC;IACL,CAAC;IAED,SAAS;QACL,OAAO,IAAI,CAAC,UAAU,CAAC;IAC3B,CAAC;IAED,eAAe,CAAC,EAAW;QACvB,MAAM,QAAQ,GACV,EAAE,YAAY,mCAAkB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,sBAAsB,CAAC,mCAAkB,CAAC,CAAC;QAE1F,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YACzB,OAAO,SAAS,CAAC;QACrB,CAAC;QAED,OAAO,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC9C,CAAC;IAED,WAAW,CAAC,EAAW;QACnB,MAAM,IAAI,GAAG,EAAE,YAAY,2BAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,sBAAsB,CAAC,2BAAU,CAAC,CAAC;QACnF,IAAA,uBAAM,EAAC,IAAI,KAAK,SAAS,EAAE,wBAAwB,EAAE,EAAE,CAAC,CAAC;QAEzD,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAChD,IAAA,uBAAM,EAAC,QAAQ,KAAK,SAAS,EAAE,+BAA+B,EAAE,IAAI,CAAC,CAAC;QAEtE,OAAO,QAAQ,CAAC;IACpB,CAAC;IAED,qBAAqB,CAAC,IAAe;QACjC,OAAO,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAChD,CAAC;IAED,+BAA+B,CAAC,QAAoB;QAChD,MAAM,IAAI,GAAG,IAAA,qBAAW,EAAC,QAAQ,CAAC,CAAC;QAEnC,IAAI,IAAI,EAAE,CAAC;YACP,OAAO,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAChD,CAAC;QAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,0BAA0B,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC9D,MAAM,KAAK,GAAG,IAAI,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC;YAEjD,IAAI,IAAA,oCAAe,EAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC;gBAC1C,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YAC9B,CAAC;QACL,CAAC;QAED,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,+BAA+B,CAAC,gBAA4B;QACxD,MAAM,IAAI,GAAG,IAAA,6BAAmB,EAAC,gBAAgB,CAAC,CAAC;QAEnD,IAAI,IAAI,EAAE,CAAC;YACP,OAAO,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAChD,CAAC;QAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,0BAA0B,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC9D,MAAM,KAAK,GAAG,IAAI,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC;YAEjD,IAAI,IAAA,oCAAe,EAAC,gBAAgB,EAAE,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC;gBACjD,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YAC9B,CAAC;QACL,CAAC;QAED,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,WAAW,CACP,EAAU,EACV,GAA8B,EAC9B,UAAmB;QAEnB,IAAI,YAAsC,CAAC;QAE3C,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,YAAY,UAAU,EAAE,CAAC;YACvD,YAAY,GAAG,UAAU;gBACrB,CAAC,CAAC,IAAI,CAAC,+BAA+B,CAAC,GAAG,CAAC;gBAC3C,CAAC,CAAC,IAAI,CAAC,+BAA+B,CAAC,GAAG,CAAC,CAAC;QACpD,CAAC;aAAM,CAAC;YACJ,YAAY,GAAG,GAAG,CAAC;QACvB,CAAC;QAED,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;YAC7B,OAAO,SAAS,CAAC;QACrB,CAAC;QAED,MAAM,WAAW,GAAG,UAAU;YAC1B,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,gBAAgB;YACxC,CAAC,CAAC,YAAY,CAAC,gBAAgB,CAAC,gBAAgB,CAAC;QAErD,MAAM,GAAG,GAAG,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAEhC,IAAI,GAAG,EAAE,CAAC;YACN,OAAO,GAAG,CAAC;QACf,CAAC;QAED,OAAO,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACjD,CAAC;IAED,SAAS;QACL,OAAO,IAAI,CAAC,UAAU,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,OAAe;QACjB,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;YACjC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,0BAAS,CAAC,OAAO,CAAC,CAAC,CAAC;QAC1D,CAAC;QAED,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAc,CAAC;IACtD,CAAC;IAED,UAAU,CACN,QAAgC,EAChC,IAAmB;QAEnB,IAAI,QAAQ,YAAY,UAAU,EAAE,CAAC;YACjC,QAAQ,GAAG,KAAK,IAAA,kBAAU,EAAC,QAAQ,CAAC,EAAE,CAAC;QAC3C,CAAC;QAED,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACrD,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;gBAChB,SAAS;YACb,CAAC;YAED,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;YAC1D,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC;YAEzB,MAAM,UAAU,GAAG;gBACf,GAAG,GAAG,CAAC,UAAU,CAAC,MAAM,CACpB,CAAC,MAAM,EAAE,EAAE,CACP,MAAM,CAAC,UAAU,KAAK,mCAAkB,CAAC,QAAQ;oBACjD,MAAM,CAAC,UAAU,KAAK,mCAAkB,CAAC,MAAM,CACtD;gBACD,GAAG,GAAG,CAAC,eAAe,CAAC,MAAM,CACzB,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,KAAK,wCAAuB,CAAC,MAAM,CACnE;aACJ,CAAC;YAEF,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;gBAC5B,IAAI,GAAG,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,QAAQ,EAAE,CAAC;oBACvC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;gBAC5B,CAAC;YACL,CAAC;QACL,CAAC;QAED,OAAO,SAAS,CAAC;IACrB,CAAC;IAED;;;;;;OAMG;IACH,cAAc,CACV,IAAgB,EAChB,IAAkB;QAElB,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC;QAE1B,IAAI,CAAC,QAAQ,EAAE,CAAC;YACZ,OAAO,SAAS,CAAC;QACrB,CAAC;QAED,kCAAkC;QAClC,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClB,+CAA+C;YAC/C,MAAM,KAAK,GAAG,IAAA,yBAAc,EAAC,QAAQ,CAAC,CAAC;YAEvC,IAAI,KAAK,EAAE,CAAC;gBACR,OAAO,KAAK,CAAC;YACjB,CAAC;YAED,6CAA6C;YAC7C,OAAO,IAAA,0BAAe,EAAC,QAAQ,CAAC,CAAC;QACrC,CAAC;QAED,MAAM,WAAW,GAAwB,IAAA,kBAAU,EAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACtE,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;QAExD,KAAK,MAAM,IAAI,IAAI,QAAQ,CAAC,wBAAwB,EAAE,CAAC;YACnD,IAAI,CAAC,IAAI,EAAE,CAAC;gBACR,SAAS;YACb,CAAC;YAED,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChC,MAAM,MAAM,GAAG,IAAA,0BAAmB,EAAC,GAAG,EAAE,KAAK,CAAC,CAAC;gBAC/C,IAAI,MAAM,IAAI,WAAW,EAAE,CAAC;oBACxB,OAAO,GAAG,CAAC;gBACf,CAAC;YACL,CAAC;YAED,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;gBACnC,IAAI,CAAC,CAAC,UAAU,KAAK,wCAAuB,CAAC,MAAM,EAAE,CAAC;oBAClD,SAAS;gBACb,CAAC;gBAED,IAAI,IAAwB,CAAC;gBAE7B,IAAI,CAAC;oBACD,IAAI,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;gBAClC,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACT,SAAS;gBACb,CAAC;gBAED,IAAI,IAAI,IAAI,WAAW,EAAE,CAAC;oBACtB,OAAO,CAAC,CAAC;gBACb,CAAC;YACL,CAAC;QACL,CAAC;QAED,mCAAmC;QACnC,OAAO,IAAA,0BAAe,EAAC,QAAQ,CAAC,CAAC;IACrC,CAAC;IAED,eAAe,CAAC,GAAoC;QAChD,IAAI,KAAa,CAAC;QAElB,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;YAC1B,KAAK,GAAG,GAAG,CAAC;QAChB,CAAC;aAAM,IAAI,GAAG,YAAY,UAAU,EAAE,CAAC;YACnC,KAAK,GAAG,IAAA,oBAAa,EAAC,GAAG,CAAC,CAAC;QAC/B,CAAC;aAAM,CAAC;YACJ,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACxB,OAAO,SAAS,CAAC;YACrB,CAAC;YAED,KAAK,GAAG,IAAA,oBAAa,EAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QACzC,CAAC;QAED,OAAO,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC7C,CAAC;CACJ;AA3cD,0CA2cC"}

package/dist/debug/artifact_manager/types.d.ts

@@ -19,6 +19,10 @@ export interface BytecodeInfo {
      * Map from bytecode offsets to instruction indices. (since some instructions are multi-byte, offset != instruction index).
      */
     offsetToIndexMap: Map<number, number>;
+    /**
+     * Actual bytecode
+     */
+    bytecode: Uint8Array;
 }
 /**
  * Contract info kept by the artifact manager for each compiled contract.
@@ -89,6 +93,10 @@ export interface ArtifactInfo {
      * Map from src triples to AST nodes with that source range
      */
     srcMap: Map<string, ASTNode>;
+    /**
+     * Codegen type
+     */
+    codegen: "ir" | "old";
 }
 /**
  * Solidity file type. Either source file, or compiler-generated Yul.

package/dist/debug/artifact_manager/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/debug/artifact_manager/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EACH,iBAAiB,EACjB,UAAU,EACV,OAAO,EACP,kBAAkB,EAClB,UAAU,EACb,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC1F,OAAO,EAAE,6BAA6B,EAAE,MAAM,oBAAoB,CAAC;AAEnE;;GAEG;AACH,MAAM,WAAW,YAAY;IACzB;;;OAGG;IACH,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IAC9C;;OAEG;IACH,MAAM,EAAE,6BAA6B,EAAE,CAAC;IACxC;;OAEG;IACH,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACzC;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IACzB;;OAEG;IACH,QAAQ,EAAE,YAAY,CAAC;IACvB;;OAEG;IACH,gBAAgB,EAAE,uBAAuB,CAAC;IAC1C;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,GAAG,EAAE,kBAAkB,GAAG,SAAS,CAAC;IACpC;;OAEG;IACH,QAAQ,EAAE,YAAY,CAAC;IACvB;;OAEG;IACH,gBAAgB,EAAE,YAAY,CAAC;IAC/B;;OAEG;IACH,MAAM,EAAE,iBAAiB,GAAG,SAAS,CAAC;CACzC;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IACzB;;OAEG;IACH,QAAQ,EAAE,iBAAiB,CAAC;IAC5B;;OAEG;IACH,KAAK,EAAE,UAAU,EAAE,CAAC;IACpB;;OAEG;IACH,GAAG,EAAE,UAAU,CAAC;IAChB;;OAEG;IACH,eAAe,EAAE,MAAM,CAAC;IACxB;;OAEG;IACH,iBAAiB,EAAE,iBAAiB,CAAC;IACrC;;OAEG;IACH,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACrC;;OAEG;IACH,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAChC;AAED;;GAEG;AACH,oBAAY,cAAc;IACtB,QAAQ,aAAa;IACrB,WAAW,iBAAiB;CAC/B;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC3B;;OAEG;IACH,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,GAAG,EAAE,UAAU,GAAG,SAAS,CAAC;IAC5B;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,IAAI,EAAE,cAAc,CAAC;CACxB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/debug/artifact_manager/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EACH,iBAAiB,EACjB,UAAU,EACV,OAAO,EACP,kBAAkB,EAClB,UAAU,EACb,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC1F,OAAO,EAAE,6BAA6B,EAAE,MAAM,oBAAoB,CAAC;AAEnE;;GAEG;AACH,MAAM,WAAW,YAAY;IACzB;;;OAGG;IACH,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IAC9C;;OAEG;IACH,MAAM,EAAE,6BAA6B,EAAE,CAAC;IACxC;;OAEG;IACH,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC;;OAEG;IACH,QAAQ,EAAE,UAAU,CAAC;CACxB;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IACzB;;OAEG;IACH,QAAQ,EAAE,YAAY,CAAC;IACvB;;OAEG;IACH,gBAAgB,EAAE,uBAAuB,CAAC;IAC1C;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,GAAG,EAAE,kBAAkB,GAAG,SAAS,CAAC;IACpC;;OAEG;IACH,QAAQ,EAAE,YAAY,CAAC;IACvB;;OAEG;IACH,gBAAgB,EAAE,YAAY,CAAC;IAC/B;;OAEG;IACH,MAAM,EAAE,iBAAiB,GAAG,SAAS,CAAC;CACzC;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IACzB;;OAEG;IACH,QAAQ,EAAE,iBAAiB,CAAC;IAC5B;;OAEG;IACH,KAAK,EAAE,UAAU,EAAE,CAAC;IACpB;;OAEG;IACH,GAAG,EAAE,UAAU,CAAC;IAChB;;OAEG;IACH,eAAe,EAAE,MAAM,CAAC;IACxB;;OAEG;IACH,iBAAiB,EAAE,iBAAiB,CAAC;IACrC;;OAEG;IACH,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACrC;;OAEG;IACH,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC7B;;OAEG;IACH,OAAO,EAAE,IAAI,GAAG,KAAK,CAAA;CACxB;AAED;;GAEG;AACH,oBAAY,cAAc;IACtB,QAAQ,aAAa;IACrB,WAAW,iBAAiB;CAC/B;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC3B;;OAEG;IACH,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,GAAG,EAAE,UAAU,GAAG,SAAS,CAAC;IAC5B;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,IAAI,EAAE,cAAc,CAAC;CACxB"}

package/dist/debug/artifact_manager/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/debug/artifact_manager/types.ts"],"names":[],"mappings":";;;AAsGA;;GAEG;AACH,IAAY,cAGX;AAHD,WAAY,cAAc;IACtB,uCAAqB,CAAA;IACrB,8CAA4B,CAAA;AAChC,CAAC,EAHW,cAAc,8BAAd,cAAc,QAGzB"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/debug/artifact_manager/types.ts"],"names":[],"mappings":";;;AA8GA;;GAEG;AACH,IAAY,cAGX;AAHD,WAAY,cAAc;IACtB,uCAAqB,CAAA;IACrB,8CAA4B,CAAA;AAChC,CAAC,EAHW,cAAc,8BAAd,cAAc,QAGzB"}

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

@@ -1,13 +1,12 @@
-import { AddressType, ArrayType, BoolType, BytesType, FixedBytesType, IntType, PointerType, TupleType, TypeNode } from "solc-typed-ast";
 import { Memory } from "../../types";
 import { DecodingFailure, Struct, Value } from "../value";
 import { ArrayLikeView, PointerView, StructView, View } from "../view";
 import { Address } from "@ethereumjs/util";
-import { ExpStructType, MissingType } from "../exp_types";
-interface ArrayLikeCalldataView<ValViewT extends BaseCalldataView<Value, TypeNode>> extends ArrayLikeView<Memory, ValViewT> {
+import { AddressType, ArrayType, BaseRuntimeType, BoolType, BytesType, FixedBytesType, IntType, MissingType, PointerType, StructType, TupleType } from "../../runtime_types";
+interface ArrayLikeCalldataView<ValViewT extends BaseCalldataView<Value, BaseRuntimeType>> extends ArrayLikeView<Memory, ValViewT> {
 }
-export declare function isArrayLikeCalldataView(v: any): v is ArrayLikeCalldataView<BaseCalldataView<Value, TypeNode>>;
-export declare abstract class BaseCalldataView<Val extends Value, Type extends TypeNode = TypeNode> extends View<Memory, Val, bigint, Type> {
+export declare function isArrayLikeCalldataView(v: any): v is ArrayLikeCalldataView<BaseCalldataView<Value, BaseRuntimeType>>;
+export declare abstract class BaseCalldataView<Val extends Value, Type extends BaseRuntimeType = BaseRuntimeType> extends View<Memory, Val, bigint, Type> {
     base: bigint;
     constructor(type: Type, loc: bigint, base: bigint);
     protected readMemAt(off: number | bigint, calldata: Memory, len: bigint | number): Uint8Array | DecodingFailure;
@@ -63,15 +62,15 @@ export declare class StringCalldataView extends BaseCalldataView<string, BytesTy
 export declare class TupleCalldataView extends BaseCalldataView<Value[], TupleType> {
     decode(state: Memory): Value[] | DecodingFailure;
 }
-export declare abstract class BaseArrayCalldataView extends BaseCalldataView<Value[], ArrayType> implements ArrayLikeCalldataView<BaseCalldataView<Value, TypeNode>> {
+export declare abstract class BaseArrayCalldataView extends BaseCalldataView<Value[], ArrayType> implements ArrayLikeCalldataView<BaseCalldataView<Value, BaseRuntimeType>> {
     decodeArray(baseOff: bigint, bigIntSize: bigint, state: Memory): Value[] | DecodingFailure;
-    protected _indexView(key: bigint, baseOff: bigint, size: bigint): BaseCalldataView<Value, TypeNode> | DecodingFailure;
-    abstract indexView(key: bigint, state: Memory): BaseCalldataView<Value, TypeNode> | DecodingFailure;
+    protected _indexView(key: bigint, baseOff: bigint, size: bigint): BaseCalldataView<Value, BaseRuntimeType> | DecodingFailure;
+    abstract indexView(key: bigint, state: Memory): BaseCalldataView<Value, BaseRuntimeType> | DecodingFailure;
     abstract size(state: Memory): bigint | DecodingFailure;
 }
 export declare class ArrayCalldataView extends BaseArrayCalldataView {
     decode(state: Memory): Value[] | DecodingFailure;
-    indexView(key: bigint, state: Memory): BaseCalldataView<Value, TypeNode> | DecodingFailure;
+    indexView(key: bigint, state: Memory): BaseCalldataView<Value, BaseRuntimeType> | DecodingFailure;
     size(state: Memory): bigint | DecodingFailure;
 }
 /**
@@ -81,21 +80,21 @@ export declare class ArraySliceCalldataView extends BaseArrayCalldataView {
     protected len: bigint;
     constructor(type: ArrayType, loc: bigint, len: bigint);
     decode(state: Memory): Value[] | DecodingFailure;
-    indexView(key: bigint): BaseCalldataView<Value, TypeNode> | DecodingFailure;
+    indexView(key: bigint): BaseCalldataView<Value, BaseRuntimeType> | DecodingFailure;
     size(): bigint | DecodingFailure;
 }
-export declare class StructCalldataView extends BaseCalldataView<Struct, ExpStructType> implements StructView<Memory, BaseCalldataView<Value, TypeNode>> {
+export declare class StructCalldataView extends BaseCalldataView<Struct, StructType> implements StructView<Memory, BaseCalldataView<Value, BaseRuntimeType>> {
     decode(state: Memory): Struct;
-    fieldView(name: string): DecodingFailure | BaseCalldataView<Value, TypeNode>;
+    fieldView(name: string): DecodingFailure | BaseCalldataView<Value, BaseRuntimeType>;
 }
-export declare class PointerCalldataView extends BaseCalldataView<Value, PointerType> implements PointerView<Memory, BaseCalldataView<Value, TypeNode>> {
+export declare class PointerCalldataView extends BaseCalldataView<Value, PointerType> implements PointerView<Memory, BaseCalldataView<Value, BaseRuntimeType>> {
     decode(state: Memory): Value | DecodingFailure;
-    toView(state: Memory): DecodingFailure | BaseCalldataView<Value, TypeNode>;
+    toView(state: Memory): DecodingFailure | BaseCalldataView<Value, BaseRuntimeType>;
 }
 export declare class MissingCalldataView extends BaseCalldataView<DecodingFailure, MissingType> {
     decode(): DecodingFailure;
 }
-export declare function makeCalldataView(type: TypeNode, loc: bigint, base: bigint): BaseCalldataView<Value, TypeNode>;
-export declare function makeCalldataViews(types: TypeNode[], base: bigint): Array<BaseCalldataView<Value, TypeNode>>;
+export declare function makeCalldataView(type: BaseRuntimeType, loc: bigint, base: bigint): BaseCalldataView<Value, BaseRuntimeType>;
+export declare function makeCalldataViews(types: BaseRuntimeType[], base: bigint): Array<BaseCalldataView<Value, BaseRuntimeType>>;
 export {};
 //# sourceMappingURL=view.d.ts.map

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

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

package/dist/debug/decoding/calldata/view.js

@@ -10,7 +10,7 @@ const view_1 = require("../view");
 const utils_1 = require("../../../utils");
 const util_1 = require("@ethereumjs/util");
 const utils_2 = require("../utils");
-const exp_types_1 = require("../exp_types");
+const runtime_types_1 = require("../../runtime_types");
 function isArrayLikeCalldataView(v) {
     return (v instanceof FixedBytesCalldataView ||
         v instanceof ArrayCalldataView ||
@@ -23,28 +23,28 @@ function isArrayLikeCalldataView(v) {
  * @returns
  */
 function isTypeDynamic(t) {
-    if (t instanceof solc_typed_ast_1.BytesType || t instanceof solc_typed_ast_1.StringType) {
+    if (t instanceof runtime_types_1.BytesType || t instanceof runtime_types_1.StringType) {
         return true;
     }
-    if (t instanceof solc_typed_ast_1.ArrayType) {
+    if (t instanceof runtime_types_1.ArrayType) {
         return t.size === undefined || isTypeDynamic(t.elementT);
     }
-    if (t instanceof solc_typed_ast_1.TupleType) {
-        for (const elementT of t.elements) {
+    if (t instanceof runtime_types_1.TupleType) {
+        for (const elementT of t.elementTypes) {
             if (elementT && isTypeDynamic(elementT)) {
                 return true;
             }
         }
     }
-    if (t instanceof exp_types_1.ExpStructType) {
+    if (t instanceof runtime_types_1.StructType) {
         for (const [, fieldT] of t.fields) {
             if (isTypeDynamic(fieldT)) {
                 return true;
             }
         }
     }
-    if (t instanceof solc_typed_ast_1.PointerType) {
-        return isTypeDynamic(t.to);
+    if (t instanceof runtime_types_1.PointerType) {
+        return isTypeDynamic(t.toType);
     }
     return false;
 }
@@ -60,9 +60,9 @@ function headSize(t) {
     if (isTypeDynamic(t)) {
         return 32;
     }
-    if (t instanceof solc_typed_ast_1.TupleType) {
+    if (t instanceof runtime_types_1.TupleType) {
         let size = 0;
-        for (const elT of t.elements) {
+        for (const elT of t.elementTypes) {
             const elSize = headSize(elT);
             if (elSize === undefined) {
                 return undefined;
@@ -71,7 +71,7 @@ function headSize(t) {
         }
         return size;
     }
-    if (t instanceof solc_typed_ast_1.ArrayType) {
+    if (t instanceof runtime_types_1.ArrayType) {
         (0, solc_typed_ast_1.assert)(t.size !== undefined, `Statically sized array types must have a size`);
         const elSize = headSize(t.elementT);
         if (elSize === undefined) {
@@ -79,7 +79,7 @@ function headSize(t) {
         }
         return elSize * (0, utils_1.bigIntToNum)(t.size);
     }
-    if (t instanceof exp_types_1.ExpStructType) {
+    if (t instanceof runtime_types_1.StructType) {
         let size = 0;
         for (const [, fieldT] of t.fields) {
             const fieldSize = headSize(fieldT);
@@ -90,22 +90,22 @@ function headSize(t) {
         }
         return size;
     }
-    if (t instanceof solc_typed_ast_1.IntType ||
-        t instanceof solc_typed_ast_1.BoolType ||
-        t instanceof solc_typed_ast_1.FixedBytesType ||
-        t instanceof solc_typed_ast_1.AddressType) {
+    if (t instanceof runtime_types_1.IntType ||
+        t instanceof runtime_types_1.BoolType ||
+        t instanceof runtime_types_1.FixedBytesType ||
+        t instanceof runtime_types_1.AddressType) {
         return 32;
     }
-    if (t instanceof solc_typed_ast_1.PointerType) {
-        return headSize(t.to);
+    if (t instanceof runtime_types_1.PointerType) {
+        return headSize(t.toType);
     }
-    if (t instanceof exp_types_1.MissingType) {
-        if (t.rawTypeName === undefined) {
+    if (t instanceof runtime_types_1.MissingType) {
+        if (t.typeString === undefined) {
             return undefined;
         }
         // Small optimization - if we can guess this is a dynamic array of an unknown
         // element type, we still know the head size is 32.
-        if ((0, utils_2.isTypeStringDynamicArray)(t.rawTypeName.typeString)) {
+        if ((0, utils_2.isTypeStringDynamicArray)(t.typeString)) {
             return 32;
         }
     }
@@ -132,10 +132,10 @@ class BaseCalldataView extends view_1.View {
         }
         let res = (0, utils_1.bigEndianBufToBigint)(bytes);
         // Convert signed negative 2's complement values
-        if (typ.signed && (res & (BigInt(1) << BigInt(typ.nBits - 1))) !== BigInt(0)) {
+        if (typ.signed && (res & (BigInt(1) << BigInt(typ.numBits - 1))) !== BigInt(0)) {
             // Mask out any 1's above the number's size
-            res = res & ((BigInt(1) << BigInt(typ.nBits)) - BigInt(1));
-            res = -((BigInt(1) << BigInt(typ.nBits)) - res);
+            res = res & ((BigInt(1) << BigInt(typ.numBits)) - BigInt(1));
+            res = -((BigInt(1) << BigInt(typ.numBits)) - res);
         }
         if (!(0, utils_1.fits)(res, typ)) {
             return new value_1.DecodingFailure(`Decoded value ${res} doesnt fit in type ${this.type.pp()}`);
@@ -155,7 +155,7 @@ class BaseCalldataView extends view_1.View {
     decodeTupleAt(loc, base, type, state) {
         const res = [];
         let failRemaining = false;
-        for (const t of type.elements) {
+        for (const t of type.elementTypes) {
             if (failRemaining) {
                 res.push(new value_1.DecodingFailure(`Failed due to earlier failure.`));
             }
@@ -221,7 +221,7 @@ exports.AddressCalldataView = AddressCalldataView;
  */
 class SingleByteCalldataView extends BaseCalldataView {
     constructor(loc, base) {
-        super(solc_typed_ast_1.types.byte, loc, base);
+        super(utils_1.byte, loc, base);
     }
     decode(state) {
         const off = this.loc + this.base;
@@ -237,16 +237,16 @@ exports.SingleByteCalldataView = SingleByteCalldataView;
  */
 class FixedBytesCalldataView extends BaseCalldataView {
     decode(state) {
-        return this.readMemAt(this.loc, state, this.type.size);
+        return this.readMemAt(this.loc, state, this.type.numBytes);
     }
     indexView(key) {
-        if (key >= this.type.size || key < 0n) {
+        if (key >= this.type.numBytes || key < 0n) {
             return new value_1.DecodingFailure(`Invalid index ${key} in ${this.type.pp()}`);
         }
         return new SingleByteCalldataView(this.loc + key, this.base);
     }
     size() {
-        return BigInt(this.type.size);
+        return BigInt(this.type.numBytes);
     }
 }
 exports.FixedBytesCalldataView = FixedBytesCalldataView;
@@ -397,7 +397,7 @@ class StructCalldataView extends BaseCalldataView {
     decode(state) {
         // A StructCalldataView should be wrapped in a PointerCalldataView. So translating
         // the base should be handled by PointerCalldataView.decode
-        const values = this.decodeTupleAt(this.loc, this.base, new solc_typed_ast_1.TupleType(this.type.fields.map(([, type]) => type)), state);
+        const values = this.decodeTupleAt(this.loc, this.base, new runtime_types_1.TupleType(this.type.fields.map(([, type]) => type)), state);
         return new value_1.Struct((0, utils_1.zip)(this.type.fields.map(([name]) => name), values));
     }
     fieldView(name) {
@@ -431,58 +431,58 @@ class PointerCalldataView extends BaseCalldataView {
     }
     toView(state) {
         let off = this.loc;
-        if (isTypeDynamic(this.type.to)) {
+        if (isTypeDynamic(this.type.toType)) {
             off = this.decodeIntAt(off, utils_1.uint256, state);
             if ((0, utils_2.isFailure)(off)) {
                 return off;
             }
-            return makeCalldataView(this.type.to, 0n, this.base + off);
+            return makeCalldataView(this.type.toType, 0n, this.base + off);
         }
-        return makeCalldataView(this.type.to, off, this.base);
+        return makeCalldataView(this.type.toType, off, this.base);
     }
 }
 exports.PointerCalldataView = PointerCalldataView;
 class MissingCalldataView extends BaseCalldataView {
     decode() {
-        return new value_1.DecodingFailure(`${this.type.rawTypeName ? this.type.rawTypeName.type : "<unknown>"}`);
+        return new value_1.DecodingFailure(`${this.type.typeString ? this.type.typeString : "<unknown>"}`);
     }
 }
 exports.MissingCalldataView = MissingCalldataView;
 function makeCalldataView(type, loc, base) {
-    if (type instanceof solc_typed_ast_1.IntType) {
+    if (type instanceof runtime_types_1.IntType) {
         return new IntCalldataView(type, loc, base);
     }
-    if (type instanceof solc_typed_ast_1.BoolType) {
+    if (type instanceof runtime_types_1.BoolType) {
         return new BoolCalldataView(type, loc, base);
     }
-    if (type instanceof solc_typed_ast_1.AddressType) {
+    if (type instanceof runtime_types_1.AddressType) {
         return new AddressCalldataView(type, loc, base);
     }
-    if (type instanceof solc_typed_ast_1.FixedBytesType) {
+    if (type instanceof runtime_types_1.FixedBytesType) {
         return new FixedBytesCalldataView(type, loc, base);
     }
-    if (type instanceof solc_typed_ast_1.TupleType) {
+    if (type instanceof runtime_types_1.TupleType) {
         return new TupleCalldataView(type, loc, base);
     }
-    if (type instanceof solc_typed_ast_1.BytesType) {
+    if (type instanceof runtime_types_1.BytesType) {
         return new BytesCalldataView(type, loc, base);
     }
-    if (type instanceof solc_typed_ast_1.StringType) {
+    if (type instanceof runtime_types_1.StringType) {
         return new StringCalldataView(type, loc, base);
     }
-    if (type instanceof solc_typed_ast_1.ArrayType) {
+    if (type instanceof runtime_types_1.ArrayType) {
         return new ArrayCalldataView(type, loc, base);
     }
-    if (type instanceof exp_types_1.ExpStructType) {
+    if (type instanceof runtime_types_1.StructType) {
         return new StructCalldataView(type, loc, base);
     }
-    if (type instanceof solc_typed_ast_1.TupleType) {
+    if (type instanceof runtime_types_1.TupleType) {
         return new TupleCalldataView(type, loc, base);
     }
-    if (type instanceof solc_typed_ast_1.PointerType) {
+    if (type instanceof runtime_types_1.PointerType) {
         return new PointerCalldataView(type, loc, base);
     }
-    if (type instanceof exp_types_1.MissingType) {
+    if (type instanceof runtime_types_1.MissingType) {
         return new MissingCalldataView(type, loc, base);
     }
     (0, utils_1.nyi)(`makeCalldataView(${type.pp()})`);
@@ -495,7 +495,7 @@ function makeCalldataViews(types, base) {
         // If we have missing type info at an earlier type, and we can't compute its head size,
         // we make all remaining views "missing"
         if (failRemaining) {
-            res.push(new MissingCalldataView(new exp_types_1.MissingType(undefined), off, base));
+            res.push(new MissingCalldataView(new runtime_types_1.MissingType(undefined), off, base));
             continue;
         }
         const view = makeCalldataView(t, off, base);