tmp7

Author: SomberNight

electrum/address_synchronizer.py

@@ -1045,7 +1045,7 @@ def get_spender(self, outpoint: str) -> Optional[str]:
         """
         prev_txid, index = outpoint.split(':')
         spender_txid = self.db.get_spent_outpoint(prev_txid, int(index))
-        # discard local spenders
+        # discard local spenders  #
         tx_mined_status = self.get_tx_height(spender_txid)
         if tx_mined_status.height in [TX_HEIGHT_LOCAL, TX_HEIGHT_FUTURE]:
             spender_txid = None

electrum/fee_policy.py

@@ -2,6 +2,7 @@
 from decimal import Decimal
 from numbers import Real
 from enum import IntEnum
+import random
 
 from .i18n import _
 from .util import NoDynamicFeeEstimates, quantize_feerate, format_fee_satoshis
@@ -23,6 +24,7 @@
 FEERATE_MAX_DYNAMIC = 1500000
 FEERATE_WARNING_HIGH_FEE = 600000
 FEERATE_FALLBACK_STATIC_FEE = 150000
+FEERATE_REGTEST_STATIC_FEE = 1000
 FEERATE_DEFAULT_RELAY = 1000
 FEERATE_MAX_RELAY = 50000
 
@@ -74,6 +76,7 @@ def slider_index_of_method(cls, method):
             i = -1
         return i
 
+is_flaky = False
 
 class FeePolicy(Logger):
     # object associated to a fee slider
@@ -217,8 +220,10 @@ def fee_per_kb(self, network: 'Network') -> Optional[int]:
         """Returns sat/kvB fee to pay for a txn.
         Note: might return None.
         """
+        if is_flaky and random.random() < 0.5:
+            return None
         if self.use_dynamic_estimates and constants.net is constants.BitcoinRegtest:
-            return FEERATE_FALLBACK_STATIC_FEE
+            return FEERATE_REGTEST_STATIC_FEE
 
         if self.method == FeeMethod.FEERATE:
             fee_rate = self.value

electrum/lnchannel.py

@@ -313,7 +313,7 @@ def get_ctx_sweep_info(self, ctx: Transaction) -> Tuple[bool, Dict[str, SweepInf
             sweep_info = their_sweep_info
             who_closed = REMOTE
         else:
-            sweep_info = {}
+            sweep_info = {}  #
             who_closed = 0
         if self._who_closed != who_closed:  # mostly here to limit log spam
             self._who_closed = who_closed
@@ -443,7 +443,7 @@ def update_closed_state(self, *, funding_txid: str, funding_height: TxMinedInfo,
                     util.trigger_callback('channel', self.lnworker.wallet, self)
 
         if self.get_state() == ChannelState.CLOSED and not keep_watching:
-            self.set_state(ChannelState.REDEEMED)
+            self.set_state(ChannelState.REDEEMED)  #
             if self.lnworker and self.is_backup():
                 # auto-remove redeemed backups
                 self.lnworker.remove_channel_backup(self.channel_id)

electrum/lnwatcher.py

@@ -99,6 +99,7 @@ async def check_onchain_situation(self, address: str, funding_outpoint: str) ->
         if not self.adb.is_mine(address):
             return
         # inspect_tx_candidate might have added new addresses, in which case we return early
+        # TODO why don't we wait until adb.is_up_to_date ?!
         funding_txid = funding_outpoint.split(':')[0]
         funding_height = self.adb.get_tx_height(funding_txid)
         closing_txid = self.adb.get_spender(funding_outpoint)
@@ -159,9 +160,9 @@ async def sweep_commitment_transaction(self, funding_outpoint: str, closing_tx:
             return False
         # detect who closed and get information about how to claim outputs
         is_local_ctx, sweep_info_dict = chan.get_ctx_sweep_info(closing_tx)
-        keep_watching = False if sweep_info_dict else not self.adb.is_deeply_mined(closing_tx.txid())
+        keep_watching = False if sweep_info_dict else not self.adb.is_deeply_mined(closing_tx.txid())  #
         # create and broadcast transactions
-        for prevout, sweep_info in sweep_info_dict.items():
+        for prevout, sweep_info in sweep_info_dict.items():  #
             prev_txid, prev_index = prevout.split(':')
             name = sweep_info.name + ' ' + chan.get_id_for_log()
             self.lnworker.wallet.set_default_label(prevout, name)
@@ -170,7 +171,7 @@ async def sweep_commitment_transaction(self, funding_outpoint: str, closing_tx:
                 self.logger.info(f'prevout does not exist for {name}: {prevout}')
                 continue
             was_added = self.maybe_redeem(sweep_info)
-            spender_txid = self.adb.get_spender(prevout)
+            spender_txid = self.adb.get_spender(prevout)  # note: LOCAL spenders don't count
             spender_tx = self.adb.get_transaction(spender_txid) if spender_txid else None
             if spender_tx:
                 # the spender might be the remote, revoked or not
@@ -188,7 +189,7 @@ async def sweep_commitment_transaction(self, funding_outpoint: str, closing_tx:
                 self.maybe_extract_preimage(chan, spender_tx, prevout)
                 self.maybe_add_accounting_address(spender_txid, sweep_info)
             else:
-                keep_watching |= was_added
+                keep_watching |= was_added  #
             self.maybe_add_pending_forceclose(
                 chan=chan, spender_txid=spender_txid, is_local_ctx=is_local_ctx, sweep_info=sweep_info, was_added=was_added)
         return keep_watching

electrum/lnworker.py

@@ -40,7 +40,7 @@
 )
 from .fee_policy import (
     FeePolicy, FEERATE_FALLBACK_STATIC_FEE, FEE_LN_ETA_TARGET, FEE_LN_LOW_ETA_TARGET,
-    FEERATE_PER_KW_MIN_RELAY_LIGHTNING, FEE_LN_MINIMUM_ETA_TARGET
+    FEERATE_PER_KW_MIN_RELAY_LIGHTNING, FEE_LN_MINIMUM_ETA_TARGET, FEERATE_REGTEST_STATIC_FEE
 )
 from .invoices import Invoice, PR_UNPAID, PR_PAID, PR_INFLIGHT, PR_FAILED, LN_EXPIRY_NEVER, BaseInvoice
 from .bitcoin import COIN, opcodes, make_op_return, address_to_scripthash, DummyAddress
@@ -3080,9 +3080,10 @@ def current_target_feerate_per_kw(self, *, has_anchors: bool) -> Optional[int]:
                 # grows quickly
                 feerate_per_kvbyte = max(feerate_per_kvbyte, 5000)
         else:
-            if constants.net is not constants.BitcoinRegtest:
+            if constants.net is constants.BitcoinRegtest:
+                feerate_per_kvbyte = FEERATE_REGTEST_STATIC_FEE
+            else:
                 return None
-            feerate_per_kvbyte = FEERATE_FALLBACK_STATIC_FEE
         return max(FEERATE_PER_KW_MIN_RELAY_LIGHTNING, feerate_per_kvbyte // 4)
 
     def current_low_feerate_per_kw_srk_channel(self) -> Optional[int]:

electrum/txbatcher.py

@@ -62,6 +62,7 @@
 import copy
 from typing import Dict, Sequence, Optional, TYPE_CHECKING, Mapping, Set, List, Tuple
 
+import electrum
 from . import util
 from .bitcoin import dust_threshold
 from .logging import Logger
@@ -271,7 +272,10 @@ def is_dust(self, sweep_info: SweepInfo) -> bool:
         witness_size = len(sweep_info.txin.make_witness(71*b'\x00'))
         tx_size_vbytes = 84 + witness_size//4     # assumes no batching, sweep to p2wpkh
         self.logger.info(f'{sweep_info.name} size = {tx_size_vbytes}')
-        fee = self.fee_policy.estimate_fee(tx_size_vbytes, network=self.wallet.network, allow_fallback_to_static_rates=True)
+        electrum.fee_policy.is_flaky = True
+        fee = self.fee_policy.estimate_fee(tx_size_vbytes, network=self.wallet.network, allow_fallback_to_static_rates=True)  # TODO why allow fallback?
+        self.logger.info(f"heyheyhey. is_dust. {value=}. {fee=}. {dust_threshold()=}")
+        electrum.fee_policy.is_flaky = False
         return value - fee <= dust_threshold()
 
     @locked

tests/regtest/regtest.sh

@@ -2,7 +2,7 @@
 export HOME=~
 set -eu
 
-TEST_ANCHOR_CHANNELS=True
+TEST_ANCHOR_CHANNELS=False
 
 # alice -> bob -> carol
 
@@ -323,12 +323,12 @@ if [[ $1 == "swapserver_server_skip_onchain_funding" ]]; then
     new_blocks 3
     wait_until_channel_open alice
     echo "alice initiates swap"
-    dryrun=$($alice reverse_swap 0.02 dryrun)
+    dryrun=$($alice reverse_swap 0.0002 dryrun)
     onchain_amount=$(echo $dryrun| jq -r ".onchain_amount")
     # Alice starts a reverse-swap, but will time out waiting for Bob's swap-funding-tx to appear in mempool.
     $alice setconfig timeout 10
     set +e
-    swap=$($alice reverse_swap 0.02 $onchain_amount)
+    swap=$($alice reverse_swap 0.0002 $onchain_amount)
     set -e
     $alice unsetconfig timeout
     # After a while, Alice gets impatient and gets Bob to close the channel.
@@ -339,11 +339,54 @@ if [[ $1 == "swapserver_server_skip_onchain_funding" ]]; then
     wait_until_channel_closed alice
     ctx_id=$($alice list_channels | jq -r ".[0].closing_txid")
     # need more blocks to reach CLTV of HTLC-output in ctx
-    new_blocks 130
+
+    $alice stop
+    new_blocks 20
+    $alice daemon -d
+    $alice load_wallet
+    sleep 5
+
+    $alice stop
+    new_blocks 20
+    $alice daemon -d
+    $alice load_wallet
+    sleep 5
+
+    $alice stop
+    new_blocks 20
+    $alice daemon -d
+    $alice load_wallet
+    sleep 5
+
+    $alice stop
+    new_blocks 20
+    $alice daemon -d
+    $alice load_wallet
+    sleep 5
+
+    $alice stop
+    new_blocks 20
+    $alice daemon -d
+    $alice load_wallet
+    sleep 5
+
+    $alice stop
+    new_blocks 20
+    $alice daemon -d
+    $alice load_wallet
+    sleep 5
+
+    $alice stop
+    new_blocks 20
+    $alice daemon -d
+    $alice load_wallet
+    sleep 5
+
+    #new_blocks 130
     if [ $TEST_ANCHOR_CHANNELS = True ] ; then
-        htlc_output_index=3  # FIXME index depends on Alice not using MPP
+        htlc_output_index=2  # FIXME index depends on Alice not using MPP. # FIXME also assumes there was a non-dust fee-prepayment
     else
-        htlc_output_index=1
+        htlc_output_index=0
     fi
     wait_until_spent $ctx_id $htlc_output_index
     new_blocks 1