AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge pull request #3630 from SomberNight/bip84

Browse Source 
bip84 for sw seeds
This commit is contained in:
ThomasV
2018-01-11 16:43:34 +01:00
committed by GitHub
parent 3c755aaa90 e218c4a305
commit 359882d0b1
3 changed files with 42 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/base_wizard.py
View File

@@ -232,14 +232,15 @@ class BaseWizard(object):
self.derivation_dialog(f)
def derivation_dialog(self, f):
default = bip44_derivation(0, False)
default = bip44_derivation(0, bip43_purpose=44)
message = '\n'.join([
_('Enter your wallet derivation here.'),
_('If you are not sure what this is, leave this field unchanged.')
])
presets = (
('legacy BIP44', bip44_derivation(0, False)),
('p2sh-segwit BIP49', bip44_derivation(0, True)),
('legacy BIP44', bip44_derivation(0, bip43_purpose=44)),
('p2sh-segwit BIP49', bip44_derivation(0, bip43_purpose=49)),
('native-segwit BIP84', bip44_derivation(0, bip43_purpose=84)),
)
self.line_dialog(run_next=f, title=_('Derivation'), message=message,
default=default, test=bitcoin.is_bip32_derivation,
@@ -247,7 +248,10 @@ class BaseWizard(object):
def on_hw_derivation(self, name, device_info, derivation):
from .keystore import hardware_keystore
xtype = 'p2wpkh-p2sh' if derivation.startswith("m/49'/") else 'standard'
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:
xpub = self.plugin.get_xpub(device_info.device.id_, derivation, xtype, self)
except BaseException as e: