@across-protocol/sdk 4.3.116-alpha.1 → 4.3.116-alpha.3

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

@@ -1,1165 +0,0 @@
-import { __assign, __awaiter, __generator, __rest } from "tslib";
-import assert from "assert";
-import _ from "lodash";
-import { FillType, FillStatus, } from "../../interfaces";
-import { findFillEvent as findEvmFillEvent } from "../../arch/evm";
-import { findFillEvent as findSvmFillEvent } from "../../arch/svm";
-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
-export var INFINITE_FILL_DEADLINE = bnUint32Max;
-// V3 dictionary helper functions
-function updateExpiredDepositsV3(dict, deposit) {
-    var _a, _b;
-    var _c, _d;
-    // A deposit refund for a deposit is invalid if the depositor has a bytes32 address input for an EVM chain. It is valid otherwise.
-    if (!deposit.depositor.isValidOn(deposit.originChainId)) {
-        return;
-    }
-    var originChainId = deposit.originChainId, inputToken = deposit.inputToken;
-    (_a = dict[originChainId]) !== null && _a !== void 0 ? _a : (dict[originChainId] = {});
-    (_b = (_c = dict[originChainId])[_d = inputToken.toBytes32()]) !== null && _b !== void 0 ? _b : (_c[_d] = []);
-    dict[originChainId][inputToken.toBytes32()].push(deposit);
-}
-function updateBundleDepositsV3(dict, deposit) {
-    var _a, _b;
-    var _c, _d;
-    var originChainId = deposit.originChainId, inputToken = deposit.inputToken;
-    (_a = dict[originChainId]) !== null && _a !== void 0 ? _a : (dict[originChainId] = {});
-    (_b = (_c = dict[originChainId])[_d = inputToken.toBytes32()]) !== null && _b !== void 0 ? _b : (_c[_d] = []);
-    dict[originChainId][inputToken.toBytes32()].push(deposit);
-}
-function updateBundleFillsV3(dict, fill, lpFeePct, repaymentChainId, repaymentToken, repaymentAddress) {
-    var _a, _b, _c;
-    var _d, _e;
-    // We shouldn't pass any unrepayable fills into this function, so we perform an extra safety check.
-    if (!fill.relayer.isValidOn(repaymentChainId)) {
-        return;
-    }
-    (_a = dict[repaymentChainId]) !== null && _a !== void 0 ? _a : (dict[repaymentChainId] = {});
-    (_b = (_d = dict[repaymentChainId])[_e = repaymentToken.toBytes32()]) !== null && _b !== void 0 ? _b : (_d[_e] = {
-        fills: [],
-        totalRefundAmount: bnZero,
-        realizedLpFees: bnZero,
-        refunds: {},
-    });
-    var bundleFill = __assign(__assign({}, fill), { lpFeePct: lpFeePct, relayer: repaymentAddress });
-    // Add all fills, slow and fast, to dictionary.
-    assign(dict, [repaymentChainId, repaymentToken.toBytes32(), "fills"], [bundleFill]);
-    // All fills update the bundle LP fees.
-    var refundObj = dict[repaymentChainId][repaymentToken.toBytes32()];
-    var realizedLpFee = bundleFill.inputAmount.mul(bundleFill.lpFeePct).div(fixedPointAdjustment);
-    refundObj.realizedLpFees = refundObj.realizedLpFees ? refundObj.realizedLpFees.add(realizedLpFee) : realizedLpFee;
-    // Only fast fills get refunded.
-    if (!isSlowFill(bundleFill)) {
-        var refundAmount = bundleFill.inputAmount.mul(fixedPointAdjustment.sub(lpFeePct)).div(fixedPointAdjustment);
-        refundObj.totalRefundAmount = refundObj.totalRefundAmount
-            ? refundObj.totalRefundAmount.add(refundAmount)
-            : refundAmount;
-        // Instantiate dictionary if it doesn't exist.
-        (_c = refundObj.refunds) !== null && _c !== void 0 ? _c : (refundObj.refunds = {});
-        if (refundObj.refunds[bundleFill.relayer.toBytes32()]) {
-            refundObj.refunds[bundleFill.relayer.toBytes32()] =
-                refundObj.refunds[bundleFill.relayer.toBytes32()].add(refundAmount);
-        }
-        else {
-            refundObj.refunds[bundleFill.relayer.toBytes32()] = refundAmount;
-        }
-    }
-}
-function updateBundleExcessSlowFills(dict, deposit) {
-    var _a, _b;
-    var _c, _d;
-    var destinationChainId = deposit.destinationChainId, outputToken = deposit.outputToken;
-    (_a = dict[destinationChainId]) !== null && _a !== void 0 ? _a : (dict[destinationChainId] = {});
-    (_b = (_c = dict[destinationChainId])[_d = outputToken.toBytes32()]) !== null && _b !== void 0 ? _b : (_c[_d] = []);
-    dict[destinationChainId][outputToken.toBytes32()].push(deposit);
-}
-function updateBundleSlowFills(dict, deposit) {
-    var _a, _b;
-    var _c, _d;
-    if (!deposit.recipient.isValidOn(deposit.destinationChainId)) {
-        return;
-    }
-    var destinationChainId = deposit.destinationChainId, outputToken = deposit.outputToken;
-    (_a = dict[destinationChainId]) !== null && _a !== void 0 ? _a : (dict[destinationChainId] = {});
-    (_b = (_c = dict[destinationChainId])[_d = outputToken.toBytes32()]) !== null && _b !== void 0 ? _b : (_c[_d] = []);
-    dict[destinationChainId][outputToken.toBytes32()].push(deposit);
-}
-// @notice Shared client for computing data needed to construct or validate a bundle.
-var BundleDataClient = /** @class */ (function () {
-    // eslint-disable-next-line no-useless-constructor
-    function BundleDataClient(logger, clients, spokePoolClients, chainIdListForBundleEvaluationBlockNumbers, blockRangeEndBlockBuffer) {
-        if (blockRangeEndBlockBuffer === void 0) { blockRangeEndBlockBuffer = {}; }
-        this.logger = logger;
-        this.clients = clients;
-        this.chainIdListForBundleEvaluationBlockNumbers = chainIdListForBundleEvaluationBlockNumbers;
-        this.blockRangeEndBlockBuffer = blockRangeEndBlockBuffer;
-        this.loadDataCache = {};
-        this.arweaveDataCache = {};
-        this.bundleTimestampCache = {};
-        this.spokePoolClientManager = new SpokePoolManager(logger, spokePoolClients);
-    }
-    // This should be called whenever it's possible that the loadData information for a block range could have changed.
-    // For instance, if the spoke or hub clients have been updated, it probably makes sense to clear this to be safe.
-    BundleDataClient.prototype.clearCache = function () {
-        this.loadDataCache = {};
-    };
-    BundleDataClient.prototype.loadDataFromCache = function (key) {
-        return __awaiter(this, void 0, void 0, function () {
-            var _a, _b;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0:
-                        _b = (_a = _).cloneDeep;
-                        return [4 /*yield*/, this.loadDataCache[key]];
-                    case 1: 
-                    // Always return a deep cloned copy of object stored in cache. Since JS passes by reference instead of value, we
-                    // want to minimize the risk that the programmer accidentally mutates data in the cache.
-                    return [2 /*return*/, _b.apply(_a, [_c.sent()])];
-                }
-            });
-        });
-    };
-    BundleDataClient.prototype.getBundleTimestampsFromCache = function (key) {
-        if (this.bundleTimestampCache[key]) {
-            return _.cloneDeep(this.bundleTimestampCache[key]);
-        }
-        return undefined;
-    };
-    BundleDataClient.prototype.setBundleTimestampsInCache = function (key, timestamps) {
-        this.bundleTimestampCache[key] = timestamps;
-    };
-    BundleDataClient.getArweaveClientKey = function (blockRangesForChains) {
-        // As a unique key for this bundle, use the bundle mainnet end block, which should
-        // never be duplicated between bundles as long as thebundle block range
-        // always progresses forwards, which I think is a safe assumption. Other chains might pause
-        // but mainnet should never pause.
-        return blockRangesForChains[0][1].toString();
-    };
-    BundleDataClient.prototype.getArweaveBundleDataClientKey = function (blockRangesForChains) {
-        return "bundles-".concat(BundleDataClient.getArweaveClientKey(blockRangesForChains));
-    };
-    BundleDataClient.prototype.loadPersistedDataFromArweave = function (blockRangesForChains) {
-        return __awaiter(this, void 0, void 0, function () {
-            var start, persistedData, convertTypedStringRecordIntoNumericRecord, convertSortableEventFieldsIntoRequiredFields, convertEmbeddedSortableEventFieldsIntoRequiredFields, data, bundleData;
-            var _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        if (!isDefined((_a = this.clients) === null || _a === void 0 ? void 0 : _a.arweaveClient)) {
-                            return [2 /*return*/, undefined];
-                        }
-                        start = performance.now();
-                        return [4 /*yield*/, this.clients.arweaveClient.getByTopic(this.getArweaveBundleDataClientKey(blockRangesForChains), BundleDataSS)];
-                    case 1:
-                        persistedData = _b.sent();
-                        // If there is no data or the data is empty, return undefined because we couldn't
-                        // pull info from the Arweave persistence layer.
-                        if (!isDefined(persistedData) || persistedData.length < 1) {
-                            return [2 /*return*/, undefined];
-                        }
-                        convertTypedStringRecordIntoNumericRecord = function (data) {
-                            return Object.keys(data).reduce(function (acc, chainId) {
-                                acc[Number(chainId)] = data[chainId];
-                                return acc;
-                            }, {});
-                        };
-                        convertSortableEventFieldsIntoRequiredFields = function (data) {
-                            return data.map(function (item) {
-                                // For txnIndex/transactionIndex: throw if both are defined or both are missing.
-                                if ((item.txnIndex !== undefined && item.transactionIndex !== undefined) ||
-                                    (item.txnIndex === undefined && item.transactionIndex === undefined)) {
-                                    throw new Error("Either txnIndex or transactionIndex must be defined, but not both.");
-                                }
-                                // For txnRef/transactionHash: throw if both are defined or both are missing.
-                                if ((item.txnRef !== undefined && item.transactionHash !== undefined) ||
-                                    (item.txnRef === undefined && item.transactionHash === undefined)) {
-                                    throw new Error("Either txnRef or transactionHash must be defined, but not both.");
-                                }
-                                // Destructure the fields we don't need anymore
-                                var txnIndex = item.txnIndex, transactionIndex = item.transactionIndex, txnRef = item.txnRef, transactionHash = item.transactionHash, rest = __rest(item, ["txnIndex", "transactionIndex", "txnRef", "transactionHash"]);
-                                // Return a new object with normalized fields.
-                                // The non-null assertion (!) is safe here because our conditions ensure that one of each pair is defined.
-                                return __assign(__assign({}, rest), { txnIndex: txnIndex !== null && txnIndex !== void 0 ? txnIndex : transactionIndex, txnRef: txnRef !== null && txnRef !== void 0 ? txnRef : transactionHash });
-                            });
-                        };
-                        convertEmbeddedSortableEventFieldsIntoRequiredFields = function (data) {
-                            return Object.fromEntries(Object.entries(data).map(function (_a) {
-                                var chainId = _a[0], tokenData = _a[1];
-                                return [
-                                    chainId,
-                                    Object.fromEntries(Object.entries(tokenData).map(function (_a) {
-                                        var token = _a[0], data = _a[1];
-                                        return [
-                                            token,
-                                            convertSortableEventFieldsIntoRequiredFields(data),
-                                        ];
-                                    })),
-                                ];
-                            }));
-                        };
-                        data = persistedData[0].data;
-                        bundleData = {
-                            bundleFillsV3: convertTypedStringRecordIntoNumericRecord(Object.fromEntries(Object.entries(data.bundleFillsV3).map(function (_a) {
-                                var chainId = _a[0], tokenData = _a[1];
-                                return [
-                                    chainId,
-                                    Object.fromEntries(Object.entries(tokenData).map(function (_a) {
-                                        var token = _a[0], data = _a[1];
-                                        return [
-                                            token,
-                                            {
-                                                refunds: Object.fromEntries(Object.entries(data.refunds).map(function (_a) {
-                                                    var refundAddress = _a[0], refund = _a[1];
-                                                    return [toBytes32(refundAddress), refund];
-                                                })),
-                                                totalRefundAmount: data.totalRefundAmount,
-                                                realizedLpFees: data.realizedLpFees,
-                                                fills: convertSortableEventFieldsIntoRequiredFields(data.fills),
-                                            },
-                                        ];
-                                    })),
-                                ];
-                            }))),
-                            expiredDepositsToRefundV3: convertTypedStringRecordIntoNumericRecord(convertEmbeddedSortableEventFieldsIntoRequiredFields(data.expiredDepositsToRefundV3)),
-                            bundleDepositsV3: convertTypedStringRecordIntoNumericRecord(convertEmbeddedSortableEventFieldsIntoRequiredFields(data.bundleDepositsV3)),
-                            unexecutableSlowFills: convertTypedStringRecordIntoNumericRecord(convertEmbeddedSortableEventFieldsIntoRequiredFields(data.unexecutableSlowFills)),
-                            bundleSlowFillsV3: convertTypedStringRecordIntoNumericRecord(convertEmbeddedSortableEventFieldsIntoRequiredFields(data.bundleSlowFillsV3)),
-                        };
-                        this.logger.debug({
-                            at: "BundleDataClient#loadPersistedDataFromArweave",
-                            message: "Loaded persisted data from Arweave in ".concat(Math.round(performance.now() - start) / 1000, "s."),
-                            blockRanges: JSON.stringify(blockRangesForChains),
-                            bundleData: prettyPrintV3SpokePoolEvents(bundleData.bundleDepositsV3, bundleData.bundleFillsV3, bundleData.bundleSlowFillsV3, bundleData.expiredDepositsToRefundV3, bundleData.unexecutableSlowFills),
-                        });
-                        return [2 /*return*/, bundleData];
-                }
-            });
-        });
-    };
-    BundleDataClient.prototype.loadArweaveData = function (blockRangesForChains) {
-        return __awaiter(this, void 0, void 0, function () {
-            var arweaveKey, arweaveData, _a, _b;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0:
-                        arweaveKey = this.getArweaveBundleDataClientKey(blockRangesForChains);
-                        // eslint-disable-next-line @typescript-eslint/no-misused-promises
-                        if (!this.arweaveDataCache[arweaveKey]) {
-                            this.arweaveDataCache[arweaveKey] = this.loadPersistedDataFromArweave(blockRangesForChains);
-                        }
-                        _b = (_a = _).cloneDeep;
-                        return [4 /*yield*/, this.arweaveDataCache[arweaveKey]];
-                    case 1:
-                        arweaveData = _b.apply(_a, [_c.sent()]);
-                        return [2 /*return*/, arweaveData];
-                }
-            });
-        });
-    };
-    // Common data re-formatting logic shared across all data worker public functions.
-    // User must pass in spoke pool to search event data against. This allows the user to refund relays and fill deposits
-    // on deprecated spoke pools.
-    BundleDataClient.prototype.loadData = function (blockRangesForChains_1, spokePoolClients_1) {
-        return __awaiter(this, arguments, void 0, function (blockRangesForChains, spokePoolClients, attemptArweaveLoad) {
-            var key, arweaveData, data;
-            if (attemptArweaveLoad === void 0) { attemptArweaveLoad = false; }
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        key = JSON.stringify(blockRangesForChains);
-                        if (!!this.loadDataCache[key]) return [3 /*break*/, 4];
-                        arweaveData = void 0;
-                        if (!attemptArweaveLoad) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.loadArweaveData(blockRangesForChains)];
-                    case 1:
-                        arweaveData = _a.sent();
-                        return [3 /*break*/, 3];
-                    case 2:
-                        arweaveData = undefined;
-                        _a.label = 3;
-                    case 3:
-                        data = isDefined(arweaveData)
-                            ? // We can return the data to a Promise to keep the return type consistent.
-                                // Note: this is now a fast operation since we've already loaded the data from Arweave.
-                                Promise.resolve(arweaveData)
-                            : this.loadDataFromScratch(blockRangesForChains, spokePoolClients);
-                        this.loadDataCache[key] = data;
-                        _a.label = 4;
-                    case 4: return [2 /*return*/, this.loadDataFromCache(key)];
-                }
-            });
-        });
-    };
-    BundleDataClient.prototype.loadDataFromScratch = function (blockRangesForChains, spokePoolClients) {
-        return __awaiter(this, void 0, void 0, function () {
-            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 (_d) {
-                switch (_d.label) {
-                    case 0:
-                        start = performance.now();
-                        key = JSON.stringify(blockRangesForChains);
-                        if (!this.clients.configStoreClient.isUpdated) {
-                            throw new Error("ConfigStoreClient not updated");
-                        }
-                        else if (!this.clients.hubPoolClient.isUpdated) {
-                            throw new Error("HubPoolClient not updated");
-                        }
-                        _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));
-                        }
-                        bundleDepositsV3 = {};
-                        bundleFillsV3 = {};
-                        bundleInvalidFillsV3 = [];
-                        bundleUnrepayableFillsV3 = [];
-                        bundleInvalidSlowFillRequests = [];
-                        bundleSlowFillsV3 = {};
-                        expiredDepositsToRefundV3 = {};
-                        unexecutableSlowFills = {};
-                        _canCreateSlowFillLeaf = function (deposit) {
-                            return (
-                            // Cannot slow fill when input and output tokens are not equivalent.
-                            _this.clients.hubPoolClient.areTokensEquivalent(deposit.inputToken, deposit.originChainId, deposit.outputToken, deposit.destinationChainId, bundleEndBlockForMainnet) &&
-                                // Cannot slow fill from or to a lite chain.
-                                !deposit.fromLiteChain &&
-                                !deposit.toLiteChain);
-                        };
-                        _depositIsExpired = function (deposit) {
-                            return deposit.fillDeadline < bundleBlockTimestamps[deposit.destinationChainId][1];
-                        };
-                        _getFillStatusForDeposit = function (deposit, queryBlock) {
-                            return spokePoolClients[deposit.destinationChainId].relayFillStatus(deposit, 
-                            // We can assume that in production
-                            // the block to query is not one that the spoke pool client
-                            // hasn't queried. This is because this function will usually be called
-                            // in production with block ranges that were validated by
-                            // DataworkerUtils.blockRangesAreInvalidForSpokeClients.
-                            Math.min(queryBlock, spokePoolClients[deposit.destinationChainId].latestHeightSearched));
-                        };
-                        allChainIds = blockRangesForChains
-                            .map(function (_blockRange, index) { return chainIds[index]; })
-                            .filter(function (chainId) {
-                            return !isChainDisabledAtBlock(chainId, bundleStartBlockForMainnet, _this.clients.configStoreClient) &&
-                                spokePoolClients[chainId] !== undefined;
-                        });
-                        allChainIds.forEach(function (chainId) {
-                            var spokePoolClient = spokePoolClients[chainId];
-                            if (!spokePoolClient.isUpdated) {
-                                throw new Error("SpokePoolClient for chain ".concat(chainId, " not updated."));
-                            }
-                        });
-                        _cachedBundleTimestamps = this.getBundleTimestampsFromCache(key);
-                        bundleBlockTimestamps = {};
-                        if (!!_cachedBundleTimestamps) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.getBundleBlockTimestamps(chainIds, blockRangesForChains, spokePoolClients)];
-                    case 1:
-                        bundleBlockTimestamps = _d.sent();
-                        this.setBundleTimestampsInCache(key, bundleBlockTimestamps);
-                        this.logger.debug({
-                            at: "BundleDataClient#loadData",
-                            message: "Bundle block timestamps",
-                            bundleBlockTimestamps: bundleBlockTimestamps,
-                            blockRangesForChains: JSON.stringify(blockRangesForChains),
-                        });
-                        return [3 /*break*/, 3];
-                    case 2:
-                        bundleBlockTimestamps = _cachedBundleTimestamps;
-                        _d.label = 3;
-                    case 3:
-                        v3RelayHashes = {};
-                        bundleDepositHashes = [];
-                        olderDepositHashes = [];
-                        decodeBundleDepositHash = function (depositHash) {
-                            var _a = depositHash.split("@"), relayDataHash = _a[0], i = _a[1];
-                            return { relayDataHash: relayDataHash, index: Number(i) };
-                        };
-                        _loop_1 = function (originChainId) {
-                            var originClient = spokePoolClients[originChainId];
-                            var originChainBlockRange = getBlockRangeForChain(blockRangesForChains, originChainId, chainIds);
-                            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)) {
-                                        return;
-                                    }
-                                    var relayDataHash = getRelayEventKey(deposit);
-                                    if (!v3RelayHashes[relayDataHash]) {
-                                        v3RelayHashes[relayDataHash] = {
-                                            deposits: [deposit],
-                                            fill: undefined,
-                                            slowFillRequest: undefined,
-                                        };
-                                    }
-                                    else {
-                                        var deposits_1 = v3RelayHashes[relayDataHash].deposits;
-                                        assert(isDefined(deposits_1) && deposits_1.length > 0, "Deposit should exist in relay hash dictionary.");
-                                        deposits_1.push(deposit);
-                                    }
-                                    // Account for duplicate deposits by concatenating the relayDataHash with the count of the number of times
-                                    // we have seen it so far.
-                                    var deposits = v3RelayHashes[relayDataHash].deposits;
-                                    assert(isDefined(deposits) && deposits.length > 0, "Deposit should exist in relay hash dictionary.");
-                                    var newBundleDepositHash = "".concat(relayDataHash, "@").concat(deposits.length - 1);
-                                    var decodedBundleDepositHash = decodeBundleDepositHash(newBundleDepositHash);
-                                    assert(decodedBundleDepositHash.relayDataHash === relayDataHash &&
-                                        decodedBundleDepositHash.index === deposits.length - 1, "Not using correct bundle deposit hash key");
-                                    if (deposit.blockNumber >= originChainBlockRange[0]) {
-                                        if ((_b = (_a = bundleDepositsV3 === null || bundleDepositsV3 === void 0 ? void 0 : bundleDepositsV3[originChainId]) === null || _a === void 0 ? void 0 : _a[deposit.inputToken.toBytes32()]) === null || _b === void 0 ? void 0 : _b.find(function (d) {
-                                            return duplicateEvent(deposit, d);
-                                        })) {
-                                            _this.logger.debug({
-                                                at: "BundleDataClient#loadData",
-                                                message: "Duplicate deposit detected",
-                                                deposit: convertRelayDataParamsToBytes32(deposit),
-                                            });
-                                            throw new Error("Duplicate deposit detected");
-                                        }
-                                        bundleDepositHashes.push(newBundleDepositHash);
-                                        updateBundleDepositsV3(bundleDepositsV3, deposit);
-                                    }
-                                    else if (deposit.blockNumber < originChainBlockRange[0]) {
-                                        olderDepositHashes.push(newBundleDepositHash);
-                                    }
-                                });
-                            }
-                        };
-                        // Prerequisite step: Load all deposit events from the current or older bundles into the v3RelayHashes dictionary
-                        // for convenient matching with fills.
-                        for (_i = 0, allChainIds_1 = allChainIds; _i < allChainIds_1.length; _i++) {
-                            originChainId = allChainIds_1[_i];
-                            _loop_1(originChainId);
-                        }
-                        this.logger.debug({
-                            at: "BundleDataClient#loadData",
-                            message: "Processed ".concat(bundleDepositHashes.length + olderDepositHashes.length, " deposits in ").concat(performance.now() - start, "ms."),
-                        });
-                        start = performance.now();
-                        validatedBundleV3Fills = [];
-                        validatedBundleSlowFills = [];
-                        validatedBundleUnexecutableSlowFills = [];
-                        fillCounter = 0;
-                        _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_3 = function (destinationChainId) {
-                                            var destinationClient, destinationChainBlockRange, originChainBlockRange, fastFillsReplacingSlowFills;
-                                            return __generator(this, function (_h) {
-                                                switch (_h.label) {
-                                                    case 0:
-                                                        destinationClient = spokePoolClients[destinationChainId];
-                                                        destinationChainBlockRange = getBlockRangeForChain(blockRangesForChains, destinationChainId, chainIds);
-                                                        originChainBlockRange = getBlockRangeForChain(blockRangesForChains, originChainId, chainIds);
-                                                        fastFillsReplacingSlowFills = [];
-                                                        return [4 /*yield*/, forEachAsync(destinationClient
-                                                                .getFillsForOriginChain(originChainId)
-                                                                // We can remove fills for deposits with input amount equal to zero because these will result in 0 refunded
-                                                                // 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(function (fill) {
-                                                                return fill.blockNumber <= destinationChainBlockRange[1] &&
-                                                                    !isZeroValueFillOrSlowFillRequest(fill) &&
-                                                                    !invalidOutputToken(fill);
-                                                            }), function (fill) { return __awaiter(_this, void 0, void 0, function () {
-                                                                var relayDataHash, deposits, provider, fillToRefund_1, duplicateDeposits, historicalDeposit, matchedDeposit, provider, fillToRefund;
-                                                                return __generator(this, function (_a) {
-                                                                    switch (_a.label) {
-                                                                        case 0:
-                                                                            fillCounter++;
-                                                                            relayDataHash = getRelayEventKey(fill);
-                                                                            if (!v3RelayHashes[relayDataHash]) return [3 /*break*/, 5];
-                                                                            if (!!v3RelayHashes[relayDataHash].fill) return [3 /*break*/, 3];
-                                                                            deposits = v3RelayHashes[relayDataHash].deposits;
-                                                                            assert(isDefined(deposits) && deposits.length > 0, "Deposit should exist in relay hash dictionary.");
-                                                                            v3RelayHashes[relayDataHash].fill = fill;
-                                                                            if (!(fill.blockNumber >= destinationChainBlockRange[0])) return [3 /*break*/, 2];
-                                                                            provider = void 0;
-                                                                            if (isEVMSpokePoolClient(destinationClient)) {
-                                                                                provider = destinationClient.spokePool.provider;
-                                                                            }
-                                                                            else if (isSVMSpokePoolClient(destinationClient)) {
-                                                                                provider = destinationClient.svmEventsClient.getRpc();
-                                                                            }
-                                                                            return [4 /*yield*/, verifyFillRepayment(fill, provider, deposits[0], this.clients.hubPoolClient, bundleEndBlockForMainnet)];
-                                                                        case 1:
-                                                                            fillToRefund_1 = _a.sent();
-                                                                            if (!isDefined(fillToRefund_1)) {
-                                                                                bundleUnrepayableFillsV3.push(fill);
-                                                                                // We don't return here yet because we still need to mark unexecutable slow fill leaves
-                                                                                // or duplicate deposits. However, we won't issue a fast fill refund.
-                                                                            }
-                                                                            else {
-                                                                                v3RelayHashes[relayDataHash].fill = fillToRefund_1;
-                                                                                validatedBundleV3Fills.push(__assign(__assign({}, fillToRefund_1), { quoteTimestamp: deposits[0].quoteTimestamp }));
-                                                                                duplicateDeposits = deposits.slice(1);
-                                                                                duplicateDeposits.forEach(function (duplicateDeposit) {
-                                                                                    if (isSlowFill(fill)) {
-                                                                                        updateExpiredDepositsV3(expiredDepositsToRefundV3, duplicateDeposit);
-                                                                                    }
-                                                                                    else {
-                                                                                        validatedBundleV3Fills.push(__assign(__assign({}, fillToRefund_1), { quoteTimestamp: duplicateDeposit.quoteTimestamp }));
-                                                                                    }
-                                                                                });
-                                                                            }
-                                                                            // If fill replaced a slow fill request, then mark it as one that might have created an
-                                                                            // unexecutable slow fill. We can't know for sure until we check the slow fill request
-                                                                            // events.
-                                                                            if (fill.relayExecutionInfo.fillType === FillType.ReplacedSlowFill &&
-                                                                                _canCreateSlowFillLeaf(deposits[0])) {
-                                                                                fastFillsReplacingSlowFills.push(relayDataHash);
-                                                                            }
-                                                                            _a.label = 2;
-                                                                        case 2: return [3 /*break*/, 4];
-                                                                        case 3:
-                                                                            this.logger.debug({
-                                                                                at: "BundleDataClient#loadData",
-                                                                                message: "Duplicate fill detected",
-                                                                                fill: convertFillParamsToBytes32(fill),
-                                                                            });
-                                                                            throw new Error("Duplicate fill detected");
-                                                                        case 4: return [2 /*return*/];
-                                                                        case 5:
-                                                                            // At this point, there is no relay hash dictionary entry for this fill, so we need to
-                                                                            // instantiate the entry. We won't modify the fill.relayer until we match it with a deposit.
-                                                                            v3RelayHashes[relayDataHash] = {
-                                                                                deposits: undefined,
-                                                                                fill: fill,
-                                                                                slowFillRequest: undefined,
-                                                                            };
-                                                                            if (!(fill.blockNumber >= destinationChainBlockRange[0])) return [3 /*break*/, 9];
-                                                                            // Fill has a non-infinite expiry, and we can assume our spoke pool clients have old enough deposits
-                                                                            // to conclude that this fill is invalid if we haven't found a matching deposit in memory, so
-                                                                            // skip the historical query.
-                                                                            if (!INFINITE_FILL_DEADLINE.eq(fill.fillDeadline)) {
-                                                                                bundleInvalidFillsV3.push(fill);
-                                                                                return [2 /*return*/];
-                                                                            }
-                                                                            return [4 /*yield*/, queryHistoricalDepositForFill(originClient, fill)];
-                                                                        case 6:
-                                                                            historicalDeposit = _a.sent();
-                                                                            if (!!historicalDeposit.found) return [3 /*break*/, 7];
-                                                                            bundleInvalidFillsV3.push(fill);
-                                                                            return [3 /*break*/, 9];
-                                                                        case 7:
-                                                                            matchedDeposit = historicalDeposit.deposit;
-                                                                            // If deposit is in a following bundle, then this fill will have to be refunded once that deposit
-                                                                            // is in the current bundle.
-                                                                            if (matchedDeposit.blockNumber > originChainBlockRange[1]) {
-                                                                                bundleInvalidFillsV3.push(fill);
-                                                                                return [2 /*return*/];
-                                                                            }
-                                                                            v3RelayHashes[relayDataHash].deposits = [matchedDeposit];
-                                                                            provider = void 0;
-                                                                            if (isEVMSpokePoolClient(destinationClient)) {
-                                                                                provider = destinationClient.spokePool.provider;
-                                                                            }
-                                                                            else if (isSVMSpokePoolClient(destinationClient)) {
-                                                                                provider = destinationClient.svmEventsClient.getRpc();
-                                                                            }
-                                                                            return [4 /*yield*/, verifyFillRepayment(fill, provider, matchedDeposit, this.clients.hubPoolClient, bundleEndBlockForMainnet)];
-                                                                        case 8:
-                                                                            fillToRefund = _a.sent();
-                                                                            if (!isDefined(fillToRefund)) {
-                                                                                bundleUnrepayableFillsV3.push(fill);
-                                                                                // Don't return yet as we still need to mark down any unexecutable slow fill leaves
-                                                                                // in case this fast fill replaced a slow fill request.
-                                                                            }
-                                                                            else {
-                                                                                // @dev Since queryHistoricalDepositForFill validates the fill by checking individual
-                                                                                // object property values against the deposit's, we
-                                                                                // sanity check it here by comparing the full relay hashes. If there's an error here then the
-                                                                                // historical deposit query is not working as expected.
-                                                                                assert(getRelayEventKey(matchedDeposit) === relayDataHash, "Relay hashes should match.");
-                                                                                validatedBundleV3Fills.push(__assign(__assign({}, fillToRefund), { quoteTimestamp: matchedDeposit.quoteTimestamp }));
-                                                                                v3RelayHashes[relayDataHash].fill = fillToRefund;
-                                                                                // No need to check for duplicate deposits here since duplicate deposits with
-                                                                                // infinite deadlines are impossible to send via unsafeDeposit().
-                                                                            }
-                                                                            if (fill.relayExecutionInfo.fillType === FillType.ReplacedSlowFill &&
-                                                                                _canCreateSlowFillLeaf(matchedDeposit)) {
-                                                                                fastFillsReplacingSlowFills.push(relayDataHash);
-                                                                            }
-                                                                            _a.label = 9;
-                                                                        case 9: return [2 /*return*/];
-                                                                    }
-                                                                });
-                                                            }); })];
-                                                    case 1:
-                                                        _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.
-                                                        // Assumptions about fills:
-                                                        // - 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.
-                                                        return [4 /*yield*/, forEachAsync(destinationClient
-                                                                .getSlowFillRequestsForOriginChain(originChainId)
-                                                                .filter(function (request) {
-                                                                return request.blockNumber <= destinationChainBlockRange[1] &&
-                                                                    !isZeroValueFillOrSlowFillRequest(request) &&
-                                                                    !invalidOutputToken(request);
-                                                            }), function (slowFillRequest) { return __awaiter(_this, void 0, void 0, function () {
-                                                                var relayDataHash, _a, deposits, fill, matchedDeposit, historicalDeposit, matchedDeposit;
-                                                                return __generator(this, function (_b) {
-                                                                    switch (_b.label) {
-                                                                        case 0:
-                                                                            relayDataHash = getRelayEventKey(slowFillRequest);
-                                                                            if (v3RelayHashes[relayDataHash]) {
-                                                                                if (!v3RelayHashes[relayDataHash].slowFillRequest) {
-                                                                                    v3RelayHashes[relayDataHash].slowFillRequest = slowFillRequest;
-                                                                                    _a = v3RelayHashes[relayDataHash], deposits = _a.deposits, fill = _a.fill;
-                                                                                    if (fill) {
-                                                                                        // Exiting here assumes that slow fill requests must precede fills, so if there was a fill
-                                                                                        // following this slow fill request, then we would have already seen it. We don't need to check
-                                                                                        // for a fill older than this slow fill request.
-                                                                                        return [2 /*return*/];
-                                                                                    }
-                                                                                    assert(isDefined(deposits) && deposits.length > 0, "Deposit should exist in relay hash dictionary.");
-                                                                                    matchedDeposit = deposits[0];
-                                                                                    if (slowFillRequest.blockNumber >= destinationChainBlockRange[0] &&
-                                                                                        _canCreateSlowFillLeaf(matchedDeposit) &&
-                                                                                        !_depositIsExpired(matchedDeposit)) {
-                                                                                        validatedBundleSlowFills.push(matchedDeposit);
-                                                                                    }
-                                                                                }
-                                                                                else {
-                                                                                    this.logger.debug({
-                                                                                        at: "BundleDataClient#loadData",
-                                                                                        message: "Duplicate slow fill request detected",
-                                                                                        slowFillRequest: slowFillRequest,
-                                                                                    });
-                                                                                    throw new Error("Duplicate slow fill request detected.");
-                                                                                }
-                                                                                return [2 /*return*/];
-                                                                            }
-                                                                            // Instantiate dictionary if there is neither a deposit nor fill matching it.
-                                                                            v3RelayHashes[relayDataHash] = {
-                                                                                deposits: undefined,
-                                                                                fill: undefined,
-                                                                                slowFillRequest: slowFillRequest,
-                                                                            };
-                                                                            if (!(slowFillRequest.blockNumber >= destinationChainBlockRange[0])) return [3 /*break*/, 2];
-                                                                            if (!INFINITE_FILL_DEADLINE.eq(slowFillRequest.fillDeadline)) {
-                                                                                bundleInvalidSlowFillRequests.push(slowFillRequest);
-                                                                                return [2 /*return*/];
-                                                                            }
-                                                                            return [4 /*yield*/, queryHistoricalDepositForFill(originClient, slowFillRequest)];
-                                                                        case 1:
-                                                                            historicalDeposit = _b.sent();
-                                                                            if (!historicalDeposit.found) {
-                                                                                bundleInvalidSlowFillRequests.push(slowFillRequest);
-                                                                                return [2 /*return*/];
-                                                                            }
-                                                                            matchedDeposit = historicalDeposit.deposit;
-                                                                            // If deposit is in a following bundle, then this slow fill request will have to be created
-                                                                            // once that deposit is in the current bundle.
-                                                                            if (matchedDeposit.blockNumber > originChainBlockRange[1]) {
-                                                                                bundleInvalidSlowFillRequests.push(slowFillRequest);
-                                                                                return [2 /*return*/];
-                                                                            }
-                                                                            // @dev Since queryHistoricalDepositForFill validates the slow fill request by checking individual
-                                                                            // object property values against the deposit's, we
-                                                                            // sanity check it here by comparing the full relay hashes. If there's an error here then the
-                                                                            // historical deposit query is not working as expected.
-                                                                            assert(getRelayEventKey(matchedDeposit) === relayDataHash, "Deposit relay hashes should match.");
-                                                                            v3RelayHashes[relayDataHash].deposits = [matchedDeposit];
-                                                                            if (!_canCreateSlowFillLeaf(matchedDeposit) || _depositIsExpired(matchedDeposit)) {
-                                                                                return [2 /*return*/];
-                                                                            }
-                                                                            validatedBundleSlowFills.push(matchedDeposit);
-                                                                            _b.label = 2;
-                                                                        case 2: return [2 /*return*/];
-                                                                    }
-                                                                });
-                                                            }); })];
-                                                    case 2:
-                                                        // 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.
-                                                        // Assumptions about fills:
-                                                        // - 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.
-                                                        _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.
-                                                        // - Deposits matching fills that are type SlowFill from previous bundle block ranges should be refunded to the
-                                                        // depositor.
-                                                        // - All deposits expiring in this bundle, even those sent in prior bundle block ranges, should be refunded
-                                                        // to the depositor.
-                                                        // - An expired deposit cannot be refunded if the deposit was filled.
-                                                        // - If a deposit from a prior bundle expired in this bundle, had a slow fill request created for it
-                                                        // in a prior bundle, and has not been filled yet, then an unexecutable slow fill leaf has been created
-                                                        // and needs to be refunded to the HubPool.
-                                                        // - Deposits matching slow fill requests from previous bundle block ranges should produce slow fills
-                                                        // if the deposit has not been filled.
-                                                        // Assumptions:
-                                                        // - If the deposit has a matching fill or slow fill request in the bundle then we have already stored
-                                                        // it in the relay hashes dictionary.
-                                                        // - We've created refunds for all fills in this bundle matching a deposit.
-                                                        // - 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.
-                                                        return [4 /*yield*/, mapAsync(bundleDepositHashes, function (depositHash) { return __awaiter(_this, void 0, void 0, function () {
-                                                                var _a, relayDataHash, index, _b, deposits, fill, slowFillRequest, deposit, provider, fillToRefund, fillStatus, prefill, provider, verifiedFill;
-                                                                return __generator(this, function (_c) {
-                                                                    switch (_c.label) {
-                                                                        case 0:
-                                                                            _a = decodeBundleDepositHash(depositHash), relayDataHash = _a.relayDataHash, index = _a.index;
-                                                                            _b = v3RelayHashes[relayDataHash], deposits = _b.deposits, fill = _b.fill, slowFillRequest = _b.slowFillRequest;
-                                                                            if (!deposits || deposits.length === 0) {
-                                                                                throw new Error("Deposits should exist in relay hash dictionary.");
-                                                                            }
-                                                                            deposit = deposits[index];
-                                                                            if (!deposit)
-                                                                                throw new Error("Deposit should exist in relay hash dictionary.");
-                                                                            if (deposit.originChainId !== originChainId || deposit.destinationChainId !== destinationChainId) {
-                                                                                return [2 /*return*/];
-                                                                            }
-                                                                            if (!fill) return [3 /*break*/, 3];
-                                                                            if (!(fill.blockNumber < destinationChainBlockRange[0])) return [3 /*break*/, 2];
-                                                                            provider = void 0;
-                                                                            if (isEVMSpokePoolClient(destinationClient)) {
-                                                                                provider = destinationClient.spokePool.provider;
-                                                                            }
-                                                                            else if (isSVMSpokePoolClient(destinationClient)) {
-                                                                                provider = destinationClient.svmEventsClient.getRpc();
-                                                                            }
-                                                                            return [4 /*yield*/, verifyFillRepayment(fill, provider, deposits[0], this.clients.hubPoolClient, bundleEndBlockForMainnet)];
-                                                                        case 1:
-                                                                            fillToRefund = _c.sent();
-                                                                            if (!isDefined(fillToRefund)) {
-                                                                                bundleUnrepayableFillsV3.push(fill);
-                                                                            }
-                                                                            else if (!isSlowFill(fill)) {
-                                                                                v3RelayHashes[relayDataHash].fill = fillToRefund;
-                                                                                validatedBundleV3Fills.push(__assign(__assign({}, fillToRefund), { quoteTimestamp: deposit.quoteTimestamp }));
-                                                                            }
-                                                                            else {
-                                                                                updateExpiredDepositsV3(expiredDepositsToRefundV3, deposit);
-                                                                            }
-                                                                            _c.label = 2;
-                                                                        case 2: return [2 /*return*/];
-                                                                        case 3:
-                                                                            // If a slow fill request exists in memory, then we know the deposit has not been filled because fills
-                                                                            // must follow slow fill requests and we would have seen the fill already if it existed.,
-                                                                            // We can conclude that either the deposit has expired or we need to create a slow fill leaf for the
-                                                                            // deposit because it has not been filled. Slow fill leaves were already created for requests sent
-                                                                            // in the current bundle so only create new slow fill leaves for prior bundle deposits.
-                                                                            if (slowFillRequest) {
-                                                                                if (_depositIsExpired(deposit)) {
-                                                                                    updateExpiredDepositsV3(expiredDepositsToRefundV3, deposit);
-                                                                                }
-                                                                                else if (slowFillRequest.blockNumber < destinationChainBlockRange[0] &&
-                                                                                    _canCreateSlowFillLeaf(deposit) &&
-                                                                                    validatedBundleSlowFills.every(function (d) { return getRelayEventKey(d) !== relayDataHash; })) {
-                                                                                    validatedBundleSlowFills.push(deposit);
-                                                                                }
-                                                                                return [2 /*return*/];
-                                                                            }
-                                                                            return [4 /*yield*/, _getFillStatusForDeposit(deposit, destinationChainBlockRange[1])];
-                                                                        case 4:
-                                                                            fillStatus = _c.sent();
-                                                                            if (!(fillStatus === FillStatus.Filled)) return [3 /*break*/, 7];
-                                                                            return [4 /*yield*/, this.findMatchingFillEvent(deposit, destinationClient)];
-                                                                        case 5:
-                                                                            prefill = _c.sent();
-                                                                            assert(isDefined(prefill), "findFillEvent# Cannot find prefill: ".concat(relayDataHash));
-                                                                            assert(getRelayEventKey(prefill) === relayDataHash, "Relay hashes should match.");
-                                                                            provider = void 0;
-                                                                            if (isEVMSpokePoolClient(destinationClient)) {
-                                                                                provider = destinationClient.spokePool.provider;
-                                                                            }
-                                                                            else if (isSVMSpokePoolClient(destinationClient)) {
-                                                                                provider = destinationClient.svmEventsClient.getRpc();
-                                                                            }
-                                                                            return [4 /*yield*/, verifyFillRepayment(prefill, provider, deposit, this.clients.hubPoolClient, bundleEndBlockForMainnet)];
-                                                                        case 6:
-                                                                            verifiedFill = _c.sent();
-                                                                            if (!isDefined(verifiedFill)) {
-                                                                                bundleUnrepayableFillsV3.push(prefill);
-                                                                            }
-                                                                            else if (!isSlowFill(verifiedFill)) {
-                                                                                validatedBundleV3Fills.push(__assign(__assign({}, verifiedFill), { quoteTimestamp: deposit.quoteTimestamp }));
-                                                                            }
-                                                                            else {
-                                                                                updateExpiredDepositsV3(expiredDepositsToRefundV3, deposit);
-                                                                            }
-                                                                            return [3 /*break*/, 8];
-                                                                        case 7:
-                                                                            if (_depositIsExpired(deposit)) {
-                                                                                updateExpiredDepositsV3(expiredDepositsToRefundV3, deposit);
-                                                                            }
-                                                                            else if (fillStatus === FillStatus.RequestedSlowFill &&
-                                                                                // Don't create duplicate slow fill requests for the same deposit.
-                                                                                validatedBundleSlowFills.every(function (d) { return getRelayEventKey(d) !== relayDataHash; })) {
-                                                                                if (_canCreateSlowFillLeaf(deposit)) {
-                                                                                    validatedBundleSlowFills.push(deposit);
-                                                                                }
-                                                                            }
-                                                                            _c.label = 8;
-                                                                        case 8: return [2 /*return*/];
-                                                                    }
-                                                                });
-                                                            }); })];
-                                                    case 3:
-                                                        // 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.
-                                                        // - Deposits matching fills that are type SlowFill from previous bundle block ranges should be refunded to the
-                                                        // depositor.
-                                                        // - All deposits expiring in this bundle, even those sent in prior bundle block ranges, should be refunded
-                                                        // to the depositor.
-                                                        // - An expired deposit cannot be refunded if the deposit was filled.
-                                                        // - If a deposit from a prior bundle expired in this bundle, had a slow fill request created for it
-                                                        // in a prior bundle, and has not been filled yet, then an unexecutable slow fill leaf has been created
-                                                        // and needs to be refunded to the HubPool.
-                                                        // - Deposits matching slow fill requests from previous bundle block ranges should produce slow fills
-                                                        // if the deposit has not been filled.
-                                                        // Assumptions:
-                                                        // - If the deposit has a matching fill or slow fill request in the bundle then we have already stored
-                                                        // it in the relay hashes dictionary.
-                                                        // - We've created refunds for all fills in this bundle matching a deposit.
-                                                        // - 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.
-                                                        _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.
-                                                        fastFillsReplacingSlowFills.forEach(function (relayDataHash) {
-                                                            var _a = v3RelayHashes[relayDataHash], deposits = _a.deposits, slowFillRequest = _a.slowFillRequest, fill = _a.fill;
-                                                            assert((fill === null || fill === void 0 ? void 0 : fill.relayExecutionInfo.fillType) === FillType.ReplacedSlowFill, "Fill type should be ReplacedSlowFill.");
-                                                            // Needed for TSC - are implicitly checking that deposit exists by making it to this point.
-                                                            if (!deposits || deposits.length < 1) {
-                                                                throw new Error("Deposit should exist in relay hash dictionary.");
-                                                            }
-                                                            // We should never push fast fills involving lite chains here because slow fill requests for them are invalid:
-                                                            assert(_canCreateSlowFillLeaf(deposits[0]), "fastFillsReplacingSlowFills should contain only deposits that can be slow filled");
-                                                            var destinationBlockRange = getBlockRangeForChain(blockRangesForChains, destinationChainId, chainIds);
-                                                            var originBlockRange = getBlockRangeForChain(blockRangesForChains, originChainId, chainIds);
-                                                            var matchedDeposit = deposits[0];
-                                                            // For a slow fill leaf to have been created (and subsequently create an excess), the deposit matching the
-                                                            // slow fill request must have been included in a previous bundle AND the slow fill request should not
-                                                            // be included in this bundle. This is because a slow fill request is only valid once its deposit
-                                                            // has been mined, so if the deposit is not in a prior bundle to the fill, then no slow fill leaf could
-                                                            // have been created. Secondly, the slow fill request itself must have occurred in an older bundle than the
-                                                            // fill otherwise the slow fill leaf be unexecutable for an already-filled deposit..
-                                                            if (matchedDeposit.blockNumber < originBlockRange[0] &&
-                                                                // If there is a slow fill request in this bundle that matches the relay hash, then there was no slow fill
-                                                                // created that would be considered excess.
-                                                                (!slowFillRequest || slowFillRequest.blockNumber < destinationBlockRange[0])) {
-                                                                validatedBundleUnexecutableSlowFills.push(deposits[0]);
-                                                            }
-                                                        });
-                                                        return [2 /*return*/];
-                                                }
-                                            });
-                                        };
-                                        _f = 0, allChainIds_4 = allChainIds;
-                                        _g.label = 1;
-                                    case 1:
-                                        if (!(_f < allChainIds_4.length)) return [3 /*break*/, 4];
-                                        destinationChainId = allChainIds_4[_f];
-                                        return [5 /*yield**/, _loop_3(destinationChainId)];
-                                    case 2:
-                                        _g.sent();
-                                        _g.label = 3;
-                                    case 3:
-                                        _f++;
-                                        return [3 /*break*/, 1];
-                                    case 4: return [2 /*return*/];
-                                }
-                            });
-                        };
-                        _b = 0, allChainIds_2 = allChainIds;
-                        _d.label = 4;
-                    case 4:
-                        if (!(_b < allChainIds_2.length)) return [3 /*break*/, 7];
-                        originChainId = allChainIds_2[_b];
-                        return [5 /*yield**/, _loop_2(originChainId)];
-                    case 5:
-                        _d.sent();
-                        _d.label = 6;
-                    case 6:
-                        _b++;
-                        return [3 /*break*/, 4];
-                    case 7:
-                        this.logger.debug({
-                            at: "BundleDataClient#loadData",
-                            message: "Processed ".concat(fillCounter, " fills in ").concat(performance.now() - start, "ms."),
-                        });
-                        start = performance.now();
-                        // 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.
-                        return [4 /*yield*/, forEachAsync(olderDepositHashes, function (depositHash) { return __awaiter(_this, void 0, void 0, function () {
-                                var _a, relayDataHash, index, _b, deposits, slowFillRequest, fill, deposit, destinationChainId, destinationBlockRange, fillStatus;
-                                return __generator(this, function (_c) {
-                                    switch (_c.label) {
-                                        case 0:
-                                            _a = decodeBundleDepositHash(depositHash), relayDataHash = _a.relayDataHash, index = _a.index;
-                                            _b = v3RelayHashes[relayDataHash], deposits = _b.deposits, slowFillRequest = _b.slowFillRequest, fill = _b.fill;
-                                            if (!deposits || deposits.length < 1) {
-                                                throw new Error("Deposit should exist in relay hash dictionary.");
-                                            }
-                                            deposit = deposits[index];
-                                            destinationChainId = deposit.destinationChainId;
-                                            destinationBlockRange = getBlockRangeForChain(blockRangesForChains, destinationChainId, chainIds);
-                                            if (!
-                                            // If there is a valid fill that we saw matching this deposit, then it does not need a refund.
-                                            (!fill &&
-                                                isDefined(deposit) && // Needed for TSC - we check this above.
-                                                _depositIsExpired(deposit) &&
-                                                deposit.fillDeadline >= bundleBlockTimestamps[destinationChainId][0] &&
-                                                spokePoolClients[destinationChainId] !== undefined)) 
-                                            // If there is a valid fill that we saw matching this deposit, then it does not need a refund.
-                                            return [3 /*break*/, 2];
-                                            return [4 /*yield*/, _getFillStatusForDeposit(deposit, destinationBlockRange[1])];
-                                        case 1:
-                                            fillStatus = _c.sent();
-                                            // If there is no matching fill and the deposit expired in this bundle and the fill status on-chain is not
-                                            // Filled, then we can to refund it as an expired deposit.
-                                            if (fillStatus !== FillStatus.Filled) {
-                                                updateExpiredDepositsV3(expiredDepositsToRefundV3, deposit);
-                                            }
-                                            // If fill status is RequestedSlowFill, then we might need to mark down an unexecutable
-                                            // slow fill that we're going to replace with an expired deposit refund.
-                                            // If deposit cannot be slow filled, then exit early.
-                                            if (fillStatus !== FillStatus.RequestedSlowFill || !_canCreateSlowFillLeaf(deposit)) {
-                                                return [2 /*return*/];
-                                            }
-                                            // Now, check if there was a slow fill created for this deposit in a previous bundle which would now be
-                                            // unexecutable. Mark this deposit as having created an unexecutable slow fill if there is no matching
-                                            // slow fill request or the matching slow fill request took place in a previous bundle.
-                                            // If there is a slow fill request in this bundle, then the expired deposit refund will supersede
-                                            // the slow fill request. If there is no slow fill request seen or its older than this bundle, then we can
-                                            // assume a slow fill leaf was created for it when the deposit was mined. Therefore, because the deposit
-                                            // was in an older bundle, we can assume that a slow fill leaf was created at that time and therefore
-                                            // is now unexecutable.
-                                            if (!slowFillRequest || slowFillRequest.blockNumber < destinationBlockRange[0]) {
-                                                validatedBundleUnexecutableSlowFills.push(deposit);
-                                            }
-                                            _c.label = 2;
-                                        case 2: return [2 /*return*/];
-                                    }
-                                });
-                            }); })];
-                    case 8:
-                        // 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.
-                        _d.sent();
-                        // Batch compute V3 lp fees.
-                        start = performance.now();
-                        promises = [
-                            validatedBundleV3Fills.length > 0
-                                ? this.clients.hubPoolClient.batchComputeRealizedLpFeePct(validatedBundleV3Fills.map(function (fill) {
-                                    var deposits = v3RelayHashes[getRelayEventKey(fill)].deposits;
-                                    assert(isDefined(deposits) && deposits.length > 0, "Deposit should exist in relay hash dictionary.");
-                                    var matchedDeposit = deposits[0];
-                                    assert(isDefined(matchedDeposit), "Deposit should exist in relay hash dictionary.");
-                                    var paymentChainId = getRefundInformationFromFill(__assign(__assign({}, fill), { fromLiteChain: matchedDeposit.fromLiteChain }), _this.clients.hubPoolClient, bundleEndBlockForMainnet).chainToSendRefundTo;
-                                    return __assign(__assign({}, fill), { paymentChainId: paymentChainId });
-                                }))
-                                : [],
-                            validatedBundleSlowFills.length > 0
-                                ? this.clients.hubPoolClient.batchComputeRealizedLpFeePct(validatedBundleSlowFills.map(function (deposit) {
-                                    return __assign(__assign({}, deposit), { paymentChainId: deposit.destinationChainId });
-                                }))
-                                : [],
-                            validatedBundleUnexecutableSlowFills.length > 0
-                                ? this.clients.hubPoolClient.batchComputeRealizedLpFeePct(validatedBundleUnexecutableSlowFills.map(function (deposit) {
-                                    return __assign(__assign({}, deposit), { paymentChainId: deposit.destinationChainId });
-                                }))
-                                : [],
-                        ];
-                        return [4 /*yield*/, Promise.all(promises)];
-                    case 9:
-                        _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."),
-                        });
-                        v3FillLpFees.forEach(function (_a, idx) {
-                            var realizedLpFeePct = _a.realizedLpFeePct;
-                            var fill = validatedBundleV3Fills[idx];
-                            var deposits = v3RelayHashes[getRelayEventKey(fill)].deposits;
-                            assert(isDefined(deposits) && deposits.length > 0, "Deposit should exist in relay hash dictionary.");
-                            var associatedDeposit = deposits[0];
-                            assert(isDefined(associatedDeposit), "Deposit should exist in relay hash dictionary.");
-                            var _b = getRefundInformationFromFill(__assign(__assign({}, fill), { fromLiteChain: associatedDeposit.fromLiteChain }), _this.clients.hubPoolClient, bundleEndBlockForMainnet), chainToSendRefundTo = _b.chainToSendRefundTo, repaymentToken = _b.repaymentToken;
-                            updateBundleFillsV3(bundleFillsV3, fill, realizedLpFeePct, chainToSendRefundTo, repaymentToken, fill.relayer);
-                        });
-                        v3SlowFillLpFees.forEach(function (_a, idx) {
-                            var lpFeePct = _a.realizedLpFeePct;
-                            var deposit = validatedBundleSlowFills[idx];
-                            // We should not create slow fill leaves for duplicate deposit hashes and we should only create a slow
-                            // fill leaf for the first deposit (the quote timestamp of the deposit determines the LP fee, so its
-                            // important we pick out the correct deposit). Deposits are pushed into validatedBundleSlowFills in ascending
-                            // order so the following slice will only match the first deposit.
-                            var relayDataHash = getRelayEventKey(deposit);
-                            if (validatedBundleSlowFills.slice(0, idx).some(function (d) { return getRelayEventKey(d) === relayDataHash; })) {
-                                return;
-                            }
-                            assert(!_depositIsExpired(deposit), "Cannot create slow fill leaf for expired deposit.");
-                            updateBundleSlowFills(bundleSlowFillsV3, __assign(__assign({}, deposit), { lpFeePct: lpFeePct }));
-                        });
-                        v3UnexecutableSlowFillLpFees.forEach(function (_a, idx) {
-                            var lpFeePct = _a.realizedLpFeePct;
-                            var deposit = validatedBundleUnexecutableSlowFills[idx];
-                            updateBundleExcessSlowFills(unexecutableSlowFills, __assign(__assign({}, deposit), { lpFeePct: lpFeePct }));
-                        });
-                        v3SpokeEventsReadable = prettyPrintV3SpokePoolEvents(bundleDepositsV3, bundleFillsV3, bundleSlowFillsV3, expiredDepositsToRefundV3, unexecutableSlowFills);
-                        if (bundleInvalidFillsV3.length > 0) {
-                            invalidFillsWithPartialMatchedDeposits_1 = [];
-                            preFillsForNextBundle_1 = [];
-                            unknownReasonInvalidFills_1 = [];
-                            bundleInvalidFillsV3.forEach(function (fill) {
-                                var originClient = spokePoolClients[fill.originChainId];
-                                var fullyMatchedDeposit = originClient.getDepositForFill(fill);
-                                if (!isDefined(fullyMatchedDeposit)) {
-                                    var partiallyMatchedDeposit = originClient.getDeposit(fill.depositId);
-                                    if (isDefined(partiallyMatchedDeposit)) {
-                                        invalidFillsWithPartialMatchedDeposits_1.push(fill);
-                                    }
-                                    else {
-                                        unknownReasonInvalidFills_1.push(fill);
-                                    }
-                                }
-                                else {
-                                    var originBundleBlockRange = getBlockRangeForChain(blockRangesForChains, fill.originChainId, chainIds);
-                                    if (fullyMatchedDeposit.blockNumber <= originBundleBlockRange[1]) {
-                                        throw new Error("Detected invalid fill that matches fully with a deposit in current or prior bundle");
-                                    }
-                                    preFillsForNextBundle_1.push(fill);
-                                }
-                            });
-                            this.logger.debug({
-                                at: "BundleDataClient#loadData",
-                                message: "Finished loading V3 spoke pool data and found some invalid fills in range",
-                                blockRangesForChains: blockRangesForChains,
-                                invalidFillsWithPartialMatchedDeposits: invalidFillsWithPartialMatchedDeposits_1.map(function (invalidFill) {
-                                    return convertFillParamsToBytes32(invalidFill);
-                                }),
-                                preFillsForNextBundle: preFillsForNextBundle_1.map(function (preFill) { return convertFillParamsToBytes32(preFill); }),
-                                unknownReasonInvalidFills: unknownReasonInvalidFills_1.map(function (invalidFill) {
-                                    return convertFillParamsToBytes32(invalidFill);
-                                }),
-                            });
-                        }
-                        if (bundleUnrepayableFillsV3.length > 0) {
-                            this.logger.debug({
-                                at: "BundleDataClient#loadData",
-                                message: "Finished loading V3 spoke pool data and found some unrepayable fills in range",
-                                blockRangesForChains: blockRangesForChains,
-                                bundleUnrepayableFillsV3: bundleUnrepayableFillsV3,
-                            });
-                        }
-                        if (bundleInvalidSlowFillRequests.length > 0) {
-                            this.logger.debug({
-                                at: "BundleDataClient#loadData",
-                                message: "Finished loading V3 spoke pool data and found some invalid slow fill requests in range",
-                                blockRangesForChains: blockRangesForChains,
-                                bundleInvalidSlowFillRequests: bundleInvalidSlowFillRequests,
-                            });
-                        }
-                        this.logger.debug({
-                            at: "BundleDataClient#loadDataFromScratch",
-                            message: "Computed bundle data in ".concat(Math.round(performance.now() - start) / 1000, "s."),
-                            blockRangesForChains: JSON.stringify(blockRangesForChains),
-                            v3SpokeEventsReadable: v3SpokeEventsReadable,
-                        });
-                        return [2 /*return*/, {
-                                bundleDepositsV3: bundleDepositsV3,
-                                expiredDepositsToRefundV3: expiredDepositsToRefundV3,
-                                bundleFillsV3: bundleFillsV3,
-                                unexecutableSlowFills: unexecutableSlowFills,
-                                bundleSlowFillsV3: bundleSlowFillsV3,
-                            }];
-                }
-            });
-        });
-    };
-    BundleDataClient.prototype.findMatchingFillEvent = function (deposit, spokePoolClient) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (!isSVMSpokePoolClient(spokePoolClient)) return [3 /*break*/, 2];
-                        return [4 /*yield*/, findSvmFillEvent(deposit, spokePoolClient.chainId, spokePoolClient.svmEventsClient, spokePoolClient.deploymentBlock, spokePoolClient.latestHeightSearched, spokePoolClient.logger)];
-                    case 1: return [2 /*return*/, _a.sent()];
-                    case 2:
-                        if (!isEVMSpokePoolClient(spokePoolClient)) return [3 /*break*/, 4];
-                        return [4 /*yield*/, findEvmFillEvent(spokePoolClient.spokePool, deposit, spokePoolClient.deploymentBlock, spokePoolClient.latestHeightSearched)];
-                    case 3: return [2 /*return*/, _a.sent()];
-                    case 4: throw new Error("Unsupported spoke pool client type");
-                }
-            });
-        });
-    };
-    BundleDataClient.prototype.getBundleBlockTimestamps = function (chainIds, blockRangesForChains, spokePoolClients) {
-        return __awaiter(this, void 0, void 0, function () {
-            var _a, _b;
-            var _this = this;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0:
-                        _b = (_a = Object).fromEntries;
-                        return [4 /*yield*/, mapAsync(chainIds, function (chainId, index) { return __awaiter(_this, void 0, void 0, function () {
-                                var blockRangeForChain, _startBlockForChain, _endBlockForChain, spokePoolClient, startBlockForChain, endBlockForChain, _a, startTime, _endTime, _b, endBlockDelta, endTime;
-                                return __generator(this, function (_c) {
-                                    switch (_c.label) {
-                                        case 0:
-                                            blockRangeForChain = blockRangesForChains[index];
-                                            if (!isDefined(blockRangeForChain) ||
-                                                isChainDisabledAtBlock(chainId, blockRangesForChains[0][0], this.clients.configStoreClient)) {
-                                                return [2 /*return*/];
-                                            }
-                                            _startBlockForChain = blockRangeForChain[0], _endBlockForChain = blockRangeForChain[1];
-                                            spokePoolClient = spokePoolClients[chainId];
-                                            // Relayer instances using the BundleDataClient for repayment estimates may only relay on a subset of chains.
-                                            if (!isDefined(spokePoolClient)) {
-                                                return [2 /*return*/];
-                                            }
-                                            startBlockForChain = Math.min(_startBlockForChain, spokePoolClient.latestHeightSearched);
-                                            endBlockForChain = Math.min(_endBlockForChain + 1, spokePoolClient.latestHeightSearched);
-                                            return [4 /*yield*/, spokePoolClient.getTimestampForBlock(startBlockForChain)];
-                                        case 1:
-                                            _b = [
-                                                _c.sent()
-                                            ];
-                                            return [4 /*yield*/, spokePoolClient.getTimestampForBlock(endBlockForChain)];
-                                        case 2:
-                                            _a = _b.concat([
-                                                _c.sent()
-                                            ]), startTime = _a[0], _endTime = _a[1];
-                                            endBlockDelta = endBlockForChain > startBlockForChain ? 1 : 0;
-                                            endTime = Math.max(0, _endTime - endBlockDelta);
-                                            // Sanity checks:
-                                            assert(endTime >= startTime, "End time for block ".concat(endBlockForChain, " should be greater than start time for block ").concat(startBlockForChain, ": ").concat(endTime, " >= ").concat(startTime, "."));
-                                            assert(startBlockForChain === 0 || startTime > 0, "Start timestamp must be greater than 0 if the start block is greater than 0.");
-                                            return [2 /*return*/, [chainId, [startTime, endTime]]];
-                                    }
-                                });
-                            }); })];
-                    case 1: return [2 /*return*/, _b.apply(_a, [(_c.sent()).filter(isDefined)])];
-                }
-            });
-        });
-    };
-    return BundleDataClient;
-}());
-export { BundleDataClient };
-//# sourceMappingURL=BundleDataClient.js.map