@openzeppelin/upgrades-core 1.28.0 → 1.30.0

package/src/storage/report.ts

@@ -154,6 +154,11 @@ function explainStorageOperation(op: StorageOperation<StorageField>, ctx: Storag
           hints.push('Keep the variable even if unused');
           break;
         }
+
+        case 'delete-namespace': {
+          hints.push(`Keep the struct with annotation '@custom:storage-location ${op.namespace}' even if unused`);
+          break;
+        }
       }
 
       return printWithHints({ title, hints });
@@ -299,6 +304,9 @@ function explainBasicOperation<T>(op: BasicOperation<T>, getName: (t: T) => stri
 
     case 'append':
       return `Added \`${getName(op.updated)}\``;
+
+    case 'delete-namespace':
+      return `Deleted namespace \`${op.namespace}\``;
   }
 }
 

package/src/storage-0.8.test.ts.md

@@ -9,6 +9,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     {
+      namespaces: [],
       storage: [
         {
           contract: 'Storage088',
@@ -46,6 +47,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     {
+      namespaces: [],
       storage: [
         {
           contract: 'Storage089',
@@ -83,6 +85,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     {
+      namespaces: [],
       storage: [
         {
           contract: 'Storage089',
@@ -117,6 +120,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     {
+      namespaces: [],
       storage: [
         {
           contract: 'StorageRenamedRetyped',

package/src/storage-memory-0.5.test.ts.md

@@ -9,6 +9,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     {
+      namespaces: [],
       storage: [
         {
           contract: 'Memory05',
@@ -94,6 +95,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     {
+      namespaces: [],
       storage: [
         {
           contract: 'Memory08',

package/src/storage-namespaced-conflicts-layout.test.ts

@@ -0,0 +1,96 @@
+import _test, { TestFn } from 'ava';
+import { ContractDefinition } from 'solidity-ast';
+import { findAll, astDereferencer } from 'solidity-ast/utils';
+import { artifacts } from 'hardhat';
+
+import { SolcOutput } from './solc-api';
+import { StorageLayout } from './storage/layout';
+import { extractStorageLayout } from './storage/extract';
+import { solcInputOutputDecoder } from './src-decoder';
+
+interface Context {
+  extractStorageLayout: (contract: string) => ReturnType<typeof extractStorageLayout>;
+}
+
+const test = _test as TestFn<Context>;
+
+test.before(async t => {
+  const origBuildInfo = await artifacts.getBuildInfo('contracts/test/NamespacedConflicts.sol:DuplicateNamespace');
+  const namespacedBuildInfo = await artifacts.getBuildInfo(
+    'contracts/test/NamespacedConflictsLayout.sol:DuplicateNamespace',
+  );
+
+  if (origBuildInfo === undefined || namespacedBuildInfo === undefined) {
+    throw new Error('Build info not found');
+  }
+
+  const origSolcOutput: SolcOutput = origBuildInfo.output;
+  const origContracts: Record<string, ContractDefinition> = {};
+  const origStorageLayouts: Record<string, StorageLayout> = {};
+
+  const namespacedSolcOutput: SolcOutput = namespacedBuildInfo.output;
+  const namespacedContracts: Record<string, ContractDefinition> = {};
+  const namespacedStorageLayouts: Record<string, StorageLayout> = {};
+
+  const origContractDefs = [];
+  for (const def of findAll(
+    'ContractDefinition',
+    origSolcOutput.sources['contracts/test/NamespacedConflicts.sol'].ast,
+  )) {
+    origContractDefs.push(def);
+  }
+  const namespacedContractDefs = [];
+  for (const def of findAll(
+    'ContractDefinition',
+    namespacedSolcOutput.sources['contracts/test/NamespacedConflictsLayout.sol'].ast,
+  )) {
+    namespacedContractDefs.push(def);
+  }
+
+  for (let i = 0; i < origContractDefs.length; i++) {
+    const origContractDef = origContractDefs[i];
+    const namespacedContractDef = namespacedContractDefs[i];
+
+    origContracts[origContractDef.name] = origContractDef;
+    namespacedContracts[namespacedContractDef.name] = namespacedContractDef;
+
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    origStorageLayouts[origContractDef.name] =
+      origSolcOutput.contracts['contracts/test/NamespacedConflicts.sol'][origContractDef.name].storageLayout!;
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    namespacedStorageLayouts[namespacedContractDef.name] =
+      namespacedSolcOutput.contracts['contracts/test/NamespacedConflictsLayout.sol'][
+        namespacedContractDef.name
+      ].storageLayout!;
+  }
+  const origDeref = astDereferencer(origSolcOutput);
+  const namespacedDeref = astDereferencer(namespacedSolcOutput);
+
+  const decodeSrc = solcInputOutputDecoder(origBuildInfo.input, origSolcOutput);
+  t.context.extractStorageLayout = name =>
+    extractStorageLayout(origContracts[name], decodeSrc, origDeref, origStorageLayouts[name], {
+      deref: namespacedDeref,
+      contractDef: namespacedContracts[name],
+      storageLayout: namespacedStorageLayouts[name],
+    });
+});
+
+test('duplicate namespace', t => {
+  const error = t.throws(() => t.context.extractStorageLayout('DuplicateNamespace'));
+  t.snapshot(error?.message);
+});
+
+test('inherits duplicate', t => {
+  const error = t.throws(() => t.context.extractStorageLayout('InheritsDuplicate'));
+  t.snapshot(error?.message);
+});
+
+test('conflicts with parent', t => {
+  const error = t.throws(() => t.context.extractStorageLayout('ConflictsWithParent'));
+  t.snapshot(error?.message);
+});
+
+test('conflicts in both parents', t => {
+  const error = t.throws(() => t.context.extractStorageLayout('ConflictsInBothParents'));
+  t.snapshot(error?.message);
+});

package/src/storage-namespaced-conflicts-layout.test.ts.md

@@ -0,0 +1,53 @@
+# Snapshot report for `src/storage-namespaced-conflicts-layout.test.ts`
+
+The actual snapshot is saved in `storage-namespaced-conflicts-layout.test.ts.snap`.
+
+Generated by [AVA](https://avajs.dev).
+
+## duplicate namespace
+
+> Snapshot 1
+
+    `Namespace erc7201:conflicting is defined multiple times for contract DuplicateNamespace␊
+    ␊
+    The namespace erc7201:conflicting was found in structs at the following locations:␊
+    - contracts/test/NamespacedConflicts.sol:10␊
+    - contracts/test/NamespacedConflicts.sol:15␊
+    ␊
+    Use a unique namespace id for each struct annotated with '@custom:storage-location erc7201:<NAMESPACE_ID>' in your contract and its inherited contracts.`
+
+## inherits duplicate
+
+> Snapshot 1
+
+    `Namespace erc7201:conflicting is defined multiple times for contract InheritsDuplicate␊
+    ␊
+    The namespace erc7201:conflicting was found in structs at the following locations:␊
+    - contracts/test/NamespacedConflicts.sol:10␊
+    - contracts/test/NamespacedConflicts.sol:15␊
+    ␊
+    Use a unique namespace id for each struct annotated with '@custom:storage-location erc7201:<NAMESPACE_ID>' in your contract and its inherited contracts.`
+
+## conflicts with parent
+
+> Snapshot 1
+
+    `Namespace erc7201:conflicting is defined multiple times for contract ConflictsWithParent␊
+    ␊
+    The namespace erc7201:conflicting was found in structs at the following locations:␊
+    - contracts/test/NamespacedConflicts.sol:45␊
+    - contracts/test/NamespacedConflicts.sol:30␊
+    ␊
+    Use a unique namespace id for each struct annotated with '@custom:storage-location erc7201:<NAMESPACE_ID>' in your contract and its inherited contracts.`
+
+## conflicts in both parents
+
+> Snapshot 1
+
+    `Namespace erc7201:conflicting is defined multiple times for contract ConflictsInBothParents␊
+    ␊
+    The namespace erc7201:conflicting was found in structs at the following locations:␊
+    - contracts/test/NamespacedConflicts.sol:45␊
+    - contracts/test/NamespacedConflicts.sol:30␊
+    ␊
+    Use a unique namespace id for each struct annotated with '@custom:storage-location erc7201:<NAMESPACE_ID>' in your contract and its inherited contracts.`

package/src/storage-namespaced-conflicts.test.ts

@@ -0,0 +1,54 @@
+import _test, { TestFn } from 'ava';
+import { ContractDefinition } from 'solidity-ast';
+import { findAll, astDereferencer } from 'solidity-ast/utils';
+import { artifacts } from 'hardhat';
+
+import { SolcOutput } from './solc-api';
+import { StorageLayout } from './storage/layout';
+import { extractStorageLayout } from './storage/extract';
+import { solcInputOutputDecoder } from './src-decoder';
+
+interface Context {
+  extractStorageLayout: (contract: string) => ReturnType<typeof extractStorageLayout>;
+}
+
+const test = _test as TestFn<Context>;
+
+test.before(async t => {
+  const buildInfo = await artifacts.getBuildInfo('contracts/test/NamespacedConflicts.sol:DuplicateNamespace');
+  if (buildInfo === undefined) {
+    throw new Error('Build info not found');
+  }
+  const solcOutput: SolcOutput = buildInfo.output;
+  const contracts: Record<string, ContractDefinition> = {};
+  const storageLayouts: Record<string, StorageLayout> = {};
+  for (const def of findAll('ContractDefinition', solcOutput.sources['contracts/test/NamespacedConflicts.sol'].ast)) {
+    contracts[def.name] = def;
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    storageLayouts[def.name] = solcOutput.contracts['contracts/test/NamespacedConflicts.sol'][def.name].storageLayout!;
+  }
+  const deref = astDereferencer(solcOutput);
+  const decodeSrc = solcInputOutputDecoder(buildInfo.input, solcOutput);
+  t.context.extractStorageLayout = name =>
+    extractStorageLayout(contracts[name], decodeSrc, deref, storageLayouts[name]);
+});
+
+test('duplicate namespace', t => {
+  const error = t.throws(() => t.context.extractStorageLayout('DuplicateNamespace'));
+  t.snapshot(error?.message);
+});
+
+test('inherits duplicate', t => {
+  const error = t.throws(() => t.context.extractStorageLayout('InheritsDuplicate'));
+  t.snapshot(error?.message);
+});
+
+test('conflicts with parent', t => {
+  const error = t.throws(() => t.context.extractStorageLayout('ConflictsWithParent'));
+  t.snapshot(error?.message);
+});
+
+test('conflicts in both parents', t => {
+  const error = t.throws(() => t.context.extractStorageLayout('ConflictsInBothParents'));
+  t.snapshot(error?.message);
+});

package/src/storage-namespaced-conflicts.test.ts.md

@@ -0,0 +1,53 @@
+# Snapshot report for `src/storage-namespaced-conflicts.test.ts`
+
+The actual snapshot is saved in `storage-namespaced-conflicts.test.ts.snap`.
+
+Generated by [AVA](https://avajs.dev).
+
+## duplicate namespace
+
+> Snapshot 1
+
+    `Namespace erc7201:conflicting is defined multiple times for contract DuplicateNamespace␊
+    ␊
+    The namespace erc7201:conflicting was found in structs at the following locations:␊
+    - contracts/test/NamespacedConflicts.sol:10␊
+    - contracts/test/NamespacedConflicts.sol:15␊
+    ␊
+    Use a unique namespace id for each struct annotated with '@custom:storage-location erc7201:<NAMESPACE_ID>' in your contract and its inherited contracts.`
+
+## inherits duplicate
+
+> Snapshot 1
+
+    `Namespace erc7201:conflicting is defined multiple times for contract InheritsDuplicate␊
+    ␊
+    The namespace erc7201:conflicting was found in structs at the following locations:␊
+    - contracts/test/NamespacedConflicts.sol:10␊
+    - contracts/test/NamespacedConflicts.sol:15␊
+    ␊
+    Use a unique namespace id for each struct annotated with '@custom:storage-location erc7201:<NAMESPACE_ID>' in your contract and its inherited contracts.`
+
+## conflicts with parent
+
+> Snapshot 1
+
+    `Namespace erc7201:conflicting is defined multiple times for contract ConflictsWithParent␊
+    ␊
+    The namespace erc7201:conflicting was found in structs at the following locations:␊
+    - contracts/test/NamespacedConflicts.sol:45␊
+    - contracts/test/NamespacedConflicts.sol:30␊
+    ␊
+    Use a unique namespace id for each struct annotated with '@custom:storage-location erc7201:<NAMESPACE_ID>' in your contract and its inherited contracts.`
+
+## conflicts in both parents
+
+> Snapshot 1
+
+    `Namespace erc7201:conflicting is defined multiple times for contract ConflictsInBothParents␊
+    ␊
+    The namespace erc7201:conflicting was found in structs at the following locations:␊
+    - contracts/test/NamespacedConflicts.sol:45␊
+    - contracts/test/NamespacedConflicts.sol:30␊
+    ␊
+    Use a unique namespace id for each struct annotated with '@custom:storage-location erc7201:<NAMESPACE_ID>' in your contract and its inherited contracts.`

package/src/storage-namespaced-layout.test.ts

@@ -0,0 +1,77 @@
+import _test, { TestFn } from 'ava';
+import { ContractDefinition } from 'solidity-ast';
+import { findAll, astDereferencer } from 'solidity-ast/utils';
+import { artifacts } from 'hardhat';
+
+import { SolcOutput } from './solc-api';
+import { StorageLayout } from './storage/layout';
+import { extractStorageLayout } from './storage/extract';
+import { stabilizeStorageLayout } from './utils/stabilize-layout';
+import { solcInputOutputDecoder } from './src-decoder';
+
+interface Context {
+  extractStorageLayout: (contract: string) => ReturnType<typeof extractStorageLayout>;
+}
+
+const test = _test as TestFn<Context>;
+
+test.before(async t => {
+  // Tests extracting the storage layout (to include slot and offset) using Namespaced.sol's Example as the original contract,
+  // and NamespacedLayout.sol's Example as the modified contract with the storage layout.
+  const origBuildInfo = await artifacts.getBuildInfo('contracts/test/Namespaced.sol:Example');
+  const namespacedBuildInfo = await artifacts.getBuildInfo('contracts/test/NamespacedLayout.sol:Example');
+
+  if (origBuildInfo === undefined || namespacedBuildInfo === undefined) {
+    throw new Error('Build info not found');
+  }
+
+  const origSolcOutput: SolcOutput = origBuildInfo.output;
+  const origContracts: Record<string, ContractDefinition> = {};
+  const origStorageLayouts: Record<string, StorageLayout> = {};
+
+  const namespacedSolcOutput: SolcOutput = namespacedBuildInfo.output;
+  const namespacedContracts: Record<string, ContractDefinition> = {};
+  const namespacedStorageLayouts: Record<string, StorageLayout> = {};
+
+  const origContractDefs = [];
+  for (const def of findAll('ContractDefinition', origSolcOutput.sources['contracts/test/Namespaced.sol'].ast)) {
+    origContractDefs.push(def);
+  }
+  const namespacedContractDefs = [];
+  for (const def of findAll(
+    'ContractDefinition',
+    namespacedSolcOutput.sources['contracts/test/NamespacedLayout.sol'].ast,
+  )) {
+    namespacedContractDefs.push(def);
+  }
+
+  // Expects the first contract in Namespaced.sol and NamespacedLayout.sol to be 'Example'
+  const origContractDef = origContractDefs[0];
+  const namespacedContractDef = namespacedContractDefs[0];
+
+  origContracts[origContractDef.name] = origContractDef;
+  namespacedContracts[namespacedContractDef.name] = namespacedContractDef;
+
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+  origStorageLayouts[origContractDef.name] =
+    origSolcOutput.contracts['contracts/test/Namespaced.sol'][origContractDef.name].storageLayout!;
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+  namespacedStorageLayouts[namespacedContractDef.name] =
+    namespacedSolcOutput.contracts['contracts/test/NamespacedLayout.sol'][namespacedContractDef.name].storageLayout!;
+
+  const origDeref = astDereferencer(origSolcOutput);
+  const namespacedDeref = astDereferencer(namespacedSolcOutput);
+
+  const decodeSrc = solcInputOutputDecoder(origBuildInfo.input, origSolcOutput);
+  t.context.extractStorageLayout = name =>
+    extractStorageLayout(origContracts[name], decodeSrc, origDeref, origStorageLayouts[name], {
+      deref: namespacedDeref,
+      contractDef: namespacedContracts[name],
+      storageLayout: namespacedStorageLayouts[name],
+    });
+});
+
+test('layout', t => {
+  const layout = t.context.extractStorageLayout('Example');
+  t.snapshot(stabilizeStorageLayout(layout));
+});

package/src/storage-namespaced-layout.test.ts.md

@@ -0,0 +1,67 @@
+# Snapshot report for `src/storage-namespaced-layout.test.ts`
+
+The actual snapshot is saved in `storage-namespaced-layout.test.ts.snap`.
+
+Generated by [AVA](https://avajs.dev).
+
+## layout
+
+> Snapshot 1
+
+    {
+      namespaces: [
+        [
+          'erc7201:example.main',
+          [
+            {
+              contract: 'Example',
+              label: 'x',
+              offset: 0,
+              slot: '0',
+              src: 'contracts/test/Namespaced.sol:7',
+              type: 't_uint256',
+            },
+            {
+              contract: 'Example',
+              label: 'y',
+              offset: 0,
+              slot: '1',
+              src: 'contracts/test/Namespaced.sol:8',
+              type: 't_uint256',
+            },
+          ],
+        ],
+      ],
+      storage: [],
+      types: [
+        [
+          't_struct(MainStorage)storage',
+          {
+            label: 'struct Example.MainStorage',
+            members: [
+              {
+                label: 'x',
+                offset: 0,
+                slot: '0',
+                type: 't_uint256',
+              },
+              {
+                label: 'y',
+                offset: 0,
+                slot: '1',
+                type: 't_uint256',
+              },
+            ],
+            numberOfBytes: '64',
+          },
+        ],
+        [
+          't_uint256',
+          {
+            label: 'uint256',
+            members: undefined,
+            numberOfBytes: '32',
+          },
+        ],
+      ],
+    }

package/src/storage-namespaced-outside-contract.test.ts

@@ -0,0 +1,24 @@
+import test from 'ava';
+import { artifacts } from 'hardhat';
+
+import { validate } from './validate';
+import { solcInputOutputDecoder } from './src-decoder';
+
+test('namespace outside contract', async t => {
+  const contract = 'contracts/test/NamespacedOutsideContract.sol:Example';
+
+  const buildInfo = await artifacts.getBuildInfo(contract);
+  if (buildInfo === undefined) {
+    throw new Error(`Build info not found for contract ${contract}`);
+  }
+  const solcOutput = buildInfo.output;
+  const solcInput = buildInfo.input;
+  const decodeSrc = solcInputOutputDecoder(solcInput, solcOutput);
+  const error = t.throws(() => validate(solcOutput, decodeSrc));
+  t.assert(
+    error?.message.includes(
+      'contracts/test/NamespacedOutsideContract.sol:7: Namespace struct MainStorage is defined outside of a contract',
+    ),
+    error?.message,
+  );
+});

package/src/storage-namespaced-solc-versions.test.ts

@@ -0,0 +1,59 @@
+import _test, { TestFn } from 'ava';
+import { artifacts } from 'hardhat';
+
+import { validate } from './validate';
+import { solcInputOutputDecoder } from './src-decoder';
+
+interface Context {
+  validate: (solcVersion?: string) => ReturnType<typeof validate>;
+}
+
+const test = _test as TestFn<Context>;
+
+test.before(async t => {
+  const contract = 'contracts/test/Namespaced.sol:Example';
+
+  const buildInfo = await artifacts.getBuildInfo(contract);
+  if (buildInfo === undefined) {
+    throw new Error(`Build info not found for contract ${contract}`);
+  }
+  const solcOutput = buildInfo.output;
+  const solcInput = buildInfo.input;
+  const decodeSrc = solcInputOutputDecoder(solcInput, solcOutput);
+
+  t.context.validate = solcVersion => validate(solcOutput, decodeSrc, solcVersion, solcInput);
+});
+
+test('namespace with older solc version', async t => {
+  const { validate } = t.context;
+  const error = t.throws(() => validate('0.8.19'));
+  t.assert(
+    error?.message.includes(
+      `contracts/test/Namespaced.sol: Namespace annotations require Solidity version >= 0.8.20, but 0.8.19 was used`,
+    ),
+    error?.message,
+  );
+});
+
+test('namespace with correct solc version', async t => {
+  const { validate } = t.context;
+  validate('0.8.20');
+  t.pass();
+});
+
+test('namespace with newer solc version', async t => {
+  const { validate } = t.context;
+  validate('0.8.21');
+  t.pass();
+});
+
+test('namespace with no solc version', async t => {
+  const { validate } = t.context;
+  const error = t.throws(() => validate(undefined));
+  t.assert(
+    error?.message.includes(
+      `contracts/test/Namespaced.sol: Namespace annotations require Solidity version >= 0.8.20, but no solcVersion parameter was provided`,
+    ),
+    error?.message,
+  );
+});