tAdd short channel id to tx labels - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 8b63f7176e0ae7a421b49b1f846fb0eabde8add7
DIR parent 1e9230712062589e312d548b45bef7a13fa6c691
HTML Author: ThomasV <thomasv@electrum.org>
Date: Fri, 6 Mar 2020 20:45:17 +0100
Add short channel id to tx labels
Diffstat:
M electrum/lnwatcher.py | 9 ++++-----
M electrum/lnworker.py | 4 ++--
2 files changed, 6 insertions(+), 7 deletions(-)
---
DIR diff --git a/electrum/lnwatcher.py b/electrum/lnwatcher.py
t@@ -366,7 +366,7 @@ class LNWalletWatcher(LNWatcher):
self.logger.info(f'(chan {chan.get_id_for_log()}) sweep_info_dict length: {len(sweep_info_dict)}')
# create and broadcast transaction
for prevout, sweep_info in sweep_info_dict.items():
- name = sweep_info.name
+ name = sweep_info.name + ' ' + chan.get_id_for_log()
spender_txid = spenders.get(prevout)
if spender_txid is not None:
spender_tx = self.db.get_transaction(spender_txid)
t@@ -381,20 +381,19 @@ class LNWalletWatcher(LNWatcher):
keep_watching |= not self.is_deeply_mined(spender2)
else:
self.logger.info(f'(chan {chan.get_id_for_log()}) trying to redeem htlc {name}: {prevout}')
- await self.try_redeem(spender_txid+':0', e_htlc_tx)
+ await self.try_redeem(spender_txid+':0', e_htlc_tx, name)
keep_watching = True
else:
self.logger.info(f'(chan {chan.get_id_for_log()}) outpoint already spent {name}: {prevout}')
keep_watching |= not self.is_deeply_mined(spender_txid)
else:
self.logger.info(f'(chan {chan.get_id_for_log()}) trying to redeem {name}: {prevout}')
- await self.try_redeem(prevout, sweep_info)
+ await self.try_redeem(prevout, sweep_info, name)
keep_watching = True
return keep_watching
@log_exceptions
- async def try_redeem(self, prevout: str, sweep_info: 'SweepInfo') -> None:
- name = sweep_info.name
+ async def try_redeem(self, prevout: str, sweep_info: 'SweepInfo', name: str) -> None:
prev_txid, prev_index = prevout.split(':')
broadcast = True
if sweep_info.cltv_expiry:
DIR diff --git a/electrum/lnworker.py b/electrum/lnworker.py
t@@ -599,7 +599,7 @@ class LNWallet(LNWorker):
item = {
'channel_id': bh2u(chan.channel_id),
'type': 'channel_opening',
- 'label': self.wallet.get_label(funding_txid) or _('Open channel'),
+ 'label': self.wallet.get_label(funding_txid) or (_('Open channel') + ' ' + chan.get_id_for_log()),
'txid': funding_txid,
'amount_msat': chan.balance(LOCAL, ctn=0),
'direction': 'received',
t@@ -614,7 +614,7 @@ class LNWallet(LNWorker):
item = {
'channel_id': bh2u(chan.channel_id),
'txid': closing_txid,
- 'label': self.wallet.get_label(closing_txid) or _('Close channel'),
+ 'label': self.wallet.get_label(closing_txid) or (_('Close channel') + ' ' + chan.get_id_for_log()),
'type': 'channel_closure',
'amount_msat': -chan.balance_minus_outgoing_htlcs(LOCAL),
'direction': 'sent',