refactor!: move BlockTrackerPollingController to user-operation-controller

README.md

@@ -537,7 +537,6 @@ linkStyle default opacity:0.5
   phishing_controller --> messenger;
   phishing_controller --> transaction_controller;
   polling_controller --> base_controller;
-  polling_controller --> network_controller;
   polling_controller --> messenger;
   preferences_controller --> base_controller;
   preferences_controller --> messenger;

eslint-suppressions.json

@@ -1600,14 +1600,6 @@
       "count": 1
     }
   },
-  "packages/polling-controller/src/BlockTrackerPollingController.test.ts": {
-    "@typescript-eslint/explicit-function-return-type": {
-      "count": 2
-    },
-    "no-restricted-syntax": {
-      "count": 1
-    }
-  },
   "packages/profile-metrics-controller/src/index.ts": {
     "no-restricted-syntax": {
       "count": 2
@@ -2197,6 +2189,11 @@
       "count": 6
     }
   },
+  "packages/user-operation-controller/src/BlockTrackerPollingController.test.ts": {
+    "@typescript-eslint/explicit-function-return-type": {
+      "count": 1
+    }
+  },
   "packages/user-operation-controller/src/UserOperationController.test.ts": {
     "@typescript-eslint/explicit-function-return-type": {
       "count": 6

packages/polling-controller/CHANGELOG.md

@@ -7,10 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Export `AbstractPollingControllerBaseMixin`, `getKey`, `Constructor`, and `PollingTokenSetId` ([#9882](https://github.com/MetaMask/core/pull/9882))
+
 ### Changed
 
 - Bump `@metamask/network-controller` from `^35.0.0` to `^35.0.1` ([#9758](https://github.com/MetaMask/core/pull/9758))
 
+### Removed
+
+- **BREAKING:** Remove `BlockTrackerPollingController` and `BlockTrackerPollingControllerOnly` ([#9882](https://github.com/MetaMask/core/pull/9882))
+
 ## [16.0.9]
 
 ### Changed

packages/polling-controller/package.json

@@ -54,7 +54,6 @@
   },
   "dependencies": {
     "@metamask/base-controller": "^9.1.0",
-    "@metamask/network-controller": "^35.0.1",
     "@metamask/utils": "^11.11.0",
     "@types/uuid": "^8.3.0",
     "fast-json-stable-stringify": "^2.1.0",

packages/polling-controller/src/index.ts

@@ -1,11 +1,15 @@
-export {
-  BlockTrackerPollingControllerOnly,
-  BlockTrackerPollingController,
-} from './BlockTrackerPollingController.js';
-
 export {
   StaticIntervalPollingControllerOnly,
   StaticIntervalPollingController,
 } from './StaticIntervalPollingController.js';
 
-export type { IPollingController } from './types.js';
+export {
+  AbstractPollingControllerBaseMixin,
+  getKey,
+} from './AbstractPollingController.js';
+
+export type {
+  IPollingController,
+  Constructor,
+  PollingTokenSetId,
+} from './types.js';

packages/polling-controller/tsconfig.build.json

@@ -9,9 +9,6 @@
     {
       "path": "../base-controller/tsconfig.build.json"
     },
-    {
-      "path": "../network-controller/tsconfig.build.json"
-    },
     {
       "path": "../messenger/tsconfig.build.json"
     }

packages/polling-controller/tsconfig.json

@@ -8,9 +8,6 @@
     {
       "path": "../base-controller"
     },
-    {
-      "path": "../network-controller"
-    },
     {
       "path": "../messenger"
     }

packages/user-operation-controller/jest.config.js

@@ -17,10 +17,10 @@ module.exports = merge(baseConfig, {
   // An object that configures minimum threshold enforcement for coverage results
   coverageThreshold: {
     global: {
-      branches: 99.18,
+      branches: 97.64,
       functions: 100,
-      lines: 100,
-      statements: 100,
+      lines: 99.63,
+      statements: 99.63,
     },
   },
 });

packages/polling-controller/src/BlockTrackerPollingController.test.ts → packages/user-operation-controller/src/BlockTrackerPollingController.test.ts

@@ -33,11 +33,11 @@ class ChildBlockTrackerPollingController extends BlockTrackerPollingController<B
 }
 
 class TestBlockTracker extends EventEmitter {
-  private latestBlockNumber = 0;
+  #latestBlockNumber = 0;
 
-  emitBlockEvent() {
-    this.latestBlockNumber += 1;
-    this.emit('latest', this.latestBlockNumber);
+  emitBlockEvent(): void {
+    this.#latestBlockNumber += 1;
+    this.emit('latest', this.#latestBlockNumber);
   }
 }
 

packages/polling-controller/src/BlockTrackerPollingController.ts → packages/user-operation-controller/src/BlockTrackerPollingController.ts

@@ -3,13 +3,13 @@ import type {
   NetworkClientId,
   NetworkClient,
 } from '@metamask/network-controller';
-import type { Json } from '@metamask/utils';
-
 import {
   AbstractPollingControllerBaseMixin,
   getKey,
-} from './AbstractPollingController.js';
-import type { Constructor, PollingTokenSetId } from './types.js';
+  Constructor,
+  PollingTokenSetId,
+} from '@metamask/polling-controller';
+import type { Json } from '@metamask/utils';
 
 /**
  * The minimum input required to start polling for a {@link BlockTrackerPollingController}.

packages/user-operation-controller/src/helpers/PendingUserOperationTracker.ts

@@ -5,13 +5,13 @@ import type {
   NetworkClientId,
   Provider,
 } from '@metamask/network-controller';
-import { BlockTrackerPollingControllerOnly } from '@metamask/polling-controller';
 import { createModuleLogger } from '@metamask/utils';
 import type { Hex } from '@metamask/utils';
 // This package purposefully relies on Node's EventEmitter module.
 // eslint-disable-next-line import-x/no-nodejs-modules
 import EventEmitter from 'events';
 
+import { BlockTrackerPollingControllerOnly } from '../BlockTrackerPollingController.js';
 import { projectLogger } from '../logger.js';
 import type { UserOperationMetadata, UserOperationReceipt } from '../types.js';
 import { UserOperationStatus } from '../types.js';

yarn.lock

@@ -8512,7 +8512,6 @@ __metadata:
     "@metamask/auto-changelog": "npm:^6.1.0"
     "@metamask/base-controller": "npm:^9.1.0"
     "@metamask/messenger": "npm:^2.0.0"
-    "@metamask/network-controller": "npm:^35.0.1"
     "@metamask/utils": "npm:^11.11.0"
     "@ts-bridge/cli": "npm:^0.6.4"
     "@types/jest": "npm:^30.0.0"