Merge branch 'horizon' of github.com:graphprotocol/indexer into horizon

Author: tmigone

packages/indexer-agent/src/__tests__/indexer.ts

@@ -21,7 +21,6 @@ import {
   MultiNetworks,
   loadTestYamlConfig,
 } from '@graphprotocol/indexer-common'
-import { BigNumber } from 'ethers'
 import { Sequelize } from 'sequelize'
 
 const TEST_DISPUTE_1: POIDisputeAttributes = {
@@ -69,7 +68,7 @@ const TEST_DISPUTE_2: POIDisputeAttributes = {
 
 const POI_DISPUTES_CONVERTERS_FROM_GRAPHQL: Record<
   keyof POIDisputeAttributes,
-  (x: never) => string | BigNumber | number | undefined
+  (x: never) => string | bigint | number | undefined
 > = {
   allocationID: x => x,
   subgraphDeploymentID: x => x,

packages/indexer-agent/src/agent.ts

@@ -682,7 +682,8 @@ export class Agent {
               currentEpochNumber: number,
             ) =>
               currentEpochNumber -
-              network.specification.indexerOptions.poiDisputableEpochs,
+              (network.specification.indexerOptions
+                .poiDisputableEpochs as number),
           )
 
           // Find disputable allocations

packages/indexer-agent/src/commands/start.ts

@@ -31,7 +31,6 @@ import { createSyncingServer } from '../syncing-server'
 import { injectCommonStartupOptions } from './common-options'
 import pMap from 'p-map'
 import { NetworkSpecification } from '@graphprotocol/indexer-common/dist/network-specification'
-import { BigNumber } from 'ethers'
 import { displayZodParsingError } from '@graphprotocol/indexer-common'
 import { readFileSync } from 'fs'
 import { AgentConfigs } from '../types'
@@ -601,7 +600,7 @@ export async function run(
     defaults: {
       globalIndexingRule: {
         // TODO: Update this, there will be defaults per network
-        allocationAmount: BigNumber.from(100),
+        allocationAmount: BigInt(100),
         parallelAllocations: 1,
       },
     },

packages/indexer-cli/src/actions.ts

@@ -14,7 +14,7 @@ import {
 } from '@graphprotocol/indexer-common'
 import { validatePOI, validateRequiredParams } from './command-helpers'
 import gql from 'graphql-tag'
-import { utils } from 'ethers'
+import { hexlify } from 'ethers'
 import { parseGRT } from '@graphprotocol/common-ts'
 
 export interface GenericActionInputParams {
@@ -51,7 +51,7 @@ export async function buildActionInput(
     case ActionType.UNALLOCATE: {
       let poi = actionParams.param2
       if (poi == '0' || poi == '0x0') {
-        poi = utils.hexlify(Array(32).fill(0))
+        poi = hexlify(new Uint8Array(32).fill(0))
       }
       return {
         deploymentID: actionParams.targetDeployment,
@@ -69,7 +69,7 @@ export async function buildActionInput(
     case ActionType.REALLOCATE: {
       let poi = actionParams.param3
       if (poi == '0' || poi == '0x0') {
-        poi = utils.hexlify(Array(32).fill(0))
+        poi = hexlify(new Uint8Array(32).fill(0))
       }
       return {
         deploymentID: actionParams.targetDeployment,

packages/indexer-cli/src/allocations.ts

@@ -1,8 +1,7 @@
-import { SubgraphDeploymentID, formatGRT } from '@graphprotocol/common-ts'
+import { SubgraphDeploymentID, formatGRT, commify } from '@graphprotocol/common-ts'
 import yaml from 'yaml'
 import { GluegunPrint } from 'gluegun'
 import { table, getBorderCharacters } from 'table'
-import { BigNumber, utils } from 'ethers'
 import { OutputFormat, parseOutputFormat, pickFields } from './command-helpers'
 import { IndexerManagementClient } from '@graphprotocol/indexer-common'
 import gql from 'graphql-tag'
@@ -17,17 +16,17 @@ export interface IndexerAllocation {
   id: number
   indexer: string
   subgraphDeployment: string
-  allocatedTokens: BigNumber
-  signalledTokens: BigNumber
-  stakedTokens: BigNumber
+  allocatedTokens: bigint
+  signalledTokens: bigint
+  stakedTokens: bigint
   createdAtEpoch: number
   closedAtEpoch: number | null
   ageInEpochs: number
   closeDeadlineEpoch: number
   closeDeadlineBlocksRemaining: number
   closeDeadlineTimeRemaining: number
-  indexingRewards: BigNumber
-  queryFeesCollected: BigNumber
+  indexingRewards: bigint
+  queryFeesCollected: bigint
   status: string
   protocolNetwork: string
 }
@@ -41,17 +40,17 @@ const ALLOCATION_CONVERTERS_FROM_GRAPHQL: Record<
   indexer: x => x,
   subgraphDeployment: (d: SubgraphDeploymentID) =>
     typeof d === 'string' ? d : d.ipfsHash,
-  allocatedTokens: nullPassThrough((x: string) => BigNumber.from(x)),
-  signalledTokens: nullPassThrough((x: string) => BigNumber.from(x)),
-  stakedTokens: nullPassThrough((x: string) => BigNumber.from(x)),
+  allocatedTokens: nullPassThrough((x: string) => BigInt(x)),
+  signalledTokens: nullPassThrough((x: string) => BigInt(x)),
+  stakedTokens: nullPassThrough((x: string) => BigInt(x)),
   createdAtEpoch: nullPassThrough((x: string) => parseInt(x)),
   closedAtEpoch: nullPassThrough((x: string) => parseInt(x)),
   ageInEpochs: nullPassThrough((x: string) => parseInt(x)),
   closeDeadlineEpoch: nullPassThrough((x: string) => parseInt(x)),
   closeDeadlineBlocksRemaining: nullPassThrough((x: string) => parseInt(x)),
   closeDeadlineTimeRemaining: nullPassThrough((x: string) => parseInt(x)),
-  indexingRewards: nullPassThrough((x: string) => BigNumber.from(x)),
-  queryFeesCollected: nullPassThrough((x: string) => BigNumber.from(x)),
+  indexingRewards: nullPassThrough((x: string) => BigInt(x)),
+  queryFeesCollected: nullPassThrough((x: string) => BigInt(x)),
   status: x => x,
   protocolNetwork: x => x,
 }
@@ -64,17 +63,17 @@ const ALLOCATION_FORMATTERS: Record<
   indexer: nullPassThrough(x => x),
   subgraphDeployment: (d: SubgraphDeploymentID) =>
     typeof d === 'string' ? d : d.ipfsHash,
-  allocatedTokens: x => utils.commify(formatGRT(x)),
-  signalledTokens: x => utils.commify(formatGRT(x)),
-  stakedTokens: x => utils.commify(formatGRT(x)),
+  allocatedTokens: x => commify(formatGRT(x)),
+  signalledTokens: x => commify(formatGRT(x)),
+  stakedTokens: x => commify(formatGRT(x)),
   createdAtEpoch: x => x,
   closedAtEpoch: x => x,
   ageInEpochs: x => x,
   closeDeadlineEpoch: x => x,
   closeDeadlineBlocksRemaining: x => x,
   closeDeadlineTimeRemaining: x => x,
-  indexingRewards: x => utils.commify(formatGRT(x)),
-  queryFeesCollected: x => utils.commify(formatGRT(x)),
+  indexingRewards: x => commify(formatGRT(x)),
+  queryFeesCollected: x => commify(formatGRT(x)),
   status: x => x,
   protocolNetwork: resolveChainAlias,
 }
@@ -173,7 +172,7 @@ function nullPassThrough<T, U>(fn: (x: T) => U): (x: T | null) => U | null {
 export const createAllocation = async (
   client: IndexerManagementClient,
   deployment: string,
-  amount: BigNumber,
+  amount: bigint,
   indexNode: string | undefined,
   protocolNetwork: string,
 ): Promise<CreateAllocationResult> => {
@@ -265,7 +264,7 @@ export const reallocateAllocation = async (
   client: IndexerManagementClient,
   allocationID: string,
   poi: string | undefined,
-  amount: BigNumber,
+  amount: bigint,
   force: boolean,
   protocolNetwork: string,
 ): Promise<ReallocateAllocationResult> => {

packages/indexer-cli/src/command-helpers.ts

@@ -35,8 +35,8 @@ export enum OutputFormat {
 }
 import yaml from 'yaml'
 import { GluegunParameters, GluegunPrint } from 'gluegun'
-import { utils } from 'ethers'
 import { validateNetworkIdentifier } from '@graphprotocol/indexer-common'
+import { hexlify, isHexString } from 'ethers'
 
 export const fixParameters = (
   parameters: GluegunParameters,
@@ -159,13 +159,13 @@ export async function validateRequiredParams(
 export function validatePOI(poi: string | undefined): string | undefined {
   if (poi !== undefined) {
     if (typeof poi == 'number' && poi == 0) {
-      poi = utils.hexlify(Array(32).fill(0))
+      poi = hexlify(new Uint8Array(32).fill(0))
     }
     if (typeof poi == 'string' && poi == '0') {
-      poi = utils.hexlify(Array(32).fill(0))
+      poi = hexlify(new Uint8Array(32).fill(0))
     }
     // Ensure user provided POI is formatted properly - '0x...' (32 bytes)
-    const isHex = utils.isHexString(poi, 32)
+    const isHex = isHexString(poi, 32)
     if (!isHex) {
       throw new Error(
         `Invalid POI provided ('${poi}'): Must be a 32 byte length hex string`,

packages/indexer-cli/src/commands/indexer/allocations/create.ts

@@ -3,7 +3,6 @@ import chalk from 'chalk'
 
 import { loadValidatedConfig } from '../../../config'
 import { createIndexerManagementClient } from '../../../client'
-import { BigNumber } from 'ethers'
 import { createAllocation } from '../../../allocations'
 import {
   processIdentifier,
@@ -78,7 +77,7 @@ module.exports = {
           `Invalid 'deploymentID' provided (${deploymentID}), must be bytes32 or base58 formatted)`,
         )
       }
-      const allocationAmount = BigNumber.from(amount)
+      const allocationAmount = BigInt(amount)
 
       const config = loadValidatedConfig()
       const client = await createIndexerManagementClient({ url: config.api })

packages/indexer-cli/src/commands/indexer/allocations/get.ts

@@ -8,7 +8,7 @@ import gql from 'graphql-tag'
 import { SubgraphDeploymentID } from '@graphprotocol/common-ts'
 import { processIdentifier, SubgraphIdentifierType } from '@graphprotocol/indexer-common'
 import { IndexerAllocation, printIndexerAllocations } from '../../../allocations'
-import { utils } from 'ethers'
+import { isHexString } from 'ethers'
 
 const HELP = `
 ${chalk.bold('graph indexer allocations get')} [options]
@@ -59,7 +59,7 @@ module.exports = {
       }
 
       if (allocation) {
-        if (allocation !== 'all' && !utils.isHexString(allocation, 20)) {
+        if (allocation !== 'all' && !isHexString(allocation, 20)) {
           throw Error(
             `Invalid 'allocation-id' provided ('${allocation}'), must be a bytes20 string or 'all'`,
           )

packages/indexer-cli/src/commands/indexer/allocations/reallocate.ts

@@ -3,7 +3,6 @@ import chalk from 'chalk'
 
 import { loadValidatedConfig } from '../../../config'
 import { createIndexerManagementClient } from '../../../client'
-import { BigNumber } from 'ethers'
 import { reallocateAllocation } from '../../../allocations'
 import { printObjectOrArray, validatePOI } from '../../../command-helpers'
 
@@ -73,7 +72,7 @@ module.exports = {
 
     try {
       validatePOI(poi)
-      const allocationAmount = BigNumber.from(amount)
+      const allocationAmount = BigInt(amount)
       const config = loadValidatedConfig()
       const client = await createIndexerManagementClient({ url: config.api })
 

packages/indexer-cli/src/rules.ts

@@ -8,11 +8,12 @@ import {
   IndexingDecisionBasis,
   IndexingRuleIdentifier,
   resolveChainAlias,
+  commify,
 } from '@graphprotocol/indexer-common'
 import gql from 'graphql-tag'
 import yaml from 'yaml'
 import { table, getBorderCharacters } from 'table'
-import { BigNumber, utils } from 'ethers'
+
 import { OutputFormat, pickFields } from './command-helpers'
 import chalk from 'chalk'
 
@@ -47,15 +48,15 @@ const INDEXING_RULE_FORMATTERS: Record<
   //deployment: (d: SubgraphDeploymentIDIsh) => (typeof d === 'string' ? d : d.ipfsHash),
   identifier: x => x,
   identifierType: x => x,
-  allocationAmount: nullPassThrough(x => utils.commify(formatGRT(x))),
+  allocationAmount: nullPassThrough(x => commify(formatGRT(x))),
   allocationLifetime: nullPassThrough((x: number) => x.toString()),
   autoRenewal: x => x,
   parallelAllocations: nullPassThrough((x: number) => x.toString()),
-  maxSignal: nullPassThrough(x => utils.commify(formatGRT(x))),
-  minSignal: nullPassThrough(x => utils.commify(formatGRT(x))),
-  minStake: nullPassThrough(x => utils.commify(formatGRT(x))),
+  maxSignal: nullPassThrough(x => commify(formatGRT(x))),
+  minSignal: nullPassThrough(x => commify(formatGRT(x))),
+  minStake: nullPassThrough(x => commify(formatGRT(x))),
   maxAllocationPercentage: nullPassThrough((x: number) => x.toPrecision(2)),
-  minAverageQueryFees: nullPassThrough(x => utils.commify(formatGRT(x))),
+  minAverageQueryFees: nullPassThrough(x => commify(formatGRT(x))),
   decisionBasis: x => x,
   custom: nullPassThrough(JSON.stringify),
   requireSupported: x => x,
@@ -71,15 +72,15 @@ const INDEXING_RULE_CONVERTERS_FROM_GRAPHQL: Record<
   id: x => x,
   identifier: x => x,
   identifierType: x => x,
-  allocationAmount: nullPassThrough((x: string) => BigNumber.from(x)),
+  allocationAmount: nullPassThrough((x: string) => BigInt(x)),
   allocationLifetime: nullPassThrough((x: string) => parseInt(x)),
   autoRenewal: x => x,
   parallelAllocations: nullPassThrough((x: string) => parseInt(x)),
-  minSignal: nullPassThrough((x: string) => BigNumber.from(x)),
-  maxSignal: nullPassThrough((x: string) => BigNumber.from(x)),
-  minStake: nullPassThrough((x: string) => BigNumber.from(x)),
+  minSignal: nullPassThrough((x: string) => BigInt(x)),
+  maxSignal: nullPassThrough((x: string) => BigInt(x)),
+  minStake: nullPassThrough((x: string) => BigInt(x)),
   maxAllocationPercentage: nullPassThrough((x: string) => parseFloat(x)),
-  minAverageQueryFees: nullPassThrough((x: string) => BigNumber.from(x)),
+  minAverageQueryFees: nullPassThrough((x: string) => BigInt(x)),
   decisionBasis: x => x,
   custom: nullPassThrough(JSON.stringify),
   requireSupported: x => x,
@@ -95,15 +96,15 @@ const INDEXING_RULE_CONVERTERS_TO_GRAPHQL: Record<
   id: x => x,
   identifier: x => x,
   identifierType: x => x,
-  allocationAmount: nullPassThrough((x: BigNumber) => x.toString()),
+  allocationAmount: nullPassThrough((x: bigint) => x.toString()),
   allocationLifetime: nullPassThrough((x: number) => x),
   autoRenewal: x => x,
   parallelAllocations: nullPassThrough((x: number) => x),
-  minSignal: nullPassThrough((x: BigNumber) => x.toString()),
-  maxSignal: nullPassThrough((x: BigNumber) => x.toString()),
-  minStake: nullPassThrough((x: BigNumber) => x.toString()),
+  minSignal: nullPassThrough((x: bigint) => x.toString()),
+  maxSignal: nullPassThrough((x: bigint) => x.toString()),
+  minStake: nullPassThrough((x: bigint) => x.toString()),
   maxAllocationPercentage: nullPassThrough((x: number) => x),
-  minAverageQueryFees: nullPassThrough((x: BigNumber) => x.toString()),
+  minAverageQueryFees: nullPassThrough((x: bigint) => x.toString()),
   decisionBasis: x => x,
   custom: nullPassThrough(JSON.stringify),
   requireSupported: x => x,