From deca5ecef457472076ca3c9379c1b14722f19b01 Mon Sep 17 00:00:00 2001 From: legobt <6wbvkn0j@anonaddy.me> Date: Tue, 28 May 2024 06:50:06 +0000 Subject: [PATCH] deps: nonce-tracker@^3.0.0 -> @metamask/nonce-tracker@^5.0.0 --- packages/transaction-controller/package.json | 2 +- .../src/TransactionController.test.ts | 2 +- .../src/TransactionController.ts | 13 +++++----- .../helpers/MultichainTrackingHelper.test.ts | 2 +- .../src/helpers/MultichainTrackingHelper.ts | 2 +- .../src/utils/nonce.test.ts | 2 +- .../transaction-controller/src/utils/nonce.ts | 2 +- yarn.lock | 24 ++++++++++--------- 8 files changed, 26 insertions(+), 23 deletions(-) diff --git a/packages/transaction-controller/package.json b/packages/transaction-controller/package.json index 9e8e32d5c1b..759f21333ed 100644 --- a/packages/transaction-controller/package.json +++ b/packages/transaction-controller/package.json @@ -54,6 +54,7 @@ "@metamask/gas-fee-controller": "^15.1.2", "@metamask/metamask-eth-abis": "^3.1.1", "@metamask/network-controller": "^18.1.1", + "@metamask/nonce-tracker": "^5.0.0", "@metamask/rpc-errors": "^6.2.1", "@metamask/utils": "^8.3.0", "async-mutex": "^0.2.6", @@ -61,7 +62,6 @@ "eth-method-registry": "^4.0.0", "fast-json-patch": "^3.1.1", "lodash": "^4.17.21", - "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 index 0253086fd08..5cfbdb33fb2 100644 --- a/packages/transaction-controller/src/TransactionController.test.ts +++ b/packages/transaction-controller/src/TransactionController.test.ts @@ -23,10 +23,10 @@ import type { Provider, } from '@metamask/network-controller'; import { NetworkClientType, NetworkStatus } from '@metamask/network-controller'; +import * as NonceTrackerPackage from '@metamask/nonce-tracker'; import { errorCodes, providerErrors, rpcErrors } from '@metamask/rpc-errors'; import { createDeferredPromise } from '@metamask/utils'; import assert from 'assert'; -import * as NonceTrackerPackage from 'nonce-tracker'; import * as uuidModule from 'uuid'; import { FakeBlockTracker } from '../../../tests/fake-block-tracker'; diff --git a/packages/transaction-controller/src/TransactionController.ts b/packages/transaction-controller/src/TransactionController.ts index 8f0f6375787..76a8158ddfe 100644 --- a/packages/transaction-controller/src/TransactionController.ts +++ b/packages/transaction-controller/src/TransactionController.ts @@ -36,6 +36,11 @@ import type { NetworkControllerGetNetworkClientByIdAction, } from '@metamask/network-controller'; import { NetworkClientType } from '@metamask/network-controller'; +import { NonceTracker } from '@metamask/nonce-tracker'; +import type { + NonceLock, + Transaction as NonceTrackerTransaction, +} from '@metamask/nonce-tracker'; import { errorCodes, rpcErrors, providerErrors } from '@metamask/rpc-errors'; import type { Hex } from '@metamask/utils'; import { add0x } from '@metamask/utils'; @@ -43,11 +48,6 @@ import { Mutex } from 'async-mutex'; import { MethodRegistry } from 'eth-method-registry'; import { EventEmitter } from 'events'; import { cloneDeep, mapValues, merge, pickBy, sortBy, isEqual } from 'lodash'; -import { NonceTracker } from 'nonce-tracker'; -import type { - NonceLock, - Transaction as NonceTrackerTransaction, -} from 'nonce-tracker'; import { v1 as random } from 'uuid'; import { DefaultGasFeeFlow } from './gas-flows/DefaultGasFeeFlow'; @@ -3402,9 +3402,10 @@ export class TransactionController extends BaseController< chainId?: Hex; }): NonceTracker { return new NonceTracker({ - // TODO: Replace `any` with type + // TODO: Fix types // eslint-disable-next-line @typescript-eslint/no-explicit-any provider: provider as any, + // @ts-expect-error TODO: Fix types blockTracker, getPendingTransactions: this.#getNonceTrackerPendingTransactions.bind( this, diff --git a/packages/transaction-controller/src/helpers/MultichainTrackingHelper.test.ts b/packages/transaction-controller/src/helpers/MultichainTrackingHelper.test.ts index b50a3bc352d..5a03b5c55f9 100644 --- a/packages/transaction-controller/src/helpers/MultichainTrackingHelper.test.ts +++ b/packages/transaction-controller/src/helpers/MultichainTrackingHelper.test.ts @@ -1,8 +1,8 @@ /* eslint-disable jsdoc/require-jsdoc */ import { ChainId } from '@metamask/controller-utils'; import type { NetworkClientId, Provider } from '@metamask/network-controller'; +import type { NonceTracker } from '@metamask/nonce-tracker'; import type { Hex } from '@metamask/utils'; -import type { NonceTracker } from 'nonce-tracker'; import { useFakeTimers } from 'sinon'; import { advanceTime } from '../../../../tests/helpers'; diff --git a/packages/transaction-controller/src/helpers/MultichainTrackingHelper.ts b/packages/transaction-controller/src/helpers/MultichainTrackingHelper.ts index 7eaa09d60bf..4c2e3fdd646 100644 --- a/packages/transaction-controller/src/helpers/MultichainTrackingHelper.ts +++ b/packages/transaction-controller/src/helpers/MultichainTrackingHelper.ts @@ -7,9 +7,9 @@ import type { Provider, NetworkControllerStateChangeEvent, } from '@metamask/network-controller'; +import type { NonceLock, NonceTracker } from '@metamask/nonce-tracker'; import type { Hex } from '@metamask/utils'; import { Mutex } from 'async-mutex'; -import type { NonceLock, NonceTracker } from 'nonce-tracker'; import { incomingTransactionsLogger as log } from '../logger'; import { EtherscanRemoteTransactionSource } from './EtherscanRemoteTransactionSource'; diff --git a/packages/transaction-controller/src/utils/nonce.test.ts b/packages/transaction-controller/src/utils/nonce.test.ts index 87238f3a69b..ce26077d4f5 100644 --- a/packages/transaction-controller/src/utils/nonce.test.ts +++ b/packages/transaction-controller/src/utils/nonce.test.ts @@ -1,7 +1,7 @@ import type { NonceLock, Transaction as NonceTrackerTransaction, -} from 'nonce-tracker'; +} from '@metamask/nonce-tracker'; import type { TransactionMeta } from '../types'; import { TransactionStatus } from '../types'; diff --git a/packages/transaction-controller/src/utils/nonce.ts b/packages/transaction-controller/src/utils/nonce.ts index 545f3a8156b..b95a73a1682 100644 --- a/packages/transaction-controller/src/utils/nonce.ts +++ b/packages/transaction-controller/src/utils/nonce.ts @@ -2,7 +2,7 @@ import { toHex } from '@metamask/controller-utils'; import type { NonceLock, Transaction as NonceTrackerTransaction, -} from 'nonce-tracker'; +} from '@metamask/nonce-tracker'; import { createModuleLogger, projectLogger } from '../logger'; import type { TransactionMeta, TransactionStatus } from '../types'; diff --git a/yarn.lock b/yarn.lock index a910821fb82..9b4adc9e12b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2555,6 +2555,18 @@ __metadata: languageName: unknown linkType: soft +"@metamask/nonce-tracker@npm:^5.0.0": + version: 5.0.0 + resolution: "@metamask/nonce-tracker@npm:5.0.0" + dependencies: + "@ethersproject/providers": ^5.7.2 + async-mutex: ^0.3.1 + peerDependencies: + "@metamask/eth-block-tracker": ">=9" + checksum: 31de9d62f2aec52688a4b7ec1fab877d1f2f4e6b2b395abef2790ddee63b3511f312c07c29d1c191f900231dbd4cdde8e969b210462f78253a177cacee72688c + languageName: node + linkType: hard + "@metamask/notification-controller@workspace:packages/notification-controller": version: 0.0.0-use.local resolution: "@metamask/notification-controller@workspace:packages/notification-controller" @@ -3044,6 +3056,7 @@ __metadata: "@metamask/gas-fee-controller": ^15.1.2 "@metamask/metamask-eth-abis": ^3.1.1 "@metamask/network-controller": ^18.1.1 + "@metamask/nonce-tracker": ^5.0.0 "@metamask/rpc-errors": ^6.2.1 "@metamask/utils": ^8.3.0 "@types/bn.js": ^5.1.5 @@ -3058,7 +3071,6 @@ __metadata: jest: ^27.5.1 lodash: ^4.17.21 nock: ^13.3.1 - nonce-tracker: ^3.0.0 sinon: ^9.2.4 ts-jest: ^27.1.4 typedoc: ^0.24.8 @@ -9422,16 +9434,6 @@ __metadata: languageName: node linkType: hard -"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: f679e83359c3d0b1941cb8569057445b5430b7e5645216442c256b2061ffb08ebee07e15011d3d55acf75710e054abd924c1b1bb38847956ef9f3bb7eed622d4 - languageName: node - linkType: hard - "nopt@npm:^7.0.0": version: 7.2.0 resolution: "nopt@npm:7.2.0"