mark on-chain resolved htlcs as resolved

This is so that lnworker.has_unresolved_sent_htlcs() does not
return True after onchain resolution

Author: ecdsa

electrum/lnchannel.py

@@ -1547,6 +1547,9 @@ def extract_preimage_from_htlc_txin(self, txin: TxInput, *, is_deeply_mined: boo
                 self.lnworker.save_preimage(payment_hash, preimage, mark_as_public=True)
             for htlc, is_sent in found.values():
                 if is_sent:
+                    # if chan is redeemed, we can safely mark all htlcs as resolved
+                    if self.is_redeemed():
+                        self.hm.mark_resolved_onchain(htlc.htlc_id, True)
                     self.lnworker.htlc_fulfilled(self, payment_hash, htlc.htlc_id)
         else:
             # htlc timeout or revocation tx
@@ -1557,6 +1560,9 @@ def extract_preimage_from_htlc_txin(self, txin: TxInput, *, is_deeply_mined: boo
             for htlc, is_sent in found.values():
                 if is_sent:
                     self.logger.info(f'htlc {"revocation" if is_revocation else "timeout"} tx: failing htlc')
+                    # if chan is redeemed, we can safely mark all htlcs as resolved
+                    if self.is_redeemed():
+                        self.hm.mark_resolved_onchain(htlc.htlc_id, False)
                     self.lnworker.htlc_failed(
                         self,
                         payment_hash=htlc.payment_hash,

electrum/lnhtlc.py

@@ -127,6 +127,16 @@ def recv_fail(self, htlc_id: int) -> None:
             raise Exception(f"(remote) cannot remove htlc that is not there...")
         self.log[LOCAL]['fails'][htlc_id] = {LOCAL: next_ctn, REMOTE: None}
 
+    @with_lock
+    def mark_resolved_onchain(self, htlc_id: int, success: bool) -> None:
+        # so that lnworker.has_unresolved_sent_htlcs() does not return True
+        if self.was_htlc_failed(htlc_id=htlc_id, htlc_proposer=LOCAL):
+            return
+        if self.was_htlc_preimage_released(htlc_id=htlc_id, htlc_proposer=LOCAL):
+            return
+        next_ctn = self.ctn_latest(LOCAL) + 1
+        self.log[LOCAL]['settles' if success else 'fails'][htlc_id] = {LOCAL: next_ctn, REMOTE: None}
+
     @with_lock
     def send_update_fee(self, feerate: int) -> None:
         fee_update = FeeUpdate(rate=feerate,