@across-protocol/sdk 4.3.46 → 4.3.47

package/dist/esm/clients/BundleDataClient/utils/SuperstructUtils.d.ts

@@ -24,21 +24,21 @@ export declare const BundleDataSS: import("superstruct").Struct<{
         exclusivityDeadline: number;
         destinationChainId: number;
         messageHash: string;
+        blockNumber: number;
+        logIndex: number;
         quoteTimestamp: number;
         fromLiteChain: boolean;
         toLiteChain: boolean;
-        blockNumber: number;
-        logIndex: number;
         quoteBlockNumber: number;
         updatedRecipient?: SvmAddress | EvmAddress | RawAddress | undefined;
         updatedOutputAmount?: BigNumber | undefined;
         updatedMessage?: string | undefined;
-        transactionHash?: string | undefined;
-        transactionIndex?: number | undefined;
-        relayerFeePct?: BigNumber | undefined;
-        speedUpSignature?: string | undefined;
         txnIndex?: number | undefined;
         txnRef?: string | undefined;
+        relayerFeePct?: BigNumber | undefined;
+        speedUpSignature?: string | undefined;
+        transactionHash?: string | undefined;
+        transactionIndex?: number | undefined;
     }[]>>;
     bundleFillsV3: Record<string, Record<string, {
         fills: {
@@ -54,25 +54,25 @@ export declare const BundleDataSS: import("superstruct").Struct<{
             exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
             exclusivityDeadline: number;
             destinationChainId: number;
+            relayer: SvmAddress | EvmAddress | RawAddress;
             messageHash: string;
             repaymentChainId: number;
-            quoteTimestamp: number;
-            relayer: SvmAddress | EvmAddress | RawAddress;
             relayExecutionInfo: {
                 updatedRecipient: SvmAddress | EvmAddress | RawAddress;
                 updatedOutputAmount: BigNumber;
-                fillType: number;
                 updatedMessageHash: string;
+                fillType: number;
                 updatedMessage?: string | undefined;
             };
             blockNumber: number;
             logIndex: number;
+            quoteTimestamp: number;
             lpFeePct: BigNumber;
             message?: string | undefined;
-            transactionHash?: string | undefined;
-            transactionIndex?: number | undefined;
             txnIndex?: number | undefined;
             txnRef?: string | undefined;
+            transactionHash?: string | undefined;
+            transactionIndex?: number | undefined;
         }[];
         refunds: Record<string, BigNumber>;
         realizedLpFees: BigNumber;
@@ -93,22 +93,22 @@ export declare const BundleDataSS: import("superstruct").Struct<{
         exclusivityDeadline: number;
         destinationChainId: number;
         messageHash: string;
+        blockNumber: number;
+        logIndex: number;
         quoteTimestamp: number;
         fromLiteChain: boolean;
         toLiteChain: boolean;
-        blockNumber: number;
-        logIndex: number;
         quoteBlockNumber: number;
         lpFeePct: BigNumber;
         updatedRecipient?: SvmAddress | EvmAddress | RawAddress | undefined;
         updatedOutputAmount?: BigNumber | undefined;
         updatedMessage?: string | undefined;
-        transactionHash?: string | undefined;
-        transactionIndex?: number | undefined;
-        relayerFeePct?: BigNumber | undefined;
-        speedUpSignature?: string | undefined;
         txnIndex?: number | undefined;
         txnRef?: string | undefined;
+        relayerFeePct?: BigNumber | undefined;
+        speedUpSignature?: string | undefined;
+        transactionHash?: string | undefined;
+        transactionIndex?: number | undefined;
     }[]>>;
     expiredDepositsToRefundV3: Record<string, Record<string, {
         message: string;
@@ -125,21 +125,21 @@ export declare const BundleDataSS: import("superstruct").Struct<{
         exclusivityDeadline: number;
         destinationChainId: number;
         messageHash: string;
+        blockNumber: number;
+        logIndex: number;
         quoteTimestamp: number;
         fromLiteChain: boolean;
         toLiteChain: boolean;
-        blockNumber: number;
-        logIndex: number;
         quoteBlockNumber: number;
         updatedRecipient?: SvmAddress | EvmAddress | RawAddress | undefined;
         updatedOutputAmount?: BigNumber | undefined;
         updatedMessage?: string | undefined;
-        transactionHash?: string | undefined;
-        transactionIndex?: number | undefined;
-        relayerFeePct?: BigNumber | undefined;
-        speedUpSignature?: string | undefined;
         txnIndex?: number | undefined;
         txnRef?: string | undefined;
+        relayerFeePct?: BigNumber | undefined;
+        speedUpSignature?: string | undefined;
+        transactionHash?: string | undefined;
+        transactionIndex?: number | undefined;
     }[]>>;
     unexecutableSlowFills: Record<string, Record<string, {
         message: string;
@@ -156,22 +156,22 @@ export declare const BundleDataSS: import("superstruct").Struct<{
         exclusivityDeadline: number;
         destinationChainId: number;
         messageHash: string;
+        blockNumber: number;
+        logIndex: number;
         quoteTimestamp: number;
         fromLiteChain: boolean;
         toLiteChain: boolean;
-        blockNumber: number;
-        logIndex: number;
         quoteBlockNumber: number;
         lpFeePct: BigNumber;
         updatedRecipient?: SvmAddress | EvmAddress | RawAddress | undefined;
         updatedOutputAmount?: BigNumber | undefined;
         updatedMessage?: string | undefined;
-        transactionHash?: string | undefined;
-        transactionIndex?: number | undefined;
-        relayerFeePct?: BigNumber | undefined;
-        speedUpSignature?: string | undefined;
         txnIndex?: number | undefined;
         txnRef?: string | undefined;
+        relayerFeePct?: BigNumber | undefined;
+        speedUpSignature?: string | undefined;
+        transactionHash?: string | undefined;
+        transactionIndex?: number | undefined;
     }[]>>;
 }, {
     bundleDepositsV3: import("superstruct").Struct<Record<string, Record<string, {
@@ -189,21 +189,21 @@ export declare const BundleDataSS: import("superstruct").Struct<{
         exclusivityDeadline: number;
         destinationChainId: number;
         messageHash: string;
+        blockNumber: number;
+        logIndex: number;
         quoteTimestamp: number;
         fromLiteChain: boolean;
         toLiteChain: boolean;
-        blockNumber: number;
-        logIndex: number;
         quoteBlockNumber: number;
         updatedRecipient?: SvmAddress | EvmAddress | RawAddress | undefined;
         updatedOutputAmount?: BigNumber | undefined;
         updatedMessage?: string | undefined;
-        transactionHash?: string | undefined;
-        transactionIndex?: number | undefined;
-        relayerFeePct?: BigNumber | undefined;
-        speedUpSignature?: string | undefined;
         txnIndex?: number | undefined;
         txnRef?: string | undefined;
+        relayerFeePct?: BigNumber | undefined;
+        speedUpSignature?: string | undefined;
+        transactionHash?: string | undefined;
+        transactionIndex?: number | undefined;
     }[]>>, null>;
     expiredDepositsToRefundV3: import("superstruct").Struct<Record<string, Record<string, {
         message: string;
@@ -220,21 +220,21 @@ export declare const BundleDataSS: import("superstruct").Struct<{
         exclusivityDeadline: number;
         destinationChainId: number;
         messageHash: string;
+        blockNumber: number;
+        logIndex: number;
         quoteTimestamp: number;
         fromLiteChain: boolean;
         toLiteChain: boolean;
-        blockNumber: number;
-        logIndex: number;
         quoteBlockNumber: number;
         updatedRecipient?: SvmAddress | EvmAddress | RawAddress | undefined;
         updatedOutputAmount?: BigNumber | undefined;
         updatedMessage?: string | undefined;
-        transactionHash?: string | undefined;
-        transactionIndex?: number | undefined;
-        relayerFeePct?: BigNumber | undefined;
-        speedUpSignature?: string | undefined;
         txnIndex?: number | undefined;
         txnRef?: string | undefined;
+        relayerFeePct?: BigNumber | undefined;
+        speedUpSignature?: string | undefined;
+        transactionHash?: string | undefined;
+        transactionIndex?: number | undefined;
     }[]>>, null>;
     unexecutableSlowFills: import("superstruct").Struct<Record<string, Record<string, {
         message: string;
@@ -251,22 +251,22 @@ export declare const BundleDataSS: import("superstruct").Struct<{
         exclusivityDeadline: number;
         destinationChainId: number;
         messageHash: string;
+        blockNumber: number;
+        logIndex: number;
         quoteTimestamp: number;
         fromLiteChain: boolean;
         toLiteChain: boolean;
-        blockNumber: number;
-        logIndex: number;
         quoteBlockNumber: number;
         lpFeePct: BigNumber;
         updatedRecipient?: SvmAddress | EvmAddress | RawAddress | undefined;
         updatedOutputAmount?: BigNumber | undefined;
         updatedMessage?: string | undefined;
-        transactionHash?: string | undefined;
-        transactionIndex?: number | undefined;
-        relayerFeePct?: BigNumber | undefined;
-        speedUpSignature?: string | undefined;
         txnIndex?: number | undefined;
         txnRef?: string | undefined;
+        relayerFeePct?: BigNumber | undefined;
+        speedUpSignature?: string | undefined;
+        transactionHash?: string | undefined;
+        transactionIndex?: number | undefined;
     }[]>>, null>;
     bundleSlowFillsV3: import("superstruct").Struct<Record<string, Record<string, {
         message: string;
@@ -283,22 +283,22 @@ export declare const BundleDataSS: import("superstruct").Struct<{
         exclusivityDeadline: number;
         destinationChainId: number;
         messageHash: string;
+        blockNumber: number;
+        logIndex: number;
         quoteTimestamp: number;
         fromLiteChain: boolean;
         toLiteChain: boolean;
-        blockNumber: number;
-        logIndex: number;
         quoteBlockNumber: number;
         lpFeePct: BigNumber;
         updatedRecipient?: SvmAddress | EvmAddress | RawAddress | undefined;
         updatedOutputAmount?: BigNumber | undefined;
         updatedMessage?: string | undefined;
-        transactionHash?: string | undefined;
-        transactionIndex?: number | undefined;
-        relayerFeePct?: BigNumber | undefined;
-        speedUpSignature?: string | undefined;
         txnIndex?: number | undefined;
         txnRef?: string | undefined;
+        relayerFeePct?: BigNumber | undefined;
+        speedUpSignature?: string | undefined;
+        transactionHash?: string | undefined;
+        transactionIndex?: number | undefined;
     }[]>>, null>;
     bundleFillsV3: import("superstruct").Struct<Record<string, Record<string, {
         fills: {
@@ -314,25 +314,25 @@ export declare const BundleDataSS: import("superstruct").Struct<{
             exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
             exclusivityDeadline: number;
             destinationChainId: number;
+            relayer: SvmAddress | EvmAddress | RawAddress;
             messageHash: string;
             repaymentChainId: number;
-            quoteTimestamp: number;
-            relayer: SvmAddress | EvmAddress | RawAddress;
             relayExecutionInfo: {
                 updatedRecipient: SvmAddress | EvmAddress | RawAddress;
                 updatedOutputAmount: BigNumber;
-                fillType: number;
                 updatedMessageHash: string;
+                fillType: number;
                 updatedMessage?: string | undefined;
             };
             blockNumber: number;
             logIndex: number;
+            quoteTimestamp: number;
             lpFeePct: BigNumber;
             message?: string | undefined;
-            transactionHash?: string | undefined;
-            transactionIndex?: number | undefined;
             txnIndex?: number | undefined;
             txnRef?: string | undefined;
+            transactionHash?: string | undefined;
+            transactionIndex?: number | undefined;
         }[];
         refunds: Record<string, BigNumber>;
         realizedLpFees: BigNumber;

package/dist/esm/clients/HubPoolClient.d.ts

@@ -18,6 +18,11 @@ type HubPoolUpdateFailure = {
 };
 export type HubPoolUpdate = HubPoolUpdateSuccess | HubPoolUpdateFailure;
 type HubPoolEvent = "SetPoolRebalanceRoute" | "L1TokenEnabledForLiquidityProvision" | "ProposeRootBundle" | "RootBundleCanceled" | "RootBundleDisputed" | "RootBundleExecuted" | "CrossChainContractsSet";
+type L1TokensToDestinationTokens = {
+    [l1Token: string]: {
+        [destinationChainId: number]: Address;
+    };
+};
 export type LpFeeRequest = Pick<Deposit, "originChainId" | "inputToken" | "inputAmount" | "quoteTimestamp"> & {
     paymentChainId?: number;
 };
@@ -32,6 +37,7 @@ export declare class HubPoolClient extends BaseAbstractClient {
         ignoredHubProposedBundles: number[];
         timeToCache?: number;
     };
+    protected l1TokensToDestinationTokens: L1TokensToDestinationTokens;
     protected l1Tokens: L1TokenInfo[];
     protected lpTokens: {
         [token: string]: LpToken;
@@ -65,9 +71,9 @@ export declare class HubPoolClient extends BaseAbstractClient {
     getExecutedRootBundles(): ExecutedRootBundle[];
     getSpokePoolForBlock(chain: number, block?: number): Address;
     getSpokePoolActivationBlock(chain: number, spokePool: Address): number | undefined;
-    getL2TokenForL1TokenAtBlock(l1Token: EvmAddress, destinationChainId: number, latestHubBlock?: number): Address | undefined;
-    getL1TokenForL2TokenAtBlock(l2Token: Address, destinationChainId: number, latestHubBlock?: number): EvmAddress | undefined;
-    protected getL1TokenForDeposit(deposit: Pick<DepositWithBlock, "originChainId" | "inputToken" | "quoteBlockNumber">): EvmAddress | undefined;
+    getL2TokenForL1TokenAtBlock(l1Token: EvmAddress, destinationChainId: number, latestHubBlock?: number): Address;
+    getL1TokenForL2TokenAtBlock(l2Token: Address, destinationChainId: number, latestHubBlock?: number): EvmAddress;
+    protected getL1TokenForDeposit(deposit: Pick<DepositWithBlock, "originChainId" | "inputToken" | "quoteBlockNumber">): EvmAddress;
     l2TokenEnabledForL1Token(l1Token: EvmAddress, destinationChainId: number): boolean;
     l2TokenEnabledForL1TokenAtBlock(l1Token: EvmAddress, destinationChainId: number, hubBlockNumber: number): boolean;
     l2TokenHasPoolRebalanceRoute(l2Token: Address, l2ChainId: number, hubPoolBlock?: number): boolean;

package/dist/esm/clients/HubPoolClient.js

@@ -4,7 +4,7 @@ import _ from "lodash";
 import { DEFAULT_CACHING_SAFE_LAG, DEFAULT_CACHING_TTL, TOKEN_SYMBOLS_MAP } from "../constants";
 import * as lpFeeCalculator from "../lpFeeCalculator";
 import { EVMBlockFinder } from "../arch/evm";
-import { BigNumber, bnZero, dedupArray, assign, fetchTokenInfo, getCachedBlockForTimestamp, getCurrentTime, isDefined, mapAsync, paginatedEventQuery, shouldCache, sortEventsDescending, spreadEventWithBlockNumber, toBN, getTokenInfo, getUsdcSymbol, chainIsSvm, getDeployedAddress, SvmAddress, EvmAddress, } from "../utils";
+import { BigNumber, bnZero, dedupArray, assign, fetchTokenInfo, getCachedBlockForTimestamp, getCurrentTime, getNetworkName, isDefined, mapAsync, paginatedEventQuery, shouldCache, sortEventsDescending, spreadEventWithBlockNumber, toBN, getTokenInfo, getUsdcSymbol, chainIsSvm, getDeployedAddress, SvmAddress, EvmAddress, } from "../utils";
 import { BaseAbstractClient, isUpdateFailureReason, UpdateFailureReason } from "./BaseAbstractClient";
 var HubPoolClient = /** @class */ (function (_super) {
     __extends(HubPoolClient, _super);
@@ -23,6 +23,8 @@ var HubPoolClient = /** @class */ (function (_super) {
         _this.deploymentBlock = deploymentBlock;
         _this.chainId = chainId;
         _this.configOverride = configOverride;
+        // L1Token -> destinationChainId -> destinationToken
+        _this.l1TokensToDestinationTokens = {};
         _this.l1Tokens = []; // L1Tokens and their associated info.
         // @dev `token` here is a 20-byte hex sting
         _this.lpTokens = {};
@@ -90,30 +92,49 @@ var HubPoolClient = /** @class */ (function (_super) {
     };
     // Returns the latest L2 token to use for an L1 token as of the input hub block.
     HubPoolClient.prototype.getL2TokenForL1TokenAtBlock = function (l1Token, destinationChainId, latestHubBlock) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         if (latestHubBlock === void 0) { latestHubBlock = Number.MAX_SAFE_INTEGER; }
         if (!((_b = (_a = this.l1TokensToDestinationTokensWithBlock) === null || _a === void 0 ? void 0 : _a[l1Token.toEvmAddress()]) === null || _b === void 0 ? void 0 : _b[destinationChainId])) {
-            return undefined;
+            var chain = getNetworkName(destinationChainId);
+            var symbol = ((_c = this.l1Tokens.find(function (_a) {
+                var address = _a.address;
+                return address.eq(l1Token);
+            })) !== null && _c !== void 0 ? _c : { symbol: l1Token.toString() }).symbol;
+            throw new Error("Could not find SpokePool mapping for ".concat(symbol, " on ").concat(chain, " and L1 token ").concat(l1Token));
         }
         // Find the last mapping published before the target block.
-        var l2Token = this.l1TokensToDestinationTokensWithBlock[l1Token.toEvmAddress()][destinationChainId].find(function (mapping) { return mapping.blockNumber <= latestHubBlock; });
-        return !l2Token || l2Token.l2Token.isZeroAddress() ? undefined : l2Token.l2Token;
+        var l2Token = sortEventsDescending(this.l1TokensToDestinationTokensWithBlock[l1Token.toEvmAddress()][destinationChainId]).find(function (mapping) { return mapping.blockNumber <= latestHubBlock; });
+        if (!l2Token) {
+            var chain = getNetworkName(destinationChainId);
+            var symbol = ((_d = this.l1Tokens.find(function (_a) {
+                var address = _a.address;
+                return address.eq(l1Token);
+            })) !== null && _d !== void 0 ? _d : { symbol: l1Token.toString() }).symbol;
+            throw new Error("Could not find SpokePool mapping for ".concat(symbol, " on ").concat(chain, " at or before HubPool block ").concat(latestHubBlock, "!"));
+        }
+        return l2Token.l2Token;
     };
     // Returns the latest L1 token to use for an L2 token as of the input hub block.
     HubPoolClient.prototype.getL1TokenForL2TokenAtBlock = function (l2Token, destinationChainId, latestHubBlock) {
         var _this = this;
         if (latestHubBlock === void 0) { latestHubBlock = Number.MAX_SAFE_INTEGER; }
-        var l2Tokens = Object.keys(this.l1TokensToDestinationTokensWithBlock).flatMap(function (l1Token) {
-            var _a;
-            // Get the latest L2 token mapping for the given L1 token.
+        var l2Tokens = Object.keys(this.l1TokensToDestinationTokensWithBlock)
+            .filter(function (l1Token) { return _this.l2TokenEnabledForL1Token(EvmAddress.from(l1Token), destinationChainId); })
+            .map(function (l1Token) {
+            // Return all matching L2 token mappings that are equal to or earlier than the target block.
             // @dev Since tokens on L2s (like Solana) can have 32 byte addresses, filter on the lower 20 bytes of the token only.
-            var sortedL2Tokens = sortEventsDescending(((_a = _this.l1TokensToDestinationTokensWithBlock[l1Token][destinationChainId]) !== null && _a !== void 0 ? _a : []).filter(function (dstTokenWithBlock) { return dstTokenWithBlock.blockNumber <= latestHubBlock; }));
-            // If the latest L2 token mapping is equal to the target L2 token, return it.
-            return sortedL2Tokens.length > 0 && sortedL2Tokens[0].l2Token.truncateToBytes20() === l2Token.truncateToBytes20()
-                ? sortedL2Tokens[0]
-                : [];
-        });
-        return l2Tokens.length === 0 ? undefined : sortEventsDescending(l2Tokens)[0].l1Token;
+            return _this.l1TokensToDestinationTokensWithBlock[l1Token][destinationChainId].filter(function (dstTokenWithBlock) {
+                return dstTokenWithBlock.l2Token.truncateToBytes20() === l2Token.truncateToBytes20() &&
+                    dstTokenWithBlock.blockNumber <= latestHubBlock;
+            });
+        })
+            .flat();
+        if (l2Tokens.length === 0) {
+            var chain = getNetworkName(destinationChainId);
+            throw new Error("Could not find HubPool mapping for ".concat(l2Token, " on ").concat(chain, " at or before HubPool block ").concat(latestHubBlock, "!"));
+        }
+        // Find the last mapping published before the target block.
+        return sortEventsDescending(l2Tokens)[0].l1Token;
     };
     HubPoolClient.prototype.getL1TokenForDeposit = function (deposit) {
         // L1-->L2 token mappings are set via PoolRebalanceRoutes which occur on mainnet,
@@ -122,18 +143,27 @@ var HubPoolClient = /** @class */ (function (_super) {
         return this.getL1TokenForL2TokenAtBlock(deposit.inputToken, deposit.originChainId, deposit.quoteBlockNumber);
     };
     HubPoolClient.prototype.l2TokenEnabledForL1Token = function (l1Token, destinationChainId) {
-        return this.l2TokenEnabledForL1TokenAtBlock(l1Token, destinationChainId, Number.MAX_SAFE_INTEGER);
+        var _a, _b;
+        return ((_b = (_a = this.l1TokensToDestinationTokens) === null || _a === void 0 ? void 0 : _a[l1Token.toEvmAddress()]) === null || _b === void 0 ? void 0 : _b[destinationChainId]) != undefined;
     };
     HubPoolClient.prototype.l2TokenEnabledForL1TokenAtBlock = function (l1Token, destinationChainId, hubBlockNumber) {
         var _a, _b, _c;
         // Find the last mapping published before the target block.
         var l2Token = sortEventsDescending((_c = (_b = (_a = this.l1TokensToDestinationTokensWithBlock) === null || _a === void 0 ? void 0 : _a[l1Token.toEvmAddress()]) === null || _b === void 0 ? void 0 : _b[destinationChainId]) !== null && _c !== void 0 ? _c : []).find(function (mapping) { return mapping.blockNumber <= hubBlockNumber; });
-        return l2Token !== undefined && !l2Token.l2Token.isZeroAddress();
+        return l2Token !== undefined;
     };
     HubPoolClient.prototype.l2TokenHasPoolRebalanceRoute = function (l2Token, l2ChainId, hubPoolBlock) {
         if (hubPoolBlock === void 0) { hubPoolBlock = this.latestHeightSearched; }
-        var l1Token = this.getL1TokenForL2TokenAtBlock(l2Token, l2ChainId, hubPoolBlock);
-        return l1Token !== undefined;
+        return Object.values(this.l1TokensToDestinationTokensWithBlock).some(function (destinationTokenMapping) {
+            return Object.entries(destinationTokenMapping).some(function (_a) {
+                var _l2ChainId = _a[0], setPoolRebalanceRouteEvents = _a[1];
+                return setPoolRebalanceRouteEvents.some(function (e) {
+                    return (e.blockNumber <= hubPoolBlock &&
+                        e.l2Token.truncateToBytes20() === l2Token.truncateToBytes20() &&
+                        Number(_l2ChainId) === l2ChainId);
+                });
+            });
+        });
     };
     /**
      * @dev If tokenAddress + chain do not exist in TOKEN_SYMBOLS_MAP then this will throw.
@@ -309,11 +339,11 @@ var HubPoolClient = /** @class */ (function (_super) {
                         getHubPoolToken = function (deposit, quoteBlockNumber) {
                             var _a;
                             var tokenKey = "".concat(deposit.originChainId, "-").concat(deposit.inputToken);
-                            var l1Token = _this.getL1TokenForDeposit(__assign(__assign({}, deposit), { quoteBlockNumber: quoteBlockNumber }));
-                            if (!l1Token) {
-                                return undefined;
+                            if (_this.l2TokenHasPoolRebalanceRoute(deposit.inputToken, deposit.originChainId, quoteBlockNumber)) {
+                                return ((_a = hubPoolTokens[tokenKey]) !== null && _a !== void 0 ? _a : (hubPoolTokens[tokenKey] = _this.getL1TokenForDeposit(__assign(__assign({}, deposit), { quoteBlockNumber: quoteBlockNumber }))));
                             }
-                            return ((_a = hubPoolTokens[tokenKey]) !== null && _a !== void 0 ? _a : (hubPoolTokens[tokenKey] = l1Token));
+                            else
+                                return undefined;
                         };
                         getHubPoolTokens = function () { return dedupArray(Object.values(hubPoolTokens).filter(isDefined)); };
                         resolveUniqueQuoteTimestamps = function (deposit) {
@@ -451,13 +481,13 @@ var HubPoolClient = /** @class */ (function (_super) {
         // Resolve both SpokePool tokens back to their respective HubPool tokens and verify that they match.
         var l1TokenA = this.getL1TokenForL2TokenAtBlock(tokenA, chainIdA, hubPoolBlock);
         var l1TokenB = this.getL1TokenForL2TokenAtBlock(tokenB, chainIdB, hubPoolBlock);
-        if (!l1TokenA || !l1TokenB || !l1TokenA.eq(l1TokenB)) {
+        if (!l1TokenA.eq(l1TokenB)) {
             return false;
         }
         // Resolve both HubPool tokens back to a current SpokePool token and verify that they match.
         var _tokenA = this.getL2TokenForL1TokenAtBlock(l1TokenA, chainIdA, hubPoolBlock);
         var _tokenB = this.getL2TokenForL1TokenAtBlock(l1TokenB, chainIdB, hubPoolBlock);
-        return _tokenA !== undefined && _tokenB !== undefined && tokenA.eq(_tokenA) && tokenB.eq(_tokenB);
+        return tokenA.eq(_tokenA) && tokenB.eq(_tokenB);
     };
     HubPoolClient.prototype.getSpokeActivationBlockForChain = function (chainId) {
         var _a;
@@ -749,21 +779,20 @@ var HubPoolClient = /** @class */ (function (_super) {
         });
     };
     HubPoolClient.prototype.update = function (eventsToQuery) {
-        var _a;
         if (eventsToQuery === void 0) { eventsToQuery = Object.keys(this.hubPoolEventFilters()); }
         return __awaiter(this, void 0, void 0, function () {
-            var update, events, currentTime, pendingRootBundleProposal, searchEndBlock, _i, _b, event_1, args, dataToAdd, solanaSpokePool, svmSpoke, truncatedAddress, _c, _d, event_2, args, destinationToken, usdcTokenSol, svmUsdc, newRoute, uniqueL1Tokens, _e, tokenInfo, lpTokenInfo_1, _loop_1, this_1, _f, tokenInfo_1, info, _g, _h, event_3, executedRootBundle, l1Tokens, runningBalances, nTokens, mostRecentProposedRootBundle;
-            var _j, _k, _l;
+            var update, events, currentTime, pendingRootBundleProposal, searchEndBlock, _i, _a, event_1, args, dataToAdd, solanaSpokePool, svmSpoke, truncatedAddress, _b, _c, event_2, args, destinationToken, usdcTokenSol, svmUsdc, uniqueL1Tokens, _d, tokenInfo, lpTokenInfo_1, _loop_1, this_1, _e, tokenInfo_1, info, _f, _g, event_3, executedRootBundle, l1Tokens, runningBalances, nTokens, mostRecentProposedRootBundle;
+            var _h, _j, _k;
             var _this = this;
-            return __generator(this, function (_m) {
-                switch (_m.label) {
+            return __generator(this, function (_l) {
+                switch (_l.label) {
                     case 0:
                         if (!this.configStoreClient.isUpdated) {
                             throw new Error("ConfigStoreClient not updated");
                         }
                         return [4 /*yield*/, this._update(eventsToQuery)];
                     case 1:
-                        update = _m.sent();
+                        update = _l.sent();
                         if (!update.success) {
                             if (update.reason !== UpdateFailureReason.AlreadyUpdated) {
                                 throw new Error("Unable to update HubPoolClient: ".concat(update.reason));
@@ -773,8 +802,8 @@ var HubPoolClient = /** @class */ (function (_super) {
                         }
                         events = update.events, currentTime = update.currentTime, pendingRootBundleProposal = update.pendingRootBundleProposal, searchEndBlock = update.searchEndBlock;
                         if (eventsToQuery.includes("CrossChainContractsSet")) {
-                            for (_i = 0, _b = events["CrossChainContractsSet"]; _i < _b.length; _i++) {
-                                event_1 = _b[_i];
+                            for (_i = 0, _a = events["CrossChainContractsSet"]; _i < _a.length; _i++) {
+                                event_1 = _a[_i];
                                 args = spreadEventWithBlockNumber(event_1);
                                 dataToAdd = {
                                     spokePool: EvmAddress.from(args.spokePool),
@@ -804,8 +833,8 @@ var HubPoolClient = /** @class */ (function (_super) {
                             }
                         }
                         if (eventsToQuery.includes("SetPoolRebalanceRoute")) {
-                            for (_c = 0, _d = events["SetPoolRebalanceRoute"]; _c < _d.length; _c++) {
-                                event_2 = _d[_c];
+                            for (_b = 0, _c = events["SetPoolRebalanceRoute"]; _b < _c.length; _b++) {
+                                event_2 = _c[_b];
                                 args = spreadEventWithBlockNumber(event_2);
                                 destinationToken = EvmAddress.from(args.destinationToken);
                                 if (chainIsSvm(args.destinationChainId)) {
@@ -817,22 +846,20 @@ var HubPoolClient = /** @class */ (function (_super) {
                                     }
                                     destinationToken = svmUsdc;
                                 }
-                                newRoute = {
-                                    l1Token: EvmAddress.from(args.l1Token),
-                                    l2Token: destinationToken,
-                                    blockNumber: args.blockNumber,
-                                    txnIndex: args.txnIndex,
-                                    logIndex: args.logIndex,
-                                    txnRef: args.txnRef,
-                                };
-                                if ((_a = this.l1TokensToDestinationTokensWithBlock[args.l1Token]) === null || _a === void 0 ? void 0 : _a[args.destinationChainId]) {
-                                    // Events are most likely coming in descending orders already but just in case we sort them again.
-                                    this.l1TokensToDestinationTokensWithBlock[args.l1Token][args.destinationChainId] = sortEventsDescending(__spreadArray(__spreadArray([], this.l1TokensToDestinationTokensWithBlock[args.l1Token][args.destinationChainId], true), [
-                                        newRoute,
-                                    ], false));
-                                }
-                                else {
-                                    assign(this.l1TokensToDestinationTokensWithBlock, [args.l1Token, args.destinationChainId], [newRoute]);
+                                // If the destination token is set to the zero address in an event, then this means Across should no longer
+                                // rebalance to this chain.
+                                if (!destinationToken.isZeroAddress()) {
+                                    assign(this.l1TokensToDestinationTokens, [args.l1Token, args.destinationChainId], destinationToken);
+                                    assign(this.l1TokensToDestinationTokensWithBlock, [args.l1Token, args.destinationChainId], [
+                                        {
+                                            l1Token: EvmAddress.from(args.l1Token),
+                                            l2Token: destinationToken,
+                                            blockNumber: args.blockNumber,
+                                            txnIndex: args.txnIndex,
+                                            logIndex: args.logIndex,
+                                            txnRef: args.txnRef,
+                                        },
+                                    ]);
                                 }
                             }
                         }
@@ -858,7 +885,7 @@ var HubPoolClient = /** @class */ (function (_super) {
                                 }); }); })),
                             ])];
                     case 2:
-                        _e = _m.sent(), tokenInfo = _e[0], lpTokenInfo_1 = _e[1];
+                        _d = _l.sent(), tokenInfo = _d[0], lpTokenInfo_1 = _d[1];
                         _loop_1 = function (info) {
                             if (!this_1.l1Tokens.find(function (token) { return token.address.eq(info.address); })) {
                                 if (info.decimals > 0 && info.decimals <= 18) {
@@ -870,8 +897,8 @@ var HubPoolClient = /** @class */ (function (_super) {
                             }
                         };
                         this_1 = this;
-                        for (_f = 0, tokenInfo_1 = tokenInfo; _f < tokenInfo_1.length; _f++) {
-                            info = tokenInfo_1[_f];
+                        for (_e = 0, tokenInfo_1 = tokenInfo; _e < tokenInfo_1.length; _e++) {
+                            info = tokenInfo_1[_e];
                             _loop_1(info);
                         }
                         uniqueL1Tokens.forEach(function (token, i) {
@@ -880,10 +907,10 @@ var HubPoolClient = /** @class */ (function (_super) {
                                 liquidReserves: lpTokenInfo_1[i].liquidReserves,
                             };
                         });
-                        _m.label = 3;
+                        _l.label = 3;
                     case 3:
                         if (eventsToQuery.includes("ProposeRootBundle")) {
-                            (_j = this.proposedRootBundles).push.apply(_j, events["ProposeRootBundle"]
+                            (_h = this.proposedRootBundles).push.apply(_h, events["ProposeRootBundle"]
                                 .filter(function (event) { return !_this.configOverride.ignoredHubProposedBundles.includes(event.blockNumber); })
                                 .map(function (_event) {
                                 var args = spreadEventWithBlockNumber(_event);
@@ -891,14 +918,14 @@ var HubPoolClient = /** @class */ (function (_super) {
                             }));
                         }
                         if (eventsToQuery.includes("RootBundleCanceled")) {
-                            (_k = this.canceledRootBundles).push.apply(_k, events["RootBundleCanceled"].map(function (event) { return spreadEventWithBlockNumber(event); }));
+                            (_j = this.canceledRootBundles).push.apply(_j, events["RootBundleCanceled"].map(function (event) { return spreadEventWithBlockNumber(event); }));
                         }
                         if (eventsToQuery.includes("RootBundleDisputed")) {
-                            (_l = this.disputedRootBundles).push.apply(_l, events["RootBundleDisputed"].map(function (event) { return spreadEventWithBlockNumber(event); }));
+                            (_k = this.disputedRootBundles).push.apply(_k, events["RootBundleDisputed"].map(function (event) { return spreadEventWithBlockNumber(event); }));
                         }
                         if (eventsToQuery.includes("RootBundleExecuted")) {
-                            for (_g = 0, _h = events["RootBundleExecuted"]; _g < _h.length; _g++) {
-                                event_3 = _h[_g];
+                            for (_f = 0, _g = events["RootBundleExecuted"]; _f < _g.length; _f++) {
+                                event_3 = _g[_f];
                                 if (this.configOverride.ignoredHubExecutedBundles.includes(event_3.blockNumber)) {
                                     continue;
                                 }