Skip to content

Dev olu hardware wallet feature flag #16725

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

Dev olu hardware wallet feature flag #16725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a018e22
Put hardware wallets behind an HARDWARE_WALLETS_MV3 flag
segun Nov 29, 2022
dec284f
update to metamask/eth-keyring-controller
segun Jan 19, 2023
8945c37
revert to eth-keyring-controller v8
segun Jan 23, 2023
c6c330e
LAvamost after rebase
segun Jan 23, 2023
ee6652a
lock file.
segun Jan 23, 2023
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
16 changes: 14 additions & 2 deletions app/scripts/metamask-controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,8 +644,9 @@ export default class MetamaskController extends EventEmitter {
await opts.openPopup();
});

let additionalKeyrings = [];
if (!isManifestV3) {
let additionalKeyrings = [keyringBuilderFactory(QRHardwareKeyring)];

if (this.canUseHardwareWallets()) {
const additionalKeyringTypes = [
TrezorKeyring,
LedgerBridgeKeyring,
Expand All @@ -663,6 +664,7 @@ export default class MetamaskController extends EventEmitter {
encryptor: opts.encryptor || undefined,
cacheEncryptionKey: isManifestV3,
});

this.keyringController.memStore.subscribe((state) =>
this._onKeyringControllerUpdate(state),
);
Expand Down Expand Up @@ -1321,6 +1323,10 @@ export default class MetamaskController extends EventEmitter {
}
}

canUseHardwareWallets() {
return !isManifestV3 || process.env.CONF?.HARDWARE_WALLETS_MV3;
}

resetStates(resetMethods) {
resetMethods.forEach((resetMethod) => {
try {
Expand Down Expand Up @@ -2590,6 +2596,12 @@ export default class MetamaskController extends EventEmitter {

async getKeyringForDevice(deviceName, hdPath = null) {
let keyringName = null;
if (
deviceName !== HardwareDeviceNames.QR &&
!this.canUseHardwareWallets()
) {
throw new Error('Hardware wallets are not supported on this version.');
}
switch (deviceName) {
case HardwareDeviceNames.trezor:
keyringName = TrezorKeyring.type;
Expand Down
Loading