Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix(deps): ethereumjs-util@^6.2.1->^7.1.5
  • Loading branch information
legobeat committed Oct 29, 2024
commit 6558a4f45772bbd5623920474588faa25cf36ee4
3 changes: 1 addition & 2 deletions app/store/migrations/029.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { toHex } from '@metamask/controller-utils';
import { Hex, hasProperty, isObject } from '@metamask/utils';
import { regex } from '../../../app/util/regex';

//@ts-expect-error - This error is expected, but ethereumjs-util exports this function
import { isHexString } from 'ethereumjs-util';
import { TransactionParams } from '@metamask/transaction-controller';
import { captureException } from '@sentry/react-native';
Expand Down Expand Up @@ -466,7 +465,7 @@ export default async function migrate(stateAsync: unknown) {
if (Array.isArray(transactionControllerState.transactions)) {
transactionControllerState.transactions.forEach(
(transaction: TransactionParams, index: number) => {
if (transaction && !isHexString(transaction.chainId)) {
if (transaction && (!transaction.chainId || (transaction.chainId && !isHexString(transaction.chainId)))) {
if (
Array.isArray(transactionControllerState.transactions) &&
isObject(transactionControllerState.transactions[index])
Expand Down
1 change: 0 additions & 1 deletion app/store/migrations/031.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import {
TokensControllerState,
} from '@metamask/assets-controllers';
import { toHex } from '@metamask/controller-utils';
//@ts-expect-error - This error is expected, but ethereumjs-util exports this function
import { isHexString } from 'ethereumjs-util';

/**
Expand Down
1 change: 0 additions & 1 deletion app/util/address/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import {
isValidAddress,
addHexPrefix,
isValidChecksumAddress,
//@ts-expect-error - This error is expected, but ethereumjs-util exports this function
isHexPrefixed,
} from 'ethereumjs-util';
import punycode from 'punycode/punycode';
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@
"eth-ens-namehash": "2.0.8",
"eth-url-parser": "1.0.4",
"ethereumjs-abi": "^0.6.8",
"ethereumjs-util": "^6.2.0",
"ethereumjs-util": "^7.1.5",
"ethers": "^5.0.14",
"ethjs-ens": "2.0.1",
"eventemitter2": "^6.4.9",
Expand Down
4 changes: 2 additions & 2 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -17124,7 +17124,7 @@ ethereumjs-abi@^0.6.8:
bn.js "^4.11.8"
ethereumjs-util "^6.0.0"

ethereumjs-util@^6.0.0, ethereumjs-util@^6.2.0:
ethereumjs-util@^6.0.0:
version "6.2.1"
resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-6.2.1.tgz#fcb4e4dd5ceacb9d2305426ab1a5cd93e3163b69"
integrity sha512-W2Ktez4L01Vexijrm5EB6w7dg4n/TgpoYU4avuT5T3Vmnw/eCRtiBrJfQYS/DCSvDIOLn2k57GcHdeBcgVxAqw==
Expand All @@ -17137,7 +17137,7 @@ ethereumjs-util@^6.0.0, ethereumjs-util@^6.2.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.0.10, ethereumjs-util@^7.0.8, ethereumjs-util@^7.1.2, ethereumjs-util@^7.1.5:
version "7.1.5"
resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-7.1.5.tgz#9ecf04861e4fbbeed7465ece5f23317ad1129181"
integrity sha512-SDl5kKrQAudFBUe5OJM9Ac6WmMyYmXX/6sTmLZ3ffG2eY6ZIGBes3pEDxNN6V72WyOw4CPD5RomKdsa8DAAwLg==
Expand Down