tMerge pull request #976 from clehner/fix/root_name - electrum - Electrum Bitcoin wallet HTML git clone https://git.parazyd.org/electrum DIR Log DIR Files DIR Refs DIR Submodules --- DIR commit b5401d2b5e71f45d1b24eea044658729b3bb08c1 DIR parent 64ee8884e8737745231bd340f070407ac894ebbd HTML Author: ThomasV <electrumdev@gmail.com> Date: Sun, 11 Jan 2015 20:19:25 +0100 Merge pull request #976 from clehner/fix/root_name Move root_name to parent class Diffstat: M lib/wallet.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- DIR diff --git a/lib/wallet.py b/lib/wallet.py t@@ -1266,6 +1266,7 @@ class Deterministic_Wallet(Abstract_Wallet): class BIP32_Wallet(Deterministic_Wallet): # abstract class, bip32 logic + root_name = 'x/' gap_limit = 20 def __init__(self, storage): t@@ -1342,7 +1343,6 @@ class BIP32_Wallet(Deterministic_Wallet): class BIP32_Simple_Wallet(BIP32_Wallet): # Wallet with a single BIP32 account, no seed # gap limit 20 - root_name = 'x/' wallet_type = 'xpub' def create_xprv_wallet(self, xprv, password): t@@ -1470,7 +1470,6 @@ class BIP32_HD_Wallet(BIP32_Wallet): class NewWallet(BIP32_Wallet, Mnemonic): # Standard wallet - root_name = 'x/' root_derivation = "m/" wallet_type = 'standard'