@across-protocol/sdk 4.2.2-alpha.0 → 4.2.2

package/dist/esm/arch/svm/BlockUtils.js

@@ -0,0 +1,208 @@
+var _a;
+import { __awaiter, __extends, __generator } from "tslib";
+import assert from "assert";
+import { clamp, sortedIndexBy } from "lodash";
+import { BlockFinder, } from "../../utils/BlockFinder";
+import { isDefined } from "../../utils/TypeGuards";
+import { getCurrentTime } from "../../utils/TimeUtils";
+import { CHAIN_IDs } from "../../constants";
+var now = getCurrentTime();
+var averageBlockTimes = (_a = {},
+    _a[CHAIN_IDs.SOLANA] = { average: 0.4, timestamp: now, blockRange: 1 },
+    _a);
+/**
+ * @description Compute the average slot time over a slot range.
+ * @dev Solana slots are all defined to be ~400ms away from each other += a small deviation, so we can hardcode this.
+ * @returns Average number of seconds per slot
+ */
+export function averageBlockTime(_provider, _opts) {
+    if (_opts === void 0) { _opts = {}; }
+    // @todo This may need to be expanded to work without assuming that chainId = CHAIN_IDs.SOLANA.
+    return averageBlockTimes[CHAIN_IDs.SOLANA];
+}
+function estimateBlocksElapsed(seconds, cushionPercentage, provider) {
+    if (cushionPercentage === void 0) { cushionPercentage = 0.0; }
+    return __awaiter(this, void 0, void 0, function () {
+        var cushionMultiplier, average;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    cushionMultiplier = cushionPercentage + 1.0;
+                    return [4 /*yield*/, averageBlockTime(provider)];
+                case 1:
+                    average = (_a.sent()).average;
+                    return [2 /*return*/, Math.floor((seconds * cushionMultiplier) / average)];
+            }
+        });
+    });
+}
+var SVMBlockFinder = /** @class */ (function (_super) {
+    __extends(SVMBlockFinder, _super);
+    function SVMBlockFinder(provider, blocks) {
+        if (blocks === void 0) { blocks = []; }
+        var _this = _super.call(this) || this;
+        _this.provider = provider;
+        _this.blocks = blocks;
+        return _this;
+    }
+    /**
+     * @notice Gets the latest slot whose timestamp is <= the provided timestamp.
+     * @param number Timestamp timestamp to search.
+     * @param hints Optional low and high slot to bound the search space.
+     */
+    SVMBlockFinder.prototype.getBlockForTimestamp = function (timestamp, hints) {
+        if (hints === void 0) { hints = {}; }
+        return __awaiter(this, void 0, void 0, function () {
+            var block, initialBlock, cushion, incrementDistance, _a, _b, multiplier, distance, blockNumber, block, index;
+            var _this = this;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        timestamp = Number(timestamp);
+                        assert(timestamp !== undefined && timestamp !== null, "timestamp must be provided");
+                        if (!(this.blocks.length === 0 || this.blocks[this.blocks.length - 1].timestamp < timestamp)) return [3 /*break*/, 2];
+                        return [4 /*yield*/, this.getLatestBlock()];
+                    case 1:
+                        block = _c.sent();
+                        if (timestamp >= block.timestamp)
+                            return [2 /*return*/, block];
+                        _c.label = 2;
+                    case 2: 
+                    // Prime the BlockFinder cache with any supplied hints.
+                    // If the hint is accurate, then this will bypass the subsequent estimation.
+                    return [4 /*yield*/, Promise.all(Object.values(hints)
+                            .filter(isDefined)
+                            .map(function (blockNumber) { return _this.getBlock(blockNumber); }))];
+                    case 3:
+                        // Prime the BlockFinder cache with any supplied hints.
+                        // If the hint is accurate, then this will bypass the subsequent estimation.
+                        _c.sent();
+                        if (!(this.blocks[0].timestamp > timestamp)) return [3 /*break*/, 8];
+                        initialBlock = this.blocks[0];
+                        cushion = 1;
+                        _b = (_a = Math).max;
+                        // Ensure the increment slot distance is _at least_ a single slot to prevent an infinite loop.
+                        return [4 /*yield*/, estimateBlocksElapsed(initialBlock.timestamp - timestamp, cushion, this.provider)];
+                    case 4:
+                        incrementDistance = _b.apply(_a, [
+                            // Ensure the increment slot distance is _at least_ a single slot to prevent an infinite loop.
+                            _c.sent(), 1]);
+                        multiplier = 1;
+                        _c.label = 5;
+                    case 5:
+                        distance = multiplier * incrementDistance;
+                        blockNumber = Math.max(0, initialBlock.number - distance);
+                        return [4 /*yield*/, this.getBlock(blockNumber)];
+                    case 6:
+                        block = _c.sent();
+                        if (block.timestamp <= timestamp)
+                            return [3 /*break*/, 8]; // Found an earlier block.
+                        assert(blockNumber > 0, "timestamp is before block 0");
+                        _c.label = 7;
+                    case 7:
+                        multiplier++;
+                        return [3 /*break*/, 5];
+                    case 8:
+                        index = sortedIndexBy(this.blocks, { timestamp: timestamp }, "timestamp");
+                        return [2 /*return*/, this.findBlock(this.blocks[index - 1], this.blocks[index], timestamp)];
+                }
+            });
+        });
+    };
+    // Grabs the most recent slot and caches it.
+    SVMBlockFinder.prototype.getLatestBlock = function () {
+        var _a;
+        return __awaiter(this, void 0, void 0, function () {
+            var latestSlot, estimatedSlotTime, block, index;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0: return [4 /*yield*/, this.provider.getSlot().send()];
+                    case 1:
+                        latestSlot = _b.sent();
+                        return [4 /*yield*/, this.provider.getBlockTime(latestSlot).send()];
+                    case 2:
+                        estimatedSlotTime = _b.sent();
+                        block = {
+                            timestamp: Number(estimatedSlotTime),
+                            number: Number(latestSlot),
+                        };
+                        index = sortedIndexBy(this.blocks, block, "number");
+                        if (((_a = this.blocks[index]) === null || _a === void 0 ? void 0 : _a.number) !== block.number)
+                            this.blocks.splice(index, 0, block);
+                        return [2 /*return*/, this.blocks[index]];
+                }
+            });
+        });
+    };
+    // Grabs the slot for a particular number and caches it.
+    SVMBlockFinder.prototype.getBlock = function (number) {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function () {
+            var index, estimatedSlotTime, block;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        index = sortedIndexBy(this.blocks, { number: number }, "number");
+                        if (((_a = this.blocks[index]) === null || _a === void 0 ? void 0 : _a.number) === number)
+                            return [2 /*return*/, this.blocks[index]]; // Return early if block already exists.
+                        return [4 /*yield*/, this.provider.getBlockTime(BigInt(number)).send()];
+                    case 1:
+                        estimatedSlotTime = _c.sent();
+                        block = {
+                            timestamp: Number(estimatedSlotTime),
+                            number: number,
+                        };
+                        // Recompute the index after the async call since the state of this.blocks could have changed!
+                        index = sortedIndexBy(this.blocks, { number: number }, "number");
+                        // Rerun this check to avoid duplicate insertion.
+                        if (((_b = this.blocks[index]) === null || _b === void 0 ? void 0 : _b.number) === number)
+                            return [2 /*return*/, this.blocks[index]];
+                        this.blocks.splice(index, 0, block); // A simple insert at index.
+                        return [2 /*return*/, block];
+                }
+            });
+        });
+    };
+    // Return the latest slot, between startSlot and endSlot, whose timestamp is <= timestamp.
+    // Effectively, this is an interpolation search algorithm to minimize slot requests.
+    // Note: startSlot and endSlot _must_ be different slots.
+    SVMBlockFinder.prototype.findBlock = function (_startSlot, _endSlot, timestamp) {
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, startBlock, endBlock, totalTimeDifference, totalBlockDistance, blockPercentile, estimatedBlock, newBlock;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = [_startSlot, _endSlot], startBlock = _a[0], endBlock = _a[1];
+                        // In the case of equality, the endBlock is expected to be passed as the one whose timestamp === the requested
+                        // timestamp.
+                        if (endBlock.timestamp === timestamp)
+                            return [2 /*return*/, endBlock];
+                        // If there's no equality, but the blocks are adjacent, return the startBlock, since we want the returned slot's
+                        // timestamp to be <= the requested timestamp.
+                        if (endBlock.number === startBlock.number + 1)
+                            return [2 /*return*/, startBlock];
+                        assert(endBlock.number !== startBlock.number, "startBlock cannot equal endBlock");
+                        assert(timestamp < endBlock.timestamp && timestamp > startBlock.timestamp, "timestamp not in between start and end blocks");
+                        totalTimeDifference = endBlock.timestamp - startBlock.timestamp;
+                        totalBlockDistance = endBlock.number - startBlock.number;
+                        blockPercentile = (timestamp - startBlock.timestamp) / totalTimeDifference;
+                        estimatedBlock = startBlock.number + Math.round(blockPercentile * totalBlockDistance);
+                        return [4 /*yield*/, this.getBlock(clamp(estimatedBlock, startBlock.number + 1, endBlock.number - 1))];
+                    case 1:
+                        newBlock = _b.sent();
+                        // Depending on whether the new slot is below or above the timestamp, narrow the search space accordingly.
+                        if (newBlock.timestamp < timestamp) {
+                            return [2 /*return*/, this.findBlock(newBlock, endBlock, timestamp)];
+                        }
+                        else {
+                            return [2 /*return*/, this.findBlock(startBlock, newBlock, timestamp)];
+                        }
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    return SVMBlockFinder;
+}(BlockFinder));
+export { SVMBlockFinder };
+//# sourceMappingURL=BlockUtils.js.map

package/dist/esm/arch/svm/BlockUtils.js.map

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

package/dist/esm/arch/svm/index.d.ts

@@ -3,3 +3,4 @@ export * from "./SpokeUtils";
 export * from "./types";
 export * from "./utils";
 export * from "./constants";
+export * from "./BlockUtils";

package/dist/esm/arch/svm/index.js

@@ -3,4 +3,5 @@ export * from "./SpokeUtils";
 export * from "./types";
 export * from "./utils";
 export * from "./constants";
+export * from "./BlockUtils";
 //# sourceMappingURL=index.js.map

package/dist/esm/arch/svm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/arch/svm/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/arch/svm/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC"}

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

@@ -6,7 +6,7 @@ import { findFillEvent as findEvmFillEvent } from "../../arch/evm";
 import { findFillEvent as findSvmFillEvent } from "../../arch/svm";
 import { BigNumber, bnZero, queryHistoricalDepositForFill, assign, fixedPointAdjustment, isDefined, toBN, forEachAsync, getBlockRangeForChain, getImpliedBundleBlockRanges, getRelayEventKey, isSlowFill, mapAsync, bnUint32Max, isZeroValueDeposit, isZeroValueFillOrSlowFillRequest, chainIsEvm, isValidEvmAddress, duplicateEvent, invalidOutputToken, } from "../../utils";
 import { BundleDataSS, getEndBlockBuffers, getRefundInformationFromFill, getRefundsFromBundle, getWidestPossibleExpectedBlockRange, isChainDisabled, prettyPrintV3SpokePoolEvents, verifyFillRepayment, } from "./utils";
-import { isEVMSpokePoolClient, isSvmSpokePoolClient } from "../SpokePoolClient";
+import { isEVMSpokePoolClient, isSVMSpokePoolClient } from "../SpokePoolClient";
 // max(uint256) - 1
 export var INFINITE_FILL_DEADLINE = bnUint32Max;
 // V3 dictionary helper functions
@@ -1396,7 +1396,7 @@ var BundleDataClient = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        if (!isSvmSpokePoolClient(spokePoolClient)) return [3 /*break*/, 2];
+                        if (!isSVMSpokePoolClient(spokePoolClient)) return [3 /*break*/, 2];
                         return [4 /*yield*/, findSvmFillEvent(deposit, spokePoolClient.chainId, spokePoolClient.svmEventsClient, spokePoolClient.deploymentBlock, spokePoolClient.latestHeightSearched)];
                     case 1: return [2 /*return*/, _a.sent()];
                     case 2:

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

@@ -1,6 +1,6 @@
 import { __assign, __awaiter, __extends, __generator, __spreadArray } from "tslib";
 import { fillStatusArray, findDepositBlock, getMaxFillDeadlineInRange as getMaxFillDeadline, getTimeAt as _getTimeAt, relayFillStatus, getTimestampForBlock as _getTimestampForBlock, } from "../../arch/evm";
-import { BigNumber, getNetworkName, InvalidFill, isZeroAddress, toBN, } from "../../utils";
+import { BigNumber, getNetworkName, InvalidFill, isZeroAddress, toBN, EvmAddress, } from "../../utils";
 import { logToSortableEvent, paginatedEventQuery, sortEventsAscendingInPlace, spreadEventWithBlockNumber, } from "../../utils/EventUtils";
 import { isUpdateFailureReason } from "../BaseAbstractClient";
 import { knownEventNames, SpokePoolClient } from "./SpokePoolClient";
@@ -13,6 +13,7 @@ var EVMSpokePoolClient = /** @class */ (function (_super) {
         if (eventSearchConfig === void 0) { eventSearchConfig = { from: 0, maxLookBack: 0 }; }
         var _this = _super.call(this, logger, hubPoolClient, chainId, deploymentBlock, eventSearchConfig) || this;
         _this.spokePool = spokePool;
+        _this.spokePoolAddress = EvmAddress.from(spokePool.address);
         return _this;
     }
     EVMSpokePoolClient.prototype.relayFillStatus = function (relayData, atHeight) {
@@ -162,7 +163,7 @@ var EVMSpokePoolClient = /** @class */ (function (_super) {
                         deposit.toLiteChain = this.isDestinationLiteChain(deposit);
                         this.logger.debug({
                             at: "SpokePoolClient#findDeposit",
-                            message: "Located deposit outside of SpokePoolClient's search range",
+                            message: "Located V3 deposit outside of SpokePoolClient's search range",
                             deposit: deposit,
                             elapsedMs: tStop - tStart,
                         });

package/dist/esm/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/esm/clients/SpokePoolClient/SVMSpokePoolClient.d.ts

@@ -9,7 +9,7 @@ import { SpokePoolClient, SpokePoolUpdate } from "./SpokePoolClient";
  * SvmSpokePoolClient is a client for the SVM SpokePool program. It extends the base SpokePoolClient
  * and implements the abstract methods required for interacting with an SVM Spoke Pool.
  */
-export declare class SvmSpokePoolClient extends SpokePoolClient {
+export declare class SVMSpokePoolClient extends SpokePoolClient {
     svmEventsClient: SvmCpiEventsClient;
     protected programId: Address;
     protected statePda: Address;
@@ -22,12 +22,12 @@ export declare class SvmSpokePoolClient extends SpokePoolClient {
      * Factory method to asynchronously create an instance of SvmSpokePoolClient.
      */
     static create(logger: winston.Logger, hubPoolClient: HubPoolClient | null, chainId: number, deploymentSlot: bigint, eventSearchConfig: MakeOptional<EventSearchConfig, "to"> | undefined, // Provide default
-    rpc: Rpc<SolanaRpcApiFromTransport<RpcTransport>>): Promise<SvmSpokePoolClient>;
+    rpc: Rpc<SolanaRpcApiFromTransport<RpcTransport>>): Promise<SVMSpokePoolClient>;
     /**
      * Factory method to asynchronously create an instance of SvmSpokePoolClient with an existing event client.
      */
     static createWithExistingEventClient(logger: winston.Logger, hubPoolClient: HubPoolClient | null, chainId: number, deploymentSlot: bigint, eventSearchConfig: MakeOptional<EventSearchConfig, "to"> | undefined, // Provide default
-    eventClient: SvmCpiEventsClient): Promise<SvmSpokePoolClient>;
+    eventClient: SvmCpiEventsClient): Promise<SVMSpokePoolClient>;
     _queryableEventNames(): string[];
     /**
      * Performs an update to refresh the state of this client by querying SVM events.

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

@@ -1,18 +1,18 @@
 import { __assign, __awaiter, __extends, __generator, __spreadArray } from "tslib";
 import { SVMEventNames, unwrapEventData, getFillDeadline, getTimestampForSlot, getStatePda, SvmCpiEventsClient, findDeposit, relayFillStatus, fillStatusArray, } from "../../arch/svm";
-import { InvalidFill, isZeroAddress, sortEventsAscendingInPlace, } from "../../utils";
+import { InvalidFill, isZeroAddress, sortEventsAscendingInPlace, SvmAddress, } from "../../utils";
 import { isUpdateFailureReason } from "../BaseAbstractClient";
 import { knownEventNames, SpokePoolClient } from "./SpokePoolClient";
 /**
  * SvmSpokePoolClient is a client for the SVM SpokePool program. It extends the base SpokePoolClient
  * and implements the abstract methods required for interacting with an SVM Spoke Pool.
  */
-var SvmSpokePoolClient = /** @class */ (function (_super) {
-    __extends(SvmSpokePoolClient, _super);
+var SVMSpokePoolClient = /** @class */ (function (_super) {
+    __extends(SVMSpokePoolClient, _super);
     /**
      * Protected constructor. Use the async create() method to instantiate.
      */
-    function SvmSpokePoolClient(logger, hubPoolClient, chainId, deploymentSlot, // Using slot instead of block number for SVM
+    function SVMSpokePoolClient(logger, hubPoolClient, chainId, deploymentSlot, // Using slot instead of block number for SVM
     eventSearchConfig, svmEventsClient, programId, statePda) {
         var _this = 
         // Convert deploymentSlot to number for base class, might need refinement
@@ -20,12 +20,13 @@ var SvmSpokePoolClient = /** @class */ (function (_super) {
         _this.svmEventsClient = svmEventsClient;
         _this.programId = programId;
         _this.statePda = statePda;
+        _this.spokePoolAddress = SvmAddress.from(programId.toString());
         return _this;
     }
     /**
      * Factory method to asynchronously create an instance of SvmSpokePoolClient.
      */
-    SvmSpokePoolClient.create = function (logger, hubPoolClient, chainId, deploymentSlot, eventSearchConfig, // Provide default
+    SVMSpokePoolClient.create = function (logger, hubPoolClient, chainId, deploymentSlot, eventSearchConfig, // Provide default
     rpc) {
         if (eventSearchConfig === void 0) { eventSearchConfig = { from: 0, maxLookBack: 0 }; }
         return __awaiter(this, void 0, void 0, function () {
@@ -39,7 +40,7 @@ var SvmSpokePoolClient = /** @class */ (function (_super) {
                         return [4 /*yield*/, getStatePda(programId)];
                     case 2:
                         statePda = _a.sent();
-                        return [2 /*return*/, new SvmSpokePoolClient(logger, hubPoolClient, chainId, deploymentSlot, eventSearchConfig, svmEventsClient, programId, statePda)];
+                        return [2 /*return*/, new SVMSpokePoolClient(logger, hubPoolClient, chainId, deploymentSlot, eventSearchConfig, svmEventsClient, programId, statePda)];
                 }
             });
         });
@@ -47,7 +48,7 @@ var SvmSpokePoolClient = /** @class */ (function (_super) {
     /**
      * Factory method to asynchronously create an instance of SvmSpokePoolClient with an existing event client.
      */
-    SvmSpokePoolClient.createWithExistingEventClient = function (logger, hubPoolClient, chainId, deploymentSlot, eventSearchConfig, // Provide default
+    SVMSpokePoolClient.createWithExistingEventClient = function (logger, hubPoolClient, chainId, deploymentSlot, eventSearchConfig, // Provide default
     eventClient) {
         if (eventSearchConfig === void 0) { eventSearchConfig = { from: 0, maxLookBack: 0 }; }
         return __awaiter(this, void 0, void 0, function () {
@@ -59,12 +60,12 @@ var SvmSpokePoolClient = /** @class */ (function (_super) {
                         return [4 /*yield*/, getStatePda(programId)];
                     case 1:
                         statePda = _a.sent();
-                        return [2 /*return*/, new SvmSpokePoolClient(logger, hubPoolClient, chainId, deploymentSlot, eventSearchConfig, eventClient, programId, statePda)];
+                        return [2 /*return*/, new SVMSpokePoolClient(logger, hubPoolClient, chainId, deploymentSlot, eventSearchConfig, eventClient, programId, statePda)];
                 }
             });
         });
     };
-    SvmSpokePoolClient.prototype._queryableEventNames = function () {
+    SVMSpokePoolClient.prototype._queryableEventNames = function () {
         // We want to take the internal event names relevant to
         // the SVM SpokePoolClient and filter them against the
         // knownEventNames list that we reference in practice
@@ -74,7 +75,7 @@ var SvmSpokePoolClient = /** @class */ (function (_super) {
     /**
      * Performs an update to refresh the state of this client by querying SVM events.
      */
-    SvmSpokePoolClient.prototype._update = function (eventsToQuery) {
+    SVMSpokePoolClient.prototype._update = function (eventsToQuery) {
         return __awaiter(this, void 0, void 0, function () {
             var searchConfig, reason, deploymentSlot, eventSearchConfigs, spokePoolAddress, timerStart, _a, currentTime, eventsQueried, errMsg;
             var _this = this;
@@ -148,13 +149,13 @@ var SvmSpokePoolClient = /** @class */ (function (_super) {
      * Retrieves the fill deadline buffer fetched from the State PDA.
      * @note This function assumes that fill deadline buffer is a constant value in svm environments.
      */
-    SvmSpokePoolClient.prototype.getMaxFillDeadlineInRange = function (_startSlot, _endSlot) {
+    SVMSpokePoolClient.prototype.getMaxFillDeadlineInRange = function (_startSlot, _endSlot) {
         return getFillDeadline(this.svmEventsClient.getRpc(), this.statePda);
     };
     /**
      * Retrieves the timestamp for a given SVM slot number.
      */
-    SvmSpokePoolClient.prototype.getTimestampForBlock = function (slot) {
+    SVMSpokePoolClient.prototype.getTimestampForBlock = function (slot) {
         return getTimestampForSlot(this.svmEventsClient.getRpc(), slot);
     };
     /**
@@ -162,13 +163,13 @@ var SvmSpokePoolClient = /** @class */ (function (_super) {
      * @note This function uses the same underlying function as getTimestampForBlock.
      *       It is kept for consistency with the EVM SpokePoolClient.
      */
-    SvmSpokePoolClient.prototype.getTimeAt = function (slot) {
+    SVMSpokePoolClient.prototype.getTimeAt = function (slot) {
         return getTimestampForSlot(this.svmEventsClient.getRpc(), slot);
     };
     /**
      * Finds a deposit based on its deposit ID on the SVM chain.
      */
-    SvmSpokePoolClient.prototype.findDeposit = function (depositId) {
+    SVMSpokePoolClient.prototype.findDeposit = function (depositId) {
         return __awaiter(this, void 0, void 0, function () {
             var deposit, _a;
             var _b, _c;
@@ -204,7 +205,7 @@ var SvmSpokePoolClient = /** @class */ (function (_super) {
     /**
      * Retrieves the fill status for a given relay data from the SVM chain.
      */
-    SvmSpokePoolClient.prototype.relayFillStatus = function (relayData, atHeight, destinationChainId) {
+    SVMSpokePoolClient.prototype.relayFillStatus = function (relayData, atHeight, destinationChainId) {
         destinationChainId !== null && destinationChainId !== void 0 ? destinationChainId : (destinationChainId = this.chainId);
         return relayFillStatus(this.programId, relayData, destinationChainId, this.svmEventsClient, atHeight);
     };
@@ -214,12 +215,12 @@ var SvmSpokePoolClient = /** @class */ (function (_super) {
      * @param atHeight The slot at which to query the fill status.
      * @returns The fill status for each of the given relay data.
      */
-    SvmSpokePoolClient.prototype.fillStatusArray = function (relayData, atHeight, destinationChainId) {
+    SVMSpokePoolClient.prototype.fillStatusArray = function (relayData, atHeight, destinationChainId) {
         // @note: deploymentBlock actually refers to the deployment slot. Also, blockTag should be a slot number.
         destinationChainId !== null && destinationChainId !== void 0 ? destinationChainId : (destinationChainId = this.chainId);
         return fillStatusArray(this.programId, relayData, destinationChainId, this.svmEventsClient, atHeight, this.logger);
     };
-    return SvmSpokePoolClient;
+    return SVMSpokePoolClient;
 }(SpokePoolClient));
-export { SvmSpokePoolClient };
+export { SVMSpokePoolClient };
 //# sourceMappingURL=SVMSpokePoolClient.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"SVMSpokePoolClient.js","sourceRoot":"","sources":["../../../../src/clients/SpokePoolClient/SVMSpokePoolClient.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SVMSpokePoolClient.js","sourceRoot":"","sources":["../../../../src/clients/SpokePoolClient/SVMSpokePoolClient.ts"],"names":[],"mappings":";AAEA,OAAO,EACL,aAAa,EACb,eAAe,EACf,eAAe,EACf,mBAAmB,EACnB,WAAW,EACX,kBAAkB,EAClB,WAAW,EACX,eAAe,EACf,eAAe,GAChB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAIL,WAAW,EACX,aAAa,EAEb,0BAA0B,EAC1B,UAAU,GACX,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAE9D,OAAO,EAAE,eAAe,EAAE,eAAe,EAAmB,MAAM,mBAAmB,CAAC;AAEtF;;;GAGG;AACH;IAAwC,sCAAe;IACrD;;OAEG;IACH,4BACE,MAAsB,EACtB,aAAmC,EACnC,OAAe,EACf,cAAsB,EAAE,6CAA6C;IACrE,iBAAwD,EACjD,eAAmC,EAChC,SAAkB,EAClB,QAAiB;QAR7B;QAUE,yEAAyE;QACzE,kBAAM,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,CAAC,cAAc,CAAC,EAAE,iBAAiB,CAAC,SAEjF;QAPQ,qBAAe,GAAf,eAAe,CAAoB;QAChC,eAAS,GAAT,SAAS,CAAS;QAClB,cAAQ,GAAR,QAAQ,CAAS;QAI3B,KAAI,CAAC,gBAAgB,GAAG,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;;IAChE,CAAC;IAED;;OAEG;IACiB,yBAAM,GAA1B,UACE,MAAsB,EACtB,aAAmC,EACnC,OAAe,EACf,cAAsB,EACtB,iBAAsF,EAAE,kBAAkB;IAC1G,GAAiD;QADjD,kCAAA,EAAA,sBAA6D,IAAI,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE;;;;;4BAG9D,qBAAM,kBAAkB,CAAC,MAAM,CAAC,GAAG,CAAC,EAAA;;wBAAtD,eAAe,GAAG,SAAoC;wBACtD,SAAS,GAAG,eAAe,CAAC,iBAAiB,EAAE,CAAC;wBACrC,qBAAM,WAAW,CAAC,SAAS,CAAC,EAAA;;wBAAvC,QAAQ,GAAG,SAA4B;wBAC7C,sBAAO,IAAI,kBAAkB,CAC3B,MAAM,EACN,aAAa,EACb,OAAO,EACP,cAAc,EACd,iBAAiB,EACjB,eAAe,EACf,SAAS,EACT,QAAQ,CACT,EAAC;;;;KACH;IAED;;OAEG;IACiB,gDAA6B,GAAjD,UACE,MAAsB,EACtB,aAAmC,EACnC,OAAe,EACf,cAAsB,EACtB,iBAAsF,EAAE,kBAAkB;IAC1G,WAA+B;QAD/B,kCAAA,EAAA,sBAA6D,IAAI,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE;;;;;;wBAGhF,SAAS,GAAG,WAAW,CAAC,iBAAiB,EAAE,CAAC;wBACjC,qBAAM,WAAW,CAAC,SAAS,CAAC,EAAA;;wBAAvC,QAAQ,GAAG,SAA4B;wBAC7C,sBAAO,IAAI,kBAAkB,CAC3B,MAAM,EACN,aAAa,EACb,OAAO,EACP,cAAc,EACd,iBAAiB,EACjB,WAAW,EACX,SAAS,EACT,QAAQ,CACT,EAAC;;;;KACH;IAEM,iDAAoB,GAA3B;QACE,uDAAuD;QACvD,sDAAsD;QACtD,qDAAqD;QACrD,IAAM,kBAAkB,GAAG,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QACxD,OAAO,kBAAkB,CAAC,MAAM,CAAC,UAAC,CAAC,IAAK,OAAA,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,EAA3B,CAA2B,CAAC,CAAC;IACvE,CAAC;IAED;;OAEG;IACa,oCAAO,GAAvB,UAAwB,aAAuB;;;;;;4BACxB,qBAAM,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,EAAA;;wBAA3E,YAAY,GAAG,SAA4D;wBACjF,IAAI,qBAAqB,CAAC,YAAY,CAAC,EAAE;4BACjC,MAAM,GAAG,YAAY,CAAC;4BAC5B,sBAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,QAAA,EAAE,EAAC;yBACnC;wBAEK,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;wBAE9C,kBAAkB,GAAG,aAAa,CAAC,GAAG,CAAC,UAAC,SAAS;4BACrD,IAAI,CAAC,KAAI,CAAC,oBAAoB,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;gCACpD,MAAM,IAAI,KAAK,CAAC,2EAAoE,SAAS,CAAE,CAAC,CAAC;6BAClG;4BAED,IAAM,aAAa,gBAAQ,YAAY,CAAE,CAAC,CAAC,eAAe;4BAE1D,8GAA8G;4BAC9G,uFAAuF;4BACvF,mGAAmG;4BACnG,IAAI,SAAS,KAAK,qBAAqB,IAAI,CAAC,KAAI,CAAC,SAAS,EAAE;gCAC1D,aAAa,CAAC,IAAI,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;6BAC7C;4BAED,OAAO,aAAkC,CAAC;wBAC5C,CAAC,CAAC,CAAC;wBAEG,gBAAgB,GAAG,IAAI,CAAC,eAAe,CAAC,iBAAiB,EAAE,CAAC;wBAElE,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,8CAAuC,IAAI,CAAC,OAAO,CAAE,EAAE;4BACvE,aAAa,eAAA;4BACb,YAAY,cAAA;4BACZ,SAAS,EAAE,gBAAgB;yBAC5B,CAAC,CAAC;wBAEG,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;wBAEU,qBAAM,OAAO,CAAC,GAAG;gCACvD,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE;+BACvE,aAAa,CAAC,GAAG,CAAC,UAAO,SAAS,EAAE,GAAG;;;;;4CAClC,MAAM,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC;4CACxB,qBAAM,IAAI,CAAC,eAAe,CAAC,WAAW,CACnD,SAA0B,EAC1B,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EACnB,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,EACjB;oDACE,KAAK,EAAE,MAAM,CAAC,WAAW;iDAC1B,CACF,EAAA;;4CAPK,MAAM,GAAG,SAOd;4CACD,sBAAO,MAAM,CAAC,GAAG,CACf,UAAC,KAAK,IAAoB,OAAA,YACxB,MAAM,EAAE,KAAK,CAAC,SAAS,EACvB,WAAW,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAC/B,QAAQ,EAAE,CAAC,EACX,QAAQ,EAAE,CAAC,IACP,eAAe,CAAC,KAAK,CAAC,IAAI,CAA6B,EAC3D,EANwB,CAMxB,CACH,EAAC;;;iCACH,CAAC,QACF,EAAA;;wBAtBI,KAAkC,SAsBtC,EAtBK,WAAW,QAAA,EAAK,aAAa,cAAA;wBAuBpC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,gDAAyC,IAAI,CAAC,OAAO,eAAK,IAAI,CAAC,GAAG,EAAE,GAAG,UAAU,QAAK,CAAC,CAAC;wBAC1G,IAAI,WAAW,GAAG,IAAI,CAAC,WAAW,EAAE;4BAC5B,MAAM,GAAG,uBAAgB,WAAW,gBAAM,IAAI,CAAC,WAAW,CAAE,CAAC;4BACnE,MAAM,IAAI,KAAK,CAAC,sCAA+B,MAAM,CAAE,CAAC,CAAC;yBAC1D;wBAED,mEAAmE;wBACnE,aAAa,CAAC,OAAO,CAAC,UAAC,MAAM,IAAK,OAAA,0BAA0B,CAAC,MAAM,CAAC,EAAlC,CAAkC,CAAC,CAAC;wBAEtE,sBAAO;gCACL,OAAO,EAAE,IAAI;gCACb,WAAW,EAAE,MAAM,CAAC,WAAW,CAAC;gCAChC,cAAc,EAAE,YAAY,CAAC,EAAE;gCAC/B,MAAM,EAAE,aAAa;6BACtB,EAAC;;;;KACH;IAED;;;OAGG;IACa,sDAAyB,GAAzC,UAA0C,UAAkB,EAAE,QAAgB;QAC5E,OAAO,eAAe,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IACvE,CAAC;IAED;;OAEG;IACa,iDAAoB,GAApC,UAAqC,IAAY;QAC/C,OAAO,mBAAmB,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC,CAAC;IAClE,CAAC;IAED;;;;OAIG;IACI,sCAAS,GAAhB,UAAiB,IAAY;QAC3B,OAAO,mBAAmB,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC,CAAC;IAClE,CAAC;IAED;;OAEG;IACU,wCAAW,GAAxB,UAAyB,SAAoB;;;;;;4BAC3B,qBAAM,WAAW,CAAC,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC,EAAA;;wBAA5D,OAAO,GAAG,SAAkD;wBAClE,IAAI,CAAC,OAAO,EAAE;4BACZ,sBAAO;oCACL,KAAK,EAAE,KAAK;oCACZ,IAAI,EAAE,WAAW,CAAC,iBAAiB;oCACnC,MAAM,EAAE,0BAAmB,SAAS,eAAY;iCACjD,EAAC;yBACH;;4BAIC,KAAK,EAAE,IAAI;;2CAEN,OAAO;;wBACQ,qBAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,EAAA;;oBAN/E,0EAA0E;oBAC1E,+BAA+B;oBAC/B,uBAEE,UAAO,sCAEL,mBAAgB,GAAE,SAAyD,EAC3E,gBAAa,GAAE,IAAI,CAAC,OAAO,EAC3B,gBAAa,GAAE,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAC9C,cAAW,GAAE,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,EACjD,cAAW,GAAE,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC;gCAC7C,CAAC,CAAC,IAAI,CAAC,6BAA6B,CAAC,OAAO,CAAC;gCAC7C,CAAC,CAAC,OAAO,CAAC,WAAW,QACxB;iCACD;;;;KACH;IAED;;OAEG;IACa,4CAAe,GAA/B,UACE,SAAoB,EACpB,QAAiB,EACjB,kBAA2B;QAE3B,kBAAkB,aAAlB,kBAAkB,cAAlB,kBAAkB,IAAlB,kBAAkB,GAAK,IAAI,CAAC,OAAO,EAAC;QACpC,OAAO,eAAe,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,EAAE,kBAAkB,EAAE,IAAI,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;IACxG,CAAC;IAED;;;;;OAKG;IACI,4CAAe,GAAtB,UACE,SAAsB,EACtB,QAAiB,EACjB,kBAA2B;QAE3B,yGAAyG;QACzG,kBAAkB,aAAlB,kBAAkB,cAAlB,kBAAkB,IAAlB,kBAAkB,GAAK,IAAI,CAAC,OAAO,EAAC;QACpC,OAAO,eAAe,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,EAAE,kBAAkB,EAAE,IAAI,CAAC,eAAe,EAAE,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACrH,CAAC;IACH,yBAAC;AAAD,CAAC,AA7OD,CAAwC,eAAe,GA6OtD"}

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

@@ -1,5 +1,5 @@
 import winston from "winston";
-import { AnyObject, BigNumber, DefaultLogLevels, DepositSearchResult, EventSearchConfig, MakeOptional } from "../../utils";
+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 { BaseAbstractClient, UpdateFailureReason } from "../BaseAbstractClient";
 import { AcrossConfigStoreClient } from "../AcrossConfigStoreClient";
@@ -53,6 +53,7 @@ export declare abstract class SpokePoolClient extends BaseAbstractClient {
     protected relayerRefundExecutions: RelayerRefundExecutionWithBlock[];
     protected configStoreClient: AcrossConfigStoreClient | undefined;
     protected invalidFills: Set<string>;
+    spokePoolAddress: Address | undefined;
     fills: {
         [OriginChainId: number]: FillWithBlock[];
     };
@@ -172,9 +173,7 @@ export declare abstract class SpokePoolClient extends BaseAbstractClient {
      * @param relayData RelayData field for the SlowFill request.
      * @returns The corresponding SlowFillRequest event if found, otherwise undefined.
      */
-    getSlowFillRequest(relayData: Omit<RelayData, "message"> & {
-        messageHash: string;
-    }): SlowFillRequestWithBlock | undefined;
+    getSlowFillRequest(relayData: RelayData): SlowFillRequestWithBlock | undefined;
     /**
      * Retrieves a list of slow fill requests for deposits from a specific origin chain ID.
      * @param originChainId The origin chain ID.

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

@@ -230,7 +230,8 @@ var SpokePoolClient = /** @class */ (function (_super) {
      * @returns The corresponding SlowFillRequest event if found, otherwise undefined.
      */
     SpokePoolClient.prototype.getSlowFillRequest = function (relayData) {
-        var hash = getRelayEventKey(__assign(__assign({}, relayData), { destinationChainId: this.chainId }));
+        var messageHash = getMessageHash(relayData.message);
+        var hash = getRelayEventKey(__assign(__assign({}, relayData), { messageHash: messageHash, destinationChainId: this.chainId }));
         return this.slowFillRequests[hash];
     };
     /**
@@ -444,7 +445,7 @@ var SpokePoolClient = /** @class */ (function (_super) {
                                 }
                             });
                         }); };
-                        _e = 0, _f = ["FundsDeposited"];
+                        _e = 0, _f = ["V3FundsDeposited", "FundsDeposited"];
                         _k.label = 2;
                     case 2:
                         if (!(_e < _f.length)) return [3 /*break*/, 5];
@@ -477,7 +478,7 @@ var SpokePoolClient = /** @class */ (function (_super) {
                             }
                         };
                         // Update deposits with speed up requests from depositor.
-                        ["RequestedSpeedUpDeposit"].forEach(function (event) {
+                        ["RequestedSpeedUpV3Deposit", "RequestedSpeedUpDeposit"].forEach(function (event) {
                             if (eventsToQuery.includes(event)) {
                                 querySpeedUpDepositEvents(event);
                             }
@@ -489,6 +490,9 @@ var SpokePoolClient = /** @class */ (function (_super) {
                             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 });
+                                if (eventName === "RequestedV3SlowFill") {
+                                    slowFillRequest.messageHash = getMessageHash(slowFillRequest.message);
+                                }
                                 var depositHash = getRelayEventKey(__assign(__assign({}, slowFillRequest), { destinationChainId: _this.chainId }));
                                 // Sanity check that this event is not a duplicate.
                                 if (_this.slowFillRequests[depositHash] !== undefined) {
@@ -498,7 +502,7 @@ var SpokePoolClient = /** @class */ (function (_super) {
                                 (_b = (_c = _this.slowFillRequests)[depositHash]) !== null && _b !== void 0 ? _b : (_c[depositHash] = slowFillRequest);
                             }
                         };
-                        ["RequestedSlowFill"].forEach(function (event) {
+                        ["RequestedV3SlowFill", "RequestedSlowFill"].forEach(function (event) {
                             if (eventsToQuery.includes(event)) {
                                 queryRequestedSlowFillEvents(event);
                             }
@@ -513,6 +517,10 @@ var SpokePoolClient = /** @class */ (function (_super) {
                             }
                             var _loop_2 = function (event_9) {
                                 var fill = __assign(__assign({}, event_9), { destinationChainId: _this.chainId });
+                                if (eventName === "FilledV3Relay") {
+                                    fill.messageHash = getMessageHash(event_9.message);
+                                    fill.relayExecutionInfo.updatedMessageHash = getMessageHash(event_9.relayExecutionInfo.updatedMessage);
+                                }
                                 // 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) {
@@ -530,7 +538,7 @@ var SpokePoolClient = /** @class */ (function (_super) {
                             }
                         };
                         // Update observed fills with ingested event data.
-                        ["FilledRelay"].forEach(function (event) {
+                        ["FilledV3Relay", "FilledRelay"].forEach(function (event) {
                             if (eventsToQuery.includes(event)) {
                                 queryFilledRelayEvents(event);
                             }