Skip to content

Commit

Permalink
Reapply patches to new accounts-controller, keyring-controller versions
Browse files Browse the repository at this point in the history
  • Loading branch information
MajorLift committed Mar 8, 2024
1 parent 44f6f0f commit 96e8576
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 91 deletions.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/dist/utils.js b/dist/utils.js
index 0a77dd709e786ee586b70677fa951f34d5097e34..dbb30f1116fc7c9f174548836c2d6d4e15049253 100644
--- a/dist/utils.js
+++ b/dist/utils.js
@@ -39,6 +39,9 @@ function keyringTypeToName(keyringType) {
case keyring_controller_1.KeyringTypes.snap: {
return 'Snap Account';
}
+ case keyring_controller_1.KeyringTypes.custody: {
+ return 'Custody';
+ }
default: {
throw new Error(`Unknown keyring ${keyringType}`);
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/dist/KeyringController.js b/dist/KeyringController.js
index da3fb9c0bf437e07f1927bca0bbfc94ed8454c2d..a3211dc83edb5d18daf328adc5a63fee920dd321 100644
index da3fb9c0bf437e07f1927bca0bbfc94ed8454c2d..c6969a3a28791bbf9fbb9d8a41193dce258e69e5 100644
--- a/dist/KeyringController.js
+++ b/dist/KeyringController.js
@@ -713,7 +713,6 @@ class KeyringController extends base_controller_1.BaseController {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/dist/KeyringController.js b/dist/KeyringController.js
index fc649ea6fc97b905d811b236de638172fb10b548..a856abf0b4942585e0b9b5682b1974bff6f68b1f 100644
--- a/dist/KeyringController.js
+++ b/dist/KeyringController.js
@@ -945,7 +945,6 @@ class KeyringController extends base_controller_1.BaseController {
throw new Error('Seed phrase imported different accounts.');
}
});
- return seedWords;
});
}
// QR Hardware related methods
9 changes: 7 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,11 @@
"nonce-tracker@npm:^3.0.0": "patch:nonce-tracker@npm%3A3.0.0#~/.yarn/patches/nonce-tracker-npm-3.0.0-c5e9a93f9d.patch",
"@trezor/connect-web": "9.0.11",
"lavamoat-core@npm:^15.1.1": "patch:lavamoat-core@npm%3A15.1.1#~/.yarn/patches/lavamoat-core-npm-15.1.1-51fbe39988.patch",
"tar-stream@npm:^3.1.6": "patch:tar-stream@npm%3A3.1.6#~/.yarn/patches/tar-stream-npm-3.1.6-ce3ac17e49.patch",
"socks": "^2.7.3",
"@metamask/accounts-controller@npm:^11.0.0": "patch:@metamask/accounts-controller@npm%3A11.0.0#~/.yarn/patches/@metamask-accounts-controller-npm-11.0.0-c67f9a2901.patch",
"@metamask/keyring-controller@npm:^12.2.0": "patch:@metamask/keyring-controller@npm%3A12.2.0#~/.yarn/patches/@metamask-keyring-controller-npm-12.2.0-2b196324d1.patch",
"@metamask/keyring-controller@npm:^13.0.0": "patch:@metamask/keyring-controller@npm%3A13.0.0#~/.yarn/patches/@metamask-keyring-controller-npm-13.0.0-d94816a680.patch",
"@metamask/snaps-sdk": "^3.1.0"
},
"dependencies": {
Expand Down Expand Up @@ -243,7 +248,7 @@
"@metamask-institutional/sdk": "^0.1.23",
"@metamask-institutional/transaction-update": "^0.1.32",
"@metamask/abi-utils": "^2.0.2",
"@metamask/accounts-controller": "^11.0.0",
"@metamask/accounts-controller": "patch:@metamask/accounts-controller@npm%3A11.0.0#~/.yarn/patches/@metamask-accounts-controller-npm-11.0.0-c67f9a2901.patch",
"@metamask/address-book-controller": "^3.0.0",
"@metamask/announcement-controller": "^5.0.1",
"@metamask/approval-controller": "^5.1.2",
Expand All @@ -270,7 +275,7 @@
"@metamask/gas-fee-controller": "^13.0.0",
"@metamask/jazzicon": "^2.0.0",
"@metamask/keyring-api": "^3.0.0",
"@metamask/keyring-controller": "^13.0.0",
"@metamask/keyring-controller": "patch:@metamask/keyring-controller@npm%3A12.2.0#~/.yarn/patches/@metamask-keyring-controller-npm-12.2.0-2b196324d1.patch",
"@metamask/logging-controller": "^2.0.2",
"@metamask/logo": "^3.1.2",
"@metamask/message-manager": "^7.3.0",
Expand Down

0 comments on commit 96e8576

Please sign in to comment.