1
0

restore from master public key (qt and command line)

This commit is contained in:
ThomasV
2014-02-28 15:43:06 +01:00
parent 9ddd9c7c65
commit e955ee69a8
3 changed files with 34 additions and 18 deletions

View File

@@ -1809,7 +1809,6 @@ class Wallet(object):
@classmethod
def from_seed(self, seed, storage):
import mnemonic
@@ -1835,8 +1834,26 @@ class Wallet(object):
w.init_seed(seed) #hex
else:
#assert is_seed(seed)
w = Wallet(storage)
w = NewWallet(storage)
w.init_seed(seed)
return w
@classmethod
def from_mpk(self, s, storage):
try:
mpk, chain = s.split(':')
except:
mpk = s
chain = False
if chain:
w = NewWallet(storage)
w.create_watching_only_wallet(mpk, chain)
else:
w = OldWallet(storage)
w.seed = ''
w.create_watching_only_wallet(mpk)
return w