Improve configuration and tasks (#469)

Reorganize some actions as Hardhat tasks. Cleanup and refactor CLI.

Author: abarmat

.eslintrc

@@ -8,7 +8,7 @@
   "rules": {
     "prefer-const": "warn",
     "no-extra-semi": "off",
-    "@typescript-eslint/no-extra-semi": "warn",
+    "@typescript-eslint/no-extra-semi": "off",
     "@typescript-eslint/no-inferrable-types": "warn",
     "@typescript-eslint/no-empty-function": "warn",
     "no-only-tests/no-only-tests": "error"

cli/commands/airdrop.ts

@@ -1,4 +1,3 @@
-import consola from 'consola'
 import inquirer from 'inquirer'
 import fs from 'fs'
 import PQueue from 'p-queue'
@@ -111,7 +110,7 @@ const loadRecipients = (path: string): Array<AirdropRecipient> => {
       logger.fatal(`Error loading address "${address}" please review the input file`)
       process.exit(1)
     }
-    results.push({ address, amount: weiAmount as any, txHash })
+    results.push({ address, amount: weiAmount, txHash })
   }
   return results
 }

cli/commands/contracts/curation.ts

@@ -80,7 +80,7 @@ export const curationCommand = {
         },
       })
   },
-  handler: (argv: CLIArgs): void => {
+  handler: (): void => {
     yargs.showHelp()
   },
 }

cli/commands/contracts/disputeManager.ts

@@ -234,7 +234,7 @@ export const disputeManagerCommand = {
         },
       })
   },
-  handler: (argv: CLIArgs): void => {
+  handler: (): void => {
     yargs.showHelp()
   },
 }

cli/commands/contracts/ens.ts

@@ -7,7 +7,8 @@ import { logger } from '../../logging'
 
 export const registerTestName = async (cli: CLIEnvironment, cliArgs: CLIArgs): Promise<void> => {
   const name = cliArgs.name
-  const testRegistrar = cli.contracts.ITestRegistrar
+  // eslint-disable-next-line  @typescript-eslint/no-explicit-any
+  const testRegistrar = (cli.contracts as any).ITestRegistrar
   const normalizedName = name.toLowerCase()
   const labelNameFull = `${normalizedName}.${'eth'}`
   const labelHashFull = utils.namehash(labelNameFull)
@@ -67,7 +68,7 @@ export const ensCommand = {
         },
       })
   },
-  handler: (argv: CLIArgs): void => {
+  handler: (): void => {
     yargs.showHelp()
   },
 }

cli/commands/contracts/ethereumDIDRegistry.ts

@@ -33,7 +33,7 @@ const handleAccountMetadata = async (ipfs: string, path: string): Promise<string
   return IPFS.ipfsHashToBytes32(metaHash)
 }
 
-export const setAttribute = async (cli: CLIEnvironment, cliArgs: CLIArgs) => {
+export const setAttribute = async (cli: CLIEnvironment, cliArgs: CLIArgs): Promise<void> => {
   const metadataPath = cliArgs.metadataPath
   const ipfsEndpoint = cliArgs.ipfs
   const ethereumDIDRegistry = cli.contracts.IEthereumDIDRegistry
@@ -83,7 +83,7 @@ export const ethereumDIDRegistryCommand = {
       },
     })
   },
-  handler: (argv: CLIArgs): void => {
+  handler: (): void => {
     yargs.showHelp()
   },
 }

cli/commands/contracts/gns.ts

@@ -1,4 +1,3 @@
-import * as fs from 'fs'
 import yargs, { Argv } from 'yargs'
 import { parseGRT } from '@graphprotocol/common-ts'
 

cli/commands/contracts/gsr-gdai.ts

@@ -1,3 +1,4 @@
+/* eslint-disable  @typescript-eslint/no-explicit-any */
 import yargs, { Argv } from 'yargs'
 import { parseGRT } from '@graphprotocol/common-ts'
 
@@ -7,23 +8,23 @@ import { loadEnv, CLIArgs, CLIEnvironment } from '../../env'
 
 export const setGSR = async (cli: CLIEnvironment, cliArgs: CLIArgs): Promise<void> => {
   const account = cliArgs.account
-  const gdai = cli.contracts.GDAI
+  const gdai = (cli.contracts as any).GDAI
 
   logger.log(`Setting GSR to ${account}...`)
   await sendTransaction(cli.wallet, gdai, 'setGSR', [account])
 }
 
 export const setRate = async (cli: CLIEnvironment, cliArgs: CLIArgs): Promise<void> => {
   const amount = parseGRT(cliArgs.amount)
-  const gsr = cli.contracts.GSRManager
+  const gsr = (cli.contracts as any).GSRManager
 
   logger.log(`Setting rate to ${amount}...`)
   await sendTransaction(cli.wallet, gsr, 'setRate', [amount])
 }
 
 export const join = async (cli: CLIEnvironment, cliArgs: CLIArgs): Promise<void> => {
   const amount = parseGRT(cliArgs.amount)
-  const gsr = cli.contracts.GSRManager
+  const gsr = (cli.contracts as any).GSRManager
 
   logger.log(`Reminder - you must call approve on the GSR before`)
   logger.log(`Joining GSR with ${cliArgs.amount} tokens...`)
@@ -33,15 +34,15 @@ export const join = async (cli: CLIEnvironment, cliArgs: CLIArgs): Promise<void>
 export const mint = async (cli: CLIEnvironment, cliArgs: CLIArgs): Promise<void> => {
   const amount = parseGRT(cliArgs.amount)
   const account = cliArgs.account
-  const gdai = cli.contracts.GDAI
+  const gdai = (cli.contracts as any).GDAI
 
   logger.log(`Minting ${cliArgs.amount} GDAI for user ${account}...`)
   await sendTransaction(cli.wallet, gdai, 'mint', [account, amount])
 }
 
 export const burn = async (cli: CLIEnvironment, cliArgs: CLIArgs): Promise<void> => {
   const amount = parseGRT(cliArgs.amount)
-  const gdai = cli.contracts.GDAI
+  const gdai = (cli.contracts as any).GDAI
 
   logger.log(`Burning ${cliArgs.amount} GDAI...`)
   await sendTransaction(cli.wallet, gdai, 'burn', [amount])
@@ -50,7 +51,7 @@ export const burn = async (cli: CLIEnvironment, cliArgs: CLIArgs): Promise<void>
 export const transfer = async (cli: CLIEnvironment, cliArgs: CLIArgs): Promise<void> => {
   const amount = parseGRT(cliArgs.amount)
   const account = cliArgs.account
-  const gdai = cli.contracts.GDAI
+  const gdai = (cli.contracts as any).GDAI
 
   logger.log(`Transferring ${cliArgs.amount} tokens to user ${account}...`)
   await sendTransaction(cli.wallet, gdai, 'transfer', [account, amount])
@@ -59,7 +60,7 @@ export const transfer = async (cli: CLIEnvironment, cliArgs: CLIArgs): Promise<v
 export const approve = async (cli: CLIEnvironment, cliArgs: CLIArgs): Promise<void> => {
   const amount = parseGRT(cliArgs.amount)
   const account = cliArgs.account
-  const gdai = cli.contracts.GDAI
+  const gdai = (cli.contracts as any).GDAI
 
   logger.log(`Approving ${cliArgs.amount} GDAI for user ${account} to spend...`)
   await sendTransaction(cli.wallet, gdai, 'approve', [account, amount])

cli/commands/contracts/index.ts

@@ -11,7 +11,6 @@ import { stakingCommand } from './staking'
 import { anyCommand } from './any'
 import { governanceCommand } from './governance'
 
-import { CLIArgs } from '../../env'
 import { disputeManagerCommand } from './disputeManager'
 
 export const contractsCommand = {
@@ -31,7 +30,7 @@ export const contractsCommand = {
       .command(disputeManagerCommand)
       .command(governanceCommand)
   },
-  handler: (argv: CLIArgs): void => {
+  handler: (): void => {
     yargs.showHelp()
   },
 }

cli/commands/contracts/serviceRegistry.ts

@@ -12,7 +12,7 @@ export const register = async (cli: CLIEnvironment, cliArgs: CLIArgs): Promise<v
   logger.log(`Registering indexer ${cli.walletAddress} with url ${url} and geoHash ${geoHash}`)
   await sendTransaction(cli.wallet, serviceRegistry, 'register', [url, geoHash])
 }
-export const unregister = async (cli: CLIEnvironment, cliArgs: CLIArgs): Promise<void> => {
+export const unregister = async (cli: CLIEnvironment): Promise<void> => {
   const serviceRegistry = cli.contracts.ServiceRegistry
 
   logger.log(`Unregistering indexer ${cli.walletAddress}`)
@@ -52,11 +52,11 @@ export const serviceRegistryCommand = {
         command: 'unregister',
         describe: 'Unregister an indexer in the service registry',
         handler: async (argv: CLIArgs): Promise<void> => {
-          return unregister(await loadEnv(argv), argv)
+          return unregister(await loadEnv(argv))
         },
       })
   },
-  handler: (argv: CLIArgs): void => {
+  handler: (): void => {
     yargs.showHelp()
   },
 }