diff --git a/app/scripts/lib/transaction/metrics.test.ts b/app/scripts/lib/transaction/metrics.test.ts index 7dcedd4e467e..c4ddf9d29e5a 100644 --- a/app/scripts/lib/transaction/metrics.test.ts +++ b/app/scripts/lib/transaction/metrics.test.ts @@ -115,6 +115,7 @@ describe('Transaction metrics', () => { type: TransactionType.simpleSend, origin: ORIGIN_METAMASK, chainId: mockChainId, + networkClientId: 'testNetworkClientId', time: 1624408066355, defaultGasEstimates: { gas: '0x7b0d', diff --git a/app/scripts/lib/transaction/smart-transactions.test.ts b/app/scripts/lib/transaction/smart-transactions.test.ts index b3ff3aa8fa7c..6b5c63c69f19 100644 --- a/app/scripts/lib/transaction/smart-transactions.test.ts +++ b/app/scripts/lib/transaction/smart-transactions.test.ts @@ -147,6 +147,7 @@ function withRequest( }, type: TransactionType.simpleSend, chainId: CHAIN_IDS.MAINNET, + networkClientId: 'testNetworkClientId', time: 1624408066355, defaultGasEstimates: { gas: '0x7b0d', diff --git a/app/scripts/metamask-controller.test.js b/app/scripts/metamask-controller.test.js index 750f8771568b..765779121aa2 100644 --- a/app/scripts/metamask-controller.test.js +++ b/app/scripts/metamask-controller.test.js @@ -21,7 +21,10 @@ import { } from '@metamask/keyring-api'; import { ControllerMessenger } from '@metamask/base-controller'; import { LoggingController, LogType } from '@metamask/logging-controller'; -import { TransactionController } from '@metamask/transaction-controller'; +import { + CHAIN_IDS, + TransactionController, +} from '@metamask/transaction-controller'; import { RatesController, TokenListController, @@ -1217,7 +1220,10 @@ describe('MetaMaskController', () => { ).toHaveBeenCalledTimes(1); expect( metamaskController.txController.wipeTransactions, - ).toHaveBeenCalledWith(false, selectedAddressMock); + ).toHaveBeenCalledWith({ + address: selectedAddressMock, + chainId: CHAIN_IDS.MAINNET, + }); expect( metamaskController.smartTransactionsController.wipeSmartTransactions, ).toHaveBeenCalledWith({ diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json index 94bf575e610a..3ec5394b584d 100644 --- a/lavamoat/browserify/beta/policy.json +++ b/lavamoat/browserify/beta/policy.json @@ -3142,7 +3142,6 @@ "@metamask/utils": true, "bn.js": true, "browserify>buffer": true, - "eth-method-registry": true, "fast-json-patch": true, "lodash": true, "uuid": true, diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json index 94bf575e610a..3ec5394b584d 100644 --- a/lavamoat/browserify/flask/policy.json +++ b/lavamoat/browserify/flask/policy.json @@ -3142,7 +3142,6 @@ "@metamask/utils": true, "bn.js": true, "browserify>buffer": true, - "eth-method-registry": true, "fast-json-patch": true, "lodash": true, "uuid": true, diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json index 94bf575e610a..3ec5394b584d 100644 --- a/lavamoat/browserify/main/policy.json +++ b/lavamoat/browserify/main/policy.json @@ -3142,7 +3142,6 @@ "@metamask/utils": true, "bn.js": true, "browserify>buffer": true, - "eth-method-registry": true, "fast-json-patch": true, "lodash": true, "uuid": true, diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json index 9acbc67302ab..47454c1373c9 100644 --- a/lavamoat/browserify/mmi/policy.json +++ b/lavamoat/browserify/mmi/policy.json @@ -3234,7 +3234,6 @@ "@metamask/utils": true, "bn.js": true, "browserify>buffer": true, - "eth-method-registry": true, "fast-json-patch": true, "lodash": true, "uuid": true, diff --git a/ui/pages/confirmations/hooks/alerts/transactions/usePendingTransactionAlerts.test.ts b/ui/pages/confirmations/hooks/alerts/transactions/usePendingTransactionAlerts.test.ts index 5d2c16a518e5..b9b3d12dc7d0 100644 --- a/ui/pages/confirmations/hooks/alerts/transactions/usePendingTransactionAlerts.test.ts +++ b/ui/pages/confirmations/hooks/alerts/transactions/usePendingTransactionAlerts.test.ts @@ -22,6 +22,7 @@ const CONFIRMATION_MOCK = genUnapprovedContractInteractionConfirmation({ const TRANSACTION_META_MOCK = { id: TRANSACTION_ID_MOCK, chainId: '0x5', + networkClientId: 'testNetworkClientId', status: TransactionStatus.submitted, type: TransactionType.contractInteraction, txParams: { diff --git a/ui/pages/confirmations/hooks/alerts/transactions/useResimulationAlert.test.ts b/ui/pages/confirmations/hooks/alerts/transactions/useResimulationAlert.test.ts index 174b6ec0398a..49209f69df9c 100644 --- a/ui/pages/confirmations/hooks/alerts/transactions/useResimulationAlert.test.ts +++ b/ui/pages/confirmations/hooks/alerts/transactions/useResimulationAlert.test.ts @@ -22,6 +22,7 @@ const CONFIRMATION_MOCK = genUnapprovedContractInteractionConfirmation({ const TRANSACTION_META_MOCK = { id: TRANSACTION_ID_MOCK, chainId: '0x5', + networkClientId: 'testNetworkClientId', status: TransactionStatus.submitted, type: TransactionType.contractInteraction, txParams: { diff --git a/ui/pages/confirmations/hooks/alerts/transactions/useSigningOrSubmittingAlerts.test.ts b/ui/pages/confirmations/hooks/alerts/transactions/useSigningOrSubmittingAlerts.test.ts index d1960827c0b1..08ed8f2aac7d 100644 --- a/ui/pages/confirmations/hooks/alerts/transactions/useSigningOrSubmittingAlerts.test.ts +++ b/ui/pages/confirmations/hooks/alerts/transactions/useSigningOrSubmittingAlerts.test.ts @@ -28,6 +28,7 @@ const CONFIRMATION_MOCK = genUnapprovedContractInteractionConfirmation({ const TRANSACTION_META_MOCK = { id: TRANSACTION_ID_MOCK, chainId: '0x5', + networkClientId: 'testNetworkClientId', status: TransactionStatus.submitted, type: TransactionType.contractInteraction, txParams: { diff --git a/yarn.lock b/yarn.lock index 08b4dadc9d0a..ae4f48ceb3f6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5087,25 +5087,7 @@ __metadata: languageName: node linkType: hard -"@metamask/controller-utils@npm:^11.0.0, @metamask/controller-utils@npm:^11.0.2, @metamask/controller-utils@npm:^11.1.0, @metamask/controller-utils@npm:^11.2.0, @metamask/controller-utils@npm:^11.3.0, @metamask/controller-utils@npm:^11.4.0, @metamask/controller-utils@npm:^11.4.1, @metamask/controller-utils@npm:^11.4.2": - version: 11.4.2 - resolution: "@metamask/controller-utils@npm:11.4.2" - dependencies: - "@ethereumjs/util": "npm:^8.1.0" - "@metamask/eth-query": "npm:^4.0.0" - "@metamask/ethjs-unit": "npm:^0.3.0" - "@metamask/utils": "npm:^10.0.0" - "@spruceid/siwe-parser": "npm:2.1.0" - "@types/bn.js": "npm:^5.1.5" - bignumber.js: "npm:^9.1.2" - bn.js: "npm:^5.2.1" - eth-ens-namehash: "npm:^2.0.8" - fast-deep-equal: "npm:^3.1.3" - checksum: 10/fdae49ee97e7a2a1bb6414011ca59932f8712a768a9c4c43673a2504c9fa9e61d83df53a21ff0506ef6a8cf774704f2df58a6d71385c8786ec5cab4359c051e1 - languageName: node - linkType: hard - -"@metamask/controller-utils@npm:^11.4.3": +"@metamask/controller-utils@npm:^11.0.0, @metamask/controller-utils@npm:^11.0.2, @metamask/controller-utils@npm:^11.1.0, @metamask/controller-utils@npm:^11.2.0, @metamask/controller-utils@npm:^11.3.0, @metamask/controller-utils@npm:^11.4.0, @metamask/controller-utils@npm:^11.4.1, @metamask/controller-utils@npm:^11.4.2, @metamask/controller-utils@npm:^11.4.3": version: 11.4.3 resolution: "@metamask/controller-utils@npm:11.4.3" dependencies: