diff --git a/app/components/UI/AccountFromToInfoCard/AddressFrom.tsx b/app/components/UI/AccountFromToInfoCard/AddressFrom.tsx index 8efc3818213..bc021cbf2f8 100644 --- a/app/components/UI/AccountFromToInfoCard/AddressFrom.tsx +++ b/app/components/UI/AccountFromToInfoCard/AddressFrom.tsx @@ -1,4 +1,4 @@ -import { toChecksumAddress } from 'ethereumjs-util'; +import { toChecksumAddress } from '@ethereumjs/util'; import React, { useEffect, useState } from 'react'; import { View } from 'react-native'; import { useSelector } from 'react-redux'; diff --git a/app/components/UI/AddCustomCollectible/index.tsx b/app/components/UI/AddCustomCollectible/index.tsx index be364abd6c8..810dedb9f4d 100644 --- a/app/components/UI/AddCustomCollectible/index.tsx +++ b/app/components/UI/AddCustomCollectible/index.tsx @@ -10,7 +10,7 @@ import { import { fontStyles } from '../../../styles/common'; import Engine from '../../../core/Engine'; import { strings } from '../../../../locales/i18n'; -import { isValidAddress } from 'ethereumjs-util'; +import { isValidAddress } from '@ethereumjs/util'; import ActionView from '../ActionView'; import { isSmartContractAddress } from '../../../util/transactions'; import Device from '../../../util/device'; diff --git a/app/components/UI/AddCustomToken/index.js b/app/components/UI/AddCustomToken/index.js index f764d4f0705..2fc7d1163bc 100644 --- a/app/components/UI/AddCustomToken/index.js +++ b/app/components/UI/AddCustomToken/index.js @@ -12,7 +12,7 @@ import { fontStyles } from '../../../styles/common'; import Engine from '../../../core/Engine'; import PropTypes from 'prop-types'; import { strings } from '../../../../locales/i18n'; -import { isValidAddress } from 'ethereumjs-util'; +import { isValidAddress } from '@ethereumjs/util'; import { isSmartContractAddress } from '../../../util/transactions'; import { MetaMetricsEvents } from '../../../core/Analytics'; diff --git a/app/components/UI/ApprovalTagUrl/ApprovalTagUrl.tsx b/app/components/UI/ApprovalTagUrl/ApprovalTagUrl.tsx index 126f3132b17..9565fc4b885 100644 --- a/app/components/UI/ApprovalTagUrl/ApprovalTagUrl.tsx +++ b/app/components/UI/ApprovalTagUrl/ApprovalTagUrl.tsx @@ -1,4 +1,4 @@ -import { toChecksumAddress } from 'ethereumjs-util'; +import { toChecksumAddress } from '@ethereumjs/util'; import React, { useEffect, useMemo, useState } from 'react'; import { useSelector } from 'react-redux'; diff --git a/app/components/UI/AssetOverview/AboutAsset/AboutAsset.tsx b/app/components/UI/AssetOverview/AboutAsset/AboutAsset.tsx index 0c15bc3115d..d60eda5ea12 100644 --- a/app/components/UI/AssetOverview/AboutAsset/AboutAsset.tsx +++ b/app/components/UI/AssetOverview/AboutAsset/AboutAsset.tsx @@ -1,4 +1,4 @@ -import { zeroAddress } from 'ethereumjs-util'; +import { zeroAddress } from '@ethereumjs/util'; import React from 'react'; import { DimensionValue, View } from 'react-native'; import SkeletonPlaceholder from 'react-native-skeleton-placeholder'; diff --git a/app/components/UI/AssetOverview/AssetOverview.test.tsx b/app/components/UI/AssetOverview/AssetOverview.test.tsx index 039d0412848..182c02f4522 100644 --- a/app/components/UI/AssetOverview/AssetOverview.test.tsx +++ b/app/components/UI/AssetOverview/AssetOverview.test.tsx @@ -1,6 +1,6 @@ import React from 'react'; import AssetOverview from './AssetOverview'; -import { zeroAddress } from 'ethereumjs-util'; +import { zeroAddress } from '@ethereumjs/util'; import renderWithProvider from '../../../util/test/renderWithProvider'; import { backgroundState } from '../../../util/test/initial-root-state'; import { NetworkController } from '@metamask/network-controller'; diff --git a/app/components/UI/AssetOverview/AssetOverview.tsx b/app/components/UI/AssetOverview/AssetOverview.tsx index d6266bfbd57..242cfde63e4 100644 --- a/app/components/UI/AssetOverview/AssetOverview.tsx +++ b/app/components/UI/AssetOverview/AssetOverview.tsx @@ -1,4 +1,4 @@ -import { zeroAddress } from 'ethereumjs-util'; +import { zeroAddress } from '@ethereumjs/util'; import React, { useCallback, useEffect } from 'react'; import { Platform, TouchableOpacity, View } from 'react-native'; import { useDispatch, useSelector } from 'react-redux'; diff --git a/app/components/UI/AssetOverview/TokenDetails/TokenDetails.tsx b/app/components/UI/AssetOverview/TokenDetails/TokenDetails.tsx index 368e2352d23..c8991e86006 100644 --- a/app/components/UI/AssetOverview/TokenDetails/TokenDetails.tsx +++ b/app/components/UI/AssetOverview/TokenDetails/TokenDetails.tsx @@ -1,4 +1,4 @@ -import { zeroAddress } from 'ethereumjs-util'; +import { zeroAddress } from '@ethereumjs/util'; import React from 'react'; import { View } from 'react-native'; import { useSelector } from 'react-redux'; diff --git a/app/components/UI/PaymentRequest/AssetList/index.tsx b/app/components/UI/PaymentRequest/AssetList/index.tsx index d3e5975e2a3..d01e6125988 100644 --- a/app/components/UI/PaymentRequest/AssetList/index.tsx +++ b/app/components/UI/PaymentRequest/AssetList/index.tsx @@ -6,7 +6,7 @@ import { fontStyles } from '../../../../styles/common'; import Identicon from '../../Identicon'; import NetworkMainAssetLogo from '../../NetworkMainAssetLogo'; import { useSelector } from 'react-redux'; -import { toChecksumAddress } from 'ethereumjs-util'; +import { toChecksumAddress } from '@ethereumjs/util'; import { useTheme } from '../../../../util/theme'; import { selectTokenList } from '../../../../selectors/tokenListController'; diff --git a/app/components/UI/Swaps/components/TokenSelectModal.js b/app/components/UI/Swaps/components/TokenSelectModal.js index ac620379b1b..0a390a2b97a 100644 --- a/app/components/UI/Swaps/components/TokenSelectModal.js +++ b/app/components/UI/Swaps/components/TokenSelectModal.js @@ -16,7 +16,7 @@ import Icon from 'react-native-vector-icons/Ionicons'; import FAIcon from 'react-native-vector-icons/FontAwesome5'; import Fuse from 'fuse.js'; import { connect } from 'react-redux'; -import { isValidAddress } from 'ethereumjs-util'; +import { isValidAddress } from '@ethereumjs/util'; import Device from '../../../../util/device'; import { diff --git a/app/components/UI/Tokens/TokenList/TokenListItem/index.tsx b/app/components/UI/Tokens/TokenList/TokenListItem/index.tsx index 46f5322c377..328209cbc4d 100644 --- a/app/components/UI/Tokens/TokenList/TokenListItem/index.tsx +++ b/app/components/UI/Tokens/TokenList/TokenListItem/index.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { View } from 'react-native'; import { Hex } from '@metamask/utils'; -import { zeroAddress } from 'ethereumjs-util'; +import { zeroAddress } from '@ethereumjs/util'; import { useSelector } from 'react-redux'; import { useNavigation } from '@react-navigation/native'; import useTokenBalancesController from '../../../../hooks/useTokenBalancesController/useTokenBalancesController'; diff --git a/app/components/UI/TransactionElement/utils.js b/app/components/UI/TransactionElement/utils.js index 22b0e562005..634e76b9222 100644 --- a/app/components/UI/TransactionElement/utils.js +++ b/app/components/UI/TransactionElement/utils.js @@ -27,7 +27,7 @@ import { TRANSACTION_TYPES, calculateEIP1559GasFeeHexes, } from '../../../util/transactions'; -import { toChecksumAddress } from 'ethereumjs-util'; +import { toChecksumAddress } from '@ethereumjs/util'; import { swapsUtils } from '@metamask/swaps-controller'; import { isSwapsNativeAsset } from '../Swaps/utils'; import { toLowerCaseEquals } from '../../../util/general'; diff --git a/app/components/Views/QRScanner/index.tsx b/app/components/Views/QRScanner/index.tsx index 0c4f2d50f8f..dc837c6c639 100644 --- a/app/components/Views/QRScanner/index.tsx +++ b/app/components/Views/QRScanner/index.tsx @@ -4,7 +4,7 @@ 'use strict'; import { useNavigation } from '@react-navigation/native'; import { parse } from 'eth-url-parser'; -import { isValidAddress } from 'ethereumjs-util'; +import { isValidAddress } from '@ethereumjs/util'; import React, { useCallback, useRef } from 'react'; import { Alert, Image, InteractionManager, View, Linking } from 'react-native'; import Text, { diff --git a/app/components/Views/Settings/Contacts/ContactForm/index.js b/app/components/Views/Settings/Contacts/ContactForm/index.js index 3c1e3b575f9..2c204599fcb 100644 --- a/app/components/Views/Settings/Contacts/ContactForm/index.js +++ b/app/components/Views/Settings/Contacts/ContactForm/index.js @@ -13,7 +13,7 @@ import PropTypes from 'prop-types'; import { getEditableOptions } from '../../../../UI/Navbar'; import StyledButton from '../../../../UI/StyledButton'; import Engine from '../../../../../core/Engine'; -import { toChecksumAddress } from 'ethereumjs-util'; +import { toChecksumAddress } from '@ethereumjs/util'; import { connect } from 'react-redux'; import { KeyboardAwareScrollView } from 'react-native-keyboard-aware-scroll-view'; import { strings } from '../../../../../../locales/i18n'; diff --git a/app/components/Views/Settings/NotificationsSettings/AccountsList.test.tsx b/app/components/Views/Settings/NotificationsSettings/AccountsList.test.tsx index aa3d30a0ee7..1826241f40f 100644 --- a/app/components/Views/Settings/NotificationsSettings/AccountsList.test.tsx +++ b/app/components/Views/Settings/NotificationsSettings/AccountsList.test.tsx @@ -6,7 +6,7 @@ import { Account } from '../../../../components/hooks/useAccounts/useAccounts.ty import { MOCK_ACCOUNTS_CONTROLLER_STATE } from '../../../../util/test/accountsControllerTestUtils'; import { Hex } from '@metamask/utils'; import { KeyringTypes } from '@metamask/keyring-controller'; -import { toChecksumAddress } from 'ethereumjs-util'; +import { toChecksumAddress } from '@ethereumjs/util'; import { RootState } from '../../../../reducers'; import { backgroundState } from '../../../../util/test/initial-root-state'; diff --git a/app/components/Views/confirmations/Approval/components/TransactionEditor/index.js b/app/components/Views/confirmations/Approval/components/TransactionEditor/index.js index 69863ccdfb1..8b5259f606d 100644 --- a/app/components/Views/confirmations/Approval/components/TransactionEditor/index.js +++ b/app/components/Views/confirmations/Approval/components/TransactionEditor/index.js @@ -9,7 +9,7 @@ import { renderFromWei, toHexadecimal, } from '../../../../../../util/number'; -import { isValidAddress, addHexPrefix } from 'ethereumjs-util'; +import { isValidAddress, addHexPrefix } from '@ethereumjs/util'; import BN from 'bnjs4'; import { strings } from '../../../../../../../locales/i18n'; import { connect } from 'react-redux'; diff --git a/app/components/Views/confirmations/Send/index.js b/app/components/Views/confirmations/Send/index.js index fdfaf8e6f95..b5944de9243 100644 --- a/app/components/Views/confirmations/Send/index.js +++ b/app/components/Views/confirmations/Send/index.js @@ -17,7 +17,7 @@ import { fromWei, fromTokenMinimalUnit, } from '../../../../util/number'; -import { toChecksumAddress } from 'ethereumjs-util'; +import { toChecksumAddress } from '@ethereumjs/util'; import { strings } from '../../../../../locales/i18n'; import { getTransactionOptionsTitle } from '../../../UI/Navbar'; import { connect } from 'react-redux'; diff --git a/app/components/Views/confirmations/SendFlow/SendTo/index.js b/app/components/Views/confirmations/SendFlow/SendTo/index.js index 3a17526ccf5..33c76e83d26 100644 --- a/app/components/Views/confirmations/SendFlow/SendTo/index.js +++ b/app/components/Views/confirmations/SendFlow/SendTo/index.js @@ -2,7 +2,7 @@ import React, { Fragment, PureComponent } from 'react'; import { View, ScrollView, Alert, Platform, BackHandler } from 'react-native'; import PropTypes from 'prop-types'; import { connect } from 'react-redux'; -import { toChecksumAddress } from 'ethereumjs-util'; +import { toChecksumAddress } from '@ethereumjs/util'; import { SafeAreaView } from 'react-native-safe-area-context'; import Icon from 'react-native-vector-icons/FontAwesome'; import AddressList from '../AddressList'; diff --git a/app/components/Views/confirmations/components/ApproveTransactionHeader/ApproveTransactionHeader.tsx b/app/components/Views/confirmations/components/ApproveTransactionHeader/ApproveTransactionHeader.tsx index 6db2535f4e9..a2011fb3e9b 100644 --- a/app/components/Views/confirmations/components/ApproveTransactionHeader/ApproveTransactionHeader.tsx +++ b/app/components/Views/confirmations/components/ApproveTransactionHeader/ApproveTransactionHeader.tsx @@ -1,4 +1,4 @@ -import { toChecksumAddress } from 'ethereumjs-util'; +import { toChecksumAddress } from '@ethereumjs/util'; import React, { useEffect, useState } from 'react'; import { View } from 'react-native'; import { useSelector } from 'react-redux'; diff --git a/app/components/Views/confirmations/components/ApproveTransactionReview/AddNickname/index.tsx b/app/components/Views/confirmations/components/ApproveTransactionReview/AddNickname/index.tsx index c8778157382..a7cb11b85cf 100644 --- a/app/components/Views/confirmations/components/ApproveTransactionReview/AddNickname/index.tsx +++ b/app/components/Views/confirmations/components/ApproveTransactionReview/AddNickname/index.tsx @@ -7,7 +7,7 @@ import EthereumAddress from '../../../../../UI/EthereumAddress'; import Engine from '../../../../../../core/Engine'; import { MetaMetricsEvents } from '../../../../../../core/Analytics'; -import { toChecksumAddress } from 'ethereumjs-util'; +import { toChecksumAddress } from '@ethereumjs/util'; import { connect } from 'react-redux'; import StyledButton from '../../../../../UI/StyledButton'; import Text from '../../../../../../component-library/components/Texts/Text'; diff --git a/app/components/Views/confirmations/hooks/useAccountInfo.ts b/app/components/Views/confirmations/hooks/useAccountInfo.ts index d07991f2f7d..7617fd78965 100644 --- a/app/components/Views/confirmations/hooks/useAccountInfo.ts +++ b/app/components/Views/confirmations/hooks/useAccountInfo.ts @@ -1,4 +1,4 @@ -import { toChecksumAddress } from 'ethereumjs-util'; +import { toChecksumAddress } from '@ethereumjs/util'; import { useMemo } from 'react'; import { useSelector } from 'react-redux'; diff --git a/app/components/hooks/useAccounts/useAccounts.test.ts b/app/components/hooks/useAccounts/useAccounts.test.ts index 0deff05f17b..d905f775fda 100644 --- a/app/components/hooks/useAccounts/useAccounts.test.ts +++ b/app/components/hooks/useAccounts/useAccounts.test.ts @@ -1,6 +1,6 @@ import { renderHook, act } from '@testing-library/react-hooks'; import { KeyringTypes } from '@metamask/keyring-controller'; -import { toChecksumAddress } from 'ethereumjs-util'; +import { toChecksumAddress } from '@ethereumjs/util'; import useAccounts from './useAccounts'; import { backgroundState } from '../../../util/test/initial-root-state'; import { MOCK_ACCOUNTS_CONTROLLER_STATE } from '../../../util/test/accountsControllerTestUtils'; diff --git a/app/components/hooks/useExistingAddress.ts b/app/components/hooks/useExistingAddress.ts index e1d8c93cf0d..eed811baffd 100644 --- a/app/components/hooks/useExistingAddress.ts +++ b/app/components/hooks/useExistingAddress.ts @@ -1,4 +1,4 @@ -import { toChecksumAddress } from 'ethereumjs-util'; +import { toChecksumAddress } from '@ethereumjs/util'; import { useSelector } from 'react-redux'; import { selectChainId } from '../../selectors/networkController'; diff --git a/app/core/Engine.test.js b/app/core/Engine.test.js index b21f4c5ce91..4ea788fd4d7 100644 --- a/app/core/Engine.test.js +++ b/app/core/Engine.test.js @@ -1,6 +1,6 @@ import Engine from './Engine'; import { backgroundState } from '../util/test/initial-root-state'; -import { zeroAddress } from 'ethereumjs-util'; +import { zeroAddress } from '@ethereumjs/util'; import { createMockAccountsControllerState } from '../util/test/accountsControllerTestUtils'; import { mockNetworkState } from '../util/test/network'; diff --git a/app/core/Engine.ts b/app/core/Engine.ts index 684f12c6164..13f3202d051 100644 --- a/app/core/Engine.ts +++ b/app/core/Engine.ts @@ -231,7 +231,7 @@ import { selectShouldUseSmartTransaction } from '../selectors/smartTransactionsC import { selectSwapsChainFeatureFlags } from '../reducers/swaps'; import { SmartTransactionStatuses } from '@metamask/smart-transactions-controller/dist/types'; import { submitSmartTransactionHook } from '../util/smart-transactions/smart-publish-hook'; -import { zeroAddress } from 'ethereumjs-util'; +import { zeroAddress } from '@ethereumjs/util'; import { ApprovalType, toChecksumHexAddress } from '@metamask/controller-utils'; import { ExtendedControllerMessenger } from './ExtendedControllerMessenger'; import EthQuery from '@metamask/eth-query'; diff --git a/app/core/RPCMethods/wallet_watchAsset.ts b/app/core/RPCMethods/wallet_watchAsset.ts index 09e7dea5470..75a9597e388 100644 --- a/app/core/RPCMethods/wallet_watchAsset.ts +++ b/app/core/RPCMethods/wallet_watchAsset.ts @@ -10,7 +10,7 @@ import { TOKEN_NOT_VALID, } from '../../constants/error'; import { selectChainId } from '../../selectors/networkController'; -import { isValidAddress } from 'ethereumjs-util'; +import { isValidAddress } from '@ethereumjs/util'; import { JsonRpcRequest, PendingJsonRpcResponse } from 'json-rpc-engine'; import { toChecksumHexAddress } from '@metamask/controller-utils'; diff --git a/app/core/SanitizationMiddleware.ts b/app/core/SanitizationMiddleware.ts index a7eb92f9291..f1c001c6073 100644 --- a/app/core/SanitizationMiddleware.ts +++ b/app/core/SanitizationMiddleware.ts @@ -1,5 +1,5 @@ import { JsonRpcMiddleware, JsonRpcRequest } from 'json-rpc-engine'; -import { addHexPrefix } from 'ethereumjs-util'; +import { addHexPrefix } from '@ethereumjs/util'; // We use this to clean any custom params from the txParams // TODO: Update this to allow `blockhash` (used by `eth_getLogs`) and EIP-1559 diff --git a/app/store/migrations/029.ts b/app/store/migrations/029.ts index 28f56e47092..7ce9c0a4992 100644 --- a/app/store/migrations/029.ts +++ b/app/store/migrations/029.ts @@ -2,7 +2,7 @@ import { toHex } from '@metamask/controller-utils'; import { Hex, hasProperty, isObject } from '@metamask/utils'; import { regex } from '../../../app/util/regex'; -import { isHexString } from 'ethereumjs-util'; +import { isHexString } from '@ethereumjs/util'; import { TransactionParams } from '@metamask/transaction-controller'; import { captureException } from '@sentry/react-native'; import { diff --git a/app/store/migrations/031.ts b/app/store/migrations/031.ts index 0ad5dcdf64e..db3181e91d2 100644 --- a/app/store/migrations/031.ts +++ b/app/store/migrations/031.ts @@ -1,3 +1,4 @@ +import { isHexString } from '@ethereumjs/util'; import { hasProperty, isObject } from '@metamask/utils'; import { captureException } from '@sentry/react-native'; import { @@ -6,7 +7,6 @@ import { TokensControllerState, } from '@metamask/assets-controllers'; import { toHex } from '@metamask/controller-utils'; -import { isHexString } from 'ethereumjs-util'; /** * This migration is to address the users that were impacted by the tokens missing on their wallet diff --git a/app/util/address/index.ts b/app/util/address/index.ts index 10c09ebae63..a6f292af8d4 100644 --- a/app/util/address/index.ts +++ b/app/util/address/index.ts @@ -4,7 +4,7 @@ import { addHexPrefix, isValidChecksumAddress, isHexPrefixed, -} from 'ethereumjs-util'; +} from '@ethereumjs/util'; import punycode from 'punycode/punycode'; import ExtendedKeyringTypes from '../../constants/keyringTypes'; import Engine from '../../core/Engine'; @@ -342,7 +342,7 @@ export function safeToChecksumAddress(address: string) { /** * Validates that the input is a hex address. This utility method is a thin - * wrapper around ethereumjs-util.isValidAddress, with the exception that it + * wrapper around @ethereumjs/util.isValidAddress, with the exception that it * does not throw an error when provided values that are not hex strings. In * addition, and by default, this method will return true for hex strings that * meet the length requirement of a hex address, but are not prefixed with `0x` diff --git a/app/util/checkAddress.ts b/app/util/checkAddress.ts index 74c1d994a58..d770690e018 100644 --- a/app/util/checkAddress.ts +++ b/app/util/checkAddress.ts @@ -1,5 +1,5 @@ import type { AddressBookControllerState } from '@metamask/address-book-controller'; -import { toChecksumAddress } from 'ethereumjs-util'; +import { toChecksumAddress } from '@ethereumjs/util'; /** * Check whether the recipient of the given transaction is included in diff --git a/app/util/conversion/index.js b/app/util/conversion/index.js index d65cb685397..7888331237c 100644 --- a/app/util/conversion/index.js +++ b/app/util/conversion/index.js @@ -24,7 +24,7 @@ import BigNumber from 'bignumber.js'; import BN from 'bnjs4'; -import { stripHexPrefix } from 'ethereumjs-util'; +import { stripHexPrefix } from '@ethereumjs/util'; // Big Number Constants const BIG_NUMBER_WEI_MULTIPLIER = new BigNumber('1000000000000000000'); diff --git a/app/util/notifications/hooks/useSwitchNotifications.test.tsx b/app/util/notifications/hooks/useSwitchNotifications.test.tsx index 87b23072404..735f45db1a1 100644 --- a/app/util/notifications/hooks/useSwitchNotifications.test.tsx +++ b/app/util/notifications/hooks/useSwitchNotifications.test.tsx @@ -3,7 +3,7 @@ /* eslint-disable import/no-namespace */ import createMockStore from 'redux-mock-store'; import { act, renderHook } from '@testing-library/react-hooks'; -import { toChecksumAddress } from 'ethereumjs-util'; +import { toChecksumAddress } from '@ethereumjs/util'; import React from 'react'; import { Provider } from 'react-redux'; import { updateAccountState } from '../../../core/redux/slices/notifications'; diff --git a/app/util/number/index.js b/app/util/number/index.js index c3a76e42206..c26ac6c8b79 100644 --- a/app/util/number/index.js +++ b/app/util/number/index.js @@ -1,7 +1,7 @@ /** * Collection of utility functions for consistent formatting and conversion */ -import { stripHexPrefix } from 'ethereumjs-util'; +import { stripHexPrefix } from '@ethereumjs/util'; import BN4 from 'bnjs4'; import { utils as ethersUtils } from 'ethers'; import convert from '@metamask/ethjs-unit'; diff --git a/app/util/transactions/index.js b/app/util/transactions/index.js index c78a43790c3..c36a2e925e1 100644 --- a/app/util/transactions/index.js +++ b/app/util/transactions/index.js @@ -1,4 +1,4 @@ -import { addHexPrefix, toChecksumAddress } from 'ethereumjs-util'; +import { addHexPrefix, toChecksumAddress } from '@ethereumjs/util'; import BN from 'bnjs4'; import { rawEncode, rawDecode } from 'ethereumjs-abi'; import BigNumber from 'bignumber.js'; diff --git a/package.json b/package.json index 66ad50edca6..e340a50cc43 100644 --- a/package.json +++ b/package.json @@ -135,6 +135,7 @@ }, "dependencies": { "@consensys/on-ramp-sdk": "1.28.5", + "@ethereumjs/util": "^8.1.0", "@keystonehq/bc-ur-registry-eth": "^0.19.1", "@keystonehq/metamask-airgapped-keyring": "^0.13.1", "@keystonehq/ur-decoder": "^0.12.2", @@ -245,7 +246,6 @@ "eth-json-rpc-middleware": "4.3.0", "eth-url-parser": "1.0.4", "ethereumjs-abi": "^0.6.8", - "ethereumjs-util": "^7.1.5", "ethers": "^5.0.14", "ethjs-ens": "2.0.1", "eventemitter2": "^6.4.9", @@ -560,8 +560,6 @@ "detox": true, "detox>bunyan>dtrace-provider": false, "eciesjs>secp256k1": true, - "ethereumjs-util>keccak": true, - "ethereumjs-util>secp256k1": true, "ganache>@trufflesuite/bigint-buffer": false, "ganache>bufferutil": false, "ganache>keccak": true, diff --git a/yarn.lock b/yarn.lock index babbb13d10f..093fbe07b3a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9457,9 +9457,9 @@ "@types/node" "*" "@types/bn.js@^5.1.0", "@types/bn.js@^5.1.5": - version "5.1.5" - resolved "https://registry.yarnpkg.com/@types/bn.js/-/bn.js-5.1.5.tgz#2e0dacdcce2c0f16b905d20ff87aedbc6f7b4bf0" - integrity sha512-V46N0zwKRF5Q00AZ6hWtN0T8gGmDUaUzLWQvHFo5yThtVwK/VCenFY3wXVbOvNfajEpsTfQM4IN9k/d6gUVX3A== + version "5.1.6" + resolved "https://registry.yarnpkg.com/@types/bn.js/-/bn.js-5.1.6.tgz#9ba818eec0c85e4d3c679518428afdf611d03203" + integrity sha512-Xh8vSwUeMKeYYrj3cX4lGQgFSF/N03r+tv4AiLl1SucqV+uTQpxRcnM8AkXKHwYP9ZPXOYXRr2KPXpVlIvqh9w== dependencies: "@types/node" "*" @@ -17253,7 +17253,7 @@ ethereumjs-util@^6.0.0: ethjs-util "0.1.6" rlp "^2.2.3" -ethereumjs-util@^7.0.10, ethereumjs-util@^7.0.8, ethereumjs-util@^7.1.2, ethereumjs-util@^7.1.5: +ethereumjs-util@^7.0.10, ethereumjs-util@^7.0.8, ethereumjs-util@^7.1.2: version "7.1.5" resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-7.1.5.tgz#9ecf04861e4fbbeed7465ece5f23317ad1129181" integrity sha512-SDl5kKrQAudFBUe5OJM9Ac6WmMyYmXX/6sTmLZ3ffG2eY6ZIGBes3pEDxNN6V72WyOw4CPD5RomKdsa8DAAwLg==