Skip to content

Commit 00c043e

Browse files
legobeatdanroc
legobeat
and
danroc
authored
deps: @metamask/keyring-api@^6.1.1->^6.4.0 (#4355)
## Explanation Bump to latest `@metamask/providers`. ## References This is causing issues: - MetaMask/keyring-api#331 ## Changelog ### `@metamask/accounts-controller` - **CHANGED**: Bump `@metamask/accounts-controller` from `^6.1.1` to `^6.4.0` ### `@metamask/assets-controller` - **CHANGED**: Bump `@metamask/assets-controller` from `^6.1.1` to `^6.4.0` ### `@metamask/chain-controller` - **CHANGED**: Bump `@metamask/chain-controller` from `^6.1.1` to `^6.4.0` ### `@metamask/keyring-controller` - **CHANGED**: Bump `@metamask/keyring-controller` from `^6.1.1` to `^6.4.0` ## Checklist - [x] I've updated the test suite for new or updated code as appropriate - [x] I've updated documentation (JSDoc, Markdown, etc.) for new or updated code as appropriate - [x] I've highlighted breaking changes using the "BREAKING" category above as appropriate --------- Co-authored-by: Daniel Rocha <[email protected]> Co-authored-by: Daniel Rocha <[email protected]>
1 parent 5251f3a commit 00c043e

File tree

7 files changed

+73
-68
lines changed

7 files changed

+73
-68
lines changed

‎packages/accounts-controller/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"@ethereumjs/util": "^8.1.0",
4545
"@metamask/base-controller": "^6.0.0",
4646
"@metamask/eth-snap-keyring": "^4.1.1",
47-
"@metamask/keyring-api": "^6.1.1",
47+
"@metamask/keyring-api": "^6.4.0",
4848
"@metamask/snaps-sdk": "^4.2.0",
4949
"@metamask/snaps-utils": "^7.4.0",
5050
"@metamask/utils": "^8.3.0",

‎packages/accounts-controller/src/AccountsController.test.ts‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import {
77
BtcAccountType,
88
BtcMethod,
99
EthAccountType,
10-
EthErc4337Method,
1110
EthMethod,
1211
} from '@metamask/keyring-api';
1312
import { KeyringTypes } from '@metamask/keyring-controller';
@@ -46,7 +45,7 @@ const mockGetKeyringForAccount = jest.fn();
4645
const mockGetKeyringByType = jest.fn();
4746
const mockGetAccounts = jest.fn();
4847

49-
const EOA_METHODS = [
48+
const ETH_EOA_METHODS = [
5049
EthMethod.PersonalSign,
5150
EthMethod.Sign,
5251
EthMethod.SignTransaction,
@@ -55,11 +54,17 @@ const EOA_METHODS = [
5554
EthMethod.SignTypedDataV4,
5655
] as const;
5756

57+
const ETH_ERC_4337_METHODS = [
58+
EthMethod.PatchUserOperation,
59+
EthMethod.PrepareUserOperation,
60+
EthMethod.SignUserOperation,
61+
] as const;
62+
5863
const mockAccount: InternalAccount = {
5964
id: 'mock-id',
6065
address: '0x123',
6166
options: {},
62-
methods: [...EOA_METHODS],
67+
methods: [...ETH_EOA_METHODS],
6368
type: EthAccountType.Eoa,
6469
metadata: {
6570
name: 'Account 1',
@@ -73,7 +78,7 @@ const mockAccount2: InternalAccount = {
7378
id: 'mock-id2',
7479
address: '0x1234',
7580
options: {},
76-
methods: [...EOA_METHODS],
81+
methods: [...ETH_EOA_METHODS],
7782
type: EthAccountType.Eoa,
7883
metadata: {
7984
name: 'Account 2',
@@ -87,7 +92,7 @@ const mockAccount3: InternalAccount = {
8792
id: 'mock-id3',
8893
address: '0x3333',
8994
options: {},
90-
methods: [...EOA_METHODS],
95+
methods: [...ETH_EOA_METHODS],
9196
type: EthAccountType.Eoa,
9297
metadata: {
9398
name: '',
@@ -106,7 +111,7 @@ const mockAccount4: InternalAccount = {
106111
id: 'mock-id4',
107112
address: '0x4444',
108113
options: {},
109-
methods: [...EOA_METHODS],
114+
methods: [...ETH_EOA_METHODS],
110115
type: EthAccountType.Eoa,
111116
metadata: {
112117
name: 'Custom Name',
@@ -183,8 +188,8 @@ function createExpectedInternalAccount({
183188
lastSelected?: number;
184189
}): InternalAccount {
185190
const accountTypeToMethods = {
186-
[`${EthAccountType.Eoa}`]: [...Object.values(EthMethod)],
187-
[`${EthAccountType.Erc4337}`]: [...Object.values(EthErc4337Method)],
191+
[`${EthAccountType.Eoa}`]: [...Object.values(ETH_EOA_METHODS)],
192+
[`${EthAccountType.Erc4337}`]: [...Object.values(ETH_ERC_4337_METHODS)],
188193
[`${BtcAccountType.P2wpkh}`]: [...Object.values(BtcMethod)],
189194
};
190195

‎packages/accounts-controller/src/tests/mocks.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import {
66
BtcAccountType,
77
BtcMethod,
88
EthAccountType,
9-
EthErc4337Method,
109
EthMethod,
1110
} from '@metamask/keyring-api';
1211
import { KeyringTypes } from '@metamask/keyring-controller';
@@ -50,9 +49,9 @@ export const createMockInternalAccount = ({
5049
break;
5150
case EthAccountType.Erc4337:
5251
methods = [
53-
EthErc4337Method.PatchUserOperation,
54-
EthErc4337Method.PrepareUserOperation,
55-
EthErc4337Method.SignUserOperation,
52+
EthMethod.PatchUserOperation,
53+
EthMethod.PrepareUserOperation,
54+
EthMethod.SignUserOperation,
5655
];
5756
break;
5857
case BtcAccountType.P2wpkh:

‎packages/assets-controllers/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
"devDependencies": {
7474
"@metamask/auto-changelog": "^3.4.4",
7575
"@metamask/ethjs-provider-http": "^0.3.0",
76-
"@metamask/keyring-api": "^6.1.1",
76+
"@metamask/keyring-api": "^6.4.0",
7777
"@types/jest": "^27.4.1",
7878
"@types/lodash": "^4.14.191",
7979
"@types/node": "^16.18.54",

‎packages/chain-controller/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"dependencies": {
4444
"@metamask/base-controller": "^6.0.0",
4545
"@metamask/chain-api": "^0.0.1",
46-
"@metamask/keyring-api": "^6.1.1",
46+
"@metamask/keyring-api": "^6.4.0",
4747
"@metamask/snaps-controllers": "^8.1.1",
4848
"@metamask/snaps-sdk": "^4.2.0",
4949
"@metamask/snaps-utils": "^7.4.0",

‎packages/keyring-controller/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"@metamask/eth-hd-keyring": "^7.0.1",
4949
"@metamask/eth-sig-util": "^7.0.1",
5050
"@metamask/eth-simple-keyring": "^6.0.1",
51-
"@metamask/keyring-api": "^6.1.1",
51+
"@metamask/keyring-api": "^6.4.0",
5252
"@metamask/message-manager": "^10.0.0",
5353
"@metamask/utils": "^8.3.0",
5454
"async-mutex": "^0.5.0",

‎yarn.lock‎

Lines changed: 53 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1617,7 +1617,7 @@ __metadata:
16171617
"@metamask/auto-changelog": ^3.4.4
16181618
"@metamask/base-controller": ^6.0.0
16191619
"@metamask/eth-snap-keyring": ^4.1.1
1620-
"@metamask/keyring-api": ^6.1.1
1620+
"@metamask/keyring-api": ^6.4.0
16211621
"@metamask/keyring-controller": ^17.0.0
16221622
"@metamask/snaps-controllers": ^8.1.1
16231623
"@metamask/snaps-sdk": ^4.2.0
@@ -1735,7 +1735,7 @@ __metadata:
17351735
"@metamask/controller-utils": ^11.0.0
17361736
"@metamask/eth-query": ^4.0.0
17371737
"@metamask/ethjs-provider-http": ^0.3.0
1738-
"@metamask/keyring-api": ^6.1.1
1738+
"@metamask/keyring-api": ^6.4.0
17391739
"@metamask/keyring-controller": ^17.0.0
17401740
"@metamask/metamask-eth-abis": ^3.1.1
17411741
"@metamask/network-controller": ^19.0.0
@@ -1876,7 +1876,7 @@ __metadata:
18761876
"@metamask/auto-changelog": ^3.4.4
18771877
"@metamask/base-controller": ^6.0.0
18781878
"@metamask/chain-api": ^0.0.1
1879-
"@metamask/keyring-api": ^6.1.1
1879+
"@metamask/keyring-api": ^6.4.0
18801880
"@metamask/snaps-controllers": ^8.1.1
18811881
"@metamask/snaps-sdk": ^4.2.0
18821882
"@metamask/snaps-utils": ^7.4.0
@@ -2227,20 +2227,20 @@ __metadata:
22272227
linkType: hard
22282228

22292229
"@metamask/eth-snap-keyring@npm:^4.1.1":
2230-
version: 4.1.1
2231-
resolution: "@metamask/eth-snap-keyring@npm:4.1.1"
2230+
version: 4.2.1
2231+
resolution: "@metamask/eth-snap-keyring@npm:4.2.1"
22322232
dependencies:
22332233
"@ethereumjs/tx": ^4.2.0
22342234
"@metamask/eth-sig-util": ^7.0.1
2235-
"@metamask/keyring-api": ^6.1.1
2235+
"@metamask/keyring-api": ^6.3.1
22362236
"@metamask/snaps-controllers": ^8.1.1
22372237
"@metamask/snaps-sdk": ^4.2.0
22382238
"@metamask/snaps-utils": ^7.4.0
22392239
"@metamask/utils": ^8.4.0
22402240
"@types/uuid": ^9.0.1
22412241
superstruct: ^1.0.3
22422242
uuid: ^9.0.0
2243-
checksum: a5d1c1ee83988a7bb829c2eaf6b9a7035c880c4a381d2a32d91aa1a554c97740232159afac93ddbb493cadba53757be2febd844f6f00fa91f21e73a9c6e3d92d
2243+
checksum: cd4eb41c878e619ea3f270439fc32e68f1d75ce92cf0232d5a21d62b6b62b2d9f2d7085078b5d2d85eb94690fd027045de1f741fce73ae7222f67935ec63c2ac
22442244
languageName: node
22452245
linkType: hard
22462246

@@ -2450,7 +2450,7 @@ __metadata:
24502450
languageName: unknown
24512451
linkType: soft
24522452

2453-
"@metamask/key-tree@npm:^9.0.0, @metamask/key-tree@npm:^9.1.0":
2453+
"@metamask/key-tree@npm:^9.1.1":
24542454
version: 9.1.1
24552455
resolution: "@metamask/key-tree@npm:9.1.1"
24562456
dependencies:
@@ -2463,19 +2463,19 @@ __metadata:
24632463
languageName: node
24642464
linkType: hard
24652465

2466-
"@metamask/keyring-api@npm:^6.1.1":
2467-
version: 6.1.1
2468-
resolution: "@metamask/keyring-api@npm:6.1.1"
2466+
"@metamask/keyring-api@npm:^6.3.1, @metamask/keyring-api@npm:^6.4.0":
2467+
version: 6.4.0
2468+
resolution: "@metamask/keyring-api@npm:6.4.0"
24692469
dependencies:
24702470
"@metamask/snaps-sdk": ^4.2.0
2471-
"@metamask/utils": ^8.3.0
2472-
"@types/uuid": ^9.0.1
2471+
"@metamask/utils": ^8.4.0
2472+
"@types/uuid": ^9.0.8
24732473
bech32: ^2.0.0
24742474
superstruct: ^1.0.3
2475-
uuid: ^9.0.0
2475+
uuid: ^9.0.1
24762476
peerDependencies:
2477-
"@metamask/providers": ">=15 <17"
2478-
checksum: 5a9ed008e19062c84ec8fd019ad29f9ebb7d8d8464bbe5da70ad26e6aceb57e4d98a9762e7cd9fea4ac7de0cdc08bfc0a5bf598770749aa9abdbe6d1840fb627
2477+
"@metamask/providers": ">=15 <18"
2478+
checksum: 7845ed5fa73db3165703c2142b6062d03ca5fea329b54d28f424dee2bb393edc1f9a015e771289ef7236c31f30355bf2c52ad74bb47cf531c09c5eec66e06b00
24792479
languageName: node
24802480
linkType: hard
24812481

@@ -2495,7 +2495,7 @@ __metadata:
24952495
"@metamask/eth-hd-keyring": ^7.0.1
24962496
"@metamask/eth-sig-util": ^7.0.1
24972497
"@metamask/eth-simple-keyring": ^6.0.1
2498-
"@metamask/keyring-api": ^6.1.1
2498+
"@metamask/keyring-api": ^6.4.0
24992499
"@metamask/message-manager": ^10.0.0
25002500
"@metamask/scure-bip39": ^2.1.1
25012501
"@metamask/utils": ^8.3.0
@@ -2804,7 +2804,7 @@ __metadata:
28042804
languageName: unknown
28052805
linkType: soft
28062806

2807-
"@metamask/post-message-stream@npm:^8.0.0":
2807+
"@metamask/post-message-stream@npm:^8.1.0":
28082808
version: 8.1.0
28092809
resolution: "@metamask/post-message-stream@npm:8.1.0"
28102810
dependencies:
@@ -2856,9 +2856,9 @@ __metadata:
28562856
languageName: unknown
28572857
linkType: soft
28582858

2859-
"@metamask/providers@npm:^16.1.0":
2860-
version: 16.1.0
2861-
resolution: "@metamask/providers@npm:16.1.0"
2859+
"@metamask/providers@npm:^17.0.0":
2860+
version: 17.0.0
2861+
resolution: "@metamask/providers@npm:17.0.0"
28622862
dependencies:
28632863
"@metamask/json-rpc-engine": ^8.0.1
28642864
"@metamask/json-rpc-middleware-stream": ^7.0.1
@@ -2871,8 +2871,9 @@ __metadata:
28712871
fast-deep-equal: ^3.1.3
28722872
is-stream: ^2.0.0
28732873
readable-stream: ^3.6.2
2874-
webextension-polyfill: ^0.10.0
2875-
checksum: 85e40140f342a38112c3d7cee436751a2be4c575cc4f815ab48a73b549abc2d756bf4a10e4b983e91dbd38076601f992531edb6d8d674aebceae32ef7e299275
2874+
peerDependencies:
2875+
webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0
2876+
checksum: 330e369458edc68d743d87b8b2597cdacac58df01b5fc31f565ae5dacee2390ee23693fb10fa451c6146665e87475a4c8f54163407eb05fceeb698900e34f9e6
28762877
languageName: node
28772878
linkType: hard
28782879

@@ -3015,8 +3016,8 @@ __metadata:
30153016
linkType: hard
30163017

30173018
"@metamask/snaps-controllers@npm:^8.1.1":
3018-
version: 8.1.1
3019-
resolution: "@metamask/snaps-controllers@npm:8.1.1"
3019+
version: 8.3.1
3020+
resolution: "@metamask/snaps-controllers@npm:8.3.1"
30203021
dependencies:
30213022
"@metamask/approval-controller": ^6.0.2
30223023
"@metamask/base-controller": ^5.0.2
@@ -3025,12 +3026,12 @@ __metadata:
30253026
"@metamask/object-multiplex": ^2.0.0
30263027
"@metamask/permission-controller": ^9.0.2
30273028
"@metamask/phishing-controller": ^9.0.1
3028-
"@metamask/post-message-stream": ^8.0.0
3029+
"@metamask/post-message-stream": ^8.1.0
30293030
"@metamask/rpc-errors": ^6.2.1
30303031
"@metamask/snaps-registry": ^3.1.0
3031-
"@metamask/snaps-rpc-methods": ^8.1.0
3032-
"@metamask/snaps-sdk": ^4.1.0
3033-
"@metamask/snaps-utils": ^7.3.0
3032+
"@metamask/snaps-rpc-methods": ^9.1.2
3033+
"@metamask/snaps-sdk": ^4.4.1
3034+
"@metamask/snaps-utils": ^7.4.1
30343035
"@metamask/utils": ^8.3.0
30353036
"@xstate/fsm": ^2.0.0
30363037
browserify-zlib: ^0.2.0
@@ -3043,11 +3044,11 @@ __metadata:
30433044
readable-web-to-node-stream: ^3.0.2
30443045
tar-stream: ^3.1.7
30453046
peerDependencies:
3046-
"@metamask/snaps-execution-environments": ^6.1.0
3047+
"@metamask/snaps-execution-environments": ^6.3.0
30473048
peerDependenciesMeta:
30483049
"@metamask/snaps-execution-environments":
30493050
optional: true
3050-
checksum: 6b3d68a48bae8a70f1f59043de6636c2ad5b2d8e427e40c1b124fc7a35a7dccc77031987ee404a8927dd3d53b4c82782abb80e768ef1defad378dbe2fa2b4a13
3051+
checksum: d2fccfc9a4fdea68c89755a0e93e292eafdbe28515fcf1f5ba761d4fb057ae2f1732d242f776cd089ea8dfbd0f84d9d2151778ba529fd9b5b4c7b00460a612ab
30513052
languageName: node
30523053
linkType: hard
30533054

@@ -3063,49 +3064,49 @@ __metadata:
30633064
languageName: node
30643065
linkType: hard
30653066

3066-
"@metamask/snaps-rpc-methods@npm:^8.1.0":
3067-
version: 8.1.0
3068-
resolution: "@metamask/snaps-rpc-methods@npm:8.1.0"
3067+
"@metamask/snaps-rpc-methods@npm:^9.1.2":
3068+
version: 9.1.2
3069+
resolution: "@metamask/snaps-rpc-methods@npm:9.1.2"
30693070
dependencies:
3070-
"@metamask/key-tree": ^9.0.0
3071+
"@metamask/key-tree": ^9.1.1
30713072
"@metamask/permission-controller": ^9.0.2
30723073
"@metamask/rpc-errors": ^6.2.1
3073-
"@metamask/snaps-sdk": ^4.1.0
3074-
"@metamask/snaps-utils": ^7.3.0
3074+
"@metamask/snaps-sdk": ^4.4.1
3075+
"@metamask/snaps-utils": ^7.4.1
30753076
"@metamask/utils": ^8.3.0
30763077
"@noble/hashes": ^1.3.1
30773078
superstruct: ^1.0.3
3078-
checksum: 343da447508c1d5a0757640bb6aa3a7b3979294574ce0600f5a011c2918eb1842ae20c93c0967cf49da622dae99af73f6b243fdfbf65046c5f638dc52d04600d
3079+
checksum: dffe041f69ae8593c080155b9338ed86997fd0e23098ccadbc80a2a17a461d3744008b30b419a49be93dbc8482c2f01f6c9fcbf844f58cebdae2439b81353d4b
30793080
languageName: node
30803081
linkType: hard
30813082

3082-
"@metamask/snaps-sdk@npm:^4.1.0, @metamask/snaps-sdk@npm:^4.2.0":
3083-
version: 4.2.0
3084-
resolution: "@metamask/snaps-sdk@npm:4.2.0"
3083+
"@metamask/snaps-sdk@npm:^4.2.0, @metamask/snaps-sdk@npm:^4.4.1":
3084+
version: 4.4.1
3085+
resolution: "@metamask/snaps-sdk@npm:4.4.1"
30853086
dependencies:
3086-
"@metamask/key-tree": ^9.1.0
3087-
"@metamask/providers": ^16.1.0
3087+
"@metamask/key-tree": ^9.1.1
3088+
"@metamask/providers": ^17.0.0
30883089
"@metamask/rpc-errors": ^6.2.1
30893090
"@metamask/utils": ^8.3.0
30903091
fast-xml-parser: ^4.3.4
30913092
superstruct: ^1.0.3
3092-
checksum: f9b0e6d7600680183e69d419f5a802208fdc119c7d1226a74076f3b8b8c581850b135392c2f35c391305fc37406973afeb19d8909101580ec16b63fd2f200a8c
3093+
checksum: 29dfc36821e77d033ddc1b8f1b8924b4880aca41a25e1767741b50659990a79d3026f3975613090342e98d0cf8d876a0e003edb23ff39d2927dc6473d5c441f9
30933094
languageName: node
30943095
linkType: hard
30953096

3096-
"@metamask/snaps-utils@npm:^7.3.0, @metamask/snaps-utils@npm:^7.4.0":
3097-
version: 7.4.0
3098-
resolution: "@metamask/snaps-utils@npm:7.4.0"
3097+
"@metamask/snaps-utils@npm:^7.4.0, @metamask/snaps-utils@npm:^7.4.1":
3098+
version: 7.4.1
3099+
resolution: "@metamask/snaps-utils@npm:7.4.1"
30993100
dependencies:
31003101
"@babel/core": ^7.23.2
31013102
"@babel/types": ^7.23.0
31023103
"@metamask/base-controller": ^5.0.2
3103-
"@metamask/key-tree": ^9.1.0
3104+
"@metamask/key-tree": ^9.1.1
31043105
"@metamask/permission-controller": ^9.0.2
31053106
"@metamask/rpc-errors": ^6.2.1
31063107
"@metamask/slip44": ^3.1.0
31073108
"@metamask/snaps-registry": ^3.1.0
3108-
"@metamask/snaps-sdk": ^4.2.0
3109+
"@metamask/snaps-sdk": ^4.4.1
31093110
"@metamask/utils": ^8.3.0
31103111
"@noble/hashes": ^1.3.1
31113112
"@scure/base": ^1.1.1
@@ -3119,7 +3120,7 @@ __metadata:
31193120
ses: ^1.1.0
31203121
superstruct: ^1.0.3
31213122
validate-npm-package-name: ^5.0.0
3122-
checksum: 1fb072f7262fa0f6685c85a3b44ce75805a87c13449c871e4dde0f6ac3c8cc62cc18ac51ae7eabc399165353abe6d08f3f4ee419cb1fe80518a202423b51660a
3123+
checksum: d1d6d3c769c33df88fb6e4fc852cdfe1e400b25b1cae020e729f1bfe8a094804cf901700afbbf1372cc1e95f697127b5847bf3a85b46b403ba2ae64ee5750d22
31233124
languageName: node
31243125
linkType: hard
31253126

@@ -4000,7 +4001,7 @@ __metadata:
40004001
languageName: node
40014002
linkType: hard
40024003

4003-
"@types/uuid@npm:^9.0.1":
4004+
"@types/uuid@npm:^9.0.1, @types/uuid@npm:^9.0.8":
40044005
version: 9.0.8
40054006
resolution: "@types/uuid@npm:9.0.8"
40064007
checksum: b8c60b7ba8250356b5088302583d1704a4e1a13558d143c549c408bf8920535602ffc12394ede77f8a8083511b023704bc66d1345792714002bfa261b17c5275
@@ -12023,7 +12024,7 @@ __metadata:
1202312024
languageName: node
1202412025
linkType: hard
1202512026

12026-
"webextension-polyfill@npm:>=0.10.0 <1.0, webextension-polyfill@npm:^0.10.0":
12027+
"webextension-polyfill@npm:>=0.10.0 <1.0":
1202712028
version: 0.10.0
1202812029
resolution: "webextension-polyfill@npm:0.10.0"
1202912030
checksum: 4a59036bda571360c2c0b2fb03fe1dc244f233946bcf9a6766f677956c40fd14d270aaa69cdba95e4ac521014afbe4008bfa5959d0ac39f91c990eb206587f91

0 commit comments

Comments
 (0)