AaronFiore/electrum
1
0
Fork 0
Code Activity

p2sh wallets cannot create accounts

Browse Source
This commit is contained in:
ThomasV
2014-05-05 12:03:01 +02:00
parent ac93b86ebc
commit fa4c2b96d7
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gui/qt/main_window.py
View File

@@ -203,6 +203,7 @@ class ElectrumWindow(QMainWindow):
self.password_menu.setEnabled(not self.wallet.is_watching_only()) self.password_menu.setEnabled(not self.wallet.is_watching_only())
self.seed_menu.setEnabled(self.wallet.has_seed()) self.seed_menu.setEnabled(self.wallet.has_seed())
self.mpk_menu.setEnabled(self.wallet.is_deterministic()) self.mpk_menu.setEnabled(self.wallet.is_deterministic())
self.import_menu.setEnabled(self.wallet.can_create_accounts() or not self.wallet.is_deterministic())
self.update_lock_icon() self.update_lock_icon()
self.update_buttons_on_seed() self.update_buttons_on_seed()
@@ -296,7 +297,7 @@ class ElectrumWindow(QMainWindow):
self.private_keys_menu = wallet_menu.addMenu(_("&Private keys")) self.private_keys_menu = wallet_menu.addMenu(_("&Private keys"))
self.private_keys_menu.addAction(_("&Sweep"), self.sweep_key_dialog) self.private_keys_menu.addAction(_("&Sweep"), self.sweep_key_dialog)
self.private_keys_menu.addAction(_("&Import"), self.do_import_privkey) self.import_menu = self.private_keys_menu.addAction(_("&Import"), self.do_import_privkey)
self.private_keys_menu.addAction(_("&Export"), self.export_privkeys_dialog) self.private_keys_menu.addAction(_("&Export"), self.export_privkeys_dialog)
wallet_menu.addAction(_("&Export History"), self.export_history_dialog) wallet_menu.addAction(_("&Export History"), self.export_history_dialog)

3
lib/wallet.py
View File

@@ -1450,6 +1450,9 @@ class Wallet_2of2(NewWallet):
NewWallet.__init__(self, storage) NewWallet.__init__(self, storage)
self.storage.put('wallet_type', '2of2', True) self.storage.put('wallet_type', '2of2', True)
def can_create_accounts(self):
return False
def create_account(self): def create_account(self):
xpub1 = self.master_public_keys.get("m/") xpub1 = self.master_public_keys.get("m/")
xpub2 = self.master_public_keys.get("cold/") xpub2 = self.master_public_keys.get("cold/")