@openzeppelin/upgrades-core 1.46.0 → 1.47.0

package/dist/storage-namespaced-renamed-retyped.test.js

@@ -0,0 +1,278 @@
+"use strict";
+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 hardhat_1 = require("hardhat");
+const task_names_1 = require("hardhat/builtin-tasks/task-names");
+const validate_1 = require("./validate");
+const overrides_1 = require("./validate/overrides");
+const src_decoder_1 = require("./src-decoder");
+const make_namespaced_1 = require("./utils/make-namespaced");
+const storage_1 = require("./storage");
+const layout_1 = require("./storage/layout");
+const stabilize_layout_1 = require("./utils/stabilize-layout");
+const source = 'contracts/test/NamespacedRenamedRetyped.sol';
+const crossFileSource = 'contracts/test/NamespacedCrossFile.sol';
+const test = ava_1.default;
+test.before(async (t) => {
+    const { input, output, solcVersion } = await getBuildInfo(`${source}:NamespacedRenamedRetypedV1`);
+    const namespacedOutput = await compileNamespaced(input, output, solcVersion);
+    const decodeSrc = (0, src_decoder_1.solcInputOutputDecoder)(input, output);
+    t.context.input = input;
+    t.context.output = output;
+    t.context.namespacedOutput = namespacedOutput;
+    t.context.solcVersion = solcVersion;
+    t.context.validation = (0, validate_1.validate)(output, decodeSrc, solcVersion, input, namespacedOutput);
+    t.context.validationWithoutSlots = (0, validate_1.validate)(output, decodeSrc, solcVersion, input);
+    const crossFile = await getBuildInfo(`${crossFileSource}:NamespacedCrossFileV1`);
+    t.context.crossFile = {
+        output: crossFile.output,
+        validation: await validateWithNamespacedOutput(crossFile.input, crossFile.output, crossFile.solcVersion),
+    };
+});
+async function getBuildInfo(contract) {
+    const buildInfo = await hardhat_1.artifacts.getBuildInfo(contract);
+    if (buildInfo === undefined) {
+        throw new Error(`Build info not found for ${contract}`);
+    }
+    return buildInfo;
+}
+/**
+ * Compiles the namespaced input for the given compilation, following the same steps as the Hardhat plugin.
+ */
+async function compileNamespaced(input, output, solcVersion) {
+    const namespacedInput = await (0, make_namespaced_1.trySanitizeNatSpec)((0, make_namespaced_1.makeNamespacedInput)(input, output, solcVersion), solcVersion);
+    return hardhatCompile(namespacedInput, solcVersion);
+}
+/**
+ * Validates with a namespaced compilation.
+ */
+async function validateWithNamespacedOutput(input, output, solcVersion) {
+    const namespacedOutput = await compileNamespaced(input, output, solcVersion);
+    return (0, validate_1.validate)(output, (0, src_decoder_1.solcInputOutputDecoder)(input, output), solcVersion, input, namespacedOutput);
+}
+/**
+ * Compiles the fixture again from the given source content and validates with a namespaced compilation.
+ */
+async function compileAndValidate(input, content, solcVersion) {
+    const newInput = { ...input, sources: { [source]: { content } } };
+    const output = await hardhatCompile(newInput, solcVersion);
+    return validateWithNamespacedOutput(newInput, output, solcVersion);
+}
+async function hardhatCompile(input, solcVersion) {
+    const solcBuild = await (0, hardhat_1.run)(task_names_1.TASK_COMPILE_SOLIDITY_GET_SOLC_BUILD, {
+        quiet: true,
+        solcVersion,
+    });
+    const output = solcBuild.isSolcJs
+        ? await (0, hardhat_1.run)(task_names_1.TASK_COMPILE_SOLIDITY_RUN_SOLCJS, { input, solcJsPath: solcBuild.compilerPath })
+        : await (0, hardhat_1.run)(task_names_1.TASK_COMPILE_SOLIDITY_RUN_SOLC, { input, solcPath: solcBuild.compilerPath });
+    const errors = output.errors?.filter(e => e.severity === 'error');
+    if (errors !== undefined && errors.length > 0) {
+        throw new Error(errors.map(e => e.formattedMessage).join('\n'));
+    }
+    return output;
+}
+function getLayout(validation, contract) {
+    return validation[`${source}:${contract}`].layout;
+}
+function assertAnnotationsApplied(t, validation) {
+    const v1 = getLayout(validation, 'NamespacedRenamedRetypedV1');
+    const v2 = getLayout(validation, 'NamespacedRenamedRetypedV2');
+    t.deepEqual((0, storage_1.getStorageUpgradeErrors)(v1, v2), []);
+    assertExactMap(t, getLayout(validation, 'NamespacedExactMap'));
+}
+function assertExactMap(t, layout) {
+    const items = layout.namespaces?.['erc7201:example.exact'];
+    if (items === undefined) {
+        throw new Error('Namespace not found');
+    }
+    t.is(items.length, 6);
+    for (const item of items) {
+        t.is(item.renamedFrom, `old_${item.label}`);
+        t.is(item.retypedFrom, undefined);
+        // Slots come from the namespaced compilation
+        t.not(item.slot, undefined);
+    }
+    // The struct used inside the namespace is looked up through the namespaced compilation
+    const members = Object.values(layout.types).find(type => type.label === 'struct NamespacedExactMap.Inner')?.members;
+    if (members === undefined || !(0, layout_1.isStructMembers)(members)) {
+        throw new Error('Struct members not found');
+    }
+    t.is(members.length, 3);
+    for (const member of members) {
+        t.is(member.renamedFrom, `old_${member.label}`);
+        t.is(member.retypedFrom, undefined);
+        t.not(member.slot, undefined);
+    }
+}
+test('layout', t => {
+    t.snapshot((0, stabilize_layout_1.stabilizeStorageLayout)(getLayout(t.context.validation, 'NamespacedRenamedRetypedV2')));
+});
+test('upgrade ok', t => {
+    assertAnnotationsApplied(t, t.context.validation);
+});
+test('inherited namespace upgrade ok', t => {
+    const v1 = getLayout(t.context.validation, 'NamespacedRenamedRetypedInheritedV1');
+    const v2 = getLayout(t.context.validation, 'NamespacedRenamedRetypedInheritedV2');
+    t.deepEqual((0, storage_1.getStorageUpgradeErrors)(v1, v2), []);
+});
+test('wrong retype', t => {
+    const v1 = getLayout(t.context.validation, 'NamespacedBadV1');
+    const v2 = getLayout(t.context.validation, 'NamespacedWrongRetypeV2');
+    t.like((0, storage_1.getStorageUpgradeErrors)(v1, v2), {
+        length: 1,
+        0: { kind: 'typechange', original: { label: 'x' }, updated: { label: 'x', retypedFrom: 'address' } },
+    });
+});
+test('annotation on the wrong member', t => {
+    // The annotation makes `x` match the original `y` with a different type, and `x` and `z` are left unmatched
+    const v1 = getLayout(t.context.validation, 'NamespacedBadV1');
+    const v2 = getLayout(t.context.validation, 'NamespacedWrongMemberV2');
+    t.like((0, storage_1.getStorageUpgradeErrors)(v1, v2), {
+        length: 3,
+        0: { kind: 'delete', original: { label: 'x' } },
+        1: { kind: 'typechange', original: { label: 'y' }, updated: { label: 'x', renamedFrom: 'y' } },
+        2: { kind: 'insert', updated: { label: 'z' } },
+    });
+});
+test('stale rename annotation', t => {
+    const v1 = getLayout(t.context.validation, 'NamespacedBadV1');
+    const v2 = getLayout(t.context.validation, 'NamespacedStaleRenameV2');
+    t.like((0, storage_1.getStorageUpgradeErrors)(v1, v2), {
+        length: 1,
+        0: { kind: 'rename', original: { label: 'y' }, updated: { label: 'y', renamedFrom: 'q' } },
+    });
+});
+test('unannotated rename and retype', t => {
+    const v1 = getLayout(t.context.validation, 'NamespacedBadV1');
+    const v2 = getLayout(t.context.validation, 'NamespacedUnannotatedV2');
+    t.like((0, storage_1.getStorageUpgradeErrors)(v1, v2), {
+        length: 2,
+        0: { kind: 'typechange', original: { label: 'x' }, updated: { label: 'x' } },
+        1: { kind: 'rename', original: { label: 'y' }, updated: { label: 'z' } },
+    });
+});
+test('namespaced output with different source ids', t => {
+    const { input, output, namespacedOutput, solcVersion } = t.context;
+    const sources = Object.fromEntries(Object.entries(namespacedOutput.sources).map(([path, s]) => [path, { ...s, id: s.id + 1 }]));
+    t.throws(() => (0, validate_1.validate)(output, (0, src_decoder_1.solcInputOutputDecoder)(input, output), solcVersion, input, { ...namespacedOutput, sources }), { message: /Source ids differ between the solc output and the namespaced solc output/ });
+});
+test('two annotated namespaces in one contract', t => {
+    const v1 = getLayout(t.context.validation, 'NamespacedTwoV1');
+    const v2 = getLayout(t.context.validation, 'NamespacedTwoV2');
+    t.like(v2.namespaces, {
+        'erc7201:example.first': {
+            length: 2,
+            0: { label: 'x', retypedFrom: 'bytes32' },
+            1: { label: 'y', renamedFrom: 'oldY' },
+        },
+        'erc7201:example.second': {
+            length: 2,
+            0: { label: 'f', retypedFrom: 'uint8' },
+            1: { label: 'g', renamedFrom: 'oldG' },
+        },
+    });
+    t.deepEqual((0, storage_1.getStorageUpgradeErrors)(v1, v2), []);
+});
+test('kept retype annotation', t => {
+    const v1 = getLayout(t.context.validation, 'NamespacedKeptRetypeV1');
+    const v2 = getLayout(t.context.validation, 'NamespacedKeptRetypeV2');
+    t.like(v2.namespaces, { 'erc7201:example.main': { length: 1, 0: { label: 'x', retypedFrom: 'uint8', slot: '0' } } });
+    t.deepEqual((0, storage_1.getStorageUpgradeErrors)(v1, v2), []);
+});
+test('kept retype annotation without layout info', t => {
+    const v1 = getLayout(t.context.validationWithoutSlots, 'NamespacedKeptRetypeV1');
+    const v2 = getLayout(t.context.validationWithoutSlots, 'NamespacedKeptRetypeV2');
+    t.like(v2.namespaces, {
+        'erc7201:example.main': { length: 1, 0: { label: 'x', retypedFrom: 'uint8', slot: undefined } },
+    });
+    t.deepEqual((0, storage_1.getStorageUpgradeErrors)(v1, v2), []);
+});
+test('retype without layout info', t => {
+    // A retype that is not known to be compatible is uncertain without slots
+    const v1 = getLayout(t.context.validationWithoutSlots, 'NamespacedBadV1');
+    const v2 = getLayout(t.context.validationWithoutSlots, 'NamespacedRetypeV2');
+    const report = (0, storage_1.getStorageUpgradeReport)(v1, v2, (0, overrides_1.withValidationDefaults)({}));
+    t.false(report.ok);
+    t.true(report.explain().includes('Layout could have changed for `x` (bytes32 -> struct TransientSlot.TBytes32)'), report.explain());
+});
+test('wrong retype without layout info', t => {
+    const v1 = getLayout(t.context.validationWithoutSlots, 'NamespacedBadV1');
+    const v2 = getLayout(t.context.validationWithoutSlots, 'NamespacedWrongRetypeV2');
+    t.like((0, storage_1.getStorageUpgradeErrors)(v1, v2), {
+        length: 1,
+        0: { kind: 'typechange', original: { label: 'x' }, updated: { label: 'x', retypedFrom: 'address' } },
+    });
+});
+test('retype with layout change', t => {
+    // A retype annotation that names the original type does not allow the member's size to change
+    const v1 = getLayout(t.context.validation, 'NamespacedRetypeLayoutChangeV1');
+    const v2 = getLayout(t.context.validation, 'NamespacedRetypeLayoutChangeV2');
+    t.like((0, storage_1.getStorageUpgradeErrors)(v1, v2), {
+        length: 1,
+        0: {
+            kind: 'layoutchange',
+            original: { label: 'y' },
+            updated: { label: 'y', retypedFrom: 'uint256' },
+            change: { bytes: { from: '32', to: '16' } },
+        },
+    });
+});
+test('struct from another source file', t => {
+    // The annotations on the members of the struct are read from the source file that defines it
+    const { output, validation } = t.context.crossFile;
+    t.not(output.sources['contracts/test/NamespacedCrossFileStruct.sol'].id, 0);
+    const v1 = validation[`${crossFileSource}:NamespacedCrossFileV1`].layout;
+    const v2 = validation[`${crossFileSource}:NamespacedCrossFileV2`].layout;
+    t.like(v2.namespaces, { 'erc7201:example.main': { length: 1, 0: { label: 'data', slot: '0' } } });
+    const members = Object.values(v2.types).find(type => type.label === 'struct CrossFileV2.Data')?.members;
+    if (members === undefined || !(0, layout_1.isStructMembers)(members)) {
+        throw new Error('Struct members not found');
+    }
+    t.like(members, {
+        length: 2,
+        0: { label: 'a', retypedFrom: 'bytes32', slot: '0' },
+        1: { label: 'c', renamedFrom: 'b', slot: '1' },
+    });
+    t.deepEqual((0, storage_1.getStorageUpgradeErrors)(v1, v2), []);
+});
+/**
+ * Validates the fixture compiled again with the given line endings.
+ */
+async function validateWithLineEndings(t, lineEnding) {
+    const content = t.context.input.sources[source].content;
+    if (content === undefined) {
+        throw new Error('Unexpected fixture content');
+    }
+    return compileAndValidate(t.context.input, content.replace(/\r\n|\r|\n/g, lineEnding), t.context.solcVersion);
+}
+test('CRLF line endings', async (t) => {
+    assertAnnotationsApplied(t, await validateWithLineEndings(t, '\r\n'));
+});
+test('CR line endings', async (t) => {
+    assertAnnotationsApplied(t, await validateWithLineEndings(t, '\r'));
+});
+test('solc 0.8.20', async (t) => {
+    const content = t.context.input.sources[source].content;
+    if (content === undefined) {
+        throw new Error('Unexpected fixture content');
+    }
+    const validation = await compileAndValidate(t.context.input, content, '0.8.20');
+    assertAnnotationsApplied(t, validation);
+});
+test('stale rename annotation report', t => {
+    const v1 = getLayout(t.context.validation, 'NamespacedBadV1');
+    const v2 = getLayout(t.context.validation, 'NamespacedStaleRenameV2');
+    const report = (0, storage_1.getStorageUpgradeReport)(v1, v2, (0, overrides_1.withValidationDefaults)({}));
+    t.false(report.ok);
+    const items = v2.namespaces?.['erc7201:example.main'];
+    if (items === undefined) {
+        throw new Error('Namespace not found');
+    }
+    t.is(report.explain(), `${items[1].src}: \`y\` has a '@custom:oz-renamed-from q' annotation, but it was not renamed\n` +
+        '  > If the annotation is left over from an earlier upgrade, remove it.');
+});
+//# sourceMappingURL=storage-namespaced-renamed-retyped.test.js.map

package/dist/storage-namespaced-renamed-retyped.test.js.map

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

package/dist/storage-struct-member-renamed-retyped.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=storage-struct-member-renamed-retyped.test.d.ts.map

package/dist/storage-struct-member-renamed-retyped.test.d.ts.map

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

package/dist/storage-struct-member-renamed-retyped.test.js

@@ -0,0 +1,256 @@
+"use strict";
+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 hardhat_1 = require("hardhat");
+const utils_1 = require("solidity-ast/utils");
+const validate_1 = require("./validate");
+const overrides_1 = require("./validate/overrides");
+const src_decoder_1 = require("./src-decoder");
+const storage_1 = require("./storage");
+const layout_1 = require("./storage/layout");
+const stabilize_layout_1 = require("./utils/stabilize-layout");
+const source = 'contracts/test/StructMemberRenamedRetyped.sol';
+const test = ava_1.default;
+test.before(async (t) => {
+    const buildInfo = await hardhat_1.artifacts.getBuildInfo(`${source}:StructMemberRenamedRetypedV1`);
+    if (buildInfo === undefined) {
+        throw new Error('Build info not found');
+    }
+    t.context.buildInfo = buildInfo;
+    // The source decoder always uses the original build info, since the tests below only modify the input in ways
+    // that keep line numbers unchanged.
+    const decodeSrc = (0, src_decoder_1.solcInputOutputDecoder)(buildInfo.input, buildInfo.output);
+    t.context.validate = (solcInput = buildInfo.input, solcOutput = buildInfo.output) => (0, validate_1.validate)(solcOutput, decodeSrc, buildInfo.solcVersion, solcInput);
+    const validation = t.context.validate();
+    t.context.layout = contract => validation[`${source}:${contract}`].layout;
+});
+function getStructMembers(layout, label) {
+    const members = Object.values(layout.types).find(type => type.label === label)?.members;
+    if (members === undefined || !(0, layout_1.isStructMembers)(members)) {
+        throw new Error(`Struct members not found for ${label}`);
+    }
+    return members;
+}
+/**
+ * Replaces the given comment inside a struct body with code of the same length, so that the AST offsets still line up
+ * but the text between two members is not whitespace or comments, as it would be with syntax that is not supported.
+ */
+function withUnexpectedStructSyntax(solcInput, comment) {
+    const content = solcInput.sources[source].content;
+    if (content === undefined || !content.includes(comment)) {
+        throw new Error(`Comment ${comment} not found in ${source}`);
+    }
+    const code = 'uint256 q;'.padEnd(comment.length);
+    return { ...solcInput, sources: { ...solcInput.sources, [source]: { content: content.replace(comment, code) } } };
+}
+test('layout', t => {
+    t.snapshot((0, stabilize_layout_1.stabilizeStorageLayout)(t.context.layout('StructMemberRenamedRetypedV2')));
+});
+test('upgrade ok', t => {
+    const v1 = t.context.layout('StructMemberRenamedRetypedV1');
+    const v2 = t.context.layout('StructMemberRenamedRetypedV2');
+    t.deepEqual((0, storage_1.getStorageUpgradeErrors)(v1, v2), []);
+});
+test('exact map', t => {
+    const members = getStructMembers(t.context.layout('StructMemberExactMap'), 'struct StructMemberExactMap.S');
+    t.is(members.length, 5);
+    for (const member of members) {
+        t.is(member.renamedFrom, `old_${member.label}`);
+        t.is(member.retypedFrom, undefined);
+    }
+});
+test('wrong retype', t => {
+    const v1 = t.context.layout('StructMemberBadV1');
+    const v2 = t.context.layout('StructMemberWrongRetypeV2');
+    t.like((0, storage_1.getStorageUpgradeErrors)(v1, v2), {
+        length: 1,
+        0: {
+            kind: 'typechange',
+            change: {
+                kind: 'struct members',
+                ops: {
+                    length: 1,
+                    0: { kind: 'typechange', original: { label: 'x' }, updated: { label: 'x', retypedFrom: 'address' } },
+                },
+            },
+            original: { label: 's' },
+            updated: { label: 's' },
+        },
+    });
+});
+test('retype with layout change', t => {
+    // A retype annotation that names the original type does not allow the member's size to change
+    const v1 = t.context.layout('StructMemberRetypeLayoutChangeV1');
+    const v2 = t.context.layout('StructMemberRetypeLayoutChangeV2');
+    t.like((0, storage_1.getStorageUpgradeErrors)(v1, v2), {
+        length: 1,
+        0: {
+            kind: 'typechange',
+            change: {
+                kind: 'struct members',
+                ops: {
+                    length: 1,
+                    0: {
+                        kind: 'layoutchange',
+                        original: { label: 'y' },
+                        updated: { label: 'y', retypedFrom: 'uint256' },
+                        change: { bytes: { from: '32', to: '16' } },
+                    },
+                },
+            },
+            original: { label: 's' },
+            updated: { label: 's' },
+        },
+    });
+});
+test('annotation on the wrong member', t => {
+    // The annotation makes `x` match the original `y` with a different type, and `x` and `z` are left unmatched
+    const v1 = t.context.layout('StructMemberBadV1');
+    const v2 = t.context.layout('StructMemberWrongMemberV2');
+    t.like((0, storage_1.getStorageUpgradeErrors)(v1, v2), {
+        length: 1,
+        0: {
+            kind: 'typechange',
+            change: {
+                kind: 'struct members',
+                ops: {
+                    length: 3,
+                    0: { kind: 'delete', original: { label: 'x' } },
+                    1: { kind: 'typechange', original: { label: 'y' }, updated: { label: 'x', renamedFrom: 'y' } },
+                    2: { kind: 'insert', updated: { label: 'z' } },
+                },
+            },
+            original: { label: 's' },
+            updated: { label: 's' },
+        },
+    });
+});
+test('stale rename annotation', t => {
+    const v1 = t.context.layout('StructMemberBadV1');
+    const v2 = t.context.layout('StructMemberStaleRenameV2');
+    t.like((0, storage_1.getStorageUpgradeErrors)(v1, v2), {
+        length: 1,
+        0: {
+            kind: 'typechange',
+            change: {
+                kind: 'struct members',
+                ops: {
+                    length: 1,
+                    0: { kind: 'rename', original: { label: 'y' }, updated: { label: 'y', renamedFrom: 'q' } },
+                },
+            },
+            original: { label: 's' },
+            updated: { label: 's' },
+        },
+    });
+});
+test('unannotated rename and retype', t => {
+    const v1 = t.context.layout('StructMemberBadV1');
+    const v2 = t.context.layout('StructMemberUnannotatedV2');
+    t.like((0, storage_1.getStorageUpgradeErrors)(v1, v2), {
+        length: 1,
+        0: {
+            kind: 'typechange',
+            change: {
+                kind: 'struct members',
+                ops: {
+                    length: 2,
+                    0: { kind: 'typechange', original: { label: 'x' }, updated: { label: 'x' } },
+                    1: { kind: 'rename', original: { label: 'y' }, updated: { label: 'z' } },
+                },
+            },
+            original: { label: 's' },
+            updated: { label: 's' },
+        },
+    });
+});
+test('annotated members without layout info', t => {
+    // Without the compiler's storage layout, members have no slots. A retype that is not known to be compatible is then uncertain.
+    const solcOutput = JSON.parse(JSON.stringify(t.context.buildInfo.output));
+    for (const contracts of Object.values(solcOutput.contracts)) {
+        for (const contract of Object.values(contracts)) {
+            delete contract.storageLayout;
+        }
+    }
+    const validation = t.context.validate(undefined, solcOutput);
+    const v1 = validation[`${source}:StructMemberRenamedRetypedV1`].layout;
+    const v2 = validation[`${source}:StructMemberRenamedRetypedV2`].layout;
+    const report = (0, storage_1.getStorageUpgradeReport)(v1, v2, (0, overrides_1.withValidationDefaults)({}));
+    t.false(report.ok);
+    t.like(report.ops, {
+        length: 4,
+        0: { kind: 'typechange', original: { label: 's' } },
+        1: { kind: 'typechange', original: { label: 'm' } },
+        2: { kind: 'typechange', original: { label: 'arr' } },
+        3: { kind: 'typechange', original: { label: 'other' } },
+    });
+    t.true(report.explain().includes('Layout could have changed for `x` (bytes32 -> struct TransientSlot.TBytes32)'), report.explain());
+    t.snapshot(report.explain());
+});
+test('annotations are not read without source content', t => {
+    const { input } = t.context.buildInfo;
+    const sources = Object.fromEntries(Object.keys(input.sources).map(path => [path, {}]));
+    const validation = t.context.validate({ ...input, sources });
+    const v1 = validation[`${source}:StructMemberRenamedRetypedV1`].layout;
+    const v2 = validation[`${source}:StructMemberRenamedRetypedV2`].layout;
+    t.like((0, storage_1.getStorageUpgradeErrors)(v1, v2), {
+        length: 5,
+        0: { kind: 'typechange', original: { label: 's' } },
+        1: { kind: 'typechange', original: { label: 'm' } },
+        2: { kind: 'typechange', original: { label: 'arr' } },
+        3: { kind: 'typechange', original: { label: 'outer' } },
+        4: { kind: 'typechange', original: { label: 'other' } },
+    });
+});
+test('unexpected syntax in struct with annotations', t => {
+    const { input, output } = t.context.buildInfo;
+    const structDef = [...(0, utils_1.findAll)('StructDefinition', output.sources[source].ast)].find(s => s.canonicalName === 'StructMemberUnreadableAnnotated.S');
+    if (structDef === undefined) {
+        throw new Error('Struct not found');
+    }
+    const structSrc = (0, src_decoder_1.solcInputOutputDecoder)(input, output)(structDef);
+    const error = t.throws(() => t.context.validate(withUnexpectedStructSyntax(input, '// 12345678')));
+    t.true(error?.message.includes(`${structSrc}: Could not read storage annotations on members of struct \`StructMemberUnreadableAnnotated.S\``), error?.message);
+    t.true(error?.message.includes('Please report this at https://zpl.in/upgrades/report and include the struct definition from your contract.'), error?.message);
+});
+test('unexpected syntax in struct without annotations', t => {
+    const validation = t.context.validate(withUnexpectedStructSyntax(t.context.buildInfo.input, '// 87654321'));
+    const layout = validation[`${source}:StructMemberUnreadableUnannotated`].layout;
+    t.like(getStructMembers(layout, 'struct StructMemberUnreadableUnannotated.S'), {
+        length: 2,
+        0: { label: 'b', renamedFrom: undefined, retypedFrom: undefined },
+        1: { label: 'c', renamedFrom: undefined, retypedFrom: undefined },
+    });
+    // Other structs are unaffected
+    const v1 = validation[`${source}:StructMemberRenamedRetypedV1`].layout;
+    const v2 = validation[`${source}:StructMemberRenamedRetypedV2`].layout;
+    t.deepEqual((0, storage_1.getStorageUpgradeErrors)(v1, v2), []);
+});
+test('unexpected syntax in struct with other annotations', t => {
+    const validation = t.context.validate(withUnexpectedStructSyntax(t.context.buildInfo.input, '// 13572468'));
+    const layout = validation[`${source}:StructMemberUnreadableOtherAnnotation`].layout;
+    t.like(getStructMembers(layout, 'struct StructMemberUnreadableOtherAnnotation.S'), {
+        length: 2,
+        0: { label: 'b', renamedFrom: undefined, retypedFrom: undefined },
+        1: { label: 'c', renamedFrom: undefined, retypedFrom: undefined },
+    });
+});
+test('multiple annotations in a doc block without line prefixes', t => {
+    const layout = t.context.layout('StateVariableDocBlock');
+    t.like(layout.storage, { length: 1, 0: { label: 'x', renamedFrom: 'a', retypedFrom: 'uint8' } });
+});
+test('stale rename annotation report', t => {
+    const v1 = t.context.layout('StructMemberBadV1');
+    const v2 = t.context.layout('StructMemberStaleRenameV2');
+    const report = (0, storage_1.getStorageUpgradeReport)(v1, v2, (0, overrides_1.withValidationDefaults)({}));
+    t.false(report.ok);
+    t.is(report.explain(), `${v2.storage[0].src}: Upgraded \`s\` to an incompatible type\n` +
+        '  - Bad upgrade from struct StructMemberBadV1.S to struct StructMemberStaleRenameV2.S\n' +
+        '  - In struct StructMemberStaleRenameV2.S\n' +
+        "    - `y` has a '@custom:oz-renamed-from q' annotation, but it was not renamed\n" +
+        '      > If the annotation is left over from an earlier upgrade, remove it.');
+});
+//# sourceMappingURL=storage-struct-member-renamed-retyped.test.js.map

package/dist/storage-struct-member-renamed-retyped.test.js.map

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

package/dist/utils/annotations.d.ts

@@ -1,4 +1,5 @@
 import { Node } from 'solidity-ast/node';
+export declare const ANNOTATION_REGEX: RegExp;
 /**
  * Whether the given doc string has an annotation tag.
  */

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

@@ -1 +1 @@
-{"version":3,"file":"annotations.d.ts","sourceRoot":"","sources":["../../src/utils/annotations.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAEzC;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAGlE;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,SAAS,MAAM,EAAE,YAuB5F;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,IAAI,UAM1C"}
+{"version":3,"file":"annotations.d.ts","sourceRoot":"","sources":["../../src/utils/annotations.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAGzC,eAAO,MAAM,gBAAgB,QAAqF,CAAC;AAEnH;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAGlE;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,SAAS,MAAM,EAAE,YAoB5F;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,IAAI,UAM1C"}

package/dist/utils/annotations.js

@@ -1,9 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ANNOTATION_REGEX = void 0;
 exports.hasAnnotationTag = hasAnnotationTag;
 exports.getAnnotationArgs = getAnnotationArgs;
 exports.getDocumentation = getDocumentation;
 const execall_1 = require("./execall");
+// Matches one NatSpec tag: `@title:tag args`, where the args run until the next line that starts with a tag
+exports.ANNOTATION_REGEX = /^\s*(?:@(?<title>\w+)(?::(?<tag>[a-z][a-z-]*))? )?(?<args>(?:(?!^\s*@\w+)[^])*)/m;
 /**
  * Whether the given doc string has an annotation tag.
  */
@@ -20,7 +23,7 @@ function hasAnnotationTag(doc, tag) {
  */
 function getAnnotationArgs(doc, tag, supportedArgs) {
     const result = [];
-    for (const { groups } of (0, execall_1.execall)(/^\s*(?:@(?<title>\w+)(?::(?<tag>[a-z][a-z-]*))? )?(?<args>(?:(?!^\s*@\w+)[^])*)/m, doc)) {
+    for (const { groups } of (0, execall_1.execall)(exports.ANNOTATION_REGEX, doc)) {
         if (groups && groups.title === 'custom' && groups.tag === tag) {
             const trimmedArgs = groups.args.trim();
             if (trimmedArgs.length > 0) {

package/dist/utils/annotations.js.map

@@ -1 +1 @@
-{"version":3,"file":"annotations.js","sourceRoot":"","sources":["../../src/utils/annotations.ts"],"names":[],"mappings":";;AAMA,4CAGC;AASD,8CAuBC;AAOD,4CAMC;AAtDD,uCAAoC;AAGpC;;GAEG;AACH,SAAgB,gBAAgB,CAAC,GAAW,EAAE,GAAW;IACvD,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,iBAAiB,GAAG,UAAU,EAAE,GAAG,CAAC,CAAC;IAC9D,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACzB,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,iBAAiB,CAAC,GAAW,EAAE,GAAW,EAAE,aAAiC;IAC3F,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,KAAK,MAAM,EAAE,MAAM,EAAE,IAAI,IAAA,iBAAO,EAC9B,kFAAkF,EAClF,GAAG,CACJ,EAAE,CAAC;QACF,IAAI,MAAM,IAAI,MAAM,CAAC,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,GAAG,KAAK,GAAG,EAAE,CAAC;YAC9D,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACvC,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC3B,MAAM,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;YAC3C,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;QAChC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YACnB,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBACjC,MAAM,IAAI,KAAK,CAAC,YAAY,GAAG,6BAA6B,GAAG,EAAE,CAAC,CAAC;YACrE,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;GAIG;AACH,SAAgB,gBAAgB,CAAC,IAAU;IACzC,IAAI,eAAe,IAAI,IAAI,EAAE,CAAC;QAC5B,OAAO,OAAO,IAAI,CAAC,aAAa,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC;IACxG,CAAC;SAAM,CAAC;QACN,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC"}
+{"version":3,"file":"annotations.js","sourceRoot":"","sources":["../../src/utils/annotations.ts"],"names":[],"mappings":";;;AASA,4CAGC;AASD,8CAoBC;AAOD,4CAMC;AAtDD,uCAAoC;AAGpC,4GAA4G;AAC/F,QAAA,gBAAgB,GAAG,kFAAkF,CAAC;AAEnH;;GAEG;AACH,SAAgB,gBAAgB,CAAC,GAAW,EAAE,GAAW;IACvD,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,iBAAiB,GAAG,UAAU,EAAE,GAAG,CAAC,CAAC;IAC9D,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACzB,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,iBAAiB,CAAC,GAAW,EAAE,GAAW,EAAE,aAAiC;IAC3F,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,KAAK,MAAM,EAAE,MAAM,EAAE,IAAI,IAAA,iBAAO,EAAC,wBAAgB,EAAE,GAAG,CAAC,EAAE,CAAC;QACxD,IAAI,MAAM,IAAI,MAAM,CAAC,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,GAAG,KAAK,GAAG,EAAE,CAAC;YAC9D,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACvC,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC3B,MAAM,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;YAC3C,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;QAChC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YACnB,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBACjC,MAAM,IAAI,KAAK,CAAC,YAAY,GAAG,6BAA6B,GAAG,EAAE,CAAC,CAAC;YACrE,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;GAIG;AACH,SAAgB,gBAAgB,CAAC,IAAU;IACzC,IAAI,eAAe,IAAI,IAAI,EAAE,CAAC;QAC5B,OAAO,OAAO,IAAI,CAAC,aAAa,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC;IACxG,CAAC;SAAM,CAAC;QACN,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC"}