AaronFiore/electrum
1
0
Fork 0
Code Activity

Allow requests that never expire

Browse Source
This commit is contained in:
ThomasV
2019-12-10 14:45:29 +01:00
parent daef1a8359
commit f08796fe68
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
electrum/gui/qt/request_list.py
View File

@@ -117,7 +117,7 @@ class RequestList(MyTreeView):
continue
request_type = req['type']
timestamp = req.get('time', 0)
expiration = req.get('exp', None)
expiration = req.get('exp', 0)
amount = req.get('amount')
message = req.get('message') or req.get('memo')
date = format_time(timestamp)

8
electrum/util.py
View File

@@ -104,6 +104,7 @@ pr_tooltips = {
}
pr_expiration_values = {
0: _('Never'),
10*60: _('10 minutes'),
60*60: _('1 hour'),
24*60*60: _('1 day'),
@@ -112,12 +113,13 @@ pr_expiration_values = {
def get_request_status(req):
status = req['status']
if req['status'] == PR_UNPAID and 'exp' in req and req['time'] + req['exp'] < time.time():
exp = req.get('exp', 0)
if req['status'] == PR_UNPAID and exp > 0 and req['time'] + req['exp'] < time.time():
status = PR_EXPIRED
status_str = pr_tooltips[status]
if status == PR_UNPAID:
if req.get('exp'):
expiration = req['exp'] + req['time']
if exp > 0:
expiration = exp + req['time']
status_str = _('Expires') + ' ' + age(expiration, include_seconds=True)
else:
status_str = _('Pending')

6
electrum/wallet.py
View File

@@ -1527,12 +1527,10 @@ class Abstract_Wallet(AddressSynchronizer):
timestamp = r.get('time', 0)
if timestamp and type(timestamp) != int:
timestamp = 0
expiration = r.get('exp')
if expiration and type(expiration) != int:
expiration = 0
exp = r.get('exp', 0)
paid, conf = self.get_payment_status(address, amount)
if not paid:
if expiration is not None and time.time() > timestamp + expiration:
if exp > 0 and time.time() > timestamp + exp:
status = PR_EXPIRED
else:
status = PR_UNPAID