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

package/dist/cjs/clients/BundleDataClient/BundleDataClient.js

@@ -6,9 +6,13 @@ var lodash_1 = tslib_1.__importDefault(require("lodash"));
 var interfaces_1 = require("../../interfaces");
 var utils_1 = require("../../utils");
 var utils_2 = require("./utils");
+var constants_1 = require("../../constants");
 exports.INFINITE_FILL_DEADLINE = utils_1.bnUint32Max;
 function updateExpiredDepositsV3(dict, deposit) {
     var _a;
+    if ((0, utils_1.chainIsEvm)(deposit.originChainId) && !(0, utils_1.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])) {
         (0, utils_1.assign)(dict, [originChainId, inputToken], []);
@@ -23,8 +27,11 @@ function updateBundleDepositsV3(dict, deposit) {
     }
     dict[originChainId][inputToken].push(deposit);
 }
-function updateBundleFillsV3(dict, fill, lpFeePct, repaymentChainId, repaymentToken) {
+function updateBundleFillsV3(dict, fill, lpFeePct, repaymentChainId, repaymentToken, repaymentAddress) {
     var _a, _b;
+    if ((0, utils_1.chainIsEvm)(repaymentChainId) && !(0, utils_1.isValidEvmAddress)(repaymentAddress)) {
+        return;
+    }
     if (!((_a = dict === null || dict === void 0 ? void 0 : dict[repaymentChainId]) === null || _a === void 0 ? void 0 : _a[repaymentToken])) {
         (0, utils_1.assign)(dict, [repaymentChainId, repaymentToken], {
             fills: [],
@@ -33,22 +40,22 @@ function updateBundleFillsV3(dict, fill, lpFeePct, repaymentChainId, repaymentTo
             refunds: {},
         });
     }
-    var bundleFill = tslib_1.__assign(tslib_1.__assign({}, fill), { lpFeePct: lpFeePct });
+    var bundleFill = tslib_1.__assign(tslib_1.__assign({}, fill), { lpFeePct: lpFeePct, relayer: repaymentAddress });
     (0, utils_1.assign)(dict, [repaymentChainId, repaymentToken, "fills"], [bundleFill]);
     var refundObj = dict[repaymentChainId][repaymentToken];
-    var realizedLpFee = fill.inputAmount.mul(bundleFill.lpFeePct).div(utils_1.fixedPointAdjustment);
+    var realizedLpFee = bundleFill.inputAmount.mul(bundleFill.lpFeePct).div(utils_1.fixedPointAdjustment);
     refundObj.realizedLpFees = refundObj.realizedLpFees ? refundObj.realizedLpFees.add(realizedLpFee) : realizedLpFee;
-    if (!(0, utils_1.isSlowFill)(fill)) {
-        var refundAmount = fill.inputAmount.mul(utils_1.fixedPointAdjustment.sub(lpFeePct)).div(utils_1.fixedPointAdjustment);
+    if (!(0, utils_1.isSlowFill)(bundleFill)) {
+        var refundAmount = bundleFill.inputAmount.mul(utils_1.fixedPointAdjustment.sub(lpFeePct)).div(utils_1.fixedPointAdjustment);
         refundObj.totalRefundAmount = refundObj.totalRefundAmount
             ? refundObj.totalRefundAmount.add(refundAmount)
             : refundAmount;
         (_b = refundObj.refunds) !== null && _b !== void 0 ? _b : (refundObj.refunds = {});
-        if (refundObj.refunds[fill.relayer]) {
-            refundObj.refunds[fill.relayer] = refundObj.refunds[fill.relayer].add(refundAmount);
+        if (refundObj.refunds[bundleFill.relayer]) {
+            refundObj.refunds[bundleFill.relayer] = refundObj.refunds[bundleFill.relayer].add(refundAmount);
         }
         else {
-            refundObj.refunds[fill.relayer] = refundAmount;
+            refundObj.refunds[bundleFill.relayer] = refundAmount;
         }
     }
 }
@@ -146,7 +153,7 @@ var BundleDataClient = (function () {
                             at: "BundleDataClient#loadPersistedDataFromArweave",
                             message: "Loaded persisted data from Arweave in ".concat(Math.round(performance.now() - start) / 1000, "s."),
                             blockRanges: JSON.stringify(blockRangesForChains),
-                            bundleData: (0, utils_2.prettyPrintV3SpokePoolEvents)(bundleData.bundleDepositsV3, bundleData.bundleFillsV3, [], bundleData.bundleSlowFillsV3, bundleData.expiredDepositsToRefundV3, bundleData.unexecutableSlowFills),
+                            bundleData: (0, utils_2.prettyPrintV3SpokePoolEvents)(bundleData.bundleDepositsV3, bundleData.bundleFillsV3, bundleData.bundleSlowFillsV3, bundleData.expiredDepositsToRefundV3, bundleData.unexecutableSlowFills),
                         });
                         return [2, bundleData];
                 }
@@ -188,64 +195,107 @@ var BundleDataClient = (function () {
                         return [4, this.loadArweaveData(bundleEvaluationBlockRanges)];
                     case 1:
                         arweaveData = _a.sent();
-                        if (arweaveData === undefined) {
-                            combinedRefunds = this.getApproximateRefundsForBlockRange(chainIds, bundleEvaluationBlockRanges);
-                        }
-                        else {
-                            bundleFillsV3 = arweaveData.bundleFillsV3, expiredDepositsToRefundV3 = arweaveData.expiredDepositsToRefundV3;
-                            combinedRefunds = (0, utils_2.getRefundsFromBundle)(bundleFillsV3, expiredDepositsToRefundV3);
-                            Object.keys(combinedRefunds).forEach(function (chainId) {
-                                if (_this.spokePoolClients[Number(chainId)] === undefined) {
-                                    delete combinedRefunds[Number(chainId)];
-                                }
-                            });
-                        }
-                        return [2, this.deductExecutedRefunds(combinedRefunds, bundle)];
+                        if (!(arweaveData === undefined)) return [3, 3];
+                        return [4, this.getApproximateRefundsForBlockRange(chainIds, bundleEvaluationBlockRanges)];
+                    case 2:
+                        combinedRefunds = _a.sent();
+                        return [3, 4];
+                    case 3:
+                        bundleFillsV3 = arweaveData.bundleFillsV3, expiredDepositsToRefundV3 = arweaveData.expiredDepositsToRefundV3;
+                        combinedRefunds = (0, utils_2.getRefundsFromBundle)(bundleFillsV3, expiredDepositsToRefundV3);
+                        Object.keys(combinedRefunds).forEach(function (chainId) {
+                            if (_this.spokePoolClients[Number(chainId)] === undefined) {
+                                delete combinedRefunds[Number(chainId)];
+                            }
+                        });
+                        _a.label = 4;
+                    case 4: return [2, this.deductExecutedRefunds(combinedRefunds, bundle)];
                 }
             });
         });
     };
     BundleDataClient.prototype.getApproximateRefundsForBlockRange = function (chainIds, blockRanges) {
-        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 (_this.spokePoolClients[fill.originChainId] === undefined) {
-                    return false;
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var refundsForChain, _loop_1, this_1, _i, chainIds_1, chainId;
+            var _this = this;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        refundsForChain = {};
+                        _loop_1 = function (chainId) {
+                            var chainIndex, fillsToCount;
+                            return tslib_1.__generator(this, function (_b) {
+                                switch (_b.label) {
+                                    case 0:
+                                        if (this_1.spokePoolClients[chainId] === undefined) {
+                                            return [2, "continue"];
+                                        }
+                                        chainIndex = chainIds.indexOf(chainId);
+                                        return [4, (0, utils_1.filterAsync)(this_1.spokePoolClients[chainId].getFills(), function (fill) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                                                var matchingDeposit, hasMatchingDeposit, validRepayment;
+                                                return tslib_1.__generator(this, function (_a) {
+                                                    switch (_a.label) {
+                                                        case 0:
+                                                            if (fill.blockNumber < blockRanges[chainIndex][0] ||
+                                                                fill.blockNumber > blockRanges[chainIndex][1] ||
+                                                                (0, utils_1.isZeroValueFillOrSlowFillRequest)(fill)) {
+                                                                return [2, false];
+                                                            }
+                                                            if (this.spokePoolClients[fill.originChainId] === undefined) {
+                                                                return [2, false];
+                                                            }
+                                                            matchingDeposit = this.spokePoolClients[fill.originChainId].getDeposit(fill.depositId);
+                                                            hasMatchingDeposit = matchingDeposit !== undefined &&
+                                                                this.getRelayHashFromEvent(fill) === this.getRelayHashFromEvent(matchingDeposit);
+                                                            if (!hasMatchingDeposit) return [3, 2];
+                                                            return [4, (0, utils_2.verifyFillRepayment)(fill, this.spokePoolClients[fill.destinationChainId].spokePool.provider, matchingDeposit, this.clients.configStoreClient
+                                                                    .getChainIdIndicesForBlock(blockRanges[0][1])
+                                                                    .filter(function (_chainId, i) { return !(0, utils_2.isChainDisabled)(blockRanges[i]); }))];
+                                                        case 1:
+                                                            validRepayment = _a.sent();
+                                                            if (!(0, utils_1.isDefined)(validRepayment)) {
+                                                                return [2, false];
+                                                            }
+                                                            _a.label = 2;
+                                                        case 2: return [2, 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);
+                                            (0, utils_1.assert)((0, utils_1.isDefined)(matchingDeposit), "Deposit not found for fill.");
+                                            var _e = (0, utils_2.getRefundInformationFromFill)(fill, _this.clients.hubPoolClient, blockRanges, _this.chainIdListForBundleEvaluationBlockNumbers, matchingDeposit.fromLiteChain), chainToSendRefundTo = _e.chainToSendRefundTo, repaymentToken = _e.repaymentToken;
+                                            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 : utils_1.bnZero;
+                                            refundsForChain[chainToSendRefundTo][repaymentToken][relayer] = existingRefundAmount.add(refundAmount);
+                                        });
+                                        return [2];
+                                }
+                            });
+                        };
+                        this_1 = this;
+                        _i = 0, chainIds_1 = chainIds;
+                        _a.label = 1;
+                    case 1:
+                        if (!(_i < chainIds_1.length)) return [3, 4];
+                        chainId = chainIds_1[_i];
+                        return [5, _loop_1(chainId)];
+                    case 2:
+                        _a.sent();
+                        _a.label = 3;
+                    case 3:
+                        _i++;
+                        return [3, 1];
+                    case 4: return [2, refundsForChain];
                 }
-                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);
-                (0, utils_1.assert)((0, utils_1.isDefined)(matchingDeposit), "Deposit not found for fill.");
-                var _e = (0, utils_2.getRefundInformationFromFill)(fill, _this.clients.hubPoolClient, blockRanges, _this.chainIdListForBundleEvaluationBlockNumbers, matchingDeposit.fromLiteChain), chainToSendRefundTo = _e.chainToSendRefundTo, repaymentToken = _e.repaymentToken;
-                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 : utils_1.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) {
@@ -317,32 +367,39 @@ var BundleDataClient = (function () {
                     return [initialBlockRange[1] + 1, blockRange[1]];
                 });
             }
-            var hubPoolClient, nextBundleMainnetStartBlock, chainIds, combinedRefunds, widestBundleBlockRanges, pendingBundleBlockRanges, arweaveData, bundleFillsV3, expiredDepositsToRefundV3, start;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
+            var hubPoolClient, nextBundleMainnetStartBlock, chainIds, combinedRefunds, widestBundleBlockRanges, pendingBundleBlockRanges, arweaveData, _a, _b, bundleFillsV3, expiredDepositsToRefundV3, start, _c, _d;
+            return tslib_1.__generator(this, function (_e) {
+                switch (_e.label) {
                     case 0:
                         hubPoolClient = this.clients.hubPoolClient;
                         nextBundleMainnetStartBlock = hubPoolClient.getNextBundleStartBlockNumber(this.chainIdListForBundleEvaluationBlockNumbers, hubPoolClient.latestBlockSearched, hubPoolClient.chainId);
                         chainIds = this.clients.configStoreClient.getChainIdIndicesForBlock(nextBundleMainnetStartBlock);
                         combinedRefunds = [];
                         widestBundleBlockRanges = (0, utils_2.getWidestPossibleExpectedBlockRange)(chainIds, this.spokePoolClients, (0, utils_2.getEndBlockBuffers)(chainIds, this.blockRangeEndBlockBuffer), this.clients, this.clients.hubPoolClient.latestBlockSearched, this.clients.configStoreClient.getEnabledChains(this.clients.hubPoolClient.latestBlockSearched));
-                        if (!hubPoolClient.hasPendingProposal()) return [3, 2];
+                        if (!hubPoolClient.hasPendingProposal()) return [3, 5];
                         pendingBundleBlockRanges = (0, utils_1.getImpliedBundleBlockRanges)(hubPoolClient, this.clients.configStoreClient, hubPoolClient.getLatestProposedRootBundle());
                         return [4, this.loadArweaveData(pendingBundleBlockRanges)];
                     case 1:
-                        arweaveData = _a.sent();
-                        if (arweaveData === undefined) {
-                            combinedRefunds.push(this.getApproximateRefundsForBlockRange(chainIds, pendingBundleBlockRanges));
-                        }
-                        else {
-                            bundleFillsV3 = arweaveData.bundleFillsV3, expiredDepositsToRefundV3 = arweaveData.expiredDepositsToRefundV3;
-                            combinedRefunds.push((0, utils_2.getRefundsFromBundle)(bundleFillsV3, expiredDepositsToRefundV3));
-                        }
-                        widestBundleBlockRanges = getBlockRangeDelta(pendingBundleBlockRanges);
-                        _a.label = 2;
+                        arweaveData = _e.sent();
+                        if (!(arweaveData === undefined)) return [3, 3];
+                        _b = (_a = combinedRefunds).push;
+                        return [4, this.getApproximateRefundsForBlockRange(chainIds, pendingBundleBlockRanges)];
                     case 2:
+                        _b.apply(_a, [_e.sent()]);
+                        return [3, 4];
+                    case 3:
+                        bundleFillsV3 = arweaveData.bundleFillsV3, expiredDepositsToRefundV3 = arweaveData.expiredDepositsToRefundV3;
+                        combinedRefunds.push((0, utils_2.getRefundsFromBundle)(bundleFillsV3, expiredDepositsToRefundV3));
+                        _e.label = 4;
+                    case 4:
+                        widestBundleBlockRanges = getBlockRangeDelta(pendingBundleBlockRanges);
+                        _e.label = 5;
+                    case 5:
                         start = performance.now();
-                        combinedRefunds.push(this.getApproximateRefundsForBlockRange(chainIds, widestBundleBlockRanges));
+                        _d = (_c = combinedRefunds).push;
+                        return [4, this.getApproximateRefundsForBlockRange(chainIds, widestBundleBlockRanges)];
+                    case 6:
+                        _d.apply(_c, [_e.sent()]);
                         this.logger.debug({
                             at: "BundleDataClient#getNextBundleRefunds",
                             message: "Loading approximate refunds for next bundle in ".concat(Math.round(performance.now() - start) / 1000, "s."),
@@ -473,7 +530,7 @@ var BundleDataClient = (function () {
     };
     BundleDataClient.prototype.loadDataFromScratch = function (blockRangesForChains, spokePoolClients) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            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 start, key, chainIds, bundleDepositsV3, bundleFillsV3, bundleInvalidFillsV3, bundleUnrepayableFillsV3, 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 _this = this;
             return tslib_1.__generator(this, function (_c) {
                 switch (_c.label) {
@@ -493,6 +550,7 @@ var BundleDataClient = (function () {
                         bundleDepositsV3 = {};
                         bundleFillsV3 = {};
                         bundleInvalidFillsV3 = [];
+                        bundleUnrepayableFillsV3 = [];
                         bundleSlowFillsV3 = {};
                         expiredDepositsToRefundV3 = {};
                         unexecutableSlowFills = {};
@@ -505,6 +563,9 @@ var BundleDataClient = (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, Math.min(queryBlock, spokePoolClients[deposit.destinationChainId].latestBlockSearched), deposit.destinationChainId);
                         };
@@ -538,6 +599,13 @@ var BundleDataClient = (function () {
                         v3RelayHashes = {};
                         bundleDepositHashes = [];
                         olderDepositHashes = [];
+                        decodeBundleDepositHash = function (depositHash) {
+                            var _a = depositHash.split("@"), relayDataHash = _a[0], i = _a[1];
+                            return { relayDataHash: relayDataHash, index: Number(i) };
+                        };
+                        startBlockForMainnet = (0, utils_1.getBlockRangeForChain)(blockRangesForChains, this.clients.hubPoolClient.chainId, this.chainIdListForBundleEvaluationBlockNumbers)[0];
+                        versionAtProposalBlock = this.clients.configStoreClient.getConfigStoreVersionForBlock(startBlockForMainnet);
+                        canRefundPrefills = versionAtProposalBlock >= constants_1.PRE_FILL_MIN_CONFIG_STORE_VERSION || process.env.FORCE_REFUND_PREFILLS === "true";
                         depositCounter = 0;
                         _loop_2 = function (originChainId) {
                             var originClient = spokePoolClients[originChainId];
@@ -548,27 +616,34 @@ var BundleDataClient = (function () {
                                     continue;
                                 }
                                 originClient.getDepositsForDestinationChainWithDuplicates(destinationChainId).forEach(function (deposit) {
-                                    if ((0, utils_1.isZeroValueDeposit)(deposit) || deposit.blockNumber > originChainBlockRange[1]) {
+                                    if (deposit.blockNumber > originChainBlockRange[1] || (0, utils_1.isZeroValueDeposit)(deposit)) {
                                         return;
                                     }
                                     depositCounter++;
                                     var relayDataHash = _this.getRelayHashFromEvent(deposit);
                                     if (!v3RelayHashes[relayDataHash]) {
                                         v3RelayHashes[relayDataHash] = {
-                                            deposit: deposit,
+                                            deposits: [deposit],
                                             fill: undefined,
                                             slowFillRequest: undefined,
                                         };
                                     }
+                                    else {
+                                        v3RelayHashes[relayDataHash].deposits.push(deposit);
+                                    }
                                     if (deposit.inputAmount.eq(0)) {
                                         return;
                                     }
+                                    var newBundleDepositHash = "".concat(relayDataHash, "@").concat(v3RelayHashes[relayDataHash].deposits.length - 1);
+                                    var decodedBundleDepositHash = decodeBundleDepositHash(newBundleDepositHash);
+                                    (0, utils_1.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(relayDataHash);
+                                        bundleDepositHashes.push(newBundleDepositHash);
                                         updateBundleDepositsV3(bundleDepositsV3, deposit);
                                     }
                                     else if (deposit.blockNumber < originChainBlockRange[0]) {
-                                        olderDepositHashes.push(relayDataHash);
+                                        olderDepositHashes.push(newBundleDepositHash);
                                     }
                                 });
                             }
@@ -593,7 +668,7 @@ var BundleDataClient = (function () {
                                     case 0:
                                         originClient = spokePoolClients[originChainId];
                                         _loop_4 = function (destinationChainId) {
-                                            var destinationClient, destinationChainBlockRange, fastFillsReplacingSlowFills, originBlockRange;
+                                            var destinationClient, destinationChainBlockRange, fastFillsReplacingSlowFills;
                                             return tslib_1.__generator(this, function (_g) {
                                                 switch (_g.label) {
                                                     case 0:
@@ -606,56 +681,76 @@ var BundleDataClient = (function () {
                                                         return [4, (0, utils_1.forEachAsync)(destinationClient
                                                                 .getFillsForOriginChain(originChainId)
                                                                 .filter(function (fill) { return fill.blockNumber <= destinationChainBlockRange[1] && !(0, utils_1.isZeroValueFillOrSlowFillRequest)(fill); }), function (fill) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                                                                var relayDataHash, historicalDeposit, matchedDeposit;
+                                                                var relayDataHash, fillToRefund, duplicateDeposits, historicalDeposit, matchedDeposit, fillToRefund;
                                                                 return tslib_1.__generator(this, function (_a) {
                                                                     switch (_a.label) {
                                                                         case 0:
-                                                                            relayDataHash = this.getRelayHashFromEvent(fill);
                                                                             fillCounter++;
-                                                                            if (v3RelayHashes[relayDataHash]) {
-                                                                                if (!v3RelayHashes[relayDataHash].fill) {
-                                                                                    (0, utils_1.assert)((0, utils_1.isDefined)(v3RelayHashes[relayDataHash].deposit), "Deposit should exist in relay hash dictionary.");
-                                                                                    v3RelayHashes[relayDataHash].fill = fill;
-                                                                                    if (fill.blockNumber >= destinationChainBlockRange[0]) {
-                                                                                        validatedBundleV3Fills.push(tslib_1.__assign(tslib_1.__assign({}, fill), { quoteTimestamp: v3RelayHashes[relayDataHash].deposit.quoteTimestamp }));
-                                                                                        if (fill.relayExecutionInfo.fillType === interfaces_1.FillType.ReplacedSlowFill &&
-                                                                                            !v3RelayHashes[relayDataHash].deposit.fromLiteChain &&
-                                                                                            !v3RelayHashes[relayDataHash].deposit.toLiteChain) {
-                                                                                            fastFillsReplacingSlowFills.push(relayDataHash);
-                                                                                        }
-                                                                                    }
-                                                                                }
-                                                                                return [2];
+                                                                            relayDataHash = this.getRelayHashFromEvent(fill);
+                                                                            if (!v3RelayHashes[relayDataHash]) return [3, 5];
+                                                                            if (!!v3RelayHashes[relayDataHash].fill) return [3, 3];
+                                                                            (0, utils_1.assert)((0, utils_1.isDefined)(v3RelayHashes[relayDataHash].deposits) && v3RelayHashes[relayDataHash].deposits.length > 0, "Deposit should exist in relay hash dictionary.");
+                                                                            v3RelayHashes[relayDataHash].fill = fill;
+                                                                            if (!(fill.blockNumber >= destinationChainBlockRange[0])) return [3, 2];
+                                                                            return [4, (0, utils_2.verifyFillRepayment)(fill, destinationClient.spokePool.provider, v3RelayHashes[relayDataHash].deposits[0], allChainIds)];
+                                                                        case 1:
+                                                                            fillToRefund = _a.sent();
+                                                                            if (!(0, utils_1.isDefined)(fillToRefund)) {
+                                                                                bundleUnrepayableFillsV3.push(fill);
+                                                                            }
+                                                                            else {
+                                                                                v3RelayHashes[relayDataHash].fill = fillToRefund;
+                                                                                validatedBundleV3Fills.push(tslib_1.__assign(tslib_1.__assign({}, fillToRefund), { quoteTimestamp: v3RelayHashes[relayDataHash].deposits[0].quoteTimestamp }));
+                                                                            }
+                                                                            if (fill.relayExecutionInfo.fillType === interfaces_1.FillType.ReplacedSlowFill &&
+                                                                                _canCreateSlowFillLeaf(v3RelayHashes[relayDataHash].deposits[0])) {
+                                                                                fastFillsReplacingSlowFills.push(relayDataHash);
                                                                             }
+                                                                            duplicateDeposits = v3RelayHashes[relayDataHash].deposits.slice(1);
+                                                                            duplicateDeposits.forEach(function (duplicateDeposit) {
+                                                                                updateExpiredDepositsV3(expiredDepositsToRefundV3, duplicateDeposit);
+                                                                            });
+                                                                            _a.label = 2;
+                                                                        case 2: return [3, 4];
+                                                                        case 3: throw new Error("Duplicate fill detected");
+                                                                        case 4: return [2];
+                                                                        case 5:
                                                                             v3RelayHashes[relayDataHash] = {
-                                                                                deposit: undefined,
+                                                                                deposits: undefined,
                                                                                 fill: fill,
                                                                                 slowFillRequest: undefined,
                                                                             };
-                                                                            if (!(fill.blockNumber >= destinationChainBlockRange[0])) return [3, 2];
+                                                                            if (!(fill.blockNumber >= destinationChainBlockRange[0])) return [3, 9];
                                                                             if (!exports.INFINITE_FILL_DEADLINE.eq(fill.fillDeadline)) {
                                                                                 bundleInvalidFillsV3.push(fill);
                                                                                 return [2];
                                                                             }
                                                                             return [4, (0, utils_1.queryHistoricalDepositForFill)(originClient, fill)];
-                                                                        case 1:
+                                                                        case 6:
                                                                             historicalDeposit = _a.sent();
-                                                                            if (!historicalDeposit.found) {
-                                                                                bundleInvalidFillsV3.push(fill);
+                                                                            if (!!historicalDeposit.found) return [3, 7];
+                                                                            bundleInvalidFillsV3.push(fill);
+                                                                            return [3, 9];
+                                                                        case 7:
+                                                                            matchedDeposit = historicalDeposit.deposit;
+                                                                            v3RelayHashes[relayDataHash].deposits = [matchedDeposit];
+                                                                            return [4, (0, utils_2.verifyFillRepayment)(fill, destinationClient.spokePool.provider, matchedDeposit, allChainIds)];
+                                                                        case 8:
+                                                                            fillToRefund = _a.sent();
+                                                                            if (!(0, utils_1.isDefined)(fillToRefund)) {
+                                                                                bundleUnrepayableFillsV3.push(fill);
                                                                             }
                                                                             else {
-                                                                                matchedDeposit = historicalDeposit.deposit;
                                                                                 (0, utils_1.assert)(this.getRelayHashFromEvent(matchedDeposit) === relayDataHash, "Relay hashes should match.");
-                                                                                validatedBundleV3Fills.push(tslib_1.__assign(tslib_1.__assign({}, fill), { quoteTimestamp: matchedDeposit.quoteTimestamp }));
-                                                                                v3RelayHashes[relayDataHash].deposit = matchedDeposit;
-                                                                                if (fill.relayExecutionInfo.fillType === interfaces_1.FillType.ReplacedSlowFill &&
-                                                                                    !matchedDeposit.fromLiteChain &&
-                                                                                    !matchedDeposit.toLiteChain) {
-                                                                                    fastFillsReplacingSlowFills.push(relayDataHash);
-                                                                                }
+                                                                                validatedBundleV3Fills.push(tslib_1.__assign(tslib_1.__assign({}, fillToRefund), { quoteTimestamp: matchedDeposit.quoteTimestamp }));
+                                                                                v3RelayHashes[relayDataHash].fill = fillToRefund;
                                                                             }
-                                                                            _a.label = 2;
-                                                                        case 2: return [2];
+                                                                            if (fill.relayExecutionInfo.fillType === interfaces_1.FillType.ReplacedSlowFill &&
+                                                                                _canCreateSlowFillLeaf(matchedDeposit)) {
+                                                                                fastFillsReplacingSlowFills.push(relayDataHash);
+                                                                            }
+                                                                            _a.label = 9;
+                                                                        case 9: return [2];
                                                                     }
                                                                 });
                                                             }); })];
@@ -677,20 +772,21 @@ var BundleDataClient = (function () {
                                                                                     if (v3RelayHashes[relayDataHash].fill) {
                                                                                         return [2];
                                                                                     }
-                                                                                    (0, utils_1.assert)((0, utils_1.isDefined)(v3RelayHashes[relayDataHash].deposit), "Deposit should exist in relay hash dictionary.");
-                                                                                    matchedDeposit = v3RelayHashes[relayDataHash].deposit;
-                                                                                    if (!_canCreateSlowFillLeaf(matchedDeposit)) {
-                                                                                        return [2];
-                                                                                    }
+                                                                                    (0, utils_1.assert)((0, utils_1.isDefined)(v3RelayHashes[relayDataHash].deposits) && v3RelayHashes[relayDataHash].deposits.length > 0, "Deposit should exist in relay hash dictionary.");
+                                                                                    matchedDeposit = v3RelayHashes[relayDataHash].deposits[0];
                                                                                     if (slowFillRequest.blockNumber >= destinationChainBlockRange[0] &&
-                                                                                        slowFillRequest.fillDeadline >= bundleBlockTimestamps[destinationChainId][1]) {
+                                                                                        _canCreateSlowFillLeaf(matchedDeposit) &&
+                                                                                        !_depositIsExpired(matchedDeposit)) {
                                                                                         validatedBundleSlowFills.push(matchedDeposit);
                                                                                     }
                                                                                 }
+                                                                                else {
+                                                                                    throw new Error("Duplicate slow fill request detected.");
+                                                                                }
                                                                                 return [2];
                                                                             }
                                                                             v3RelayHashes[relayDataHash] = {
-                                                                                deposit: undefined,
+                                                                                deposits: undefined,
                                                                                 fill: undefined,
                                                                                 slowFillRequest: slowFillRequest,
                                                                             };
@@ -704,9 +800,9 @@ var BundleDataClient = (function () {
                                                                             }
                                                                             matchedDeposit = historicalDeposit.deposit;
                                                                             (0, utils_1.assert)(this.getRelayHashFromEvent(matchedDeposit) === relayDataHash, "Deposit relay hashes should match.");
-                                                                            v3RelayHashes[relayDataHash].deposit = matchedDeposit;
+                                                                            v3RelayHashes[relayDataHash].deposits = [matchedDeposit];
                                                                             if (!_canCreateSlowFillLeaf(matchedDeposit) ||
-                                                                                slowFillRequest.fillDeadline < bundleBlockTimestamps[destinationChainId][1]) {
+                                                                                _depositIsExpired(matchedDeposit)) {
                                                                                 return [2];
                                                                             }
                                                                             validatedBundleSlowFills.push(matchedDeposit);
@@ -717,77 +813,99 @@ var BundleDataClient = (function () {
                                                             }); })];
                                                     case 2:
                                                         _g.sent();
-                                                        originBlockRange = (0, utils_1.getBlockRangeForChain)(blockRangesForChains, originChainId, chainIds);
-                                                        return [4, (0, utils_1.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] &&
-                                                                    !(0, utils_1.isZeroValueDeposit)(deposit));
-                                                            }), function (depositHash) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                                                                var _a, deposit, fill, slowFillRequest, fillStatus, prefill;
-                                                                return tslib_1.__generator(this, function (_b) {
-                                                                    switch (_b.label) {
+                                                        return [4, (0, utils_1.mapAsync)(bundleDepositHashes, function (depositHash, currentBundleDepositHashIndex) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                                                                var _a, relayDataHash, index, _b, deposits, fill, slowFillRequest, deposit, isDuplicateDepositInBundle, duplicateDepositsInBundle, fillStatus, prefill, verifiedFill;
+                                                                return tslib_1.__generator(this, function (_c) {
+                                                                    switch (_c.label) {
                                                                         case 0:
-                                                                            _a = v3RelayHashes[depositHash], deposit = _a.deposit, fill = _a.fill, slowFillRequest = _a.slowFillRequest;
+                                                                            _a = decodeBundleDepositHash(depositHash), relayDataHash = _a.relayDataHash, index = _a.index;
+                                                                            _b = v3RelayHashes[relayDataHash], deposits = _b.deposits, fill = _b.fill, slowFillRequest = _b.slowFillRequest;
+                                                                            deposit = deposits[index];
                                                                             if (!deposit)
                                                                                 throw new Error("Deposit should exist in relay hash dictionary.");
+                                                                            if (deposit.originChainId !== originChainId || deposit.destinationChainId !== destinationChainId) {
+                                                                                return [2];
+                                                                            }
+                                                                            isDuplicateDepositInBundle = bundleDepositHashes
+                                                                                .slice(0, currentBundleDepositHashIndex)
+                                                                                .some(function (_depositHash) {
+                                                                                var _relayDataHash = decodeBundleDepositHash(_depositHash).relayDataHash;
+                                                                                return _relayDataHash === relayDataHash;
+                                                                            });
+                                                                            duplicateDepositsInBundle = deposits.slice(index + 1);
                                                                             if (fill) {
-                                                                                if (!(0, utils_1.isSlowFill)(fill) && fill.blockNumber < destinationChainBlockRange[0]) {
-                                                                                    validatedBundleV3Fills.push(tslib_1.__assign(tslib_1.__assign({}, fill), { quoteTimestamp: deposit.quoteTimestamp }));
+                                                                                if (!isDuplicateDepositInBundle && fill.blockNumber < destinationChainBlockRange[0]) {
+                                                                                    duplicateDepositsInBundle.forEach(function (duplicateDeposit) {
+                                                                                        updateExpiredDepositsV3(expiredDepositsToRefundV3, duplicateDeposit);
+                                                                                    });
+                                                                                    if (canRefundPrefills) {
+                                                                                        if (!(0, utils_1.isSlowFill)(fill)) {
+                                                                                            validatedBundleV3Fills.push(tslib_1.__assign(tslib_1.__assign({}, fill), { quoteTimestamp: deposit.quoteTimestamp }));
+                                                                                        }
+                                                                                    }
                                                                                 }
                                                                                 return [2];
                                                                             }
                                                                             if (slowFillRequest) {
-                                                                                if (deposit.fillDeadline < bundleBlockTimestamps[destinationChainId][1]) {
+                                                                                if (_depositIsExpired(deposit)) {
                                                                                     updateExpiredDepositsV3(expiredDepositsToRefundV3, deposit);
                                                                                 }
-                                                                                else if (_canCreateSlowFillLeaf(deposit) &&
-                                                                                    slowFillRequest.blockNumber < destinationChainBlockRange[0]) {
+                                                                                else if (!isDuplicateDepositInBundle &&
+                                                                                    canRefundPrefills &&
+                                                                                    slowFillRequest.blockNumber < destinationChainBlockRange[0] &&
+                                                                                    _canCreateSlowFillLeaf(deposit)) {
                                                                                     validatedBundleSlowFills.push(deposit);
                                                                                 }
                                                                                 return [2];
                                                                             }
                                                                             return [4, _getFillStatusForDeposit(deposit, destinationChainBlockRange[1])];
                                                                         case 1:
-                                                                            fillStatus = _b.sent();
-                                                                            if (!(fillStatus === interfaces_1.FillStatus.Filled)) return [3, 3];
-                                                                            return [4, (0, utils_1.findFillEvent)(destinationClient.spokePool, deposit, destinationClient.deploymentBlock, destinationClient.latestBlockSearched)];
+                                                                            fillStatus = _c.sent();
+                                                                            if (!(fillStatus === interfaces_1.FillStatus.Filled)) return [3, 5];
+                                                                            return [4, this.findMatchingFillEvent(deposit, destinationClient)];
                                                                         case 2:
-                                                                            prefill = (_b.sent());
-                                                                            if (!(0, utils_1.isSlowFill)(prefill)) {
-                                                                                validatedBundleV3Fills.push(tslib_1.__assign(tslib_1.__assign({}, prefill), { quoteTimestamp: deposit.quoteTimestamp }));
-                                                                            }
-                                                                            return [3, 4];
+                                                                            prefill = _c.sent();
+                                                                            (0, utils_1.assert)((0, utils_1.isDefined)(prefill), "findFillEvent# Cannot find prefill: ".concat(relayDataHash));
+                                                                            (0, utils_1.assert)(this.getRelayHashFromEvent(prefill) === relayDataHash, "Relay hashes should match.");
+                                                                            if (!!isDuplicateDepositInBundle) return [3, 4];
+                                                                            duplicateDepositsInBundle.forEach(function (duplicateDeposit) {
+                                                                                updateExpiredDepositsV3(expiredDepositsToRefundV3, duplicateDeposit);
+                                                                            });
+                                                                            return [4, (0, utils_2.verifyFillRepayment)(prefill, destinationClient.spokePool.provider, deposit, allChainIds)];
                                                                         case 3:
-                                                                            if (deposit.fillDeadline < bundleBlockTimestamps[destinationChainId][1]) {
+                                                                            verifiedFill = _c.sent();
+                                                                            if (canRefundPrefills && (0, utils_1.isDefined)(verifiedFill) && !(0, utils_1.isSlowFill)(verifiedFill)) {
+                                                                                validatedBundleV3Fills.push(tslib_1.__assign(tslib_1.__assign({}, verifiedFill), { quoteTimestamp: deposit.quoteTimestamp }));
+                                                                            }
+                                                                            _c.label = 4;
+                                                                        case 4: return [3, 6];
+                                                                        case 5:
+                                                                            if (_depositIsExpired(deposit)) {
                                                                                 updateExpiredDepositsV3(expiredDepositsToRefundV3, deposit);
                                                                             }
                                                                             else if (fillStatus === interfaces_1.FillStatus.RequestedSlowFill) {
-                                                                                if (_canCreateSlowFillLeaf(deposit)) {
+                                                                                if (!isDuplicateDepositInBundle && canRefundPrefills && _canCreateSlowFillLeaf(deposit)) {
                                                                                     validatedBundleSlowFills.push(deposit);
                                                                                 }
                                                                             }
-                                                                            _b.label = 4;
-                                                                        case 4: return [2];
+                                                                            _c.label = 6;
+                                                                        case 6: return [2];
                                                                     }
                                                                 });
                                                             }); })];
                                                     case 3:
                                                         _g.sent();
                                                         fastFillsReplacingSlowFills.forEach(function (relayDataHash) {
-                                                            var _a = v3RelayHashes[relayDataHash], deposit = _a.deposit, slowFillRequest = _a.slowFillRequest, fill = _a.fill;
+                                                            var _a = v3RelayHashes[relayDataHash], deposits = _a.deposits, slowFillRequest = _a.slowFillRequest, fill = _a.fill;
                                                             (0, utils_1.assert)((fill === null || fill === void 0 ? void 0 : fill.relayExecutionInfo.fillType) === interfaces_1.FillType.ReplacedSlowFill, "Fill type should be ReplacedSlowFill.");
-                                                            if (!deposit) {
+                                                            if (!deposits || deposits.length < 1) {
                                                                 throw new Error("Deposit should exist in relay hash dictionary.");
                                                             }
-                                                            (0, utils_1.assert)(!deposit.fromLiteChain && !deposit.toLiteChain, "fastFillsReplacingSlowFills should not contain lite chain deposits");
+                                                            (0, utils_1.assert)(_canCreateSlowFillLeaf(deposits[0]), "fastFillsReplacingSlowFills should contain only deposits that can be slow filled");
                                                             var destinationBlockRange = (0, utils_1.getBlockRangeForChain)(blockRangesForChains, destinationChainId, chainIds);
-                                                            if (_this.clients.hubPoolClient.areTokensEquivalent(deposit.inputToken, deposit.originChainId, deposit.outputToken, deposit.destinationChainId, deposit.quoteBlockNumber) &&
-                                                                (!slowFillRequest || slowFillRequest.blockNumber < destinationBlockRange[0])) {
-                                                                validatedBundleUnexecutableSlowFills.push(deposit);
+                                                            if (!slowFillRequest ||
+                                                                slowFillRequest.blockNumber < destinationBlockRange[0]) {
+                                                                validatedBundleUnexecutableSlowFills.push(deposits[0]);
                                                             }
                                                         });
                                                         return [2];
@@ -828,34 +946,37 @@ var BundleDataClient = (function () {
                             message: "Processed ".concat(fillCounter, " fills in ").concat(performance.now() - start, "ms."),
                         });
                         start = performance.now();
-                        return [4, (0, utils_1.forEachAsync)(olderDepositHashes, function (relayDataHash) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                                var _a, deposit, slowFillRequest, fill, destinationChainId, destinationBlockRange, fillStatus;
-                                return tslib_1.__generator(this, function (_b) {
-                                    switch (_b.label) {
+                        return [4, (0, utils_1.forEachAsync)(olderDepositHashes, function (depositHash) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                                var _a, relayDataHash, index, _b, deposits, slowFillRequest, fill, deposit, destinationChainId, destinationBlockRange, fillStatus;
+                                return tslib_1.__generator(this, function (_c) {
+                                    switch (_c.label) {
                                         case 0:
-                                            _a = v3RelayHashes[relayDataHash], deposit = _a.deposit, slowFillRequest = _a.slowFillRequest, fill = _a.fill;
-                                            (0, utils_1.assert)((0, utils_1.isDefined)(deposit), "Deposit should exist in relay hash dictionary.");
+                                            _a = decodeBundleDepositHash(depositHash), relayDataHash = _a.relayDataHash, index = _a.index;
+                                            _b = v3RelayHashes[relayDataHash], deposits = _b.deposits, slowFillRequest = _b.slowFillRequest, fill = _b.fill;
+                                            if (!deposits || deposits.length < 1) {
+                                                throw new Error("Deposit should exist in relay hash dictionary.");
+                                            }
+                                            deposit = deposits[index];
                                             destinationChainId = deposit.destinationChainId;
                                             destinationBlockRange = (0, utils_1.getBlockRangeForChain)(blockRangesForChains, destinationChainId, chainIds);
                                             if (!(!fill &&
                                                 (0, utils_1.isDefined)(deposit) &&
-                                                deposit.fillDeadline < bundleBlockTimestamps[destinationChainId][1] &&
+                                                _depositIsExpired(deposit) &&
                                                 deposit.fillDeadline >= bundleBlockTimestamps[destinationChainId][0] &&
                                                 spokePoolClients[destinationChainId] !== undefined)) return [3, 2];
                                             return [4, _getFillStatusForDeposit(deposit, destinationBlockRange[1])];
                                         case 1:
-                                            fillStatus = _b.sent();
+                                            fillStatus = _c.sent();
                                             if (fillStatus !== interfaces_1.FillStatus.Filled) {
                                                 updateExpiredDepositsV3(expiredDepositsToRefundV3, deposit);
                                             }
-                                            if (fillStatus !== interfaces_1.FillStatus.RequestedSlowFill || deposit.fromLiteChain || deposit.toLiteChain) {
+                                            if (fillStatus !== interfaces_1.FillStatus.RequestedSlowFill || !_canCreateSlowFillLeaf(deposit)) {
                                                 return [2];
                                             }
-                                            if (this.clients.hubPoolClient.areTokensEquivalent(deposit.inputToken, deposit.originChainId, deposit.outputToken, deposit.destinationChainId, deposit.quoteBlockNumber) &&
-                                                (!slowFillRequest || slowFillRequest.blockNumber < destinationBlockRange[0])) {
+                                            if (!slowFillRequest || slowFillRequest.blockNumber < destinationBlockRange[0]) {
                                                 validatedBundleUnexecutableSlowFills.push(deposit);
                                             }
-                                            _b.label = 2;
+                                            _c.label = 2;
                                         case 2: return [2];
                                     }
                                 });
@@ -866,7 +987,7 @@ var BundleDataClient = (function () {
                         promises = [
                             validatedBundleV3Fills.length > 0
                                 ? this.clients.hubPoolClient.batchComputeRealizedLpFeePct(validatedBundleV3Fills.map(function (fill) {
-                                    var matchedDeposit = v3RelayHashes[_this.getRelayHashFromEvent(fill)].deposit;
+                                    var matchedDeposit = v3RelayHashes[_this.getRelayHashFromEvent(fill)].deposits[0];
                                     (0, utils_1.assert)((0, utils_1.isDefined)(matchedDeposit), "Deposit should exist in relay hash dictionary.");
                                     var paymentChainId = (0, utils_2.getRefundInformationFromFill)(fill, _this.clients.hubPoolClient, blockRangesForChains, chainIds, matchedDeposit.fromLiteChain).chainToSendRefundTo;
                                     return tslib_1.__assign(tslib_1.__assign({}, fill), { paymentChainId: paymentChainId });
@@ -893,10 +1014,10 @@ var BundleDataClient = (function () {
                         v3FillLpFees.forEach(function (_a, idx) {
                             var realizedLpFeePct = _a.realizedLpFeePct;
                             var fill = validatedBundleV3Fills[idx];
-                            var associatedDeposit = v3RelayHashes[_this.getRelayHashFromEvent(fill)].deposit;
+                            var associatedDeposit = v3RelayHashes[_this.getRelayHashFromEvent(fill)].deposits[0];
                             (0, utils_1.assert)((0, utils_1.isDefined)(associatedDeposit), "Deposit should exist in relay hash dictionary.");
                             var _b = (0, utils_2.getRefundInformationFromFill)(fill, _this.clients.hubPoolClient, blockRangesForChains, chainIds, associatedDeposit.fromLiteChain), chainToSendRefundTo = _b.chainToSendRefundTo, repaymentToken = _b.repaymentToken;
-                            updateBundleFillsV3(bundleFillsV3, fill, realizedLpFeePct, chainToSendRefundTo, repaymentToken);
+                            updateBundleFillsV3(bundleFillsV3, fill, realizedLpFeePct, chainToSendRefundTo, repaymentToken, fill.relayer);
                         });
                         v3SlowFillLpFees.forEach(function (_a, idx) {
                             var lpFeePct = _a.realizedLpFeePct;
@@ -908,7 +1029,7 @@ var BundleDataClient = (function () {
                             var deposit = validatedBundleUnexecutableSlowFills[idx];
                             updateBundleExcessSlowFills(unexecutableSlowFills, tslib_1.__assign(tslib_1.__assign({}, deposit), { lpFeePct: lpFeePct }));
                         });
-                        v3SpokeEventsReadable = (0, utils_2.prettyPrintV3SpokePoolEvents)(bundleDepositsV3, bundleFillsV3, bundleInvalidFillsV3, bundleSlowFillsV3, expiredDepositsToRefundV3, unexecutableSlowFills);
+                        v3SpokeEventsReadable = (0, utils_2.prettyPrintV3SpokePoolEvents)(bundleDepositsV3, bundleFillsV3, bundleSlowFillsV3, expiredDepositsToRefundV3, unexecutableSlowFills);
                         if (bundleInvalidFillsV3.length > 0) {
                             this.logger.debug({
                                 at: "BundleDataClient#loadData",
@@ -917,6 +1038,14 @@ var BundleDataClient = (function () {
                                 bundleInvalidFillsV3: bundleInvalidFillsV3,
                             });
                         }
+                        if (bundleUnrepayableFillsV3.length > 0) {
+                            this.logger.debug({
+                                at: "BundleDataClient#loadData",
+                                message: "Finished loading V3 spoke pool data and found some unrepayable V3 fills in range",
+                                blockRangesForChains: blockRangesForChains,
+                                bundleUnrepayableFillsV3: bundleUnrepayableFillsV3,
+                            });
+                        }
                         this.logger.debug({
                             at: "BundleDataClient#loadDataFromScratch",
                             message: "Computed bundle data in ".concat(Math.round(performance.now() - start) / 1000, "s."),
@@ -935,7 +1064,17 @@ var BundleDataClient = (function () {
         });
     };
     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, "-").concat(event.fillDeadline, "-").concat(event.exclusivityDeadline, "-").concat(event.message, "-").concat(event.destinationChainId);
+        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 tslib_1.__awaiter(this, void 0, void 0, function () {
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4, (0, utils_1.findFillEvent)(spokePoolClient.spokePool, deposit, spokePoolClient.deploymentBlock, spokePoolClient.latestBlockSearched)];
+                    case 1: return [2, _a.sent()];
+                }
+            });
+        });
     };
     BundleDataClient.prototype.getBundleBlockTimestamps = function (chainIds, blockRangesForChains, spokePoolClients) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
@@ -946,7 +1085,7 @@ var BundleDataClient = (function () {
                     case 0:
                         _b = (_a = Object).fromEntries;
                         return [4, (0, utils_1.mapAsync)(chainIds, function (chainId, index) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                                var blockRangeForChain, _startBlockForChain, _endBlockForChain, spokePoolClient, startBlockForChain, endBlockForChain, _a, startTime, endTime, _b;
+                                var blockRangeForChain, _startBlockForChain, _endBlockForChain, spokePoolClient, startBlockForChain, endBlockForChain, _a, startTime, _endTime, _b, endBlockDelta, endTime;
                                 return tslib_1.__generator(this, function (_c) {
                                     switch (_c.label) {
                                         case 0:
@@ -960,7 +1099,7 @@ var BundleDataClient = (function () {
                                                 return [2];
                                             }
                                             startBlockForChain = Math.min(_startBlockForChain, spokePoolClient.latestBlockSearched);
-                                            endBlockForChain = Math.min(_endBlockForChain, spokePoolClient.latestBlockSearched);
+                                            endBlockForChain = Math.min(_endBlockForChain + 1, spokePoolClient.latestBlockSearched);
                                             return [4, spokePoolClient.getTimestampForBlock(startBlockForChain)];
                                         case 1:
                                             _b = [
@@ -970,8 +1109,10 @@ var BundleDataClient = (function () {
                                         case 2:
                                             _a = _b.concat([
                                                 _c.sent()
-                                            ]), startTime = _a[0], endTime = _a[1];
-                                            (0, utils_1.assert)(endTime >= startTime, "End time should be greater than start time.");
+                                            ]), startTime = _a[0], _endTime = _a[1];
+                                            endBlockDelta = endBlockForChain > startBlockForChain ? 1 : 0;
+                                            endTime = Math.max(0, _endTime - endBlockDelta);
+                                            (0, utils_1.assert)(endTime >= startTime, "End time for block ".concat(endBlockForChain, " should be greater than start time for block ").concat(startBlockForChain, ": ").concat(endTime, " >= ").concat(startTime, "."));
                                             (0, utils_1.assert)(startBlockForChain === 0 || startTime > 0, "Start timestamp must be greater than 0 if the start block is greater than 0.");
                                             return [2, [chainId, [startTime, endTime]]];
                                     }