chore: fix deployments

Author: abarmat

cli/commands/migrate.ts

@@ -26,6 +26,7 @@ let allContracts = [
   'ServiceRegistry',
   'Curation',
   'SubgraphNFTDescriptor',
+  'SubgraphNFT',
   'GNS',
   'Staking',
   'RewardsManager',
@@ -58,6 +59,7 @@ export const migrate = async (cli: CLIEnvironment, cliArgs: CLIArgs): Promise<vo
   const deployContracts = contractName ? [contractName] : allContracts
   const pendingContractCalls = []
 
+  // Deploy contracts
   logger.info(`>>> Contracts deployment\n`)
   for (const name of deployContracts) {
     // Get address book info
@@ -80,7 +82,7 @@ export const migrate = async (cli: CLIEnvironment, cliArgs: CLIArgs): Promise<vo
     }
 
     // Get config and deploy contract
-    const contractConfig = getContractConfig(graphConfig, cli.addressBook, name)
+    const contractConfig = getContractConfig(graphConfig, cli.addressBook, name, cli)
     const deployFn = contractConfig.proxy ? deployContractWithProxyAndSave : deployContractAndSave
     const contract = await deployFn(
       name,
@@ -113,7 +115,7 @@ export const migrate = async (cli: CLIEnvironment, cliArgs: CLIArgs): Promise<vo
           cli.wallet,
           entry.contract,
           call.fn,
-          loadCallParams(call.params, cli.addressBook),
+          loadCallParams(call.params, cli.addressBook, cli),
         )
       }
       logger.info('')

cli/config.ts

@@ -2,6 +2,7 @@ import fs from 'fs'
 import YAML from 'yaml'
 
 import { AddressBook } from './address-book'
+import { CLIEnvironment } from './env'
 
 const ABRefMatcher = /\${{([A-Z]\w.+)}}/
 
@@ -14,9 +15,9 @@ interface ContractConfig {
   proxy: boolean
 }
 
-function parseConfigValue(value: string, addressBook: AddressBook) {
+function parseConfigValue(value: string, addressBook: AddressBook, cli: CLIEnvironment) {
   if (isAddressBookRef(value)) {
-    return parseAddressBookRef(addressBook, value)
+    return parseAddressBookRef(addressBook, value, cli)
   }
   return value
 }
@@ -25,9 +26,16 @@ function isAddressBookRef(value: string): boolean {
   return ABRefMatcher.test(value)
 }
 
-function parseAddressBookRef(addressBook: AddressBook, value: string): string {
+function parseAddressBookRef(addressBook: AddressBook, value: string, cli: CLIEnvironment): string {
   const ref: string = ABRefMatcher.exec(value as string)[1]
   const [contractName, contractAttr] = ref.split('.')
+  // This is a convention to use the inject CLI-env variables into the config
+  if (contractName === 'Env') {
+    if (contractAttr == 'deployer') {
+      return cli.walletAddress
+    }
+    throw new Error('Attribute not found in the CLI env')
+  }
   // eslint-disable-next-line  @typescript-eslint/no-explicit-any
   const entry = addressBook.getEntry(contractName) as { [key: string]: any }
   return entry[contractAttr]
@@ -42,14 +50,16 @@ export function readConfig(path: string): any {
 export function loadCallParams(
   values: Array<ContractCallParam>,
   addressBook: AddressBook,
+  cli: CLIEnvironment,
 ): Array<ContractCallParam> {
-  return values.map((value) => parseConfigValue(value as string, addressBook))
+  return values.map((value) => parseConfigValue(value as string, addressBook, cli))
 }
 
 export function getContractConfig(
   config: any,
   addressBook: AddressBook,
   name: string,
+  cli: CLIEnvironment,
 ): ContractConfig {
   const contractConfig = config.contracts[name] || {}
   const contractParams: Array<ContractParam> = []
@@ -62,7 +72,10 @@ export function getContractConfig(
     if (name.startsWith('init')) {
       const initList = Object.entries(contractConfig.init) as Array<Array<string>>
       for (const [initName, initValue] of initList) {
-        contractParams.push({ name: initName, value: parseConfigValue(initValue, addressBook) } as {
+        contractParams.push({
+          name: initName,
+          value: parseConfigValue(initValue, addressBook, cli),
+        } as {
           name: string
           value: string
         })

graph.config.yml

@@ -1,5 +1,5 @@
 general:
-  arbitrator: &arbitrator "0xE1FDD398329C6b74C14cf19100316f0826a492d3"
+  arbitrator: &arbitrator "0xE1FDD398329C6b74C14cf19100316f0826a492d3" # Arbitration Council
   governor: &governor "0x48301Fe520f72994d32eAd72E2B6A8447873CF50" # Graph Council
   authority: &authority "0x79fd74da4c906509862c8fe93e87a9602e370bc4" # Authority that signs payment vouchers
 
@@ -41,7 +41,7 @@ contracts:
       initialSupply: "10000000000000000000000000000" # 10,000,000,000 GRT
     calls:
       - fn: "addMinter"
-        minter: "${{RewardsManager.address}}"    
+        minter: "${{RewardsManager.address}}"
   Curation:
     proxy: true
     init:
@@ -65,9 +65,15 @@ contracts:
     init:
       controller: "${{Controller.address}}"
       bondingCurve: "${{BancorFormula.address}}"
-      tokenDescriptor: "${{SubgraphNFTDescriptor.address}}"
+      subgraphNFT: "${{SubgraphNFT.address}}"
     calls:
       - fn: "approveAll"
+  SubgraphNFT:
+    init:
+      governor: "${{Env.deployer}}"
+    calls:
+      - fn: "setTokenDescriptor"
+        tokenDescriptor: "${{SubgraphNFTDescriptor.address}}"
   Staking:
     proxy: true
     init:

test/curation/curation.test.ts

@@ -546,6 +546,8 @@ describe('Curation', () => {
     })
 
     it('should mint when using the edge case of linear function', async function () {
+      this.timeout(60000) // increase timeout for test runner
+
       // Setup edge case like linear function: 1 GRT = 1 GCS
       await curation.setMinimumCurationDeposit(toGRT('1'))
       await curation.setDefaultReserveRatio(1000000)