@across-protocol/sdk 4.3.58 → 4.3.59

package/dist/esm/clients/BundleDataClient/BundleDataClient.js

@@ -4,8 +4,8 @@ import _ from "lodash";
 import { FillType, FillStatus, } from "../../interfaces";
 import { findFillEvent as findEvmFillEvent } from "../../arch/evm";
 import { findFillEvent as findSvmFillEvent } from "../../arch/svm";
-import { BigNumber, bnZero, queryHistoricalDepositForFill, assign, fixedPointAdjustment, isDefined, toBN, forEachAsync, getBlockRangeForChain, getImpliedBundleBlockRanges, getRelayEventKey, isSlowFill, mapAsync, bnUint32Max, isZeroValueDeposit, isZeroValueFillOrSlowFillRequest, duplicateEvent, invalidOutputToken, getNetworkName, toBytes32, convertRelayDataParamsToBytes32, convertFillParamsToBytes32, } from "../../utils";
-import { BundleDataSS, getEndBlockBuffers, getRefundInformationFromFill, getRefundsFromBundle, getWidestPossibleExpectedBlockRange, isChainDisabled, prettyPrintV3SpokePoolEvents, verifyFillRepayment, } from "./utils";
+import { bnZero, queryHistoricalDepositForFill, assign, fixedPointAdjustment, isDefined, forEachAsync, getBlockRangeForChain, getRelayEventKey, isSlowFill, mapAsync, bnUint32Max, isZeroValueDeposit, isZeroValueFillOrSlowFillRequest, duplicateEvent, invalidOutputToken, toBytes32, convertRelayDataParamsToBytes32, convertFillParamsToBytes32, } from "../../utils";
+import { BundleDataSS, getRefundInformationFromFill, isChainDisabledAtBlock, prettyPrintV3SpokePoolEvents, verifyFillRepayment, } from "./utils";
 import { isEVMSpokePoolClient, isSVMSpokePoolClient } from "../SpokePoolClient";
 import { SpokePoolManager } from "../SpokePoolClient/SpokePoolClientManager";
 // max(uint256) - 1
@@ -240,332 +240,6 @@ var BundleDataClient = /** @class */ (function () {
             });
         });
     };
-    // @dev This function should probably be moved to the InventoryClient since it bypasses loadData completely now.
-    BundleDataClient.prototype.getPendingRefundsFromValidBundles = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var refunds, bundle, _a, _b;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0:
-                        refunds = [];
-                        if (!this.clients.hubPoolClient.isUpdated) {
-                            throw new Error("BundleDataClient::getPendingRefundsFromValidBundles HubPoolClient not updated.");
-                        }
-                        bundle = this.clients.hubPoolClient.getLatestFullyExecutedRootBundle(this.clients.hubPoolClient.latestHeightSearched);
-                        if (!(bundle !== undefined)) return [3 /*break*/, 2];
-                        _b = (_a = refunds).push;
-                        return [4 /*yield*/, this.getPendingRefundsFromBundle(bundle)];
-                    case 1:
-                        _b.apply(_a, [_c.sent()]);
-                        _c.label = 2;
-                    case 2: // No more valid bundles in history!
-                    return [2 /*return*/, refunds];
-                }
-            });
-        });
-    };
-    // @dev This function should probably be moved to the InventoryClient since it bypasses loadData completely now.
-    // Return refunds from input bundle.
-    BundleDataClient.prototype.getPendingRefundsFromBundle = function (bundle) {
-        return __awaiter(this, void 0, void 0, function () {
-            var nextBundleMainnetStartBlock, chainIds, bundleEvaluationBlockRanges, combinedRefunds, arweaveData, bundleFillsV3, expiredDepositsToRefundV3;
-            var _this = this;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        nextBundleMainnetStartBlock = this.clients.hubPoolClient.getNextBundleStartBlockNumber(this.chainIdListForBundleEvaluationBlockNumbers, this.clients.hubPoolClient.latestHeightSearched, this.clients.hubPoolClient.chainId);
-                        chainIds = this.clients.configStoreClient.getChainIdIndicesForBlock(nextBundleMainnetStartBlock);
-                        bundleEvaluationBlockRanges = getImpliedBundleBlockRanges(this.clients.hubPoolClient, this.clients.configStoreClient, bundle);
-                        return [4 /*yield*/, this.loadArweaveData(bundleEvaluationBlockRanges)];
-                    case 1:
-                        arweaveData = _a.sent();
-                        if (!!isDefined(arweaveData)) return [3 /*break*/, 3];
-                        return [4 /*yield*/, this.getApproximateRefundsForBlockRange(chainIds, bundleEvaluationBlockRanges)];
-                    case 2:
-                        combinedRefunds = _a.sent();
-                        return [3 /*break*/, 4];
-                    case 3:
-                        bundleFillsV3 = arweaveData.bundleFillsV3, expiredDepositsToRefundV3 = arweaveData.expiredDepositsToRefundV3;
-                        combinedRefunds = getRefundsFromBundle(bundleFillsV3, expiredDepositsToRefundV3);
-                        // If we don't have a spoke pool client for a chain, then we won't be able to deduct refunds correctly for this
-                        // chain. For most of the pending bundle's liveness period, these past refunds are already executed so this is
-                        // a reasonable assumption. This empty refund chain also matches what the alternative
-                        // `getApproximateRefundsForBlockRange` would return.
-                        Object.keys(combinedRefunds).forEach(function (chainId) {
-                            if (!_this.spokePoolClientManager.getClient(Number(chainId))) {
-                                delete combinedRefunds[Number(chainId)];
-                            }
-                        });
-                        _a.label = 4;
-                    case 4: 
-                    // The latest proposed bundle's refund leaves might have already been partially or entirely executed.
-                    // We have to deduct the executed amounts from the total refund amounts.
-                    return [2 /*return*/, this.deductExecutedRefunds(combinedRefunds, bundle)];
-                }
-            });
-        });
-    };
-    // @dev This helper function should probably be moved to the InventoryClient
-    BundleDataClient.prototype.getApproximateRefundsForBlockRange = function (chainIds, blockRanges) {
-        return __awaiter(this, void 0, void 0, function () {
-            var refundsForChain, bundleEndBlockForMainnet, _loop_1, this_1, _i, chainIds_1, chainId;
-            var _this = this;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        refundsForChain = {};
-                        bundleEndBlockForMainnet = blockRanges[0][1];
-                        _loop_1 = function (chainId) {
-                            var spokePoolClient, chainIndex, fillsToCount;
-                            return __generator(this, function (_b) {
-                                switch (_b.label) {
-                                    case 0:
-                                        spokePoolClient = this_1.spokePoolClientManager.getClient(chainId);
-                                        if (!isDefined(spokePoolClient)) {
-                                            return [2 /*return*/, "continue"];
-                                        }
-                                        chainIndex = chainIds.indexOf(chainId);
-                                        fillsToCount = spokePoolClient.getFills().filter(function (fill) {
-                                            if (fill.blockNumber < blockRanges[chainIndex][0] ||
-                                                fill.blockNumber > blockRanges[chainIndex][1] ||
-                                                isZeroValueFillOrSlowFillRequest(fill) ||
-                                                invalidOutputToken(fill)) {
-                                                return false;
-                                            }
-                                            var originSpokePoolClient = _this.spokePoolClientManager.getClient(fill.originChainId);
-                                            // If origin spoke pool client isn't defined, we can't validate it.
-                                            if (!isDefined(originSpokePoolClient)) {
-                                                return false;
-                                            }
-                                            var matchingDeposit = originSpokePoolClient.getDeposit(fill.depositId);
-                                            var hasMatchingDeposit = matchingDeposit !== undefined && getRelayEventKey(fill) === getRelayEventKey(matchingDeposit);
-                                            return hasMatchingDeposit;
-                                        });
-                                        return [4 /*yield*/, forEachAsync(fillsToCount, function (_fill) { return __awaiter(_this, void 0, void 0, function () {
-                                                var originChain, originSpokePoolClient, matchingDeposit, spokeClient, provider, fill, _a, chainToSendRefundTo, repaymentToken, relayer, refundAmount, existingRefundAmount;
-                                                var _b, _c, _d;
-                                                var _e, _f;
-                                                return __generator(this, function (_g) {
-                                                    switch (_g.label) {
-                                                        case 0:
-                                                            originChain = getNetworkName(_fill.originChainId);
-                                                            originSpokePoolClient = this.spokePoolClientManager.getClient(_fill.originChainId);
-                                                            assert(isDefined(originSpokePoolClient), "No SpokePoolClient for chain ".concat(originChain));
-                                                            matchingDeposit = originSpokePoolClient.getDeposit(_fill.depositId);
-                                                            assert(isDefined(matchingDeposit), "No ".concat(originChain, " deposit found for ").concat(getNetworkName(_fill.destinationChainId), " fill ").concat(_fill.depositId));
-                                                            spokeClient = this.spokePoolClientManager.getClient(_fill.destinationChainId);
-                                                            assert(isDefined(spokeClient), "SpokePoolClient for ".concat(getNetworkName(_fill.destinationChainId), " not found for fill."));
-                                                            if (isEVMSpokePoolClient(spokeClient)) {
-                                                                provider = spokeClient.spokePool.provider;
-                                                            }
-                                                            else if (isSVMSpokePoolClient(spokeClient)) {
-                                                                provider = spokeClient.svmEventsClient.getRpc();
-                                                            }
-                                                            return [4 /*yield*/, verifyFillRepayment(_fill, provider, matchingDeposit, this.clients.hubPoolClient, bundleEndBlockForMainnet)];
-                                                        case 1:
-                                                            fill = _g.sent();
-                                                            if (!isDefined(fill)) {
-                                                                return [2 /*return*/];
-                                                            }
-                                                            _a = getRefundInformationFromFill(__assign(__assign({}, fill), { fromLiteChain: matchingDeposit.fromLiteChain }), this.clients.hubPoolClient, bundleEndBlockForMainnet), chainToSendRefundTo = _a.chainToSendRefundTo, repaymentToken = _a.repaymentToken;
-                                                            relayer = fill.relayer, refundAmount = fill.inputAmount;
-                                                            (_b = refundsForChain[chainToSendRefundTo]) !== null && _b !== void 0 ? _b : (refundsForChain[chainToSendRefundTo] = {});
-                                                            (_c = (_e = refundsForChain[chainToSendRefundTo])[_f = repaymentToken.toBytes32()]) !== null && _c !== void 0 ? _c : (_e[_f] = {});
-                                                            existingRefundAmount = (_d = refundsForChain[chainToSendRefundTo][repaymentToken.toBytes32()][relayer.toBytes32()]) !== null && _d !== void 0 ? _d : bnZero;
-                                                            refundsForChain[chainToSendRefundTo][repaymentToken.toBytes32()][relayer.toBytes32()] =
-                                                                existingRefundAmount.add(refundAmount);
-                                                            return [2 /*return*/];
-                                                    }
-                                                });
-                                            }); })];
-                                    case 1:
-                                        _b.sent();
-                                        return [2 /*return*/];
-                                }
-                            });
-                        };
-                        this_1 = this;
-                        _i = 0, chainIds_1 = chainIds;
-                        _a.label = 1;
-                    case 1:
-                        if (!(_i < chainIds_1.length)) return [3 /*break*/, 4];
-                        chainId = chainIds_1[_i];
-                        return [5 /*yield**/, _loop_1(chainId)];
-                    case 2:
-                        _a.sent();
-                        _a.label = 3;
-                    case 3:
-                        _i++;
-                        return [3 /*break*/, 1];
-                    case 4: return [2 /*return*/, refundsForChain];
-                }
-            });
-        });
-    };
-    BundleDataClient.prototype.getUpcomingDepositAmount = function (chainId, l2Token, latestBlockToSearch) {
-        var spokePoolClient = this.spokePoolClientManager.getClient(chainId);
-        if (!isDefined(spokePoolClient)) {
-            return toBN(0);
-        }
-        return spokePoolClient
-            .getDeposits()
-            .filter(function (deposit) { return deposit.blockNumber > latestBlockToSearch && deposit.inputToken.eq(l2Token); })
-            .reduce(function (acc, deposit) {
-            return acc.add(deposit.inputAmount);
-        }, toBN(0));
-    };
-    // @dev This function should probably be moved to the InventoryClient since it bypasses loadData completely now.
-    // Return refunds from the next valid bundle. This will contain any refunds that have been sent but are not included
-    // in a valid bundle with all of its leaves executed. This contains refunds from:
-    // - Bundles that passed liveness but have not had all of their pool rebalance leaves executed.
-    // - Bundles that are pending liveness
-    // - Fills sent after the pending, but not validated, bundle
-    BundleDataClient.prototype.getNextBundleRefunds = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            // Return block ranges for blocks after _pendingBlockRanges and up to widestBlockRanges.
-            // If a chain is disabled or doesn't have a spoke pool client, return a range of 0
-            function getBlockRangeDelta(_pendingBlockRanges) {
-                return widestBundleBlockRanges.map(function (blockRange, index) {
-                    var _a;
-                    // If pending block range doesn't have an entry for the widest range, which is possible when a new chain
-                    // is added to the CHAIN_ID_INDICES list, then simply set the initial block range to the widest block range.
-                    // This will produce a block range delta of 0 where the returned range for this chain is [widest[1], widest[1]].
-                    var initialBlockRange = (_a = _pendingBlockRanges[index]) !== null && _a !== void 0 ? _a : blockRange;
-                    // If chain is disabled, return disabled range
-                    if (initialBlockRange[0] === initialBlockRange[1]) {
-                        return initialBlockRange;
-                    }
-                    // If pending bundle end block exceeds widest end block or if widest end block is undefined
-                    // (which is possible if the spoke pool client for the chain is not defined), return an empty range since there are no
-                    // "new" events to consider for this chain.
-                    if (!isDefined(blockRange[1]) || initialBlockRange[1] >= blockRange[1]) {
-                        return [initialBlockRange[1], initialBlockRange[1]];
-                    }
-                    // If initialBlockRange][0] > widestBlockRange[0], then we'll ignore any blocks
-                    // between initialBlockRange[0] and widestBlockRange[0] (inclusive) for simplicity reasons. In practice
-                    // this should not happen.
-                    return [initialBlockRange[1] + 1, blockRange[1]];
-                });
-            }
-            var hubPoolClient, nextBundleMainnetStartBlock, chainIds, combinedRefunds, widestBundleBlockRanges, pendingBundleBlockRanges, arweaveData, _a, _b, bundleFillsV3, expiredDepositsToRefundV3, start, _c, _d;
-            return __generator(this, function (_e) {
-                switch (_e.label) {
-                    case 0:
-                        hubPoolClient = this.clients.hubPoolClient;
-                        nextBundleMainnetStartBlock = hubPoolClient.getNextBundleStartBlockNumber(this.chainIdListForBundleEvaluationBlockNumbers, hubPoolClient.latestHeightSearched, hubPoolClient.chainId);
-                        chainIds = this.clients.configStoreClient.getChainIdIndicesForBlock(nextBundleMainnetStartBlock);
-                        combinedRefunds = [];
-                        return [4 /*yield*/, getWidestPossibleExpectedBlockRange(chainIds, this.spokePoolClientManager.getSpokePoolClients(), getEndBlockBuffers(chainIds, this.blockRangeEndBlockBuffer), this.clients, this.clients.hubPoolClient.latestHeightSearched, this.clients.configStoreClient.getEnabledChains(this.clients.hubPoolClient.latestHeightSearched))];
-                    case 1:
-                        widestBundleBlockRanges = _e.sent();
-                        if (!hubPoolClient.hasPendingProposal()) return [3 /*break*/, 6];
-                        pendingBundleBlockRanges = getImpliedBundleBlockRanges(hubPoolClient, this.clients.configStoreClient, hubPoolClient.getLatestProposedRootBundle());
-                        return [4 /*yield*/, this.loadArweaveData(pendingBundleBlockRanges)];
-                    case 2:
-                        arweaveData = _e.sent();
-                        if (!!isDefined(arweaveData)) return [3 /*break*/, 4];
-                        _b = (_a = combinedRefunds).push;
-                        return [4 /*yield*/, this.getApproximateRefundsForBlockRange(chainIds, pendingBundleBlockRanges)];
-                    case 3:
-                        _b.apply(_a, [_e.sent()]);
-                        return [3 /*break*/, 5];
-                    case 4:
-                        bundleFillsV3 = arweaveData.bundleFillsV3, expiredDepositsToRefundV3 = arweaveData.expiredDepositsToRefundV3;
-                        combinedRefunds.push(getRefundsFromBundle(bundleFillsV3, expiredDepositsToRefundV3));
-                        _e.label = 5;
-                    case 5:
-                        // Shorten the widestBundleBlockRanges now to not double count the pending bundle blocks.
-                        widestBundleBlockRanges = getBlockRangeDelta(pendingBundleBlockRanges);
-                        _e.label = 6;
-                    case 6:
-                        start = performance.now();
-                        _d = (_c = combinedRefunds).push;
-                        return [4 /*yield*/, this.getApproximateRefundsForBlockRange(chainIds, widestBundleBlockRanges)];
-                    case 7:
-                        _d.apply(_c, [_e.sent()]);
-                        this.logger.debug({
-                            at: "BundleDataClient#getNextBundleRefunds",
-                            message: "Loading approximate refunds for next bundle in ".concat(Math.round(performance.now() - start) / 1000, "s."),
-                            blockRanges: JSON.stringify(widestBundleBlockRanges),
-                        });
-                        return [2 /*return*/, combinedRefunds];
-                }
-            });
-        });
-    };
-    // @dev This helper function should probably be moved to the InventoryClient
-    BundleDataClient.prototype.getExecutedRefunds = function (spokePoolClient, relayerRefundRoot) {
-        var _a, _b;
-        if (!isDefined(spokePoolClient)) {
-            return {};
-        }
-        // @dev Search from right to left since there can be multiple root bundles with the same relayer refund root.
-        // The caller should take caution if they're trying to use this function to find matching refunds for older
-        // root bundles as opposed to more recent ones.
-        var bundle = _.findLast(spokePoolClient.getRootBundleRelays(), function (bundle) { return bundle.relayerRefundRoot === relayerRefundRoot; });
-        if (bundle === undefined) {
-            return {};
-        }
-        var executedRefundLeaves = spokePoolClient
-            .getRelayerRefundExecutions()
-            .filter(function (leaf) { return leaf.rootBundleId === bundle.rootBundleId; });
-        var executedRefunds = {};
-        for (var _i = 0, executedRefundLeaves_1 = executedRefundLeaves; _i < executedRefundLeaves_1.length; _i++) {
-            var refundLeaf = executedRefundLeaves_1[_i];
-            var tokenAddress = refundLeaf.l2TokenAddress.toBytes32();
-            var executedTokenRefunds = ((_a = executedRefunds[tokenAddress]) !== null && _a !== void 0 ? _a : (executedRefunds[tokenAddress] = {}));
-            for (var i = 0; i < refundLeaf.refundAddresses.length; i++) {
-                var relayer = refundLeaf.refundAddresses[i].toBytes32();
-                var refundAmount = refundLeaf.refundAmounts[i];
-                (_b = executedTokenRefunds[relayer]) !== null && _b !== void 0 ? _b : (executedTokenRefunds[relayer] = bnZero);
-                executedTokenRefunds[relayer] = executedTokenRefunds[relayer].add(refundAmount);
-            }
-        }
-        return executedRefunds;
-    };
-    // @dev This helper function should probably be moved to the InventoryClient
-    BundleDataClient.prototype.deductExecutedRefunds = function (allRefunds, bundleContainingRefunds) {
-        for (var _i = 0, _a = Object.keys(allRefunds); _i < _a.length; _i++) {
-            var chainIdStr = _a[_i];
-            var chainId = Number(chainIdStr);
-            var spokePoolClient = this.spokePoolClientManager.getClient(chainId);
-            if (!isDefined(spokePoolClient)) {
-                continue;
-            }
-            var executedRefunds = this.getExecutedRefunds(spokePoolClient, bundleContainingRefunds.relayerRefundRoot);
-            for (var _b = 0, _c = Object.keys(allRefunds[chainId]); _b < _c.length; _b++) {
-                var tokenAddress = _c[_b];
-                var refunds = allRefunds[chainId][tokenAddress];
-                if (executedRefunds[tokenAddress] === undefined || refunds === undefined) {
-                    continue;
-                }
-                for (var _d = 0, _e = Object.keys(refunds); _d < _e.length; _d++) {
-                    var relayer = _e[_d];
-                    var executedAmount = executedRefunds[tokenAddress][relayer];
-                    if (executedAmount === undefined) {
-                        continue;
-                    }
-                    // Since there should only be a single executed relayer refund leaf for each relayer-token-chain combination,
-                    // we can deduct this refund and mark it as executed if the executed amount is > 0.
-                    refunds[relayer] = bnZero;
-                }
-            }
-        }
-        return allRefunds;
-    };
-    BundleDataClient.prototype.getRefundsFor = function (bundleRefunds, relayer, chainId, token) {
-        if (!bundleRefunds[chainId] || !bundleRefunds[chainId][token.toBytes32()]) {
-            return BigNumber.from(0);
-        }
-        var allRefunds = bundleRefunds[chainId][token.toBytes32()];
-        return allRefunds && allRefunds[relayer.toBytes32()] ? allRefunds[relayer.toBytes32()] : BigNumber.from(0);
-    };
-    BundleDataClient.prototype.getTotalRefund = function (refunds, relayer, chainId, refundToken) {
-        var _this = this;
-        return refunds.reduce(function (totalRefund, refunds) {
-            return totalRefund.add(_this.getRefundsFor(refunds, relayer, chainId, refundToken));
-        }, bnZero);
-    };
     BundleDataClient.prototype.loadArweaveData = function (blockRangesForChains) {
         return __awaiter(this, void 0, void 0, function () {
             var arweaveKey, arweaveData, _a, _b;
@@ -622,10 +296,10 @@ var BundleDataClient = /** @class */ (function () {
     };
     BundleDataClient.prototype.loadDataFromScratch = function (blockRangesForChains, spokePoolClients) {
         return __awaiter(this, void 0, void 0, function () {
-            var start, key, chainIds, bundleEndBlockForMainnet, bundleDepositsV3, bundleFillsV3, bundleInvalidFillsV3, bundleUnrepayableFillsV3, bundleInvalidSlowFillRequests, bundleSlowFillsV3, expiredDepositsToRefundV3, unexecutableSlowFills, _isChainDisabled, _canCreateSlowFillLeaf, _depositIsExpired, _getFillStatusForDeposit, allChainIds, _cachedBundleTimestamps, bundleBlockTimestamps, v3RelayHashes, bundleDepositHashes, olderDepositHashes, decodeBundleDepositHash, _loop_2, _i, allChainIds_1, originChainId, validatedBundleV3Fills, validatedBundleSlowFills, validatedBundleUnexecutableSlowFills, fillCounter, _loop_3, _a, allChainIds_2, originChainId, promises, _b, v3FillLpFees, v3SlowFillLpFees, v3UnexecutableSlowFillLpFees, v3SpokeEventsReadable, invalidFillsWithPartialMatchedDeposits_1, preFillsForNextBundle_1, unknownReasonInvalidFills_1;
+            var start, key, _a, bundleStartBlockForMainnet, bundleEndBlockForMainnet, chainIds, bundleDepositsV3, bundleFillsV3, bundleInvalidFillsV3, bundleUnrepayableFillsV3, bundleInvalidSlowFillRequests, bundleSlowFillsV3, expiredDepositsToRefundV3, unexecutableSlowFills, _canCreateSlowFillLeaf, _depositIsExpired, _getFillStatusForDeposit, allChainIds, _cachedBundleTimestamps, bundleBlockTimestamps, v3RelayHashes, bundleDepositHashes, olderDepositHashes, decodeBundleDepositHash, _loop_1, _i, allChainIds_1, originChainId, validatedBundleV3Fills, validatedBundleSlowFills, validatedBundleUnexecutableSlowFills, fillCounter, _loop_2, _b, allChainIds_2, originChainId, promises, _c, v3FillLpFees, v3SlowFillLpFees, v3UnexecutableSlowFillLpFees, v3SpokeEventsReadable, invalidFillsWithPartialMatchedDeposits_1, preFillsForNextBundle_1, unknownReasonInvalidFills_1;
             var _this = this;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
                         start = performance.now();
                         key = JSON.stringify(blockRangesForChains);
@@ -635,8 +309,8 @@ var BundleDataClient = /** @class */ (function () {
                         else if (!this.clients.hubPoolClient.isUpdated) {
                             throw new Error("HubPoolClient not updated");
                         }
-                        chainIds = this.clients.configStoreClient.getChainIdIndicesForBlock(blockRangesForChains[0][0]);
-                        bundleEndBlockForMainnet = blockRangesForChains[0][1];
+                        _a = blockRangesForChains[0], bundleStartBlockForMainnet = _a[0], bundleEndBlockForMainnet = _a[1];
+                        chainIds = this.clients.configStoreClient.getChainIdIndicesForBlock(bundleStartBlockForMainnet);
                         if (blockRangesForChains.length > chainIds.length) {
                             throw new Error("Unexpected block range list length of ".concat(blockRangesForChains.length, ", should be <= ").concat(chainIds.length));
                         }
@@ -648,10 +322,6 @@ var BundleDataClient = /** @class */ (function () {
                         bundleSlowFillsV3 = {};
                         expiredDepositsToRefundV3 = {};
                         unexecutableSlowFills = {};
-                        _isChainDisabled = function (chainId) {
-                            var blockRangeForChain = getBlockRangeForChain(blockRangesForChains, chainId, chainIds);
-                            return isChainDisabled(blockRangeForChain);
-                        };
                         _canCreateSlowFillLeaf = function (deposit) {
                             return (
                             // Cannot slow fill when input and output tokens are not equivalent.
@@ -674,7 +344,10 @@ var BundleDataClient = /** @class */ (function () {
                         };
                         allChainIds = blockRangesForChains
                             .map(function (_blockRange, index) { return chainIds[index]; })
-                            .filter(function (chainId) { return !_isChainDisabled(chainId) && spokePoolClients[chainId] !== undefined; });
+                            .filter(function (chainId) {
+                            return !isChainDisabledAtBlock(chainId, bundleStartBlockForMainnet, _this.clients.configStoreClient) &&
+                                spokePoolClients[chainId] !== undefined;
+                        });
                         allChainIds.forEach(function (chainId) {
                             var spokePoolClient = spokePoolClients[chainId];
                             if (!spokePoolClient.isUpdated) {
@@ -686,7 +359,7 @@ var BundleDataClient = /** @class */ (function () {
                         if (!!_cachedBundleTimestamps) return [3 /*break*/, 2];
                         return [4 /*yield*/, this.getBundleBlockTimestamps(chainIds, blockRangesForChains, spokePoolClients)];
                     case 1:
-                        bundleBlockTimestamps = _c.sent();
+                        bundleBlockTimestamps = _d.sent();
                         this.setBundleTimestampsInCache(key, bundleBlockTimestamps);
                         this.logger.debug({
                             at: "BundleDataClient#loadData",
@@ -697,7 +370,7 @@ var BundleDataClient = /** @class */ (function () {
                         return [3 /*break*/, 3];
                     case 2:
                         bundleBlockTimestamps = _cachedBundleTimestamps;
-                        _c.label = 3;
+                        _d.label = 3;
                     case 3:
                         v3RelayHashes = {};
                         bundleDepositHashes = [];
@@ -706,11 +379,11 @@ var BundleDataClient = /** @class */ (function () {
                             var _a = depositHash.split("@"), relayDataHash = _a[0], i = _a[1];
                             return { relayDataHash: relayDataHash, index: Number(i) };
                         };
-                        _loop_2 = function (originChainId) {
+                        _loop_1 = function (originChainId) {
                             var originClient = spokePoolClients[originChainId];
                             var originChainBlockRange = getBlockRangeForChain(blockRangesForChains, originChainId, chainIds);
-                            for (var _d = 0, allChainIds_3 = allChainIds; _d < allChainIds_3.length; _d++) {
-                                var destinationChainId = allChainIds_3[_d];
+                            for (var _e = 0, allChainIds_3 = allChainIds; _e < allChainIds_3.length; _e++) {
+                                var destinationChainId = allChainIds_3[_e];
                                 originClient.getDepositsForDestinationChainWithDuplicates(destinationChainId).forEach(function (deposit) {
                                     var _a, _b;
                                     if (deposit.blockNumber > originChainBlockRange[1] || isZeroValueDeposit(deposit)) {
@@ -761,7 +434,7 @@ var BundleDataClient = /** @class */ (function () {
                         // for convenient matching with fills.
                         for (_i = 0, allChainIds_1 = allChainIds; _i < allChainIds_1.length; _i++) {
                             originChainId = allChainIds_1[_i];
-                            _loop_2(originChainId);
+                            _loop_1(originChainId);
                         }
                         this.logger.debug({
                             at: "BundleDataClient#loadData",
@@ -772,16 +445,16 @@ var BundleDataClient = /** @class */ (function () {
                         validatedBundleSlowFills = [];
                         validatedBundleUnexecutableSlowFills = [];
                         fillCounter = 0;
-                        _loop_3 = function (originChainId) {
-                            var originClient, _loop_4, _e, allChainIds_4, destinationChainId;
-                            return __generator(this, function (_f) {
-                                switch (_f.label) {
+                        _loop_2 = function (originChainId) {
+                            var originClient, _loop_3, _f, allChainIds_4, destinationChainId;
+                            return __generator(this, function (_g) {
+                                switch (_g.label) {
                                     case 0:
                                         originClient = spokePoolClients[originChainId];
-                                        _loop_4 = function (destinationChainId) {
+                                        _loop_3 = function (destinationChainId) {
                                             var destinationClient, destinationChainBlockRange, originChainBlockRange, fastFillsReplacingSlowFills;
-                                            return __generator(this, function (_g) {
-                                                switch (_g.label) {
+                                            return __generator(this, function (_h) {
+                                                switch (_h.label) {
                                                     case 0:
                                                         destinationClient = spokePoolClients[destinationChainId];
                                                         destinationChainBlockRange = getBlockRangeForChain(blockRangesForChains, destinationChainId, chainIds);
@@ -921,7 +594,7 @@ var BundleDataClient = /** @class */ (function () {
                                                                 });
                                                             }); })];
                                                     case 1:
-                                                        _g.sent();
+                                                        _h.sent();
                                                         // Process slow fill requests and produce slow fill leaves while maintaining the following the invariants:
                                                         // - Slow fill leaves cannot be produced for deposits that have expired in this bundle.
                                                         // - Slow fill leaves cannot be produced for deposits that have been filled.
@@ -1017,7 +690,7 @@ var BundleDataClient = /** @class */ (function () {
                                                         // - Duplicate slow fill requests for the same relay data hash are impossible to send.
                                                         // - Slow fill requests can only be sent before the deposit's fillDeadline.
                                                         // - Slow fill requests for a deposit that has been filled.
-                                                        _g.sent();
+                                                        _h.sent();
                                                         // Process deposits and maintain the following invariants:
                                                         // - Deposits matching fills that are not type SlowFill from previous bundle block ranges should produce
                                                         // refunds for those fills.
@@ -1161,7 +834,7 @@ var BundleDataClient = /** @class */ (function () {
                                                         // - We've created slow fill leaves for all slow fill requests in this bundle matching an unfilled deposit.
                                                         // - Deposits for the same relay data hash can be sent an arbitrary amount of times.
                                                         // - Deposits can be sent an arbitrary amount of time after a fill has been sent for the matching relay data.
-                                                        _g.sent();
+                                                        _h.sent();
                                                         // For all fills that came after a slow fill request, we can now check if the slow fill request
                                                         // was a valid one and whether it was created in a previous bundle. If so, then it created a slow fill
                                                         // leaf that is now unexecutable.
@@ -1194,33 +867,33 @@ var BundleDataClient = /** @class */ (function () {
                                                 }
                                             });
                                         };
-                                        _e = 0, allChainIds_4 = allChainIds;
-                                        _f.label = 1;
+                                        _f = 0, allChainIds_4 = allChainIds;
+                                        _g.label = 1;
                                     case 1:
-                                        if (!(_e < allChainIds_4.length)) return [3 /*break*/, 4];
-                                        destinationChainId = allChainIds_4[_e];
-                                        return [5 /*yield**/, _loop_4(destinationChainId)];
+                                        if (!(_f < allChainIds_4.length)) return [3 /*break*/, 4];
+                                        destinationChainId = allChainIds_4[_f];
+                                        return [5 /*yield**/, _loop_3(destinationChainId)];
                                     case 2:
-                                        _f.sent();
-                                        _f.label = 3;
+                                        _g.sent();
+                                        _g.label = 3;
                                     case 3:
-                                        _e++;
+                                        _f++;
                                         return [3 /*break*/, 1];
                                     case 4: return [2 /*return*/];
                                 }
                             });
                         };
-                        _a = 0, allChainIds_2 = allChainIds;
-                        _c.label = 4;
+                        _b = 0, allChainIds_2 = allChainIds;
+                        _d.label = 4;
                     case 4:
-                        if (!(_a < allChainIds_2.length)) return [3 /*break*/, 7];
-                        originChainId = allChainIds_2[_a];
-                        return [5 /*yield**/, _loop_3(originChainId)];
+                        if (!(_b < allChainIds_2.length)) return [3 /*break*/, 7];
+                        originChainId = allChainIds_2[_b];
+                        return [5 /*yield**/, _loop_2(originChainId)];
                     case 5:
-                        _c.sent();
-                        _c.label = 6;
+                        _d.sent();
+                        _d.label = 6;
                     case 6:
-                        _a++;
+                        _b++;
                         return [3 /*break*/, 4];
                     case 7:
                         this.logger.debug({
@@ -1287,7 +960,7 @@ var BundleDataClient = /** @class */ (function () {
                         // For all deposits older than this bundle, we need to check if they expired in this bundle and if they did,
                         // whether there was a slow fill created for it in a previous bundle that is now unexecutable and replaced
                         // by a new expired deposit refund.
-                        _c.sent();
+                        _d.sent();
                         // Batch compute V3 lp fees.
                         start = performance.now();
                         promises = [
@@ -1314,7 +987,7 @@ var BundleDataClient = /** @class */ (function () {
                         ];
                         return [4 /*yield*/, Promise.all(promises)];
                     case 9:
-                        _b = _c.sent(), v3FillLpFees = _b[0], v3SlowFillLpFees = _b[1], v3UnexecutableSlowFillLpFees = _b[2];
+                        _c = _d.sent(), v3FillLpFees = _c[0], v3SlowFillLpFees = _c[1], v3UnexecutableSlowFillLpFees = _c[2];
                         this.logger.debug({
                             at: "BundleDataClient#loadData",
                             message: "Computed batch async LP fees in ".concat(performance.now() - start, "ms."),
@@ -1450,7 +1123,8 @@ var BundleDataClient = /** @class */ (function () {
                                     switch (_c.label) {
                                         case 0:
                                             blockRangeForChain = blockRangesForChains[index];
-                                            if (!isDefined(blockRangeForChain) || isChainDisabled(blockRangeForChain)) {
+                                            if (!isDefined(blockRangeForChain) ||
+                                                isChainDisabledAtBlock(chainId, blockRangesForChains[0][0], this.clients.configStoreClient)) {
                                                 return [2 /*return*/];
                                             }
                                             _startBlockForChain = blockRangeForChain[0], _endBlockForChain = blockRangeForChain[1];