AaronFiore/electrum
1
0
Fork 0
Code Activity

Revert "disable p2wpkh for hw wallets for now"

Browse Source 
This reverts commit e218c4a305.
This commit is contained in:
SomberNight
2018-01-12 18:46:08 +01:00
parent d731df3b22
commit f3f43c8f2a
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/base_wizard.py
View File

@@ -258,9 +258,6 @@ class BaseWizard(object):
def on_hw_derivation(self, name, device_info, derivation): def on_hw_derivation(self, name, device_info, derivation):
from .keystore import hardware_keystore from .keystore import hardware_keystore
xtype = keystore.xtype_from_derivation(derivation) xtype = keystore.xtype_from_derivation(derivation)
if xtype not in ('standard', 'p2wpkh-p2sh'):
self.show_error(_('Hardware wallet support for this script type is not yet enabled.'))
return
try: try:
xpub = self.plugin.get_xpub(device_info.device.id_, derivation, xtype, self) xpub = self.plugin.get_xpub(device_info.device.id_, derivation, xtype, self)
except ScriptTypeNotSupported: except ScriptTypeNotSupported: