@across-protocol/sdk 4.3.110 → 4.3.111-alpha.1

package/dist/cjs/clients/SpokePoolClient/SpokePoolClient.js

@@ -1,13 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SpokePoolClient = exports.knownEventNames = void 0;
-var tslib_1 = require("tslib");
-var ethers_1 = require("ethers");
-var utils_1 = require("../../utils");
-var EventUtils_1 = require("../../utils/EventUtils");
-var constants_1 = require("../../constants");
-var BaseAbstractClient_1 = require("../BaseAbstractClient");
-var BundleDataClient_1 = require("../BundleDataClient");
+const ethers_1 = require("ethers");
+const utils_1 = require("../../utils");
+const EventUtils_1 = require("../../utils/EventUtils");
+const constants_1 = require("../../constants");
+const BaseAbstractClient_1 = require("../BaseAbstractClient");
+const BundleDataClient_1 = require("../BundleDataClient");
 exports.knownEventNames = [
     "EnabledDepositRoute",
     "TokensBridged",
@@ -24,160 +23,157 @@ exports.knownEventNames = [
     "BridgedToHubPool",
     "ClaimedRelayerRefund",
 ];
-var SpokePoolClient = (function (_super) {
-    tslib_1.__extends(SpokePoolClient, _super);
-    function SpokePoolClient(logger, hubPoolClient, chainId, deploymentBlock, eventSearchConfig) {
-        if (eventSearchConfig === void 0) { eventSearchConfig = { from: 0, maxLookBack: 0 }; }
-        var _this = _super.call(this, eventSearchConfig) || this;
-        _this.logger = logger;
-        _this.hubPoolClient = hubPoolClient;
-        _this.chainId = chainId;
-        _this.deploymentBlock = deploymentBlock;
-        _this.currentTime = 0;
-        _this.duplicateDepositHashes = {};
-        _this.depositHashesToFills = {};
-        _this.speedUps = {};
-        _this.slowFillRequests = {};
-        _this.depositRoutes = {};
-        _this.tokensBridged = [];
-        _this.rootBundleRelays = [];
-        _this.relayerRefundExecutions = [];
-        _this.claimedRelayerRefunds = [];
-        _this.bridgedToHubPool = [];
-        _this.invalidFills = new Set();
-        _this.depositHashes = {};
-        _this.fills = {};
-        _this.firstHeightToSearch = eventSearchConfig.from;
-        _this.latestHeightSearched = 0;
-        _this.configStoreClient = hubPoolClient === null || hubPoolClient === void 0 ? void 0 : hubPoolClient.configStoreClient;
-        return _this;
-    }
-    SpokePoolClient.prototype.getDepositsForDestinationChain = function (destinationChainId) {
-        return Object.values(this.depositHashes).filter(function (deposit) { return deposit.destinationChainId === destinationChainId; });
-    };
-    SpokePoolClient.prototype._getDuplicateDeposits = function (deposit) {
-        var _a;
-        var depositHash = (0, utils_1.getRelayEventKey)(deposit);
-        return (_a = this.duplicateDepositHashes[depositHash]) !== null && _a !== void 0 ? _a : [];
-    };
-    SpokePoolClient.prototype.getDepositsForDestinationChainWithDuplicates = function (destinationChainId) {
-        var _this = this;
-        var deposits = this.getDepositsForDestinationChain(destinationChainId);
-        var duplicateDeposits = deposits.reduce(function (acc, deposit) {
-            var duplicates = _this._getDuplicateDeposits(deposit);
+class SpokePoolClient extends BaseAbstractClient_1.BaseAbstractClient {
+    logger;
+    hubPoolClient;
+    chainId;
+    deploymentBlock;
+    currentTime = 0;
+    duplicateDepositHashes = {};
+    depositHashesToFills = {};
+    speedUps = {};
+    slowFillRequests = {};
+    depositRoutes = {};
+    tokensBridged = [];
+    rootBundleRelays = [];
+    relayerRefundExecutions = [];
+    claimedRelayerRefunds = [];
+    bridgedToHubPool = [];
+    configStoreClient;
+    invalidFills = new Set();
+    depositHashes = {};
+    spokePoolAddress;
+    fills = {};
+    constructor(logger, hubPoolClient, chainId, deploymentBlock, eventSearchConfig = { from: 0, maxLookBack: 0 }) {
+        super(eventSearchConfig);
+        this.logger = logger;
+        this.hubPoolClient = hubPoolClient;
+        this.chainId = chainId;
+        this.deploymentBlock = deploymentBlock;
+        this.firstHeightToSearch = eventSearchConfig.from;
+        this.latestHeightSearched = 0;
+        this.configStoreClient = hubPoolClient?.configStoreClient;
+    }
+    getDepositsForDestinationChain(destinationChainId) {
+        return Object.values(this.depositHashes).filter((deposit) => deposit.destinationChainId === destinationChainId);
+    }
+    _getDuplicateDeposits(deposit) {
+        const depositHash = (0, utils_1.getRelayEventKey)(deposit);
+        return this.duplicateDepositHashes[depositHash] ?? [];
+    }
+    getDepositsForDestinationChainWithDuplicates(destinationChainId) {
+        const deposits = this.getDepositsForDestinationChain(destinationChainId);
+        const duplicateDeposits = deposits.reduce((acc, deposit) => {
+            const duplicates = this._getDuplicateDeposits(deposit);
             return acc.concat(duplicates);
         }, []);
         return (0, EventUtils_1.sortEventsAscendingInPlace)(deposits.concat(duplicateDeposits.flat()));
-    };
-    SpokePoolClient.prototype.getDeposits = function (filter) {
-        var deposits = Object.values(this.depositHashes);
+    }
+    getDeposits(filter) {
+        let deposits = Object.values(this.depositHashes);
         if ((0, utils_1.isDefined)(filter)) {
-            var fromBlock_1 = filter.fromBlock, toBlock_1 = filter.toBlock;
-            deposits = deposits.filter(function (_a) {
-                var blockNumber = _a.blockNumber;
-                return blockNumber >= fromBlock_1 && toBlock_1 >= blockNumber;
-            });
+            const { fromBlock, toBlock } = filter;
+            deposits = deposits.filter(({ blockNumber }) => blockNumber >= fromBlock && toBlock >= blockNumber);
         }
         return (0, EventUtils_1.sortEventsAscendingInPlace)(deposits);
-    };
-    SpokePoolClient.prototype.getTokensBridged = function () {
+    }
+    getTokensBridged() {
         return this.tokensBridged;
-    };
-    SpokePoolClient.prototype.getDepositRoutes = function () {
+    }
+    getDepositRoutes() {
         return this.depositRoutes;
-    };
-    SpokePoolClient.prototype.getFills = function () {
+    }
+    getFills() {
         return (0, EventUtils_1.sortEventsAscendingInPlace)(Object.values(this.fills).flat());
-    };
-    SpokePoolClient.prototype.getFillsForOriginChain = function (originChainId) {
+    }
+    getFillsForOriginChain(originChainId) {
         return this.fills[originChainId] || [];
-    };
-    SpokePoolClient.prototype.getFillsForRelayer = function (relayer) {
-        return this.getFills().filter(function (fill) { return fill.relayer.eq(relayer); });
-    };
-    SpokePoolClient.prototype.getFillsWithBlockInRange = function (startingBlock, endingBlock) {
-        return this.getFills().filter(function (fill) { return fill.blockNumber >= startingBlock && fill.blockNumber <= endingBlock; });
-    };
-    SpokePoolClient.prototype.getRootBundleRelays = function () {
+    }
+    getFillsForRelayer(relayer) {
+        return this.getFills().filter((fill) => fill.relayer.eq(relayer));
+    }
+    getFillsWithBlockInRange(startingBlock, endingBlock) {
+        return this.getFills().filter((fill) => fill.blockNumber >= startingBlock && fill.blockNumber <= endingBlock);
+    }
+    getRootBundleRelays() {
         return this.rootBundleRelays;
-    };
-    SpokePoolClient.prototype.getLatestRootBundleId = function () {
-        var _a;
+    }
+    getLatestRootBundleId() {
         return this.rootBundleRelays.length > 0
-            ? ((_a = this.rootBundleRelays[this.rootBundleRelays.length - 1]) === null || _a === void 0 ? void 0 : _a.rootBundleId) + 1
+            ? this.rootBundleRelays[this.rootBundleRelays.length - 1]?.rootBundleId + 1
             : 0;
-    };
-    SpokePoolClient.prototype.getRelayerRefundExecutions = function () {
+    }
+    getRelayerRefundExecutions() {
         return this.relayerRefundExecutions;
-    };
-    SpokePoolClient.prototype.getClaimedRelayerRefunds = function () {
+    }
+    getClaimedRelayerRefunds() {
         return this.claimedRelayerRefunds;
-    };
-    SpokePoolClient.prototype.getBridgedToHubPoolEvents = function () {
+    }
+    getBridgedToHubPoolEvents() {
         return this.bridgedToHubPool;
-    };
-    SpokePoolClient.prototype.appendMaxSpeedUpSignatureToDeposit = function (deposit) {
-        var _a;
-        var depositId = deposit.depositId, depositor = deposit.depositor;
-        var speedups = (_a = this.speedUps[depositor.toEvmAddress()]) === null || _a === void 0 ? void 0 : _a[depositId.toString()];
+    }
+    appendMaxSpeedUpSignatureToDeposit(deposit) {
+        const { depositId, depositor } = deposit;
+        const speedups = this.speedUps[depositor.toEvmAddress()]?.[depositId.toString()];
         if (!(0, utils_1.isDefined)(speedups) || speedups.length === 0) {
             return deposit;
         }
-        var maxSpeedUp = speedups.reduce(function (prev, current) {
-            return prev.updatedOutputAmount.lt(current.updatedOutputAmount) ? prev : current;
-        });
+        const maxSpeedUp = speedups.reduce((prev, current) => prev.updatedOutputAmount.lt(current.updatedOutputAmount) ? prev : current);
         if (maxSpeedUp.updatedOutputAmount.gte(deposit.outputAmount)) {
             return deposit;
         }
-        var updatedDeposit = tslib_1.__assign(tslib_1.__assign({}, deposit), { speedUpSignature: maxSpeedUp.depositorSignature, updatedOutputAmount: maxSpeedUp.updatedOutputAmount, updatedRecipient: maxSpeedUp.updatedRecipient, updatedMessage: maxSpeedUp.updatedMessage });
+        const updatedDeposit = {
+            ...deposit,
+            speedUpSignature: maxSpeedUp.depositorSignature,
+            updatedOutputAmount: maxSpeedUp.updatedOutputAmount,
+            updatedRecipient: maxSpeedUp.updatedRecipient,
+            updatedMessage: maxSpeedUp.updatedMessage,
+        };
         return updatedDeposit;
-    };
-    SpokePoolClient.prototype.getDeposit = function (depositId) {
-        return Object.values(this.depositHashes).find(function (_a) {
-            var _depositId = _a.depositId;
-            return _depositId.eq(depositId);
-        });
-    };
-    SpokePoolClient.prototype.getSlowFillRequests = function () {
+    }
+    getDeposit(depositId) {
+        return Object.values(this.depositHashes).find(({ depositId: _depositId }) => _depositId.eq(depositId));
+    }
+    getSlowFillRequests() {
         return (0, EventUtils_1.sortEventsAscendingInPlace)(Object.values(this.slowFillRequests));
-    };
-    SpokePoolClient.prototype.getSlowFillRequest = function (relayData) {
-        var hash = (0, utils_1.getRelayEventKey)(tslib_1.__assign(tslib_1.__assign({}, relayData), { destinationChainId: this.chainId }));
+    }
+    getSlowFillRequest(relayData) {
+        const hash = (0, utils_1.getRelayEventKey)({ ...relayData, destinationChainId: this.chainId });
         return this.slowFillRequests[hash];
-    };
-    SpokePoolClient.prototype.getSlowFillRequestsForOriginChain = function (originChainId) {
-        return Object.values(this.slowFillRequests).filter(function (e) { return e.originChainId === originChainId; });
-    };
-    SpokePoolClient.prototype.getSpeedUps = function () {
+    }
+    getSlowFillRequestsForOriginChain(originChainId) {
+        return Object.values(this.slowFillRequests).filter((e) => e.originChainId === originChainId);
+    }
+    getSpeedUps() {
         return this.speedUps;
-    };
-    SpokePoolClient.prototype.getDepositForFill = function (fill) {
-        var deposit = this.depositHashes[(0, utils_1.getRelayEventKey)(fill)];
-        var match = (0, utils_1.validateFillForDeposit)(fill, deposit);
+    }
+    getDepositForFill(fill) {
+        const deposit = this.depositHashes[(0, utils_1.getRelayEventKey)(fill)];
+        const match = (0, utils_1.validateFillForDeposit)(fill, deposit);
         return match.valid ? deposit : undefined;
-    };
-    SpokePoolClient.prototype.getFillsForDeposit = function (deposit) {
-        var _a;
-        return (_a = this.depositHashesToFills[this.getDepositHash(deposit)]) !== null && _a !== void 0 ? _a : [];
-    };
-    SpokePoolClient.prototype.isDepositFilled = function (deposit) {
-        var _a;
-        var depositHash = this.getDepositHash(deposit);
-        var fills = (_a = this.depositHashesToFills[depositHash]) !== null && _a !== void 0 ? _a : [];
-        return fills.some(function (fill) { return (0, utils_1.validateFillForDeposit)(fill, deposit).valid; });
-    };
-    SpokePoolClient.prototype.getValidUnfilledAmountForDeposit = function (deposit) {
-        var _this = this;
-        var outputAmount = deposit.outputAmount, originChainId = deposit.originChainId;
-        var fillsForDeposit = this.depositHashesToFills[this.getDepositHash(deposit)];
+    }
+    getFillsForDeposit(deposit) {
+        return this.depositHashesToFills[this.getDepositHash(deposit)] ?? [];
+    }
+    isDepositFilled(deposit) {
+        const depositHash = this.getDepositHash(deposit);
+        const fills = this.depositHashesToFills[depositHash] ?? [];
+        return fills.some((fill) => (0, utils_1.validateFillForDeposit)(fill, deposit).valid);
+    }
+    getValidUnfilledAmountForDeposit(deposit) {
+        const { outputAmount, originChainId } = deposit;
+        const fillsForDeposit = this.depositHashesToFills[this.getDepositHash(deposit)];
         if (fillsForDeposit === undefined || fillsForDeposit.length === 0) {
             return { unfilledAmount: outputAmount, fillCount: 0, invalidFills: [] };
         }
-        var _a = fillsForDeposit.reduce(function (groupedFills, fill) {
+        const { validFills, invalidFills, unrepayableFills } = fillsForDeposit.reduce((groupedFills, fill) => {
             if ((0, utils_1.validateFillForDeposit)(fill, deposit).valid) {
-                var fillRepaymentData = tslib_1.__assign(tslib_1.__assign({}, fill), { fromLiteChain: deposit.fromLiteChain });
-                var repaymentChainId = (0, BundleDataClient_1.getRefundInformationFromFill)(fillRepaymentData, _this.hubPoolClient, _this.hubPoolClient.latestHeightSearched).chainToSendRefundTo;
-                if (_this.hubPoolClient && !(0, utils_1.isSlowFill)(fill) && !fill.relayer.isValidOn(repaymentChainId)) {
+                const fillRepaymentData = {
+                    ...fill,
+                    fromLiteChain: deposit.fromLiteChain,
+                };
+                const { chainToSendRefundTo: repaymentChainId } = (0, BundleDataClient_1.getRefundInformationFromFill)(fillRepaymentData, this.hubPoolClient, this.hubPoolClient.latestHeightSearched);
+                if (this.hubPoolClient && !(0, utils_1.isSlowFill)(fill) && !fill.relayer.isValidOn(repaymentChainId)) {
                     groupedFills.unrepayableFills.push(fill);
                 }
                 groupedFills.validFills.push(fill);
@@ -186,291 +182,263 @@ var SpokePoolClient = (function (_super) {
                 groupedFills.invalidFills.push(fill);
             }
             return groupedFills;
-        }, { validFills: [], invalidFills: [], unrepayableFills: [] }), validFills = _a.validFills, invalidFills = _a.invalidFills, unrepayableFills = _a.unrepayableFills;
-        var logLevel = (0, utils_1.chainIsProd)(originChainId) ? "warn" : "debug";
-        var unrepayableFillsForDeposit = unrepayableFills.filter(function (x) { return x.depositId.eq(deposit.depositId); });
+        }, { validFills: [], invalidFills: [], unrepayableFills: [] });
+        const logLevel = (0, utils_1.chainIsProd)(originChainId) ? "warn" : "debug";
+        const unrepayableFillsForDeposit = unrepayableFills.filter((x) => x.depositId.eq(deposit.depositId));
         if (unrepayableFillsForDeposit.length > 0) {
             this.logger[logLevel]({
                 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.toNative(), x]; })),
+                deposit,
+                unrepayableFills: Object.fromEntries(unrepayableFillsForDeposit.map((x) => [x.relayer.toNative(), x])),
                 notificationPath: "across-unrepayable-fills",
             });
         }
         if (validFills.length === 0) {
-            return { unfilledAmount: outputAmount, fillCount: 0, invalidFills: invalidFills };
+            return { unfilledAmount: outputAmount, fillCount: 0, invalidFills };
         }
         return {
             unfilledAmount: utils_1.bnZero,
             fillCount: validFills.length,
-            invalidFills: invalidFills,
+            invalidFills,
         };
-    };
-    SpokePoolClient.prototype.getDepositHash = function (event) {
-        return "".concat(event.depositId.toString(), "-").concat(event.originChainId);
-    };
-    SpokePoolClient.prototype.canResolveZeroAddressOutputToken = function (deposit) {
-        var _a, _b;
-        if (!((_a = this.hubPoolClient) === null || _a === void 0 ? void 0 : _a.l2TokenHasPoolRebalanceRoute(deposit.inputToken, deposit.originChainId, deposit.quoteBlockNumber))) {
+    }
+    getDepositHash(event) {
+        return `${event.depositId.toString()}-${event.originChainId}`;
+    }
+    canResolveZeroAddressOutputToken(deposit) {
+        if (!this.hubPoolClient?.l2TokenHasPoolRebalanceRoute(deposit.inputToken, deposit.originChainId, deposit.quoteBlockNumber)) {
             return false;
         }
-        var l1Token = (_b = this.hubPoolClient) === null || _b === void 0 ? void 0 : _b.getL1TokenForL2TokenAtBlock(deposit.inputToken, deposit.originChainId, deposit.quoteBlockNumber);
+        const l1Token = this.hubPoolClient?.getL1TokenForL2TokenAtBlock(deposit.inputToken, deposit.originChainId, deposit.quoteBlockNumber);
         if (!l1Token) {
             return false;
         }
         return this.hubPoolClient.l2TokenEnabledForL1TokenAtBlock(l1Token, deposit.destinationChainId, deposit.quoteBlockNumber);
-    };
-    SpokePoolClient.prototype.update = function () {
-        return tslib_1.__awaiter(this, arguments, void 0, function (eventsToQuery) {
-            var duplicateEvents, update, queryResults, currentTime, searchEndBlock, _i, _a, _event, event_1, queryDepositEvents, _b, _c, event_2, querySpeedUpDepositEvents, queryRequestedSlowFillEvents, queryFilledRelayEvents, enableDepositsEvents, _d, enableDepositsEvents_1, event_3, relayedRootBundleEvents, _e, relayedRootBundleEvents_1, event_4, refundEvents, _f, refundEvents_1, _event, event_5, claimedRelayerRefundEvents, _g, claimedRelayerRefundEvents_1, event_6, bridgedToHubPoolEvents, _h, bridgedToHubPoolEvents_1, event_7;
-            var _this = this;
-            var _j, _k;
-            if (eventsToQuery === void 0) { eventsToQuery = this._queryableEventNames(); }
-            return tslib_1.__generator(this, function (_l) {
-                switch (_l.label) {
-                    case 0:
-                        duplicateEvents = [];
-                        if (this.hubPoolClient !== null && !this.hubPoolClient.isUpdated) {
-                            throw new Error("HubPoolClient not updated");
-                        }
-                        return [4, this._update(eventsToQuery)];
-                    case 1:
-                        update = _l.sent();
-                        if (!update.success) {
-                            return [2];
-                        }
-                        queryResults = update.events, currentTime = update.currentTime, searchEndBlock = update.searchEndBlock;
-                        if (eventsToQuery.includes("TokensBridged")) {
-                            for (_i = 0, _a = queryResults[eventsToQuery.indexOf("TokensBridged")]; _i < _a.length; _i++) {
-                                _event = _a[_i];
-                                event_1 = _event;
-                                this.tokensBridged.push(tslib_1.__assign(tslib_1.__assign({}, event_1), { l2TokenAddress: (0, utils_1.toAddressType)(event_1.l2TokenAddress, this.chainId) }));
-                            }
-                        }
-                        queryDepositEvents = function (eventName) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                            var depositEvents, quoteBlockNumbers, _loop_1, this_1, _i, depositEvents_1, event_8;
-                            var _this = this;
-                            var _a;
-                            return tslib_1.__generator(this, function (_b) {
-                                switch (_b.label) {
-                                    case 0:
-                                        depositEvents = ((_a = queryResults[eventsToQuery.indexOf(eventName)]) !== null && _a !== void 0 ? _a : []).map(function (event) {
-                                            return (0, utils_1.unpackDepositEvent)(event, _this.chainId);
-                                        });
-                                        return [4, this.getBlockNumbers(depositEvents.map(function (e) { return e.quoteTimestamp; }))];
-                                    case 1:
-                                        quoteBlockNumbers = _b.sent();
-                                        _loop_1 = function (event_8) {
-                                            var quoteBlockNumber = quoteBlockNumbers[Number(event_8.quoteTimestamp)];
-                                            var outputToken = event_8.outputToken.isZeroAddress()
-                                                ? this_1.getDestinationTokenForDeposit(tslib_1.__assign(tslib_1.__assign({}, event_8), { quoteBlockNumber: quoteBlockNumber }))
-                                                : event_8.outputToken;
-                                            var deposit = tslib_1.__assign(tslib_1.__assign({}, event_8), { outputToken: outputToken, quoteBlockNumber: quoteBlockNumber, fromLiteChain: this_1.isOriginLiteChain(event_8), toLiteChain: this_1.isDestinationLiteChain(event_8) });
-                                            if (this_1.depositHashes[(0, utils_1.getRelayEventKey)(deposit)] !== undefined) {
-                                                var allDeposits = this_1._getDuplicateDeposits(deposit).concat(this_1.depositHashes[(0, utils_1.getRelayEventKey)(deposit)]);
-                                                if (allDeposits.some(function (e) { return (0, EventUtils_1.duplicateEvent)(deposit, e); })) {
-                                                    duplicateEvents.push(event_8);
-                                                    return "continue";
-                                                }
-                                                (0, utils_1.assign)(this_1.duplicateDepositHashes, [(0, utils_1.getRelayEventKey)(deposit)], [deposit]);
-                                                return "continue";
-                                            }
-                                            (0, utils_1.assign)(this_1.depositHashes, [(0, utils_1.getRelayEventKey)(deposit)], deposit);
-                                        };
-                                        this_1 = this;
-                                        for (_i = 0, depositEvents_1 = depositEvents; _i < depositEvents_1.length; _i++) {
-                                            event_8 = depositEvents_1[_i];
-                                            _loop_1(event_8);
-                                        }
-                                        return [2];
-                                }
-                            });
-                        }); };
-                        _b = 0, _c = ["FundsDeposited"];
-                        _l.label = 2;
-                    case 2:
-                        if (!(_b < _c.length)) return [3, 5];
-                        event_2 = _c[_b];
-                        if (!eventsToQuery.includes(event_2)) return [3, 4];
-                        return [4, queryDepositEvents(event_2)];
-                    case 3:
-                        _l.sent();
-                        _l.label = 4;
-                    case 4:
-                        _b++;
-                        return [3, 2];
-                    case 5:
-                        querySpeedUpDepositEvents = function (eventName) {
-                            var _a;
-                            var speedUpEvents = ((_a = queryResults[eventsToQuery.indexOf(eventName)]) !== null && _a !== void 0 ? _a : [])
-                                .map(function (_event) {
-                                var event = _event;
-                                var invalid = [event.depositor, event.updatedRecipient].some(function (addr) { return !utils_1.EvmAddress.validate(ethers_1.utils.arrayify(addr)); });
-                                if (invalid) {
-                                    return;
-                                }
-                                return tslib_1.__assign(tslib_1.__assign({}, event), { depositor: utils_1.EvmAddress.from(event.depositor), updatedRecipient: utils_1.EvmAddress.from(event.updatedRecipient) });
-                            })
-                                .filter(utils_1.isDefined);
-                            for (var _i = 0, speedUpEvents_1 = speedUpEvents; _i < speedUpEvents_1.length; _i++) {
-                                var event_9 = speedUpEvents_1[_i];
-                                var speedUp = tslib_1.__assign(tslib_1.__assign({}, event_9), { originChainId: _this.chainId });
-                                (0, utils_1.assign)(_this.speedUps, [speedUp.depositor.toEvmAddress(), speedUp.depositId.toString()], [speedUp]);
-                                var deposit = _this.getDeposit(speedUp.depositId);
-                                if ((0, utils_1.isDefined)(deposit) && (0, utils_1.chainIsEvm)(deposit.destinationChainId) && deposit.depositor.eq(speedUp.depositor)) {
-                                    var eventKey = (0, utils_1.getRelayEventKey)(deposit);
-                                    _this.depositHashes[eventKey] = _this.appendMaxSpeedUpSignatureToDeposit(deposit);
-                                }
-                            }
-                        };
-                        ["RequestedSpeedUpDeposit"].forEach(function (event) {
-                            if (eventsToQuery.includes(event)) {
-                                querySpeedUpDepositEvents(event);
-                            }
-                        });
-                        queryRequestedSlowFillEvents = function (eventName) {
-                            var _a, _b;
-                            var _c;
-                            var destinationChainId = _this.chainId;
-                            var slowFillRequests = ((_a = queryResults[eventsToQuery.indexOf(eventName)]) !== null && _a !== void 0 ? _a : []).map(function (_event) {
-                                var event = _event;
-                                return tslib_1.__assign(tslib_1.__assign({}, event), { destinationChainId: destinationChainId, depositor: (0, utils_1.toAddressType)(event.depositor, event.originChainId), recipient: (0, utils_1.toAddressType)(event.recipient, destinationChainId), inputToken: (0, utils_1.toAddressType)(event.inputToken, event.originChainId), outputToken: (0, utils_1.toAddressType)(event.outputToken, destinationChainId), exclusiveRelayer: (0, utils_1.toAddressType)(event.exclusiveRelayer, destinationChainId) });
-                            });
-                            for (var _i = 0, slowFillRequests_1 = slowFillRequests; _i < slowFillRequests_1.length; _i++) {
-                                var slowFillRequest = slowFillRequests_1[_i];
-                                var depositHash = (0, utils_1.getRelayEventKey)(slowFillRequest);
-                                if (_this.slowFillRequests[depositHash] !== undefined) {
-                                    duplicateEvents.push(slowFillRequest);
-                                    continue;
-                                }
-                                (_b = (_c = _this.slowFillRequests)[depositHash]) !== null && _b !== void 0 ? _b : (_c[depositHash] = slowFillRequest);
-                            }
-                        };
-                        ["RequestedSlowFill"].forEach(function (event) {
-                            if (eventsToQuery.includes(event)) {
-                                queryRequestedSlowFillEvents(event);
-                            }
-                        });
-                        queryFilledRelayEvents = function (eventName) {
-                            var _a, _b;
-                            var fillEvents = ((_a = queryResults[eventsToQuery.indexOf(eventName)]) !== null && _a !== void 0 ? _a : []).map(function (event) {
-                                return (0, utils_1.unpackFillEvent)(event, _this.chainId);
-                            });
-                            if (fillEvents.length > 0) {
-                                _this.log("debug", "Using ".concat(fillEvents.length, " newly queried ").concat(eventName, " events for chain ").concat(_this.chainId), {
-                                    earliestEvent: fillEvents[0].blockNumber,
-                                });
-                            }
-                            var _loop_2 = function (fill) {
-                                var duplicateFill = (_b = _this.fills[fill.originChainId]) === null || _b === void 0 ? void 0 : _b.find(function (f) { return (0, EventUtils_1.duplicateEvent)(fill, f); });
-                                if (duplicateFill) {
-                                    duplicateEvents.push(fill);
-                                    return "continue";
-                                }
-                                (0, utils_1.assign)(_this.fills, [fill.originChainId], [fill]);
-                                (0, utils_1.assign)(_this.depositHashesToFills, [_this.getDepositHash(fill)], [fill]);
-                            };
-                            for (var _i = 0, fillEvents_1 = fillEvents; _i < fillEvents_1.length; _i++) {
-                                var fill = fillEvents_1[_i];
-                                _loop_2(fill);
-                            }
-                        };
-                        ["FilledRelay"].forEach(function (event) {
-                            if (eventsToQuery.includes(event)) {
-                                queryFilledRelayEvents(event);
-                            }
-                        });
-                        if (eventsToQuery.includes("EnabledDepositRoute")) {
-                            enableDepositsEvents = queryResults[eventsToQuery.indexOf("EnabledDepositRoute")].map(function (_event) {
-                                var event = _event;
-                                return tslib_1.__assign(tslib_1.__assign({}, event), { originToken: (0, utils_1.toAddressType)(event.originToken, constants_1.CHAIN_IDs.MAINNET) });
-                            });
-                            for (_d = 0, enableDepositsEvents_1 = enableDepositsEvents; _d < enableDepositsEvents_1.length; _d++) {
-                                event_3 = enableDepositsEvents_1[_d];
-                                (0, utils_1.assign)(this.depositRoutes, [event_3.originToken.toBytes32(), event_3.destinationChainId], event_3.enabled);
-                            }
-                        }
-                        if (eventsToQuery.includes("RelayedRootBundle")) {
-                            relayedRootBundleEvents = queryResults[eventsToQuery.indexOf("RelayedRootBundle")];
-                            for (_e = 0, relayedRootBundleEvents_1 = relayedRootBundleEvents; _e < relayedRootBundleEvents_1.length; _e++) {
-                                event_4 = relayedRootBundleEvents_1[_e];
-                                this.rootBundleRelays.push(event_4);
-                            }
-                        }
-                        if (eventsToQuery.includes("ExecutedRelayerRefundRoot")) {
-                            refundEvents = queryResults[eventsToQuery.indexOf("ExecutedRelayerRefundRoot")];
-                            for (_f = 0, refundEvents_1 = refundEvents; _f < refundEvents_1.length; _f++) {
-                                _event = refundEvents_1[_f];
-                                event_5 = _event;
-                                this.relayerRefundExecutions.push(tslib_1.__assign(tslib_1.__assign({}, event_5), { l2TokenAddress: (0, utils_1.toAddressType)(event_5.l2TokenAddress, this.chainId), refundAddresses: event_5.refundAddresses.map(function (addr) { return (0, utils_1.toAddressType)(addr, _this.chainId); }) }));
-                            }
-                        }
-                        if (eventsToQuery.includes("ClaimedRelayerRefund")) {
-                            claimedRelayerRefundEvents = ((_j = queryResults[eventsToQuery.indexOf("ClaimedRelayerRefund")]) !== null && _j !== void 0 ? _j : []);
-                            for (_g = 0, claimedRelayerRefundEvents_1 = claimedRelayerRefundEvents; _g < claimedRelayerRefundEvents_1.length; _g++) {
-                                event_6 = claimedRelayerRefundEvents_1[_g];
-                                this.claimedRelayerRefunds.push(tslib_1.__assign(tslib_1.__assign({}, event_6), { amount: event_6.amount || event_6.claimAmount }));
-                            }
-                        }
-                        if (eventsToQuery.includes("BridgedToHubPool")) {
-                            bridgedToHubPoolEvents = ((_k = queryResults[eventsToQuery.indexOf("BridgedToHubPool")]) !== null && _k !== void 0 ? _k : []);
-                            for (_h = 0, bridgedToHubPoolEvents_1 = bridgedToHubPoolEvents; _h < bridgedToHubPoolEvents_1.length; _h++) {
-                                event_7 = bridgedToHubPoolEvents_1[_h];
-                                this.bridgedToHubPool.push(event_7);
-                            }
-                        }
-                        if (duplicateEvents.length > 0) {
-                            this.log("debug", "Duplicate events listed", {
-                                duplicateEvents: duplicateEvents,
-                            });
-                            this.log("error", "Duplicate events detected, check debug logs");
-                        }
-                        this.currentTime = currentTime;
-                        this.latestHeightSearched = searchEndBlock;
-                        this.firstHeightToSearch = searchEndBlock + 1;
-                        this.eventSearchConfig.to = undefined;
-                        this.isUpdated = true;
-                        this.log("debug", "SpokePool client for chain ".concat(this.chainId, " updated!"), {
-                            nextFirstHeightToSearch: this.firstHeightToSearch,
-                        });
-                        return [2];
+    }
+    async update(eventsToQuery = this._queryableEventNames()) {
+        const duplicateEvents = [];
+        if (this.hubPoolClient !== null && !this.hubPoolClient.isUpdated) {
+            throw new Error("HubPoolClient not updated");
+        }
+        const update = await this._update(eventsToQuery);
+        if (!update.success) {
+            return;
+        }
+        const { events: queryResults, currentTime, searchEndBlock } = update;
+        if (eventsToQuery.includes("TokensBridged")) {
+            for (const _event of queryResults[eventsToQuery.indexOf("TokensBridged")]) {
+                const event = _event;
+                this.tokensBridged.push({
+                    ...event,
+                    l2TokenAddress: (0, utils_1.toAddressType)(event.l2TokenAddress, this.chainId),
+                });
+            }
+        }
+        const queryDepositEvents = async (eventName) => {
+            const depositEvents = (queryResults[eventsToQuery.indexOf(eventName)] ?? []).map((event) => (0, utils_1.unpackDepositEvent)(event, this.chainId));
+            const quoteBlockNumbers = await this.getBlockNumbers(depositEvents.map((e) => e.quoteTimestamp));
+            for (const event of depositEvents) {
+                const quoteBlockNumber = quoteBlockNumbers[Number(event.quoteTimestamp)];
+                const outputToken = event.outputToken.isZeroAddress()
+                    ? this.getDestinationTokenForDeposit({ ...event, quoteBlockNumber })
+                    : event.outputToken;
+                const deposit = {
+                    ...event,
+                    outputToken,
+                    quoteBlockNumber,
+                    fromLiteChain: this.isOriginLiteChain(event),
+                    toLiteChain: this.isDestinationLiteChain(event),
+                };
+                if (this.depositHashes[(0, utils_1.getRelayEventKey)(deposit)] !== undefined) {
+                    const allDeposits = this._getDuplicateDeposits(deposit).concat(this.depositHashes[(0, utils_1.getRelayEventKey)(deposit)]);
+                    if (allDeposits.some((e) => (0, EventUtils_1.duplicateEvent)(deposit, e))) {
+                        duplicateEvents.push(event);
+                        continue;
+                    }
+                    (0, utils_1.assign)(this.duplicateDepositHashes, [(0, utils_1.getRelayEventKey)(deposit)], [deposit]);
+                    continue;
+                }
+                (0, utils_1.assign)(this.depositHashes, [(0, utils_1.getRelayEventKey)(deposit)], deposit);
+            }
+        };
+        for (const event of ["FundsDeposited"]) {
+            if (eventsToQuery.includes(event)) {
+                await queryDepositEvents(event);
+            }
+        }
+        const querySpeedUpDepositEvents = (eventName) => {
+            const speedUpEvents = (queryResults[eventsToQuery.indexOf(eventName)] ?? [])
+                .map((_event) => {
+                const event = _event;
+                const invalid = [event.depositor, event.updatedRecipient].some((addr) => !utils_1.EvmAddress.validate(ethers_1.utils.arrayify(addr)));
+                if (invalid) {
+                    return;
+                }
+                return {
+                    ...event,
+                    depositor: utils_1.EvmAddress.from(event.depositor),
+                    updatedRecipient: utils_1.EvmAddress.from(event.updatedRecipient),
+                };
+            })
+                .filter(utils_1.isDefined);
+            for (const event of speedUpEvents) {
+                const speedUp = {
+                    ...event,
+                    originChainId: this.chainId,
+                };
+                (0, utils_1.assign)(this.speedUps, [speedUp.depositor.toEvmAddress(), speedUp.depositId.toString()], [speedUp]);
+                const deposit = this.getDeposit(speedUp.depositId);
+                if ((0, utils_1.isDefined)(deposit) && (0, utils_1.chainIsEvm)(deposit.destinationChainId) && deposit.depositor.eq(speedUp.depositor)) {
+                    const eventKey = (0, utils_1.getRelayEventKey)(deposit);
+                    this.depositHashes[eventKey] = this.appendMaxSpeedUpSignatureToDeposit(deposit);
                 }
+            }
+        };
+        ["RequestedSpeedUpDeposit"].forEach((event) => {
+            if (eventsToQuery.includes(event)) {
+                querySpeedUpDepositEvents(event);
+            }
+        });
+        const queryRequestedSlowFillEvents = (eventName) => {
+            const destinationChainId = this.chainId;
+            const slowFillRequests = (queryResults[eventsToQuery.indexOf(eventName)] ?? []).map((_event) => {
+                const event = _event;
+                return {
+                    ...event,
+                    destinationChainId,
+                    depositor: (0, utils_1.toAddressType)(event.depositor, event.originChainId),
+                    recipient: (0, utils_1.toAddressType)(event.recipient, destinationChainId),
+                    inputToken: (0, utils_1.toAddressType)(event.inputToken, event.originChainId),
+                    outputToken: (0, utils_1.toAddressType)(event.outputToken, destinationChainId),
+                    exclusiveRelayer: (0, utils_1.toAddressType)(event.exclusiveRelayer, destinationChainId),
+                };
             });
+            for (const slowFillRequest of slowFillRequests) {
+                const depositHash = (0, utils_1.getRelayEventKey)(slowFillRequest);
+                if (this.slowFillRequests[depositHash] !== undefined) {
+                    duplicateEvents.push(slowFillRequest);
+                    continue;
+                }
+                this.slowFillRequests[depositHash] ??= slowFillRequest;
+            }
+        };
+        ["RequestedSlowFill"].forEach((event) => {
+            if (eventsToQuery.includes(event)) {
+                queryRequestedSlowFillEvents(event);
+            }
+        });
+        const queryFilledRelayEvents = (eventName) => {
+            const fillEvents = (queryResults[eventsToQuery.indexOf(eventName)] ?? []).map((event) => (0, utils_1.unpackFillEvent)(event, this.chainId));
+            if (fillEvents.length > 0) {
+                this.log("debug", `Using ${fillEvents.length} newly queried ${eventName} events for chain ${this.chainId}`, {
+                    earliestEvent: fillEvents[0].blockNumber,
+                });
+            }
+            for (const fill of fillEvents) {
+                const duplicateFill = this.fills[fill.originChainId]?.find((f) => (0, EventUtils_1.duplicateEvent)(fill, f));
+                if (duplicateFill) {
+                    duplicateEvents.push(fill);
+                    continue;
+                }
+                (0, utils_1.assign)(this.fills, [fill.originChainId], [fill]);
+                (0, utils_1.assign)(this.depositHashesToFills, [this.getDepositHash(fill)], [fill]);
+            }
+        };
+        ["FilledRelay"].forEach((event) => {
+            if (eventsToQuery.includes(event)) {
+                queryFilledRelayEvents(event);
+            }
         });
-    };
-    SpokePoolClient.prototype.getBlockNumber = function (timestamp) {
-        var _a, _b;
-        return (_b = (_a = this.hubPoolClient) === null || _a === void 0 ? void 0 : _a.getBlockNumber(timestamp)) !== null && _b !== void 0 ? _b : Promise.resolve(utils_1.MAX_BIG_INT.toNumber());
-    };
-    SpokePoolClient.prototype.getBlockNumbers = function (timestamps) {
-        var _a, _b;
-        return ((_b = (_a = this.hubPoolClient) === null || _a === void 0 ? void 0 : _a.getBlockNumbers(timestamps)) !== null && _b !== void 0 ? _b : Promise.resolve(Object.fromEntries(timestamps.map(function (timestamp) { return [timestamp, utils_1.MAX_BIG_INT.toNumber()]; }))));
-    };
-    SpokePoolClient.prototype.getDestinationTokenForDeposit = function (deposit) {
+        if (eventsToQuery.includes("EnabledDepositRoute")) {
+            const enableDepositsEvents = queryResults[eventsToQuery.indexOf("EnabledDepositRoute")].map((_event) => {
+                const event = _event;
+                return {
+                    ...event,
+                    originToken: (0, utils_1.toAddressType)(event.originToken, constants_1.CHAIN_IDs.MAINNET),
+                };
+            });
+            for (const event of enableDepositsEvents) {
+                (0, utils_1.assign)(this.depositRoutes, [event.originToken.toBytes32(), event.destinationChainId], event.enabled);
+            }
+        }
+        if (eventsToQuery.includes("RelayedRootBundle")) {
+            const relayedRootBundleEvents = queryResults[eventsToQuery.indexOf("RelayedRootBundle")];
+            for (const event of relayedRootBundleEvents) {
+                this.rootBundleRelays.push(event);
+            }
+        }
+        if (eventsToQuery.includes("ExecutedRelayerRefundRoot")) {
+            const refundEvents = queryResults[eventsToQuery.indexOf("ExecutedRelayerRefundRoot")];
+            for (const _event of refundEvents) {
+                const event = _event;
+                this.relayerRefundExecutions.push({
+                    ...event,
+                    l2TokenAddress: (0, utils_1.toAddressType)(event.l2TokenAddress, this.chainId),
+                    refundAddresses: event.refundAddresses.map((addr) => (0, utils_1.toAddressType)(addr, this.chainId)),
+                });
+            }
+        }
+        if (eventsToQuery.includes("ClaimedRelayerRefund")) {
+            const claimedRelayerRefundEvents = (queryResults[eventsToQuery.indexOf("ClaimedRelayerRefund")] ??
+                []);
+            for (const event of claimedRelayerRefundEvents) {
+                this.claimedRelayerRefunds.push({
+                    ...event,
+                    amount: event.amount || event.claimAmount,
+                });
+            }
+        }
+        if (eventsToQuery.includes("BridgedToHubPool")) {
+            const bridgedToHubPoolEvents = (queryResults[eventsToQuery.indexOf("BridgedToHubPool")] ??
+                []);
+            for (const event of bridgedToHubPoolEvents) {
+                this.bridgedToHubPool.push(event);
+            }
+        }
+        if (duplicateEvents.length > 0) {
+            this.log("debug", "Duplicate events listed", {
+                duplicateEvents,
+            });
+            this.log("error", "Duplicate events detected, check debug logs");
+        }
+        this.currentTime = currentTime;
+        this.latestHeightSearched = searchEndBlock;
+        this.firstHeightToSearch = searchEndBlock + 1;
+        this.eventSearchConfig.to = undefined;
+        this.isUpdated = true;
+        this.log("debug", `SpokePool client for chain ${this.chainId} updated!`, {
+            nextFirstHeightToSearch: this.firstHeightToSearch,
+        });
+    }
+    getBlockNumber(timestamp) {
+        return this.hubPoolClient?.getBlockNumber(timestamp) ?? Promise.resolve(utils_1.MAX_BIG_INT.toNumber());
+    }
+    getBlockNumbers(timestamps) {
+        return (this.hubPoolClient?.getBlockNumbers(timestamps) ??
+            Promise.resolve(Object.fromEntries(timestamps.map((timestamp) => [timestamp, utils_1.MAX_BIG_INT.toNumber()]))));
+    }
+    getDestinationTokenForDeposit(deposit) {
         if (!this.canResolveZeroAddressOutputToken(deposit)) {
             return (0, utils_1.toAddressType)(constants_1.ZERO_ADDRESS, constants_1.CHAIN_IDs.MAINNET);
         }
-        var l1Token = this.hubPoolClient.getL1TokenForL2TokenAtBlock(deposit.inputToken, deposit.originChainId, deposit.quoteBlockNumber);
-        var counterpartToken = this.hubPoolClient.getL2TokenForL1TokenAtBlock(l1Token, deposit.destinationChainId, deposit.quoteBlockNumber);
-        return counterpartToken !== null && counterpartToken !== void 0 ? counterpartToken : (0, utils_1.toAddressType)(constants_1.ZERO_ADDRESS, constants_1.CHAIN_IDs.MAINNET);
-    };
-    SpokePoolClient.prototype.log = function (level, message, data) {
-        this.logger[level](tslib_1.__assign({ at: "SpokePoolClient", chainId: this.chainId, message: message }, data));
-    };
-    SpokePoolClient.prototype.getCurrentTime = function () {
+        const l1Token = this.hubPoolClient.getL1TokenForL2TokenAtBlock(deposit.inputToken, deposit.originChainId, deposit.quoteBlockNumber);
+        const counterpartToken = this.hubPoolClient.getL2TokenForL1TokenAtBlock(l1Token, deposit.destinationChainId, deposit.quoteBlockNumber);
+        return counterpartToken ?? (0, utils_1.toAddressType)(constants_1.ZERO_ADDRESS, constants_1.CHAIN_IDs.MAINNET);
+    }
+    log(level, message, data) {
+        this.logger[level]({ at: "SpokePoolClient", chainId: this.chainId, message, ...data });
+    }
+    getCurrentTime() {
         return this.currentTime;
-    };
-    SpokePoolClient.prototype.isOriginLiteChain = function (deposit) {
-        var _a, _b;
-        return (_b = (_a = this.configStoreClient) === null || _a === void 0 ? void 0 : _a.isChainLiteChainAtTimestamp(deposit.originChainId, deposit.quoteTimestamp)) !== null && _b !== void 0 ? _b : false;
-    };
-    SpokePoolClient.prototype.isDestinationLiteChain = function (deposit) {
-        var _a, _b;
-        return ((_b = (_a = this.configStoreClient) === null || _a === void 0 ? void 0 : _a.isChainLiteChainAtTimestamp(deposit.destinationChainId, deposit.quoteTimestamp)) !== null && _b !== void 0 ? _b : false);
-    };
-    return SpokePoolClient;
-}(BaseAbstractClient_1.BaseAbstractClient));
+    }
+    isOriginLiteChain(deposit) {
+        return this.configStoreClient?.isChainLiteChainAtTimestamp(deposit.originChainId, deposit.quoteTimestamp) ?? false;
+    }
+    isDestinationLiteChain(deposit) {
+        return (this.configStoreClient?.isChainLiteChainAtTimestamp(deposit.destinationChainId, deposit.quoteTimestamp) ?? false);
+    }
+}
 exports.SpokePoolClient = SpokePoolClient;
 //# sourceMappingURL=SpokePoolClient.js.map