AaronFiore/electrum
1
0
Fork 0
Code Activity

lnworker: get_onchain_history does not need to be online anymore

Browse Source
This commit is contained in:
ThomasV
2022-06-13 10:26:07 +02:00
parent 7d5125c935
commit 599ad1c017
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
electrum/lnworker.py
View File

@@ -856,10 +856,8 @@ class LNWallet(LNWorker):
item = chan.get_funding_height() item = chan.get_funding_height()
if item is None: if item is None:
continue continue
if not self.lnwatcher:
continue # lnwatcher not available with --offline (its data is not persisted)
funding_txid, funding_height, funding_timestamp = item funding_txid, funding_height, funding_timestamp = item
tx_height = self.lnwatcher.adb.get_tx_height(funding_txid) tx_height = self.wallet.adb.get_tx_height(funding_txid)
item = { item = {
'channel_id': bh2u(chan.channel_id), 'channel_id': bh2u(chan.channel_id),
'type': 'channel_opening', 'type': 'channel_opening',
@@ -879,7 +877,7 @@ class LNWallet(LNWorker):
if item is None: if item is None:
continue continue
closing_txid, closing_height, closing_timestamp = item closing_txid, closing_height, closing_timestamp = item
tx_height = self.lnwatcher.adb.get_tx_height(closing_txid) tx_height = self.wallet.adb.get_tx_height(closing_txid)
item = { item = {
'channel_id': bh2u(chan.channel_id), 'channel_id': bh2u(chan.channel_id),
'txid': closing_txid, 'txid': closing_txid,
@@ -910,10 +908,9 @@ class LNWallet(LNWorker):
amount_msat = 0 amount_msat = 0
label = 'Reverse swap' if swap.is_reverse else 'Forward swap' label = 'Reverse swap' if swap.is_reverse else 'Forward swap'
delta = current_height - swap.locktime delta = current_height - swap.locktime
if self.lnwatcher: tx_height = self.wallet.adb.get_tx_height(swap.funding_txid)
tx_height = self.lnwatcher.adb.get_tx_height(swap.funding_txid) if swap.is_reverse and tx_height.height <= 0:
if swap.is_reverse and tx_height.height <= 0: label += ' (%s)' % _('funding transaction not confirmed')
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
out[txid] = { out[txid] = {