Merge pull request #910 from graphprotocol/pcv/graphgovernance-cleanup

fix: remove remaining usage of the removed GraphGovernance contract

Author: pcarranzav

packages/contracts/cli/commands/contracts/governance.ts

@@ -7,7 +7,6 @@ import { gnsCommand } from './gns'
 import { graphTokenCommand } from './graphToken'
 import { stakingCommand } from './staking'
 import { anyCommand } from './any'
-import { governanceCommand } from './governance'
 
 import { disputeManagerCommand } from './disputeManager'
 
@@ -24,7 +23,6 @@ export const contractsCommand = {
       .command(stakingCommand)
       .command(anyCommand)
       .command(disputeManagerCommand)
-      .command(governanceCommand)
   },
   handler: (): void => {
     yargs.showHelp()

packages/contracts/cli/commands/contracts/index.ts

@@ -31,7 +31,6 @@ import { GraphToken } from '../build/types/GraphToken'
 import { Controller } from '../build/types/Controller'
 import { BancorFormula } from '../build/types/BancorFormula'
 import { IENS } from '../build/types/IENS'
-import { GraphGovernance } from '../build/types/GraphGovernance'
 import { AllocationExchange } from '../build/types/AllocationExchange'
 import { SubgraphNFT } from '../build/types/SubgraphNFT'
 import { GraphCurationToken } from '../build/types/GraphCurationToken'
@@ -60,7 +59,6 @@ export interface NetworkContracts {
   Controller: Controller
   BancorFormula: BancorFormula
   IENS: IENS
-  GraphGovernance: GraphGovernance
   AllocationExchange: AllocationExchange
   SubgraphNFT: SubgraphNFT
   SubgraphNFTDescriptor: SubgraphNFTDescriptor

packages/contracts/cli/contracts.ts

@@ -35,7 +35,7 @@ describe('Open allocations', () => {
   })
 
   describe('Allocations', () => {
-    it(`allocatons should be open`, async function () {
+    it(`allocations should be open`, async function () {
       const allocations = indexerFixtures.map((i) => i.allocations).flat()
       for (const allocation of allocations) {
         const state = await Staking.getAllocationState(allocation.signer.address)

packages/contracts/e2e/scenarios/open-allocations.test.ts

@@ -8,7 +8,6 @@ echo "Cleaning flattened contracts..."
 
 FLATTENED_FILES=(
     "$OUT_DIR/Controller.sol"
-    "$OUT_DIR/GraphGovernance.sol"
     "$OUT_DIR/GNS.sol"
     "$OUT_DIR/ServiceRegistry.sol"
     "$OUT_DIR/Curation.sol"
@@ -27,4 +26,4 @@ for path in ${FLATTENED_FILES[@]}; do
         -e "s|// SPDX-License-Identifier:.*||g" \
         -e 's|pragma abicoder v2;|//pragma abicoder v2;|g' \
         -e '1s|^|pragma abicoder v2;\n|' $path
-done
+done

packages/contracts/scripts/clean

@@ -8,7 +8,6 @@ echo "Flattening contracts..."
 
 FILES=(
     "contracts/governance/Controller.sol"
-    "contracts/governance/GraphGovernance.sol"
     "contracts/discovery/GNS.sol"
     "contracts/discovery/ServiceRegistry.sol"
     "contracts/curation/Curation.sol"

packages/contracts/scripts/flatten

@@ -48,13 +48,18 @@ export const allocateFrom: GraphNetworkAction<{
   const metadata = ethers.constants.HashZero
 
   console.log(`\nAllocating ${amount} tokens on ${allocationId}...`)
+  let extraArgs: ethers.Overrides = {}
+  if (process.env.CI) {
+    extraArgs.gasLimit = BigNumber.from('400000')
+  }
   const tx = await contracts.Staking.connect(indexer).allocateFrom(
     indexer.address,
     subgraphDeploymentID,
     amount,
     allocationId,
     metadata,
     proof,
+    extraArgs
   )
   await tx.wait()
 }