add retries for hl specific error

Author: tmcgroul

evm/evm-rpc/src/data-source/get-blocks.ts

@@ -32,17 +32,20 @@ export async function getBlocks(
     let blocks = await rpc.getBlockBatch(numbers, req)
 
     let retries = 0
-    let invalid = blocks.find(b => b._isInvalid)
-    while (invalid != null) {
-        await wait(100)
-
-        if (retries == 5) {
-            throw new Error(invalid._errorMessage)
+    while (true) {
+        let invalid = blocks.find(b => b == null || b._isInvalid)
+
+        if (invalid) {
+            if (retries == 5) {
+                throw new Error(invalid._errorMessage)
+            } else {
+                await wait(100)
+
+                await requestInvalidBlocks(rpc, req, blocks)
+                retries += 1
+            }
+        } else {
+            return blocks
         }
-
-        await requestInvalidBlocks(rpc, req, blocks)
-        retries += 1
     }
-
-    return blocks
 }

evm/evm-rpc/src/rpc.ts

@@ -1,5 +1,5 @@
 import {Logger, createLogger} from '@subsquid/logger'
-import {CallOptions, RpcClient, RpcError, RpcProtocolError} from '@subsquid/rpc-client'
+import {CallOptions, RetryError, RpcClient, RpcError, RpcProtocolError} from '@subsquid/rpc-client'
 import {
     array,
     BYTES,
@@ -132,7 +132,7 @@ export class Rpc {
             validateResult: getResultValidator(nullable(GetBlock)),
             validateError: info => {
                 if (info.message.includes('cannot query unfinalized data')) return null // Avalanche
-                if (info.message.includes('invalid block height')) return null // Hyperliquid
+                if (info.message.includes('invalid block height')) throw new RetryError() // Hyperliquid
                 throw new RpcError(info)
             }
         })
@@ -278,7 +278,11 @@ export class Rpc {
         }))
 
         let results = await this.reduceBatchOnRetry(call, {
-            validateResult: getResultValidator(nullable(array(Receipt)))
+            validateResult: getResultValidator(nullable(array(Receipt))),
+            validateError: info => {
+                if (info.message.includes('invalid block height')) throw new RetryError() // Hyperliquid
+                throw new RpcError(info)
+            }
         })
 
         let utils = await this.getChainUtils()