Check solc output is complete before validations (#253)

OpenZeppelin · Dec 4, 2020 · a4ae92b · a4ae92b
1 parent 36e50aa
commit a4ae92b
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 3 deletions.
diff --git a/packages/plugin-hardhat/CHANGELOG.md b/packages/plugin-hardhat/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.4.2 (2020-12-04)
+
+- Fix a bug that prevented some solc errors from reaching the console. ([#253](https://github.com/OpenZeppelin/openzeppelin-upgrades/pull/253))
+
 ## 1.4.1 (2020-11-30)
 
 - Add `admin` to the TypeScript type for `hre.upgrades`.

diff --git a/packages/plugin-hardhat/src/index.ts b/packages/plugin-hardhat/src/index.ts
@@ -31,9 +31,14 @@ interface RunCompilerArgs {
 subtask(TASK_COMPILE_SOLIDITY_COMPILE, async (args: RunCompilerArgs, hre, runSuper) => {
   // TODO: patch input
   const { output, solcBuild } = await runSuper();
-  const decodeSrc = solcInputOutputDecoder(args.input, output);
-  const validations = validate(output, decodeSrc);
-  await writeValidations(hre, validations);
+
+  const { isFullSolcOutput } = await import('./utils/is-full-solc-output');
+  if (isFullSolcOutput(output)) {
+    const decodeSrc = solcInputOutputDecoder(args.input, output);
+    const validations = validate(output, decodeSrc);
+    await writeValidations(hre, validations);
+  }
+
   return { output, solcBuild };
 });
 

diff --git a/packages/plugin-hardhat/src/utils/is-full-solc-output.ts b/packages/plugin-hardhat/src/utils/is-full-solc-output.ts
@@ -0,0 +1,30 @@
+import type { SolcOutput } from '@openzeppelin/upgrades-core';
+
+type RecursivePartial<T> = { [k in keyof T]?: RecursivePartial<T[k]> };
+
+type MaybeSolcOutput = RecursivePartial<SolcOutput>;
+
+export function isFullSolcOutput(output: MaybeSolcOutput | undefined): boolean {
+  if (output?.contracts == undefined || output?.sources == undefined) {
+    return false;
+  }
+
+  for (const file of Object.values(output.contracts)) {
+    if (file == undefined) {
+      return false;
+    }
+    for (const contract of Object.values(file)) {
+      if (contract?.evm?.bytecode == undefined) {
+        return false;
+      }
+    }
+  }
+
+  for (const file of Object.values(output.sources)) {
+    if (file?.ast == undefined || file?.id == undefined) {
+      return false;
+    }
+  }
+
+  return true;
+}