AaronFiore/electrum
1
0
Fork 0
Code Activity

kivy: allow address reuse in imported wallets. (fix #6852)

Browse Source
This commit is contained in:
ThomasV
2020-12-16 10:05:17 +01:00
parent 43614af2c4
commit 06b9d48535
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
electrum/gui/kivy/uix/dialogs/request_dialog.py
View File

@@ -116,6 +116,10 @@ class RequestDialog(Factory.Popup):
if self.status == PR_UNPAID and self.is_lightning and self.app.wallet.lnworker: if self.status == PR_UNPAID and self.is_lightning and self.app.wallet.lnworker:
if self.amount_sat and self.amount_sat > self.app.wallet.lnworker.num_sats_can_receive(): if self.amount_sat and self.amount_sat > self.app.wallet.lnworker.num_sats_can_receive():
self.warning = _('Warning') + ': ' + _('This amount exceeds the maximum you can currently receive with your channels') self.warning = _('Warning') + ': ' + _('This amount exceeds the maximum you can currently receive with your channels')
if self.status == PR_UNPAID and not self.is_lightning:
address = req.get_address()
if self.app.wallet.is_used(address):
self.warning = _('Warning') + ': ' + _('This address is being reused')
def on_dismiss(self): def on_dismiss(self):
self.app.request_popup = None self.app.request_popup = None

7
electrum/gui/kivy/uix/screens.py
View File

@@ -491,8 +491,11 @@ class ReceiveScreen(CScreen):
else: else:
addr = self.address or self.app.wallet.get_unused_address() addr = self.address or self.app.wallet.get_unused_address()
if not addr: if not addr:
self.app.show_info(_('No address available. Please remove some of your pending requests.')) if not self.app.wallet.is_deterministic():
return addr = self.app.wallet.get_receiving_address()
else:
self.app.show_info(_('No address available. Please remove some of your pending requests.'))
return
self.address = addr self.address = addr
req = self.app.wallet.make_payment_request(addr, amount, message, self.expiry()) req = self.app.wallet.make_payment_request(addr, amount, message, self.expiry())
self.app.wallet.add_payment_request(req) self.app.wallet.add_payment_request(req)