sol-dbg 0.6.13 → 0.7.1

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

@@ -0,0 +1,397 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MissingCalldataView = exports.PointerCalldataView = exports.StructCalldataView = exports.ArraySliceCalldataView = exports.ArrayCalldataView = exports.BaseArrayCalldataView = exports.TupleCalldataView = exports.StringCalldataView = exports.BytesCalldataView = exports.FixedBytesCalldataView = exports.AddressCalldataView = exports.BoolCalldataView = exports.IntCalldataView = exports.BaseCalldataView = void 0;
+exports.makeCalldataView = makeCalldataView;
+exports.makeCalldataViews = makeCalldataViews;
+const solc_typed_ast_1 = require("solc-typed-ast");
+const value_1 = require("../value");
+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");
+/**
+ * Return true IFF the given type is "dynamic". I,e. its size is not statically known.
+ * @param t
+ * @param infer
+ * @returns
+ */
+function isTypeDynamic(t) {
+    if (t instanceof solc_typed_ast_1.BytesType || t instanceof solc_typed_ast_1.StringType) {
+        return true;
+    }
+    if (t instanceof solc_typed_ast_1.ArrayType) {
+        return t.size === undefined || isTypeDynamic(t.elementT);
+    }
+    if (t instanceof solc_typed_ast_1.TupleType) {
+        for (const elementT of t.elements) {
+            if (elementT && isTypeDynamic(elementT)) {
+                return true;
+            }
+        }
+    }
+    if (t instanceof exp_types_1.ExpStructType) {
+        for (const [, fieldT] of t.fields) {
+            if (isTypeDynamic(fieldT)) {
+                return true;
+            }
+        }
+    }
+    if (t instanceof solc_typed_ast_1.PointerType) {
+        return isTypeDynamic(t.to);
+    }
+    return false;
+}
+/**
+ * Return the calldata head size for a given type. This is `len(head(X))` in the notation of
+ * https://docs.soliditylang.org/en/latest/abi-spec.html#formal-specification-of-the-encoding
+ *
+ * @param t
+ * @param infer
+ * @returns
+ */
+function headSize(t) {
+    if (isTypeDynamic(t)) {
+        return 32;
+    }
+    if (t instanceof solc_typed_ast_1.TupleType) {
+        let size = 0;
+        for (const elT of t.elements) {
+            const elSize = headSize(elT);
+            if (elSize === undefined) {
+                return undefined;
+            }
+            size += elSize;
+        }
+        return size;
+    }
+    if (t instanceof solc_typed_ast_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) {
+            return undefined;
+        }
+        return elSize * Number(t.size);
+    }
+    if (t instanceof exp_types_1.ExpStructType) {
+        let size = 0;
+        for (const [, fieldT] of t.fields) {
+            const fieldSize = headSize(fieldT);
+            if (fieldSize === undefined) {
+                return undefined;
+            }
+            size += fieldSize;
+        }
+        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) {
+        return 32;
+    }
+    if (t instanceof solc_typed_ast_1.PointerType) {
+        return headSize(t.to);
+    }
+    if (t instanceof exp_types_1.MissingType) {
+        if (t.rawTypeName === 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)) {
+            return 32;
+        }
+    }
+    (0, utils_1.nyi)(`Statically sized type ${t.pp()}`);
+}
+class BaseCalldataView extends view_1.View {
+    constructor(type, loc, base) {
+        super(type, loc);
+        this.base = base;
+    }
+    readMemAt(off, calldata, len) {
+        const actualOffset = this.base + BigInt(off);
+        const res = (0, utils_1.readMem)(actualOffset, len, calldata);
+        if (!res) {
+            // OoB access
+            return new value_1.DecodingFailure(`OoB access at ${actualOffset}:${actualOffset + BigInt(len)} in memory of size ${calldata.length}`);
+        }
+        return res;
+    }
+    decodeIntAt(offset, typ, calldata) {
+        const bytes = this.readMemAt(offset, calldata, 32);
+        if ((0, utils_2.isFailure)(bytes)) {
+            return bytes;
+        }
+        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)) {
+            // 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);
+        }
+        if (!(0, utils_1.fits)(res, typ)) {
+            return new value_1.DecodingFailure(`Decoded value ${res} doesnt fit in type ${this.type.pp()}`);
+        }
+        return res;
+    }
+    decodeBytesAt(loc, state) {
+        const len = this.decodeIntAt(loc, utils_1.uint256, state);
+        if ((0, utils_2.isFailure)(len)) {
+            return len;
+        }
+        if (len >= utils_1.MAX_ARR_DECODE_LIMIT) {
+            return new value_1.DecodingFailure(`Bytes to decode too large - ${len}`);
+        }
+        return this.readMemAt(loc + 32n, state, len);
+    }
+    decodeTupleAt(loc, curBase, type, state) {
+        let base = curBase;
+        if (isTypeDynamic(type)) {
+            base = loc + curBase;
+            loc = 0n;
+        }
+        const res = [];
+        let failRemaining = false;
+        for (const t of type.elements) {
+            if (failRemaining) {
+                res.push(new value_1.DecodingFailure(`Failed due to earlier failure.`));
+            }
+            (0, solc_typed_ast_1.assert)(t !== null, `Unexpected null element in tuple type {0}`, type);
+            res.push(makeCalldataView(t, loc, base).decode(state));
+            const tSize = headSize(t);
+            if (tSize === undefined) {
+                failRemaining = true;
+            }
+            else {
+                loc += BigInt(tSize);
+            }
+        }
+        return res;
+    }
+    pp() {
+        return `<${this.type.pp()}@${this.loc + this.base} in calldata>`;
+    }
+}
+exports.BaseCalldataView = BaseCalldataView;
+/**
+ * View to an IntType in calldata
+ */
+class IntCalldataView extends BaseCalldataView {
+    decode(state) {
+        return this.decodeIntAt(this.loc, this.type, state);
+    }
+}
+exports.IntCalldataView = IntCalldataView;
+/**
+ * View to a BoolType in calldata
+ */
+class BoolCalldataView extends BaseCalldataView {
+    decode(state) {
+        const intV = this.decodeIntAt(this.loc, utils_1.uint256, state);
+        if ((0, utils_2.isFailure)(intV)) {
+            return intV;
+        }
+        return intV !== 0n;
+    }
+}
+exports.BoolCalldataView = BoolCalldataView;
+/**
+ * View to an Address in calldata
+ */
+class AddressCalldataView extends BaseCalldataView {
+    decode(state) {
+        const m = this.readMemAt(this.loc, state, 32);
+        if ((0, utils_2.isFailure)(m)) {
+            return m;
+        }
+        return new util_1.Address(m.slice(12));
+    }
+}
+exports.AddressCalldataView = AddressCalldataView;
+/**
+ * View to an FixedBytes in calldata
+ */
+class FixedBytesCalldataView extends BaseCalldataView {
+    decode(state) {
+        return this.readMemAt(this.loc, state, this.type.size);
+    }
+}
+exports.FixedBytesCalldataView = FixedBytesCalldataView;
+class BytesCalldataView extends BaseCalldataView {
+    decode(state) {
+        return this.decodeBytesAt(this.loc, state);
+    }
+}
+exports.BytesCalldataView = BytesCalldataView;
+class StringCalldataView extends BaseCalldataView {
+    decode(state) {
+        const bytes = this.decodeBytesAt(this.loc, state);
+        if ((0, utils_2.isFailure)(bytes)) {
+            return bytes;
+        }
+        return (0, util_1.bytesToUtf8)(bytes);
+    }
+}
+exports.StringCalldataView = StringCalldataView;
+class TupleCalldataView extends BaseCalldataView {
+    decode(state) {
+        let offset = this.loc;
+        if (isTypeDynamic(this.type)) {
+            offset = this.decodeIntAt(offset, utils_1.uint256, state);
+            if ((0, utils_2.isFailure)(offset)) {
+                return offset;
+            }
+        }
+        return this.decodeTupleAt(offset, this.base, this.type, state);
+    }
+}
+exports.TupleCalldataView = TupleCalldataView;
+class BaseArrayCalldataView extends BaseCalldataView {
+    decodeArray(baseOff, bigIntSize, state) {
+        if (!(0, utils_2.inRange)(bigIntSize, 0, utils_1.MAX_ARR_DECODE_LIMIT)) {
+            return new value_1.DecodingFailure(`Array too large ${bigIntSize}`);
+        }
+        const size = Number(bigIntSize);
+        const res = [];
+        let off = 0n;
+        const newBase = baseOff + this.base;
+        const hs = headSize(this.type.elementT);
+        if (hs === undefined) {
+            return new value_1.DecodingFailure(`Can't compute head size of ${this.type.elementT.pp()}`);
+        }
+        const elSize = BigInt(hs);
+        for (let i = 0; i < size; i++) {
+            const elView = makeCalldataView(this.type.elementT, off, newBase);
+            res.push(elView.decode(state));
+            off += elSize;
+        }
+        return res;
+    }
+}
+exports.BaseArrayCalldataView = BaseArrayCalldataView;
+class ArrayCalldataView extends BaseArrayCalldataView {
+    decode(state) {
+        let baseOff = this.loc;
+        // Dynamic sized arrays have length at the start. Fixed sized arrays do
+        // not.
+        let bigintSize;
+        if (this.type.size !== undefined) {
+            bigintSize = this.type.size;
+        }
+        else {
+            bigintSize = this.decodeIntAt(baseOff, utils_1.uint256, state);
+            if ((0, utils_2.isFailure)(bigintSize)) {
+                return bigintSize;
+            }
+            baseOff += 32n;
+        }
+        return this.decodeArray(baseOff, bigintSize, state);
+    }
+}
+exports.ArrayCalldataView = ArrayCalldataView;
+/**
+ * An ArraySliceView is only created from stack locations. It should not be created in makeCalldataView.
+ */
+class ArraySliceCalldataView extends BaseArrayCalldataView {
+    constructor(type, loc, len) {
+        super(type, loc, 0n);
+        this.len = len;
+    }
+    decode(state) {
+        return this.decodeArray(this.loc, this.len, state);
+    }
+}
+exports.ArraySliceCalldataView = ArraySliceCalldataView;
+class StructCalldataView extends BaseCalldataView {
+    decode(state) {
+        const offset = this.loc;
+        const values = this.decodeTupleAt(offset, this.base, new solc_typed_ast_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));
+    }
+}
+exports.StructCalldataView = StructCalldataView;
+class PointerCalldataView extends BaseCalldataView {
+    decode(state) {
+        let off = this.loc;
+        if (isTypeDynamic(this.type.to)) {
+            off = this.decodeIntAt(off, utils_1.uint256, state);
+            if ((0, utils_2.isFailure)(off)) {
+                return off;
+            }
+        }
+        const innerView = makeCalldataView(this.type.to, off, this.base);
+        return innerView.decode(state);
+    }
+}
+exports.PointerCalldataView = PointerCalldataView;
+class MissingCalldataView extends BaseCalldataView {
+    decode() {
+        return new value_1.DecodingFailure(`${this.type.rawTypeName ? this.type.rawTypeName.type : "<unknown>"}`);
+    }
+}
+exports.MissingCalldataView = MissingCalldataView;
+function makeCalldataView(type, loc, base) {
+    if (type instanceof solc_typed_ast_1.IntType) {
+        return new IntCalldataView(type, loc, base);
+    }
+    if (type instanceof solc_typed_ast_1.BoolType) {
+        return new BoolCalldataView(type, loc, base);
+    }
+    if (type instanceof solc_typed_ast_1.AddressType) {
+        return new AddressCalldataView(type, loc, base);
+    }
+    if (type instanceof solc_typed_ast_1.FixedBytesType) {
+        return new FixedBytesCalldataView(type, loc, base);
+    }
+    if (type instanceof solc_typed_ast_1.TupleType) {
+        return new TupleCalldataView(type, loc, base);
+    }
+    if (type instanceof solc_typed_ast_1.BytesType) {
+        return new BytesCalldataView(type, loc, base);
+    }
+    if (type instanceof solc_typed_ast_1.StringType) {
+        return new StringCalldataView(type, loc, base);
+    }
+    if (type instanceof solc_typed_ast_1.ArrayType) {
+        return new ArrayCalldataView(type, loc, base);
+    }
+    if (type instanceof exp_types_1.ExpStructType) {
+        return new StructCalldataView(type, loc, base);
+    }
+    if (type instanceof solc_typed_ast_1.TupleType) {
+        return new TupleCalldataView(type, loc, base);
+    }
+    if (type instanceof solc_typed_ast_1.PointerType) {
+        return new PointerCalldataView(type, loc, base);
+    }
+    if (type instanceof exp_types_1.MissingType) {
+        return new MissingCalldataView(type, loc, base);
+    }
+    (0, utils_1.nyi)(`makeCalldataView(${type.pp()})`);
+}
+function makeCalldataViews(types, base) {
+    let off = 0n;
+    const res = [];
+    let failRemaining = false;
+    for (const t of types) {
+        // 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));
+            continue;
+        }
+        const view = makeCalldataView(t, off, base);
+        res.push(view);
+        const hs = headSize(t);
+        if (hs === undefined) {
+            failRemaining = true;
+        }
+        else {
+            off += BigInt(hs);
+        }
+    }
+    return res;
+}
+//# sourceMappingURL=view.js.map

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

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

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

@@ -0,0 +1,46 @@
+import { ContractDefinition, DataLocation, InferType, TypeName, TypeNode } from "solc-typed-ast";
+/**
+ * An internal struct type that converts all field VariableDeclaration(s) to
+ * TypeNode(s). This way handling this type doesn't require an InferType
+ * instance.
+ */
+export declare class ExpStructType extends TypeNode {
+    readonly name: string;
+    readonly fields: Array<[string, TypeNode]>;
+    readonly rawType: TypeNode | undefined;
+    constructor(name: string, fields: Array<[string, TypeNode]>, rawType?: TypeNode | undefined);
+    pp(): string;
+}
+/**
+ * Simplify the given solc-typed-ast types for use in encoding. This does the following conversions:
+ *
+ * - Convert `UserDefinedType(StructDefinition)` to `ExpStructType`
+ * - Convert `UserDefinedType(UserDefinedValueTypeDefinition)` to the underlying type
+ * - Convert `UserDefinedType(ContractDefinition)` to address
+ *
+ * in the given rawT
+ * @param rawT
+ */
+export declare function simplifyType(rawT: TypeNode, infer: InferType, loc: DataLocation | undefined): TypeNode;
+export declare class MissingType extends TypeNode {
+    readonly rawTypeName: TypeName | undefined;
+    constructor(rawTypeName: TypeName | undefined);
+    pp(): string;
+}
+/**
+ * Given a `ContractDefinition` try and compute an `ExpStructType` struct that
+ * describes the layout of the class.  This takes into account all base classes,
+ * and simplifies types using `simplifyType`.
+ *
+ * Since we may be missing AST information for some user-defined types, or even
+ * entire bases, the layout may be partial. It may be only up to a given base,
+ * and it may be missing exact type information for certain fields.
+ *
+ * We return a tuple with the resulting layout, and a boolean specifying whether
+ * the layout is complete.
+ *
+ * @param def
+ * @param infer
+ */
+export declare function getContractLayoutType(contract: ContractDefinition, infer: InferType): [ExpStructType, boolean];
+//# sourceMappingURL=exp_types.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"exp_types.d.ts","sourceRoot":"","sources":["../../../src/debug/decoding/exp_types.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,kBAAkB,EAClB,YAAY,EAGZ,SAAS,EAMT,QAAQ,EACR,QAAQ,EAKX,MAAM,gBAAgB,CAAC;AAIxB;;;;GAIG;AACH,qBAAa,aAAc,SAAQ,QAAQ;aAEnB,IAAI,EAAE,MAAM;aACZ,MAAM,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;aACjC,OAAO,EAAE,QAAQ,GAAG,SAAS;gBAF7B,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,EACjC,OAAO,GAAE,QAAQ,GAAG,SAAqB;IAK7D,EAAE,IAAI,MAAM;CAGf;AAgDD;;;;;;;;;GASG;AACH,wBAAgB,YAAY,CACxB,IAAI,EAAE,QAAQ,EACd,KAAK,EAAE,SAAS,EAChB,GAAG,EAAE,YAAY,GAAG,SAAS,GAC9B,QAAQ,CAyEV;AAED,qBAAa,WAAY,SAAQ,QAAQ;aACT,WAAW,EAAE,QAAQ,GAAG,SAAS;gBAAjC,WAAW,EAAE,QAAQ,GAAG,SAAS;IAI7D,EAAE,IAAI,MAAM;CAGf;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,qBAAqB,CACjC,QAAQ,EAAE,kBAAkB,EAC5B,KAAK,EAAE,SAAS,GACjB,CAAC,aAAa,EAAE,OAAO,CAAC,CA8C1B"}

package/dist/debug/decoding/exp_types.js

@@ -0,0 +1,202 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MissingType = exports.ExpStructType = void 0;
+exports.simplifyType = simplifyType;
+exports.getContractLayoutType = getContractLayoutType;
+const solc_typed_ast_1 = require("solc-typed-ast");
+const utils_1 = require("../../utils");
+const utils_2 = require("./utils");
+/**
+ * An internal struct type that converts all field VariableDeclaration(s) to
+ * TypeNode(s). This way handling this type doesn't require an InferType
+ * instance.
+ */
+class ExpStructType extends solc_typed_ast_1.TypeNode {
+    constructor(name, fields, rawType = undefined) {
+        super();
+        this.name = name;
+        this.fields = fields;
+        this.rawType = rawType;
+    }
+    pp() {
+        return `struct ${this.name}{\n${this.fields.map(([name, type]) => `${name}: ${type.pp()}`).join("\n")}\n}`;
+    }
+}
+exports.ExpStructType = ExpStructType;
+function isTypeUnknownContract(t) {
+    return (t instanceof solc_typed_ast_1.UserDefinedTypeName &&
+        t.referencedDeclaration < 0 &&
+        (t.typeString.startsWith("contract ") ||
+            t.typeString.startsWith("interface ") ||
+            t.typeString.startsWith("library ")));
+}
+/**
+ * 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 (isTypeUnknownContract(t)) {
+            return utils_1.address;
+        }
+        throw e;
+    }
+}
+/**
+ * Helper for converting `VariableDeclartaion`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 variableDeclarationToTypeNode(v, infer) {
+    try {
+        return infer.variableDeclarationToTypeNode(v);
+    }
+    catch (e) {
+        if (v.vType && isTypeUnknownContract(v.vType)) {
+            return utils_1.address;
+        }
+        throw e;
+    }
+}
+/**
+ * Simplify the given solc-typed-ast types for use in encoding. This does the following conversions:
+ *
+ * - Convert `UserDefinedType(StructDefinition)` to `ExpStructType`
+ * - Convert `UserDefinedType(UserDefinedValueTypeDefinition)` to the underlying type
+ * - Convert `UserDefinedType(ContractDefinition)` to address
+ *
+ * in the given rawT
+ * @param rawT
+ */
+function simplifyType(rawT, infer, loc) {
+    if (rawT instanceof solc_typed_ast_1.ArrayType) {
+        const expElT = simplifyType(rawT.elementT, infer, loc);
+        return expElT === rawT.elementT ? rawT : new solc_typed_ast_1.ArrayType(expElT, rawT.size, rawT.src);
+    }
+    if (rawT instanceof solc_typed_ast_1.MappingType) {
+        const keyT = simplifyType(rawT.keyType, infer, loc);
+        const valueT = simplifyType(rawT.valueType, infer, loc);
+        return keyT === rawT.keyType && valueT === rawT.valueType
+            ? rawT
+            : new solc_typed_ast_1.MappingType(keyT, valueT, rawT.src);
+    }
+    if (rawT instanceof solc_typed_ast_1.TupleType) {
+        return new solc_typed_ast_1.TupleType(rawT.elements.map((elT) => (elT === null ? elT : simplifyType(elT, infer, loc))));
+    }
+    if (rawT instanceof solc_typed_ast_1.PointerType) {
+        const toT = simplifyType(rawT.to, infer, rawT.location);
+        return toT === rawT.to ? rawT : new solc_typed_ast_1.PointerType(toT, rawT.location, rawT.kind, rawT.src);
+    }
+    if (rawT instanceof solc_typed_ast_1.UserDefinedType) {
+        if (rawT.definition === undefined) {
+            return new MissingType(undefined);
+        }
+        if (rawT.definition instanceof solc_typed_ast_1.StructDefinition) {
+            (0, solc_typed_ast_1.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) {
+                    fieldT = new MissingType(decl.vType);
+                }
+                return [decl.name, simplifyType(fieldT, infer, loc)];
+            });
+            return new ExpStructType(rawT.name, fields, rawT);
+        }
+        if (rawT.definition instanceof solc_typed_ast_1.UserDefinedValueTypeDefinition) {
+            let underlyingType;
+            try {
+                underlyingType = typeNameToTypeNode(rawT.definition.underlyingType, infer);
+            }
+            catch (e) {
+                underlyingType = new MissingType(rawT.definition.underlyingType);
+            }
+            return simplifyType(underlyingType, infer, loc);
+        }
+        if (rawT.definition instanceof solc_typed_ast_1.ContractDefinition) {
+            return utils_1.address;
+        }
+        if (rawT.definition instanceof solc_typed_ast_1.EnumDefinition) {
+            return (0, solc_typed_ast_1.enumToIntType)(rawT.definition);
+        }
+    }
+    if (rawT instanceof MissingType) {
+        return rawT;
+    }
+    return rawT;
+}
+class MissingType extends solc_typed_ast_1.TypeNode {
+    constructor(rawTypeName) {
+        super();
+        this.rawTypeName = rawTypeName;
+    }
+    pp() {
+        return `<missing type info for ${this.rawTypeName?.print()}>`;
+    }
+}
+exports.MissingType = MissingType;
+/**
+ * Given a `ContractDefinition` try and compute an `ExpStructType` struct that
+ * describes the layout of the class.  This takes into account all base classes,
+ * and simplifies types using `simplifyType`.
+ *
+ * Since we may be missing AST information for some user-defined types, or even
+ * entire bases, the layout may be partial. It may be only up to a given base,
+ * and it may be missing exact type information for certain fields.
+ *
+ * We return a tuple with the resulting layout, and a boolean specifying whether
+ * the layout is complete.
+ *
+ * @param def
+ * @param infer
+ */
+function getContractLayoutType(contract, infer) {
+    const stateVars = [];
+    let complete = true;
+    for (const base of [...contract.vLinearizedBaseContracts].reverse()) {
+        if (base === null || base === undefined) {
+            complete = false;
+            break;
+        }
+        for (const varDecl of base.vStateVariables) {
+            // Not part of layout
+            if (varDecl.mutability === solc_typed_ast_1.Mutability.Constant ||
+                varDecl.mutability === solc_typed_ast_1.Mutability.Immutable ||
+                varDecl.storageLocation === solc_typed_ast_1.DataLocation.Transient) {
+                continue;
+            }
+            let typeNode;
+            try {
+                typeNode = variableDeclarationToTypeNode(varDecl, infer);
+            }
+            catch (e) {
+                /**
+                 * Missing type info. If this is a:
+                 *  - map type
+                 *  - array type
+                 *
+                 * then we can continue decoding as it takes exactly 32 bytes
+                 * statically in the layout. Otherwise we have to abort decoding
+                 */
+                complete = false;
+                if ((0, utils_2.isTypeStringStatic32BytesInStorage)(varDecl.typeString)) {
+                    typeNode = new MissingType(varDecl.vType);
+                }
+                else {
+                    break;
+                }
+            }
+            stateVars.push([varDecl.name, simplifyType(typeNode, infer, solc_typed_ast_1.DataLocation.Storage)]);
+        }
+    }
+    return [new ExpStructType(contract.name, stateVars), complete];
+}
+//# sourceMappingURL=exp_types.js.map

package/dist/debug/decoding/exp_types.js.map

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