@across-protocol/sdk 4.1.46-beta.0 → 4.1.46-beta.1

package/dist/cjs/utils/EventUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.duplicateEvent = exports.getTransactionHashes = exports.isEventOlder = exports.sortEventsDescendingInPlace = exports.sortEventsDescending = exports.sortEventsAscendingInPlace = exports.sortEventsAscending = exports.spreadEventWithBlockNumber = exports.getPaginatedBlockRanges = exports.paginatedEventQuery = exports.eventToLog = exports.spreadEvent = void 0;
+exports.duplicateEvent = exports.getTransactionRefs = exports.isEventOlder = exports.sortEventsDescendingInPlace = exports.sortEventsDescending = exports.sortEventsAscendingInPlace = exports.sortEventsAscending = exports.spreadEventWithBlockNumber = exports.logToSortableEvent = exports.getPaginatedBlockRanges = exports.paginatedEventQuery = exports.eventToLog = exports.spreadEvent = void 0;
 var tslib_1 = require("tslib");
 var common_1 = require("./common");
 var _1 = require("./");
@@ -145,8 +145,17 @@ function getPaginatedBlockRanges(_a) {
     return ranges;
 }
 exports.getPaginatedBlockRanges = getPaginatedBlockRanges;
+function logToSortableEvent(log) {
+    return {
+        txnIndex: log.transactionIndex,
+        txnRef: log.transactionHash,
+        logIndex: log.logIndex,
+        blockNumber: log.blockNumber,
+    };
+}
+exports.logToSortableEvent = logToSortableEvent;
 function spreadEventWithBlockNumber(event) {
-    return tslib_1.__assign(tslib_1.__assign({}, spreadEvent(event.args)), { blockNumber: event.blockNumber, transactionIndex: event.transactionIndex, logIndex: event.logIndex, transactionHash: event.transactionHash });
+    return tslib_1.__assign(tslib_1.__assign({}, spreadEvent(event.args)), logToSortableEvent(event));
 }
 exports.spreadEventWithBlockNumber = spreadEventWithBlockNumber;
 function sortEventsAscending(events) {
@@ -158,8 +167,8 @@ function sortEventsAscendingInPlace(events) {
         if (ex.blockNumber !== ey.blockNumber) {
             return ex.blockNumber - ey.blockNumber;
         }
-        if (ex.transactionIndex !== ey.transactionIndex) {
-            return ex.transactionIndex - ey.transactionIndex;
+        if (ex.txnIndex !== ey.txnIndex) {
+            return ex.txnIndex - ey.txnIndex;
         }
         return ex.logIndex - ey.logIndex;
     });
@@ -174,8 +183,8 @@ function sortEventsDescendingInPlace(events) {
         if (ex.blockNumber !== ey.blockNumber) {
             return ey.blockNumber - ex.blockNumber;
         }
-        if (ex.transactionIndex !== ey.transactionIndex) {
-            return ey.transactionIndex - ex.transactionIndex;
+        if (ex.txnIndex !== ey.txnIndex) {
+            return ey.txnIndex - ex.txnIndex;
         }
         return ey.logIndex - ex.logIndex;
     });
@@ -185,18 +194,18 @@ function isEventOlder(ex, ey) {
     if (ex.blockNumber !== ey.blockNumber) {
         return ex.blockNumber < ey.blockNumber;
     }
-    if (ex.transactionIndex !== ey.transactionIndex) {
-        return ex.transactionIndex < ey.transactionIndex;
+    if (ex.txnIndex !== ey.txnIndex) {
+        return ex.txnIndex < ey.txnIndex;
     }
     return ex.logIndex < ey.logIndex;
 }
 exports.isEventOlder = isEventOlder;
-function getTransactionHashes(events) {
-    return tslib_1.__spreadArray([], Array.from(new Set(events.map(function (e) { return e.transactionHash; }))), true);
+function getTransactionRefs(events) {
+    return tslib_1.__spreadArray([], Array.from(new Set(events.map(function (e) { return e.txnRef; }))), true);
 }
-exports.getTransactionHashes = getTransactionHashes;
+exports.getTransactionRefs = getTransactionRefs;
 function duplicateEvent(a, b) {
-    return a.transactionHash === b.transactionHash && a.logIndex === b.logIndex;
+    return a.txnRef === b.txnRef && a.logIndex === b.logIndex;
 }
 exports.duplicateEvent = duplicateEvent;
 //# sourceMappingURL=EventUtils.js.map

package/dist/cjs/utils/EventUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"EventUtils.js","sourceRoot":"","sources":["../../../src/utils/EventUtils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"EventUtils.js","sourceRoot":"","sources":["../../../src/utils/EventUtils.ts"],"names":[],"mappings":"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"}

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

@@ -1,7 +1,7 @@
 import { Contract } from "ethers";
 import winston from "winston";
 import { EventSearchConfig, MakeOptional } from "../../utils";
-import { ConfigStoreVersionUpdate, DisabledChainsUpdate, GlobalConfigUpdate, LiteChainsIdListUpdate, Log, RateModelUpdate, RouteRateModelUpdate, SpokePoolTargetBalance, SpokeTargetBalanceUpdate, TokenConfig } from "../../interfaces";
+import { ConfigStoreVersionUpdate, DisabledChainsUpdate, GlobalConfigUpdate, LiteChainsIdListUpdate, RateModelUpdate, RouteRateModelUpdate, SortableEvent, SpokePoolTargetBalance, SpokeTargetBalanceUpdate, TokenConfig } from "../../interfaces";
 import { BaseAbstractClient, UpdateFailureReason } from "../BaseAbstractClient";
 import { RateModel } from "../../lpFeeCalculator";
 type ConfigStoreUpdateSuccess = {
@@ -9,8 +9,8 @@ type ConfigStoreUpdateSuccess = {
     chainId: number;
     searchEndBlock: number;
     events: {
-        updatedTokenConfigEvents: Log[];
-        updatedGlobalConfigEvents: Log[];
+        updatedTokenConfigEvents: SortableEvent[];
+        updatedGlobalConfigEvents: SortableEvent[];
         globalConfigUpdateTimes: number[];
     };
 };

package/dist/esm/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.js

@@ -266,7 +266,7 @@ var AcrossConfigStoreClient = /** @class */ (function (_super) {
     };
     AcrossConfigStoreClient.prototype._update = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var chainId, searchConfig, reason, _a, updatedTokenConfigEvents, updatedGlobalConfigEvents, globalConfigUpdateTimes;
+            var chainId, searchConfig, reason, _a, updatedTokenConfigEvents, updatedGlobalConfigEvents, updatedTokenConfigSortableEvents, updatedGlobalConfigSortableEvents, globalConfigUpdateTimes;
             var _this = this;
             return __generator(this, function (_b) {
                 switch (_b.label) {
@@ -287,8 +287,12 @@ var AcrossConfigStoreClient = /** @class */ (function (_super) {
                             ])];
                     case 3:
                         _a = _b.sent(), updatedTokenConfigEvents = _a[0], updatedGlobalConfigEvents = _a[1];
+                        updatedTokenConfigSortableEvents = updatedTokenConfigEvents.map(spreadEventWithBlockNumber);
+                        updatedGlobalConfigSortableEvents = updatedGlobalConfigEvents.map(spreadEventWithBlockNumber);
                         // Events *should* normally be received in ascending order, but explicitly enforce the ordering.
-                        [updatedTokenConfigEvents, updatedGlobalConfigEvents].forEach(function (events) { return sortEventsAscendingInPlace(events); });
+                        [updatedTokenConfigSortableEvents, updatedGlobalConfigSortableEvents].forEach(function (events) {
+                            return sortEventsAscendingInPlace(events);
+                        });
                         return [4 /*yield*/, Promise.all(updatedGlobalConfigEvents.map(function (event) { return _this.configStore.provider.getBlock(event.blockNumber); }))];
                     case 4:
                         globalConfigUpdateTimes = (_b.sent()).map(function (block) { return block.timestamp; });
@@ -297,8 +301,8 @@ var AcrossConfigStoreClient = /** @class */ (function (_super) {
                                 chainId: chainId,
                                 searchEndBlock: searchConfig.toBlock,
                                 events: {
-                                    updatedTokenConfigEvents: updatedTokenConfigEvents,
-                                    updatedGlobalConfigEvents: updatedGlobalConfigEvents,
+                                    updatedTokenConfigEvents: updatedTokenConfigSortableEvents,
+                                    updatedGlobalConfigEvents: updatedGlobalConfigSortableEvents,
                                     globalConfigUpdateTimes: globalConfigUpdateTimes,
                                 },
                             }];
@@ -331,10 +335,10 @@ var AcrossConfigStoreClient = /** @class */ (function (_super) {
                         if (!(_i < updatedTokenConfigEvents_1.length)) return [3 /*break*/, 7];
                         event_1 = updatedTokenConfigEvents_1[_i];
                         // If transaction hash is known to be invalid, skip it immediately to avoid creating extra logs.
-                        if (KNOWN_INVALID_TOKEN_CONFIG_UPDATE_HASHES.includes(event_1.transactionHash.toLowerCase())) {
+                        if (KNOWN_INVALID_TOKEN_CONFIG_UPDATE_HASHES.includes(event_1.txnRef.toLowerCase())) {
                             return [3 /*break*/, 6];
                         }
-                        args = __assign({}, spreadEventWithBlockNumber(event_1));
+                        args = event_1;
                         _j.label = 3;
                     case 3:
                         _j.trys.push([3, 4, , 6]);
@@ -367,7 +371,7 @@ var AcrossConfigStoreClient = /** @class */ (function (_super) {
                             this.logger.debug({
                                 at: "ConfigStoreClient::update",
                                 message: "Skipping invalid historical update at block ".concat(event_1.blockNumber),
-                                transactionHash: event_1.transactionHash,
+                                txnRef: event_1.txnRef,
                             });
                         }
                         return [3 /*break*/, 6];
@@ -376,7 +380,7 @@ var AcrossConfigStoreClient = /** @class */ (function (_super) {
                         return [3 /*break*/, 2];
                     case 7:
                         _loop_1 = function (i) {
-                            var args = spreadEventWithBlockNumber(updatedGlobalConfigEvents[i]);
+                            var args = updatedGlobalConfigEvents[i];
                             if (args.key === utf8ToHex(GLOBAL_CONFIG_STORE_KEYS.MAX_RELAYER_REPAYMENT_LEAF_SIZE)) {
                                 if (!isNaN(args.value)) {
                                     this_1.cumulativeMaxRefundCountUpdates.push(args);
@@ -507,7 +511,7 @@ var AcrossConfigStoreClient = /** @class */ (function (_super) {
     };
     AcrossConfigStoreClient.prototype.validateTokenConfigUpdate = function (args) {
         var _this = this;
-        var value = args.value, key = args.key, transactionHash = args.transactionHash;
+        var value = args.value, key = args.key, txnRef = args.txnRef;
         var parsedValue = parseJSONWithNumericString(value);
         var l1Token = key;
         // Return the following parameters if the TokenConfig update is valid, otherwise throw an error.
@@ -519,7 +523,7 @@ var AcrossConfigStoreClient = /** @class */ (function (_super) {
         // Drop value and key before passing args.
         if ((parsedValue === null || parsedValue === void 0 ? void 0 : parsedValue.rateModel) !== undefined) {
             var rateModel = parsedValue.rateModel;
-            assert(this.isValidRateModel(rateModel), "Invalid rateModel UBar for ".concat(l1Token, " at transaction ").concat(transactionHash, ", ").concat(JSON.stringify(rateModel)));
+            assert(this.isValidRateModel(rateModel), "Invalid rateModel UBar for ".concat(l1Token, " at transaction ").concat(txnRef, ", ").concat(JSON.stringify(rateModel)));
             rateModelForToken = JSON.stringify(rateModel);
             // Store spokeTargetBalances
             if (parsedValue === null || parsedValue === void 0 ? void 0 : parsedValue.spokeTargetBalances) {
@@ -537,7 +541,7 @@ var AcrossConfigStoreClient = /** @class */ (function (_super) {
                 routeRateModel = Object.fromEntries(Object.entries(parsedValue.routeRateModel).map(function (_a) {
                     var path = _a[0], routeRateModel = _a[1];
                     assert(_this.isValidRateModel(routeRateModel) &&
-                        "Invalid routeRateModel UBar for ".concat(path, " for ").concat(l1Token, " at transaction ").concat(transactionHash, ", ").concat(JSON.stringify(routeRateModel)));
+                        "Invalid routeRateModel UBar for ".concat(path, " for ").concat(l1Token, " at transaction ").concat(txnRef, ", ").concat(JSON.stringify(routeRateModel)));
                     return [path, JSON.stringify(routeRateModel)];
                 }));
             }

package/dist/esm/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"AcrossConfigStoreClient.js","sourceRoot":"","sources":["../../../../src/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AcrossConfigStoreClient.js","sourceRoot":"","sources":["../../../../src/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.ts"],"names":[],"mappings":"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"}

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

@@ -2,7 +2,6 @@ import { ProposedRootBundle, SpokePoolClientsByChain, LoadDataReturnValue, Clien
 import { SpokePoolClient } from "..";
 import { BigNumber } from "../../utils";
 import winston from "winston";
-import { BundleData } from "./utils";
 export declare const INFINITE_FILL_DEADLINE: BigNumber;
 export declare class BundleDataClient {
     readonly logger: winston.Logger;
@@ -32,7 +31,6 @@ export declare class BundleDataClient {
     }): void;
     static getArweaveClientKey(blockRangesForChains: number[][]): string;
     private getArweaveBundleDataClientKey;
-    backfillMessageHashes(data: Pick<BundleData, "bundleDepositsV3" | "bundleFillsV3">): void;
     private loadPersistedDataFromArweave;
     getPendingRefundsFromValidBundles(): Promise<CombinedRefunds[]>;
     getPendingRefundsFromBundle(bundle: ProposedRootBundle): Promise<CombinedRefunds>;

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

@@ -1,11 +1,10 @@
-import { __assign, __awaiter, __generator } from "tslib";
+import { __assign, __awaiter, __generator, __rest } from "tslib";
 import assert from "assert";
 import _ from "lodash";
 import { FillType, FillStatus, } from "../../interfaces";
 import { findFillEvent } from "../../arch/evm";
-import { BigNumber, bnZero, queryHistoricalDepositForFill, assign, fixedPointAdjustment, isDefined, toBN, forEachAsync, getBlockRangeForChain, getImpliedBundleBlockRanges, getMessageHash, getRelayEventKey, isSlowFill, mapAsync, bnUint32Max, isZeroValueDeposit, isZeroValueFillOrSlowFillRequest, chainIsEvm, isValidEvmAddress, duplicateEvent, } from "../../utils";
+import { BigNumber, bnZero, queryHistoricalDepositForFill, assign, fixedPointAdjustment, isDefined, toBN, forEachAsync, getBlockRangeForChain, getImpliedBundleBlockRanges, getRelayEventKey, isSlowFill, mapAsync, bnUint32Max, isZeroValueDeposit, isZeroValueFillOrSlowFillRequest, chainIsEvm, isValidEvmAddress, duplicateEvent, invalidOutputToken, } from "../../utils";
 import { BundleDataSS, getEndBlockBuffers, getRefundInformationFromFill, getRefundsFromBundle, getWidestPossibleExpectedBlockRange, isChainDisabled, prettyPrintV3SpokePoolEvents, verifyFillRepayment, } from "./utils";
-import { UNDEFINED_MESSAGE_HASH } from "../../constants";
 import { isEVMSpokePoolClient } from "../SpokePoolClient";
 // max(uint256) - 1
 export var INFINITE_FILL_DEADLINE = bnUint32Max;
@@ -138,38 +137,10 @@ var BundleDataClient = /** @class */ (function () {
     BundleDataClient.prototype.getArweaveBundleDataClientKey = function (blockRangesForChains) {
         return "bundles-".concat(BundleDataClient.getArweaveClientKey(blockRangesForChains));
     };
-    // Post-populate any missing message hashes.
-    // @todo This can be removed once the legacy types hurdle is cleared (earliest 7 days post migration).
-    BundleDataClient.prototype.backfillMessageHashes = function (data) {
-        Object.values(data.bundleDepositsV3).forEach(function (x) {
-            return Object.values(x).forEach(function (deposits) {
-                return deposits.forEach(function (deposit) {
-                    if (deposit.messageHash === UNDEFINED_MESSAGE_HASH) {
-                        deposit.messageHash = getMessageHash(deposit.message);
-                    }
-                });
-            });
-        });
-        Object.values(data.bundleFillsV3).forEach(function (x) {
-            return Object.values(x).forEach(function (_a) {
-                var fills = _a.fills;
-                return fills.forEach(function (fill) {
-                    if (fill.messageHash === UNDEFINED_MESSAGE_HASH && isDefined(fill.message)) {
-                        // If messageHash is undefined, fill should be of type FilledV3Relay and should have a message.
-                        fill.messageHash = getMessageHash(fill.message);
-                    }
-                    if (fill.relayExecutionInfo.updatedMessageHash === UNDEFINED_MESSAGE_HASH &&
-                        isDefined(fill.relayExecutionInfo.updatedMessage)) {
-                        fill.relayExecutionInfo.updatedMessageHash = getMessageHash(fill.relayExecutionInfo.updatedMessage);
-                    }
-                });
-            });
-        });
-    };
     BundleDataClient.prototype.loadPersistedDataFromArweave = function (blockRangesForChains) {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var start, persistedData, convertTypedStringRecordIntoNumericRecord, data, bundleData;
+            var start, persistedData, convertTypedStringRecordIntoNumericRecord, convertSortableEventFieldsIntoRequiredFields, convertEmbeddedSortableEventFieldsIntoRequiredFields, data, bundleData;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -191,14 +162,64 @@ var BundleDataClient = /** @class */ (function () {
                                 return acc;
                             }, {});
                         };
+                        convertSortableEventFieldsIntoRequiredFields = function (data) {
+                            return data.map(function (item) {
+                                // For txnIndex/transactionIndex: throw if both are defined or both are missing.
+                                if ((item.txnIndex !== undefined && item.transactionIndex !== undefined) ||
+                                    (item.txnIndex === undefined && item.transactionIndex === undefined)) {
+                                    throw new Error("Either txnIndex or transactionIndex must be defined, but not both.");
+                                }
+                                // For txnRef/transactionHash: throw if both are defined or both are missing.
+                                if ((item.txnRef !== undefined && item.transactionHash !== undefined) ||
+                                    (item.txnRef === undefined && item.transactionHash === undefined)) {
+                                    throw new Error("Either txnRef or transactionHash must be defined, but not both.");
+                                }
+                                // Destructure the fields we don't need anymore
+                                var txnIndex = item.txnIndex, transactionIndex = item.transactionIndex, txnRef = item.txnRef, transactionHash = item.transactionHash, rest = __rest(item, ["txnIndex", "transactionIndex", "txnRef", "transactionHash"]);
+                                // Return a new object with normalized fields.
+                                // The non-null assertion (!) is safe here because our conditions ensure that one of each pair is defined.
+                                return __assign(__assign({}, rest), { txnIndex: txnIndex !== null && txnIndex !== void 0 ? txnIndex : transactionIndex, txnRef: txnRef !== null && txnRef !== void 0 ? txnRef : transactionHash });
+                            });
+                        };
+                        convertEmbeddedSortableEventFieldsIntoRequiredFields = function (data) {
+                            return Object.fromEntries(Object.entries(data).map(function (_a) {
+                                var chainId = _a[0], tokenData = _a[1];
+                                return [
+                                    chainId,
+                                    Object.fromEntries(Object.entries(tokenData).map(function (_a) {
+                                        var token = _a[0], data = _a[1];
+                                        return [
+                                            token,
+                                            convertSortableEventFieldsIntoRequiredFields(data),
+                                        ];
+                                    })),
+                                ];
+                            }));
+                        };
                         data = persistedData[0].data;
-                        this.backfillMessageHashes(data);
                         bundleData = {
-                            bundleFillsV3: convertTypedStringRecordIntoNumericRecord(data.bundleFillsV3),
-                            expiredDepositsToRefundV3: convertTypedStringRecordIntoNumericRecord(data.expiredDepositsToRefundV3),
-                            bundleDepositsV3: convertTypedStringRecordIntoNumericRecord(data.bundleDepositsV3),
-                            unexecutableSlowFills: convertTypedStringRecordIntoNumericRecord(data.unexecutableSlowFills),
-                            bundleSlowFillsV3: convertTypedStringRecordIntoNumericRecord(data.bundleSlowFillsV3),
+                            bundleFillsV3: convertTypedStringRecordIntoNumericRecord(Object.fromEntries(Object.entries(data.bundleFillsV3).map(function (_a) {
+                                var chainId = _a[0], tokenData = _a[1];
+                                return [
+                                    chainId,
+                                    Object.fromEntries(Object.entries(tokenData).map(function (_a) {
+                                        var token = _a[0], data = _a[1];
+                                        return [
+                                            token,
+                                            {
+                                                refunds: data.refunds,
+                                                totalRefundAmount: data.totalRefundAmount,
+                                                realizedLpFees: data.realizedLpFees,
+                                                fills: convertSortableEventFieldsIntoRequiredFields(data.fills),
+                                            },
+                                        ];
+                                    })),
+                                ];
+                            }))),
+                            expiredDepositsToRefundV3: convertTypedStringRecordIntoNumericRecord(convertEmbeddedSortableEventFieldsIntoRequiredFields(data.expiredDepositsToRefundV3)),
+                            bundleDepositsV3: convertTypedStringRecordIntoNumericRecord(convertEmbeddedSortableEventFieldsIntoRequiredFields(data.bundleDepositsV3)),
+                            unexecutableSlowFills: convertTypedStringRecordIntoNumericRecord(convertEmbeddedSortableEventFieldsIntoRequiredFields(data.unexecutableSlowFills)),
+                            bundleSlowFillsV3: convertTypedStringRecordIntoNumericRecord(convertEmbeddedSortableEventFieldsIntoRequiredFields(data.bundleSlowFillsV3)),
                         };
                         this.logger.debug({
                             at: "BundleDataClient#loadPersistedDataFromArweave",
@@ -279,12 +300,13 @@ var BundleDataClient = /** @class */ (function () {
     // @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 refundsForChain, bundleEndBlockForMainnet, _loop_1, this_1, _i, chainIds_1, chainId;
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         refundsForChain = {};
+                        bundleEndBlockForMainnet = blockRanges[0][1];
                         _loop_1 = function (chainId) {
                             var chainIndex, fillsToCount;
                             return __generator(this, function (_b) {
@@ -297,7 +319,8 @@ var BundleDataClient = /** @class */ (function () {
                                         fillsToCount = this_1.spokePoolClients[chainId].getFills().filter(function (fill) {
                                             if (fill.blockNumber < blockRanges[chainIndex][0] ||
                                                 fill.blockNumber > blockRanges[chainIndex][1] ||
-                                                isZeroValueFillOrSlowFillRequest(fill)) {
+                                                isZeroValueFillOrSlowFillRequest(fill) ||
+                                                invalidOutputToken(fill)) {
                                                 return false;
                                             }
                                             // If origin spoke pool client isn't defined, we can't validate it.
@@ -322,13 +345,13 @@ var BundleDataClient = /** @class */ (function () {
                                                                 // FIXME: Handle non-EVM chains.
                                                                 throw new Error("Destination chain is not an EVM chain.");
                                                             }
-                                                            return [4 /*yield*/, verifyFillRepayment(_fill, spokeClient.spokePool.provider, matchingDeposit, this.clients.hubPoolClient)];
+                                                            return [4 /*yield*/, verifyFillRepayment(_fill, spokeClient.spokePool.provider, matchingDeposit, this.clients.hubPoolClient, bundleEndBlockForMainnet)];
                                                         case 1:
                                                             fill = _f.sent();
                                                             if (!isDefined(fill)) {
                                                                 return [2 /*return*/];
                                                             }
-                                                            _a = getRefundInformationFromFill(fill, this.clients.hubPoolClient, blockRanges, this.chainIdListForBundleEvaluationBlockNumbers, matchingDeposit.fromLiteChain), chainToSendRefundTo = _a.chainToSendRefundTo, repaymentToken = _a.repaymentToken;
+                                                            _a = getRefundInformationFromFill(__assign(__assign({}, fill), { fromLiteChain: matchingDeposit.fromLiteChain }), this.clients.hubPoolClient, bundleEndBlockForMainnet), chainToSendRefundTo = _a.chainToSendRefundTo, repaymentToken = _a.repaymentToken;
                                                             relayer = fill.relayer, refundAmount = fill.inputAmount;
                                                             (_b = refundsForChain[chainToSendRefundTo]) !== null && _b !== void 0 ? _b : (refundsForChain[chainToSendRefundTo] = {});
                                                             (_c = (_e = refundsForChain[chainToSendRefundTo])[repaymentToken]) !== null && _c !== void 0 ? _c : (_e[repaymentToken] = {});
@@ -582,7 +605,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, bundleUnrepayableFillsV3, bundleInvalidSlowFillRequests, bundleSlowFillsV3, expiredDepositsToRefundV3, unexecutableSlowFills, _isChainDisabled, _canCreateSlowFillLeaf, _depositIsExpired, _getFillStatusForDeposit, allChainIds, _cachedBundleTimestamps, bundleBlockTimestamps, v3RelayHashes, bundleDepositHashes, olderDepositHashes, decodeBundleDepositHash, _loop_2, _i, allChainIds_1, originChainId, validatedBundleV3Fills, validatedBundleSlowFills, validatedBundleUnexecutableSlowFills, fillCounter, _loop_3, _a, allChainIds_2, originChainId, promises, _b, v3FillLpFees, v3SlowFillLpFees, v3UnexecutableSlowFillLpFees, v3SpokeEventsReadable, invalidFillsWithPartialMatchedDeposits_1, preFillsForNextBundle_1, unknownReasonInvalidFills_1;
+            var start, key, chainIds, bundleEndBlockForMainnet, bundleDepositsV3, bundleFillsV3, bundleInvalidFillsV3, bundleUnrepayableFillsV3, bundleInvalidSlowFillRequests, bundleSlowFillsV3, expiredDepositsToRefundV3, unexecutableSlowFills, _isChainDisabled, _canCreateSlowFillLeaf, _depositIsExpired, _getFillStatusForDeposit, allChainIds, _cachedBundleTimestamps, bundleBlockTimestamps, v3RelayHashes, bundleDepositHashes, olderDepositHashes, decodeBundleDepositHash, _loop_2, _i, allChainIds_1, originChainId, validatedBundleV3Fills, validatedBundleSlowFills, validatedBundleUnexecutableSlowFills, fillCounter, _loop_3, _a, allChainIds_2, originChainId, promises, _b, v3FillLpFees, v3SlowFillLpFees, v3UnexecutableSlowFillLpFees, v3SpokeEventsReadable, invalidFillsWithPartialMatchedDeposits_1, preFillsForNextBundle_1, unknownReasonInvalidFills_1;
             var _this = this;
             return __generator(this, function (_c) {
                 switch (_c.label) {
@@ -596,6 +619,7 @@ var BundleDataClient = /** @class */ (function () {
                             throw new Error("HubPoolClient not updated");
                         }
                         chainIds = this.clients.configStoreClient.getChainIdIndicesForBlock(blockRangesForChains[0][0]);
+                        bundleEndBlockForMainnet = blockRangesForChains[0][1];
                         if (blockRangesForChains.length > chainIds.length) {
                             throw new Error("Unexpected block range list length of ".concat(blockRangesForChains.length, ", should be <= ").concat(chainIds.length));
                         }
@@ -614,7 +638,7 @@ var BundleDataClient = /** @class */ (function () {
                         _canCreateSlowFillLeaf = function (deposit) {
                             return (
                             // Cannot slow fill when input and output tokens are not equivalent.
-                            _this.clients.hubPoolClient.areTokensEquivalent(deposit.inputToken, deposit.originChainId, deposit.outputToken, deposit.destinationChainId, deposit.quoteBlockNumber) &&
+                            _this.clients.hubPoolClient.areTokensEquivalent(deposit.inputToken, deposit.originChainId, deposit.outputToken, deposit.destinationChainId, bundleEndBlockForMainnet) &&
                                 // Cannot slow fill from or to a lite chain.
                                 !deposit.fromLiteChain &&
                                 !deposit.toLiteChain);
@@ -755,7 +779,11 @@ var BundleDataClient = /** @class */ (function () {
                                                                 // We can remove fills for deposits with input amount equal to zero because these will result in 0 refunded
                                                                 // tokens to the filler. We can't remove non-empty message deposit here in case there is a slow fill
                                                                 // request for the deposit, we'd want to see the fill took place.
-                                                                .filter(function (fill) { return fill.blockNumber <= destinationChainBlockRange[1] && !isZeroValueFillOrSlowFillRequest(fill); }), function (fill) { return __awaiter(_this, void 0, void 0, function () {
+                                                                .filter(function (fill) {
+                                                                return fill.blockNumber <= destinationChainBlockRange[1] &&
+                                                                    !isZeroValueFillOrSlowFillRequest(fill) &&
+                                                                    !invalidOutputToken(fill);
+                                                            }), function (fill) { return __awaiter(_this, void 0, void 0, function () {
                                                                 var relayDataHash, deposits, fillToRefund_1, duplicateDeposits, historicalDeposit, matchedDeposit, fillToRefund;
                                                                 return __generator(this, function (_a) {
                                                                     switch (_a.label) {
@@ -772,7 +800,7 @@ var BundleDataClient = /** @class */ (function () {
                                                                                 // FIXME: Handle non-EVM chains.
                                                                                 throw new Error("Destination chain is not an EVM chain.");
                                                                             }
-                                                                            return [4 /*yield*/, verifyFillRepayment(fill, destinationClient.spokePool.provider, deposits[0], this.clients.hubPoolClient)];
+                                                                            return [4 /*yield*/, verifyFillRepayment(fill, destinationClient.spokePool.provider, deposits[0], this.clients.hubPoolClient, bundleEndBlockForMainnet)];
                                                                         case 1:
                                                                             fillToRefund_1 = _a.sent();
                                                                             if (!isDefined(fillToRefund_1)) {
@@ -845,7 +873,7 @@ var BundleDataClient = /** @class */ (function () {
                                                                                 // FIXME: Handle non-EVM chains.
                                                                                 throw new Error("Destination chain is not an EVM chain.");
                                                                             }
-                                                                            return [4 /*yield*/, verifyFillRepayment(fill, destinationClient.spokePool.provider, matchedDeposit, this.clients.hubPoolClient)];
+                                                                            return [4 /*yield*/, verifyFillRepayment(fill, destinationClient.spokePool.provider, matchedDeposit, this.clients.hubPoolClient, bundleEndBlockForMainnet)];
                                                                         case 8:
                                                                             fillToRefund = _a.sent();
                                                                             if (!isDefined(fillToRefund)) {
@@ -885,7 +913,9 @@ var BundleDataClient = /** @class */ (function () {
                                                         return [4 /*yield*/, forEachAsync(destinationClient
                                                                 .getSlowFillRequestsForOriginChain(originChainId)
                                                                 .filter(function (request) {
-                                                                return request.blockNumber <= destinationChainBlockRange[1] && !isZeroValueFillOrSlowFillRequest(request);
+                                                                return request.blockNumber <= destinationChainBlockRange[1] &&
+                                                                    !isZeroValueFillOrSlowFillRequest(request) &&
+                                                                    !invalidOutputToken(request);
                                                             }), function (slowFillRequest) { return __awaiter(_this, void 0, void 0, function () {
                                                                 var relayDataHash, _a, deposits, fill, matchedDeposit, historicalDeposit, matchedDeposit;
                                                                 return __generator(this, function (_b) {
@@ -1011,7 +1041,7 @@ var BundleDataClient = /** @class */ (function () {
                                                                                 // FIXME: Handle non-EVM chains.
                                                                                 throw new Error("Destination chain is not an EVM chain.");
                                                                             }
-                                                                            return [4 /*yield*/, verifyFillRepayment(fill, destinationClient.spokePool.provider, deposits[0], this.clients.hubPoolClient)];
+                                                                            return [4 /*yield*/, verifyFillRepayment(fill, destinationClient.spokePool.provider, deposits[0], this.clients.hubPoolClient, bundleEndBlockForMainnet)];
                                                                         case 1:
                                                                             fillToRefund = _c.sent();
                                                                             if (!isDefined(fillToRefund)) {
@@ -1056,7 +1086,7 @@ var BundleDataClient = /** @class */ (function () {
                                                                                 // FIXME: Handle non-EVM chains.
                                                                                 throw new Error("Destination chain is not an EVM chain.");
                                                                             }
-                                                                            return [4 /*yield*/, verifyFillRepayment(prefill, destinationClient.spokePool.provider, deposit, this.clients.hubPoolClient)];
+                                                                            return [4 /*yield*/, verifyFillRepayment(prefill, destinationClient.spokePool.provider, deposit, this.clients.hubPoolClient, bundleEndBlockForMainnet)];
                                                                         case 6:
                                                                             verifiedFill = _c.sent();
                                                                             if (!isDefined(verifiedFill)) {
@@ -1242,7 +1272,7 @@ var BundleDataClient = /** @class */ (function () {
                                     assert(isDefined(deposits) && deposits.length > 0, "Deposit should exist in relay hash dictionary.");
                                     var matchedDeposit = deposits[0];
                                     assert(isDefined(matchedDeposit), "Deposit should exist in relay hash dictionary.");
-                                    var paymentChainId = getRefundInformationFromFill(fill, _this.clients.hubPoolClient, blockRangesForChains, chainIds, matchedDeposit.fromLiteChain).chainToSendRefundTo;
+                                    var paymentChainId = getRefundInformationFromFill(__assign(__assign({}, fill), { fromLiteChain: matchedDeposit.fromLiteChain }), _this.clients.hubPoolClient, bundleEndBlockForMainnet).chainToSendRefundTo;
                                     return __assign(__assign({}, fill), { paymentChainId: paymentChainId });
                                 }))
                                 : [],
@@ -1271,7 +1301,7 @@ var BundleDataClient = /** @class */ (function () {
                             assert(isDefined(deposits) && deposits.length > 0, "Deposit should exist in relay hash dictionary.");
                             var associatedDeposit = deposits[0];
                             assert(isDefined(associatedDeposit), "Deposit should exist in relay hash dictionary.");
-                            var _b = getRefundInformationFromFill(fill, _this.clients.hubPoolClient, blockRangesForChains, chainIds, associatedDeposit.fromLiteChain), chainToSendRefundTo = _b.chainToSendRefundTo, repaymentToken = _b.repaymentToken;
+                            var _b = getRefundInformationFromFill(__assign(__assign({}, fill), { fromLiteChain: associatedDeposit.fromLiteChain }), _this.clients.hubPoolClient, bundleEndBlockForMainnet), chainToSendRefundTo = _b.chainToSendRefundTo, repaymentToken = _b.repaymentToken;
                             updateBundleFillsV3(bundleFillsV3, fill, realizedLpFeePct, chainToSendRefundTo, repaymentToken, fill.relayer);
                         });
                         v3SlowFillLpFees.forEach(function (_a, idx) {