@across-protocol/sdk 4.1.43 → 4.1.45-beta.0

package/dist/types/utils/common.d.ts

@@ -1,10 +1,12 @@
 import Decimal from "decimal.js";
+import bs58 from "bs58";
 import { ethers } from "ethers";
 import { BigNumber, BigNumberish, BN } from "./BigNumberUtils";
 export type Decimalish = string | number | Decimal;
 export declare const AddressZero = "0x0000000000000000000000000000000000000000";
 export declare const MAX_BIG_INT: ethers.BigNumber;
 export declare const keccak256: typeof ethers.utils.keccak256;
+export { bs58 };
 /**
  * toBNWei.
  *

package/dist/types/utils/common.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/utils/common.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE,EAAiC,MAAM,kBAAkB,CAAC;AAG9F,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;AACnD,eAAO,MAAM,WAAW,+CAA+B,CAAC;AACxD,eAAO,MAAM,WAAW,kBAAqD,CAAC;AAE9E,eAAO,MAAQ,SAAS,+BAAiB,CAAC;AAE1C;;;;;;GAMG;AACH,eAAO,MAAM,OAAO,QAAS,YAAY,aAAa,MAAM,KAAG,EAA0C,CAAC;AAE1G;;;;;;GAMG;AACH,eAAO,MAAM,OAAO,QAAS,YAAY,aAAa,MAAM,KAAG,MAA+C,CAAC;AAE/G;;;;;;GAMG;AACH,wBAAgB,GAAG,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,YAAY,GAAG,EAAE,CAIxD;AACD;;;;;;GAMG;AACH,wBAAgB,GAAG,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,YAAY,GAAG,EAAE,CAIxD;AAED,eAAO,MAAM,oBAAoB,kBAAe,CAAC;AAEjD;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAC3B,UAAU,EAAE,YAAY,EACxB,KAAK,GAAE,MAAM,GAAG,MAAU,EAC1B,UAAU,SAAK,EACf,cAAc,SAAK,GAClB,MAAM,CAIR;AAED;;;;;;GAMG;AACH,eAAO,MAAM,OAAO,QAAS,YAAY,YAAY,YAAY,KAAG,SAEnE,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,YAAY,EACtB,KAAK,GAAE,MAAM,GAAG,MAAU,EAC1B,QAAQ,SAAK,GACZ,MAAM,CAGR;AAED;;;;;;GAMG;AACH,wBAAgB,OAAO,CAAC,SAAS,EAAE,YAAY,EAAE,WAAW,EAAE,YAAY,GAAG,EAAE,CAE9E;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,8BAA8B,gBAC5B,UAAU,aACZ,UAAU,kBACL,UAAU,kBACV,UAAU,KACzB,MAGF,CAAC;AACF;;;;;;;;GAQG;AACH,eAAO,MAAM,4BAA4B,gBAC1B,UAAU,aACZ,UAAU,kBACL,UAAU,kBACV,UAAU,KACzB,MAaF,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,OAAO,gBACL,UAAU,aACZ,UAAU,kBACL,UAAU,kBACV,UAAU,KACzB,MAEF,CAAC;AACF;;;;;;;GAOG;AACH,eAAO,MAAM,iBAAiB,QAAS,MAAM,OAAO,MAAM,QAAQ,MAAM,eAYvE,CAAC;AAEF;;;GAGG;AACH,wBAAgB,KAAK,CAAC,OAAO,EAAE,MAAM,oBAEpC;AAED;;;;;;GAMG;AACH,wBAAgB,KAAK,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAQ1F;AAED,MAAM,MAAM,uBAAuB,GAAG;IACpC,aAAa,EAAE,SAAS,CAAC;IACzB,YAAY,EAAE,SAAS,CAAC;IACxB,QAAQ,EAAE,SAAS,CAAC;IACpB,gBAAgB,CAAC,EAAE,SAAS,CAAC;CAC9B,CAAC;AAEF,wBAAgB,aAAa,WAE5B"}
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/utils/common.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE,EAAiC,MAAM,kBAAkB,CAAC;AAG9F,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;AACnD,eAAO,MAAM,WAAW,+CAA+B,CAAC;AACxD,eAAO,MAAM,WAAW,kBAAqD,CAAC;AAE9E,eAAO,MAAQ,SAAS,+BAAiB,CAAC;AAC1C,OAAO,EAAE,IAAI,EAAE,CAAC;AAEhB;;;;;;GAMG;AACH,eAAO,MAAM,OAAO,QAAS,YAAY,aAAa,MAAM,KAAG,EAA0C,CAAC;AAE1G;;;;;;GAMG;AACH,eAAO,MAAM,OAAO,QAAS,YAAY,aAAa,MAAM,KAAG,MAA+C,CAAC;AAE/G;;;;;;GAMG;AACH,wBAAgB,GAAG,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,YAAY,GAAG,EAAE,CAIxD;AACD;;;;;;GAMG;AACH,wBAAgB,GAAG,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,YAAY,GAAG,EAAE,CAIxD;AAED,eAAO,MAAM,oBAAoB,kBAAe,CAAC;AAEjD;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAC3B,UAAU,EAAE,YAAY,EACxB,KAAK,GAAE,MAAM,GAAG,MAAU,EAC1B,UAAU,SAAK,EACf,cAAc,SAAK,GAClB,MAAM,CAIR;AAED;;;;;;GAMG;AACH,eAAO,MAAM,OAAO,QAAS,YAAY,YAAY,YAAY,KAAG,SAEnE,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,YAAY,EACtB,KAAK,GAAE,MAAM,GAAG,MAAU,EAC1B,QAAQ,SAAK,GACZ,MAAM,CAGR;AAED;;;;;;GAMG;AACH,wBAAgB,OAAO,CAAC,SAAS,EAAE,YAAY,EAAE,WAAW,EAAE,YAAY,GAAG,EAAE,CAE9E;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,8BAA8B,gBAC5B,UAAU,aACZ,UAAU,kBACL,UAAU,kBACV,UAAU,KACzB,MAGF,CAAC;AACF;;;;;;;;GAQG;AACH,eAAO,MAAM,4BAA4B,gBAC1B,UAAU,aACZ,UAAU,kBACL,UAAU,kBACV,UAAU,KACzB,MAaF,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,OAAO,gBACL,UAAU,aACZ,UAAU,kBACL,UAAU,kBACV,UAAU,KACzB,MAEF,CAAC;AACF;;;;;;;GAOG;AACH,eAAO,MAAM,iBAAiB,QAAS,MAAM,OAAO,MAAM,QAAQ,MAAM,eAYvE,CAAC;AAEF;;;GAGG;AACH,wBAAgB,KAAK,CAAC,OAAO,EAAE,MAAM,oBAEpC;AAED;;;;;;GAMG;AACH,wBAAgB,KAAK,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAQ1F;AAED,MAAM,MAAM,uBAAuB,GAAG;IACpC,aAAa,EAAE,SAAS,CAAC;IACzB,YAAY,EAAE,SAAS,CAAC;IACxB,QAAQ,EAAE,SAAS,CAAC;IACpB,gBAAgB,CAAC,EAAE,SAAS,CAAC;CAC9B,CAAC;AAEF,wBAAgB,aAAa,WAE5B"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@across-protocol/sdk",
   "author": "UMA Team",
-  "version": "4.1.43",
+  "version": "4.1.45-beta.0",
   "license": "AGPL-3.0",
   "homepage": "https://docs.across.to/reference/sdk",
   "files": [

package/src/addressAggregator/adapters/abstract.ts

@@ -0,0 +1,74 @@
+import axios from "axios";
+import { AdapterOptions, AddressListAdapter } from "../types";
+import { Logger } from "../../utils";
+
+const { ACROSS_USER_AGENT = "across-protocol" } = process.env;
+
+export abstract class AbstractAdapter implements AddressListAdapter {
+  readonly timeout: number;
+  readonly retries: number;
+  readonly throw: boolean;
+  readonly logger?: Logger;
+
+  constructor(
+    readonly name: string,
+    readonly path: string,
+    opts?: Omit<AdapterOptions, "name" | "path">
+  ) {
+    this.timeout = opts?.timeout ?? 2000;
+    this.retries = opts?.retries ?? 1;
+    this.throw = opts?.throwOnError ?? true;
+    this.logger = opts?.logger;
+  }
+
+  abstract update(logger?: Logger): Promise<string[]>;
+
+  protected sleep(ms: number): Promise<void> {
+    return new Promise((r) => setTimeout(r, ms));
+  }
+
+  protected async fetch(name: string, url: string, timeout = 2000, retries = 1): Promise<unknown> {
+    const args = {
+      headers: { "User-Agent": ACROSS_USER_AGENT },
+      timeout,
+    };
+
+    const errs: string[] = [];
+    let tries = 0;
+    do {
+      try {
+        return (await axios(url, args)).data;
+      } catch (err) {
+        const errMsg = axios.isAxiosError(err) || err instanceof Error ? err.message : "unknown error";
+        errs.push(errMsg);
+        if (++tries <= retries) await this.sleep(Math.pow(1.5, tries) * 1000); // simple backoff
+      }
+    } while (tries <= retries);
+
+    throw new Error(`${name} retrieval failure (${errs.join(", ")})`);
+  }
+
+  protected error(error: unknown): Promise<string[]> {
+    if (this.throw) {
+      throw error;
+    }
+
+    let reason: string;
+    if (error instanceof Error) {
+      reason = error.message;
+    } else {
+      reason = typeof error === "string" ? error : "unknown error";
+    }
+
+    const { name, path, timeout, retries } = this;
+    this.logger?.warn({
+      at: `${name}::update`,
+      message: `Failed to read addresses from ${name}.`,
+      reason,
+      path,
+      retries,
+      timeout,
+    });
+    return Promise.resolve([]);
+  }
+}

package/src/addressAggregator/adapters/bybit.ts

@@ -1,7 +1,8 @@
 import { array, defaulted, string, type } from "superstruct";
-import { AddressListAdapter } from "../types";
-import { logError, Logger, fetch } from "./util";
+import { AdapterOptions } from "../types";
+import { AbstractAdapter } from "./abstract";
 
+const DEFAULT_NAME = "bybit";
 const DEFAULT_URL = "https://hackscan.hackbounty.io/public/hack-address.json";
 
 // This type is a bit message and unweildy. Additional fields representing new chains may be added without notification.
@@ -13,18 +14,16 @@ const bybitResponse = type({
   }),
 });
 
-export class AddressList implements AddressListAdapter {
-  readonly timeout = 2000; // ms
-  readonly retries = 1;
-  readonly name = "bybit";
-
-  constructor(readonly url = DEFAULT_URL) {}
+export class AddressList extends AbstractAdapter {
+  constructor(opts?: AdapterOptions) {
+    super(opts?.name ?? DEFAULT_NAME, opts?.path ?? DEFAULT_URL, opts);
+  }
 
-  async update(logger?: Logger): Promise<string[]> {
-    const response = await fetch(this.name, this.url, this.timeout, this.retries);
+  async update(): Promise<string[]> {
+    const response = await this.fetch(this.name, this.path, this.timeout, this.retries);
     if (!bybitResponse.is(response)) {
       // nb. don't log the response because it might be very large.
-      return logError(this.name, "Failed to validate response", logger);
+      return this.error("Failed to validate response");
     }
 
     return [...response["0221"].eth, ...response["0221"].bsc, ...response["0221"].arbi];

package/src/addressAggregator/adapters/env.ts

@@ -1,16 +1,16 @@
 import { array, defaulted, string } from "superstruct";
-import { AddressListAdapter } from "../types";
-import { Logger, logError } from "./util";
+import { AdapterOptions } from "../types";
+import { AbstractAdapter } from "./abstract";
 
 const envConfig = defaulted(array(string()), []);
 
-export class AddressList implements AddressListAdapter {
-  readonly name = "process.env";
-
-  constructor(readonly envVar = "ACROSS_IGNORED_ADDRESSES") {}
+export class AddressList extends AbstractAdapter {
+  constructor(opts?: AdapterOptions) {
+    super(opts?.name ?? "process.env", opts?.path ?? "ACROSS_IGNORED_ADDRESSES", opts);
+  }
 
-  update(logger?: Logger): Promise<string[]> {
-    const config = process.env[this.envVar];
+  update(): Promise<string[]> {
+    const config = process.env[this.path];
     if (!config) {
       return Promise.resolve([]);
     }
@@ -19,10 +19,10 @@ export class AddressList implements AddressListAdapter {
     try {
       addresses = JSON.parse(config);
       if (!envConfig.is(addresses)) {
-        return logError(this.name, "Address format validation failure.", logger);
+        return this.error("Address format validation failure.");
       }
     } catch (err) {
-      return logError(this.name, err, logger);
+      return this.error(err);
     }
 
     return Promise.resolve(addresses);

package/src/addressAggregator/adapters/file.ts

@@ -1,37 +1,36 @@
 import { readFile } from "node:fs/promises";
 import { array, defaulted, string } from "superstruct";
-import { AddressListAdapter } from "../types";
-import { Logger, logError } from "./util";
+import { AdapterOptions } from "../types";
+import { AbstractAdapter } from "./abstract";
 
 const fileConfig = defaulted(array(string()), []);
 
-export class AddressList implements AddressListAdapter {
-  readonly name: string;
-
-  constructor(readonly path = "./addresses.json") {
-    this.name = `fs:${path}`;
+export class AddressList extends AbstractAdapter {
+  constructor(opts?: AdapterOptions) {
+    const { path = "addresses.json" } = opts ?? {};
+    super(opts?.name ?? `fs:${path}`, path, opts);
   }
 
-  async update(logger?: Logger): Promise<string[]> {
+  async update(): Promise<string[]> {
     let data: string;
     try {
       data = await readFile(this.path, { encoding: "utf8" });
     } catch (err) {
-      return logError(this.name, err, logger);
+      return this.error(err);
     }
 
     if (!data) {
-      return logError(this.name, `No addresses found in "${this.path}"`, logger);
+      return this.error("No addresses found");
     }
 
     let addresses: unknown;
     try {
       addresses = JSON.parse(data);
       if (!fileConfig.is(addresses)) {
-        return logError(this.name, "Address format validation failure.", logger);
+        return this.error("Address format validation failure.");
       }
     } catch (err) {
-      return logError(this.name, err, logger);
+      return this.error(err);
     }
 
     return Promise.resolve(addresses);

package/src/addressAggregator/adapters/risklabs.ts

@@ -1,25 +1,26 @@
 import { array, string } from "superstruct";
-import { AddressListAdapter } from "../types";
-import { logError, Logger, fetch } from "./util";
+import { AdapterOptions } from "../types";
+import { AbstractAdapter } from "./abstract";
 
 const RESPONSE_TYPE = array(string());
 const DEFAULT_NAME = "Risk Labs";
 const DEFAULT_URL = "https://blacklist.risklabs.foundation/api/blacklist";
 
-export class AddressList implements AddressListAdapter {
-  readonly timeout = 2000; // ms
-  readonly retries = 1;
-
-  constructor(
-    readonly name = DEFAULT_NAME,
-    readonly url = DEFAULT_URL
-  ) {}
+export class AddressList extends AbstractAdapter {
+  constructor(opts?: AdapterOptions) {
+    super(opts?.name ?? DEFAULT_NAME, opts?.path ?? DEFAULT_URL, opts);
+  }
 
-  async update(logger?: Logger): Promise<string[]> {
-    const response = await fetch(this.name, this.url, this.timeout, this.retries);
+  async update(): Promise<string[]> {
+    let response: unknown;
+    try {
+      response = await this.fetch(this.name, this.path, this.timeout, this.retries);
+    } catch (err) {
+      return this.error(err);
+    }
 
     if (!RESPONSE_TYPE.is(response)) {
-      return logError(this.name, "Failed to validate response", logger);
+      return this.error("Failed to validate response");
     }
 
     return response;

package/src/addressAggregator/index.ts

@@ -25,7 +25,7 @@ export class AddressAggregator {
 
     const allAddresses = await mapAsync(this.adapters, async (adapter) => {
       const invalidAddresses: string[] = [];
-      const addresses = (await adapter.update(this.logger))
+      const addresses = (await adapter.update())
         .map((address) => {
           try {
             return ethersUtils.getAddress(address.toLowerCase());
@@ -66,7 +66,7 @@ export class AddressAggregator {
 }
 
 async function run(): Promise<number> {
-  const addressList = new AddressAggregator([new adapters.risklabs.AddressList()]);
+  const addressList = new AddressAggregator([new adapters.risklabs.AddressList({ throwOnError: true })]);
 
   const addresses = await addressList.update();
   console.log(`Retrieved ${addresses.size} addresses: ${JSON.stringify(Array.from(addresses), null, 2)}`);

package/src/addressAggregator/types.ts

@@ -1,8 +1,17 @@
 import { Logger } from "../utils";
 
+export type AdapterOptions = {
+  name?: string;
+  path?: string;
+  retries?: number;
+  timeout?: number;
+  throwOnError?: boolean;
+  logger?: Logger;
+};
+
 export interface AddressListAdapter {
   readonly name: string;
-  update(logger?: Logger): Promise<string[]>;
+  update(): Promise<string[]>;
 }
 
 export const INVALID_ADDRESS = "";

package/src/clients/BundleDataClient/BundleDataClient.ts

@@ -42,6 +42,7 @@ import {
   chainIsEvm,
   isValidEvmAddress,
   duplicateEvent,
+  invalidOutputToken,
 } from "../../utils";
 import winston from "winston";
 import {
@@ -372,7 +373,8 @@ export class BundleDataClient {
         if (
           fill.blockNumber < blockRanges[chainIndex][0] ||
           fill.blockNumber > blockRanges[chainIndex][1] ||
-          isZeroValueFillOrSlowFillRequest(fill)
+          isZeroValueFillOrSlowFillRequest(fill) ||
+          invalidOutputToken(fill)
         ) {
           return false;
         }
@@ -405,11 +407,12 @@ export class BundleDataClient {
           return;
         }
         const { chainToSendRefundTo, repaymentToken } = getRefundInformationFromFill(
-          fill,
-          this.clients.hubPoolClient,
-          blockRanges,
-          this.chainIdListForBundleEvaluationBlockNumbers,
-          matchingDeposit.fromLiteChain
+          {
+            ...fill,
+            fromLiteChain: matchingDeposit.fromLiteChain,
+            quoteBlockNumber: matchingDeposit.quoteBlockNumber,
+          },
+          this.clients.hubPoolClient
         );
         // Assume that lp fees are 0 for the sake of speed. In the future we could batch compute
         // these or make hardcoded assumptions based on the origin-repayment chain direction. This might result
@@ -885,7 +888,10 @@ export class BundleDataClient {
             // tokens to the filler. We can't remove non-empty message deposit here in case there is a slow fill
             // request for the deposit, we'd want to see the fill took place.
             .filter(
-              (fill) => fill.blockNumber <= destinationChainBlockRange[1] && !isZeroValueFillOrSlowFillRequest(fill)
+              (fill) =>
+                fill.blockNumber <= destinationChainBlockRange[1] &&
+                !isZeroValueFillOrSlowFillRequest(fill) &&
+                !invalidOutputToken(fill)
             ),
           async (fill) => {
             fillCounter++;
@@ -1054,7 +1060,9 @@ export class BundleDataClient {
             .getSlowFillRequestsForOriginChain(originChainId)
             .filter(
               (request) =>
-                request.blockNumber <= destinationChainBlockRange[1] && !isZeroValueFillOrSlowFillRequest(request)
+                request.blockNumber <= destinationChainBlockRange[1] &&
+                !isZeroValueFillOrSlowFillRequest(request) &&
+                !invalidOutputToken(request)
             ),
           async (slowFillRequest: SlowFillRequestWithBlock) => {
             const relayDataHash = getRelayEventKey(slowFillRequest);
@@ -1376,11 +1384,12 @@ export class BundleDataClient {
               const matchedDeposit = deposits[0];
               assert(isDefined(matchedDeposit), "Deposit should exist in relay hash dictionary.");
               const { chainToSendRefundTo: paymentChainId } = getRefundInformationFromFill(
-                fill,
-                this.clients.hubPoolClient,
-                blockRangesForChains,
-                chainIds,
-                matchedDeposit.fromLiteChain
+                {
+                  ...fill,
+                  fromLiteChain: matchedDeposit.fromLiteChain,
+                  quoteBlockNumber: matchedDeposit.quoteBlockNumber,
+                },
+                this.clients.hubPoolClient
               );
               return {
                 ...fill,
@@ -1422,11 +1431,12 @@ export class BundleDataClient {
       const associatedDeposit = deposits[0];
       assert(isDefined(associatedDeposit), "Deposit should exist in relay hash dictionary.");
       const { chainToSendRefundTo, repaymentToken } = getRefundInformationFromFill(
-        fill,
-        this.clients.hubPoolClient,
-        blockRangesForChains,
-        chainIds,
-        associatedDeposit.fromLiteChain
+        {
+          ...fill,
+          fromLiteChain: associatedDeposit.fromLiteChain,
+          quoteBlockNumber: associatedDeposit.quoteBlockNumber,
+        },
+        this.clients.hubPoolClient
       );
       updateBundleFillsV3(bundleFillsV3, fill, realizedLpFeePct, chainToSendRefundTo, repaymentToken, fill.relayer);
     });

package/src/clients/BundleDataClient/utils/DataworkerUtils.ts

@@ -146,6 +146,13 @@ export function _buildPoolRebalanceRoot(
     const repaymentChainId = Number(_repaymentChainId);
     Object.entries(fillsForChain).forEach(
       ([l2TokenAddress, { realizedLpFees: totalRealizedLpFee, totalRefundAmount }]) => {
+        // If the repayment token and repayment chain ID do not map to a PoolRebalanceRoute graph, then
+        // there are no relevant L1 running balances.
+        if (
+          !clients.hubPoolClient.l2TokenHasPoolRebalanceRoute(l2TokenAddress, repaymentChainId, mainnetBundleEndBlock)
+        ) {
+          return;
+        }
         const l1TokenCounterpart = clients.hubPoolClient.getL1TokenForL2TokenAtBlock(
           l2TokenAddress,
           repaymentChainId,
@@ -215,6 +222,17 @@ export function _buildPoolRebalanceRoot(
   Object.entries(bundleV3Deposits).forEach(([, depositsForChain]) => {
     Object.entries(depositsForChain).forEach(([, deposits]) => {
       deposits.forEach((deposit) => {
+        // If the repayment token and repayment chain ID do not map to a PoolRebalanceRoute graph, then
+        // there are no relevant L1 running balances.
+        if (
+          !clients.hubPoolClient.l2TokenHasPoolRebalanceRoute(
+            deposit.inputToken,
+            deposit.originChainId,
+            mainnetBundleEndBlock
+          )
+        ) {
+          return;
+        }
         updateRunningBalanceForDeposit(runningBalances, clients.hubPoolClient, deposit, deposit.inputAmount.mul(-1));
       });
     });
@@ -229,6 +247,17 @@ export function _buildPoolRebalanceRoot(
     const originChainId = Number(_originChainId);
     Object.entries(depositsForChain).forEach(([inputToken, deposits]) => {
       deposits.forEach((deposit) => {
+        // If the repayment token and repayment chain ID do not map to a PoolRebalanceRoute graph, then
+        // there are no relevant L1 running balances.
+        if (
+          !clients.hubPoolClient.l2TokenHasPoolRebalanceRoute(
+            deposit.inputToken,
+            deposit.originChainId,
+            mainnetBundleEndBlock
+          )
+        ) {
+          return;
+        }
         const l1TokenCounterpart = clients.hubPoolClient.getL1TokenForL2TokenAtBlock(
           inputToken,
           originChainId,