Use loaded contracts in cli

Author: davekay100

scripts/cli/commands/contracts/curation.ts

@@ -11,23 +11,18 @@ export const mint = async (cli: CLIEnvironment, cliArgs: CLIArgs) => {
   const subgraphID = cliArgs.subgraphID
   const amount = parseGRT(cliArgs.amount)
 
-  const curationEntry = cli.addressBook.getEntry('Curation')
-  const graphTokenEntry = cli.addressBook.getEntry('GraphToken')
-
-  const curation = getContractAt('Curation', curationEntry.address).connect(cli.wallet)
-  const graphToken = getContractAt('GraphToken', graphTokenEntry.address).connect(cli.wallet)
+  const curation = cli.contracts.Curation
+  const graphToken = cli.contracts.GraphToken
 
   logger.log('First calling approve() to ensure curation contract can call transferFrom()...')
-  await sendTransaction(cli.wallet, graphToken, 'approve', ...[curationEntry.address, amount])
+  await sendTransaction(cli.wallet, graphToken, 'approve', ...[curation.address, amount])
   logger.log(`Signaling on ${subgraphID} with ${cliArgs.amount} tokens...`)
   await sendTransaction(cli.wallet, curation, 'mint', ...[subgraphID, amount])
 }
 export const burn = async (cli: CLIEnvironment, cliArgs: CLIArgs) => {
   const subgraphID = cliArgs.subgraphID
   const amount = parseGRT(cliArgs.amount)
-
-  const curationEntry = cli.addressBook.getEntry('Curation')
-  const curation = getContractAt('Curation', curationEntry.address).connect(cli.wallet)
+  const curation = cli.contracts.Curation
 
   logger.log(`Burning signal on ${subgraphID} with ${cliArgs.amount} tokens...`)
   await sendTransaction(cli.wallet, curation, 'burn', ...[subgraphID, amount])

scripts/cli/commands/contracts/service-registry.ts

@@ -8,16 +8,13 @@ const logger = consola.create({})
 export const register = async (cli: CLIEnvironment, cliArgs: CLIArgs) => {
   const url = cliArgs.url
   const geoHash = cliArgs.geoHash
-
-  const addressEntry = cli.addressBook.getEntry('ServiceRegistry')
-  const serviceRegistry = getContractAt('ServiceRegistry', addressEntry.address).connect(cli.wallet)
+  const serviceRegistry = cli.contracts.ServiceRegistry
 
   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) => {
-  const addressEntry = cli.addressBook.getEntry('ServiceRegistry')
-  const serviceRegistry = getContractAt('ServiceRegistry', addressEntry.address).connect(cli.wallet)
+  const serviceRegistry = cli.contracts.ServiceRegistry
 
   logger.log(`Unregistering indexer ${cli.walletAddress}`)
   await sendTransaction(cli.wallet, serviceRegistry, 'unregister')