@metamask-previews/eth-block-tracker 15.0.1-preview-abca9bcea → 16.0.0-preview-0a30e47

package/CHANGELOG.md

@@ -7,11 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [16.0.0]
+
 ### Changed
 
+- **BREAKING:** Drop CommonJS support ([#9536](https://github.com/MetaMask/core/pull/9536))
+  - This package is now ESM-only, but can still be used in CommonJS projects via `require(esm)` in modern Node.js versions (22+), or dynamic imports in older Node.js versions.
+- **BREAKING:** Bump minimum Node.js version to 22 ([#9976](https://github.com/MetaMask/core/pull/9976))
+- **BREAKING:** Bump TypeScript target to ES2022 ([#10019](https://github.com/MetaMask/core/pull/10019))
+  - This package now ships ES2022 code, requiring a compatible modern environment or bundler configuration to consume.
 - Bump `@metamask/utils` from `^11.9.0` to `^11.12.0` ([#9074](https://github.com/MetaMask/core/pull/9074), [#10076](https://github.com/MetaMask/core/pull/10076))
 - Bump `@metamask/json-rpc-engine` from `^10.2.4` to `^10.3.0` ([#8661](https://github.com/MetaMask/core/pull/8661))
-- Bump `@metamask/eth-json-rpc-provider` from `^6.0.0` to `^6.0.1` ([#8317](https://github.com/MetaMask/core/pull/8317))
+- Bump `@metamask/eth-json-rpc-provider` from `^6.0.0` to `^7.0.0` ([#8317](https://github.com/MetaMask/core/pull/8317), [#10160](https://github.com/MetaMask/core/pull/10160))
 
 ### Fixed
 
@@ -47,7 +54,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - See [`MetaMask/eth-block-tracker`](https://github.com/MetaMask/eth-block-tracker/blob/main/CHANGELOG.md)
     for the original changelog.
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/eth-block-tracker@15.0.1...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/eth-block-tracker@16.0.0...HEAD
+[16.0.0]: https://github.com/MetaMask/core/compare/@metamask/eth-block-tracker@15.0.1...@metamask/eth-block-tracker@16.0.0
 [15.0.1]: https://github.com/MetaMask/core/compare/@metamask/eth-block-tracker@15.0.0...@metamask/eth-block-tracker@15.0.1
 [15.0.0]: https://github.com/MetaMask/core/compare/@metamask/eth-block-tracker@14.0.0...@metamask/eth-block-tracker@15.0.0
 [14.0.0]: https://github.com/MetaMask/core/releases/tag/@metamask/eth-block-tracker@14.0.0

package/dist/{BlockTracker.d.mts → BlockTracker.d.ts}

@@ -1,4 +1,4 @@
-import type SafeEventEmitter from "@metamask/safe-event-emitter";
+import type SafeEventEmitter from '@metamask/safe-event-emitter';
 export type BlockTracker = SafeEventEmitter & {
     destroy(): Promise<void>;
     isRunning(): boolean;
@@ -6,4 +6,4 @@ export type BlockTracker = SafeEventEmitter & {
     getLatestBlock(): Promise<string>;
     checkForLatestBlock(): Promise<string>;
 };
-//# sourceMappingURL=BlockTracker.d.mts.map
+//# sourceMappingURL=BlockTracker.d.ts.map

package/dist/BlockTracker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"BlockTracker.d.ts","sourceRoot":"","sources":["../src/BlockTracker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,gBAAgB,MAAM,8BAA8B,CAAC;AAEjE,MAAM,MAAM,YAAY,GAAG,gBAAgB,GAAG;IAC5C,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzB,SAAS,IAAI,OAAO,CAAC;IAErB,eAAe,IAAI,MAAM,GAAG,IAAI,CAAC;IAEjC,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAElC,mBAAmB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;CACxC,CAAC"}

package/dist/BlockTracker.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=BlockTracker.js.map

package/dist/BlockTracker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"BlockTracker.js","sourceRoot":"","sources":["../src/BlockTracker.ts"],"names":[],"mappings":"","sourcesContent":["import type SafeEventEmitter from '@metamask/safe-event-emitter';\n\nexport type BlockTracker = SafeEventEmitter & {\n  destroy(): Promise<void>;\n\n  isRunning(): boolean;\n\n  getCurrentBlock(): string | null;\n\n  getLatestBlock(): Promise<string>;\n\n  checkForLatestBlock(): Promise<string>;\n};\n"]}

package/dist/{PollingBlockTracker.d.cts → PollingBlockTracker.d.ts}

@@ -1,7 +1,7 @@
-import type { InternalProvider } from "@metamask/eth-json-rpc-provider";
-import type { ContextConstraint, MiddlewareContext } from "@metamask/json-rpc-engine/v2";
-import SafeEventEmitter from "@metamask/safe-event-emitter";
-import type { BlockTracker } from "./BlockTracker.cjs";
+import type { InternalProvider } from '@metamask/eth-json-rpc-provider';
+import type { ContextConstraint, MiddlewareContext } from '@metamask/json-rpc-engine/v2';
+import SafeEventEmitter from '@metamask/safe-event-emitter';
+import type { BlockTracker } from './BlockTracker.js';
 export type PollingBlockTrackerOptions<Context extends ContextConstraint = MiddlewareContext> = {
     provider?: InternalProvider<Context>;
     pollingInterval?: number;
@@ -30,4 +30,4 @@ export declare class PollingBlockTracker<Context extends ContextConstraint = Mid
      */
     checkForLatestBlock(): Promise<string>;
 }
-//# sourceMappingURL=PollingBlockTracker.d.cts.map
+//# sourceMappingURL=PollingBlockTracker.d.ts.map

package/dist/PollingBlockTracker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"PollingBlockTracker.d.ts","sourceRoot":"","sources":["../src/PollingBlockTracker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,KAAK,EACV,iBAAiB,EACjB,iBAAiB,EAClB,MAAM,8BAA8B,CAAC;AACtC,OAAO,gBAAgB,MAAM,8BAA8B,CAAC;AAK5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAStD,MAAM,MAAM,0BAA0B,CACpC,OAAO,SAAS,iBAAiB,GAAG,iBAAiB,IACnD;IACF,QAAQ,CAAC,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACrC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AAQF,qBAAa,mBAAmB,CAC9B,OAAO,SAAS,iBAAiB,GAAG,iBAAiB,CAErD,SAAQ,gBACR,YAAW,YAAY;;IAsCvB,YAAY,IAAI,GAAE,0BAA0B,CAAC,OAAO,CAAM,EA6BzD;IAEK,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAI7B;IAED,SAAS,IAAI,OAAO,CAEnB;IAED,eAAe,IAAI,MAAM,GAAG,IAAI,CAE/B;IAEK,cAAc,CAAC,EACnB,QAAe,GAChB,GAAE;QAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;KAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAoD/C;IAGD,kBAAkB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAcpD;IAsHD;;;;;;OAMG;IACH,mBAAmB,IAAI,OAAO,CAAC,MAAM,CAAC,CASrC;CA+HF"}

package/dist/PollingBlockTracker.js

@@ -0,0 +1,354 @@
+import SafeEventEmitter from '@metamask/safe-event-emitter';
+import { createDeferredPromise, getErrorMessage } from '@metamask/utils';
+import getCreateRandomId from 'json-rpc-random-id';
+import { projectLogger, createModuleLogger } from './logging-utils.js';
+const log = createModuleLogger(projectLogger, 'polling-block-tracker');
+const createRandomId = getCreateRandomId();
+const sec = 1000;
+const blockTrackerEvents = ['sync', 'latest'];
+export class PollingBlockTracker extends SafeEventEmitter {
+    #isRunning;
+    #blockResetDuration;
+    #usePastBlocks;
+    #currentBlock;
+    #blockResetTimeout;
+    #pollingTimeout;
+    #provider;
+    #pollingInterval;
+    #retryTimeout;
+    #keepEventLoopActive;
+    #setSkipCacheFlag;
+    #internalEventListeners = [];
+    #pendingLatestBlock;
+    #pendingFetch;
+    #pendingCheckForLatestBlock;
+    #onNewListener;
+    #onRemoveListener;
+    #resetCurrentBlock;
+    constructor(opts = {}) {
+        // parse + validate args
+        if (!opts.provider) {
+            throw new Error('PollingBlockTracker - no provider specified.');
+        }
+        super();
+        // config
+        this.#blockResetDuration = opts.blockResetDuration ?? 20 * sec;
+        this.#usePastBlocks = opts.usePastBlocks ?? false;
+        // state
+        this.#currentBlock = null;
+        this.#isRunning = false;
+        // bind functions for internal use
+        this.#onNewListener = this.#onNewListenerUnbound.bind(this);
+        this.#onRemoveListener = this.#onRemoveListenerUnbound.bind(this);
+        this.#resetCurrentBlock = this.#resetCurrentBlockUnbound.bind(this);
+        // listen for handler changes
+        this.#setupInternalEvents();
+        // config
+        this.#provider = opts.provider;
+        this.#pollingInterval = opts.pollingInterval ?? 20 * sec;
+        this.#retryTimeout = opts.retryTimeout ?? this.#pollingInterval / 10;
+        this.#keepEventLoopActive = opts.keepEventLoopActive ?? true;
+        this.#setSkipCacheFlag = opts.setSkipCacheFlag ?? false;
+    }
+    async destroy() {
+        this.#cancelBlockResetTimeout();
+        super.removeAllListeners();
+        this.#maybeEnd();
+    }
+    isRunning() {
+        return this.#isRunning;
+    }
+    getCurrentBlock() {
+        return this.#currentBlock;
+    }
+    async getLatestBlock({ useCache = true, } = {}) {
+        // return if available
+        if (this.#currentBlock && useCache) {
+            return this.#currentBlock;
+        }
+        if (this.#pendingLatestBlock) {
+            return await this.#pendingLatestBlock.promise;
+        }
+        const { promise, resolve, reject } = createDeferredPromise({
+            suppressUnhandledRejection: true,
+        });
+        this.#pendingLatestBlock = { reject, promise };
+        if (this.#isRunning) {
+            try {
+                // If tracker is running, wait for next block with timeout
+                const onLatestBlock = (value) => {
+                    this.#removeInternalListener(onLatestBlock);
+                    this.removeListener('latest', onLatestBlock);
+                    resolve(value);
+                };
+                this.#addInternalListener(onLatestBlock);
+                this.once('latest', onLatestBlock);
+                return await promise;
+            }
+            catch (error) {
+                reject(error);
+                throw error;
+            }
+            finally {
+                this.#pendingLatestBlock = undefined;
+            }
+        }
+        else {
+            // If tracker isn't running, just fetch directly
+            try {
+                const latestBlock = await this.#updateLatestBlock();
+                resolve(latestBlock);
+                return latestBlock;
+            }
+            catch (error) {
+                reject(error);
+                throw error;
+            }
+            finally {
+                // We want to rate limit calls to this method if we made a direct fetch
+                // for the block number because the BlockTracker was not running. We
+                // achieve this by delaying the unsetting of the #pendingLatestBlock promise.
+                setTimeout(() => {
+                    this.#pendingLatestBlock = undefined;
+                }, this.#pollingInterval);
+            }
+        }
+    }
+    // Don't allow module consumer to remove our internal event listeners.
+    removeAllListeners(eventName) {
+        // perform default behavior, preserve fn arity
+        if (eventName) {
+            super.removeAllListeners(eventName);
+        }
+        else {
+            super.removeAllListeners();
+        }
+        // re-add internal events
+        this.#setupInternalEvents();
+        // trigger stop check just in case
+        this.#onRemoveListener();
+        return this;
+    }
+    #setupInternalEvents() {
+        // first remove listeners for idempotence
+        this.removeListener('newListener', this.#onNewListener);
+        this.removeListener('removeListener', this.#onRemoveListener);
+        // then add them
+        this.on('newListener', this.#onNewListener);
+        this.on('removeListener', this.#onRemoveListener);
+    }
+    #onNewListenerUnbound(eventName) {
+        // `newListener` is called *before* the listener is added
+        if (blockTrackerEvents.includes(eventName)) {
+            // TODO: Handle dangling promise
+            this.#maybeStart();
+        }
+    }
+    #onRemoveListenerUnbound() {
+        // `removeListener` is called *after* the listener is removed
+        if (this.#getBlockTrackerEventCount() > 0) {
+            return;
+        }
+        this.#maybeEnd();
+    }
+    #maybeStart() {
+        if (this.#isRunning) {
+            return;
+        }
+        this.#isRunning = true;
+        // cancel setting latest block to stale
+        this.#cancelBlockResetTimeout();
+        this.#start();
+        this.emit('_started');
+    }
+    #maybeEnd() {
+        if (!this.#isRunning) {
+            return;
+        }
+        this.#isRunning = false;
+        this.#setupBlockResetTimeout();
+        this.#end();
+        this.#rejectPendingLatestBlock(new Error('Block tracker destroyed'));
+        this.emit('_ended');
+    }
+    #getBlockTrackerEventCount() {
+        return (blockTrackerEvents
+            .map((eventName) => this.listeners(eventName))
+            .flat()
+            // internal listeners are not included in the count
+            .filter((listener) => this.#internalEventListeners.every((internalListener) => !Object.is(internalListener, listener))).length);
+    }
+    #shouldUseNewBlock(newBlock) {
+        const currentBlock = this.#currentBlock;
+        if (!currentBlock) {
+            return true;
+        }
+        const newBlockInt = hexToInt(newBlock);
+        const currentBlockInt = hexToInt(currentBlock);
+        return ((this.#usePastBlocks && newBlockInt < currentBlockInt) ||
+            newBlockInt > currentBlockInt);
+    }
+    #newPotentialLatest(newBlock) {
+        if (!this.#shouldUseNewBlock(newBlock)) {
+            return;
+        }
+        this.#setCurrentBlock(newBlock);
+    }
+    #setCurrentBlock(newBlock) {
+        const oldBlock = this.#currentBlock;
+        this.#currentBlock = newBlock;
+        this.emit('latest', newBlock);
+        this.emit('sync', { oldBlock, newBlock });
+    }
+    #setupBlockResetTimeout() {
+        // clear any existing timeout
+        this.#cancelBlockResetTimeout();
+        // clear latest block when stale
+        this.#blockResetTimeout = setTimeout(this.#resetCurrentBlock, this.#blockResetDuration);
+        // nodejs - dont hold process open
+        if (this.#blockResetTimeout.unref) {
+            this.#blockResetTimeout.unref();
+        }
+    }
+    #cancelBlockResetTimeout() {
+        if (this.#blockResetTimeout) {
+            clearTimeout(this.#blockResetTimeout);
+        }
+    }
+    #resetCurrentBlockUnbound() {
+        this.#currentBlock = null;
+    }
+    /**
+     * Checks for the latest block, updates the internal state,  and returns the
+     * value immediately rather than waiting for the next polling interval.
+     *
+     * @deprecated Use {@link getLatestBlock} instead.
+     * @returns A promise that resolves to the latest block number.
+     */
+    checkForLatestBlock() {
+        if (!this.#pendingCheckForLatestBlock) {
+            this.#pendingCheckForLatestBlock = this.#updateLatestBlock()
+                .then(() => this.getLatestBlock())
+                .finally(() => {
+                this.#pendingCheckForLatestBlock = undefined;
+            });
+        }
+        return this.#pendingCheckForLatestBlock;
+    }
+    #start() {
+        // Intentionally not awaited as this starts the polling via a timeout chain.
+        // eslint-disable-next-line @typescript-eslint/no-floating-promises
+        this.#updateAndQueue();
+    }
+    #end() {
+        this.#clearPollingTimeout();
+    }
+    async #updateLatestBlock() {
+        // fetch + set latest block
+        const latestBlock = await this.#fetchLatestBlock();
+        this.#newPotentialLatest(latestBlock);
+        if (!this.#isRunning) {
+            // Ensure the one-time update is eventually reset once it's stale
+            this.#setupBlockResetTimeout();
+        }
+        // _newPotentialLatest() ensures that this._currentBlock is not null
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        return this.#currentBlock;
+    }
+    async #fetchLatestBlock() {
+        // If there's already a pending fetch, reuse it
+        if (this.#pendingFetch) {
+            return await this.#pendingFetch.promise;
+        }
+        // Create a new deferred promise for this request
+        const { promise, resolve, reject } = createDeferredPromise({
+            suppressUnhandledRejection: true,
+        });
+        this.#pendingFetch = { reject, promise };
+        try {
+            const req = {
+                jsonrpc: '2.0',
+                id: createRandomId(),
+                method: 'eth_blockNumber',
+                params: [],
+            };
+            if (this.#setSkipCacheFlag) {
+                req.skipCache = true;
+            }
+            log('Making request', req);
+            const result = await this.#provider.request(req);
+            log('Got result', result);
+            resolve(result);
+            return result;
+        }
+        catch (error) {
+            log('Encountered error fetching block', getErrorMessage(error));
+            reject(error);
+            this.#rejectPendingLatestBlock(error);
+            throw error;
+        }
+        finally {
+            this.#pendingFetch = undefined;
+        }
+    }
+    /**
+     * The core polling function that runs after each interval.
+     * Updates the latest block and then queues the next update.
+     */
+    async #updateAndQueue() {
+        let interval = this.#pollingInterval;
+        try {
+            await this.#updateLatestBlock();
+        }
+        catch (error) {
+            try {
+                this.emit('error', error);
+            }
+            catch {
+                console.error(`Error updating latest block: ${getErrorMessage(error)}`);
+            }
+            interval = this.#retryTimeout;
+        }
+        if (!this.#isRunning) {
+            return;
+        }
+        this.#clearPollingTimeout();
+        const timeoutRef = setTimeout(() => {
+            // Intentionally not awaited as this just continues the polling loop.
+            // eslint-disable-next-line @typescript-eslint/no-floating-promises
+            this.#updateAndQueue();
+        }, interval);
+        if (timeoutRef.unref && !this.#keepEventLoopActive) {
+            timeoutRef.unref();
+        }
+        this.#pollingTimeout = timeoutRef;
+        this.emit('_waitingForNextIteration');
+    }
+    #clearPollingTimeout() {
+        if (this.#pollingTimeout) {
+            clearTimeout(this.#pollingTimeout);
+            this.#pollingTimeout = undefined;
+        }
+    }
+    #addInternalListener(listener) {
+        this.#internalEventListeners.push(listener);
+    }
+    #removeInternalListener(listener) {
+        this.#internalEventListeners.splice(this.#internalEventListeners.indexOf(listener), 1);
+    }
+    #rejectPendingLatestBlock(error) {
+        this.#pendingLatestBlock?.reject(error);
+        this.#pendingLatestBlock = undefined;
+    }
+}
+/**
+ * Converts a number represented as a string in hexadecimal format into a native
+ * number.
+ *
+ * @param hexInt - The hex string.
+ * @returns The number.
+ */
+function hexToInt(hexInt) {
+    return Number.parseInt(hexInt, 16);
+}
+//# sourceMappingURL=PollingBlockTracker.js.map

package/dist/PollingBlockTracker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PollingBlockTracker.js","sourceRoot":"","sources":["../src/PollingBlockTracker.ts"],"names":[],"mappings":"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","sourcesContent":["import type { InternalProvider } from '@metamask/eth-json-rpc-provider';\nimport type {\n  ContextConstraint,\n  MiddlewareContext,\n} from '@metamask/json-rpc-engine/v2';\nimport SafeEventEmitter from '@metamask/safe-event-emitter';\nimport { createDeferredPromise, getErrorMessage } from '@metamask/utils';\nimport type { DeferredPromise, JsonRpcRequest } from '@metamask/utils';\nimport getCreateRandomId from 'json-rpc-random-id';\n\nimport type { BlockTracker } from './BlockTracker.js';\nimport { projectLogger, createModuleLogger } from './logging-utils.js';\n\nconst log = createModuleLogger(projectLogger, 'polling-block-tracker');\nconst createRandomId = getCreateRandomId();\nconst sec = 1000;\n\nconst blockTrackerEvents: (string | symbol)[] = ['sync', 'latest'];\n\nexport type PollingBlockTrackerOptions<\n  Context extends ContextConstraint = MiddlewareContext,\n> = {\n  provider?: InternalProvider<Context>;\n  pollingInterval?: number;\n  retryTimeout?: number;\n  keepEventLoopActive?: boolean;\n  setSkipCacheFlag?: boolean;\n  blockResetDuration?: number;\n  usePastBlocks?: boolean;\n};\n\ntype ExtendedJsonRpcRequest = {\n  skipCache?: boolean;\n} & JsonRpcRequest<[]>;\n\ntype InternalListener = (value: string) => void;\n\nexport class PollingBlockTracker<\n  Context extends ContextConstraint = MiddlewareContext,\n>\n  extends SafeEventEmitter\n  implements BlockTracker\n{\n  #isRunning: boolean;\n\n  readonly #blockResetDuration: number;\n\n  readonly #usePastBlocks: boolean;\n\n  #currentBlock: string | null;\n\n  #blockResetTimeout?: ReturnType<typeof setTimeout>;\n\n  #pollingTimeout?: ReturnType<typeof setTimeout>;\n\n  readonly #provider: InternalProvider<Context>;\n\n  readonly #pollingInterval: number;\n\n  readonly #retryTimeout: number;\n\n  readonly #keepEventLoopActive: boolean;\n\n  readonly #setSkipCacheFlag: boolean;\n\n  readonly #internalEventListeners: InternalListener[] = [];\n\n  #pendingLatestBlock?: Omit<DeferredPromise<string>, 'resolve'>;\n\n  #pendingFetch?: Omit<DeferredPromise<string>, 'resolve'>;\n\n  #pendingCheckForLatestBlock?: Promise<string>;\n\n  readonly #onNewListener: (eventName: string | symbol) => void;\n\n  readonly #onRemoveListener: () => void;\n\n  readonly #resetCurrentBlock: () => void;\n\n  constructor(opts: PollingBlockTrackerOptions<Context> = {}) {\n    // parse + validate args\n    if (!opts.provider) {\n      throw new Error('PollingBlockTracker - no provider specified.');\n    }\n\n    super();\n\n    // config\n    this.#blockResetDuration = opts.blockResetDuration ?? 20 * sec;\n    this.#usePastBlocks = opts.usePastBlocks ?? false;\n    // state\n    this.#currentBlock = null;\n    this.#isRunning = false;\n\n    // bind functions for internal use\n    this.#onNewListener = this.#onNewListenerUnbound.bind(this);\n    this.#onRemoveListener = this.#onRemoveListenerUnbound.bind(this);\n    this.#resetCurrentBlock = this.#resetCurrentBlockUnbound.bind(this);\n\n    // listen for handler changes\n    this.#setupInternalEvents();\n\n    // config\n    this.#provider = opts.provider;\n    this.#pollingInterval = opts.pollingInterval ?? 20 * sec;\n    this.#retryTimeout = opts.retryTimeout ?? this.#pollingInterval / 10;\n    this.#keepEventLoopActive = opts.keepEventLoopActive ?? true;\n    this.#setSkipCacheFlag = opts.setSkipCacheFlag ?? false;\n  }\n\n  async destroy(): Promise<void> {\n    this.#cancelBlockResetTimeout();\n    super.removeAllListeners();\n    this.#maybeEnd();\n  }\n\n  isRunning(): boolean {\n    return this.#isRunning;\n  }\n\n  getCurrentBlock(): string | null {\n    return this.#currentBlock;\n  }\n\n  async getLatestBlock({\n    useCache = true,\n  }: { useCache?: boolean } = {}): Promise<string> {\n    // return if available\n    if (this.#currentBlock && useCache) {\n      return this.#currentBlock;\n    }\n\n    if (this.#pendingLatestBlock) {\n      return await this.#pendingLatestBlock.promise;\n    }\n\n    const { promise, resolve, reject } = createDeferredPromise<string>({\n      suppressUnhandledRejection: true,\n    });\n    this.#pendingLatestBlock = { reject, promise };\n\n    if (this.#isRunning) {\n      try {\n        // If tracker is running, wait for next block with timeout\n        const onLatestBlock = (value: string): void => {\n          this.#removeInternalListener(onLatestBlock);\n          this.removeListener('latest', onLatestBlock);\n          resolve(value);\n        };\n\n        this.#addInternalListener(onLatestBlock);\n        this.once('latest', onLatestBlock);\n\n        return await promise;\n      } catch (error) {\n        reject(error);\n        throw error;\n      } finally {\n        this.#pendingLatestBlock = undefined;\n      }\n    } else {\n      // If tracker isn't running, just fetch directly\n      try {\n        const latestBlock = await this.#updateLatestBlock();\n        resolve(latestBlock);\n        return latestBlock;\n      } catch (error) {\n        reject(error);\n        throw error;\n      } finally {\n        // We want to rate limit calls to this method if we made a direct fetch\n        // for the block number because the BlockTracker was not running. We\n        // achieve this by delaying the unsetting of the #pendingLatestBlock promise.\n        setTimeout(() => {\n          this.#pendingLatestBlock = undefined;\n        }, this.#pollingInterval);\n      }\n    }\n  }\n\n  // Don't allow module consumer to remove our internal event listeners.\n  removeAllListeners(eventName?: string | symbol): this {\n    // perform default behavior, preserve fn arity\n    if (eventName) {\n      super.removeAllListeners(eventName);\n    } else {\n      super.removeAllListeners();\n    }\n\n    // re-add internal events\n    this.#setupInternalEvents();\n    // trigger stop check just in case\n    this.#onRemoveListener();\n\n    return this;\n  }\n\n  #setupInternalEvents(): void {\n    // first remove listeners for idempotence\n    this.removeListener('newListener', this.#onNewListener);\n    this.removeListener('removeListener', this.#onRemoveListener);\n    // then add them\n    this.on('newListener', this.#onNewListener);\n    this.on('removeListener', this.#onRemoveListener);\n  }\n\n  #onNewListenerUnbound(eventName: string | symbol): void {\n    // `newListener` is called *before* the listener is added\n    if (blockTrackerEvents.includes(eventName)) {\n      // TODO: Handle dangling promise\n      this.#maybeStart();\n    }\n  }\n\n  #onRemoveListenerUnbound(): void {\n    // `removeListener` is called *after* the listener is removed\n    if (this.#getBlockTrackerEventCount() > 0) {\n      return;\n    }\n    this.#maybeEnd();\n  }\n\n  #maybeStart(): void {\n    if (this.#isRunning) {\n      return;\n    }\n\n    this.#isRunning = true;\n    // cancel setting latest block to stale\n    this.#cancelBlockResetTimeout();\n    this.#start();\n    this.emit('_started');\n  }\n\n  #maybeEnd(): void {\n    if (!this.#isRunning) {\n      return;\n    }\n\n    this.#isRunning = false;\n    this.#setupBlockResetTimeout();\n    this.#end();\n    this.#rejectPendingLatestBlock(new Error('Block tracker destroyed'));\n    this.emit('_ended');\n  }\n\n  #getBlockTrackerEventCount(): number {\n    return (\n      blockTrackerEvents\n        .map((eventName) => this.listeners(eventName))\n        .flat()\n        // internal listeners are not included in the count\n        .filter((listener) =>\n          this.#internalEventListeners.every(\n            (internalListener) => !Object.is(internalListener, listener),\n          ),\n        ).length\n    );\n  }\n\n  #shouldUseNewBlock(newBlock: string): boolean {\n    const currentBlock = this.#currentBlock;\n    if (!currentBlock) {\n      return true;\n    }\n    const newBlockInt = hexToInt(newBlock);\n    const currentBlockInt = hexToInt(currentBlock);\n\n    return (\n      (this.#usePastBlocks && newBlockInt < currentBlockInt) ||\n      newBlockInt > currentBlockInt\n    );\n  }\n\n  #newPotentialLatest(newBlock: string): void {\n    if (!this.#shouldUseNewBlock(newBlock)) {\n      return;\n    }\n    this.#setCurrentBlock(newBlock);\n  }\n\n  #setCurrentBlock(newBlock: string): void {\n    const oldBlock = this.#currentBlock;\n    this.#currentBlock = newBlock;\n    this.emit('latest', newBlock);\n    this.emit('sync', { oldBlock, newBlock });\n  }\n\n  #setupBlockResetTimeout(): void {\n    // clear any existing timeout\n    this.#cancelBlockResetTimeout();\n    // clear latest block when stale\n    this.#blockResetTimeout = setTimeout(\n      this.#resetCurrentBlock,\n      this.#blockResetDuration,\n    );\n\n    // nodejs - dont hold process open\n    if (this.#blockResetTimeout.unref) {\n      this.#blockResetTimeout.unref();\n    }\n  }\n\n  #cancelBlockResetTimeout(): void {\n    if (this.#blockResetTimeout) {\n      clearTimeout(this.#blockResetTimeout);\n    }\n  }\n\n  #resetCurrentBlockUnbound(): void {\n    this.#currentBlock = null;\n  }\n\n  /**\n   * Checks for the latest block, updates the internal state,  and returns the\n   * value immediately rather than waiting for the next polling interval.\n   *\n   * @deprecated Use {@link getLatestBlock} instead.\n   * @returns A promise that resolves to the latest block number.\n   */\n  checkForLatestBlock(): Promise<string> {\n    if (!this.#pendingCheckForLatestBlock) {\n      this.#pendingCheckForLatestBlock = this.#updateLatestBlock()\n        .then(() => this.getLatestBlock())\n        .finally(() => {\n          this.#pendingCheckForLatestBlock = undefined;\n        });\n    }\n    return this.#pendingCheckForLatestBlock;\n  }\n\n  #start(): void {\n    // Intentionally not awaited as this starts the polling via a timeout chain.\n    // eslint-disable-next-line @typescript-eslint/no-floating-promises\n    this.#updateAndQueue();\n  }\n\n  #end(): void {\n    this.#clearPollingTimeout();\n  }\n\n  async #updateLatestBlock(): Promise<string> {\n    // fetch + set latest block\n    const latestBlock = await this.#fetchLatestBlock();\n    this.#newPotentialLatest(latestBlock);\n\n    if (!this.#isRunning) {\n      // Ensure the one-time update is eventually reset once it's stale\n      this.#setupBlockResetTimeout();\n    }\n\n    // _newPotentialLatest() ensures that this._currentBlock is not null\n    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n    return this.#currentBlock!;\n  }\n\n  async #fetchLatestBlock(): Promise<string> {\n    // If there's already a pending fetch, reuse it\n    if (this.#pendingFetch) {\n      return await this.#pendingFetch.promise;\n    }\n\n    // Create a new deferred promise for this request\n    const { promise, resolve, reject } = createDeferredPromise<string>({\n      suppressUnhandledRejection: true,\n    });\n    this.#pendingFetch = { reject, promise };\n\n    try {\n      const req: ExtendedJsonRpcRequest = {\n        jsonrpc: '2.0',\n        id: createRandomId(),\n        method: 'eth_blockNumber',\n        params: [] as [],\n      };\n      if (this.#setSkipCacheFlag) {\n        req.skipCache = true;\n      }\n\n      log('Making request', req);\n      const result = await this.#provider.request<[], string>(req);\n      log('Got result', result);\n      resolve(result);\n      return result;\n    } catch (error) {\n      log('Encountered error fetching block', getErrorMessage(error));\n      reject(error);\n      this.#rejectPendingLatestBlock(error);\n      throw error;\n    } finally {\n      this.#pendingFetch = undefined;\n    }\n  }\n\n  /**\n   * The core polling function that runs after each interval.\n   * Updates the latest block and then queues the next update.\n   */\n  async #updateAndQueue(): Promise<void> {\n    let interval = this.#pollingInterval;\n\n    try {\n      await this.#updateLatestBlock();\n    } catch (error: unknown) {\n      try {\n        this.emit('error', error);\n      } catch {\n        console.error(`Error updating latest block: ${getErrorMessage(error)}`);\n      }\n\n      interval = this.#retryTimeout;\n    }\n\n    if (!this.#isRunning) {\n      return;\n    }\n\n    this.#clearPollingTimeout();\n\n    const timeoutRef = setTimeout(() => {\n      // Intentionally not awaited as this just continues the polling loop.\n      // eslint-disable-next-line @typescript-eslint/no-floating-promises\n      this.#updateAndQueue();\n    }, interval);\n\n    if (timeoutRef.unref && !this.#keepEventLoopActive) {\n      timeoutRef.unref();\n    }\n\n    this.#pollingTimeout = timeoutRef;\n\n    this.emit('_waitingForNextIteration');\n  }\n\n  #clearPollingTimeout(): void {\n    if (this.#pollingTimeout) {\n      clearTimeout(this.#pollingTimeout);\n      this.#pollingTimeout = undefined;\n    }\n  }\n\n  #addInternalListener(listener: InternalListener): void {\n    this.#internalEventListeners.push(listener);\n  }\n\n  #removeInternalListener(listener: InternalListener): void {\n    this.#internalEventListeners.splice(\n      this.#internalEventListeners.indexOf(listener),\n      1,\n    );\n  }\n\n  #rejectPendingLatestBlock(error: unknown): void {\n    this.#pendingLatestBlock?.reject(error);\n    this.#pendingLatestBlock = undefined;\n  }\n}\n\n/**\n * Converts a number represented as a string in hexadecimal format into a native\n * number.\n *\n * @param hexInt - The hex string.\n * @returns The number.\n */\nfunction hexToInt(hexInt: string): number {\n  return Number.parseInt(hexInt, 16);\n}\n"]}

package/dist/index.d.ts

@@ -0,0 +1,3 @@
+export * from './PollingBlockTracker.js';
+export type * from './BlockTracker.js';
+//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC;AACzC,mBAAmB,mBAAmB,CAAC"}

package/dist/index.js

@@ -0,0 +1,2 @@
+export * from './PollingBlockTracker.js';
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC","sourcesContent":["export * from './PollingBlockTracker.js';\nexport type * from './BlockTracker.js';\n"]}

package/dist/logging-utils.d.ts

@@ -0,0 +1,4 @@
+import { createModuleLogger } from '@metamask/utils';
+export declare const projectLogger: import("debug").Debugger;
+export { createModuleLogger };
+//# sourceMappingURL=logging-utils.d.ts.map

package/dist/logging-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"logging-utils.d.ts","sourceRoot":"","sources":["../src/logging-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAE1E,eAAO,MAAM,aAAa,0BAA2C,CAAC;AAEtE,OAAO,EAAE,kBAAkB,EAAE,CAAC"}

package/dist/logging-utils.js

@@ -0,0 +1,4 @@
+import { createProjectLogger, createModuleLogger } from '@metamask/utils';
+export const projectLogger = createProjectLogger('eth-block-tracker');
+export { createModuleLogger };
+//# sourceMappingURL=logging-utils.js.map

package/dist/logging-utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"logging-utils.js","sourceRoot":"","sources":["../src/logging-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAE1E,MAAM,CAAC,MAAM,aAAa,GAAG,mBAAmB,CAAC,mBAAmB,CAAC,CAAC;AAEtE,OAAO,EAAE,kBAAkB,EAAE,CAAC","sourcesContent":["import { createProjectLogger, createModuleLogger } from '@metamask/utils';\n\nexport const projectLogger = createProjectLogger('eth-block-tracker');\n\nexport { createModuleLogger };\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask-previews/eth-block-tracker",
-  "version": "15.0.1-preview-abca9bcea",
+  "version": "16.0.0-preview-0a30e47",
   "description": "A block tracker for the Ethereum blockchain. Keeps track of the latest block",
   "keywords": [
     "Ethereum",
@@ -19,20 +19,12 @@
     "dist",
     "dist/"
   ],
+  "type": "module",
   "sideEffects": false,
-  "main": "./dist/index.cjs",
-  "module": "./dist/index.mjs",
-  "types": "./dist/index.d.cts",
   "exports": {
     ".": {
-      "import": {
-        "types": "./dist/index.d.mts",
-        "default": "./dist/index.mjs"
-      },
-      "require": {
-        "types": "./dist/index.d.cts",
-        "default": "./dist/index.cjs"
-      }
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
     },
     "./package.json": "./package.json"
   },
@@ -41,9 +33,11 @@
     "registry": "https://registry.npmjs.org/"
   },
   "scripts": {
-    "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references",
-    "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean",
+    "build": "tsc --project tsconfig.build.json",
+    "build:all": "tsc --build tsconfig.build.json --verbose",
+    "build:clean": "yarn build:only-clean && yarn build",
     "build:docs": "typedoc",
+    "build:only-clean": "rimraf './dist' './tsconfig.build.tsbuildinfo'",
     "changelog:update": "../../scripts/update-changelog.sh @metamask/eth-block-tracker",
     "changelog:validate": "../../scripts/validate-changelog.sh @metamask/eth-block-tracker",
     "lint:tsconfigs": "tsx ../../scripts/lint-tsconfigs/lint-tsconfigs.mts",
@@ -55,26 +49,27 @@
     "test:watch": "NODE_OPTIONS=--experimental-vm-modules jest --watch"
   },
   "dependencies": {
-    "@metamask/eth-json-rpc-provider": "^6.0.1",
-    "@metamask/safe-event-emitter": "^3.0.0",
+    "@metamask/eth-json-rpc-provider": "^7.0.0",
+    "@metamask/safe-event-emitter": "^3.1.3",
     "@metamask/utils": "^11.12.0",
     "json-rpc-random-id": "^1.0.1"
   },
   "devDependencies": {
     "@metamask/auto-changelog": "^6.1.0",
-    "@metamask/json-rpc-engine": "^10.5.0",
-    "@ts-bridge/cli": "^0.6.4",
+    "@metamask/json-rpc-engine": "^11.0.0",
     "@types/jest": "^30.0.0",
     "@types/json-rpc-random-id": "^1.0.1",
+    "@typescript/native": "npm:typescript@^7.0.2",
     "deepmerge": "^4.2.2",
     "jest": "^30.4.2",
+    "rimraf": "^5.0.5",
     "ts-jest": "^29.4.11",
     "tsx": "^4.20.5",
     "typedoc": "^0.25.13",
     "typedoc-plugin-missing-exports": "^2.0.0",
-    "typescript": "~5.3.3"
+    "typescript": "npm:@typescript/typescript6@^6.0.2"
   },
   "engines": {
-    "node": "^18.18 || >=20"
+    "node": "^22.14.0 || ^24"
   }
 }

package/dist/BlockTracker.cjs

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=BlockTracker.cjs.map

package/dist/BlockTracker.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"BlockTracker.cjs","sourceRoot":"","sources":["../src/BlockTracker.ts"],"names":[],"mappings":"","sourcesContent":["import type SafeEventEmitter from '@metamask/safe-event-emitter';\n\nexport type BlockTracker = SafeEventEmitter & {\n  destroy(): Promise<void>;\n\n  isRunning(): boolean;\n\n  getCurrentBlock(): string | null;\n\n  getLatestBlock(): Promise<string>;\n\n  checkForLatestBlock(): Promise<string>;\n};\n"]}

package/dist/BlockTracker.d.cts

@@ -1,9 +0,0 @@
-import type SafeEventEmitter from "@metamask/safe-event-emitter";
-export type BlockTracker = SafeEventEmitter & {
-    destroy(): Promise<void>;
-    isRunning(): boolean;
-    getCurrentBlock(): string | null;
-    getLatestBlock(): Promise<string>;
-    checkForLatestBlock(): Promise<string>;
-};
-//# sourceMappingURL=BlockTracker.d.cts.map

package/dist/BlockTracker.d.cts.map

@@ -1 +0,0 @@
-{"version":3,"file":"BlockTracker.d.cts","sourceRoot":"","sources":["../src/BlockTracker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,gBAAgB,qCAAqC;AAEjE,MAAM,MAAM,YAAY,GAAG,gBAAgB,GAAG;IAC5C,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzB,SAAS,IAAI,OAAO,CAAC;IAErB,eAAe,IAAI,MAAM,GAAG,IAAI,CAAC;IAEjC,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAElC,mBAAmB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;CACxC,CAAC"}

package/dist/BlockTracker.d.mts.map

@@ -1 +0,0 @@
-{"version":3,"file":"BlockTracker.d.mts","sourceRoot":"","sources":["../src/BlockTracker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,gBAAgB,qCAAqC;AAEjE,MAAM,MAAM,YAAY,GAAG,gBAAgB,GAAG;IAC5C,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzB,SAAS,IAAI,OAAO,CAAC;IAErB,eAAe,IAAI,MAAM,GAAG,IAAI,CAAC;IAEjC,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAElC,mBAAmB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;CACxC,CAAC"}

package/dist/BlockTracker.mjs

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=BlockTracker.mjs.map

package/dist/BlockTracker.mjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"BlockTracker.mjs","sourceRoot":"","sources":["../src/BlockTracker.ts"],"names":[],"mappings":"","sourcesContent":["import type SafeEventEmitter from '@metamask/safe-event-emitter';\n\nexport type BlockTracker = SafeEventEmitter & {\n  destroy(): Promise<void>;\n\n  isRunning(): boolean;\n\n  getCurrentBlock(): string | null;\n\n  getLatestBlock(): Promise<string>;\n\n  checkForLatestBlock(): Promise<string>;\n};\n"]}