Merge pull request #10294 from spesmilo/dust_override

add dust_override to SweepInfo

electrum/lnsweep.py

@@ -43,6 +43,7 @@ class SweepInfo(NamedTuple):
     txin: PartialTxInput
     txout: Optional[PartialTxOutput]  # only for first-stage htlc tx
     can_be_batched: bool # todo: this could be more fine-grained
+    dust_override: bool
 
     def is_anchor(self):
         return self.name in ['local_anchor', 'remote_anchor']
@@ -260,6 +261,7 @@ def sweep_their_htlctx_justice(
                 txin=txin,
                 txout=None,
                 can_be_batched=False,
+                dust_override=False,
             )
     return index_to_sweepinfo
 
@@ -337,6 +339,7 @@ def sweep_our_ctx(
                 txin=txin,
                 txout=None,
                 can_be_batched=True,
+                dust_override=True,
             )
 
     # to_local
@@ -358,6 +361,7 @@ def sweep_our_ctx(
                 txin=txin,
                 txout=None,
                 can_be_batched=True,
+                dust_override=False,
             )
     we_breached = ctn < chan.get_oldest_unrevoked_ctn(LOCAL)
     if we_breached:
@@ -398,6 +402,7 @@ def sweep_our_ctx(
                 #   - in particular, it would be safe to batch htlcs where
                 #        htlc_direction, htlc.payment_hash, htlc.cltv_abs
                 #     all match. That is, MPP htlcs for the same payment.
+                dust_override=False,
             )
         else:
             # second-stage
@@ -420,6 +425,7 @@ def sweep_our_ctx(
                         # this is safe to batch, we are the only ones who can spend
                         # (assuming we did not broadcast a revoked state)
                         can_be_batched=True,
+                        dust_override=False,
                     )
 
     # offered HTLCs, in our ctx --> "timeout"
@@ -557,6 +563,7 @@ def sweep_their_ctx_to_remote_backup(
                 txin=txin,
                 txout=None,
                 can_be_batched=True,
+                dust_override=True,
             )
 
     # to_remote
@@ -577,6 +584,7 @@ def sweep_their_ctx_to_remote_backup(
                 txin=txin,
                 txout=None,
                 can_be_batched=True,
+                dust_override=False,
             )
     return txs
 
@@ -634,6 +642,7 @@ def sweep_their_ctx(
                 txin=txin,
                 txout=None,
                 can_be_batched=True,
+                dust_override=True,
             )
 
     # to_local is handled by lnwatcher
@@ -646,6 +655,7 @@ def sweep_their_ctx(
                 txin=txin,
                 txout=None,
                 can_be_batched=False,
+                dust_override=False,
             )
 
     # to_remote
@@ -676,6 +686,7 @@ def sweep_their_ctx(
                     txin=txin,
                     txout=None,
                     can_be_batched=True,
+                    dust_override=False,
                 )
 
     # HTLCs
@@ -715,6 +726,7 @@ def sweep_their_ctx(
                 txout=None,
                 can_be_batched=False,   # both parties can spend
                 # (still, in some cases we could batch, see comment in sweep_our_ctx)
+                dust_override=False,
             )
     # received HTLCs, in their ctx --> "timeout"
     # offered HTLCs, in their ctx --> "success"

electrum/submarine_swaps.py

@@ -529,6 +529,7 @@ class SwapManager(Logger):
                 txout=None,
                 name=name,
                 can_be_batched=can_be_batched,
+                dust_override=False,
             )
             try:
                 self.wallet.txbatcher.add_sweep_input('swaps', sweep_info)

electrum/txbatcher.py

@@ -265,7 +265,7 @@ class TxBatch(Logger):
 
     def is_dust(self, sweep_info: SweepInfo) -> bool:
         """Can raise NoDynamicFeeEstimates."""
-        if sweep_info.is_anchor():
+        if sweep_info.dust_override:
             return False
         if sweep_info.txout is not None:
             return False

tests/test_txbatcher.py

@@ -86,6 +86,7 @@ SWAP_SWEEP_INFO = SweepInfo(
     txout=None,
     name='swap claim',
     can_be_batched=True,
+    dust_override=False,
 )