@openzeppelin/upgrades-core 1.44.2 → 2.0.0-alpha.0

package/dist/cli/validate/build-info-file.js

@@ -91,42 +91,109 @@ async function exists(dir) {
 }
 async function getJsonFiles(dir) {
     const files = await fs_1.promises.readdir(dir);
-    const jsonFiles = files.filter(file => file.endsWith('.json'));
+    const jsonFiles = files.filter(file => file.endsWith('.json') && !file.endsWith('.output.json'));
     return jsonFiles.map(file => path_1.default.join(dir, file));
 }
 async function readBuildInfo(buildInfoFilePaths, dirShortName) {
     const buildInfoFiles = [];
     for (const buildInfoFilePath of buildInfoFilePaths) {
-        const buildInfoJson = await readJSON(buildInfoFilePath);
-        if (buildInfoJson.input === undefined ||
-            buildInfoJson.output === undefined ||
-            buildInfoJson.solcVersion === undefined) {
-            throw new error_1.ValidateCommandError(`Build info file ${buildInfoFilePath} must contain Solidity compiler input, output, and solcVersion.`);
-        }
-        else {
-            checkOutputSelection(buildInfoJson, buildInfoFilePath);
-            buildInfoFiles.push({
-                input: buildInfoJson.input,
-                output: buildInfoJson.output,
+        const buildInfo = await loadBuildInfo(buildInfoFilePath);
+        checkOutputSelection(buildInfo.input, buildInfoFilePath);
+        buildInfoFiles.push({
+            input: buildInfo.input,
+            output: buildInfo.output,
+            solcVersion: buildInfo.solcVersion,
+            dirShortName,
+        });
+    }
+    return buildInfoFiles;
+}
+async function loadBuildInfo(buildInfoFilePath) {
+    const buildInfoJson = await readJSON(buildInfoFilePath);
+    if (buildInfoJson.input !== undefined &&
+        buildInfoJson.output !== undefined &&
+        buildInfoJson.solcVersion !== undefined) {
+        return {
+            input: buildInfoJson.input,
+            output: buildInfoJson.output,
+            solcVersion: buildInfoJson.solcVersion,
+        };
+    }
+    const format = buildInfoJson._format;
+    if (typeof format === 'string' &&
+        (format.startsWith('hh3-sol-build-info') || format.startsWith('hh-sol-build-info'))) {
+        if (buildInfoJson.input !== undefined && buildInfoJson.solcVersion !== undefined) {
+            let inputData = buildInfoJson.input;
+            let outputData = buildInfoJson.output;
+            if (outputData === undefined) {
+                const { dir, name } = path_1.default.parse(buildInfoFilePath);
+                const outputFilePath = path_1.default.join(dir, `${name}.output.json`);
+                try {
+                    const outputJson = await readJSON(outputFilePath);
+                    outputData = outputJson.output ?? outputJson;
+                }
+                catch (error) {
+                    throw new error_1.ValidateCommandError(`Build info file ${buildInfoFilePath} does not contain output, and output file ${outputFilePath} could not be read.`);
+                }
+                if (outputData === undefined) {
+                    throw new error_1.ValidateCommandError(`Build info file ${buildInfoFilePath} does not contain output, and output file ${outputFilePath} is missing Solidity compiler output.`);
+                }
+            }
+            const userSourceNameMap = buildInfoJson.userSourceNameMap;
+            if (userSourceNameMap !== undefined) {
+                const canonicalToUser = {};
+                for (const [userSource, canonicalSource] of Object.entries(userSourceNameMap)) {
+                    canonicalToUser[canonicalSource] = userSource;
+                }
+                if (inputData.sources !== undefined) {
+                    inputData = {
+                        ...inputData,
+                        sources: remapKeys(inputData.sources, canonicalToUser),
+                    };
+                }
+                if (outputData.sources !== undefined) {
+                    outputData = {
+                        ...outputData,
+                        sources: remapKeys(outputData.sources, canonicalToUser),
+                        contracts: outputData.contracts !== undefined
+                            ? remapKeys(outputData.contracts, canonicalToUser)
+                            : outputData.contracts,
+                    };
+                }
+                else if (outputData.contracts !== undefined) {
+                    outputData = {
+                        ...outputData,
+                        contracts: remapKeys(outputData.contracts, canonicalToUser),
+                    };
+                }
+            }
+            return {
+                input: inputData,
+                output: outputData,
                 solcVersion: buildInfoJson.solcVersion,
-                dirShortName: dirShortName,
-            });
+            };
         }
     }
-    return buildInfoFiles;
+    throw new error_1.ValidateCommandError(`Build info file ${buildInfoFilePath} must contain Solidity compiler input, output, and solcVersion. Got format: ${format ?? 'unknown'}.`);
 }
 /**
  * Gives an error if there is empty output selection for any contract, or a contract does not have storage layout.
  */
-function checkOutputSelection(buildInfoJson, buildInfoFilePath) {
-    const o = buildInfoJson.input.settings?.outputSelection;
-    return Object.keys(o).forEach((item) => {
-        if ((o[item][''] === undefined || o[item][''].length === 0) && o[item]['*'].length === 0) {
+function checkOutputSelection(input, buildInfoFilePath) {
+    const outputSelection = input.settings?.outputSelection;
+    if (outputSelection === undefined) {
+        throw new error_1.ValidateCommandError(`Build info file ${buildInfoFilePath} does not define compiler outputSelection.`, () => STORAGE_LAYOUT_HELP);
+    }
+    Object.keys(outputSelection).forEach(item => {
+        const selection = outputSelection[item] ?? {};
+        const unnamed = Array.isArray(selection['']) ? selection[''] : [];
+        const wildcard = Array.isArray(selection['*']) ? selection['*'] : [];
+        if (unnamed.length === 0 && wildcard.length === 0) {
             // No outputs at all for this contract e.g. if there were no changes since the last compile in Foundry.
             // This is not supported for now, since it leads to AST nodes that reference node ids in other build-info files.
             throw new error_1.ValidateCommandError(`Build info file ${buildInfoFilePath} is not from a full compilation.`, () => PARTIAL_COMPILE_HELP);
         }
-        else if (!o[item]['*'].includes('storageLayout')) {
+        else if (!wildcard.includes('storageLayout')) {
             throw new error_1.ValidateCommandError(`Build info file ${buildInfoFilePath} does not contain storage layout for all contracts.`, () => STORAGE_LAYOUT_HELP);
         }
     });
@@ -134,4 +201,12 @@ function checkOutputSelection(buildInfoJson, buildInfoFilePath) {
 async function readJSON(path) {
     return JSON.parse(await fs_1.promises.readFile(path, 'utf8'));
 }
+function remapKeys(original, canonicalToUser) {
+    const remapped = {};
+    for (const [key, value] of Object.entries(original)) {
+        const mappedKey = canonicalToUser[key] ?? key;
+        remapped[mappedKey] = value;
+    }
+    return remapped;
+}
 //# sourceMappingURL=build-info-file.js.map

package/dist/cli/validate/build-info-file.js.map

@@ -1 +1 @@
-{"version":3,"file":"build-info-file.js","sourceRoot":"","sources":["../../../src/cli/validate/build-info-file.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"build-info-file.js","sourceRoot":"","sources":["../../../src/cli/validate/build-info-file.ts"],"names":[],"mappings":"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"}

package/dist/impl-address.d.ts

@@ -9,7 +9,8 @@ export declare class InvalidBeacon extends UpgradesError {
  * @returns The implementation address.
  * @throws {InvalidBeacon} If the implementation() function could not be called or does not return an address.
  */
-export declare function getImplementationAddressFromBeacon(provider: EthereumProvider, beaconAddress: string): Promise<string>;
+export declare function getImplementationAddressFromBeacon(provider: EthereumProvider, // v2 may differ from v3
+beaconAddress: string): Promise<string>;
 /**
  * Gets the implementation address from a UUPS/Transparent/Beacon proxy.
  *

package/dist/impl-address.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"impl-address.d.ts","sourceRoot":"","sources":["../src/impl-address.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,aAAa,EACd,MAAM,GAAG,CAAC;AAGX,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAG9C,qBAAa,aAAc,SAAQ,aAAa;CAAG;AAEnD;;;;;;GAMG;AACH,wBAAsB,kCAAkC,CACtD,QAAQ,EAAE,gBAAgB,EAC1B,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,MAAM,CAAC,CAYjB;AAED;;;;GAIG;AACH,wBAAsB,iCAAiC,CACrD,QAAQ,EAAE,gBAAgB,EAC1B,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAmB7B"}
+{"version":3,"file":"impl-address.d.ts","sourceRoot":"","sources":["../src/impl-address.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,aAAa,EACd,MAAM,GAAG,CAAC;AAGX,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAG9C,qBAAa,aAAc,SAAQ,aAAa;CAAG;AAEnD;;;;;;GAMG;AACH,wBAAsB,kCAAkC,CACtD,QAAQ,EAAE,gBAAgB,EAAE,wBAAwB;AACpD,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,MAAM,CAAC,CAiBjB;AAED;;;;GAIG;AACH,wBAAsB,iCAAiC,CACrD,QAAQ,EAAE,gBAAgB,EAC1B,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAmB7B"}

package/dist/impl-address.js

@@ -16,11 +16,17 @@ exports.InvalidBeacon = InvalidBeacon;
  * @returns The implementation address.
  * @throws {InvalidBeacon} If the implementation() function could not be called or does not return an address.
  */
-async function getImplementationAddressFromBeacon(provider, beaconAddress) {
+async function getImplementationAddressFromBeacon(provider, // v2 may differ from v3
+beaconAddress) {
     const impl = await (0, call_optional_signature_1.callOptionalSignature)(provider, beaconAddress, 'implementation()');
     let parsedImplAddress;
     if (impl !== undefined) {
-        parsedImplAddress = (0, address_1.parseAddress)(impl);
+        try {
+            parsedImplAddress = (0, address_1.parseAddress)(impl);
+        }
+        catch (parseErr) {
+            throw new InvalidBeacon(`Contract at ${beaconAddress} doesn't look like a beacon`);
+        }
     }
     if (parsedImplAddress === undefined) {
         throw new InvalidBeacon(`Contract at ${beaconAddress} doesn't look like a beacon`);

package/dist/impl-address.js.map

@@ -1 +1 @@
-{"version":3,"file":"impl-address.js","sourceRoot":"","sources":["../src/impl-address.ts"],"names":[],"mappings":";;;AAqBA,gFAeC;AAOD,8EAsBC;AAjED,wBAMW;AACX,uEAAkE;AAGlE,6CAA+C;AAE/C,MAAa,aAAc,SAAQ,gBAAa;CAAG;AAAnD,sCAAmD;AAEnD;;;;;;GAMG;AACI,KAAK,UAAU,kCAAkC,CACtD,QAA0B,EAC1B,aAAqB;IAErB,MAAM,IAAI,GAAG,MAAM,IAAA,+CAAqB,EAAC,QAAQ,EAAE,aAAa,EAAE,kBAAkB,CAAC,CAAC;IACtF,IAAI,iBAAiB,CAAC;IACtB,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,iBAAiB,GAAG,IAAA,sBAAY,EAAC,IAAI,CAAC,CAAC;IACzC,CAAC;IAED,IAAI,iBAAiB,KAAK,SAAS,EAAE,CAAC;QACpC,MAAM,IAAI,aAAa,CAAC,eAAe,aAAa,6BAA6B,CAAC,CAAC;IACrF,CAAC;SAAM,CAAC;QACN,OAAO,iBAAiB,CAAC;IAC3B,CAAC;AACH,CAAC;AAED;;;;GAIG;AACI,KAAK,UAAU,iCAAiC,CACrD,QAA0B,EAC1B,YAAoB;IAEpB,IAAI,CAAC;QACH,OAAO,MAAM,IAAA,2BAAwB,EAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;IAChE,CAAC;IAAC,OAAO,CAAM,EAAE,CAAC;QAChB,IAAI,CAAC,YAAY,gCAA6B,EAAE,CAAC;YAC/C,IAAI,CAAC;gBACH,MAAM,aAAa,GAAG,MAAM,IAAA,mBAAgB,EAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;gBACrE,OAAO,MAAM,kCAAkC,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;YAC3E,CAAC;YAAC,OAAO,CAAM,EAAE,CAAC;gBAChB,IAAI,CAAC,YAAY,wBAAqB,EAAE,CAAC;oBACvC,OAAO,SAAS,CAAC;gBACnB,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,CAAC;gBACV,CAAC;YACH,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,CAAC;QACV,CAAC;IACH,CAAC;AACH,CAAC"}
+{"version":3,"file":"impl-address.js","sourceRoot":"","sources":["../src/impl-address.ts"],"names":[],"mappings":";;;AAqBA,gFAoBC;AAOD,8EAsBC;AAtED,wBAMW;AACX,uEAAkE;AAGlE,6CAA+C;AAE/C,MAAa,aAAc,SAAQ,gBAAa;CAAG;AAAnD,sCAAmD;AAEnD;;;;;;GAMG;AACI,KAAK,UAAU,kCAAkC,CACtD,QAA0B,EAAE,wBAAwB;AACpD,aAAqB;IAErB,MAAM,IAAI,GAAG,MAAM,IAAA,+CAAqB,EAAC,QAAQ,EAAE,aAAa,EAAE,kBAAkB,CAAC,CAAC;IAEtF,IAAI,iBAAiB,CAAC;IACtB,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,IAAI,CAAC;YACH,iBAAiB,GAAG,IAAA,sBAAY,EAAC,IAAI,CAAC,CAAC;QACzC,CAAC;QAAC,OAAO,QAAQ,EAAE,CAAC;YAClB,MAAM,IAAI,aAAa,CAAC,eAAe,aAAa,6BAA6B,CAAC,CAAC;QACrF,CAAC;IACH,CAAC;IAED,IAAI,iBAAiB,KAAK,SAAS,EAAE,CAAC;QACpC,MAAM,IAAI,aAAa,CAAC,eAAe,aAAa,6BAA6B,CAAC,CAAC;IACrF,CAAC;SAAM,CAAC;QACN,OAAO,iBAAiB,CAAC;IAC3B,CAAC;AACH,CAAC;AAED;;;;GAIG;AACI,KAAK,UAAU,iCAAiC,CACrD,QAA0B,EAC1B,YAAoB;IAEpB,IAAI,CAAC;QACH,OAAO,MAAM,IAAA,2BAAwB,EAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;IAChE,CAAC;IAAC,OAAO,CAAM,EAAE,CAAC;QAChB,IAAI,CAAC,YAAY,gCAA6B,EAAE,CAAC;YAC/C,IAAI,CAAC;gBACH,MAAM,aAAa,GAAG,MAAM,IAAA,mBAAgB,EAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;gBACrE,OAAO,MAAM,kCAAkC,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;YAC3E,CAAC;YAAC,OAAO,CAAM,EAAE,CAAC;gBAChB,IAAI,CAAC,YAAY,wBAAqB,EAAE,CAAC;oBACvC,OAAO,SAAS,CAAC;gBACnB,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,CAAC;gBACV,CAAC;YACH,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,CAAC;QACV,CAAC;IACH,CAAC;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openzeppelin/upgrades-core",
-  "version": "1.44.2",
+  "version": "2.0.0-alpha.0",
   "description": "",
   "repository": "https://github.com/OpenZeppelin/openzeppelin-upgrades",
   "license": "MIT",

package/src/cli/validate/build-info-file.ts

@@ -129,7 +129,7 @@ async function exists(dir: string) {
 
 async function getJsonFiles(dir: string): Promise<string[]> {
   const files = await fs.readdir(dir);
-  const jsonFiles = files.filter(file => file.endsWith('.json'));
+  const jsonFiles = files.filter(file => file.endsWith('.json') && !file.endsWith('.output.json'));
   return jsonFiles.map(file => path.join(dir, file));
 }
 
@@ -137,44 +137,139 @@ async function readBuildInfo(buildInfoFilePaths: string[], dirShortName: string)
   const buildInfoFiles: BuildInfoFile[] = [];
 
   for (const buildInfoFilePath of buildInfoFilePaths) {
-    const buildInfoJson = await readJSON(buildInfoFilePath);
-    if (
-      buildInfoJson.input === undefined ||
-      buildInfoJson.output === undefined ||
-      buildInfoJson.solcVersion === undefined
-    ) {
-      throw new ValidateCommandError(
-        `Build info file ${buildInfoFilePath} must contain Solidity compiler input, output, and solcVersion.`,
-      );
-    } else {
-      checkOutputSelection(buildInfoJson, buildInfoFilePath);
+    const buildInfo = await loadBuildInfo(buildInfoFilePath);
+
+    checkOutputSelection(buildInfo.input, buildInfoFilePath);
+
+    buildInfoFiles.push({
+      input: buildInfo.input,
+      output: buildInfo.output,
+      solcVersion: buildInfo.solcVersion,
+      dirShortName,
+    });
+  }
+  return buildInfoFiles;
+}
+
+async function loadBuildInfo(buildInfoFilePath: string): Promise<{
+  input: SolcInput;
+  output: SolcOutput;
+  solcVersion: string;
+}> {
+  const buildInfoJson = await readJSON(buildInfoFilePath);
+
+  if (
+    buildInfoJson.input !== undefined &&
+    buildInfoJson.output !== undefined &&
+    buildInfoJson.solcVersion !== undefined
+  ) {
+    return {
+      input: buildInfoJson.input,
+      output: buildInfoJson.output,
+      solcVersion: buildInfoJson.solcVersion,
+    };
+  }
+
+  const format = buildInfoJson._format as string | undefined;
+
+  if (
+    typeof format === 'string' &&
+    (format.startsWith('hh3-sol-build-info') || format.startsWith('hh-sol-build-info'))
+  ) {
+    if (buildInfoJson.input !== undefined && buildInfoJson.solcVersion !== undefined) {
+      let inputData: SolcInput = buildInfoJson.input;
+      let outputData: SolcOutput | undefined = buildInfoJson.output;
+
+      if (outputData === undefined) {
+        const { dir, name } = path.parse(buildInfoFilePath);
+        const outputFilePath = path.join(dir, `${name}.output.json`);
 
-      buildInfoFiles.push({
-        input: buildInfoJson.input,
-        output: buildInfoJson.output,
+        try {
+          const outputJson = await readJSON(outputFilePath);
+          outputData = outputJson.output ?? outputJson;
+        } catch (error) {
+          throw new ValidateCommandError(
+            `Build info file ${buildInfoFilePath} does not contain output, and output file ${outputFilePath} could not be read.`,
+          );
+        }
+
+        if (outputData === undefined) {
+          throw new ValidateCommandError(
+            `Build info file ${buildInfoFilePath} does not contain output, and output file ${outputFilePath} is missing Solidity compiler output.`,
+          );
+        }
+      }
+
+      const userSourceNameMap: Record<string, string> | undefined = buildInfoJson.userSourceNameMap;
+      if (userSourceNameMap !== undefined) {
+        const canonicalToUser: Record<string, string> = {};
+        for (const [userSource, canonicalSource] of Object.entries(userSourceNameMap)) {
+          canonicalToUser[canonicalSource] = userSource;
+        }
+
+        if (inputData.sources !== undefined) {
+          inputData = {
+            ...inputData,
+            sources: remapKeys(inputData.sources, canonicalToUser),
+          };
+        }
+
+        if (outputData.sources !== undefined) {
+          outputData = {
+            ...outputData,
+            sources: remapKeys(outputData.sources, canonicalToUser),
+            contracts:
+              outputData.contracts !== undefined
+                ? remapKeys(outputData.contracts, canonicalToUser)
+                : outputData.contracts,
+          };
+        } else if (outputData.contracts !== undefined) {
+          outputData = {
+            ...outputData,
+            contracts: remapKeys(outputData.contracts, canonicalToUser),
+          };
+        }
+      }
+
+      return {
+        input: inputData,
+        output: outputData,
         solcVersion: buildInfoJson.solcVersion,
-        dirShortName: dirShortName,
-      });
+      };
     }
   }
-  return buildInfoFiles;
+
+  throw new ValidateCommandError(
+    `Build info file ${buildInfoFilePath} must contain Solidity compiler input, output, and solcVersion. Got format: ${format ?? 'unknown'}.`,
+  );
 }
 
 /**
  * Gives an error if there is empty output selection for any contract, or a contract does not have storage layout.
  */
-function checkOutputSelection(buildInfoJson: any, buildInfoFilePath: string) {
-  const o = buildInfoJson.input.settings?.outputSelection;
+function checkOutputSelection(input: SolcInput, buildInfoFilePath: string) {
+  const outputSelection = input.settings?.outputSelection;
 
-  return Object.keys(o).forEach((item: any) => {
-    if ((o[item][''] === undefined || o[item][''].length === 0) && o[item]['*'].length === 0) {
+  if (outputSelection === undefined) {
+    throw new ValidateCommandError(
+      `Build info file ${buildInfoFilePath} does not define compiler outputSelection.`,
+      () => STORAGE_LAYOUT_HELP,
+    );
+  }
+
+  Object.keys(outputSelection).forEach(item => {
+    const selection = outputSelection[item] ?? {};
+    const unnamed = Array.isArray(selection['']) ? selection[''] : [];
+    const wildcard = Array.isArray(selection['*']) ? selection['*'] : [];
+
+    if (unnamed.length === 0 && wildcard.length === 0) {
       // No outputs at all for this contract e.g. if there were no changes since the last compile in Foundry.
       // This is not supported for now, since it leads to AST nodes that reference node ids in other build-info files.
       throw new ValidateCommandError(
         `Build info file ${buildInfoFilePath} is not from a full compilation.`,
         () => PARTIAL_COMPILE_HELP,
       );
-    } else if (!o[item]['*'].includes('storageLayout')) {
+    } else if (!wildcard.includes('storageLayout')) {
       throw new ValidateCommandError(
         `Build info file ${buildInfoFilePath} does not contain storage layout for all contracts.`,
         () => STORAGE_LAYOUT_HELP,
@@ -186,3 +281,12 @@ function checkOutputSelection(buildInfoJson: any, buildInfoFilePath: string) {
 async function readJSON(path: string) {
   return JSON.parse(await fs.readFile(path, 'utf8'));
 }
+
+function remapKeys<T>(original: Record<string, T>, canonicalToUser: Record<string, string>): Record<string, T> {
+  const remapped: Record<string, T> = {};
+  for (const [key, value] of Object.entries(original)) {
+    const mappedKey = canonicalToUser[key] ?? key;
+    remapped[mappedKey] = value;
+  }
+  return remapped;
+}

package/src/impl-address.ts

@@ -20,13 +20,18 @@ export class InvalidBeacon extends UpgradesError {}
  * @throws {InvalidBeacon} If the implementation() function could not be called or does not return an address.
  */
 export async function getImplementationAddressFromBeacon(
-  provider: EthereumProvider,
+  provider: EthereumProvider, // v2 may differ from v3
   beaconAddress: string,
 ): Promise<string> {
   const impl = await callOptionalSignature(provider, beaconAddress, 'implementation()');
+
   let parsedImplAddress;
   if (impl !== undefined) {
-    parsedImplAddress = parseAddress(impl);
+    try {
+      parsedImplAddress = parseAddress(impl);
+    } catch (parseErr) {
+      throw new InvalidBeacon(`Contract at ${beaconAddress} doesn't look like a beacon`);
+    }
   }
 
   if (parsedImplAddress === undefined) {