🔨 deploy: merge governance scripts

deploy/Auditor.ts

@@ -56,6 +56,6 @@ const func: DeployFunction = async ({
 };
 
 func.tags = ["Auditor"];
-func.dependencies = ["ProxyAdmin", "TimelockController"];
+func.dependencies = ["Governance"];
 
 export default func;

deploy/DebtManager.ts

@@ -39,6 +39,6 @@ const func: DeployFunction = async ({ deployments: { deploy, get }, getNamedAcco
 };
 
 func.tags = ["DebtManager"];
-func.dependencies = ["TimelockController", "Auditor", "Markets", "UniswapV3", "Balancer", "Permit2"];
+func.dependencies = ["Governance", "Auditor", "Markets", "UniswapV3", "Balancer", "Permit2"];
 
 export default func;

deploy/EXA.ts

@@ -58,7 +58,7 @@ const func: DeployFunction = async ({
 };
 
 func.tags = ["EXA"];
-func.dependencies = ["Sablier"];
+func.dependencies = ["Governance", "Sablier"];
 func.skip = async ({ network }) => !["optimism", "goerli"].includes(network.name) && network.live;
 
 export default func;

deploy/TimelockController.ts → deploy/Governance.ts

@@ -1,5 +1,5 @@
 import type { DeployFunction } from "hardhat-deploy/types";
-import { TimelockController } from "../types";
+import type { ProxyAdmin, TimelockController } from "../types";
 import timelockPropose from "./.utils/timelockPropose";
 import tenderlify from "./.utils/tenderlify";
 
@@ -16,6 +16,7 @@ const func: DeployFunction = async ({
   getNamedAccounts,
 }) => {
   const { deployer, multisig } = await getNamedAccounts();
+
   await tenderlify(
     "TimelockController",
     await deploy("TimelockController", {
@@ -26,12 +27,22 @@ const func: DeployFunction = async ({
     }),
   );
 
+  await tenderlify(
+    "ProxyAdmin",
+    await deploy("ProxyAdmin", { skipIfAlreadyDeployed: true, from: deployer, log: true }),
+  );
+
   const timelock = await getContract<TimelockController>("TimelockController", await getSigner(deployer));
   if (!(await timelock.getMinDelay()).eq(timelockDelay)) {
     await timelockPropose(timelock, "updateDelay", [timelockDelay]);
   }
+
+  const proxyAdmin = await getContract<ProxyAdmin>("ProxyAdmin", await getSigner(deployer));
+  if ((await proxyAdmin.owner()).toLowerCase() !== timelock.address.toLowerCase()) {
+    await (await proxyAdmin.transferOwnership(timelock.address)).wait();
+  }
 };
 
-func.tags = ["TimelockController"];
+func.tags = ["Governance"];
 
 export default func;

deploy/Markets.ts

@@ -245,6 +245,6 @@ const func: DeployFunction = async ({
 };
 
 func.tags = ["Markets"];
-func.dependencies = ["Auditor", "ProxyAdmin", "TimelockController", "Assets", "PriceFeeds", "RewardsController"];
+func.dependencies = ["Auditor", "Governance", "Assets", "PriceFeeds", "Rewards"];
 
 export default func;

deploy/RewardsController.ts → deploy/Rewards.ts

@@ -21,8 +21,8 @@ const func: DeployFunction = async ({ deployments: { deploy, get }, getNamedAcco
   );
 };
 
-func.tags = ["RewardsController"];
-func.dependencies = ["ProxyAdmin", "TimelockController"];
+func.tags = ["Rewards"];
+func.dependencies = ["Governance"];
 func.skip = async ({ network }) =>
   !Object.values(network.config.finance.markets).some(({ rewards }) => Boolean(rewards));