chore: add confirmation step to a few more commands

Signed-off-by: Tomás Migone <[email protected]>

Author: tmigone

cli/commands/airdrop.ts

@@ -1,4 +1,3 @@
-import inquirer from 'inquirer'
 import fs from 'fs'
 import PQueue from 'p-queue'
 import yargs, { Argv } from 'yargs'
@@ -10,6 +9,7 @@ import { NonceManager } from '@ethersproject/experimental'
 import { logger } from '../logging'
 import { sendTransaction } from '../network'
 import { loadEnv, CLIArgs, CLIEnvironment } from '../env'
+import { confirm } from '../helpers'
 
 const { getAddress } = utils
 
@@ -66,20 +66,6 @@ interface AirdropRecipient {
   txHash?: string
 }
 
-const sure = async (message = 'Are you sure?'): Promise<boolean> => {
-  // Warn about changing ownership
-  const res = await inquirer.prompt({
-    name: 'confirm',
-    type: 'confirm',
-    message,
-  })
-  if (!res.confirm) {
-    logger.info('Cancelled')
-    return false
-  }
-  return true
-}
-
 const getDisperseContract = (chainID: number, provider) => {
   return new Contract(DISPERSE_CONTRACT_ADDRESS[chainID], DISPERSE_CONTRACT_ABI, provider)
 }
@@ -193,10 +179,8 @@ export const airdrop = async (cli: CLIEnvironment, cliArgs: CLIArgs): Promise<vo
   }
 
   // Confirmation
-  logger.info('Are you sure you want to proceed with the distribution?')
-  if (!(await sure())) {
-    process.exit(1)
-  }
+  const sure = await confirm('Are you sure you want to proceed with the distribution?')
+  if (!sure) return
 
   // Approve
   logger.info('## Token approval')

cli/commands/migrate.ts

@@ -11,6 +11,7 @@ import {
   sendTransaction,
 } from '../network'
 import { loadEnv, CLIArgs, CLIEnvironment } from '../env'
+import { confirm } from '../helpers'
 
 const { EtherSymbol } = constants
 const { formatEther } = utils
@@ -40,6 +41,10 @@ export const migrate = async (cli: CLIEnvironment, cliArgs: CLIArgs): Promise<vo
   const contractName = cliArgs.contract
   const chainId = cli.chainId
 
+  // Ensure action
+  const sure = await confirm('Are you sure you want to migrate contracts?')
+  if (!sure) return
+
   if (chainId == 1337) {
     await (cli.wallet.provider as providers.JsonRpcProvider).send('evm_setAutomine', [true])
     allContracts = ['EthereumDIDRegistry', ...allContracts]

cli/commands/proxy/admin.ts

@@ -13,9 +13,7 @@ export const setProxyAdmin = async (cli: CLIEnvironment, cliArgs: CLIArgs): Prom
 
   // Warn about changing ownership
   const sure = await confirm(`Are you sure to set the admin to ${adminAddress}?`)
-  if (!sure) {
-    return
-  }
+  if (!sure) return
 
   // Get address book info
   const addressEntry = cli.addressBook.getEntry(contractName)

cli/commands/proxy/upgrade.ts

@@ -3,13 +3,18 @@ import yargs, { Argv } from 'yargs'
 import { logger } from '../../logging'
 import { getContractAt, isContractDeployed, sendTransaction } from '../../network'
 import { loadEnv, CLIArgs, CLIEnvironment } from '../../env'
+import { confirm } from '../../helpers'
 
 export const upgradeProxy = async (cli: CLIEnvironment, cliArgs: CLIArgs): Promise<void> => {
   const contractName = cliArgs.contract
   const implAddress = cliArgs.impl
   const initArgs = cliArgs.init
   const buildAcceptProxyTx = cliArgs.buildTx
 
+  // Warn about upgrade
+  const sure = await confirm(`Are you sure you want to upgrade ${contractName} to ${implAddress}?`)
+  if (!sure) return
+
   logger.info(`Upgrading contract ${contractName}...`)
 
   // Get address book info