deploy script: update transferOwnership

Author: apoorvlathey

deploy/NFTXV3.ts

@@ -6,6 +6,7 @@ import { deployInventoryStaking } from "./modules/InventoryStaking";
 import { deployUniswapV3Periphery } from "./modules/UniswapV3Periphery";
 import { deployNFTXRouter } from "./modules/NFTXRouter";
 import { deployFeeDistributor } from "./modules/FeeDistributor";
+import { deployFailSafe } from "./modules/FailSafe";
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const { vaultFactory } = await deployVaultFactory({ hre });
@@ -41,6 +42,14 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     inventoryStaking,
     vaultFactory,
   });
+
+  const { failSafe } = await deployFailSafe({
+    hre,
+    inventoryStaking,
+    vaultFactory,
+    feeDistributor,
+    nftxRouter,
+  });
 };
 export default func;
 func.tags = ["NFTXV3"];

deploy/modules/FailSafe.ts

@@ -0,0 +1,45 @@
+import { HardhatRuntimeEnvironment } from "hardhat/types";
+import { getConfig } from "../utils";
+
+export const deployFailSafe = async ({
+  hre,
+  inventoryStaking,
+  vaultFactory,
+  feeDistributor,
+  nftxRouter,
+}: {
+  hre: HardhatRuntimeEnvironment;
+  inventoryStaking: string;
+  vaultFactory: string;
+  feeDistributor: string;
+  nftxRouter: string;
+}) => {
+  const { deploy, deployer } = await getConfig(hre);
+
+  const failSafe = await deploy("FailSafe", {
+    args: [
+      [
+        {
+          addr: inventoryStaking,
+          lastLockId: 4,
+        },
+        {
+          addr: vaultFactory,
+          lastLockId: 0,
+        },
+        {
+          addr: feeDistributor,
+          lastLockId: 1,
+        },
+        {
+          addr: nftxRouter,
+          lastLockId: 4,
+        },
+      ],
+    ],
+    from: deployer,
+    log: true,
+  });
+
+  return { failSafe: failSafe.address };
+};

deploy/modules/FeeDistributor.ts

@@ -83,6 +83,6 @@ export const deployFeeDistributor = async ({
   }
 
   return {
-    feeDistributor,
+    feeDistributor: feeDistributor.address,
   };
 };

deploy/scripts/TransferOwnership.ts

@@ -1,37 +1,50 @@
 import { HardhatRuntimeEnvironment, Network } from "hardhat/types";
 import { DeployFunction } from "hardhat-deploy/types";
-import { utils } from "ethers";
-import deployConfig from "../deployConfig";
+import { getConfig, getContract } from "../utils";
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
-  const { deployments, getNamedAccounts, network } = hre;
-  const { deploy, execute } = deployments;
+  const { execute, deployments, deployer, config } = await getConfig(hre);
 
-  const { deployer } = await getNamedAccounts();
-  const config = deployConfig[network.name];
-
-  // `transferOwnership`:
-  if (!config.multisig) return;
+  if (!config.multisig) {
+    console.log("🚨 No multisig set");
+    return;
+  }
 
   await Promise.all(
     [
       "DefaultProxyAdmin",
       "MarketplaceUniversalRouterZap",
+      "MigratorZap",
+      "FailSafe",
       "NFTXFeeDistributorV3",
       "NFTXInventoryStakingV3Upgradeable",
       "NFTXRouter",
-      "NFTXVaultFactoryUpgradeable",
+      "NFTXVaultFactoryUpgradeableV3",
       "NonfungiblePositionManager",
       "UniswapV3FactoryUpgradeable",
     ].map(async (name) => {
-      console.log(`Transferring ownership of ${name}...`);
-      await execute(
-        name,
-        { from: deployer },
-        "transferOwnership",
-        config.multisig
-      );
-      console.log(`Ownership of ${name} transferred`);
+      const contract = await getContract(hre, name);
+      const owner = await contract.owner();
+
+      if (owner.toLowerCase() === config.multisig.toLowerCase()) {
+        console.log(`Ownership of ${name} already transferred`);
+      } else {
+        try {
+          console.log(`⌛ Transferring ownership of ${name}...`);
+
+          await execute(
+            name,
+            { from: deployer },
+            "transferOwnership",
+            config.multisig
+          );
+
+          console.log(`✅ Ownership of ${name} transferred`);
+        } catch (e) {
+          console.log(`🚨 Failed to transfer ownership of ${name}`);
+          console.log(e);
+        }
+      }
     })
   );
 };

deploy/utils/index.ts

@@ -27,16 +27,31 @@ export const getContract = async (
   hre: HardhatRuntimeEnvironment,
   contractName: string,
   // keeping this param and not using deployments.get() because it helps to see the module's dependencies on other contracts
-  contractAddress: string
+  // making optional for querying DefaultProxyAdmin
+  contractAddress?: string
 ) => {
+  // this fails to read "DefaultProxyAdmin":
+  /** 
   const { deployments } = hre;
-
   const artifact = await deployments.getArtifact(contractName);
   const contractFactory = await hre.ethers.getContractFactory(
     artifact.abi,
     artifact.bytecode
   );
   const contract = contractFactory.attach(contractAddress);
+  */
+
+  const contractDeployment = await getDeploymentFileByName(
+    contractName,
+    hre.network
+  );
+  const contract = (
+    await hre.ethers.getContractFactory(
+      contractDeployment.abi,
+      contractDeployment.bytecode
+    )
+  ).attach(contractAddress ?? contractDeployment.address);
+
   return contract;
 };
 
@@ -103,16 +118,7 @@ export const handleUpgradeDeploy = async ({
 }): Promise<Deployment> => {
   const { deploy, network, deployments } = await getConfig(hre);
 
-  const defaultProxyAdminDeployment = await getDeploymentFileByName(
-    "DefaultProxyAdmin",
-    network
-  );
-  const defaultProxyAdminContract = (
-    await hre.ethers.getContractFactory(
-      defaultProxyAdminDeployment.abi,
-      defaultProxyAdminDeployment.bytecode
-    )
-  ).attach(defaultProxyAdminDeployment.address);
+  const defaultProxyAdminContract = await getContract(hre, "DefaultProxyAdmin");
 
   // set the current owner of the proxy, in the deployOptions
   deployOptions.proxy = {
@@ -128,8 +134,6 @@ export const handleUpgradeDeploy = async ({
     await setImplementation(contractName, network);
     deployment = await deployments.get(contractName);
 
-    console.log(e);
-
     console.warn(
       `[⚠️ NOTE!] call "upgrade" on DefaultProxyAdmin to upgrade the implementation for ${contractName}`
     );