CLI cleanup and fixes (#467)

Removes unused commands from the CLI. 
Fixes the CLI workflow.
Update Typechain imports locations.

Author: abarmat

.github/workflows/npmtest.yml

@@ -1,13 +1,10 @@
-# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
-
 name: Node.js CI
 
 on:
   push:
-    branches: [master]
+    branches: [dev]
   pull_request:
-    branches: [master]
+    branches: [dev]
 
 jobs:
   build:

DEPLOYMENT.md

@@ -106,4 +106,4 @@ Some contracts require the address from previously deployed contracts. For that
 3. Update the `package.json` and `package-lock.json` files with the new package version and publish a new npm package with `npm publish`. You can dry-run the files to be uploaded by running `npm publish --dry-run`.
 4. Merge this update into master, branch off and save for whatever version of the testnet is going on, and then tag this on the github repo, pointing to your branch (ex. at `testnet-phase-1` branch). This way we can always get the contract code for testnet, while continuing to do work on mainnet.
 5. Pull the updated package into the subgraph, and other apps that depend on the package.json.
-6. Send tokens to the whole team with `./cli/cli.ts transferTeamTokens --amount 10000000`
+6. Send tokens to the whole team using `./cli/cli.ts airdrop`

addresses.json

@@ -259,18 +259,6 @@
         "runtimeCodeHash": "0x126ff82d91cc4a00987d757db8d244edafb91507197b052441dcc94230e4b6ce",
         "txHash": "0x3df6cec81fa4ebed4c7c4575c3cb645378f89ff38fcd547307d9a26820579617"
       }
-    },
-    "GRTAssetHolder": {
-      "address": "0x0000000000000000000000000000000000000000",
-      "creationCodeHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-      "runtimeCodeHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-      "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
-    },
-    "AttestationApp": {
-      "address": "0x0000000000000000000000000000000000000000",
-      "creationCodeHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-      "runtimeCodeHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-      "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
     }
   },
   "4": {
@@ -533,32 +521,6 @@
       "creationCodeHash": "0x26a6f47e71ad242e264768571ce7223bf5a86fd0113ab6cb8200f65820232904",
       "runtimeCodeHash": "0xd5330527cfb09df657adc879d8ad704ce6b8d5917265cabbd3eb073d1399f122",
       "txHash": "0xca463b34d7967c4351d24b2af779817bd1da75e53a48957cfa32abd1ebf3a56c"
-    },
-    "GRTAssetHolder": {
-      "address": "0x94896da4a6608b4C9C9F287873cc607BaC204804",
-      "constructorArgs": [
-        {
-          "name": "adjudicatorAddress",
-          "value": "0x94Fca2E2F57B25b2D9eA5d4FCEd6c5d8d9ad3172"
-        },
-        {
-          "name": "tokenAddress",
-          "value": "0x31958e219073d60FDCeb1d608c293754331dd352"
-        },
-        {
-          "name": "controllerAddress",
-          "value": "0x542919Faf1Ed3716fCF31c47dF98D6208EA50569"
-        }
-      ],
-      "creationCodeHash": "0xd912c1d3be60f8d4d3fb29cd203c926639a6b8546612953a33cf6810989cee59",
-      "runtimeCodeHash": "0xdd3f9efcf92f1cf52471d8f4442649ce8a8315a3a4a554a49221f0dae16fca45",
-      "txHash": "0x76641360856c3097b62773e942d194b0d3880f2cb56e192e141d8b03dbafac6d"
-    },
-    "AttestationApp": {
-      "address": "0x02cbecbEE7Ad3f74d95b50755C26a16534F53C1A",
-      "creationCodeHash": "0x9c31294194a6e9768a6da9af195b293dbc589e98ef88ebfd81156487e61d87f3",
-      "runtimeCodeHash": "0xb0e364454528b8dcf5876bdb1ac15e6efb46d97d10583b4746bcf54cee3783a0",
-      "txHash": "0x5f58737c9a39e766142148cae55d49abf9bcd04427e9f450183e841f74136ac4"
     }
   }
 }

cli/README.md

@@ -47,6 +47,6 @@ Under the `commands/` there is one file per general command and a folder called
     - `deploy.ts` - helper to deploy a single contract.
     - `migrate.ts` - helper to migrate all contracts for a new network on chain.
     - `protocol.ts` - list, set or get any protocol parameter on any contract.
-    - `transferTeamTokens.ts` - mint tokens for the whole team for testing purposes.
+    - `airdrop.ts` - distribute tokens to multiple addresses.
     - `verify.ts` - verify a contract is on chain.
     - `upgrade.ts` - helper to upgrade a proxy to use a new implementation.

cli/cli.ts

@@ -5,10 +5,8 @@ import yargs from 'yargs'
 import { deployCommand } from './commands/deploy'
 import { migrateCommand } from './commands/migrate'
 import { proxyCommand } from './commands/proxy'
-import { verifyCommand } from './commands/verify'
 import { protocolCommand } from './commands/protocol'
 import { contractsCommand } from './commands/contracts'
-import { transferTeamTokensCommand } from './commands/transferTeamTokens'
 import { simulationCommand } from './commands/simulations'
 import { airdropCommand } from './commands/airdrop'
 
@@ -25,10 +23,8 @@ yargs
   .command(deployCommand)
   .command(migrateCommand)
   .command(proxyCommand)
-  .command(verifyCommand)
   .command(protocolCommand)
   .command(contractsCommand)
-  .command(transferTeamTokensCommand)
   .command(simulationCommand)
   .command(airdropCommand)
   .demandCommand(1, 'Choose a command from the above list')

cli/commands/airdrop.ts

@@ -8,11 +8,10 @@ import { parseGRT, formatGRT } from '@graphprotocol/common-ts'
 import { utils, BigNumber, Contract } from 'ethers'
 import { NonceManager } from '@ethersproject/experimental'
 
+import { logger } from '../logging'
 import { sendTransaction } from '../network'
 import { loadEnv, CLIArgs, CLIEnvironment } from '../env'
 
-const logger = consola.create({})
-
 const { getAddress } = utils
 
 const DISPERSE_CONTRACT_ADDRESS = {
@@ -76,7 +75,7 @@ const sure = async (message = 'Are you sure?'): Promise<boolean> => {
     message,
   })
   if (!res.confirm) {
-    consola.success('Cancelled')
+    logger.success('Cancelled')
     return false
   }
   return true

cli/commands/contracts/any.ts

@@ -1,12 +1,10 @@
-import consola from 'consola'
 import yargs, { Argv } from 'yargs'
 import { ContractFunction } from 'ethers'
 
+import { logger } from '../../logging'
 import { getContractAt, sendTransaction } from '../../network'
 import { loadEnv, CLIArgs, CLIEnvironment } from '../../env'
 
-const logger = consola.create({})
-
 export const any = async (cli: CLIEnvironment, cliArgs: CLIArgs): Promise<void> => {
   const contract = cliArgs.contract
   const func = cliArgs.func

cli/commands/contracts/curation.ts

@@ -1,12 +1,10 @@
-import consola from 'consola'
 import yargs, { Argv } from 'yargs'
 import { parseGRT } from '@graphprotocol/common-ts'
 
+import { logger } from '../../logging'
 import { sendTransaction } from '../../network'
 import { loadEnv, CLIArgs, CLIEnvironment } from '../../env'
 
-const logger = consola.create({})
-
 export const mint = async (cli: CLIEnvironment, cliArgs: CLIArgs): Promise<void> => {
   const subgraphID = cliArgs.subgraphID
   const amount = parseGRT(cliArgs.amount)

cli/commands/contracts/disputeManager.ts

@@ -1,8 +1,8 @@
-import consola from 'consola'
 import yargs, { Argv } from 'yargs'
 import { constants, utils, Wallet } from 'ethers'
 import { createAttestation, Attestation, Receipt } from '@graphprotocol/common-ts'
 
+import { logger } from '../../logging'
 import { sendTransaction, getChainID, getProvider, toGRT, randomHexBytes } from '../../network'
 import { loadEnv, CLIArgs, CLIEnvironment } from '../../env'
 
@@ -15,8 +15,6 @@ interface ChannelKey {
   address: string
 }
 
-const logger = consola.create({})
-
 async function buildAttestation(receipt: Receipt, signer: string, disputeManagerAddress: string) {
   const attestation = await createAttestation(signer, getChainID(), disputeManagerAddress, receipt)
   return attestation

cli/commands/contracts/ens.ts

@@ -1,11 +1,10 @@
-import consola from 'consola'
 import yargs, { Argv } from 'yargs'
 import { utils } from 'ethers'
 
 import { sendTransaction } from '../../network'
 import { loadEnv, CLIArgs, CLIEnvironment } from '../../env'
+import { logger } from '../../logging'
 
-const logger = consola.create({})
 export const registerTestName = async (cli: CLIEnvironment, cliArgs: CLIArgs): Promise<void> => {
   const name = cliArgs.name
   const testRegistrar = cli.contracts.ITestRegistrar