@openzeppelin/upgrades-core 1.12.0 → 1.14.0

package/src/usage-error.ts

@@ -51,6 +51,15 @@ export class PrepareUpgradeUnsupportedError extends UpgradesError {
   }
 }
 
+export class ForceImportUnsupportedError extends UpgradesError {
+  constructor(proxyOrBeaconAddress: string) {
+    super(
+      `Contract at address ${proxyOrBeaconAddress} doesn't look like a supported proxy or beacon`,
+      () => `Only transparent, UUPS, or beacon proxies or beacons can be used with the forceImport() function.`,
+    );
+  }
+}
+
 export async function assertNotProxy(provider: EthereumProvider, address: string) {
   if (await isTransparentOrUUPSProxy(provider, address)) {
     throw new UpgradesError(

package/src/utils/execall.ts

@@ -0,0 +1,11 @@
+export function* execall(re: RegExp, text: string) {
+  re = new RegExp(re, re.flags + (re.sticky ? '' : 'y'));
+  while (true) {
+    const match = re.exec(text);
+    if (match && match[0] !== '') {
+      yield match;
+    } else {
+      break;
+    }
+  }
+}

package/src/utils/parse-type-id.test.ts.md

@@ -4,40 +4,56 @@ The actual snapshot is saved in `parse-type-id.test.ts.snap`.
 
 Generated by [AVA](https://avajs.dev).
 
-## t_array(t_function_internal_nonpayable(t_uint256)returns(t_address))10_storage
+## t_uint256
+
+> Snapshot 1
+
+    {
+      args: undefined,
+      head: 't_uint256',
+      id: 't_uint256',
+      rets: undefined,
+      tail: undefined,
+    }
+
+## t_enum(MyEnum)
 
 > Snapshot 1
 
     {
       args: [
         {
-          args: [
-            {
-              args: undefined,
-              head: 't_uint256',
-              id: 't_uint256',
-              rets: undefined,
-              tail: undefined,
-            },
-          ],
-          head: 't_function_internal_nonpayable',
-          id: 't_function_internal_nonpayable(t_uint256)returns(t_address)',
-          rets: [
-            {
-              args: undefined,
-              head: 't_address',
-              id: 't_address',
-              rets: undefined,
-              tail: undefined,
-            },
-          ],
+          args: undefined,
+          head: 'MyEnum',
+          id: 'MyEnum',
+          rets: undefined,
           tail: undefined,
         },
       ],
-      head: 't_array',
-      id: 't_array(t_function_internal_nonpayable(t_uint256)returns(t_address))10_storage',
+      head: 't_enum',
+      id: 't_enum(MyEnum)',
       rets: undefined,
-      tail: '10_storage',
+      tail: undefined,
+    }
+
+## t_struct(MyComplexStruct)storage
+
+> Snapshot 1
+
+    {
+      args: [
+        {
+          args: undefined,
+          head: 'MyComplexStruct',
+          id: 'MyComplexStruct',
+          rets: undefined,
+          tail: undefined,
+        },
+      ],
+      head: 't_struct',
+      id: 't_struct(MyComplexStruct)storage',
+      rets: undefined,
+      tail: 'storage',
     }
 
 ## t_array(t_uint256)3_storage
@@ -60,7 +76,7 @@ Generated by [AVA](https://avajs.dev).
       tail: '3_storage',
     }
 
-## t_function_internal_nonpayable(t_uint256)returns()
+## t_mapping(t_uint256,t_uint256)
 
 > Snapshot 1
 
@@ -73,10 +89,44 @@ Generated by [AVA](https://avajs.dev).
           rets: undefined,
           tail: undefined,
         },
+        {
+          args: undefined,
+          head: 't_uint256',
+          id: 't_uint256',
+          rets: undefined,
+          tail: undefined,
+        },
       ],
-      head: 't_function_internal_nonpayable',
-      id: 't_function_internal_nonpayable(t_uint256)returns()',
-      rets: [],
+      head: 't_mapping',
+      id: 't_mapping(t_uint256,t_uint256)',
+      rets: undefined,
+      tail: undefined,
+    }
+
+## t_mapping(unknown,t_uint256)
+
+> Snapshot 1
+
+    {
+      args: [
+        {
+          args: undefined,
+          head: 'unknown',
+          id: 'unknown',
+          rets: undefined,
+          tail: undefined,
+        },
+        {
+          args: undefined,
+          head: 't_uint256',
+          id: 't_uint256',
+          rets: undefined,
+          tail: undefined,
+        },
+      ],
+      head: 't_mapping',
+      id: 't_mapping(unknown,t_uint256)',
+      rets: undefined,
       tail: undefined,
     }
 
@@ -157,58 +207,12 @@ Generated by [AVA](https://avajs.dev).
       tail: undefined,
     }
 
-## t_mapping(t_uint256,t_uint256)
-
-> Snapshot 1
-
-    {
-      args: [
-        {
-          args: undefined,
-          head: 't_uint256',
-          id: 't_uint256',
-          rets: undefined,
-          tail: undefined,
-        },
-        {
-          args: undefined,
-          head: 't_uint256',
-          id: 't_uint256',
-          rets: undefined,
-          tail: undefined,
-        },
-      ],
-      head: 't_mapping',
-      id: 't_mapping(t_uint256,t_uint256)',
-      rets: undefined,
-      tail: undefined,
-    }
-
-## t_uint256
-
-> Snapshot 1
-
-    {
-      args: undefined,
-      head: 't_uint256',
-      id: 't_uint256',
-      rets: undefined,
-      tail: undefined,
-    }
-
-## t_mapping(unknown,t_uint256)
+## t_function_internal_nonpayable(t_uint256)returns()
 
 > Snapshot 1
 
     {
       args: [
-        {
-          args: undefined,
-          head: 'unknown',
-          id: 'unknown',
-          rets: undefined,
-          tail: undefined,
-        },
         {
           args: undefined,
           head: 't_uint256',
@@ -217,48 +221,44 @@ Generated by [AVA](https://avajs.dev).
           tail: undefined,
         },
       ],
-      head: 't_mapping',
-      id: 't_mapping(unknown,t_uint256)',
-      rets: undefined,
-      tail: undefined,
-    }
-
-## t_enum(MyEnum)
-
-> Snapshot 1
-
-    {
-      args: [
-        {
-          args: undefined,
-          head: 'MyEnum',
-          id: 'MyEnum',
-          rets: undefined,
-          tail: undefined,
-        },
-      ],
-      head: 't_enum',
-      id: 't_enum(MyEnum)',
-      rets: undefined,
+      head: 't_function_internal_nonpayable',
+      id: 't_function_internal_nonpayable(t_uint256)returns()',
+      rets: [],
       tail: undefined,
     }
 
-## t_struct(MyComplexStruct)storage
+## t_array(t_function_internal_nonpayable(t_uint256)returns(t_address))10_storage
 
 > Snapshot 1
 
     {
       args: [
         {
-          args: undefined,
-          head: 'MyComplexStruct',
-          id: 'MyComplexStruct',
-          rets: undefined,
+          args: [
+            {
+              args: undefined,
+              head: 't_uint256',
+              id: 't_uint256',
+              rets: undefined,
+              tail: undefined,
+            },
+          ],
+          head: 't_function_internal_nonpayable',
+          id: 't_function_internal_nonpayable(t_uint256)returns(t_address)',
+          rets: [
+            {
+              args: undefined,
+              head: 't_address',
+              id: 't_address',
+              rets: undefined,
+              tail: undefined,
+            },
+          ],
           tail: undefined,
         },
       ],
-      head: 't_struct',
-      id: 't_struct(MyComplexStruct)storage',
+      head: 't_array',
+      id: 't_array(t_function_internal_nonpayable(t_uint256)returns(t_address))10_storage',
       rets: undefined,
-      tail: 'storage',
+      tail: '10_storage',
     }

package/src/validate/query.ts

@@ -58,13 +58,17 @@ export function getStorageLayout(data: ValidationData, version: Version): Storag
 }
 
 export function unfoldStorageLayout(runData: ValidationRunData, contractName: string): StorageLayout {
-  const c = runData[contractName];
   const layout: StorageLayout = { storage: [], types: {} };
-  for (const name of [contractName].concat(c.inherit)) {
-    layout.storage.unshift(...runData[name].layout.storage);
-    Object.assign(layout.types, runData[name].layout.types);
+  if (runData[contractName].layout.flat) {
+    return { storage: runData[contractName].layout.storage, types: runData[contractName].layout.types };
+  } else {
+    const c = runData[contractName];
+    for (const name of [contractName].concat(c.inherit)) {
+      layout.storage.unshift(...runData[name].layout.storage);
+      Object.assign(layout.types, runData[name].layout.types);
+    }
+    return layout;
   }
-  return layout;
 }
 
 export function* findVersionWithoutMetadataMatches(

package/src/validate/run.ts

@@ -162,7 +162,12 @@ export function validate(solcOutput: SolcOutput, decodeSrc: SrcDecoder): Validat
           ...getLinkingErrors(contractDef, bytecode),
         ];
 
-        validation[contractDef.name].layout = extractStorageLayout(contractDef, decodeSrc, deref);
+        validation[contractDef.name].layout = extractStorageLayout(
+          contractDef,
+          decodeSrc,
+          deref,
+          solcOutput.contracts[source][contractDef.name].storageLayout,
+        );
         validation[contractDef.name].methods = [...findAll('FunctionDefinition', contractDef)]
           .filter(fnDef => ['external', 'public'].includes(fnDef.visibility))
           .map(fnDef => getFunctionSignature(fnDef, deref));

package/src/validate.test.ts

@@ -1,4 +1,4 @@
-import _test, { TestInterface } from 'ava';
+import _test, { TestFn } from 'ava';
 import { artifacts } from 'hardhat';
 
 import {
@@ -15,7 +15,7 @@ interface Context {
   validation: RunValidation;
 }
 
-const test = _test as TestInterface<Context>;
+const test = _test as TestFn<Context>;
 
 test.before(async t => {
   const contracts = [