Small fixes in deployment scripts

OriginTrail · Dec 20, 2023 · 870e790 · 870e790
1 parent 7017386
commit 870e790
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 14 deletions.
diff --git a/deploy/001_deploy_hub_v2.ts b/deploy/001_deploy_hub_v2.ts
@@ -46,20 +46,30 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
       const hubAddress = hre.helpers.contractDeployments.contracts['Hub'].evmAddress;
       const Hub = await hre.ethers.getContractAt('Hub', hubAddress, deployer);
 
-      const transferHubOwneshipTx = await Hub.transferOwnership(HubController.address);
-      await transferHubOwneshipTx.wait();
+      const hubOwner = await Hub.owner();
+
+      if (deployer.toLowerCase() === hubOwner.toLowerCase()) {
+        const transferHubOwneshipTx = await Hub.transferOwnership(HubController.address);
+        await transferHubOwneshipTx.wait();
+
+        console.log(`Hub ownership transferred to HubController (${HubController.address})`);
+      }
     } else {
       const previousHubController = await hre.ethers.getContractAt(
         'HubController',
         previousHubControllerAddress,
         deployer,
       );
 
-      const transferHubOwneshipTx = await previousHubController.transferHubOwnership(HubController.address);
-      await transferHubOwneshipTx.wait();
-    }
+      const previousHubControllerOwner = await previousHubController.owner();
 
-    console.log(`Hub ownership transferred to HubController (${HubController.address})`);
+      if (deployer.toLowerCase() === previousHubControllerOwner.toLowerCase()) {
+        const transferHubOwneshipTx = await previousHubController.transferHubOwnership(HubController.address);
+        await transferHubOwneshipTx.wait();
+
+        console.log(`Hub ownership transferred to HubController (${HubController.address})`);
+      }
+    }
   }
 };
 

diff --git a/deploy/002_deploy_hub.ts b/deploy/002_deploy_hub.ts
@@ -46,21 +46,29 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
       const hubAddress = hre.helpers.contractDeployments.contracts['Hub'].evmAddress;
       const Hub = await hre.ethers.getContractAt('Hub', hubAddress, deployer);
 
-      const transferHubOwneshipTx = await Hub.transferOwnership(HubController.address);
-      await transferHubOwneshipTx.wait();
+      const hubOwner = await Hub.owner();
 
-      console.log(`Hub ownership transferred to HubController (${HubController.address})`);
-    } else if (hre.network.config.environment !== 'testnet' && hre.network.config.environment !== 'mainnet') {
+      if (deployer.toLowerCase() === hubOwner.toLowerCase()) {
+        const transferHubOwneshipTx = await Hub.transferOwnership(HubController.address);
+        await transferHubOwneshipTx.wait();
+
+        console.log(`Hub ownership transferred to HubController (${HubController.address})`);
+      }
+    } else {
       const previousHubController = await hre.ethers.getContractAt(
         'HubController',
         previousHubControllerAddress,
         deployer,
       );
 
-      const transferHubOwneshipTx = await previousHubController.transferHubOwnership(HubController.address);
-      await transferHubOwneshipTx.wait();
+      const previousHubControllerOwner = await previousHubController.owner();
+
+      if (deployer.toLowerCase() === previousHubControllerOwner.toLowerCase()) {
+        const transferHubOwneshipTx = await previousHubController.transferHubOwnership(HubController.address);
+        await transferHubOwneshipTx.wait();
 
-      console.log(`Hub ownership transferred to HubController (${HubController.address})`);
+        console.log(`Hub ownership transferred to HubController (${HubController.address})`);
+      }
     }
   }
 };

diff --git a/utils/helpers.ts b/utils/helpers.ts
@@ -213,7 +213,7 @@ export class Helpers {
 
     await this.updateDeploymentsJson(nameInHub, newContract.address);
 
-    return await this.hre.ethers.getContractAt(newContractName, newContract.address, deployer);
+    return await this.hre.ethers.getContractAt(this.getAbi(newContractName), newContract.address, deployer);
   }
 
   public async updateContractParameters(contractName: string, contract: Contract) {