@openzeppelin/upgrades-core 1.31.3 → 1.32.0

package/dist/usage-error.js.map

@@ -1 +1 @@
-{"version":3,"file":"usage-error.js","sourceRoot":"","sources":["../src/usage-error.ts"],"names":[],"mappings":";;;AAAA,wBAA+G;AAE/G,MAAa,2BAA4B,SAAQ,gBAAa;IAC5D;QACE,KAAK,CACH,6DAA6D,EAC7D,GAAG,EAAE,CAAC,sEAAsE,CAC7E,CAAC;IACJ,CAAC;CACF;AAPD,kEAOC;AAED,MAAa,0BAA2B,SAAQ,gBAAa;IAC3D,YAAY,IAAY;QACtB,KAAK,CACH,2BAA2B,IAAI,GAAG,EAClC,GAAG,EAAE,CAAC,6EAA6E,CACpF,CAAC;IACJ,CAAC;CACF;AAPD,gEAOC;AAED,MAAa,iCAAkC,SAAQ,gBAAa;IAClE,YAAY,aAAqB;QAC/B,KAAK,CAAC,eAAe,aAAa,6BAA6B,EAAE,GAAG,EAAE,CAAC,uCAAuC,CAAC,CAAC;IAClH,CAAC;CACF;AAJD,8EAIC;AAED,MAAa,iCAAkC,SAAQ,gBAAa;IAClE,YAAY,WAAmB;QAC7B,KAAK,CACH,sCAAsC,WAAW,aAAa,EAC9D,GAAG,EAAE,CAAC,wGAAwG,CAC/G,CAAC;IACJ,CAAC;CACF;AAPD,8EAOC;AAED,MAAa,yBAA0B,SAAQ,gBAAa;IAC1D,YAAY,YAAoB;QAC9B,KAAK,CACH,eAAe,YAAY,sCAAsC,EACjE,GAAG,EAAE,CAAC,wFAAwF,CAC/F,CAAC;IACJ,CAAC;CACF;AAPD,8DAOC;AAED;;GAEG;AACH,MAAa,8BAA+B,SAAQ,gBAAa;IAC/D,YAAY,oBAA4B;QACtC,KAAK,CACH,uBAAuB,oBAAoB,gDAAgD,EAC3F,GAAG,EAAE,CAAC,sGAAsG,CAC7G,CAAC;IACJ,CAAC;CACF;AAPD,wEAOC;AAED;;GAEG;AACH,MAAa,2BAA4B,SAAQ,gBAAa;IAC5D,YAAY,oBAA4B;QACtC,KAAK,CACH,uBAAuB,oBAAoB,gDAAgD,EAC3F,GAAG,EAAE,CAAC,mGAAmG,CAC1G,CAAC;IACJ,CAAC;CACF;AAPD,kEAOC;AAED,MAAa,qBAAsB,SAAQ,gBAAa;IACtD,YAAY,OAAe;QACzB,KAAK,CACH,0BAA0B,OAAO,EAAE,EACnC,GAAG,EAAE,CAAC,iFAAiF,CACxF,CAAC;IACJ,CAAC;CACF;AAPD,sDAOC;AAED,MAAa,+BAAgC,SAAQ,gBAAa;IAChE;QACE,KAAK,CACH,oCAAoC,EACpC,GAAG,EAAE,CACH,gIAAgI,CACnI,CAAC;IACJ,CAAC;CACF;AARD,0EAQC;AAED,MAAa,+BAAgC,SAAQ,gBAAa;IAChE;QACE,KAAK,CACH,oCAAoC,EACpC,GAAG,EAAE,CACH,+HAA+H,CAClI,CAAC;IACJ,CAAC;CACF;AARD,0EAQC;AAEM,KAAK,UAAU,cAAc,CAAC,QAA0B,EAAE,OAAe;IAC9E,IAAI,MAAM,IAAA,2BAAwB,EAAC,QAAQ,EAAE,OAAO,CAAC,EAAE;QACrD,MAAM,IAAI,gBAAa,CACrB,wFAAwF,EACxF,GAAG,EAAE,CAAC,6BAA6B,CACpC,CAAC;KACH;SAAM,IAAI,MAAM,IAAA,gBAAa,EAAC,QAAQ,EAAE,OAAO,CAAC,EAAE;QACjD,MAAM,aAAa,GAAG,MAAM,IAAA,mBAAgB,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAChE,MAAM,IAAI,gBAAa,CACrB,8DAA8D,EAC9D,GAAG,EAAE,CACH,gIAAgI,aAAa,WAAW,CAC3J,CAAC;KACH;AACH,CAAC;AAdD,wCAcC"}
+{"version":3,"file":"usage-error.js","sourceRoot":"","sources":["../src/usage-error.ts"],"names":[],"mappings":";;;AAAA,wBAA+G;AAE/G,MAAa,2BAA4B,SAAQ,gBAAa;IAC5D;QACE,KAAK,CACH,6DAA6D,EAC7D,GAAG,EAAE,CAAC,sEAAsE,CAC7E,CAAC;IACJ,CAAC;CACF;AAPD,kEAOC;AAED,MAAa,0BAA2B,SAAQ,gBAAa;IAC3D,YAAY,IAAY;QACtB,KAAK,CACH,2BAA2B,IAAI,GAAG,EAClC,GAAG,EAAE,CAAC,6EAA6E,CACpF,CAAC;IACJ,CAAC;CACF;AAPD,gEAOC;AAED,MAAa,iCAAkC,SAAQ,gBAAa;IAClE,YAAY,aAAqB;QAC/B,KAAK,CAAC,eAAe,aAAa,6BAA6B,EAAE,GAAG,EAAE,CAAC,uCAAuC,CAAC,CAAC;IAClH,CAAC;CACF;AAJD,8EAIC;AAED,MAAa,iCAAkC,SAAQ,gBAAa;IAClE,YAAY,WAAmB;QAC7B,KAAK,CACH,sCAAsC,WAAW,aAAa,EAC9D,GAAG,EAAE,CAAC,wGAAwG,CAC/G,CAAC;IACJ,CAAC;CACF;AAPD,8EAOC;AAED,MAAa,yBAA0B,SAAQ,gBAAa;IAC1D,YAAY,YAAoB;QAC9B,KAAK,CACH,eAAe,YAAY,sCAAsC,EACjE,GAAG,EAAE,CAAC,wFAAwF,CAC/F,CAAC;IACJ,CAAC;CACF;AAPD,8DAOC;AAED;;GAEG;AACH,MAAa,8BAA+B,SAAQ,gBAAa;IAC/D,YAAY,oBAA4B;QACtC,KAAK,CACH,uBAAuB,oBAAoB,gDAAgD,EAC3F,GAAG,EAAE,CAAC,sGAAsG,CAC7G,CAAC;IACJ,CAAC;CACF;AAPD,wEAOC;AAED;;GAEG;AACH,MAAa,2BAA4B,SAAQ,gBAAa;IAC5D,YAAY,oBAA4B;QACtC,KAAK,CACH,uBAAuB,oBAAoB,gDAAgD,EAC3F,GAAG,EAAE,CAAC,mGAAmG,CAC1G,CAAC;IACJ,CAAC;CACF;AAPD,kEAOC;AAED,MAAa,qBAAsB,SAAQ,gBAAa;IACtD,YAAY,OAAe;QACzB,KAAK,CACH,0BAA0B,OAAO,EAAE,EACnC,GAAG,EAAE,CAAC,iFAAiF,CACxF,CAAC;IACJ,CAAC;CACF;AAPD,sDAOC;AAED,MAAa,+BAAgC,SAAQ,gBAAa;IAChE;QACE,KAAK,CACH,oCAAoC,EACpC,GAAG,EAAE,CACH,gIAAgI,CACnI,CAAC;IACJ,CAAC;CACF;AARD,0EAQC;AAED,MAAa,+BAAgC,SAAQ,gBAAa;IAChE;QACE,KAAK,CACH,oCAAoC,EACpC,GAAG,EAAE,CACH,+HAA+H,CAClI,CAAC;IACJ,CAAC;CACF;AARD,0EAQC;AAED,MAAa,gCAAiC,SAAQ,gBAAa;IACjE,YAAY,IAAY;QACtB,KAAK,CACH,yEAAyE,IAAI,IAAI,EACjF,GAAG,EAAE,CAAC,iFAAiF,CACxF,CAAC;IACJ,CAAC;CACF;AAPD,4EAOC;AAEM,KAAK,UAAU,cAAc,CAAC,QAA0B,EAAE,OAAe;IAC9E,IAAI,MAAM,IAAA,2BAAwB,EAAC,QAAQ,EAAE,OAAO,CAAC,EAAE;QACrD,MAAM,IAAI,gBAAa,CACrB,wFAAwF,EACxF,GAAG,EAAE,CAAC,6BAA6B,CACpC,CAAC;KACH;SAAM,IAAI,MAAM,IAAA,gBAAa,EAAC,QAAQ,EAAE,OAAO,CAAC,EAAE;QACjD,MAAM,aAAa,GAAG,MAAM,IAAA,mBAAgB,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAChE,MAAM,IAAI,gBAAa,CACrB,8DAA8D,EAC9D,GAAG,EAAE,CACH,gIAAgI,aAAa,WAAW,CAC3J,CAAC;KACH;AACH,CAAC;AAdD,wCAcC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openzeppelin/upgrades-core",
-  "version": "1.31.3",
+  "version": "1.32.0",
   "description": "",
   "repository": "https://github.com/OpenZeppelin/openzeppelin-upgrades/tree/master/packages/core",
   "license": "MIT",
@@ -13,22 +13,29 @@
     "/artifacts/contracts/proxy/AdminUpgradeabilityProxy.sol/AdminUpgradeabilityProxy.json",
     "/artifacts/contracts/proxy/ProxyAdmin.sol/ProxyAdmin.json",
     "/contracts/Initializable.sol",
-    "/artifacts/@openzeppelin/contracts/proxy/beacon/BeaconProxy.sol",
-    "/artifacts/@openzeppelin/contracts/proxy/beacon/UpgradeableBeacon.sol",
-    "/artifacts/@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol",
+    "/artifacts/@openzeppelin/contracts/proxy/beacon/BeaconProxy.sol/BeaconProxy.json",
+    "/artifacts/@openzeppelin/contracts/proxy/beacon/UpgradeableBeacon.sol/UpgradeableBeacon.json",
+    "/artifacts/@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol/ERC1967Proxy.json",
     "/artifacts/@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol/ProxyAdmin.json",
     "/artifacts/@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol/TransparentUpgradeableProxy.json",
     "/artifacts/@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol/ITransparentUpgradeableProxy.json",
-    "/artifacts/build-info.json"
+    "/artifacts/build-info.json",
+    "/artifacts/@openzeppelin/contracts-v5/proxy/beacon/BeaconProxy.sol/BeaconProxy.json",
+    "/artifacts/@openzeppelin/contracts-v5/proxy/beacon/UpgradeableBeacon.sol/UpgradeableBeacon.json",
+    "/artifacts/@openzeppelin/contracts-v5/proxy/ERC1967/ERC1967Proxy.sol/ERC1967Proxy.json",
+    "/artifacts/@openzeppelin/contracts-v5/proxy/transparent/ProxyAdmin.sol/ProxyAdmin.json",
+    "/artifacts/@openzeppelin/contracts-v5/proxy/transparent/TransparentUpgradeableProxy.sol/TransparentUpgradeableProxy.json",
+    "/artifacts/@openzeppelin/contracts-v5/proxy/transparent/TransparentUpgradeableProxy.sol/ITransparentUpgradeableProxy.json",
+    "/artifacts/build-info-v5.json"
   ],
   "scripts": {
     "clean": "hardhat clean && rimraf dist *.tsbuildinfo",
     "compile": "tsc -b && yarn compile:contracts",
-    "compile:contracts": "hardhat compile && node scripts/copy-build-info.js",
-    "prepare": "yarn clean && yarn compile",
-    "prepublishOnly": "bash scripts/copy-artifacts.sh",
-    "test": "tsc -b && hardhat compile --force && node scripts/copy-build-info.js && ava",
-    "test:watch": "hardhat compile --force && fgbg 'ava --watch' 'tsc -b --watch' --",
+    "compile:contracts": "hardhat compile",
+    "copyfiles": "node scripts/copy-build-info-v5.js && bash scripts/copy-legacy-artifacts.sh",
+    "prepare": "yarn clean && yarn compile && yarn copyfiles",
+    "test": "tsc -b && hardhat compile --force && yarn copyfiles && ava",
+    "test:watch": "hardhat compile --force && yarn copyfiles && fgbg 'ava --watch' 'tsc -b --watch' --",
     "version": "node ../../scripts/bump-changelog.js",
     "cli": "node ./dist/cli/cli.js"
   },
@@ -38,8 +45,8 @@
   "devDependencies": {
     "@ava/typescript": "^4.0.0",
     "@nomicfoundation/hardhat-ethers": "^3.0.5",
-    "@openzeppelin/contracts": "4.8.3",
-    "@openzeppelin/contracts-upgradeable": "4.8.3",
+    "@openzeppelin/contracts": "5.0.1",
+    "@openzeppelin/upgrades-core-legacy": "npm:@openzeppelin/upgrades-core@1.31.3",
     "@types/cbor": "^5.0.0",
     "@types/debug": "^4.1.5",
     "@types/mocha": "^7.0.2",
@@ -64,5 +71,5 @@
     "proper-lockfile": "^4.1.1",
     "solidity-ast": "^0.4.51"
   },
-  "gitHead": "40943810bbb60721f9a1f2a566e5e17b96e63fbc"
+  "gitHead": "3b113ee12d1bb47cd3cf736f1c70b1302289e8d2"
 }

package/src/impl-store.test.ts

@@ -10,6 +10,7 @@ import { fetchOrDeploy, fetchOrDeployGetDeployment, mergeAddresses } from './imp
 import { getVersion } from './version';
 import { stubProvider } from './stub-provider';
 import { ImplDeployment } from './manifest';
+import { RemoteDeploymentId } from './deployment';
 
 test.before(async () => {
   process.chdir(await fs.mkdtemp(path.join(os.tmpdir(), 'upgrades-core-test-')));
@@ -61,7 +62,7 @@ test('merge addresses', async t => {
   const depl1 = { address: '0x1' } as ImplDeployment;
   const depl2 = { address: '0x2' } as ImplDeployment;
 
-  const { address, allAddresses } = await mergeAddresses(depl1, depl2);
+  const { address, allAddresses } = mergeAddresses(depl1, depl2);
   t.is(address, '0x1');
   t.true(unorderedEqual(allAddresses, ['0x1', '0x2']), allAddresses.toString());
 });
@@ -70,7 +71,7 @@ test('merge multiple existing addresses', async t => {
   const depl1 = { address: '0x1', allAddresses: ['0x1a', '0x1b'] } as ImplDeployment;
   const depl2 = { address: '0x2' } as ImplDeployment;
 
-  const { address, allAddresses } = await mergeAddresses(depl1, depl2);
+  const { address, allAddresses } = mergeAddresses(depl1, depl2);
   t.is(address, '0x1');
   t.true(unorderedEqual(allAddresses, ['0x1', '0x1a', '0x1b', '0x2']), allAddresses.toString());
 });
@@ -79,7 +80,7 @@ test('merge all addresses', async t => {
   const depl1 = { address: '0x1', allAddresses: ['0x1a', '0x1b'] } as ImplDeployment;
   const depl2 = { address: '0x2', allAddresses: ['0x2a', '0x2b'] } as ImplDeployment;
 
-  const { address, allAddresses } = await mergeAddresses(depl1, depl2);
+  const { address, allAddresses } = mergeAddresses(depl1, depl2);
   t.is(address, '0x1');
   t.true(unorderedEqual(allAddresses, ['0x1', '0x1a', '0x1b', '0x2', '0x2a', '0x2b']), allAddresses.toString());
 });
@@ -88,7 +89,7 @@ function unorderedEqual(arr1: string[], arr2: string[]) {
   return arr1.every(i => arr2.includes(i)) && arr2.every(i => arr1.includes(i));
 }
 
-test('platform - replace tx hash for deployment', async t => {
+test('defender - replace tx hash for deployment', async t => {
   const provider = stubProvider();
 
   // create a pending deployment with id
@@ -137,3 +138,126 @@ test('platform - replace tx hash for deployment', async t => {
   t.is(deployment.address, fakeDeploy.address);
   t.is(deployment.txHash, '0x2');
 });
+
+test('defender - address clash', async t => {
+  const provider = stubProvider();
+
+  // create a pending deployment with id
+  const fakeDeploy = await provider.deployPending();
+  provider.removeContract(fakeDeploy.address);
+
+  async function deployment1() {
+    return {
+      ...fakeDeploy,
+      txHash: '0x1',
+      remoteDeploymentId: 'abc',
+    };
+  }
+
+  const mockPendingDeployment = sinon.stub().returns({
+    status: 'submitted',
+    txHash: '0x1',
+  });
+  // let it timeout
+  await t.throwsAsync(
+    fetchOrDeployGetDeployment(
+      version1,
+      provider,
+      deployment1,
+      { timeout: 1, pollingInterval: 0 },
+      undefined,
+      mockPendingDeployment,
+    ),
+  );
+
+  // simulate a new deployment with the same address, but different tx hash and deployment id
+  async function deployment2() {
+    return {
+      ...fakeDeploy,
+      txHash: '0x2',
+      remoteDeploymentId: 'def',
+    };
+  }
+
+  // deploy with a different version hash
+  const error = await t.throwsAsync(
+    fetchOrDeployGetDeployment(
+      version2,
+      provider,
+      deployment2,
+      { timeout: 1, pollingInterval: 0 },
+      undefined,
+      mockPendingDeployment,
+    ),
+  );
+
+  t.true(
+    error?.message.startsWith(`The deployment clashes with an existing one at ${fakeDeploy.address}`),
+    error?.message,
+  );
+});
+
+test('defender - merge avoids address clash, replaces deployment id', async t => {
+  const provider = stubProvider();
+
+  const MERGE = true;
+
+  // create a pending deployment with id
+  const fakeDeploy = await provider.deployPending();
+  provider.removeContract(fakeDeploy.address);
+
+  async function deployment1() {
+    return {
+      ...fakeDeploy,
+      txHash: '0x1',
+      remoteDeploymentId: 'abc',
+    };
+  }
+
+  const getDeploymentResponse1 = sinon.stub().returns({
+    status: 'submitted',
+    txHash: '0x1',
+  });
+  // let it timeout
+  await t.throwsAsync(
+    fetchOrDeployGetDeployment(
+      version1,
+      provider,
+      deployment1,
+      { timeout: 1, pollingInterval: 0 },
+      MERGE,
+      getDeploymentResponse1,
+    ),
+  );
+
+  // simulate a failed previous deployment
+  const getDeploymentResponse2 = sinon.stub().returns({
+    status: 'failed',
+    txHash: '0x1',
+  });
+
+  // redeploy with a new deployment id
+  async function deployment2() {
+    return {
+      ...fakeDeploy,
+      txHash: '0x2',
+      remoteDeploymentId: 'def',
+    };
+  }
+
+  // make the contract code exist
+  provider.addContract(fakeDeploy.address);
+
+  const deployment = await fetchOrDeployGetDeployment(
+    version1,
+    provider,
+    deployment2,
+    { timeout: 1, pollingInterval: 0 },
+    MERGE,
+    getDeploymentResponse2,
+  );
+
+  t.is(deployment.address, fakeDeploy.address);
+  t.is(deployment.txHash, '0x2');
+  t.is((deployment as RemoteDeploymentId).remoteDeploymentId, 'def');
+});

package/src/impl-store.ts

@@ -72,12 +72,10 @@ async function fetchOrDeployGeneric<T extends Deployment, U extends T = T>(
       );
       if (updated !== stored) {
         if (merge && deployment.merge) {
-          // only check primary addresses for clashes, since the address could already exist in an allAddresses field
-          // but the above updated and stored objects are different instances representing the same entry
-          await checkForAddressClash(provider, data, updated, false);
+          await checkForAddressClash(provider, data, updated, true);
           deployment.merge(updated);
         } else {
-          await checkForAddressClash(provider, data, updated, true);
+          await checkForAddressClash(provider, data, updated, false);
           deployment.set(updated);
         }
         await manifest.write(data);
@@ -172,12 +170,17 @@ export async function fetchOrDeployGetDeployment<T extends ImplDeployment>(
 const implLens = (versionWithoutMetadata: string) =>
   lens(`implementation ${versionWithoutMetadata}`, 'implementation', data => ({
     get: () => data.impls[versionWithoutMetadata],
-    set: (value?: ImplDeployment) => (data.impls[versionWithoutMetadata] = value),
-    merge: (value?: ImplDeployment) => {
+    set: (value?: ImplDeployment & RemoteDeploymentId) => (data.impls[versionWithoutMetadata] = value),
+    merge: (value?: ImplDeployment & RemoteDeploymentId) => {
       const existing = data.impls[versionWithoutMetadata];
       if (existing !== undefined && value !== undefined) {
         const { address, allAddresses } = mergeAddresses(existing, value);
-        data.impls[versionWithoutMetadata] = { ...existing, address, allAddresses };
+        data.impls[versionWithoutMetadata] = {
+          ...existing,
+          address,
+          allAddresses,
+          remoteDeploymentId: value.remoteDeploymentId,
+        };
       } else {
         data.impls[versionWithoutMetadata] = value;
       }
@@ -223,14 +226,23 @@ async function checkForAddressClash(
   provider: EthereumProvider,
   data: ManifestData,
   updated: Deployment & RemoteDeploymentId,
-  checkAllAddresses: boolean,
+  merge: boolean,
 ): Promise<void> {
-  const clash = lookupDeployment(data, updated.address, checkAllAddresses);
-  if (clash !== undefined) {
-    if (await isDevelopmentNetwork(provider)) {
+  let clash;
+  const findClash = () => lookupDeployment(data, updated.address, !merge);
+
+  if (await isDevelopmentNetwork(provider)) {
+    // Look for clashes so that we can delete deployments from older runs.
+    // `merge` only checks primary addresses for clashes, since the address could already exist in an allAddresses field
+    // but the updated and stored objects are different instances representing the same entry.
+    clash = findClash();
+    if (clash !== undefined) {
       debug('deleting a previous deployment at address', updated.address);
       clash.set(undefined);
-    } else {
+    }
+  } else if (!merge) {
+    clash = findClash();
+    if (clash !== undefined) {
       const existing = clash.get();
       // it's a clash if there is no deployment id or if deployment ids don't match
       if (
@@ -238,13 +250,12 @@ async function checkForAddressClash(
         (existing.remoteDeploymentId === undefined || existing.remoteDeploymentId !== updated.remoteDeploymentId)
       ) {
         throw new Error(
-          `The following deployment clashes with an existing one at ${updated.address}\n\n` +
-            JSON.stringify(updated, null, 2) +
-            `\n\n`,
+          `The deployment clashes with an existing one at ${updated.address}.\n\n` +
+            `Deployments: ${JSON.stringify({ existing, updated }, null, 2)}\n\n`,
         );
       }
     }
-  }
+  } // else, merge indicates that the user is force-importing or redeploying an implementation, so we simply allow merging the entries
 }
 
 function lookupDeployment(

package/src/index.ts

@@ -53,6 +53,7 @@ export {
   NoContractImportError,
   ValidateUpdateRequiresKindError,
   PrepareUpgradeRequiresKindError,
+  InitialOwnerUnsupportedKindError,
   assertNotProxy,
 } from './usage-error';
 

package/src/solidity-version.json

@@ -0,0 +1 @@
+"0.8.20"

package/src/standalone.test.ts

@@ -1,6 +1,8 @@
 import _test, { TestFn } from 'ava';
 import { artifacts } from 'hardhat';
 
+import SOLIDITY_VERSION from './solidity-version.json';
+
 import { SolcInput, SolcOutput } from './solc-api';
 import { UpgradeableContract } from './standalone';
 
@@ -21,7 +23,7 @@ test.before(async t => {
 });
 
 test('reports unsafe operation', t => {
-  const impl = new UpgradeableContract('StandaloneV1', t.context.solcInput, t.context.solcOutput);
+  const impl = new UpgradeableContract('StandaloneV1', t.context.solcInput, t.context.solcOutput, {}, SOLIDITY_VERSION);
   const report = impl.getErrorReport();
   t.false(report.ok);
   t.true(report.errors[0].kind === 'delegatecall');
@@ -32,6 +34,8 @@ test('reports unsafe operation - fully qualified name', t => {
     'contracts/test/Standalone.sol:StandaloneV1',
     t.context.solcInput,
     t.context.solcOutput,
+    {},
+    SOLIDITY_VERSION,
   );
   const report = impl.getErrorReport();
   t.false(report.ok);
@@ -39,25 +43,55 @@ test('reports unsafe operation - fully qualified name', t => {
 });
 
 test('reports storage upgrade errors', t => {
-  const v1 = new UpgradeableContract('StandaloneV1', t.context.solcInput, t.context.solcOutput);
+  const v1 = new UpgradeableContract('StandaloneV1', t.context.solcInput, t.context.solcOutput, {}, SOLIDITY_VERSION);
 
-  const v2Good = new UpgradeableContract('StandaloneV2Good', t.context.solcInput, t.context.solcOutput);
+  const v2Good = new UpgradeableContract(
+    'StandaloneV2Good',
+    t.context.solcInput,
+    t.context.solcOutput,
+    {},
+    SOLIDITY_VERSION,
+  );
   const goodReport = v1.getStorageUpgradeReport(v2Good);
   t.true(goodReport.ok);
 
-  const v2Bad = new UpgradeableContract('StandaloneV2Bad', t.context.solcInput, t.context.solcOutput);
+  const v2Bad = new UpgradeableContract(
+    'StandaloneV2Bad',
+    t.context.solcInput,
+    t.context.solcOutput,
+    {},
+    SOLIDITY_VERSION,
+  );
   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 v1 = new UpgradeableContract(
+    'StandaloneRenameV1',
+    t.context.solcInput,
+    t.context.solcOutput,
+    {},
+    SOLIDITY_VERSION,
+  );
 
-  const v2 = new UpgradeableContract('StandaloneRenameV2', t.context.solcInput, t.context.solcOutput);
+  const v2 = new UpgradeableContract(
+    'StandaloneRenameV2',
+    t.context.solcInput,
+    t.context.solcOutput,
+    {},
+    SOLIDITY_VERSION,
+  );
   const goodReport = v1.getStorageUpgradeReport(v2);
   t.true(goodReport.ok);
 
-  const v3 = new UpgradeableContract('StandaloneRenameV3', t.context.solcInput, t.context.solcOutput);
+  const v3 = new UpgradeableContract(
+    'StandaloneRenameV3',
+    t.context.solcInput,
+    t.context.solcOutput,
+    {},
+    SOLIDITY_VERSION,
+  );
   const goodReport2 = v2.getStorageUpgradeReport(v3);
   t.true(goodReport2.ok);
 });

package/src/usage-error.ts

@@ -95,6 +95,15 @@ export class PrepareUpgradeRequiresKindError extends UpgradesError {
   }
 }
 
+export class InitialOwnerUnsupportedKindError extends UpgradesError {
+  constructor(kind: string) {
+    super(
+      `The \`initialOwner\` option is not supported for this kind of proxy ('${kind}')`,
+      () => `Set the initial owner as part of your contract's initializer arguments instead.`,
+    );
+  }
+}
+
 export async function assertNotProxy(provider: EthereumProvider, address: string) {
   if (await isTransparentOrUUPSProxy(provider, address)) {
     throw new UpgradesError(

package/artifacts/@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol/ERC1967Proxy.dbg.json

@@ -1,4 +0,0 @@
-{
-  "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../../build-info/966b1f437e942115ba46359eb293018c.json"
-}

package/artifacts/@openzeppelin/contracts/proxy/beacon/BeaconProxy.sol/BeaconProxy.dbg.json

@@ -1,4 +0,0 @@
-{
-  "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../../build-info/966b1f437e942115ba46359eb293018c.json"
-}

package/artifacts/@openzeppelin/contracts/proxy/beacon/UpgradeableBeacon.sol/UpgradeableBeacon.dbg.json

@@ -1,4 +0,0 @@
-{
-  "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../../build-info/966b1f437e942115ba46359eb293018c.json"
-}