@across-protocol/sdk 4.1.63-alpha.1 → 4.1.63-beta.0

package/dist/cjs/clients/SpokePoolClient/EVMSpokePoolClient.d.ts

@@ -7,9 +7,9 @@ import winston from "winston";
 import { HubPoolClient } from "../HubPoolClient";
 export declare class EVMSpokePoolClient extends SpokePoolClient {
     readonly spokePool: Contract;
-    constructor(logger: winston.Logger, spokePool: Contract, hubPoolClient: HubPoolClient | null, chainId: number, deploymentBlock: number, eventSearchConfig?: MakeOptional<EventSearchConfig, "toBlock">);
-    relayFillStatus(relayData: RelayData, blockTag?: number | "latest"): Promise<FillStatus>;
-    fillStatusArray(relayData: RelayData[], blockTag?: number | "latest"): Promise<(FillStatus | undefined)[]>;
+    constructor(logger: winston.Logger, spokePool: Contract, hubPoolClient: HubPoolClient | null, chainId: number, deploymentBlock: number, eventSearchConfig?: MakeOptional<EventSearchConfig, "to">);
+    relayFillStatus(relayData: RelayData, atHeight?: number): Promise<FillStatus>;
+    fillStatusArray(relayData: RelayData[], atHeight?: number): Promise<(FillStatus | undefined)[]>;
     getMaxFillDeadlineInRange(startBlock: number, endBlock: number): Promise<number>;
     private _availableEventsOnSpoke;
     _queryableEventNames(): string[];

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

@@ -10,16 +10,16 @@ var SpokePoolClient_1 = require("./SpokePoolClient");
 var EVMSpokePoolClient = (function (_super) {
     tslib_1.__extends(EVMSpokePoolClient, _super);
     function EVMSpokePoolClient(logger, spokePool, hubPoolClient, chainId, deploymentBlock, eventSearchConfig) {
-        if (eventSearchConfig === void 0) { eventSearchConfig = { fromBlock: 0, maxBlockLookBack: 0 }; }
+        if (eventSearchConfig === void 0) { eventSearchConfig = { from: 0, maxLookBack: 0 }; }
         var _this = _super.call(this, logger, hubPoolClient, chainId, deploymentBlock, eventSearchConfig) || this;
         _this.spokePool = spokePool;
         return _this;
     }
-    EVMSpokePoolClient.prototype.relayFillStatus = function (relayData, blockTag) {
-        return (0, evm_1.relayFillStatus)(this.spokePool, relayData, blockTag, this.chainId);
+    EVMSpokePoolClient.prototype.relayFillStatus = function (relayData, atHeight) {
+        return (0, evm_1.relayFillStatus)(this.spokePool, relayData, atHeight, this.chainId);
     };
-    EVMSpokePoolClient.prototype.fillStatusArray = function (relayData, blockTag) {
-        return (0, evm_1.fillStatusArray)(this.spokePool, relayData, blockTag);
+    EVMSpokePoolClient.prototype.fillStatusArray = function (relayData, atHeight) {
+        return (0, evm_1.fillStatusArray)(this.spokePool, relayData, atHeight);
     };
     EVMSpokePoolClient.prototype.getMaxFillDeadlineInRange = function (startBlock, endBlock) {
         return (0, evm_1.getMaxFillDeadlineInRange)(this.spokePool, startBlock, endBlock);
@@ -42,7 +42,7 @@ var EVMSpokePoolClient = (function (_super) {
     };
     EVMSpokePoolClient.prototype._update = function (eventsToQuery) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var searchConfig, reason, eventSearchConfigs, spokePool, timerStart, multicallFunctions, _a, multicallOutput, events, currentTime, errMsg;
+            var searchConfig, reason, eventSearchConfigs, spokePool, timerStart, multicallFunctions, _a, multicallOutput, events, currentTime, errMsg, eventsWithBlockNumber;
             var _this = this;
             return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
@@ -59,7 +59,7 @@ var EVMSpokePoolClient = (function (_super) {
                             }
                             var _searchConfig = tslib_1.__assign({}, searchConfig);
                             if (eventName === "EnabledDepositRoute" && !_this.isUpdated) {
-                                _searchConfig.fromBlock = _this.deploymentBlock;
+                                _searchConfig.from = _this.deploymentBlock;
                             }
                             return {
                                 filter: _this._availableEventsOnSpoke()[eventName],
@@ -75,7 +75,7 @@ var EVMSpokePoolClient = (function (_super) {
                         timerStart = Date.now();
                         multicallFunctions = ["getCurrentTime"];
                         return [4, Promise.all(tslib_1.__spreadArray([
-                                spokePool.callStatic.multicall(multicallFunctions.map(function (f) { return spokePool.interface.encodeFunctionData(f); }), { blockTag: searchConfig.toBlock })
+                                spokePool.callStatic.multicall(multicallFunctions.map(function (f) { return spokePool.interface.encodeFunctionData(f); }), { blockTag: searchConfig.to })
                             ], eventSearchConfigs.map(function (config) { return (0, EventUtils_1.paginatedEventQuery)(_this.spokePool, config.filter, config.searchConfig); }), true))];
                     case 2:
                         _a = _b.sent(), multicallOutput = _a[0], events = _a.slice(1);
@@ -85,14 +85,17 @@ var EVMSpokePoolClient = (function (_super) {
                             errMsg = utils_1.BigNumber.isBigNumber(currentTime)
                                 ? "currentTime: ".concat(currentTime, " < ").concat((0, utils_1.toBN)(this.currentTime))
                                 : "currentTime is not a BigNumber: ".concat(JSON.stringify(currentTime));
-                            throw new Error("SpokePoolClient::update: ".concat(errMsg));
+                            throw new Error("EVMSpokePoolClient::update: ".concat(errMsg));
                         }
                         events.forEach(function (events) { return (0, EventUtils_1.sortEventsAscendingInPlace)(events.map(EventUtils_1.logToSortableEvent)); });
+                        eventsWithBlockNumber = events.map(function (eventList) {
+                            return eventList.map(function (event) { return (0, EventUtils_1.spreadEventWithBlockNumber)(event); });
+                        });
                         return [2, {
                                 success: true,
                                 currentTime: currentTime.toNumber(),
-                                searchEndBlock: searchConfig.toBlock,
-                                events: events,
+                                searchEndBlock: searchConfig.to,
+                                events: eventsWithBlockNumber,
                             }];
                 }
             });
@@ -103,7 +106,7 @@ var EVMSpokePoolClient = (function (_super) {
     };
     EVMSpokePoolClient.prototype.findDeposit = function (depositId) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var deposit, upperBound, fromBlock, chain, reason, toBlock, tStart, maxBlockLookBack, query, tStop, event, _a;
+            var deposit, upperBound, from, chain, reason, to, tStart, maxLookBack, query, tStop, event, _a;
             var _b;
             return tslib_1.__generator(this, function (_c) {
                 switch (_c.label) {
@@ -112,22 +115,22 @@ var EVMSpokePoolClient = (function (_super) {
                         if (deposit) {
                             return [2, { found: true, deposit: deposit }];
                         }
-                        upperBound = this.latestBlockSearched || undefined;
+                        upperBound = this.latestHeightSearched || undefined;
                         return [4, (0, evm_1.findDepositBlock)(this.spokePool, depositId, this.deploymentBlock, upperBound)];
                     case 1:
-                        fromBlock = _c.sent();
+                        from = _c.sent();
                         chain = (0, utils_1.getNetworkName)(this.chainId);
-                        if (!fromBlock) {
+                        if (!from) {
                             reason = "Unable to find ".concat(chain, " depositId ").concat(depositId) +
                                 " within blocks [".concat(this.deploymentBlock, ", ").concat(upperBound !== null && upperBound !== void 0 ? upperBound : "latest", "].");
                             return [2, { found: false, code: utils_1.InvalidFill.DepositIdNotFound, reason: reason }];
                         }
-                        toBlock = fromBlock;
+                        to = from;
                         tStart = Date.now();
-                        maxBlockLookBack = this.eventSearchConfig.maxBlockLookBack;
+                        maxLookBack = this.eventSearchConfig.maxLookBack;
                         return [4, Promise.all([
-                                (0, EventUtils_1.paginatedEventQuery)(this.spokePool, this.spokePool.filters.V3FundsDeposited(null, null, null, null, null, depositId), { fromBlock: fromBlock, toBlock: toBlock, maxBlockLookBack: maxBlockLookBack }),
-                                (0, EventUtils_1.paginatedEventQuery)(this.spokePool, this.spokePool.filters.FundsDeposited(null, null, null, null, null, depositId), { fromBlock: fromBlock, toBlock: toBlock, maxBlockLookBack: maxBlockLookBack }),
+                                (0, EventUtils_1.paginatedEventQuery)(this.spokePool, this.spokePool.filters.V3FundsDeposited(null, null, null, null, null, depositId), { from: from, to: to, maxLookBack: maxLookBack }),
+                                (0, EventUtils_1.paginatedEventQuery)(this.spokePool, this.spokePool.filters.FundsDeposited(null, null, null, null, null, depositId), { from: from, to: to, maxLookBack: maxLookBack }),
                             ])];
                     case 2:
                         query = (_c.sent()).flat();
@@ -140,7 +143,7 @@ var EVMSpokePoolClient = (function (_super) {
                             return [2, {
                                     found: false,
                                     code: utils_1.InvalidFill.DepositIdNotFound,
-                                    reason: "".concat(chain, " depositId ").concat(depositId, " not found at block ").concat(fromBlock, "."),
+                                    reason: "".concat(chain, " depositId ").concat(depositId, " not found at block ").concat(from, "."),
                                 }];
                         }
                         _a = [tslib_1.__assign({}, (0, EventUtils_1.spreadEventWithBlockNumber)(event))];

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

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

package/dist/cjs/clients/SpokePoolClient/SVMSpokePoolClient.d.ts

@@ -0,0 +1,23 @@
+import { Address, Rpc, RpcTransport, SolanaRpcApiFromTransport } from "@solana/kit";
+import winston from "winston";
+import { SvmCpiEventsClient } from "../../arch/svm";
+import { FillStatus, RelayData } from "../../interfaces";
+import { BigNumber, DepositSearchResult, EventSearchConfig, MakeOptional } from "../../utils";
+import { HubPoolClient } from "../HubPoolClient";
+import { SpokePoolClient, SpokePoolUpdate } from "./SpokePoolClient";
+export declare class SvmSpokePoolClient extends SpokePoolClient {
+    svmEventsClient: SvmCpiEventsClient;
+    protected programId: Address;
+    protected statePda: Address;
+    protected constructor(logger: winston.Logger, hubPoolClient: HubPoolClient | null, chainId: number, deploymentSlot: bigint, eventSearchConfig: MakeOptional<EventSearchConfig, "to">, svmEventsClient: SvmCpiEventsClient, programId: Address, statePda: Address);
+    static create(logger: winston.Logger, hubPoolClient: HubPoolClient | null, chainId: number, deploymentSlot: bigint, eventSearchConfig: MakeOptional<EventSearchConfig, "to"> | undefined, rpc: Rpc<SolanaRpcApiFromTransport<RpcTransport>>): Promise<SvmSpokePoolClient>;
+    static createWithExistingEventClient(logger: winston.Logger, hubPoolClient: HubPoolClient | null, chainId: number, deploymentSlot: bigint, eventSearchConfig: MakeOptional<EventSearchConfig, "to"> | undefined, eventClient: SvmCpiEventsClient): Promise<SvmSpokePoolClient>;
+    _queryableEventNames(): string[];
+    protected _update(eventsToQuery: string[]): Promise<SpokePoolUpdate>;
+    getMaxFillDeadlineInRange(_startSlot: number, _endSlot: number): Promise<number>;
+    getTimestampForBlock(slot: number): Promise<number>;
+    getTimeAt(slot: number): Promise<number>;
+    findDeposit(_depositId: BigNumber): Promise<DepositSearchResult>;
+    relayFillStatus(relayData: RelayData, atHeight?: number, destinationChainId?: number): Promise<FillStatus>;
+    fillStatusArray(relayData: RelayData[], atHeight?: number, destinationChainId?: number): Promise<(FillStatus | undefined)[]>;
+}

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

@@ -0,0 +1,145 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SvmSpokePoolClient = void 0;
+var tslib_1 = require("tslib");
+var svm_1 = require("../../arch/svm");
+var utils_1 = require("../../utils");
+var BaseAbstractClient_1 = require("../BaseAbstractClient");
+var SpokePoolClient_1 = require("./SpokePoolClient");
+var SvmSpokePoolClient = (function (_super) {
+    tslib_1.__extends(SvmSpokePoolClient, _super);
+    function SvmSpokePoolClient(logger, hubPoolClient, chainId, deploymentSlot, eventSearchConfig, svmEventsClient, programId, statePda) {
+        var _this = _super.call(this, logger, hubPoolClient, chainId, Number(deploymentSlot), eventSearchConfig) || this;
+        _this.svmEventsClient = svmEventsClient;
+        _this.programId = programId;
+        _this.statePda = statePda;
+        return _this;
+    }
+    SvmSpokePoolClient.create = function (logger, hubPoolClient, chainId, deploymentSlot, eventSearchConfig, rpc) {
+        if (eventSearchConfig === void 0) { eventSearchConfig = { from: 0, maxLookBack: 0 }; }
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var svmEventsClient, programId, statePda;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4, svm_1.SvmCpiEventsClient.create(rpc)];
+                    case 1:
+                        svmEventsClient = _a.sent();
+                        programId = svmEventsClient.getProgramAddress();
+                        return [4, (0, svm_1.getStatePda)(programId)];
+                    case 2:
+                        statePda = _a.sent();
+                        return [2, new SvmSpokePoolClient(logger, hubPoolClient, chainId, deploymentSlot, eventSearchConfig, svmEventsClient, programId, statePda)];
+                }
+            });
+        });
+    };
+    SvmSpokePoolClient.createWithExistingEventClient = function (logger, hubPoolClient, chainId, deploymentSlot, eventSearchConfig, eventClient) {
+        if (eventSearchConfig === void 0) { eventSearchConfig = { from: 0, maxLookBack: 0 }; }
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var programId, statePda;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        programId = eventClient.getProgramAddress();
+                        return [4, (0, svm_1.getStatePda)(programId)];
+                    case 1:
+                        statePda = _a.sent();
+                        return [2, new SvmSpokePoolClient(logger, hubPoolClient, chainId, deploymentSlot, eventSearchConfig, eventClient, programId, statePda)];
+                }
+            });
+        });
+    };
+    SvmSpokePoolClient.prototype._queryableEventNames = function () {
+        var internalEventNames = Object.values(svm_1.SVMEventNames);
+        return internalEventNames.filter(function (e) { return SpokePoolClient_1.knownEventNames.includes(e); });
+    };
+    SvmSpokePoolClient.prototype._update = function (eventsToQuery) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var searchConfig, reason, deploymentSlot, eventSearchConfigs, spokePoolAddress, timerStart, _a, currentTime, eventsQueried, errMsg;
+            var _this = this;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0: return [4, this.updateSearchConfig(this.svmEventsClient.getRpc())];
+                    case 1:
+                        searchConfig = _b.sent();
+                        if ((0, BaseAbstractClient_1.isUpdateFailureReason)(searchConfig)) {
+                            reason = searchConfig;
+                            return [2, { success: false, reason: reason }];
+                        }
+                        deploymentSlot = BigInt(this.deploymentBlock);
+                        eventSearchConfigs = eventsToQuery.map(function (eventName) {
+                            if (!_this._queryableEventNames().includes(eventName)) {
+                                throw new Error("SpokePoolClient: Cannot query unrecognised SpokePool event name: ".concat(eventName));
+                            }
+                            var _searchConfig = tslib_1.__assign({}, searchConfig);
+                            if (eventName === "EnabledDepositRoute" && !_this.isUpdated) {
+                                _searchConfig.from = Number(deploymentSlot);
+                            }
+                            return _searchConfig;
+                        });
+                        spokePoolAddress = this.svmEventsClient.getProgramAddress();
+                        this.log("debug", "Updating SpokePool client for chain ".concat(this.chainId), {
+                            eventsToQuery: eventsToQuery,
+                            searchConfig: searchConfig,
+                            spokePool: spokePoolAddress,
+                        });
+                        timerStart = Date.now();
+                        return [4, Promise.all(tslib_1.__spreadArray([
+                                this.svmEventsClient.getRpc().getBlockTime(BigInt(searchConfig.to)).send()
+                            ], eventsToQuery.map(function (eventName, idx) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                                var config, events;
+                                return tslib_1.__generator(this, function (_a) {
+                                    switch (_a.label) {
+                                        case 0:
+                                            config = eventSearchConfigs[idx];
+                                            return [4, this.svmEventsClient.queryEvents(eventName, BigInt(config.from), BigInt(config.to), {
+                                                    limit: config.maxLookBack,
+                                                })];
+                                        case 1:
+                                            events = _a.sent();
+                                            return [2, events.map(function (event) { return (tslib_1.__assign({ txnRef: event.signature, blockNumber: Number(event.slot), txnIndex: 0, logIndex: 0 }, (0, svm_1.unwrapEventData)(event.data))); })];
+                                    }
+                                });
+                            }); }), true))];
+                    case 2:
+                        _a = _b.sent(), currentTime = _a[0], eventsQueried = _a.slice(1);
+                        this.log("debug", "Time to query new events from RPC for ".concat(this.chainId, ": ").concat(Date.now() - timerStart, " ms"));
+                        if (currentTime < this.currentTime) {
+                            errMsg = "currentTime: ".concat(currentTime, " < ").concat(this.currentTime);
+                            throw new Error("SvmSpokePoolClient::update: ".concat(errMsg));
+                        }
+                        eventsQueried.forEach(function (events) { return (0, utils_1.sortEventsAscendingInPlace)(events); });
+                        return [2, {
+                                success: true,
+                                currentTime: Number(currentTime),
+                                searchEndBlock: searchConfig.to,
+                                events: eventsQueried,
+                            }];
+                }
+            });
+        });
+    };
+    SvmSpokePoolClient.prototype.getMaxFillDeadlineInRange = function (_startSlot, _endSlot) {
+        return (0, svm_1.getFillDeadline)(this.svmEventsClient.getRpc(), this.statePda);
+    };
+    SvmSpokePoolClient.prototype.getTimestampForBlock = function (slot) {
+        return (0, svm_1.getTimestampForSlot)(this.svmEventsClient.getRpc(), slot);
+    };
+    SvmSpokePoolClient.prototype.getTimeAt = function (slot) {
+        return (0, svm_1.getTimestampForSlot)(this.svmEventsClient.getRpc(), slot);
+    };
+    SvmSpokePoolClient.prototype.findDeposit = function (_depositId) {
+        throw new Error("findDeposit not implemented for SVM");
+    };
+    SvmSpokePoolClient.prototype.relayFillStatus = function (relayData, atHeight, destinationChainId) {
+        destinationChainId !== null && destinationChainId !== void 0 ? destinationChainId : (destinationChainId = this.chainId);
+        return (0, svm_1.relayFillStatus)(this.programId, relayData, destinationChainId, this.svmEventsClient, atHeight);
+    };
+    SvmSpokePoolClient.prototype.fillStatusArray = function (relayData, atHeight, destinationChainId) {
+        destinationChainId !== null && destinationChainId !== void 0 ? destinationChainId : (destinationChainId = this.chainId);
+        return (0, svm_1.fillStatusArray)(this.programId, relayData, destinationChainId, this.svmEventsClient, atHeight, this.logger);
+    };
+    return SvmSpokePoolClient;
+}(SpokePoolClient_1.SpokePoolClient));
+exports.SvmSpokePoolClient = SvmSpokePoolClient;
+//# sourceMappingURL=SVMSpokePoolClient.js.map

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

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

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

@@ -1,13 +1,13 @@
 import winston from "winston";
 import { AnyObject, BigNumber, DefaultLogLevels, DepositSearchResult, EventSearchConfig, MakeOptional } from "../../utils";
-import { Deposit, DepositWithBlock, Fill, FillStatus, FillWithBlock, Log, RelayData, RelayerRefundExecutionWithBlock, RootBundleRelayWithBlock, SlowFillRequestWithBlock, SpeedUpWithBlock, TokensBridged } from "../../interfaces";
+import { 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";
 export type SpokePoolUpdateSuccess = {
     success: true;
     currentTime: number;
-    events: Log[][];
+    events: SortableEvent[][];
     searchEndBlock: number;
 };
 export type SpokePoolUpdateFailure = {
@@ -52,7 +52,7 @@ export declare abstract class SpokePoolClient extends BaseAbstractClient {
     fills: {
         [OriginChainId: number]: FillWithBlock[];
     };
-    protected constructor(logger: winston.Logger, hubPoolClient: HubPoolClient | null, chainId: number, deploymentBlock: number, eventSearchConfig?: MakeOptional<EventSearchConfig, "toBlock">);
+    protected constructor(logger: winston.Logger, hubPoolClient: HubPoolClient | null, chainId: number, deploymentBlock: number, eventSearchConfig?: MakeOptional<EventSearchConfig, "to">);
     getDepositsForDestinationChain(destinationChainId: number): DepositWithBlock[];
     private _getDuplicateDeposits;
     getDepositsForDestinationChainWithDuplicates(destinationChainId: number): DepositWithBlock[];
@@ -111,6 +111,6 @@ export declare abstract class SpokePoolClient extends BaseAbstractClient {
     abstract getTimestampForBlock(blockTag: number): Promise<number>;
     abstract getTimeAt(blockNumber: number): Promise<number>;
     abstract findDeposit(depositId: BigNumber): Promise<DepositSearchResult>;
-    abstract relayFillStatus(relayData: RelayData, blockTag?: number | "latest"): Promise<FillStatus>;
-    abstract fillStatusArray(relayData: RelayData[], blockTag?: number | "latest"): Promise<(FillStatus | undefined)[]>;
+    abstract relayFillStatus(relayData: RelayData, atHeight?: number): Promise<FillStatus>;
+    abstract fillStatusArray(relayData: RelayData[], atHeight?: number): Promise<(FillStatus | undefined)[]>;
 }

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

@@ -24,7 +24,7 @@ exports.knownEventNames = [
 var SpokePoolClient = (function (_super) {
     tslib_1.__extends(SpokePoolClient, _super);
     function SpokePoolClient(logger, hubPoolClient, chainId, deploymentBlock, eventSearchConfig) {
-        if (eventSearchConfig === void 0) { eventSearchConfig = { fromBlock: 0, maxBlockLookBack: 0 }; }
+        if (eventSearchConfig === void 0) { eventSearchConfig = { from: 0, maxLookBack: 0 }; }
         var _this = _super.call(this, eventSearchConfig) || this;
         _this.logger = logger;
         _this.hubPoolClient = hubPoolClient;
@@ -42,8 +42,8 @@ var SpokePoolClient = (function (_super) {
         _this.relayerRefundExecutions = [];
         _this.invalidFills = new Set();
         _this.fills = {};
-        _this.firstBlockToSearch = eventSearchConfig.fromBlock;
-        _this.latestBlockSearched = 0;
+        _this.firstHeightToSearch = eventSearchConfig.from;
+        _this.latestHeightSearched = 0;
         _this.configStoreClient = hubPoolClient === null || hubPoolClient === void 0 ? void 0 : hubPoolClient.configStoreClient;
         return _this;
     }
@@ -159,7 +159,7 @@ var SpokePoolClient = (function (_super) {
         var _a = fillsForDeposit.reduce(function (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.latestBlockSearched).chainToSendRefundTo;
+                var repaymentChainId = (0, BundleDataClient_1.getRefundInformationFromFill)(fillRepaymentData, _this.hubPoolClient, _this.hubPoolClient.latestHeightSearched).chainToSendRefundTo;
                 if (_this.hubPoolClient &&
                     !(0, utils_1.isSlowFill)(fill) &&
                     (!(0, utils_1.chainIsEvm)(repaymentChainId) || !(0, utils_1.isValidEvmAddress)(fill.relayer))) {
@@ -224,12 +224,13 @@ var SpokePoolClient = (function (_super) {
         }
     };
     SpokePoolClient.prototype.update = function (eventsToQuery) {
+        var _a, _b, _c;
         if (eventsToQuery === void 0) { eventsToQuery = this._queryableEventNames(); }
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var duplicateEvents, update, queryResults, currentTime, 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 duplicateEvents, update, queryResults, currentTime, searchEndBlock, _i, _d, event_1, queryDepositEvents, _e, _f, event_2, querySpeedUpDepositEvents, queryRequestedSlowFillEvents, queryFilledRelayEvents, enableDepositsEvents, _g, enableDepositsEvents_1, event_3, relayedRootBundleEvents, _h, relayedRootBundleEvents_1, event_4, refundEvents, _j, refundEvents_1, event_5;
             var _this = this;
-            return tslib_1.__generator(this, function (_g) {
-                switch (_g.label) {
+            return tslib_1.__generator(this, function (_k) {
+                switch (_k.label) {
                     case 0:
                         duplicateEvents = [];
                         if (this.hubPoolClient !== null && !this.hubPoolClient.isUpdated) {
@@ -237,15 +238,15 @@ var SpokePoolClient = (function (_super) {
                         }
                         return [4, this._update(eventsToQuery)];
                     case 1:
-                        update = _g.sent();
+                        update = _k.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_1 = _a[_i];
-                                this.tokensBridged.push((0, EventUtils_1.spreadEventWithBlockNumber)(event_1));
+                            for (_i = 0, _d = queryResults[eventsToQuery.indexOf("TokensBridged")]; _i < _d.length; _i++) {
+                                event_1 = _d[_i];
+                                this.tokensBridged.push(event_1);
                             }
                         }
                         queryDepositEvents = function (eventName) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
@@ -254,21 +255,18 @@ var SpokePoolClient = (function (_super) {
                             return tslib_1.__generator(this, function (_b) {
                                 switch (_b.label) {
                                     case 0:
-                                        depositEvents = (_a = queryResults[eventsToQuery.indexOf(eventName)]) !== null && _a !== void 0 ? _a : [];
+                                        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, this.getBlockNumbers(depositEvents.map(function (_a) {
-                                                var args = _a.args;
-                                                return Number(args["quoteTimestamp"]);
-                                            }))];
+                                        return [4, 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.args["quoteTimestamp"])];
-                                            var deposit = tslib_1.__assign(tslib_1.__assign({}, (0, EventUtils_1.spreadEventWithBlockNumber)(event_6)), { messageHash: (0, utils_1.getMessageHash)(event_6.args.message), quoteBlockNumber: quoteBlockNumber, originChainId: this_1.chainId, fromLiteChain: true, toLiteChain: true });
+                                            var quoteBlockNumber = quoteBlockNumbers[Number(event_6.quoteTimestamp)];
+                                            var deposit = tslib_1.__assign(tslib_1.__assign({}, event_6), { messageHash: (0, utils_1.getMessageHash)(event_6.message), quoteBlockNumber: quoteBlockNumber, originChainId: this_1.chainId, fromLiteChain: true, toLiteChain: true });
                                             deposit.fromLiteChain = this_1.isOriginLiteChain(deposit);
                                             deposit.toLiteChain = this_1.isDestinationLiteChain(deposit);
                                             if ((0, utils_1.isZeroAddress)(deposit.outputToken)) {
@@ -294,26 +292,26 @@ var SpokePoolClient = (function (_super) {
                                 }
                             });
                         }); };
-                        _b = 0, _c = ["V3FundsDeposited", "FundsDeposited"];
-                        _g.label = 2;
+                        _e = 0, _f = ["V3FundsDeposited", "FundsDeposited"];
+                        _k.label = 2;
                     case 2:
-                        if (!(_b < _c.length)) return [3, 5];
-                        event_2 = _c[_b];
+                        if (!(_e < _f.length)) return [3, 5];
+                        event_2 = _f[_e];
                         if (!eventsToQuery.includes(event_2)) return [3, 4];
                         return [4, queryDepositEvents(event_2)];
                     case 3:
-                        _g.sent();
-                        _g.label = 4;
+                        _k.sent();
+                        _k.label = 4;
                     case 4:
-                        _b++;
+                        _e++;
                         return [3, 2];
                     case 5:
                         querySpeedUpDepositEvents = function (eventName) {
                             var _a;
-                            var speedUpEvents = (_a = queryResults[eventsToQuery.indexOf(eventName)]) !== null && _a !== void 0 ? _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 = tslib_1.__assign(tslib_1.__assign({}, (0, EventUtils_1.spreadEventWithBlockNumber)(event_7)), { originChainId: _this.chainId });
+                                var speedUp = tslib_1.__assign(tslib_1.__assign({}, event_7), { originChainId: _this.chainId });
                                 (0, utils_1.assign)(_this.speedUps, [speedUp.depositor, speedUp.depositId.toString()], [speedUp]);
                                 var deposit = _this.getDeposit(speedUp.depositId);
                                 if ((0, utils_1.isDefined)(deposit)) {
@@ -328,12 +326,12 @@ var SpokePoolClient = (function (_super) {
                             }
                         });
                         queryRequestedSlowFillEvents = function (eventName) {
-                            var _a;
-                            var _b;
-                            var slowFillRequests = queryResults[eventsToQuery.indexOf(eventName)];
+                            var _a, _b;
+                            var _c;
+                            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 = tslib_1.__assign(tslib_1.__assign({}, (0, EventUtils_1.spreadEventWithBlockNumber)(event_8)), { destinationChainId: _this.chainId });
+                                var slowFillRequest = tslib_1.__assign(tslib_1.__assign({}, event_8), { destinationChainId: _this.chainId });
                                 if (eventName === "RequestedV3SlowFill") {
                                     slowFillRequest.messageHash = (0, utils_1.getMessageHash)(slowFillRequest.message);
                                 }
@@ -342,7 +340,7 @@ var SpokePoolClient = (function (_super) {
                                     duplicateEvents.push(event_8);
                                     continue;
                                 }
-                                (_a = (_b = _this.slowFillRequests)[depositHash]) !== null && _a !== void 0 ? _a : (_b[depositHash] = slowFillRequest);
+                                (_b = (_c = _this.slowFillRequests)[depositHash]) !== null && _b !== void 0 ? _b : (_c[depositHash] = slowFillRequest);
                             }
                         };
                         ["RequestedV3SlowFill", "RequestedSlowFill"].forEach(function (event) {
@@ -352,17 +350,17 @@ var SpokePoolClient = (function (_super) {
                         });
                         queryFilledRelayEvents = function (eventName) {
                             var _a, _b;
-                            var fillEvents = (_a = queryResults[eventsToQuery.indexOf(eventName)]) !== null && _a !== void 0 ? _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 ").concat(eventName, " events for chain ").concat(_this.chainId), {
                                     earliestEvent: fillEvents[0].blockNumber,
                                 });
                             }
                             var _loop_2 = function (event_9) {
-                                var fill = tslib_1.__assign(tslib_1.__assign({}, (0, EventUtils_1.spreadEventWithBlockNumber)(event_9)), { destinationChainId: _this.chainId });
+                                var fill = tslib_1.__assign(tslib_1.__assign({}, event_9), { destinationChainId: _this.chainId });
                                 if (eventName === "FilledV3Relay") {
-                                    fill.messageHash = (0, utils_1.getMessageHash)(event_9.args.message);
-                                    fill.relayExecutionInfo.updatedMessageHash = (0, utils_1.getMessageHash)(event_9.args.relayExecutionInfo.updatedMessage);
+                                    fill.messageHash = (0, utils_1.getMessageHash)(event_9.message);
+                                    fill.relayExecutionInfo.updatedMessageHash = (0, utils_1.getMessageHash)(event_9.relayExecutionInfo.updatedMessage);
                                 }
                                 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) {
@@ -383,26 +381,24 @@ var SpokePoolClient = (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];
-                                enableDeposit = (0, EventUtils_1.spreadEvent)(event_3.args);
-                                (0, utils_1.assign)(this.depositRoutes, [enableDeposit.originToken, enableDeposit.destinationChainId], enableDeposit.enabled);
+                            enableDepositsEvents = ((_a = queryResults[eventsToQuery.indexOf("EnabledDepositRoute")]) !== null && _a !== void 0 ? _a : []);
+                            for (_g = 0, enableDepositsEvents_1 = enableDepositsEvents; _g < enableDepositsEvents_1.length; _g++) {
+                                event_3 = enableDepositsEvents_1[_g];
+                                (0, utils_1.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];
-                                this.rootBundleRelays.push((0, EventUtils_1.spreadEventWithBlockNumber)(event_4));
+                            relayedRootBundleEvents = ((_b = queryResults[eventsToQuery.indexOf("RelayedRootBundle")]) !== null && _b !== void 0 ? _b : []);
+                            for (_h = 0, relayedRootBundleEvents_1 = relayedRootBundleEvents; _h < relayedRootBundleEvents_1.length; _h++) {
+                                event_4 = relayedRootBundleEvents_1[_h];
+                                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_5 = refundEvents_1[_f];
-                                executedRefund = (0, EventUtils_1.spreadEventWithBlockNumber)(event_5);
-                                this.relayerRefundExecutions.push(executedRefund);
+                            refundEvents = ((_c = queryResults[eventsToQuery.indexOf("ExecutedRelayerRefundRoot")]) !== null && _c !== void 0 ? _c : []);
+                            for (_j = 0, refundEvents_1 = refundEvents; _j < refundEvents_1.length; _j++) {
+                                event_5 = refundEvents_1[_j];
+                                this.relayerRefundExecutions.push(event_5);
                             }
                         }
                         if (duplicateEvents.length > 0) {
@@ -412,12 +408,12 @@ var SpokePoolClient = (function (_super) {
                             this.log("error", "Duplicate events detected, check debug logs");
                         }
                         this.currentTime = currentTime;
-                        this.latestBlockSearched = searchEndBlock;
-                        this.firstBlockToSearch = searchEndBlock + 1;
-                        this.eventSearchConfig.toBlock = undefined;
+                        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!"), {
-                            nextFirstBlockToSearch: this.firstBlockToSearch,
+                            nextFirstHeightToSearch: this.firstHeightToSearch,
                         });
                         return [2];
                 }