@across-protocol/sdk 4.2.14-alpha.1 → 4.2.15

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

@@ -1,6 +1,6 @@
 import winston from "winston";
 import { AnyObject, BigNumber, DefaultLogLevels, DepositSearchResult, EventSearchConfig, MakeOptional, Address } from "../../utils";
-import { Deposit, DepositWithBlock, Fill, FillStatus, FillWithBlock, RelayData, RelayerRefundExecutionWithBlock, RootBundleRelayWithBlock, SlowFillRequestWithBlock, SortableEvent, SpeedUpWithBlock, TokensBridged } from "../../interfaces";
+import { BridgedToHubPoolWithBlock, ClaimedRelayerRefundWithBlock, Deposit, DepositWithBlock, Fill, FillStatus, FillWithBlock, RelayData, RelayerRefundExecutionWithBlock, RootBundleRelayWithBlock, SlowFillRequestWithBlock, SortableEvent, SpeedUpWithBlock, TokensBridged } from "../../interfaces";
 import { BaseAbstractClient, UpdateFailureReason } from "../BaseAbstractClient";
 import { AcrossConfigStoreClient } from "../AcrossConfigStoreClient";
 import { HubPoolClient } from "../HubPoolClient";
@@ -48,6 +48,8 @@ export declare abstract class SpokePoolClient extends BaseAbstractClient {
     protected tokensBridged: TokensBridged[];
     protected rootBundleRelays: RootBundleRelayWithBlock[];
     protected relayerRefundExecutions: RelayerRefundExecutionWithBlock[];
+    protected claimedRelayerRefunds: ClaimedRelayerRefundWithBlock[];
+    protected bridgedToHubPool: BridgedToHubPoolWithBlock[];
     protected configStoreClient: AcrossConfigStoreClient | undefined;
     protected invalidFills: Set<string>;
     readonly depositHashes: {
@@ -127,7 +129,7 @@ export declare abstract class SpokePoolClient extends BaseAbstractClient {
      * @param relayer The relayer address.
      * @returns A list of fills.
      */
-    getFillsForRelayer(relayer: Address): FillWithBlock[];
+    getFillsForRelayer(relayer: string): FillWithBlock[];
     /**
      * Retrieves a list of fills from a given block range.
      * @param startingBlock The starting block number.
@@ -150,6 +152,16 @@ export declare abstract class SpokePoolClient extends BaseAbstractClient {
      * @returns A list of relayer refund executions.
      */
     getRelayerRefundExecutions(): RelayerRefundExecutionWithBlock[];
+    /**
+     * Retrieves a list of claimed relayer refunds from the SpokePool contract.
+     * @returns A list of claimed relayer refunds.
+     */
+    getClaimedRelayerRefunds(): ClaimedRelayerRefundWithBlock[];
+    /**
+     * Retrieves a list of bridged to hub pool events from the SpokePool contract.
+     * @returns A list of bridged to hub pool events.
+     */
+    getBridgedToHubPoolEvents(): BridgedToHubPoolWithBlock[];
     /**
      * Appends a speed up signature to a specific deposit.
      * @param deposit The deposit to append the speed up signature to.
@@ -250,7 +262,7 @@ export declare abstract class SpokePoolClient extends BaseAbstractClient {
      * @param deposit The deposit to retrieve the destination token for.
      * @returns The destination token.
      */
-    protected getDestinationTokenForDeposit(deposit: DepositWithBlock): Address;
+    protected getDestinationTokenForDeposit(deposit: DepositWithBlock): string;
     /**
      * Performs a log for a specific level, message and data.
      * @param level The log level.

package/dist/esm/clients/SpokePoolClient/SpokePoolClient.js

@@ -1,5 +1,5 @@
 import { __assign, __awaiter, __extends, __generator } from "tslib";
-import { bnZero, MAX_BIG_INT, assign, getRelayEventKey, isDefined, getMessageHash, isSlowFill, isZeroAddress, validateFillForDeposit, chainIsEvm, chainIsProd, toAddressType, } from "../../utils";
+import { bnZero, MAX_BIG_INT, assign, getRelayEventKey, isDefined, getMessageHash, isSlowFill, isValidEvmAddress, isZeroAddress, toAddress, validateFillForDeposit, chainIsEvm, chainIsProd, } from "../../utils";
 import { duplicateEvent, sortEventsAscendingInPlace } from "../../utils/EventUtils";
 import { ZERO_ADDRESS } from "../../constants";
 import { BaseAbstractClient } from "../BaseAbstractClient";
@@ -17,6 +17,8 @@ export var knownEventNames = [
     "RequestedSlowFill",
     "FilledV3Relay",
     "FilledRelay",
+    "BridgedToHubPool",
+    "ClaimedRelayerRefund",
 ];
 /**
  * SpokePoolClient is a client for the SpokePool contract. It is responsible for querying the SpokePool contract
@@ -50,6 +52,8 @@ var SpokePoolClient = /** @class */ (function (_super) {
         _this.tokensBridged = [];
         _this.rootBundleRelays = [];
         _this.relayerRefundExecutions = [];
+        _this.claimedRelayerRefunds = [];
+        _this.bridgedToHubPool = [];
         _this.invalidFills = new Set();
         _this.depositHashes = {};
         _this.fills = {};
@@ -145,7 +149,7 @@ var SpokePoolClient = /** @class */ (function (_super) {
      * @returns A list of fills.
      */
     SpokePoolClient.prototype.getFillsForRelayer = function (relayer) {
-        return this.getFills().filter(function (fill) { return fill.relayer.eq(relayer); });
+        return this.getFills().filter(function (fill) { return fill.relayer === relayer; });
     };
     /**
      * Retrieves a list of fills from a given block range.
@@ -180,6 +184,20 @@ var SpokePoolClient = /** @class */ (function (_super) {
     SpokePoolClient.prototype.getRelayerRefundExecutions = function () {
         return this.relayerRefundExecutions;
     };
+    /**
+     * Retrieves a list of claimed relayer refunds from the SpokePool contract.
+     * @returns A list of claimed relayer refunds.
+     */
+    SpokePoolClient.prototype.getClaimedRelayerRefunds = function () {
+        return this.claimedRelayerRefunds;
+    };
+    /**
+     * Retrieves a list of bridged to hub pool events from the SpokePool contract.
+     * @returns A list of bridged to hub pool events.
+     */
+    SpokePoolClient.prototype.getBridgedToHubPoolEvents = function () {
+        return this.bridgedToHubPool;
+    };
     /**
      * Appends a speed up signature to a specific deposit.
      * @param deposit The deposit to append the speed up signature to.
@@ -189,8 +207,7 @@ var SpokePoolClient = /** @class */ (function (_super) {
         var _a;
         var depositId = deposit.depositId, depositor = deposit.depositor;
         // Note: we know depositor cannot be more than 20 bytes since this is guaranteed by contracts.
-        // Additionally, speed ups can only be done on EVM networks.
-        var speedups = (_a = this.speedUps[depositor.toEvmAddress()]) === null || _a === void 0 ? void 0 : _a[depositId.toString()];
+        var speedups = (_a = this.speedUps[toAddress(depositor)]) === null || _a === void 0 ? void 0 : _a[depositId.toString()];
         if (!isDefined(speedups) || speedups.length === 0) {
             return deposit;
         }
@@ -289,8 +306,7 @@ var SpokePoolClient = /** @class */ (function (_super) {
                 // functioon synchronous, we can't make that decision now. So this function might log some false positives.
                 if (_this.hubPoolClient &&
                     !isSlowFill(fill) &&
-                    chainIsEvm(repaymentChainId) &&
-                    !fill.relayer.isValidEvmAddress()) {
+                    (!chainIsEvm(repaymentChainId) || !isValidEvmAddress(fill.relayer))) {
                     groupedFills.unrepayableFills.push(fill);
                 }
                 // This fill is still valid and means that the deposit cannot be filled on-chain anymore, but it
@@ -310,7 +326,7 @@ var SpokePoolClient = /** @class */ (function (_super) {
                 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.toAddress(), x]; })),
+                unrepayableFills: Object.fromEntries(unrepayableFillsForDeposit.map(function (x) { return [x.relayer, x]; })),
                 notificationPath: "across-unrepayable-fills",
             });
         }
@@ -353,12 +369,13 @@ var SpokePoolClient = /** @class */ (function (_super) {
      * @see _update
      */
     SpokePoolClient.prototype.update = function (eventsToQuery) {
+        var _a, _b, _c, _d, _e;
         if (eventsToQuery === void 0) { eventsToQuery = this._queryableEventNames(); }
         return __awaiter(this, void 0, void 0, function () {
-            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;
+            var duplicateEvents, update, queryResults, currentTime, searchEndBlock, _i, _f, event_1, queryDepositEvents, _g, _h, event_2, querySpeedUpDepositEvents, queryRequestedSlowFillEvents, queryFilledRelayEvents, enableDepositsEvents, _j, enableDepositsEvents_1, event_3, relayedRootBundleEvents, _k, relayedRootBundleEvents_1, event_4, refundEvents, _l, refundEvents_1, event_5, claimedRelayerRefundEvents, _m, claimedRelayerRefundEvents_1, event_6, bridgedToHubPoolEvents, _o, bridgedToHubPoolEvents_1, event_7;
             var _this = this;
-            return __generator(this, function (_g) {
-                switch (_g.label) {
+            return __generator(this, function (_p) {
+                switch (_p.label) {
                     case 0:
                         duplicateEvents = [];
                         if (this.hubPoolClient !== null && !this.hubPoolClient.isUpdated) {
@@ -366,29 +383,24 @@ var SpokePoolClient = /** @class */ (function (_super) {
                         }
                         return [4 /*yield*/, this._update(eventsToQuery)];
                     case 1:
-                        update = _g.sent();
+                        update = _p.sent();
                         if (!update.success) {
                             return [2 /*return*/];
                         }
                         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(__assign(__assign({}, event_1), { l2TokenAddress: toAddressType(event_1.l2TokenAddress, this.chainId) }));
+                            for (_i = 0, _f = queryResults[eventsToQuery.indexOf("TokensBridged")]; _i < _f.length; _i++) {
+                                event_1 = _f[_i];
+                                this.tokensBridged.push(event_1);
                             }
                         }
                         queryDepositEvents = function (eventName) { return __awaiter(_this, void 0, void 0, function () {
-                            var depositEvents, quoteBlockNumbers, _loop_1, this_1, _i, depositEvents_1, event_6;
-                            var _this = this;
+                            var depositEvents, quoteBlockNumbers, _loop_1, this_1, _i, depositEvents_1, event_8;
                             var _a;
                             return __generator(this, function (_b) {
                                 switch (_b.label) {
                                     case 0:
-                                        depositEvents = ((_a = queryResults[eventsToQuery.indexOf(eventName)]) !== null && _a !== void 0 ? _a : []).map(function (_event) {
-                                            var event = _event;
-                                            return __assign(__assign({}, event), { depositor: toAddressType(event.depositor, _this.chainId), recipient: toAddressType(event.recipient, event.destinationChainId), inputToken: toAddressType(event.inputToken, _this.chainId), outputToken: toAddressType(event.outputToken, event.destinationChainId), exclusiveRelayer: toAddressType(event.exclusiveRelayer, event.destinationChainId) });
-                                        });
+                                        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,
@@ -397,10 +409,10 @@ var SpokePoolClient = /** @class */ (function (_super) {
                                         return [4 /*yield*/, this.getBlockNumbers(depositEvents.map(function (e) { return e.quoteTimestamp; }))];
                                     case 1:
                                         quoteBlockNumbers = _b.sent();
-                                        _loop_1 = function (event_6) {
-                                            var quoteBlockNumber = quoteBlockNumbers[Number(event_6.quoteTimestamp)];
+                                        _loop_1 = function (event_8) {
+                                            var quoteBlockNumber = quoteBlockNumbers[Number(event_8.quoteTimestamp)];
                                             // Derive and append the common properties that are not part of the onchain event.
-                                            var deposit = __assign(__assign({}, event_6), { messageHash: getMessageHash(event_6.message), quoteBlockNumber: quoteBlockNumber, originChainId: this_1.chainId, 
+                                            var deposit = __assign(__assign({}, event_8), { messageHash: getMessageHash(event_8.message), quoteBlockNumber: quoteBlockNumber, originChainId: this_1.chainId, 
                                                 // The following properties are placeholders to be updated immediately.
                                                 fromLiteChain: true, toLiteChain: true });
                                             deposit.fromLiteChain = this_1.isOriginLiteChain(deposit);
@@ -412,7 +424,7 @@ var SpokePoolClient = /** @class */ (function (_super) {
                                                 // Sanity check that this event is not a duplicate, even though the relay data hash is a duplicate.
                                                 var allDeposits = this_1._getDuplicateDeposits(deposit).concat(this_1.depositHashes[getRelayEventKey(deposit)]);
                                                 if (allDeposits.some(function (e) { return duplicateEvent(deposit, e); })) {
-                                                    duplicateEvents.push(event_6);
+                                                    duplicateEvents.push(event_8);
                                                     return "continue";
                                                 }
                                                 assign(this_1.duplicateDepositHashes, [getRelayEventKey(deposit)], [deposit]);
@@ -422,37 +434,34 @@ var SpokePoolClient = /** @class */ (function (_super) {
                                         };
                                         this_1 = this;
                                         for (_i = 0, depositEvents_1 = depositEvents; _i < depositEvents_1.length; _i++) {
-                                            event_6 = depositEvents_1[_i];
-                                            _loop_1(event_6);
+                                            event_8 = depositEvents_1[_i];
+                                            _loop_1(event_8);
                                         }
                                         return [2 /*return*/];
                                 }
                             });
                         }); };
-                        _b = 0, _c = ["FundsDeposited"];
-                        _g.label = 2;
+                        _g = 0, _h = ["FundsDeposited"];
+                        _p.label = 2;
                     case 2:
-                        if (!(_b < _c.length)) return [3 /*break*/, 5];
-                        event_2 = _c[_b];
+                        if (!(_g < _h.length)) return [3 /*break*/, 5];
+                        event_2 = _h[_g];
                         if (!eventsToQuery.includes(event_2)) return [3 /*break*/, 4];
                         return [4 /*yield*/, queryDepositEvents(event_2)];
                     case 3:
-                        _g.sent();
-                        _g.label = 4;
+                        _p.sent();
+                        _p.label = 4;
                     case 4:
-                        _b++;
+                        _g++;
                         return [3 /*break*/, 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;
-                                return __assign(__assign({}, event), { depositor: toAddressType(event.depositor, _this.chainId), updatedRecipient: toAddressType(event.updatedRecipient) });
-                            });
+                            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({}, event_7), { originChainId: _this.chainId });
-                                assign(_this.speedUps, [speedUp.depositor.toAddress(), speedUp.depositId.toString()], [speedUp]);
+                                var event_9 = speedUpEvents_1[_i];
+                                var speedUp = __assign(__assign({}, event_9), { 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);
@@ -473,17 +482,14 @@ var SpokePoolClient = /** @class */ (function (_super) {
                         queryRequestedSlowFillEvents = function (eventName) {
                             var _a, _b;
                             var _c;
-                            var slowFillRequests = ((_a = queryResults[eventsToQuery.indexOf(eventName)]) !== null && _a !== void 0 ? _a : []).map(function (_event) {
-                                var event = _event;
-                                return __assign(__assign({}, event), { depositor: toAddressType(event.depositor, event.originChainId), recipient: toAddressType(event.recipient, _this.chainId), inputToken: toAddressType(event.inputToken, event.originChainId), outputToken: toAddressType(event.outputToken, _this.chainId), exclusiveRelayer: toAddressType(event.exclusiveRelayer, _this.chainId) });
-                            });
+                            var slowFillRequests = ((_a = queryResults[eventsToQuery.indexOf(eventName)]) !== null && _a !== void 0 ? _a : []);
                             for (var _i = 0, slowFillRequests_1 = slowFillRequests; _i < slowFillRequests_1.length; _i++) {
-                                var event_8 = slowFillRequests_1[_i];
-                                var slowFillRequest = __assign(__assign({}, event_8), { destinationChainId: _this.chainId });
+                                var event_10 = slowFillRequests_1[_i];
+                                var slowFillRequest = __assign(__assign({}, event_10), { destinationChainId: _this.chainId });
                                 var depositHash = getRelayEventKey(__assign(__assign({}, slowFillRequest), { destinationChainId: _this.chainId }));
                                 // Sanity check that this event is not a duplicate.
                                 if (_this.slowFillRequests[depositHash] !== undefined) {
-                                    duplicateEvents.push(event_8);
+                                    duplicateEvents.push(event_10);
                                     continue;
                                 }
                                 (_b = (_c = _this.slowFillRequests)[depositHash]) !== null && _b !== void 0 ? _b : (_c[depositHash] = slowFillRequest);
@@ -496,21 +502,18 @@ var SpokePoolClient = /** @class */ (function (_super) {
                         });
                         queryFilledRelayEvents = function (eventName) {
                             var _a, _b;
-                            var fillEvents = ((_a = queryResults[eventsToQuery.indexOf(eventName)]) !== null && _a !== void 0 ? _a : []).map(function (_event) {
-                                var event = _event;
-                                return __assign(__assign({}, event), { depositor: toAddressType(event.depositor, event.originChainId), recipient: toAddressType(event.recipient, _this.chainId), inputToken: toAddressType(event.inputToken, event.originChainId), outputToken: toAddressType(event.outputToken, _this.chainId), exclusiveRelayer: toAddressType(event.exclusiveRelayer, _this.chainId), relayer: toAddressType(event.relayer, _this.chainId), relayExecutionInfo: __assign(__assign({}, event.relayExecutionInfo), { updatedRecipient: toAddressType(event.relayExecutionInfo.updatedRecipient, _this.chainId) }) });
-                            });
+                            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 ").concat(eventName, " events for chain ").concat(_this.chainId), {
                                     earliestEvent: fillEvents[0].blockNumber,
                                 });
                             }
-                            var _loop_2 = function (event_9) {
-                                var fill = __assign(__assign({}, event_9), { destinationChainId: _this.chainId });
+                            var _loop_2 = function (event_11) {
+                                var fill = __assign(__assign({}, event_11), { destinationChainId: _this.chainId });
                                 // Sanity check that this event is not a duplicate.
                                 var duplicateFill = (_b = _this.fills[fill.originChainId]) === null || _b === void 0 ? void 0 : _b.find(function (f) { return duplicateEvent(fill, f); });
                                 if (duplicateFill) {
-                                    duplicateEvents.push(event_9);
+                                    duplicateEvents.push(event_11);
                                     return "continue";
                                 }
                                 assign(_this.fills, [fill.originChainId], [fill]);
@@ -519,8 +522,8 @@ var SpokePoolClient = /** @class */ (function (_super) {
                             // @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 (var _i = 0, fillEvents_1 = fillEvents; _i < fillEvents_1.length; _i++) {
-                                var event_9 = fillEvents_1[_i];
-                                _loop_2(event_9);
+                                var event_11 = fillEvents_1[_i];
+                                _loop_2(event_11);
                             }
                         };
                         // Update observed fills with ingested event data.
@@ -530,25 +533,38 @@ var SpokePoolClient = /** @class */ (function (_super) {
                             }
                         });
                         if (eventsToQuery.includes("EnabledDepositRoute")) {
-                            enableDepositsEvents = queryResults[eventsToQuery.indexOf("EnabledDepositRoute")];
-                            for (_d = 0, enableDepositsEvents_1 = enableDepositsEvents; _d < enableDepositsEvents_1.length; _d++) {
-                                event_3 = enableDepositsEvents_1[_d];
+                            enableDepositsEvents = ((_a = queryResults[eventsToQuery.indexOf("EnabledDepositRoute")]) !== null && _a !== void 0 ? _a : []);
+                            for (_j = 0, enableDepositsEvents_1 = enableDepositsEvents; _j < enableDepositsEvents_1.length; _j++) {
+                                event_3 = enableDepositsEvents_1[_j];
                                 assign(this.depositRoutes, [event_3.originToken, 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];
+                            relayedRootBundleEvents = ((_b = queryResults[eventsToQuery.indexOf("RelayedRootBundle")]) !== null && _b !== void 0 ? _b : []);
+                            for (_k = 0, relayedRootBundleEvents_1 = relayedRootBundleEvents; _k < relayedRootBundleEvents_1.length; _k++) {
+                                event_4 = relayedRootBundleEvents_1[_k];
                                 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(__assign(__assign({}, event_5), { l2TokenAddress: toAddressType(event_5.l2TokenAddress, this.chainId), refundAddresses: event_5.refundAddresses.map(function (addr) { return toAddressType(addr, _this.chainId); }) }));
+                            refundEvents = ((_c = queryResults[eventsToQuery.indexOf("ExecutedRelayerRefundRoot")]) !== null && _c !== void 0 ? _c : []);
+                            for (_l = 0, refundEvents_1 = refundEvents; _l < refundEvents_1.length; _l++) {
+                                event_5 = refundEvents_1[_l];
+                                this.relayerRefundExecutions.push(event_5);
+                            }
+                        }
+                        if (eventsToQuery.includes("ClaimedRelayerRefund")) {
+                            claimedRelayerRefundEvents = ((_d = queryResults[eventsToQuery.indexOf("ClaimedRelayerRefund")]) !== null && _d !== void 0 ? _d : []);
+                            for (_m = 0, claimedRelayerRefundEvents_1 = claimedRelayerRefundEvents; _m < claimedRelayerRefundEvents_1.length; _m++) {
+                                event_6 = claimedRelayerRefundEvents_1[_m];
+                                this.claimedRelayerRefunds.push(__assign(__assign({}, event_6), { amount: event_6.amount || event_6.claimAmount }));
+                            }
+                        }
+                        if (eventsToQuery.includes("BridgedToHubPool")) {
+                            bridgedToHubPoolEvents = ((_e = queryResults[eventsToQuery.indexOf("BridgedToHubPool")]) !== null && _e !== void 0 ? _e : []);
+                            for (_o = 0, bridgedToHubPoolEvents_1 = bridgedToHubPoolEvents; _o < bridgedToHubPoolEvents_1.length; _o++) {
+                                event_7 = bridgedToHubPoolEvents_1[_o];
+                                this.bridgedToHubPool.push(event_7);
                             }
                         }
                         if (duplicateEvents.length > 0) {
@@ -595,13 +611,13 @@ var SpokePoolClient = /** @class */ (function (_super) {
      * @returns The destination token.
      */
     SpokePoolClient.prototype.getDestinationTokenForDeposit = function (deposit) {
+        var _a;
         if (!this.canResolveZeroAddressOutputToken(deposit)) {
-            return toAddressType(ZERO_ADDRESS);
+            return ZERO_ADDRESS;
         }
         // L1 token should be resolved if we get here:
         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 : toAddressType(ZERO_ADDRESS);
+        return ((_a = this.hubPoolClient.getL2TokenForL1TokenAtBlock(l1Token, deposit.destinationChainId, deposit.quoteBlockNumber)) !== null && _a !== void 0 ? _a : ZERO_ADDRESS);
     };
     /**
      * Performs a log for a specific level, message and data.

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

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

package/dist/esm/clients/mocks/MockHubPoolClient.d.ts

@@ -1,7 +1,7 @@
 import winston from "winston";
 import { Contract } from "ethers";
-import { BigNumber, EvmAddress, Address } from "../../utils";
-import { TokenInfo, Log, PendingRootBundle, RealizedLpFee, L1TokenInfo } from "../../interfaces";
+import { BigNumber } from "../../utils";
+import { L1Token, Log, PendingRootBundle, RealizedLpFee } from "../../interfaces";
 import { AcrossConfigStoreClient as ConfigStoreClient } from "../AcrossConfigStoreClient";
 import { HubPoolClient, HubPoolUpdate, LpFeeRequest } from "../HubPoolClient";
 import { EventOverrides } from "./MockEvents";
@@ -19,15 +19,15 @@ export declare class MockHubPoolClient extends HubPoolClient {
     batchComputeRealizedLpFeePct(_deposits: LpFeeRequest[]): Promise<RealizedLpFee[]>;
     setCrossChainContracts(chainId: number, contract: string, blockNumber?: number): void;
     setLatestBlockNumber(blockNumber: number): void;
-    addL1Token(l1Token: TokenInfo): void;
-    getL1Tokens(): L1TokenInfo[];
+    addL1Token(l1Token: L1Token): void;
+    getL1Tokens(): L1Token[];
     setTokenMapping(l1Token: string, chainId: number, l2Token: string): void;
-    l2TokenEnabledForL1TokenAtBlock(l1Token: EvmAddress, destinationChainId: number, hubBlockNumber: number): boolean;
-    l2TokenHasPoolRebalanceRoute(l2Token: Address, chainId: number, hubPoolBlock: number): boolean;
+    l2TokenEnabledForL1TokenAtBlock(l1Token: string, destinationChainId: number, hubBlockNumber: number): boolean;
+    l2TokenHasPoolRebalanceRoute(l2Token: string, chainId: number, hubPoolBlock: number): boolean;
     deleteTokenMapping(l1Token: string, chainId: number): void;
-    getL1TokenForL2TokenAtBlock(l2Token: Address, chainId: number, blockNumber: number): EvmAddress;
-    getL2TokenForL1TokenAtBlock(l1Token: EvmAddress, chainId: number, blockNumber: number): Address;
-    getTokenInfoForL1Token(l1Token: EvmAddress): TokenInfo | undefined;
+    getL1TokenForL2TokenAtBlock(l2Token: string, chainId: number, blockNumber: number): string;
+    getL2TokenForL1TokenAtBlock(l1Token: string, chainId: number, blockNumber: number): string;
+    getTokenInfoForL1Token(l1Token: string): L1Token | undefined;
     _update(eventNames: string[]): Promise<HubPoolUpdate>;
     readonly eventSignatures: Record<string, string>;
     setCrossChainContractsEvent(l2ChainId: number, adapter: string, spokePool: string, overrides?: EventOverrides): Log;

package/dist/esm/clients/mocks/MockHubPoolClient.js

@@ -1,13 +1,12 @@
 import { __awaiter, __extends, __generator } from "tslib";
-import { randomAddress, assign, bnZero, toAddressType, EvmAddress, isDefined } from "../../utils";
+import { randomAddress, assign, bnZero } from "../../utils";
 import { HubPoolClient } from "../HubPoolClient";
 import { getEventManager } from "./MockEvents";
-import { ZERO_ADDRESS } from "../../constants";
 var emptyRootBundle = {
     poolRebalanceRoot: "",
     relayerRefundRoot: "",
     slowRelayRoot: "",
-    proposer: EvmAddress.from(ZERO_ADDRESS),
+    proposer: "",
     unclaimedPoolRebalanceLeafCount: 0,
     challengePeriodEndTimestamp: 0,
     bundleEvaluationBlockNumbers: [],
@@ -84,7 +83,7 @@ var MockHubPoolClient = /** @class */ (function (_super) {
         if (blockNumber === void 0) { blockNumber = 0; }
         assign(this.crossChainContracts, [chainId], [
             {
-                spokePool: toAddressType(contract),
+                spokePool: contract,
                 blockNumber: blockNumber,
                 transactionIndex: 0,
                 logIndex: 0,
@@ -104,11 +103,11 @@ var MockHubPoolClient = /** @class */ (function (_super) {
         var _a;
         var _b;
         (_a = (_b = this.spokePoolTokens)[l1Token]) !== null && _a !== void 0 ? _a : (_b[l1Token] = {});
-        this.spokePoolTokens[l1Token][chainId] = toAddressType(l2Token);
+        this.spokePoolTokens[l1Token][chainId] = l2Token;
     };
     MockHubPoolClient.prototype.l2TokenEnabledForL1TokenAtBlock = function (l1Token, destinationChainId, hubBlockNumber) {
         var _a;
-        if ((_a = this.spokePoolTokens[l1Token.toEvmAddress()]) === null || _a === void 0 ? void 0 : _a[destinationChainId]) {
+        if ((_a = this.spokePoolTokens[l1Token]) === null || _a === void 0 ? void 0 : _a[destinationChainId]) {
             return true;
         }
         else {
@@ -117,7 +116,7 @@ var MockHubPoolClient = /** @class */ (function (_super) {
     };
     MockHubPoolClient.prototype.l2TokenHasPoolRebalanceRoute = function (l2Token, chainId, hubPoolBlock) {
         var _this = this;
-        var l1Token = Object.keys(this.spokePoolTokens).find(function (l1Token) { var _a, _b; return (_b = (_a = _this.spokePoolTokens[l1Token]) === null || _a === void 0 ? void 0 : _a[chainId]) === null || _b === void 0 ? void 0 : _b.eq(l2Token); });
+        var l1Token = Object.keys(this.spokePoolTokens).find(function (l1Token) { var _a; return ((_a = _this.spokePoolTokens[l1Token]) === null || _a === void 0 ? void 0 : _a[chainId]) === l2Token; });
         if (!l1Token) {
             return _super.prototype.l2TokenHasPoolRebalanceRoute.call(this, l2Token, chainId, hubPoolBlock);
         }
@@ -130,21 +129,16 @@ var MockHubPoolClient = /** @class */ (function (_super) {
     };
     MockHubPoolClient.prototype.getL1TokenForL2TokenAtBlock = function (l2Token, chainId, blockNumber) {
         var _this = this;
-        var l1Token = Object.keys(this.spokePoolTokens).find(function (l1Token) { var _a; return (_a = _this.spokePoolTokens[l1Token]) === null || _a === void 0 ? void 0 : _a[chainId].eq(l2Token); });
-        if (isDefined(l1Token)) {
-            return EvmAddress.from(l1Token);
-        }
-        else {
-            return _super.prototype.getL1TokenForL2TokenAtBlock.call(this, l2Token, chainId, blockNumber);
-        }
+        var l1Token = Object.keys(this.spokePoolTokens).find(function (l1Token) { var _a; return ((_a = _this.spokePoolTokens[l1Token]) === null || _a === void 0 ? void 0 : _a[chainId]) === l2Token; });
+        return l1Token !== null && l1Token !== void 0 ? l1Token : _super.prototype.getL1TokenForL2TokenAtBlock.call(this, l2Token, chainId, blockNumber);
     };
     MockHubPoolClient.prototype.getL2TokenForL1TokenAtBlock = function (l1Token, chainId, blockNumber) {
         var _a;
-        var l2Token = (_a = this.spokePoolTokens[l1Token.toEvmAddress()]) === null || _a === void 0 ? void 0 : _a[chainId];
+        var l2Token = (_a = this.spokePoolTokens[l1Token]) === null || _a === void 0 ? void 0 : _a[chainId];
         return l2Token !== null && l2Token !== void 0 ? l2Token : _super.prototype.getL2TokenForL1TokenAtBlock.call(this, l1Token, chainId, blockNumber);
     };
     MockHubPoolClient.prototype.getTokenInfoForL1Token = function (l1Token) {
-        return this.l1TokensMock.find(function (token) { return token.address.eq(l1Token); });
+        return this.l1TokensMock.find(function (token) { return token.address === l1Token; });
     };
     MockHubPoolClient.prototype._update = function (eventNames) {
         // Generate new "on chain" responses.