Browse Source
history: better handling of None timestamps
regtest_lnd
ThomasV
6 years ago
committed by
SomberNight
No known key found for this signature in database
GPG Key ID: B33B5F232C6271E9
2 changed files with
6 additions and
6 deletions
-
electrum/gui/qt/history_list.py
-
electrum/lnworker.py
|
|
@ -141,7 +141,6 @@ class HistoryModel(QAbstractItemModel, Logger): |
|
|
|
if is_lightning: |
|
|
|
status = 0 |
|
|
|
if timestamp is None: |
|
|
|
timestamp = sys.maxsize |
|
|
|
status_str = 'unconfirmed' |
|
|
|
else: |
|
|
|
status_str = format_time(int(timestamp)) |
|
|
@ -155,9 +154,10 @@ class HistoryModel(QAbstractItemModel, Logger): |
|
|
|
except KeyError: |
|
|
|
tx_mined_info = self.tx_mined_info_from_tx_item(tx_item) |
|
|
|
status, status_str = self.parent.wallet.get_tx_status(tx_hash, tx_mined_info) |
|
|
|
# we sort by timestamp |
|
|
|
if conf<=0: |
|
|
|
timestamp = sys.maxsize |
|
|
|
|
|
|
|
# we sort by timestamp |
|
|
|
if timestamp is None: |
|
|
|
timestamp = float("inf") |
|
|
|
|
|
|
|
if role == Qt.UserRole: |
|
|
|
# for sorting |
|
|
|
|
|
@ -11,7 +11,6 @@ from typing import Optional, Sequence, Tuple, List, Dict, TYPE_CHECKING |
|
|
|
import threading |
|
|
|
import socket |
|
|
|
import json |
|
|
|
import operator |
|
|
|
from datetime import datetime, timezone |
|
|
|
from functools import partial |
|
|
|
|
|
|
@ -197,7 +196,8 @@ class LNWorker(PrintError): |
|
|
|
'timestamp': closing_timestamp, |
|
|
|
} |
|
|
|
out.append(item) |
|
|
|
out.sort(key=operator.itemgetter('timestamp')) |
|
|
|
# sort by timestamp |
|
|
|
out.sort(key=lambda x: (x.get('timestamp') or float("inf"))) |
|
|
|
balance_msat = 0 |
|
|
|
for item in out: |
|
|
|
balance_msat += item['amount_msat'] * (1 if item['direction']=='received' else -1) |
|
|
|