sol-dbg 0.8.18 → 0.9.1

package/dist/debug/runtime_types/ast/function_type.d.ts

@@ -1,11 +1,8 @@
-import { FunctionStateMutability } from "solc-typed-ast";
+import { FunctionTypeId } from "solc-typed-ast";
 import { BaseRuntimeType } from "./base_type";
 export declare class FunctionType extends BaseRuntimeType {
-    readonly argTs: BaseRuntimeType[];
-    readonly external: boolean;
-    readonly mutability: FunctionStateMutability;
-    readonly retTs: BaseRuntimeType[];
-    constructor(argTs: BaseRuntimeType[], external: boolean, mutability: FunctionStateMutability, retTs: BaseRuntimeType[]);
+    readonly solType: FunctionTypeId;
+    constructor(solType: FunctionTypeId);
     pp(): string;
 }
 //# sourceMappingURL=function_type.d.ts.map

package/dist/debug/runtime_types/ast/function_type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"function_type.d.ts","sourceRoot":"","sources":["../../../../src/debug/runtime_types/ast/function_type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,qBAAa,YAAa,SAAQ,eAAe;aAEzB,KAAK,EAAE,eAAe,EAAE;aACxB,QAAQ,EAAE,OAAO;aACjB,UAAU,EAAE,uBAAuB;aACnC,KAAK,EAAE,eAAe,EAAE;gBAHxB,KAAK,EAAE,eAAe,EAAE,EACxB,QAAQ,EAAE,OAAO,EACjB,UAAU,EAAE,uBAAuB,EACnC,KAAK,EAAE,eAAe,EAAE;IAK5C,EAAE,IAAI,MAAM;CAQf"}
+{"version":3,"file":"function_type.d.ts","sourceRoot":"","sources":["../../../../src/debug/runtime_types/ast/function_type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,qBAAa,YAAa,SAAQ,eAAe;aACjB,OAAO,EAAE,cAAc;gBAAvB,OAAO,EAAE,cAAc;IAInD,EAAE,IAAI,MAAM;CAGf"}

package/dist/debug/runtime_types/ast/function_type.js

@@ -3,19 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FunctionType = void 0;
 const base_type_1 = require("./base_type");
 class FunctionType extends base_type_1.BaseRuntimeType {
-    constructor(argTs, external, mutability, retTs) {
+    constructor(solType) {
         super();
-        this.argTs = argTs;
-        this.external = external;
-        this.mutability = mutability;
-        this.retTs = retTs;
+        this.solType = solType;
     }
     pp() {
-        const argStr = this.argTs.map((argT) => argT.pp()).join(", ");
-        const retStr = this.retTs.length > 0
-            ? `returns (${this.retTs.map((retT) => retT.pp()).join(", ")})`
-            : "";
-        return `function (${argStr})${this.external ? " external " : " "}${this.mutability} ${retStr}`;
+        return `<function ${this.solType.pp()}>`;
     }
 }
 exports.FunctionType = FunctionType;

package/dist/debug/runtime_types/ast/function_type.js.map

@@ -1 +1 @@
-{"version":3,"file":"function_type.js","sourceRoot":"","sources":["../../../../src/debug/runtime_types/ast/function_type.ts"],"names":[],"mappings":";;;AACA,2CAA8C;AAE9C,MAAa,YAAa,SAAQ,2BAAe;IAC7C,YACoB,KAAwB,EACxB,QAAiB,EACjB,UAAmC,EACnC,KAAwB;QAExC,KAAK,EAAE,CAAC;QALQ,UAAK,GAAL,KAAK,CAAmB;QACxB,aAAQ,GAAR,QAAQ,CAAS;QACjB,eAAU,GAAV,UAAU,CAAyB;QACnC,UAAK,GAAL,KAAK,CAAmB;IAG5C,CAAC;IAED,EAAE;QACE,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9D,MAAM,MAAM,GACR,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC;YACjB,CAAC,CAAC,YAAY,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;YAC/D,CAAC,CAAC,EAAE,CAAC;QACb,OAAO,aAAa,MAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,UAAU,IAAI,MAAM,EAAE,CAAC;IACnG,CAAC;CACJ;AAlBD,oCAkBC"}
+{"version":3,"file":"function_type.js","sourceRoot":"","sources":["../../../../src/debug/runtime_types/ast/function_type.ts"],"names":[],"mappings":";;;AACA,2CAA8C;AAE9C,MAAa,YAAa,SAAQ,2BAAe;IAC7C,YAA4B,OAAuB;QAC/C,KAAK,EAAE,CAAC;QADgB,YAAO,GAAP,OAAO,CAAgB;IAEnD,CAAC;IAED,EAAE;QACE,OAAO,aAAa,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,GAAG,CAAC;IAC7C,CAAC;CACJ;AARD,oCAQC"}

package/dist/debug/runtime_types/ast/missing_type.d.ts

@@ -1,11 +1,12 @@
+import { TypeIdentifier } from "solc-typed-ast";
 import { BaseRuntimeType } from "./base_type";
 /**
  * The local version of sol-dbg's MissingType.
  * @todo may deprecate this in the future
  */
-export declare class MissingType extends BaseRuntimeType {
-    readonly typeString: string | undefined;
-    constructor(typeString: string | undefined);
+export declare class MissingTypeDef extends BaseRuntimeType {
+    readonly type: TypeIdentifier;
+    constructor(type: TypeIdentifier);
     pp(): string;
 }
 //# sourceMappingURL=missing_type.d.ts.map

package/dist/debug/runtime_types/ast/missing_type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"missing_type.d.ts","sourceRoot":"","sources":["../../../../src/debug/runtime_types/ast/missing_type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C;;;GAGG;AACH,qBAAa,WAAY,SAAQ,eAAe;aAChB,UAAU,EAAE,MAAM,GAAG,SAAS;gBAA9B,UAAU,EAAE,MAAM,GAAG,SAAS;IAI1D,EAAE,IAAI,MAAM;CAGf"}
+{"version":3,"file":"missing_type.d.ts","sourceRoot":"","sources":["../../../../src/debug/runtime_types/ast/missing_type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C;;;GAGG;AACH,qBAAa,cAAe,SAAQ,eAAe;aACnB,IAAI,EAAE,cAAc;gBAApB,IAAI,EAAE,cAAc;IAIhD,EAAE,IAAI,MAAM;CAGf"}

package/dist/debug/runtime_types/ast/missing_type.js

@@ -1,19 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MissingType = void 0;
+exports.MissingTypeDef = void 0;
 const base_type_1 = require("./base_type");
 /**
  * The local version of sol-dbg's MissingType.
  * @todo may deprecate this in the future
  */
-class MissingType extends base_type_1.BaseRuntimeType {
-    constructor(typeString) {
+class MissingTypeDef extends base_type_1.BaseRuntimeType {
+    constructor(type) {
         super();
-        this.typeString = typeString;
+        this.type = type;
     }
     pp() {
-        return `<mssing type${this.typeString !== undefined ? `: ${this.typeString}` : ""}>`;
+        return `<missing type def for ${this.type.pp()}"}>`;
     }
 }
-exports.MissingType = MissingType;
+exports.MissingTypeDef = MissingTypeDef;
 //# sourceMappingURL=missing_type.js.map

package/dist/debug/runtime_types/ast/missing_type.js.map

@@ -1 +1 @@
-{"version":3,"file":"missing_type.js","sourceRoot":"","sources":["../../../../src/debug/runtime_types/ast/missing_type.ts"],"names":[],"mappings":";;;AAAA,2CAA8C;AAE9C;;;GAGG;AACH,MAAa,WAAY,SAAQ,2BAAe;IAC5C,YAA4B,UAA8B;QACtD,KAAK,EAAE,CAAC;QADgB,eAAU,GAAV,UAAU,CAAoB;IAE1D,CAAC;IAED,EAAE;QACE,OAAO,eAAe,IAAI,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC;IACzF,CAAC;CACJ;AARD,kCAQC"}
+{"version":3,"file":"missing_type.js","sourceRoot":"","sources":["../../../../src/debug/runtime_types/ast/missing_type.ts"],"names":[],"mappings":";;;AACA,2CAA8C;AAE9C;;;GAGG;AACH,MAAa,cAAe,SAAQ,2BAAe;IAC/C,YAA4B,IAAoB;QAC5C,KAAK,EAAE,CAAC;QADgB,SAAI,GAAJ,IAAI,CAAgB;IAEhD,CAAC;IAED,EAAE;QACE,OAAO,yBAAyB,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,CAAC;IACxD,CAAC;CACJ;AARD,wCAQC"}

package/dist/debug/runtime_types/ast/type_type.d.ts

@@ -5,8 +5,8 @@ import { BaseRuntimeType } from "./base_type";
  * to have it here as it appears as an argument to `abi.decode`.
  */
 export declare class TypeType extends BaseRuntimeType {
-    readonly rawT: sol.TypeNode;
-    constructor(rawT: sol.TypeNode);
+    readonly rawT: sol.TypeIdentifier;
+    constructor(rawT: sol.TypeIdentifier);
     pp(): string;
 }
 //# sourceMappingURL=type_type.d.ts.map

package/dist/debug/runtime_types/ast/type_type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"type_type.d.ts","sourceRoot":"","sources":["../../../../src/debug/runtime_types/ast/type_type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C;;;GAGG;AACH,qBAAa,QAAS,SAAQ,eAAe;aACb,IAAI,EAAE,GAAG,CAAC,QAAQ;gBAAlB,IAAI,EAAE,GAAG,CAAC,QAAQ;IAI9C,EAAE,IAAI,MAAM;CAGf"}
+{"version":3,"file":"type_type.d.ts","sourceRoot":"","sources":["../../../../src/debug/runtime_types/ast/type_type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C;;;GAGG;AACH,qBAAa,QAAS,SAAQ,eAAe;aACb,IAAI,EAAE,GAAG,CAAC,cAAc;gBAAxB,IAAI,EAAE,GAAG,CAAC,cAAc;IAIpD,EAAE,IAAI,MAAM;CAGf"}

package/dist/debug/runtime_types/ast/type_type.js.map

@@ -1 +1 @@
-{"version":3,"file":"type_type.js","sourceRoot":"","sources":["../../../../src/debug/runtime_types/ast/type_type.ts"],"names":[],"mappings":";;;AACA,2CAA8C;AAE9C;;;GAGG;AACH,MAAa,QAAS,SAAQ,2BAAe;IACzC,YAA4B,IAAkB;QAC1C,KAAK,EAAE,CAAC;QADgB,SAAI,GAAJ,IAAI,CAAc;IAE9C,CAAC;IAED,EAAE;QACE,OAAO,UAAU,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC;IACvC,CAAC;CACJ;AARD,4BAQC"}
+{"version":3,"file":"type_type.js","sourceRoot":"","sources":["../../../../src/debug/runtime_types/ast/type_type.ts"],"names":[],"mappings":";;;AACA,2CAA8C;AAE9C;;;GAGG;AACH,MAAa,QAAS,SAAQ,2BAAe;IACzC,YAA4B,IAAwB;QAChD,KAAK,EAAE,CAAC;QADgB,SAAI,GAAJ,IAAI,CAAoB;IAEpD,CAAC;IAED,EAAE;QACE,OAAO,UAAU,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC;IACvC,CAAC;CACJ;AARD,4BAQC"}

package/dist/debug/runtime_types/utils.d.ts

@@ -1,32 +1,9 @@
 import * as sol from "solc-typed-ast";
 import * as rtt from "./ast";
 /**
- * Convert the given solc-typed-ast type to a runtime types. This does the following conversions:
- *
- * - Convert `UserDefinedType(StructDefinition)` to `ExpStructType`
- * - Convert `UserDefinedType(UserDefinedValueTypeDefinition)` to the underlying type
- * - Convert `UserDefinedType(ContractDefinition)` to address
+ * Convert the given solc-typed-ast typeIdentifier to a runtime types. This does the following conversions:
  *
  * @param rawT
  */
-export declare function astToRuntimeType(rawT: sol.TypeNode, infer: sol.InferType, loc?: sol.DataLocation | undefined): rtt.BaseRuntimeType;
-/**
- * Given a general runtime type 'pattern' that doesn't contain any data locations, and a data location,
- * produce a concrete instance of the general type for the target location.
- * This is the inverse of `specializeType()`
- *
- * @param type - general type "pattern"
- * @param loc - target location to specialize to
- * @returns specialized type
- */
-export declare function specializeType(type: rtt.BaseRuntimeType, loc: sol.DataLocation): rtt.BaseRuntimeType;
-/**
- * Given a `BaseRuntimeType` `type` that is specialized to some storage location,
- * compute the original 'general' type that is independent of location.
- * This is the inverse of `specializeType()`
- *
- * @param type - specialized type
- * @returns computed generalized type
- */
-export declare function generalizeType(type: rtt.BaseRuntimeType): rtt.BaseRuntimeType;
+export declare function typeIdToRuntimeType(rawT: sol.TypeIdentifier, ctx: sol.ASTContext, loc?: sol.DataLocation): rtt.BaseRuntimeType;
 //# sourceMappingURL=utils.d.ts.map

package/dist/debug/runtime_types/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/debug/runtime_types/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,gBAAgB,CAAC;AACtC,OAAO,KAAK,GAAG,MAAM,OAAO,CAAC;AAyB7B;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAC5B,IAAI,EAAE,GAAG,CAAC,QAAQ,EAClB,KAAK,EAAE,GAAG,CAAC,SAAS,EACpB,GAAG,GAAE,GAAG,CAAC,YAAY,GAAG,SAAqB,GAC9C,GAAG,CAAC,eAAe,CA4GrB;AAED;;;;;;;;GAQG;AACH,wBAAgB,cAAc,CAC1B,IAAI,EAAE,GAAG,CAAC,eAAe,EACzB,GAAG,EAAE,GAAG,CAAC,YAAY,GACtB,GAAG,CAAC,eAAe,CA4CrB;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,GAAG,CAAC,eAAe,GAAG,GAAG,CAAC,eAAe,CA8B7E"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/debug/runtime_types/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,gBAAgB,CAAC;AACtC,OAAO,KAAK,GAAG,MAAM,OAAO,CAAC;AAQ7B;;;;GAIG;AACH,wBAAgB,mBAAmB,CAC/B,IAAI,EAAE,GAAG,CAAC,cAAc,EACxB,GAAG,EAAE,GAAG,CAAC,UAAU,EACnB,GAAG,CAAC,EAAE,GAAG,CAAC,YAAY,GACvB,GAAG,CAAC,eAAe,CAkGrB"}

package/dist/debug/runtime_types/utils.js

@@ -33,181 +33,88 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.astToRuntimeType = astToRuntimeType;
-exports.specializeType = specializeType;
-exports.generalizeType = generalizeType;
+exports.typeIdToRuntimeType = typeIdToRuntimeType;
 const sol = __importStar(require("solc-typed-ast"));
 const rtt = __importStar(require("./ast"));
 const utils_1 = require("../../utils");
+const addressT = new rtt.AddressType();
+const bytesT = new rtt.BytesType();
+const stringT = new rtt.StringType();
+const boolT = new rtt.BoolType();
 /**
- * Helper for converting `TypeName`s to `TypeNode`s. In some cases when solc-typed-ast conversion fails,
- * it can try and guess the correct simplified type from the typeString
- *
- * - unknown contracts - retun address
- */
-function typeNameToTypeNode(t, infer, loc) {
-    try {
-        return loc ? infer.typeNameToSpecializedTypeNode(t, loc) : infer.typeNameToTypeNode(t);
-    }
-    catch (e) {
-        if ((0, utils_1.isTypeUnknownContract)(t)) {
-            return new sol.AddressType(false);
-        }
-        throw e;
-    }
-}
-/**
- * Convert the given solc-typed-ast type to a runtime types. This does the following conversions:
- *
- * - Convert `UserDefinedType(StructDefinition)` to `ExpStructType`
- * - Convert `UserDefinedType(UserDefinedValueTypeDefinition)` to the underlying type
- * - Convert `UserDefinedType(ContractDefinition)` to address
+ * Convert the given solc-typed-ast typeIdentifier to a runtime types. This does the following conversions:
  *
  * @param rawT
  */
-function astToRuntimeType(rawT, infer, loc = undefined) {
-    if (rawT instanceof sol.IntType) {
-        return new rtt.IntType(rawT.nBits, rawT.signed);
+function typeIdToRuntimeType(rawT, ctx, loc) {
+    if (rawT instanceof sol.IntTypeId) {
+        return new rtt.IntType(rawT.numBits, rawT.isSigned);
     }
-    if (rawT instanceof sol.FixedBytesType) {
-        return new rtt.FixedBytesType(rawT.size);
+    if (rawT instanceof sol.FixedBytesTypeId) {
+        return new rtt.FixedBytesType(rawT.numBytes);
     }
-    if (rawT instanceof sol.BoolType) {
-        return new rtt.BoolType();
+    if (rawT instanceof sol.BoolTypeId) {
+        return boolT;
     }
-    if (rawT instanceof sol.AddressType) {
-        return new rtt.AddressType();
+    if (rawT instanceof sol.AddressTypeId) {
+        return addressT;
     }
-    if (rawT instanceof sol.BytesType) {
-        return new rtt.BytesType();
+    if (rawT instanceof sol.BytesTypeId) {
+        return bytesT;
     }
-    if (rawT instanceof sol.StringType) {
-        return new rtt.StringType();
+    if (rawT instanceof sol.StringTypeId) {
+        return stringT;
     }
-    if (rawT instanceof sol.ArrayType) {
-        const expElT = astToRuntimeType(rawT.elementT, infer, loc);
+    if (rawT instanceof sol.ArrayTypeId) {
+        const expElT = typeIdToRuntimeType(rawT.elT, ctx, loc);
         return new rtt.ArrayType(expElT, rawT.size);
     }
-    if (rawT instanceof sol.MappingType) {
-        const keyT = astToRuntimeType(rawT.keyType, infer, loc);
-        const valueT = astToRuntimeType(rawT.valueType, infer, loc);
+    if (rawT instanceof sol.MappingTypeId) {
+        const keyT = typeIdToRuntimeType(rawT.keyType, ctx, loc);
+        const valueT = typeIdToRuntimeType(rawT.valueType, ctx, loc);
         return new rtt.MappingType(keyT, valueT);
     }
-    if (rawT instanceof sol.TupleType) {
-        return new rtt.TupleType(rawT.elements.map((elT) => elT === null ? new rtt.MissingType(undefined) : astToRuntimeType(elT, infer, loc)));
-    }
-    if (rawT instanceof sol.PointerType) {
-        const ptrLoc = rawT.location === sol.DataLocation.Default ? loc : rawT.location;
-        sol.assert(ptrLoc !== undefined, `Missing location in conversion of {0}`, rawT);
-        const toT = astToRuntimeType(rawT.to, infer, ptrLoc);
-        return new rtt.PointerType(toT, ptrLoc);
-    }
-    if (rawT instanceof sol.UserDefinedType) {
-        if (rawT.definition === undefined) {
-            return new rtt.MissingType(undefined);
-        }
-        if (rawT.definition instanceof sol.StructDefinition) {
-            sol.assert(loc !== undefined, `Missing location in struct expansion {0}`, rawT);
-            const fields = rawT.definition.vMembers.map((decl) => {
-                let fieldT;
-                try {
-                    fieldT = typeNameToTypeNode(decl.vType, infer, loc);
-                }
-                catch (e) {
-                    return [
-                        decl.name,
-                        new rtt.MissingType(decl.vType !== undefined ? decl.vType.typeString : undefined)
-                    ];
-                }
-                return [decl.name, astToRuntimeType(fieldT, infer, loc)];
-            });
-            return new rtt.StructType(rawT.name, fields);
-        }
-        if (rawT.definition instanceof sol.UserDefinedValueTypeDefinition) {
-            let underlyingType;
-            try {
-                underlyingType = typeNameToTypeNode(rawT.definition.underlyingType, infer);
-            }
-            catch (e) {
-                return new rtt.MissingType(rawT.definition.underlyingType.typeString);
-            }
-            return astToRuntimeType(underlyingType, infer, loc);
-        }
-        if (rawT.definition instanceof sol.ContractDefinition) {
-            return new rtt.AddressType();
-        }
-        if (rawT.definition instanceof sol.EnumDefinition) {
-            return astToRuntimeType(sol.enumToIntType(rawT.definition), infer);
-        }
+    if (rawT instanceof sol.TupleTypeId) {
+        return new rtt.TupleType(rawT.components.map((elT) => typeIdToRuntimeType(elT, ctx, loc)));
     }
-    if (rawT instanceof sol.TypeNameType) {
-        return new rtt.TypeType(rawT.type);
+    if (rawT instanceof sol.PointerTypeId) {
+        sol.assert(rawT.location !== sol.DataLocation.Default, `Unexpected default location`);
+        const toT = typeIdToRuntimeType(rawT.toType, ctx, rawT.location);
+        return new rtt.PointerType(toT, rawT.location);
     }
-    (0, utils_1.nyi)(`Type ${rawT.constructor.name}`);
-}
-/**
- * Given a general runtime type 'pattern' that doesn't contain any data locations, and a data location,
- * produce a concrete instance of the general type for the target location.
- * This is the inverse of `specializeType()`
- *
- * @param type - general type "pattern"
- * @param loc - target location to specialize to
- * @returns specialized type
- */
-function specializeType(type, loc) {
-    sol.assert(!(type instanceof rtt.PointerType), "Unexpected pointer type {0} in concretization.", type);
-    sol.assert(!(type instanceof rtt.TupleType), "Unexpected tuple type {0} in concretization.", type);
-    // bytes and string
-    if (type instanceof rtt.StringType || type instanceof rtt.BytesType) {
-        return new rtt.PointerType(type, loc);
-    }
-    if (type instanceof rtt.ArrayType) {
-        const concreteElT = specializeType(type.elementT, loc);
-        return new rtt.PointerType(new rtt.ArrayType(concreteElT, type.size), loc);
-    }
-    if (type instanceof rtt.StructType) {
-        return new rtt.PointerType(type, loc);
-    }
-    if (type instanceof rtt.MappingType) {
-        // Always treat map keys as in-memory copies
-        const concreteKeyT = specializeType(type.keyType, sol.DataLocation.Memory);
-        // The result of map indexing is always a pointer to a value that lives in storage
-        const concreteValueT = specializeType(type.valueType, sol.DataLocation.Storage); // @todo update when maps supported in transient
-        // Maps always live in storage
-        return new rtt.PointerType(new rtt.MappingType(concreteKeyT, concreteValueT), sol.DataLocation.Storage); // @todo update when maps supported in transient
-    }
-    if (type instanceof rtt.TupleType) {
-        return new rtt.TupleType(type.elementTypes.map((elT) => specializeType(elT, loc)));
-    }
-    return type;
-}
-/**
- * Given a `BaseRuntimeType` `type` that is specialized to some storage location,
- * compute the original 'general' type that is independent of location.
- * This is the inverse of `specializeType()`
- *
- * @param type - specialized type
- * @returns computed generalized type
- */
-function generalizeType(type) {
-    if (type instanceof rtt.PointerType) {
-        return generalizeType(type.toType);
+    if (rawT instanceof sol.ContractTypeId) {
+        return addressT;
     }
-    if (type instanceof rtt.ArrayType) {
-        const innerT = generalizeType(type.elementT);
-        return new rtt.ArrayType(innerT, type.size);
+    if (rawT instanceof sol.EnumTypeId) {
+        const def = ctx.locate(rawT.id);
+        if (!(def instanceof sol.EnumDefinition)) {
+            return new rtt.MissingTypeDef(rawT);
+        }
+        return typeIdToRuntimeType(sol.enumToIntTypeId(def), ctx, loc);
     }
-    if (type instanceof rtt.MappingType) {
-        const genearlKeyT = generalizeType(type.keyType);
-        const generalValueT = generalizeType(type.valueType);
-        return new rtt.MappingType(genearlKeyT, generalValueT);
+    if (rawT instanceof sol.UserDefinedValueTypeId) {
+        const def = ctx.locate(rawT.id);
+        if (!(def instanceof sol.UserDefinedValueTypeDefinition &&
+            def.underlyingType.typeIdentifier !== undefined)) {
+            return new rtt.MissingTypeDef(rawT);
+        }
+        return typeIdToRuntimeType(sol.typeOf(def.underlyingType), ctx, loc);
     }
-    if (type instanceof rtt.StructType) {
-        return new rtt.StructType(type.name, type.fields.map(([fieldName, fieldT]) => [fieldName, generalizeType(fieldT)]));
+    if (rawT instanceof sol.StructTypeId) {
+        const def = ctx.locate(rawT.id);
+        if (!(def instanceof sol.StructDefinition)) {
+            return new rtt.MissingTypeDef(rawT);
+        }
+        sol.assert(loc !== undefined, `Missing location in struct expansion {0}`, rawT);
+        const fields = def.vMembers.map((decl) => [
+            decl.name,
+            typeIdToRuntimeType(sol.changeLocationTo(sol.typeOf(decl), loc), ctx, loc)
+        ]);
+        return new rtt.StructType(rawT.name, fields);
     }
-    if (type instanceof rtt.TupleType) {
-        return new rtt.TupleType(type.elementTypes.map(generalizeType));
+    if (rawT instanceof sol.FunctionTypeId) {
+        return new rtt.FunctionType(rawT);
     }
-    return type;
+    (0, utils_1.nyi)(`typeIdToRuntimeType(${rawT.constructor.name})`);
 }
 //# sourceMappingURL=utils.js.map

package/dist/debug/runtime_types/utils.js.map

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

package/dist/debug/tracers/sol_debugger.js

@@ -13,7 +13,7 @@ class SolTxDebugger extends base_tracer_1.MapOnlyTracer {
         const opInfo = (0, transformers_1.addOpInfo)(vm, step, {});
         const basicInfo = await (0, transformers_1.addBasicInfo)(vm, step, opInfo, trace);
         const extFrameInfo = await (0, ext_stack_1.addExternalFrame)(vm, step, basicInfo, trace, this.artifactManager, tx);
-        const retInfo = await (0, ret_info_1.addReturnInfo)(vm, step, extFrameInfo, trace, this.artifactManager);
+        const retInfo = await (0, ret_info_1.addReturnInfo)(vm, step, extFrameInfo);
         const excInfo = await (0, transformers_1.addExceptionInfo)(vm, step, retInfo, trace, this.artifactManager);
         const source = await (0, source_1.addSource)(vm, step, excInfo);
         const intStack = await (0, int_stack_1.addInternalFrameInfo)(vm, step, source, trace, this.artifactManager, this.strict);

package/dist/debug/tracers/sol_debugger.js.map

@@ -1 +1 @@
-{"version":3,"file":"sol_debugger.js","sourceRoot":"","sources":["../../../src/debug/tracers/sol_debugger.ts"],"names":[],"mappings":";;;AAIA,+CAA8C;AAC9C,iDAMwB;AACxB,kDAAqD;AACrD,wDAA4D;AAC5D,wDAAgE;AAChE,sDAAwD;AACxD,kDAAkD;AAElD,MAAa,aAAc,SAAQ,2BAAwB;IACvD,KAAK,CAAC,mBAAmB,CACrB,EAAM,EACN,IAAqB,EACrB,KAAkB,EAClB,EAAoB;QAEpB,MAAM,MAAM,GAAG,IAAA,wBAAS,EAAC,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;QACvC,MAAM,SAAS,GAAG,MAAM,IAAA,2BAAY,EAAC,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;QAC9D,MAAM,YAAY,GAAG,MAAM,IAAA,4BAAgB,EACvC,EAAE,EACF,IAAI,EACJ,SAAS,EACT,KAAK,EACL,IAAI,CAAC,eAAe,EACpB,EAAE,CACL,CAAC;QACF,MAAM,OAAO,GAAG,MAAM,IAAA,wBAAa,EAAC,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;QACzF,MAAM,OAAO,GAAG,MAAM,IAAA,+BAAgB,EAAC,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;QACvF,MAAM,MAAM,GAAG,MAAM,IAAA,kBAAS,EAAC,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QAClD,MAAM,QAAQ,GAAG,MAAM,IAAA,gCAAoB,EACvC,EAAE,EACF,IAAI,EACJ,MAAM,EACN,KAAK,EACL,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,MAAM,CACd,CAAC;QAEF,MAAM,MAAM,GAAG,MAAM,IAAA,qBAAY,EAAC,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;QAE5E,MAAM,gBAAgB,GAAG,MAAM,IAAA,sCAAuB,EAAC,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;QAEhF,MAAM,eAAe,GAAG,MAAM,IAAA,kCAAmB,EAAC,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE,KAAK,CAAC,CAAC;QAErF,OAAO,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;IACnC,CAAC;CACJ;AArCD,sCAqCC"}
+{"version":3,"file":"sol_debugger.js","sourceRoot":"","sources":["../../../src/debug/tracers/sol_debugger.ts"],"names":[],"mappings":";;;AAIA,+CAA8C;AAC9C,iDAMwB;AACxB,kDAAqD;AACrD,wDAA4D;AAC5D,wDAAgE;AAChE,sDAAwD;AACxD,kDAAkD;AAElD,MAAa,aAAc,SAAQ,2BAAwB;IACvD,KAAK,CAAC,mBAAmB,CACrB,EAAM,EACN,IAAqB,EACrB,KAAkB,EAClB,EAAoB;QAEpB,MAAM,MAAM,GAAG,IAAA,wBAAS,EAAC,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;QACvC,MAAM,SAAS,GAAG,MAAM,IAAA,2BAAY,EAAC,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;QAC9D,MAAM,YAAY,GAAG,MAAM,IAAA,4BAAgB,EACvC,EAAE,EACF,IAAI,EACJ,SAAS,EACT,KAAK,EACL,IAAI,CAAC,eAAe,EACpB,EAAE,CACL,CAAC;QACF,MAAM,OAAO,GAAG,MAAM,IAAA,wBAAa,EAAC,EAAE,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC;QAC5D,MAAM,OAAO,GAAG,MAAM,IAAA,+BAAgB,EAAC,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;QACvF,MAAM,MAAM,GAAG,MAAM,IAAA,kBAAS,EAAC,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QAClD,MAAM,QAAQ,GAAG,MAAM,IAAA,gCAAoB,EACvC,EAAE,EACF,IAAI,EACJ,MAAM,EACN,KAAK,EACL,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,MAAM,CACd,CAAC;QAEF,MAAM,MAAM,GAAG,MAAM,IAAA,qBAAY,EAAC,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;QAE5E,MAAM,gBAAgB,GAAG,MAAM,IAAA,sCAAuB,EAAC,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;QAEhF,MAAM,eAAe,GAAG,MAAM,IAAA,kCAAmB,EAAC,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE,KAAK,CAAC,CAAC;QAErF,OAAO,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;IACnC,CAAC;CACJ;AArCD,sCAqCC"}

package/dist/debug/tracers/transformers/ext_stack.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ext_stack.d.ts","sourceRoot":"","sources":["../../../../src/debug/tracers/transformers/ext_stack.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAElD,OAAO,EAAE,EAAE,EAAE,MAAM,gBAAgB,CAAC;AAIpC,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAExE,OAAO,EAA4B,aAAa,EAAwB,MAAM,aAAa,CAAC;AAC5F,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAI7C,MAAM,WAAW,iBAAiB;IAC9B,KAAK,EAAE,aAAa,EAAE,CAAC;CAC1B;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,iBAAiB,GAAG,aAAa,CAEjE;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,iBAAiB,GAAG,YAAY,GAAG,SAAS,CAEjF;AAED,wBAAgB,OAAO,CAAC,IAAI,EAAE,iBAAiB,GAAG,UAAU,CAE3D;AAuHD;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,CAAC,SAAS,MAAM,GAAG,aAAa,EACnE,EAAE,EAAE,EAAE,EACN,IAAI,EAAE,eAAe,EACrB,KAAK,EAAE,CAAC,EACR,KAAK,EAAE,KAAK,CAAC,CAAC,GAAG,iBAAiB,CAAC,EACnC,eAAe,EAAE,gBAAgB,EACjC,EAAE,EAAE,gBAAgB,GACrB,OAAO,CAAC,CAAC,GAAG,iBAAiB,CAAC,CAgHhC"}
+{"version":3,"file":"ext_stack.d.ts","sourceRoot":"","sources":["../../../../src/debug/tracers/transformers/ext_stack.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAElD,OAAO,EAAE,EAAE,EAAE,MAAM,gBAAgB,CAAC;AAIpC,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAExE,OAAO,EAA4B,aAAa,EAAwB,MAAM,aAAa,CAAC;AAC5F,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAI7C,MAAM,WAAW,iBAAiB;IAC9B,KAAK,EAAE,aAAa,EAAE,CAAC;CAC1B;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,iBAAiB,GAAG,aAAa,CAEjE;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,iBAAiB,GAAG,YAAY,GAAG,SAAS,CAEjF;AAED,wBAAgB,OAAO,CAAC,IAAI,EAAE,iBAAiB,GAAG,UAAU,CAE3D;AAqHD;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,CAAC,SAAS,MAAM,GAAG,aAAa,EACnE,EAAE,EAAE,EAAE,EACN,IAAI,EAAE,eAAe,EACrB,KAAK,EAAE,CAAC,EACR,KAAK,EAAE,KAAK,CAAC,CAAC,GAAG,iBAAiB,CAAC,EACnC,eAAe,EAAE,gBAAgB,EACjC,EAAE,EAAE,gBAAgB,GACrB,OAAO,CAAC,CAAC,GAAG,iBAAiB,CAAC,CAgHhC"}

package/dist/debug/tracers/transformers/ext_stack.js

@@ -27,11 +27,10 @@ function makeCallFrame(sender, receiver, codeAddress, data, receiverCode, codeHa
     let callee;
     let args;
     if (contractInfo && contractInfo.ast) {
-        const infer = artifactManager.infer(contractInfo.artifact.compilerVersion);
         callee = artifactManager.findEntryPoint(data, contractInfo);
         if (callee !== undefined) {
             try {
-                args = (0, abi_1.buildMsgViews)(callee, infer);
+                args = (0, abi_1.buildMsgViews)(callee);
             }
             catch (e) {
                 args = undefined;

package/dist/debug/tracers/transformers/ext_stack.js.map

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

package/dist/debug/tracers/transformers/int_stack.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"int_stack.d.ts","sourceRoot":"","sources":["../../../../src/debug/tracers/transformers/int_stack.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,EAAE,EAAE,MAAM,gBAAgB,CAAC;AAEpC,OAAO,EAAgB,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAGxE,OAAO,EAAoB,iBAAiB,EAAS,MAAM,aAAa,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAe,MAAM,aAAa,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAKtC,MAAM,WAAW,iBAAiB;IAC9B,QAAQ,EAAE,iBAAiB,EAAE,CAAC;CACjC;AA6DD;;GAEG;AACH,wBAAsB,oBAAoB,CACtC,CAAC,SAAS,MAAM,GAAG,aAAa,GAAG,iBAAiB,GAAG,UAAU,EAEjE,EAAE,EAAE,EAAE,EACN,IAAI,EAAE,eAAe,EACrB,KAAK,EAAE,CAAC,EACR,KAAK,EAAE,KAAK,CAAC,CAAC,GAAG,iBAAiB,CAAC,EACnC,eAAe,EAAE,gBAAgB,EACjC,MAAM,EAAE,OAAO,GAChB,OAAO,CAAC,CAAC,GAAG,iBAAiB,CAAC,CA0HhC"}
+{"version":3,"file":"int_stack.d.ts","sourceRoot":"","sources":["../../../../src/debug/tracers/transformers/int_stack.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,EAAE,EAAE,MAAM,gBAAgB,CAAC;AAEpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAG1D,OAAO,EAAoB,iBAAiB,EAAS,MAAM,aAAa,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAe,MAAM,aAAa,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAMtC,MAAM,WAAW,iBAAiB;IAC9B,QAAQ,EAAE,iBAAiB,EAAE,CAAC;CACjC;AA2CD;;GAEG;AACH,wBAAsB,oBAAoB,CACtC,CAAC,SAAS,MAAM,GAAG,aAAa,GAAG,iBAAiB,GAAG,UAAU,EAEjE,EAAE,EAAE,EAAE,EACN,IAAI,EAAE,eAAe,EACrB,KAAK,EAAE,CAAC,EACR,KAAK,EAAE,KAAK,CAAC,CAAC,GAAG,iBAAiB,CAAC,EACnC,eAAe,EAAE,gBAAgB,EACjC,MAAM,EAAE,OAAO,GAChB,OAAO,CAAC,CAAC,GAAG,iBAAiB,CAAC,CA0HhC"}

package/dist/debug/tracers/transformers/int_stack.js

@@ -8,6 +8,7 @@ const types_1 = require("../../types");
 const ext_stack_1 = require("./ext_stack");
 const decoding_1 = require("../../decoding");
 const runtime_types_1 = require("../../runtime_types");
+const utils_2 = require("../../../utils");
 function topFrame(step) {
     if (step.intStack.length > 0) {
         return step.intStack[step.intStack.length - 1];
@@ -19,30 +20,14 @@ function topFrame(step) {
  * Given a callable (function definition or public state variable) try to build
  * `View`s for all the callable arguments. On failure return undefined.
  */
-function buildFunArgViews(callee, stack, contractInfo, artifactManager) {
+function buildFunArgViews(callee, stack) {
     const res = [];
-    let formals;
-    const infer = artifactManager.infer(contractInfo.artifact.compilerVersion);
-    try {
-        formals =
-            callee instanceof solc_typed_ast_1.FunctionDefinition
-                ? callee.vParameters.vParameters.map((argDef) => [
-                    argDef.name,
-                    infer.variableDeclarationToTypeNode(argDef)
-                ])
-                : infer
-                    .getterArgsAndReturn(callee)[0]
-                    .map((typ, i) => [`ARG_${i}`, typ]);
-    }
-    catch (e) {
-        // `variableDeclarationToTypeNode` may fail when referencing structs/contracts that are defined
-        // in SourceUnits that are missing
-        return undefined;
-    }
+    const ctx = callee.requiredContext;
+    const formals = (0, utils_2.getArgs)(callee);
     let offsetFromTop = -1;
     for (let i = formals.length - 1; i >= 0; i--) {
         const [name, typ] = formals[i];
-        const rttTyp = (0, runtime_types_1.astToRuntimeType)(typ, infer);
+        const rttTyp = (0, runtime_types_1.typeIdToRuntimeType)(typ, ctx);
         const stackSize = (0, utils_1.isCalldataArrayType)(rttTyp) ? 2 : 1;
         offsetFromTop += stackSize;
         if (offsetFromTop > stack.length) {
@@ -115,7 +100,7 @@ async function addInternalFrameInfo(vm, step, state, trace, artifactManager, str
         if (ast instanceof solc_typed_ast_1.FunctionDefinition ||
             (ast instanceof solc_typed_ast_1.VariableDeclaration && ast.stateVariable)) {
             (0, solc_typed_ast_1.assert)(curExtFrame.info !== undefined, ``);
-            args = buildFunArgViews(ast, state.evmStack, curExtFrame.info, artifactManager);
+            args = buildFunArgViews(ast, state.evmStack);
         }
         const newFrame = {
             kind: types_1.FrameKind.InternalCall,

package/dist/debug/tracers/transformers/int_stack.js.map

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