From 82e4042054b40aba4639951652fc6a1199277bf2 Mon Sep 17 00:00:00 2001
From: Paul <108695806+pxrl@users.noreply.github.com>
Date: Fri, 27 Sep 2024 15:51:24 +0200
Subject: [PATCH] improve(relayer): Permit up to 120s for SpokePoolClient
 readiness (#1838)

The existing limit of 10 loops was somewhat imprecise and was too short.
as observed in production. This would occasionally trigger asserts in
the BundleDataClient because it requires all SpokePoolClient instances
to be updated. Instead, permit up to 60 seconds before proceeding.
---
 src/relayer/index.ts | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/relayer/index.ts b/src/relayer/index.ts
index da8413ee6..1c526c189 100644
--- a/src/relayer/index.ts
+++ b/src/relayer/index.ts
@@ -61,14 +61,19 @@ export async function runRelayer(_logger: winston.Logger, baseSigner: Signer): P
       const ready = await relayer.update();
       const activeRelayer = redis ? await redis.get(botIdentifier) : undefined;
 
-      // If there is another active relayer, allow up to 10 update cycles for this instance to be ready,
-      // then proceed unconditionally to protect against any RPC outages blocking the relayer.
-      if (!ready && activeRelayer && run < 10) {
-        const runTime = Math.round((performance.now() - tLoopStart) / 1000);
-        const delta = pollingDelay - runTime;
-        logger.debug({ at: "Relayer#run", message: `Not ready to relay, waiting ${delta} seconds.` });
-        await delay(delta);
-        continue;
+      // If there is another active relayer, allow up to 120 seconds for this instance to be ready.
+      // If this instance can't update, throw an error (for now).
+      if (!ready && activeRelayer) {
+        if (run * pollingDelay < 120) {
+          const runTime = Math.round((performance.now() - tLoopStart) / 1000);
+          const delta = pollingDelay - runTime;
+          logger.debug({ at: "Relayer#run", message: `Not ready to relay, waiting ${delta} seconds.` });
+          await delay(delta);
+          continue;
+        }
+
+        const badChains = Object.values(spokePoolClients).filter(({ isUpdated }) => !isUpdated);
+        throw new Error(`Unable to start relayer due to chains ${badChains}`);
       }
 
       // Signal to any existing relayer that a handover is underway, or alternatively