Skip to content

Commit 14dde1c

Browse files
committed
use BlockTrackerPollingController for PendingUserOperationTracker
1 parent 8a684fb commit 14dde1c

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

packages/user-operation-controller/src/UserOperationController.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,6 @@ export class UserOperationController extends BaseController<
130130
messenger,
131131
});
132132

133-
this.#pendingUserOperationTracker.setIntervalLength(
134-
interval ?? DEFAULT_INTERVAL,
135-
);
136-
137133
this.#addPendingUserOperationTrackerListeners();
138134
}
139135

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { query } from '@metamask/controller-utils';
22
import EthQuery from '@metamask/eth-query';
3-
import type { Provider } from '@metamask/network-controller';
4-
import { PollingControllerOnly } from '@metamask/polling-controller';
3+
import type { NetworkClient, Provider } from '@metamask/network-controller';
4+
import { BlockTrackerPollingControllerOnly } from '@metamask/polling-controller';
55
import type { Json } from '@metamask/utils';
66
import { createModuleLogger } from '@metamask/utils';
77
import EventEmitter from 'events';
@@ -34,7 +34,7 @@ export type PendingUserOperationTrackerEventEmitter = EventEmitter & {
3434
emit<T extends keyof Events>(eventName: T, ...args: Events[T]): boolean;
3535
};
3636

37-
export class PendingUserOperationTracker extends PollingControllerOnly {
37+
export class PendingUserOperationTracker extends BlockTrackerPollingControllerOnly {
3838
hub: PendingUserOperationTrackerEventEmitter;
3939

4040
#getUserOperations: () => UserOperationMetadata[];
@@ -56,6 +56,13 @@ export class PendingUserOperationTracker extends PollingControllerOnly {
5656
this.#messenger = messenger;
5757
}
5858

59+
_getNetworkClientById(networkClientId: string): NetworkClient | undefined {
60+
return this.#messenger.call(
61+
'NetworkController:getNetworkClientById',
62+
networkClientId,
63+
);
64+
}
65+
5966
async _executePoll(networkClientId: string, _options: Json) {
6067
try {
6168
const { blockTracker, configuration, provider } = this.#messenger.call(

0 commit comments

Comments
 (0)