@openzeppelin/upgrades-core 1.14.0 → 1.15.0

package/src/standalone.test.ts

@@ -38,3 +38,15 @@ test('reports storage upgrade errors', t => {
   const badReport = v1.getStorageUpgradeReport(v2Bad);
   t.false(badReport.ok);
 });
+
+test('dont report renamed version update', t => {
+  const v1 = new UpgradeableContract('StandaloneRenameV1', t.context.solcInput, t.context.solcOutput);
+
+  const v2 = new UpgradeableContract('StandaloneRenameV2', t.context.solcInput, t.context.solcOutput);
+  const goodReport = v1.getStorageUpgradeReport(v2);
+  t.true(goodReport.ok);
+
+  const v3 = new UpgradeableContract('StandaloneRenameV3', t.context.solcInput, t.context.solcOutput);
+  const goodReport2 = v2.getStorageUpgradeReport(v3);
+  t.true(goodReport2.ok);
+});

package/src/storage/compare.ts

@@ -98,7 +98,11 @@ export class StorageLayoutComparator {
   }
 
   getFieldChange<F extends StorageField>(original: F, updated: F): StorageFieldChange<F> | undefined {
-    const nameChange = !this.unsafeAllowRenames && original.label !== (updated.renamedFrom ?? updated.label);
+    const nameChange =
+      !this.unsafeAllowRenames &&
+      original.label !== updated.renamedFrom &&
+      (updated.label !== original.label ||
+        (updated.renamedFrom !== undefined && updated.renamedFrom !== original.renamedFrom));
     const retypedFromOriginal = original.type.item.label === updated.retypedFrom?.trim();
     const typeChange = !retypedFromOriginal && this.getTypeChange(original.type, updated.type, { allowAppend: false });
     const layoutChange = this.getLayoutChange(original, updated);

package/src/storage/extract.ts

@@ -108,7 +108,7 @@ function getTypeMembers(typeDef: StructDefinition | EnumDefinition): TypeItem['m
 }
 
 function getOriginContract(contract: ContractDefinition, astId: number | undefined, deref: ASTDereferencer) {
-  for (const id of contract.linearizedBaseContracts.reverse()) {
+  for (const id of contract.linearizedBaseContracts) {
     const parentContract = deref(['ContractDefinition'], id);
     const varDecl = parentContract.nodes.find(n => n.id == astId);
     if (varDecl && isNodeType('VariableDeclaration', varDecl)) {

package/src/validate/overrides.ts

@@ -9,6 +9,7 @@ export interface ValidationOptions {
   unsafeAllowCustomTypes?: boolean;
   unsafeAllowLinkedLibraries?: boolean;
   unsafeAllowRenames?: boolean;
+  unsafeSkipStorageCheck?: boolean;
   unsafeAllow?: ValidationError['kind'][];
   kind?: ProxyDeployment['kind'];
 }
@@ -58,8 +59,16 @@ export function withValidationDefaults(opts: ValidationOptions): Required<Valida
   const kind = opts.kind ?? 'transparent';
 
   const unsafeAllowRenames = opts.unsafeAllowRenames ?? false;
+  const unsafeSkipStorageCheck = opts.unsafeSkipStorageCheck ?? false;
 
-  return { unsafeAllowCustomTypes, unsafeAllowLinkedLibraries, unsafeAllowRenames, unsafeAllow, kind };
+  return {
+    unsafeAllowCustomTypes,
+    unsafeAllowLinkedLibraries,
+    unsafeAllowRenames,
+    unsafeSkipStorageCheck,
+    unsafeAllow,
+    kind,
+  };
 }
 
 export function processExceptions(

package/src/validate/run.ts

@@ -248,9 +248,19 @@ function* getStateVariableErrors(
 }
 
 function getReferencedLibraryIds(contractDef: ContractDefinition): number[] {
-  const implicitUsage = [...findAll('UsingForDirective', contractDef)].map(
-    usingForDirective => usingForDirective.libraryName.referencedDeclaration,
-  );
+  const implicitUsage = [...findAll('UsingForDirective', contractDef)]
+    .map(usingForDirective => {
+      if (usingForDirective.libraryName !== undefined) {
+        return usingForDirective.libraryName.referencedDeclaration;
+      } else if (usingForDirective.functionList !== undefined) {
+        return [];
+      } else {
+        throw new Error(
+          'Broken invariant: either UsingForDirective.libraryName or UsingForDirective.functionList should be defined',
+        );
+      }
+    })
+    .flat();
 
   const explicitUsage = [...findAll('Identifier', contractDef)]
     .filter(identifier => identifier.typeDescriptions.typeString?.match(/^type\(library/))