@across-protocol/sdk 4.0.0-beta.19 → 4.0.0-beta.2

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

@@ -1,18 +1,13 @@
 import { __assign, __awaiter, __generator } from "tslib";
 import _ from "lodash";
 import { FillType, FillStatus, } from "../../interfaces";
-import { BigNumber, bnZero, queryHistoricalDepositForFill, assign, assert, fixedPointAdjustment, isDefined, toBN, forEachAsync, getBlockRangeForChain, getImpliedBundleBlockRanges, isSlowFill, mapAsync, filterAsync, bnUint32Max, isZeroValueDeposit, findFillEvent, isZeroValueFillOrSlowFillRequest, chainIsEvm, isValidEvmAddress, } from "../../utils";
-import { _buildPoolRebalanceRoot, BundleDataSS, getEndBlockBuffers, getRefundInformationFromFill, getRefundsFromBundle, getWidestPossibleExpectedBlockRange, isChainDisabled, prettyPrintV3SpokePoolEvents, verifyFillRepayment, } from "./utils";
-import { PRE_FILL_MIN_CONFIG_STORE_VERSION } from "../../constants";
+import { BigNumber, bnZero, queryHistoricalDepositForFill, assign, assert, fixedPointAdjustment, isDefined, toBN, forEachAsync, getBlockRangeForChain, getImpliedBundleBlockRanges, isSlowFill, mapAsync, bnUint32Max, isZeroValueDeposit, findFillEvent, isZeroValueFillOrSlowFillRequest, } from "../../utils";
+import { _buildPoolRebalanceRoot, BundleDataSS, getEndBlockBuffers, getRefundInformationFromFill, getRefundsFromBundle, getWidestPossibleExpectedBlockRange, isChainDisabled, prettyPrintV3SpokePoolEvents, } from "./utils";
 // max(uint256) - 1
 export var INFINITE_FILL_DEADLINE = bnUint32Max;
 // V3 dictionary helper functions
 function updateExpiredDepositsV3(dict, deposit) {
     var _a;
-    // 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 (chainIsEvm(deposit.originChainId) && !isValidEvmAddress(deposit.depositor)) {
-        return;
-    }
     var originChainId = deposit.originChainId, inputToken = deposit.inputToken;
     if (!((_a = dict === null || dict === void 0 ? void 0 : dict[originChainId]) === null || _a === void 0 ? void 0 : _a[inputToken])) {
         assign(dict, [originChainId, inputToken], []);
@@ -27,12 +22,8 @@ function updateBundleDepositsV3(dict, deposit) {
     }
     dict[originChainId][inputToken].push(deposit);
 }
-function updateBundleFillsV3(dict, fill, lpFeePct, repaymentChainId, repaymentToken, repaymentAddress) {
+function updateBundleFillsV3(dict, fill, lpFeePct, repaymentChainId, repaymentToken) {
     var _a, _b;
-    // It is impossible to refund a deposit if the repayment chain is EVM and the relayer is a non-evm address.
-    if (chainIsEvm(repaymentChainId) && !isValidEvmAddress(repaymentAddress)) {
-        return;
-    }
     if (!((_a = dict === null || dict === void 0 ? void 0 : dict[repaymentChainId]) === null || _a === void 0 ? void 0 : _a[repaymentToken])) {
         assign(dict, [repaymentChainId, repaymentToken], {
             fills: [],
@@ -41,26 +32,26 @@ function updateBundleFillsV3(dict, fill, lpFeePct, repaymentChainId, repaymentTo
             refunds: {},
         });
     }
-    var bundleFill = __assign(__assign({}, fill), { lpFeePct: lpFeePct, relayer: repaymentAddress });
+    var bundleFill = __assign(__assign({}, fill), { lpFeePct: lpFeePct });
     // Add all fills, slow and fast, to dictionary.
     assign(dict, [repaymentChainId, repaymentToken, "fills"], [bundleFill]);
     // All fills update the bundle LP fees.
     var refundObj = dict[repaymentChainId][repaymentToken];
-    var realizedLpFee = bundleFill.inputAmount.mul(bundleFill.lpFeePct).div(fixedPointAdjustment);
+    var realizedLpFee = fill.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);
+    if (!isSlowFill(fill)) {
+        var refundAmount = fill.inputAmount.mul(fixedPointAdjustment.sub(lpFeePct)).div(fixedPointAdjustment);
         refundObj.totalRefundAmount = refundObj.totalRefundAmount
             ? refundObj.totalRefundAmount.add(refundAmount)
             : refundAmount;
         // Instantiate dictionary if it doesn't exist.
         (_b = refundObj.refunds) !== null && _b !== void 0 ? _b : (refundObj.refunds = {});
-        if (refundObj.refunds[bundleFill.relayer]) {
-            refundObj.refunds[bundleFill.relayer] = refundObj.refunds[bundleFill.relayer].add(refundAmount);
+        if (refundObj.refunds[fill.relayer]) {
+            refundObj.refunds[fill.relayer] = refundObj.refunds[fill.relayer].add(refundAmount);
         }
         else {
-            refundObj.refunds[bundleFill.relayer] = refundAmount;
+            refundObj.refunds[fill.relayer] = refundAmount;
         }
     }
 }
@@ -218,124 +209,77 @@ var BundleDataClient = /** @class */ (function () {
                         return [4 /*yield*/, this.loadArweaveData(bundleEvaluationBlockRanges)];
                     case 1:
                         arweaveData = _a.sent();
-                        if (!(arweaveData === undefined)) return [3 /*break*/, 3];
-                        return [4 /*yield*/, this.getApproximateRefundsForBlockRange(chainIds, bundleEvaluationBlockRanges)];
-                    case 2:
-                        combinedRefunds = _a.sent();
-                        return [3 /*break*/, 4];
-                    case 3:
-                        bundleFillsV3 = arweaveData.bundleFillsV3, expiredDepositsToRefundV3 = arweaveData.expiredDepositsToRefundV3;
-                        combinedRefunds = getRefundsFromBundle(bundleFillsV3, expiredDepositsToRefundV3);
-                        // If we don't have a spoke pool client for a chain, then we won't be able to deduct refunds correctly for this
-                        // chain. For most of the pending bundle's liveness period, these past refunds are already executed so this is
-                        // a reasonable assumption. This empty refund chain also matches what the alternative
-                        // `getApproximateRefundsForBlockRange` would return.
-                        Object.keys(combinedRefunds).forEach(function (chainId) {
-                            if (_this.spokePoolClients[Number(chainId)] === undefined) {
-                                delete combinedRefunds[Number(chainId)];
-                            }
-                        });
-                        _a.label = 4;
-                    case 4: 
-                    // The latest proposed bundle's refund leaves might have already been partially or entirely executed.
-                    // We have to deduct the executed amounts from the total refund amounts.
-                    return [2 /*return*/, this.deductExecutedRefunds(combinedRefunds, bundle)];
+                        if (arweaveData === undefined) {
+                            combinedRefunds = this.getApproximateRefundsForBlockRange(chainIds, bundleEvaluationBlockRanges);
+                        }
+                        else {
+                            bundleFillsV3 = arweaveData.bundleFillsV3, expiredDepositsToRefundV3 = arweaveData.expiredDepositsToRefundV3;
+                            combinedRefunds = getRefundsFromBundle(bundleFillsV3, expiredDepositsToRefundV3);
+                            // If we don't have a spoke pool client for a chain, then we won't be able to deduct refunds correctly for this
+                            // chain. For most of the pending bundle's liveness period, these past refunds are already executed so this is
+                            // a reasonable assumption. This empty refund chain also matches what the alternative
+                            // `getApproximateRefundsForBlockRange` would return.
+                            Object.keys(combinedRefunds).forEach(function (chainId) {
+                                if (_this.spokePoolClients[Number(chainId)] === undefined) {
+                                    delete combinedRefunds[Number(chainId)];
+                                }
+                            });
+                        }
+                        // The latest proposed bundle's refund leaves might have already been partially or entirely executed.
+                        // We have to deduct the executed amounts from the total refund amounts.
+                        return [2 /*return*/, this.deductExecutedRefunds(combinedRefunds, bundle)];
                 }
             });
         });
     };
     // @dev This helper function should probably be moved to the InventoryClient
     BundleDataClient.prototype.getApproximateRefundsForBlockRange = function (chainIds, blockRanges) {
-        return __awaiter(this, void 0, void 0, function () {
-            var refundsForChain, _loop_1, this_1, _i, chainIds_1, chainId;
-            var _this = this;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        refundsForChain = {};
-                        _loop_1 = function (chainId) {
-                            var chainIndex, fillsToCount;
-                            return __generator(this, function (_b) {
-                                switch (_b.label) {
-                                    case 0:
-                                        if (this_1.spokePoolClients[chainId] === undefined) {
-                                            return [2 /*return*/, "continue"];
-                                        }
-                                        chainIndex = chainIds.indexOf(chainId);
-                                        return [4 /*yield*/, filterAsync(this_1.spokePoolClients[chainId].getFills(), function (fill) { return __awaiter(_this, void 0, void 0, function () {
-                                                var matchingDeposit, hasMatchingDeposit, validRepayment;
-                                                return __generator(this, function (_a) {
-                                                    switch (_a.label) {
-                                                        case 0:
-                                                            if (fill.blockNumber < blockRanges[chainIndex][0] ||
-                                                                fill.blockNumber > blockRanges[chainIndex][1] ||
-                                                                isZeroValueFillOrSlowFillRequest(fill)) {
-                                                                return [2 /*return*/, false];
-                                                            }
-                                                            // If origin spoke pool client isn't defined, we can't validate it.
-                                                            if (this.spokePoolClients[fill.originChainId] === undefined) {
-                                                                return [2 /*return*/, false];
-                                                            }
-                                                            matchingDeposit = this.spokePoolClients[fill.originChainId].getDeposit(fill.depositId);
-                                                            hasMatchingDeposit = matchingDeposit !== undefined &&
-                                                                this.getRelayHashFromEvent(fill) === this.getRelayHashFromEvent(matchingDeposit);
-                                                            if (!hasMatchingDeposit) return [3 /*break*/, 2];
-                                                            return [4 /*yield*/, verifyFillRepayment(fill, this.spokePoolClients[fill.destinationChainId].spokePool.provider, matchingDeposit, 
-                                                                // @dev: to get valid repayment chain ID's, get all chain IDs for the bundle block range and remove
-                                                                // disabled block ranges.
-                                                                this.clients.configStoreClient
-                                                                    .getChainIdIndicesForBlock(blockRanges[0][1])
-                                                                    .filter(function (_chainId, i) { return !isChainDisabled(blockRanges[i]); }))];
-                                                        case 1:
-                                                            validRepayment = _a.sent();
-                                                            if (!isDefined(validRepayment)) {
-                                                                return [2 /*return*/, false];
-                                                            }
-                                                            _a.label = 2;
-                                                        case 2: return [2 /*return*/, hasMatchingDeposit];
-                                                    }
-                                                });
-                                            }); })];
-                                    case 1:
-                                        fillsToCount = _b.sent();
-                                        fillsToCount.forEach(function (fill) {
-                                            var _a, _b, _c;
-                                            var _d;
-                                            var matchingDeposit = _this.spokePoolClients[fill.originChainId].getDeposit(fill.depositId);
-                                            assert(isDefined(matchingDeposit), "Deposit not found for fill.");
-                                            var _e = getRefundInformationFromFill(fill, _this.clients.hubPoolClient, blockRanges, _this.chainIdListForBundleEvaluationBlockNumbers, matchingDeposit.fromLiteChain // Use ! because we've already asserted that matchingDeposit is defined.
-                                            ), chainToSendRefundTo = _e.chainToSendRefundTo, repaymentToken = _e.repaymentToken;
-                                            // Assume that lp fees are 0 for the sake of speed. In the future we could batch compute
-                                            // these or make hardcoded assumptions based on the origin-repayment chain direction. This might result
-                                            // in slight over estimations of refunds, but its not clear whether underestimating or overestimating is
-                                            // worst from the relayer's perspective.
-                                            var relayer = fill.relayer, refundAmount = fill.inputAmount;
-                                            (_a = refundsForChain[chainToSendRefundTo]) !== null && _a !== void 0 ? _a : (refundsForChain[chainToSendRefundTo] = {});
-                                            (_b = (_d = refundsForChain[chainToSendRefundTo])[repaymentToken]) !== null && _b !== void 0 ? _b : (_d[repaymentToken] = {});
-                                            var existingRefundAmount = (_c = refundsForChain[chainToSendRefundTo][repaymentToken][relayer]) !== null && _c !== void 0 ? _c : bnZero;
-                                            refundsForChain[chainToSendRefundTo][repaymentToken][relayer] = existingRefundAmount.add(refundAmount);
-                                        });
-                                        return [2 /*return*/];
-                                }
-                            });
-                        };
-                        this_1 = this;
-                        _i = 0, chainIds_1 = chainIds;
-                        _a.label = 1;
-                    case 1:
-                        if (!(_i < chainIds_1.length)) return [3 /*break*/, 4];
-                        chainId = chainIds_1[_i];
-                        return [5 /*yield**/, _loop_1(chainId)];
-                    case 2:
-                        _a.sent();
-                        _a.label = 3;
-                    case 3:
-                        _i++;
-                        return [3 /*break*/, 1];
-                    case 4: return [2 /*return*/, refundsForChain];
+        var _this = this;
+        var refundsForChain = {};
+        var _loop_1 = function (chainId) {
+            if (this_1.spokePoolClients[chainId] === undefined) {
+                return "continue";
+            }
+            var chainIndex = chainIds.indexOf(chainId);
+            this_1.spokePoolClients[chainId]
+                .getFills()
+                .filter(function (fill) {
+                if (fill.blockNumber < blockRanges[chainIndex][0] || fill.blockNumber > blockRanges[chainIndex][1]) {
+                    return false;
+                }
+                // If origin spoke pool client isn't defined, we can't validate it.
+                if (_this.spokePoolClients[fill.originChainId] === undefined) {
+                    return false;
                 }
+                var matchingDeposit = _this.spokePoolClients[fill.originChainId].getDeposit(fill.depositId);
+                var hasMatchingDeposit = matchingDeposit !== undefined &&
+                    _this.getRelayHashFromEvent(fill) === _this.getRelayHashFromEvent(matchingDeposit);
+                return hasMatchingDeposit;
+            })
+                .forEach(function (fill) {
+                var _a, _b, _c;
+                var _d;
+                var matchingDeposit = _this.spokePoolClients[fill.originChainId].getDeposit(fill.depositId);
+                assert(isDefined(matchingDeposit), "Deposit not found for fill.");
+                var _e = getRefundInformationFromFill(fill, _this.clients.hubPoolClient, blockRanges, _this.chainIdListForBundleEvaluationBlockNumbers, matchingDeposit.fromLiteChain // Use ! because we've already asserted that matchingDeposit is defined.
+                ), chainToSendRefundTo = _e.chainToSendRefundTo, repaymentToken = _e.repaymentToken;
+                // Assume that lp fees are 0 for the sake of speed. In the future we could batch compute
+                // these or make hardcoded assumptions based on the origin-repayment chain direction. This might result
+                // in slight over estimations of refunds, but its not clear whether underestimating or overestimating is
+                // worst from the relayer's perspective.
+                var relayer = fill.relayer, refundAmount = fill.inputAmount;
+                (_a = refundsForChain[chainToSendRefundTo]) !== null && _a !== void 0 ? _a : (refundsForChain[chainToSendRefundTo] = {});
+                (_b = (_d = refundsForChain[chainToSendRefundTo])[repaymentToken]) !== null && _b !== void 0 ? _b : (_d[repaymentToken] = {});
+                var existingRefundAmount = (_c = refundsForChain[chainToSendRefundTo][repaymentToken][relayer]) !== null && _c !== void 0 ? _c : bnZero;
+                refundsForChain[chainToSendRefundTo][repaymentToken][relayer] = existingRefundAmount.add(refundAmount);
             });
-        });
+        };
+        var this_1 = this;
+        for (var _i = 0, chainIds_1 = chainIds; _i < chainIds_1.length; _i++) {
+            var chainId = chainIds_1[_i];
+            _loop_1(chainId);
+        }
+        return refundsForChain;
     };
     BundleDataClient.prototype.getUpcomingDepositAmount = function (chainId, l2Token, latestBlockToSearch) {
         if (this.spokePoolClients[chainId] === undefined) {
@@ -427,40 +371,33 @@ var BundleDataClient = /** @class */ (function () {
                     return [initialBlockRange[1] + 1, blockRange[1]];
                 });
             }
-            var hubPoolClient, nextBundleMainnetStartBlock, chainIds, combinedRefunds, widestBundleBlockRanges, pendingBundleBlockRanges, arweaveData, _a, _b, bundleFillsV3, expiredDepositsToRefundV3, start, _c, _d;
-            return __generator(this, function (_e) {
-                switch (_e.label) {
+            var hubPoolClient, nextBundleMainnetStartBlock, chainIds, combinedRefunds, widestBundleBlockRanges, pendingBundleBlockRanges, arweaveData, bundleFillsV3, expiredDepositsToRefundV3, start;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
                     case 0:
                         hubPoolClient = this.clients.hubPoolClient;
                         nextBundleMainnetStartBlock = hubPoolClient.getNextBundleStartBlockNumber(this.chainIdListForBundleEvaluationBlockNumbers, hubPoolClient.latestBlockSearched, hubPoolClient.chainId);
                         chainIds = this.clients.configStoreClient.getChainIdIndicesForBlock(nextBundleMainnetStartBlock);
                         combinedRefunds = [];
                         widestBundleBlockRanges = getWidestPossibleExpectedBlockRange(chainIds, this.spokePoolClients, getEndBlockBuffers(chainIds, this.blockRangeEndBlockBuffer), this.clients, this.clients.hubPoolClient.latestBlockSearched, this.clients.configStoreClient.getEnabledChains(this.clients.hubPoolClient.latestBlockSearched));
-                        if (!hubPoolClient.hasPendingProposal()) return [3 /*break*/, 5];
+                        if (!hubPoolClient.hasPendingProposal()) return [3 /*break*/, 2];
                         pendingBundleBlockRanges = getImpliedBundleBlockRanges(hubPoolClient, this.clients.configStoreClient, hubPoolClient.getLatestProposedRootBundle());
                         return [4 /*yield*/, this.loadArweaveData(pendingBundleBlockRanges)];
                     case 1:
-                        arweaveData = _e.sent();
-                        if (!(arweaveData === undefined)) return [3 /*break*/, 3];
-                        _b = (_a = combinedRefunds).push;
-                        return [4 /*yield*/, this.getApproximateRefundsForBlockRange(chainIds, pendingBundleBlockRanges)];
-                    case 2:
-                        _b.apply(_a, [_e.sent()]);
-                        return [3 /*break*/, 4];
-                    case 3:
-                        bundleFillsV3 = arweaveData.bundleFillsV3, expiredDepositsToRefundV3 = arweaveData.expiredDepositsToRefundV3;
-                        combinedRefunds.push(getRefundsFromBundle(bundleFillsV3, expiredDepositsToRefundV3));
-                        _e.label = 4;
-                    case 4:
+                        arweaveData = _a.sent();
+                        if (arweaveData === undefined) {
+                            combinedRefunds.push(this.getApproximateRefundsForBlockRange(chainIds, pendingBundleBlockRanges));
+                        }
+                        else {
+                            bundleFillsV3 = arweaveData.bundleFillsV3, expiredDepositsToRefundV3 = arweaveData.expiredDepositsToRefundV3;
+                            combinedRefunds.push(getRefundsFromBundle(bundleFillsV3, expiredDepositsToRefundV3));
+                        }
                         // Shorten the widestBundleBlockRanges now to not double count the pending bundle blocks.
                         widestBundleBlockRanges = getBlockRangeDelta(pendingBundleBlockRanges);
-                        _e.label = 5;
-                    case 5:
+                        _a.label = 2;
+                    case 2:
                         start = performance.now();
-                        _d = (_c = combinedRefunds).push;
-                        return [4 /*yield*/, this.getApproximateRefundsForBlockRange(chainIds, widestBundleBlockRanges)];
-                    case 6:
-                        _d.apply(_c, [_e.sent()]);
+                        combinedRefunds.push(this.getApproximateRefundsForBlockRange(chainIds, widestBundleBlockRanges));
                         this.logger.debug({
                             at: "BundleDataClient#getNextBundleRefunds",
                             message: "Loading approximate refunds for next bundle in ".concat(Math.round(performance.now() - start) / 1000, "s."),
@@ -603,7 +540,7 @@ var BundleDataClient = /** @class */ (function () {
     };
     BundleDataClient.prototype.loadDataFromScratch = function (blockRangesForChains, spokePoolClients) {
         return __awaiter(this, void 0, void 0, function () {
-            var start, key, chainIds, bundleDepositsV3, bundleFillsV3, bundleInvalidFillsV3, bundleSlowFillsV3, expiredDepositsToRefundV3, unexecutableSlowFills, _isChainDisabled, _canCreateSlowFillLeaf, _depositIsExpired, _getFillStatusForDeposit, allChainIds, _cachedBundleTimestamps, bundleBlockTimestamps, v3RelayHashes, bundleDepositHashes, olderDepositHashes, decodeBundleDepositHash, startBlockForMainnet, versionAtProposalBlock, canRefundPrefills, depositCounter, _loop_2, _i, allChainIds_1, originChainId, validatedBundleV3Fills, validatedBundleSlowFills, validatedBundleUnexecutableSlowFills, fillCounter, _loop_3, _a, allChainIds_2, originChainId, promises, _b, v3FillLpFees, v3SlowFillLpFees, v3UnexecutableSlowFillLpFees, v3SpokeEventsReadable;
+            var start, key, chainIds, bundleDepositsV3, bundleFillsV3, bundleInvalidFillsV3, bundleSlowFillsV3, expiredDepositsToRefundV3, unexecutableSlowFills, _isChainDisabled, _canCreateSlowFillLeaf, _getFillStatusForDeposit, allChainIds, _cachedBundleTimestamps, bundleBlockTimestamps, v3RelayHashes, bundleDepositHashes, olderDepositHashes, depositCounter, _loop_2, _i, allChainIds_1, originChainId, validatedBundleV3Fills, validatedBundleSlowFills, validatedBundleUnexecutableSlowFills, fillCounter, _loop_3, _a, allChainIds_2, originChainId, promises, _b, v3FillLpFees, v3SlowFillLpFees, v3UnexecutableSlowFillLpFees, v3SpokeEventsReadable;
             var _this = this;
             return __generator(this, function (_c) {
                 switch (_c.label) {
@@ -638,9 +575,6 @@ var BundleDataClient = /** @class */ (function () {
                                 !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
@@ -680,13 +614,6 @@ var BundleDataClient = /** @class */ (function () {
                         v3RelayHashes = {};
                         bundleDepositHashes = [];
                         olderDepositHashes = [];
-                        decodeBundleDepositHash = function (depositHash) {
-                            var _a = depositHash.split("@"), relayDataHash = _a[0], i = _a[1];
-                            return { relayDataHash: relayDataHash, index: Number(i) };
-                        };
-                        startBlockForMainnet = getBlockRangeForChain(blockRangesForChains, this.clients.hubPoolClient.chainId, this.chainIdListForBundleEvaluationBlockNumbers)[0];
-                        versionAtProposalBlock = this.clients.configStoreClient.getConfigStoreVersionForBlock(startBlockForMainnet);
-                        canRefundPrefills = versionAtProposalBlock >= PRE_FILL_MIN_CONFIG_STORE_VERSION || process.env.FORCE_REFUND_PREFILLS === "true";
                         depositCounter = 0;
                         _loop_2 = function (originChainId) {
                             var originClient = spokePoolClients[originChainId];
@@ -700,21 +627,18 @@ var BundleDataClient = /** @class */ (function () {
                                     // Only evaluate deposits that are in this bundle or in previous bundles. This means we cannot issue fill
                                     // refunds or slow fills here for deposits that are in future bundles (i.e. "pre-fills"). Instead, we'll
                                     // evaluate these pre-fills once the deposit is inside the "current" bundle block range.
-                                    if (deposit.blockNumber > originChainBlockRange[1] || isZeroValueDeposit(deposit)) {
+                                    if (isZeroValueDeposit(deposit) || deposit.blockNumber > originChainBlockRange[1]) {
                                         return;
                                     }
                                     depositCounter++;
                                     var relayDataHash = _this.getRelayHashFromEvent(deposit);
                                     if (!v3RelayHashes[relayDataHash]) {
                                         v3RelayHashes[relayDataHash] = {
-                                            deposits: [deposit],
+                                            deposit: deposit,
                                             fill: undefined,
                                             slowFillRequest: undefined,
                                         };
                                     }
-                                    else {
-                                        v3RelayHashes[relayDataHash].deposits.push(deposit);
-                                    }
                                     // Once we've saved the deposit hash into v3RelayHashes, then we can exit early here if the inputAmount
                                     // is 0 because there can be no expired amount to refund and no unexecutable slow fill amount to return
                                     // if this deposit did expire. Input amount can only be zero at this point if the message is non-empty,
@@ -722,18 +646,12 @@ var BundleDataClient = /** @class */ (function () {
                                     if (deposit.inputAmount.eq(0)) {
                                         return;
                                     }
-                                    // Evaluate all expired deposits after fetching fill statuses,
-                                    // since we can't know for certain whether an expired deposit was filled a long time ago.
-                                    var newBundleDepositHash = "".concat(relayDataHash, "@").concat(v3RelayHashes[relayDataHash].deposits.length - 1);
-                                    var decodedBundleDepositHash = decodeBundleDepositHash(newBundleDepositHash);
-                                    assert(decodedBundleDepositHash.relayDataHash === relayDataHash &&
-                                        decodedBundleDepositHash.index === v3RelayHashes[relayDataHash].deposits.length - 1, "Not using correct bundle deposit hash key");
                                     if (deposit.blockNumber >= originChainBlockRange[0]) {
-                                        bundleDepositHashes.push(newBundleDepositHash);
+                                        bundleDepositHashes.push(relayDataHash);
                                         updateBundleDepositsV3(bundleDepositsV3, deposit);
                                     }
                                     else if (deposit.blockNumber < originChainBlockRange[0]) {
-                                        olderDepositHashes.push(newBundleDepositHash);
+                                        olderDepositHashes.push(relayDataHash);
                                     }
                                 });
                             }
@@ -758,7 +676,7 @@ var BundleDataClient = /** @class */ (function () {
                                     case 0:
                                         originClient = spokePoolClients[originChainId];
                                         _loop_4 = function (destinationChainId) {
-                                            var destinationClient, destinationChainBlockRange, fastFillsReplacingSlowFills;
+                                            var destinationClient, destinationChainBlockRange, fastFillsReplacingSlowFills, originBlockRange;
                                             return __generator(this, function (_g) {
                                                 switch (_g.label) {
                                                     case 0:
@@ -774,56 +692,41 @@ var BundleDataClient = /** @class */ (function () {
                                                                 // 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); }), function (fill) { return __awaiter(_this, void 0, void 0, function () {
-                                                                var relayDataHash, fillToRefund, duplicateDeposits, historicalDeposit, matchedDeposit, fillToRefund;
+                                                                var relayDataHash, historicalDeposit, matchedDeposit;
                                                                 return __generator(this, function (_a) {
                                                                     switch (_a.label) {
                                                                         case 0:
-                                                                            fillCounter++;
                                                                             relayDataHash = this.getRelayHashFromEvent(fill);
-                                                                            if (!v3RelayHashes[relayDataHash]) return [3 /*break*/, 5];
-                                                                            if (!!v3RelayHashes[relayDataHash].fill) return [3 /*break*/, 3];
-                                                                            assert(isDefined(v3RelayHashes[relayDataHash].deposits) && v3RelayHashes[relayDataHash].deposits.length > 0, "Deposit should exist in relay hash dictionary.");
-                                                                            // At this point, the v3RelayHashes entry already existed meaning that there is a matching deposit,
-                                                                            // so this fill can no longer be filled on-chain.
-                                                                            v3RelayHashes[relayDataHash].fill = fill;
-                                                                            if (!(fill.blockNumber >= destinationChainBlockRange[0])) return [3 /*break*/, 2];
-                                                                            return [4 /*yield*/, verifyFillRepayment(fill, destinationClient.spokePool.provider, v3RelayHashes[relayDataHash].deposits[0], allChainIds)];
-                                                                        case 1:
-                                                                            fillToRefund = _a.sent();
-                                                                            if (!isDefined(fillToRefund)) {
-                                                                                bundleInvalidFillsV3.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;
-                                                                                validatedBundleV3Fills.push(__assign(__assign({}, fillToRefund), { quoteTimestamp: v3RelayHashes[relayDataHash].deposits[0].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.
-                                                                            // slow fill requests for deposits from or to lite chains are considered invalid
-                                                                            if (fill.relayExecutionInfo.fillType === FillType.ReplacedSlowFill &&
-                                                                                _canCreateSlowFillLeaf(v3RelayHashes[relayDataHash].deposits[0])) {
-                                                                                fastFillsReplacingSlowFills.push(relayDataHash);
+                                                                            fillCounter++;
+                                                                            if (v3RelayHashes[relayDataHash]) {
+                                                                                if (!v3RelayHashes[relayDataHash].fill) {
+                                                                                    assert(isDefined(v3RelayHashes[relayDataHash].deposit), "Deposit should exist in relay hash dictionary.");
+                                                                                    // At this point, the v3RelayHashes entry already existed meaning that there is a matching deposit,
+                                                                                    // so this fill is validated.
+                                                                                    v3RelayHashes[relayDataHash].fill = fill;
+                                                                                    if (fill.blockNumber >= destinationChainBlockRange[0]) {
+                                                                                        validatedBundleV3Fills.push(__assign(__assign({}, fill), { quoteTimestamp: v3RelayHashes[relayDataHash].deposit.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.
+                                                                                        // slow fill requests for deposits from or to lite chains are considered invalid
+                                                                                        if (fill.relayExecutionInfo.fillType === FillType.ReplacedSlowFill &&
+                                                                                            !v3RelayHashes[relayDataHash].deposit.fromLiteChain &&
+                                                                                            !v3RelayHashes[relayDataHash].deposit.toLiteChain) {
+                                                                                            fastFillsReplacingSlowFills.push(relayDataHash);
+                                                                                        }
+                                                                                    }
+                                                                                }
+                                                                                return [2 /*return*/];
                                                                             }
-                                                                            duplicateDeposits = v3RelayHashes[relayDataHash].deposits.slice(1);
-                                                                            duplicateDeposits.forEach(function (duplicateDeposit) {
-                                                                                updateExpiredDepositsV3(expiredDepositsToRefundV3, duplicateDeposit);
-                                                                            });
-                                                                            _a.label = 2;
-                                                                        case 2: return [3 /*break*/, 4];
-                                                                        case 3: 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.
+                                                                            // instantiate the entry.
                                                                             v3RelayHashes[relayDataHash] = {
-                                                                                deposits: undefined,
+                                                                                deposit: undefined,
                                                                                 fill: fill,
                                                                                 slowFillRequest: undefined,
                                                                             };
-                                                                            if (!(fill.blockNumber >= destinationChainBlockRange[0])) return [3 /*break*/, 9];
+                                                                            if (!(fill.blockNumber >= destinationChainBlockRange[0])) return [3 /*break*/, 2];
                                                                             // 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.
@@ -832,38 +735,29 @@ var BundleDataClient = /** @class */ (function () {
                                                                                 return [2 /*return*/];
                                                                             }
                                                                             return [4 /*yield*/, queryHistoricalDepositForFill(originClient, fill)];
-                                                                        case 6:
+                                                                        case 1:
                                                                             historicalDeposit = _a.sent();
-                                                                            if (!!historicalDeposit.found) return [3 /*break*/, 7];
-                                                                            bundleInvalidFillsV3.push(fill);
-                                                                            return [3 /*break*/, 9];
-                                                                        case 7:
-                                                                            matchedDeposit = historicalDeposit.deposit;
-                                                                            v3RelayHashes[relayDataHash].deposits = [matchedDeposit];
-                                                                            return [4 /*yield*/, verifyFillRepayment(fill, destinationClient.spokePool.provider, matchedDeposit, allChainIds)];
-                                                                        case 8:
-                                                                            fillToRefund = _a.sent();
-                                                                            if (!isDefined(fillToRefund)) {
+                                                                            if (!historicalDeposit.found) {
                                                                                 bundleInvalidFillsV3.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 {
+                                                                                matchedDeposit = historicalDeposit.deposit;
                                                                                 // @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(this.getRelayHashFromEvent(matchedDeposit) === relayDataHash, "Relay hashes should match.");
-                                                                                validatedBundleV3Fills.push(__assign(__assign({}, fillToRefund), { quoteTimestamp: matchedDeposit.quoteTimestamp }));
-                                                                                v3RelayHashes[relayDataHash].fill = fillToRefund;
-                                                                            }
-                                                                            // slow fill requests for deposits from or to lite chains are considered invalid
-                                                                            if (fill.relayExecutionInfo.fillType === FillType.ReplacedSlowFill &&
-                                                                                _canCreateSlowFillLeaf(matchedDeposit)) {
-                                                                                fastFillsReplacingSlowFills.push(relayDataHash);
+                                                                                validatedBundleV3Fills.push(__assign(__assign({}, fill), { quoteTimestamp: matchedDeposit.quoteTimestamp }));
+                                                                                v3RelayHashes[relayDataHash].deposit = matchedDeposit;
+                                                                                // slow fill requests for deposits from or to lite chains are considered invalid
+                                                                                if (fill.relayExecutionInfo.fillType === FillType.ReplacedSlowFill &&
+                                                                                    !matchedDeposit.fromLiteChain &&
+                                                                                    !matchedDeposit.toLiteChain) {
+                                                                                    fastFillsReplacingSlowFills.push(relayDataHash);
+                                                                                }
                                                                             }
-                                                                            _a.label = 9;
-                                                                        case 9: return [2 /*return*/];
+                                                                            _a.label = 2;
+                                                                        case 2: return [2 /*return*/];
                                                                     }
                                                                 });
                                                             }); })];
@@ -888,33 +782,30 @@ var BundleDataClient = /** @class */ (function () {
                                                                                     v3RelayHashes[relayDataHash].slowFillRequest = slowFillRequest;
                                                                                     if (v3RelayHashes[relayDataHash].fill) {
                                                                                         // If there is a fill matching the relay hash, then this slow fill request can't be used
-                                                                                        // to create a slow fill for a filled deposit. This takes advantage of the fact that
-                                                                                        // slow fill requests must precede fills, so if there is a matching fill for this request's
-                                                                                        // relay data, then this slow fill will be unexecutable.
+                                                                                        // to create a slow fill for a filled deposit.
+                                                                                        return [2 /*return*/];
+                                                                                    }
+                                                                                    assert(isDefined(v3RelayHashes[relayDataHash].deposit), "Deposit should exist in relay hash dictionary.");
+                                                                                    matchedDeposit = v3RelayHashes[relayDataHash].deposit;
+                                                                                    if (!_canCreateSlowFillLeaf(matchedDeposit)) {
                                                                                         return [2 /*return*/];
                                                                                     }
-                                                                                    assert(isDefined(v3RelayHashes[relayDataHash].deposits) && v3RelayHashes[relayDataHash].deposits.length > 0, "Deposit should exist in relay hash dictionary.");
-                                                                                    matchedDeposit = v3RelayHashes[relayDataHash].deposits[0];
                                                                                     // If there is no fill matching the relay hash, then this might be a valid slow fill request
                                                                                     // that we should produce a slow fill leaf for. Check if the slow fill request is in the
                                                                                     // destination chain block range.
                                                                                     if (slowFillRequest.blockNumber >= destinationChainBlockRange[0] &&
-                                                                                        _canCreateSlowFillLeaf(matchedDeposit) &&
                                                                                         // Deposit must not have expired in this bundle.
-                                                                                        !_depositIsExpired(matchedDeposit)) {
+                                                                                        slowFillRequest.fillDeadline >= bundleBlockTimestamps[destinationChainId][1]) {
                                                                                         // At this point, the v3RelayHashes entry already existed meaning that there is a matching deposit,
                                                                                         // so this slow fill request relay data is correct.
                                                                                         validatedBundleSlowFills.push(matchedDeposit);
                                                                                     }
                                                                                 }
-                                                                                else {
-                                                                                    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,
+                                                                                deposit: undefined,
                                                                                 fill: undefined,
                                                                                 slowFillRequest: slowFillRequest,
                                                                             };
@@ -933,10 +824,10 @@ var BundleDataClient = /** @class */ (function () {
                                                                             // 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(this.getRelayHashFromEvent(matchedDeposit) === relayDataHash, "Deposit relay hashes should match.");
-                                                                            v3RelayHashes[relayDataHash].deposits = [matchedDeposit];
+                                                                            v3RelayHashes[relayDataHash].deposit = matchedDeposit;
                                                                             if (!_canCreateSlowFillLeaf(matchedDeposit) ||
                                                                                 // Deposit must not have expired in this bundle.
-                                                                                _depositIsExpired(matchedDeposit)) {
+                                                                                slowFillRequest.fillDeadline < bundleBlockTimestamps[destinationChainId][1]) {
                                                                                 return [2 /*return*/];
                                                                             }
                                                                             validatedBundleSlowFills.push(matchedDeposit);
@@ -949,35 +840,23 @@ var BundleDataClient = /** @class */ (function () {
                                                         // Process slow fill requests. One invariant we need to maintain is that we cannot create slow fill requests
                                                         // for deposits that would expire in this bundle.
                                                         _g.sent();
-                                                        // Deposits can be submitted an arbitrary amount of time after matching fills and slow fill requests.
-                                                        // Therefore, let's go through each deposit in this bundle again and check a few things in order:
-                                                        // - Has the deposit been filled ? If so, then we need to issue a relayer refund for
-                                                        //   this "pre-fill" if the fill took place in a previous bundle.
-                                                        // - Or, has the deposit expired in this bundle? If so, then we need to issue an expiry refund.
-                                                        // - And finally, has the deposit been slow filled? If so, then we need to issue a slow fill leaf
-                                                        //   for this "pre-slow-fill-request" if this request took place in a previous bundle.
-                                                        // @todo Only start refunding pre-fills and slow fill requests after a config store version is activated. We
-                                                        // should remove this check once we've advanced far beyond the version bump block.
-                                                        return [4 /*yield*/, mapAsync(bundleDepositHashes, function (depositHash, currentBundleDepositHashIndex) { return __awaiter(_this, void 0, void 0, function () {
-                                                                var _a, relayDataHash, index, _b, deposits, fill, slowFillRequest, deposit, isDuplicateDepositInBundle, duplicateDepositsInBundle, fillStatus, prefill, verifiedFill;
-                                                                return __generator(this, function (_c) {
-                                                                    switch (_c.label) {
+                                                        originBlockRange = getBlockRangeForChain(blockRangesForChains, originChainId, chainIds);
+                                                        return [4 /*yield*/, mapAsync(bundleDepositHashes.filter(function (depositHash) {
+                                                                var deposit = v3RelayHashes[depositHash].deposit;
+                                                                return (deposit &&
+                                                                    deposit.originChainId === originChainId &&
+                                                                    deposit.destinationChainId === destinationChainId &&
+                                                                    deposit.blockNumber >= originBlockRange[0] &&
+                                                                    deposit.blockNumber <= originBlockRange[1] &&
+                                                                    !isZeroValueDeposit(deposit));
+                                                            }), function (depositHash) { return __awaiter(_this, void 0, void 0, function () {
+                                                                var _a, deposit, fill, slowFillRequest, fillStatus, prefill;
+                                                                return __generator(this, function (_b) {
+                                                                    switch (_b.label) {
                                                                         case 0:
-                                                                            _a = decodeBundleDepositHash(depositHash), relayDataHash = _a.relayDataHash, index = _a.index;
-                                                                            _b = v3RelayHashes[relayDataHash], deposits = _b.deposits, fill = _b.fill, slowFillRequest = _b.slowFillRequest;
-                                                                            deposit = deposits[index];
+                                                                            _a = v3RelayHashes[depositHash], deposit = _a.deposit, fill = _a.fill, slowFillRequest = _a.slowFillRequest;
                                                                             if (!deposit)
                                                                                 throw new Error("Deposit should exist in relay hash dictionary.");
-                                                                            if (deposit.originChainId !== originChainId || deposit.destinationChainId !== destinationChainId) {
-                                                                                return [2 /*return*/];
-                                                                            }
-                                                                            isDuplicateDepositInBundle = bundleDepositHashes
-                                                                                .slice(0, currentBundleDepositHashIndex)
-                                                                                .some(function (_depositHash) {
-                                                                                var _relayDataHash = decodeBundleDepositHash(_depositHash).relayDataHash;
-                                                                                return _relayDataHash === relayDataHash;
-                                                                            });
-                                                                            duplicateDepositsInBundle = deposits.slice(index + 1);
                                                                             // We are willing to refund a pre-fill multiple times for each duplicate deposit.
                                                                             // This is because a duplicate deposit for a pre-fill cannot get
                                                                             // refunded to the depositor anymore because its fill status on-chain has changed to Filled. Therefore
@@ -986,18 +865,11 @@ var BundleDataClient = /** @class */ (function () {
                                                                             // If fill exists in memory, then the only case in which we need to create a refund is if the
                                                                             // the fill occurred in a previous bundle. There are no expiry refunds for filled deposits.
                                                                             if (fill) {
-                                                                                if (!isDuplicateDepositInBundle && fill.blockNumber < destinationChainBlockRange[0]) {
-                                                                                    duplicateDepositsInBundle.forEach(function (duplicateDeposit) {
-                                                                                        updateExpiredDepositsV3(expiredDepositsToRefundV3, duplicateDeposit);
-                                                                                    });
-                                                                                    if (canRefundPrefills) {
-                                                                                        // If fill is in the current bundle then we can assume there is already a refund for it, so only
-                                                                                        // include this pre fill if the fill is in an older bundle. If fill is after this current bundle, then
-                                                                                        // we won't consider it, following the previous treatment of fills after the bundle block range.
-                                                                                        if (!isSlowFill(fill)) {
-                                                                                            validatedBundleV3Fills.push(__assign(__assign({}, fill), { quoteTimestamp: deposit.quoteTimestamp }));
-                                                                                        }
-                                                                                    }
+                                                                                if (!isSlowFill(fill) && fill.blockNumber < destinationChainBlockRange[0]) {
+                                                                                    // If fill is in the current bundle then we can assume there is already a refund for it, so only
+                                                                                    // include this pre fill if the fill is in an older bundle. If fill is after this current bundle, then
+                                                                                    // we won't consider it, following the previous treatment of fills after the bundle block range.
+                                                                                    validatedBundleV3Fills.push(__assign(__assign({}, fill), { quoteTimestamp: deposit.quoteTimestamp }));
                                                                                 }
                                                                                 return [2 /*return*/];
                                                                             }
@@ -1007,87 +879,69 @@ var BundleDataClient = /** @class */ (function () {
                                                                             // we need to create a slow fill leaf for the deposit. The latter should only happen if the slow fill request
                                                                             // took place in a prior bundle otherwise we would have already created a slow fill leaf for it.
                                                                             if (slowFillRequest) {
-                                                                                if (_depositIsExpired(deposit)) {
+                                                                                if (deposit.fillDeadline < bundleBlockTimestamps[destinationChainId][1]) {
                                                                                     updateExpiredDepositsV3(expiredDepositsToRefundV3, deposit);
                                                                                 }
-                                                                                else if (!isDuplicateDepositInBundle &&
-                                                                                    canRefundPrefills &&
-                                                                                    slowFillRequest.blockNumber < destinationChainBlockRange[0] &&
-                                                                                    _canCreateSlowFillLeaf(deposit)) {
+                                                                                else if (_canCreateSlowFillLeaf(deposit) &&
+                                                                                    slowFillRequest.blockNumber < destinationChainBlockRange[0]) {
                                                                                     validatedBundleSlowFills.push(deposit);
                                                                                 }
                                                                                 return [2 /*return*/];
                                                                             }
                                                                             return [4 /*yield*/, _getFillStatusForDeposit(deposit, destinationChainBlockRange[1])];
                                                                         case 1:
-                                                                            fillStatus = _c.sent();
-                                                                            if (!(fillStatus === FillStatus.Filled)) return [3 /*break*/, 5];
-                                                                            return [4 /*yield*/, this.findMatchingFillEvent(deposit, destinationClient)];
+                                                                            fillStatus = _b.sent();
+                                                                            if (!(fillStatus === FillStatus.Filled)) return [3 /*break*/, 3];
+                                                                            return [4 /*yield*/, findFillEvent(destinationClient.spokePool, deposit, destinationClient.deploymentBlock, destinationClient.latestBlockSearched)];
                                                                         case 2:
-                                                                            prefill = _c.sent();
-                                                                            assert(isDefined(prefill), "findFillEvent# Cannot find prefill: ".concat(relayDataHash));
-                                                                            assert(this.getRelayHashFromEvent(prefill) === relayDataHash, "Relay hashes should match.");
-                                                                            if (!!isDuplicateDepositInBundle) return [3 /*break*/, 4];
-                                                                            duplicateDepositsInBundle.forEach(function (duplicateDeposit) {
-                                                                                updateExpiredDepositsV3(expiredDepositsToRefundV3, duplicateDeposit);
-                                                                            });
-                                                                            return [4 /*yield*/, verifyFillRepayment(prefill, destinationClient.spokePool.provider, deposit, allChainIds)];
-                                                                        case 3:
-                                                                            verifiedFill = _c.sent();
-                                                                            if (canRefundPrefills && isDefined(verifiedFill) && !isSlowFill(verifiedFill)) {
-                                                                                validatedBundleV3Fills.push(__assign(__assign({}, verifiedFill), { quoteTimestamp: deposit.quoteTimestamp }));
+                                                                            prefill = (_b.sent());
+                                                                            if (!isSlowFill(prefill)) {
+                                                                                validatedBundleV3Fills.push(__assign(__assign({}, prefill), { quoteTimestamp: deposit.quoteTimestamp }));
                                                                             }
-                                                                            _c.label = 4;
-                                                                        case 4: return [3 /*break*/, 6];
-                                                                        case 5:
-                                                                            if (_depositIsExpired(deposit)) {
+                                                                            return [3 /*break*/, 4];
+                                                                        case 3:
+                                                                            if (deposit.fillDeadline < bundleBlockTimestamps[destinationChainId][1]) {
                                                                                 updateExpiredDepositsV3(expiredDepositsToRefundV3, deposit);
                                                                             }
                                                                             // If slow fill requested, then issue a slow fill leaf for the deposit.
                                                                             else if (fillStatus === FillStatus.RequestedSlowFill) {
                                                                                 // Input and Output tokens must be equivalent on the deposit for this to be slow filled.
                                                                                 // Slow fill requests for deposits from or to lite chains are considered invalid
-                                                                                if (!isDuplicateDepositInBundle && canRefundPrefills && _canCreateSlowFillLeaf(deposit)) {
+                                                                                if (_canCreateSlowFillLeaf(deposit)) {
                                                                                     // If deposit newly expired, then we can't create a slow fill leaf for it but we can
                                                                                     // create a deposit refund for it.
                                                                                     validatedBundleSlowFills.push(deposit);
                                                                                 }
                                                                             }
-                                                                            _c.label = 6;
-                                                                        case 6: return [2 /*return*/];
+                                                                            _b.label = 4;
+                                                                        case 4: return [2 /*return*/];
                                                                     }
                                                                 });
                                                             }); })];
                                                     case 3:
-                                                        // Deposits can be submitted an arbitrary amount of time after matching fills and slow fill requests.
-                                                        // Therefore, let's go through each deposit in this bundle again and check a few things in order:
-                                                        // - Has the deposit been filled ? If so, then we need to issue a relayer refund for
-                                                        //   this "pre-fill" if the fill took place in a previous bundle.
-                                                        // - Or, has the deposit expired in this bundle? If so, then we need to issue an expiry refund.
-                                                        // - And finally, has the deposit been slow filled? If so, then we need to issue a slow fill leaf
-                                                        //   for this "pre-slow-fill-request" if this request took place in a previous bundle.
-                                                        // @todo Only start refunding pre-fills and slow fill requests after a config store version is activated. We
-                                                        // should remove this check once we've advanced far beyond the version bump block.
                                                         _g.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;
+                                                            var _a = v3RelayHashes[relayDataHash], deposit = _a.deposit, 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 implicitely checking that deposit exists by making it to this point.
-                                                            if (!deposits || deposits.length < 1) {
+                                                            if (!deposit) {
                                                                 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");
+                                                            assert(!deposit.fromLiteChain && !deposit.toLiteChain, "fastFillsReplacingSlowFills should not contain lite chain deposits");
                                                             var destinationBlockRange = getBlockRangeForChain(blockRangesForChains, destinationChainId, chainIds);
                                                             if (
-                                                            // 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]);
+                                                            // If the slow fill request that was replaced by this fill was in an older bundle, then we don't
+                                                            // need to check if the slow fill request was valid since we can assume all bundles in the past
+                                                            // were validated. However, we might as well double check.
+                                                            _this.clients.hubPoolClient.areTokensEquivalent(deposit.inputToken, deposit.originChainId, deposit.outputToken, deposit.destinationChainId, deposit.quoteBlockNumber) &&
+                                                                // 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(deposit);
                                                             }
                                                         });
                                                         return [2 /*return*/];
@@ -1131,31 +985,27 @@ var BundleDataClient = /** @class */ (function () {
                         // For all deposits older than this bundle, we need to check if they expired in this bundle and if they did,
                         // whether there was a slow fill created for it in a previous bundle that is now unexecutable and replaced
                         // by a new expired deposit refund.
-                        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) {
+                        return [4 /*yield*/, forEachAsync(olderDepositHashes, function (relayDataHash) { return __awaiter(_this, void 0, void 0, function () {
+                                var _a, deposit, slowFillRequest, fill, destinationChainId, destinationBlockRange, fillStatus;
+                                return __generator(this, function (_b) {
+                                    switch (_b.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];
+                                            _a = v3RelayHashes[relayDataHash], deposit = _a.deposit, slowFillRequest = _a.slowFillRequest, fill = _a.fill;
+                                            assert(isDefined(deposit), "Deposit should exist in relay hash dictionary.");
                                             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][1] &&
                                                 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();
+                                            fillStatus = _b.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) {
@@ -1164,7 +1014,8 @@ var BundleDataClient = /** @class */ (function () {
                                             // 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)) {
+                                            // slow fill requests for deposits from or to lite chains are considered invalid
+                                            if (fillStatus !== FillStatus.RequestedSlowFill || deposit.fromLiteChain || deposit.toLiteChain) {
                                                 return [2 /*return*/];
                                             }
                                             // Now, check if there was a slow fill created for this deposit in a previous bundle which would now be
@@ -1172,12 +1023,17 @@ var BundleDataClient = /** @class */ (function () {
                                             // 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 supercede
                                             // 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 because of the previous _canCreateSlowFillLeaf check.
-                                            // The slow fill request was also sent before the fill deadline expired since we checked that above.
-                                            if (!slowFillRequest || slowFillRequest.blockNumber < destinationBlockRange[0]) {
+                                            // assume a slow fill leaf was created for it because its tokens are equivalent. The slow fill request was
+                                            // also sent before the fill deadline expired since we checked that above.
+                                            if (
+                                            // Since this deposit was requested for a slow fill in an older bundle at this point, we don't
+                                            // technically need to check if the slow fill request was valid since we can assume all bundles in the past
+                                            // were validated. However, we might as well double check.
+                                            this.clients.hubPoolClient.areTokensEquivalent(deposit.inputToken, deposit.originChainId, deposit.outputToken, deposit.destinationChainId, deposit.quoteBlockNumber) &&
+                                                (!slowFillRequest || slowFillRequest.blockNumber < destinationBlockRange[0])) {
                                                 validatedBundleUnexecutableSlowFills.push(deposit);
                                             }
-                                            _c.label = 2;
+                                            _b.label = 2;
                                         case 2: return [2 /*return*/];
                                     }
                                 });
@@ -1192,7 +1048,7 @@ var BundleDataClient = /** @class */ (function () {
                         promises = [
                             validatedBundleV3Fills.length > 0
                                 ? this.clients.hubPoolClient.batchComputeRealizedLpFeePct(validatedBundleV3Fills.map(function (fill) {
-                                    var matchedDeposit = v3RelayHashes[_this.getRelayHashFromEvent(fill)].deposits[0];
+                                    var matchedDeposit = v3RelayHashes[_this.getRelayHashFromEvent(fill)].deposit;
                                     assert(isDefined(matchedDeposit), "Deposit should exist in relay hash dictionary.");
                                     var paymentChainId = getRefundInformationFromFill(fill, _this.clients.hubPoolClient, blockRangesForChains, chainIds, matchedDeposit.fromLiteChain).chainToSendRefundTo;
                                     return __assign(__assign({}, fill), { paymentChainId: paymentChainId });
@@ -1219,10 +1075,10 @@ var BundleDataClient = /** @class */ (function () {
                         v3FillLpFees.forEach(function (_a, idx) {
                             var realizedLpFeePct = _a.realizedLpFeePct;
                             var fill = validatedBundleV3Fills[idx];
-                            var associatedDeposit = v3RelayHashes[_this.getRelayHashFromEvent(fill)].deposits[0];
+                            var associatedDeposit = v3RelayHashes[_this.getRelayHashFromEvent(fill)].deposit;
                             assert(isDefined(associatedDeposit), "Deposit should exist in relay hash dictionary.");
                             var _b = getRefundInformationFromFill(fill, _this.clients.hubPoolClient, blockRangesForChains, chainIds, associatedDeposit.fromLiteChain), chainToSendRefundTo = _b.chainToSendRefundTo, repaymentToken = _b.repaymentToken;
-                            updateBundleFillsV3(bundleFillsV3, fill, realizedLpFeePct, chainToSendRefundTo, repaymentToken, fill.relayer);
+                            updateBundleFillsV3(bundleFillsV3, fill, realizedLpFeePct, chainToSendRefundTo, repaymentToken);
                         });
                         v3SlowFillLpFees.forEach(function (_a, idx) {
                             var lpFeePct = _a.realizedLpFeePct;
@@ -1265,17 +1121,7 @@ var BundleDataClient = /** @class */ (function () {
     // spoke pool contract. However, this internal function is used to uniquely identify a bridging event
     // for speed since its easier to build a string from the event data than to hash it.
     BundleDataClient.prototype.getRelayHashFromEvent = function (event) {
-        return "".concat(event.depositor, "-").concat(event.recipient, "-").concat(event.exclusiveRelayer, "-").concat(event.inputToken, "-").concat(event.outputToken, "-").concat(event.inputAmount, "-").concat(event.outputAmount, "-").concat(event.originChainId, "-").concat(event.depositId.toString(), "-").concat(event.fillDeadline, "-").concat(event.exclusivityDeadline, "-").concat(event.message, "-").concat(event.destinationChainId);
-    };
-    BundleDataClient.prototype.findMatchingFillEvent = function (deposit, spokePoolClient) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, findFillEvent(spokePoolClient.spokePool, deposit, spokePoolClient.deploymentBlock, spokePoolClient.latestBlockSearched)];
-                    case 1: return [2 /*return*/, _a.sent()];
-                }
-            });
-        });
+        return "".concat(event.depositor, "-").concat(event.recipient, "-").concat(event.exclusiveRelayer, "-").concat(event.inputToken, "-").concat(event.outputToken, "-").concat(event.inputAmount, "-").concat(event.outputAmount, "-").concat(event.originChainId, "-").concat(event.depositId, "-").concat(event.fillDeadline, "-").concat(event.exclusivityDeadline, "-").concat(event.message, "-").concat(event.destinationChainId);
     };
     BundleDataClient.prototype.getBundleBlockTimestamps = function (chainIds, blockRangesForChains, spokePoolClients) {
         return __awaiter(this, void 0, void 0, function () {
@@ -1286,7 +1132,7 @@ var BundleDataClient = /** @class */ (function () {
                     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;
+                                var blockRangeForChain, _startBlockForChain, _endBlockForChain, spokePoolClient, startBlockForChain, endBlockForChain, _a, startTime, endTime, _b;
                                 return __generator(this, function (_c) {
                                     switch (_c.label) {
                                         case 0:
@@ -1301,7 +1147,7 @@ var BundleDataClient = /** @class */ (function () {
                                                 return [2 /*return*/];
                                             }
                                             startBlockForChain = Math.min(_startBlockForChain, spokePoolClient.latestBlockSearched);
-                                            endBlockForChain = Math.min(_endBlockForChain + 1, spokePoolClient.latestBlockSearched);
+                                            endBlockForChain = Math.min(_endBlockForChain, spokePoolClient.latestBlockSearched);
                                             return [4 /*yield*/, spokePoolClient.getTimestampForBlock(startBlockForChain)];
                                         case 1:
                                             _b = [
@@ -1311,11 +1157,9 @@ var BundleDataClient = /** @class */ (function () {
                                         case 2:
                                             _a = _b.concat([
                                                 _c.sent()
-                                            ]), startTime = _a[0], _endTime = _a[1];
-                                            endBlockDelta = endBlockForChain > startBlockForChain ? 1 : 0;
-                                            endTime = Math.max(0, _endTime - endBlockDelta);
+                                            ]), startTime = _a[0], endTime = _a[1];
                                             // 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(endTime >= startTime, "End time should be greater than start time.");
                                             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]]];
                                     }