AaronFiore/electrum
1
0
Fork 0
Code Activity

lnworker: store onchain default labels in a cache

Browse Source
This commit is contained in:
ThomasV
2023-01-21 12:23:26 +01:00
parent 5d9678a269
commit 062051b530
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
electrum/lnworker.py
View File

@@ -217,7 +217,7 @@ class LNWorker(Logger, EventListener, NetworkRetryManager[LNPeerAddr]):
self.network = None # type: Optional[Network] self.network = None # type: Optional[Network]
self.config = None # type: Optional[SimpleConfig] self.config = None # type: Optional[SimpleConfig]
self.stopping_soon = False # whether we are being shut down self.stopping_soon = False # whether we are being shut down
self._labels_cache = {} # txid -> str
self.register_callbacks() self.register_callbacks()
@property @property
@@ -876,6 +876,9 @@ class LNWallet(LNWorker):
out[payment_hash] = item out[payment_hash] = item
return out return out
def get_label_for_txid(self, txid: str) -> str:
return self._labels_cache.get(txid)
def get_onchain_history(self): def get_onchain_history(self):
current_height = self.wallet.adb.get_local_height() current_height = self.wallet.adb.get_local_height()
out = {} out = {}
@@ -886,10 +889,11 @@ class LNWallet(LNWorker):
continue continue
funding_txid, funding_height, funding_timestamp = item funding_txid, funding_height, funding_timestamp = item
tx_height = self.wallet.adb.get_tx_height(funding_txid) tx_height = self.wallet.adb.get_tx_height(funding_txid)
self._labels_cache[funding_txid] = _('Open channel') + ' ' + chan.get_id_for_log()
item = { item = {
'channel_id': bh2u(chan.channel_id), 'channel_id': bh2u(chan.channel_id),
'type': 'channel_opening', 'type': 'channel_opening',
'label': self.wallet.get_label_for_txid(funding_txid) or (_('Open channel') + ' ' + chan.get_id_for_log()), 'label': self.get_label_for_txid(funding_txid),
'txid': funding_txid, 'txid': funding_txid,
'amount_msat': chan.balance(LOCAL, ctn=0), 'amount_msat': chan.balance(LOCAL, ctn=0),
'direction': PaymentDirection.RECEIVED, 'direction': PaymentDirection.RECEIVED,
@@ -906,10 +910,11 @@ class LNWallet(LNWorker):
continue continue
closing_txid, closing_height, closing_timestamp = item closing_txid, closing_height, closing_timestamp = item
tx_height = self.wallet.adb.get_tx_height(closing_txid) tx_height = self.wallet.adb.get_tx_height(closing_txid)
self._labels_cache[closing_txid] = _('Close channel') + ' ' + chan.get_id_for_log()
item = { item = {
'channel_id': bh2u(chan.channel_id), 'channel_id': bh2u(chan.channel_id),
'txid': closing_txid, 'txid': closing_txid,
'label': self.wallet.get_label_for_txid(closing_txid) or (_('Close channel') + ' ' + chan.get_id_for_log()), 'label': self.get_label_for_txid(closing_txid),
'type': 'channel_closure', 'type': 'channel_closure',
'amount_msat': -chan.balance_minus_outgoing_htlcs(LOCAL), 'amount_msat': -chan.balance_minus_outgoing_htlcs(LOCAL),
'direction': PaymentDirection.SENT, 'direction': PaymentDirection.SENT,
@@ -942,13 +947,14 @@ class LNWallet(LNWorker):
label += ' (%s)' % _('waiting for funding tx confirmation') label += ' (%s)' % _('waiting for funding tx confirmation')
if not swap.is_reverse and not swap.is_redeemed and swap.spending_txid is None and delta < 0: if not swap.is_reverse and not swap.is_redeemed and swap.spending_txid is None and delta < 0:
label += f' (refundable in {-delta} blocks)' # fixme: only if unspent label += f' (refundable in {-delta} blocks)' # fixme: only if unspent
self._labels_cache[txid] = label
out[txid] = { out[txid] = {
'txid': txid, 'txid': txid,
'group_id': txid, 'group_id': txid,
'amount_msat': 0, 'amount_msat': 0,
#'amount_msat': amount_msat, # must not be added #'amount_msat': amount_msat, # must not be added
'type': 'swap', 'type': 'swap',
'label': self.wallet.get_label_for_txid(txid) or label, 'label': self.get_label_for_txid(txid),
} }
return out return out

2
electrum/wallet.py
View File

@@ -1372,6 +1372,8 @@ class Abstract_Wallet(ABC, Logger, EventListener):
return self._labels.get(tx_hash) or self._get_default_label_for_txid(tx_hash) return self._labels.get(tx_hash) or self._get_default_label_for_txid(tx_hash)
def _get_default_label_for_txid(self, tx_hash: str) -> str: def _get_default_label_for_txid(self, tx_hash: str) -> str:
if self.lnworker and (label:= self.lnworker.get_label_for_txid(tx_hash)):
return label
# note: we don't deserialize tx as the history calls us for every tx, and that would be slow # note: we don't deserialize tx as the history calls us for every tx, and that would be slow
if not self.db.get_txi_addresses(tx_hash): if not self.db.get_txi_addresses(tx_hash):
# no inputs are ismine -> likely incoming payment -> concat labels of output addresses # no inputs are ismine -> likely incoming payment -> concat labels of output addresses