Skip to content

Commit 4d962ac

Browse files
legobeatlegobeat
committed
deps(keyring-controller): ethereumjs-wallet@^1.0.1 -> @ethereumjs/wallet@^2.0.3
1 parent 6c07eb7 commit 4d962ac

File tree

3 files changed

+71
-78
lines changed

3 files changed

+71
-78
lines changed

‎packages/keyring-controller/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
},
4343
"dependencies": {
4444
"@ethereumjs/util": "^8.1.0",
45+
"@ethereumjs/wallet": "^2.0.3",
4546
"@keystonehq/metamask-airgapped-keyring": "^0.13.1",
4647
"@metamask/base-controller": "^5.0.1",
4748
"@metamask/browser-passworder": "^4.3.0",
@@ -52,7 +53,6 @@
5253
"@metamask/message-manager": "^8.0.1",
5354
"@metamask/utils": "^8.3.0",
5455
"async-mutex": "^0.2.6",
55-
"ethereumjs-wallet": "^1.0.1",
5656
"immer": "^9.0.6"
5757
},
5858
"devDependencies": {

‎packages/keyring-controller/src/KeyringController.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import type { TxData, TypedTransaction } from '@ethereumjs/tx';
22
import { isValidPrivate, toBuffer, getBinarySize } from '@ethereumjs/util';
3+
import Wallet, { thirdparty as importers } from '@ethereumjs/wallet';
34
import type {
45
MetaMaskKeyring as QRKeyring,
56
IKeyringState as IQRKeyringState,
@@ -40,7 +41,6 @@ import {
4041
} from '@metamask/utils';
4142
import { Mutex } from 'async-mutex';
4243
import type { MutexInterface } from 'async-mutex';
43-
import Wallet, { thirdparty as importers } from 'ethereumjs-wallet';
4444
import type { Patch } from 'immer';
4545

4646
import { KeyringControllerError } from './constants';

‎yarn.lock

+69-76
Original file line numberDiff line numberDiff line change
@@ -799,6 +799,15 @@ __metadata:
799799
languageName: node
800800
linkType: hard
801801

802+
"@ethereumjs/rlp@npm:^5.0.2":
803+
version: 5.0.2
804+
resolution: "@ethereumjs/rlp@npm:5.0.2"
805+
bin:
806+
rlp: bin/rlp.cjs
807+
checksum: b569061ddb1f4cf56a82f7a677c735ba37f9e94e2bbaf567404beb9e2da7aa1f595e72fc12a17c61f7aec67fd5448443efe542967c685a2fe0ffc435793dcbab
808+
languageName: node
809+
linkType: hard
810+
802811
"@ethereumjs/tx@npm:^4.0.2, @ethereumjs/tx@npm:^4.1.2, @ethereumjs/tx@npm:^4.2.0":
803812
version: 4.2.0
804813
resolution: "@ethereumjs/tx@npm:4.2.0"
@@ -822,6 +831,29 @@ __metadata:
822831
languageName: node
823832
linkType: hard
824833

834+
"@ethereumjs/util@npm:^9.0.3":
835+
version: 9.0.3
836+
resolution: "@ethereumjs/util@npm:9.0.3"
837+
dependencies:
838+
"@ethereumjs/rlp": ^5.0.2
839+
ethereum-cryptography: ^2.1.3
840+
checksum: 231dae61268c84d514a6c992a770559bb94a21c753c02287d08781cbeae01a6e5b5479af9f0d3d412d532fda6e9b1eeb746e617a68b738907a4a8ee4e24d79a6
841+
languageName: node
842+
linkType: hard
843+
844+
"@ethereumjs/wallet@npm:^2.0.3":
845+
version: 2.0.3
846+
resolution: "@ethereumjs/wallet@npm:2.0.3"
847+
dependencies:
848+
"@ethereumjs/util": ^9.0.3
849+
"@scure/base": ^1.1.5
850+
ethereum-cryptography: ^2.1.3
851+
js-md5: ^0.8.3
852+
uuid: ^9.0.1
853+
checksum: 2f813bc229c8ab052c3f2d6210204f316318e26f90b795e154cbfd6fc907a0e59e735745d298d2ad25e696a3a828dd9dcb5467b3e084a4dcd9cfa165933c1893
854+
languageName: node
855+
linkType: hard
856+
825857
"@ethersproject/abi@npm:^5.7.0":
826858
version: 5.7.0
827859
resolution: "@ethersproject/abi@npm:5.7.0"
@@ -2418,6 +2450,7 @@ __metadata:
24182450
"@ethereumjs/common": ^3.2.0
24192451
"@ethereumjs/tx": ^4.2.0
24202452
"@ethereumjs/util": ^8.1.0
2453+
"@ethereumjs/wallet": ^2.0.3
24212454
"@keystonehq/bc-ur-registry-eth": ^0.9.0
24222455
"@keystonehq/metamask-airgapped-keyring": ^0.13.1
24232456
"@lavamoat/allow-scripts": ^3.0.2
@@ -2434,7 +2467,6 @@ __metadata:
24342467
"@types/jest": ^27.4.1
24352468
async-mutex: ^0.2.6
24362469
deepmerge: ^4.2.2
2437-
ethereumjs-wallet: ^1.0.1
24382470
immer: ^9.0.6
24392471
jest: ^27.5.1
24402472
jest-environment-node: ^27.5.1
@@ -3135,16 +3167,7 @@ __metadata:
31353167
languageName: node
31363168
linkType: hard
31373169

3138-
"@noble/curves@npm:1.1.0, @noble/curves@npm:~1.1.0":
3139-
version: 1.1.0
3140-
resolution: "@noble/curves@npm:1.1.0"
3141-
dependencies:
3142-
"@noble/hashes": 1.3.1
3143-
checksum: 2658cdd3f84f71079b4e3516c47559d22cf4b55c23ac8ee9d2b1f8e5b72916d9689e59820e0f9d9cb4a46a8423af5b56dc6bb7782405c88be06a015180508db5
3144-
languageName: node
3145-
linkType: hard
3146-
3147-
"@noble/curves@npm:^1.2.0":
3170+
"@noble/curves@npm:1.3.0, @noble/curves@npm:^1.2.0, @noble/curves@npm:~1.3.0":
31483171
version: 1.3.0
31493172
resolution: "@noble/curves@npm:1.3.0"
31503173
dependencies:
@@ -3160,14 +3183,7 @@ __metadata:
31603183
languageName: node
31613184
linkType: hard
31623185

3163-
"@noble/hashes@npm:1.3.1":
3164-
version: 1.3.1
3165-
resolution: "@noble/hashes@npm:1.3.1"
3166-
checksum: 7fdefc0f7a0c1ec27acc6ff88841793e3f93ec4ce6b8a6a12bfc0dd70ae6b7c4c82fe305fdfeda1735d5ad4a9eebe761e6693b3d355689c559e91242f4bc95b1
3167-
languageName: node
3168-
linkType: hard
3169-
3170-
"@noble/hashes@npm:1.3.3, @noble/hashes@npm:~1.3.0, @noble/hashes@npm:~1.3.1, @noble/hashes@npm:~1.3.2":
3186+
"@noble/hashes@npm:1.3.3, @noble/hashes@npm:~1.3.2":
31713187
version: 1.3.3
31723188
resolution: "@noble/hashes@npm:1.3.3"
31733189
checksum: 8a6496d1c0c64797339bc694ad06cdfaa0f9e56cd0c3f68ae3666cfb153a791a55deb0af9c653c7ed2db64d537aa3e3054629740d2f2338bb1dcb7ab60cd205b
@@ -3409,31 +3425,31 @@ __metadata:
34093425
languageName: node
34103426
linkType: hard
34113427

3412-
"@scure/base@npm:^1.0.0, @scure/base@npm:^1.1.1, @scure/base@npm:^1.1.3, @scure/base@npm:~1.1.0, @scure/base@npm:~1.1.3":
3413-
version: 1.1.3
3414-
resolution: "@scure/base@npm:1.1.3"
3415-
checksum: 1606ab8a4db898cb3a1ada16c15437c3bce4e25854fadc8eb03ae93cbbbac1ed90655af4b0be3da37e12056fef11c0374499f69b9e658c9e5b7b3e06353c630c
3428+
"@scure/base@npm:^1.0.0, @scure/base@npm:^1.1.1, @scure/base@npm:^1.1.3, @scure/base@npm:^1.1.5, @scure/base@npm:~1.1.3, @scure/base@npm:~1.1.4":
3429+
version: 1.1.6
3430+
resolution: "@scure/base@npm:1.1.6"
3431+
checksum: d6deaae91deba99e87939af9e55d80edba302674983f32bba57f942e22b1726a83c62dc50d8f4370a5d5d35a212dda167fb169f4b0d0c297488d8604608fc3d3
34163432
languageName: node
34173433
linkType: hard
34183434

3419-
"@scure/bip32@npm:1.3.1":
3420-
version: 1.3.1
3421-
resolution: "@scure/bip32@npm:1.3.1"
3435+
"@scure/bip32@npm:1.3.3":
3436+
version: 1.3.3
3437+
resolution: "@scure/bip32@npm:1.3.3"
34223438
dependencies:
3423-
"@noble/curves": ~1.1.0
3424-
"@noble/hashes": ~1.3.1
3425-
"@scure/base": ~1.1.0
3426-
checksum: 394d65f77a40651eba21a5096da0f4233c3b50d422864751d373fcf142eeedb94a1149f9ab1dbb078086dab2d0bc27e2b1afec8321bf22d4403c7df2fea5bfe2
3439+
"@noble/curves": ~1.3.0
3440+
"@noble/hashes": ~1.3.2
3441+
"@scure/base": ~1.1.4
3442+
checksum: f939ca733972622fcc1e61d4fdf170a0ad294b24ddb7ed7cdd4c467e1ef283b970154cb101cf5f1a7b64cf5337e917ad31135911dfc36b1d76625320167df2fa
34273443
languageName: node
34283444
linkType: hard
34293445

3430-
"@scure/bip39@npm:1.2.1":
3431-
version: 1.2.1
3432-
resolution: "@scure/bip39@npm:1.2.1"
3446+
"@scure/bip39@npm:1.2.2":
3447+
version: 1.2.2
3448+
resolution: "@scure/bip39@npm:1.2.2"
34333449
dependencies:
3434-
"@noble/hashes": ~1.3.0
3435-
"@scure/base": ~1.1.0
3436-
checksum: c5bd6f1328fdbeae2dcdd891825b1610225310e5e62a4942714db51066866e4f7bef242c7b06a1b9dcc8043a4a13412cf5c5df76d3b10aa9e36b82e9b6e3eeaa
3450+
"@noble/hashes": ~1.3.2
3451+
"@scure/base": ~1.1.4
3452+
checksum: cb99505e6d2deef8e55e81df8c563ce8dbfdf1595596dc912bceadcf366c91b05a98130e928ecb090df74efdb20150b64acc4be55bc42768cab4d39a2833d234
34373453
languageName: node
34383454
linkType: hard
34393455

@@ -4130,13 +4146,6 @@ __metadata:
41304146
languageName: node
41314147
linkType: hard
41324148

4133-
"aes-js@npm:^3.1.2":
4134-
version: 3.1.2
4135-
resolution: "aes-js@npm:3.1.2"
4136-
checksum: 062154d50b1e433cc8c3b8ca7879f3a6375d5e79c2a507b2b6c4ec920b4cd851bf2afa7f65c98761a9da89c0ab618cbe6529e8e9a1c71f93290b53128fb8f712
4137-
languageName: node
4138-
linkType: hard
4139-
41404149
"agent-base@npm:6":
41414150
version: 6.0.2
41424151
resolution: "agent-base@npm:6.0.2"
@@ -6355,19 +6364,19 @@ __metadata:
63556364
languageName: node
63566365
linkType: hard
63576366

6358-
"ethereum-cryptography@npm:^2.0.0, ethereum-cryptography@npm:^2.1.2":
6359-
version: 2.1.2
6360-
resolution: "ethereum-cryptography@npm:2.1.2"
6367+
"ethereum-cryptography@npm:^2.0.0, ethereum-cryptography@npm:^2.1.2, ethereum-cryptography@npm:^2.1.3":
6368+
version: 2.1.3
6369+
resolution: "ethereum-cryptography@npm:2.1.3"
63616370
dependencies:
6362-
"@noble/curves": 1.1.0
6363-
"@noble/hashes": 1.3.1
6364-
"@scure/bip32": 1.3.1
6365-
"@scure/bip39": 1.2.1
6366-
checksum: 2e8f7b8cc90232ae838ab6a8167708e8362621404d26e79b5d9e762c7b53d699f7520aff358d9254de658fcd54d2d0af168ff909943259ed27dc4cef2736410c
6371+
"@noble/curves": 1.3.0
6372+
"@noble/hashes": 1.3.3
6373+
"@scure/bip32": 1.3.3
6374+
"@scure/bip39": 1.2.2
6375+
checksum: 7f9c14f868a588641179cace3eb86c332c4743290865db699870710253cabc4dc74bd4bce5e7bc6db667482e032e94d6f79521219eb6be5dc422059d279a27b7
63676376
languageName: node
63686377
linkType: hard
63696378

6370-
"ethereumjs-util@npm:^7.0.8, ethereumjs-util@npm:^7.1.2":
6379+
"ethereumjs-util@npm:^7.0.8":
63716380
version: 7.1.5
63726381
resolution: "ethereumjs-util@npm:7.1.5"
63736382
dependencies:
@@ -6380,22 +6389,6 @@ __metadata:
63806389
languageName: node
63816390
linkType: hard
63826391

6383-
"ethereumjs-wallet@npm:^1.0.1":
6384-
version: 1.0.2
6385-
resolution: "ethereumjs-wallet@npm:1.0.2"
6386-
dependencies:
6387-
aes-js: ^3.1.2
6388-
bs58check: ^2.1.2
6389-
ethereum-cryptography: ^0.1.3
6390-
ethereumjs-util: ^7.1.2
6391-
randombytes: ^2.1.0
6392-
scrypt-js: ^3.0.1
6393-
utf8: ^3.0.0
6394-
uuid: ^8.3.2
6395-
checksum: 555effe571c633ca9189e08639928e7bfcb601474f5a37653a3d028b06a10fb8577408c32d425ccecb3ac25d7165322cb9786239fa09ce276532d262206feb8c
6396-
languageName: node
6397-
linkType: hard
6398-
63996392
"ethjs-abi@npm:^0.2.0":
64006393
version: 0.2.1
64016394
resolution: "ethjs-abi@npm:0.2.1"
@@ -8479,6 +8472,13 @@ __metadata:
84798472
languageName: node
84808473
linkType: hard
84818474

8475+
"js-md5@npm:^0.8.3":
8476+
version: 0.8.3
8477+
resolution: "js-md5@npm:0.8.3"
8478+
checksum: b8578232d8004978036f114aa4d46ad7c06ca36b2a6889f241762263424cfea6099701ec5394a1b463ad95f18f74a2acb8c6033b5ebd6a188d67a9e704b41e05
8479+
languageName: node
8480+
linkType: hard
8481+
84828482
"js-sha3@npm:0.5.5":
84838483
version: 0.5.5
84848484
resolution: "js-sha3@npm:0.5.5"
@@ -10454,7 +10454,7 @@ __metadata:
1045410454
languageName: node
1045510455
linkType: hard
1045610456

10457-
"scrypt-js@npm:^3.0.0, scrypt-js@npm:^3.0.1":
10457+
"scrypt-js@npm:^3.0.0":
1045810458
version: 3.0.1
1045910459
resolution: "scrypt-js@npm:3.0.1"
1046010460
checksum: b7c7d1a68d6ca946f2fbb0778e0c4ec63c65501b54023b2af7d7e9f48fdb6c6580d6f7675cd53bda5944c5ebc057560d5a6365079752546865defb3b79dea454
@@ -11699,13 +11699,6 @@ __metadata:
1169911699
languageName: node
1170011700
linkType: hard
1170111701

11702-
"utf8@npm:^3.0.0":
11703-
version: 3.0.0
11704-
resolution: "utf8@npm:3.0.0"
11705-
checksum: cb89a69ad9ab393e3eae9b25305b3ff08bebca9adc839191a34f90777eb2942f86a96369d2839925fea58f8f722f7e27031d697f10f5f39690f8c5047303e62d
11706-
languageName: node
11707-
linkType: hard
11708-
1170911702
"util-deprecate@npm:^1.0.1, util-deprecate@npm:~1.0.1":
1171011703
version: 1.0.2
1171111704
resolution: "util-deprecate@npm:1.0.2"

0 commit comments

Comments
 (0)