fixes for pending accounts
This commit is contained in:
parent
5ce50f4421
commit
0ce2c870bb
|
@ -1775,7 +1775,7 @@ class ElectrumWindow(QMainWindow):
|
||||||
|
|
||||||
self.wallet.create_pending_account(name, password)
|
self.wallet.create_pending_account(name, password)
|
||||||
self.update_address_tab()
|
self.update_address_tab()
|
||||||
self.tabs.setCurrentIndex(2)
|
self.tabs.setCurrentIndex(3)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -81,19 +81,16 @@ class Account(object):
|
||||||
|
|
||||||
class PendingAccount(Account):
|
class PendingAccount(Account):
|
||||||
def __init__(self, v):
|
def __init__(self, v):
|
||||||
try:
|
self.pending_address = v['pending']
|
||||||
self.pending_pubkey = v['pending_pubkey']
|
|
||||||
except:
|
|
||||||
pass
|
|
||||||
|
|
||||||
def get_addresses(self, is_change):
|
def get_addresses(self, is_change):
|
||||||
return []
|
return [self.pending_address]
|
||||||
|
|
||||||
def has_change(self):
|
def has_change(self):
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def dump(self):
|
def dump(self):
|
||||||
return {} #{'pending_pubkey':self.pending_pubkey }
|
return {'pending':self.pending_address }
|
||||||
|
|
||||||
def get_name(self, k):
|
def get_name(self, k):
|
||||||
return _('Pending account')
|
return _('Pending account')
|
||||||
|
@ -265,7 +262,9 @@ class BIP32_Account(Account):
|
||||||
return d
|
return d
|
||||||
|
|
||||||
def first_address(self):
|
def first_address(self):
|
||||||
return self.get_address(0,0)
|
pubkeys = self.derive_pubkeys(0, 0)
|
||||||
|
address = self.pubkeys_to_address(pubkeys)
|
||||||
|
return address
|
||||||
|
|
||||||
def get_master_pubkeys(self):
|
def get_master_pubkeys(self):
|
||||||
return [self.xpub]
|
return [self.xpub]
|
||||||
|
|
|
@ -1256,7 +1256,7 @@ class Deterministic_Wallet(Abstract_Wallet):
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def get_action(self):
|
def get_action(self):
|
||||||
if not self.get_master_public_key():
|
if not self.master_public_keys:
|
||||||
return 'create_seed'
|
return 'create_seed'
|
||||||
if not self.accounts:
|
if not self.accounts:
|
||||||
return 'create_accounts'
|
return 'create_accounts'
|
||||||
|
@ -1278,7 +1278,7 @@ class NewWallet(Deterministic_Wallet):
|
||||||
|
|
||||||
def get_master_public_key(self):
|
def get_master_public_key(self):
|
||||||
"""xpub of the main account"""
|
"""xpub of the main account"""
|
||||||
return self.master_public_keys["m/0'"]
|
return self.master_public_keys.get("m/0'")
|
||||||
|
|
||||||
def get_master_public_keys(self):
|
def get_master_public_keys(self):
|
||||||
out = {}
|
out = {}
|
||||||
|
@ -1559,8 +1559,8 @@ class Wallet(object):
|
||||||
config = storage.config
|
config = storage.config
|
||||||
|
|
||||||
self.wallet_types = [
|
self.wallet_types = [
|
||||||
('standard', ("Standard wallet"), OldWallet),
|
('standard', ("Standard wallet"), NewWallet if config.get('bip32') else OldWallet),
|
||||||
('imported', ("Imported wallet"), Imported_Wallet),
|
('imported', ("Imported wallet"), Imported_Wallet),
|
||||||
('2of2', ("Multisig wallet (2 of 2)"), Wallet_2of2),
|
('2of2', ("Multisig wallet (2 of 2)"), Wallet_2of2),
|
||||||
('2of3', ("Multisig wallet (2 of 3)"), Wallet_2of3)
|
('2of3', ("Multisig wallet (2 of 3)"), Wallet_2of3)
|
||||||
]
|
]
|
||||||
|
|
Loading…
Reference in New Issue