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

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

@@ -10,61 +10,61 @@ export declare const SortableEventSS: {
 };
 export declare const BundleDataSS: import("superstruct").Struct<{
     bundleDepositsV3: Record<string, Record<string, {
-        depositId: BigNumber;
-        fromLiteChain: boolean;
-        toLiteChain: boolean;
+        blockNumber: number;
+        logIndex: number;
+        message: string;
+        originChainId: number;
+        inputToken: string;
+        inputAmount: BigNumber;
+        quoteTimestamp: number;
         messageHash: string;
         destinationChainId: number;
-        quoteTimestamp: number;
-        originChainId: number;
+        fromLiteChain: boolean;
+        toLiteChain: boolean;
         depositor: string;
         recipient: string;
-        inputToken: string;
-        inputAmount: BigNumber;
+        depositId: BigNumber;
         outputToken: string;
         outputAmount: BigNumber;
-        message: string;
         fillDeadline: number;
         exclusiveRelayer: string;
         exclusivityDeadline: number;
-        blockNumber: number;
-        logIndex: number;
         quoteBlockNumber: number;
+        txnIndex?: number | undefined;
+        txnRef?: string | undefined;
         speedUpSignature?: string | undefined;
         updatedRecipient?: string | undefined;
         updatedOutputAmount?: BigNumber | undefined;
         updatedMessage?: string | undefined;
-        txnIndex?: number | undefined;
-        txnRef?: string | undefined;
         transactionHash?: string | undefined;
         transactionIndex?: number | undefined;
         relayerFeePct?: BigNumber | undefined;
     }[]>>;
     bundleFillsV3: Record<string, Record<string, {
         fills: {
-            depositId: BigNumber;
+            blockNumber: number;
+            logIndex: number;
+            originChainId: number;
+            inputToken: string;
+            inputAmount: BigNumber;
+            quoteTimestamp: number;
             messageHash: string;
             destinationChainId: number;
-            quoteTimestamp: number;
-            originChainId: number;
             depositor: string;
             recipient: string;
-            inputToken: string;
-            inputAmount: BigNumber;
+            depositId: BigNumber;
             outputToken: string;
             outputAmount: BigNumber;
             fillDeadline: number;
             exclusiveRelayer: string;
             exclusivityDeadline: number;
-            blockNumber: number;
-            logIndex: number;
-            repaymentChainId: number;
             relayer: string;
+            repaymentChainId: number;
             lpFeePct: BigNumber;
             relayExecutionInfo: {
-                fillType: number;
                 updatedRecipient: string;
                 updatedOutputAmount: BigNumber;
+                fillType: number;
                 updatedMessageHash: string;
                 updatedMessage?: string | undefined;
             };
@@ -79,252 +79,252 @@ export declare const BundleDataSS: import("superstruct").Struct<{
         totalRefundAmount: BigNumber;
     }>>;
     bundleSlowFillsV3: Record<string, Record<string, {
-        depositId: BigNumber;
-        fromLiteChain: boolean;
-        toLiteChain: boolean;
+        blockNumber: number;
+        logIndex: number;
+        message: string;
+        originChainId: number;
+        inputToken: string;
+        inputAmount: BigNumber;
+        quoteTimestamp: number;
         messageHash: string;
         destinationChainId: number;
-        quoteTimestamp: number;
-        originChainId: number;
+        fromLiteChain: boolean;
+        toLiteChain: boolean;
         depositor: string;
         recipient: string;
-        inputToken: string;
-        inputAmount: BigNumber;
+        depositId: BigNumber;
         outputToken: string;
         outputAmount: BigNumber;
-        message: string;
         fillDeadline: number;
         exclusiveRelayer: string;
         exclusivityDeadline: number;
-        blockNumber: number;
-        logIndex: number;
         quoteBlockNumber: number;
         lpFeePct: BigNumber;
+        txnIndex?: number | undefined;
+        txnRef?: string | undefined;
         speedUpSignature?: string | undefined;
         updatedRecipient?: string | undefined;
         updatedOutputAmount?: BigNumber | undefined;
         updatedMessage?: string | undefined;
-        txnIndex?: number | undefined;
-        txnRef?: string | undefined;
         transactionHash?: string | undefined;
         transactionIndex?: number | undefined;
         relayerFeePct?: BigNumber | undefined;
     }[]>>;
     expiredDepositsToRefundV3: Record<string, Record<string, {
-        depositId: BigNumber;
-        fromLiteChain: boolean;
-        toLiteChain: boolean;
+        blockNumber: number;
+        logIndex: number;
+        message: string;
+        originChainId: number;
+        inputToken: string;
+        inputAmount: BigNumber;
+        quoteTimestamp: number;
         messageHash: string;
         destinationChainId: number;
-        quoteTimestamp: number;
-        originChainId: number;
+        fromLiteChain: boolean;
+        toLiteChain: boolean;
         depositor: string;
         recipient: string;
-        inputToken: string;
-        inputAmount: BigNumber;
+        depositId: BigNumber;
         outputToken: string;
         outputAmount: BigNumber;
-        message: string;
         fillDeadline: number;
         exclusiveRelayer: string;
         exclusivityDeadline: number;
-        blockNumber: number;
-        logIndex: number;
         quoteBlockNumber: number;
+        txnIndex?: number | undefined;
+        txnRef?: string | undefined;
         speedUpSignature?: string | undefined;
         updatedRecipient?: string | undefined;
         updatedOutputAmount?: BigNumber | undefined;
         updatedMessage?: string | undefined;
-        txnIndex?: number | undefined;
-        txnRef?: string | undefined;
         transactionHash?: string | undefined;
         transactionIndex?: number | undefined;
         relayerFeePct?: BigNumber | undefined;
     }[]>>;
     unexecutableSlowFills: Record<string, Record<string, {
-        depositId: BigNumber;
-        fromLiteChain: boolean;
-        toLiteChain: boolean;
+        blockNumber: number;
+        logIndex: number;
+        message: string;
+        originChainId: number;
+        inputToken: string;
+        inputAmount: BigNumber;
+        quoteTimestamp: number;
         messageHash: string;
         destinationChainId: number;
-        quoteTimestamp: number;
-        originChainId: number;
+        fromLiteChain: boolean;
+        toLiteChain: boolean;
         depositor: string;
         recipient: string;
-        inputToken: string;
-        inputAmount: BigNumber;
+        depositId: BigNumber;
         outputToken: string;
         outputAmount: BigNumber;
-        message: string;
         fillDeadline: number;
         exclusiveRelayer: string;
         exclusivityDeadline: number;
-        blockNumber: number;
-        logIndex: number;
         quoteBlockNumber: number;
         lpFeePct: BigNumber;
+        txnIndex?: number | undefined;
+        txnRef?: string | undefined;
         speedUpSignature?: string | undefined;
         updatedRecipient?: string | undefined;
         updatedOutputAmount?: BigNumber | undefined;
         updatedMessage?: string | undefined;
-        txnIndex?: number | undefined;
-        txnRef?: string | undefined;
         transactionHash?: string | undefined;
         transactionIndex?: number | undefined;
         relayerFeePct?: BigNumber | undefined;
     }[]>>;
 }, {
     bundleDepositsV3: import("superstruct").Struct<Record<string, Record<string, {
-        depositId: BigNumber;
-        fromLiteChain: boolean;
-        toLiteChain: boolean;
+        blockNumber: number;
+        logIndex: number;
+        message: string;
+        originChainId: number;
+        inputToken: string;
+        inputAmount: BigNumber;
+        quoteTimestamp: number;
         messageHash: string;
         destinationChainId: number;
-        quoteTimestamp: number;
-        originChainId: number;
+        fromLiteChain: boolean;
+        toLiteChain: boolean;
         depositor: string;
         recipient: string;
-        inputToken: string;
-        inputAmount: BigNumber;
+        depositId: BigNumber;
         outputToken: string;
         outputAmount: BigNumber;
-        message: string;
         fillDeadline: number;
         exclusiveRelayer: string;
         exclusivityDeadline: number;
-        blockNumber: number;
-        logIndex: number;
         quoteBlockNumber: number;
+        txnIndex?: number | undefined;
+        txnRef?: string | undefined;
         speedUpSignature?: string | undefined;
         updatedRecipient?: string | undefined;
         updatedOutputAmount?: BigNumber | undefined;
         updatedMessage?: string | undefined;
-        txnIndex?: number | undefined;
-        txnRef?: string | undefined;
         transactionHash?: string | undefined;
         transactionIndex?: number | undefined;
         relayerFeePct?: BigNumber | undefined;
     }[]>>, null>;
     expiredDepositsToRefundV3: import("superstruct").Struct<Record<string, Record<string, {
-        depositId: BigNumber;
-        fromLiteChain: boolean;
-        toLiteChain: boolean;
+        blockNumber: number;
+        logIndex: number;
+        message: string;
+        originChainId: number;
+        inputToken: string;
+        inputAmount: BigNumber;
+        quoteTimestamp: number;
         messageHash: string;
         destinationChainId: number;
-        quoteTimestamp: number;
-        originChainId: number;
+        fromLiteChain: boolean;
+        toLiteChain: boolean;
         depositor: string;
         recipient: string;
-        inputToken: string;
-        inputAmount: BigNumber;
+        depositId: BigNumber;
         outputToken: string;
         outputAmount: BigNumber;
-        message: string;
         fillDeadline: number;
         exclusiveRelayer: string;
         exclusivityDeadline: number;
-        blockNumber: number;
-        logIndex: number;
         quoteBlockNumber: number;
+        txnIndex?: number | undefined;
+        txnRef?: string | undefined;
         speedUpSignature?: string | undefined;
         updatedRecipient?: string | undefined;
         updatedOutputAmount?: BigNumber | undefined;
         updatedMessage?: string | undefined;
-        txnIndex?: number | undefined;
-        txnRef?: string | undefined;
         transactionHash?: string | undefined;
         transactionIndex?: number | undefined;
         relayerFeePct?: BigNumber | undefined;
     }[]>>, null>;
     unexecutableSlowFills: import("superstruct").Struct<Record<string, Record<string, {
-        depositId: BigNumber;
-        fromLiteChain: boolean;
-        toLiteChain: boolean;
+        blockNumber: number;
+        logIndex: number;
+        message: string;
+        originChainId: number;
+        inputToken: string;
+        inputAmount: BigNumber;
+        quoteTimestamp: number;
         messageHash: string;
         destinationChainId: number;
-        quoteTimestamp: number;
-        originChainId: number;
+        fromLiteChain: boolean;
+        toLiteChain: boolean;
         depositor: string;
         recipient: string;
-        inputToken: string;
-        inputAmount: BigNumber;
+        depositId: BigNumber;
         outputToken: string;
         outputAmount: BigNumber;
-        message: string;
         fillDeadline: number;
         exclusiveRelayer: string;
         exclusivityDeadline: number;
-        blockNumber: number;
-        logIndex: number;
         quoteBlockNumber: number;
         lpFeePct: BigNumber;
+        txnIndex?: number | undefined;
+        txnRef?: string | undefined;
         speedUpSignature?: string | undefined;
         updatedRecipient?: string | undefined;
         updatedOutputAmount?: BigNumber | undefined;
         updatedMessage?: string | undefined;
-        txnIndex?: number | undefined;
-        txnRef?: string | undefined;
         transactionHash?: string | undefined;
         transactionIndex?: number | undefined;
         relayerFeePct?: BigNumber | undefined;
     }[]>>, null>;
     bundleSlowFillsV3: import("superstruct").Struct<Record<string, Record<string, {
-        depositId: BigNumber;
-        fromLiteChain: boolean;
-        toLiteChain: boolean;
+        blockNumber: number;
+        logIndex: number;
+        message: string;
+        originChainId: number;
+        inputToken: string;
+        inputAmount: BigNumber;
+        quoteTimestamp: number;
         messageHash: string;
         destinationChainId: number;
-        quoteTimestamp: number;
-        originChainId: number;
+        fromLiteChain: boolean;
+        toLiteChain: boolean;
         depositor: string;
         recipient: string;
-        inputToken: string;
-        inputAmount: BigNumber;
+        depositId: BigNumber;
         outputToken: string;
         outputAmount: BigNumber;
-        message: string;
         fillDeadline: number;
         exclusiveRelayer: string;
         exclusivityDeadline: number;
-        blockNumber: number;
-        logIndex: number;
         quoteBlockNumber: number;
         lpFeePct: BigNumber;
+        txnIndex?: number | undefined;
+        txnRef?: string | undefined;
         speedUpSignature?: string | undefined;
         updatedRecipient?: string | undefined;
         updatedOutputAmount?: BigNumber | undefined;
         updatedMessage?: string | undefined;
-        txnIndex?: number | undefined;
-        txnRef?: string | undefined;
         transactionHash?: string | undefined;
         transactionIndex?: number | undefined;
         relayerFeePct?: BigNumber | undefined;
     }[]>>, null>;
     bundleFillsV3: import("superstruct").Struct<Record<string, Record<string, {
         fills: {
-            depositId: BigNumber;
+            blockNumber: number;
+            logIndex: number;
+            originChainId: number;
+            inputToken: string;
+            inputAmount: BigNumber;
+            quoteTimestamp: number;
             messageHash: string;
             destinationChainId: number;
-            quoteTimestamp: number;
-            originChainId: number;
             depositor: string;
             recipient: string;
-            inputToken: string;
-            inputAmount: BigNumber;
+            depositId: BigNumber;
             outputToken: string;
             outputAmount: BigNumber;
             fillDeadline: number;
             exclusiveRelayer: string;
             exclusivityDeadline: number;
-            blockNumber: number;
-            logIndex: number;
-            repaymentChainId: number;
             relayer: string;
+            repaymentChainId: number;
             lpFeePct: BigNumber;
             relayExecutionInfo: {
-                fillType: number;
                 updatedRecipient: string;
                 updatedOutputAmount: BigNumber;
+                fillType: number;
                 updatedMessageHash: string;
                 updatedMessage?: string | undefined;
             };

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

@@ -1,8 +1,7 @@
 import { Contract, EventFilter } from "ethers";
 import winston from "winston";
 import { CachingMechanismInterface, CancelledRootBundle, CrossChainContractsSet, Deposit, DepositWithBlock, DestinationTokenWithBlock, DisputedRootBundle, ExecutedRootBundle, L1Token, Log, LpToken, PendingRootBundle, ProposedRootBundle, RealizedLpFee, TokenRunningBalance } from "../interfaces";
-import { EVMBlockFinder } from "../arch/evm";
-import { BigNumber, EventSearchConfig, MakeOptional } from "../utils";
+import { BigNumber, BlockFinder, EventSearchConfig, MakeOptional } from "../utils";
 import { AcrossConfigStoreClient as ConfigStoreClient } from "./AcrossConfigStoreClient/AcrossConfigStoreClient";
 import { BaseAbstractClient, UpdateFailureReason } from "./BaseAbstractClient";
 type HubPoolUpdateSuccess = {
@@ -56,8 +55,8 @@ export declare class HubPoolClient extends BaseAbstractClient {
     };
     protected pendingRootBundle: PendingRootBundle | undefined;
     currentTime: number | undefined;
-    readonly blockFinder: EVMBlockFinder;
-    constructor(logger: winston.Logger, hubPool: Contract, configStoreClient: ConfigStoreClient, deploymentBlock?: number, chainId?: number, eventSearchConfig?: MakeOptional<EventSearchConfig, "to">, configOverride?: {
+    readonly blockFinder: BlockFinder;
+    constructor(logger: winston.Logger, hubPool: Contract, configStoreClient: ConfigStoreClient, deploymentBlock?: number, chainId?: number, eventSearchConfig?: MakeOptional<EventSearchConfig, "toBlock">, configOverride?: {
         ignoredHubExecutedBundles: number[];
         ignoredHubProposedBundles: number[];
         timeToCache?: number;

package/dist/cjs/clients/HubPoolClient.js

@@ -6,7 +6,6 @@ var assert_1 = tslib_1.__importDefault(require("assert"));
 var lodash_1 = tslib_1.__importDefault(require("lodash"));
 var constants_1 = require("../constants");
 var lpFeeCalculator = tslib_1.__importStar(require("../lpFeeCalculator"));
-var evm_1 = require("../arch/evm");
 var utils_1 = require("../utils");
 var BaseAbstractClient_1 = require("./BaseAbstractClient");
 var HubPoolClient = (function (_super) {
@@ -14,7 +13,7 @@ var HubPoolClient = (function (_super) {
     function HubPoolClient(logger, hubPool, configStoreClient, deploymentBlock, chainId, eventSearchConfig, configOverride, cachingMechanism) {
         if (deploymentBlock === void 0) { deploymentBlock = 0; }
         if (chainId === void 0) { chainId = 1; }
-        if (eventSearchConfig === void 0) { eventSearchConfig = { from: 0, maxLookBack: 0 }; }
+        if (eventSearchConfig === void 0) { eventSearchConfig = { fromBlock: 0, maxBlockLookBack: 0 }; }
         if (configOverride === void 0) { configOverride = {
             ignoredHubExecutedBundles: [],
             ignoredHubProposedBundles: [],
@@ -35,10 +34,10 @@ var HubPoolClient = (function (_super) {
         _this.executedRootBundles = [];
         _this.crossChainContracts = {};
         _this.l1TokensToDestinationTokensWithBlock = {};
-        _this.latestHeightSearched = Math.min(deploymentBlock - 1, 0);
-        _this.firstHeightToSearch = eventSearchConfig.from;
+        _this.latestBlockSearched = Math.min(deploymentBlock - 1, 0);
+        _this.firstBlockToSearch = eventSearchConfig.fromBlock;
         var provider = _this.hubPool.provider;
-        _this.blockFinder = new evm_1.EVMBlockFinder(provider);
+        _this.blockFinder = new utils_1.BlockFinder(provider);
         return _this;
     }
     HubPoolClient.prototype.hubPoolEventFilters = function () {
@@ -137,7 +136,7 @@ var HubPoolClient = (function (_super) {
         return l2Token !== undefined;
     };
     HubPoolClient.prototype.l2TokenHasPoolRebalanceRoute = function (l2Token, l2ChainId, hubPoolBlock) {
-        if (hubPoolBlock === void 0) { hubPoolBlock = this.latestHeightSearched; }
+        if (hubPoolBlock === void 0) { hubPoolBlock = this.latestBlockSearched; }
         return Object.values(this.l1TokensToDestinationTokensWithBlock).some(function (destinationTokenMapping) {
             return Object.entries(destinationTokenMapping).some(function (_a) {
                 var _l2ChainId = _a[0], setPoolRebalanceRouteEvents = _a[1];
@@ -195,7 +194,7 @@ var HubPoolClient = (function (_super) {
             return tslib_1.__generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
-                        if (!((_a = this.latestHeightSearched) !== null && _a !== void 0)) return [3, 1];
+                        if (!((_a = this.latestBlockSearched) !== null && _a !== void 0)) return [3, 1];
                         _b = _a;
                         return [3, 3];
                     case 1: return [4, this.hubPool.provider.getBlockNumber()];
@@ -408,7 +407,7 @@ var HubPoolClient = (function (_super) {
         return this.lpTokens[l1Token];
     };
     HubPoolClient.prototype.areTokensEquivalent = function (tokenA, chainIdA, tokenB, chainIdB, hubPoolBlock) {
-        if (hubPoolBlock === void 0) { hubPoolBlock = this.latestHeightSearched; }
+        if (hubPoolBlock === void 0) { hubPoolBlock = this.latestBlockSearched; }
         if (!this.l2TokenHasPoolRebalanceRoute(tokenA, chainIdA, hubPoolBlock) ||
             !this.l2TokenHasPoolRebalanceRoute(tokenB, chainIdB, hubPoolBlock)) {
             return false;
@@ -522,12 +521,12 @@ var HubPoolClient = (function (_super) {
         if (n === 0) {
             throw new Error("n cannot be 0");
         }
-        if (!this.latestHeightSearched) {
+        if (!this.latestBlockSearched) {
             throw new Error("HubPoolClient::getNthFullyExecutedRootBundle client not updated");
         }
         var bundleToReturn;
         if (n < 0) {
-            var nextLatestMainnetBlock = startBlock !== null && startBlock !== void 0 ? startBlock : this.latestHeightSearched;
+            var nextLatestMainnetBlock = startBlock !== null && startBlock !== void 0 ? startBlock : this.latestBlockSearched;
             for (var i = 0; i < Math.abs(n); i++) {
                 bundleToReturn = this.getLatestFullyExecutedRootBundle(nextLatestMainnetBlock);
                 var bundleBlockNumber = bundleToReturn ? bundleToReturn.blockNumber : 0;
@@ -537,9 +536,9 @@ var HubPoolClient = (function (_super) {
         else {
             var nextStartBlock = startBlock !== null && startBlock !== void 0 ? startBlock : 0;
             for (var i = 0; i < n; i++) {
-                bundleToReturn = this.getEarliestFullyExecutedRootBundle(this.latestHeightSearched, nextStartBlock);
+                bundleToReturn = this.getEarliestFullyExecutedRootBundle(this.latestBlockSearched, nextStartBlock);
                 var bundleBlockNumber = bundleToReturn ? bundleToReturn.blockNumber : 0;
-                nextStartBlock = Math.min(bundleBlockNumber + 1, this.latestHeightSearched);
+                nextStartBlock = Math.min(bundleBlockNumber + 1, this.latestBlockSearched);
             }
         }
         return bundleToReturn;
@@ -598,7 +597,7 @@ var HubPoolClient = (function (_super) {
                             var _searchConfig = tslib_1.__assign({}, searchConfig);
                             var overrideEvents = ["CrossChainContractsSet", "L1TokenEnabledForLiquidityProvision", "SetPoolRebalanceRoute"];
                             if (overrideEvents.includes(eventName) && !_this.isUpdated) {
-                                _searchConfig.from = _this.deploymentBlock;
+                                _searchConfig.fromBlock = _this.deploymentBlock;
                             }
                             return {
                                 eventName: eventName,
@@ -618,7 +617,7 @@ var HubPoolClient = (function (_super) {
                         hubPool = this.hubPool;
                         multicallFunctions = ["getCurrentTime", "rootBundleProposal"];
                         return [4, Promise.all(tslib_1.__spreadArray([
-                                hubPool.callStatic.multicall(multicallFunctions.map(function (f) { return hubPool.interface.encodeFunctionData(f); }), { blockTag: searchConfig.to })
+                                hubPool.callStatic.multicall(multicallFunctions.map(function (f) { return hubPool.interface.encodeFunctionData(f); }), { blockTag: searchConfig.toBlock })
                             ], eventSearchConfigs.map(function (config) { return (0, utils_1.paginatedEventQuery)(hubPool, config.filter, config.searchConfig); }), true))];
                     case 2:
                         _a = _c.sent(), multicallOutput = _a[0], events = _a.slice(1);
@@ -635,7 +634,7 @@ var HubPoolClient = (function (_super) {
                                 success: true,
                                 currentTime: currentTime,
                                 pendingRootBundleProposal: pendingRootBundleProposal,
-                                searchEndBlock: searchConfig.to,
+                                searchEndBlock: searchConfig.toBlock,
                                 events: _events,
                             }];
                 }
@@ -810,9 +809,9 @@ var HubPoolClient = (function (_super) {
                             }
                         }
                         this.currentTime = currentTime;
-                        this.latestHeightSearched = searchEndBlock;
-                        this.firstHeightToSearch = update.searchEndBlock + 1;
-                        this.eventSearchConfig.to = undefined;
+                        this.latestBlockSearched = searchEndBlock;
+                        this.firstBlockToSearch = update.searchEndBlock + 1;
+                        this.eventSearchConfig.toBlock = undefined;
                         this.isUpdated = true;
                         this.logger.debug({ at: "HubPoolClient::update", message: "HubPool client updated!", searchEndBlock: searchEndBlock });
                         return [2];