indexer-cli, -common: allow latestBlock and chainHeadBlock to be null…

…able
graphprotocol · Aug 3, 2022 · d579000 · d579000
1 parent 0bdbcc4
commit d579000
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 22 deletions.
diff --git a/packages/indexer-cli/src/commands/indexer/status.ts b/packages/indexer-cli/src/commands/indexer/status.ts
@@ -273,8 +273,8 @@ module.exports = {
                   : '-',
                 node: deployment.node,
                 network: chain.network,
-                latestBlockNumber: chain.latestBlock.number,
-                chainHeadBlockNumber: chain.chainHeadBlock.number,
+                latestBlockNumber: chain.latestBlock?.number,
+                chainHeadBlockNumber: chain.chainHeadBlock?.number,
                 earliestBlockNumber: chain.earliestBlock?.number,
               })),
             ),

diff --git a/packages/indexer-common/src/indexer-management/__tests__/actions.ts b/packages/indexer-common/src/indexer-management/__tests__/actions.ts
@@ -135,7 +135,7 @@ const defaults: IndexerManagementDefaults = {
   },
 }
 
-const subgraphDeployment1 = 'QmbFK3kfmeNXyQ2zzvysAkduAFb68S7a6heaFxnJizSAqD'
+const subgraphDeployment1 = 'QmZsXh48bDVNVvrkweZRoGJrXbvbXzTE5M8ztZYc46dPRx'
 const subgraphDeployment2 = 'Qmav8jkmAeKBLyxmngJVwprN3ZsJA9A57jeoikdCU2Dyrv'
 const subgraphDeployment3 = 'Qmdpkd8yvD4XR3mQMZQmY5nqBQtjEac8gb8RoFFcWan7xE'
 const notPublishedSubgraphDeployment = 'QmeqJ6hsdyk9dVbo1tvRgAxWrVS3rkERiEMsxzPShKLco6'
@@ -245,7 +245,7 @@ const setup = async () => {
   })
   networkSubgraph = await NetworkSubgraph.create({
     logger,
-    endpoint: 'https://gateway.testnet.thegraph.com/network',
+    endpoint: 'https://gateway.thegraph.com/network',
     deployment: undefined,
   })
   transactionManager = new TransactionManager(
@@ -500,7 +500,7 @@ describe('Actions', () => {
       new CombinedError({
         graphQLErrors: [
           new GraphQLError(
-            'Failed to queue action: Invalid action input, actionInput: {"status":"queued","type":"reallocate","deploymentID":"QmbFK3kfmeNXyQ2zzvysAkduAFb68S7a6heaFxnJizSAqD","allocationID":"0x8f63930129e585c69482b56390a09b6b176f4a4c","force":false,"source":"indexerAgent","reason":"indexingRule","priority":0}',
+            'Failed to queue action: Invalid action input, actionInput: {"status":"queued","type":"reallocate","deploymentID":"QmZsXh48bDVNVvrkweZRoGJrXbvbXzTE5M8ztZYc46dPRx","allocationID":"0x8f63930129e585c69482b56390a09b6b176f4a4c","force":false,"source":"indexerAgent","reason":"indexingRule","priority":0}',
           ),
         ],
       }),
@@ -546,7 +546,7 @@ describe('Actions', () => {
       new CombinedError({
         graphQLErrors: [
           new GraphQLError(
-            `Duplicate action found in queue that effects 'QmbFK3kfmeNXyQ2zzvysAkduAFb68S7a6heaFxnJizSAqD' but NOT overwritten because it has a different source and/or status. If you ` +
+            `Duplicate action found in queue that effects 'QmZsXh48bDVNVvrkweZRoGJrXbvbXzTE5M8ztZYc46dPRx' but NOT overwritten because it has a different source and/or status. If you ` +
               `would like to replace the item currently in the queue please cancel it and then queue the proposed action`,
           ),
         ],

diff --git a/packages/indexer-common/src/indexer-management/client.ts b/packages/indexer-common/src/indexer-management/client.ts
@@ -278,8 +278,8 @@ const SCHEMA_SDL = gql`
 
   type ChainIndexingStatus {
     network: String!
-    latestBlock: BlockPointer!
-    chainHeadBlock: BlockPointer!
+    latestBlock: BlockPointer
+    chainHeadBlock: BlockPointer
     earliestBlock: BlockPointer
   }
 

diff --git a/packages/indexer-common/src/indexing-status.ts b/packages/indexer-common/src/indexing-status.ts
@@ -26,16 +26,17 @@ export const parseGraphQLChain = (chain: any): ChainIndexingStatus => ({
   network: chain.network,
   latestBlock: parseGraphQLBlockPointer(chain.latestBlock),
   chainHeadBlock: parseGraphQLBlockPointer(chain.chainHeadBlock),
-  earliestBlock: chain.earliestBlock
-    ? parseGraphQLBlockPointer(chain.earliestBlock)
-    : null,
+  earliestBlock: parseGraphQLBlockPointer(chain.earliestBlock),
 })
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const parseGraphQLBlockPointer = (block: any): BlockPointer => ({
-  number: +block.number,
-  hash: block.hash,
-})
+export const parseGraphQLBlockPointer = (block: any): BlockPointer | null =>
+  block
+    ? {
+        number: +block.number,
+        hash: block.hash,
+      }
+    : null
 
 export class IndexingStatusResolver {
   logger: Logger

diff --git a/packages/indexer-common/src/network-subgraph.ts b/packages/indexer-common/src/network-subgraph.ts
@@ -18,8 +18,8 @@ export interface NetworkSubgraphCreateOptions {
 interface DeploymentStatus {
   health: string
   synced: boolean
-  latestBlock?: BlockPointer
-  chainHeadBlock?: BlockPointer
+  latestBlock?: BlockPointer | null
+  chainHeadBlock?: BlockPointer | null
   fatalError?: IndexingError
 }
 
@@ -222,13 +222,13 @@ const monitorDeployment = async ({
       const status = {
         health: indexingStatus.health,
         synced: indexingStatus.synced,
-        latestBlock: indexingStatus.chains[0].latestBlock,
-        chainHeadBlock: indexingStatus.chains[0].chainHeadBlock,
+        latestBlock: indexingStatus.chains[0]?.latestBlock,
+        chainHeadBlock: indexingStatus.chains[0]?.chainHeadBlock,
         fatalError: indexingStatus.fatalError,
       }
 
       // If failed for the first time, log an error
-      if (!lastStatus.fatalError && status.fatalError) {
+      if (!lastStatus || (!lastStatus.fatalError && status.fatalError)) {
         logger.error(`Failed to index network subgraph deployment`, {
           err: status.fatalError,
           latestBlock: status.latestBlock,

diff --git a/packages/indexer-common/src/types.ts b/packages/indexer-common/src/types.ts
@@ -14,8 +14,8 @@ export interface BlockPointer {
 
 export interface EthereumIndexingStatus {
   network: string
-  latestBlock: BlockPointer
-  chainHeadBlock: BlockPointer
+  latestBlock: BlockPointer | null
+  chainHeadBlock: BlockPointer | null
   earliestBlock: BlockPointer | null
 }