AaronFiore/electrum
1
0
Fork 0
Code Activity

move xpubkey logic to keystore and fix it

Browse Source
This commit is contained in:
ThomasV
2016-08-17 14:28:37 +02:00
parent f6e393d7b6
commit bfd7709ccd
6 changed files with 67 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gui/qt/main_window.py
View File

@@ -777,7 +777,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
self.saved = True
def new_payment_request(self):
addr = self.wallet.get_unused_address(None)
addr = self.wallet.get_unused_address()
if addr is None:
from electrum.wallet import Imported_Wallet
if isinstance(self.wallet, Imported_Wallet):
@@ -785,7 +785,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
return
if not self.question(_("Warning: The next address will not be recovered automatically if you restore your wallet from seed; you may need to add it manually.\n\nThis occurs because you have too many unused addresses in your wallet. To avoid this situation, use the existing addresses first.\n\nCreate anyway?")):
return
addr = self.wallet.create_new_address(None, False)
addr = self.wallet.create_new_address(False)
self.set_receive_address(addr)
self.expires_label.hide()
self.expires_combo.show()

2
gui/qt/request_list.py
View File

@@ -107,7 +107,7 @@ class RequestList(MyTreeWidget):
item = self.itemAt(position)
if not item:
return
addr = str(item.text(2))
addr = str(item.text(1))
req = self.wallet.receive_requests[addr]
column = self.currentColumn()
column_title = self.headerItem().text(column)