Closes AP-752,AP-779: Use cli types in tasks

tasks/deploy/deployAPTeamMultiSig.ts

@@ -1,5 +1,6 @@
 import {deployAPTeamMultiSig} from "contracts/multisigs/scripts/deploy";
 import {task} from "hardhat/config";
+import {cliTypes} from "tasks/types";
 import {confirmAction, getAddresses, getSigners, isLocalNetwork, logger, verify} from "utils";
 
 type TaskArgs = {
@@ -12,7 +13,12 @@ type TaskArgs = {
 task("deploy:APTeamMultiSig", "Will deploy APTeamMultiSig contract")
   .addFlag("skipVerify", "Skip contract verification")
   .addFlag("yes", "Automatic yes to prompt.")
-  .addOptionalParam("admin", "override for proxy admin wallet, default: proxyAdminMultisig")
+  .addOptionalParam(
+    "admin",
+    "override for proxy admin wallet, default: proxyAdminMultisig",
+    undefined,
+    cliTypes.address
+  )
   .addOptionalParam(
     "apTeamSignerPkey",
     "If running on prod, provide a pkey for a valid APTeam Multisig Owner."

tasks/deploy/deployAccountsDiamond.ts

@@ -1,5 +1,6 @@
 import {deployAccountsDiamond} from "contracts/core/accounts/scripts/deploy";
 import {task} from "hardhat/config";
+import {cliTypes} from "tasks/types";
 import {confirmAction, getAddresses, getSigners, isLocalNetwork, logger, verify} from "utils";
 
 type TaskArgs = {
@@ -14,11 +15,15 @@ type TaskArgs = {
 task("deploy:accounts", "It will deploy accounts diamond contracts")
   .addOptionalParam(
     "apTeamMultisig",
-    "APTeamMultiSig contract address. Will do a local lookup from contract-address.json if none is provided."
+    "APTeamMultiSig contract address. Will do a local lookup from contract-address.json if none is provided.",
+    undefined,
+    cliTypes.address
   )
   .addOptionalParam(
     "registrar",
-    "Registrar contract address. Will do a local lookup from contract-address.json if none is provided."
+    "Registrar contract address. Will do a local lookup from contract-address.json if none is provided.",
+    undefined,
+    cliTypes.address
   )
   .addOptionalParam(
     "apTeamSignerPkey",

tasks/deploy/deployCharityApplications.ts

@@ -1,5 +1,6 @@
 import {deployCharityApplications} from "contracts/multisigs/scripts/deployCharityApplications";
 import {task} from "hardhat/config";
+import {cliTypes} from "tasks/types";
 import {confirmAction, getAddresses, getSigners, isLocalNetwork, logger, verify} from "utils";
 
 type TaskArgs = {
@@ -13,7 +14,9 @@ type TaskArgs = {
 task("deploy:CharityApplications", "Will deploy CharityApplication contract")
   .addOptionalParam(
     "accountsDiamond",
-    "Accounts Diamond contract address. Will do a local lookup from contract-address.json if none is provided."
+    "Accounts Diamond contract address. Will do a local lookup from contract-address.json if none is provided.",
+    undefined,
+    cliTypes.address
   )
   .addOptionalParam(
     "apTeamSignerPkey",

tasks/deploy/deployGiftcard.ts

@@ -1,10 +1,11 @@
 import {CONFIG} from "config";
 import {deployGiftCard} from "contracts/accessory/gift-cards/scripts/deploy";
 import {task} from "hardhat/config";
+import {cliTypes} from "tasks/types";
 import {getAddresses, isLocalNetwork, logger} from "utils";
 
 type TaskArgs = {
-  keeper: string;
+  keeper?: string;
   registrar?: string;
   skipVerify: boolean;
 };
@@ -16,7 +17,9 @@ task("deploy:GiftCard", "Will deploy GiftCardContracts contract")
   )
   .addOptionalParam(
     "registrar",
-    "Registrar contract address. Will do a local lookup from contract-address.json if none is provided."
+    "Registrar contract address. Will do a local lookup from contract-address.json if none is provided.",
+    undefined,
+    cliTypes.address
   )
   .addFlag("skipVerify", "Skip contract verification")
   .setAction(async (taskArgs: TaskArgs, hre) => {

tasks/deploy/deployHaloImplementation.ts

@@ -10,12 +10,15 @@ import {deployCommunity} from "contracts/halo/community/scripts/deploy";
 import {deployGov} from "contracts/halo/gov/scripts/deploy";
 import {deployStaking} from "contracts/halo/staking/scripts/deploy";
 import {deployVesting} from "contracts/halo/vesting/scripts/deploy";
+import {cliTypes} from "tasks/types";
 
 task("deploy:HaloImplementation", "Will deploy HaloImplementation contract")
   .addFlag("skipVerify", "Skip contract verification")
   .addOptionalParam(
     "registrar",
-    "Registrar contract address. Will do a local lookup from contract-address.json if none is provided."
+    "Registrar contract address. Will do a local lookup from contract-address.json if none is provided.",
+    undefined,
+    cliTypes.address
   )
   .setAction(async (taskArgs, hre) => {
     try {

tasks/deploy/deployIndexFund.ts

@@ -1,5 +1,6 @@
 import {deployIndexFund} from "contracts/core/index-fund/scripts/deploy";
 import {task} from "hardhat/config";
+import {cliTypes} from "tasks/types";
 import {confirmAction, getAddresses, getSigners, isLocalNetwork, logger, verify} from "utils";
 
 type TaskArgs = {
@@ -13,11 +14,15 @@ type TaskArgs = {
 task("deploy:IndexFund", "Will deploy IndexFund contract")
   .addOptionalParam(
     "owner",
-    "Address of the owner. By default set to AP team multisig proxy saved in contract-address.json."
+    "Address of the owner. By default set to AP team multisig proxy saved in contract-address.json.",
+    undefined,
+    cliTypes.address
   )
   .addOptionalParam(
     "registrar",
-    "Registrar contract address. Will do a local lookup from contract-address.json if none is provided."
+    "Registrar contract address. Will do a local lookup from contract-address.json if none is provided.",
+    undefined,
+    cliTypes.address
   )
   .addOptionalParam(
     "apTeamSignerPkey",

tasks/deploy/deployLocalRegistrar.ts

@@ -1,6 +1,7 @@
 import {deployLocalRegistrar} from "contracts/core/registrar/scripts/deploy";
 import {deployRouter} from "contracts/core/router/scripts/deploy";
 import {task} from "hardhat/config";
+import {cliTypes} from "tasks/types";
 import {LocalRegistrarLib} from "typechain-types/contracts/core/registrar/LocalRegistrar";
 import {confirmAction, getAddresses, getSigners, isLocalNetwork, logger, verify} from "utils";
 
@@ -12,7 +13,12 @@ type TaskArgs = {
 };
 
 task("deploy:LocalRegistrarAndRouter", "Will deploy the Local Registrar contract and Router.")
-  .addOptionalParam("owner", "The owner wallet for both router and registrar")
+  .addOptionalParam(
+    "owner",
+    "The owner wallet for both router and registrar. By default set to AP team multisig proxy saved in contract-address.json.",
+    undefined,
+    cliTypes.address
+  )
   .addOptionalParam(
     "apTeamSignerPkey",
     "If running on prod, provide a pkey for a valid APTeam Multisig Owner."

tasks/deploy/deployRegistrar.ts

@@ -1,6 +1,7 @@
 import {CONFIG} from "config";
 import {deployRegistrar} from "contracts/core/registrar/scripts/deploy";
 import {task} from "hardhat/config";
+import {cliTypes} from "tasks/types";
 import {confirmAction, getAddresses, getSigners, isLocalNetwork, logger, verify} from "utils";
 
 type TaskArgs = {
@@ -17,11 +18,15 @@ task(
 )
   .addOptionalParam(
     "apTeamMultisig",
-    "APTeamMultiSig contract address. Will do a local lookup from contract-address.json if none is provided."
+    "APTeamMultiSig contract address. Will do a local lookup from contract-address.json if none is provided.",
+    undefined,
+    cliTypes.address
   )
   .addOptionalParam(
     "router",
-    "Router contract address. Will do a local lookup from contract-address.json if none is provided."
+    "Router contract address. Will do a local lookup from contract-address.json if none is provided.",
+    undefined,
+    cliTypes.address
   )
   .addOptionalParam(
     "apTeamSignerPkey",

tasks/deploy/deployRouter.ts

@@ -1,5 +1,6 @@
 import {deployRouter} from "contracts/core/router/scripts/deploy";
 import {task} from "hardhat/config";
+import {cliTypes} from "tasks/types";
 import {confirmAction, getAddresses, getSigners, isLocalNetwork, logger, verify} from "utils";
 
 type TaskArgs = {
@@ -12,7 +13,9 @@ type TaskArgs = {
 task("deploy:Router", "Will deploy Router contract")
   .addOptionalParam(
     "registrar",
-    "Registrar contract address. Will do a local lookup from contract-address.json if none is provided."
+    "Registrar contract address. Will do a local lookup from contract-address.json if none is provided.",
+    undefined,
+    cliTypes.address
   )
   .addOptionalParam(
     "apTeamSignerPkey",

tasks/deploy/integrations/dummyIntegration.ts

@@ -1,5 +1,12 @@
+import {allStrategyConfigs} from "contracts/integrations/stratConfig";
 import {task} from "hardhat/config";
-import {APVault_V1__factory, VaultEmitter__factory, DummyERC20__factory, GoerliDummy__factory} from "typechain-types";
+import {cliTypes} from "tasks/types";
+import {
+  APVault_V1__factory,
+  DummyERC20__factory,
+  GoerliDummy__factory,
+  VaultEmitter__factory,
+} from "typechain-types";
 import {VaultType} from "types";
 import {
   StratConfig,
@@ -8,25 +15,22 @@ import {
   getSigners,
   logger,
   writeStrategyAddresses,
-  getVaultAddress,
-  getStrategyAddress,
-  getAPTeamOwner
 } from "utils";
-import {allStrategyConfigs} from "../../../contracts/integrations/stratConfig";
-import {submitMultiSigTx} from "tasks/helpers";
 
 type TaskArgs = {
-  name: string;
+  stratConfig: StratConfig;
   admin: string;
   skipVerify: boolean;
 };
 
 task("Deploy:dummyIntegration", "Will deploy a set of vaults and a dummy strategy")
   .addParam(
-    "name",
+    "stratConfig",
     `The name of the strategy according to StratConfig, possible values: ${Object.keys(
       allStrategyConfigs
-    ).join(", ")}`
+    ).join(", ")}`,
+    undefined,
+    cliTypes.stratConfig
   )
   .addOptionalParam(
     "admin",
@@ -35,7 +39,10 @@ task("Deploy:dummyIntegration", "Will deploy a set of vaults and a dummy strateg
   .addFlag("skipVerify", "Skip contract verification")
   .setAction(async (taskArgs: TaskArgs, hre) => {
     try {
-      const config: StratConfig = allStrategyConfigs[taskArgs.name];
+      logger.divider();
+      logger.out("Deploying a set of vaults and a dummy strategy...");
+
+      const config: StratConfig = taskArgs.stratConfig;
       const {deployer} = await getSigners(hre);
       let network = await hre.ethers.provider.getNetwork();
       if (network.chainId != config.chainId) {
@@ -86,44 +93,37 @@ task("Deploy:dummyIntegration", "Will deploy a set of vaults and a dummy strateg
       };
       let liqVault = await Vault.deploy(liquidConfig, addresses.vaultEmitter.proxy, admin);
       logger.pad(30, "Liquid Vault deployed to", liqVault.address);
-
-      const emitter = VaultEmitter__factory.connect(addresses.vaultEmitter.proxy, deployer);
 
-      await emitter.vaultCreated(
-        lockVault.address,
-        {
-          vaultType: VaultType.LOCKED,
-          strategyId: config.id,
-          strategy: strategy.address,
-          registrar: addresses.registrar.proxy,
-          baseToken: addresses.tokens.usdc,
-          yieldToken: yieldToken.address,
-          apTokenName: "LockedTestVault",
-          apTokenSymbol: "LockTV",
-        }
-      )
-      await emitter.vaultCreated(
-        liqVault.address,
-        {
-          vaultType: VaultType.LIQUID,
-          strategyId: config.id,
-          strategy: strategy.address,
-          registrar: addresses.registrar.proxy,
-          baseToken: addresses.tokens.usdc,
-          yieldToken: "0x2811747e3336aa28caf71c51454766e1b95f56e8",
-          apTokenName: "LiquidTestVault",
-          apTokenSymbol: "LiqTV",
+      const emitter = VaultEmitter__factory.connect(addresses.vaultEmitter.proxy, deployer);
 
-        }
-      )
+      await emitter.vaultCreated(lockVault.address, {
+        vaultType: VaultType.LOCKED,
+        strategyId: config.id,
+        strategy: strategy.address,
+        registrar: addresses.registrar.proxy,
+        baseToken: addresses.tokens.usdc,
+        yieldToken: yieldToken.address,
+        apTokenName: "LockedTestVault",
+        apTokenSymbol: "LockTV",
+      });
+      await emitter.vaultCreated(liqVault.address, {
+        vaultType: VaultType.LIQUID,
+        strategyId: config.id,
+        strategy: strategy.address,
+        registrar: addresses.registrar.proxy,
+        baseToken: addresses.tokens.usdc,
+        yieldToken: "0x2811747e3336aa28caf71c51454766e1b95f56e8",
+        apTokenName: "LiquidTestVault",
+        apTokenSymbol: "LiqTV",
+      });
 
       const data: StrategyObject = {
         strategy: strategy.address,
         locked: lockVault.address,
         liquid: liqVault.address,
       };
 
-      writeStrategyAddresses(taskArgs.name, data);
+      writeStrategyAddresses(taskArgs.stratConfig.name, data);
     } catch (error) {
       logger.out(error, logger.Level.Error);
     }

tasks/manage/accounts/updateConfig.ts

@@ -1,5 +1,6 @@
 import {task} from "hardhat/config";
 import {submitMultiSigTx} from "tasks/helpers";
+import {cliTypes} from "tasks/types";
 import {AccountsQueryEndowments__factory, AccountsUpdate__factory} from "typechain-types";
 import {confirmAction, getAPTeamOwner, getAddresses, logger, structToObject} from "utils";
 
@@ -12,7 +13,9 @@ type TaskArgs = {
 task("manage:accounts:updateConfig", "Will update Accounts Diamond config")
   .addOptionalParam(
     "registrarContract",
-    "Registrar contract address. Will do a local lookup from contract-address.json if none is provided."
+    "Registrar contract address. Will do a local lookup from contract-address.json if none is provided.",
+    undefined,
+    cliTypes.address
   )
   .addOptionalParam(
     "apTeamSignerPkey",

tasks/manage/accounts/updateOwner.ts

@@ -1,5 +1,6 @@
 import {task} from "hardhat/config";
 import {submitMultiSigTx} from "tasks/helpers";
+import {cliTypes} from "tasks/types";
 import {AccountsQueryEndowments__factory, AccountsUpdate__factory} from "typechain-types";
 import {confirmAction, getAPTeamOwner, getAddresses, logger} from "utils";
 
@@ -8,7 +9,9 @@ type TaskArgs = {to: string; apTeamSignerPkey?: string; yes: boolean};
 task("manage:AccountsDiamond:updateOwner", "Will update the owner of the Accounts Diamond")
   .addOptionalParam(
     "to",
-    "Address of the new owner. Ensure at least one of `apTeamMultisigOwners` is the controller of this address. Will default to `contract-address.json > multiSig.apTeam.proxy` if none is provided."
+    "Address of the new owner. Ensure at least one of `apTeamMultisigOwners` is the controller of this address. Will default to `contract-address.json > multiSig.apTeam.proxy` if none is provided.",
+    undefined,
+    cliTypes.address
   )
   .addOptionalParam(
     "apTeamSignerPkey",

tasks/manage/addMultisigOwners.ts

@@ -1,5 +1,6 @@
 import {task} from "hardhat/config";
 import {submitMultiSigTx} from "tasks/helpers";
+import {cliTypes} from "tasks/types";
 import {MultiSigGeneric__factory} from "typechain-types";
 import {confirmAction, connectSignerFromPkey, logger} from "utils";
 
@@ -11,27 +12,25 @@ type TaskArgs = {
 };
 
 task("manage:addMultisigOwners", "Will add the specified address to the multisig as an owner")
-  .addParam("multisig", "Address of multisig")
-  .addVariadicPositionalParam("owners", "Addresses of new owners")
+  .addParam("multisig", "Address of multisig", undefined, cliTypes.address)
+  .addParam("owners", "Addresses of new owners", undefined, cliTypes.array.address)
   .addParam("multisigOwnerPkey", "Private Key for a valid Multisig Owner.")
   .addFlag("yes", "Automatic yes to prompt.")
   .setAction(async (taskArguments: TaskArgs, hre) => {
     try {
       logger.divider();
+      logger.out(`Adding new owners to ${taskArguments.multisig}:`);
+      logger.out(taskArguments.owners);
 
-      const msOwner = await connectSignerFromPkey(taskArguments.multisigOwnerPkey, hre);
-
-      const isConfirmed =
-        taskArguments.yes ||
-        (await confirmAction(`Adding new owner: ${await msOwner.getAddress()}`));
+      const isConfirmed = taskArguments.yes || (await confirmAction());
       if (!isConfirmed) {
         return logger.out("Confirmation denied.", logger.Level.Warn);
       }
 
+      const msOwner = await connectSignerFromPkey(taskArguments.multisigOwnerPkey, hre);
+
       const multisig = MultiSigGeneric__factory.connect(taskArguments.multisig, msOwner);
 
-      logger.out("Adding new owners:");
-      logger.out(taskArguments.owners);
       const addOwnerData = multisig.interface.encodeFunctionData("addOwners", [
         taskArguments.owners,
       ]);