commit 472c0defee233e36c37305a931b0760922e59ed9
parent 6e6e829ef73941c992982237e2c3514810613014
Author: ThomasV <thomasv@electrum.org>
Date: Mon, 17 Feb 2020 12:19:18 +0100
fix lnchannel.get_payments: unsettled htlcs may have overwritten the returned results.
Diffstat:
2 files changed, 11 insertions(+), 41 deletions(-)
diff --git a/electrum/lnchannel.py b/electrum/lnchannel.py
@@ -180,20 +180,15 @@ class Channel(Logger):
def get_next_feerate(self, subject):
return self.hm.get_feerate_in_next_ctx(subject)
- def get_payments(self):
+ def get_settled_payments(self):
out = {}
for subject in LOCAL, REMOTE:
log = self.hm.log[subject]
for htlc_id, htlc in log.get('adds', {}).items():
- if htlc_id in log.get('fails',{}):
- status = 'failed'
- elif htlc_id in log.get('settles',{}):
- status = 'settled'
- else:
- status = 'inflight'
- direction = SENT if subject is LOCAL else RECEIVED
- rhash = bh2u(htlc.payment_hash)
- out[rhash] = (self.channel_id, htlc, direction, status)
+ if htlc_id in log.get('settles',{}):
+ direction = SENT if subject is LOCAL else RECEIVED
+ rhash = bh2u(htlc.payment_hash)
+ out[rhash] = (self.channel_id, htlc, direction)
return out
def open_with_first_pcp(self, remote_pcp, remote_sig):
diff --git a/electrum/lnworker.py b/electrum/lnworker.py
@@ -449,14 +449,14 @@ class LNWallet(LNWorker):
timestamp = int(time.time())
self.network.trigger_callback('ln_payment_completed', timestamp, direction, htlc, preimage, chan_id)
- def get_payments(self):
+ def get_settled_payments(self):
# return one item per payment_hash
# note: with AMP we will have several channels per payment
out = defaultdict(list)
with self.lock:
channels = list(self.channels.values())
for chan in channels:
- d = chan.get_payments()
+ d = chan.get_settled_payments()
for k, v in d.items():
out[k].append(v)
return out
@@ -475,36 +475,13 @@ class LNWallet(LNWorker):
'rhash': lnaddr.paymenthash.hex(),
}
- def get_unsettled_payments(self):
- out = []
- for payment_hash, plist in self.get_payments().items():
- if len(plist) != 1:
- continue
- chan_id, htlc, _direction, status = plist[0]
- if _direction != SENT:
- continue
- if status == 'settled':
- continue
- amount = htlc.amount_msat//1000
- item = {
- 'is_lightning': True,
- 'status': status,
- 'key': payment_hash,
- 'amount': amount,
- 'timestamp': htlc.timestamp,
- 'label': self.wallet.get_label(payment_hash)
- }
- out.append(item)
- return out
-
def get_history(self):
out = []
- for key, plist in self.get_payments().items():
- plist = list(filter(lambda x: x[3] == 'settled', plist))
+ for key, plist in self.get_settled_payments().items():
if len(plist) == 0:
continue
elif len(plist) == 1:
- chan_id, htlc, _direction, status = plist[0]
+ chan_id, htlc, _direction = plist[0]
direction = 'sent' if _direction == SENT else 'received'
amount_msat = int(_direction) * htlc.amount_msat
timestamp = htlc.timestamp
@@ -520,10 +497,9 @@ class LNWallet(LNWorker):
else:
# assume forwarding
direction = 'forwarding'
- amount_msat = sum([int(_direction) * htlc.amount_msat for chan_id, htlc, _direction, status in plist])
- status = ''
+ amount_msat = sum([int(_direction) * htlc.amount_msat for chan_id, htlc, _direction in plist])
label = _('Forwarding')
- timestamp = min([htlc.timestamp for chan_id, htlc, _direction, status in plist])
+ timestamp = min([htlc.timestamp for chan_id, htlc, _direction in plist])
fee_msat = None # fixme
item = {
@@ -532,7 +508,6 @@ class LNWallet(LNWorker):
'timestamp': timestamp or 0,
'date': timestamp_to_datetime(timestamp),
'direction': direction,
- 'status': status,
'amount_msat': amount_msat,
'fee_msat': fee_msat,
'payment_hash': key,
