@across-protocol/sdk 4.0.2 → 4.0.3

package/dist/esm/clients/BundleDataClient/utils/FillUtils.js.map

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

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

@@ -1,3 +1,4 @@
+import { Infer } from "superstruct";
 import { BigNumber } from "../../../utils";
 export declare const BundleDataSS: import("superstruct").Struct<{
     bundleDepositsV3: Record<string, Record<string, {
@@ -10,6 +11,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
         inputToken: string;
         inputAmount: BigNumber;
         quoteTimestamp: number;
+        messageHash: string;
         destinationChainId: number;
         fromLiteChain: boolean;
         toLiteChain: boolean;
@@ -39,6 +41,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
             inputToken: string;
             inputAmount: BigNumber;
             quoteTimestamp: number;
+            messageHash: string;
             destinationChainId: number;
             depositor: string;
             recipient: string;
@@ -55,9 +58,9 @@ export declare const BundleDataSS: import("superstruct").Struct<{
                 updatedOutputAmount: BigNumber;
                 updatedMessage: string;
                 fillType: number;
+                updatedMessageHash: string;
             };
             lpFeePct: BigNumber;
-            messageHash?: string | undefined;
         }[];
         refunds: Record<string, BigNumber>;
         realizedLpFees: BigNumber;
@@ -73,6 +76,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
         inputToken: string;
         inputAmount: BigNumber;
         quoteTimestamp: number;
+        messageHash: string;
         destinationChainId: number;
         fromLiteChain: boolean;
         toLiteChain: boolean;
@@ -102,6 +106,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
         inputToken: string;
         inputAmount: BigNumber;
         quoteTimestamp: number;
+        messageHash: string;
         destinationChainId: number;
         fromLiteChain: boolean;
         toLiteChain: boolean;
@@ -130,6 +135,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
         inputToken: string;
         inputAmount: BigNumber;
         quoteTimestamp: number;
+        messageHash: string;
         destinationChainId: number;
         fromLiteChain: boolean;
         toLiteChain: boolean;
@@ -160,6 +166,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
         inputToken: string;
         inputAmount: BigNumber;
         quoteTimestamp: number;
+        messageHash: string;
         destinationChainId: number;
         fromLiteChain: boolean;
         toLiteChain: boolean;
@@ -188,6 +195,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
         inputToken: string;
         inputAmount: BigNumber;
         quoteTimestamp: number;
+        messageHash: string;
         destinationChainId: number;
         fromLiteChain: boolean;
         toLiteChain: boolean;
@@ -216,6 +224,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
         inputToken: string;
         inputAmount: BigNumber;
         quoteTimestamp: number;
+        messageHash: string;
         destinationChainId: number;
         fromLiteChain: boolean;
         toLiteChain: boolean;
@@ -245,6 +254,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
         inputToken: string;
         inputAmount: BigNumber;
         quoteTimestamp: number;
+        messageHash: string;
         destinationChainId: number;
         fromLiteChain: boolean;
         toLiteChain: boolean;
@@ -275,6 +285,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
             inputToken: string;
             inputAmount: BigNumber;
             quoteTimestamp: number;
+            messageHash: string;
             destinationChainId: number;
             depositor: string;
             recipient: string;
@@ -291,12 +302,13 @@ export declare const BundleDataSS: import("superstruct").Struct<{
                 updatedOutputAmount: BigNumber;
                 updatedMessage: string;
                 fillType: number;
+                updatedMessageHash: string;
             };
             lpFeePct: BigNumber;
-            messageHash?: string | undefined;
         }[];
         refunds: Record<string, BigNumber>;
         realizedLpFees: BigNumber;
         totalRefundAmount: BigNumber;
     }>>, null>;
 }>;
+export type BundleData = Infer<typeof BundleDataSS>;

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

@@ -1,5 +1,6 @@
 import { __assign } from "tslib";
 import { object, number, optional, string, array, record, coerce, instance, pattern, boolean, defaulted, union, type, } from "superstruct";
+import { UNDEFINED_MESSAGE_HASH } from "../../../constants";
 import { BigNumber } from "../../../utils";
 var PositiveIntegerStringSS = pattern(string(), /\d+/);
 var Web3AddressSS = pattern(string(), /^0x[a-fA-F0-9]{40}$/);
@@ -36,6 +37,7 @@ var SortableEventSS = {
     transactionHash: string(),
 };
 var V3DepositSS = {
+    messageHash: defaulted(string(), UNDEFINED_MESSAGE_HASH),
     fromLiteChain: defaulted(boolean(), false),
     toLiteChain: defaulted(boolean(), false),
     destinationChainId: number(),
@@ -54,8 +56,9 @@ var V3RelayExecutionEventInfoSS = object({
     fillType: FillTypeSS,
     updatedRecipient: string(),
     updatedMessage: string(),
+    updatedMessageHash: defaulted(string(), UNDEFINED_MESSAGE_HASH),
 });
-var V3FillSS = __assign(__assign({}, V3RelayDataSS), { destinationChainId: number(), relayer: string(), repaymentChainId: number(), relayExecutionInfo: V3RelayExecutionEventInfoSS, quoteTimestamp: number(), messageHash: optional(string()) });
+var V3FillSS = __assign(__assign({}, V3RelayDataSS), { messageHash: defaulted(string(), UNDEFINED_MESSAGE_HASH), destinationChainId: number(), relayer: string(), repaymentChainId: number(), relayExecutionInfo: V3RelayExecutionEventInfoSS, quoteTimestamp: number() });
 var V3FillWithBlockSS = __assign(__assign({}, SortableEventSS), V3FillSS);
 var BundleFillV3SS = object(__assign(__assign({}, V3FillWithBlockSS), { lpFeePct: BigNumberType }));
 var nestedV3DepositRecordSS = record(PositiveIntegerStringSS, record(Web3AddressSS, array(V3DepositWithBlockSS)));

package/dist/esm/clients/BundleDataClient/utils/SuperstructUtils.js.map

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

package/dist/esm/clients/SpokePoolClient.js

@@ -1,11 +1,12 @@
 import { __assign, __awaiter, __extends, __generator, __spreadArray } from "tslib";
-import { BigNumber, bnZero, MAX_BIG_INT, assign, getRelayDataHash, isDefined, toBN, bnOne, isUnsafeDepositId, } from "../utils";
+import { BigNumber, bnZero, MAX_BIG_INT, assign, getRelayEventKey, isDefined, toBN, bnOne, getMessageHash, isUnsafeDepositId, isSlowFill, isValidEvmAddress, isZeroAddress, } from "../utils";
 import { paginatedEventQuery, sortEventsAscendingInPlace, spreadEvent, spreadEventWithBlockNumber, } from "../utils/EventUtils";
 import { validateFillForDeposit } from "../utils/FlowUtils";
 import { ZERO_ADDRESS } from "../constants";
 import { getNetworkName } from "../utils/NetworkUtils";
 import { getBlockRangeForDepositId, getDepositIdAtBlock, relayFillStatus } from "../utils/SpokeUtils";
 import { BaseAbstractClient, isUpdateFailureReason } from "./BaseAbstractClient";
+import { getRepaymentChainId, forceDestinationRepayment } from "./BundleDataClient/utils/FillUtils";
 /**
  * SpokePoolClient is a client for the SpokePool contract. It is responsible for querying the SpokePool contract
  * for events and storing them in memory. It also provides some convenience methods for querying the stored events.
@@ -93,7 +94,7 @@ var SpokePoolClient = /** @class */ (function (_super) {
      */
     SpokePoolClient.prototype._getDuplicateDeposits = function (deposit) {
         var _a;
-        var depositHash = this.getDepositHash(deposit);
+        var depositHash = getRelayEventKey(deposit);
         return (_a = this.duplicateDepositHashes[depositHash]) !== null && _a !== void 0 ? _a : [];
     };
     /**
@@ -229,8 +230,10 @@ var SpokePoolClient = /** @class */ (function (_super) {
      * @returns The corresponding deposit if found, undefined otherwise.
      */
     SpokePoolClient.prototype.getDeposit = function (depositId) {
-        var depositHash = this.getDepositHash({ depositId: depositId, originChainId: this.chainId });
-        return this.depositHashes[depositHash];
+        return Object.values(this.depositHashes).find(function (_a) {
+            var _depositId = _a.depositId;
+            return _depositId.eq(depositId);
+        });
     };
     /**
      * Find a SlowFillRequested event based on its deposit RelayData.
@@ -238,7 +241,8 @@ var SpokePoolClient = /** @class */ (function (_super) {
      * @returns The corresponding SlowFIllRequest event if found, otherwise undefined.
      */
     SpokePoolClient.prototype.getSlowFillRequest = function (relayData) {
-        var hash = getRelayDataHash(relayData, this.chainId);
+        var messageHash = getMessageHash(relayData.message);
+        var hash = getRelayEventKey(__assign(__assign({}, relayData), { messageHash: messageHash, destinationChainId: this.chainId }));
         return this.slowFillRequests[hash];
     };
     /**
@@ -262,7 +266,7 @@ var SpokePoolClient = /** @class */ (function (_super) {
      * @returns The corresponding deposit if found, undefined otherwise.
      */
     SpokePoolClient.prototype.getDepositForFill = function (fill) {
-        var deposit = this.depositHashes[this.getDepositHash(fill)];
+        var deposit = this.depositHashes[getRelayEventKey(fill)];
         var match = validateFillForDeposit(fill, deposit);
         if (match.valid) {
             return deposit;
@@ -282,7 +286,7 @@ var SpokePoolClient = /** @class */ (function (_super) {
      * @returns A valid fill for the deposit, or undefined.
      */
     SpokePoolClient.prototype.getFillForDeposit = function (deposit) {
-        var fills = this.depositHashesToFills[this.getDepositHash(deposit)];
+        var fills = this.depositHashesToFills[getRelayEventKey(deposit)];
         return fills === null || fills === void 0 ? void 0 : fills.find(function (fill) { return validateFillForDeposit(fill, deposit); });
     };
     /**
@@ -293,21 +297,37 @@ var SpokePoolClient = /** @class */ (function (_super) {
      * @returns The unfilled amount.
      */
     SpokePoolClient.prototype.getValidUnfilledAmountForDeposit = function (deposit) {
+        var _this = this;
         var outputAmount = deposit.outputAmount;
-        var fillsForDeposit = this.depositHashesToFills[this.getDepositHash(deposit)];
+        var fillsForDeposit = this.depositHashesToFills[getRelayEventKey(deposit)];
         // If no fills then the full amount is remaining.
         if (fillsForDeposit === undefined || fillsForDeposit.length === 0) {
             return { unfilledAmount: outputAmount, fillCount: 0, invalidFills: [] };
         }
         var _a = fillsForDeposit.reduce(function (groupedFills, fill) {
             if (validateFillForDeposit(fill, deposit).valid) {
+                var repaymentChainId = getRepaymentChainId(fill, deposit);
+                // In order to keep this function sync, we can't call verifyFillRepayment so we'll log any fills that
+                // we'll have to overwrite repayment information for. This includes fills for lite chains where the
+                // repayment address is invalid, and fills for non-lite chains where the repayment address is valid or
+                // the repayment chain is invalid. We don't check that the origin chain is a valid EVM chain for
+                // lite chain deposits yet because only EVM chains are supported on Across...for now. This means
+                // this logic will have to be revisited when we add SVM to log properly.
+                if (_this.hubPoolClient &&
+                    !isSlowFill(fill) &&
+                    (!isValidEvmAddress(fill.relayer) ||
+                        forceDestinationRepayment(repaymentChainId, __assign(__assign({}, deposit), { quoteBlockNumber: _this.hubPoolClient.latestBlockSearched }), _this.hubPoolClient))) {
+                    groupedFills.unrepayableFills.push(fill);
+                }
+                // This fill is still valid and means that the deposit cannot be filled on-chain anymore, but it
+                // also can be unrepayable which we should want to log.
                 groupedFills.validFills.push(fill);
             }
             else {
                 groupedFills.invalidFills.push(fill);
             }
             return groupedFills;
-        }, { validFills: [], invalidFills: [] }), validFills = _a.validFills, invalidFills = _a.invalidFills;
+        }, { validFills: [], invalidFills: [], unrepayableFills: [] }), validFills = _a.validFills, invalidFills = _a.invalidFills, unrepayableFills = _a.unrepayableFills;
         // Log any invalid deposits with same deposit id but different params.
         var invalidFillsForDeposit = invalidFills.filter(function (x) { return x.depositId.eq(deposit.depositId); });
         if (invalidFillsForDeposit.length > 0) {
@@ -320,6 +340,17 @@ var SpokePoolClient = /** @class */ (function (_super) {
                 notificationPath: "across-invalid-fills",
             });
         }
+        var unrepayableFillsForDeposit = unrepayableFills.filter(function (x) { return x.depositId.eq(deposit.depositId); });
+        if (unrepayableFillsForDeposit.length > 0) {
+            this.logger.warn({
+                at: "SpokePoolClient",
+                chainId: this.chainId,
+                message: "Unrepayable fills found where we need to switch repayment address and or chain",
+                deposit: deposit,
+                unrepayableFills: Object.fromEntries(unrepayableFillsForDeposit.map(function (x) { return [x.relayer, x]; })),
+                notificationPath: "across-unrepayable-fills",
+            });
+        }
         // If all fills are invalid we can consider this unfilled.
         if (validFills.length === 0) {
             return { unfilledAmount: outputAmount, fillCount: 0, invalidFills: invalidFills };
@@ -470,129 +501,178 @@ var SpokePoolClient = /** @class */ (function (_super) {
      * @see _update
      */
     SpokePoolClient.prototype.update = function (eventsToQuery) {
-        var _a, _b, _c;
         if (eventsToQuery === void 0) { eventsToQuery = this.queryableEventNames; }
         return __awaiter(this, void 0, void 0, function () {
-            var update, queryResults, currentTime, oldestTime, searchEndBlock, _i, _d, event_1, depositEvents, quoteBlockNumbers, _e, depositEvents_1, event_2, quoteBlockNumber, deposit, speedUpEvents, _f, speedUpEvents_1, event_3, speedUp, depositHash, depositDataAssociatedWithSpeedUp, slowFillRequests, _g, slowFillRequests_1, event_4, slowFillRequest, relayDataHash, fillEvents, _h, fillEvents_1, event_5, fill, enableDepositsEvents, _j, enableDepositsEvents_1, event_6, enableDeposit, relayedRootBundleEvents, _k, relayedRootBundleEvents_1, event_7, refundEvents, _l, refundEvents_1, event_8, executedRefund;
-            return __generator(this, function (_m) {
-                switch (_m.label) {
+            var update, queryResults, currentTime, oldestTime, searchEndBlock, _i, _a, event_1, queryDepositEvents, _b, _c, event_2, querySpeedUpDepositEvents, queryRequestedSlowFillEvents, queryFilledRelayEvents, enableDepositsEvents, _d, enableDepositsEvents_1, event_3, enableDeposit, relayedRootBundleEvents, _e, relayedRootBundleEvents_1, event_4, refundEvents, _f, refundEvents_1, event_5, executedRefund;
+            var _this = this;
+            return __generator(this, function (_g) {
+                switch (_g.label) {
                     case 0:
                         if (this.hubPoolClient !== null && !this.hubPoolClient.isUpdated) {
                             throw new Error("HubPoolClient not updated");
                         }
                         return [4 /*yield*/, this._update(eventsToQuery)];
                     case 1:
-                        update = _m.sent();
+                        update = _g.sent();
                         if (!update.success) {
                             return [2 /*return*/];
                         }
                         queryResults = update.events, currentTime = update.currentTime, oldestTime = update.oldestTime, searchEndBlock = update.searchEndBlock;
                         if (eventsToQuery.includes("TokensBridged")) {
-                            for (_i = 0, _d = queryResults[eventsToQuery.indexOf("TokensBridged")]; _i < _d.length; _i++) {
-                                event_1 = _d[_i];
+                            for (_i = 0, _a = queryResults[eventsToQuery.indexOf("TokensBridged")]; _i < _a.length; _i++) {
+                                event_1 = _a[_i];
                                 this.tokensBridged.push(spreadEventWithBlockNumber(event_1));
                             }
                         }
-                        if (!eventsToQuery.includes("V3FundsDeposited")) return [3 /*break*/, 3];
-                        depositEvents = (_a = queryResults[eventsToQuery.indexOf("V3FundsDeposited")]) !== null && _a !== void 0 ? _a : [];
-                        if (depositEvents.length > 0) {
-                            this.log("debug", "Using ".concat(depositEvents.length, " newly queried deposit events for chain ").concat(this.chainId), {
-                                earliestEvent: depositEvents[0].blockNumber,
+                        queryDepositEvents = function (eventName) { return __awaiter(_this, void 0, void 0, function () {
+                            var depositEvents, quoteBlockNumbers, _i, depositEvents_1, event_6, quoteBlockNumber, deposit;
+                            var _a;
+                            return __generator(this, function (_b) {
+                                switch (_b.label) {
+                                    case 0:
+                                        depositEvents = (_a = queryResults[eventsToQuery.indexOf(eventName)]) !== null && _a !== void 0 ? _a : [];
+                                        if (depositEvents.length > 0) {
+                                            this.log("debug", "Using ".concat(depositEvents.length, " newly queried ").concat(eventName, " deposit events for chain ").concat(this.chainId), {
+                                                earliestEvent: depositEvents[0].blockNumber,
+                                            });
+                                        }
+                                        return [4 /*yield*/, this.getBlockNumbers(depositEvents.map(function (_a) {
+                                                var args = _a.args;
+                                                return Number(args["quoteTimestamp"]);
+                                            }))];
+                                    case 1:
+                                        quoteBlockNumbers = _b.sent();
+                                        for (_i = 0, depositEvents_1 = depositEvents; _i < depositEvents_1.length; _i++) {
+                                            event_6 = depositEvents_1[_i];
+                                            quoteBlockNumber = quoteBlockNumbers[Number(event_6.args["quoteTimestamp"])];
+                                            deposit = __assign(__assign({}, spreadEventWithBlockNumber(event_6)), { messageHash: getMessageHash(event_6.args.message), quoteBlockNumber: quoteBlockNumber, originChainId: this.chainId, 
+                                                // The following properties are placeholders to be updated immediately.
+                                                fromLiteChain: true, toLiteChain: true });
+                                            deposit.fromLiteChain = this.isOriginLiteChain(deposit);
+                                            deposit.toLiteChain = this.isDestinationLiteChain(deposit);
+                                            if (isZeroAddress(deposit.outputToken)) {
+                                                deposit.outputToken = this.getDestinationTokenForDeposit(deposit);
+                                            }
+                                            if (this.depositHashes[getRelayEventKey(deposit)] !== undefined) {
+                                                assign(this.duplicateDepositHashes, [getRelayEventKey(deposit)], [deposit]);
+                                                continue;
+                                            }
+                                            assign(this.depositHashes, [getRelayEventKey(deposit)], deposit);
+                                            if (deposit.depositId.lt(this.earliestDepositIdQueried) && !isUnsafeDepositId(deposit.depositId)) {
+                                                this.earliestDepositIdQueried = deposit.depositId;
+                                            }
+                                            if (deposit.depositId.gt(this.latestDepositIdQueried) && !isUnsafeDepositId(deposit.depositId)) {
+                                                this.latestDepositIdQueried = deposit.depositId;
+                                            }
+                                        }
+                                        return [2 /*return*/];
+                                }
                             });
-                        }
-                        return [4 /*yield*/, this.getBlockNumbers(depositEvents.map(function (_a) {
-                                var args = _a.args;
-                                return Number(args["quoteTimestamp"]);
-                            }))];
+                        }); };
+                        _b = 0, _c = ["V3FundsDeposited", "FundsDeposited"];
+                        _g.label = 2;
                     case 2:
-                        quoteBlockNumbers = _m.sent();
-                        for (_e = 0, depositEvents_1 = depositEvents; _e < depositEvents_1.length; _e++) {
-                            event_2 = depositEvents_1[_e];
-                            quoteBlockNumber = quoteBlockNumbers[Number(event_2.args["quoteTimestamp"])];
-                            deposit = __assign(__assign({}, spreadEventWithBlockNumber(event_2)), { quoteBlockNumber: quoteBlockNumber, originChainId: this.chainId, 
-                                // The following properties are placeholders to be updated immediately.
-                                fromLiteChain: true, toLiteChain: true });
-                            deposit.fromLiteChain = this.isOriginLiteChain(deposit);
-                            deposit.toLiteChain = this.isDestinationLiteChain(deposit);
-                            if (deposit.outputToken === ZERO_ADDRESS) {
-                                deposit.outputToken = this.getDestinationTokenForDeposit(deposit);
-                            }
-                            if (this.depositHashes[this.getDepositHash(deposit)] !== undefined) {
-                                assign(this.duplicateDepositHashes, [this.getDepositHash(deposit)], [deposit]);
-                                continue;
-                            }
-                            assign(this.depositHashes, [this.getDepositHash(deposit)], deposit);
-                            if (deposit.depositId.lt(this.earliestDepositIdQueried) && !isUnsafeDepositId(deposit.depositId)) {
-                                this.earliestDepositIdQueried = deposit.depositId;
-                            }
-                            if (deposit.depositId.gt(this.latestDepositIdQueried) && !isUnsafeDepositId(deposit.depositId)) {
-                                this.latestDepositIdQueried = deposit.depositId;
-                            }
-                        }
-                        _m.label = 3;
+                        if (!(_b < _c.length)) return [3 /*break*/, 5];
+                        event_2 = _c[_b];
+                        if (!eventsToQuery.includes(event_2)) return [3 /*break*/, 4];
+                        return [4 /*yield*/, queryDepositEvents(event_2)];
                     case 3:
-                        // Update deposits with speed up requests from depositor.
-                        if (eventsToQuery.includes("RequestedSpeedUpV3Deposit")) {
-                            speedUpEvents = (_b = queryResults[eventsToQuery.indexOf("RequestedSpeedUpV3Deposit")]) !== null && _b !== void 0 ? _b : [];
-                            for (_f = 0, speedUpEvents_1 = speedUpEvents; _f < speedUpEvents_1.length; _f++) {
-                                event_3 = speedUpEvents_1[_f];
-                                speedUp = __assign(__assign({}, spreadEventWithBlockNumber(event_3)), { originChainId: this.chainId });
-                                assign(this.speedUps, [speedUp.depositor, speedUp.depositId.toString()], [speedUp]);
-                                depositHash = this.getDepositHash(speedUp);
-                                depositDataAssociatedWithSpeedUp = this.depositHashes[depositHash];
-                                if (isDefined(depositDataAssociatedWithSpeedUp)) {
-                                    this.depositHashes[depositHash] = this.appendMaxSpeedUpSignatureToDeposit(depositDataAssociatedWithSpeedUp);
+                        _g.sent();
+                        _g.label = 4;
+                    case 4:
+                        _b++;
+                        return [3 /*break*/, 2];
+                    case 5:
+                        querySpeedUpDepositEvents = function (eventName) {
+                            var _a;
+                            var speedUpEvents = (_a = queryResults[eventsToQuery.indexOf(eventName)]) !== null && _a !== void 0 ? _a : [];
+                            for (var _i = 0, speedUpEvents_1 = speedUpEvents; _i < speedUpEvents_1.length; _i++) {
+                                var event_7 = speedUpEvents_1[_i];
+                                var speedUp = __assign(__assign({}, spreadEventWithBlockNumber(event_7)), { originChainId: _this.chainId });
+                                assign(_this.speedUps, [speedUp.depositor, speedUp.depositId.toString()], [speedUp]);
+                                // Find deposit hash matching this speed up event and update the deposit data associated with the hash,
+                                // if the hash+data exists.
+                                var deposit = _this.getDeposit(speedUp.depositId);
+                                // We can assume all deposits in this lookback window are loaded in-memory already so if the depositHash
+                                // is not mapped to a deposit, then we can throw away the speedup as it can't be applied to anything.
+                                if (isDefined(deposit)) {
+                                    var eventKey = getRelayEventKey(deposit);
+                                    _this.depositHashes[eventKey] = _this.appendMaxSpeedUpSignatureToDeposit(deposit);
                                 }
                             }
-                        }
-                        if (eventsToQuery.includes("RequestedV3SlowFill")) {
-                            slowFillRequests = queryResults[eventsToQuery.indexOf("RequestedV3SlowFill")];
-                            for (_g = 0, slowFillRequests_1 = slowFillRequests; _g < slowFillRequests_1.length; _g++) {
-                                event_4 = slowFillRequests_1[_g];
-                                slowFillRequest = __assign(__assign({}, spreadEventWithBlockNumber(event_4)), { destinationChainId: this.chainId });
-                                relayDataHash = getRelayDataHash(slowFillRequest, this.chainId);
-                                if (this.slowFillRequests[relayDataHash] !== undefined) {
-                                    continue;
+                        };
+                        // Update deposits with speed up requests from depositor.
+                        ["RequestedSpeedUpV3Deposit", "RequestedSpeedUpDeposit"].forEach(function (event) {
+                            if (eventsToQuery.includes(event)) {
+                                querySpeedUpDepositEvents(event);
+                            }
+                        });
+                        queryRequestedSlowFillEvents = function (eventName) {
+                            var _a;
+                            var _b;
+                            var slowFillRequests = queryResults[eventsToQuery.indexOf(eventName)];
+                            for (var _i = 0, slowFillRequests_1 = slowFillRequests; _i < slowFillRequests_1.length; _i++) {
+                                var event_8 = slowFillRequests_1[_i];
+                                var slowFillRequest = __assign(__assign({}, spreadEventWithBlockNumber(event_8)), { destinationChainId: _this.chainId });
+                                if (eventName === "RequestedV3SlowFill") {
+                                    slowFillRequest.messageHash = getMessageHash(slowFillRequest.message);
                                 }
-                                this.slowFillRequests[relayDataHash] = slowFillRequest;
+                                var depositHash = getRelayEventKey(__assign(__assign({}, slowFillRequest), { destinationChainId: _this.chainId }));
+                                (_a = (_b = _this.slowFillRequests)[depositHash]) !== null && _a !== void 0 ? _a : (_b[depositHash] = slowFillRequest);
                             }
-                        }
-                        if (eventsToQuery.includes("FilledV3Relay")) {
-                            fillEvents = (_c = queryResults[eventsToQuery.indexOf("FilledV3Relay")]) !== null && _c !== void 0 ? _c : [];
+                        };
+                        ["RequestedV3SlowFill", "RequestedSlowFill"].forEach(function (event) {
+                            if (eventsToQuery.includes(event)) {
+                                queryRequestedSlowFillEvents(event);
+                            }
+                        });
+                        queryFilledRelayEvents = function (eventName) {
+                            var _a;
+                            var fillEvents = (_a = queryResults[eventsToQuery.indexOf(eventName)]) !== null && _a !== void 0 ? _a : [];
                             if (fillEvents.length > 0) {
-                                this.log("debug", "Using ".concat(fillEvents.length, " newly queried fill events for chain ").concat(this.chainId), {
+                                _this.log("debug", "Using ".concat(fillEvents.length, " newly queried ").concat(eventName, " events for chain ").concat(_this.chainId), {
                                     earliestEvent: fillEvents[0].blockNumber,
                                 });
                             }
                             // @note The type assertions here suppress errors that might arise due to incomplete types. For now, verify via
                             // test that the types are complete. A broader change in strategy for safely unpacking events will be introduced.
-                            for (_h = 0, fillEvents_1 = fillEvents; _h < fillEvents_1.length; _h++) {
-                                event_5 = fillEvents_1[_h];
-                                fill = __assign(__assign({}, spreadEventWithBlockNumber(event_5)), { destinationChainId: this.chainId });
-                                assign(this.fills, [fill.originChainId], [fill]);
-                                assign(this.depositHashesToFills, [this.getDepositHash(fill)], [fill]);
+                            for (var _i = 0, fillEvents_1 = fillEvents; _i < fillEvents_1.length; _i++) {
+                                var event_9 = fillEvents_1[_i];
+                                var fill = __assign(__assign({}, spreadEventWithBlockNumber(event_9)), { messageHash: getMessageHash(event_9.args["message"]), destinationChainId: _this.chainId });
+                                if (eventName === "FilledV3Relay") {
+                                    fill.messageHash = getMessageHash(event_9.args.message);
+                                    fill.relayExecutionInfo.updatedMessageHash = getMessageHash(event_9.args.relayExecutionInfo.updatedMessage);
+                                }
+                                assign(_this.fills, [fill.originChainId], [fill]);
+                                assign(_this.depositHashesToFills, [getRelayEventKey(fill)], [fill]);
                             }
-                        }
+                        };
+                        // Update observed fills with ingested event data.
+                        ["FilledV3Relay", "FilledRelay"].forEach(function (event) {
+                            if (eventsToQuery.includes(event)) {
+                                queryFilledRelayEvents(event);
+                            }
+                        });
                         if (eventsToQuery.includes("EnabledDepositRoute")) {
                             enableDepositsEvents = queryResults[eventsToQuery.indexOf("EnabledDepositRoute")];
-                            for (_j = 0, enableDepositsEvents_1 = enableDepositsEvents; _j < enableDepositsEvents_1.length; _j++) {
-                                event_6 = enableDepositsEvents_1[_j];
-                                enableDeposit = spreadEvent(event_6.args);
+                            for (_d = 0, enableDepositsEvents_1 = enableDepositsEvents; _d < enableDepositsEvents_1.length; _d++) {
+                                event_3 = enableDepositsEvents_1[_d];
+                                enableDeposit = spreadEvent(event_3.args);
                                 assign(this.depositRoutes, [enableDeposit.originToken, enableDeposit.destinationChainId], enableDeposit.enabled);
                             }
                         }
                         if (eventsToQuery.includes("RelayedRootBundle")) {
                             relayedRootBundleEvents = queryResults[eventsToQuery.indexOf("RelayedRootBundle")];
-                            for (_k = 0, relayedRootBundleEvents_1 = relayedRootBundleEvents; _k < relayedRootBundleEvents_1.length; _k++) {
-                                event_7 = relayedRootBundleEvents_1[_k];
-                                this.rootBundleRelays.push(spreadEventWithBlockNumber(event_7));
+                            for (_e = 0, relayedRootBundleEvents_1 = relayedRootBundleEvents; _e < relayedRootBundleEvents_1.length; _e++) {
+                                event_4 = relayedRootBundleEvents_1[_e];
+                                this.rootBundleRelays.push(spreadEventWithBlockNumber(event_4));
                             }
                         }
                         if (eventsToQuery.includes("ExecutedRelayerRefundRoot")) {
                             refundEvents = queryResults[eventsToQuery.indexOf("ExecutedRelayerRefundRoot")];
-                            for (_l = 0, refundEvents_1 = refundEvents; _l < refundEvents_1.length; _l++) {
-                                event_8 = refundEvents_1[_l];
-                                executedRefund = spreadEventWithBlockNumber(event_8);
+                            for (_f = 0, refundEvents_1 = refundEvents; _f < refundEvents_1.length; _f++) {
+                                event_5 = refundEvents_1[_f];
+                                executedRefund = spreadEventWithBlockNumber(event_5);
                                 executedRefund.l2TokenAddress = SpokePoolClient.getExecutedRefundLeafL2Token(executedRefund.chainId, executedRefund.l2TokenAddress);
                                 this.relayerRefundExecutions.push(executedRefund);
                             }
@@ -724,7 +804,7 @@ var SpokePoolClient = /** @class */ (function (_super) {
                         return [4 /*yield*/, this.getBlockNumber(Number(event.args["quoteTimestamp"]))];
                     case 3:
                         deposit = __assign.apply(void 0, _a.concat([(_b.quoteBlockNumber = _c.sent(), _b.fromLiteChain = true, _b.toLiteChain = true, _b)]));
-                        if (deposit.outputToken === ZERO_ADDRESS) {
+                        if (isZeroAddress(deposit.outputToken)) {
                             deposit.outputToken = this.getDestinationTokenForDeposit(deposit);
                         }
                         deposit.fromLiteChain = this.isOriginLiteChain(deposit);