AaronFiore/electrum
1
0
Fork 0
Code Activity

split bip32 from bitcoin.py

Browse Source
This commit is contained in:
SomberNight
2018-10-25 22:20:33 +02:00
parent c61e13c1e9
commit a88a2dea82
24 changed files with 391 additions and 372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
electrum/base_wizard.py
View File

@@ -30,6 +30,7 @@ from functools import partial
from . import bitcoin
from . import keystore
from .bip32 import is_bip32_derivation, xpub_type
from .keystore import bip44_derivation, purpose48_derivation
from .wallet import (Imported_Wallet, Standard_Wallet, Multisig_Wallet,
wallet_types, Wallet, Abstract_Wallet)
@@ -339,7 +340,7 @@ class BaseWizard(object):
try:
self.choice_and_line_dialog(
run_next=f, title=_('Script type and Derivation path'), message1=message1,
message2=message2, choices=choices, test_text=bitcoin.is_bip32_derivation)
message2=message2, choices=choices, test_text=is_bip32_derivation)
return
except ScriptTypeNotSupported as e:
self.show_error(e)
@@ -419,7 +420,6 @@ class BaseWizard(object):
def on_keystore(self, k):
has_xpub = isinstance(k, keystore.Xpub)
if has_xpub:
from .bitcoin import xpub_type
t1 = xpub_type(k.xpub)
if self.wallet_type == 'standard':
if has_xpub and t1 not in ['standard', 'p2wpkh', 'p2wpkh-p2sh']: