Update cli curation scripts

Author: davekay100

cli/commands/simulations/curatorSimulation.ts

@@ -56,8 +56,8 @@ const curateOnSubgraphs = async (
   for (let i = 0; i < txData.length; i++) {
     const subgraph = txData[i]
     const graphAccount = cli.walletAddress
-    const signal = subgraph.signal.replace(/"/g, '')
-    const tokens = parseGRT(signal)
+    const tokens = parseGRT(subgraph.signal)
+    const minNSignal = parseGRT(`0`)
     const gns = cli.contracts.GNS
 
     logger.log(`Minting nSignal for ${graphAccount}-${firstSubgraphNumber}...`)
@@ -66,12 +66,19 @@ const curateOnSubgraphs = async (
       graphAccount,
       firstSubgraphNumber,
       tokens,
+      minNSignal,
     ])
     firstSubgraphNumber++
   }
 }
 
-const createAndSignal = async (cli: CLIEnvironment, cliArgs: CLIArgs): Promise<void> => {
+const create = async (cli: CLIEnvironment, cliArgs: CLIArgs): Promise<void> => {
+  const txData = parseCreateSubgraphsCSV(__dirname + cliArgs.path)
+  logger.log(`Running create for ${txData.length} subgraphs`)
+  await createSubgraphs(cli, txData)
+}
+
+const signal = async (cli: CLIEnvironment, cliArgs: CLIArgs): Promise<void> => {
   // First approve the GNS
   const maxUint = '115792089237316195423570985008687907853269984665640564039457584007913129639935'
   const gnsAddr = cli.contracts.GNS.address
@@ -81,8 +88,7 @@ const createAndSignal = async (cli: CLIEnvironment, cliArgs: CLIArgs): Promise<v
   await sendTransaction(cli.wallet, graphToken, 'approve', [gnsAddr, maxUint])
 
   const txData = parseCreateSubgraphsCSV(__dirname + cliArgs.path)
-  logger.log(`Running createAndSignal for ${txData.length} subgraphs`)
-  await createSubgraphs(cli, txData)
+  logger.log(`Running signal for ${txData.length} subgraphs`)
   await curateOnSubgraphs(cli, txData, cliArgs.firstSubgraphNumber)
 }
 
@@ -102,7 +108,7 @@ const unsignal = async (cli: CLIEnvironment, cliArgs: CLIArgs): Promise<void> =>
     const account = txData[i].account
     const subgraphNumber = txData[i].subgraphNumber
     logger.log(`Burning ${formatGRT(burnAmount)} nSignal for ${account}-${subgraphNumber}...`)
-    await sendTransaction(cli.wallet, gns, 'burnNSignal', [account, subgraphNumber, burnAmount])
+    await sendTransaction(cli.wallet, gns, 'burnNSignal', [account, subgraphNumber, burnAmount, 0])
   }
 }
 export const curatorSimulationCommand = {
@@ -111,8 +117,23 @@ export const curatorSimulationCommand = {
   builder: (yargs: Argv): yargs.Argv => {
     return yargs
       .command({
-        command: 'createAndSignal',
+        command: 'create',
         describe: 'Create and signal on subgraphs by reading data from a csv file',
+        builder: (yargs: Argv) => {
+          return yargs.option('path', {
+            description: 'Path of the csv file relative to this folder',
+            type: 'string',
+            requiresArg: true,
+            demandOption: true,
+          })
+        },
+        handler: async (argv: CLIArgs): Promise<void> => {
+          return create(await loadEnv(argv), argv)
+        },
+      })
+      .command({
+        command: 'signal',
+        describe: 'Signal on a bunch of subgraphs by reading data from a CSV',
         builder: (yargs: Argv) => {
           return yargs
             .option('path', {
@@ -129,7 +150,7 @@ export const curatorSimulationCommand = {
             })
         },
         handler: async (argv: CLIArgs): Promise<void> => {
-          return createAndSignal(await loadEnv(argv), argv)
+          return signal(await loadEnv(argv), argv)
         },
       })
       .command({

cli/defaults.ts

@@ -9,8 +9,8 @@ export const local = {
   accountNumber: '0',
 }
 export const defaultOverrides: Overrides = {
-  // gasPrice: utils.parseUnits('25', 'gwei'), // auto
-  // gasLimit: 2000000, // auto
+  gasPrice: utils.parseUnits('25', 'gwei'), // auto
+  gasLimit: 2000000, // auto
 }
 
 export const cliOpts = {