fix(FillUtils): verifyFillRepayment should check that repayment chain has pool rebalance route

src/clients/BundleDataClient/BundleDataClient.ts

@@ -355,11 +355,7 @@ export class BundleDataClient {
             fill,
             this.spokePoolClients[fill.destinationChainId].spokePool.provider,
             matchingDeposit,
-            // @dev: to get valid repayment chain ID's, get all chain IDs for the bundle block range and remove
-            // disabled block ranges.
-            this.clients.configStoreClient
-              .getChainIdIndicesForBlock(blockRanges[0][1])
-              .filter((_chainId, i) => !isChainDisabled(blockRanges[i]))
+            this.clients.hubPoolClient
           );
           if (!isDefined(validRepayment)) {
             return false;
@@ -919,7 +915,7 @@ export class BundleDataClient {
                     fill,
                     destinationClient.spokePool.provider,
                     v3RelayHashes[relayDataHash].deposits![0],
-                    allChainIds
+                    this.clients.hubPoolClient
                   );
                   if (!isDefined(fillToRefund)) {
                     bundleUnrepayableFillsV3.push(fill);
@@ -1013,7 +1009,7 @@ export class BundleDataClient {
                   fill,
                   destinationClient.spokePool.provider,
                   matchedDeposit,
-                  allChainIds
+                  this.clients.hubPoolClient
                 );
                 if (!isDefined(fillToRefund)) {
                   bundleUnrepayableFillsV3.push(fill);
@@ -1187,7 +1183,7 @@ export class BundleDataClient {
                 fill,
                 destinationClient.spokePool.provider,
                 v3RelayHashes[relayDataHash].deposits![0],
-                allChainIds
+                this.clients.hubPoolClient
               );
               if (!isDefined(fillToRefund)) {
                 bundleUnrepayableFillsV3.push(fill);
@@ -1241,7 +1237,7 @@ export class BundleDataClient {
                 prefill!,
                 destinationClient.spokePool.provider,
                 deposit,
-                allChainIds
+                this.clients.hubPoolClient
               );
               if (!isDefined(verifiedFill)) {
                 bundleUnrepayableFillsV3.push(prefill!);

src/clients/BundleDataClient/utils/FillUtils.ts

@@ -52,20 +52,11 @@ export function getRepaymentChainId(fill: Fill, matchedDeposit: Deposit): number
   return matchedDeposit.fromLiteChain ? fill.originChainId : fill.repaymentChainId;
 }
 
-export function isEvmRepaymentValid(
-  fill: Fill,
-  repaymentChainId: number,
-  possibleRepaymentChainIds: number[] = []
-): boolean {
+export function isEvmRepaymentValid(fill: Fill, repaymentChainId: number): boolean {
   // Slow fills don't result in repayments so they're always valid.
   if (isSlowFill(fill)) {
     return true;
   }
-  // Return undefined if the requested repayment chain ID is not in a passed in set of eligible chains. This can
-  // be used by the caller to narrow the chains to those that are not disabled in the config store.
-  if (possibleRepaymentChainIds.length > 0 && !possibleRepaymentChainIds.includes(repaymentChainId)) {
-    return false;
-  }
   return chainIsEvm(repaymentChainId) && isValidEvmAddress(fill.relayer);
 }
 
@@ -75,12 +66,24 @@ export async function verifyFillRepayment(
   _fill: FillWithBlock,
   destinationChainProvider: providers.Provider,
   matchedDeposit: DepositWithBlock,
-  possibleRepaymentChainIds: number[] = []
+  hubPoolClient: HubPoolClient
 ): Promise<FillWithBlock | undefined> {
   const fill = _.cloneDeep(_fill);
 
   const repaymentChainId = getRepaymentChainId(fill, matchedDeposit);
-  const validEvmRepayment = isEvmRepaymentValid(fill, repaymentChainId, possibleRepaymentChainIds);
+  const validEvmRepayment = isEvmRepaymentValid(fill, repaymentChainId);
+  try {
+    const l1TokenCounterpart = hubPoolClient.getL1TokenForL2TokenAtBlock(
+      fill.inputToken,
+      fill.originChainId,
+      matchedDeposit.quoteBlockNumber
+    );
+    hubPoolClient.getL2TokenForL1TokenAtBlock(l1TokenCounterpart, repaymentChainId, matchedDeposit.quoteBlockNumber);
+    // Repayment token could be found, this is a valid repayment chain.
+  } catch {
+    // Repayment token doesn't exist on repayment chain via PoolRebalanceRoutes, impossible to repay filler.
+    return undefined;
+  }
 
   // Case 1: Repayment chain is EVM and repayment address is valid EVM address.
   if (validEvmRepayment) {