diff --git a/package.json b/package.json index 8e217d43e8..1c686dbde9 100644 --- a/package.json +++ b/package.json @@ -79,11 +79,6 @@ "@lavamoat/preinstall-always-fail": false, "@keystonehq/bc-ur-registry-eth>hdkey>secp256k1": true, "babel-runtime>core-js": false, - "eth-sig-util>ethereumjs-abi>ethereumjs-util>keccakjs>sha3": true, - "eth-sig-util>ethereumjs-util>keccak": true, - "eth-sig-util>ethereumjs-util>secp256k1": true, - "ethereumjs-util>ethereum-cryptography>keccak": true, - "ethereumjs-util>ethereum-cryptography>secp256k1": true, "simple-git-hooks": false } } diff --git a/packages/accounts-controller/package.json b/packages/accounts-controller/package.json index aaff428430..56fb842db9 100644 --- a/packages/accounts-controller/package.json +++ b/packages/accounts-controller/package.json @@ -29,13 +29,13 @@ "test:watch": "jest --watch" }, "dependencies": { + "@ethereumjs/util": "^8.1.0", "@metamask/base-controller": "^3.2.3", "@metamask/eth-snap-keyring": "^1.0.0", "@metamask/keyring-api": "^1.0.0", "@metamask/snaps-utils": "^3.0.0", "@metamask/utils": "^8.1.0", "deepmerge": "^4.2.2", - "ethereumjs-util": "^7.0.10", "immer": "^9.0.6", "uuid": "^8.3.2" }, diff --git a/packages/accounts-controller/src/AccountsController.ts b/packages/accounts-controller/src/AccountsController.ts index 264a705238..df05be2a33 100644 --- a/packages/accounts-controller/src/AccountsController.ts +++ b/packages/accounts-controller/src/AccountsController.ts @@ -1,3 +1,4 @@ +import { sha256FromString } from '@ethereumjs/util'; import type { RestrictedControllerMessenger } from '@metamask/base-controller'; import { BaseControllerV2 } from '@metamask/base-controller'; import { SnapKeyring } from '@metamask/eth-snap-keyring'; @@ -16,7 +17,6 @@ import type { } from '@metamask/snaps-controllers'; import type { Snap, ValidatedSnapId } from '@metamask/snaps-utils'; import type { Keyring, Json } from '@metamask/utils'; -import { sha256FromString } from 'ethereumjs-util'; import type { Patch } from 'immer'; import { v4 as uuid } from 'uuid'; diff --git a/packages/assets-controllers/package.json b/packages/assets-controllers/package.json index 309805922a..086cac461c 100644 --- a/packages/assets-controllers/package.json +++ b/packages/assets-controllers/package.json @@ -29,6 +29,7 @@ "test:watch": "jest --watch" }, "dependencies": { + "@ethereumjs/util": "^8.1.0", "@ethersproject/address": "^5.7.0", "@ethersproject/bignumber": "^5.7.0", "@ethersproject/contracts": "^5.7.0", @@ -47,7 +48,6 @@ "@metamask/utils": "^8.1.0", "@types/uuid": "^8.3.0", "async-mutex": "^0.2.6", - "ethereumjs-util": "^7.0.10", "immer": "^9.0.6", "multiformats": "^9.5.2", "single-call-balance-checker-abi": "^1.0.0", diff --git a/packages/assets-controllers/src/AssetsContractController.ts b/packages/assets-controllers/src/AssetsContractController.ts index 707a0650db..5aabf5a054 100644 --- a/packages/assets-controllers/src/AssetsContractController.ts +++ b/packages/assets-controllers/src/AssetsContractController.ts @@ -1,3 +1,4 @@ +import type { BN } from '@ethereumjs/util'; import { Contract } from '@ethersproject/contracts'; import { Web3Provider } from '@ethersproject/providers'; import type { BaseConfig, BaseState } from '@metamask/base-controller'; @@ -10,7 +11,6 @@ import type { } from '@metamask/network-controller'; import type { PreferencesState } from '@metamask/preferences-controller'; import type { Hex } from '@metamask/utils'; -import type { BN } from 'ethereumjs-util'; import abiSingleCallBalancesContract from 'single-call-balance-checker-abi'; import { SupportedTokenDetectionNetworks } from './assetsUtil'; diff --git a/packages/assets-controllers/src/NftController.test.ts b/packages/assets-controllers/src/NftController.test.ts index a57f60143f..94cac46efe 100644 --- a/packages/assets-controllers/src/NftController.test.ts +++ b/packages/assets-controllers/src/NftController.test.ts @@ -1,3 +1,4 @@ +import { BN } from '@ethereumjs/util'; import type { Network } from '@ethersproject/providers'; import type { AddApprovalRequest, @@ -24,7 +25,6 @@ import type { } from '@metamask/network-controller'; import { defaultState as defaultNetworkState } from '@metamask/network-controller'; import { PreferencesController } from '@metamask/preferences-controller'; -import { BN } from 'ethereumjs-util'; import HttpProvider from 'ethjs-provider-http'; import nock from 'nock'; import * as sinon from 'sinon'; diff --git a/packages/assets-controllers/src/NftController.ts b/packages/assets-controllers/src/NftController.ts index dd9122f6ff..28b27e9503 100644 --- a/packages/assets-controllers/src/NftController.ts +++ b/packages/assets-controllers/src/NftController.ts @@ -1,3 +1,4 @@ +import { BN, stripHexPrefix } from '@ethereumjs/util'; import { isAddress } from '@ethersproject/address'; import type { AddApprovalRequest } from '@metamask/approval-controller'; import type { @@ -27,7 +28,6 @@ import type { PreferencesState } from '@metamask/preferences-controller'; import { rpcErrors } from '@metamask/rpc-errors'; import type { Hex } from '@metamask/utils'; import { Mutex } from 'async-mutex'; -import { BN, stripHexPrefix } from 'ethereumjs-util'; import { EventEmitter } from 'events'; import { v4 as random } from 'uuid'; diff --git a/packages/assets-controllers/src/Standards/ERC20Standard.ts b/packages/assets-controllers/src/Standards/ERC20Standard.ts index 98adf5aa7e..8790fa9d78 100644 --- a/packages/assets-controllers/src/Standards/ERC20Standard.ts +++ b/packages/assets-controllers/src/Standards/ERC20Standard.ts @@ -1,11 +1,11 @@ +import { toUtf8 } from '@ethereumjs/util'; +import type { BN } from '@ethereumjs/util'; import { Contract } from '@ethersproject/contracts'; import type { Web3Provider } from '@ethersproject/providers'; import { decodeSingle } from '@metamask/abi-utils'; import { ERC20 } from '@metamask/controller-utils'; import { abiERC20 } from '@metamask/metamask-eth-abis'; import { assertIsStrictHexString } from '@metamask/utils'; -import { toUtf8 } from 'ethereumjs-util'; -import type { BN } from 'ethereumjs-util'; import { ethersBigNumberToBN } from '../assetsUtil'; diff --git a/packages/assets-controllers/src/Standards/NftStandards/ERC1155/ERC1155Standard.ts b/packages/assets-controllers/src/Standards/NftStandards/ERC1155/ERC1155Standard.ts index 7901a57656..52f9ffd8ae 100644 --- a/packages/assets-controllers/src/Standards/NftStandards/ERC1155/ERC1155Standard.ts +++ b/packages/assets-controllers/src/Standards/NftStandards/ERC1155/ERC1155Standard.ts @@ -1,3 +1,4 @@ +import type { BN } from '@ethereumjs/util'; import { Contract } from '@ethersproject/contracts'; import type { Web3Provider } from '@ethersproject/providers'; import { @@ -8,7 +9,6 @@ import { timeoutFetch, } from '@metamask/controller-utils'; import { abiERC1155 } from '@metamask/metamask-eth-abis'; -import type { BN } from 'ethereumjs-util'; import { getFormattedIpfsUrl, ethersBigNumberToBN } from '../../../assetsUtil'; diff --git a/packages/assets-controllers/src/TokenBalancesController.test.ts b/packages/assets-controllers/src/TokenBalancesController.test.ts index 2be2e5c0fc..0a968cef1a 100644 --- a/packages/assets-controllers/src/TokenBalancesController.test.ts +++ b/packages/assets-controllers/src/TokenBalancesController.test.ts @@ -1,9 +1,9 @@ +import { BN } from '@ethereumjs/util'; import { ControllerMessenger } from '@metamask/base-controller'; import { toHex } from '@metamask/controller-utils'; import type { NetworkControllerMessenger } from '@metamask/network-controller'; import { NetworkController } from '@metamask/network-controller'; import { PreferencesController } from '@metamask/preferences-controller'; -import { BN } from 'ethereumjs-util'; import * as sinon from 'sinon'; import { AssetsContractController } from './AssetsContractController'; diff --git a/packages/assets-controllers/src/TokenBalancesController.ts b/packages/assets-controllers/src/TokenBalancesController.ts index 5ce5d05801..796db303b4 100644 --- a/packages/assets-controllers/src/TokenBalancesController.ts +++ b/packages/assets-controllers/src/TokenBalancesController.ts @@ -1,8 +1,8 @@ +import { BN } from '@ethereumjs/util'; import type { BaseConfig, BaseState } from '@metamask/base-controller'; import { BaseController } from '@metamask/base-controller'; import { safelyExecute } from '@metamask/controller-utils'; import type { PreferencesState } from '@metamask/preferences-controller'; -import { BN } from 'ethereumjs-util'; import type { AssetsContractController } from './AssetsContractController'; import type { Token } from './TokenRatesController'; diff --git a/packages/assets-controllers/src/TokenDetectionController.test.ts b/packages/assets-controllers/src/TokenDetectionController.test.ts index 36c0e4176a..9ad4c781ae 100644 --- a/packages/assets-controllers/src/TokenDetectionController.test.ts +++ b/packages/assets-controllers/src/TokenDetectionController.test.ts @@ -1,3 +1,4 @@ +import { BN } from '@ethereumjs/util'; import { ControllerMessenger } from '@metamask/base-controller'; import { ChainId, @@ -13,7 +14,6 @@ import type { ProviderConfig, } from '@metamask/network-controller'; import { PreferencesController } from '@metamask/preferences-controller'; -import { BN } from 'ethereumjs-util'; import nock from 'nock'; import * as sinon from 'sinon'; diff --git a/packages/assets-controllers/src/assetsUtil.ts b/packages/assets-controllers/src/assetsUtil.ts index e18ed10cf9..4aeae85c01 100644 --- a/packages/assets-controllers/src/assetsUtil.ts +++ b/packages/assets-controllers/src/assetsUtil.ts @@ -1,3 +1,4 @@ +import { BN, stripHexPrefix } from '@ethereumjs/util'; import type { BigNumber } from '@ethersproject/bignumber'; import { convertHexToDecimal, @@ -6,7 +7,6 @@ import { } from '@metamask/controller-utils'; import { rpcErrors } from '@metamask/rpc-errors'; import type { Hex } from '@metamask/utils'; -import { BN, stripHexPrefix } from 'ethereumjs-util'; import { CID } from 'multiformats/cid'; import type { Nft, NftMetadata } from './NftController'; diff --git a/packages/controller-utils/package.json b/packages/controller-utils/package.json index 62c28d7b53..a66b5470fe 100644 --- a/packages/controller-utils/package.json +++ b/packages/controller-utils/package.json @@ -29,11 +29,11 @@ "test:watch": "jest --watch" }, "dependencies": { + "@ethereumjs/util": "^8.1.0", "@metamask/eth-query": "^3.0.1", "@metamask/utils": "^8.1.0", "@spruceid/siwe-parser": "1.1.3", "eth-ens-namehash": "^2.0.8", - "ethereumjs-util": "^7.0.10", "ethjs-unit": "^0.1.6", "fast-deep-equal": "^3.1.3" }, diff --git a/packages/controller-utils/src/siwe.ts b/packages/controller-utils/src/siwe.ts index ced594725d..fdef0a4694 100644 --- a/packages/controller-utils/src/siwe.ts +++ b/packages/controller-utils/src/siwe.ts @@ -1,5 +1,5 @@ +import { isHexPrefixed } from '@ethereumjs/util'; import { ParsedMessage } from '@spruceid/siwe-parser'; -import { isHexPrefixed } from 'ethereumjs-util'; import { projectLogger, createModuleLogger } from './logger'; diff --git a/packages/controller-utils/src/util.test.ts b/packages/controller-utils/src/util.test.ts index 37e1f3d3d8..a4eff7554b 100644 --- a/packages/controller-utils/src/util.test.ts +++ b/packages/controller-utils/src/util.test.ts @@ -1,4 +1,4 @@ -import { BN } from 'ethereumjs-util'; +import { BN } from '@ethereumjs/util'; import nock from 'nock'; import { MAX_SAFE_CHAIN_ID } from './constants'; diff --git a/packages/controller-utils/src/util.ts b/packages/controller-utils/src/util.ts index 7e89f77ae5..b07f010caf 100644 --- a/packages/controller-utils/src/util.ts +++ b/packages/controller-utils/src/util.ts @@ -1,7 +1,3 @@ -import type EthQuery from '@metamask/eth-query'; -import type { Hex, Json } from '@metamask/utils'; -import { isStrictHexString } from '@metamask/utils'; -import ensNamehash from 'eth-ens-namehash'; import { addHexPrefix, isValidAddress, @@ -9,7 +5,11 @@ import { BN, toChecksumAddress, stripHexPrefix, -} from 'ethereumjs-util'; +} from '@ethereumjs/util'; +import type EthQuery from '@metamask/eth-query'; +import type { Hex, Json } from '@metamask/utils'; +import { isStrictHexString } from '@metamask/utils'; +import ensNamehash from 'eth-ens-namehash'; import { fromWei, toWei } from 'ethjs-unit'; import deepEqual from 'fast-deep-equal'; diff --git a/packages/gas-fee-controller/package.json b/packages/gas-fee-controller/package.json index 6de6948798..226b9a9b18 100644 --- a/packages/gas-fee-controller/package.json +++ b/packages/gas-fee-controller/package.json @@ -29,6 +29,7 @@ "test:watch": "jest --watch" }, "dependencies": { + "@ethereumjs/util": "^8.1.0", "@metamask/base-controller": "^3.2.3", "@metamask/controller-utils": "^5.0.2", "@metamask/eth-query": "^3.0.1", @@ -36,7 +37,6 @@ "@metamask/polling-controller": "^0.2.0", "@metamask/utils": "^8.1.0", "@types/uuid": "^8.3.0", - "ethereumjs-util": "^7.0.10", "ethjs-unit": "^0.1.6", "immer": "^9.0.6", "uuid": "^8.3.2" diff --git a/packages/gas-fee-controller/src/fetchBlockFeeHistory.test.ts b/packages/gas-fee-controller/src/fetchBlockFeeHistory.test.ts index 69554bec0c..39fea4415f 100644 --- a/packages/gas-fee-controller/src/fetchBlockFeeHistory.test.ts +++ b/packages/gas-fee-controller/src/fetchBlockFeeHistory.test.ts @@ -1,5 +1,5 @@ +import { BN } from '@ethereumjs/util'; import { query, fromHex, toHex } from '@metamask/controller-utils'; -import { BN } from 'ethereumjs-util'; import { when } from 'jest-when'; import fetchBlockFeeHistory from './fetchBlockFeeHistory'; diff --git a/packages/gas-fee-controller/src/fetchBlockFeeHistory.ts b/packages/gas-fee-controller/src/fetchBlockFeeHistory.ts index c7ca903e6d..899e9786ae 100644 --- a/packages/gas-fee-controller/src/fetchBlockFeeHistory.ts +++ b/packages/gas-fee-controller/src/fetchBlockFeeHistory.ts @@ -1,5 +1,5 @@ +import { BN } from '@ethereumjs/util'; import { query, fromHex, toHex } from '@metamask/controller-utils'; -import { BN } from 'ethereumjs-util'; type EthQuery = any; diff --git a/packages/gas-fee-controller/src/fetchGasEstimatesViaEthFeeHistory.test.ts b/packages/gas-fee-controller/src/fetchGasEstimatesViaEthFeeHistory.test.ts index 11c0384214..c2850c4814 100644 --- a/packages/gas-fee-controller/src/fetchGasEstimatesViaEthFeeHistory.test.ts +++ b/packages/gas-fee-controller/src/fetchGasEstimatesViaEthFeeHistory.test.ts @@ -1,4 +1,4 @@ -import { BN } from 'ethereumjs-util'; +import { BN } from '@ethereumjs/util'; import { when } from 'jest-when'; import fetchBlockFeeHistory from './fetchBlockFeeHistory'; diff --git a/packages/gas-fee-controller/src/fetchGasEstimatesViaEthFeeHistory/calculateGasFeeEstimatesForPriorityLevels.test.ts b/packages/gas-fee-controller/src/fetchGasEstimatesViaEthFeeHistory/calculateGasFeeEstimatesForPriorityLevels.test.ts index f39f368496..78b14d1e32 100644 --- a/packages/gas-fee-controller/src/fetchGasEstimatesViaEthFeeHistory/calculateGasFeeEstimatesForPriorityLevels.test.ts +++ b/packages/gas-fee-controller/src/fetchGasEstimatesViaEthFeeHistory/calculateGasFeeEstimatesForPriorityLevels.test.ts @@ -1,4 +1,4 @@ -import { BN } from 'ethereumjs-util'; +import { BN } from '@ethereumjs/util'; import calculateGasFeeEstimatesForPriorityLevels from './calculateGasFeeEstimatesForPriorityLevels'; diff --git a/packages/gas-fee-controller/src/fetchGasEstimatesViaEthFeeHistory/calculateGasFeeEstimatesForPriorityLevels.ts b/packages/gas-fee-controller/src/fetchGasEstimatesViaEthFeeHistory/calculateGasFeeEstimatesForPriorityLevels.ts index 80022c7f7b..251510b520 100644 --- a/packages/gas-fee-controller/src/fetchGasEstimatesViaEthFeeHistory/calculateGasFeeEstimatesForPriorityLevels.ts +++ b/packages/gas-fee-controller/src/fetchGasEstimatesViaEthFeeHistory/calculateGasFeeEstimatesForPriorityLevels.ts @@ -1,5 +1,5 @@ +import { BN } from '@ethereumjs/util'; import { GWEI } from '@metamask/controller-utils'; -import { BN } from 'ethereumjs-util'; import { fromWei } from 'ethjs-unit'; import type { FeeHistoryBlock } from '../fetchBlockFeeHistory'; diff --git a/packages/gas-fee-controller/src/fetchGasEstimatesViaEthFeeHistory/medianOf.ts b/packages/gas-fee-controller/src/fetchGasEstimatesViaEthFeeHistory/medianOf.ts index c7dfdc2a6f..0b6221de87 100644 --- a/packages/gas-fee-controller/src/fetchGasEstimatesViaEthFeeHistory/medianOf.ts +++ b/packages/gas-fee-controller/src/fetchGasEstimatesViaEthFeeHistory/medianOf.ts @@ -1,4 +1,4 @@ -import type { BN } from 'ethereumjs-util'; +import type { BN } from '@ethereumjs/util'; /** * Finds the median among a list of numbers. Note that this is different from the implementation diff --git a/packages/gas-fee-controller/src/fetchGasEstimatesViaEthFeeHistory/types.ts b/packages/gas-fee-controller/src/fetchGasEstimatesViaEthFeeHistory/types.ts index 296700bd6d..bbd90256ba 100644 --- a/packages/gas-fee-controller/src/fetchGasEstimatesViaEthFeeHistory/types.ts +++ b/packages/gas-fee-controller/src/fetchGasEstimatesViaEthFeeHistory/types.ts @@ -1,4 +1,4 @@ -import type { BN } from 'ethereumjs-util'; +import type { BN } from '@ethereumjs/util'; export type EthBlock = { number: BN; diff --git a/packages/gas-fee-controller/src/gas-util.ts b/packages/gas-fee-controller/src/gas-util.ts index 6d91495bfe..8638b3e1a8 100644 --- a/packages/gas-fee-controller/src/gas-util.ts +++ b/packages/gas-fee-controller/src/gas-util.ts @@ -1,3 +1,4 @@ +import { BN } from '@ethereumjs/util'; import { query, handleFetch, @@ -5,7 +6,6 @@ import { weiHexToGweiDec, } from '@metamask/controller-utils'; import type EthQuery from '@metamask/eth-query'; -import { BN } from 'ethereumjs-util'; import type { GasFeeEstimates, diff --git a/packages/keyring-controller/package.json b/packages/keyring-controller/package.json index 398404c5cc..03f21d065e 100644 --- a/packages/keyring-controller/package.json +++ b/packages/keyring-controller/package.json @@ -29,6 +29,7 @@ "test:watch": "jest --watch" }, "dependencies": { + "@ethereumjs/util": "^8.1.0", "@keystonehq/metamask-airgapped-keyring": "^0.13.1", "@metamask/base-controller": "^3.2.3", "@metamask/eth-keyring-controller": "^13.0.1", @@ -36,7 +37,6 @@ "@metamask/preferences-controller": "^4.4.3", "@metamask/utils": "^8.1.0", "async-mutex": "^0.2.6", - "ethereumjs-util": "^7.0.10", "ethereumjs-wallet": "^1.0.1", "immer": "^9.0.6" }, diff --git a/packages/keyring-controller/src/KeyringController.test.ts b/packages/keyring-controller/src/KeyringController.test.ts index 2cc605a8d0..a033960e0d 100644 --- a/packages/keyring-controller/src/KeyringController.test.ts +++ b/packages/keyring-controller/src/KeyringController.test.ts @@ -1,5 +1,6 @@ import { Chain, Common, Hardfork } from '@ethereumjs/common'; import { TransactionFactory } from '@ethereumjs/tx'; +import { bufferToHex } from '@ethereumjs/util'; import { CryptoHDKey, ETHSignature } from '@keystonehq/bc-ur-registry-eth'; import { MetaMaskKeyring as QRKeyring } from '@keystonehq/metamask-airgapped-keyring'; import { ControllerMessenger } from '@metamask/base-controller'; @@ -18,7 +19,6 @@ import { type Keyring, type Json, } from '@metamask/utils'; -import { bufferToHex } from 'ethereumjs-util'; import * as sinon from 'sinon'; import * as uuid from 'uuid'; diff --git a/packages/keyring-controller/src/KeyringController.ts b/packages/keyring-controller/src/KeyringController.ts index b51f2f2625..cbd4aecce2 100644 --- a/packages/keyring-controller/src/KeyringController.ts +++ b/packages/keyring-controller/src/KeyringController.ts @@ -1,4 +1,12 @@ import type { TxData, TypedTransaction } from '@ethereumjs/tx'; +import { + addHexPrefix, + bufferToHex, + isValidPrivate, + toBuffer, + stripHexPrefix, + getBinarySize, +} from '@ethereumjs/util'; import type { MetaMaskKeyring as QRKeyring, IKeyringState as IQRKeyringState, @@ -14,14 +22,6 @@ import type { PreferencesController } from '@metamask/preferences-controller'; import type { Eip1024EncryptedData, Hex, Keyring, Json } from '@metamask/utils'; import { assertIsStrictHexString, hasProperty } from '@metamask/utils'; import { Mutex } from 'async-mutex'; -import { - addHexPrefix, - bufferToHex, - isValidPrivate, - toBuffer, - stripHexPrefix, - getBinarySize, -} from 'ethereumjs-util'; import Wallet, { thirdparty as importers } from 'ethereumjs-wallet'; import type { Patch } from 'immer'; diff --git a/packages/message-manager/package.json b/packages/message-manager/package.json index 48b9b2d8bf..0b63cae65c 100644 --- a/packages/message-manager/package.json +++ b/packages/message-manager/package.json @@ -29,12 +29,12 @@ "test:watch": "jest --watch" }, "dependencies": { + "@ethereumjs/util": "^8.1.0", "@metamask/base-controller": "^3.2.3", "@metamask/controller-utils": "^5.0.2", "@metamask/eth-sig-util": "^7.0.0", "@metamask/utils": "^8.1.0", "@types/uuid": "^8.3.0", - "ethereumjs-util": "^7.0.10", "jsonschema": "^1.2.4", "uuid": "^8.3.2" }, diff --git a/packages/message-manager/src/utils.ts b/packages/message-manager/src/utils.ts index 6d80714c48..0e52d249e5 100644 --- a/packages/message-manager/src/utils.ts +++ b/packages/message-manager/src/utils.ts @@ -1,10 +1,10 @@ +import { addHexPrefix, bufferToHex, stripHexPrefix } from '@ethereumjs/util'; import { isValidHexAddress } from '@metamask/controller-utils'; import { TYPED_MESSAGE_SCHEMA, typedSignatureHash, } from '@metamask/eth-sig-util'; import type { Hex } from '@metamask/utils'; -import { addHexPrefix, bufferToHex, stripHexPrefix } from 'ethereumjs-util'; import { validate } from 'jsonschema'; import type { DecryptMessageParams } from './DecryptMessageManager'; diff --git a/packages/signature-controller/package.json b/packages/signature-controller/package.json index 01fe37e14e..124af6565f 100644 --- a/packages/signature-controller/package.json +++ b/packages/signature-controller/package.json @@ -29,6 +29,7 @@ "test:watch": "jest --watch" }, "dependencies": { + "@ethereumjs/util": "^8.1.0", "@metamask/approval-controller": "^4.0.1", "@metamask/base-controller": "^3.2.3", "@metamask/controller-utils": "^5.0.2", @@ -36,7 +37,6 @@ "@metamask/message-manager": "^7.3.5", "@metamask/rpc-errors": "^6.1.0", "@metamask/utils": "^8.1.0", - "ethereumjs-util": "^7.0.10", "immer": "^9.0.6", "lodash": "^4.17.21" }, diff --git a/packages/signature-controller/src/SignatureController.ts b/packages/signature-controller/src/SignatureController.ts index 332c2ca7ee..32709e959c 100644 --- a/packages/signature-controller/src/SignatureController.ts +++ b/packages/signature-controller/src/SignatureController.ts @@ -1,3 +1,4 @@ +import { bufferToHex } from '@ethereumjs/util'; import type { AddApprovalRequest, AcceptResultCallbacks, @@ -42,7 +43,6 @@ import { } from '@metamask/message-manager'; import { providerErrors, rpcErrors } from '@metamask/rpc-errors'; import type { Hex, Json } from '@metamask/utils'; -import { bufferToHex } from 'ethereumjs-util'; import EventEmitter from 'events'; import type { Patch } from 'immer'; import { cloneDeep } from 'lodash'; diff --git a/packages/transaction-controller/package.json b/packages/transaction-controller/package.json index 51df4269fc..53ac67727c 100644 --- a/packages/transaction-controller/package.json +++ b/packages/transaction-controller/package.json @@ -31,6 +31,7 @@ "dependencies": { "@ethereumjs/common": "^3.2.0", "@ethereumjs/tx": "^4.2.0", + "@ethereumjs/util": "^8.1.0", "@ethersproject/abi": "^5.7.0", "@metamask/approval-controller": "^4.0.1", "@metamask/base-controller": "^3.2.3", @@ -42,7 +43,6 @@ "@metamask/utils": "^8.1.0", "async-mutex": "^0.2.6", "eth-method-registry": "1.1.0", - "ethereumjs-util": "^7.0.10", "fast-json-patch": "^3.1.1", "lodash": "^4.17.21", "nonce-tracker": "^1.1.0", diff --git a/packages/transaction-controller/src/EtherscanRemoteTransactionSource.ts b/packages/transaction-controller/src/EtherscanRemoteTransactionSource.ts index 7ab2460ff8..bf1404e223 100644 --- a/packages/transaction-controller/src/EtherscanRemoteTransactionSource.ts +++ b/packages/transaction-controller/src/EtherscanRemoteTransactionSource.ts @@ -1,6 +1,6 @@ +import { BN } from '@ethereumjs/util'; import { BNToHex } from '@metamask/controller-utils'; import type { Hex } from '@metamask/utils'; -import { BN } from 'ethereumjs-util'; import { v1 as random } from 'uuid'; import { ETHERSCAN_SUPPORTED_NETWORKS } from './constants'; diff --git a/packages/transaction-controller/src/TransactionController.ts b/packages/transaction-controller/src/TransactionController.ts index 0e3c812a4a..8198d6ea71 100644 --- a/packages/transaction-controller/src/TransactionController.ts +++ b/packages/transaction-controller/src/TransactionController.ts @@ -1,6 +1,7 @@ import { Hardfork, Common, type ChainConfig } from '@ethereumjs/common'; import type { TypedTransaction } from '@ethereumjs/tx'; import { TransactionFactory } from '@ethereumjs/tx'; +import { addHexPrefix, bufferToHex } from '@ethereumjs/util'; import type { AcceptResultCallbacks, AddApprovalRequest, @@ -33,7 +34,6 @@ import { errorCodes, rpcErrors, providerErrors } from '@metamask/rpc-errors'; import type { Hex } from '@metamask/utils'; import { Mutex } from 'async-mutex'; 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'; diff --git a/packages/transaction-controller/src/utils.ts b/packages/transaction-controller/src/utils.ts index bff356e479..e4bc3545e9 100644 --- a/packages/transaction-controller/src/utils.ts +++ b/packages/transaction-controller/src/utils.ts @@ -1,5 +1,5 @@ +import { addHexPrefix, isHexString } from '@ethereumjs/util'; import { convertHexToDecimal } from '@metamask/controller-utils'; -import { addHexPrefix, isHexString } from 'ethereumjs-util'; import type { Transaction as NonceTrackerTransaction } from 'nonce-tracker/dist/NonceTracker'; import type { diff --git a/yarn.lock b/yarn.lock index 3a1d323bcc..b9135a35fe 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1291,6 +1291,7 @@ __metadata: version: 0.0.0-use.local resolution: "@metamask/accounts-controller@workspace:packages/accounts-controller" dependencies: + "@ethereumjs/util": ^8.1.0 "@metamask/auto-changelog": ^3.1.0 "@metamask/base-controller": ^3.2.3 "@metamask/eth-snap-keyring": ^1.0.0 @@ -1302,7 +1303,6 @@ __metadata: "@types/jest": ^27.4.1 "@types/readable-stream": ^2.3.0 deepmerge: ^4.2.2 - ethereumjs-util: ^7.0.10 immer: ^9.0.6 jest: ^27.5.1 ts-jest: ^27.1.4 @@ -1399,6 +1399,7 @@ __metadata: version: 0.0.0-use.local resolution: "@metamask/assets-controllers@workspace:packages/assets-controllers" dependencies: + "@ethereumjs/util": ^8.1.0 "@ethersproject/address": ^5.7.0 "@ethersproject/bignumber": ^5.7.0 "@ethersproject/contracts": ^5.7.0 @@ -1421,7 +1422,6 @@ __metadata: "@types/uuid": ^8.3.0 async-mutex: ^0.2.6 deepmerge: ^4.2.2 - ethereumjs-util: ^7.0.10 ethjs-provider-http: ^0.1.6 immer: ^9.0.6 jest: ^27.5.1 @@ -1511,6 +1511,7 @@ __metadata: version: 0.0.0-use.local resolution: "@metamask/controller-utils@workspace:packages/controller-utils" dependencies: + "@ethereumjs/util": ^8.1.0 "@metamask/auto-changelog": ^3.1.0 "@metamask/eth-query": ^3.0.1 "@metamask/utils": ^8.1.0 @@ -1518,7 +1519,6 @@ __metadata: "@types/jest": ^27.4.1 deepmerge: ^4.2.2 eth-ens-namehash: ^2.0.8 - ethereumjs-util: ^7.0.10 ethjs-unit: ^0.1.6 fast-deep-equal: ^3.1.3 jest: ^27.5.1 @@ -1815,6 +1815,7 @@ __metadata: version: 0.0.0-use.local resolution: "@metamask/gas-fee-controller@workspace:packages/gas-fee-controller" dependencies: + "@ethereumjs/util": ^8.1.0 "@metamask/auto-changelog": ^3.1.0 "@metamask/base-controller": ^3.2.3 "@metamask/controller-utils": ^5.0.2 @@ -1826,7 +1827,6 @@ __metadata: "@types/jest-when": ^2.7.3 "@types/uuid": ^8.3.0 deepmerge: ^4.2.2 - ethereumjs-util: ^7.0.10 ethjs-unit: ^0.1.6 immer: ^9.0.6 jest: ^27.5.1 @@ -1890,6 +1890,7 @@ __metadata: dependencies: "@ethereumjs/common": ^3.2.0 "@ethereumjs/tx": ^4.2.0 + "@ethereumjs/util": ^8.1.0 "@keystonehq/bc-ur-registry-eth": ^0.9.0 "@keystonehq/metamask-airgapped-keyring": ^0.13.1 "@metamask/auto-changelog": ^3.1.0 @@ -1903,7 +1904,6 @@ __metadata: "@types/jest": ^27.4.1 async-mutex: ^0.2.6 deepmerge: ^4.2.2 - ethereumjs-util: ^7.0.10 ethereumjs-wallet: ^1.0.1 immer: ^9.0.6 jest: ^27.5.1 @@ -1940,6 +1940,7 @@ __metadata: version: 0.0.0-use.local resolution: "@metamask/message-manager@workspace:packages/message-manager" dependencies: + "@ethereumjs/util": ^8.1.0 "@metamask/auto-changelog": ^3.1.0 "@metamask/base-controller": ^3.2.3 "@metamask/controller-utils": ^5.0.2 @@ -1948,7 +1949,6 @@ __metadata: "@types/jest": ^27.4.1 "@types/uuid": ^8.3.0 deepmerge: ^4.2.2 - ethereumjs-util: ^7.0.10 jest: ^27.5.1 jsonschema: ^1.2.4 ts-jest: ^27.1.4 @@ -2326,6 +2326,7 @@ __metadata: version: 0.0.0-use.local resolution: "@metamask/signature-controller@workspace:packages/signature-controller" dependencies: + "@ethereumjs/util": ^8.1.0 "@metamask/approval-controller": ^4.0.1 "@metamask/auto-changelog": ^3.1.0 "@metamask/base-controller": ^3.2.3 @@ -2337,7 +2338,6 @@ __metadata: "@metamask/utils": ^8.1.0 "@types/jest": ^27.4.1 deepmerge: ^4.2.2 - ethereumjs-util: ^7.0.10 immer: ^9.0.6 jest: ^27.5.1 lodash: ^4.17.21 @@ -2461,6 +2461,7 @@ __metadata: dependencies: "@ethereumjs/common": ^3.2.0 "@ethereumjs/tx": ^4.2.0 + "@ethereumjs/util": ^8.1.0 "@ethersproject/abi": ^5.7.0 "@metamask/approval-controller": ^4.0.1 "@metamask/auto-changelog": ^3.1.0 @@ -2477,7 +2478,6 @@ __metadata: babel-runtime: ^6.26.0 deepmerge: ^4.2.2 eth-method-registry: 1.1.0 - ethereumjs-util: ^7.0.10 ethjs-provider-http: ^0.1.6 fast-json-patch: ^3.1.1 jest: ^27.5.1 @@ -5230,7 +5230,7 @@ __metadata: languageName: node linkType: hard -"ethereumjs-util@npm:^7.0.10, ethereumjs-util@npm:^7.0.8, ethereumjs-util@npm:^7.1.2": +"ethereumjs-util@npm:^7.0.8, ethereumjs-util@npm:^7.1.2": version: 7.1.5 resolution: "ethereumjs-util@npm:7.1.5" dependencies: