deps: nonce-tracker@^2.0.0->^3.0.0

MetaMask · Nov 15, 2023 · dcad094 · dcad094
1 parent 6e92916
commit dcad094
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 13 deletions.
diff --git a/packages/transaction-controller/package.json b/packages/transaction-controller/package.json
@@ -47,7 +47,7 @@
     "ethereumjs-util": "^7.0.10",
     "fast-json-patch": "^3.1.1",
     "lodash": "^4.17.21",
-    "nonce-tracker": "^2.0.0",
+    "nonce-tracker": "^3.0.0",
     "uuid": "^8.3.2"
   },
   "devDependencies": {

diff --git a/packages/transaction-controller/src/TransactionController.test.ts b/packages/transaction-controller/src/TransactionController.test.ts
@@ -20,7 +20,7 @@ import type {
 import { NetworkClientType, NetworkStatus } from '@metamask/network-controller';
 import { errorCodes, providerErrors, rpcErrors } from '@metamask/rpc-errors';
 import HttpProvider from 'ethjs-provider-http';
-import NonceTracker from 'nonce-tracker';
+import { NonceTracker } from 'nonce-tracker';
 
 import { FakeBlockTracker } from '../../../tests/fake-block-tracker';
 import { mockNetwork } from '../../../tests/mock-network';

diff --git a/packages/transaction-controller/src/TransactionController.ts b/packages/transaction-controller/src/TransactionController.ts
@@ -34,8 +34,8 @@ import MethodRegistry from 'eth-method-registry';
 import { addHexPrefix, bufferToHex } from 'ethereumjs-util';
 import { EventEmitter } from 'events';
 import { merge, pickBy } from 'lodash';
-import NonceTracker from 'nonce-tracker';
-import type { NonceLock } from 'nonce-tracker/dist/NonceTracker';
+import { NonceTracker } from 'nonce-tracker';
+import type { NonceLock } from 'nonce-tracker';
 import { v1 as random } from 'uuid';
 
 import { EtherscanRemoteTransactionSource } from './helpers/EtherscanRemoteTransactionSource';
@@ -462,6 +462,7 @@ export class TransactionController extends BaseController<
       hooks?.getAdditionalSignArguments ?? (() => []);
 
     this.nonceTracker = new NonceTracker({
+      // @ts-expect-error provider types misaligned: SafeEventEmitterProvider vs Record<string,string>
       provider,
       blockTracker,
       getPendingTransactions: (address) =>

diff --git a/packages/transaction-controller/src/helpers/PendingTransactionTracker.test.ts b/packages/transaction-controller/src/helpers/PendingTransactionTracker.test.ts
@@ -2,7 +2,7 @@
 
 import { query } from '@metamask/controller-utils';
 import type { BlockTracker } from '@metamask/network-controller';
-import type NonceTracker from 'nonce-tracker';
+import type { NonceTracker } from 'nonce-tracker';
 
 import { TransactionStatus } from '../types';
 import { PendingTransactionTracker } from './PendingTransactionTracker';

diff --git a/packages/transaction-controller/src/helpers/PendingTransactionTracker.ts b/packages/transaction-controller/src/helpers/PendingTransactionTracker.ts
@@ -3,7 +3,7 @@ import type EthQuery from '@metamask/eth-query';
 import type { BlockTracker } from '@metamask/network-controller';
 import { createModuleLogger } from '@metamask/utils';
 import EventEmitter from 'events';
-import type NonceTracker from 'nonce-tracker';
+import type { NonceTracker } from 'nonce-tracker';
 
 import { projectLogger } from '../logger';
 import type { TransactionState } from '../TransactionController';

diff --git a/packages/transaction-controller/src/utils/utils.test.ts b/packages/transaction-controller/src/utils/utils.test.ts
@@ -1,4 +1,4 @@
-import type { Transaction as NonceTrackerTransaction } from 'nonce-tracker/dist/NonceTracker';
+import type { Transaction as NonceTrackerTransaction } from 'nonce-tracker';
 
 import type {
   GasPriceValue,

diff --git a/packages/transaction-controller/src/utils/utils.ts b/packages/transaction-controller/src/utils/utils.ts
@@ -1,7 +1,7 @@
 import { convertHexToDecimal } from '@metamask/controller-utils';
 import { getKnownPropertyNames } from '@metamask/utils';
 import { addHexPrefix, isHexString } from 'ethereumjs-util';
-import type { Transaction as NonceTrackerTransaction } from 'nonce-tracker/dist/NonceTracker';
+import type { Transaction as NonceTrackerTransaction } from 'nonce-tracker';
 
 import type {
   GasPriceValue,

diff --git a/yarn.lock b/yarn.lock
@@ -2570,7 +2570,7 @@ __metadata:
     fast-json-patch: ^3.1.1
     jest: ^27.5.1
     lodash: ^4.17.21
-    nonce-tracker: ^2.0.0
+    nonce-tracker: ^3.0.0
     sinon: ^9.2.4
     ts-jest: ^27.1.4
     typedoc: ^0.24.8
@@ -8424,13 +8424,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nonce-tracker@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "nonce-tracker@npm:2.0.0"
+"nonce-tracker@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "nonce-tracker@npm:3.0.0"
   dependencies:
     "@ethersproject/providers": ^5.7.2
     async-mutex: ^0.3.1
-  checksum: 7fc901b7a5e5f3b1c6431864780ab47c69aed096f1bcc0903242e7c9189b78612fe04d076cf451ea63aa646858fb3bd834fc707223295ad8e04a3d847e5d703e
+  checksum: f679e83359c3d0b1941cb8569057445b5430b7e5645216442c256b2061ffb08ebee07e15011d3d55acf75710e054abd924c1b1bb38847956ef9f3bb7eed622d4
   languageName: node
   linkType: hard