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

package/dist/esm/arch/evm/utils/wait.js

@@ -1,4 +1,3 @@
-import { __awaiter, __generator } from "tslib";
 import assert from "assert";
 import { createPublicClient, http, isAddress } from "viem";
 import { isDefined } from "../../../utils";
@@ -7,70 +6,59 @@ export var WAITFOR_FAIL;
     WAITFOR_FAIL[WAITFOR_FAIL["TIMEOUT"] = 0] = "TIMEOUT";
 })(WAITFOR_FAIL || (WAITFOR_FAIL = {}));
 export function waitFor(providerUrl, eventFilter) {
-    var provider = createPublicClient({
+    const provider = createPublicClient({
         transport: http(providerUrl),
     });
-    var address = eventFilter.address;
-    var timeout = eventFilter.timeout * 1000;
+    const { address } = eventFilter;
+    const timeout = eventFilter.timeout * 1000;
     assert(!isDefined(address) || isAddress(address));
-    return new Promise(function (resolve) {
-        var abortController = new AbortController();
-        var onLogs = function (logs) {
-            var txnRef = logs[0].transactionHash;
+    return new Promise((resolve) => {
+        const abortController = new AbortController();
+        const onLogs = (logs) => {
+            const txnRef = logs[0].transactionHash;
             abortController.abort();
-            resolve({ error: false, txnRef: txnRef });
+            resolve({ error: false, txnRef });
         };
-        var timeoutId = setTimeout(function () {
+        const timeoutId = setTimeout(() => {
             abortController.abort();
             resolve({ error: true, reason: WAITFOR_FAIL.TIMEOUT });
         }, timeout);
-        var unsub = provider.watchEvent({ address: address, onLogs: onLogs });
-        abortController.signal.addEventListener("abort", function () {
+        const unsub = provider.watchEvent({ address, onLogs });
+        abortController.signal.addEventListener("abort", () => {
             clearTimeout(timeoutId);
             unsub();
         });
     });
 }
-function run() {
-    return __awaiter(this, void 0, void 0, function () {
-        var url, event, filter, result;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    url = process.env.RPC_PROVIDER;
-                    assert(isDefined(url), "No mainnet RPC_PROVIDER defined");
-                    event = "RootBundleExecuted(uint256,uint256,uint256,address[],uint256[],int256[],int256[],address)";
-                    filter = {
-                        address: "0xc186fA914353c44b2E33eBE05f21846F1048bEda",
-                        event: event,
-                        timeout: 5400,
-                    };
-                    return [4 /*yield*/, waitFor(url, filter)];
-                case 1:
-                    result = _a.sent();
-                    if (result.error) {
-                        switch (result.reason) {
-                            case WAITFOR_FAIL.TIMEOUT:
-                                console.log("Error: timed out waiting for event");
-                                break;
-                            default:
-                                console.log("Unknown error (".concat(result.reason, ")"));
-                        }
-                        throw Error;
-                    }
-                    console.log("Event transaction hash: ".concat(result.txnRef));
-                    return [2 /*return*/];
-            }
-        });
-    });
+async function run() {
+    const { RPC_PROVIDER: url } = process.env;
+    assert(isDefined(url), "No mainnet RPC_PROVIDER defined");
+    const event = "RootBundleExecuted(uint256,uint256,uint256,address[],uint256[],int256[],int256[],address)";
+    const filter = {
+        address: "0xc186fA914353c44b2E33eBE05f21846F1048bEda",
+        event,
+        timeout: 5400,
+    };
+    const result = await waitFor(url, filter);
+    if (result.error) {
+        switch (result.reason) {
+            case WAITFOR_FAIL.TIMEOUT:
+                console.log("Error: timed out waiting for event");
+                break;
+            default:
+                console.log(`Unknown error (${result.reason})`);
+        }
+        throw Error;
+    }
+    console.log(`Event transaction hash: ${result.txnRef}`);
 }
 // Only run the CLI entry point in Node.js environments
 if (typeof window === "undefined" && require.main === module) {
     run()
-        .then(function () {
+        .then(() => {
         process.exitCode = 0;
     })
-        .catch(function () {
+        .catch(() => {
         console.error("Process errored");
         process.exitCode = 9;
     });

package/dist/esm/arch/evm/utils/wait.js.map

@@ -1 +1 @@
-{"version":3,"file":"wait.js","sourceRoot":"","sources":["../../../../../src/arch/evm/utils/wait.ts"],"names":[],"mappings":";AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,kBAAkB,EAAE,IAAI,EAAE,SAAS,EAAO,MAAM,MAAM,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,MAAM,CAAN,IAAY,YAEX;AAFD,WAAY,YAAY;IACtB,qDAAO,CAAA;AACT,CAAC,EAFW,YAAY,KAAZ,YAAY,QAEvB;AAUD,MAAM,UAAU,OAAO,CAAC,WAAmB,EAAE,WAAwB;IACnE,IAAM,QAAQ,GAAG,kBAAkB,CAAC;QAClC,SAAS,EAAE,IAAI,CAAC,WAAW,CAAC;KAC7B,CAAC,CAAC;IAEK,IAAA,OAAO,GAAK,WAAW,QAAhB,CAAiB;IAChC,IAAM,OAAO,GAAG,WAAW,CAAC,OAAO,GAAG,IAAI,CAAC;IAC3C,MAAM,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;IAElD,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO;QACzB,IAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;QAE9C,IAAM,MAAM,GAAG,UAAC,IAAW;YACzB,IAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,eAAyB,CAAC;YACjD,eAAe,CAAC,KAAK,EAAE,CAAC;YACxB,OAAO,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,QAAA,EAAE,CAAC,CAAC;QACpC,CAAC,CAAC;QAEF,IAAM,SAAS,GAAG,UAAU,CAAC;YAC3B,eAAe,CAAC,KAAK,EAAE,CAAC;YACxB,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,OAAO,EAAE,CAAC,CAAC;QACzD,CAAC,EAAE,OAAO,CAAC,CAAC;QAEZ,IAAM,KAAK,GAAG,QAAQ,CAAC,UAAU,CAAC,EAAE,OAAO,SAAA,EAAE,MAAM,QAAA,EAAE,CAAC,CAAC;QAEvD,eAAe,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE;YAC/C,YAAY,CAAC,SAAS,CAAC,CAAC;YACxB,KAAK,EAAE,CAAC;QACV,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAe,GAAG;;;;;;oBACM,GAAG,GAAK,OAAO,CAAC,GAAG,aAAhB,CAAiB;oBAC1C,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,iCAAiC,CAAC,CAAC;oBAEpD,KAAK,GAAG,2FAA2F,CAAC;oBACpG,MAAM,GAAG;wBACb,OAAO,EAAE,4CAA4C;wBACrD,KAAK,OAAA;wBACL,OAAO,EAAE,IAAI;qBACd,CAAC;oBAEa,qBAAM,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,EAAA;;oBAAnC,MAAM,GAAG,SAA0B;oBACzC,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;wBACjB,QAAQ,MAAM,CAAC,MAAM,EAAE,CAAC;4BACtB,KAAK,YAAY,CAAC,OAAO;gCACvB,OAAO,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC;gCAClD,MAAM;4BACR;gCACE,OAAO,CAAC,GAAG,CAAC,yBAAkB,MAAM,CAAC,MAAM,MAAG,CAAC,CAAC;wBACpD,CAAC;wBACD,MAAM,KAAK,CAAC;oBACd,CAAC;oBAED,OAAO,CAAC,GAAG,CAAC,kCAA2B,MAAM,CAAC,MAAM,CAAE,CAAC,CAAC;;;;;CACzD;AAED,uDAAuD;AACvD,IAAI,OAAO,MAAM,KAAK,WAAW,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;IAC7D,GAAG,EAAE;SACF,IAAI,CAAC;QACJ,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;IACvB,CAAC,CAAC;SACD,KAAK,CAAC;QACL,OAAO,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACjC,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;IACvB,CAAC,CAAC,CAAC;AACP,CAAC"}
+{"version":3,"file":"wait.js","sourceRoot":"","sources":["../../../../../src/arch/evm/utils/wait.ts"],"names":[],"mappings":"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"}

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

@@ -1,5 +1,3 @@
-var _a;
-import { __awaiter, __extends, __generator } from "tslib";
 import assert from "assert";
 import { clamp, sortedIndexBy } from "lodash";
 import { BlockFinder } from "../../utils/BlockFinder";
@@ -7,10 +5,10 @@ import { isDefined } from "../../utils/TypeGuards";
 import { getCurrentTime } from "../../utils/TimeUtils";
 import { CHAIN_IDs } from "../../constants";
 import { getNearestSlotTime } from "./utils";
-var now = getCurrentTime();
-var averageBlockTimes = (_a = {},
-    _a[CHAIN_IDs.SOLANA] = { average: 0.4, timestamp: now, blockRange: 1 },
-    _a);
+const now = getCurrentTime();
+const averageBlockTimes = {
+    [CHAIN_IDs.SOLANA]: { average: 0.4, timestamp: now, blockRange: 1 },
+};
 /**
  * @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.
@@ -20,184 +18,138 @@ export function averageBlockTime() {
     // @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; }
-    var cushionMultiplier = cushionPercentage + 1.0;
-    var average = averageBlockTime().average;
+function estimateBlocksElapsed(seconds, cushionPercentage = 0.0, _provider) {
+    const cushionMultiplier = cushionPercentage + 1.0;
+    const { average } = averageBlockTime();
     return Math.floor((seconds * cushionMultiplier) / average);
 }
-var SVMBlockFinder = /** @class */ (function (_super) {
-    __extends(SVMBlockFinder, _super);
-    function SVMBlockFinder(provider, blocks, logger) {
-        if (blocks === void 0) { blocks = []; }
-        var _this = _super.call(this) || this;
-        _this.provider = provider;
-        _this.blocks = blocks;
-        _this.logger = logger;
-        return _this;
+export class SVMBlockFinder extends BlockFinder {
+    provider;
+    blocks;
+    logger;
+    constructor(provider, blocks = [], logger) {
+        super();
+        this.provider = provider;
+        this.blocks = blocks;
+        this.logger = logger;
     }
     /**
      * @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_1) {
-        return __awaiter(this, arguments, void 0, function (timestamp, hints) {
-            var block, initialBlock, cushion, incrementDistance, multiplier, distance, blockNumber, block, index;
-            var _this = this;
-            if (hints === void 0) { hints = {}; }
-            return __generator(this, function (_a) {
-                switch (_a.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 = _a.sent();
-                        if (timestamp >= block.timestamp)
-                            return [2 /*return*/, block];
-                        _a.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.
-                        _a.sent();
-                        if (!(this.blocks[0].timestamp > timestamp)) return [3 /*break*/, 7];
-                        initialBlock = this.blocks[0];
-                        cushion = 1;
-                        incrementDistance = Math.max(
-                        // Ensure the increment slot distance is _at least_ a single slot to prevent an infinite loop.
-                        estimateBlocksElapsed(initialBlock.timestamp - timestamp, cushion, this.provider), 1);
-                        multiplier = 1;
-                        _a.label = 4;
-                    case 4:
-                        distance = multiplier * incrementDistance;
-                        blockNumber = Math.max(0, initialBlock.number - distance);
-                        return [4 /*yield*/, this.getBlock(blockNumber)];
-                    case 5:
-                        block = _a.sent();
-                        if (block.timestamp <= timestamp)
-                            return [3 /*break*/, 7]; // Found an earlier block.
-                        assert(blockNumber > 0, "timestamp is before block 0");
-                        _a.label = 6;
-                    case 6:
-                        multiplier++;
-                        return [3 /*break*/, 4];
-                    case 7:
-                        index = sortedIndexBy(this.blocks, { timestamp: timestamp }, "timestamp");
-                        return [2 /*return*/, this.findBlock(this.blocks[index - 1], this.blocks[index], timestamp)];
-                }
-            });
-        });
-    };
+    async getBlockForTimestamp(timestamp, hints = {}) {
+        timestamp = Number(timestamp);
+        assert(timestamp !== undefined && timestamp !== null, "timestamp must be provided");
+        // If the last slot we have stored is too early, grab the latest slot.
+        if (this.blocks.length === 0 || this.blocks[this.blocks.length - 1].timestamp < timestamp) {
+            const block = await this.getLatestBlock();
+            if (timestamp >= block.timestamp)
+                return block;
+        }
+        // Prime the BlockFinder cache with any supplied hints.
+        // If the hint is accurate, then this will bypass the subsequent estimation.
+        await Promise.all(Object.values(hints)
+            .filter(isDefined)
+            .map((blockNumber) => this.getBlock(blockNumber)));
+        // Check the first slot. If it's greater than our timestamp, we need to find an earlier slot.
+        if (this.blocks[0].timestamp > timestamp) {
+            const initialBlock = this.blocks[0];
+            // We use a 2x cushion to reduce the number of iterations in the following loop and increase the chance
+            // that the first slot we find sets a floor for the target timestamp. The loop converges on the correct slot
+            // slower than the following incremental search performed by `findBlock`, so we want to minimize the number of
+            // loop iterations in favor of searching more slots over the `findBlock` search.
+            const cushion = 1;
+            const incrementDistance = Math.max(
+            // Ensure the increment slot distance is _at least_ a single slot to prevent an infinite loop.
+            estimateBlocksElapsed(initialBlock.timestamp - timestamp, cushion, this.provider), 1);
+            // Search backwards by a constant increment until we find a slot before the timestamp or hit slot 0.
+            for (let multiplier = 1;; multiplier++) {
+                const distance = multiplier * incrementDistance;
+                const blockNumber = Math.max(0, initialBlock.number - distance);
+                const block = await this.getBlock(blockNumber);
+                if (block.timestamp <= timestamp)
+                    break; // Found an earlier block.
+                assert(blockNumber > 0, "timestamp is before block 0");
+            }
+        }
+        // Find the index where the slot would be inserted and use that as the end slot (since it is >= the timestamp).
+        const index = sortedIndexBy(this.blocks, { timestamp }, "timestamp");
+        return this.findBlock(this.blocks[index - 1], this.blocks[index], timestamp);
+    }
     /**
      * For a given slot, resolve the current or preceding timestamp.
      * Not all Solana slots have an associated block timestamp; in case of no block at the requested slot, the most
      * immediate preceding block timestamp will be used. Note that this may return an eventually-incorrect timestamp for
      * future slots.
      */
-    SVMBlockFinder.prototype.getBlockTime = function (slot) {
-        var opts = isDefined(slot) ? { slot: slot } : undefined;
+    getBlockTime(slot) {
+        const opts = isDefined(slot) ? { slot } : undefined;
         return getNearestSlotTime(this.provider, opts, this.logger);
-    };
+    }
     // Grabs the most recent slot and caches it.
-    SVMBlockFinder.prototype.getLatestBlock = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var _a, slot, timestamp, block, index;
-            var _b;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0: return [4 /*yield*/, this.getBlockTime()];
-                    case 1:
-                        _a = _c.sent(), slot = _a.slot, timestamp = _a.timestamp;
-                        block = {
-                            timestamp: timestamp,
-                            number: Number(slot),
-                        };
-                        index = sortedIndexBy(this.blocks, block, "number");
-                        if (((_b = this.blocks[index]) === null || _b === void 0 ? void 0 : _b.number) !== block.number)
-                            this.blocks.splice(index, 0, block);
-                        return [2 /*return*/, this.blocks[index]];
-                }
-            });
-        });
-    };
+    async getLatestBlock() {
+        const { slot, timestamp } = await this.getBlockTime();
+        // Cast the return type to an SVMBlock.
+        const block = {
+            timestamp,
+            number: Number(slot),
+        };
+        const index = sortedIndexBy(this.blocks, block, "number");
+        if (this.blocks[index]?.number !== block.number)
+            this.blocks.splice(index, 0, block);
+        return this.blocks[index];
+    }
     // Grabs the slot for a particular number and caches it.
-    SVMBlockFinder.prototype.getBlock = function (number) {
-        return __awaiter(this, void 0, void 0, function () {
-            var index, _a, _slot, timestamp, slot, block;
-            var _b, _c;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
-                    case 0:
-                        index = sortedIndexBy(this.blocks, { number: number }, "number");
-                        if (((_b = this.blocks[index]) === null || _b === void 0 ? void 0 : _b.number) === number)
-                            return [2 /*return*/, this.blocks[index]]; // Return early if block already exists.
-                        return [4 /*yield*/, this.getBlockTime(BigInt(number))];
-                    case 1:
-                        _a = _d.sent(), _slot = _a.slot, timestamp = _a.timestamp;
-                        slot = Number(_slot);
-                        block = {
-                            timestamp: timestamp,
-                            number: slot,
-                        };
-                        // Recompute the index after the async call since the state of this.blocks could have changed!
-                        index = sortedIndexBy(this.blocks, { number: slot }, "number");
-                        // Rerun this check to avoid duplicate insertion.
-                        if (((_c = this.blocks[index]) === null || _c === void 0 ? void 0 : _c.number) === slot)
-                            return [2 /*return*/, this.blocks[index]];
-                        this.blocks.splice(index, 0, block); // A simple insert at index.
-                        return [2 /*return*/, block];
-                }
-            });
-        });
-    };
+    async getBlock(number) {
+        let index = sortedIndexBy(this.blocks, { number }, "number");
+        if (this.blocks[index]?.number === number)
+            return this.blocks[index]; // Return early if block already exists.
+        // The resolved slot may be rotated backwards if no timestamp exists at the requested slot.
+        const { slot: _slot, timestamp } = await this.getBlockTime(BigInt(number));
+        const slot = Number(_slot);
+        // Cast the return type to an SVMBlock.
+        const block = {
+            timestamp,
+            number: slot,
+        };
+        // Recompute the index after the async call since the state of this.blocks could have changed!
+        index = sortedIndexBy(this.blocks, { number: slot }, "number");
+        // Rerun this check to avoid duplicate insertion.
+        if (this.blocks[index]?.number === slot)
+            return this.blocks[index];
+        this.blocks.splice(index, 0, block); // A simple insert at index.
+        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 };
+    async findBlock(_startSlot, _endSlot, timestamp) {
+        const [startBlock, endBlock] = [_startSlot, _endSlot];
+        // 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 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 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");
+        // Interpolating the timestamp we're searching for to slot numbers.
+        const totalTimeDifference = endBlock.timestamp - startBlock.timestamp;
+        const totalBlockDistance = endBlock.number - startBlock.number;
+        const blockPercentile = (timestamp - startBlock.timestamp) / totalTimeDifference;
+        const estimatedBlock = startBlock.number + Math.round(blockPercentile * totalBlockDistance);
+        // Clamp ensures the estimated slot is strictly greater than the start slot and strictly less than the end slot.
+        const newBlock = await this.getBlock(clamp(estimatedBlock, startBlock.number + 1, endBlock.number - 1));
+        // Depending on whether the new slot is below or above the timestamp, narrow the search space accordingly.
+        if (newBlock.timestamp < timestamp) {
+            return this.findBlock(newBlock, endBlock, timestamp);
+        }
+        else {
+            return this.findBlock(startBlock, newBlock, timestamp);
+        }
+    }
+}
 //# sourceMappingURL=BlockUtils.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"BlockUtils.js","sourceRoot":"","sources":["../../../../src/arch/svm/BlockUtils.ts"],"names":[],"mappings":";;AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,WAAW,EAA4D,MAAM,yBAAyB,CAAC;AAChH,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAK7C,IAAM,GAAG,GAAG,cAAc,EAAE,CAAC;AAC7B,IAAM,iBAAiB;IACrB,GAAC,SAAS,CAAC,MAAM,IAAG,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,EAAE;OACpE,CAAC;AAEF;;;;GAIG;AACH,MAAM,UAAU,gBAAgB;IAC9B,+FAA+F;IAC/F,OAAO,iBAAiB,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;AAC7C,CAAC;AAED,SAAS,qBAAqB,CAAC,OAAe,EAAE,iBAAuB,EAAE,SAAsB;IAA/C,kCAAA,EAAA,uBAAuB;IACrE,IAAM,iBAAiB,GAAG,iBAAiB,GAAG,GAAG,CAAC;IAC1C,IAAA,OAAO,GAAK,gBAAgB,EAAE,QAAvB,CAAwB;IACvC,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,GAAG,iBAAiB,CAAC,GAAG,OAAO,CAAC,CAAC;AAC7D,CAAC;AAED;IAAoC,kCAAqB;IACvD,wBACmB,QAAqB,EACrB,MAAuB,EACvB,MAAuB;QADvB,uBAAA,EAAA,WAAuB;QAGxC,YAAA,MAAK,WAAE,SAAC;QAJS,cAAQ,GAAR,QAAQ,CAAa;QACrB,YAAM,GAAN,MAAM,CAAiB;QACvB,YAAM,GAAN,MAAM,CAAiB;;IAG1C,CAAC;IAED;;;;OAIG;IACU,6CAAoB,GAAjC;4DAAkC,SAA0B,EAAE,KAA4B;;;YAA5B,sBAAA,EAAA,UAA4B;;;;wBACxF,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;wBAC9B,MAAM,CAAC,SAAS,KAAK,SAAS,IAAI,SAAS,KAAK,IAAI,EAAE,4BAA4B,CAAC,CAAC;6BAEhF,CAAA,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,SAAS,GAAG,SAAS,CAAA,EAArF,wBAAqF;wBACzE,qBAAM,IAAI,CAAC,cAAc,EAAE,EAAA;;wBAAnC,KAAK,GAAG,SAA2B;wBACzC,IAAI,SAAS,IAAI,KAAK,CAAC,SAAS;4BAAE,sBAAO,KAAK,EAAC;;;oBAGjD,uDAAuD;oBACvD,4EAA4E;oBAC5E,qBAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;6BACjB,MAAM,CAAC,SAAS,CAAC;6BACjB,GAAG,CAAC,UAAC,WAAW,IAAK,OAAA,KAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,EAA1B,CAA0B,CAAC,CACpD,EAAA;;wBAND,uDAAuD;wBACvD,4EAA4E;wBAC5E,SAIC,CAAC;6BAGE,CAAA,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,GAAG,SAAS,CAAA,EAApC,wBAAoC;wBAChC,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;wBAK9B,OAAO,GAAG,CAAC,CAAC;wBACZ,iBAAiB,GAAG,IAAI,CAAC,GAAG;wBAChC,8FAA8F;wBAC9F,qBAAqB,CAAC,YAAY,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,EACjF,CAAC,CACF,CAAC;wBAGO,UAAU,GAAG,CAAC;;;wBACf,QAAQ,GAAG,UAAU,GAAG,iBAAiB,CAAC;wBAC1C,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,YAAY,CAAC,MAAM,GAAG,QAAQ,CAAC,CAAC;wBAClD,qBAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAA;;wBAAxC,KAAK,GAAG,SAAgC;wBAC9C,IAAI,KAAK,CAAC,SAAS,IAAI,SAAS;4BAAE,wBAAM,CAAC,0BAA0B;wBACnE,MAAM,CAAC,WAAW,GAAG,CAAC,EAAE,6BAA6B,CAAC,CAAC;;;wBAL9B,UAAU,EAAE,CAAA;;;wBAUnC,KAAK,GAAG,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,SAAS,WAAA,EAAW,EAAE,WAAW,CAAC,CAAC;wBAC9E,sBAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC,EAAC;;;;KAC9E;IAED;;;;;OAKG;IACK,qCAAY,GAApB,UAAqB,IAAa;QAChC,IAAM,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,MAAA,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;QACpD,OAAO,kBAAkB,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9D,CAAC;IAED,4CAA4C;IAC9B,uCAAc,GAA5B;;;;;;4BAC8B,qBAAM,IAAI,CAAC,YAAY,EAAE,EAAA;;wBAA/C,KAAsB,SAAyB,EAA7C,IAAI,UAAA,EAAE,SAAS,eAAA;wBAGjB,KAAK,GAAa;4BACtB,SAAS,WAAA;4BACT,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC;yBACrB,CAAC;wBACI,KAAK,GAAG,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;wBAC1D,IAAI,CAAA,MAAA,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0CAAE,MAAM,MAAK,KAAK,CAAC,MAAM;4BAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;wBACrF,sBAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAC;;;;KAC3B;IAED,wDAAwD;IAC1C,iCAAQ,GAAtB,UAAuB,MAAc;;;;;;;wBAC/B,KAAK,GAAG,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,MAAM,QAAA,EAAW,EAAE,QAAQ,CAAC,CAAC;wBACtE,IAAI,CAAA,MAAA,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0CAAE,MAAM,MAAK,MAAM;4BAAE,sBAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAC,CAAC,wCAAwC;wBAG3E,qBAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAA;;wBAApE,KAA6B,SAAuC,EAA5D,KAAK,UAAA,EAAE,SAAS,eAAA;wBACxB,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;wBAErB,KAAK,GAAa;4BACtB,SAAS,WAAA;4BACT,MAAM,EAAE,IAAI;yBACb,CAAC;wBAEF,8FAA8F;wBAC9F,KAAK,GAAG,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,IAAI,EAAW,EAAE,QAAQ,CAAC,CAAC;wBAExE,iDAAiD;wBACjD,IAAI,CAAA,MAAA,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0CAAE,MAAM,MAAK,IAAI;4BAAE,sBAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAC;wBACnE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,4BAA4B;wBACjE,sBAAO,KAAK,EAAC;;;;KACd;IAED,0FAA0F;IAC1F,oFAAoF;IACpF,yDAAyD;IAC3C,kCAAS,GAAvB,UAAwB,UAAoB,EAAE,QAAkB,EAAE,SAAiB;;;;;;wBAC3E,KAAyB,CAAC,UAAU,EAAE,QAAQ,CAAC,EAA9C,UAAU,QAAA,EAAE,QAAQ,QAAA,CAA2B;wBACtD,8GAA8G;wBAC9G,aAAa;wBACb,IAAI,QAAQ,CAAC,SAAS,KAAK,SAAS;4BAAE,sBAAO,QAAQ,EAAC;wBAEtD,gHAAgH;wBAChH,8CAA8C;wBAC9C,IAAI,QAAQ,CAAC,MAAM,KAAK,UAAU,CAAC,MAAM,GAAG,CAAC;4BAAE,sBAAO,UAAU,EAAC;wBAEjE,MAAM,CAAC,QAAQ,CAAC,MAAM,KAAK,UAAU,CAAC,MAAM,EAAE,kCAAkC,CAAC,CAAC;wBAClF,MAAM,CACJ,SAAS,GAAG,QAAQ,CAAC,SAAS,IAAI,SAAS,GAAG,UAAU,CAAC,SAAS,EAClE,+CAA+C,CAChD,CAAC;wBAGI,mBAAmB,GAAG,QAAQ,CAAC,SAAS,GAAG,UAAU,CAAC,SAAS,CAAC;wBAChE,kBAAkB,GAAG,QAAQ,CAAC,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;wBACzD,eAAe,GAAG,CAAC,SAAS,GAAG,UAAU,CAAC,SAAS,CAAC,GAAG,mBAAmB,CAAC;wBAC3E,cAAc,GAAG,UAAU,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,GAAG,kBAAkB,CAAC,CAAC;wBAG3E,qBAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,EAAE,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,EAAA;;wBAAjG,QAAQ,GAAG,SAAsF;wBAEvG,0GAA0G;wBAC1G,IAAI,QAAQ,CAAC,SAAS,GAAG,SAAS,EAAE,CAAC;4BACnC,sBAAO,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,CAAC,EAAC;wBACvD,CAAC;6BAAM,CAAC;4BACN,sBAAO,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,QAAQ,EAAE,SAAS,CAAC,EAAC;wBACzD,CAAC;;;;;KACF;IACH,qBAAC;AAAD,CAAC,AA/ID,CAAoC,WAAW,GA+I9C"}
+{"version":3,"file":"BlockUtils.js","sourceRoot":"","sources":["../../../../src/arch/svm/BlockUtils.ts"],"names":[],"mappings":"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"}