[filler]: retry http calls before returning execution result (#242)

* [filler]: retry http calls before returning execution result

* bump

Author: royvardhan

packages/filler/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@hyperbridge/filler",
-	"version": "0.1.10",
+	"version": "0.1.11",
 	"description": "IntentGateway filler package for hyperbridge",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",

packages/filler/src/core/event-monitor.ts

@@ -1,5 +1,5 @@
 import { EventEmitter } from "events"
-import { ChainConfig, Order, orderCommitment, hexToString, DecodedOrderPlacedLog } from "@hyperbridge/sdk"
+import { ChainConfig, Order, orderCommitment, hexToString, DecodedOrderPlacedLog, retryPromise } from "@hyperbridge/sdk"
 import { INTENT_GATEWAY_ABI } from "@/config/abis/IntentGateway"
 import { PublicClient } from "viem"
 import { ChainClientManager } from "@/services"
@@ -41,7 +41,11 @@ export class EventMonitor extends EventEmitter {
 				)
 				const intentGatewayAddress = this.configService.getIntentGatewayAddress(`EVM-${chainId}`)
 
-				const startBlock = await client.getBlockNumber()
+				const startBlock = await retryPromise(() => client.getBlockNumber(), {
+					maxRetries: 3,
+					backoffMs: 250,
+					logMessage: "Failed to get start block number",
+				})
 				this.lastScannedBlock.set(chainId, startBlock - 1n)
 
 				this.logger.info({ chainId, startBlock }, "Initializing block scanner")
@@ -51,7 +55,6 @@ export class EventMonitor extends EventEmitter {
 					if (!mutex) return
 
 					if (mutex.isLocked()) {
-						this.logger.warn({ chainId }, "Waiting for previous scan to complete")
 						return
 					}
 
@@ -82,7 +85,11 @@ export class EventMonitor extends EventEmitter {
 		const lastScanned = this.lastScannedBlock.get(chainId)
 		if (!lastScanned) return
 
-		const currentBlock = await client.getBlockNumber()
+		const currentBlock = await retryPromise(() => client.getBlockNumber(), {
+			maxRetries: 3,
+			backoffMs: 250,
+			logMessage: "Failed to get current block number",
+		})
 
 		if (currentBlock > lastScanned) {
 			const fromBlock = lastScanned + 1n
@@ -96,12 +103,20 @@ export class EventMonitor extends EventEmitter {
 				"Scanning blocks",
 			)
 
-			const logs = await client.getLogs({
-				address: intentGatewayAddress,
-				event: orderPlacedEvent,
-				fromBlock,
-				toBlock: actualToBlock,
-			})
+			const logs = await retryPromise(
+				() =>
+					client.getLogs({
+						address: intentGatewayAddress,
+						event: orderPlacedEvent,
+						fromBlock,
+						toBlock: actualToBlock,
+					}),
+				{
+					maxRetries: 3,
+					backoffMs: 250,
+					logMessage: "Failed to get logs for block scan",
+				},
+			)
 
 			if (logs.length > 0) {
 				this.logger.info(

packages/filler/src/core/filler.ts

@@ -1,4 +1,4 @@
-import { chainIds } from "@hyperbridge/sdk"
+import { chainIds, retryPromise } from "@hyperbridge/sdk"
 import { EventMonitor } from "./event-monitor"
 import { FillerStrategy } from "@/strategies/base"
 import { Order, FillerConfig, ChainConfig, DUMMY_PRIVATE_KEY, ADDRESS_ZERO, bytes20ToBytes32 } from "@hyperbridge/sdk"
@@ -86,9 +86,17 @@ export class IntentFiller {
 			try {
 				const sourceClient = this.chainClientManager.getPublicClient(order.sourceChain)
 				const orderValue = await this.contractService.getTokenUsdValue(order)
-				let currentConfirmations = await sourceClient.getTransactionConfirmations({
-					hash: order.transactionHash!,
-				})
+				let currentConfirmations = await retryPromise(
+					() =>
+						sourceClient.getTransactionConfirmations({
+							hash: order.transactionHash!,
+						}),
+					{
+						maxRetries: 3,
+						backoffMs: 250,
+						logMessage: "Failed to get initial transaction confirmations",
+					},
+				)
 				const requiredConfirmations = this.config.confirmationPolicy.getConfirmationBlocks(
 					chainIds[order.sourceChain as keyof typeof chainIds],
 					orderValue.inputUsdValue.toNumber(),
@@ -100,9 +108,17 @@ export class IntentFiller {
 
 				while (currentConfirmations < requiredConfirmations) {
 					await new Promise((resolve) => setTimeout(resolve, 300)) // Wait 300ms
-					currentConfirmations = await sourceClient.getTransactionConfirmations({
-						hash: order.transactionHash!,
-					})
+					currentConfirmations = await retryPromise(
+						() =>
+							sourceClient.getTransactionConfirmations({
+								hash: order.transactionHash!,
+							}),
+						{
+							maxRetries: 3,
+							backoffMs: 250,
+							logMessage: "Failed to get transaction confirmations",
+						},
+					)
 					this.logger.debug({ orderId: order.id, currentConfirmations }, "Order confirmation progress")
 				}