@openzeppelin/upgrades-core 1.9.1

package/dist/solc-api.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"solc-api.d.ts","sourceRoot":"","sources":["../src/solc-api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE;SACR,IAAI,IAAI,MAAM,GAAG;aACf,QAAQ,IAAI,MAAM,GAAG;gBACpB,GAAG,EAAE;oBACH,QAAQ,EAAE,YAAY,CAAC;oBACvB,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;iBAC5C,CAAC;aACH;SACF;KACF,CAAC;IACF,OAAO,EAAE;SACN,IAAI,IAAI,MAAM,GAAG;YAChB,GAAG,EAAE,UAAU,CAAC;YAChB,EAAE,EAAE,MAAM,CAAC;SACZ;KACF,CAAC;CACH;AAED,MAAM,WAAW,SAAS;IACxB,OAAO,EAAE;SACN,MAAM,IAAI,MAAM,GAAG;YAClB,OAAO,CAAC,EAAE,MAAM,CAAC;SAClB;KACF,CAAC;CACH;AAED,oBAAY,kBAAkB,GAAG;KAC9B,IAAI,IAAI,MAAM,GAAG;SACf,OAAO,IAAI,MAAM,GAAG;YACnB,MAAM,EAAE,MAAM,CAAC;YACf,KAAK,EAAE,MAAM,CAAC;SACf,EAAE;KACJ;CACF,CAAC;AAEF,MAAM,WAAW,YAAY;IAC3B,cAAc,EAAE,kBAAkB,CAAC;IACnC,MAAM,EAAE,MAAM,CAAC;CAChB"}

package/dist/solc-api.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=solc-api.js.map

package/dist/solc-api.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"solc-api.js","sourceRoot":"","sources":["../src/solc-api.ts"],"names":[],"mappings":""}

package/dist/src-decoder.d.ts

@@ -0,0 +1,6 @@
+import { SolcOutput, SolcInput } from './solc-api';
+export declare type SrcDecoder = (node: {
+    src: string;
+}) => string;
+export declare function solcInputOutputDecoder(solcInput: SolcInput, solcOutput: SolcOutput, basePath?: string): SrcDecoder;
+//# sourceMappingURL=src-decoder.d.ts.map

package/dist/src-decoder.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"src-decoder.d.ts","sourceRoot":"","sources":["../src/src-decoder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEnD,oBAAY,UAAU,GAAG,CAAC,IAAI,EAAE;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,KAAK,MAAM,CAAC;AAO3D,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,SAAM,GAAG,UAAU,CA0B/G"}

package/dist/src-decoder.js

@@ -0,0 +1,36 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.solcInputOutputDecoder = void 0;
+const path_1 = __importDefault(require("path"));
+function solcInputOutputDecoder(solcInput, solcOutput, basePath = '.') {
+    const sources = {};
+    function getSource(sourceId) {
+        var _a;
+        if (sourceId in sources) {
+            return sources[sourceId];
+        }
+        else {
+            const sourcePath = (_a = Object.entries(solcOutput.sources).find(([, { id }]) => sourceId === id)) === null || _a === void 0 ? void 0 : _a[0];
+            if (sourcePath === undefined) {
+                throw new Error(`Source file not available`);
+            }
+            const content = solcInput.sources[sourcePath].content;
+            const name = path_1.default.relative(basePath, sourcePath);
+            if (content === undefined) {
+                throw new Error(`Content for ${name} not available`);
+            }
+            return (sources[sourceId] = { name, content });
+        }
+    }
+    return ({ src }) => {
+        const [begin, , sourceId] = src.split(':').map(Number);
+        const { name, content } = getSource(sourceId);
+        const line = content.substr(0, begin).split('\n').length;
+        return name + ':' + line;
+    };
+}
+exports.solcInputOutputDecoder = solcInputOutputDecoder;
+//# sourceMappingURL=src-decoder.js.map

package/dist/src-decoder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"src-decoder.js","sourceRoot":"","sources":["../src/src-decoder.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAUxB,SAAgB,sBAAsB,CAAC,SAAoB,EAAE,UAAsB,EAAE,QAAQ,GAAG,GAAG;IACjG,MAAM,OAAO,GAA2B,EAAE,CAAC;IAE3C,SAAS,SAAS,CAAC,QAAgB;;QACjC,IAAI,QAAQ,IAAI,OAAO,EAAE;YACvB,OAAO,OAAO,CAAC,QAAQ,CAAC,CAAC;SAC1B;aAAM;YACL,MAAM,UAAU,GAAG,MAAA,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,QAAQ,KAAK,EAAE,CAAC,0CAAG,CAAC,CAAC,CAAC;YACjG,IAAI,UAAU,KAAK,SAAS,EAAE;gBAC5B,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;aAC9C;YACD,MAAM,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC;YACtD,MAAM,IAAI,GAAG,cAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;YACjD,IAAI,OAAO,KAAK,SAAS,EAAE;gBACzB,MAAM,IAAI,KAAK,CAAC,eAAe,IAAI,gBAAgB,CAAC,CAAC;aACtD;YACD,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;SAChD;IACH,CAAC;IAED,OAAO,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE;QACjB,MAAM,CAAC,KAAK,EAAE,AAAD,EAAG,QAAQ,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACvD,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC9C,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC;QACzD,OAAO,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC;IAC3B,CAAC,CAAC;AACJ,CAAC;AA1BD,wDA0BC"}

package/dist/src-decoder.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=src-decoder.test.d.ts.map

package/dist/src-decoder.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"src-decoder.test.d.ts","sourceRoot":"","sources":["../src/src-decoder.test.ts"],"names":[],"mappings":""}

package/dist/src-decoder.test.js

@@ -0,0 +1,29 @@
+"use strict";
+/* eslint-disable @typescript-eslint/no-explicit-any */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const ava_1 = __importDefault(require("ava"));
+const src_decoder_1 = require("./src-decoder");
+ava_1.default('solcInputOutputDecoder', t => {
+    const solcInput = {
+        sources: {
+            'a.sol': { content: '\n\n' },
+            'b.sol': { content: '\n\n' },
+        },
+    };
+    const solcOutput = {
+        contracts: {},
+        sources: {
+            'a.sol': { id: 0, ast: undefined },
+            'b.sol': { id: 1, ast: undefined },
+        },
+    };
+    const decodeSrc = src_decoder_1.solcInputOutputDecoder(solcInput, solcOutput);
+    t.is(decodeSrc({ src: '0:0:0' }), 'a.sol:1');
+    t.is(decodeSrc({ src: '1:0:0' }), 'a.sol:2');
+    t.is(decodeSrc({ src: '1:0:1' }), 'b.sol:2');
+    t.is(decodeSrc({ src: '2:0:1' }), 'b.sol:3');
+});
+//# sourceMappingURL=src-decoder.test.js.map

package/dist/src-decoder.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"src-decoder.test.js","sourceRoot":"","sources":["../src/src-decoder.test.ts"],"names":[],"mappings":";AAAA,uDAAuD;;;;;AAEvD,8CAAuB;AAGvB,+CAAuD;AAEvD,aAAI,CAAC,wBAAwB,EAAE,CAAC,CAAC,EAAE;IACjC,MAAM,SAAS,GAAc;QAC3B,OAAO,EAAE;YACP,OAAO,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE;YAC5B,OAAO,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE;SAC7B;KACF,CAAC;IAEF,MAAM,UAAU,GAAe;QAC7B,SAAS,EAAE,EAAE;QACb,OAAO,EAAE;YACP,OAAO,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,EAAE,SAAgB,EAAE;YACzC,OAAO,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,EAAE,SAAgB,EAAE;SAC1C;KACF,CAAC;IAEF,MAAM,SAAS,GAAG,oCAAsB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IAEhE,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,EAAE,SAAS,CAAC,CAAC;IAC7C,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,EAAE,SAAS,CAAC,CAAC;IAC7C,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,EAAE,SAAS,CAAC,CAAC;IAC7C,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,EAAE,SAAS,CAAC,CAAC;AAC/C,CAAC,CAAC,CAAC"}

package/dist/storage/compare.d.ts

@@ -0,0 +1,55 @@
+import { Operation } from '../levenshtein';
+import { ParsedTypeDetailed, StorageItem as _StorageItem } from './layout';
+import { StructMember as _StructMember } from './layout';
+import { LayoutCompatibilityReport } from './report';
+export declare type StorageItem = _StorageItem<ParsedTypeDetailed>;
+declare type StructMember = _StructMember<ParsedTypeDetailed>;
+export declare type StorageField = StorageItem | StructMember;
+export declare type StorageOperation<F extends StorageField> = Operation<F, StorageFieldChange<F>>;
+export declare type EnumOperation = Operation<string, {
+    kind: 'replace';
+    original: string;
+    updated: string;
+}>;
+declare type StorageFieldChange<F extends StorageField> = ({
+    kind: 'replace' | 'rename';
+} | {
+    kind: 'typechange';
+    change: TypeChange;
+}) & {
+    original: F;
+    updated: F;
+};
+export declare type TypeChange = ({
+    kind: 'obvious mismatch' | 'unknown' | 'array grow' | 'array shrink' | 'array dynamic' | 'enum resize' | 'missing members';
+} | {
+    kind: 'mapping key' | 'mapping value' | 'array value';
+    inner: TypeChange;
+} | {
+    kind: 'enum members';
+    ops: EnumOperation[];
+} | {
+    kind: 'struct members';
+    ops: StorageOperation<StructMember>[];
+    allowAppend: boolean;
+}) & {
+    original: ParsedTypeDetailed;
+    updated: ParsedTypeDetailed;
+};
+export declare class StorageLayoutComparator {
+    readonly unsafeAllowCustomTypes: boolean;
+    readonly unsafeAllowRenames: boolean;
+    hasAllowedUncheckedCustomTypes: boolean;
+    stack: Set<string>;
+    cache: Map<string, TypeChange | undefined>;
+    constructor(unsafeAllowCustomTypes?: boolean, unsafeAllowRenames?: boolean);
+    compareLayouts(original: StorageItem[], updated: StorageItem[]): LayoutCompatibilityReport;
+    private layoutLevenshtein;
+    getFieldChange<F extends StorageField>(original: F, updated: F): StorageFieldChange<F> | undefined;
+    getTypeChange(original: ParsedTypeDetailed, updated: ParsedTypeDetailed, { allowAppend }: {
+        allowAppend: boolean;
+    }): TypeChange | undefined;
+    private uncachedGetTypeChange;
+}
+export {};
+//# sourceMappingURL=compare.d.ts.map

package/dist/storage/compare.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"compare.d.ts","sourceRoot":"","sources":["../../src/storage/compare.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,SAAS,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,WAAW,IAAI,YAAY,EAAE,MAAM,UAAU,CAAC;AAE3E,OAAO,EAAE,YAAY,IAAI,aAAa,EAAkC,MAAM,UAAU,CAAC;AACzF,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAC;AAIrD,oBAAY,WAAW,GAAG,YAAY,CAAC,kBAAkB,CAAC,CAAC;AAC3D,aAAK,YAAY,GAAG,aAAa,CAAC,kBAAkB,CAAC,CAAC;AAEtD,oBAAY,YAAY,GAAG,WAAW,GAAG,YAAY,CAAC;AACtD,oBAAY,gBAAgB,CAAC,CAAC,SAAS,YAAY,IAAI,SAAS,CAAC,CAAC,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;AAE3F,oBAAY,aAAa,GAAG,SAAS,CAAC,MAAM,EAAE;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAEtG,aAAK,kBAAkB,CAAC,CAAC,SAAS,YAAY,IAAI,CAC9C;IAAE,IAAI,EAAE,SAAS,GAAG,QAAQ,CAAA;CAAE,GAC9B;IAAE,IAAI,EAAE,YAAY,CAAC;IAAC,MAAM,EAAE,UAAU,CAAA;CAAE,CAC7C,GAAG;IACF,QAAQ,EAAE,CAAC,CAAC;IACZ,OAAO,EAAE,CAAC,CAAC;CACZ,CAAC;AAEF,oBAAY,UAAU,GAAG,CACrB;IACE,IAAI,EACA,kBAAkB,GAClB,SAAS,GACT,YAAY,GACZ,cAAc,GACd,eAAe,GACf,aAAa,GACb,iBAAiB,CAAC;CACvB,GACD;IACE,IAAI,EAAE,aAAa,GAAG,eAAe,GAAG,aAAa,CAAC;IACtD,KAAK,EAAE,UAAU,CAAC;CACnB,GACD;IACE,IAAI,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,aAAa,EAAE,CAAC;CACtB,GACD;IACE,IAAI,EAAE,gBAAgB,CAAC;IACvB,GAAG,EAAE,gBAAgB,CAAC,YAAY,CAAC,EAAE,CAAC;IACtC,WAAW,EAAE,OAAO,CAAC;CACtB,CACJ,GAAG;IACF,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,OAAO,EAAE,kBAAkB,CAAC;CAC7B,CAAC;AAEF,qBAAa,uBAAuB;IAOtB,QAAQ,CAAC,sBAAsB;IAAU,QAAQ,CAAC,kBAAkB;IANhF,8BAA8B,UAAS;IAGvC,KAAK,cAAqB;IAC1B,KAAK,sCAA6C;gBAE7B,sBAAsB,UAAQ,EAAW,kBAAkB,UAAQ;IAExF,cAAc,CAAC,QAAQ,EAAE,WAAW,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,yBAAyB;IAI1F,OAAO,CAAC,iBAAiB;IAczB,cAAc,CAAC,CAAC,SAAS,YAAY,EAAE,QAAQ,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,GAAG,kBAAkB,CAAC,CAAC,CAAC,GAAG,SAAS;IAalG,aAAa,CACX,QAAQ,EAAE,kBAAkB,EAC5B,OAAO,EAAE,kBAAkB,EAC3B,EAAE,WAAW,EAAE,EAAE;QAAE,WAAW,EAAE,OAAO,CAAA;KAAE,GACxC,UAAU,GAAG,SAAS;IAqBzB,OAAO,CAAC,qBAAqB;CA8H9B"}

package/dist/storage/compare.js

@@ -0,0 +1,181 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StorageLayoutComparator = void 0;
+const levenshtein_1 = require("../levenshtein");
+const error_1 = require("../error");
+const layout_1 = require("./layout");
+const report_1 = require("./report");
+const assert_1 = require("../utils/assert");
+const is_value_type_1 = require("../utils/is-value-type");
+class StorageLayoutComparator {
+    constructor(unsafeAllowCustomTypes = false, unsafeAllowRenames = false) {
+        this.unsafeAllowCustomTypes = unsafeAllowCustomTypes;
+        this.unsafeAllowRenames = unsafeAllowRenames;
+        this.hasAllowedUncheckedCustomTypes = false;
+        // Holds a stack of type comparisons to detect recursion
+        this.stack = new Set();
+        this.cache = new Map();
+    }
+    compareLayouts(original, updated) {
+        return new report_1.LayoutCompatibilityReport(this.layoutLevenshtein(original, updated, { allowAppend: true }));
+    }
+    layoutLevenshtein(original, updated, { allowAppend }) {
+        const ops = levenshtein_1.levenshtein(original, updated, (a, b) => this.getFieldChange(a, b));
+        if (allowAppend) {
+            return ops.filter(o => o.kind !== 'append');
+        }
+        else {
+            return ops;
+        }
+    }
+    getFieldChange(original, updated) {
+        const nameChange = !this.unsafeAllowRenames && original.label !== updated.label;
+        const typeChange = this.getTypeChange(original.type, updated.type, { allowAppend: false });
+        if (typeChange && nameChange) {
+            return { kind: 'replace', original, updated };
+        }
+        else if (nameChange) {
+            return { kind: 'rename', original, updated };
+        }
+        else if (typeChange) {
+            return { kind: 'typechange', change: typeChange, original, updated };
+        }
+    }
+    getTypeChange(original, updated, { allowAppend }) {
+        const key = JSON.stringify({ original: original.id, updated: updated.id, allowAppend });
+        if (this.cache.has(key)) {
+            return this.cache.get(key);
+        }
+        if (this.stack.has(key)) {
+            throw new error_1.UpgradesError(`Recursive types are not supported`, () => `Recursion found in ${updated.item.label}\n`);
+        }
+        try {
+            this.stack.add(key);
+            const result = this.uncachedGetTypeChange(original, updated, { allowAppend });
+            this.cache.set(key, result);
+            return result;
+        }
+        finally {
+            this.stack.delete(key);
+        }
+    }
+    uncachedGetTypeChange(original, updated, { allowAppend }) {
+        var _a, _b, _c, _d;
+        if (original.head !== updated.head) {
+            return { kind: 'obvious mismatch', original, updated };
+        }
+        if (original.args === undefined || updated.args === undefined) {
+            // both should be undefined at the same time
+            assert_1.assert(original.args === updated.args);
+            return undefined;
+        }
+        switch (original.head) {
+            case 't_contract':
+                // no storage layout errors can be introduced here since it is just an address
+                return undefined;
+            case 't_struct': {
+                const originalMembers = original.item.members;
+                const updatedMembers = updated.item.members;
+                if (originalMembers === undefined || updatedMembers === undefined) {
+                    if (this.unsafeAllowCustomTypes) {
+                        this.hasAllowedUncheckedCustomTypes = true;
+                        return undefined;
+                    }
+                    else {
+                        return { kind: 'missing members', original, updated };
+                    }
+                }
+                assert_1.assert(layout_1.isStructMembers(originalMembers) && layout_1.isStructMembers(updatedMembers));
+                const ops = this.layoutLevenshtein(originalMembers, updatedMembers, { allowAppend });
+                if (ops.length > 0) {
+                    return { kind: 'struct members', ops, original, updated, allowAppend };
+                }
+                else {
+                    return undefined;
+                }
+            }
+            case 't_enum': {
+                const originalMembers = original.item.members;
+                const updatedMembers = updated.item.members;
+                if (originalMembers === undefined || updatedMembers === undefined) {
+                    if (this.unsafeAllowCustomTypes) {
+                        this.hasAllowedUncheckedCustomTypes = true;
+                        return undefined;
+                    }
+                    else {
+                        return { kind: 'missing members', original, updated };
+                    }
+                }
+                assert_1.assert(layout_1.isEnumMembers(originalMembers) && layout_1.isEnumMembers(updatedMembers));
+                if (enumSize(originalMembers.length) !== enumSize(updatedMembers.length)) {
+                    return { kind: 'enum resize', original, updated };
+                }
+                else {
+                    const ops = levenshtein_1.levenshtein(originalMembers, updatedMembers, (a, b) => a === b ? undefined : { kind: 'replace', original: a, updated: b }).filter(o => o.kind !== 'append');
+                    if (ops.length > 0) {
+                        return { kind: 'enum members', ops, original, updated };
+                    }
+                    else {
+                        return undefined;
+                    }
+                }
+            }
+            case 't_mapping': {
+                const [originalKey, originalValue] = original.args;
+                const [updatedKey, updatedValue] = updated.args;
+                // validate an invariant we assume from solidity: key types are always simple value types
+                assert_1.assert(is_value_type_1.isValueType(originalKey) && is_value_type_1.isValueType(updatedKey));
+                // network files migrated from the OZ CLI have an unknown key type
+                // we allow it to match with any other key type, carrying over the semantics of OZ CLI
+                const keyChange = originalKey.head === 'unknown'
+                    ? undefined
+                    : this.getTypeChange(originalKey, updatedKey, { allowAppend: false });
+                if (keyChange) {
+                    return { kind: 'mapping key', inner: keyChange, original, updated };
+                }
+                else {
+                    // mapping value types are allowed to grow
+                    const inner = this.getTypeChange(originalValue, updatedValue, { allowAppend: true });
+                    if (inner) {
+                        return { kind: 'mapping value', inner, original, updated };
+                    }
+                    else {
+                        return undefined;
+                    }
+                }
+            }
+            case 't_array': {
+                const originalLength = (_b = (_a = original.tail) === null || _a === void 0 ? void 0 : _a.match(/^(\d+|dyn)/)) === null || _b === void 0 ? void 0 : _b[0];
+                const updatedLength = (_d = (_c = updated.tail) === null || _c === void 0 ? void 0 : _c.match(/^(\d+|dyn)/)) === null || _d === void 0 ? void 0 : _d[0];
+                assert_1.assert(originalLength !== undefined && updatedLength !== undefined);
+                if (originalLength === 'dyn' || updatedLength === 'dyn') {
+                    if (originalLength !== updatedLength) {
+                        return { kind: 'array dynamic', original, updated };
+                    }
+                }
+                const originalLengthInt = parseInt(originalLength, 10);
+                const updatedLengthInt = parseInt(updatedLength, 10);
+                if (updatedLengthInt < originalLengthInt) {
+                    return { kind: 'array shrink', original, updated };
+                }
+                else if (!allowAppend && updatedLengthInt > originalLengthInt) {
+                    return { kind: 'array grow', original, updated };
+                }
+                const inner = this.getTypeChange(original.args[0], updated.args[0], { allowAppend: false });
+                if (inner) {
+                    return { kind: 'array value', inner, original, updated };
+                }
+                else {
+                    return undefined;
+                }
+            }
+            default:
+                return { kind: 'unknown', original, updated };
+        }
+    }
+}
+exports.StorageLayoutComparator = StorageLayoutComparator;
+function enumSize(memberCount) {
+    return Math.ceil(Math.log2(Math.max(2, memberCount)) / 8);
+}
+//# sourceMappingURL=compare.js.map

package/dist/storage/compare.js.map

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

package/dist/storage/compat.d.ts

@@ -0,0 +1,4 @@
+export { StorageItem, StorageLayout, TypeItem, TypeItemMembers, StructMember } from './layout';
+export { extractStorageLayout } from './extract';
+export { decodeTypeIdentifier, stabilizeTypeIdentifier } from '../utils/type-id';
+//# sourceMappingURL=compat.d.ts.map

package/dist/storage/compat.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"compat.d.ts","sourceRoot":"","sources":["../../src/storage/compat.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,QAAQ,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAC/F,OAAO,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AACjD,OAAO,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC"}

package/dist/storage/compat.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.stabilizeTypeIdentifier = exports.decodeTypeIdentifier = exports.extractStorageLayout = void 0;
+var extract_1 = require("./extract");
+Object.defineProperty(exports, "extractStorageLayout", { enumerable: true, get: function () { return extract_1.extractStorageLayout; } });
+var type_id_1 = require("../utils/type-id");
+Object.defineProperty(exports, "decodeTypeIdentifier", { enumerable: true, get: function () { return type_id_1.decodeTypeIdentifier; } });
+Object.defineProperty(exports, "stabilizeTypeIdentifier", { enumerable: true, get: function () { return type_id_1.stabilizeTypeIdentifier; } });
+//# sourceMappingURL=compat.js.map

package/dist/storage/compat.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../src/storage/compat.ts"],"names":[],"mappings":";;;AACA,qCAAiD;AAAxC,+GAAA,oBAAoB,OAAA;AAC7B,4CAAiF;AAAxE,+GAAA,oBAAoB,OAAA;AAAE,kHAAA,uBAAuB,OAAA"}

package/dist/storage/extract.d.ts

@@ -0,0 +1,7 @@
+import { ContractDefinition } from 'solidity-ast';
+import { StorageLayout } from './layout';
+import { SrcDecoder } from '../src-decoder';
+import { ASTDereferencer } from '../ast-dereferencer';
+export declare function isCurrentLayoutVersion(layout: StorageLayout): boolean;
+export declare function extractStorageLayout(contractDef: ContractDefinition, decodeSrc: SrcDecoder, deref: ASTDereferencer): StorageLayout;
+//# sourceMappingURL=extract.d.ts.map

package/dist/storage/extract.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"extract.d.ts","sourceRoot":"","sources":["../../src/storage/extract.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAsD,MAAM,cAAc,CAAC;AAGtG,OAAO,EAAE,aAAa,EAAY,MAAM,UAAU,CAAC;AAEnD,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAItD,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAErE;AAED,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,kBAAkB,EAC/B,SAAS,EAAE,UAAU,EACrB,KAAK,EAAE,eAAe,GACrB,aAAa,CAyDf"}

package/dist/storage/extract.js

@@ -0,0 +1,86 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.extractStorageLayout = exports.isCurrentLayoutVersion = void 0;
+const assert_1 = __importDefault(require("assert"));
+const utils_1 = require("solidity-ast/utils");
+const type_id_1 = require("../utils/type-id");
+const currentLayoutVersion = '1.1';
+function isCurrentLayoutVersion(layout) {
+    return (layout === null || layout === void 0 ? void 0 : layout.layoutVersion) === currentLayoutVersion;
+}
+exports.isCurrentLayoutVersion = isCurrentLayoutVersion;
+function extractStorageLayout(contractDef, decodeSrc, deref) {
+    const layout = { storage: [], types: {}, layoutVersion: currentLayoutVersion };
+    // Note: A UserDefinedTypeName can also refer to a ContractDefinition but we won't care about those.
+    const derefUserDefinedType = deref(['StructDefinition', 'EnumDefinition']);
+    for (const varDecl of contractDef.nodes) {
+        if (utils_1.isNodeType('VariableDeclaration', varDecl)) {
+            if (!varDecl.constant && varDecl.mutability !== 'immutable') {
+                const type = type_id_1.normalizeTypeIdentifier(typeDescriptions(varDecl).typeIdentifier);
+                layout.storage.push({
+                    contract: contractDef.name,
+                    label: varDecl.name,
+                    type,
+                    src: decodeSrc(varDecl),
+                });
+                assert_1.default(varDecl.typeName != null);
+                // We will recursively look for all types involved in this variable declaration in order to store their type
+                // information. We iterate over a Map that is indexed by typeIdentifier to ensure we visit each type only once.
+                // Note that there can be recursive types.
+                const typeNames = new Map([...findTypeNames(varDecl.typeName)].map(n => [typeDescriptions(n).typeIdentifier, n]));
+                for (const typeName of typeNames.values()) {
+                    const { typeIdentifier, typeString: label } = typeDescriptions(typeName);
+                    const type = type_id_1.normalizeTypeIdentifier(typeIdentifier);
+                    if (type in layout.types) {
+                        continue;
+                    }
+                    let members;
+                    if ('referencedDeclaration' in typeName && !/^t_contract\b/.test(type)) {
+                        const typeDef = derefUserDefinedType(typeName.referencedDeclaration);
+                        members = getTypeMembers(typeDef);
+                        // Recursively look for the types referenced in this definition and add them to the queue.
+                        for (const typeName of findTypeNames(typeDef)) {
+                            const { typeIdentifier } = typeDescriptions(typeName);
+                            if (!typeNames.has(typeIdentifier)) {
+                                typeNames.set(typeIdentifier, typeName);
+                            }
+                        }
+                    }
+                    layout.types[type] = { label, members };
+                }
+            }
+        }
+    }
+    return layout;
+}
+exports.extractStorageLayout = extractStorageLayout;
+const findTypeNames = utils_1.findAll([
+    'ArrayTypeName',
+    'ElementaryTypeName',
+    'FunctionTypeName',
+    'Mapping',
+    'UserDefinedTypeName',
+]);
+function typeDescriptions(x) {
+    assert_1.default(typeof x.typeDescriptions.typeIdentifier === 'string');
+    assert_1.default(typeof x.typeDescriptions.typeString === 'string');
+    return x.typeDescriptions;
+}
+function getTypeMembers(typeDef) {
+    if (typeDef.nodeType === 'StructDefinition') {
+        return typeDef.members.map(m => {
+            assert_1.default(typeof m.typeDescriptions.typeIdentifier === 'string');
+            return {
+                label: m.name,
+                type: type_id_1.normalizeTypeIdentifier(m.typeDescriptions.typeIdentifier),
+            };
+        });
+    }
+    else {
+        return typeDef.members.map(m => m.name);
+    }
+}
+//# sourceMappingURL=extract.js.map