Skip to content

Commit 94e1ebf

Browse files
shane-tGudahtt
shane-t
and
Gudahtt
authored
Version 11.9.2 (#22882)
## **Description** This hotfixes an issue affecting all MMI users originating in `@metamask/accounts-controller` where they are unable to find their keyrings. A [similar patch](#2269) was already merged to develop but operated on version 10 of that library. This duplicates @montelaidev's patch but for 4.0.0 ## **Related issues** ## **Manual testing steps** 1. Onboard to qredo 2. Observe there is no error ## **Screenshots/Recordings** <!-- If applicable, add screenshots and/or recordings to visualize the before and after of your change. --> ### **Before** ![image](https://github.com/MetaMask/metamask-extension/assets/1504499/24ff33da-8646-4255-8d5e-778e3be7a2aa) ### **After** <!-- [screenshots/recordings] --> ## **Pre-merge author checklist** - [X] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [X] I've clearly explained what problem this PR is solving and how it is solved. - [X] I've linked related issues - [X] I've included manual testing steps - [X] I've included screenshots/recordings if applicable - [X] I’ve included tests if applicable - [X] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [X] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. - [x] I’ve properly set the pull request status: - [ ] In case it's not yet "ready for review", I've set it to "draft". - [x] In case it's "ready for review", I've changed it from "draft" to "non-draft". ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --------- Co-authored-by: Mark Stacey <markjstacey@gmail.com>
1 parent d2958b2 commit 94e1ebf

File tree

10 files changed

+338
-311
lines changed

10 files changed

+338
-311
lines changed

‎.yarn/patches/@metamask-accounts-controller-npm-4.0.0-3127b56d14.patch‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
diff --git a/dist/utils.js b/dist/utils.js
2-
index 810f229841ffff83f7a28191bc558862b1809e01..2daf3b12cf8a77aad9a5e0a6167734540805ecfc 100644
2+
index 810f229841ffff83f7a28191bc558862b1809e01..31047fd3387693f30a76807d596a8de86bb505e1 100644
33
--- a/dist/utils.js
44
+++ b/dist/utils.js
5-
@@ -36,6 +36,13 @@ function keyringTypeToName(keyringType) {
6-
case keyring_controller_1.KeyringTypes.custody: {
7-
return 'Custody';
8-
}
9-
+ /**
10-
+ * PATCH INFORMATION - The keyring type used for custody account has been changed from 'Custody' to 'Custody - JSONRPC'.
11-
+ * To do: Develop a better solution to keep all keyring types in sync.
12-
+ */
13-
+ case 'Custody - JSONRPC': {
14-
+ return 'Custody';
15-
+ }
16-
default: {
17-
throw new Error(`Unknown keyring ${keyringType}`);
18-
}
5+
@@ -11,6 +11,12 @@ const uuid_1 = require("uuid");
6+
* @returns The name of the keyring type.
7+
*/
8+
function keyringTypeToName(keyringType) {
9+
+
10+
+ // Custody Keyrings follow this pattern
11+
+ if (/^Custody.*/.test(keyringType)) {
12+
+ return "Custody";
13+
+ }
14+
+
15+
switch (keyringType) {
16+
case keyring_controller_1.KeyringTypes.simple: {
17+
return 'Account';

‎CHANGELOG.md‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased]
88

9+
## [11.9.2]
10+
### Fixed
11+
- [MMI] Patches `@metamask/accounts-controller` to fix an issue with MMI where custodial keyrings could nto be found ([#22730](https://github.com/MetaMask/metamask-extension/pull/22692))
12+
913
## [11.9.1]
1014
### Fixed
1115
- [MMI] Patches `@metamask/transaction-controller` to fix an issue with MMI where due to a TransactionController refactor, custodial transactions stopped yielding a hash to dapps when they were submitted ([#22730](https://github.com/MetaMask/metamask-extension/pull/22730))
@@ -4343,7 +4347,8 @@ Update styles and spacing on the critical error page ([#20350](https://github.c
43434347
### Uncategorized
43444348
- Added the ability to restore accounts from seed words.
43454349

4346-
[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v11.9.1...HEAD
4350+
[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v11.9.2...HEAD
4351+
[11.9.2]: https://github.com/MetaMask/metamask-extension/compare/v11.9.1...v11.9.2
43474352
[11.9.1]: https://github.com/MetaMask/metamask-extension/compare/v11.9.0...v11.9.1
43484353
[11.9.0]: https://github.com/MetaMask/metamask-extension/compare/v11.8.0...v11.9.0
43494354
[11.8.0]: https://github.com/MetaMask/metamask-extension/compare/v11.7.5...v11.8.0

‎lavamoat/browserify/beta/policy.json‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1062,9 +1062,9 @@
10621062
},
10631063
"@metamask/eth-token-tracker>deep-equal": {
10641064
"packages": {
1065+
"@lavamoat/lavapack>json-stable-stringify>isarray": true,
10651066
"@metamask/eth-token-tracker>deep-equal>es-get-iterator": true,
10661067
"@metamask/eth-token-tracker>deep-equal>is-date-object": true,
1067-
"@metamask/eth-token-tracker>deep-equal>isarray": true,
10681068
"@metamask/eth-token-tracker>deep-equal>which-boxed-primitive": true,
10691069
"@metamask/eth-token-tracker>deep-equal>which-collection": true,
10701070
"@ngraveio/bc-ur>assert>object-is": true,
@@ -1084,9 +1084,9 @@
10841084
},
10851085
"@metamask/eth-token-tracker>deep-equal>es-get-iterator": {
10861086
"packages": {
1087+
"@lavamoat/lavapack>json-stable-stringify>isarray": true,
10871088
"@metamask/eth-token-tracker>deep-equal>es-get-iterator>is-map": true,
10881089
"@metamask/eth-token-tracker>deep-equal>es-get-iterator>is-set": true,
1089-
"@metamask/eth-token-tracker>deep-equal>es-get-iterator>isarray": true,
10901090
"@metamask/eth-token-tracker>deep-equal>es-get-iterator>stop-iteration-iterator": true,
10911091
"browserify>process": true,
10921092
"browserify>util>is-arguments": true,
@@ -2320,9 +2320,7 @@
23202320
"clearTimeout": true,
23212321
"console.error": true,
23222322
"document": true,
2323-
"new": true,
2324-
"setTimeout": true,
2325-
"target": true
2323+
"setTimeout": true
23262324
},
23272325
"packages": {
23282326
"browserify>process": true
@@ -3598,9 +3596,7 @@
35983596
"globals": {
35993597
"AbortController": true,
36003598
"AggregateError": true,
3601-
"Blob": true,
3602-
"new": true,
3603-
"target": true
3599+
"Blob": true
36043600
},
36053601
"packages": {
36063602
"browserify>buffer": true,
@@ -3639,6 +3635,7 @@
36393635
"globalthis>define-properties>define-data-property": {
36403636
"packages": {
36413637
"globalthis>define-properties>has-property-descriptors": true,
3638+
"string.prototype.matchall>call-bind>es-errors": true,
36423639
"string.prototype.matchall>es-abstract>gopd": true,
36433640
"string.prototype.matchall>get-intrinsic": true
36443641
}
@@ -4364,6 +4361,17 @@
43644361
"string.prototype.matchall>call-bind": {
43654362
"packages": {
43664363
"browserify>has>function-bind": true,
4364+
"string.prototype.matchall>call-bind>es-errors": true,
4365+
"string.prototype.matchall>call-bind>set-function-length": true,
4366+
"string.prototype.matchall>get-intrinsic": true
4367+
}
4368+
},
4369+
"string.prototype.matchall>call-bind>set-function-length": {
4370+
"packages": {
4371+
"globalthis>define-properties>define-data-property": true,
4372+
"globalthis>define-properties>has-property-descriptors": true,
4373+
"string.prototype.matchall>call-bind>es-errors": true,
4374+
"string.prototype.matchall>es-abstract>gopd": true,
43674375
"string.prototype.matchall>get-intrinsic": true
43684376
}
43694377
},
@@ -4415,6 +4423,7 @@
44154423
"packages": {
44164424
"browserify>has>function-bind": true,
44174425
"depcheck>is-core-module>hasown": true,
4426+
"string.prototype.matchall>call-bind>es-errors": true,
44184427
"string.prototype.matchall>es-abstract>has-proto": true,
44194428
"string.prototype.matchall>has-symbols": true
44204429
}

‎lavamoat/browserify/desktop/policy.json‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1139,9 +1139,9 @@
11391139
},
11401140
"@metamask/eth-token-tracker>deep-equal": {
11411141
"packages": {
1142+
"@lavamoat/lavapack>json-stable-stringify>isarray": true,
11421143
"@metamask/eth-token-tracker>deep-equal>es-get-iterator": true,
11431144
"@metamask/eth-token-tracker>deep-equal>is-date-object": true,
1144-
"@metamask/eth-token-tracker>deep-equal>isarray": true,
11451145
"@metamask/eth-token-tracker>deep-equal>which-boxed-primitive": true,
11461146
"@metamask/eth-token-tracker>deep-equal>which-collection": true,
11471147
"@ngraveio/bc-ur>assert>object-is": true,
@@ -1161,9 +1161,9 @@
11611161
},
11621162
"@metamask/eth-token-tracker>deep-equal>es-get-iterator": {
11631163
"packages": {
1164+
"@lavamoat/lavapack>json-stable-stringify>isarray": true,
11641165
"@metamask/eth-token-tracker>deep-equal>es-get-iterator>is-map": true,
11651166
"@metamask/eth-token-tracker>deep-equal>es-get-iterator>is-set": true,
1166-
"@metamask/eth-token-tracker>deep-equal>es-get-iterator>isarray": true,
11671167
"@metamask/eth-token-tracker>deep-equal>es-get-iterator>stop-iteration-iterator": true,
11681168
"browserify>process": true,
11691169
"browserify>util>is-arguments": true,
@@ -2572,9 +2572,7 @@
25722572
"clearTimeout": true,
25732573
"console.error": true,
25742574
"document": true,
2575-
"new": true,
2576-
"setTimeout": true,
2577-
"target": true
2575+
"setTimeout": true
25782576
},
25792577
"packages": {
25802578
"browserify>process": true
@@ -3855,9 +3853,7 @@
38553853
"globals": {
38563854
"AbortController": true,
38573855
"AggregateError": true,
3858-
"Blob": true,
3859-
"new": true,
3860-
"target": true
3856+
"Blob": true
38613857
},
38623858
"packages": {
38633859
"browserify>buffer": true,
@@ -3896,6 +3892,7 @@
38963892
"globalthis>define-properties>define-data-property": {
38973893
"packages": {
38983894
"globalthis>define-properties>has-property-descriptors": true,
3895+
"string.prototype.matchall>call-bind>es-errors": true,
38993896
"string.prototype.matchall>es-abstract>gopd": true,
39003897
"string.prototype.matchall>get-intrinsic": true
39013898
}
@@ -4730,6 +4727,17 @@
47304727
"string.prototype.matchall>call-bind": {
47314728
"packages": {
47324729
"browserify>has>function-bind": true,
4730+
"string.prototype.matchall>call-bind>es-errors": true,
4731+
"string.prototype.matchall>call-bind>set-function-length": true,
4732+
"string.prototype.matchall>get-intrinsic": true
4733+
}
4734+
},
4735+
"string.prototype.matchall>call-bind>set-function-length": {
4736+
"packages": {
4737+
"globalthis>define-properties>define-data-property": true,
4738+
"globalthis>define-properties>has-property-descriptors": true,
4739+
"string.prototype.matchall>call-bind>es-errors": true,
4740+
"string.prototype.matchall>es-abstract>gopd": true,
47334741
"string.prototype.matchall>get-intrinsic": true
47344742
}
47354743
},
@@ -4781,6 +4789,7 @@
47814789
"packages": {
47824790
"browserify>has>function-bind": true,
47834791
"depcheck>is-core-module>hasown": true,
4792+
"string.prototype.matchall>call-bind>es-errors": true,
47844793
"string.prototype.matchall>es-abstract>has-proto": true,
47854794
"string.prototype.matchall>has-symbols": true
47864795
}

‎lavamoat/browserify/flask/policy.json‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1139,9 +1139,9 @@
11391139
},
11401140
"@metamask/eth-token-tracker>deep-equal": {
11411141
"packages": {
1142+
"@lavamoat/lavapack>json-stable-stringify>isarray": true,
11421143
"@metamask/eth-token-tracker>deep-equal>es-get-iterator": true,
11431144
"@metamask/eth-token-tracker>deep-equal>is-date-object": true,
1144-
"@metamask/eth-token-tracker>deep-equal>isarray": true,
11451145
"@metamask/eth-token-tracker>deep-equal>which-boxed-primitive": true,
11461146
"@metamask/eth-token-tracker>deep-equal>which-collection": true,
11471147
"@ngraveio/bc-ur>assert>object-is": true,
@@ -1161,9 +1161,9 @@
11611161
},
11621162
"@metamask/eth-token-tracker>deep-equal>es-get-iterator": {
11631163
"packages": {
1164+
"@lavamoat/lavapack>json-stable-stringify>isarray": true,
11641165
"@metamask/eth-token-tracker>deep-equal>es-get-iterator>is-map": true,
11651166
"@metamask/eth-token-tracker>deep-equal>es-get-iterator>is-set": true,
1166-
"@metamask/eth-token-tracker>deep-equal>es-get-iterator>isarray": true,
11671167
"@metamask/eth-token-tracker>deep-equal>es-get-iterator>stop-iteration-iterator": true,
11681168
"browserify>process": true,
11691169
"browserify>util>is-arguments": true,
@@ -2625,9 +2625,7 @@
26252625
"clearTimeout": true,
26262626
"console.error": true,
26272627
"document": true,
2628-
"new": true,
2629-
"setTimeout": true,
2630-
"target": true
2628+
"setTimeout": true
26312629
},
26322630
"packages": {
26332631
"browserify>process": true
@@ -3908,9 +3906,7 @@
39083906
"globals": {
39093907
"AbortController": true,
39103908
"AggregateError": true,
3911-
"Blob": true,
3912-
"new": true,
3913-
"target": true
3909+
"Blob": true
39143910
},
39153911
"packages": {
39163912
"browserify>buffer": true,
@@ -3949,6 +3945,7 @@
39493945
"globalthis>define-properties>define-data-property": {
39503946
"packages": {
39513947
"globalthis>define-properties>has-property-descriptors": true,
3948+
"string.prototype.matchall>call-bind>es-errors": true,
39523949
"string.prototype.matchall>es-abstract>gopd": true,
39533950
"string.prototype.matchall>get-intrinsic": true
39543951
}
@@ -4783,6 +4780,17 @@
47834780
"string.prototype.matchall>call-bind": {
47844781
"packages": {
47854782
"browserify>has>function-bind": true,
4783+
"string.prototype.matchall>call-bind>es-errors": true,
4784+
"string.prototype.matchall>call-bind>set-function-length": true,
4785+
"string.prototype.matchall>get-intrinsic": true
4786+
}
4787+
},
4788+
"string.prototype.matchall>call-bind>set-function-length": {
4789+
"packages": {
4790+
"globalthis>define-properties>define-data-property": true,
4791+
"globalthis>define-properties>has-property-descriptors": true,
4792+
"string.prototype.matchall>call-bind>es-errors": true,
4793+
"string.prototype.matchall>es-abstract>gopd": true,
47864794
"string.prototype.matchall>get-intrinsic": true
47874795
}
47884796
},
@@ -4834,6 +4842,7 @@
48344842
"packages": {
48354843
"browserify>has>function-bind": true,
48364844
"depcheck>is-core-module>hasown": true,
4845+
"string.prototype.matchall>call-bind>es-errors": true,
48374846
"string.prototype.matchall>es-abstract>has-proto": true,
48384847
"string.prototype.matchall>has-symbols": true
48394848
}

‎lavamoat/browserify/main/policy.json‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1062,9 +1062,9 @@
10621062
},
10631063
"@metamask/eth-token-tracker>deep-equal": {
10641064
"packages": {
1065+
"@lavamoat/lavapack>json-stable-stringify>isarray": true,
10651066
"@metamask/eth-token-tracker>deep-equal>es-get-iterator": true,
10661067
"@metamask/eth-token-tracker>deep-equal>is-date-object": true,
1067-
"@metamask/eth-token-tracker>deep-equal>isarray": true,
10681068
"@metamask/eth-token-tracker>deep-equal>which-boxed-primitive": true,
10691069
"@metamask/eth-token-tracker>deep-equal>which-collection": true,
10701070
"@ngraveio/bc-ur>assert>object-is": true,
@@ -1084,9 +1084,9 @@
10841084
},
10851085
"@metamask/eth-token-tracker>deep-equal>es-get-iterator": {
10861086
"packages": {
1087+
"@lavamoat/lavapack>json-stable-stringify>isarray": true,
10871088
"@metamask/eth-token-tracker>deep-equal>es-get-iterator>is-map": true,
10881089
"@metamask/eth-token-tracker>deep-equal>es-get-iterator>is-set": true,
1089-
"@metamask/eth-token-tracker>deep-equal>es-get-iterator>isarray": true,
10901090
"@metamask/eth-token-tracker>deep-equal>es-get-iterator>stop-iteration-iterator": true,
10911091
"browserify>process": true,
10921092
"browserify>util>is-arguments": true,
@@ -2548,9 +2548,7 @@
25482548
"clearTimeout": true,
25492549
"console.error": true,
25502550
"document": true,
2551-
"new": true,
2552-
"setTimeout": true,
2553-
"target": true
2551+
"setTimeout": true
25542552
},
25552553
"packages": {
25562554
"browserify>process": true
@@ -3831,9 +3829,7 @@
38313829
"globals": {
38323830
"AbortController": true,
38333831
"AggregateError": true,
3834-
"Blob": true,
3835-
"new": true,
3836-
"target": true
3832+
"Blob": true
38373833
},
38383834
"packages": {
38393835
"browserify>buffer": true,
@@ -3872,6 +3868,7 @@
38723868
"globalthis>define-properties>define-data-property": {
38733869
"packages": {
38743870
"globalthis>define-properties>has-property-descriptors": true,
3871+
"string.prototype.matchall>call-bind>es-errors": true,
38753872
"string.prototype.matchall>es-abstract>gopd": true,
38763873
"string.prototype.matchall>get-intrinsic": true
38773874
}
@@ -4706,6 +4703,17 @@
47064703
"string.prototype.matchall>call-bind": {
47074704
"packages": {
47084705
"browserify>has>function-bind": true,
4706+
"string.prototype.matchall>call-bind>es-errors": true,
4707+
"string.prototype.matchall>call-bind>set-function-length": true,
4708+
"string.prototype.matchall>get-intrinsic": true
4709+
}
4710+
},
4711+
"string.prototype.matchall>call-bind>set-function-length": {
4712+
"packages": {
4713+
"globalthis>define-properties>define-data-property": true,
4714+
"globalthis>define-properties>has-property-descriptors": true,
4715+
"string.prototype.matchall>call-bind>es-errors": true,
4716+
"string.prototype.matchall>es-abstract>gopd": true,
47094717
"string.prototype.matchall>get-intrinsic": true
47104718
}
47114719
},
@@ -4757,6 +4765,7 @@
47574765
"packages": {
47584766
"browserify>has>function-bind": true,
47594767
"depcheck>is-core-module>hasown": true,
4768+
"string.prototype.matchall>call-bind>es-errors": true,
47604769
"string.prototype.matchall>es-abstract>has-proto": true,
47614770
"string.prototype.matchall>has-symbols": true
47624771
}

0 commit comments

Comments
 (0)