@openzeppelin/upgrades-core 1.19.1 → 1.20.0

package/src/validate/query.ts

@@ -58,11 +58,16 @@ export function getStorageLayout(data: ValidationData, version: Version): Storag
 }
 
 export function unfoldStorageLayout(runData: ValidationRunData, contractName: string): StorageLayout {
-  const layout: StorageLayout = { storage: [], types: {} };
-  if (runData[contractName].layout.flat) {
-    return { storage: runData[contractName].layout.storage, types: runData[contractName].layout.types };
+  const c = runData[contractName];
+  const { solcVersion } = c;
+  if (c.layout.flat) {
+    return {
+      solcVersion,
+      storage: c.layout.storage,
+      types: c.layout.types,
+    };
   } else {
-    const c = runData[contractName];
+    const layout: StorageLayout = { solcVersion, 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);

package/src/validate/run.ts

@@ -23,6 +23,7 @@ export interface ContractValidation {
   linkReferences: LinkReference[];
   errors: ValidationError[];
   layout: StorageLayout;
+  solcVersion?: string;
 }
 
 const errorKinds = [
@@ -113,7 +114,7 @@ function skipCheck(error: string, node: Node): boolean {
   return getAllowed(node).includes(error);
 }
 
-export function validate(solcOutput: SolcOutput, decodeSrc: SrcDecoder): ValidationRunData {
+export function validate(solcOutput: SolcOutput, decodeSrc: SrcDecoder, solcVersion?: string): ValidationRunData {
   const validation: ValidationRunData = {};
   const fromId: Record<number, string> = {};
   const inheritIds: Record<string, number[]> = {};
@@ -139,6 +140,7 @@ export function validate(solcOutput: SolcOutput, decodeSrc: SrcDecoder): Validat
           storage: [],
           types: {},
         },
+        solcVersion,
       };
     }
 

package/src/validate.test.ts

@@ -22,6 +22,7 @@ test.before(async t => {
     'contracts/test/Validations.sol:HasEmptyConstructor',
     'contracts/test/ValidationsNatspec.sol:HasNonEmptyConstructorNatspec1',
     'contracts/test/Proxiable.sol:ChildOfProxiable',
+    'contracts/test/ValidationsUDVT.sol:ValidationsUDVT',
   ];
 
   t.context.validation = {} as RunValidation;