deps: ethereumjs-util@^7.0.10->@ethereumjs/util@^8.1.0

legobeat · Oct 13, 2023 · ea7d4fc · ea7d4fc
1 parent 855a752
commit ea7d4fc
Show file tree

Hide file tree

Showing 38 changed files with 57 additions and 62 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,6 @@
 import { Contract } from '@ethersproject/contracts';
 import { Web3Provider } from '@ethersproject/providers';
+import type { BN } from '@ethereumjs/util';
 import type { BaseConfig, BaseState } from '@metamask/base-controller';
 import { BaseController } from '@metamask/base-controller';
 import { IPFS_DEFAULT_GATEWAY_URL } from '@metamask/controller-utils';
@@ -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
@@ -1,4 +1,5 @@
 import type { Network } from '@ethersproject/providers';
+import { BN } from '@ethereumjs/util';
 import type {
   AddApprovalRequest,
   ApprovalStateChange,
@@ -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
@@ -1,4 +1,5 @@
 import { isAddress } from '@ethersproject/address';
+import { BN, stripHexPrefix } from '@ethereumjs/util';
 import type { AddApprovalRequest } from '@metamask/approval-controller';
 import type {
   BaseConfig,
@@ -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
@@ -1,11 +1,11 @@
 import { Contract } from '@ethersproject/contracts';
 import type { Web3Provider } from '@ethersproject/providers';
+import { toUtf8 } from '@ethereumjs/util';
+import type { BN } from '@ethereumjs/util';
 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
@@ -1,5 +1,6 @@
 import { Contract } from '@ethersproject/contracts';
 import type { Web3Provider } from '@ethersproject/providers';
+import type { BN } from '@ethereumjs/util';
 import {
   ERC1155,
   ERC1155_INTERFACE_ID,
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,12 +1,12 @@
 import type { BigNumber } from '@ethersproject/bignumber';
+import { BN, stripHexPrefix } from '@ethereumjs/util';
 import {
   convertHexToDecimal,
   isValidHexAddress,
   GANACHE_CHAIN_ID,
 } 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
@@ -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
@@ -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
@@ -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
@@ -1,15 +1,15 @@
-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,
   isHexString,
   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
@@ -29,14 +29,14 @@
     "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",
     "@metamask/network-controller": "^15.0.0",
     "@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
@@ -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
@@ -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
@@ -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/...r/src/fetchGasEstimatesViaEthFeeHistory/calculateGasFeeEstimatesForPriorityLevels.test.ts b/...r/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/...roller/src/fetchGasEstimatesViaEthFeeHistory/calculateGasFeeEstimatesForPriorityLevels.ts b/...roller/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
@@ -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
@@ -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
@@ -1,11 +1,11 @@
+import { BN } from '@ethereumjs/util';
 import {
   query,
   handleFetch,
   gweiDecToWEIBN,
   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
@@ -29,14 +29,14 @@
     "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",
     "@metamask/message-manager": "^7.3.5",
     "@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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -29,14 +29,14 @@
     "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",
     "@metamask/logging-controller": "^1.0.4",
     "@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"
   },