AaronFiore/electrum
1
0
Fork 0
Code Activity

invoices: Use the same base method to export invoices and requests.

Browse Source 
This fixes an inconsistency where the 'expiration' field was
relative for invoices, and absolute timestamp for requests.

This in turn fixes QML the timer refreshing the request list.

In order to prevent any API using that field from being silently
broken, the 'expiration' field is renamed as 'expiry'.
This commit is contained in:
ThomasV
2023-03-31 14:25:40 +02:00
parent 2cda5a1a7b
commit 56e685feaa
4 changed files with 33 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
electrum/commands.py
View File

@@ -975,7 +975,7 @@ class Commands:
return wallet.get_unused_address()
@command('w')
async def add_request(self, amount, memo='', expiration=3600, force=False, wallet: Abstract_Wallet = None):
async def add_request(self, amount, memo='', expiry=3600, force=False, wallet: Abstract_Wallet = None):
"""Create a payment request, using the first unused address of the wallet.
The address will be considered as used after this operation.
If no payment is received, the address will be considered as unused if the payment request is deleted from the wallet."""
@@ -986,8 +986,8 @@ class Commands:
else:
return False
amount = satoshis(amount)
expiration = int(expiration) if expiration else None
key = wallet.create_request(amount, memo, expiration, addr)
expiry = int(expiry) if expiry else None
key = wallet.create_request(amount, memo, expiry, addr)
req = wallet.get_request(key)
return wallet.export_request(req)
@@ -1429,7 +1429,7 @@ command_options = {
'addtransaction': (None,'Whether transaction is to be used for broadcasting afterwards. Adds transaction to the wallet'),
'domain': ("-D", "List of addresses"),
'memo': ("-m", "Description of the request"),
'expiration': (None, "Time in seconds"),
'expiry': (None, "Time in seconds"),
'timeout': (None, "Timeout in seconds"),
'force': (None, "Create new address beyond gap limit, if no more addresses are available."),
'pending': (None, "Show only pending requests."),