deps: upgrade from ethereumjs-util (#3943)

Author: legobeat

package.json

@@ -92,8 +92,6 @@
       "@lavamoat/preinstall-always-fail": false,
       "@keystonehq/bc-ur-registry-eth>hdkey>secp256k1": true,
       "babel-runtime>core-js": false,
-      "ethereumjs-util>ethereum-cryptography>keccak": true,
-      "ethereumjs-util>ethereum-cryptography>secp256k1": true,
       "simple-git-hooks": false
     }
   }

packages/accounts-controller/package.json

@@ -31,14 +31,15 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
+    "@ethereumjs/util": "^8.1.0",
     "@metamask/base-controller": "^4.1.1",
     "@metamask/eth-snap-keyring": "^2.1.1",
     "@metamask/keyring-api": "^3.0.0",
     "@metamask/snaps-sdk": "^1.3.2",
     "@metamask/snaps-utils": "^5.1.2",
     "@metamask/utils": "^8.3.0",
     "deepmerge": "^4.2.2",
-    "ethereumjs-util": "^7.0.10",
+    "ethereum-cryptography": "^2.1.2",
     "immer": "^9.0.6",
     "uuid": "^8.3.2"
   },

packages/accounts-controller/src/AccountsController.ts

@@ -1,3 +1,4 @@
+import { toBuffer } from '@ethereumjs/util';
 import type {
   ControllerGetStateAction,
   ControllerStateChangeEvent,
@@ -22,7 +23,7 @@ import type {
 import type { SnapId } from '@metamask/snaps-sdk';
 import type { Snap } from '@metamask/snaps-utils';
 import type { Keyring, Json } from '@metamask/utils';
-import { sha256FromString } from 'ethereumjs-util';
+import { sha256 } from 'ethereum-cryptography/sha256';
 import type { Draft } from 'immer';
 import { v4 as uuid } from 'uuid';
 
@@ -455,7 +456,7 @@ export class AccountsController extends BaseController<
         address,
       );
       const v4options = {
-        random: sha256FromString(address).slice(0, 16),
+        random: sha256(toBuffer(address)).slice(0, 16),
       };
 
       internalAccounts.push({

packages/accounts-controller/src/utils.ts

@@ -1,5 +1,6 @@
+import { toBuffer } from '@ethereumjs/util';
 import { isCustodyKeyring, KeyringTypes } from '@metamask/keyring-controller';
-import { sha256FromString } from 'ethereumjs-util';
+import { sha256 } from 'ethereum-cryptography/sha256';
 import { v4 as uuid } from 'uuid';
 
 /**
@@ -50,7 +51,7 @@ export function keyringTypeToName(keyringType: string): string {
  */
 export function getUUIDFromAddressOfNormalAccount(address: string): string {
   const v4options = {
-    random: sha256FromString(address).slice(0, 16),
+    random: sha256(toBuffer(address)).slice(0, 16),
   };
 
   return uuid(v4options);

packages/assets-controllers/package.json

@@ -31,6 +31,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",
@@ -49,10 +50,11 @@
     "@metamask/preferences-controller": "^7.0.0",
     "@metamask/rpc-errors": "^6.2.0",
     "@metamask/utils": "^8.3.0",
+    "@types/bn.js": "^5.1.5",
     "@types/uuid": "^8.3.0",
     "async-mutex": "^0.2.6",
+    "bn.js": "^5.2.1",
     "cockatiel": "^3.1.2",
-    "ethereumjs-util": "^7.0.10",
     "lodash": "^4.17.21",
     "multiformats": "^9.5.2",
     "single-call-balance-checker-abi": "^1.0.0",

packages/assets-controllers/src/AssetsContractController.ts

@@ -11,7 +11,7 @@ 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 type BN from 'bn.js';
 import abiSingleCallBalancesContract from 'single-call-balance-checker-abi';
 
 import { SupportedTokenDetectionNetworks } from './assetsUtil';

packages/assets-controllers/src/NftController.test.ts

@@ -26,7 +26,7 @@ import {
   getDefaultPreferencesState,
   type PreferencesState,
 } from '@metamask/preferences-controller';
-import { BN } from 'ethereumjs-util';
+import BN from 'bn.js';
 import nock from 'nock';
 import * as sinon from 'sinon';
 import { v4 } from 'uuid';

packages/assets-controllers/src/NftController.ts

@@ -26,8 +26,9 @@ import type {
 import type { PreferencesState } from '@metamask/preferences-controller';
 import { rpcErrors } from '@metamask/rpc-errors';
 import type { Hex } from '@metamask/utils';
+import { remove0x } from '@metamask/utils';
 import { Mutex } from 'async-mutex';
-import { BN, stripHexPrefix } from 'ethereumjs-util';
+import BN from 'bn.js';
 import { EventEmitter } from 'events';
 import { v4 as random } from 'uuid';
 
@@ -568,7 +569,7 @@ export class NftController extends BaseControllerV1<NftConfig, NftState> {
         return [tokenURI, ERC1155];
       }
 
-      const hexTokenId = stripHexPrefix(BNToHex(new BN(tokenId)))
+      const hexTokenId = remove0x(BNToHex(new BN(tokenId)))
         .padStart(64, '0')
         .toLowerCase();
       return [tokenURI.replace('{id}', hexTokenId), ERC1155];

packages/assets-controllers/src/Standards/ERC20Standard.ts

@@ -1,11 +1,11 @@
+import { toUtf8 } 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 type BN from 'bn.js';
 
 import { ethersBigNumberToBN } from '../assetsUtil';
 

packages/assets-controllers/src/Standards/NftStandards/ERC1155/ERC1155Standard.ts

@@ -9,7 +9,7 @@ import {
   timeoutFetch,
 } from '@metamask/controller-utils';
 import { abiERC1155 } from '@metamask/metamask-eth-abis';
-import type { BN } from 'ethereumjs-util';
+import type * as BN from 'bn.js';
 
 import { getFormattedIpfsUrl, ethersBigNumberToBN } from '../../../assetsUtil';