solc-typed-ast 19.0.0 → 19.2.0

package/dist/ast/ast_reader.d.ts

@@ -40,6 +40,7 @@ export declare class ASTContext {
     unregister(...nodes: ASTNode[]): void;
     locate(id: number): ASTNode;
     require(id: number): ASTNode;
+    requireType<T extends ASTNode>(id: number, constr: ASTNodeConstructor<T>): T;
     contains(node: ASTNode): boolean;
 }
 export declare class ASTPostprocessor {

package/dist/ast/ast_reader.d.ts.map

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

package/dist/ast/ast_reader.js

@@ -64,6 +64,13 @@ class ASTContext {
         }
         throw new Error("Required node not found for id " + id);
     }
+    requireType(id, constr) {
+        const node = this.locate(id);
+        if (node instanceof constr) {
+            return node;
+        }
+        throw new Error(`Required node of type ${constr.name} for id ${id}, not ${node}`);
+    }
     contains(node) {
         return this.locate(node.id) === node;
     }

package/dist/ast/ast_reader.js.map

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

package/dist/misc/utils.d.ts

@@ -1,4 +1,4 @@
-import { PPIsh } from "..";
+import { PPIsh } from "./pretty_printing";
 export declare function forAll<T>(iterable: Iterable<T>, cb: (v: T) => boolean): boolean;
 export declare function forAny<T>(iterable: Iterable<T>, cb: (v: T) => boolean): boolean;
 export declare function assert(condition: boolean, message: string, ...details: PPIsh[]): asserts condition;

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/misc/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AAEhC,wBAAgB,MAAM,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,OAAO,GAAG,OAAO,CAQ/E;AAED,wBAAgB,MAAM,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,OAAO,GAAG,OAAO,CAQ/E;AAED,wBAAgB,MAAM,CAClB,SAAS,EAAE,OAAO,EAClB,OAAO,EAAE,MAAM,EACf,GAAG,OAAO,EAAE,KAAK,EAAE,GACpB,OAAO,CAAC,SAAS,CAMnB;AAED,wBAAgB,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,CAAC,EAAE,CAO9C"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/misc/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE/C,wBAAgB,MAAM,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,OAAO,GAAG,OAAO,CAQ/E;AAED,wBAAgB,MAAM,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,OAAO,GAAG,OAAO,CAQ/E;AAED,wBAAgB,MAAM,CAClB,SAAS,EAAE,OAAO,EAClB,OAAO,EAAE,MAAM,EACf,GAAG,OAAO,EAAE,KAAK,EAAE,GACpB,OAAO,CAAC,SAAS,CAMnB;AAED,wBAAgB,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,CAAC,EAAE,CAO9C"}

package/dist/misc/utils.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.repeat = exports.assert = exports.forAny = exports.forAll = void 0;
-const __1 = require("..");
+const pretty_printing_1 = require("./pretty_printing");
 function forAll(iterable, cb) {
     for (const el of iterable) {
         if (!cb(el)) {
@@ -24,7 +24,7 @@ function assert(condition, message, ...details) {
     if (condition) {
         return;
     }
-    throw new Error((0, __1.fmt)(message, ...details));
+    throw new Error((0, pretty_printing_1.fmt)(message, ...details));
 }
 exports.assert = assert;
 function repeat(x, n) {

package/dist/misc/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/misc/utils.ts"],"names":[],"mappings":";;;AAAA,0BAAgC;AAEhC,SAAgB,MAAM,CAAI,QAAqB,EAAE,EAAqB;IAClE,KAAK,MAAM,EAAE,IAAI,QAAQ,EAAE,CAAC;QACxB,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;YACV,OAAO,KAAK,CAAC;QACjB,CAAC;IACL,CAAC;IAED,OAAO,IAAI,CAAC;AAChB,CAAC;AARD,wBAQC;AAED,SAAgB,MAAM,CAAI,QAAqB,EAAE,EAAqB;IAClE,KAAK,MAAM,EAAE,IAAI,QAAQ,EAAE,CAAC;QACxB,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;YACT,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AARD,wBAQC;AAED,SAAgB,MAAM,CAClB,SAAkB,EAClB,OAAe,EACf,GAAG,OAAgB;IAEnB,IAAI,SAAS,EAAE,CAAC;QACZ,OAAO;IACX,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,IAAA,OAAG,EAAC,OAAO,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC;AAC9C,CAAC;AAVD,wBAUC;AAED,SAAgB,MAAM,CAAI,CAAI,EAAE,CAAS;IACrC,MAAM,GAAG,GAAQ,EAAE,CAAC;IACpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QACzB,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAChB,CAAC;IAED,OAAO,GAAG,CAAC;AACf,CAAC;AAPD,wBAOC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/misc/utils.ts"],"names":[],"mappings":";;;AAAA,uDAA+C;AAE/C,SAAgB,MAAM,CAAI,QAAqB,EAAE,EAAqB;IAClE,KAAK,MAAM,EAAE,IAAI,QAAQ,EAAE,CAAC;QACxB,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;YACV,OAAO,KAAK,CAAC;QACjB,CAAC;IACL,CAAC;IAED,OAAO,IAAI,CAAC;AAChB,CAAC;AARD,wBAQC;AAED,SAAgB,MAAM,CAAI,QAAqB,EAAE,EAAqB;IAClE,KAAK,MAAM,EAAE,IAAI,QAAQ,EAAE,CAAC;QACxB,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;YACT,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AARD,wBAQC;AAED,SAAgB,MAAM,CAClB,SAAkB,EAClB,OAAe,EACf,GAAG,OAAgB;IAEnB,IAAI,SAAS,EAAE,CAAC;QACZ,OAAO;IACX,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,IAAA,qBAAG,EAAC,OAAO,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC;AAC9C,CAAC;AAVD,wBAUC;AAED,SAAgB,MAAM,CAAI,CAAI,EAAE,CAAS;IACrC,MAAM,GAAG,GAAQ,EAAE,CAAC;IACpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QACzB,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAChB,CAAC;IAED,OAAO,GAAG,CAAC;AACf,CAAC;AAPD,wBAOC"}

package/dist/typeIdentifiers/abi.d.ts

@@ -0,0 +1,15 @@
+import { ASTContext, EnumDefinition } from "../ast";
+import { TypeIdentifier, IntTypeId } from "./ast";
+/**
+ * Return the int typeIdentifier corresponding to a given Enum
+ * @param decl
+ * @returns
+ */
+export declare function enumToIntTypeId(decl: EnumDefinition): IntTypeId;
+/**
+ * Given an function argument's `TypeIdentifier` `from`, return the
+ * `TypeIdentifier` that this argument would be encoded as in calldata.
+ * @param from
+ */
+export declare function toABIType(from: TypeIdentifier, ctx: ASTContext): TypeIdentifier;
+//# sourceMappingURL=abi.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"abi.d.ts","sourceRoot":"","sources":["../../src/typeIdentifiers/abi.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,UAAU,EAGV,cAAc,EAEjB,MAAM,QAAQ,CAAC;AAEhB,OAAO,EACH,cAAc,EAMd,SAAS,EAUZ,MAAM,OAAO,CAAC;AAIf;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,cAAc,GAAG,SAAS,CAoB/D;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,cAAc,EAAE,GAAG,EAAE,UAAU,GAAG,cAAc,CA8E/E"}

package/dist/typeIdentifiers/abi.js

@@ -0,0 +1,94 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toABIType = exports.enumToIntTypeId = void 0;
+const ast_1 = require("../ast");
+const misc_1 = require("../misc");
+const ast_2 = require("./ast");
+const constants_1 = require("./constants");
+const utils_1 = require("./utils");
+/**
+ * Return the int typeIdentifier corresponding to a given Enum
+ * @param decl
+ * @returns
+ */
+function enumToIntTypeId(decl) {
+    const length = decl.children.length;
+    let size;
+    for (let n = 8; n <= 32; n += 8) {
+        if (length <= 2 ** n) {
+            size = n;
+            break;
+        }
+    }
+    (0, misc_1.assert)(size !== undefined, "Unable to detect enum type size - member count exceeds 2 ** 32", decl);
+    return new ast_2.IntTypeId(size, false);
+}
+exports.enumToIntTypeId = enumToIntTypeId;
+/**
+ * Given an function argument's `TypeIdentifier` `from`, return the
+ * `TypeIdentifier` that this argument would be encoded as in calldata.
+ * @param from
+ */
+function toABIType(from, ctx) {
+    if (from instanceof ast_2.AddressTypeId) {
+        // normalize payable -> address
+        return constants_1.addressT;
+    }
+    // Simple case - these are passed unchanged
+    if (from instanceof ast_2.BoolTypeId ||
+        from instanceof ast_2.BytesTypeId ||
+        from instanceof ast_2.StringTypeId ||
+        from instanceof ast_2.FixedBytesTypeId ||
+        from instanceof ast_2.IntTypeId) {
+        return from;
+    }
+    if ((0, utils_1.isTypeInStorage)(from)) {
+        return constants_1.uint256T;
+    }
+    if (from instanceof ast_2.PointerTypeId) {
+        (0, misc_1.assert)(from.location !== ast_1.DataLocation.Storage, `Unexpected pointer {0}`, from);
+        return toABIType(from.toType, ctx);
+    }
+    // Size arrays are passed as tuples, unsized arrays as arrays
+    if (from instanceof ast_2.ArrayTypeId) {
+        const elT = toABIType(from.elT, ctx);
+        return from.size === undefined
+            ? new ast_2.ArrayTypeId(elT, from.size)
+            : new ast_2.TupleTypeId((0, misc_1.repeat)(elT, Number(from.size)));
+    }
+    if (from instanceof ast_2.UserDefinedValueTypeId) {
+        const def = ctx.requireType(from.id, ast_1.UserDefinedValueTypeDefinition);
+        const innerT = (0, utils_1.typeOf)(def.underlyingType);
+        return toABIType(innerT, ctx);
+    }
+    // Contracts are passed as addresses
+    if (from instanceof ast_2.ContractTypeId) {
+        return constants_1.addressT;
+    }
+    // Enums are passed as the smallest number that fits
+    if (from instanceof ast_2.EnumTypeId) {
+        const def = ctx.requireType(from.id, ast_1.EnumDefinition);
+        return enumToIntTypeId(def);
+    }
+    // Structs are passed as tuples
+    if (from instanceof ast_2.StructTypeId) {
+        const def = ctx.requireType(from.id, ast_1.StructDefinition);
+        let fieldTs = def.vMembers.map((decl) => (0, utils_1.typeOf)(decl));
+        // Remove any mappings
+        fieldTs = fieldTs.filter((fieldT) => !(fieldT instanceof ast_2.MappingTypeId));
+        // Convert the fields to ABI types and filter out any empty tuples.
+        // Empty tuples can result if a field is a struct contains only mappings.
+        // Also note that struct fields have "storage" as a default location.
+        // Convert to Memory to avoid treating them as storage pointers.
+        const abiFieldTs = fieldTs
+            .map((fieldT) => toABIType((0, utils_1.changeLocationTo)(fieldT, ast_1.DataLocation.Memory), ctx))
+            .filter((abiFieldT) => !(abiFieldT instanceof ast_2.TupleTypeId && abiFieldT.components.length === 0));
+        return new ast_2.TupleTypeId(abiFieldTs);
+    }
+    if (from instanceof ast_2.FunctionTypeId && from.kind === "external") {
+        return constants_1.bytes24T;
+    }
+    (0, misc_1.assert)(false, `Cannot abi encode type ${from.pp()}`);
+}
+exports.toABIType = toABIType;
+//# sourceMappingURL=abi.js.map

package/dist/typeIdentifiers/abi.js.map

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

package/dist/typeIdentifiers/ast/pointer.d.ts

@@ -1,4 +1,4 @@
-import { DataLocation } from "../../ast";
+import { DataLocation } from "../../ast/constants";
 import { TypeIdentifier } from "./type_identifier";
 export declare class PointerTypeId extends TypeIdentifier {
     readonly toType: TypeIdentifier;

package/dist/typeIdentifiers/ast/pointer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pointer.d.ts","sourceRoot":"","sources":["../../../src/typeIdentifiers/ast/pointer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,qBAAa,aAAc,SAAQ,cAAc;aAEzB,MAAM,EAAE,cAAc;aACtB,QAAQ,EAAE,YAAY;aACtB,SAAS,EAAE,OAAO;gBAFlB,MAAM,EAAE,cAAc,EACtB,QAAQ,EAAE,YAAY,EACtB,SAAS,EAAE,OAAO;IAKtC,EAAE,IAAI,MAAM;CAGf"}
+{"version":3,"file":"pointer.d.ts","sourceRoot":"","sources":["../../../src/typeIdentifiers/ast/pointer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,qBAAa,aAAc,SAAQ,cAAc;aAEzB,MAAM,EAAE,cAAc;aACtB,QAAQ,EAAE,YAAY;aACtB,SAAS,EAAE,OAAO;gBAFlB,MAAM,EAAE,cAAc,EACtB,QAAQ,EAAE,YAAY,EACtB,SAAS,EAAE,OAAO;IAKtC,EAAE,IAAI,MAAM;CAGf"}

package/dist/typeIdentifiers/ast/rational_num.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rational_num.d.ts","sourceRoot":"","sources":["../../../src/typeIdentifiers/ast/rational_num.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGnD,qBAAa,iBAAkB,SAAQ,cAAc;aAE7B,SAAS,EAAE,MAAM;aACjB,WAAW,EAAE,MAAM;gBADnB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM;IAMvC,EAAE,IAAI,MAAM;CAGf"}
+{"version":3,"file":"rational_num.d.ts","sourceRoot":"","sources":["../../../src/typeIdentifiers/ast/rational_num.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGnD,qBAAa,iBAAkB,SAAQ,cAAc;aAE7B,SAAS,EAAE,MAAM;aACjB,WAAW,EAAE,MAAM;gBADnB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM;IAKvC,EAAE,IAAI,MAAM;CAGf"}

package/dist/typeIdentifiers/ast/rational_num.js

@@ -1,12 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RationalNumTypeId = void 0;
-const misc_1 = require("../../misc");
 const type_identifier_1 = require("./type_identifier");
 const utils_1 = require("./utils");
 class RationalNumTypeId extends type_identifier_1.TypeIdentifier {
     constructor(numerator, denominator) {
-        (0, misc_1.assert)(denominator > 0n, ``);
         super();
         this.numerator = numerator;
         this.denominator = denominator;

package/dist/typeIdentifiers/ast/rational_num.js.map

@@ -1 +1 @@
-{"version":3,"file":"rational_num.js","sourceRoot":"","sources":["../../../src/typeIdentifiers/ast/rational_num.ts"],"names":[],"mappings":";;;AAAA,qCAAoC;AACpC,uDAAmD;AACnD,mCAAoC;AAEpC,MAAa,iBAAkB,SAAQ,gCAAc;IACjD,YACoB,SAAiB,EACjB,WAAmB;QAEnC,IAAA,aAAM,EAAC,WAAW,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC;QAC7B,KAAK,EAAE,CAAC;QAJQ,cAAS,GAAT,SAAS,CAAQ;QACjB,gBAAW,GAAX,WAAW,CAAQ;IAIvC,CAAC;IAED,EAAE;QACE,OAAO,aAAa,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,IAAA,iBAAS,EAAC,IAAI,CAAC,SAAS,CAAC,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC;IACjH,CAAC;CACJ;AAZD,8CAYC"}
+{"version":3,"file":"rational_num.js","sourceRoot":"","sources":["../../../src/typeIdentifiers/ast/rational_num.ts"],"names":[],"mappings":";;;AAAA,uDAAmD;AACnD,mCAAoC;AAEpC,MAAa,iBAAkB,SAAQ,gCAAc;IACjD,YACoB,SAAiB,EACjB,WAAmB;QAEnC,KAAK,EAAE,CAAC;QAHQ,cAAS,GAAT,SAAS,CAAQ;QACjB,gBAAW,GAAX,WAAW,CAAQ;IAGvC,CAAC;IAED,EAAE;QACE,OAAO,aAAa,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,IAAA,iBAAS,EAAC,IAAI,CAAC,SAAS,CAAC,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC;IACjH,CAAC;CACJ;AAXD,8CAWC"}

package/dist/typeIdentifiers/ast/tuple.d.ts

@@ -1,7 +1,7 @@
 import { TypeIdentifier } from "./type_identifier";
 export declare class TupleTypeId extends TypeIdentifier {
-    readonly components: Array<TypeIdentifier | null>;
-    constructor(components: Array<TypeIdentifier | null>);
+    readonly components: TypeIdentifier[];
+    constructor(components: TypeIdentifier[]);
     pp(): string;
 }
 //# sourceMappingURL=tuple.d.ts.map

package/dist/typeIdentifiers/ast/tuple.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tuple.d.ts","sourceRoot":"","sources":["../../../src/typeIdentifiers/ast/tuple.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGnD,qBAAa,WAAY,SAAQ,cAAc;aACf,UAAU,EAAE,KAAK,CAAC,cAAc,GAAG,IAAI,CAAC;gBAAxC,UAAU,EAAE,KAAK,CAAC,cAAc,GAAG,IAAI,CAAC;IAIpE,EAAE,IAAI,MAAM;CAGf"}
+{"version":3,"file":"tuple.d.ts","sourceRoot":"","sources":["../../../src/typeIdentifiers/ast/tuple.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGnD,qBAAa,WAAY,SAAQ,cAAc;aACf,UAAU,EAAE,cAAc,EAAE;gBAA5B,UAAU,EAAE,cAAc,EAAE;IAIxD,EAAE,IAAI,MAAM;CAGf"}

package/dist/typeIdentifiers/ast/tuple.js.map

@@ -1 +1 @@
-{"version":3,"file":"tuple.js","sourceRoot":"","sources":["../../../src/typeIdentifiers/ast/tuple.ts"],"names":[],"mappings":";;;AAAA,uDAAmD;AACnD,mCAA+C;AAE/C,MAAa,WAAY,SAAQ,gCAAc;IAC3C,YAA4B,UAAwC;QAChE,KAAK,EAAE,CAAC;QADgB,eAAU,GAAV,UAAU,CAA8B;IAEpE,CAAC;IAED,EAAE;QACE,OAAO,UAAU,IAAA,4BAAoB,EAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;IAC7D,CAAC;CACJ;AARD,kCAQC"}
+{"version":3,"file":"tuple.js","sourceRoot":"","sources":["../../../src/typeIdentifiers/ast/tuple.ts"],"names":[],"mappings":";;;AAAA,uDAAmD;AACnD,mCAA+C;AAE/C,MAAa,WAAY,SAAQ,gCAAc;IAC3C,YAA4B,UAA4B;QACpD,KAAK,EAAE,CAAC;QADgB,eAAU,GAAV,UAAU,CAAkB;IAExD,CAAC;IAED,EAAE;QACE,OAAO,UAAU,IAAA,4BAAoB,EAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;IAC7D,CAAC;CACJ;AARD,kCAQC"}

package/dist/typeIdentifiers/constants.d.ts

@@ -0,0 +1,18 @@
+import { IntTypeId, AddressTypeId, BytesTypeId, StringTypeId, BoolTypeId, FixedBytesTypeId, PointerTypeId } from "./ast";
+export declare const uint256T: IntTypeId;
+export declare const uint8T: IntTypeId;
+export declare const int256T: IntTypeId;
+export declare const int8T: IntTypeId;
+export declare const bytes1T: FixedBytesTypeId;
+export declare const bytes2T: FixedBytesTypeId;
+export declare const bytes4T: FixedBytesTypeId;
+export declare const bytes20T: FixedBytesTypeId;
+export declare const bytes24T: FixedBytesTypeId;
+export declare const bytes32T: FixedBytesTypeId;
+export declare const addressT: AddressTypeId;
+export declare const bytesT: BytesTypeId;
+export declare const stringT: StringTypeId;
+export declare const memStringPtrT: PointerTypeId;
+export declare const memBytesPtrT: PointerTypeId;
+export declare const boolT: BoolTypeId;
+//# sourceMappingURL=constants.d.ts.map

package/dist/typeIdentifiers/constants.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/typeIdentifiers/constants.ts"],"names":[],"mappings":"AACA,OAAO,EACH,SAAS,EACT,aAAa,EACb,WAAW,EACX,YAAY,EACZ,UAAU,EACV,gBAAgB,EAChB,aAAa,EAChB,MAAM,OAAO,CAAC;AAEf,eAAO,MAAM,QAAQ,WAA4B,CAAC;AAClD,eAAO,MAAM,MAAM,WAA0B,CAAC;AAC9C,eAAO,MAAM,OAAO,WAA2B,CAAC;AAChD,eAAO,MAAM,KAAK,WAAyB,CAAC;AAC5C,eAAO,MAAM,OAAO,kBAA0B,CAAC;AAC/C,eAAO,MAAM,OAAO,kBAA0B,CAAC;AAC/C,eAAO,MAAM,OAAO,kBAA0B,CAAC;AAC/C,eAAO,MAAM,QAAQ,kBAA2B,CAAC;AACjD,eAAO,MAAM,QAAQ,kBAA2B,CAAC;AACjD,eAAO,MAAM,QAAQ,kBAA2B,CAAC;AACjD,eAAO,MAAM,QAAQ,eAA2B,CAAC;AACjD,eAAO,MAAM,MAAM,aAAoB,CAAC;AACxC,eAAO,MAAM,OAAO,cAAqB,CAAC;AAC1C,eAAO,MAAM,aAAa,eAAwD,CAAC;AACnF,eAAO,MAAM,YAAY,eAAuD,CAAC;AACjF,eAAO,MAAM,KAAK,YAAmB,CAAC"}

package/dist/typeIdentifiers/constants.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.boolT = exports.memBytesPtrT = exports.memStringPtrT = exports.stringT = exports.bytesT = exports.addressT = exports.bytes32T = exports.bytes24T = exports.bytes20T = exports.bytes4T = exports.bytes2T = exports.bytes1T = exports.int8T = exports.int256T = exports.uint8T = exports.uint256T = void 0;
+const constants_1 = require("../ast/constants");
+const ast_1 = require("./ast");
+exports.uint256T = new ast_1.IntTypeId(256, false);
+exports.uint8T = new ast_1.IntTypeId(8, false);
+exports.int256T = new ast_1.IntTypeId(256, true);
+exports.int8T = new ast_1.IntTypeId(8, true);
+exports.bytes1T = new ast_1.FixedBytesTypeId(1);
+exports.bytes2T = new ast_1.FixedBytesTypeId(2);
+exports.bytes4T = new ast_1.FixedBytesTypeId(4);
+exports.bytes20T = new ast_1.FixedBytesTypeId(20);
+exports.bytes24T = new ast_1.FixedBytesTypeId(24);
+exports.bytes32T = new ast_1.FixedBytesTypeId(32);
+exports.addressT = new ast_1.AddressTypeId(false);
+exports.bytesT = new ast_1.BytesTypeId();
+exports.stringT = new ast_1.StringTypeId();
+exports.memStringPtrT = new ast_1.PointerTypeId(exports.stringT, constants_1.DataLocation.Memory, true);
+exports.memBytesPtrT = new ast_1.PointerTypeId(exports.bytesT, constants_1.DataLocation.Memory, true);
+exports.boolT = new ast_1.BoolTypeId();
+//# sourceMappingURL=constants.js.map

package/dist/typeIdentifiers/constants.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/typeIdentifiers/constants.ts"],"names":[],"mappings":";;;AAAA,gDAAgD;AAChD,+BAQe;AAEF,QAAA,QAAQ,GAAG,IAAI,eAAS,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;AACrC,QAAA,MAAM,GAAG,IAAI,eAAS,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;AACjC,QAAA,OAAO,GAAG,IAAI,eAAS,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;AACnC,QAAA,KAAK,GAAG,IAAI,eAAS,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;AAC/B,QAAA,OAAO,GAAG,IAAI,sBAAgB,CAAC,CAAC,CAAC,CAAC;AAClC,QAAA,OAAO,GAAG,IAAI,sBAAgB,CAAC,CAAC,CAAC,CAAC;AAClC,QAAA,OAAO,GAAG,IAAI,sBAAgB,CAAC,CAAC,CAAC,CAAC;AAClC,QAAA,QAAQ,GAAG,IAAI,sBAAgB,CAAC,EAAE,CAAC,CAAC;AACpC,QAAA,QAAQ,GAAG,IAAI,sBAAgB,CAAC,EAAE,CAAC,CAAC;AACpC,QAAA,QAAQ,GAAG,IAAI,sBAAgB,CAAC,EAAE,CAAC,CAAC;AACpC,QAAA,QAAQ,GAAG,IAAI,mBAAa,CAAC,KAAK,CAAC,CAAC;AACpC,QAAA,MAAM,GAAG,IAAI,iBAAW,EAAE,CAAC;AAC3B,QAAA,OAAO,GAAG,IAAI,kBAAY,EAAE,CAAC;AAC7B,QAAA,aAAa,GAAG,IAAI,mBAAa,CAAC,eAAO,EAAE,wBAAY,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;AACtE,QAAA,YAAY,GAAG,IAAI,mBAAa,CAAC,cAAM,EAAE,wBAAY,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;AACpE,QAAA,KAAK,GAAG,IAAI,gBAAU,EAAE,CAAC"}

package/dist/typeIdentifiers/index.d.ts

@@ -1,4 +1,6 @@
 export * from "./utils";
 export * from "./ast";
+export * from "./abi";
+export * from "./signature";
 export { parseTypeIdentifier } from "./typeIdentifier_parser_gen";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/typeIdentifiers/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,OAAO,CAAC;AACtB,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/typeIdentifiers/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,OAAO,CAAC;AACtB,cAAc,OAAO,CAAC;AACtB,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC"}

package/dist/typeIdentifiers/index.js

@@ -17,6 +17,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseTypeIdentifier = void 0;
 __exportStar(require("./utils"), exports);
 __exportStar(require("./ast"), exports);
+__exportStar(require("./abi"), exports);
+__exportStar(require("./signature"), exports);
 var typeIdentifier_parser_gen_1 = require("./typeIdentifier_parser_gen");
 Object.defineProperty(exports, "parseTypeIdentifier", { enumerable: true, get: function () { return typeIdentifier_parser_gen_1.parseTypeIdentifier; } });
 //# sourceMappingURL=index.js.map

package/dist/typeIdentifiers/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/typeIdentifiers/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,wCAAsB;AACtB,yEAAkE;AAAzD,gIAAA,mBAAmB,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/typeIdentifiers/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,wCAAsB;AACtB,wCAAsB;AACtB,8CAA4B;AAC5B,yEAAkE;AAAzD,gIAAA,mBAAmB,OAAA"}

package/dist/typeIdentifiers/signature.d.ts

@@ -0,0 +1,4 @@
+import { FunctionDefinition, VariableDeclaration, EventDefinition, ErrorDefinition } from "../ast";
+export declare function signature(nd: FunctionDefinition | VariableDeclaration | EventDefinition | ErrorDefinition): string;
+export declare function signatureHash(nd: FunctionDefinition | VariableDeclaration | EventDefinition | ErrorDefinition): Uint8Array;
+//# sourceMappingURL=signature.d.ts.map

package/dist/typeIdentifiers/signature.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"signature.d.ts","sourceRoot":"","sources":["../../src/typeIdentifiers/signature.ts"],"names":[],"mappings":"AACA,OAAO,EAOH,kBAAkB,EAClB,mBAAmB,EACnB,eAAe,EACf,eAAe,EAElB,MAAM,QAAQ,CAAC;AAuLhB,wBAAgB,SAAS,CACrB,EAAE,EAAE,kBAAkB,GAAG,mBAAmB,GAAG,eAAe,GAAG,eAAe,GACjF,MAAM,CA8BR;AAED,wBAAgB,aAAa,CACzB,EAAE,EAAE,kBAAkB,GAAG,mBAAmB,GAAG,eAAe,GAAG,eAAe,GACjF,UAAU,CAIZ"}

package/dist/typeIdentifiers/signature.js

@@ -0,0 +1,157 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.signatureHash = exports.signature = void 0;
+const utils_1 = require("ethereum-cryptography/utils");
+const ast_1 = require("../ast");
+const misc_1 = require("../misc");
+const ast_2 = require("./ast");
+const constants_1 = require("./constants");
+const utils_2 = require("./utils");
+const keccak_1 = require("ethereum-cryptography/keccak");
+const abi_1 = require("./abi");
+/**
+ * Given a function argument `TypeIdentifier` `from`, return the
+ * `TypeIdentifier` as it should appear in the function signature.
+ *
+ * This differs from `toAbiType` in how it treats:
+ *  - storage pointers
+ *  - structs
+ *  - functions types
+ *
+ * @param from
+ */
+function toSignatureType(from, ctx, isLibrary) {
+    if (from instanceof ast_2.AddressTypeId) {
+        // normalize payable -> address
+        return constants_1.addressT;
+    }
+    // Simple case - these are passed unchanged
+    if (from instanceof ast_2.BoolTypeId ||
+        from instanceof ast_2.BytesTypeId ||
+        from instanceof ast_2.StringTypeId ||
+        from instanceof ast_2.FixedBytesTypeId ||
+        from instanceof ast_2.IntTypeId) {
+        return from;
+    }
+    if (from instanceof ast_2.PointerTypeId) {
+        return toSignatureType(from.toType, ctx, isLibrary);
+    }
+    // Arrays appear just as arrays in signatures
+    if (from instanceof ast_2.ArrayTypeId) {
+        const elT = toSignatureType(from.elT, ctx, isLibrary);
+        return new ast_2.ArrayTypeId(elT, from.size);
+    }
+    if (from instanceof ast_2.UserDefinedValueTypeId) {
+        const def = ctx.requireType(from.id, ast_1.UserDefinedValueTypeDefinition);
+        const innerT = (0, utils_2.typeOf)(def.underlyingType);
+        return toSignatureType(innerT, ctx, isLibrary);
+    }
+    // Contracts are passed as addresses for normal contracts, and by name for libraries
+    if (from instanceof ast_2.ContractTypeId) {
+        return isLibrary ? from : constants_1.addressT;
+    }
+    if (from instanceof ast_2.EnumTypeId) {
+        if (isLibrary) {
+            return from;
+        }
+        const def = ctx.requireType(from.id, ast_1.EnumDefinition);
+        return isLibrary ? from : (0, abi_1.enumToIntTypeId)(def);
+    }
+    // Structs appear by name in library signatures, and as tuples in normal function signatures
+    if (from instanceof ast_2.StructTypeId) {
+        if (isLibrary) {
+            return from;
+        }
+        const def = ctx.requireType(from.id, ast_1.StructDefinition);
+        let fieldTs = def.vMembers.map((decl) => (0, utils_2.typeOf)(decl));
+        // Remove any mappings
+        fieldTs = fieldTs.filter((fieldT) => !(fieldT instanceof ast_2.MappingTypeId));
+        // Convert the fields to ABI signature types and filter out any empty tuples.
+        // Empty tuples can result if a field is a struct contains only mappings.
+        // Also note that struct fields have "storage" as a default location.
+        // Convert to Memory to avoid treating them as storage pointers.
+        const abiFieldTs = fieldTs
+            .map((fieldT) => toSignatureType((0, utils_2.changeLocationTo)(fieldT, ast_1.DataLocation.Memory), ctx, isLibrary))
+            .filter((abiFieldT) => !(abiFieldT instanceof ast_2.TupleTypeId && abiFieldT.components.length === 0));
+        return new ast_2.TupleTypeId(abiFieldTs);
+    }
+    if (from instanceof ast_2.FunctionTypeId && from.kind === "external") {
+        return from;
+    }
+    if (from instanceof ast_2.MappingTypeId) {
+        return new ast_2.MappingTypeId(toSignatureType((0, utils_2.changeLocationTo)(from.keyType, ast_1.DataLocation.Memory), ctx, isLibrary), toSignatureType((0, utils_2.changeLocationTo)(from.valueType, ast_1.DataLocation.Memory), ctx, isLibrary));
+    }
+    (0, misc_1.assert)(false, `Cannot abi encode type ${from.pp()}`);
+}
+function scopedName(n) {
+    const scope = n.vScope;
+    return scope instanceof ast_1.ContractDefinition ? `${scope.name}.${n.name}` : n.name;
+}
+function abiTypeIdToCanonicalName(t, ctx) {
+    if (t instanceof ast_2.IntTypeId ||
+        t instanceof ast_2.FixedBytesTypeId ||
+        t instanceof ast_2.BoolTypeId ||
+        t instanceof ast_2.BytesTypeId ||
+        t instanceof ast_2.StringTypeId) {
+        // Skip the t_
+        return t.pp().slice(2);
+    }
+    // Payable is ignored in canonical names
+    if (t instanceof ast_2.AddressTypeId) {
+        return "address";
+    }
+    if (t instanceof ast_2.ArrayTypeId) {
+        return `${abiTypeIdToCanonicalName(t.elT, ctx)}[${t.size ? t.size.toString(10) : ""}]`;
+    }
+    if (t instanceof ast_2.TupleTypeId) {
+        return `(${t.components.map((compT) => abiTypeIdToCanonicalName(compT, ctx)).join(",")})`;
+    }
+    if (t instanceof ast_2.FunctionTypeId) {
+        return "function";
+    }
+    if (t instanceof ast_2.MappingTypeId) {
+        return `mapping(${abiTypeIdToCanonicalName(t.keyType, ctx)} => ${abiTypeIdToCanonicalName(t.valueType, ctx)})`;
+    }
+    if (t instanceof ast_2.StructTypeId) {
+        return scopedName(ctx.requireType(t.id, ast_1.StructDefinition));
+    }
+    if (t instanceof ast_2.ContractTypeId) {
+        return scopedName(ctx.requireType(t.id, ast_1.ContractDefinition));
+    }
+    if (t instanceof ast_2.EnumTypeId) {
+        return scopedName(ctx.requireType(t.id, ast_1.EnumDefinition));
+    }
+    (0, misc_1.assert)(false, "Unexpected ABI Type: {0}", t);
+}
+function signature(nd) {
+    const ctx = nd.requiredContext;
+    let argTs;
+    if (nd instanceof ast_1.FunctionDefinition ||
+        nd instanceof ast_1.EventDefinition ||
+        nd instanceof ast_1.ErrorDefinition) {
+        argTs = nd.vParameters.vParameters.map(utils_2.typeOf);
+    }
+    else {
+        [argTs] = (0, utils_2.getterArgsAndReturn)(nd);
+    }
+    const isLibFun = nd instanceof ast_1.FunctionDefinition &&
+        nd.vScope instanceof ast_1.ContractDefinition &&
+        nd.vScope.kind === ast_1.ContractKind.Library;
+    const argSigTs = argTs.map((t) => [
+        toSignatureType(t, ctx, isLibFun),
+        (0, utils_2.isTypeInStorage)(t)
+    ]);
+    return `${nd.name}(${argSigTs
+        .map(([t, isStorage]) => {
+        const tName = abiTypeIdToCanonicalName(t, ctx);
+        return isStorage ? `${tName} storage` : tName;
+    })
+        .join(",")})`;
+}
+exports.signature = signature;
+function signatureHash(nd) {
+    const sig = signature(nd);
+    return (0, keccak_1.keccak256)((0, utils_1.utf8ToBytes)(sig)).slice(0, 4);
+}
+exports.signatureHash = signatureHash;
+//# sourceMappingURL=signature.js.map

package/dist/typeIdentifiers/signature.js.map

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

package/dist/typeIdentifiers/utils.d.ts

@@ -1,7 +1,48 @@
-import { Expression, TypeName, VariableDeclaration } from "../ast";
+import { DataLocation, Expression, TypeName, VariableDeclaration } from "../ast";
 import { TypeIdentifier } from "./ast";
 /**
  * Return the parsed `TypeIdentifier` for the given node.
  */
 export declare function typeOf(nd: Expression | VariableDeclaration | TypeName): TypeIdentifier;
+/**
+ * Given a `TypeIdentifier` `t` return a new `TypeIdentifier` with all pointer locations changed to `loc`.
+ * @param t
+ * @param loc
+ * @returns
+ */
+export declare function changeLocationTo(t: TypeIdentifier, loc: DataLocation): TypeIdentifier;
+/**
+ * Given a public state variable declaration `v` return the ABI types of the arguments and the returns for this var.
+ * This will account for:
+ *  - indexing into arrays/maps
+ *  - converting returned structs to tuples
+ *  - omitting arrays and maps
+ *
+ * @param t
+ * @param loc
+ * @returns
+ */
+export declare function getterArgsAndReturn(v: VariableDeclaration): [TypeIdentifier[], TypeIdentifier];
+/**
+ * Given a `TypeIdentifier` `t` return a new generalized `TypeIdentifier` with all pointers removed (i.e. no specifications for locations)
+ * @param t
+ * @param loc
+ * @returns
+ */
+export declare function generalize(t: TypeIdentifier): TypeIdentifier;
+/**
+ * Given an already generalized `TypeIdentifier` `t` and a location return a new
+ * specialized `TypeIdentifier` with all reference types wrapped in a pointer to
+ * the given location
+ * @param t
+ * @param loc
+ * @returns
+ */
+export declare function specialize(t: TypeIdentifier, loc: DataLocation): TypeIdentifier;
+/**
+ * Return true IFF the `TypeIdentifier` `t` must live in storage.
+ * @param t
+ * @returns
+ */
+export declare function isTypeInStorage(t: TypeIdentifier): boolean;
 //# sourceMappingURL=utils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/typeIdentifiers/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AAEnE,OAAO,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AAKvC;;GAEG;AACH,wBAAgB,MAAM,CAAC,EAAE,EAAE,UAAU,GAAG,mBAAmB,GAAG,QAAQ,GAAG,cAAc,CAgBtF"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/typeIdentifiers/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,YAAY,EACZ,UAAU,EAEV,QAAQ,EACR,mBAAmB,EACtB,MAAM,QAAQ,CAAC;AAGhB,OAAO,EAQH,cAAc,EACjB,MAAM,OAAO,CAAC;AAMf;;GAEG;AACH,wBAAgB,MAAM,CAAC,EAAE,EAAE,UAAU,GAAG,mBAAmB,GAAG,QAAQ,GAAG,cAAc,CAgBtF;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,cAAc,EAAE,GAAG,EAAE,YAAY,GAAG,cAAc,CA2BrF;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,mBAAmB,GAAG,CAAC,cAAc,EAAE,EAAE,cAAc,CAAC,CAyC9F;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,CAAC,EAAE,cAAc,GAAG,cAAc,CAkB5D;AAED;;;;;;;GAOG;AACH,wBAAgB,UAAU,CAAC,CAAC,EAAE,cAAc,EAAE,GAAG,EAAE,YAAY,GAAG,cAAc,CAkB/E;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,CAAC,EAAE,cAAc,GAAG,OAAO,CAK1D"}

package/dist/typeIdentifiers/utils.js

@@ -1,7 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.typeOf = void 0;
+exports.isTypeInStorage = exports.specialize = exports.generalize = exports.getterArgsAndReturn = exports.changeLocationTo = exports.typeOf = void 0;
+const ast_1 = require("../ast");
 const misc_1 = require("../misc");
+const abi_1 = require("./abi");
+const ast_2 = require("./ast");
+const constants_1 = require("./constants");
 const typeIdentifier_parser_gen_1 = require("./typeIdentifier_parser_gen");
 const cache = new Map();
 /**
@@ -23,4 +27,126 @@ function typeOf(nd) {
     return cached;
 }
 exports.typeOf = typeOf;
+/**
+ * Given a `TypeIdentifier` `t` return a new `TypeIdentifier` with all pointer locations changed to `loc`.
+ * @param t
+ * @param loc
+ * @returns
+ */
+function changeLocationTo(t, loc) {
+    if (t instanceof ast_2.PointerTypeId) {
+        return new ast_2.PointerTypeId(changeLocationTo(t.toType, loc), loc, t.isPointer);
+    }
+    if (t instanceof ast_2.ArrayTypeId) {
+        return new ast_2.ArrayTypeId(changeLocationTo(t.elT, loc), t.size);
+    }
+    if (t instanceof ast_2.ArraySliceTypeId) {
+        return new ast_2.ArraySliceTypeId(changeLocationTo(t.toType, loc));
+    }
+    if (t instanceof ast_2.MappingTypeId) {
+        return new ast_2.MappingTypeId(changeLocationTo(t.keyType, loc), changeLocationTo(t.valueType, loc));
+    }
+    if (t instanceof ast_2.TupleTypeId) {
+        return new ast_2.TupleTypeId(t.components.map((c) => (c === null ? c : changeLocationTo(c, loc))));
+    }
+    return t;
+}
+exports.changeLocationTo = changeLocationTo;
+/**
+ * Given a public state variable declaration `v` return the ABI types of the arguments and the returns for this var.
+ * This will account for:
+ *  - indexing into arrays/maps
+ *  - converting returned structs to tuples
+ *  - omitting arrays and maps
+ *
+ * @param t
+ * @param loc
+ * @returns
+ */
+function getterArgsAndReturn(v) {
+    const argTypes = [];
+    const ctx = v.requiredContext;
+    let type = v.vType;
+    (0, misc_1.assert)(type !== undefined, "Called getterArgsAndReturn() on variable declaration without type", v);
+    while (true) {
+        if (type instanceof ast_1.ArrayTypeName) {
+            argTypes.push(constants_1.uint256T);
+            type = type.vBaseType;
+        }
+        else if (type instanceof ast_1.Mapping) {
+            // Make sure to change default storage pointer location for string/bytes to Memory as to not
+            // confuse `toABIType`.
+            argTypes.push((0, abi_1.toABIType)(changeLocationTo(typeOf(type.vKeyType), ast_1.DataLocation.Memory), ctx));
+            type = type.vValueType;
+        }
+        else {
+            break;
+        }
+    }
+    let retType = (0, abi_1.toABIType)(changeLocationTo(typeOf(type), ast_1.DataLocation.Memory), ctx);
+    // Filter out top-level arrays. Maps are already filtered by toABIType
+    if (retType instanceof ast_2.TupleTypeId) {
+        const filteredComps = retType.components.filter((compT) => !(compT instanceof ast_2.ArrayTypeId));
+        // For top-level tuples remove any arrays from the tuple
+        retType = filteredComps.length === 1 ? filteredComps[0] : new ast_2.TupleTypeId(filteredComps);
+    }
+    return [argTypes, retType];
+}
+exports.getterArgsAndReturn = getterArgsAndReturn;
+/**
+ * Given a `TypeIdentifier` `t` return a new generalized `TypeIdentifier` with all pointers removed (i.e. no specifications for locations)
+ * @param t
+ * @param loc
+ * @returns
+ */
+function generalize(t) {
+    if (t instanceof ast_2.PointerTypeId) {
+        return generalize(t.toType);
+    }
+    if (t instanceof ast_2.ArrayTypeId) {
+        return new ast_2.ArrayTypeId(generalize(t.elT), t.size);
+    }
+    if (t instanceof ast_2.ArraySliceTypeId || t instanceof ast_2.MappingTypeId) {
+        throw new Error(`Cannot generalize ${t.pp()}`);
+    }
+    if (t instanceof ast_2.TupleTypeId) {
+        return new ast_2.TupleTypeId(t.components.map((c) => (c === null ? c : generalize(c))));
+    }
+    return t;
+}
+exports.generalize = generalize;
+/**
+ * Given an already generalized `TypeIdentifier` `t` and a location return a new
+ * specialized `TypeIdentifier` with all reference types wrapped in a pointer to
+ * the given location
+ * @param t
+ * @param loc
+ * @returns
+ */
+function specialize(t, loc) {
+    if (t instanceof ast_2.ArraySliceTypeId || t instanceof ast_2.PointerTypeId || t instanceof ast_2.MappingTypeId) {
+        throw new Error(`Cannot specialize ${t.pp()}`);
+    }
+    if (t instanceof ast_2.ArrayTypeId) {
+        return new ast_2.PointerTypeId(new ast_2.ArrayTypeId(specialize(t.elT, loc), t.size), loc, true);
+    }
+    if (t instanceof ast_2.BytesTypeId || t instanceof ast_2.StringTypeId) {
+        return new ast_2.PointerTypeId(t, loc, true);
+    }
+    if (t instanceof ast_2.TupleTypeId) {
+        return new ast_2.TupleTypeId(t.components.map((c) => (c === null ? c : specialize(c, loc))));
+    }
+    return t;
+}
+exports.specialize = specialize;
+/**
+ * Return true IFF the `TypeIdentifier` `t` must live in storage.
+ * @param t
+ * @returns
+ */
+function isTypeInStorage(t) {
+    return (t instanceof ast_2.MappingTypeId ||
+        (t instanceof ast_2.PointerTypeId && t.location === ast_1.DataLocation.Storage));
+}
+exports.isTypeInStorage = isTypeInStorage;
 //# sourceMappingURL=utils.js.map

package/dist/typeIdentifiers/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/typeIdentifiers/utils.ts"],"names":[],"mappings":";;;AACA,kCAAiC;AAEjC,2EAAkE;AAElE,MAAM,KAAK,GAAG,IAAI,GAAG,EAA0B,CAAC;AAEhD;;GAEG;AACH,SAAgB,MAAM,CAAC,EAA+C;IAClE,IAAA,aAAM,EAAC,EAAE,CAAC,cAAc,KAAK,SAAS,EAAE,+BAA+B,EAAE,EAAE,CAAC,CAAC;IAC7E,IAAI,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC;IAE1C;;;;;OAKG;IACH,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACvB,MAAM,GAAG,IAAA,+CAAmB,EAAC,EAAE,CAAC,cAAc,CAAC,CAAC;QAChD,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;IACzC,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC;AAhBD,wBAgBC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/typeIdentifiers/utils.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "solc-typed-ast",
-    "version": "19.0.0",
+    "version": "19.2.0",
     "description": "A TypeScript library providing a normalized typed Solidity AST along with the utilities necessary to generate the AST (from Solc) and traverse/manipulate it.",
     "keywords": [],
     "files": [
@@ -38,7 +38,9 @@
         "semver": "^7.6.0",
         "solc": "0.8.25",
         "src-location": "^1.1.0",
-        "web3-eth-abi": "^4.2.0"
+        "web3-eth-abi": "^4.2.0",
+        "ethereum-cryptography": "3.2.0",
+        "@ethereumjs/util": "10.1.0"
     },
     "devDependencies": {
         "@types/fs-extra": "^11.0.4",