sol-dbg 0.7.16 → 0.8.0

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

@@ -2,16 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PointerStackView = exports.FixedBytesStackView = exports.SingleByteStackView = exports.AddressStackView = exports.BoolStackView = exports.IntStackView = exports.BaseStackView = void 0;
 exports.makeStackView = makeStackView;
-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 storage_1 = require("../storage");
 const utils_2 = require("../utils");
 const view_2 = require("../calldata/view");
-const memory_1 = require("../memory");
 const view_3 = require("../storage/view");
 const view_4 = require("../memory/view");
+const runtime_types_1 = require("../../runtime_types");
+const solc_typed_ast_1 = require("solc-typed-ast");
 class BaseStackView extends view_1.View {
     fetchStackWord(offsetFromTop, state) {
         const len = state.length;
@@ -27,10 +27,10 @@ class BaseStackView extends view_1.View {
         }
         let res = (0, utils_1.bigEndianBufToBigint)(word);
         // 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(`${res} doesnt fit in type ${typ.pp()}`);
@@ -44,7 +44,7 @@ class BaseStackView extends view_1.View {
         if (state.length <= offsetFromTop) {
             throw new view_1.EncodingError(`OoB access at ${offsetFromTop} in stack`);
         }
-        (0, utils_1.encodeBigintInBigEndianBuf)(value, state[offsetFromTop], type.nBits / 8);
+        (0, utils_1.encodeBigintInBigEndianBuf)(value, state[offsetFromTop], type.numBits / 8);
     }
 }
 exports.BaseStackView = BaseStackView;
@@ -83,7 +83,7 @@ class AddressStackView extends BaseStackView {
 exports.AddressStackView = AddressStackView;
 class SingleByteStackView extends BaseStackView {
     constructor(loc, byteOffset) {
-        super(solc_typed_ast_1.types.byte, loc);
+        super(utils_1.byte, loc);
         this.byteOffset = byteOffset;
     }
     decode(state) {
@@ -105,7 +105,7 @@ exports.SingleByteStackView = SingleByteStackView;
 class FixedBytesStackView extends BaseStackView {
     decode(state) {
         const w = this.fetchStackWord(this.loc, state);
-        return (0, utils_2.isFailure)(w) ? w : w.slice(0, this.type.size);
+        return (0, utils_2.isFailure)(w) ? w : w.slice(0, this.type.numBytes);
     }
     encode(value, state) {
         const w = this.fetchStackWord(this.loc, state);
@@ -115,10 +115,10 @@ class FixedBytesStackView extends BaseStackView {
         w.set(value);
     }
     size() {
-        return BigInt(this.type.size);
+        return BigInt(this.type.numBytes);
     }
     indexView(key) {
-        if (!(0, utils_2.inRange)(key, 0, this.type.size - 1)) {
+        if (!(0, utils_2.inRange)(key, 0, this.type.numBytes - 1)) {
             return new value_1.DecodingFailure(`Invalid index ${key} in ${this.type.pp()}`);
         }
         return new SingleByteStackView(this.loc, Number(key));
@@ -137,17 +137,18 @@ class PointerStackView extends BaseStackView {
             if ((0, utils_2.isFailure)(len)) {
                 return len;
             }
-            return new view_2.ArraySliceCalldataView(this.type.to, off, len);
+            // This cast is weird...
+            return new view_2.ArraySliceCalldataView(this.type.toType, off, len);
         }
         if (this.type.location === solc_typed_ast_1.DataLocation.CallData) {
-            return (0, view_2.makeCalldataView)(this.type.to, 0n, off);
+            return (0, view_2.makeCalldataView)(this.type.toType, 0n, off);
         }
         if (this.type.location === solc_typed_ast_1.DataLocation.Memory) {
-            return (0, memory_1.makeMemoryView)(this.type.to, off);
+            return (0, view_4.makeMemoryView)(this.type.toType, off);
         }
         if (this.type.location === solc_typed_ast_1.DataLocation.Storage ||
             this.type.location === solc_typed_ast_1.DataLocation.Transient) {
-            return (0, storage_1.makeStorageView)(this.type.to, [off, 32]);
+            return (0, storage_1.makeStorageView)(this.type.toType, [off, 32]);
         }
         (0, utils_1.nyi)(`Stack pointer to ${this.type.location}`);
     }
@@ -166,19 +167,19 @@ class PointerStackView extends BaseStackView {
 }
 exports.PointerStackView = PointerStackView;
 function makeStackView(type, loc) {
-    if (type instanceof solc_typed_ast_1.IntType) {
+    if (type instanceof runtime_types_1.IntType) {
         return new IntStackView(type, loc);
     }
-    if (type instanceof solc_typed_ast_1.AddressType) {
+    if (type instanceof runtime_types_1.AddressType) {
         return new AddressStackView(type, loc);
     }
-    if (type instanceof solc_typed_ast_1.FixedBytesType) {
+    if (type instanceof runtime_types_1.FixedBytesType) {
         return new FixedBytesStackView(type, loc);
     }
-    if (type instanceof solc_typed_ast_1.BoolType) {
+    if (type instanceof runtime_types_1.BoolType) {
         return new BoolStackView(type, loc);
     }
-    if (type instanceof solc_typed_ast_1.PointerType) {
+    if (type instanceof runtime_types_1.PointerType) {
         return new PointerStackView(type, loc);
     }
     (0, utils_1.nyi)(`makeStackView(${type.pp()}, ${loc})`);

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

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

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

@@ -1,15 +1,14 @@
-import { AddressType, ArrayType, BoolType, BytesType, FixedBytesType, IntType, MappingType, PointerType, StringType, TypeNode } from "solc-typed-ast";
 import { DecodingFailure, Struct, Value } from "../value";
 import { ArrayLikeView, IndexableView, PointerView, StructView, View } from "../view";
 import { Storage } from "../../types";
 import { Address } from "@ethereumjs/util";
-import { ExpStructType, MissingType } from "../exp_types";
 import { MapKeys } from "../../tracers";
-interface ArrayLikeStorageView<ValViewT extends BaseStorageView<Value, TypeNode>> extends ArrayLikeView<Storage, ValViewT> {
+import { AddressType, ArrayType, BaseRuntimeType, BoolType, BytesType, FixedBytesType, IntType, MappingType, MissingType, PointerType, StringType, StructType } from "../../runtime_types";
+interface ArrayLikeStorageView<ValViewT extends BaseStorageView<Value, BaseRuntimeType>> extends ArrayLikeView<Storage, ValViewT> {
 }
 type StorageLocation = [bigint, number];
-export declare function isArrayLikeStorageView(v: any): v is ArrayLikeStorageView<BaseStorageView<Value, TypeNode>>;
-export declare abstract class BaseStorageView<Val extends Value, Type extends TypeNode = TypeNode> extends View<Storage, Val, [bigint, number], Type> {
+export declare function isArrayLikeStorageView(v: any): v is ArrayLikeStorageView<BaseStorageView<Value, BaseRuntimeType>>;
+export declare abstract class BaseStorageView<Val extends Value, Type extends BaseRuntimeType = BaseRuntimeType> extends View<Storage, Val, [bigint, number], Type> {
     key: bigint;
     endOffsetInWord: number;
     constructor(type: Type, loc: [bigint, number]);
@@ -66,15 +65,15 @@ export declare class FixedBytesStorageView extends BaseStorageView<Uint8Array, F
     nextLoc(): StorageLocation;
     size(): bigint | DecodingFailure;
 }
-export declare class PointerStorageView extends BaseStorageView<Value, PointerType> implements PointerView<Storage, BaseStorageView<Value, TypeNode>> {
-    innerView: BaseStorageView<Value, TypeNode>;
+export declare class PointerStorageView extends BaseStorageView<Value, PointerType> implements PointerView<Storage, BaseStorageView<Value, BaseRuntimeType>> {
+    innerView: BaseStorageView<Value, BaseRuntimeType>;
     constructor(type: PointerType, loc: [bigint, number]);
     decode(state: Storage, mapKeys?: MapKeys): Value;
     encode(value: Value, state: Storage): Storage;
     nextLoc(): StorageLocation | undefined;
-    toView(): BaseStorageView<Value, TypeNode>;
+    toView(): BaseStorageView<Value, BaseRuntimeType>;
 }
-export declare class ArrayStorageView extends BaseStorageView<Value[], ArrayType> implements ArrayLikeStorageView<BaseStorageView<Value, TypeNode>> {
+export declare class ArrayStorageView extends BaseStorageView<Value[], ArrayType> implements ArrayLikeStorageView<BaseStorageView<Value, BaseRuntimeType>> {
     private _nextLoc;
     /**
      * Helper to compute how many words elements "take". This is not straightforward, as we may pack multiple
@@ -82,31 +81,31 @@ export declare class ArrayStorageView extends BaseStorageView<Value[], ArrayType
      * I.e. we state that we can fit `nEls` elements in `nWords`, where this is the smalles "package" possible.
      * @param elT
      */
-    static computeElmentSize(elT: TypeNode): [bigint, bigint] | undefined;
+    static computeElmentSize(elT: BaseRuntimeType): [bigint, bigint] | undefined;
     constructor(type: ArrayType, loc: [bigint, number]);
     nextLoc(): StorageLocation | undefined;
     decode(state: Storage, mapKeys?: MapKeys): Value[] | DecodingFailure;
     encode(value: Value[], state: Storage): Storage;
-    indexView(key: bigint, state: Storage): DecodingFailure | BaseStorageView<Value, TypeNode>;
+    indexView(key: bigint, state: Storage): DecodingFailure | BaseStorageView<Value, BaseRuntimeType>;
     size(state: Storage): bigint | DecodingFailure;
 }
-export declare class StructStorageView extends BaseStorageView<Struct, ExpStructType> implements StructView<Storage, BaseStorageView<Value, TypeNode>> {
-    fieldViews: Array<[string, BaseStorageView<Value, TypeNode>]>;
+export declare class StructStorageView extends BaseStorageView<Struct, StructType> implements StructView<Storage, BaseStorageView<Value, BaseRuntimeType>> {
+    fieldViews: Array<[string, BaseStorageView<Value, BaseRuntimeType>]>;
     private _nextLoc;
-    constructor(type: ExpStructType, loc: StorageLocation);
+    constructor(type: StructType, loc: StorageLocation);
     nextLoc(): StorageLocation | undefined;
     decode(state: Storage, mapKeys?: MapKeys): Struct;
     encode(value: Struct, state: Storage): Storage;
-    fieldView(name: string): BaseStorageView<Value, TypeNode> | DecodingFailure;
+    fieldView(name: string): BaseStorageView<Value, BaseRuntimeType> | DecodingFailure;
 }
-export declare class MapStorageView extends BaseStorageView<Map<Value, Value>, MappingType> implements IndexableView<Value, Storage, BaseStorageView<Value, TypeNode>> {
+export declare class MapStorageView extends BaseStorageView<Map<Value, Value>, MappingType> implements IndexableView<Value, Storage, BaseStorageView<Value, BaseRuntimeType>> {
     constructor(type: MappingType, loc: StorageLocation);
     nextLoc(): StorageLocation;
     decode(state: Storage, mapKeys?: MapKeys): Map<Value, Value>;
     encode(value: Map<Value, Value>, state: Storage): Storage;
-    indexView(key: Value): DecodingFailure | BaseStorageView<Value, TypeNode>;
+    indexView(key: Value): DecodingFailure | BaseStorageView<Value, BaseRuntimeType>;
 }
-export declare abstract class PackedArrayStorageView<V extends Value, T extends TypeNode> extends BaseStorageView<V, T> {
+export declare abstract class PackedArrayStorageView<V extends Value, T extends BaseRuntimeType> extends BaseStorageView<V, T> {
     nextLoc(): StorageLocation;
     protected getSize(state: Storage): bigint | DecodingFailure;
     decodeBytes(state: Storage): Uint8Array | DecodingFailure;
@@ -129,6 +128,6 @@ export declare class MissingStorageView extends BaseStorageView<DecodingFailure,
     nextLoc(): StorageLocation | undefined;
 }
 export declare function nextWord(loc: StorageLocation): StorageLocation;
-export declare function makeStorageView(type: TypeNode, loc: StorageLocation): BaseStorageView<Value, TypeNode>;
+export declare function makeStorageView(type: BaseRuntimeType, loc: StorageLocation): BaseStorageView<Value, BaseRuntimeType>;
 export {};
 //# sourceMappingURL=view.d.ts.map

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

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

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

@@ -10,11 +10,11 @@ const view_1 = require("../view");
 const utils_1 = require("../../../utils");
 const keccak_1 = require("ethereum-cryptography/keccak");
 const util_1 = require("@ethereumjs/util");
-const exp_types_1 = require("../exp_types");
 const memory_1 = require("../memory");
 const utils_2 = require("../utils");
 const view_2 = require("../memory/view");
 const utils_3 = require("ethereum-cryptography/utils");
+const runtime_types_1 = require("../../runtime_types");
 function isArrayLikeStorageView(v) {
     return (v instanceof FixedBytesStorageView ||
         v instanceof ArrayStorageView ||
@@ -72,17 +72,17 @@ class BaseStorageView extends view_1.View {
      * Helper to decode an int type at a given location in storage.
      */
     decodeIntAt(key, endOffsetInWord, type, state) {
-        const size = type.nBits / 8;
+        const size = type.numBits / 8;
         if (endOffsetInWord < size) {
             return new value_1.DecodingFailure(`Internal Error: Can't decode ${type.pp()} starting at offset ${endOffsetInWord} in word ${key}`);
         }
         const rawBytes = this.fetchBytes(key, endOffsetInWord - size, size, state);
         let res = (0, utils_1.bigEndianBufToBigint)(rawBytes);
         // Convert signed negative 2's complement values
-        if (type.signed && (res & (BigInt(1) << BigInt(type.nBits - 1))) !== BigInt(0)) {
+        if (type.signed && (res & (BigInt(1) << BigInt(type.numBits - 1))) !== BigInt(0)) {
             // Mask out any 1's above the number's size
-            res = res & ((BigInt(1) << BigInt(type.nBits)) - BigInt(1));
-            res = -((BigInt(1) << BigInt(type.nBits)) - res);
+            res = res & ((BigInt(1) << BigInt(type.numBits)) - BigInt(1));
+            res = -((BigInt(1) << BigInt(type.numBits)) - res);
         }
         if (!(0, utils_1.fits)(res, type)) {
             return new value_1.DecodingFailure(`Decoded value ${res} from ${[key, endOffsetInWord]} doesn't fit in expected typee ${type.pp()}`);
@@ -90,7 +90,7 @@ class BaseStorageView extends view_1.View {
         return res;
     }
     encodeIntAt(val, key, endOffsetInWord, type, state) {
-        const size = type.nBits / 8;
+        const size = type.numBits / 8;
         if (endOffsetInWord < size) {
             throw new view_1.EncodingError(`Internal Error: Can't decode ${type.pp()} starting at offset ${endOffsetInWord} in word ${key}`);
         }
@@ -98,7 +98,7 @@ class BaseStorageView extends view_1.View {
             throw new view_1.EncodingError(`Decoded value ${val} from ${[key, endOffsetInWord]} doesn't fit in expected typee ${type.pp()}`);
         }
         const word = this.fetchWord(key, state);
-        (0, utils_1.encodeBigintInBigEndianBuf)(val, word, type.nBits / 8, endOffsetInWord);
+        (0, utils_1.encodeBigintInBigEndianBuf)(val, word, type.numBits / 8, endOffsetInWord);
         return this.setWord(key, word, state);
     }
     pp() {
@@ -111,7 +111,7 @@ class IntStorageView extends BaseStorageView {
         return this.decodeIntAt(this.key, this.endOffsetInWord, this.type, state);
     }
     nextLoc() {
-        return move(this.loc, this.type.nBits / 8);
+        return move(this.loc, this.type.numBits / 8);
     }
     encode(value, state) {
         return this.encodeIntAt(value, this.key, this.endOffsetInWord, this.type, state);
@@ -160,13 +160,13 @@ exports.AddressStorageView = AddressStorageView;
  */
 class SingleByteStorageView extends BaseStorageView {
     constructor(loc) {
-        super(solc_typed_ast_1.types.byte, loc);
+        super(utils_1.byte, loc);
     }
     decode(state) {
-        if (this.endOffsetInWord < this.type.size) {
+        if (this.endOffsetInWord < this.type.numBytes) {
             return new value_1.DecodingFailure(`Unalighed Read: Can't decode ${this.type.pp()} starting at offset ${this.endOffsetInWord} in word ${this.key}`);
         }
-        const byte = this.fetchBytes(this.key, this.endOffsetInWord - this.type.size, this.type.size, state);
+        const byte = this.fetchBytes(this.key, this.endOffsetInWord - this.type.numBytes, this.type.numBytes, state);
         return BigInt(byte[0]);
     }
     encode(value, state) {
@@ -174,50 +174,50 @@ class SingleByteStorageView extends BaseStorageView {
         if (!(0, utils_2.inRange)(value, 0, 255)) {
             throw new view_1.EncodingError(`${value} not in byte range [0, 255]`);
         }
-        word[this.endOffsetInWord - this.type.size] = Number(value);
+        word[this.endOffsetInWord - this.type.numBytes] = Number(value);
         return this.setWord(this.key, word, state);
     }
     nextLoc() {
-        return move(this.loc, this.type.size);
+        return move(this.loc, this.type.numBytes);
     }
 }
 exports.SingleByteStorageView = SingleByteStorageView;
 class FixedBytesStorageView extends BaseStorageView {
     decode(state) {
-        if (this.endOffsetInWord < this.type.size) {
+        if (this.endOffsetInWord < this.type.numBytes) {
             return new value_1.DecodingFailure(`Unalighed Read: Can't decode ${this.type.pp()} starting at offset ${this.endOffsetInWord} in word ${this.key}`);
         }
-        return this.fetchBytes(this.key, this.endOffsetInWord - this.type.size, this.type.size, state);
+        return this.fetchBytes(this.key, this.endOffsetInWord - this.type.numBytes, this.type.numBytes, state);
     }
     encode(value, state) {
-        if (this.endOffsetInWord < this.type.size) {
+        if (this.endOffsetInWord < this.type.numBytes) {
             throw new view_1.EncodingError(`Unalighed read: Can't decode ${this.type.pp()} starting at offset ${this.endOffsetInWord} in word ${this.key}`);
         }
         const word = this.fetchWord(this.key, state);
-        word.set(value, this.endOffsetInWord - this.type.size);
+        word.set(value, this.endOffsetInWord - this.type.numBytes);
         return this.setWord(this.key, word, state);
     }
     indexView(key) {
-        if (!(0, utils_2.inRange)(key, 0, this.type.size)) {
+        if (!(0, utils_2.inRange)(key, 0, this.type.numBytes)) {
             return new value_1.DecodingFailure(`Invalid index ${key} in ${this.type.pp()}`);
         }
         return new SingleByteStorageView([
             this.key,
-            this.endOffsetInWord - this.type.size + Number(key) + 1
+            this.endOffsetInWord - this.type.numBytes + Number(key) + 1
         ]);
     }
     nextLoc() {
-        return move(this.loc, this.type.size);
+        return move(this.loc, this.type.numBytes);
     }
     size() {
-        return BigInt(this.type.size);
+        return BigInt(this.type.numBytes);
     }
 }
 exports.FixedBytesStorageView = FixedBytesStorageView;
 class PointerStorageView extends BaseStorageView {
     constructor(type, loc) {
         super(type, loc);
-        this.innerView = makeStorageView(type.to, loc);
+        this.innerView = makeStorageView(type.toType, loc);
     }
     decode(state, mapKeys) {
         return this.innerView.decode(state, mapKeys);
@@ -388,7 +388,7 @@ class StructStorageView extends BaseStorageView {
         let fieldLoc = this.loc;
         for (const [name, fieldT] of this.type.fields) {
             const fieldView = fieldLoc === undefined
-                ? new MissingStorageView(new exp_types_1.MissingType(undefined), [-1n, 32])
+                ? new MissingStorageView(new runtime_types_1.MissingType(undefined), [-1n, 32])
                 : makeStorageView(fieldT, fieldLoc);
             this.fieldViews.push([name, fieldView]);
             fieldLoc = fieldView.nextLoc();
@@ -427,17 +427,19 @@ class StructStorageView extends BaseStorageView {
 }
 exports.StructStorageView = StructStorageView;
 function decodeMapRefKey(type, data) {
-    if (!(type instanceof solc_typed_ast_1.StringType || type instanceof solc_typed_ast_1.BytesType)) {
+    if (!(type instanceof runtime_types_1.StringType || type instanceof runtime_types_1.BytesType)) {
         throw new Error(`Invalid map reference key type ${type.pp()}`);
     }
-    return type instanceof solc_typed_ast_1.StringType ? (0, util_1.bytesToUtf8)(data) : (0, utils_3.bytesToHex)(data);
+    return type instanceof runtime_types_1.StringType ? (0, util_1.bytesToUtf8)(data) : (0, utils_3.bytesToHex)(data);
 }
 function encodeMapKey(keyT, value) {
-    if (keyT instanceof solc_typed_ast_1.PointerType) {
-        if (!(keyT.to instanceof solc_typed_ast_1.StringType || keyT.to instanceof solc_typed_ast_1.BytesType)) {
+    if (keyT instanceof runtime_types_1.PointerType) {
+        if (!(keyT.toType instanceof runtime_types_1.StringType || keyT.toType instanceof runtime_types_1.BytesType)) {
             throw new Error(`Invalid map reference key type ${keyT.pp()}`);
         }
-        return keyT.to instanceof solc_typed_ast_1.StringType ? (0, utils_3.utf8ToBytes)(value) : value;
+        return keyT.toType instanceof runtime_types_1.StringType
+            ? (0, utils_3.utf8ToBytes)(value)
+            : value;
     }
     const buf = new Uint8Array(32);
     const keyV = (0, memory_1.makeMemoryView)(keyT, 0n);
@@ -461,7 +463,7 @@ class MapStorageView extends BaseStorageView {
             return res;
         }
         let keyView;
-        if (!(this.type.keyType instanceof solc_typed_ast_1.PointerType)) {
+        if (!(this.type.keyType instanceof runtime_types_1.PointerType)) {
             keyView = (0, memory_1.makeMemoryView)(this.type.keyType, 0n);
         }
         // @todo(dimo) Would it be better here to check that `candidateSlot` is an explicitly defined in storage, and not just a 0 by default?
@@ -471,7 +473,7 @@ class MapStorageView extends BaseStorageView {
                 decodedKey = keyView.decode(candidateKey);
             }
             else {
-                decodedKey = decodeMapRefKey(this.type.keyType.to, candidateKey);
+                decodedKey = decodeMapRefKey(this.type.keyType.toType, candidateKey);
             }
             const valueView = makeStorageView(this.type.valueType, [candidateSlot, 32]);
             const decodedValue = valueView.decode(state, mapKeys);
@@ -619,24 +621,24 @@ exports.StringStorageView = StringStorageView;
 class MissingStorageView extends BaseStorageView {
     constructor(type, loc) {
         super(type, loc);
-        if (this.type.rawTypeName !== undefined) {
-            const typeString = this.type.rawTypeName.typeString;
-            if ((0, utils_2.isTypeStringStatic32BytesInStorage)(typeString)) {
-                (0, solc_typed_ast_1.assert)(this.endOffsetInWord === 32, `Unexpected non-word aligned {0} in storage`, typeString);
+        if (this.type.typeString !== undefined) {
+            if ((0, utils_2.isTypeStringStatic32BytesInStorage)(this.type.typeString)) {
+                (0, solc_typed_ast_1.assert)(this.endOffsetInWord === 32, `Unexpected non-word aligned {0} in storage`, this.type.typeString);
             }
         }
     }
     decode() {
-        return new value_1.DecodingFailure(`missing ${this.type.rawTypeName ? this.type.rawTypeName.type : "<unknown>"}`);
+        const typeStr = this.type.typeString;
+        return new value_1.DecodingFailure(`missing ${typeStr ? typeStr : "<unknown>"}`);
     }
     encode() {
         throw new view_1.EncodingError(`Cannot encode a missing value`);
     }
     nextLoc() {
-        if (this.type.rawTypeName === undefined) {
+        if (this.type.typeString === undefined) {
             return undefined;
         }
-        const typeString = this.type.rawTypeName.typeString;
+        const typeString = this.type.typeString;
         // If we can guess this is a dynamic array or mapping from the typestring, then we know the nextLoc
         if ((0, utils_2.isTypeStringStatic32BytesInStorage)(typeString)) {
             return nextWord(this.loc);
@@ -665,10 +667,10 @@ function nextWord(loc) {
     return [loc[0] + 1n, 32];
 }
 function typeStartsInNewWord(t) {
-    if (t instanceof solc_typed_ast_1.PointerType) {
-        return typeStartsInNewWord(t.to);
+    if (t instanceof runtime_types_1.PointerType) {
+        return typeStartsInNewWord(t.toType);
     }
-    return t instanceof solc_typed_ast_1.ArrayType || t instanceof solc_typed_ast_1.MappingType || t instanceof exp_types_1.ExpStructType;
+    return t instanceof runtime_types_1.ArrayType || t instanceof runtime_types_1.MappingType || t instanceof runtime_types_1.StructType;
 }
 /**
  * Compute the 'static' size that a variable of primitive type `typ` would take
@@ -677,35 +679,35 @@ function typeStartsInNewWord(t) {
  * starts in own word too).
  */
 function staticSize(typ) {
-    if (typ instanceof solc_typed_ast_1.IntType) {
-        return typ.nBits / 8;
+    if (typ instanceof runtime_types_1.IntType) {
+        return typ.numBits / 8;
     }
-    if (typ instanceof solc_typed_ast_1.FixedBytesType) {
-        return typ.size;
+    if (typ instanceof runtime_types_1.FixedBytesType) {
+        return typ.numBytes;
     }
-    if (typ instanceof solc_typed_ast_1.BoolType) {
+    if (typ instanceof runtime_types_1.BoolType) {
         return 1;
     }
-    if (typ instanceof solc_typed_ast_1.AddressType) {
+    if (typ instanceof runtime_types_1.AddressType) {
         return 20;
     }
-    if (typ instanceof solc_typed_ast_1.BytesType || typ instanceof solc_typed_ast_1.StringType) {
+    if (typ instanceof runtime_types_1.BytesType || typ instanceof runtime_types_1.StringType) {
         return 32;
     }
-    if (typ instanceof solc_typed_ast_1.PointerType) {
-        return staticSize(typ.to);
+    if (typ instanceof runtime_types_1.PointerType) {
+        return staticSize(typ.toType);
     }
-    if (typ instanceof exp_types_1.MissingType &&
-        typ.rawTypeName !== undefined &&
-        (0, utils_2.isTypeStringStatic32BytesInStorage)(typ.rawTypeName.typeString)) {
+    if (typ instanceof runtime_types_1.MissingType &&
+        typ.typeString !== undefined &&
+        (0, utils_2.isTypeStringStatic32BytesInStorage)(typ.typeString)) {
         return 32;
     }
     (0, utils_1.nyi)(`NYI staticSize(${typ.pp()})`);
 }
 function makeStorageView(type, loc) {
-    if (type instanceof exp_types_1.MissingType) {
-        if (type.rawTypeName !== undefined) {
-            if ((0, utils_2.isTypeStringStatic32BytesInStorage)(type.rawTypeName.typeString)) {
+    if (type instanceof runtime_types_1.MissingType) {
+        if (type.typeString !== undefined) {
+            if ((0, utils_2.isTypeStringStatic32BytesInStorage)(type.typeString)) {
                 loc = loc[1] === 32 ? loc : nextWord(loc);
             }
         }
@@ -714,34 +716,34 @@ function makeStorageView(type, loc) {
     if (!typeFitsInLoc(type, loc)) {
         loc = nextWord(loc);
     }
-    if (type instanceof solc_typed_ast_1.IntType) {
+    if (type instanceof runtime_types_1.IntType) {
         return new IntStorageView(type, loc);
     }
-    if (type instanceof solc_typed_ast_1.BoolType) {
+    if (type instanceof runtime_types_1.BoolType) {
         return new BoolStorageView(utils_1.bool, loc);
     }
-    if (type instanceof solc_typed_ast_1.AddressType) {
+    if (type instanceof runtime_types_1.AddressType) {
         return new AddressStorageView(utils_1.address, loc);
     }
-    if (type instanceof solc_typed_ast_1.FixedBytesType) {
+    if (type instanceof runtime_types_1.FixedBytesType) {
         return new FixedBytesStorageView(type, loc);
     }
-    if (type instanceof solc_typed_ast_1.BytesType) {
+    if (type instanceof runtime_types_1.BytesType) {
         return new BytesStorageView(type, loc);
     }
-    if (type instanceof solc_typed_ast_1.StringType) {
+    if (type instanceof runtime_types_1.StringType) {
         return new StringStorageView(type, loc);
     }
-    if (type instanceof solc_typed_ast_1.ArrayType) {
+    if (type instanceof runtime_types_1.ArrayType) {
         return new ArrayStorageView(type, loc);
     }
-    if (type instanceof solc_typed_ast_1.PointerType) {
+    if (type instanceof runtime_types_1.PointerType) {
         return new PointerStorageView(type, loc);
     }
-    if (type instanceof exp_types_1.ExpStructType) {
+    if (type instanceof runtime_types_1.StructType) {
         return new StructStorageView(type, loc);
     }
-    if (type instanceof solc_typed_ast_1.MappingType) {
+    if (type instanceof runtime_types_1.MappingType) {
         return new MapStorageView(type, loc);
     }
     (0, utils_1.nyi)(`makeStoragView(${type.pp()})`);