From 879bf20044ca53337ca68ba75e3c617f1c7cc37a Mon Sep 17 00:00:00 2001 From: Adam Gibson Date: Sat, 19 Aug 2017 16:32:02 +0300 Subject: [PATCH] bugfix legacy wallet load for migrate --- jmclient/jmclient/wallet.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/jmclient/jmclient/wallet.py b/jmclient/jmclient/wallet.py index b9c168a..7f89780 100644 --- a/jmclient/jmclient/wallet.py +++ b/jmclient/jmclient/wallet.py @@ -172,8 +172,12 @@ class Wallet(AbstractWallet): def get_master_key(self): if not self.seed: raise Exception("Cannot extract master key of wallet, no seed.") - return btc.bip32_master_key( - self.seed.decode('hex'),(btc.MAINNET_PRIVATE if get_network( + #Legacy used the seed in hex + if not isinstance(self, SegwitWallet): + bip32seed = self.seed + else: + bip32seed = self.seed.decode('hex') + return btc.bip32_master_key(bip32seed, (btc.MAINNET_PRIVATE if get_network( ) == 'mainnet' else btc.TESTNET_PRIVATE)) def get_mixing_depth_keys(self, master):